订单快递信息展示优化

7963a1f8 · gongfuxiang · b2810500 · 7963a1f8 · 7963a1f8 · 7963a1f8
12 changed file
--- a/lang/en.json
+++ b/lang/en.json
@@ -42,7 +42,8 @@
 		"sending_in_text": "Sending",
 		"sending": "Sending",
 		"scan_name": "Scan it",
-		"not_have_name": "not have"
+		"not_have_name": "not have",
+        "note": "Remarks"
 	},
 	"pages": {
 		"goods-category": "Product classification",
@@ -299,6 +300,7 @@
 			"xcj552": "element",
 			"7xtnjt": "Unconfigured data",
 			"7dikfm": "Pickup information",
+            "0876xf": "Express delivery information",
 			"o38952": "Pickup code:",
 			"0f26j2": "Order Information",
 			"ct34n5": "Extended Data",
@@ -1095,7 +1097,6 @@
 	"invoice-detail": {
 		"invoice-detail": {
 			"s70kj4": "Application Information",
-			"0876xf": "Express delivery information",
 			"1s2f0g": "Electronic invoice",
 			"4tu3v3": "You can click on the invoice name and copy it, then go to the browser to open the address and download the invoice.",
 			"rrfex6": "state",
@@ -1116,7 +1117,6 @@
 	"invoice-saveinfo": {
 		"invoice-saveinfo": {
 			"x8hhiv": "Unified social credit code or tax identification number for enterprises",
-			"tng0se": "Remarks",
 			"t3i3e3": "Please select invoice type",
 			"k31t2s": "Please select the application type",
 			"i73t3c": "Please select invoice content",

--- a/lang/zh.json
+++ b/lang/zh.json
@@ -42,7 +42,8 @@
 		"sub_error_retry_tips": "提交失败，请重试！",
 		"not_more_list_data_tips": "无更多列表数据",
 		"scan_name": "扫一扫",
-		"not_have_name": "没有"
+		"not_have_name": "没有",
+        "note": "备注"
 	},
 	"pages": {
 		"goods-category": "商品分类",
@@ -290,6 +291,7 @@
 			"41ty94": "件 合计",
 			"7xtnjt": "未配置数据",
 			"7dikfm": "取货信息",
+            "0876xf": "快递信息",
 			"o38952": "取货码：",
 			"0f26j2": "订单信息",
 			"ct34n5": "扩展数据",
@@ -1086,7 +1088,6 @@
 	"invoice-detail": {
 		"invoice-detail": {
 			"s70kj4": "申请信息",
-			"0876xf": "快递信息",
 			"1s2f0g": "电子发票",
 			"4tu3v3": "可点击发票名称复制后、到浏览器打开地址下载发票。",
 			"rrfex6": "状态",
@@ -1107,7 +1108,6 @@
 	"invoice-saveinfo": {
 		"invoice-saveinfo": {
 			"x8hhiv": "企业统一社会信用代码或纳税识别号",
-			"tng0se": "备注",
 			"t3i3e3": "请选择发票类型",
 			"k31t2s": "请选择申请类型",
 			"i73t3c": "请选择发票内容",

--- a/pages/plugins/invoice/invoice-detail/invoice-detail.vue
+++ b/pages/plugins/invoice/invoice-detail/invoice-detail.vue
@@ -14,7 +14,7 @@

                <!-- 快递信息 -->
                <view v-if="detail.status == 2 && detail.invoice_type != 0 && express_data.length > 0" class="panel-item padding-main border-radius-main bg-white spacing-mb">
-                    <view class="br-b padding-bottom-main fw-b text-size">{{$t('invoice-detail.invoice-detail.0876xf')}}</view>
+                    <view class="br-b padding-bottom-main fw-b text-size">{{$t('user-order-detail.user-order-detail.0876xf')}}</view>
                    <view class="panel-content oh">
                        <view v-for="(item, index) in express_data" :key="index" class="item br-b oh padding-vertical-main">
                            <view class="title fl padding-right-main cr-grey">{{ item.name }}</view>

--- a/pages/plugins/invoice/invoice-saveinfo/invoice-saveinfo.vue
+++ b/pages/plugins/invoice/invoice-saveinfo/invoice-saveinfo.vue
@@ -98,7 +98,7 @@
                            </view>

                            <view class="form-gorup">
-                                <view class="form-gorup-title">{{$t('invoice-saveinfo.invoice-saveinfo.tng0se')}}</view>
+                                <view class="form-gorup-title">{{$t('common.note')}}</view>
                                <input type="text" name="user_note" placeholder-class="cr-grey" class="cr-base" :placeholder="$t('invoice-saveinfo.invoice-saveinfo.vaw647')" maxlength="60" :value="data.user_note || ''" />
                            </view>
                        </view>
@@ -196,7 +196,7 @@
                    success: (res) => {
                        uni.stopPullDownRefresh();
                        if (res.data.code == 0) {
-                            var data = res.data.data;
+                            var data = res.data.data;
                            var default_data = ((data.data || null) == null || data.data.length == 0) ? null : data.data;
                            var upd_data = {
                                data_base: data.base || null,

--- a/pages/plugins/realstore/batchorder-list/batchorder-list.vue
+++ b/pages/plugins/realstore/batchorder-list/batchorder-list.vue
@@ -72,7 +72,7 @@ export default {
            nav_status_index: 0,
            content_list: [
                { name: this.$t('form.form.xy87t8'), field: "describe" },
-                { name: this.$t('invoice-saveinfo.invoice-saveinfo.tng0se'), field: "note" },
+                { name: this.$t('common.note'), field: "note" },
                { name: this.$t('buy.buy.s7rr5s'), field: "upd_time" },
                { name: this.$t('invoice-detail.invoice-detail.rrfex6'), field: "status_name" },
            ],

--- a/pages/plugins/scanpay/index/index.vue
+++ b/pages/plugins/scanpay/index/index.vue
@@ -55,7 +55,7 @@
                    <uni-popup ref="inputDialog" type="dialog" :animation="false">
                        <view class="dialog-container">
                            <view class="dialog-title">
-                                <text>{{$t('invoice-saveinfo.invoice-saveinfo.tng0se')}}</text>
+                                <text>{{$t('common.note')}}</text>
                            </view>
                            <view class="dialog-content">
                                <input type="text" class="dialog-input" maxlength="200" @input="input_change" />

--- a/pages/plugins/signin/user-qrcode-detail/user-qrcode-detail.vue
+++ b/pages/plugins/signin/user-qrcode-detail/user-qrcode-detail.vue
@@ -118,7 +118,7 @@ export default {
                                { name: this.$t('user-qrcode-detail.user-qrcode-detail.do23j6'), value: data.data.name || "" },
                                { name: this.$t('user-qrcode-detail.user-qrcode-detail.5k2ibd'), value: data.data.tel || "" },
                                { name: this.$t('user-qrcode-detail.user-qrcode-detail.911a61'), value: data.data.address || "" },
-                                { name: this.$t('invoice-saveinfo.invoice-saveinfo.tng0se'), value: data.data.note || "" },
+                                { name: this.$t('common.note'), value: data.data.note || "" },
                                { name: this.$t('user-order-detail.user-order-detail.h2c78h'), value: data.data.add_time || "" },
                                { name: this.$t('order-detail.order-detail.21ift9'), value: data.data.upd_time || "" },
                            ],

--- a/pages/plugins/signin/user-qrcode-saveinfo/user-qrcode-saveinfo.vue
+++ b/pages/plugins/signin/user-qrcode-saveinfo/user-qrcode-saveinfo.vue
@@ -32,7 +32,7 @@
                            </view>
                        </view>
                        <view class="form-gorup">
-                            <view class="form-gorup-title">{{$t('invoice-saveinfo.invoice-saveinfo.tng0se')}}</view>
+                            <view class="form-gorup-title">{{$t('common.note')}}</view>
                            <input type="text" name="note" placeholder-class="cr-grey" class="cr-base" :placeholder="$t('invoice-saveinfo.invoice-saveinfo.vaw647')" maxlength="60" :value="data.note || ''" />
                        </view>
                        <view class="bottom-fixed">

--- a/pages/plugins/wallet/user-cash-detail/user-cash-detail.vue
+++ b/pages/plugins/wallet/user-cash-detail/user-cash-detail.vue
@@ -96,7 +96,7 @@ export default {
                                { name: this.$t('user-cash-detail.user-cash-detail.m556tl'), value: data.data.bank_accounts || "" },
                                { name: this.$t('user-cash-detail.user-cash-detail.i308o1'), value: data.data.pay_money <= 0 ? "" : data.data.pay_money || "" },
                                { name: this.$t('user-cash-detail.user-cash-detail.451xxt'), value: data.data.pay_time_time || "" },
-                                { name: this.$t('invoice-saveinfo.invoice-saveinfo.tng0se'), value: data.data.msg || "" },
+                                { name: this.$t('common.note'), value: data.data.msg || "" },
                                { name: this.$t('user-cash-detail.user-cash-detail.y96262'), value: data.data.add_time_time || "" },
                                { name: this.$t('order-detail.order-detail.21ift9'), value: data.data.upd_time_time || "" },
                            ],

--- a/pages/plugins/wallet/user-transfer-detail/user-transfer-detail.vue
+++ b/pages/plugins/wallet/user-transfer-detail/user-transfer-detail.vue
@@ -90,7 +90,7 @@ export default {
                            detail_list: [
                                { name: this.$t('user-transfer-detail.user-transfer-detail.stj2eh'), value: data.data.transfer_no || "" },
                                { name: this.$t('transfer.transfer.2q274j'), value: data.data.money || "" },
-                                { name: this.$t('invoice-saveinfo.invoice-saveinfo.tng0se'), value: data.data.note || "" },
+                                { name: this.$t('common.note'), value: data.data.note || "" },
                                { name: this.$t('user-transfer-detail.user-transfer-detail.x17599'), value: data.data.add_time || "" },
                            ],
                            data_list_loding_status: 3,

--- a/pages/user-order-detail/user-order-detail.vue
+++ b/pages/user-order-detail/user-order-detail.vue
@@ -85,6 +85,27 @@
                            <view class="content fl br-l padding-left-main" :data-value="item.value" @tap="text_copy_event">{{ item.value }}</view>
                        </view>
                    </view>
+                </view>
+
+                <!-- 快递信息 -->
+                <view v-if="(detail.express_data || null) != null && detail.express_data.length > 0" class="express-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.0876xf')}}</view>
+                    <view class="panel-content">
+                        <view v-for="(item, index) in detail.express_data" :key="index" class="item br-b-dashed oh padding-vertical-main">
+                            <view class="item oh padding-vertical-main">
+                                <view class="title fl padding-right-main cr-grey">{{$t('user-order-detail.user-order-detail.12d445')}}</view>
+                                <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>
+                            <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>
+                                <view class="content fl br-l padding-left-main" :data-value="item.note" @tap="text_copy_event">{{item.note}}</view>
+                            </view>
+                        </view>
+                    </view>
                </view>

                <!-- 扩展数据 -->
@@ -193,8 +214,6 @@
                                    { name: this.$t('user-order-detail.user-order-detail.8b18q8'), value: data.data.increase_price || '' },
                                    { name: this.$t('user-order-detail.user-order-detail.516tlr'), value: data.data.pay_price || '' },
                                    { name: this.$t('user-order-detail.user-order-detail.0e1sfs'), value: (data.data.payment_name || '') + ((data.data.is_under_line_text || null) == null || (data.data.payment_name || null) == null ? '' : '（' + data.data.is_under_line_text + '）') },
-                                    { name: this.$t('user-order-detail.user-order-detail.12d445'), value: data.data.express_name || '' },
-                                    { name: this.$t('user-order-detail.user-order-detail.2byl8l'), value: data.data.express_number || '' },
                                    { name: this.$t('user-order-detail.user-order-detail.2b5fc8'), value: data.data.user_note || '' },
                                    { name: this.$t('user-order-detail.user-order-detail.h2c78h'), value: data.data.add_time || '' },
                                    { name: this.$t('user-order-detail.user-order-detail.9vivhl'), value: data.data.confirm_time || '' },
@@ -263,13 +282,13 @@
            // url事件
            url_event(e) {
                app.globalData.url_event(e);
-            },
-
-            // 文本复制
-            text_copy_event(e) {
-                if((e.currentTarget.dataset.value || null) != null) {
-                    app.globalData.text_copy_event(e);
-                }
+            },
+
+            // 文本复制
+            text_copy_event(e) {
+                if((e.currentTarget.dataset.value || null) != null) {
+                    app.globalData.text_copy_event(e);
+                }
            }
        },
    };

--- a/pages/user-orderaftersale-detail/user-orderaftersale-detail.vue
+++ b/pages/user-orderaftersale-detail/user-orderaftersale-detail.vue
@@ -105,7 +105,7 @@

                    <!-- 快递信息 -->
                    <view v-if="new_aftersale_data.status > 1 && new_aftersale_data.type == 1" class="panel-item padding-main border-radius-main bg-white spacing-mb">
-                        <view class="br-b padding-bottom-main fw-b text-size">{{$t('invoice-detail.invoice-detail.0876xf')}}</view>
+                        <view class="br-b padding-bottom-main fw-b text-size">{{$t('user-order-detail.user-order-detail.0876xf')}}</view>
                        <view class="panel-content oh">
                            <view v-for="(item, index) in panel_express_data_list" :key="index" class="item br-b oh padding-vertical-main">
                                <view class="title fl padding-right-main cr-grey">{{ item.name }}</view>
@@ -590,13 +590,13 @@ export default {
                images: this.form_images_list.length > 0 ? JSON.stringify(this.form_images_list) : "",
            };

-            // 防止金额大于计算的金额
+            // 防止金额大于计算的金额
            var refund_price = parseFloat(this.returned_data["refund_price"]);
            if (form_data["price"] > refund_price) {
                form_data["price"] =refund_price;
            }

-            // 防止数量大于计算的数量
+            // 防止数量大于计算的数量
            var returned_quantity = parseInt(this.returned_data["returned_quantity"]);
            if (form_data["number"] > returned_quantity) {
                form_data["number"] = returned_quantity;
@@ -619,7 +619,7 @@ export default {
                    fields: "number",
                    msg: this.$t('user-orderaftersale-detail.user-orderaftersale-detail.dn3423'),
                });
-            }
+            }

            // 校验参数并提交
            if (app.globalData.fields_check(form_data, validation)) {