From a772797ef096a14aec9919869500c64d2c7c510b Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Thu, 29 Aug 2024 00:40:07 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=81=E7=A4=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 locale/en.json                                |  4 +
 locale/zh.json                                |  4 +
 pages.json                                    | 21 +++--
 .../extraction-order/extraction-order.vue     |  2 +-
 pages/plugins/distribution/order/order.vue    |  2 +-
 pages/plugins/distribution/profit/profit.vue  |  2 +-
 .../profit/profit.vue                         |  2 +-
 pages/plugins/givegift/code/code.vue          |  8 ++
 pages/plugins/givegift/gift/gift.css          | 14 +--
 pages/plugins/givegift/gift/gift.vue          | 88 +++++++++++++++++--
 pages/plugins/givegift/goods/goods.vue        |  2 +-
 pages/plugins/invoice/invoice/invoice.vue     |  2 +-
 .../membershiplevelvip/order/order.vue        |  2 +-
 .../membershiplevelvip/profit/profit.vue      |  2 +-
 .../weixinliveplayer/search/search.vue        |  2 +-
 15 files changed, 129 insertions(+), 28 deletions(-)
 create mode 100644 pages/plugins/givegift/code/code.vue

diff --git a/locale/en.json b/locale/en.json
index 54da30fa..1641ca10 100644
--- a/locale/en.json
+++ b/locale/en.json
@@ -15,6 +15,8 @@
 		"add": "Add",
 		"del": "Delete",
 		"edit": "Edit",
+        "link": "Link",
+        "gift": "Gift",
 		"more": "More",
 		"more_null": "",
 		"search": "Search",
@@ -30,6 +32,8 @@
 		"return": "Return",
 		"view_text": "Check",
         "detail_text": "Detail",
+        "yes_text": "Yes",
+        "no_text": "NO",
         "place_order_text": "Place Order",
 		"processing_in_text": "Processing",
 		"loading_in_text": "Loading",
diff --git a/locale/zh.json b/locale/zh.json
index 530c12bc..189c86fb 100644
--- a/locale/zh.json
+++ b/locale/zh.json
@@ -15,6 +15,8 @@
 		"add": "新增",
 		"del": "删除",
 		"edit": "编辑",
+        "link": "链接",
+        "gift": "礼物",
 		"more": "更多",
 		"more_null": "更 多",
 		"search": "搜索",
@@ -30,6 +32,8 @@
 		"return": "返回",
 		"view_text": "查看",
         "detail_text": "详情",
+        "yes_text": "是",
+        "no_text": "否",
         "place_order_text": "下单",
 		"processing_in_text": "处理中...",
 		"loading_in_text": "加载中...",
diff --git a/pages.json b/pages.json
index 422c09d9..94bdb3f0 100644
--- a/pages.json
+++ b/pages.json
@@ -1601,13 +1601,6 @@
                         "navigationBarTitleText": ""
                     }
                 },
-                {
-                    "path": "receive/receive",
-                    "style": {
-                        "enablePullDownRefresh": true,
-                        "navigationBarTitleText": ""
-                    }
-                },
                 {
                     "path": "gift/gift",
                     "style": {
@@ -1621,6 +1614,20 @@
                         "enablePullDownRefresh": true,
                         "navigationBarTitleText": ""
                     }
+                },
+                {
+                    "path": "code/code",
+                    "style": {
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                },
+                {
+                    "path": "receive/receive",
+                    "style": {
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
                 }
             ]
         },
diff --git a/pages/plugins/distribution/extraction-order/extraction-order.vue b/pages/plugins/distribution/extraction-order/extraction-order.vue
index 350536d4..ff971397 100644
--- a/pages/plugins/distribution/extraction-order/extraction-order.vue
+++ b/pages/plugins/distribution/extraction-order/extraction-order.vue
@@ -3,7 +3,7 @@
         <!-- 导航 -->
         <view class="nav-base bg-white">
             <block v-for="(item, index) in nav_status_list" :key="index">
-                <view :class="'item fl tc cr-grey ' + (nav_status_index == index ? 'cr-main' : '')" :data-index="index" @tap="nav_event">{{ item.name }}</view>
+                <view :class="'item fl tc ' + (nav_status_index == index ? 'cr-main' : '')" :data-index="index" @tap="nav_event">{{ item.name }}</view>
             </block>
         </view>
 
diff --git a/pages/plugins/distribution/order/order.vue b/pages/plugins/distribution/order/order.vue
index 498667b3..f426a5bd 100644
--- a/pages/plugins/distribution/order/order.vue
+++ b/pages/plugins/distribution/order/order.vue
@@ -3,7 +3,7 @@
         <!-- 导航 -->
         <view class="nav-base bg-white">
             <view v-for="(item, index) in nav_status_list" :key="index">
