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 || '' },