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

config/dev.env.js

@@ -3,14 +3,14 @@ var prodEnv = require('./prod.env')
 
 
 module.exports = merge(prodEnv, {//zjgyl
-  SHOP_MIXID:"'ad666666'",
+  SHOP_MIXID:"'antgood'",
   NODE_ENV: '"development"',
   // BASE_URL:"'https://shop.mayi888.com'", 
   // BASE_URL:"'http://192.168.1.146:3005'",
   // BASE_URL:"'http://192.168.1.106:3000'",
-  BASE_URL:"'http://test-m-shop.mayi888.cn'",
+  BASE_URL:"'https://test-m-shop.mayi888.cn'",
 
-  OLSHOP_URL:'"http://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"',
   IMG_DOMAIN: '"http://test-bucket-ant.oss-cn-shanghai.aliyuncs.com"'
   // IMG_DOMAIN: '"http://cdn.mayi888.com"'