From bb12531dd42a1bea310c7e5f3feafd6ef33a7b26 Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Thu, 31 Oct 2024 21:51:13 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=94=AF=E6=8C=81=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E8=B5=84=E6=BA=90=E6=8F=92=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                       |   8 +-
 locale/en.json                                |  15 +-
 locale/zh.json                                |  11 +-
 pages.json                                    |  12 ++
 pages/plugins/blog/form/form.vue              |   2 +-
 pages/plugins/givegift/code/code.vue          |   8 +-
 .../orderresources/orderannex/orderannex.css  |  18 ++
 .../orderresources/orderannex/orderannex.vue  | 169 ++++++++++++++++++
 pages/user-order/user-order.vue               |   6 +-
 9 files changed, 232 insertions(+), 17 deletions(-)
 create mode 100644 pages/plugins/orderresources/orderannex/orderannex.css
 create mode 100644 pages/plugins/orderresources/orderannex/orderannex.vue

diff --git a/App.vue b/App.vue
index 582b38ce..813b8cc5 100644
--- a/App.vue
+++ b/App.vue
@@ -7,10 +7,10 @@
             data: {
                 // 基础配置
                 // 数据接口请求地址
-                request_url:'https://d1.shopxo.vip/',
+                request_url:'http://shopxo.com/',
 
                 // 静态资源地址（如系统根目录不在public目录下面请在静态地址后面加public目录、如：https://d1.shopxo.vip/public/）
-                static_url:'https://d1.shopxo.vip/',
+                static_url:'http://shopxo.com/',
 
                 // 系统类型（默认default、如额外独立小程序、可与程序分身插件实现不同主体小程序及支付独立）
                 system_type: 'default',
@@ -1797,12 +1797,12 @@
             },
 
             // 图片预览
