Merge branch 'product_dev' of http://code.mayi888.com/chengmo/mayi-mp-shop into product_dev

project.config.json

@@ -2,13 +2,17 @@
 	"description": "项目配置文件。",
 	"setting": {
 		"urlCheck": false,
-		"es6": false,
+		"es6": true,
+		"enhance": true,
 		"postcss": true,
 		"minified": true,
 		"newFeature": true,
 		"coverView": true,
-		"nodeModules": false,
+		"nodeModules": true,
 		"autoAudits": true,
+		"showShadowRootInWxmlPanel": true,
+		"scopeDataCheck": false,
+		"uglifyFileName": true,
 		"checkInvalidKey": true,
 		"checkSiteMap": true,
 		"uploadWithSourceMap": true,
@@ -16,11 +20,14 @@
 			"ignore": [],
 			"disablePlugins": [],
 			"outputPath": ""
-		}
+		},
+		"bundle": true,
+		"useCompilerModule": true,
+		"userConfirmedUseCompilerModuleSwitch": false
 	},
 	"miniprogramRoot": "dist/wx/",
 	"compileType": "miniprogram",
-	"appid": "wxdec983ee91e2422a",
+	"appid": "wxae95a07ffdf11548",
 	"projectname": "mayi-mp-shop",
 	"simulatorType": "wechat",
 	"simulatorPluginLibVersion": {},

src/pages/index/index.vue

@@ -201,6 +201,8 @@ export default {
           // }else if(querys.length == 3){
           //   this.params += `&orderSn=${querys[1]}&userId=${querys[2]}`
           // }
+        }else if (querys[0] == 'redeemCode') {//兑换码
+          this.page = `/personalCenter/CDkey/exchange`;
         }
       }
       console.log(querys, "scene");