Merge branch '11/24SAAS' of http://git.dayaedu.com/yonge/dy-admin-manager into 11/24SAAS

src/layout/components/Navbar.vue

@@ -173,7 +173,7 @@
             <i class="icon_admin_edit userSize"></i>
             <span class="dropdown-text">修改密码</span>
           </el-dropdown-item>
-          <el-dropdown-item @click.native="accountStatus = true" v-if="$helpers.permission('/tenantInfoSetting')">
+          <el-dropdown-item @click.native="accountStatus = true" v-if="$helpers.permission('employee/simpleUpdate')">
             <i class="icon_admin_account userSize"></i>
             <span class="dropdown-text">账号设置</span>
           </el-dropdown-item>
@@ -395,7 +395,7 @@ export default {
     },
     async onTenantChange() {
       try {
-        const res = await tenantInfoQueryPage({ page: 1, rows: 999, payState: 1 }, )
+        const res = await tenantInfoQueryPage({ page: 1, rows: 999, payState: 1, state: 1 }, )
         this.tenantList = res.data?.rows || []
         this.tenantVisible = true
       } catch(e) {}

src/layout/components/modal/userModal.vue

@@ -38,8 +38,9 @@
       <el-form-item label="手机号" prop="phone">
         <el-input
           v-model.trim.number="form.phone"
-          disabled
           placeholder="请输入手机号"
+          :max="11"
+          maxlength="11"
           autocomplete="off"
         ></el-input>
       </el-form-item>
@@ -205,8 +206,7 @@ export default {
       // employee/simpleUpdate
       this.$refs['ruleForm'].validate(async (valid) => {
         if (valid) {
-          const { phone, ...res } = this.form
-          simpleUpdate({...res}).then((res) => {
+          simpleUpdate(this.form).then((res) => {
               this.messageTips("修改", res);
             });
         } else {

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>

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

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

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) {