测试修改

a/code.vue

@@ -166,6 +166,7 @@
 						getReservatRemoveh5(that.id).then(res=>{
 							if(res.code==200){
 								that.$toast('取消成功')
+								uni.$emit('refreshrelist')
 								setTimeout(function(){
 									that.getDataFn()
 								},1500)

manifest.json

@@ -2,8 +2,8 @@
     "name" : "智慧园区",
     "appid" : "__UNI__9ACE566",
     "description" : "",
-    "versionName" : "1.0.5",
-    "versionCode" : 105,
+    "versionName" : "1.0.6",
+    "versionCode" : 106,
     "transformPx" : false,
     "app-plus" : {
         "usingComponents" : true,

pages/order/search.vue

@@ -1,6 +1,6 @@
 <template>
   <view class="ysec">
-    <uni-forms ref="form" :value="user" >
+    <uni-forms ref="form" class="forms" :value="user" >
 		<view class="yttit">查询预约</view>
 		<view class="ysecbox">
 			<uni-forms-item name="phonenumber" label="预约电话">
@@ -24,7 +24,7 @@
     </uni-forms>
 	<!-- 列表 -->
 	<view class="searchlist" v-if="listflag">
-		<y-list :datalist="list" :wtdt="wtdt" :type="type" @getDetail='getDetail'></y-list>
+		<y-list :datalist="list" :wtdt="wtdt" :type="type" :adrlist="adrlist" @getDetail='getDetail'></y-list>
 	</view>
 	
   </view>
@@ -35,6 +35,7 @@
 	import { getReservatListNoPage } from "@/api/mine/order.js"
 	import {sendSmsFn} from "@/api/login.js"
 	import yList from "@/components/order/list.vue"
+	import {getDictionaryFn} from "@/api/mine/register.js"
   export default {
 	  components:{yList},
     data() {
@@ -54,11 +55,13 @@
 		listflag:false,
 		backflag:false,
 		codeflag: false,
+		adrlist:[],
       }
     },
     onReady() {
     },
 	onLoad:function(){
+		this.init()
 		uni.$on('refreshrelist',(e) => {
 			this.reachflag=true;
 			this.pageNum=1;
@@ -88,6 +91,19 @@
 		reset() {
 		    this.$refs.verify.initialization()
 		},
+		init(){
+			// 记录来源
+			getDictionaryFn('jluly').then(res=>{
+				if(res.code==200){
+					this.adrlist = res.data.map(v => {
+						return {
+							dictLabel: v.dictLabel,
+							dictValue: v.dictValue
+						}
+					})
+				}
+			})
+		},
 		getDetail(data){
 			// var s=base64.encode(data)
 			this.$tab.navigateTo('/a/code?id='+data)
@@ -132,10 +148,19 @@
 			},1000)
 		},
 		getDataFn(){
+			if (!this.phonenumber) {
+				that.$toast("请输入手机号")
+				return
+			}
+			let regphone = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/
+			if (this.phonenumber && !regphone.test(this.phonenumber)) {
+				that.$toast("请输入正确的手机号")
+				return
+			}
 			var params={
 				visitPhone:this.phonenumber,
-				pageSize:this.pageSize,
-				pageNum: this.pageNum,
+				// pageSize:this.pageSize,
+				// pageNum: this.pageNum,
 			}
 			getReservatListNoPage(params).then(res=>{
 				this.reset()
@@ -146,7 +171,8 @@
 						var len=list.length;
 						if(len==1&&!this.backflag&&this.pageNum==1){
 							var id=list[0].reservatId
-							this.$tab.navigateTo('/a/code?id='+base64.encode(id))
+							// this.$tab.navigateTo('/a/code?id='+base64.encode(id))
+							this.$tab.navigateTo('/a/code?id='+id)
 						}else{
 							if (res.rows.length < this.pageSize) {
 								this.reachflag = false
@@ -211,14 +237,16 @@
   // page {
   //   background-color: #f5f5f5;
   // }
-  .ysec{padding-top: 10rpx; 
-	.rbtn{width: 680rpx;height: 90rpx;background: $com-cd3;border-radius: 42rpx;text-align: center;line-height: 90rpx;font-size: 28rpx;font-weight: bold;color: #FFFEFE;margin: 70rpx auto 0;}
+  .ysec{display: flex;flex-direction: column;height: 100vh;box-sizing: border-box;min-height: 800rpx;overflow: auto;
+	.forms{flex: 0 0 auto;}
+	.rbtn{width: 680rpx;height: 90rpx;background: $com-cd3;border-radius: 42rpx;text-align: center;line-height: 90rpx;font-size: 28rpx;font-weight: bold;color: #FFFEFE;margin: 60rpx auto 0;}
 	.yttit{font-size: 28rpx;font-weight: bold;background-color: #f1f1f1;color: $com-cd3;min-height: 72rpx;display: flex;align-items: center;padding: 0rpx 60rpx;box-sizing: border-box;position: relative;
 		&::before{content: '';width: 6rpx;height: 34rpx;background: $com-cd3;border-radius: 4rpx;position: absolute;top: 50%;transform: translateY(-50%);left: 34rpx;}
 	}
 	.ysecbox{padding:0 34rpx;background: #ffffff;}
   }
   .searchlist{
+	  flex: 1;overflow: auto;
 	  padding: 0 30rpx;margin-top: 30rpx;
   }
   .line{width: 2rpx;height: 24rpx;background: #CDCDCD;margin: 0 24rpx;}

work/components/yuyue/list.vue

@@ -229,10 +229,20 @@
 							<view>食谱</view>
 						</view>
 						<view class="flex1">
-							<!-- <view class="rtit"><text>早餐：</text>{{ite.menuFoodDetailBk}}</view> -->
-							<view class="rtit"><text>午餐：</text>{{ite.menuFoodDetailLu}}</view>
-							<view class="rtit"><text>晚餐：</text>{{ite.menuFoodDetailDi}}</view>
+							<view>
+								<!-- <view class="rtit"><text>早餐：</text>{{ite.menuFoodDetailBk}}</view> -->
+								<view class="rtit"><text>午餐：</text>{{ite.menuFoodDetailLu}}</view>
+								<view class="rtit"><text>晚餐：</text>{{ite.menuFoodDetailDi}}</view>
+							</view>
+							<!-- 图片 -->
+							<view v-if="ite.imgs&&ite.imgs.length" class="ckimgs">
+								<block v-for="(pite,pidx) in ite.imgs" :key="pidx">
+									<image class="cimg" v-if="pidx<3" :src="baseUrl+pite"  @click="getPreview(pidx,ite.imgs)"></image>
+								</block>
+								<image class="cright" :src="mright" @click="getPreview(3,ite.imgs)" v-if="ite.imgs.length>3"></image>
+							</view>
 						</view>
+						
 					</view>
 				</view>
 			</view>
@@ -249,6 +259,8 @@
 	import { selectDictValue } from '@/utils/common.js';
 	import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
 	import noData from "@/components/nodata/nodata.vue"
+	import config from '@/config.js';
+		const baseUrl = config.baseUrl;
   export default {
 	props:{
 		datalist: {
@@ -320,10 +332,12 @@
 			usebtn:require("@/work/static/yuy/usebtn.png"),
 			nusebtn:require("@/work/static/yuy/nusebtn.png"),
 			putimg:require("@/work/static/yuy/put.png"),
+			mright:require("@/work/static/yuy/mright.png"),
 			//左滑默认宽度
 			delBtnWidth:66,
 			csListArrl:[],
 			startX:'',
+			baseUrl:config.baseUrl,
 		}
 	},
 	watch:{
@@ -355,6 +369,19 @@
 				return ''
 			}	
 		},
+		getPreview(idx,arr) {
+			var newArr=[];
+			arr.forEach(ite=>{
+				var ds=this.baseUrl+ite
+				newArr.push(ds)
+			})
+			uni.previewImage({
+				urls: newArr,
+				current:idx,
+				success: function(data) {},
+				fail: function(err) {}
+			});
+		},
 		getDelFn(id){
 			var that=this;
 			uni.showModal({
@@ -562,7 +589,7 @@ color: #FFFFFF;position: absolute;left: 0;top: 0;right: 0;bottom: 0;text-align:
 	}
 	.sptxt{font-weight: 500;font-size: 18rpx;color: #666666;margin-bottom: 20rpx;}
 	.spbox{position: relative;
-		.ltit{font-weight: bold;font-size: 28rpx;color: #AAAAAA;position: relative;width: 68rpx;margin-right: 40rpx;padding-left: 4rpx;box-sizing: border-box;
+		.ltit{font-weight: bold;font-size: 28rpx;color: #AAAAAA;position: relative;width: 68rpx;margin-right: 40rpx;padding-left: 4rpx;box-sizing: border-box;flex:0 0 auto;
 			&::after{content: '';position: absolute;right: -20rpx;top: 0;bottom: 0;background: #DADADA;width: 2rpx;}
 		}
 		.rtit{font-size: 26rpx;color: #AAAAAA;padding: 9rpx 0;
@@ -599,4 +626,9 @@ color: #FFFFFF;position: absolute;left: 0;top: 0;right: 0;bottom: 0;text-align:
 	.spdel{width: 132rpx;background: #EA2D2D;font-weight: bold;font-size: 26rpx;color: #FFFFFF;display: flex;align-items: center;justify-content: center;
 	border-radius: 14rpx;position: absolute;right: -118rpx;top: 0;bottom: 0;}
 }
+.ckimgs{padding:8rpx 0 16rpx 0rpx;display: flex;align-items: center;}
+.cimg{
+	width: 136rpx;height: 88rpx;margin-right: 32rpx;
+}
+.cright{width: 16rpx;height: 16rpx;flex: 0 0 auto;}
 </style>

work/pages/yyorder/menu.vue

@@ -34,8 +34,8 @@
 					</view>
 					<!-- 图片 -->
 					<view v-if="ite.imgs&&ite.imgs.length" class="ckimgs">
-						<block v-for="(pite,idx) in ite.imgs" :key="idx">
-							<image class="cimg" v-if="idx<3" :src="baseUrl+pite"  @click="getPreview(idx,ite.imgs)"></image>
+						<block v-for="(pite,pidx) in ite.imgs" :key="pidx">
+							<image class="cimg" v-if="pidx<3" :src="baseUrl+pite"  @click="getPreview(pidx,ite.imgs)"></image>
 						</block>
 						<image class="cright" :src="mright" @click="getPreview(3,ite.imgs)" v-if="ite.imgs.length>3"></image>
 					</view>
@@ -73,7 +73,7 @@ import config from '@/config.js';
 			list:[],
 			startDate:'',
 			endDate:'',
-			weeklist:'',
+			weeklist:[],
 		}
 	},
 	onLoad: function() {
@@ -99,6 +99,7 @@ import config from '@/config.js';
 						}
 					})
 				}
+				this.getDataFn()
 			})
 		},
 		getWeeksDay(){
@@ -117,7 +118,6 @@ import config from '@/config.js';
 			}
 			this.startDate=this.formatDate(startDate)
 			this.endDate=this.formatDate(endDate)
-			this.getDataFn()
 			// console.log(this.formatDate(startDate),this.formatDate(endDate))
 		},
 		formatDate(date){
@@ -128,7 +128,6 @@ import config from '@/config.js';
 			return month + '-' + day;
 		},
 		getPreview(idx,arr) {
-			console.log(arr)
 			var newArr=[];
 			arr.forEach(ite=>{
 				var ds=this.baseUrl+ite
@@ -169,13 +168,17 @@ import config from '@/config.js';
 					// }
 					var data=JSON.parse(JSON.stringify(res.rows))
 					var newArr=[];
-					data.forEach(ite=>{
-						var obj=JSON.parse(JSON.stringify(ite));
-						var a=ite.menuFoodDetailBkPhoto?ite.menuFoodDetailBkPhoto.split(','):[];
-						var b=ite.menuFoodDetailLuPhoto?ite.menuFoodDetailLuPhoto.split(','):[];
-						var c=ite.menuFoodDetailDiPhoto?ite.menuFoodDetailDiPhoto.split(','):[];
-						obj.imgs=a.concat(b).concat(c);
-						newArr.push(obj)
+					var weeklist=JSON.parse(JSON.stringify(this.weeklist))
+					weeklist.forEach(ite=>{
+						const matchingData = data.find(d => d.menuFoodTime == ite.dictLabel);
+						if(matchingData){
+							var obj=JSON.parse(JSON.stringify(matchingData));
+							var a=matchingData.menuFoodDetailBkPhoto?matchingData.menuFoodDetailBkPhoto.split(','):[];
+							var b=matchingData.menuFoodDetailLuPhoto?matchingData.menuFoodDetailLuPhoto.split(','):[];
+							var c=matchingData.menuFoodDetailDiPhoto?matchingData.menuFoodDetailDiPhoto.split(','):[];
+							obj.imgs=a.concat(b).concat(c);
+							newArr.push(obj)
+						}
 					})
 					if (this.pageNum == 1) {
 						this.list = newArr;

work/pages/yyorder/menuRecord.vue

@@ -155,10 +155,20 @@
 								this.wtdt = '到底了~';
 							}
 						}
+						var data=JSON.parse(JSON.stringify(res.rows))
+						var newArr=[];
+						data.forEach(ite=>{
+							var obj=JSON.parse(JSON.stringify(ite));
+							var a=ite.menuFoodDetailBkPhoto?ite.menuFoodDetailBkPhoto.split(','):[];
+							var b=ite.menuFoodDetailLuPhoto?ite.menuFoodDetailLuPhoto.split(','):[];
+							var c=ite.menuFoodDetailDiPhoto?ite.menuFoodDetailDiPhoto.split(','):[];
+							obj.imgs=a.concat(b).concat(c);
+							newArr.push(obj)
+						})
 						if (this.pageNum == 1) {
-							this.list = res.rows;
+							this.list = newArr;
 						} else {
-							this.list = this.list.concat(res.rows)
+							this.list = this.list.concat(newArr)
 						}
 					} else {
 						this.$toast(res.msg)