add

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);
 }

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'
 }

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 @@
 			}
 		}
 	}
-}
+}

pages.json

@@ -93,7 +93,13 @@
 				"navigationBarTitleText": "账户绑定"
 			}
 		},
-
+		{
+			"path": "pages/bindSupplier/index",
+			"style": {
+				"enablePullDownRefresh": false,
+				"navigationBarTitleText": "供应商入驻"
+			}
+		},
 		{
 			"path": "pages/gather/gather",
 			"style": {

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));