diff --git a/template/uni-app/pages/annex/applicationRecord/index.vue b/template/uni-app/pages/annex/applicationRecord/index.vue index 2680c9ad3..1badcae6e 100644 --- a/template/uni-app/pages/annex/applicationRecord/index.vue +++ b/template/uni-app/pages/annex/applicationRecord/index.vue @@ -3,9 +3,9 @@ - {{item.mer_name}} - {{$t(`提交时间`)}}:{{item.create_time}} - {{$t(`原因`)}}:{{item.fail_msg}} + {{item.mer_name || ''}} + {{$t(`提交时间`)}}:{{item.create_time || ''}} + {{$t(`原因`)}}:{{item.fail_msg || ''}} diff --git a/template/uni-app/pages/annex/offline_pay/index.vue b/template/uni-app/pages/annex/offline_pay/index.vue index a64ada279..571593ed7 100644 --- a/template/uni-app/pages/annex/offline_pay/index.vue +++ b/template/uni-app/pages/annex/offline_pay/index.vue @@ -7,7 +7,7 @@ {{$t(`¥`)}} - {{$t(`会员优惠价`)}}:{{$t(`¥`)}}{{ payPrice }} + {{$t(`会员优惠价`)}}:{{$t(`¥`)}}{{ payPrice || 0 }} diff --git a/template/uni-app/pages/annex/vip_active/index.vue b/template/uni-app/pages/annex/vip_active/index.vue index c3ed03c5b..44b3b53cc 100644 --- a/template/uni-app/pages/annex/vip_active/index.vue +++ b/template/uni-app/pages/annex/vip_active/index.vue @@ -22,8 +22,8 @@ - {{item.title}} - {{item.explain}} + {{item.title || ''}} + {{item.explain || ''}} diff --git a/template/uni-app/pages/annex/vip_clause/index.vue b/template/uni-app/pages/annex/vip_clause/index.vue index a9b143a1e..f2850b861 100644 --- a/template/uni-app/pages/annex/vip_clause/index.vue +++ b/template/uni-app/pages/annex/vip_clause/index.vue @@ -1,6 +1,6 @@ diff --git a/template/uni-app/pages/annex/vip_paid/index.vue b/template/uni-app/pages/annex/vip_paid/index.vue index 9ba564416..5cab6e21a 100644 --- a/template/uni-app/pages/annex/vip_paid/index.vue +++ b/template/uni-app/pages/annex/vip_paid/index.vue @@ -4,19 +4,19 @@ - {{userInfo.nickname}} + {{userInfo.nickname || ''}} {{$t(`永久SVIP会员`)}} {{$t(`SVIP会员`)}} {{userInfo.overdue_time | dateFormat}} {{$t(`到期`)}} - {{$t(`您与`)}} {{userInfo.shop_name}} {{$t(`商城的第`)}} {{userInfo.register_days}} + {{$t(`您与`)}} {{userInfo.shop_name || ''}} {{$t(`商城的第`)}} {{userInfo.register_days || ''}} {{$t(`天.`)}} {{$t(`已累积为您节省`)}} {{$t(`¥`)}}{{userInfo.economize_money}} + class="num">{{userInfo.economize_money || ''}} {{$t(`开通即享会员权益`)}} diff --git a/template/uni-app/pages/goods/admin_order_detail/index.vue b/template/uni-app/pages/goods/admin_order_detail/index.vue index 41fe5b2c3..168cacdb9 100644 --- a/template/uni-app/pages/goods/admin_order_detail/index.vue +++ b/template/uni-app/pages/goods/admin_order_detail/index.vue @@ -469,7 +469,6 @@ .order-details .wrapper .item .conter { color: #868686; - width: 500upx; text-align: right; } diff --git a/template/uni-app/pages/goods/cashier/index.vue b/template/uni-app/pages/goods/cashier/index.vue index 1b3d031b4..19adb7e82 100644 --- a/template/uni-app/pages/goods/cashier/index.vue +++ b/template/uni-app/pages/goods/cashier/index.vue @@ -256,6 +256,7 @@ title: that.$t(`支付中`) }); if (paytype == 'friend' && that.orderId) { + uni.hideLoading(); return uni.navigateTo({ url: '/pages/users/payment_on_behalf/index?order_id=' + that.orderId + '&spread=' + this.$store.state.app.uid, @@ -290,7 +291,6 @@ '&spread=' + this .$store.state.app.uid - switch (status) { case 'ORDER_EXIST': case 'EXTEND_ORDER': @@ -518,16 +518,16 @@ case 'ALIPAY_PAY': //#ifdef H5 - uni.hideLoading(); - that.$util.Tips({ - title: that.$t(`等待支付中`) - }, { - tab: 4, - url: goPages + '&status=0' + uni.hideLoading(); + that.$util.Tips({ + title: that.$t(`等待支付中`) + }, { + tab: 4, + url: goPages + '&status=0' }); - that.formContent = res.data.result.jsConfig; - setTimeout(() => { - document.getElementById('alipaysubmit').submit(); + that.formContent = res.data.result.jsConfig; + setTimeout(() => { + document.getElementById('alipaysubmit').submit(); }, 1500); //#endif // #ifdef MP diff --git a/template/uni-app/pages/users/promoter-list/index.vue b/template/uni-app/pages/users/promoter-list/index.vue index 64fa475fd..56707f3b9 100644 --- a/template/uni-app/pages/users/promoter-list/index.vue +++ b/template/uni-app/pages/users/promoter-list/index.vue @@ -227,7 +227,9 @@ } }, onReachBottom: function() { - this.userSpreadNewList(); + if (this.teamCount > this.recordList.length) { + this.userSpreadNewList(); + } } } @@ -370,7 +372,7 @@ .no-data { background-color: #fff; padding-bottom: 30rpx; - padding: 180rpx 0 300rpx; + padding: 180rpx 0 calc(100vh - 1030rpx); .emptyBox { text-align: center;