mall https

mall/src/App.vue

@@ -20,15 +20,15 @@
 			uni.setStorageSync('account', extConfig.account)
 			// #endif
 			// 开发
-			if (process.env.NODE_ENV == 'development') {
-				if (this.$constant.source == 'business') {
-					uni.setStorageSync('token', 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiIsImp0aSI6IjBfNyJ9.eyJpc3MiOiJodHRwczpcL1wvYXBpLmIuaHVhbWwuY29tIiwiYXVkIjoiaHR0cHM6XC9cL2FwaS5iLmh1YW1sLmNvbSIsImp0aSI6IjBfNyIsImlhdCI6MTU4MjAyOTY2MywibmJmIjoxNTgyMDI5NjYzLCJleHAiOjE1OTA2Njk2NjMsInVuaXF1ZUlkIjoiNyIsInNvdXJjZUlkIjowfQ.v04WwuiNYArwrCzERY--uB3mWx4r2Za2R0chdjdTZF4')
-					uni.setStorageSync('account', '12362')
-				} else {
-					uni.setStorageSync('token', 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiIsImp0aSI6IjBfMTI1NDM3NDUifQ.eyJpc3MiOiJodHRwOlwvXC9hcGkubS5odWFtbC5jb20iLCJhdWQiOiJodHRwOlwvXC9hcGkubS5odWFtbC5jb20iLCJqdGkiOiIwXzEyNTQzNzQ1IiwiaWF0IjoxNTgyNDY5NDIzLCJuYmYiOjE1ODI0Njk0MjMsImV4cCI6MTU5MTEwOTQyMywidW5pcXVlSWQiOiIxMjU0Mzc0NSIsInNvdXJjZUlkIjowfQ.ebTPvzLj4aI8F4iLHy_UdsVlAI-KyzErGQbJhPL1YRY')
-					uni.setStorageSync('account', '12362')
-				}
-			}
+			// if (process.env.NODE_ENV == 'development') {
+			// 	if (this.$constant.source == 'business') {
+			// 		uni.setStorageSync('token', 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiIsImp0aSI6IjBfNyJ9.eyJpc3MiOiJodHRwczpcL1wvYXBpLmIuaHVhbWwuY29tIiwiYXVkIjoiaHR0cHM6XC9cL2FwaS5iLmh1YW1sLmNvbSIsImp0aSI6IjBfNyIsImlhdCI6MTU4MjAyOTY2MywibmJmIjoxNTgyMDI5NjYzLCJleHAiOjE1OTA2Njk2NjMsInVuaXF1ZUlkIjoiNyIsInNvdXJjZUlkIjowfQ.v04WwuiNYArwrCzERY--uB3mWx4r2Za2R0chdjdTZF4')
+			// 		uni.setStorageSync('account', '12362')
+			// 	} else {
+			// 		uni.setStorageSync('token', 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiIsImp0aSI6IjBfMTI1NDM3NDUifQ.eyJpc3MiOiJodHRwOlwvXC9hcGkubS5odWFtbC5jb20iLCJhdWQiOiJodHRwOlwvXC9hcGkubS5odWFtbC5jb20iLCJqdGkiOiIwXzEyNTQzNzQ1IiwiaWF0IjoxNTgyNDY5NDIzLCJuYmYiOjE1ODI0Njk0MjMsImV4cCI6MTU5MTEwOTQyMywidW5pcXVlSWQiOiIxMjU0Mzc0NSIsInNvdXJjZUlkIjowfQ.ebTPvzLj4aI8F4iLHy_UdsVlAI-KyzErGQbJhPL1YRY')
+			// 		uni.setStorageSync('account', '12362')
+			// 	}
+			// }
 		},
 		onShow() {
 			// this.isLogin()

mall/src/constant/index.js

@@ -23,40 +23,15 @@ const envVal = {
 }
 
 // 项目配置
-if (ProjectName == 'mobile') {
-	// #ifdef H5
-	envVal.formal = process.env.NODE_ENV == 'development' ? 'http://mall.huaml.com' : `${window.location.protocol}//${window.location.host}`
-	envVal.hostUrl = process.env.NODE_ENV == 'development' ? `http://api.mall.huaml.com` : `${window.location.protocol}//api.${window.location.host}`
-	// #endif
-	// #ifdef MP-WEIXIN
-	envVal.formal = process.env.NODE_ENV == 'development' ? extConfig.apiHost : extConfig.apiHost
-	envVal.hostUrl = process.env.NODE_ENV == 'development' ? extConfig.apiHost : extConfig.apiHost
-	// #endif
-
-	// uni.setStorageSync('source', 'mobile')
-} else if (ProjectName == 'business') {
-	// #ifdef H5
-	envVal.formal = process.env.NODE_ENV == 'development' ? 'http://shop.huaml.com' : `${window.location.protocol}//${window.location.host}`
-	envVal.hostUrl = process.env.NODE_ENV == 'development' ? `http://api.shop.huaml.com` : `${window.location.protocol}//api.${window.location.host}`
-	// #endif
-	// #ifndef H5
-	envVal.formal = process.env.NODE_ENV == 'development' ? 'http://shop.huaml.com' : `https://shop.huaml.com`
-	envVal.hostUrl = process.env.NODE_ENV == 'development' ? `http://api.shop.huaml.com` : `https://api.shop.huaml.com`
-	// #endif
 
-	// uni.setStorageSync('source', 'business')
-} else {
-	// #ifdef H5
-	envVal.formal = process.env.NODE_ENV == 'development' ? 'http://mall.huaml.com' : `${window.location.protocol}//${window.location.host}`
-	envVal.hostUrl = process.env.NODE_ENV == 'development' ? `http://api.mall.huaml.com` : `${window.location.protocol}//api.w.${getFirstHost()}.com`
-	// #endif
-	// #ifndef H5
-	envVal.formal = process.env.NODE_ENV == 'development' ? 'http://mall.huaml.com' : `https://mall.huaml.com`
-	envVal.hostUrl = process.env.NODE_ENV == 'development' ? `http://api.mall.huaml.com` : `https://api.mall.huaml.com`
-	// #endif
-}
-
-console.log(envVal)
+// #ifdef H5
+envVal.formal = process.env.NODE_ENV == 'development' ? 'https://mall.huaml.com' : `${window.location.protocol}//${window.location.host}`
+envVal.hostUrl = process.env.NODE_ENV == 'development' ? `https://api.mall.huaml.com` : `${window.location.protocol}//api.${window.location.host}`
+// #endif
+// #ifdef MP-WEIXIN
+envVal.formal = process.env.NODE_ENV == 'development' ? extConfig.apiHost : extConfig.apiHost
+envVal.hostUrl = process.env.NODE_ENV == 'development' ? extConfig.apiHost : extConfig.apiHost
+// #endif
 
 function getFirstHost() {
 	let host = ''

mall/src/ext.json

@@ -3,7 +3,7 @@
     "extAppid": "wxe41bd5816affd0ba",
     "directCommit": false,
     "ext": {
-      "account": 12362,
+      "account": 12358,
       "apiHost": "https://api.mall.huaml.com",
       "imgHost": "https://img.huaml.com",
       "merchantName":"中花卉"