Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxingli...

rk

2026-04-28 a59ff44b2eaa7020f0529632d9ec064c4dc38e27

 small-program/shop/pages/wallet/wallet.vue

@@ -75,9 +75,9 @@
                           <view class="info-a-label">
                           {{item.type === 0 ? '完成订单' : item.type === 1 ? '提现支出' : item.type === 2 ? '提现退回' : ''}}
                           <template  v-if="item.type === 1">
                              <text style="color: #FF0020;"  v-if="item.withdrawStatus == 2">未通过</text>
                              <text style="color: #004096" v-else-if="item.withdrawStatus == 1">已通过</text>
                              <text style="color: #FF0020;" v-else>审核中</text>
                              <text style="color: #FF0020;"  v-if="item.status == 2">处理中</text>
                              <text style="color: #FF0020;" v-else-if="item.status == 1">失败</text>
                              <text style="color: #004096;" v-else>已通过</text>
                           </template>
                           </view>
                           <view class="info-a-price">
@@ -192,6 +192,7 @@
            countData:{},
            countDataList:{},
            hasNext:true,
            loading:false,
            show: false,
            show1:false,
            year:null,
@@ -246,8 +247,8 @@
               model: {
                  startTime: this.startDate || this.defaultStartDate,
                  endTime: this.endDate || this.defaultEndDate,
                  type: this.active === 1?0:(this.active===2?1:''), 
                  objType: this.type === 1?16:( this.type === 2?17:( this.type === 3?25: (this.type === 4?1: ''))), 
                  optType: this.active === 1 ? 1 : (this.active === 2 ? -1 : ''),
                  type: this.type === 1 ? 0 : (this.type === 2 ? 1 : (this.type === 4 ? 2 : '')),
               },
               page: this.currentPage
            }).then(res => {
@@ -267,8 +268,8 @@
            this.$u.api.shopSummary({
               startTime: this.startDate || this.defaultStartDate,
               endTime: this.endDate || this.defaultEndDate,
               type: this.active === 1?0:(this.active===2?1:''), 
               objType: this.type === 1?16:( this.type === 2?17:( this.type === 3?25: (this.type === 4?1: ''))), 
               optType: this.active === 1 ? 1 : (this.active === 2 ? -1 : ''),
               type: this.type === 1 ? 0 : (this.type === 2 ? 1 : (this.type === 4 ? 2 : '')),
            }).then(res=>{
               if(res.code == 200){
                  this.countDataList = res.data
@@ -285,22 +286,34 @@
         },
         comfirmDate(flag){
            if (flag) {
               if(new Date(this.tempEndDate+" 00:00:00").getTime() < new Date(this.tempStartDate+" 00:00:00").getTime()){
               if (!this.tempStartDate || !this.tempEndDate) {
                  return uni.showToast({
                     title:'日期范围不正确',
                     icon:'error'
                     title: '请选择开始和结束时间',
                     icon: 'none'
                  })
               }
               this.startDate =this.tempStartDate
               this.endDate =this.tempEndDate
               if(new Date(this.tempEndDate+" 00:00:00").getTime() <= new Date(this.tempStartDate+" 00:00:00").getTime()){
                  return uni.showToast({
                     title:'开始时间必须小于截止时间',
                     icon:'none'
                  })
               }
               this.startDate = this.tempStartDate
               this.endDate = this.tempEndDate
               this.show1 = false
               setTimeout(() => {
                  this.getFirstPageData()
               }, 300)
            } else {
               this.startDate = null
               this.endDate = null
               this.tempStartDate = this.defaultStartDate
               this.tempEndDate = this.defaultEndDate
               this.tempStartDate = null
               this.tempEndDate = null
               this.show1 = false
               setTimeout(() => {
                  this.getFirstPageData()
               }, 300)
            }
            this.getFirstPageData()
            this.show1=false
         },
         openShow(){
            this.tempActive =this.active
@@ -311,7 +324,6 @@
            if(flag){
               this.active = this.tempActive
               this.type = this.tempType
               this.show = false
               this.wordsWidth = 250
               if(this.active === 0 && this.type === 0){
                  this.words = '全部'
@@ -323,10 +335,20 @@
                  }
                  this.words = t1 + t2
               } 
               this.getFirstPageData()
               this.show = false
               setTimeout(() => {
                  this.getFirstPageData()
               }, 300)
            }else{
               this.tempActive = 0
               this.tempType =0
               this.tempType = 0
               this.active = 0
               this.type = 0
               this.words = '全部'
               this.show = false
               setTimeout(() => {
                  this.getFirstPageData()
               }, 300)
            }
         },
         formattedDateTime(currentDate) {
@@ -361,9 +383,10 @@
         },
         getFirstPageData(){
            this.currentPage = 0
            this.hasNext=true
            this.total=0
            this.dataList=[]
            this.hasNext = true
            this.loading = false
            this.total = 0
            this.dataList = []
            this.getShopPage()
         },
         jumpWithdraw(){
@@ -610,6 +633,8 @@
                  font-size: 30rpx;
                  font-weight: 400;
                  margin-top: 30rpx;
                  padding-bottom: 30rpx;
                  box-sizing: border-box;
               }
               .item-list-item {
                  width: 100%;