-            image_show_event(e) {
+            image_show_event(e, urls = null) {
                 var value = e.currentTarget.dataset.value || null;
                 if (value != null) {
                     uni.previewImage({
                         current: value,
-                        urls: [value],
+                        urls: urls || [value],
                     });
                 } else {
                     this.showToast(i18n.t('shopxo-uniapp.app.qm8548'));
diff --git a/locale/en.json b/locale/en.json
index 5e4f977c..d80714bc 100644
--- a/locale/en.json
+++ b/locale/en.json
@@ -20,6 +20,9 @@
 		"edit": "Edit",
         "link": "Link",
         "gift": "Gift",
+        "image": "Image",
+        "video": "Video",
+        "file": "File",
 		"more": "More",
 		"more_null": "",
         "view_more": "View more",
@@ -67,7 +70,8 @@
 		"apply_time": "Application time",
         "verification_text": "Verification code",
         "verification_message": "Please enter the verification code",
-        "not_supported_scan_tips": "H5 webpage does not support scanning codes"
+        "not_supported_scan_tips": "H5 webpage does not support scanning codes",
+        "copy_link": "Copy link"
 	},
 	"pages": {
 		"goods-category": "Product classification",
@@ -233,7 +237,12 @@
 		"plugins-coin-recharge-list": "Recharge details",
         "plugins-antifakecode-index": "Authentic inquiry",
         "plugins-giftcard-index": "My gift card",
-        "plugins-giftcard-form": "Gift card redemption"
+        "plugins-giftcard-form": "Gift card redemption",
+        "plugins-givegift-goods": "Buying Gifts",
+        "plugins-givegift-receive": "Gift collection",
+        "plugins-givegift-gift": "My gift",
+        "plugins-givegift-code": "Gift Link",
+        "plugins-orderresources-orderannex": "Order Resources"
 	},
 	"login": {
 		"login": {
@@ -729,7 +738,6 @@
 			"4h814w": "Pack up more",
 			"lfwj0g": "Expand more",
 			"2e5rv3": "Uploading, please wait a moment",
-			"3h58hv": "picture",
 			"v19gg8": "Please enter a title",
 			"gu3x97": "Please select a category",
 			"adiq70": "Please enter the content"
@@ -1463,6 +1471,7 @@
 			"lp1v28": "Urge and urge",
 			"ht65c9": "Suborder",
 			"9l47b6": "form",
+            "fyuikn": "resources",
 			"3l2jr5": "buy-back",
 			"7571p2": "Merge payments",
 			"hp123x": "To be picked up",
diff --git a/locale/zh.json b/locale/zh.json
index a9a99952..4a580848 100644
--- a/locale/zh.json
+++ b/locale/zh.json
@@ -20,6 +20,9 @@
 		"edit": "编辑",
         "link": "链接",
         "gift": "礼物",
+        "image": "图片",
+        "video": "视频",
+        "file": "文件",
 		"more": "更多",
 		"more_null": "更 多",
         "view_more": "查看更多",
@@ -67,7 +70,8 @@
 		"apply_time": "申请时间",
         "verification_text": "核销码",
         "verification_message": "请输入核销码",
-        "not_supported_scan_tips": "H5网页不支持扫码"
+        "not_supported_scan_tips": "H5网页不支持扫码",
+        "copy_link": "复制链接"
 	},
 	"pages": {
 		"goods-category": "商品分类",
@@ -235,7 +239,8 @@
         "plugins-givegift-goods": "购买礼品",
         "plugins-givegift-receive": "礼品领取",
         "plugins-givegift-gift": "我的送礼",
-        "plugins-givegift-code": "礼品链接"
+        "plugins-givegift-code": "礼品链接",
+        "plugins-orderresources-orderannex": "订单资源"
 	},
 	"login": {
 		"login": {
@@ -723,7 +728,6 @@
 			"4h814w": "收起更多",
 			"lfwj0g": "展开更多",
 			"2e5rv3": "上传中请稍后",
-			"3h58hv": "图片",
 			"v19gg8": "请输入标题",
 			"gu3x97": "请选择分类",
 			"adiq70": "请输入内容"
@@ -1455,6 +1459,7 @@
 			"lp1v28": "催催",
 			"ht65c9": "子单",
 			"9l47b6": "表单",
+            "fyuikn": "资源",
 			"3l2jr5": "回购",
 			"7571p2": "合并支付",
 			"hp123x": "待取货",
diff --git a/pages.json b/pages.json
index 4fe20027..19414868 100644
--- a/pages.json
+++ b/pages.json
@@ -1653,6 +1653,18 @@
                     }
                 }
             ]
+        },
+        {
+            "root": "pages/plugins/orderresources",
+            "pages": [
+                {
+                    "path": "orderannex/orderannex",
+                    "style": {
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                }
+            ]
         }
     ],
     "preloadRule": {
diff --git a/pages/plugins/blog/form/form.vue b/pages/plugins/blog/form/form.vue
index 3d6992a7..8a9b766f 100644
--- a/pages/plugins/blog/form/form.vue
+++ b/pages/plugins/blog/form/form.vue
@@ -362,7 +362,7 @@
                                 editorCtx.insertImage({
                                     src: data.data.url, // 此处需要将图片地址切换成服务器返回的真实图片地址
                                     // width: '50%',
-                                    alt: self.$t('form.form.3h58hv'),
+                                    alt: self.$t('common.video'),
                                     success: function (e) {},
                                 });
                                 uni.hideLoading();
diff --git a/pages/plugins/givegift/code/code.vue b/pages/plugins/givegift/code/code.vue
index a493d0f6..482adda5 100644
--- a/pages/plugins/givegift/code/code.vue
+++ b/pages/plugins/givegift/code/code.vue
@@ -27,7 +27,7 @@
             </view>
             <view v-else>
                 <!-- 提示信息 -->
-                <component-no-data :propStatus="data_list_loding_status"></component-no-data>
+                <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
             </view>
             <!-- 结尾 -->
             <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
@@ -51,7 +51,8 @@
                 data_total: 0,
                 data_page_total: 0,
                 data_page: 1,
-                data_list_loding_status: 1,
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
                 data_bottom_line_status: false,
                 data_is_loading: 0,
                 params: null,
@@ -144,7 +145,7 @@
                                 data_list_loding_status: 2,
                                 data_list_loding_msg: res.data.msg,
                             });
-                            if (app.globalData.is_login_check(res.data, this, 'get_data_base')) {
+                            if (app.globalData.is_login_check(res.data, this, 'get_data')) {
                                 app.globalData.showToast(res.data.msg);
                             }
                         }
@@ -154,7 +155,6 @@
                         this.setData({
                             data_bottom_line_status: false,
                             data_list_loding_status: 2,
-                            data_list_loding_msg: this.$t('common.internet_error_tips'),
                         });
                         app.globalData.showToast(this.$t('common.internet_error_tips'));
                     },
