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-02-05 18:03:55 +08:00
parent 20997cac4f
commit 346c96ba5a
5 changed files with 43 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pages.json
View File

@ -694,13 +694,13 @@
{
"path": "business/staff",
"style": {
"navigationBarTitleText": "员工管理"
"navigationBarTitleText": "客户经理管理"
}
},
{
"path": "business/edit_staff",
"style": {
"navigationBarTitleText": "编辑员工"
"navigationBarTitleText": "编辑客户经理"
}
},
{

2
pages/admin/business/index.vue
View File

@ -138,7 +138,7 @@ export default {
if(this.service.purchase_permission){
list.push({
title: '进货',
url: '/pages/admin/custom/index?mer_id=' + merId,
url: '/pages/store/shopStreet/index?merchant_type=2',
icon: 'iconfont icon-shangjiadingdan'
});
}

2
pages/admin/business/staff.vue
View File

@ -25,7 +25,7 @@
</view>
<!--添加按钮-->
<view class="group-btn">
<view class="add-btn" @click="addStaff()">添加客户经理</view>
<view class="add-btn" @click="addStaff()">新增客户经理</view>
</view>
<!-- 添加方式弹框 -->
<uni-popup ref="addTypeList" type="bottom">

29
pages/agent/invite/index.vue
View File

@ -25,14 +25,14 @@
</view>
<view class="line">
<view class="line-content">
<view class="title">联系人姓名</view>
<input type="text" v-model="apply_info.contact_name" maxlength="15" placeholder="请输入联系人姓名" />
<view class="title">负责人姓名</view>
<input type="text" v-model="apply_info.contact_name" maxlength="15" placeholder="请输入负责人姓名" />
</view>
</view>
<view class="line">
<view class="line-content">
<view class="title">联系人电话</view>
<input type="text" v-model="apply_info.contact_phone" maxlength="20" placeholder="请输入联系人电话" />
<view class="title">负责人电话</view>
<input type="text" v-model="apply_info.contact_phone" maxlength="20" placeholder="请输入负责人电话" />
</view>
</view>
<!-- 地区选择，仅【2=省公司,3=省合伙人(外勤),4=省合伙人(内勤),5=区县运营商,6=区县合伙人,7=餐厅】显示 -->
@ -46,7 +46,7 @@
</view>
</view>
</block>
<!-- 仅餐厅 显示详细地址、定位 商户名称、商户分类、商户类型、营业执照及行业相关资质证明图片 -->
<!-- 仅餐厅 显示详细地址、定位 商户名称、行业分类、商户类型、营业执照及行业相关资质证明图片 -->
<block v-if="agent_type == 7">
<view class="line">
<view class="line-content">
@ -56,16 +56,22 @@
</view>
<view class="line">
<view class="line-content">
<view class="title">商户名称</view>
<input type="text" v-model="apply_info.mer_name" maxlength="130" placeholder="请输入商户名称" />
<view class="title">品牌名称</view>
<input type="text" v-model="apply_info.mer_name" maxlength="130" placeholder="请输入品牌名称" />
</view>
</view>
<view class="line">
<view class="line-content">
<view class="title">商户分类</view>
<view class="title">企业名称</view>
<input type="text" v-model="apply_info.enterprise_name" maxlength="130" placeholder="请输入企业名称" />
</view>
</view>
<view class="line">
<view class="line-content">
<view class="title">行业分类</view>
<view class="right">
<picker @change="merChangeClass" :value="mer_cate_index" :range="mer_cate_list" range-key="category_name">
<input placeholder="请选择商户分类" type="text" readonly disabled v-model="mer_class_name">
<input placeholder="请选择行业分类" type="text" readonly disabled v-model="mer_class_name">
</picker>
</view>
</view>
@ -328,7 +334,10 @@ export default {
case 4: title += '内勤';break;
case 5: title += '运营商';break;
case 6: title += '合伙人';break;
case 7: title += '餐厅';break;
case 7:
// title += '餐厅';
title = '商户入驻';
break;
case 8: title += '配送商';break;
}
}

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

@ -243,7 +243,8 @@
limit: 10,
order: '',
category_id : '',
type_id: ''
type_id: '',
merchant_type: 0
},
storeKey: 0,
storeScroll: true,
@ -264,6 +265,12 @@
onLoad(options) {
this.sotreParam.type_id = options.type_id && options.type_id.split(',').toString() || ''
this.sotreParam.category_id= options.cate_id && options.cate_id.split(',').toString() || ''
// 获取类型
let merchantType = options.merchant_type || 0;
this.sotreParam.merchant_type = merchantType
uni.setNavigationBarTitle({
title: merchantType == 0 ? '附近商家' : (merchantType == 1 ? '附近酒道馆' : '附近供应商')
})
this.storeList = [];
if(this.mer_location)this.selfLocation()
setTimeout(()=>{
@ -375,7 +382,7 @@
});
// #ifdef H5
}
//#endif
//#endif
},
showStoreLocation(item) {
if (!item.lat || !item.long) return this.$util.Tips({
@ -401,13 +408,13 @@
});
// #ifdef H5
}
//#endif
//#endif
},
selfLocation() {
let self = this
uni.getLocation({
type: 'gcj02',
success: (res) => {
success: (res) => {
let latitude, longitude;
latitude = res.latitude.toString();
longitude = res.longitude.toString();
@ -446,7 +453,8 @@
limit: 10,
order: this.sotreParam.order,
category_id: this.sotreParam.category_id,
type_id: this.sotreParam.type_id
type_id: this.sotreParam.type_id,
merchant_type: this.sotreParam.merchant_type || 0
}
if (this.latitude) {
rqData.location = this.latitude + ',' + this.longitude
@ -849,7 +857,7 @@
margin-right: 0;
}
}
&.styleType3{
padding: 20rpx;
.pro-item {
@ -857,7 +865,7 @@
border-radius: 16rpx;
text-align: center;
padding: 10rpx 0 20rpx;
.picture,/deep/image,uni-image {
width: 194rpx;
height: 194rpx;
@ -869,7 +877,7 @@
}
}
}
}
}
.mer-top {
display: flex;
align-items: center;
@ -921,7 +929,7 @@
}
}
}
.mer-item2{
padding: 20rpx;
background: #fff;
@ -941,7 +949,7 @@
.mer-btn{
color: #666666;
}
}
.pro-box {
display: flex;
@ -971,8 +979,8 @@
}
}
}
}
}
.no-shop {
background-color: #fff;