From 73a8f4f87b505e42c66d5501043db9cdcace1e82 Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Sat, 6 Jul 2024 23:49:07 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A4=BC=E5=93=81=E5=8D=A1=E5=8D=A1=E5=AF=86?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=B1=95=E7=A4=BA=E4=BC=98=E5=8C=96=EF=BC=8C?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=89=AB=E7=A0=81=E5=85=91=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/payment/payment.vue         |  2 +-
 locale/en.json                         |  1 +
 locale/zh.json                         |  1 +
 pages/plugins/giftcard/form/form.vue   | 47 +++++++++++++++++++-----
 pages/plugins/giftcard/index/index.css |  3 ++
 pages/plugins/giftcard/index/index.vue | 49 +++++++++++++++++++-------
 6 files changed, 81 insertions(+), 22 deletions(-)
 create mode 100644 pages/plugins/giftcard/index/index.css

diff --git a/components/payment/payment.vue b/components/payment/payment.vue
index a99e8846..58a73941 100644
--- a/components/payment/payment.vue
+++ b/components/payment/payment.vue
@@ -486,7 +486,7 @@
                         self.setData({
                             open_pay_url_status: false
                         });
-                        self.order_item_pay_fail_handle(data, order_id, error);
+                        self.order_item_pay_fail_handle(data, order_id, error.message+'('+error.code+')');
                     });
                     // 定时3秒后提示用户确认支付状态
                     self.open_pay_url_timer = setTimeout(function() {
diff --git a/locale/en.json b/locale/en.json
index c82df9cf..83ca5b96 100644
--- a/locale/en.json
+++ b/locale/en.json
@@ -29,6 +29,7 @@
 		"share": "Share",
 		"return": "Return",
 		"view_text": "Check",
+        "place_order_text": "Place Order",
 		"processing_in_text": "Processing",
 		"loading_in_text": "Loading",
 		"upload_in_text": "Uploading",
diff --git a/locale/zh.json b/locale/zh.json
index dba884a3..ab4d82c9 100644
--- a/locale/zh.json
+++ b/locale/zh.json
@@ -29,6 +29,7 @@
 		"share": "分享",
 		"return": "返回",
 		"view_text": "查看",
+        "place_order_text": "下单",
 		"processing_in_text": "处理中...",
 		"loading_in_text": "加载中...",
 		"upload_in_text": "上传中...",
diff --git a/pages/plugins/giftcard/form/form.vue b/pages/plugins/giftcard/form/form.vue
index 485f264f..bb9d4d90 100644
--- a/pages/plugins/giftcard/form/form.vue
+++ b/pages/plugins/giftcard/form/form.vue
@@ -4,8 +4,13 @@
             <block v-if="data_list_loding_status == 3">
                 <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-bottom-xxxl padding-bottom-xl">{{$t('giftcard-index.giftcard-index.hfg2fg')}}</view>
-                        <input name="secret_key" type="text" class="text-size-lg tc margin-bottom-sm" :placeholder="$t('giftcard-index.giftcard-index.fu3rf1')" placeholder-class="cr-grey-c" />
+                        <view class="title fw-b text-size margin-vertical-xxxl">{{$t('giftcard-index.giftcard-index.hfg2fg')}}</view>
+                        <view class="flex-row align-c padding-bottom-xl">
+                            <view class="margin-right" @tap="scan_event">
+                                <uni-icons type="scan" size="42rpx" color="#666"></uni-icons>
+                            </view>
+                            <input type="text" class="text-size-lg wh-auto" :placeholder="$t('giftcard-index.giftcard-index.fu3rf1')" placeholder-class="cr-grey-c" :value="secret_key_value" @input="secret_key_event" />
+                        </view>
                     </view>
                     <view class="padding-main">
                         <button type="default" form-type="submit" hover-class="none" size="mini" class="br-main bg-main cr-white round buy-submit text-size dis-block" :disabled="form_submit_loading">{{$t('common.confirm')}}</button>
@@ -27,7 +32,8 @@
                 theme_view: app.globalData.get_theme_value_view(),
                 data_list_loding_status: 1,
                 data_list_loding_msg: '',
-                form_submit_loading: false
+                form_submit_loading: false,
+                secret_key_value: ''
             };
         },
         components: {
@@ -62,13 +68,38 @@
                     });
                 }
             },
+            
+            // 输入事件
+            secret_key_event(e) {
+                this.setData({
+                    secret_key_value: e.detail.value
+                });
+            },
 
-            // 转账表单提交
-            form_submit(e) {
+            // 扫码事件
+            scan_event(e) {
+                var self = this;
+                uni.scanCode({
+                	success: function (res) {
+                        if((res.result || null) != null) {
+                            self.setData({
+                                secret_key_value: res.result
+                            });
+                            self.form_submit();
+                        }
+                	}
+                });
+            },
+
+            // 表单提交
+            form_submit() {
+                var form_data = {
+                    secret_key: this.secret_key_value
+                }
                 var validation = [
                     { fields: 'secret_key', msg: this.$t('giftcard-index.giftcard-index.fu3rf1') }
                 ];
-                if (app.globalData.fields_check(e.detail.value, validation)) {
+                if (app.globalData.fields_check(form_data, validation)) {
                     uni.showLoading({
                         title: this.$t('common.processing_in_text'),
                     });
@@ -78,7 +109,7 @@
                     uni.request({
                         url: app.globalData.get_request_url('exchange', 'index', 'giftcard'),
                         method: 'POST',
-                        data: e.detail.value,
+                        data: form_data,
                         dataType: 'json',
                         success: (res) => {
                             uni.hideLoading();
@@ -96,7 +127,7 @@
                                     }
                                 }, 1500);
                             } else {
-                                if (app.globalData.is_login_check(res.data, this, 'form_submit', e)) {
+                                if (app.globalData.is_login_check(res.data, this, 'form_submit')) {
                                     this.setData({
                                         form_submit_loading: false
                                     });
diff --git a/pages/plugins/giftcard/index/index.css b/pages/plugins/giftcard/index/index.css
new file mode 100644
index 00000000..5189be84
--- /dev/null
+++ b/pages/plugins/giftcard/index/index.css
@@ -0,0 +1,3 @@
+.secret-value-data .value-title {
+    width: calc(100% - 160rpx);
+}
\ No newline at end of file
diff --git a/pages/plugins/giftcard/index/index.vue b/pages/plugins/giftcard/index/index.vue
index 0e7ca793..0fe9740a 100644
--- a/pages/plugins/giftcard/index/index.vue
+++ b/pages/plugins/giftcard/index/index.vue
@@ -4,16 +4,41 @@
             <view class="page-bottom-fixed">
                 <view v-if="data_list.length > 0" class="data-list padding-horizontal-main padding-top-main">
                     <view v-for="(item, index) in data_list" :key="index" class="item padding-main border-radius-main oh bg-white spacing-mb">
-                        <view class="content margin-top-main">
-                            <view v-for="(fv, fi) in content_list" :key="fi">
-                                <view class="single-text margin-top-xs">
-                                    <text class="cr-grey-9 margin-right-main">{{ fv.name }}:</text>
-                                    <text class="cr-black">{{ item[fv.field] }}</text>
-                                    <text v-if="(fv.unit || null) != null" class="cr-grey">{{ fv.unit }}</text>
-                                </view>
+                        <view class="content">
+                            <view class="single-text margin-top-xs">
+                                <text class="cr-grey-9 margin-right-main">{{ $t('giftcard-index.giftcard-index.87ytyh') }}:</text>
+                                <text class="cr-black">{{ item.data_type_name }}</text>
+                            </view>
+                            <view class="single-text margin-top-xs">
+                                <text class="cr-grey-9 margin-right-main">{{ $t('giftcard-index.giftcard-index.hfg2fg') }}:</text>
+                                <text class="cr-black" data-event="copy" :data-value="item.secret_key" @tap="text_event">{{ item.secret_key }}</text>
+                            </view>
+                            <view v-if="(item.secret_value_text || null) != null" class="single-text margin-top-xs">
+                                <text class="cr-grey-9 margin-right-main">{{ $t('giftcard-index.giftcard-index.fyjnsd') }}:</text>
+                                <text class="cr-black am-margin-right-lg">{{ item.secret_value_text }}</text>
+                                <text v-if="item.data_type == 0" data-value="/pages/plugins/wallet/user/user" @tap="url_event" class="cr-grey fr">{{ $t('common.view_text') }}</text>
+                                <text v-else-if="item.data_type == 1" data-value="/pages/plugins/coupon/user/user" @tap="url_event" class="cr-grey fr">{{ $t('common.view_text') }}</text>
+                                <text v-else-if="item.data_type == 2" data-value="/pages/user-integral/user-integral" @tap="url_event" class="cr-grey fr">{{ $t('common.view_text') }}</text>
+                            </view>
+                            <block v-else>
+                                <view class="margin-top-sm fw-b">{{$t('giftcard-index.giftcard-index.fyjnsd')}}</view>
+                                <view v-if="(item.secret_value_data || null) != null" class="secret-value-data margin-bottom-sm">
+                                    <view v-for="(items, indexs) in item.secret_value_data" :key="indexs" class="oh">
+                                        <view class="single-text fl value-title">{{items.title}}</view>
+                                        <text :data-value="items.url" @tap="url_event" :class="'fr cr-'+((item.use_data || null) == null ? 'blue' : 'grey')">{{(item.use_data || null) == null ? $t('common.place_order_text') : $t('common.view_text') }}</text>
+                                    </view>
+                                </view>
+                                <view v-else class="cr-grey margin-bottom-sm">{{ $t('common.no_relevant_data_tips') }}</view>
+                            </block>
+                            <view v-for="(fv, fi) in content_list" :key="fi">
+                                <view class="single-text margin-top-xs">
+                                    <text class="cr-grey-9 margin-right-main">{{ fv.name }}:</text>
+                                    <text class="cr-black">{{ item[fv.field] }}</text>
+                                    <text v-if="(fv.unit || null) != null" class="cr-grey">{{ fv.unit }}</text>
+                                </view>
                             </view>
                             <view v-if="(item.use_data || null) != null && item.use_data.length > 0">
-                                <view class="margin-top-sm">{{$t('giftcard-index.giftcard-index.6redfg')}}</view>
+                                <view class="margin-top-sm fw-b">{{$t('giftcard-index.giftcard-index.6redfg')}}</view>
                                 <view v-for="(uv, uk) in item.use_data" :key="uk">
                                     <view>
                                         <text class="cr-grey-9 margin-right-main">{{$t('user-order-detail.user-order-detail.n18sd2')}}:</text>
@@ -68,10 +93,7 @@
                 data_bottom_line_status: false,
                 data_is_loading: 0,
                 params: null,
-                content_list: [
-                    { name: this.$t('giftcard-index.giftcard-index.87ytyh'), field: 'data_type_name' },
-                    { name: this.$t('giftcard-index.giftcard-index.hfg2fg'), field: 'secret_key' },
-                    { name: this.$t('giftcard-index.giftcard-index.fyjnsd'), field: 'secret_value_text' },
+                content_list: [
                     { name: this.$t('giftcard-index.giftcard-index.87yyj3'), field: 'exchange_time' },
                     { name: this.$t('common.add_time'), field: 'add_time' },
                     { name: this.$t('common.upd_time'), field: 'upd_time' },
@@ -235,5 +257,6 @@
         },
     };
 </script>
-<style>
+<style>
+    @import "./index.css";
 </style>
\ No newline at end of file