Merge branch 'test' of https://e.coding.net/g-cphe0354/xiaochengxusaomadiancan/cashier_weapp into gaohao

pagesQueueUp/index/index.vue

@@ -18,10 +18,10 @@
 						<text>预计等待</text>
 					</view>
 					<!-- queueUpList -->
-					<view class="center_list" v-for="(item,index) in queueUpList" :key="index">
+					<view class="center_list" v-for="(item,index) in tableList" :key="index">
 						<view class="w center_list_item">
-							<text>{{item.tableName||''}}</text>
+							<text>{{item.name||''}}</text>
-							<text>{{item.tableNote||''}}</text>
+							<text>{{item.note||''}}</text>
 						</view>
 						<view class="w center_list_item">
 							<text>{{item.waitingCount}}</text>
@@ -145,7 +145,7 @@
 		},
 		onShow() {
 			this.getQueueUpState();
-			this.getQueueUpList();
+			// this.getQueueUpList();
 			this.getQueueUpTablList();
 		},
 		
@@ -181,6 +181,7 @@
 				if ( res.code == 0) {
 					this.shopInfo = res.data.shopInfo;
 					this.queueInfo = res.data.queueInfo;
+					this.queueId = this.queueInfo.id;
 				}
 			},
 			
@@ -221,6 +222,10 @@
 					queueId: this.queueId,
 				})
 				if ( res.code == 0) {
+					uni.showToast({
+						title: '订阅成功',
+						icon: 'none'
+					});
 					uni.requestSubscribeMessage({
 						tmplIds:["qUhvEfvCtIcBA3DOn3QMqsGOolrEpyr0YBh99i-AUqw","yxOjWK-KjMEZ_BaHWqDJJpHiUPXN6JWqr7u9y65RIWM","3BgFazRpVlvreh5z9u4cNP_VeclXKSQfh-r3x2_bYx4"],
 						complete() {
@@ -273,7 +278,7 @@
 					shopId: this.shopId,
 				})
 				if ( res.code == 0) {
-					this.getQueueUpList();
+					this.getQueueUpTablList();
 					this.getQueueUpState();
 				}