1.微信一键登录：新增“同意用户协议”之后才可登录

陶杰

2025-01-13 efa9bfe98ba906e4c9b8f49c89f5da162a46bb0f

 pages/order/order.vue

@@ -46,43 +46,18 @@
         this.query.status = options.status || ''
         this.listApi = `/api/customer/order/list`
         await this.getList()
         this.timer = setInterval(() => {
            //倒计时
            var nowdate = new Date().getTime() - 1000 * 60 * 5
            var change = false
            for (var item of this.list) {
               if (item.statusBackend === 'PENDING') {
                  //计算倒计时
                  var diff = new Date(item.createTime).getTime() - nowdate
                  // console.log('diff', diff, item)
                  if (diff <= 2000 && true) {
                     //超过了5分钟
                     item.statusBackend = 'CANCEL'
                     item.statusBackend = '已取消'
                     item.status = 'CANCEL'
                     item.statusStr = '已取消'

                     item.bctime = ''
                     change = true
         console.log('order-list-query',this.query.status)
         if(this.query.status=='PENDING'){
            this.getPendingTimer()
         }
			
      },

                  } else {
                     //相差
                     var alltime = parseInt(diff / 1000)
                     var tt = 0
                     if (alltime > 60) {
                        tt = alltime - parseInt(alltime / 60) * 60
                     } else {
                        tt = alltime
                     }
                     item.bctime = `0${parseInt(alltime / 60)}:${tt<10?'0':''}${tt}`
                     change = true

                  }
               }
            }
            if (change)
               this.$forceUpdate()
         }, 1000)

      onShow() {
         // console.log("onshow")
      },
      onReachBottom() {
         this.getMore()
@@ -94,6 +69,69 @@
      },
      methods: {

         changeStatus(item) {
            this.query.status = item.value || '';
            this.refreshList();
            if(item.value=='PENDING'){
               this.getPendingTimer()
            }else{
               if(this.timer){
                  clearTimeout(this.timer)
                  this.timer=null
               }
            }
				
         },

         getPendingTimer(){

            this.timer = setInterval(async () => {
				
               let res = await this.$http.request('get', `/api/order/time/now`, {
                  params: {}
               })
               let serverTime=res.data;
					
               //倒计时
               var nowdate = serverTime - 1000 * 60 * 15
               // var nowdate = new Date().getTime() - 1000 * 60 * 5
               var change = false
               for (var item of this.list) {
                  if (item.statusBackend === 'PENDING') {
                     //计算倒计时
					
                     var diff = new Date(item.createTime).getTime() - nowdate
                     // console.log('diff', diff, item)
                     if (diff <= 2000 && true) {
                        //超过了5分钟
                        item.statusBackend = 'CANCEL'
                        item.statusBackend = '已取消'
                        item.status = 'CANCEL'
                        item.statusStr = '已取消'

                        item.bctime = ''
                        change = true

                     } else {
                        //相差
                        var alltime = parseInt(diff / 1000)
                        var tt = 0
                        if (alltime > 60) {
                           tt = alltime - parseInt(alltime / 60) * 60
                        } else {
                           tt = alltime
                        }
                        // item.bctime = `0${parseInt(alltime / 60)}:${tt<10?'0':''}${tt}`
                        item.bctime = `${parseInt(alltime / 60) < 10 ? '0' : ''}${parseInt(alltime / 60)}:${tt < 10 ? '0' : ''}${tt}`
                        change = true

                     }
                  }
               }
               if (change)
                  this.$forceUpdate()
            }, 1000)
         },

         openbrand(item) {
            console.log(item)
@@ -136,8 +174,17 @@
               url: `/sub_pages/customer/trade/detail?id=${item.flowerId}`
            })
         },
         getList_after() {
            var nowdate = new Date().getTime() - 1000 * 60 * 5
         async getList_after() {
				
            let res = await this.$http.request('get', `/api/order/time/now`, {
               params: {}
            })
            let serverTime=res.data;
				
            //倒计时
            var nowdate = serverTime - 1000 * 60 * 15
				
            // var nowdate = new Date().getTime() - 1000 * 60 * 15
            var change = false
            for (var item of this.list) {
               if (item.statusBackend === 'PENDING') {
@@ -164,6 +211,12 @@
            // console.log(' toDetail item', item)
            uni.navigateTo({
               url: '/pages/order/order-detail?id=' + item.id
            })
         },
			
         commentButtonClick(item){
            uni.navigateTo({
               url: '/pages/order/comment/order-comment?id='+item.id
            })
         },

@@ -294,6 +347,9 @@
                     this.$message.hideLoading()
                     if (code === 0) {
                        this.refreshList()
                        //刷新积分
                        this.$store.dispatch('getCurrentInfo')
                        this.$message.showToast('收货成功')
                     }
                  }

@@ -419,10 +475,19 @@
         </view>
      </view>
      <view class="status-list m-t-12 flex flex-wrap-normal">
         <view v-for="each of status" :key="each.value" @click.stop="(e)=>{
         <!-- <view v-for="each of status" :key="each.value" @click.stop="(e)=>{
              query.status = each.value || '';
              refreshList();
           if(query.status!='PENDING'){
            timer && clearTimeout(this.timer)
            timer=null
           }else{
            getPendingTimer()
           }
            }" class="status-each" :class="[query.status===each.value?'cur':'']">
            {{ each.name }}
         </view> -->
         <view v-for="each of status" :key="each.value" @click.stop="changeStatus(each)" class="status-each" :class="[query.status===each.value?'cur':'']">
            {{ each.name }}
         </view>
      </view>
@@ -579,8 +644,11 @@
               <!--       <view class="button button-1 m-l-a m-r-15" @click="toDetailSale(dto)"
                  v-if="dto.statusBackend === 'RECEIVE'"> 申请售后
               </view> -->
               <view class="button button-0 m-l-a m-r-15" @click="buttonClick(dto,'evaluate')"
               <!-- <view class="button button-0 m-l-a m-r-15" @click="buttonClick(dto,'evaluate')"
                  v-if="dto.statusBackend === 'EVALUATE'"> 评价
               </view> -->
               <view class="button button-0 m-l-a m-r-15" @click="commentButtonClick(dto)"
                     v-if="dto.statusBackend === 'EVALUATE'"> 评价
               </view>