wanma-benteng
/
new-mshop-view
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

添加：烟酒馆代销商邀请烟酒馆商户入驻

This commit is contained in:
wuhui_zzw 2024-03-23 16:55:52 +08:00
parent fe5ebbb039
commit cb075d0126
4 changed files with 119 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
pages/agent/centerV2.vue
View File

@ -4,11 +4,16 @@
<view class="main-content">
<!--顶部信息-->
<view class="top">
<view class="title">{{ corporate_name || '' }}</view>
<view class="identity-info">
<view class="identity">{{ agent_info.agent_type_text || '' }}</view>
<view class="change-btn" @click="identityChangeShow" v-if="Object.values(children).length > 1">切换</view>
</view>
<template v-if="agent_info.agent_type == 11">
<view class="title">{{ agent_info.agent_type_text || '' }}</view>
</template>
<template v-else>
<view class="title">{{ corporate_name || '' }}</view>
<view class="identity-info">
<view class="identity">{{ agent_info.agent_type_text || '' }}</view>
<view class="change-btn" @click="identityChangeShow" v-if="Object.values(children).length > 1">切换</view>
</view>
</template>
</view>
<!--下级订单中心-->
<!--<view class="block-content order">
@ -120,7 +125,7 @@ export default {
let menuList = [];
let agentType = this.agent_info.agent_type || 0;
// 推广二维码
if(['1','2','3','5','6','9'].includes(String(agentType))){
if(['1','2','3','5','6','9','11'].includes(String(agentType))){
menuList.push({
title: '推广二维码',
type: 'invite_qr_code',
@ -129,7 +134,7 @@ export default {
});
}
// 除内勤、餐厅、配送商外都有下级管理
if(!['4','7','8','10'].includes(String(agentType))){
if(!['4','7','8','10','11'].includes(String(agentType))){
menuList.push({
title: '下级管理',
type: 'link',
@ -276,17 +281,29 @@ export default {
}
});
}
menuList.push({
title: '烟酒店代销商邀请码',
type: 'invite_qr_code',
url: '',
icon: 'icon-erweima1',
params: {
type: 'subordinate',
level: 11,
}
});
if(Number(agentType) !== 11){
menuList.push({
title: '烟酒店代销商邀请码',
type: 'invite_qr_code',
url: '',
icon: 'icon-erweima1',
params: {
type: 'subordinate',
level: 11,
}
});
}
if(Number(agentType) === 11){
menuList.push({
title: '烟酒馆商户邀请码',
type: 'invite_qr_code',
url: '',
icon: 'icon-erweima1',
params: {
type: 'wine'
}
});
}

6
pages/store/applicationRecord/index.vue
View File

@ -43,10 +43,12 @@
pageData: {
page: 1,
limit: 10,
}
merchant_type: 0,
},
}
},
onLoad() {
onLoad(options) {
this.pageData.merchant_type = options.merchant_type || 0;
this.getListData()
},
// 滚动到底部

32
pages/store/settled/index.vue
View File

@ -63,7 +63,7 @@
<view class="imageCode" @click="again"><image :src="codeUrl" /></view>
</view>
</view>
<view class="item">
<view class="item" v-if="merchant_type != 3">
<view class="uni-list">
<view class="uni-list-cell">
<view class="uni-list-cell-db acea-row row-middle">
@ -76,7 +76,7 @@
</view>
</view>
</view>
<view class="item">
<view class="item" v-if="merchant_type != 3">
<view class="uni-list">
<view class="uni-list-cell">
<view class="uni-list-cell-db acea-row row-middle">
@ -214,6 +214,9 @@
},
mer_i_id: null, // 商户申请id
isType: false,
// 代理邀请入驻
agent_id: 0,
merchant_type: 0,
};
},
beforeDestroy() {
@ -221,6 +224,16 @@
},
computed: configMap({sys_intention_agree:''},mapGetters(['isLogin','uid','viewColor','keyColor'])),
onLoad(options) {
let _this = this;
if(options.scene){
console.log('转换前参数：',options.scene)
let scene = _this.$util.getUrlParams(decodeURIComponent(options.scene));
// console.log("接收参数",scene)
_this.agent_id = scene.aid || 0;
_this.merchant_type = scene.mt || 0;
}
if (this.isLogin) {
this.getClassfication();
this.getStoreType();
@ -237,7 +250,6 @@
this.getGoodsDetails(options.mer_i_id)
})
}
// 关系处理
if(options.spread) spread(options.spread, this.isLogin)
},
@ -300,6 +312,8 @@
this.manage_search = Number(this.merchantData.manage_uid) || ''
})
this.pics = resData.images
this.merchant_type = resData.merchant_type
this.agent_id = resData.agent_id
this.mer_classification = this.getCategoryName(resData.merchant_category_id, this.array)
this.mer_storeType = this.getStoreTypeName(resData.mer_type_id, this.storeTypeArr)
uni.hideLoading();
@ -504,7 +518,9 @@
code: that.merchantData.yanzhengma,
merchant_category_id: that.merchantData.classification,
mer_type_id: that.merchantData.mer_type,
images: that.pics
images: that.pics,
agent_id: that.agent_id || 0,
merchant_type: that.merchant_type || 0
}
that.validate = false;
if (that.mer_i_id) {
@ -546,7 +562,7 @@
validateBtn: function() {
let that = this,
value = that.merchantData;//value.yanzhengma &&
if (value.enterprise_name && value.user_name && value.phone && /^1(3|4|5|7|8|9|6)\d{9}$/i.test(value.phone) && that.isAgree && value.classification) {
if (value.enterprise_name && value.user_name && value.phone && /^1(3|4|5|7|8|9|6)\d{9}$/i.test(value.phone) && that.isAgree && (value.classification || this.merchant_type == 3)) {
if (!that.isShowCode) {
that.validate = true;
} else {
@ -570,7 +586,7 @@
if (!value.phone) return that.$util.Tips({title: '请输入手机号'});
if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(value.phone)) return that.$util.Tips({title: '请输入正确的手机号码'});
// if (!value.yanzhengma) return that.$util.Tips({title: '请填写验证码'});
if (!value.classification) return that.$util.Tips({title: '请选择商户分类'});
if (!value.classification && this.merchant_type != 3) return that.$util.Tips({title: '请选择商户分类'});
if (!that.isAgree) return that.$util.Tips({title: '请勾选并同意入驻协议'});
if (that.isShowCode && !that.codeVal) return that.$util.Tips({title: '请填写图片验证码'});
@ -579,8 +595,8 @@
},
jumpToList() {
uni.navigateTo({
url: "/pages/store/applicationRecord/index"
})
url: "/pages/store/applicationRecord/index?merchant_type=" + this.merchant_type
})
},
success(data) {
this.$refs.verify.hide();

69
pages/user/index.vue
View File

@ -83,6 +83,14 @@
<view class="num-item" @click="goMenuPage('/pages/users/online_payment/record/integral')">
<text class="num">{{userInfo.exchange_integral || 0}}</text>
<view class="txt">酒水卡积分</view>
</view>
<view class="num-item" @click="goMenuPage('/pages/users/online_payment/record/quota?quota_type=3')">
<text class="num">{{userInfo.wine_available || 0}}</text>
<view class="txt">坛封酒额度</view>
</view>
<view class="num-item" @click="goMenuPage('/pages/users/online_payment/record/quota?quota_type=4')">
<text class="num">{{userInfo.oil_available || 0}}</text>
<view class="txt">加油卡额度</view>
</view>
<!--<view class="num-item" @click="goMenuPage('/pages/users/user_coupon/index')">-->
<!-- <text class="num">{{userInfo.total_coupon || 0}}</text>-->
@ -190,6 +198,12 @@
<text>{{ operation_center.county_title }}</text>
</view>
</view>
<view class="item" @click="clickOperationCenterMenu('wine')" v-if="Object.keys(identity.wine_list).length > 0 || userInfo.smokeMerService">
<view class="item-count">
<image :src="operation_center.wine_image"></image>
<text>{{ operation_center.wine_title || '烟酒馆运营商' }}</text>
</view>
</view>
</view>
</view>
<!--商户员工端、平台客服端、酒道馆员工端入口-->
@ -278,6 +292,8 @@
<view class="tag-list-item">酒道馆管理中心</view>
</view>
</view>
</template>
<template v-if="identityCurrentName == 'wine'">
<view class="_list-item" v-if="userInfo.smokeMerService" @click="toService(3)">
<view class="top">烟酒店管理</view>
<view class="tag-list">
@ -296,7 +312,7 @@
</view>
</template>
<!--配送商-->
<template v-else-if="item.agent_type == 8">
<template v-else-if="item.agent_type == 8 || item.agent_type == 11">
<view class="top">{{ item.agent_type_text }}</view>
<view class="tag-list delivery-tag">
<view class="tag-list-item" v-for="(merItem,merIndex) in item.merList" :key="merIndex">{{ merItem.mer_name || '' }}</view>
@ -446,9 +462,10 @@
// 身份信息
identityShow: false,
identity: {
county_list: 0,
headquarters_list: 0,
province_list: 0
county_list: {},
headquarters_list: {},
province_list: {},
wine_list: {},
},
identityCurrent:{},
identityCurrentName: '',
@ -773,7 +790,8 @@
let headquarters = Object.keys(_this.identity.headquarters_list).length || 0;
let province = Object.keys(_this.identity.province_list).length || 0;
let county = Object.keys(_this.identity.county_list).length || 0;
let total = Number(headquarters) + Number(province) + Number(county);
let wine = Object.keys(_this.identity.wine_list).length || 0;
let total = Number(headquarters) + Number(province) + Number(county) + Number(wine);
_this.identityShow = Number(total) > 0;
}
}).catch(err => {
@ -787,9 +805,17 @@
this.identityCurrent = this.identity[keyName] || {};
let len = Object.keys(this.identityCurrent).length || 0;
// 根据数据进行对应的操作
if(len <= 0 && (type != 'county' || (type == 'county' && !this.userInfo.service && !this.userInfo.shopMerService))) return false;
else if((len == 1 || type == 'headquarters') && type != 'county') this.goToAgentCenter(this.identityCurrent[0]);
else this.$refs.agentIdentitySelect.open('bottom');
if(len <= 0){
// 不存在列表
if(type == 'county' && (this.userInfo.service || this.userInfo.shopMerService)) this.$refs.agentIdentitySelect.open('bottom');
else if(type == 'wine' && this.userInfo.smokeMerService) this.$refs.agentIdentitySelect.open('bottom');
}else{
// 存在列表
if(len == 1 || type == 'headquarters') this.goToAgentCenter(this.identityCurrent[0]);
else this.$refs.agentIdentitySelect.open('bottom');
}
return false;
},
// 运营中心 - 关闭弹框
closeAgentIdentitySelect(){
@ -1159,16 +1185,26 @@
.num-wrapper {
z-index: 30;
position: relative;
display: flex;
align-items: center;
justify-content: space-between;
//display: flex;
//align-items: center;
//justify-content: space-between;
margin: 30rpx 20rpx 0;
color: #fff;
display: flex;
align-items: center;
justify-content: flex-start;
flex-direction: row;
flex-wrap: wrap;
.num-item {
width: 25%;
width: calc(100% / 3) !important;
text-align: center;
height: 100rpx;
display: inline-flex;
flex-direction: column;
flex-wrap: nowrap;
justify-content: center;
align-items: center;
.num {
font-size: 42rpx;
font-weight: bold;
@ -1630,6 +1666,13 @@
}
}
.operation-center{
width: 100%;
display: inline-flex;
flex-direction: row;
flex-wrap: wrap;
justify-content: flex-start;
align-items: center;
align-content: flex-start;
.item{
width: calc(100% / 3) !important;
}