-                <view :class="'item fl tc cr-grey ' + (nav_status_index == index ? 'cr-main nav-active-line' : '')" :data-index="index" @tap="nav_event">{{ item.name }}</view>
+                <view :class="'item fl tc ' + (nav_status_index == index ? 'cr-main nav-active-line' : '')" :data-index="index" @tap="nav_event">{{ item.name }}</view>
             </view>
         </view>
 
diff --git a/pages/plugins/distribution/profit/profit.vue b/pages/plugins/distribution/profit/profit.vue
index f8cd662f..b9054d38 100644
--- a/pages/plugins/distribution/profit/profit.vue
+++ b/pages/plugins/distribution/profit/profit.vue
@@ -3,7 +3,7 @@
         <!-- 导航 -->
         <view class="nav-base bg-white">
             <view v-for="(item, index) in nav_status_list" :key="index">
-                <view :class="'item fl tc cr-grey ' + (nav_status_index == index ? 'cr-main nav-active-line' : '')" :data-index="index" @tap="nav_event">{{ item.name }}</view>
+                <view :class="'item fl tc ' + (nav_status_index == index ? 'cr-main nav-active-line' : '')" :data-index="index" @tap="nav_event">{{ item.name }}</view>
             </view>
         </view>
 
diff --git a/pages/plugins/excellentbuyreturntocash/profit/profit.vue b/pages/plugins/excellentbuyreturntocash/profit/profit.vue
index 0eb062ee..97acf9ad 100644
--- a/pages/plugins/excellentbuyreturntocash/profit/profit.vue
+++ b/pages/plugins/excellentbuyreturntocash/profit/profit.vue
@@ -3,7 +3,7 @@
         <!-- 导航 -->
         <view class="nav-base bg-white">
             <view v-for="(item, index) in nav_status_list" :key="index">
-                <view :class="'item fl tc cr-grey ' + (nav_status_index == index ? 'cr-main nav-active-line' : '')" :data-index="index" @tap="nav_event">{{ item.name }}</view>
+                <view :class="'item fl tc ' + (nav_status_index == index ? 'cr-main nav-active-line' : '')" :data-index="index" @tap="nav_event">{{ item.name }}</view>
             </view>
         </view>
 
diff --git a/pages/plugins/givegift/code/code.vue b/pages/plugins/givegift/code/code.vue
new file mode 100644
index 00000000..02409e35
--- /dev/null
+++ b/pages/plugins/givegift/code/code.vue
@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/pages/plugins/givegift/gift/gift.css b/pages/plugins/givegift/gift/gift.css
index 61485416..fcf737c5 100644
--- a/pages/plugins/givegift/gift/gift.css
+++ b/pages/plugins/givegift/gift/gift.css
@@ -1,10 +1,3 @@
-/*
-* 导航
-*/
-.nav-base .item {
-    width: 20%;
-}
-
 /**
  * 商品
  */
@@ -14,4 +7,11 @@
 }
 .goods-title {
     width: calc(100% - 90rpx);
+}
+
+/**
+ * 编辑表单
+ */
+.form-container .message-tips {
+    width: calc(100% - 200rpx) !important;
 }
\ No newline at end of file
diff --git a/pages/plugins/givegift/gift/gift.vue b/pages/plugins/givegift/gift/gift.vue
index 4b114e20..0b0d80e4 100644
--- a/pages/plugins/givegift/gift/gift.vue
+++ b/pages/plugins/givegift/gift/gift.vue
@@ -1,9 +1,9 @@
 <template>
     <view :class="theme_view">
         <!-- 导航 -->
-        <view class="nav-base bg-white">
+        <view class="nav-base bg-white flex-row jc-sa align-c">
             <block v-for="(item, index) in nav_status_list" :key="index">
-                <view :class="'item fl tc cr-grey ' + (nav_status_index == index ? 'cr-main nav-active-line' : '')" :data-index="index" @tap="nav_event">{{ item.name }}</view>
+                <view :class="'item fl tc ' + (nav_status_index == index ? 'cr-main nav-active-line' : '')" :data-index="index" @tap="nav_event">{{ item.name }}</view>
             </block>
         </view>
         <!-- 列表 -->
@@ -26,6 +26,10 @@
                         <block v-if="item.status == 0">
                             <button class="round bg-white cr-green br-green" type="default" size="mini" @tap="pay_event" :data-value="item.id" :data-price="item.total_price" :data-index="index" :data-payment="item.payment_id" hover-class="none">{{$t('order.order.1i873j')}}</button>
                             <button class="round bg-white cr-yellow br-yellow" type="default" size="mini" @tap="cancel_event" :data-value="item.id" :data-index="index" hover-class="none">{{$t('common.cancel')}}</button>
