1、首页-售后订单-小提示；

2、入驻主体填写信息提示优化
3、账户管理-（户名-账户）字段优化；
4、资产-提现申请，前端拦截校验优化

src/views/dashboard/PanelGroup.vue

@@ -44,6 +44,7 @@
         <div class="card-panel-icon-wrapper icon-shopping">
           <svg-icon icon-class="shopping" class-name="card-panel-icon" />
         </div>
+        <div class="xz-tip">{{panelData.refundTotal}}</div>
         <div class="card-panel-description">
           <div class="card-panel-text">
             售后订单
@@ -75,7 +76,7 @@ export default {
 }
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss" scoped type="text/stylus">
 .panel-group {
   margin-top: 18px;
 
@@ -145,6 +146,27 @@ export default {
       font-size: 48px;
     }
 
+    .xz-tip {
+      float: left;
+      background-color : #f4516c;
+      color: #fff;
+      width: 24px;
+      height: 24px;
+      border-radius: 12px;
+      line-height: 24px;
+      text-align :center;
+      margin-top: 18px;
+      margin-left: -24px;
+      animation : xzTip 3s;
+    }
+    @keyframes xzTip{
+      0% {  }
+      25% {  }
+      50% {  }
+      75% {  }
+      100% {  }
+    }
+
     .card-panel-description {
       float: right;
       font-weight: bold;

src/views/entry/fillMainInf.vue

@@ -260,7 +260,7 @@
           license: [{required: true, message: '请上传营业执照电子版',validator: licenseValidator}],
           organization_name: [{required: true, message: '企业名称不能为空', trigger: 'blur'}],
           organization_address: [{required: true, message: '营业执照地址不能为空', trigger: 'blur'}],
-          idcard_type: [{required: true, message: '证件号不能为空', trigger: 'blur'}],
+          idcard_type: [{required: true, message: '证件类型不能为空', trigger: 'change'}],
           real_name: [{required: true, message: '法人姓名不能为空', trigger: 'blur'}],
           idcard_number: [
             {required: true, message: '法人证件号不能为空', trigger: 'blur'},

src/views/system/asset/bankcard/index.vue

@@ -21,8 +21,8 @@
         <el-table-column label="城市名" align="center" prop="ProvinceCity"/>
         <el-table-column label="银行名称" align="center" prop="BankName"/>
         <el-table-column label="开户行" align="center" prop="Kaihuhang"/>
-        <el-table-column label="持卡人姓名" align="center" prop="BankAccountName"/>
-        <el-table-column label="卡号" align="center" prop="BankAccountNo"/>
+        <el-table-column label="户名" align="center" prop="BankAccountName"/>
+        <el-table-column label="账号" align="center" prop="BankAccountNo"/>
         <!--             <el-table-column label="支付宝账户名称" align="center" prop="ZfbAccountName" />-->
         <!--             <el-table-column label="支付宝账户" align="center" prop="ZfbAccount" />-->
         <el-table-column label="类型" :formatter="btypa" align="center" prop="State"/>
@@ -92,16 +92,16 @@
 
           <el-row>
             <el-col :span="16" :offset="3">
-              <el-form-item label="持卡人姓名" prop="BankAccountName">
-                <el-input v-model="form.BankAccountName" placeholder="请输入持卡人姓名"/>
+              <el-form-item label="户名" prop="BankAccountName">
+                <el-input v-model="form.BankAccountName" placeholder="请输入户名"/>
               </el-form-item>
             </el-col>
           </el-row>
 
           <el-row>
             <el-col :span="16" :offset="3">
-              <el-form-item label="卡号" prop="BankAccountNo">
-                <el-input v-model="form.BankAccountNo" placeholder="请输入卡号"/>
+              <el-form-item label="账号" prop="BankAccountNo">
+                <el-input v-model="form.BankAccountNo" placeholder="请输入账号"/>
               </el-form-item>
             </el-col>
           </el-row>

src/views/system/asset/withdraw/index.vue

@@ -8,7 +8,7 @@
       <el-row>
         <el-col :span="24" class="card-box">
           <!-- <span>商户信息</span> -->
-          <el-form ref="form" :model="form" :rules="rules" label-width="120px" class="ruleFormshop">
+          <el-form ref="form" :model="form" :rules="rules" label-width="150px" class="ruleFormshop">
             <el-form-item label="当前余额">
               {{sellerinfo.Balance}}元
             </el-form-item>
@@ -22,7 +22,7 @@
             <el-form-item label="手续费">
               当前手续费为{{newFee}}元
             </el-form-item>
-            <el-form-item label="银行卡">
+            <el-form-item label="银行卡" prop="bankId">
               <el-select v-model="form.bankId" placeholder="选择到账银行卡" style="width:260px;">
                 <el-option v-for="item in banklist" :key="item.Id"
                            :label="item.BankAccountName?item.BankAccountName:item.ZfbAccountName"
@@ -30,7 +30,7 @@
               </el-select>
             </el-form-item>
             <el-form-item label="提现金额" prop="money">
-              <el-input v-model="form.money" @blur="onInputBlur($event)" placeholder="提现金额大于等于100"
+              <el-input v-model="form.money" placeholder="提现金额大于等于100"
                         style="width:260px;"/>
             </el-form-item>
             <el-form-item label="短信验证码" prop="verifycode">
@@ -44,13 +44,11 @@
             <el-form-item label="支付密码" prop="pwd">
               <el-input v-model="form.pwd" type="password" placeholder="请输入提现密码" style="width:260px;"/>
             </el-form-item>
-            <el-form-item label="">
-              <el-button type="primary" @click="submitForm">确 定</el-button>
+            <el-form-item>
+              <el-button type="primary" @click="submitForm" :disabled="inSureCashOut">确 定</el-button>
               <el-button @click="cancel">取 消</el-button>
             </el-form-item>
           </el-form>
-
-
         </el-col>
       </el-row>
     </el-card>
@@ -65,6 +63,7 @@
       return {
         //倒计时
         show: true,
+        inSureCashOut: false,
         count: '',
         timer: null,
         //提现金额
@@ -87,12 +86,18 @@
         form: {},
         // 表单校验
         rules: {
-          status: [
-            {required: true, message: "提现状态 0申请提现 1提现成功 2提现失败不能为空", trigger: "blur"}
-          ],
+          bankId: [{required: true, message: "请选择要提现的银行卡", trigger: "change"}],
+          money: [{required: true, message: "提现金额不能为空", trigger: "blur"}],
+          verifycode: [{required: true, message: "短信验证码不能为空", trigger: "blur"}],
+          pwd: [{required: true, message: "支付密码必须填写", trigger: "blur"}]
         }
       };
     },
+    watch: {
+      // drawableCash: function() {
+      //   this.drawableCash = this.drawableCash.toFixed(2);
+      // }
+    },
     created() {
       this.sellerId = this.$store.state.user.sellerid;
       this.getList();
@@ -155,38 +160,33 @@
           if (response.code == 0) {
             this.msgSuccess(response.msg);
           }
-          //console.log(response.data)
         });
 
       },
 
