瀏覽代碼

bug 修复

lilei 2 年之前
父節點
當前提交
58c6687b44
共有 3 個文件被更改,包括 9 次插入5 次删除
  1. 4 0
      pages/morePage/redPacket.vue
  2. 2 2
      pagesA/digitalShelf/orderDetail.vue
  3. 3 3
      pagesA/digitalShelf/orderList.vue

+ 4 - 0
pages/morePage/redPacket.vue

@@ -34,6 +34,9 @@
 							<view class="totalBar" v-if="rewardData&&curTab==1&&total">
 								共<text>{{total}}</text>个红包,合计<text>{{rewardData.paidAmount}}</text>元
 							</view>
+							<view class="totalBar" v-if="rewardData&&curTab==2&&total">
+								共<text>{{total}}</text>个红包,合计<text>{{rewardData.unpaidAmount}}</text>元
+							</view>
 							<view class="flex align_center justify_between itemlist" v-for="item in list" :key="item.id">
 								<view class="flex align_center">
 									<view class="imgs flex align_center">
@@ -126,6 +129,7 @@
 				this.list = []
 				this.total = 0
 				this.getEwardOrder(1)
+				this.getUserReward()
 			},
 			// 查询列表
 			getEwardOrder (pageNo) {

+ 2 - 2
pagesA/digitalShelf/orderDetail.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="orderDetail-digitalShel flex flex_column">
-		<view class="contHead" :style="{background:state== 'FINISH'?'#066cff':'#ff5500',color:'#fff'}">
+		<view class="contHead" :style="{background:state!= 'CLOSE' ? '#066cff':'#ff5500',color:'#fff'}">
 			<view class="statusH">
 				<view class="flex flex_column align_center">
 					<view class="status-row">
@@ -132,7 +132,7 @@
 		  // 更改标题栏背景色
 		  uni.setNavigationBarColor({
 		  	frontColor: '#ffffff',
-		  	backgroundColor: option.state== 'FINISH' ? '#066cff':'#ff5500',
+		  	backgroundColor: option.state!= 'CLOSE' ? '#066cff':'#ff5500',
 		  })
 	   },
 	   onShow() {

+ 3 - 3
pagesA/digitalShelf/orderList.vue

@@ -81,6 +81,7 @@
 				theme:'',
 				status: 'loading',
 				noDataText: '暂无数据',
+				stateList:['WAIT','FINISH','CLOSE'],
 				tabList: [
 					  {
 						  dispName: '待取货',
@@ -184,11 +185,10 @@
 			    this.pageNo = pageNo
 			  }
 			  // 状态条件
-			  const state = ['WAIT','FINISH','CLOSE']
 			  let params = {
 			    pageNo: this.pageNo,
 			    pageSize: this.pageSize,
-				billState: state[this.swiperCurrent]
+				billState: this.stateList[this.swiperCurrent]
 			  }
 			  this.status = "loading"
 			  getShelfOrderList(params).then(res => {
@@ -213,7 +213,7 @@
 			// 详细页
 			viewRow(item){
 				uni.navigateTo({
-					url: "/pagesA/digitalShelf/orderDetail?shelfOrderSn="+item.shelfOrderSn+"&state="+['FINISH','CLOSE'][this.swiperCurrent]
+					url: "/pagesA/digitalShelf/orderDetail?shelfOrderSn="+item.shelfOrderSn+"&state="+this.stateList[this.swiperCurrent]
 				})
 			},
 			// 删除