+                        </block>
+                        <block v-if="item.status == 1">
+                            <button class="round bg-white cr-main br-main" type="default" size="mini" @tap="url_event" :data-value="'/pages/plugins/givegift/code/code?oid='+item.id" hover-class="none">{{$t('common.gift')}}</button>
+                            <button class="round bg-white cr-green br-green" type="default" size="mini" @tap="url_event" :data-value="'/pages/plugins/givegift/receive/receive?key='+item.key" hover-class="none">{{$t('common.link')}}</button>
                         </block>
                         <button v-if="item.status == 2" class="round bg-white cr-red br-red" type="default" size="mini" @tap="delete_event" :data-value="item.id" :data-index="index" hover-class="none">{{$t('common.del')}}</button>
                     </view>
@@ -49,7 +53,25 @@
                 </view>
                 <view class="padding-bottom-main">
                     <view v-if="(edit_data || null) != null">
-                        {{edit_data.order_no}}
+                        <form @submit="form_submit" class="form-container">
+                            <view class="border-radius-main spacing-mb oh">
+                                <view class="form-gorup">
+                                    <view class="flex-row jc-sb align-c padding-top-sm">
+                                        <view class="form-gorup-title">留言提示</view>
+                                        <input type="text" name="message_tips" :value="edit_data.message_tips || ''" class="br-b-f5 tr message-tips" placeholder-class="cr-grey-c" placeholder="留言提示,格式最多200个字符" />
+                                    </view>
+                                </view>
+                                <view class="form-gorup">
+                                    <view class="flex-row jc-sb align-c padding-bottom-sm">
+                                        <view class="form-gorup-title">不限领取</view>
+                                        <switch name="is_no_limit_receive" :checked="edit_data.is_no_limit_receive == 1" />
+                                    </view>
+                                </view>
+                            </view>
+                            <view class="padding-main">
+                                <button class="bg-main br-main cr-white round text-size" type="default" form-type="submit" hover-class="none" :disabled="form_submit_disabled_status">{{$t('common.save')}}</button>
+                            </view>
+                        </form>
                     </view>
                     <block v-else>
                         <component-no-data propStatus="0"></component-no-data>
@@ -98,7 +120,9 @@
                 data_is_loading: 0,
                 params: null,
                 edit_data: null,
-                popup_edit_status: false,
+                popup_edit_status: false,
+                edit_item_index: 0,
+                form_submit_disabled_status: false,
                 // 支付弹窗参数
                 pay_url: '',
                 qrcode_url: '',
@@ -496,8 +520,11 @@
                 var index = e.currentTarget.dataset.index || 0;
                 this.setData({
                     popup_edit_status: true,
-                    edit_data: this.data_list[index]
+                    edit_data: this.data_list[index],
+                    edit_item_index: index
                 });
+                
+                console.log(this.edit_data)
             },
 
             // 编辑弹层关闭
@@ -505,6 +532,57 @@
                 this.setData({
                     popup_edit_status: false,
                 });
