优化

wangyu
pages/main/finalpay/refundDetail/refundDetail.js
pages/main/finalpay/refundDetail/refundDetail.wxml
pages/main/finalpay/refundInfo/refundInfo.js
pages/main/finalpay/refundInfo/refundInfo.wxml
--- a/pages/main/finalpay/refundDetail/refundDetail.js
查看文件 @b1871be
+++ b/pages/main/finalpay/refundDetail/refundDetail.js
查看文件 @b1871be
-;// pages/main/finalpay/refundDetail/refundDetail.js
+; // pages/main/finalpay/refundDetail/refundDetail.js
 var app = getApp();
 var baseUrl = app.globalData.baseUrl;
 Page({
@@ -7,33 +7,34 @@ Page({
    * Page initial data
    */
   data: {
-    year:"2019",
+    year: "2019",
     refund_status: "", //退税状态  "0" 无需退税； "1" 待退税；"2" 退税中"3" 退税成功；"4"退税失败；"5"放弃退税；
-    refundInfo:{}
+    refundInfo: {},
+    refund_tax: 0
   },
   /**
    * Lifecycle function--Called when page load
    */
-  onLoad: function (options) {
-      this.getRefundDetail()
+  onLoad: function(options) {
+    this.getRefundDetail()
   },
   /**
    * Lifecycle function--Called when page is initially rendered
    */
-  onReady: function () {
+  onReady: function() {
   },
   /**
    * Lifecycle function--Called when page show
    */
-  onShow: function () {
+  onShow: function() {
   },
-  getRefundDetail: function () {//退税明细
+  getRefundDetail: function() { //退税明细
     var that = this
     this.Authorization = getApp().globalData.Authorization;
     wx.request({
@@ -42,13 +43,14 @@ Page({
         'Authorization': this.Authorization
       },
       data: {
-        years:that.data.year,
+        years: that.data.year,
       },
-      success: function (result) {
+      success: function(result) {
         console.log("declareinfo", result)
         if (result.statusCode == 200) {
           that.setData({
-              refundInfo:result.data.item
+            refund_tax: Math.abs(result.data.item.accumulated_refund_tax),
+            refundInfo: result.data.item
           })
         }
       },
@@ -58,35 +60,35 @@ Page({
   /**
    * Lifecycle function--Called when page hide
    */
-  onHide: function () {
+  onHide: function() {
   },
   /**
    * Lifecycle function--Called when page unload
    */
-  onUnload: function () {
+  onUnload: function() {
   },
   /**
    * Page event handler function--Called when user drop down
    */
-  onPullDownRefresh: function () {
+  onPullDownRefresh: function() {
   },
   /**
    * Called when page reach bottom
    */
-  onReachBottom: function () {
+  onReachBottom: function() {
   },
   /**
    * Called when user click on the top right corner to share
    */
-  onShareAppMessage: function () {
+  onShareAppMessage: function() {
   }
 })
--- a/pages/main/finalpay/refundDetail/refundDetail.wxml
查看文件 @b1871be
+++ b/pages/main/finalpay/refundDetail/refundDetail.wxml
查看文件 @b1871be
@@ -20,7 +20,7 @@
     </view>
     <view>
       <text class="text_black6_32">申请退税金额</text>
-      <text class="text_black6_32 float_right">{{refundInfo.accumulated_refund_tax}}</text>
+      <text class="text_black6_32 float_right">{{refund_tax}}</text>
     </view>
     <view>
       <text class="text_black6_32">银行卡号</text>
--- a/pages/main/finalpay/refundInfo/refundInfo.js
查看文件 @b1871be
+++ b/pages/main/finalpay/refundInfo/refundInfo.js
查看文件 @b1871be
@@ -14,7 +14,7 @@ Page({
     name: '',
     bank: '',
     bank_card_no: '',
-    bank_card_province: '',
+    bank_province: '',
     show_modal: false
   },
@@ -112,13 +112,13 @@ Page({
   ocrBankImage: function(imginfo) {
     var that = this
     this.Authorization = getApp().globalData.Authorization;
-    setTimeout(function () {
+    setTimeout(function() {
       wx.showLoading({
         title: "识别银行卡中",
         mask: true
       })
     }, 1000)
-    
+
     wx.request({
       url: baseUrl + "common/v1/ocr/bankcards",
       method: "POST",
@@ -130,7 +130,7 @@ Page({
       },
       success: function(result) {
         console.log("bankinfo", result)
-       
+
         if (result.statusCode == 200) {
           var result_new = result.data.bank.split("银行")
           that.setData({
@@ -138,11 +138,15 @@ Page({
             bank_card_no: result.data.bank_card_no,
             hideLoading: true,
           })
-            wx.hideLoading()
+          wx.hideLoading()
+        } else {
+          wx.hideLoading()
+          that.showToast("照片无法识别，请重试")
         }
       },
-      complete: function() {
-        
+      fail: function() {
+        wx.hideLoading()
+        that.showToast("照片无法识别，请重试")
       }
     })
   },
@@ -150,7 +154,7 @@ Page({
   bindRegionChange: function(e) {
     console.log('picker，携带值为', e.detail.value)
     this.setData({
-      bank_card_province: this.data.province[e.detail.value]
+      bank_province: this.data.province[e.detail.value]
     })
   },
@@ -173,7 +177,7 @@ Page({
       this.showToast("请输入银行名称")
       return
     }
-    if (this.data.bank_card_province.length < 1) {
+    if (this.data.bank_province.length < 1) {
       this.showToast("请选择开户银行省份")
       return
     }
@@ -206,8 +210,8 @@ Page({
         'name': that.data.name,
         "bank": that.data.bank,
         "bank_card_no": that.data.bank_card_no,
-        "bank_card_province": that.data.bank_card_province,
-        "refund_status":"",
+        "bank_province": that.data.bank_province,
+        "refund_status": "",
         "years": "2019",
       },
--- a/pages/main/finalpay/refundInfo/refundInfo.wxml
查看文件 @b1871be
+++ b/pages/main/finalpay/refundInfo/refundInfo.wxml
查看文件 @b1871be
@@ -25,7 +25,7 @@
     <picker style="height:104rpx;padding:0 30rpx;background-color:#fff" mode="selector" bindchange="bindRegionChange" range="{{province}}" >
       <text class="text_gray7_34">开户银行省份</text>
       <view wx:if="{{bank_card_province.length>0}}" class="input_wrap rigion_choosed">
-        {{bank_card_province}}
+        {{bank_province}}
       </view>
       <view wx:else class="input_wrap rigion_notchoosed}}">
         请选择 </view>