商家入驻页面: 开户名称在公户时显示请输入法人姓名、添加勾选阅读商家入驻协议

我的店铺页面: 添加查看入驻协议按钮

src/pagesC/settledMerchant/addShop.vue

@@ -84,7 +84,7 @@
             <uni-forms-item label="统一社会信用代码" required name="credit_code">
                 <uni-easyinput v-model="formData.credit_code" type="text" placeholder="请输入统一社会信用代码" />
             </uni-forms-item>
-            <uni-forms-item label="身份证照" required name="idcard_front_img">
+            <uni-forms-item label="法人身份证照" required name="idcard_front_img">
                 <div style="display: flex; align-items: center;">
                     <upimg v-model="formData.idcard_front_img" :count="1" desc="身份证正面照" style="margin-right: 8rpx;"/>
                     <upimg v-model="formData.idcard_back_img" :count="1" desc="身份证反面照"/>
@@ -109,7 +109,7 @@
                 <uni-easyinput v-model="formData.card_no" type="text" placeholder="请输入银行卡号" />
             </uni-forms-item>
             <uni-forms-item label="开户名称" required name="account_holder">
-                <uni-easyinput v-model="formData.account_holder" type="text" :placeholder="formData.user_type==0?'请输入开户姓名':'请输入公司名称'" />
+                <uni-easyinput v-model="formData.account_holder" type="text" :placeholder="formData.user_type==0?'请输入开户姓名':'请输入法人姓名'" />
             </uni-forms-item>
             <uni-forms-item label="身份证号" required name="card_id">
                 <uni-easyinput v-model="formData.card_id" type="text" :placeholder="formData.user_type==0?'请输入身份证号':'请输入法人身份证号'" />
@@ -127,7 +127,7 @@
             <uni-forms-item label="店铺图集" required name="atlas">
                 <upimg v-model="formData.atlas" :count="9"/>
             </uni-forms-item>
-            <uni-forms-item label="入驻协议" required name="settled">
+            <uni-forms-item label="入驻协议">
                 <upimg v-model="formData.settled" :count="9"/>
             </uni-forms-item>
             <!-- <uni-forms-item label="平台截图" name="other_type">
@@ -137,6 +137,12 @@
                 <upimg v-model="formData.other_images" :count="6"/>
             </uni-forms-item>
         </uni-forms>
+        <checkbox-group class="flex_r flex_ac flex_jc" @change="checkboxChange">
+            <label class="option_box">
+                <checkbox value="1" :checked="checked" color="#2DB389" style="transform: scale(0.7)" />
+                我已阅读并同意<text @tap.stop="getProPage">《商家入驻协议》</text>
+            </label>
+        </checkbox-group>
         <div class="btn" @click="submit">确认提交</div>
         <!-- <button class="button" @click="submit">校验表单</button> -->
         <select-address :address.sync="address" ref="selectAddress" @change="changeAddress" />
@@ -194,7 +200,7 @@ export default {
                 open_phone: { rules: [{ required: true, errorMessage: '请输入开户手机' }] },
                 card_no: { rules: [{ required: true, errorMessage: '请输入银行卡号' }] },
                 atlas: { rules: [{ required: true, errorMessage: '请上传店铺图集' }] },
-                settled: { rules: [{ required: true, errorMessage: '请上传入驻协议' }] },
+                // settled: { rules: [{ required: true, errorMessage: '请上传入驻协议' }] },
                 full_name: { rules: [{ required: true, errorMessage: '请输入营业执照相同公司全称' }] },
                 credit_code: { rules: [{ required: true, errorMessage: '请输入统一社会信用代码' }] },
                 user_type: { rules: [{ required: true, errorMessage: '请选择开户类型' }] },
@@ -212,7 +218,8 @@ export default {
             submitType: 0, //0新增 1修改
             salesmanSearch: "",
             salesmanList: [],
-            current: 0
+            current: 0,
+            checked: false
         };
     },
     watch:{
@@ -230,8 +237,11 @@ export default {
 
         // 识别营业执照信息
         'formData.qualification'(val){
-            console.log(val,"识别营业执照信息");
             let that = this;
+            console.log(val,"识别营业执照信息");
+            // if (val.indexOf("[\"")!=-1) {
+            //     val =JSON.parse(val)
+            // }
             if (val) {
                 post("v1/merchant/business",{license: val}).then(res=>{
                     console.log(res.data,that.formData);
@@ -313,6 +323,10 @@ export default {
                     }
                     
                 }
+                if (!this.checked) {
+                    this.$toast("请阅读并同意商家入驻协议");
+                    return;
+                }
                 let da = Object.assign({},that.formData);
                 da.discount = that.$h.Div(da.discount, 100);
                 da.qualification = JSON.stringify([da.qualification])
@@ -396,6 +410,21 @@ export default {
                 }
             }
         },
+        getProPage() {
+            uni.navigateTo({
+                url: "/pages/agreement/index?tit=商家入驻协议&type=30})"
+            });
+        },
+        // 点击同意协议
+        checkboxChange(e) {
+            console.log(e);
+            let index = e.detail.value.indexOf("1");
+            if (index != -1) {
+                this.checked = true;
+            } else {
+                this.checked = false;
+            }
+        },
     },
     onReady() {
         this.$refs.form.setRules(this.rules);
@@ -409,6 +438,9 @@ export default {
                     this.saleValue = this.formData.user_val
                     // this.formData.idcard_img = !!this.formData.idcard_front_img && !!this.formData.idcard_back_img
                     console.log(this.formData);
+                    if (this.formData.qualification.indexOf("[\"")!=-1) {
+                        this.formData.qualification =JSON.parse(this.formData.qualification)
+                    }
                 }
             });
         }
@@ -532,7 +564,14 @@ export default {
     text-align: center;
     margin-bottom: 50rpx;
 }
+.option_box text {
+    color: #2db389;
+}
 
+.option_box {
+    font-size: 26rpx;
+    margin: 30rpx 0;
+}
 
 // ::v-deep .uni-forms-item__content{
 //     display: flex !important;

src/pagesC/settledMerchant/myShop.vue

@@ -44,6 +44,9 @@
                     <div class="day_income" @click.stop="goto('/pagesC/settledMerchant/shopOrderLog',{s:1,shop_id: i.shop_id})">今日收入<span>￥{{i.day_income || "0.00"}}</span></div>
                 </div>
             </div>
+            <view class="flex_r flex_jc" @click="getProPage">
+                <view class="settle_btn flex_r flex_ac flex_jc">查看入驻协议</view>
+            </view>
         </div>
         <empty v-else />
         <create-code ref="createCode" />
@@ -99,6 +102,11 @@ export default {
                 error: (e) => {},
             });
         },
+        getProPage() {
+            uni.navigateTo({
+                url: "/pages/agreement/index?tit=商家入驻协议&type=30})"
+            });
+        },
     },
     onLoad(da) {},
     onShow() {
@@ -295,4 +303,14 @@ export default {
         }
     }
 }
+.settle_btn {
+    width: 300rpx;
+    height: 70rpx;
+    // padding: 40rpx 60rpx;
+    background: #2db48a;
+    font-size: 26rpx;
+    color: #fff;
+    border-radius: 12rpx;
+    margin-bottom: 30rpx;
+}
 </style>