diff --git a/api/supplier.js b/api/supplier.js
index 4f26d84..b013f89 100644
--- a/api/supplier.js
+++ b/api/supplier.js
@@ -34,4 +34,13 @@ export const OpurchaseGoodsOfferApi = (data) => {
export const aboutUsApi = (data) => {
return request.post('operation/OpurchaseGoodsOffer/offer', data);
+}
+
+
+export const applysApi = (data) => {
+ return request.post('shop/index/apply', data);
+}
+
+export const merchatTypeApi = (data) => {
+ return request.get('shop/index/merchat_type', data);
}
\ No newline at end of file
diff --git a/config/app.js b/config/app.js
index fec7d0c..13ede59 100644
--- a/config/app.js
+++ b/config/app.js
@@ -29,13 +29,14 @@ switch (env) {
case 'prew':
httpApi = 'https://test.shop.lihaink.cn' //预发布环境
httpSix = 'https://ceshi-new-wokr.lihaink.cn'
- httpTwo = 'https://erp.lihaink.cn'
+ httpTwo = 'http://192.168.1.22:8546'
wsApi = 'wss://test.shop.lihaink.cn'
break;
default:
httpApi = "https://crmeb-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.22:8546'
// wsApi = 'ws://192.168.1.22:8324'
wsApi = 'wss://crmeb-test.shop.lihaink.cn'
}
diff --git a/manifest.json b/manifest.json
index aec1b5c..7a44b01 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name": "惠农生活",
"appid": "__UNI__3A527D1",
"description": "",
- "versionName": "2.0.53",
- "versionCode": 2053,
+ "versionName": "2.0.55",
+ "versionCode": 2055,
"transformPx": false,
/* 5+App特有相关 */
"app-plus": {
@@ -350,4 +350,4 @@
}
}
}
-}
+}
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 987c2dc..632eb60 100644
--- a/pages.json
+++ b/pages.json
@@ -93,7 +93,13 @@
"navigationBarTitleText": "账户绑定"
}
},
-
+ {
+ "path": "pages/bindSupplier/index",
+ "style": {
+ "enablePullDownRefresh": false,
+ "navigationBarTitleText": "供应商入驻"
+ }
+ },
{
"path": "pages/gather/gather",
"style": {
diff --git a/pages/bindSupplier/index.vue b/pages/bindSupplier/index.vue
new file mode 100644
index 0000000..0d88038
--- /dev/null
+++ b/pages/bindSupplier/index.vue
@@ -0,0 +1,1366 @@
+
+
+
+
+
+
+
+
+ 商户入住
+
+
+ 申请记录
+
+
+
+
+
+
+
+ 简单3步 商户入驻
+
+
+
+
+ 1
+
+
+ 添加店铺
+
+
+
+
+
+ 2
+
+
+ 资质认证
+
+
+
+
+
+ 3
+
+
+ 入驻审核
+
+
+
+
+
+
+
+
+ 商户名称
+
+
+
+
+
+
+ 商户电话
+
+
+
+
+
+
+ 商户分类
+
+
+
+ {{formData.type_name||'请选择店铺类型'}}
+
+
+
+
+
+
+ 商户位置
+
+
+ {{formData.storeAddress||'点击获取当前位置'}}
+
+
+
+
+
+
+
+
+ 请上传营业执照
+
+
+
+
+
+
+ 上传图片
+
+
+
+
+
+
+ 店铺资质
+
+
+
+
+ 详细地址
+
+
+
+
+
+
+ 公司名称
+
+
+
+
+
+
+ 法人名称
+
+
+
+
+
+
+ 社会信用代码
+
+
+
+
+
+
+
+
+
+
+
+ 店铺等待审核
+
+
+ 店铺已提交入驻申请
+
+
+
+ {{formData.mer_name}}
+ 等待审核
+ 审核通过
+ 审核失败
+
+
+ 提交时间：{{formData.create_time}}
+
+
+
+ 备注：{{formData.fail_msg}}
+
+
+
+ 可以登录我们的工作台，把您的商品推向市场了
+
+
+
+
+
+
+
+
+
+
+ 《入驻协议》
+
+
+
+
+
+ 返回上一步
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ '商户入驻协议'
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/utils/requestSupplier.js b/utils/requestSupplier.js
index 9a026b4..da02383 100644
--- a/utils/requestSupplier.js
+++ b/utils/requestSupplier.js
@@ -10,7 +10,7 @@
import {
HTTP_REQUEST_URL_TWO,
HEADER,
-
+ TOKENNAME
} from '@/config/app';
import {
checkLogin
@@ -18,14 +18,12 @@ import {
import store from '../store';
import pako from '../plugin/pako/pako.es5.min.js'
-let TOKENNAME = 'Token'
+// let TOKENNAME = 'Token'
function toLogin() {
}
-console.log(HTTP_REQUEST_URL_TWO, 'HTTP_REQUEST_URL_TWO')
-
function decompress(str) {
return pako.inflateRaw(base64ToUint8Array(str), {
to: 'string'
@@ -93,6 +91,10 @@ function baseRequest(url, method, data, {
header: header,
data: data || {},
success: (res) => {
+ if (res.data.code == 1) {
+ reslove(res.data, res);
+ }
+
if (res.data && res.data.encode) {
try {
res.data = JSON.parse(decompress(res.data.data));