Commit 837199b6 by 李嘉林

行为收集、url解析

parent e3590aad
...@@ -40,6 +40,15 @@ module.exports = merge(baseWebpackConfig, { ...@@ -40,6 +40,15 @@ module.exports = merge(baseWebpackConfig, {
new webpack.DefinePlugin({ new webpack.DefinePlugin({
'process.env': config.dev.env 'process.env': config.dev.env
}), }),
// new webpack.LoaderOptionsPlugin({
// // test: /\.js/,
// // options: {
// // optimization: {
// // usedExports: true
// // },
// // }
// minimize: true,
// }),
// copy from ./webpack.prod.conf.js // copy from ./webpack.prod.conf.js
// extract css into its own file // extract css into its own file
......
...@@ -27,7 +27,8 @@ module.exports = merge(prodEnv, {//zjgyl ...@@ -27,7 +27,8 @@ module.exports = merge(prodEnv, {//zjgyl
POSTHOG_KEY: '"phc_nTr1oY7NkSuDMZsqCskE6iUIGKgWPmFHlRAKFVuZD2B"', POSTHOG_KEY: '"phc_nTr1oY7NkSuDMZsqCskE6iUIGKgWPmFHlRAKFVuZD2B"',
POSTHOG_HOST: '"https://posthog.mayi118.com"', POSTHOG_HOST: '"https://posthog.mayi118.com"',
AREA_JSON: '"https://mayi-newshop.oss-cn-shanghai.aliyuncs.com/static/js/app.area.json"', AREA_JSON: '"https://mayi-newshop.oss-cn-shanghai.aliyuncs.com/static/js/app.area.json"',
WLY_PROD_MARKETING: '"https://uat-zanmall-m.cipmp.com"' WLY_PROD_MARKETING: '"https://uat-zanmall-m.cipmp.com"',
MANALYTICS_HOST: '"https://analytics.mayi888.cn/ma.gif"',
// IMG_DOMAIN: '"http://cdn.mayi888.com"', // IMG_DOMAIN: '"http://cdn.mayi888.com"',
}) })
...@@ -10,6 +10,7 @@ module.exports = { ...@@ -10,6 +10,7 @@ module.exports = {
IMG_DOMAIN: '"https://mayi-newshop.oss-cn-shanghai.aliyuncs.com"', IMG_DOMAIN: '"https://mayi-newshop.oss-cn-shanghai.aliyuncs.com"',
POSTHOG_KEY: '"phc_nTr1oY7NkSuDMZsqCskE6iUIGKgWPmFHlRAKFVuZD2B"', POSTHOG_KEY: '"phc_nTr1oY7NkSuDMZsqCskE6iUIGKgWPmFHlRAKFVuZD2B"',
POSTHOG_HOST: '"https://posthog.mayi118.com"', POSTHOG_HOST: '"https://posthog.mayi118.com"',
AREA_JSON: '"https://mayi-newshop.oss-cn-shanghai.aliyuncs.com/static/js/app.area.json"' AREA_JSON: '"https://mayi-newshop.oss-cn-shanghai.aliyuncs.com/static/js/app.area.json"',
MANALYTICS_HOST: '"https://analytics.mayi888.com/ma.gif"',
// IMG_DOMAIN: '"http://cdn.mayi888.com"' // IMG_DOMAIN: '"http://cdn.mayi888.com"'
} }
...@@ -27,7 +27,8 @@ module.exports = merge(prodEnv, {//zjgyl ...@@ -27,7 +27,8 @@ module.exports = merge(prodEnv, {//zjgyl
POSTHOG_KEY: '"phc_nTr1oY7NkSuDMZsqCskE6iUIGKgWPmFHlRAKFVuZD2B"', POSTHOG_KEY: '"phc_nTr1oY7NkSuDMZsqCskE6iUIGKgWPmFHlRAKFVuZD2B"',
POSTHOG_HOST: '"https://posthog.mayi118.com"', POSTHOG_HOST: '"https://posthog.mayi118.com"',
AREA_JSON: '"https://new-xhyx-uat.oss-cn-zhangjiakou.aliyuncs.com/public/json/f7746156-6329-4130-b724-eda06215ddea.json"', AREA_JSON: '"https://new-xhyx-uat.oss-cn-zhangjiakou.aliyuncs.com/public/json/f7746156-6329-4130-b724-eda06215ddea.json"',
WLY_PROD_MARKETING: '"https://swt.wuliangye.com.cn:1443/marketing"' WLY_PROD_MARKETING: '"https://swt.wuliangye.com.cn:1443/marketing"',
MANALYTICS_HOST: '""',
// IMG_DOMAIN: '"http://cdn.mayi888.com"', // IMG_DOMAIN: '"http://cdn.mayi888.com"',
}) })
...@@ -25,7 +25,8 @@ module.exports = merge(prodEnv, {//zjgyl ...@@ -25,7 +25,8 @@ module.exports = merge(prodEnv, {//zjgyl
// OLSHOP_URL:'"https://shop.mayi888.com/innerApi/shopApiService"', // OLSHOP_URL:'"https://shop.mayi888.com/innerApi/shopApiService"',
IMG_DOMAIN: '"http://new-xhyx.oss-cn-zhangjiakou.aliyuncs.com"', IMG_DOMAIN: '"http://new-xhyx.oss-cn-zhangjiakou.aliyuncs.com"',
POSTHOG_KEY: '"phc_nTr1oY7NkSuDMZsqCskE6iUIGKgWPmFHlRAKFVuZD2B"', POSTHOG_KEY: '"phc_nTr1oY7NkSuDMZsqCskE6iUIGKgWPmFHlRAKFVuZD2B"',
POSTHOG_HOST: '"https://posthog.mayi118.com"' POSTHOG_HOST: '"https://posthog.mayi118.com"',
MANALYTICS_HOST: '"http://uat.bi.xinhuabest.com/log/xinhua.gif"',
// IMG_DOMAIN: '"http://cdn.mayi888.com"', // IMG_DOMAIN: '"http://cdn.mayi888.com"',
}) })
...@@ -26,7 +26,8 @@ module.exports = merge(prodEnv, {//zjgyl ...@@ -26,7 +26,8 @@ module.exports = merge(prodEnv, {//zjgyl
IMG_DOMAIN: '"http://new-xhyx-uat.oss-cn-zhangjiakou.aliyuncs.com"', IMG_DOMAIN: '"http://new-xhyx-uat.oss-cn-zhangjiakou.aliyuncs.com"',
POSTHOG_KEY: '"phc_nTr1oY7NkSuDMZsqCskE6iUIGKgWPmFHlRAKFVuZD2B"', POSTHOG_KEY: '"phc_nTr1oY7NkSuDMZsqCskE6iUIGKgWPmFHlRAKFVuZD2B"',
POSTHOG_HOST: '"https://posthog.mayi118.com"', POSTHOG_HOST: '"https://posthog.mayi118.com"',
AREA_JSON: '"https://new-xhyx-uat.oss-cn-zhangjiakou.aliyuncs.com/public/json/f7746156-6329-4130-b724-eda06215ddea.json"' AREA_JSON: '"https://new-xhyx-uat.oss-cn-zhangjiakou.aliyuncs.com/public/json/f7746156-6329-4130-b724-eda06215ddea.json"',
MANALYTICS_HOST: '"http://uat.bi.xinhuabest.com/log/xinhua.gif"',
// IMG_DOMAIN: '"http://cdn.mayi888.com"', // IMG_DOMAIN: '"http://cdn.mayi888.com"',
}) })
...@@ -4478,12 +4478,13 @@ ...@@ -4478,12 +4478,13 @@
"dev": true "dev": true
}, },
"get-intrinsic": { "get-intrinsic": {
"version": "1.2.0", "version": "1.2.1",
"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz", "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz",
"integrity": "sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==", "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==",
"requires": { "requires": {
"function-bind": "^1.1.1", "function-bind": "^1.1.1",
"has": "^1.0.3", "has": "^1.0.3",
"has-proto": "^1.0.1",
"has-symbols": "^1.0.3" "has-symbols": "^1.0.3"
}, },
"dependencies": { "dependencies": {
...@@ -4630,6 +4631,11 @@ ...@@ -4630,6 +4631,11 @@
"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
"dev": true "dev": true
}, },
"has-proto": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
"integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg=="
},
"has-symbols": { "has-symbols": {
"version": "1.0.1", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
...@@ -5728,9 +5734,9 @@ ...@@ -5728,9 +5734,9 @@
"dev": true "dev": true
}, },
"mayi-analytics": { "mayi-analytics": {
"version": "1.1.40", "version": "1.1.47",
"resolved": "https://registry.npmjs.org/mayi-analytics/-/mayi-analytics-1.1.40.tgz", "resolved": "https://registry.npmjs.org/mayi-analytics/-/mayi-analytics-1.1.47.tgz",
"integrity": "sha512-7r+3U+48oilMLxshVsjInQ719/KTRdgm7W06Iss2wnCcUMuoVL9rXf02H2VDESvGhqBWAq8PwU5DUZ/Fih22Bw==", "integrity": "sha512-JB0aSl9TrZXk/cubh2h4XtbVQdz7j2rcHGnBnQSQ+S1KpL19SVInXuhbywrxoH/q315+zniqVtNP2n4q4c6X1Q==",
"requires": { "requires": {
"js-cookie": "^2.2.0", "js-cookie": "^2.2.0",
"qs": "^6.7.0", "qs": "^6.7.0",
...@@ -5738,9 +5744,9 @@ ...@@ -5738,9 +5744,9 @@
}, },
"dependencies": { "dependencies": {
"qs": { "qs": {
"version": "6.11.1", "version": "6.11.2",
"resolved": "https://registry.npmjs.org/qs/-/qs-6.11.1.tgz", "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.2.tgz",
"integrity": "sha512-0wsrzgTz/kAVIeuxSjnpGC56rzYtr6JT/2BwEvMaPhFIoYa1aGO8LbzuU1R0uUYQkLpWBTOj0l/CLAJB64J6nQ==", "integrity": "sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==",
"requires": { "requires": {
"side-channel": "^1.0.4" "side-channel": "^1.0.4"
} }
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
}, },
"dependencies": { "dependencies": {
"hashids": "^2.2.8", "hashids": "^2.2.8",
"mayi-analytics": "^1.1.40", "mayi-analytics": "^1.1.47",
"mayi-front-tools": "^1.0.1", "mayi-front-tools": "^1.0.1",
"mpvue": "^2.0.0", "mpvue": "^2.0.0",
"mpvue-wxparse": "^0.6.5", "mpvue-wxparse": "^0.6.5",
......
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
"setting": { "setting": {
"urlCheck": false, "urlCheck": false,
"es6": true, "es6": true,
"enhance": true, "enhance": false,
"postcss": true, "postcss": false,
"preloadBackgroundData": false, "preloadBackgroundData": false,
"minified": true, "minified": true,
"newFeature": true, "newFeature": true,
......
...@@ -17,7 +17,7 @@ export default { ...@@ -17,7 +17,7 @@ export default {
let shopItem = { let shopItem = {
// development: { mixid: "ssa", "shopid": 2342}, //五粮液uat // development: { mixid: "ssa", "shopid": 2342}, //五粮液uat
development: { mixid: "antgood", "shopid": 67}, development: { mixid: "antgood", "shopid": 67},
// production: { "mixid":"qiyeCT", "shopid": 1045 }, // 道可 production: { "mixid":"qiyeCT", "shopid": 1045 }, // 道可
// production: { "mixid":"metasense_doctors", "shopid": 1238 }, // 册为医护端 // production: { "mixid":"metasense_doctors", "shopid": 1238 }, // 册为医护端
// production: { "mixid":"3QqsFT", "shopid": 1337 }, // production: { "mixid":"3QqsFT", "shopid": 1337 },
// production: { "mixid":"notSHOWROOM", "shopid": 1274 }, // 诸色 // production: { "mixid":"notSHOWROOM", "shopid": 1274 }, // 诸色
...@@ -26,8 +26,8 @@ export default { ...@@ -26,8 +26,8 @@ export default {
// production: { "mixid":"RON", "shopid": 1503 }, // 荣恩 // production: { "mixid":"RON", "shopid": 1503 }, // 荣恩
// production: { "mixid":"ant", "shopid": 6 }, // 小工蚁 // production: { "mixid":"ant", "shopid": 6 }, // 小工蚁
// production: { "mixid":"MetaSense", "shopid": 1237 }, // 册为 // production: { "mixid":"MetaSense", "shopid": 1237 }, // 册为
production: { "mixid":"5BkDRR", "shopid": 1316 }, // lost in echo订货 // production: { "mixid":"5BkDRR", "shopid": 1316 }, // lost in echo订货
production: { "mixid":"CYNZ", "shopid": 1609 }, // 晨语女装 // production: { "mixid":"CYNZ", "shopid": 1609 }, // 晨语女装
xhyx_uat: { "mixid":"xhyxshop", "shopid": 1 }, xhyx_uat: { "mixid":"xhyxshop", "shopid": 1 },
xhyx_prod: { "mixid":"antgood", "shopid": 67 }, xhyx_prod: { "mixid":"antgood", "shopid": 67 },
wly_prod: { "mixid":"WLYSWT", "shopid": 2 } wly_prod: { "mixid":"WLYSWT", "shopid": 2 }
...@@ -199,7 +199,8 @@ export default { ...@@ -199,7 +199,8 @@ export default {
this.$mpBehavior.init("mayi-moblie-shop-mp", res.data.data.id, { this.$mpBehavior.init("mayi-moblie-shop-mp", res.data.data.id, {
mode: process.env.NODE_ENV, mode: process.env.NODE_ENV,
gid: res.data.data.groupId, gid: res.data.data.groupId,
mixid: mixid mixid: mixid,
host: process.env.MANALYTICS_HOST+'?',
}) })
let mpApp = getApp(); let mpApp = getApp();
......
...@@ -306,7 +306,7 @@ export default { ...@@ -306,7 +306,7 @@ export default {
this.withoutScene = true; this.withoutScene = true;
log.info('getShareSceneRecord',res) log.info('getShareSceneRecord',res)
if(res.data.code == '200'){ if(res.data.code == '200'){
this.page = res.data.data.pageUri; this.page = decodeURIComponent(res.data.data.pageUri);
let paramsObj = JSON.parse(res.data.data.scene); let paramsObj = JSON.parse(res.data.data.scene);
wx.setStorageSync('attractingCustomerChannelId',paramsObj.attractingCustomerChannelId); wx.setStorageSync('attractingCustomerChannelId',paramsObj.attractingCustomerChannelId);
wx.setStorageSync(this.$store.state.mixid+'storeId',paramsObj.storeId); wx.setStorageSync(this.$store.state.mixid+'storeId',paramsObj.storeId);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment