From c4a8db98cdbdd039ed0e0a360be30d159965493d Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Mon, 16 Dec 2024 17:10:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B8=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                       |   4 +-
 components/realstore-cart/realstore-cart.vue  |   2 +-
 locale/en.json                                |   3 +-
 locale/zh.json                                |   3 +-
 .../components/ask-comments/ask-comments.vue  |   4 +-
 pages/plugins/ask/detail/detail.vue           |   8 +-
 pages/plugins/ask/goods-list/goods-list.vue   |   6 +-
 pages/plugins/ask/index/index.vue             |   7 +-
 pages/plugins/ask/user-detail/user-detail.vue |   8 +-
 pages/plugins/ask/user-list/user-list.vue     |   4 +-
 pages/plugins/form/check/check.vue            | 121 ++++++++++++++++--
 11 files changed, 144 insertions(+), 26 deletions(-)

diff --git a/App.vue b/App.vue
index c79c08bf..4ad210ea 100644
--- a/App.vue
+++ b/App.vue
@@ -7,10 +7,10 @@
             data: {
                 // 基础配置
                 // 数据接口请求地址
-                request_url:'https://d1.shopxo.vip/',
+                request_url:'https://san.shopxo.vip/',
 
                 // 静态资源地址（如系统根目录不在public目录下面请在静态地址后面加public目录、如：https://d1.shopxo.vip/public/）
-                static_url:'https://d1.shopxo.vip/',
+                static_url:'https://san.shopxo.vip/',
 
                 // 系统类型（默认default、如额外独立小程序、可与程序分身插件实现不同主体小程序及支付独立）
                 system_type: 'default',
diff --git a/components/realstore-cart/realstore-cart.vue b/components/realstore-cart/realstore-cart.vue
index 5d48264b..a6e30804 100644
--- a/components/realstore-cart/realstore-cart.vue
+++ b/components/realstore-cart/realstore-cart.vue
@@ -13,7 +13,7 @@
                                 <view v-if="(info.buy_use_type_list || null) != null && info.buy_use_type_list.length > 0" class="dis-inline-block margin-left-xl">
                                     <text class="cr-red">{{$t('realstore-cart.realstore-cart.v437n6')}}</text>
                                     <view class="va-m dis-inline-block br-green cr-green round padding-horizontal-sm padding-vertical-xs cp" @tap="buy_use_type_event">
-                                        <text class="va-m">{{$t('realstore-cart.realstore-cart.6bmc34')}}{{info.buy_use_type_list[buy_use_type_index]['name']}})</text>
+                                        <text class="va-m">{{$t('realstore-cart.realstore-cart.6bmc34')}}({{info.buy_use_type_list[buy_use_type_index]['name']}})</text>
                                         <view class="va-m dis-inline-block margin-left-xs">
                                             <iconfont name="icon-arrow-bottom" size="24rpx" propClass="cr-green"></iconfont>
                                         </view>
diff --git a/locale/en.json b/locale/en.json
index 8757d227..8fd7df0f 100644
--- a/locale/en.json
+++ b/locale/en.json
@@ -73,6 +73,7 @@
         "verification_text": "Verification code",
         "verification_message": "Please enter the verification code",
         "verification_mobile_message": "Please enter the verification code or mobile number",
+        "unique_message": "The unique identifier is empty",
         "not_supported_scan_tips": "H5 webpage does not support scanning codes",
         "copy_link": "Copy link"
 	},
