From 8ddb8d66c30defbcbc414319691a7f6d15db3432 Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Tue, 17 Dec 2024 16:04:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=8F=90=E4=BA=A4=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E9=87=8D=E5=A4=8D=E6=94=AF=E4=BB=98=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/cart/cart.vue                |  2 +-
 pages/buy/buy.vue                       | 16 +++++++++++++---
 pages/goods-category/goods-category.vue |  2 +-
 pages/login/login.vue                   |  6 ++++--
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/components/cart/cart.vue b/components/cart/cart.vue
index 6ca668e3..a83ed9c6 100644
--- a/components/cart/cart.vue
+++ b/components/cart/cart.vue
@@ -995,7 +995,7 @@
                     uni.request({
                         url: app.globalData.get_request_url('index', 'buy'),
                         method: 'POST',
-                        data: data,
+                        data: {...data, ...{is_cart_init: 1}},
                         dataType: 'json',
                         success: (res) => {
                             if (res.data.code == 0) {
diff --git a/pages/buy/buy.vue b/pages/buy/buy.vue
index e09832c2..e902bc90 100644
--- a/pages/buy/buy.vue
+++ b/pages/buy/buy.vue
@@ -399,7 +399,9 @@
                 // 下单时间选择
                 buy_datetime_info: {},
                 // 自提客户名称和电话
-                buy_extraction_contact_info: {},
+                buy_extraction_contact_info: {},
+                // 订单是否已进入支付
+                is_order_submit_payment: 0,
                 // 优惠劵
                 plugins_coupon_data: null,
                 plugins_coupon_list: [],
@@ -516,7 +518,12 @@
             },
 
             // 获取数据
-            init() {
+            init() {
+                // 订单是否已经提交进入支付
+                if(this.is_order_submit_payment == 1) {
+                    uni.stopPullDownRefresh();
+                    return false;
+                }
                 // 订单参数信息是否正确
                 if (this.params == null) {
                     this.setData({
@@ -953,7 +960,10 @@
                     });
                 } else {
                     this.$refs.payment.pay_handle(res.data.order_ids.join(','), res.data.payment_id, this.payment_list);
-                }
+                }
+                this.setData({
+                    is_order_submit_payment: 1
+                });
             },
 
             // 支付方式选择
diff --git a/pages/goods-category/goods-category.vue b/pages/goods-category/goods-category.vue
index ee71e24f..9f45f27b 100644
--- a/pages/goods-category/goods-category.vue
+++ b/pages/goods-category/goods-category.vue
@@ -332,7 +332,7 @@
                             <view class="botton-nav bg-white round pa oh padding-sm flex-row jc-sb align-c" :style="botton_nav_style+(cart_status ? 'z-index:5;' : '')">
                                 <view class="flex-row align-c flex-1 flex-width">
                                     <view class="cart pr cp top-sm padding-left-sm" @tap="cart_event">
-                                        <iconfont name="icon-applet-shop-acquiesce" size="36rpx" color="#666"></iconfont>
+                                        <iconfont name="icon-menu-cart" size="36rpx" color="#666"></iconfont>
                                         <view v-if="(cart || null) != null && (cart.buy_number || 0) != 0" class="badge-icon pa">
                                             <component-badge :propNumber="cart.buy_number"></component-badge>
                                         </view>
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 6526bbe5..f79b49ff 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -66,8 +66,8 @@
                                     <view v-if="(user.user_name_view || null) != null" class="cr-base">{{ user.user_name_view }}</view>
                                 </view>
                                 <block v-if="current_opt_form == 'bind'">
-                                    <view class="margin-top-xxxl padding-top-xxxl">
-                                        <button class="bg-main-pair br-main-pair cr-white round text-size" type="warn" hover-class="none" data-value="bind_verify" @tap="opt_form_event">{{ $t('login.login.31r6p2') }}</button>
+                                    <view v-if="(common_user_verify_bind_mobile_list.length > 0 && common_user_verify_bind_mobile_list.indexOf(client_value) != -1) || (common_user_onekey_bind_mobile_list.length > 0 && common_user_onekey_bind_mobile_list.indexOf(client_value) != -1)" class="margin-top-xxxl padding-top-xxxl">
+                                        <button v-if="common_user_verify_bind_mobile_list.length > 0 && common_user_verify_bind_mobile_list.indexOf(client_value) != -1" class="bg-main-pair br-main-pair cr-white round text-size" type="warn" hover-class="none" data-value="bind_verify" @tap="opt_form_event">{{ $t('login.login.31r6p2') }}</button>
                                         <button v-if="common_user_onekey_bind_mobile_list.length > 0 && common_user_onekey_bind_mobile_list.indexOf(client_value) != -1" class="margin-top-xxl bg-main br-main cr-white round text-size" type="default" hover-class="none" open-type="getPhoneNumber" @getphonenumber="confirm_phone_number_event">{{ $t('login.login.p3kxy2') }}</button>
                                     </view>
                                     <!-- 当前还没有账号的情况下才可以操作登录和注册绑定 -->
@@ -453,6 +453,7 @@
                 // 基础配置
                 is_refreshed_base_data: 0,
                 is_exist_base_data: 0,
+                common_user_verify_bind_mobile_list: [],
                 common_user_onekey_bind_mobile_list: [],
                 home_site_logo_square: null,
                 home_user_login_type: [],
@@ -678,6 +679,7 @@
                 if ((status || false) == true) {
                     this.setData({
                         home_site_logo_square: app.globalData.get_config('config.home_site_logo_square'),
+                        common_user_verify_bind_mobile_list: app.globalData.get_config('config.common_user_verify_bind_mobile_list', []),
                         common_user_onekey_bind_mobile_list: app.globalData.get_config('config.common_user_onekey_bind_mobile_list', []),
                         home_user_login_type: app.globalData.get_config('config.home_user_login_type'),
                         home_user_reg_type: app.globalData.get_config('config.home_user_reg_type'),