修改微信小程序端编译不过的问题

App.vue

@@ -28,6 +28,28 @@ export default {
         }
       }
     })
+	
+	var project = "";
+	// #ifdef H5
+	var fullUrl = window.location.search;
+	  if (fullUrl.indexOf("?") != -1) {
+		fullUrl = fullUrl.substring(1);
+		var paramStrs = fullUrl.split("&");
+		for(let i=0;i<paramStrs.length;i++){
+		  const newStrs = paramStrs[i].split("=");
+		  if(newStrs[0] === 'project'){
+			project = newStrs[1]
+			break;
+		  }
+		}
+	  }
+	// #endif
+	if(!project){
+		project = API.defaultProject;
+	}
+	console.log("project:" + project)
+	uni.setStorageSync("project", project);
+	
     // 购物车右上角数量
 		if(uni.getStorageSync('storage_key')){
 			NET.request(API.ShoppingCart, {}, 'GET').then(resCart => {

components/canvasShow/config/mixin/server.js

@@ -37,22 +37,26 @@ service.interceptors.request.use(config => {
   }
   config.headers['language'] =  locale
   
-  var fullUrl = window.location.search;
- 
+ var project = "";
+ // #ifdef H5
+ var fullUrl = window.location.search;
    if (fullUrl.indexOf("?") != -1) {
      fullUrl = fullUrl.substring(1);
      var paramStrs = fullUrl.split("&");
      for(let i=0;i<paramStrs.length;i++){
        const newStrs = paramStrs[i].split("=");
        if(newStrs[0] === 'project'){
-         config.headers['project'] = newStrs[1]
+         project = newStrs[1]
          break;
        }
      }
    }
-   if(config.headers['project'] == undefined || config.headers['project']== ''){
-   		config.headers['project'] = '0'
-   }
+ // #endif
+ if(!project){
+ 	project = uni.getStorageSync('project');
+ }
+ config.headers['project'] = project
+
    
   return config
 }, error => {

config/api.js

@@ -1,3 +1,6 @@
+//默认打开商家
+const default_project = 4
+
 // const DOMAIN_PREFIX = 'http://127.0.0.1:9007'
 const DOMAIN_PREFIX = 'http://36.138.125.206:8081/ceres-app-api'
 // const DOMAIN_PREFIX = 'https://http://36.138.125.206:8081/ceres-local-filehnthee.com/ceres-app-api'
@@ -21,6 +24,7 @@ const TERMINAL = 1
 // #endif
 
 module.exports = {
+	defaultProject:default_project,
 	terminal: TERMINAL, // 画布设备 1 小程序，2 H5，3 App 4 电脑
 	SettledMerchantPrefix: DOMAIN_PREFIX.replace('ceres-app-api', "ceres-settled-merchant/"), //商家入驻链接
 	shareLink: DOMAIN_PREFIX + '/ceres-h5/', // 分享地址

config/requestApi.js

@@ -1,5 +1,4 @@
 import { hideLoading, showLoading } from "../utils/plugIn/globalLoading.js";
-
 /**
  * @FileDescription:
  * @Author: kahu
@@ -21,21 +20,25 @@ export function doPointRequest(data){
             header['Authorization'] = token
         }
 		
-		 var fullUrl = window.location.search;
+		var project = "";
+		// #ifdef H5
+		var fullUrl = window.location.search;
 		  if (fullUrl.indexOf("?") != -1) {
 		    fullUrl = fullUrl.substring(1);
 		    var paramStrs = fullUrl.split("&");
 		    for(let i=0;i<paramStrs.length;i++){
 		      const newStrs = paramStrs[i].split("=");
 		      if(newStrs[0] === 'project'){
-		        header['project'] = newStrs[1]
-		        return config
+		        project = newStrs[1]
+		        break;
 		      }
 		    }
-		    header['project'] = '0'
-		  }else{
-		    header['project'] = '0'
 		  }
+		// #endif
+		if(!project){
+			project = uni.getStorageSync('project');
+		}
+		header['project'] = project
 		  
         uni.request({
             url: API.doPointer,

main.js

@@ -35,7 +35,7 @@ App.mpType = 'app'
 import VueI18n from 'vue-i18n'
 Vue.use(VueI18n)
 const i18n = new VueI18n(i18nConfig)
-window.i18n = i18n;
+// window.i18n = i18n;
 
 
 const app = new Vue({

pages.json

@@ -661,7 +661,7 @@
 		}
 	},
 	"tabBar": {
-		"borderStyle": "#00000000",
+		"borderStyle": "white",
 		"backgroundColor": "#fff",
 		"color": "#CCCCCC",
 		"selectedColor": "#333333",

utils/request.js

@@ -1,4 +1,6 @@
 import {showLoading,hideLoading} from "./plugIn/globalLoading";
+
+
 const request = (url, data, method = 'GET') => {
 	return new Promise((resolve, reject) => {
 		let header = {
@@ -9,22 +11,26 @@ const request = (url, data, method = 'GET') => {
 		if (token) {
 			header['Authorization'] = token
 		}
-		
+		var project = "";
+		// #ifdef H5
 		var fullUrl = window.location.search;
-		 if (fullUrl.indexOf("?") != -1) {
-		   fullUrl = fullUrl.substring(1);
-		   var paramStrs = fullUrl.split("&");
-		   for(let i=0;i<paramStrs.length;i++){
-		     const newStrs = paramStrs[i].split("=");
-		     if(newStrs[0] === 'project'){
-		       header['project'] = newStrs[1]
-			   break;
-		     }
-		   }
-		 }
-		 if(header['project'] == undefined || header['project']== ''){
-			 header['project'] = '0'
-		 }
+		  if (fullUrl.indexOf("?") != -1) {
+		    fullUrl = fullUrl.substring(1);
+		    var paramStrs = fullUrl.split("&");
+		    for(let i=0;i<paramStrs.length;i++){
+		      const newStrs = paramStrs[i].split("=");
+		      if(newStrs[0] === 'project'){
+		        project = newStrs[1]
+		        break;
+		      }
+		    }
+		  }
+		// #endif
+		if(!project){
+			project = uni.getStorageSync('project');
+		}
+		header['project'] = project
+		
 		var locale =  uni.getLocale() || 'zh'
 		if(locale == 'zh-Hans'){
 			locale = 'zh'