申请退税部分逻辑

@@ -3,12 +3,14 @@ var OSSInit;
 var app = getApp();
 var app = getApp();
 var baseUrl = app.globalData.baseUrl;
 var baseUrl = app.globalData.baseUrl;
 var format = require('../../../../utils/util.js');
 var format = require('../../../../utils/util.js');
+var province = require('../../../../utils/province.js');
 Page({
 Page({
 
 
   /**
   /**
    * Page initial data
    * Page initial data
    */
    */
   data: {
   data: {
+    province: [],
     name: '',
     name: '',
     bank: '',
     bank: '',
     bank_card_no: '',
     bank_card_no: '',
@@ -23,11 +25,25 @@ Page({
     this.initOSS()
     this.initOSS()
     var userinfo = app.globalData.userInfo
     var userinfo = app.globalData.userInfo
     console.log("userinfo", userinfo)
     console.log("userinfo", userinfo)
+    this.loadProvince()
     this.setData({
     this.setData({
       name: userinfo ? userinfo.name : ""
       name: userinfo ? userinfo.name : ""
     })
     })
   },
   },
 
 
+  loadProvince: function() {
+    province.init(this)
+    var provincelist = this.data.province
+    var province_data = []
+    for (var i = 0; i < provincelist.length; i++) {
+      province_data.push(provincelist[i].name)
+    }
+    console.log("provincedata", province_data)
+    this.setData({
+      province: province_data,
+    })
+  },
+
   /**
   /**
    * Lifecycle function--Called when page is initially rendered
    * Lifecycle function--Called when page is initially rendered
    */
    */
@@ -81,9 +97,6 @@ Page({
       count: 1,
       count: 1,
       success: function(res) {
       success: function(res) {
         console.log('success', res)
         console.log('success', res)
-        wx.showLoading({
-          title: "识别中"
-        })
         wx.getFileSystemManager().readFile({
         wx.getFileSystemManager().readFile({
           filePath: res.tempFilePaths[0], // 选择图片返回的相对路径
           filePath: res.tempFilePaths[0], // 选择图片返回的相对路径
           encoding: 'base64', // 编码格式
           encoding: 'base64', // 编码格式
@@ -99,6 +112,13 @@ Page({
   ocrBankImage: function(imginfo) {
   ocrBankImage: function(imginfo) {
     var that = this
     var that = this
     this.Authorization = getApp().globalData.Authorization;
     this.Authorization = getApp().globalData.Authorization;
+    setTimeout(function () {
+      wx.showLoading({
+        title: "识别银行卡中",
+        mask: true
+      })
+    }, 1000)
+    
     wx.request({
     wx.request({
       url: baseUrl + "common/v1/ocr/bankcards",
       url: baseUrl + "common/v1/ocr/bankcards",
       method: "POST",
       method: "POST",
@@ -110,21 +130,27 @@ Page({
       },
       },
       success: function(result) {
       success: function(result) {
         console.log("bankinfo", result)
         console.log("bankinfo", result)
+       
         if (result.statusCode == 200) {
         if (result.statusCode == 200) {
-          wx.hideLoading()
+          var result_new = result.data.bank.split("银行")
           that.setData({
           that.setData({
-            bank: result.data.bank.split("银行")[0] + "银行",
-            bank_card_no: result.data.bank_card_no
+            bank: result_new[0] + "银行",
+            bank_card_no: result.data.bank_card_no,
+            hideLoading: true,
           })
           })
+            wx.hideLoading()
         }
         }
       },
       },
+      complete: function() {
+        
+      }
     })
     })
   },
   },
 
 
-  bindRegionChange: function (e) {
-    console.log('picker发送选择改变，携带值为', e.detail.value)
+  bindRegionChange: function(e) {
+    console.log('picker，携带值为', e.detail.value)
     this.setData({
     this.setData({
-      region: e.detail.value
+      bank_card_province: this.data.province[e.detail.value]
     })
     })
   },
   },
 
 
@@ -147,8 +173,8 @@ Page({
       this.showToast("请输入银行名称")
       this.showToast("请输入银行名称")
       return
       return
     }
     }
-    if (!formdata.bank_card_province.length < 1) {
-      this.showToast("请输入开户银行省份")
+    if (this.data.bank_card_province.length < 1) {
+      this.showToast("请选择开户银行省份")
       return
       return
     }
     }
     this.setData({
     this.setData({
@@ -177,16 +203,16 @@ Page({
       },
       },
       method: "PUT",
       method: "PUT",
       data: {
       data: {
-        'name': '',
-        "bank": '',
-        "bank_card_no": '',
-        "bank_card_province": ''
+        'name': that.data.name,
+        "bank": that.data.bank,
+        "bank_card_no": that.data.bank_card_no,
+        "bank_card_province": that.data.bank_card_province
       },
       },
       success: function(result) {
       success: function(result) {
         console.log("submit", result)
         console.log("submit", result)
         if (result.statusCode == 200) {
         if (result.statusCode == 200) {
-          that.setData({
-
+          wx.navigateBack({
+            delta: 1
           })
           })
         }
         }
       },
       },

@@ -22,13 +22,13 @@
       <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请输入' name='bank_card_province' value="{{bank_card_province}}"></input>
       <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请输入' name='bank_card_province' value="{{bank_card_province}}"></input>
     </view> -->
     </view> -->
 
 
-    <picker style="height:104rpx;padding:0 30rpx;background-color:#fff" mode="province" bindchange="bindRegionChange" value="{{region}}">
+    <picker style="height:104rpx;padding:0 30rpx;background-color:#fff" mode="selector" bindchange="bindRegionChange" range="{{province}}" >
       <text class="text_gray7_34">开户银行省份</text>
       <text class="text_gray7_34">开户银行省份</text>
-      <view class="input_wrap rigion_notchoosed}}">
-        请选择 </view>
-      <view class="input_wrap rigion_choosed">
-        {{region[0]}}
+      <view wx:if="{{bank_card_province.length>0}}" class="input_wrap rigion_choosed">
+        {{bank_card_province}}
       </view>
       </view>
+      <view wx:else class="input_wrap rigion_notchoosed}}">
+        请选择 </view>
     </picker>
     </picker>
 
 
     <view class="btn_bottom">
     <view class="btn_bottom">

+var province = [{
+  "name": "北京市",
+  "code": "110000",
+},
+{
+  "name": "天津市",
+  "code": "120000",
+},
+{
+  "name": "河北省",
+  "code": "130000",
+},
+{
+  "name": "山西省",
+  "code": "140000",
+},
+{
+  "name": "内蒙古自治区",
+  "code": "150000",
+},
+{
+  "name": "辽宁省",
+  "code": "210000",
+},
+{
+  "name": "吉林省",
+  "code": "220000",
+},
+{
+  "name": "黑龙江省",
+  "code": "230000",
+},
+{
+  "name": "上海市",
+  "code": "310000",
+},
+{
+  "name": "江苏省",
+  "code": "320000",
+},
+{
+  "name": "浙江省",
+  "code": "330000",
+},
+{
+  "name": "安徽省",
+  "code": "340000",
+},
+{
+  "name": "福建省",
+  "code": "350000",
+},
+{
+  "name": "江西省",
+  "code": "360000",
+},
+{
+  "name": "山东省",
+  "code": "370000",
+},
+{
+  "name": "河南省",
+  "code": "410000",
+},
+{
+  "name": "湖北省",
+  "code": "420000",
+},
+{
+  "name": "湖南省",
+  "code": "430000",
+},
+{
+  "name": "广东省",
+  "code": "440000",
+},
+{
+  "name": "广西壮族自治区",
+  "code": "450000",
+},
+{
+  "name": "海南省",
+  "code": "460000",
+},
+{
+  "name": "重庆市",
+  "code": "500000",
+},
+{
+  "name": "四川省",
+  "code": "510000",
+},
+{
+  "name": "贵州省",
+  "code": "520000",
+},
+{
+  "name": "云南省",
+  "code": "530000",
+},
+{
+  "name": "西藏自治区",
+  "code": "540000",
+},
+{
+  "name": "陕西省",
+  "code": "610000",
+},
+{
+  "name": "甘肃省",
+  "code": "620000",
+},
+{
+  "name": "青海省",
+  "code": "630000",
+},
+{
+  "name": "宁夏回族自治区",
+  "code": "640000",
+},
+{
+  "name": "新疆维吾尔自治区",
+  "code": "650000",
+},
+{
+  "name": "台湾省",
+  "code": "710000"
+},
+{
+  "name": "台湾省",
+  "code": "710000"
+},
+{
+  "name": "台湾省",
+  "code": "710000"
+},
+{
+  "name": "香港特别行政区",
+  "code": "810000"
+},
+{
+  "name": "澳门特别行政区",
+  "code": "820000"
+}]
+
+function init(that) {
+  that.setData({
+    'province': province
+  });
+}
+
+module.exports = {
+  init: init
+}