From 9b8fe0ea072ac780b0d2ba501f5ddf4e612f3701 Mon Sep 17 00:00:00 2001
From: gcd <wyemail666@163.com>
Date: Mon, 21 Apr 2025 23:09:30 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=B7=A5=E5=8D=95=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E5=BE=AE=E8=B0=83=EF=BC=9B=E9=9D=9E=E7=94=9F?=
 =?UTF-8?q?=E4=BA=A7=E7=8E=AF=E5=A2=83=E4=B8=8D=E9=99=90=E5=88=B6=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=E4=B8=8A=E9=97=A8=E8=B7=9D=E7=A6=BB=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/config.js              |  4 ++--
 pages/order/order-info.vue | 10 ++++++++--
 static/css/common.scss     |  7 +++++--
 3 files changed, 15 insertions(+), 6 deletions(-)

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 @@
         <view class="title flex-l">客户地址</view>
         <view class="value flex-l">{{helpers.removeCommas(data.order_info.area.merge_name) + data.order_info.address}}</view>
       </view>
+      <view class="item-multi-line">
+        <view class="title flex-l">详情</view>
+        <view class="value flex-l">{{data.order_info.detail ? data.order_info.detail : '暂无详情'}}</view>
+      </view>
       <view class="item-multi-line">
         <view class="title flex-l">客户备注</view>
-        <view class="value flex-l">{{data.remark ? data.remark : '无备注信息'}}</view>
+        <view class="value flex-l">{{data.order_info.remark ? data.order_info.remark : '无备注信息'}}</view>
       </view>
       <view class="report-order-exception flex-c" v-if="canReportOrderException">
         <view @click="reportOrderException(data.order_info.id)" class="report-ctr flex-c" hover-class="auto-mask-layer-radius4" hover-start-time="0" hover-stay-time="50">
@@ -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;