Merge branch 'test' of https://newgitea.sxczgkj.cn/czg_team/cashier_wx into test

components/attract-popup.vue

@@ -6,7 +6,7 @@
 			<view class="content">
 				<view class="title">{{ form.title }}</view>
 				<view class="img_wrap">
-					<image class="img" :src="form.qrCode"></image>
+					<image class="img" :show-menu-by-longpress="true" :src="form.qrCode" @click=""></image>
 				</view>
 				<view class="intro">
 					{{ form.content }}
@@ -114,7 +114,7 @@ function showHandle() {
 		case 'order':
 			// 订单 只要包含用餐类型就显示
 			let shopMode = shopInfo.value.eatModel.split(',');
-			if (checkArrayElementsExist(shopMode, form.value.orderType)) {
+			if (checkArrayElementsExist(shopMode, form.value.orderType, true) && form.value.orderEnable) {
 				show.value = true;
 			}
 			break;