Ver Fonte

bug 修复

lilei há 2 anos atrás
pai
commit
e2f4e76d70

+ 17 - 17
pages/digitalShelf/orderList.vue

@@ -82,19 +82,19 @@
 				status: 'loading',
 				noDataText: '暂无数据',
 				tabList: [
-					  // {
-						 //  dispName: '待取货',
-						 //  typeId: 1,
-						 //  count: 0
-					  //  },
+					  {
+						  dispName: '待取货',
+						  typeId: 1,
+						  count: 0
+					   },
 					  {
 					    dispName: '已取货',
-					  	typeId: 1,
+					  	typeId: 2,
 						count: 0
 					  },
 					  {
 					    dispName: '已取消',
-					  	typeId: 2,
+					  	typeId: 3,
 						count: 0
 					  },
 				  ],
@@ -184,7 +184,7 @@
 			    this.pageNo = pageNo
 			  }
 			  // 状态条件
-			  const state = ['FINISH','CLOSE']
+			  const state = ['WAIT','FINISH','CLOSE']
 			  let params = {
 			    pageNo: this.pageNo,
 			    pageSize: this.pageSize,
@@ -199,9 +199,9 @@
 					  _this.list = res.data.list || []
 				  }
 				  _this.total = res.data.count || 0
-				  // if(this.current == 0){
-					 //  _this.tabList[0].count = _this.total
-				  // }
+				  if(this.current == 0){
+					  _this.tabList[0].count = _this.total
+				  }
 				} else {
 				  _this.list = []
 				  _this.total = 0
@@ -224,9 +224,9 @@
 					console.log(res)
 					if(res.status == 200){
 						this.list.splice(index,1)
-						// if(this.current == 0){
-						// 	this.tabList[0].count = this.tabList[0].count - 1
-						// }
+						if(this.current == 0){
+							this.tabList[0].count = this.tabList[0].count - 1
+						}
 					}else{
 						uni.showModal({
 							title: '提示',
@@ -269,9 +269,9 @@
 						  takeGoods({sn:item.shelfOrderSn}).then(res => {
 							 if(res.status == 200){
 								 _this.list.splice(index,1)
-								 // if(_this.current == 0){
-									// _this.tabList[0].count = _this.tabList[0].count - 1
-								 // }
+								 if(_this.current == 0){
+									_this.tabList[0].count = _this.tabList[0].count - 1
+								 }
 							 }
 							 uni.showToast({
 								title: res.message,

+ 4 - 4
pages/digitalShelf/settlementManage/settlementSxDetail.vue

@@ -8,7 +8,7 @@
 					<text>¥{{info?info.usedAmount.toFixed(2):0.00}}</text>
 				</view>
 			</view>
-			<!-- <view class="sxjs-head-grid flex align-center justify_between">
+			<view class="sxjs-head-grid flex align-center justify_between">
 				<view :class="tabIndex==0?'active':''" @click="tabChange(0)">
 					<view>待结算</view>
 					<view class="edu"><text>¥{{info?info.waitSettleAmount:0.00}}</text></view>
@@ -19,13 +19,13 @@
 					<view class="edu"><text>¥{{info?info.freezeAmount.toFixed(2):0.00}}</text></view>
 					<view class="line"></view>
 				</view>
-			</view> -->
+			</view>
 		</view>
 		<view class="ds-box">
 			<scroll-view style="height: calc(100vh - 370upx);position: relative;" scroll-y @scrolltolower="loadMore">
-				 <!-- <view class="notes-msg" v-if="tabIndex==1">
+				 <view class="notes-msg" v-if="tabIndex==1">
 				 	已冻结金额是指状态为“待取货”的订单结算金额合计,暂时无需支付,但是会占用授信额度,请尽快处理
-				 </view> -->
+				 </view>
 				 <!-- 列表 -->
 				 <view class="ds-list" v-for="item in list" :key="item.id">
 				 	<view class="flex align_center">