diff --git a/common/request.js b/common/request.js index ce3b835..e187605 100644 --- a/common/request.js +++ b/common/request.js @@ -188,6 +188,11 @@ class RequestManager { uni.setStorageSync('lgurldata', JSON.stringify(pages[a].options)) } } + console.log(requestUrl); + if (requestUrl.indexOf('login_record') > -1) { + reject(res.data) + return; + } setTimeout(() => { uni.showToast({ title: '请先登录', diff --git a/components/order-confirm-popup/order-confirm-popup.vue b/components/order-confirm-popup/order-confirm-popup.vue index 67d6a45..007d933 100644 --- a/components/order-confirm-popup/order-confirm-popup.vue +++ b/components/order-confirm-popup/order-confirm-popup.vue @@ -225,7 +225,7 @@ export default { // 获取货币名称和余额名称 this.currencyName = this.$config.getAppSetting('currency1_name') || 'UU币'; this.currencyName2 = this.$config.getAppSetting('currency2_name') || '达达券'; - this.balanceName = this.$config.getAppSetting('balance_name') || '余额'; + this.balanceName = this.$config.getAppSetting('balance_name') || '钻石'; let goodType = this.$config.getGoodTypeFind(this.pageData.goods.type); this.setPayType(goodType); diff --git a/pages/other/order_info.vue b/pages/other/order_info.vue index 5cc80ca..66df0ad 100644 --- a/pages/other/order_info.vue +++ b/pages/other/order_info.vue @@ -3,10 +3,15 @@ 订单信息 + 订单名称: {{orderInfo.goods_title}} + + 订单编号: + {{orderInfo.order_num}} + 购买数量: {{orderInfo.prize_num}} diff --git a/pages/other/order_list.vue b/pages/other/order_list.vue index b242a3b..64769a4 100644 --- a/pages/other/order_list.vue +++ b/pages/other/order_list.vue @@ -118,11 +118,11 @@ export default { right: 0; background-color: #67c23a; color: #fff; - font-size: 22rpx; - padding: 4rpx 16rpx; + font-size: 20rpx; + padding: 2rpx 8rpx; // transform: rotate(45deg) translate(20%, -50%); transform-origin: center; - width: 220rpx; + width: 160rpx; text-align: center; box-shadow: 0 2rpx 4rpx rgba(0, 0, 0, 0.2); }