diff --git a/components/shopListPopup.vue b/components/shopListPopup.vue
index 5f8a236..fc36a0c 100644
--- a/components/shopListPopup.vue
+++ b/components/shopListPopup.vue
@@ -19,7 +19,7 @@
             {{item.mer_address||''}}
           </view>
           <view style="color: #999;">
-            <text v-if="item.service_phone" @click.stop="callphone(item.service_phone)">{{item.service_user||''}}
+            <text v-if="item.service_phone" @click.stop="onCall(item.service_phone)">{{item.mer_real_name||''}}
               {{ item.service_phone||'' }}</text>
           </view>
           <view class="check">
@@ -31,8 +31,8 @@
       </scroll-view>
       <up-button color="#20B128" shape="circle" @click="submitAddress">确认提货点 </up-button>
     </view>
-    <modal title="是否要拨打电话" :content="`即将拨打电话${phone}`" cancleText="取消" confirmText="拨打" :show="callShow" @close="callShow = false"
-      @change="onCall" />
+    <!-- <modal title="是否要拨打电话" :content="`即将拨打电话${phone}`" cancleText="取消" confirmText="拨打" :show="callShow" @close="callShow = false"
+      @change="onCall" /> -->
   </up-popup>
 </template>
 
@@ -43,15 +43,15 @@
   import modal from "@/components/modal.vue";
 
   const addressType = ref(-1)
