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 @@ - + 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 @@ {{ user.user_name_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'),