diff --git a/pages.json b/pages.json
index c6f81dc..b796232 100644
--- a/pages.json
+++ b/pages.json
@@ -694,13 +694,13 @@
{
"path": "business/staff",
"style": {
- "navigationBarTitleText": "员工管理"
+ "navigationBarTitleText": "客户经理管理"
}
},
{
"path": "business/edit_staff",
"style": {
- "navigationBarTitleText": "编辑员工"
+ "navigationBarTitleText": "编辑客户经理"
}
},
{
diff --git a/pages/admin/business/index.vue b/pages/admin/business/index.vue
index 4ce0212..1a9cd1c 100644
--- a/pages/admin/business/index.vue
+++ b/pages/admin/business/index.vue
@@ -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'
});
}
diff --git a/pages/admin/business/staff.vue b/pages/admin/business/staff.vue
index 6ebd447..cfeba32 100644
--- a/pages/admin/business/staff.vue
+++ b/pages/admin/business/staff.vue
@@ -25,7 +25,7 @@
- 添加客户经理
+ 新增客户经理
diff --git a/pages/agent/invite/index.vue b/pages/agent/invite/index.vue
index 034c8b3..26501e3 100644
--- a/pages/agent/invite/index.vue
+++ b/pages/agent/invite/index.vue
@@ -25,14 +25,14 @@
- 联系人姓名
-
+ 负责人姓名
+
- 联系人电话
-
+ 负责人电话
+
@@ -46,7 +46,7 @@
-
+
@@ -56,16 +56,22 @@
- 商户名称
-
+ 品牌名称
+
- 商户分类
+ 企业名称
+
+
+
+
+
+ 行业分类
-
+
@@ -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;
}
}
diff --git a/pages/store/shopStreet/index.vue b/pages/store/shopStreet/index.vue
index 0d2483e..4448597 100644
--- a/pages/store/shopStreet/index.vue
+++ b/pages/store/shopStreet/index.vue
@@ -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;