Merge branch 'test' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test

pageLineUp/callRecord.vue

@@ -70,7 +70,6 @@
 			page: 1,
 			size: 9999
 		}).then((res) => {
-			console.log(res, '调试1')
 			datas.list = res.records
 		})
 	}

pageLineUp/index.vue

@@ -46,7 +46,20 @@
 	<!-- 播报弹窗 -->
 	<uni-popup ref="alertDialog" type="dialog">
 		<uni-popup-dialog :type="datas.msgType" cancelText="完成" confirmText="过号" confirmText-color="#000" title="播报"
-			content="通知消息已发送" @confirm="dialogConfirm(1)" @close="dialogConfirm(2)"></uni-popup-dialog>
+			@confirm="dialogConfirm(1)" @close="dialogConfirm(2)">
+			<view class="">
+				<view class="">
+					正在叫号请稍后
+				</view>
+				<view style="font-size: 24rpx; text-align:center;color: #52C41A;"
+					v-if="datas.profilepicturedata.state==1">
+					已发送至用户
+				</view>
+				<view style="font-size: 24rpx;text-align:center;color: #F02C45;" v-else>
+					用户未订阅消息
+				</view>
+			</view>
+		</uni-popup-dialog>
 	</uni-popup>
 	<!-- 取号遮罩层 -->
 	<up-popup :show="datas.show" :round="18" mode="center" @close="close" @open="open">
@@ -129,7 +142,10 @@
 		// 顶部全部\大桌选择
 		selecttopType: '',
 		// 选中拨号的id
-		dialId: ""
+		dialId: "",
+		// 拨号是否订阅
+		profilepicturedata: ""
+
 	})
 	onMounted(() => {
 		getList()
@@ -215,17 +231,7 @@
 				datas.showtowData = res
 				datas.phone = ''
 				getList()
-				// 取号成功
-				// getrefs.ctx.$refs.uToastRef.show({
-				// 	type: 'default',
-				// 	title: '默认主题',
-				// 	message: "取号成功",
-				// 	iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/default.png',
-				// 	complete() {
-				// 		datas.phone = ''
-				// 		getList()
-				// 	}
-				// });
+
 			}
 		})
 
@@ -240,8 +246,8 @@
 		callTablecall({
 			shopId: uni.getStorageSync('shopId'),
 			callQueueId: item.id
-		}).then(() => {
-			// datas.msgType = type
+		}).then((res) => {
+			datas.profilepicturedata = res
 			getrefs.ctx.$refs.alertDialog.open()
 		})