mkm/nk-shop2.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
weipengfei 2024-02-23 14:42:34 +08:00
parent 9cc36316aa
commit 57cecc6db3
4 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/store.js
View File

@ -374,7 +374,7 @@ export function create(data) {
return request.post("intention/create", data); return request.post("intention/create", data);
} }
/** /**
* 个人入驻表单 * 种养殖户入驻表单
* @returns {*} * @returns {*}
*/ */
export function personalStore(data) { export function personalStore(data) {

2
pages.json
View File

@ -1216,7 +1216,7 @@
"style": { "style": {
"navigationStyle": "custom", "navigationStyle": "custom",
"navigationBarTitleText": "个人入驻" "navigationBarTitleText": "种养殖户入驻"
} }
}, },
{ {

2
pages/store/home/index.vue
View File

@ -1012,10 +1012,8 @@
if (res.data.business_status == 2) { if (res.data.business_status == 2) {
this.isLihaiYun === 'Lihai' ? this.tabs = this.tabs4 : this.tabs = this.tabs3 this.isLihaiYun === 'Lihai' ? this.tabs = this.tabs4 : this.tabs = this.tabs3
this.type=7
} else { } else {
this.tabs = this.tabs5 this.tabs = this.tabs5
this.type=7
} }
this.tab(this.type) this.tab(this.type)

24
pages/store/settled/unit.vue
View File

@ -18,7 +18,7 @@
<view class='merchantsSettled'> <view class='merchantsSettled'>
<view class="merchantBgCount"> <view class="merchantBgCount">
<image mode="widthFix" class="merchantBg" <image mode="widthFix" class="merchantBg"
src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/d8208202401171727545921.png" alt=""> src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/50c52202402231430498637.png" alt="">
</view> </view>
<view class="application-record" @click="jumpToList" v-if="!mer_i_id"> <view class="application-record" @click="jumpToList" v-if="!mer_i_id">
申请记录 申请记录
@ -149,7 +149,7 @@
</view> </view>
</form> </form>
<view class="settlementAgreement" v-if="showProtocol"> <view class="settlementAgreement" v-if="showProtocol">
<view class="setAgCount" style="width: 656rpx;height: 458px;"> <view class="setAgCount" style="width: 656rpx;height: 800rpx;">
<i class="icon iconfont icon-cha" @click="showProtocol = false"></i> <i class="icon iconfont icon-cha" @click="showProtocol = false"></i>
<div class="title" v-if='titFlag'>{{isType ? '店铺类型说明' : '商户入驻协议'}}</div> <div class="title" v-if='titFlag'>{{isType ? '店铺类型说明' : '商户入驻协议'}}</div>
<div class="title" v-else></div> <div class="title" v-else></div>
@ -513,11 +513,11 @@
if (type == 0) { if (type == 0) {
this.titFlag = true this.titFlag = true
this.protocol = this.sys_intention_agree this.protocol = this.sys_intention_agree.replace(/\*\*甲方公司\*\*/g, this.company);
} else { } else {
this.titFlag = false this.titFlag = false
mer_services_agree().then(res => { 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.area_id = this.business[0][this.index2[0]].code
this.street_id = this.business[1][this.index2[1]].code this.street_id = this.business[1][this.index2[1]].code
this.village_id = this.business[2][this.index2[2]].id this.village_id = this.business[2][this.index2[2]].id
return; // 个人入驻也不需要 // return; // 个人入驻也不需要
if (this.merchantData.mer_type == 12) return; //市级供应链不需要查询镇农科公司 if (this.merchantData.mer_type == 12) return; //市级供应链不需要查询镇农科公司
merstreet({ merstreet({
street_code: this.street_id street_code: this.street_id
@ -999,9 +999,9 @@
if (!value.address) return that.$util.Tips({ if (!value.address) return that.$util.Tips({
title: '请输入详细地址' title: '请输入详细地址'
}); });
// if (!that.isAgree) return that.$util.Tips({ if (!that.isAgree) return that.$util.Tips({
// title: '请勾选并同意入驻协议' title: '请勾选并同意入驻协议'
// }); });
// if (that.isShowCode && !that.codeVal) return that.$util.Tips({ // if (that.isShowCode && !that.codeVal) return that.$util.Tips({
// title: '请填写图片验证码' // 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({ if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(this.merchantData.phone)) return this.$util.Tips({
title: '请输入正确的手机号码' title: '请输入正确的手机号码'
}); });
// if (!this.isAgree) return this.$util.Tips({ if (!this.isAgree) return this.$util.Tips({
// title: '请勾选并同意入驻协议' title: '请勾选并同意入驻协议'
// }); });
this.$refs.verify.show(); this.$refs.verify.show();
} }
} }
@ -1412,7 +1412,7 @@
overflow: hidden; overflow: hidden;
.content { .content {
height: 900rpx; height: 740rpx;
overflow-y: scroll; overflow-y: scroll;
/deep/ p { /deep/ p {