From 297aee5683b9c65b3349c67e3f598471048882c5 Mon Sep 17 00:00:00 2001 From: fanfan Date: Thu, 22 Feb 2024 15:51:11 +0800 Subject: [PATCH] =?UTF-8?q?=E9=92=B1=E5=8C=85=E7=BB=86=E8=8A=82=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=92=8C=E5=8F=91=E8=B4=A7=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/news/user/rechargeList.vue | 13 +- pages/news/user/withdrawal.vue | 46 ++++--- pages/news1/wallet.vue | 68 +++++++--- pages/news3/LogisticsDetails.vue | 29 +++-- pages/news3/ManualEntry.vue | 53 ++++++-- pages/news3/seasoningCondimentsRecord.vue | 149 ++++++++++++++++------ pages/news3/setOutRecords.vue | 39 ++++-- 7 files changed, 274 insertions(+), 123 deletions(-) diff --git a/pages/news/user/rechargeList.vue b/pages/news/user/rechargeList.vue index 793d9a5..e682695 100644 --- a/pages/news/user/rechargeList.vue +++ b/pages/news/user/rechargeList.vue @@ -13,7 +13,7 @@ - + 暂无数据显示哦~ @@ -35,12 +35,11 @@ let that = this; wallet.list() .then(res => { - if (res.data.list.data.length > 0) { + if (res.data.list.data.length == 0) { res.data.list.data.forEach((elem) => { elem.created_at = that.timestampToYds(elem.created_at) }); } - console.log(res.data.list.data) that.list = res.data.list.data }) .finally() @@ -63,11 +62,11 @@ diff --git a/pages/news1/wallet.vue b/pages/news1/wallet.vue index d2db4d0..5c9f6e2 100644 --- a/pages/news1/wallet.vue +++ b/pages/news1/wallet.vue @@ -6,14 +6,13 @@ - 余额说明 账户余额 - + - {{infor.balance}} + {{isEye?infor.balance:'****'}} 充值 @@ -73,15 +72,17 @@ - - + + 时间 - + - - + @@ -101,18 +102,18 @@ - + {{item.describe}} {{item.create_time}} - -{{item.money}} + {{item.money}} - + 暂无数据显示哦~ @@ -138,6 +139,7 @@ background: 'url(' + img + ') center top no-repeat', backgroundSize: '100% auto', }, + isEye:true, OrderType: 0, timeShow: false, timeParams: { @@ -164,7 +166,8 @@ list: [], start_at: '', end_at: '', - paramsIndex: 0 + paramsIndex: 0, + isDropShow: true } }, @@ -178,7 +181,14 @@ }) }, methods: { - onRecharge(){ + dropOpen() { + this.OrderType = 999 + }, + dropClose() { + this.OrderType ='' + this.getBalance('') + }, + onRecharge() { uni.navigateTo({ url: '/pages/wallet/recharge/index' }) @@ -214,12 +224,13 @@ }, resetting() { this.paramsIndex = 0; - this.start_at=''; - this.end_at=''; + this.start_at = ''; + this.end_at = ''; this.getBalance(''); this.timeShow = false }, onOrderTab(type) { + this.$refs.dropdown1.close(); this.OrderType = type; this.getBalance(type) }, @@ -306,8 +317,8 @@ font-weight: 400; color: #9C715E; position: absolute; - top: 20rpx; - right: 20rpx; + top: 32rpx; + right: 36rpx; z-index: 9; } @@ -370,6 +381,7 @@ padding: 30rpx 0; box-shadow: 0px 4px 9px 0px rgba(0, 0, 0, 0.12); opacity: 1; + border-radius: 0 0 6px 6px; .accountItem { flex: 1; @@ -441,6 +453,7 @@ .getData { position: relative; + background-color: #fff; .dropdownStyle { position: absolute; @@ -478,7 +491,7 @@ .btnText { flex: 1; - margin: 0 10rpx; + margin-right: 20rpx; background-color: #F3F4F6; border-radius: 50rpx; padding: 20rpx 40rpx; @@ -529,12 +542,28 @@ } ::v-deep .u-dropdown__menu { - height: 100% !important; + height: 100upx !important; } ::v-deep .u-dropdown__menu__item { justify-content: flex-end; padding-right: 20rpx; + align-items: stretch; + } + + // ::v-deep .u-dropdown__menu__item__text, + // ::v-deep .u-flex .u-icon__icon { + // color: #FE422B !important; + // } + + ::v-deep .u-input__right-icon { + display: none !important; + } + + ::v-deep .u-input { + text-align: center !important; + background-color: #F3F4F6 !important; + border-color: #F3F4F6 !important; } .order-tab { @@ -668,7 +697,6 @@ } .l { - flex: 1; .a { padding: 20rpx 0; @@ -678,7 +706,7 @@ } .b { - font-size: 28rpx; + font-size: 26rpx; font-weight: 400; color: #A3A3A3; } diff --git a/pages/news3/LogisticsDetails.vue b/pages/news3/LogisticsDetails.vue index d3ee71e..19a2a75 100644 --- a/pages/news3/LogisticsDetails.vue +++ b/pages/news3/LogisticsDetails.vue @@ -36,7 +36,10 @@ - 暂无物流信息 + + + 暂无物流信息~ + @@ -217,17 +220,21 @@ padding: 10rpx 20rpx; box-sizing: border-box; color: #999; - - // &:after { - // content: ''; - // display: inline-block; - // position: absolute; - // left: -10px; - // top: 18px; - // border-left: 10px solid #fff; - // border-bottom: 10px solid #f3f3f3; - // } } } } + .empty { + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + width: 100%; + height: 400rpx; + background-color: #fff; + image { + width: 114rpx; + height: auto; + margin-top: 90 0rpx; + } + } diff --git a/pages/news3/ManualEntry.vue b/pages/news3/ManualEntry.vue index 0f5e4ac..d5efccb 100644 --- a/pages/news3/ManualEntry.vue +++ b/pages/news3/ManualEntry.vue @@ -1,5 +1,5 @@