Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product

yudao-ui-app/main.js

@@ -18,32 +18,32 @@ import { parseQuery } from "./utils";
 import Auth from './libs/wechat';
 import { SPREAD } from './config/cache';
 Vue.prototype.$wechat = Auth;
-let cookieName = "VCONSOLE",
-	query = parseQuery(),
-	urlSpread = query["spread"],
-	vconsole = query[cookieName.toLowerCase()],
-	md5Crmeb = "b14d1e9baeced9bb7525ab19ee35f2d2", //CRMEB MD5 加密开启vconsole模式
-	md5UnCrmeb = "3dca2162c4e101b7656793a1af20295c"; //UN_CREMB MD5 加密关闭vconsole模式
+// let cookieName = "VCONSOLE",
+// 	query = parseQuery(),
+// 	urlSpread = query["spread"],
+// 	// vconsole = query[cookieName.toLowerCase()],
+// 	vconsole = "b14d1e9baeced9bb7525ab19ee35f2d2",
+// 	md5Crmeb = "b14d1e9baeced9bb7525ab19ee35f2d2", //CRMEB MD5 加密开启vconsole模式
+// 	md5UnCrmeb = "3dca2162c4e101b7656793a1af20295c"; //UN_CREMB MD5 加密关闭vconsole模式
 
-if (urlSpread !== undefined) {
-	var spread = Cache.get(SPREAD);
-	urlSpread = parseInt(urlSpread);
-	if (!Number.isNaN(urlSpread) && spread !== urlSpread) {
-		Cache.set("spread", urlSpread || 0);
-	} else if (spread === 0 || typeof spread !== "number") {
-		Cache.set("spread", urlSpread || 0);
-	}
-}
+// if (urlSpread !== undefined) {
+// 	var spread = Cache.get(SPREAD);
+// 	urlSpread = parseInt(urlSpread);
+// 	if (!Number.isNaN(urlSpread) && spread !== urlSpread) {
+// 		Cache.set("spread", urlSpread || 0);
+// 	} else if (spread === 0 || typeof spread !== "number") {
+// 		Cache.set("spread", urlSpread || 0);
+// 	}
+// }
 
-if (vconsole !== undefined) {
-  if (vconsole === md5UnCrmeb && Cache.has(cookieName))
-	  Cache.clear(cookieName);
-} else vconsole = Cache.get(cookieName);
+// if (vconsole !== undefined) {
+//   if (vconsole === md5UnCrmeb && Cache.has(cookieName))
+// 	  Cache.clear(cookieName);
+// } else vconsole = Cache.get(cookieName);
 
 import VConsole from './components/vconsole.min.js'
 
-if (vconsole !== undefined && vconsole === md5Crmeb) {
-	Cache.set(cookieName, md5Crmeb, 3600);
+if (process.env.isVConsole) {
 	let vConsole = new VConsole();
 }
 

yudao-ui-app/package.json

@@ -20,6 +20,7 @@
         "title": "开发版",
         "env": {
           "UNI_PLATFORM": "h5",
+          "isVConsole": true,
           "APP_BASE_URL": "http://192.168.1.147:48080"
         }
       },
@@ -27,6 +28,7 @@
         "title": "生产版",
         "env": {
           "UNI_PLATFORM": "h5",
+          "isVConsole": false,
           "APP_BASE_URL": "http://api.cyywl.top"
         }
       }

yudao-ui-app/pages/index/index.vue

@@ -644,7 +644,9 @@
 			// 获取H5 搜索框高度
 			let appSearchH = uni.createSelectorQuery().select(".serch-wrapper");
 			appSearchH.boundingClientRect(function(data) {
-				self.searchH = data.height
+        if(data){
+          self.searchH = data.height
+        }
 			}).exec()
 			// #endif
 		},