Sfoglia il codice sorgente

fix:交易记录时间查询无效修复

zhanghui 2 anni fa
parent
commit
30c6ba4327

+ 9 - 2
myPages/transactionRecord/index.vue

@@ -16,12 +16,16 @@
 
 
                 <picker class="picker" @change="sureChooseDate" mode='date' fields="month"  range-key="label" >
-                    <view class="left flex-row" @click="showDate">
+                    <view class="left flex-row">
                         <text>{{dataTime || '全部'}}</text>
                         <image class="xialaImage" src="/static/transaction/u5.png"></image>
                     </view>
                 </picker>
 
+                <view v-if="dataTime" class="left flex-row" @click="showDate">
+                    <text> 全部</text>
+                </view>
+
                 <view class="right flex-row justify-around">
                     <text>新增{{tranFlowstatistic.rechargeAmount || 0}}</text>
                     <text>消费-{{tranFlowstatistic.consumeAmount || 0 }}</text>
@@ -130,7 +134,10 @@
                 })
             },
             showDate(){
-                this.serviceTimeShow = true;
+                this.dataTime = '';
+                setTimeout(f=>{
+                    this.$refs.MescrollItem[this.tabIndex].downCallback()
+                },100)
             },
 
             maxDate(selectedMonth) {

+ 1 - 1
pages/order/index.vue

@@ -38,7 +38,7 @@
 				</view>
 
 				<view v-else class="text">
-					<text>前面还有{{ orderNumberData.waitNoNum || 0 }}人在等待</text>
+					<text>前面还有<text class="number">{{ orderNumberData.waitNoNum || 0 }}</text>人在等待</text>
 				</view>
 
 				<view class="text">

+ 1 - 1
pages/order/module/mescrollUni-item.vue

@@ -158,7 +158,7 @@
 							<view @click="getOrderSign(item)" class="btn" v-if="item.orderStatus == 11">
 								<text>排号信息</text>
 							</view>
-							<view @click="getQueueingMsg(item)" class="btn" v-if="item.canSignIn">
+							<view @click="getQueueingMsg(item)" class="btn" v-if="item.canSignIn && item.serviceAttribute == 1 ">
 								<text>排队信息</text>
 							</view>
 							<!--							<view class="btn" v-else-if="item.orderStatus == 6">-->