-      onInputBlur(event) {
-        let fee = 0.006;
-        this.money = event.target.value;
-        let numRegExp = /^[0-9]+(.[0-9]{2})?$/;
-        let yue = this.drawableCash;
-        if (this.money > yue) {
-          this.$message({type: 'warning',message:'提现金额不足'});
-          return false
-        }
-        if(!numRegExp.test(this.money)) {
-          this.$message({ type: 'warning',message: '提现金额只能输入大于 0 的数字'});
-          return;
-        }else {
-          this.newFee = (this.money * fee + 1).toFixed(2);
-        }
-      },
+      // onInputBlur(event) {
+      //   let fee = 0.006;
+      //   this.money = event.target.value;
+      //   let numRegExp = /^[0-9]+(.[0-9]{2})?$/;
+      //   let yue = this.drawableCash;
+      //   if (this.money > yue) {
+      //     this.$message({type: 'warning',message:'提现金额不足'});
+      //     return false
+      //   }
+      //   if(!numRegExp.test(this.money)) {
+      //     this.$message({ type: 'warning',message: '提现金额只能输入大于 0 的数字'});
+      //     return;
+      //   }else {
+      //     this.newFee = (this.money * fee + 1).toFixed(2);
+      //   }
+      // },
       //获取商户的信息
       getSellerInfo() {
-        const sellerid = this.sellerId
-        // if(sellerid <= 0){
-        //   this.$message.error('请重新登录或刷新页面');
-        // }
+        const sellerid = this.sellerId;
         getSellerInfo({sellerId: sellerid}).then(response => {
-          this.sellerinfo = response.data
-          console.log("this.sellerinfo", this.sellerinfo)
-          this.sellerinfo.Balance = response.data.Balance / 100
-          this.sellerinfo.FrozenMoney = response.data.FrozenMoney / 100
+          this.sellerinfo = response.data;
+          this.sellerinfo.Balance = response.data.Balance / 100;
+          this.sellerinfo.FrozenMoney = response.data.FrozenMoney / 100;
           this.drawableCash = this.minus(this.sellerinfo.Balance, this.sellerinfo.FrozenMoney);
         });
       },
@@ -215,19 +215,31 @@
 
       /** 提交按钮 */
       submitForm() {
+        // inSureCashOut 为true的时候，则不能不能不能点击提现按钮，操作提现，false的时候，才能点击操作提现
         this.$refs["form"].validate(valid => {
           if (valid) {
-            this.form.sellerId = this.sellerId
+            this.form.sellerId = this.sellerId;
+            // 再次校验 提现信息
+            if(!this.form.sellerId) {
+              this.$message({type: 'error',message: '商户信息有误！'});
+              return;
+            }
+            if(this.form.money < 100 ) {
+              this.$message({type: 'error',message: '提现金额不能小于100'});
+              return;
+            }
+            if(this.form.money > this.drawableCash ) {
+              this.$message({type: 'error',message: '可提现金额不足哦！'});
+              return;
+            }
             addWithdrawlog(this.form).then(response => {
               if (response.code == 0) {
                 this.msgSuccess(response.msg);
                 this.getList();
               } else {
-                this.msgError(response.msg);
+                this.$message({type: 'error',message: response.msg});
               }
-
             });
-
           }
         });
       },