Commit 3b8fcf1e by 李嘉林

feat: sid同步

parent 239dea40
...@@ -91,19 +91,19 @@ module.exports = merge(baseWebpackConfig, { ...@@ -91,19 +91,19 @@ module.exports = merge(baseWebpackConfig, {
// inject: true // inject: true
// }), // }),
new FriendlyErrorsPlugin(), new FriendlyErrorsPlugin(),
new UglifyJsPlugin({ // new UglifyJsPlugin({
sourceMap: true, // sourceMap: true,
uglifyOptions: { // uglifyOptions: {
// 删除注释 // // 删除注释
output: { // output: {
comments: false // comments: false
}, // },
compress: { // compress: {
warnings: false, // warnings: false,
drop_console: true, // drop_console: true,
pure_funcs: ['console.log'] // pure_funcs: ['console.log']
} // }
} // }
}) // })
] ]
}) })
...@@ -121,20 +121,20 @@ if (config.build.bundleAnalyzerReport) { ...@@ -121,20 +121,20 @@ if (config.build.bundleAnalyzerReport) {
var useUglifyJs = process.env.PLATFORM !== 'swan' var useUglifyJs = process.env.PLATFORM !== 'swan'
if (useUglifyJs) { if (useUglifyJs) {
webpackConfig.plugins.push(new UglifyJsPlugin({ // webpackConfig.plugins.push(new UglifyJsPlugin({
sourceMap: true, // sourceMap: true,
uglifyOptions: { // uglifyOptions: {
// 删除注释 // // 删除注释
output: { // output: {
comments: false // comments: false
}, // },
compress: { // compress: {
warnings: false, // warnings: false,
drop_console: true, // drop_console: true,
pure_funcs: ['console.log'] // pure_funcs: ['console.log']
} // }
} // }
})) // }))
} }
module.exports = webpackConfig module.exports = webpackConfig
...@@ -5768,9 +5768,9 @@ ...@@ -5768,9 +5768,9 @@
"dev": true "dev": true
}, },
"mayi-analytics": { "mayi-analytics": {
"version": "1.1.59", "version": "1.1.64",
"resolved": "https://registry.npmjs.org/mayi-analytics/-/mayi-analytics-1.1.59.tgz", "resolved": "https://registry.npmjs.org/mayi-analytics/-/mayi-analytics-1.1.64.tgz",
"integrity": "sha512-ci3G4JOHsaKfgu31DzAVVvllToxPU3XuBvQEuorzxVYmCL5yeyG6fX4e6QqcWx2DvJG0g4Sa2GWAvSAfjr3hEA==", "integrity": "sha512-s5zsZItmFn7XjtidGFuonGQsc0pFofP/aZVWkPE6dPShNDJl6OGc/L2nLmWx2NuiIfu8OGYnKL8R7S66Xsjb0A==",
"requires": { "requires": {
"js-cookie": "^2.2.0", "js-cookie": "^2.2.0",
"qs": "^6.7.0", "qs": "^6.7.0",
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
"build:my": "node build/build.js my" "build:my": "node build/build.js my"
}, },
"dependencies": { "dependencies": {
"mayi-analytics": "^1.1.59", "mayi-analytics": "^1.1.64",
"mayi-front-tools": "^1.0.3", "mayi-front-tools": "^1.0.3",
"mpvue": "^2.0.0", "mpvue": "^2.0.0",
"mpvue-wxparse": "^0.6.5", "mpvue-wxparse": "^0.6.5",
......
...@@ -58,6 +58,10 @@ export default { ...@@ -58,6 +58,10 @@ export default {
if (wx.getStorageSync("_ma_uid")) { if (wx.getStorageSync("_ma_uid")) {
this.params += `&_ma_uid=${wx.getStorageSync("_ma_uid")}`; this.params += `&_ma_uid=${wx.getStorageSync("_ma_uid")}`;
} }
// 加_ma_sid
if (wx.getStorageSync("_ma_sid")) {
this.params += `&_ma_sid=${wx.getStorageSync("_ma_sid")}`;
}
let pageUrl1 = (this.page.startsWith('http://') || this.page.startsWith('https://'))? (this.page + this.params) : this.link+this.page+this.params let pageUrl1 = (this.page.startsWith('http://') || this.page.startsWith('https://'))? (this.page + this.params) : this.link+this.page+this.params
let pageUrl = forUrlAddKey(decodeURIComponent(pageUrl1)); let pageUrl = forUrlAddKey(decodeURIComponent(pageUrl1));
console.log(pageUrl,'--pageUrl') console.log(pageUrl,'--pageUrl')
......
...@@ -87,6 +87,10 @@ export default { ...@@ -87,6 +87,10 @@ export default {
if (wx.getStorageSync("_ma_uid")) { if (wx.getStorageSync("_ma_uid")) {
this.params += `&_ma_uid=${wx.getStorageSync("_ma_uid")}`; this.params += `&_ma_uid=${wx.getStorageSync("_ma_uid")}`;
} }
// 加_ma_sid
if (wx.getStorageSync("_ma_sid")) {
this.params += `&_ma_sid=${wx.getStorageSync("_ma_sid")}`;
}
// 判断当前是否为导购分享 // 判断当前是否为导购分享
const setGuideEmployeeId = wx.getStorageSync(this.$store.state.mixid + 'setGuideEmployeeId'); const setGuideEmployeeId = wx.getStorageSync(this.$store.state.mixid + 'setGuideEmployeeId');
if (setGuideEmployeeId && !this.params.includes("setGuideEmployeeId")) { if (setGuideEmployeeId && !this.params.includes("setGuideEmployeeId")) {
......
...@@ -208,6 +208,10 @@ export default { ...@@ -208,6 +208,10 @@ export default {
if (wx.getStorageSync("_ma_uid")) { if (wx.getStorageSync("_ma_uid")) {
this.link += `&_ma_uid=${wx.getStorageSync("_ma_uid")}`; this.link += `&_ma_uid=${wx.getStorageSync("_ma_uid")}`;
} }
// 加_ma_sid
if (wx.getStorageSync("_ma_sid")) {
this.link += `&_ma_sid=${wx.getStorageSync("_ma_sid")}`;
}
this.useLink = this.link; this.useLink = this.link;
console.log(this.useLink,'--this.useLink') console.log(this.useLink,'--this.useLink')
}, },
......
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