@@ -1672,7 +1673,7 @@
 	"realstore-cart": {
 		"realstore-cart": {
 			"v437n6": "Do you have any purchased items?",
-			"6bmc34": "Switch（",
+			"6bmc34": "Switch",
 			"d1kk7x": "Please select the order type",
 			"2dc65q": "Please add the product first",
 			"50lf68": "Loading",
diff --git a/locale/zh.json b/locale/zh.json
index 112d0475..197358bd 100644
--- a/locale/zh.json
+++ b/locale/zh.json
@@ -73,6 +73,7 @@
         "verification_text": "核销码",
         "verification_message": "请输入核销码",
         "verification_mobile_message": "请输入核销码或手机",
+        "unique_message": "唯一标识为空",
         "not_supported_scan_tips": "H5网页不支持扫码",
         "copy_link": "复制链接"
 	},
@@ -1655,7 +1656,7 @@
 	"realstore-cart": {
 		"realstore-cart": {
 			"v437n6": "没有已加购的商品？",
-			"6bmc34": "切换(",
+			"6bmc34": "切换",
 			"d1kk7x": "请选择下单类型",
 			"2dc65q": "请先加购商品",
 			"50lf68": "加载中",
diff --git a/pages/plugins/ask/components/ask-comments/ask-comments.vue b/pages/plugins/ask/components/ask-comments/ask-comments.vue
index 10276704..aaf9155a 100644
--- a/pages/plugins/ask/components/ask-comments/ask-comments.vue
+++ b/pages/plugins/ask/components/ask-comments/ask-comments.vue
@@ -47,7 +47,9 @@
                                 <text class="username fw-b">{{ item.user.user_name_view }}</text>
                                 <text class="cr-grey-9 margin-left-main">{{ item.add_time }}</text>
                             </view>
-                            <view class="margin-top-sm comments-content">{{ item.content }}</view>
+                            <view class="margin-top-sm comments-content">
+                                <mp-html :content="item.content" />
+                            </view>
                             <view class="ask-comments-right-content-operate margin-top-main flex-row jc-e align-c text-size-xs cr-grey-9">
                                 <view v-if="(data_base.is_ask_comments_show || 0) == 1" class="item dis-inline-block" :data-index="index" :data-username="item.user.user_name_view" :data-askcommentsid="item.id" @tap="modal_open_event">
                                     <iconfont name="icon-message-square" size="28rpx" propClass="pr top-md margin-right-xs"></iconfont>
diff --git a/pages/plugins/ask/detail/detail.vue b/pages/plugins/ask/detail/detail.vue
index 0be6b07c..6c6c9ae1 100644
--- a/pages/plugins/ask/detail/detail.vue
+++ b/pages/plugins/ask/detail/detail.vue
@@ -10,7 +10,9 @@
                         <view class="fw-b padding-horizontal-xs">·</view>
                         {{ info.access_count || '0' }}{{ $t('detail.detail.e6ga1y') }}
                     </view>
-                    <view v-if="info.title != info.content" class="text-size-md">{{ info.content }}</view>
+                    <view v-if="info.title != info.content">
+                        <mp-html :content="info.content" />
+                    </view>
                     <block v-if="(info.goods_data || null) !== null">
                         <view :data-value="info.goods_data.goods_url" @tap="url_event" class="cp">
                             <view class="goods-link spacing-mt bg-grey-f9 padding-main border-radius-sm">
@@ -41,7 +43,9 @@
                         </view>
                         <view v-if="(info.reply_time_date || null) != null" class="cr-grey-9 text-size-xs">{{ $t('detail.detail.7rg4bb') }}{{ info.reply_time_date }}</view>
                     </view>
-                    <view class="text-size-md padding-top-main">{{ info.reply }}</view>
+                    <view class="padding-top-main">
+                        <mp-html :content="info.reply" />
+                    </view>
                 </view>
                 <view class="padding-main br-t-dashed">
                     <!-- 评论内容 -->
diff --git a/pages/plugins/ask/goods-list/goods-list.vue b/pages/plugins/ask/goods-list/goods-list.vue
index e7e63932..7a107dfa 100644
--- a/pages/plugins/ask/goods-list/goods-list.vue
+++ b/pages/plugins/ask/goods-list/goods-list.vue
@@ -11,7 +11,7 @@
                         <view :data-value="item.url" @tap="url_event" class="flex-row cp">
                             <view class="title cr-white tc margin-right-sm">{{$t('goods-list.goods-list.00n7i3')}}</view>
                             <view class="flex-1 flex-width">
-                                <view class="fw-b">{{ item.content }}</view>
+                                <mp-html :content="item.content" />
                                 <view v-if="(item.images || null) != null && item.images.length > 0" class="avatar spacing-mt-10 radius margin-right-sm oh">
                                     <image v-for="(img, i) in item.images" class="wh-auto" @tap="comment_images_show_event" :data-index="i" :data-ix="i + 1" :src="img" mode="aspectFit"></image>
                                 </view>
@@ -22,7 +22,9 @@
                         <view class="ask flex-row spacing-mt">
                             <view class="title cr-white tc margin-right-sm">{{$t('goods-list.goods-list.rw12i7')}}</view>
                             <view class="flex-1 flex-width">
-                                <view class="cr-base padding-bottom-main">{{ item.reply }}</view>
+                                <view class="padding-bottom-main">
+                                    <mp-html :content="item.reply" />
+                                </view>
                             </view>
                         </view>
                     </block>
diff --git a/pages/plugins/ask/index/index.vue b/pages/plugins/ask/index/index.vue
index c8b92df7..84963148 100644
--- a/pages/plugins/ask/index/index.vue
+++ b/pages/plugins/ask/index/index.vue
@@ -27,14 +27,15 @@
                                 </view>
                                 <view class="flex-1 flex-width">
                                     <view class="title text-size fw-b">{{ item.title }}</view>
-                                    <view v-if="item.title != item.content" class="content cr-base margin-top-sm padding-top-xs multi-text">{{ item.content }}</view>
+                                    <view v-if="item.title != item.content" class="content cr-base margin-top-sm padding-top-xs multi-text">
+                                        <mp-html :content="item.content" />
+                                    </view>
                                     <view class="status flex-row align-c spacing-mt text-size-xs">
                                         <view v-if="nav_index !== 1" class="ask-status cr-white border-radius-sm text-size-xss" :class="item.is_reply === '1' ? 'ask-bg-green' : 'ask-bg-yellow'">{{ item.is_reply === '1' ? $t('index.index.1c17n3') : $t('index.index.75l3l2') }}</view>
                                         <view class="num cr-grey-9 flex-row self-c">
                                             {{ item.add_time_date }}
                                             <view class="fw-b padding-horizontal-xs">·</view>
-                                            {{ item.access_count || '0' }}{{ $t('detail.detail.e6ga1y') }}</view
-                                        >
+                                            {{ item.access_count || '0' }}{{ $t('detail.detail.e6ga1y') }}</view>
                                     </view>
                                 </view>
                             </view>
diff --git a/pages/plugins/ask/user-detail/user-detail.vue b/pages/plugins/ask/user-detail/user-detail.vue
index e5258f59..acc7ab15 100644
--- a/pages/plugins/ask/user-detail/user-detail.vue
+++ b/pages/plugins/ask/user-detail/user-detail.vue
@@ -24,11 +24,15 @@
                             </view>
                             <view v-if="detail_data.content" class="spacing-mb">
                                 <view class="cr-grey-9">{{$t('user-detail.user-detail.7cufw6')}}</view>
-                                <view class="margin-top-xs">{{ detail_data.content }}</view>
+                                <view class="margin-top-xs">
+                                    <mp-html :content="detail_data.content" />
+                                </view>
                             </view>
                             <view v-if="detail_data.reply" class="spacing-mb">
                                 <view class="cr-grey-9">{{$t('user-detail.user-detail.u411r2')}}</view>
-                                <view class="margin-top-xs">{{ detail_data.reply }}</view>
+                                <view class="margin-top-xs">
+                                    <mp-html :content="detail_data.reply" />
+                                </view>
                             </view>
                             <view v-if="detail_data.reply_time_time" class="spacing-mb">
                                 <view class="cr-grey-9">{{$t('user-detail.user-detail.teo6qd')}}</view>
diff --git a/pages/plugins/ask/user-list/user-list.vue b/pages/plugins/ask/user-list/user-list.vue
index b5b5bc95..6966e8cc 100644
--- a/pages/plugins/ask/user-list/user-list.vue
+++ b/pages/plugins/ask/user-list/user-list.vue
@@ -12,8 +12,8 @@
                             <view class="text-size single-text">
                                 {{ item.title }}
                             </view>
-                            <view v-if="item.title != item.content" class="margin-top-sm cr-grey multi-text">
-                                {{ item.content }}
+                            <view v-if="item.title != item.content" class="margin-top-sm multi-text">
+                                <mp-html :content="item.content" />
                             </view>
                         </view>
                     </view>
diff --git a/pages/plugins/form/check/check.vue b/pages/plugins/form/check/check.vue
index 98ae42f6..1c7f4fa6 100644
--- a/pages/plugins/form/check/check.vue
+++ b/pages/plugins/form/check/check.vue
@@ -1,6 +1,12 @@
 <template>
     <view :class="theme_view">
         <view class="padding-main page-content">
+            <view class="tr">
+                <view class="fr padding-main" @tap="popup_data_event">
+                    <iconfont name="icon-transfer" color="#2196F3" propClass="va-m"></iconfont>
+                    <text class="cr-blue text-size-sm margin-left-xs">{{$t('realstore-cart.realstore-cart.6bmc34')}}{{data == null ? '' : '('+data.title+')'}}</text>
+                </view>
+            </view>
             <form @submit="form_submit" class="form-container">
                 <view class="border-radius-main bg-white padding-main padding-bottom-xxxxl spacing-mb">
                     <view class="title fw-b text-size margin-vertical-xxxl">{{$t('common.verification_text')}}</view>
@@ -36,6 +42,36 @@
             </form>
         </view>
 
+        <!-- 数据选择弹层 -->
+        <component-popup :propShow="popup_data_status" propPosition="bottom" @onclose="popup_data_close_event">
+            <view class="padding-horizontal-main padding-top-main bg-white">
+                <view class="close oh">
+                    <view class="fr" @tap.stop="popup_data_close_event">
+                        <iconfont name="icon-close-o" size="28rpx" color="#999"></iconfont>
+                    </view>
+                </view>
+                <view class="data-list">
+                    <block v-if="(data_list || null) != null && data_list.length > 0">
+                        <block v-for="(item, index) in data_list" :key="index">
+                            <view :class="'item oh padding-vertical-main ' + (index > 0 ? 'br-t' : '')">
+                                <view class="fl left">
+                                    <image class="icon dis-block radius" :src="item.cover" mode="widthFix"></image>
+                                </view>
+                                <view class="fr right tl pr">
+                                    <view class="cr-base fw-b text-size-sm">{{ item.title }}</view>
+                                    <view class="cr-grey text-size-xs margin-top-xs">{{ item.describe }}</view>
+                                    <button type="default" size="mini" class="bg-main br-main cr-white text-size-sm round pa top-xxxxl right-xxxxl" :data-index="index" @tap="data_list_choice_event">选择</button>
+                                </view>
+                            </view>
+                        </block>
+                    </block>
+                    <block v-else>
+                        <view class="cr-grey tc padding-top-xl padding-bottom-xxxl">{{$t('common.no_relevant_data_tips')}}</view>
+                    </block>
+                </view>
+            </view>
+        </component-popup>
+
         <!-- 公共 -->
         <component-common ref="common"></component-common>
     </view>
@@ -43,6 +79,7 @@
 <script>
     const app = getApp();
     import componentCommon from '@/components/common/common';
+    import componentPopup from '@/components/popup/popup';
     export default {
         data() {
             return {
@@ -51,11 +88,15 @@
                 check_value: '',
                 error_msg: '',
                 success_msg: '',
-                stats_data: []
+                stats_data: [],
+                data_list: [],
+                data: null,
+                popup_data_status: false,
             };
         },
         components: {
-            componentCommon
+            componentCommon,
+            componentPopup
         },
 
         onLoad(params) {
@@ -74,15 +115,44 @@
             if ((this.$refs.common || null) != null) {
                 this.$refs.common.on_show();
             }
-
-            // 刷新数据
-            this.refresh_data_event('init');
         },
 
         methods: {
             // 获取数据
             init() {
                 app.globalData.get_user_info(this, "init");
+                this.get_data();
+            },
+
+            // 获取数据
+            get_data() {
+                uni.showLoading({
+                    title: this.$t('common.loading_in_text'),
+                });
+                uni.request({
+                    url: app.globalData.get_request_url('init', 'index', 'form'),
+                    method: 'POST',
+                    data: {},
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.hideLoading();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            var data_list = data.data_list || [];
+                            this.setData({
+                                data_list: data_list,
+                                data: (data_list.length == 0) ? null : data_list[0],
+                            });
+                            this.refresh_data_event('init');
+                        } else {
+                            app.globalData.showToast(res.data.msg);
+                        }
+                    },
+                    fail: () => {
+                        uni.hideLoading();
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    }
+                });
             },
 
             // 输入事件
@@ -114,10 +184,12 @@
                     success_msg: ''
                 });
                 var form_data = {
-                    value: this.check_value
+                    value: this.check_value,
+                    unique: (this.data == null) ? '' : (this.data.unique || ''),
                 }
                 var validation = [
-                    { fields: 'value', msg: this.$t('common.verification_mobile_message') }
+                    { fields: 'value', msg: this.$t('common.verification_mobile_message') },
+                    { fields: 'unique', msg: this.$t('common.unique_message') }
                 ];
                 if (app.globalData.fields_check(form_data, validation)) {
                     uni.showLoading({
@@ -170,14 +242,15 @@
                 uni.request({
                     url: app.globalData.get_request_url('stats', 'index', 'form'),
                     method: 'POST',
-                    data: {},
+                    data: {unique: (this.data == null) ? '' : (this.data.unique || '')},
                     dataType: 'json',
                     success: (res) => {
                         if (res.data.code == 0) {
                             this.setData({
                                 stats_data: res.data.data || []
                             });
-                            if(e != 'init') {
+                            if(e != 'init')
+                            {
                                 app.globalData.showToast(res.data.msg, 'success');
                             }
                         } else {
@@ -185,6 +258,29 @@
                         }
                     }
                 });
+            },
+
+            // 列表数据开启弹层
+            popup_data_event(e) {
+                this.setData({
+                    popup_data_status: true,
+                });
+            },
+
+            // 列表数据弹层关闭
+            popup_data_close_event(e) {
+                this.setData({
+                    popup_data_status: false,
+                });
+            },
+
+            // 列表数据选择
+            data_list_choice_event(e) {
+                this.setData({
+                    popup_data_status: false,
+                    data: this.data_list[e.currentTarget.dataset.index],
+                });
+                this.refresh_data_event('init');
             }
         }
     };
@@ -203,4 +299,11 @@
         height: 140rpx;
         line-height: 140rpx;
     }
+    .data-list .item .icon {
+        width: 100rpx;
+        height: 100rpx;
+    }
+    .data-list .item .right {
+        width: calc(100% - 120rpx);
+    }
 </style>
\ No newline at end of file