apply-clients 4.1.56-weinan → 4.1.58-weinan

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apply-clients",
-  "version": "4.1.56-weinan",
+  "version": "4.1.58-weinan",
   "description": "报建前端模块",
   "main": "src/index.js",
   "directories": {

package/src/components/app_apply/AppChargeManagement.vue

@@ -206,7 +206,8 @@ export default {
       },
       title1:'',
       // 收费编号
-      f_charge_number:''
+      f_charge_number:'',
+      state:'结束'
     }
   },
   ready () {
@@ -235,40 +236,41 @@ export default {
     },*/
     // 获取订单信息
     async getOrderInformation () {
+      this.state = '开始'
       // 查询订单信息
       console.log('查询订单信息！！！')
-      // let data = {
-      //   out_trade_no: this.order.out_trade_no,
-      //   filiale: this.config[Vue.user.number]
-      // }
       // 查询订单状态
-
-      let http = new HttpResetClass()
-      let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/apply_singleTable`, {
-        data: {
-          tablename: "t_weixinreturnxml",
-          condition: ` f_out_trade_no = '${this.order.f_out_trade_no}' and f_order_state = '已支付' `,
+      try {
+        let http = new HttpResetClass()
+        let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/apply_singleTable`, {
+          data: {
+            tablename: "t_weixinreturnxml",
+            condition: ` f_out_trade_no = '${this.order.f_out_trade_no}' and f_order_state = '已支付' `,
+          }
+        }, {
+          resolveMsg: null,
+          rejectMsg: '订单查询失败！！！'
+        })
+        console.log('8888888888')
+        console.log(this.order.f_out_trade_no)
+        console.log(JSON.stringify(res))
+        // 支付成功
+        if (res.data.length > 0) {
+          this.$showMessage('支付成功！！！')
+          clearTimeout(this.paymentInterval)
+          clearTimeout(this.orderInterval)
+          this.timeLeft = 300
+          // 修改支付状态
+          this.updatestate('支付成功','有效')
+          this.saveother()
+          // 清除二维码
+          this.clearQrCode()
+          this.showQrCode = false
         }
-      }, {
-        resolveMsg: null,
-        rejectMsg: '订单查询失败！！！'
-      })
-      console.log('8888888888')
-      console.log(this.order.f_out_trade_no)
-      console.log(JSON.stringify(res))
-      // 支付成功
-      if (res.data.length > 0) {
-        this.$showMessage('支付成功！！！')
-        clearTimeout(this.paymentInterval)
-        clearTimeout(this.orderInterval)
-        this.timeLeft = 300
-        // 修改支付状态
-        this.updatestate('支付成功','有效')
-        this.saveother()
-        // 清除二维码
-        this.clearQrCode()
-        this.showQrCode = false
+      }catch (e){
+        this.state = '结束'
       }
+      this.state = '结束'
     },
     checkApplyModel(){
       console.log(this.charge.payment_terms)
@@ -395,7 +397,9 @@ export default {
 
           // 3秒查询一次订单支付信息
           this.orderInterval = setInterval(() => {
-            this.getOrderInformation()
+            if(this.state == '结束'){
+              this.getOrderInformation()
+            }
           },3000)
         }else{
           this.$showMessage('订单生成失败')

package/src/components/app_apply/ApplyToDoList.vue

@@ -25,8 +25,9 @@
           </div>
           <div class="row form-group app-input" v-if="criteriaShow">
             <label class="">报建类型：</label>
-            <div class="col-xs-8">
+            <div class="col-xs-8" style="width: 100%">
               <v-select
+                class="select select_list"
                 :value.sync="model.f_apply_type"
                 v-model="model.f_apply_type"
                 :options='applytype'
@@ -39,6 +40,7 @@
             <label class="">办理环节：</label>
             <div class="col-xs-8">
               <v-select
+                class="select select_list"
                 :value.sync="model.defname"
                 v-model="model.defname"
                 :options='defnames'
@@ -51,6 +53,7 @@
             <label class="">用户类型：</label>
             <div class="col-xs-8">
               <v-select
+                class="select select_list"
                 :value.sync="model.f_user_type"
                 v-model="model.f_user_type"
                 :options='usertype'
@@ -67,7 +70,7 @@
                           :value.sync="model.startDate"
                           :format="'yyyy-MM-dd 00:00:00'"
                           :show-reset-button="true"
-                          >
+              >
               </datepicker>
             </div>
           </div>
@@ -79,7 +82,7 @@
                           :value.sync="model.endDate"
                           :format="'yyyy-MM-dd 23:59:59'"
                           :show-reset-button="true"
-                          >
+              >
               </datepicker>
             </div>
           </div>