From cd9f2d67094197129b63fe3875a416ddc6bae373 Mon Sep 17 00:00:00 2001 From: gongfuxiang Date: Wed, 26 Feb 2025 16:15:38 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E5=AE=A2=E6=9C=8D?= =?UTF-8?q?=E4=BC=81=E4=B8=9A=E5=AE=A2=E6=9C=8D=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/online-service/online-service.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/components/online-service/online-service.vue b/components/online-service/online-service.vue index aa3edf03..e8066548 100644 --- a/components/online-service/online-service.vue +++ b/components/online-service/online-service.vue @@ -334,6 +334,9 @@ sendMessageImg: this.propImg, }); // #endif + // #ifdef H5 + app.globalData.url_open(this.common_app_customer_service_company_weixin_url); + // #endif } else { // 电话客服 this.call_event(); From 5ff8094fdf556ac941acebcebe9b21ec1975b20c Mon Sep 17 00:00:00 2001 From: gongfuxiang Date: Thu, 27 Feb 2025 21:31:33 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9C=8D=E5=8A=A1=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 6 +-- locale/en.json | 7 ++- locale/zh.json | 7 ++- .../orderallot-detail/orderallot-detail.vue | 37 ++++++++------ pages/user-order-detail/user-order-detail.vue | 48 ++++++++++++++++--- 5 files changed, 79 insertions(+), 26 deletions(-) diff --git a/App.vue b/App.vue index 63d1a1a2..34a8af64 100644 --- a/App.vue +++ b/App.vue @@ -7,10 +7,10 @@ data: { // 基础配置 // 数据接口请求地址 - request_url:'https://new.shopxo.vip/', + request_url:'http://shopxo.com/', // 静态资源地址（如系统根目录不在public目录下面请在静态地址后面加public目录、如：https://d1.shopxo.vip/public/） - static_url:'https://new.shopxo.vip/', + static_url:'http://shopxo.com/', // 系统类型（默认default、如额外独立小程序、可与程序分身插件实现不同主体小程序及支付独立） system_type: 'default', @@ -943,7 +943,7 @@ if (url.indexOf('?') == -1) { value = url; } else { - temp_str = url.split('?'); + var temp_str = url.split('?'); value = temp_str[0]; } } diff --git a/locale/en.json b/locale/en.json index 5870a8db..d8462227 100644 --- a/locale/en.json +++ b/locale/en.json @@ -13,6 +13,7 @@ "not_yet": "Not yet", "save": "Preserve", "add": "Add", + "copy": "Copy", "del": "Delete", "del_record": "Delete record", "del_success": "Delete successful", @@ -390,7 +391,11 @@ "1jpv4n": "Cancel time", "8o2of3": "Closing time", "5k6k56": "Parameter error", - "i876o3": "Incorrect address" + "i876o3": "Incorrect address", + "567ygf": "service information", + "67ujfr": "Service duration", + "gsfw4d": "Service Name", + "6ygfew": "Service Mobile" } }, "setup": { diff --git a/locale/zh.json b/locale/zh.json index 72a4b948..947e55dd 100644 --- a/locale/zh.json +++ b/locale/zh.json @@ -13,6 +13,7 @@ "not_yet": "暂不", "save": "保存", "add": "新增", + "copy": "复制", "del": "删除", "del_record": "删除记录", "del_success": "删除成功", @@ -380,7 +381,11 @@ "1jpv4n": "取消时间", "8o2of3": "关闭时间", "5k6k56": "参数有误", - "i876o3": "地址有误" + "i876o3": "地址有误", + "567ygf": "服务信息", + "67ujfr": "服务时长", + "gsfw4d": "服务人姓名", + "6ygfew": "服务人手机" } }, "setup": { diff --git a/pages/plugins/realstore/orderallot-detail/orderallot-detail.vue b/pages/plugins/realstore/orderallot-detail/orderallot-detail.vue index 88ce308f..377b9f30 100644 --- a/pages/plugins/realstore/orderallot-detail/orderallot-detail.vue +++ b/pages/plugins/realstore/orderallot-detail/orderallot-detail.vue @@ -80,8 +80,12 @@ {{$t('user-order-detail.user-order-detail.0f26j2')}} - {{ item.name }} - {{ item.value }} + {{ item.name }} + + {{ item.value }} + {{$t('common.copy')}} + + {{ item.value }} @@ -96,8 +100,11 @@ {{item.express_name}} - {{$t('user-order-detail.user-order-detail.2byl8l')}} - {{item.express_number}} + {{$t('user-order-detail.user-order-detail.2byl8l')}} + + {{item.express_number}} + {{$t('common.copy')}} + @@ -195,21 +202,21 @@ this.setData({ detail: data.data, detail_list: [ - { name: this.$t('orderallot-detail.orderallot-detail.81jvw1'), value: data.data.order_type_name || "" }, - { name: this.$t('user-order-detail.user-order-detail.n18sd2'), value: data.data.order_allot_no || "" }, - { name: this.$t('user-order-detail.user-order-detail.yxwu8n'), value: data.data.status_name || "" }, - { name: this.$t('user-order-detail.user-order-detail.2y7l13'), value: data.data.total_price || "" }, - { name: this.$t('user-order-detail.user-order-detail.h2c78h'), value: data.data.add_time || "" }, - { name: this.$t('common.add_time'), value: data.data.add_time || "" }, - { name: this.$t('common.receive_time'), value: data.data.receive_time || "" }, - { name: this.$t('common.service_time'), value: data.data.service_time || "" }, - { name: this.$t('order-detail.order-detail.2dw4gd'), value: data.data.success_time || "" }, - { name: this.$t('user-order-detail.user-order-detail.1jpv4n'), value: data.data.cancel_time || "" }, + { name: this.$t('orderallot-detail.orderallot-detail.81jvw1'), value: data.data.order_type_name || '' }, + { name: this.$t('user-order-detail.user-order-detail.n18sd2'), value: data.data.order_allot_no || '', is_copy: 1 }, + { name: this.$t('user-order-detail.user-order-detail.yxwu8n'), value: data.data.status_name || '' }, + { name: this.$t('user-order-detail.user-order-detail.2y7l13'), value: data.data.total_price || '' }, + { name: this.$t('user-order-detail.user-order-detail.h2c78h'), value: data.data.add_time || '' }, + { name: this.$t('common.add_time'), value: data.data.add_time || '' }, + { name: this.$t('common.receive_time'), value: data.data.receive_time || '' }, + { name: this.$t('common.service_time'), value: data.data.service_time || '' }, + { name: this.$t('order-detail.order-detail.2dw4gd'), value: data.data.success_time || '' }, + { name: this.$t('user-order-detail.user-order-detail.1jpv4n'), value: data.data.cancel_time || '' }, ], site_fictitious: data.site_fictitious || null, data_list_loding_status: 3, data_bottom_line_status: true, - data_list_loding_msg: "", + data_list_loding_msg: '', }); } else { this.setData({ diff --git a/pages/user-order-detail/user-order-detail.vue b/pages/user-order-detail/user-order-detail.vue index 5eb3b027..7088d0ad 100644 --- a/pages/user-order-detail/user-order-detail.vue +++ b/pages/user-order-detail/user-order-detail.vue @@ -3,7 +3,7 @@ - + {{ detail.address_data.alias }} {{ detail.address_data.name }} @@ -13,7 +13,7 @@ {{ detail.address_data.province_name }}{{ detail.address_data.city_name }}{{ detail.address_data.county_name }}{{ detail.address_data.address }} - {{$t('user-order-detail.user-order-detail.7lp6gw')}} + {{$t('user-order-detail.user-order-detail.7lp6gw')}} @@ -51,6 +51,35 @@ {{$t('user-order-detail.user-order-detail.423rmr')}}{{ detail.buy_number_count }}{{$t('user-order-detail.user-order-detail.41ty94')}}{{ detail.currency_data.currency_symbol }}{{ detail.total_price }} + + + + + {{$t('user-order-detail.user-order-detail.567ygf')}} + + + {{$t('user-order-detail.user-order-detail.gsfw4d')}} + {{ detail.service_data.service_name }} + + + {{$t('user-order-detail.user-order-detail.6ygfew')}} + + {{ detail.service_data.service_mobile }} + {{$t('common.copy')}} + + + + {{$t('user-order-detail.user-order-detail.67ujfr')}} + {{ detail.service_data.service_duration_minute_text }} + + + {{$t('common.service_time')}} + + {{ detail.service_data.service_start_time }} + {{ detail.service_data.service_end_time }} + + + @@ -88,8 +117,12 @@ {{$t('user-order-detail.user-order-detail.0f26j2')}} - {{ item.name }} - {{ item.value }} + {{ item.name }} + + {{ item.value }} + {{$t('common.copy')}} + + {{ item.value }} @@ -105,7 +138,10 @@ {{$t('user-order-detail.user-order-detail.2byl8l')}} - {{item.express_number}} + + {{item.express_number}} + {{$t('common.copy')}} + {{$t('common.note')}}: @@ -220,7 +256,7 @@ detail_list: [ { name: this.$t('user-order-detail.user-order-detail.346376'), value: data.data.warehouse_name || '' }, { name: this.$t('user-order-detail.user-order-detail.io6p5k'), value: data.data.order_model_name || '' }, - { name: this.$t('user-order-detail.user-order-detail.n18sd2'), value: data.data.order_no || '' }, + { name: this.$t('user-order-detail.user-order-detail.n18sd2'), value: data.data.order_no || '', is_copy: 1 }, { name: this.$t('user-order-detail.user-order-detail.yxwu8n'), value: data.data.status_name || '' }, { name: this.$t('user-order-detail.user-order-detail.23qj7m'), value: data.data.pay_status_name || '' }, { name: this.$t('user-order-detail.user-order-detail.vg4jb1'), value: data.data.price || '' }, From 0501dad7c5f23b4af7ae24ca774432f352e12131 Mon Sep 17 00:00:00 2001 From: gongfuxiang Date: Thu, 27 Feb 2025 21:47:47 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=8D=95=E5=8F=B7=E5=A4=8D=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../user-orderaftersale-detail.vue | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pages/user-orderaftersale-detail/user-orderaftersale-detail.vue b/pages/user-orderaftersale-detail/user-orderaftersale-detail.vue index e2e1bda8..ad252181 100644 --- a/pages/user-orderaftersale-detail/user-orderaftersale-detail.vue +++ b/pages/user-orderaftersale-detail/user-orderaftersale-detail.vue @@ -39,7 +39,7 @@ {{ new_aftersale_data.tips_msg.title }} - {{$t('common.view_text')}} >> + {{$t('common.view_text')}} >> @@ -70,8 +70,12 @@ {{$t('invoice-detail.invoice-detail.s70kj4')}} - {{ item.name }} - {{ new_aftersale_data[item.field] || "" }} + {{ item.name }} + + {{ new_aftersale_data[item.field] || '' }} + {{$t('common.copy')}} + + {{ new_aftersale_data[item.field] || '' }} @@ -275,6 +279,11 @@ { name: this.$t('user-orderaftersale-detail.user-orderaftersale-detail.50cm8m'), field: "type_text", + }, + { + name: this.$t('user-order-detail.user-order-detail.n18sd2'), + field: "order_no", + is_copy: 1 }, { name: this.$t('user-orderaftersale-detail.user-orderaftersale-detail.17j4cy'),