diff --git a/api/store.js b/api/store.js index 3ef1f67..6132576 100644 --- a/api/store.js +++ b/api/store.js @@ -374,7 +374,7 @@ export function create(data) { return request.post("intention/create", data); } /** - * 个人入驻表单 + * 种养殖户入驻表单 * @returns {*} */ export function personalStore(data) { diff --git a/pages.json b/pages.json index f69b4b5..70a268c 100644 --- a/pages.json +++ b/pages.json @@ -1216,7 +1216,7 @@ "style": { "navigationStyle": "custom", - "navigationBarTitleText": "个人入驻" + "navigationBarTitleText": "种养殖户入驻" } }, { diff --git a/pages/store/home/index.vue b/pages/store/home/index.vue index 7c66957..92da9f1 100644 --- a/pages/store/home/index.vue +++ b/pages/store/home/index.vue @@ -1012,10 +1012,8 @@ if (res.data.business_status == 2) { this.isLihaiYun === 'Lihai' ? this.tabs = this.tabs4 : this.tabs = this.tabs3 - this.type=7 } else { - this.tabs = this.tabs5 - this.type=7 + this.tabs = this.tabs5 } this.tab(this.type) diff --git a/pages/store/settled/unit.vue b/pages/store/settled/unit.vue index cfa913c..b00a69b 100644 --- a/pages/store/settled/unit.vue +++ b/pages/store/settled/unit.vue @@ -18,7 +18,7 @@ + src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/50c52202402231430498637.png" alt=""> 申请记录 @@ -149,7 +149,7 @@ - +
{{isType ? '店铺类型说明' : '商户入驻协议'}}
@@ -513,11 +513,11 @@ if (type == 0) { this.titFlag = true - this.protocol = this.sys_intention_agree + this.protocol = this.sys_intention_agree.replace(/\*\*甲方公司\*\*/g, this.company); } else { this.titFlag = false mer_services_agree().then(res => { - this.protocol = res.data.mer_services_agree + this.protocol = res.data.mer_services_agree.replace(/\*\*甲方公司\*\*/g, this.company); }) } // 获取配置 @@ -630,7 +630,7 @@ this.area_id = this.business[0][this.index2[0]].code this.street_id = this.business[1][this.index2[1]].code this.village_id = this.business[2][this.index2[2]].id - return; // 个人入驻也不需要 + // return; // 个人入驻也不需要 if (this.merchantData.mer_type == 12) return; //市级供应链不需要查询镇农科公司 merstreet({ street_code: this.street_id @@ -999,9 +999,9 @@ if (!value.address) return that.$util.Tips({ title: '请输入详细地址' }); - // if (!that.isAgree) return that.$util.Tips({ - // title: '请勾选并同意入驻协议' - // }); + if (!that.isAgree) return that.$util.Tips({ + title: '请勾选并同意入驻协议' + }); // if (that.isShowCode && !that.codeVal) return that.$util.Tips({ // title: '请填写图片验证码' // }); @@ -1033,9 +1033,9 @@ if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(this.merchantData.phone)) return this.$util.Tips({ title: '请输入正确的手机号码' }); - // if (!this.isAgree) return this.$util.Tips({ - // title: '请勾选并同意入驻协议' - // }); + if (!this.isAgree) return this.$util.Tips({ + title: '请勾选并同意入驻协议' + }); this.$refs.verify.show(); } } @@ -1412,7 +1412,7 @@ overflow: hidden; .content { - height: 900rpx; + height: 740rpx; overflow-y: scroll; /deep/ p {