diff --git a/config/app.js b/config/app.js
index 411a39a..03c62e7 100644
--- a/config/app.js
+++ b/config/app.js
@@ -15,9 +15,9 @@ let openPlantGrass = '-openPlantGrass-'
let httpSix, httpApi, httpTwo;
-const env = 'dev'; // 开发
+// const env = 'dev'; // 开发
// const env = 'prod'; // 生产
-// const env = 'prew'; // 预上线
+const env = 'prew'; // 预上线
switch (env) {
case 'prod':
@@ -29,7 +29,8 @@ switch (env) {
case 'prew':
httpApi = 'https://test.shop.lihaink.cn' //预发布环境
httpSix = 'https://ceshi-new-wokr.lihaink.cn'
- httpTwo = 'https://erp.lihaink.cn'
+ // httpTwo = 'https://erp.lihaink.cn'
+ httpTwo = 'http://192.168.1.13:8546'
wsApi = 'wss://test.shop.lihaink.cn'
break;
default:
diff --git a/pages.json b/pages.json
index e8d7d7a..72c9a2b 100644
--- a/pages.json
+++ b/pages.json
@@ -55,6 +55,18 @@
"height": "1000px",
"background": "rgba(0,0,0,0.2)"
}
+ },
+ {
+ "id": "distr", // 唯一标识
+ "path": "pages/index/subnvue/distr", // 页面路径
+ "type": "popup",
+ "style": {
+ "position": "absolute",
+ "dock": "right",
+ "width": "750rpx",
+ "height": "1000px",
+ "background": "rgba(0,0,0,0.2)"
+ }
}
]
@@ -112,10 +124,10 @@
}
},
{
- "path": "pages/bindSupplier/record",
+ "path": "pages/bindDistribution/index",
"style": {
- "enablePullDownRefresh": false,
- "navigationBarTitleText": "申请记录"
+ "enablePullDownRefresh": true,
+ "navigationBarTitleText": "经销商入驻"
}
},
{
@@ -184,6 +196,18 @@
"height": "1500rpx",
"background": "rgba(0,0,0,0.2)"
}
+ },
+ {
+ "id": "userDistr", // 唯一标识
+ "path": "pages/user/subnvue/userDistr", // 页面路径
+ "type": "popup",
+ "style": {
+ "position": "absolute",
+ "dock": "right",
+ "width": "750rpx",
+ "height": "1500rpx",
+ "background": "rgba(0,0,0,0.2)"
+ }
}
]
}
diff --git a/pages/bindDistribution/index.vue b/pages/bindDistribution/index.vue
new file mode 100644
index 0000000..4e296e4
--- /dev/null
+++ b/pages/bindDistribution/index.vue
@@ -0,0 +1,1276 @@
+
+
+
+
+
+ 简单3步 供应商入驻
+
+
+
+
+ 1
+
+
+ 添加店铺
+
+
+
+
+
+ 2
+
+
+ 资质认证
+
+
+
+
+
+ 3
+
+
+ 入驻审核
+
+
+
+
+
+
+
+
+ 供应商名称
+
+
+
+
+
+
+ 供应商电话
+
+
+
+
+
+
+ 供应商分类
+
+
+
+ {{formData.type_name||'请选择店铺类型'}}
+
+
+
+
+
+
+ 供应商位置
+
+
+
+ {{formData.storeAddress||'点击获取当前位置'}}
+
+
+
+
+
+ {{ formData.long?formData.long+','+formData.lat:'点击获取当前位置'}}
+
+
+
+
+
+
+
+
+
+ 上传和拍摄照片，系统自动识别
+
+
+ 请上传真实的营业执照
+
+
+
+
+
+
+ 上传图片
+
+
+
+
+
+
+ 营业执照详情
+
+
+
+
+ 详细地址
+
+
+
+
+
+
+ 公司名称
+
+
+
+
+
+
+ 法人名称
+
+
+
+
+
+
+ 社会信用代码
+
+
+
+
+
+
+
+
+
+
+ 店铺等待审核
+
+
+
+
+
+
+ {{successData.mer_name}}
+ 等待审核
+ 审核通过
+ 审核失败
+
+
+ 提交时间：{{successData.create_time}}
+
+
+
+ 备注：{{successData.mark}}
+
+
+
+
+
+
+
+
+
+
+ 《入驻协议》
+
+
+
+
+
+ 返回上一步
+
+
+
+
+
+
+
+
+
+
+
+
+
+ '商户入驻协议'
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/bindSupplier/index.vue b/pages/bindSupplier/index.vue
index 9242a98..9110aba 100644
--- a/pages/bindSupplier/index.vue
+++ b/pages/bindSupplier/index.vue
@@ -81,7 +81,7 @@
- {{formData.storeAddress||'点击获取当前位置'}}
+ {{formData.mer_address||'点击获取当前位置'}}
@@ -320,14 +320,13 @@
"merchant_category_name": "",
"mer_type_id": 0,
"mer_storeType": "",
- province_name: "",
+ city_name: "",
+ area_name: "",
mer_intention_id: "",
- storeAddress: "",
+ mer_address: "",
"images": [],
is_merchant_type: 2,
- // #ifdef APP
- jg_register_id: uni.getStorageSync('jg_id')
- // #endif
+ jg_register_id: uni.getStorageSync('jg_id') || ''
}
}
},
@@ -357,7 +356,6 @@
this.showMerchantCategoryPicker = false
},
confirmType(e) {
- console.log(e.value)
this.formData.type_id = e.value[0].id
this.formData.type_name = e.value[0].name
this.showStoreType = false
@@ -398,7 +396,6 @@
that.formData.company_nickname = res.data.legal_person;
that.formData.social_credit_code = res.data.register_number;
that.formData.company_name = res.data.name;
- console.log(this.formData)
} else {
that.$util.Tips({
title: "识别失败!"
@@ -422,13 +419,13 @@
this.formData[key] = res.data[key]
}
this.formData.phone = res.data.service_phone
- console.log(JSON.parse(res.data.data_json))
let obj = JSON.parse(res.data.data_json)
this.formData.images = [obj.images]
this.formData.company_nickname = obj.company_nickname
this.formData.company_name = obj.company_name
this.formData.address = obj.company_address
this.formData.social_credit_code = obj.social_credit_code
+ console.log(res.data)
})
this.step = 1
@@ -446,8 +443,6 @@
title: '获取定位中',
mask: true
});
- // uni.show
-
// #ifndef APP-PLUS
uni.getLocation({
type: 'wgs84 ',
@@ -460,7 +455,6 @@
uni.hideLoading()
},
});
-
// #endif
// #ifdef APP-PLUS
uni.getLocation({
@@ -469,7 +463,9 @@
success: (res) => {
this.formData.long = res.longitude
this.formData.lat = res.latitude
- this.formData.storeAddress = res.address.city + res.address.district + res.address
+ this.formData.city_name = res.address.city
+ this.formData.area_name = res.address.district
+ this.formData.mer_address = res.address.city + res.address.district + res.address
.street + res.address.streetNum
uni.hideLoading()
},
@@ -487,10 +483,10 @@
delete this.formData.data_json
}
this.formData.is_merchant_type = 2
- console.log(this.formData)
applysApi({
...this.formData
}).then(ress => {
+ console.log('ress', ress)
this.getSuccessData()
}).catch(err => {
console.log(err)
diff --git a/pages/helpPeople/helpPeople.vue b/pages/helpPeople/helpPeople.vue
index d43efbb..e0043bc 100644
--- a/pages/helpPeople/helpPeople.vue
+++ b/pages/helpPeople/helpPeople.vue
@@ -32,6 +32,13 @@
我是供应商
+
+
+
+ 我是经销商
+
+
@@ -54,6 +61,8 @@
navSw(url, isNewStoreType) {
if (isNewStoreType == 1) uni.setStorageSync('newStore', true);
if (isNewStoreType == 2) uni.setStorageSync('newSupplier', true);
+ if (isNewStoreType == 3) uni.setStorageSync('newDistribution', true);
+ console.log(uni.getStorageSync('newSupplier'), uni.getStorageSync('newDistribution'))
uni.switchTab({
url: url
})
@@ -71,7 +80,7 @@
.box {
width: 750rpx;
- height: 100vh;
+ min-height: 100vh;
background-image: url(https://lihai001.oss-cn-chengdu.aliyuncs.com/def/1333d202402261025145680.webp);
background-repeat: no-repeat;
background-size: 100% auto;
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 671ea6b..52af8c7 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -654,6 +654,7 @@
this.isSupplierFn() /*获取供应商toke*/
this.openNewMerDiver() /*新商户入驻商户引导页*/
this.openNewSuppierDiver() /*新供应商入驻商户引导页*/
+ this.openNewDistrDiver() /*新经销商入驻商户引导页*/
if (that.appUpdate.openUpgrade == '1') {
that.alertAppUpdate();
}
@@ -760,6 +761,21 @@
}
});
},
+ /* 新供应商入驻引导页*/
+ openNewDistrDiver() {
+ let isNewSupplire = Boolean(uni.getStorageSync('newDistribution'));
+ if (!isNewSupplire) return;
+ this.subNvue = uni.getSubNVueById('distr')
+ this.subNvue.show('slide-in-left', 300)
+ uni.$on('offSubnvue', () => {
+ this.subNvue.hide('slide-out-left')
+ if (uni.getStorageSync("newDistribution")) {
+ uni.switchTab({
+ url: '/pages/user/index'
+ })
+ }
+ });
+ },
loadCoupon() {
if (!this.showCoupon && !uni.getStorageSync('show_coupon') && uni.getStorageSync('is_new_user')) {
diff --git a/pages/index/subnvue/distr.nvue b/pages/index/subnvue/distr.nvue
new file mode 100644
index 0000000..5db7d17
--- /dev/null
+++ b/pages/index/subnvue/distr.nvue
@@ -0,0 +1,161 @@
+
+
+
+ 跳过
+
+
+ 下一步(1/2)
+
+
+
+
+ 点击我的页面，进行经销商户入驻
+
+
+
+
+
+
+
+
+ 我的
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/user/index.vue b/pages/user/index.vue
index d40537b..dd2a05d 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -180,7 +180,8 @@
-
+
{{item.name}}
@@ -491,6 +492,7 @@
this.isSupplierFn()
// #ifdef APP-PLUS
this.openDiver()
+ this.openDistrDiver()
setTimeout(() => {
const query = uni.createSelectorQuery().in(this);
query
@@ -563,6 +565,26 @@
.exec();
}, 800)
},
+ /*新经销商入驻引导页*/
+ openDistrDiver() {
+ let isNewSupplier = Boolean(uni.getStorageSync('newDistribution'));
+ if (!isNewSupplier) return;
+ let that = this
+ this.subNvue = uni.getSubNVueById('userDistr')
+ uni.$on('offnewSupplierSubnvue', () => {
+ this.subNvue.hide('slide-out-right');
+ })
+ setTimeout(() => {
+ that.subNvue.show('slide-in-left', 300)
+ const query = uni.createSelectorQuery().in(this);
+ query
+ .select('.targets1440')
+ .boundingClientRect((data) => {
+ uni.$emit('openSupplierSubnvue', (data))
+ })
+ .exec();
+ }, 800)
+ },
authTo(url) {
if (this.isLogin) {
diff --git a/pages/user/subnvue/userDistr.nvue b/pages/user/subnvue/userDistr.nvue
new file mode 100644
index 0000000..5adee48
--- /dev/null
+++ b/pages/user/subnvue/userDistr.nvue
@@ -0,0 +1,166 @@
+
+
+
+ 跳过
+
+
+ 我知道了
+
+
+
+ 经销入驻
+
+
+
+
+
+
+
+ 点击我的页面，进行经销商入驻
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file