feat:查看店内排队人数

common/js/api.js

@@ -4,7 +4,7 @@ import request from '../js/request.js';
 export default {
 
 
-    //我的权益卡列表
+    //结束订单
     orderFinish(orderId) {
         return request({
             url: '/order/wechat/order/finish/' + orderId,
@@ -12,7 +12,7 @@ export default {
         })
     },
 
-    //我的权益卡列表
+    //查看排队信息
     viewNumber(data) {
         return request({
             url: '/order/wechat/order/viewNumber/' + data,
@@ -20,6 +20,14 @@ export default {
         })
     },
 
+    //查看店内排队数量
+    queueInfo(data) {
+        return request({
+            url: '/order/wechat/order/queueInfo/' + data,
+            method: 'GET'
+        })
+    },
+
 
     //我的权益卡列表
     myEquityCardList() {

pages/order/index.vue

@@ -2,16 +2,6 @@
 	<view class="content">
 
 		<u-sticky>
-			<!--			<view ref="hContentWrap" class="hContentWrap h-content-wrap">-->
-			<!--				<view class="tab-bar">-->
-			<!--					<view class="tab-item" :class="{ active: currentTab === 0 }" @click="changeTab(0)">-->
-			<!--						服务订单-->
-			<!--					</view>-->
-			<!--					<view class="tab-item" :class="{ active: currentTab === 1 }" @click="changeTab(1)">-->
-			<!--						产品订单-->
-			<!--					</view>-->
-			<!--				</view>-->
-			<!--			</view>-->
 			<View class=" tabs">
 				<u-tabs :list="tabList" :scrollable="false" lineWidth="30" lineColor="#FFE05C" :activeStyle="{
             					color: '#333333',
@@ -26,22 +16,13 @@
 			<swiper :style="{'height':windowHeight}" :current="tabIndex" @change="swiperChange">
 				<swiper-item class="swiperItem" v-for="(item,index) in tabList" :key="index">
 					<view>
-						<mescroll-item ref="MescrollItem" :i="index" :index="tabIndex" :tabs="tabList" :height="windowHeight" @serialNumber="serialNumber" @openPay="openPay" @openPayAppointment="openPayAppointment">
+						<mescroll-item ref="MescrollItem" :i="index" :index="tabIndex" :tabs="tabList" :height="windowHeight"  @getQueueingMsg="getQueueingMsg" @serialNumber="serialNumber" @openPay="openPay" @openPayAppointment="openPayAppointment">
 						</mescroll-item>
 					</view>
 				</swiper-item>
 			</swiper>
 		</view>
 
-
-		<!--		<view class="product-order" v-if="currentTab === 1">-->
-		<!--			&lt;!&ndash; Tab 2 内容 &ndash;&gt;-->
-		<!--			<view class="developing">-->
-		<!--				<text>敬请期待...</text>-->
-		<!--			</view>-->
-		<!--		</view>-->
-
-
 		<uni-popup ref="serialNumber">
 			<view class="serial-number">
 				<view class="text">
@@ -63,9 +44,22 @@
 				<view class="text">
 					<text>随时关注小程序的排队进程，过号作废</text>
 				</view>
-				<!--				<view class="text">-->
-				<!--					<text>0851—85833828</text>-->
-				<!--				</view>-->
+
+			</view>
+		</uni-popup>
+		<uni-popup ref="getQueueingMsg">
+			<view class="serial-number" :style="{width:'400rpx'}">
+				<view class="text">
+					<text>店内已排队数： </text>
+					<text class="number">{{queueingMsgData.alreadyQueuedTotal}}</text>
+				</view>
+				<view class="text">
+					<text>店内待排队数：</text>
+					<text class="number">{{queueingMsgData.waitQueuedTotal}}</text>
+				</view>
+				<view class="text" :style="{color:'red',fontSize:'35rpx'}">
+					<text>请您尽快到店签到排队</text>
+				</view>
 			</view>
 		</uni-popup>
 
@@ -147,11 +141,6 @@
 			</view>
 		</uni-popup>
 
-
-		<!--		<view class="tabBarLineHeight"></view>-->
-<!--		<view class="tabBarView">-->
-<!--			<tab-bar :tabIndex="tabBarIndex"></tab-bar>-->
-<!--		</view>-->
 	</view>
 </template>
 
@@ -172,7 +161,7 @@
 				tabBarIndex:3,
 				currentTab: 0,
 				currentServiceTab: 'orderTab1',
-
+				queueingMsgData:{},
 				tabList: [{
 					name: '全部'
 				}, {
@@ -226,6 +215,13 @@
 				this.$refs.serialNumber.open()
 			},
 
+			getQueueingMsg(order){
+				this.$api.queueInfo(order.orderId).then(res=>{
+					this.queueingMsgData = res.data.data
+				})
+				this.$refs.getQueueingMsg.open()
+			},
+
 			openPayAppointment(order,number){
 				console.log(order)
 				console.log(number)

pages/order/module/mescrollUni-item.vue

@@ -158,6 +158,9 @@
 							<view @click="getOrderSign(item)" class="btn" v-if="item.orderStatus == 11">
 								<text>排号信息</text>
 							</view>
+							<view @click="getQueueingMsg(item)" class="btn" v-if="item.canSignIn">
+								<text>排队信息</text>
+							</view>
 							<!--							<view class="btn" v-else-if="item.orderStatus == 6">-->
 							<!--								<text>服务中</text>-->
 							<!--							</view>-->
@@ -173,8 +176,6 @@
 				</view>
 			</view>
 
-
-
 		</view>
 
 	</mescroll-uni>
@@ -257,6 +258,10 @@
 				this.$emit('serialNumber',order)
 			},
 
+			getQueueingMsg(order){
+				this.$emit('getQueueingMsg',order)
+			},
+
 			appointment(order){
 				this.$emit('openPayAppointment',order,2)
 			},