sileya-ai
/
vr-shopxo-uniapp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' into dev-yxl

master
于肖磊 2025-02-28 11:51:33 +08:00
parent fb7cba06c1 0501dad7c5
commit 6ef2667727
7 changed files with 94 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
App.vue
View File

@ -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];
}
}

3
components/online-service/online-service.vue
View File

@ -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();

7
locale/en.json
View File

@ -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": {

7
locale/zh.json
View File

@ -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": {

37
pages/plugins/realstore/orderallot-detail/orderallot-detail.vue
View File

@ -80,8 +80,12 @@
<view class="br-b padding-bottom-main fw-b text-size">{{$t('user-order-detail.user-order-detail.0f26j2')}}</view>
<view class="panel-content oh">
<view v-for="(item, index) in detail_list" :key="index" class="item br-b-dashed oh padding-vertical-main">
<view class="title fl padding-right-main cr-grey">{{ item.name }}</view>
<view class="content fl br-l padding-left-main" :data-value="item.value" @tap="text_copy_event">{{ item.value }}</view>
<view class="title fl padding-right-main cr-grey">{{ item.name }}</view>
<view v-if="(item.is_copy || 0) == 1" class="content fl br-l padding-left-main" :data-value="item.value" @tap="text_copy_event">
<text>{{ item.value }}</text>
<text class="bg-white br-green cr-green round padding-horizontal-sm text-size-xs margin-left-sm">{{$t('common.copy')}}</text>
</view>
<view v-else class="content fl br-l padding-left-main">{{ item.value }}</view>
</view>
</view>
</view>
@ -96,8 +100,11 @@
<view class="content fl br-l padding-left-main" :data-value="item.express_name" @tap="text_copy_event">{{item.express_name}}</view>
</view>
<view class="item oh padding-vertical-main">
<view class="title fl padding-right-main cr-grey">{{$t('user-order-detail.user-order-detail.2byl8l')}}</view>
<view class="content fl br-l padding-left-main" :data-value="item.express_number" @tap="text_copy_event">{{item.express_number}}</view>
<view class="title fl padding-right-main cr-grey">{{$t('user-order-detail.user-order-detail.2byl8l')}}</view>
<view class="content fl br-l padding-left-main" :data-value="item.express_number" @tap="text_copy_event">
<text>{{item.express_number}}</text>
<text class="bg-white br-green cr-green round padding-horizontal-sm text-size-xs margin-left-sm">{{$t('common.copy')}}</text>
</view>
</view>
</view>
</view>
@ -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({

48
pages/user-order-detail/user-order-detail.vue
View File

@ -3,7 +3,7 @@
<block v-if="detail != null">
<view class="padding-horizontal-main padding-top-main">
<!-- 地址 -->
<view v-if="(detail.order_model <= 2) && (detail.address_data || null) != null" class="address bg-white padding-horizontal-main padding-top-main border-radius-main spacing-mb">
<view v-if="(detail.address_data || null) != null" class="address bg-white padding-horizontal-main padding-top-main border-radius-main spacing-mb">
<view class="address-base padding-top-xs padding-bottom oh">
<text v-if="(detail.address_data.alias || null) != null" class="address-alias round br-main cr-main bg-white margin-right-sm">{{ detail.address_data.alias }}</text>
<text>{{ detail.address_data.name }}</text>
@ -13,7 +13,7 @@
<image class="icon fl" :src="common_static_url + 'map-icon.png'" mode="widthFix"></image>
<view class="text fr">
<text>{{ detail.address_data.province_name }}{{ detail.address_data.city_name }}{{ detail.address_data.county_name }}{{ detail.address_data.address }}</text>
<text v-if="detail.order_model == 2 && (detail.address_data.lng || 0) != 0 && (detail.address_data.lat || 0) != 0" class="address-map-submit cr-base br round bg-white margin-left-sm text-size-xs" @tap="address_map_event">{{$t('user-order-detail.user-order-detail.7lp6gw')}}</text>
<text v-if="(detail.address_data.lng || 0) != 0 && (detail.address_data.lat || 0) != 0" class="address-map-submit cr-base br round bg-white margin-left-sm text-size-xs" @tap="address_map_event">{{$t('user-order-detail.user-order-detail.7lp6gw')}}</text>
</view>
</view>
<view v-if="(detail.address_data.extraction_contact_name || null) != null || (detail.address_data.extraction_contact_tel || null) != null || (detail.address_data.appoint_time || null) != null" class="padding-vertical-main br-t-dashed">
@ -51,6 +51,35 @@
<view class="padding-top-main tr cr-base text-size">
<text>{{$t('user-order-detail.user-order-detail.423rmr')}}<text class="fw-b">{{ detail.buy_number_count }}</text>{{$t('user-order-detail.user-order-detail.41ty94')}}<text class="sales-price margin-right-xs">{{ detail.currency_data.currency_symbol }}{{ detail.total_price }}</text></text>
</view>
</view>
<!-- 服务信息 -->
<view v-if="(detail.service_data || null) != null" class="service-data panel-item padding-main border-radius-main bg-white spacing-mb">
<view class="br-b padding-bottom-main fw-b text-size">{{$t('user-order-detail.user-order-detail.567ygf')}}</view>
<view class="panel-content oh padding-top-main">
<view class="item br-b-dashed oh padding-vertical-main">
<view class="title fl padding-right-main cr-grey">{{$t('user-order-detail.user-order-detail.gsfw4d')}}</view>
<view class="content fl br-l padding-left-main">{{ detail.service_data.service_name }}</view>
</view>
<view class="item br-b-dashed oh padding-vertical-main">
<view class="title fl padding-right-main cr-grey">{{$t('user-order-detail.user-order-detail.6ygfew')}}</view>
<view class="content fl br-l padding-left-main" :data-value="detail.service_data.service_mobile" @tap="text_copy_event">
<text>{{ detail.service_data.service_mobile }}</text>
<text class="bg-white br-green cr-green round padding-horizontal-sm text-size-xs margin-left-sm">{{$t('common.copy')}}</text>
</view>
</view>
<view v-if="(detail.service_data.service_duration_minute_text || null) != null" class="item br-b-dashed oh padding-vertical-main">
<view class="title fl padding-right-main cr-grey">{{$t('user-order-detail.user-order-detail.67ujfr')}}</view>
<view class="content fl br-l padding-left-main">{{ detail.service_data.service_duration_minute_text }}</view>
</view>
<view class="item br-b-dashed oh padding-vertical-main">
<view class="title fl padding-right-main cr-grey">{{$t('common.service_time')}}</view>
<view class="content fl br-l padding-left-main">
<view v-if="(detail.service_data.service_start_time || null) != null">{{ detail.service_data.service_start_time }}</view>
<view v-if="(detail.service_data.service_end_time || null) != null">{{ detail.service_data.service_end_time }}</view>
</view>
</view>
</view>
</view>
<!-- 虚拟销售数据 -->
@ -88,8 +117,12 @@
<view class="br-b padding-bottom-main fw-b text-size">{{$t('user-order-detail.user-order-detail.0f26j2')}}</view>
<view class="panel-content oh">
<view v-for="(item, index) in detail_list" :key="index" class="item br-b-dashed oh padding-vertical-main">
<view class="title fl padding-right-main cr-grey">{{ item.name }}</view>
<view class="content fl br-l padding-left-main" :data-value="item.value" @tap="text_copy_event">{{ item.value }}</view>
<view class="title fl padding-right-main cr-grey">{{ item.name }}</view>
<view v-if="(item.is_copy || 0) == 1" class="content fl br-l padding-left-main" :data-value="item.value" @tap="text_copy_event">
<text>{{ item.value }}</text>
<text class="bg-white br-green cr-green round padding-horizontal-sm text-size-xs margin-left-sm">{{$t('common.copy')}}</text>
</view>
<view v-else class="content fl br-l padding-left-main">{{ item.value }}</view>
</view>
</view>
</view>
@ -105,7 +138,10 @@
</view>
<view class="item oh padding-vertical-main">
<view class="title fl padding-right-main cr-grey">{{$t('user-order-detail.user-order-detail.2byl8l')}}</view>
<view class="content fl br-l padding-left-main" :data-value="item.express_number" @tap="text_copy_event">{{item.express_number}}</view>
<view class="content fl br-l padding-left-main" :data-value="item.express_number" @tap="text_copy_event">
<text>{{item.express_number}}</text>
<text class="bg-white br-green cr-green round padding-horizontal-sm text-size-xs margin-left-sm">{{$t('common.copy')}}</text>
</view>
</view>
<view v-if="(item.note || null) != null" class="item oh padding-vertical-main">
<view class="title fl padding-right-main cr-grey">{{$t('common.note')}}:</view>
@ -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 || '' },

15
pages/user-orderaftersale-detail/user-orderaftersale-detail.vue
View File

@ -39,7 +39,7 @@
<!-- 提示/退货 -->
<view v-if="new_aftersale_data.status <= 2" class="msg-tips padding-main border-radius-main spacing-mb">
<text class="msg-text">{{ new_aftersale_data.tips_msg.title }}</text>
<text class="msg-a" @tap="show_aftersale_event"> {{$t('common.view_text')}} >></text>
<text class="msg-a margin-left-sm" @tap="show_aftersale_event"> {{$t('common.view_text')}} >></text>
<view v-if="new_aftersale_data.status == 1 && new_aftersale_data.type == 1 && return_goods_address != null" class="margin-top-sm oh">
<button class="bg-green cr-white round dis-block fl" type="default" size="mini" @tap="delivery_submit_event">{{$t('user-orderaftersale-detail.user-orderaftersale-detail.uuhf62')}}</button>
</view>
@ -70,8 +70,12 @@
<view class="br-b padding-bottom-main fw-b text-size">{{$t('invoice-detail.invoice-detail.s70kj4')}}</view>
<view class="panel-content oh">
<view v-for="(item, index) in panel_base_data_list" :key="index" class="item br-b oh padding-vertical-main">
<view class="title fl padding-right-main cr-grey">{{ item.name }}</view>
<view class="content fl br-l padding-left-main">{{ new_aftersale_data[item.field] || "" }}</view>
<view class="title fl padding-right-main cr-grey">{{ item.name }}</view>
<view v-if="(item.is_copy || 0) == 1" class="content fl br-l padding-left-main" :data-value="new_aftersale_data[item.field] || ''" data-event="copy" @tap="text_event">
<text>{{ new_aftersale_data[item.field] || '' }}</text>
<text class="bg-white br-green cr-green round padding-horizontal-sm text-size-xs margin-left-sm">{{$t('common.copy')}}</text>
</view>
<view v-else class="content fl br-l padding-left-main">{{ new_aftersale_data[item.field] || '' }}</view>
</view>
</view>
</view>
@ -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'),