-  const callShow = ref(false)
-  const phone = ref('');
-  const callphone = (e) => {
-    callShow.value = true;
-    phone.value = e;
-  }
-  const onCall = () => {
+  // const callShow = ref(false)
+  // const phone = ref('');
+  // const mer_real_name = (e) => {
+  //   callShow.value = true;
+  //   phone.value = e;
+  // }
+  const onCall = (e) => {
     uni.makePhoneCall({
-      phoneNumber: phone.value,
+      phoneNumber: e,
       success() {
         callShow.value = false
       }
@@ -66,7 +66,7 @@
     list: {
       type: Array,
       default: () => []
-    }
+    },
   })
 
   const emit = defineEmits(['close', 'change', 'search']);
diff --git a/config/app.js b/config/app.js
index a15eb5e..d0d2d85 100644
--- a/config/app.js
+++ b/config/app.js
@@ -1,9 +1,9 @@
 let BASE_URL
 import store from "@/store/user.js"
 // 环境
-// let env = "dev"
+let env = "dev"
 // let env = "test"
-let env = "prod"
+// let env = "prod"
 // let env = "local"
 
 switch (env) {
@@ -14,7 +14,7 @@ switch (env) {
 		BASE_URL = 'https://ceshi-erp.lihaink.cn';
 		break;
 	default:
-		BASE_URL = 'http://192.168.1.21:8546';
+		BASE_URL = 'http://192.168.1.22:8546';
 }
 
 let HTTP_REQUEST_URL
diff --git a/pagesOrder/detail/detail.vue b/pagesOrder/detail/detail.vue
index 3459ca6..0f6c6f1 100644
--- a/pagesOrder/detail/detail.vue
+++ b/pagesOrder/detail/detail.vue
@@ -11,17 +11,27 @@
 						<text style="margin: 0 10rpx;">自提点</text>
 					</view>
 					<view v-if="shopInfo.mer_id">
-						<view>{{shopInfo.mer_name}}</view>
-						<view>
-							<text>{{shopInfo.service_phone}}</text>
-							<text
-								style="color: #20b128;margin-left: 10rpx;font-size: 22rpx;">{{shopInfo.distance}}</text>
-						</view>
+					  <view style="color: #333;">
+					    {{shopInfo.mer_name}}
+					    <text v-if="shopInfo.recommend"
+					      style="font-size: 20rpx;color: #fff;background-color: #20b128;padding: 2rpx 5rpx;padding: 1rpx 4rpx;">推荐</text>
+					  </view>
+            <view style="font-size: 24rpx;color: #333;">
+              {{shopInfo.mer_address}}
+            </view>
+					  <view>
+					    <view v-if="shopInfo.service_phone">
+					      <text style="margin-right: 10rpx;">{{shopInfo.real_name||shopInfo.mer_real_name}}</text>
+					      <text>{{shopInfo.service_phone}}</text>
+					    </view>
+					    <text v-if="shopInfo.distance"
+					      style="color: #20b128;font-size: 22rpx;border: 1px solid #20b128;border-radius: 4rpx;">{{shopInfo.distance}}</text>
+					  </view>
 					</view>
 				</view>
 			</view>
-			<view class="address-btn" v-if="shopInfo.paid==0">
-				<view style="width: 80px;"><up-button @click.stop="shopListShow=true" size="small" shape="circle"
+			<view class="address-btn" v-if="datas.paid==0">
+				<view style="width: 80px;"><up-button @click="shopListShow=true" size="small" shape="circle"
 						color="#f6f6f6" :customStyle="{color:'#666666'}">修改</up-button></view>
 			</view>
 		</view>
diff --git a/pagesOrder/settle/settle.vue b/pagesOrder/settle/settle.vue
index 1369592..bee362d 100644
--- a/pagesOrder/settle/settle.vue
+++ b/pagesOrder/settle/settle.vue
@@ -19,12 +19,12 @@
                 style="font-size: 20rpx;color: #fff;background-color: #20b128;padding: 2rpx 5rpx;padding: 1rpx 4rpx;">推荐</text>
             </view>
             <view>
-              <view v-if="shopInfo.service_phone" @click="callphone(shopInfo.service_phone)">
-                <text style="margin-right: 10rpx;">{{shopInfo.service_user}}</text>
+              <view v-if="shopInfo.service_phone" @click="onCall(shopInfo.service_phone)">
+                <text style="margin-right: 10rpx;">{{shopInfo.mer_real_name}}</text>
                 <text>{{shopInfo.service_phone}}</text>
               </view>
               <text v-if="shopInfo.distance"
-                style="color: #20b128;font-size: 22rpx;border: 1px solid #20b128;border-radius: 4rpx;">{{shopInfo.distance}}</text>
+                style="color: #20b128;font-size: 20rpx;border: 1px solid #20b128;border-radius: 4rpx;">{{shopInfo.distance}}</text>
             </view>
           </view>
         </view>
@@ -129,8 +129,8 @@
       @change="changeShop" @search="searchShop" />
     <modal title="尚未设置收货地址" content="您还没有添加收货地址，请点击添加" cancleText="添加地址" confirmText="继续支付" :show="toastAddressShow"
       @close="addAddress" @change="goPay" />
-    <modal title="是否要拨打电话" :content="`即将拨打电话${phone}`" cancleText="取消" confirmText="拨打" :show="callShow" @close="callShow = false"
-      @change="onCall" />
+    <!-- <modal title="是否要拨打电话" :content="`即将拨打电话${phone}`" cancleText="取消" confirmText="拨打" :show="callShow" @close="callShow = false"
+      @change="onCall" /> -->
   </view>
 </template>
 
@@ -260,15 +260,15 @@
   }
   
   // 拨打电话
-  const callShow = ref(false)
-  const phone = ref('');
-  const callphone = (e) => {
-    callShow.value = true;
-    phone.value = e;
-  }
-  const onCall = () => {
+  // const callShow = ref(false)
+  // const phone = ref('');
+  // const callphone = (e) => {
+  //   callShow.value = true;
+  //   phone.value = e;
+  // }
+  const onCall = (e) => {
     uni.makePhoneCall({
-      phoneNumber: phone.value,
+      phoneNumber: e,
       success() {
         callShow.value = false
       }
diff --git a/store/user.js b/store/user.js
index 07cc81e..9f36be7 100644
--- a/store/user.js
+++ b/store/user.js
@@ -25,7 +25,7 @@ const useUserStore = defineStore("user", () => {
 
 	// #ifdef H5
 
-	token.value = "0bb8817664d817e9e881500cc2631ef8"
+	token.value = "6429c7999c9cb3935a3db2ccabb8a706"
 	// token.value = "95b24dd6d2dda836fe07854b08ba0944"
 	userInfo.value = {
 		avatar: "https://lihaiim.oss-cn-chengdu.aliyuncs.com/image/admin/default_avatar.png",