diff --git a/pages/plugins/orderresources/orderannex/orderannex.css b/pages/plugins/orderresources/orderannex/orderannex.css
new file mode 100644
index 00000000..3bcc6eb3
--- /dev/null
+++ b/pages/plugins/orderresources/orderannex/orderannex.css
@@ -0,0 +1,18 @@
+.images-data-list .item {
+    gap: 40rpx 20rpx;
+}
+.images-data-list .item-content {
+    width: calc(25% - 21rpx);
+    height: 200rpx;
+}
+.images-data-list .item .image,
+.video-data-list .item .video {
+    height: calc(100% - 40rpx);
+}
+.video-data-list .item {
+    gap: 50rpx 20rpx;
+}
+.video-data-list .item-content {
+    width: 100%;
+    height: 440rpx;
+}
\ No newline at end of file
diff --git a/pages/plugins/orderresources/orderannex/orderannex.vue b/pages/plugins/orderresources/orderannex/orderannex.vue
new file mode 100644
index 00000000..9a19e3be
--- /dev/null
+++ b/pages/plugins/orderresources/orderannex/orderannex.vue
@@ -0,0 +1,169 @@
+<template>
+    <view :class="theme_view">
+        <block v-if="(data || null) != null && ((data.images_data || null) != null || (data.video_data || null) != null || (data.file_data || null) != null || (data.note || null) != null)">
+            <!-- 图片 -->
+            <view v-if="(data.images_data || null) != null" class="images-data-list padding-vertical-main padding-left-main margin-bottom-lg">
+                <view class="fw-b text-size-sm margin-bottom padding-bottom-sm br-b">{{$t('common.image')}}</view>
+                <view class="item flex-row flex-wrap align-s gap-10">
+                    <view v-for="(item, index) in data.images_data" :key="index" class="item-content">
+                        <image :src="item" mode="aspectFill" class="image radius wh-auto" :data-value="item" @tap="image_show_event"></image>
+                        <view class="tc br-green cr-green round text-size-xs padding-vertical-xs" :data-value="item" @tap="text_copy_event">{{$t('common.copy_link')}}</view>
+                    </view>
+                </view>
+            </view>
+
+            <!-- 视频 -->
+            <view v-if="(data.video_data || null) != null" class="video-data-list padding-main margin-bottom-lg">
+                <view class="fw-b text-size-sm margin-bottom padding-bottom-sm br-b">{{$t('common.video')}}</view>
+                <view class="item flex-row flex-wrap align-s gap-10">
+                    <view v-for="(item, index) in data.video_data" :key="index" class="item-content">
+                        <video :src="item" class="video radius wh-auto"></video>
+                        <view class="tc br-green cr-green round text-size-xs padding-vertical-xs" :data-value="item" @tap="text_copy_event">{{$t('common.copy_link')}}</view>
+                    </view>
+                </view>
+            </view>
+
+            <!-- 文件 -->
+            <view v-if="(data.file_data || null) != null" class="file-data-list padding-main margin-bottom-lg">
+                <view class="fw-b text-size-sm margin-bottom padding-bottom-sm br-b">{{$t('common.file')}}</view>
+                <view class="item flex-row flex-wrap align-s gap-10">
+                    <view v-for="(item, index) in data.file_data" :key="index" class="item-content">
+                        <text :src="item.url">{{item.title}}</text>
+                        <text class="tc br-green cr-green round text-size-xs padding-vertical-xs padding-horizontal-sm margin-left-sm" :data-value="item.url" @tap="text_copy_event">{{$t('common.copy_link')}}</text>
+                    </view>
+                </view>
+            </view>
+            
+            <!-- 备注 -->
+            <view v-if="(data.note || null) != null" class="file-data-list padding-main margin-bottom-lg">
+                <view class="fw-b text-size-sm margin-bottom padding-bottom-sm br-b">{{$t('common.note')}}</view>
+                <view>{{data.note}}</view>
+            </view>
+
+            <!-- 结尾 -->
+            <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+        </block>
+        <block v-else>
+            <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+        </block>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from '@/components/no-data/no-data';
+    import componentBottomLine from '@/components/bottom-line/bottom-line';
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                data_bottom_line_status: false,
+                params: null,
+                data: null
+            };
+        },
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine
+        },
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 参数
+            this.setData({
+                params: app.globalData.launch_params_handle(params)
+            });
+            this.init();
+        },
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.init();
+        },
+        methods: {
+            init() {
+                var user = app.globalData.get_user_info(this, 'init');
+                if (user != false) {
+                    this.get_data();
+                } else {
+                    this.setData({
+                        data_list_loding_status: 0,
+                        data_bottom_line_status: false,
+                    });
+                }
+            },
+
+            // 获取公共数据
+            get_data() {
+                uni.request({
+                    url: app.globalData.get_request_url('index', 'orderannex', 'orderresources'),
+                    method: 'POST',
+                    data: this.params,
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            this.setData({
+                                data: data.data || null,
+                                data_list_loding_status: 0,
+                                data_list_loding_msg: '',
+                                data_bottom_line_status: true,
+                                data_page: 1,
+                            });
+                            this.get_data_list();
+                        } else {
+                            this.setData({
+                                data_bottom_line_status: false,
+                                data_list_loding_status: 2,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, 'get_data')) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_bottom_line_status: false,
+                            data_list_loding_status: 2,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                    },
+                });
+            },
+
+            // 图片查看
+            image_show_event(e) {
+                app.globalData.image_show_event(e, this.data.images_data);
+            },
+
+            // 文本复制
+            text_copy_event(e) {
+                app.globalData.text_copy_event(e);
+            }
+        }
+    };
+</script>
+<style>
+    @import './orderannex.css';
+</style>
\ No newline at end of file
diff --git a/pages/user-order/user-order.vue b/pages/user-order/user-order.vue
index 0d4b993d..cb8c2e09 100644
--- a/pages/user-order/user-order.vue
+++ b/pages/user-order/user-order.vue
@@ -46,7 +46,7 @@
                                 </view>
                             </view>
                         </view>
