From a32e9b8741128bccdae0a4e65df2051331cf89bb Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Wed, 22 May 2024 11:53:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/shopListPopup.vue | 24 ++++++++++++------------
config/app.js | 6 +++---
pagesOrder/detail/detail.vue | 26 ++++++++++++++++++--------
pagesOrder/settle/settle.vue | 26 +++++++++++++-------------
store/user.js | 2 +-
5 files changed, 47 insertions(+), 37 deletions(-)
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||''}}
- {{item.service_user||''}}
+ {{item.mer_real_name||''}}
{{ item.service_phone||'' }}
@@ -31,8 +31,8 @@
确认提货点
-
+
@@ -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 @@
自提点
- {{shopInfo.mer_name}}
-
- {{shopInfo.service_phone}}
- {{shopInfo.distance}}
-
+
+ {{shopInfo.mer_name}}
+ 推荐
+
+
+ {{shopInfo.mer_address}}
+
+
+
+ {{shopInfo.real_name||shopInfo.mer_real_name}}
+ {{shopInfo.service_phone}}
+
+ {{shopInfo.distance}}
+
-
-
+ 修改
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;">推荐
-
- {{shopInfo.service_user}}
+
+ {{shopInfo.mer_real_name}}
{{shopInfo.service_phone}}
{{shopInfo.distance}}
+ style="color: #20b128;font-size: 20rpx;border: 1px solid #20b128;border-radius: 4rpx;">{{shopInfo.distance}}
@@ -129,8 +129,8 @@
@change="changeShop" @search="searchShop" />
-
+
@@ -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",