diff --git a/api/config.js b/api/config.js index 936dfe5..2c5b46e 100644 --- a/api/config.js +++ b/api/config.js @@ -1,7 +1,7 @@ const accountInfo = wx.getAccountInfoSync(); const hosts = { - "develop": 'https://develop', - "trial": 'https://trial', + "develop": 'http://121.40.24.248', + "trial": 'http://121.40.24.248', "release": 'https://release', } diff --git a/pages/order/order-info.vue b/pages/order/order-info.vue index 309b2d8..4264262 100644 --- a/pages/order/order-info.vue +++ b/pages/order/order-info.vue @@ -43,9 +43,13 @@ 客户地址 {{helpers.removeCommas(data.order_info.area.merge_name) + data.order_info.address}} + + 详情 + {{data.order_info.detail ? data.order_info.detail : '暂无详情'}} + 客户备注 - {{data.remark ? data.remark : '无备注信息'}} + {{data.order_info.remark ? data.order_info.remark : '无备注信息'}} @@ -201,8 +205,10 @@ const arrivedOnSite = () => { uni.getLocation({ type: 'gcj02', success(res) { + let envVersion = wx.getAccountInfoSync().miniProgram.envVersion + let distances = helpers.getDistances(res.latitude, res.longitude, data.value.order_info.lat, data.value.order_info.lng); - if (distances.unit === '公里' || distances.distance > 500) { + if (envVersion === 'release' && (distances.unit === '公里' || distances.distance > 500)) { return helpers.showToast(`上门失败!距离客户地址超过 500米,当前距离:${distances.distance}${distances.unit}`) } diff --git a/static/css/common.scss b/static/css/common.scss index d628b52..8293ddd 100644 --- a/static/css/common.scss +++ b/static/css/common.scss @@ -268,15 +268,18 @@ swiper .wx-swiper-dots .wx-swiper-dot{ box-sizing: border-box; margin-top: 32rpx; .top { - height: 60rpx; + min-height: 80rpx; .type,.price { width: 323rpx; - height: 100%; + min-height: 80rpx; + padding: 8rpx 0; + box-sizing: border-box; } .type { font-weight: 500; font-size: 34rpx; color: var(--titleColor); + line-height: 48rpx; } .price { font-size: 30rpx;