From 442040e7fc501d2522b35f7a5d24923c2efcf414 Mon Sep 17 00:00:00 2001 From: gongfuxiang Date: Thu, 22 Feb 2024 23:47:08 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E5=95=86=E5=9F=8E=E7=A7=AF?= =?UTF-8?q?=E5=88=86=E5=85=91=E6=8D=A2=E4=BC=98=E3=80=81=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E5=9C=B0=E5=9D=80=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/cart/cart.vue | 6 +- components/goods-list/goods-list.vue | 2 +- pages/buy/buy.css | 11 ++- pages/buy/buy.vue | 18 ++--- pages/user-address/user-address.vue | 112 +++++++++++++++++---------- 5 files changed, 89 insertions(+), 60 deletions(-) diff --git a/components/cart/cart.vue b/components/cart/cart.vue index 7e0c2554..e61a9585 100644 --- a/components/cart/cart.vue +++ b/components/cart/cart.vue @@ -133,8 +133,8 @@ - - diff --git a/components/goods-list/goods-list.vue b/components/goods-list/goods-list.vue index 3d55be6a..b6bf0c58 100644 --- a/components/goods-list/goods-list.vue +++ b/components/goods-list/goods-list.vue @@ -81,7 +81,7 @@ {{ item.show_price_unit }} - {{ item.integral }}{{ $t('index.index.t26j9z') }} + {{ item.plugins_points_exchange_integral }}{{ $t('index.index.t26j9z') }} diff --git a/pages/buy/buy.css b/pages/buy/buy.css index 80a97629..ee7a8fb6 100644 --- a/pages/buy/buy.css +++ b/pages/buy/buy.css @@ -141,11 +141,14 @@ * 数据列表项 */ .buy-data-item, -.buy-data-item .right-value{ +.buy-data-item .right-value { line-height: 80rpx; } .buy-data-item .right-value { - width: calc(100% - 300rpx); + width: calc(100% - 260rpx); +} +.buy-data-item .right-value .right-value-content { + width: calc(100% - 32rpx); } /* @@ -209,8 +212,8 @@ * 门店次卡-页面选择 */ .plugins-realstore-container-view .image { - width: 40rpx; - height: 40rpx !important; + width: 34rpx; + height: 34rpx !important; } /* diff --git a/pages/buy/buy.vue b/pages/buy/buy.vue index a25e945b..5e9961bf 100644 --- a/pages/buy/buy.vue +++ b/pages/buy/buy.vue @@ -29,7 +29,7 @@ {{ address.province_name || '' }}{{ address.city_name || '' }}{{ address.county_name || '' }}{{ address.address || '' }} - + {{ common_site_type == 0 || (common_site_type == 4 && site_model == 0) ? $t('buy.buy.6rk813') : $t('buy.buy.wq7gnb') }} @@ -86,8 +86,8 @@ {{$t('buy.buy.876tgh')}} - - + + {{ group.plugins_freightfee_data.default.fee_name }} @@ -100,8 +100,8 @@ {{$t('buy.buy.45ovhs')}} - - {{ (plugins_choice_coupon_value || null) != null && (plugins_choice_coupon_value[group.id] || null) != null ? plugins_choice_coupon_value[group.id] : $t('buy.buy.553mxo') }} + + {{ (plugins_choice_coupon_value || null) != null && (plugins_choice_coupon_value[group.id] || null) != null ? plugins_choice_coupon_value[group.id] : $t('buy.buy.553mxo') }} @@ -112,10 +112,10 @@ {{$t('buy.buy.58rs1a')}} - - x{{ item.stock }} - - {{ item.tips_msg }} + + x{{ item.stock }} + + {{ item.tips_msg }} diff --git a/pages/user-address/user-address.vue b/pages/user-address/user-address.vue index 53832c06..588b8a95 100644 --- a/pages/user-address/user-address.vue +++ b/pages/user-address/user-address.vue @@ -69,8 +69,11 @@ common_user_address_platform_import_list: [], client_value: app.globalData.application_client_type(), data_list: [], - params: null, - is_default: 0, + params: null, + // 当前默认地址id + is_default: 0, + // 自动导入系统地址并选择 + is_auto_import_system_address_choose: 0, }; }, @@ -163,27 +166,38 @@ uni.hideLoading(); uni.stopPullDownRefresh(); if (res.data.code == 0) { - var data = res.data.data; - if (data.data.length > 0) { + var data = res.data.data; + var data_list = data.data || []; + if (data_list.length > 0) { // 获取当前默认地址 var is_default = 0; - for (var i in data.data) { - if (data.data[i]['is_default'] == 1) { - is_default = data.data[i]['id']; + for (var i in data_list) { + if (data_list[i]['is_default'] == 1) { + is_default = data_list[i]['id']; } } // 设置数据 this.setData({ - data_list: data.data, + data_list: data_list, is_default: is_default, data_list_loding_status: 3, data_bottom_line_status: true, }); } else { - this.setData({ - data_list_loding_status: 0, - }); + this.setData({ + data_list: [], + data_list_loding_status: 0, + data_bottom_line_status: false, + }); + + // 没有地址：当前不是选择地址自动返回模式下、是否下单选择地址、并且开启了系统地址选择则导入系统地址 + if(this.is_auto_import_system_address_choose == 0 && (this.params.is_back || 0) == 1 && this.common_user_address_platform_import_list.length > 0 && this.common_user_address_platform_import_list.indexOf(this.client_value) != -1) { + this.setData({ + is_auto_import_system_address_choose: 1, + }); + this.choose_system_address_event(); + } } } else { this.setData({ @@ -216,18 +230,23 @@ if(parseInt(data.address_disable_status || 0) == 1 && (data.address_disable_msg || null) != null) { app.globalData.showToast(data.address_disable_msg); } else { - // 存储缓存并返回 - uni.setStorage({ - key: app.globalData.data.cache_buy_user_address_select_key, - data: data, - }); - uni.navigateBack(); + // 存储缓存并返回 + this.address_choose_cache_save_back(data); } } else { // 点击复制地址 var copy_val = this.$t('user-address.user-address.7r29v8') + data.name + '\n' + this.$t('user-address.user-address.2nmsi1') + data.tel + '\n' + this.$t('user-address.user-address.s150l6') + data.province_name + data.city_name + data.county_name + data.address; app.globalData.text_copy_event(copy_val); } + }, + + // 地址选择存储并返回 + address_choose_cache_save_back(address) { + uni.setStorage({ + key: app.globalData.data.cache_buy_user_address_select_key, + data: address, + }); + uni.navigateBack(); }, // 获取系统地址事件 @@ -252,34 +271,41 @@ city: res.cityName || '', county: res.countyName || '', address: res.detailInfo || '', - }; - - // 加载获取数据 - uni.showLoading({ - title: self.$t('common.processing_in_text'), - }); - uni.request({ - url: app.globalData.get_request_url('outsystemadd', 'useraddress'), - method: 'POST', - data: data, - dataType: 'json', - success: (res) => { - uni.hideLoading(); - if (res.data.code == 0) { - self.get_data_list(); - } else { - if (app.globalData.is_login_check(res.data)) { - app.globalData.showToast(res.data.msg); + }; + if((Object.values(data).join('') || null) != null) { + uni.showLoading({ + title: self.$t('common.processing_in_text'), + }); + uni.request({ + url: app.globalData.get_request_url('outsystemadd', 'useraddress'), + method: 'POST', + data: data, + dataType: 'json', + success: (res) => { + uni.hideLoading(); + if (res.data.code == 0) { + // 是否自动选择地址并返回 + if(self.is_auto_import_system_address_choose == 1) { + // 存储缓存并返回 + self.address_choose_cache_save_back(res.data.data); + } else { + // 重新拉取列表数据 + self.get_data_list(); + } } else { - app.globalData.showToast(self.$t('common.sub_error_retry_tips')); + if (app.globalData.is_login_check(res.data)) { + app.globalData.showToast(res.data.msg); + } else { + app.globalData.showToast(self.$t('common.sub_error_retry_tips')); + } } - } - }, - fail: () => { - uni.hideLoading(); - app.globalData.showToast(self.$t('common.internet_error_tips')); - }, - }); + }, + fail: () => { + uni.hideLoading(); + app.globalData.showToast(self.$t('common.internet_error_tips')); + }, + }); + } }, }); },