lex-xin 3 vuotta sitten
vanhempi
commit
6e2c658abe

+ 2 - 0
src/views/organManager/components/organInfo.vue

@@ -164,6 +164,8 @@
           <el-input
             v-model.trim="form.customerServicePhone"
             type="number"
+            maxlength="13"
+            minlength="11"
             :disabled="isDisabled"
             placeholder="请输入机构客服电话"
           ></el-input>

+ 1 - 1
src/views/productService/components/serviceRenew.vue

@@ -45,7 +45,7 @@
       width="1000px"
       v-if="serviceVisible"
     >
-      <serviceModel :value="form.val" :tenantInfo="tenantInfo" @close="serviceVisible = false" />
+      <serviceModel :value="form.val" :tenantInfo="tenantInfo" v-on="$listeners" @close="serviceVisible = false" />
     </el-dialog>
 
     <el-dialog

+ 7 - 1
src/views/resetTeaming/modals/giveMemberModel.vue

@@ -61,7 +61,7 @@
       width="500px"
       append-to-body
     >
-      <giveMemberPayment :tableList="tableList" :orderNo="orderNo" :codeUrl="codeUrl" @close="onPaymentClose" />
+      <giveMemberPayment :tableList="tableList" v-on="$listeners" :orderNo="orderNo" :codeUrl="codeUrl" @close="onPaymentClose" />
     </el-dialog>
   </div>
 </template>
@@ -97,6 +97,12 @@ export default {
           try {
             const res = await cloudPay(this.tableList)
             console.log(res)
+            if(res.data.amount == 0 && res.data.orderNo) {
+              this.$message.success('您已成功缴费')
+              this.onPaymentClose(true)
+              this.$listeners.getList()
+              return
+            }
             const payForm = this.payForm
             // // 二维码页面, 唤起支付页面
             const { orderNo, sign, amount, orderBody, orderSubject } = res.data.payMap

+ 1 - 0
src/views/resetTeaming/modals/giveMemberPayment.vue

@@ -50,6 +50,7 @@ export default {
           if(res.data) {
             clearInterval(orderTimer)
             this.$message.success('您已成功缴费')
+            this.$listeners.getList()
             this.$emit('close', true)
           }
         } catch(e) {