-                        <view class="padding-vertical-main tr cr-base text-size">
+                        <view class="padding-vertical-main tr cr-base text-size-sm">
                             <text>{{$t('user-order-detail.user-order-detail.423rmr')}}<text class="fw-b">{{ item.buy_number_count }}</text>{{$t('user-order-detail.user-order-detail.41ty94')}}<text class="sales-price margin-right-xs">{{ item.currency_data.currency_symbol }}{{ item.total_price }}</text></text>
                         </view>
                         <view
@@ -61,7 +61,8 @@
                                     (item.plugins_is_order_batch_button || 0) +
                                     (item.plugins_is_order_frequencycard_button || 0) +
                                     (item.plugins_delivery_data || 0) +
-                                    (item.plugins_ordergoodsform_data || 0)
+                                    (item.plugins_ordergoodsform_data || 0) +
+                                    (item.plugins_orderresources_data || 0)
                                  > 0 ) ||
                                 (item.status == 2 && item.order_model != 2) ||
                                 ((item.plugins_express_data || 0) == 1 && (item.express_data || null) != null) ||
@@ -80,6 +81,7 @@
                             <button v-if="(item.plugins_is_order_batch_button || 0) == 1" class="round bg-white cr-blue br-blue margin-bottom-main" type="default" size="mini" @tap="url_event" :data-value="'/pages/plugins/realstore/batchorder-list/batchorder-list?oid=' + item.id" hover-class="none">{{$t('orderallot-list.orderallot-list.6m73j2')}}</button>
                             <button v-if="(item.plugins_is_order_frequencycard_button || 0) == 1" class="round bg-white cr-green br-green margin-bottom-main" type="default" size="mini" @tap="url_event" :data-value="'/pages/plugins/realstore/frequencycard-list/frequencycard-list?oid=' + item.id" hover-class="none">{{$t('orderallot-list.orderallot-list.b13k5r')}}</button>
                             <button v-if="(item.plugins_ordergoodsform_data || 0) == 1" class="round bg-white cr-blue br-blue margin-bottom-main" type="default" size="mini" @tap="url_event" :data-value="'/pages/plugins/ordergoodsform/order/order?id=' + item.id" hover-class="none">{{$t('user-order.user-order.9l47b6')}}</button>
+                            <button v-if="(item.plugins_orderresources_data || 0) == 1" class="round bg-white cr-blue br-blue margin-bottom-main" type="default" size="mini" @tap="url_event" :data-value="'/pages/plugins/orderresources/orderannex/orderannex?oid=' + item.id" hover-class="none">{{$t('user-order.user-order.fyuikn')}}</button>
                             <button v-if="(item.plugins_intellectstools_data || null) != null && (item.plugins_intellectstools_data.continue_buy_data || null) != null && item.plugins_intellectstools_data.continue_buy_data.length > 0" class="round bg-white cr-green br-green margin-bottom-main" type="default" size="mini" :data-index="index" @tap="continue_buy_event" hover-class="none">{{$t('user-order.user-order.3l2jr5')}}</button>
                         </view>
                     </view>