Merge remote-tracking branch 'origin/master'
# Conflicts: # unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map # unpackage/dist/dev/.sourcemap/mp-weixin/pages/cameraContext/cameraContext.js.map # unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map # unpackage/dist/dev/.sourcemap/mp-weixin/pages/order-goods/order-details.js.map # unpackage/dist/dev/.sourcemap/mp-weixin/pages/realName/realName.js.mapmaster
@ -1,3 +1,3 @@
|
||||
export default {
|
||||
baseUrl: "https://stock.szjixun.cn", //"https://warehouse.szjixun.cn", // https://stock.szjixun.cn
|
||||
baseUrl: "https://warehouse.szjixun.cn", //"https://warehouse.szjixun.cn", // https://stock.szjixun.cn
|
||||
};
|
||||
|
Before Width: | Height: | Size: 24 KiB After Width: | Height: | Size: 58 KiB |
Before Width: | Height: | Size: 6.3 KiB After Width: | Height: | Size: 5.1 KiB |
Before Width: | Height: | Size: 24 KiB After Width: | Height: | Size: 58 KiB |
Before Width: | Height: | Size: 6.3 KiB After Width: | Height: | Size: 5.1 KiB |
After Width: | Height: | Size: 58 KiB |
After Width: | Height: | Size: 5.1 KiB |