+            },
+
+            // 数据提交
+            form_submit(e) {
+                var form_data = e.detail.value;
+                form_data['is_no_limit_receive'] = form_data.is_no_limit_receive == true ? 1 : 0;
+                form_data['id'] = this.edit_data.id;
+                this.setData({
+                    form_submit_disabled_status: true,
+                });
+                uni.showLoading({
+                    title: this.$t('common.processing_in_text'),
+                });
+                uni.request({
+                    url: app.globalData.get_request_url('save', 'gift', 'givegift'),
+                    method: 'POST',
+                    data: form_data,
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.hideLoading();
+                        if (res.data.code == 0) {
+                            var temp_data = this.data_list;
+                            var index = this.edit_item_index;
+                            temp_data[index]['is_no_limit_receive_name'] = form_data.is_no_limit_receive == 1 ? this.$t('common.yes_text') : this.$t('common.no_text');
+                            temp_data[index]['is_no_limit_receive'] = form_data.is_no_limit_receive;
+                            temp_data[index]['message_tips'] = form_data.message_tips;
+                            this.setData({
+                                data_list: temp_data,
+                                form_submit_disabled_status: false,
+                                popup_edit_status: false
+                            });
+                            app.globalData.showToast(res.data.msg, 'success');
+                        } else {
+                            this.setData({
+                                form_submit_disabled_status: false,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, 'form_submit', e)) {
+                                app.globalData.showToast(res.data.msg);
+                            } else {
+                                app.globalData.showToast(this.$t('common.sub_error_retry_tips'));
+                            }
+                        }
+                    },
+                    fail: () => {
+                        this.setData({
+                            form_submit_disabled_status: false,
+                        });
+                        uni.hideLoading();
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
             },
 
             // url事件
diff --git a/pages/plugins/givegift/goods/goods.vue b/pages/plugins/givegift/goods/goods.vue
index b77cd52b..30b3a9b8 100644
--- a/pages/plugins/givegift/goods/goods.vue
+++ b/pages/plugins/givegift/goods/goods.vue
@@ -278,7 +278,7 @@
                             this.setData({
                                 form_submit_disabled_status: false,
                             });
-                            if (app.globalData.is_login_check(res.data)) {
+                            if (app.globalData.is_login_check(res.data, this, 'form_submit', e)) {
                                 app.globalData.showToast(res.data.msg);
                             } else {
                                 app.globalData.showToast(this.$t('common.sub_error_retry_tips'));
diff --git a/pages/plugins/invoice/invoice/invoice.vue b/pages/plugins/invoice/invoice/invoice.vue
index 83a3b2bf..8753b838 100644
--- a/pages/plugins/invoice/invoice/invoice.vue
+++ b/pages/plugins/invoice/invoice/invoice.vue
@@ -7,7 +7,7 @@
         <!-- 导航 -->
         <view v-if="nav_status_list.length > 0" class="nav-base bg-white flex-row jc-sa align-c">
             <block v-for="(item, index) in nav_status_list" :key="index">
-                <view :class="'item tc cr-grey ' + (nav_status_index == index ? 'cr-main nav-active-line' : '')" :data-index="index" @tap="nav_event">{{ item.name }}</view>
+                <view :class="'item tc ' + (nav_status_index == index ? 'cr-main nav-active-line' : '')" :data-index="index" @tap="nav_event">{{ item.name }}</view>
             </block>
         </view>
         <!-- 列表 -->
diff --git a/pages/plugins/membershiplevelvip/order/order.vue b/pages/plugins/membershiplevelvip/order/order.vue
index d51f5ca9..301ced9a 100644
--- a/pages/plugins/membershiplevelvip/order/order.vue
+++ b/pages/plugins/membershiplevelvip/order/order.vue
@@ -3,7 +3,7 @@
         <!-- 导航 -->
         <view class="nav-base bg-white">
             <block v-for="(item, index) in nav_status_list" :key="index">
-                <view :class="'item fl tc cr-grey ' + (nav_status_index == index ? 'cr-main nav-active-line' : '')" :data-index="index" @tap="nav_event">{{ item.name }}</view>
+                <view :class="'item fl tc ' + (nav_status_index == index ? 'cr-main nav-active-line' : '')" :data-index="index" @tap="nav_event">{{ item.name }}</view>
             </block>
         </view>
         <!-- 列表 -->
diff --git a/pages/plugins/membershiplevelvip/profit/profit.vue b/pages/plugins/membershiplevelvip/profit/profit.vue
index 9d65d65a..fc3fc6f4 100644
--- a/pages/plugins/membershiplevelvip/profit/profit.vue
+++ b/pages/plugins/membershiplevelvip/profit/profit.vue
@@ -3,7 +3,7 @@
         <!-- 导航 -->
         <view class="nav-base bg-white">
             <view v-for="(item, index) in nav_status_list" :key="index">
-                <view :class="'item fl tc cr-grey ' + (nav_status_index == index ? 'cr-main' : '')" :data-index="index" @tap="nav_event">{{ item.name }}</view>
+                <view :class="'item fl tc ' + (nav_status_index == index ? 'cr-main' : '')" :data-index="index" @tap="nav_event">{{ item.name }}</view>
             </view>
         </view>
 
diff --git a/pages/plugins/weixinliveplayer/search/search.vue b/pages/plugins/weixinliveplayer/search/search.vue
index 2b186f2b..105706c1 100644
--- a/pages/plugins/weixinliveplayer/search/search.vue
+++ b/pages/plugins/weixinliveplayer/search/search.vue
@@ -3,7 +3,7 @@
         <!-- 导航 -->
         <view class="nav bg-white">
             <block v-for="(item, index) in nav_status_list" :key="index">
-                <view :class="'item fl tc cr-grey ' + (nav_status_index == index ? 'cr-main nav-active-line' : '')" :data-index="index" @tap="nav_event">{{ item.name }}</view>
+                <view :class="'item fl tc ' + (nav_status_index == index ? 'cr-main nav-active-line' : '')" :data-index="index" @tap="nav_event">{{ item.name }}</view>
             </block>
         </view>