diff --git a/.DS_Store b/.DS_Store index 9df4aa1..356b888 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/App.vue b/App.vue index 19f646f..2dfda32 100644 --- a/App.vue +++ b/App.vue @@ -143,7 +143,7 @@ console.log('App Show'); // 全局初始化参数中存在isWechat属性则代表就是从小程序跳入 if (this['globalData']['parameters']?.isWechat) { - store.commit('SetcityInfor', this['globalData']['parameters']['cityInfor']); + store.commit('SetcityInfor', this['globalData']['parameters']['cityInfor']); store.commit('SetToken', this['globalData']['parameters']['token']); } else { diff --git a/config/app.js b/config/app.js new file mode 100644 index 0000000..2295e59 --- /dev/null +++ b/config/app.js @@ -0,0 +1,3 @@ +module.exports = { + HTTP_REQUEST_URL: 'https://tpoint.agrimedia.cn', +} diff --git a/manifest.json b/manifest.json index c54fa7f..03fe34d 100644 --- a/manifest.json +++ b/manifest.json @@ -5,6 +5,7 @@ "versionName" : "1.0.1", "versionCode" : "100", "transformPx" : false, + "sassImplementationName" : "node-sass", /* 5+App特有相关 */ "app-plus" : { "usingComponents" : true, diff --git a/pages/restaurant/order/orders-settlement/orders-settlement.vue b/pages/restaurant/order/orders-settlement/orders-settlement.vue index 4422bf5..7bb8dad 100644 --- a/pages/restaurant/order/orders-settlement/orders-settlement.vue +++ b/pages/restaurant/order/orders-settlement/orders-settlement.vue @@ -204,7 +204,8 @@ -