Commit f65a4ac7 by 李嘉林

提交

parent 922c9e74
...@@ -82,6 +82,6 @@ module.exports = merge(baseWebpackConfig, { ...@@ -82,6 +82,6 @@ module.exports = merge(baseWebpackConfig, {
// inject: true // inject: true
// }), // }),
new FriendlyErrorsPlugin(), new FriendlyErrorsPlugin(),
new UglifyJsPlugin({ sourceMap: true }) // new UglifyJsPlugin({ sourceMap: true })
] ]
}) })
...@@ -2,16 +2,17 @@ var merge = require('webpack-merge') ...@@ -2,16 +2,17 @@ var merge = require('webpack-merge')
var prodEnv = require('./prod.env') var prodEnv = require('./prod.env')
module.exports = merge(prodEnv, {//zjgyl module.exports = merge(prodEnv, {
SHOP_MIXID:"'antgood'", //zjgyl
SHOP_MIXID: "'antgood'",
NODE_ENV: '"development"', NODE_ENV: '"development"',
// BASE_URL:"'https://shop.mayi888.com'", // BASE_URL:"'https://shop.mayi888.com'",
// BASE_URL:"'http://192.168.1.146:3005'", // BASE_URL:"'http://192.168.1.146:3005'",
// BASE_URL:"'http://192.168.1.127:3000'", BASE_URL: "'http://172.16.1.14:3000'",
BASE_URL:"'https://test-m-shop.mayi888.cn'", // BASE_URL: "'https://test-m-shop.mayi888.cn'",
OLSHOP_URL:'"https://test-m-shop.mayi888.cn/innerApi/shopApiService"', OLSHOP_URL: '"https://test-m-shop.mayi888.cn/innerApi/shopApiService"',
// OLSHOP_URL:'"https://shop.mayi888.com/innerApi/shopApiService"', // OLSHOP_URL:'"https://shop.mayi888.com/innerApi/shopApiService"',
IMG_DOMAIN: '"http://test-bucket-ant.oss-cn-shanghai.aliyuncs.com"' IMG_DOMAIN: '"http://test-bucket-ant.oss-cn-shanghai.aliyuncs.com"'
// IMG_DOMAIN: '"http://cdn.mayi888.com"' // IMG_DOMAIN: '"http://cdn.mayi888.com"'
}) });
\ No newline at end of file
...@@ -25,9 +25,8 @@ ...@@ -25,9 +25,8 @@
"useCompilerModule": true, "useCompilerModule": true,
"userConfirmedUseCompilerModuleSwitch": false "userConfirmedUseCompilerModuleSwitch": false
}, },
"miniprogramRoot": "dist/wx/",
"compileType": "miniprogram", "compileType": "miniprogram",
"appid": "wxae95a07ffdf11548", "appid": "tt7020069def1a8a37",
"projectname": "mayi-mp-shop", "projectname": "mayi-mp-shop",
"simulatorType": "wechat", "simulatorType": "wechat",
"simulatorPluginLibVersion": {}, "simulatorPluginLibVersion": {},
......
...@@ -8,7 +8,7 @@ export default { ...@@ -8,7 +8,7 @@ export default {
extConfig={mixid:'XgyGood'} extConfig={mixid:'XgyGood'}
} else{ } else{
if(MINI_ENV=='tt'){ if(MINI_ENV=='tt'){
extConfig={mixid:'ant'} extConfig={mixid:'xgyshop'}
}else{ }else{
extConfig=wx.getExtConfigSync? wx.getExtConfigSync(): {} extConfig=wx.getExtConfigSync? wx.getExtConfigSync(): {}
} }
......
...@@ -32,8 +32,9 @@ export default { ...@@ -32,8 +32,9 @@ export default {
this.options_orderType = options.orderType; this.options_orderType = options.orderType;
this.options_isCard= options.isCard; this.options_isCard= options.isCard;
this.options_isCardTitle= options.isCardTit; this.options_isCardTitle= options.isCardTit;
let getSessionid = wx.getStorageSync("sessionid"); // let getSessionid = wx.getStorageSync("sessionid");
if(options.sessionid&&!getSessionid){ console.log(options.sessionid,'---------------------------36')
if(options.sessionid){
wx.setStorage({ wx.setStorage({
key: "sessionid", key: "sessionid",
data: options.sessionid data: options.sessionid
......
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