前端

uni_applet/pageA/find/createLifeService.vue

@@ -3,7 +3,7 @@
 		<view class='wrap'>
 			<u--form  ref="uForm">
 				<u-form-item labelPosition='left' label="主体">
-					<u-radio-group placement='row'  v-model="form.mainBody">
+					<u-radio-group activeColor="#f8bc31" placement='row'  v-model="form.mainBody">
 						<u-radio name="个人" >个人</u-radio>
 						<u-radio name="商铺" >商铺</u-radio>
 					</u-radio-group>
@@ -78,7 +78,7 @@
 			</u--form>
 			
 			<view class="footer">
-				<button @click='confirmSubmit' class="submit">提交</button>
+				<button @click='submit' class="submit">提交</button>
 			</view>
 		</view>
 		<u-modal :show="isSubmit" :content='content' @confirm="$u.debounce(confirmSubmit, 500)" showCancelButton

uni_applet/pages/find/find.vue

@@ -19,11 +19,11 @@
 				</view>
 			</view>
 		</view>
-		<view>
+		<view style='margin-top:112rpx;'>
 			<u-swiper :list="fileList"
 			autoplay
-			imgMode='aspectFit'
-			height='200'
+			:height='height'
+			imgMode='aspectFill'
 			radius='0'
 			:circular="true"
 			@change="e => current = e.current" @click="click">
@@ -39,7 +39,7 @@
 		</view>
 		<view>
 			<mescroll-uni :up="upOption" :down="downOption" ref="mescrollRef" @init="mescrollInit"
-				@up="upCallback" @down="downCallback" height="660">
+				@up="upCallback" @down="downCallback" height="960">
 				<view class='findItem' v-for='item in findList'>
 					<view style='align-items: flex-start;' class='flex'>
 						<view class="left">
@@ -59,7 +59,7 @@
 						</view>
 					</view>
 					<view class='address flex justify-space-between'>
-						<view  class='flex'>
+						<view class='flex'>
 							<view class='iconfont applet-dizhi'></view>
 							<view>{{item.province}}{{item.city}}{{item.area}}</view>
 						</view>
@@ -71,7 +71,7 @@
 			<!-- <mescroll-body ref="mescrollRef" :up="upOption" :down="downOption" @init="mescrollInit" @up="upCallback" @down="downCallback"></mescroll-body> -->
 		</view>
 		<view class='add' @click='add'>
-			<view class="iconfont applet-colors-tianjia2"></view>
+			<u--image   :showLoading="true" src="/static/image/find/add.png" width="60px" height="60px"></u--image>
 		</view>
 	</view>
 </template>
@@ -97,11 +97,13 @@
 				fileList:[],
 				findList:[],
 				handleList:[],
-				longitude:uni.getStorageSync("findlongitude")?uni.getStorageSync("findlongitude"):"",
-				latitude:uni.getStorageSync("findlatitude")?uni.getStorageSync("findlatitude"):'',
+				height:'',
+				width:'',
+				longitude:uni.getStorageSync("findlongitude")?uni.getStorageSync("findlongitude"):"122.084565",
+				latitude:uni.getStorageSync("findlatitude")?uni.getStorageSync("findlatitude"):'40.220547',
 				curPageLen:0,
 				totalPage:0,
-				detailedAddress:uni.getStorageSync("detailedAddress")?uni.getStorageSync("detailedAddress"):'',
+				detailedAddress:uni.getStorageSync("detailedAddress")?uni.getStorageSync("detailedAddress"):'山海广场',
 				downOption: {
 					auto: false,
 					textColor: '#bbb'
@@ -120,12 +122,17 @@
 		onLoad() {
 			that = this
 		this.getList()
-		console.log(this)
 		// this.mescroll.resetUpScroll();
 		},
 		onShow(){
+			this.height = uni.getSystemInfoSync().windowWidth/2;
+			
+			this.width = uni.getSystemInfoSync().windowWidth;
+			console.log(this.height,this.width,11111111)
+			
+			
 			if(!this.detailedAddress){
-				this.placeSelect()
+				// this.placeSelect()
 			}else{
 				that.upCallback({
 					num:1,
@@ -153,6 +160,7 @@
 						uni.setStorageSync("findlongitude",res.longitude)
 						let _address = that.$helper.formatLocation(res.address)
 						that.detailedAddress = _address.Village
+						console.log(that.detailedAddress)
 						uni.setStorageSync("detailedAddress",_address.Village)
 						that.$forceUpdate()
 						that.upCallback({
@@ -243,8 +251,7 @@
 									that.loading = false
 									that.$nextTick(() => {
 										that.mescroll.endBySize(that.curPageLen, that.totalPage)
-									});
-												
+									});	
 									uni.hideLoading()
 								},100)
 							}
@@ -253,7 +260,6 @@
 					// }
 			},
 		 add(){
-			console.log(111111111)
 			uni.navigateTo({
 				url: '/pageA/find/createLifeService'
 			})
@@ -280,8 +286,13 @@
 <style lang="scss" scoped>
 	
 	.content1 {
+		position: fixed;
+		top:0;
+		left:0;
 		padding: 20rpx;
 		background-color: #fbb612;
+		z-index:99;
+		width:95vw;
 		.search {
 			// color: #9199af;
 			// background: #f9d27d;
@@ -343,7 +354,7 @@
 			margin-top:20rpx;
 			width:100%;
 			font-size:28rpx;
-			color:#393733;
+			color:#999;
 		}
 	}
 	.applet-dianpu1{
@@ -356,7 +367,8 @@
 		color:#393733;
 	}
 	.add{
-		background:#fff;
+		// background:#fff;
+		border-radius:50%;
 		position: fixed;
 		right:0;bottom:10px;
 	}

uni_merchants_enter/App.vue

@@ -45,6 +45,15 @@
 				width:90%;
 			}
 		}
+		.button,.unable_button{
+			background:#5F7DE9;
+			color:#fff;
+			padding:5rpx 20rpx;
+			border-radius: 10rpx;
+		}
+		.unable_button{
+			background:#999;
+		}
 		.flex{
 			display:flex;
 		}
@@ -54,4 +63,7 @@
 		.align-item-center{
 			align-items: center;
 		}
+		.align-items-flex-start{
+			align-items: flex-start;
+		}
 </style>

uni_merchants_enter/pageA/enter/cateringindustry.vue

@@ -130,7 +130,7 @@
 					endDate:'21:00',
 					operateCertificateDate:'',
 				},
-				
+				indoorImageArray:[],
 				tips:'发送验证码',
 				startDate:'',
 				show:false,
@@ -153,9 +153,6 @@
 		},
 		methods: {
 			submit(){
-				this.isSubmit = true
-			},
-			confirmSubmit() {
 				if(this.labelList.length>0){
 					var arr=[]
 					for(var i=0;i<this.labelList.length;i++){
@@ -179,7 +176,9 @@
 					}
 					this.form.label=arr.toString()
 				}
-				
+				this.isSubmit = true
+			},
+			confirmSubmit() {
 				uni.showLoading({
 					title: '加载中',
 					mask: true
@@ -201,6 +200,7 @@
 						title: '提交成功，请等待平台审核',
 						duration: 2000
 					});
+					that.indoorImageArray=[]
 					uni.navigateBack()
 			
 				})
@@ -304,6 +304,8 @@
 			// 删除图片
 			deletePic(event,status) {
 				this[`fileList${event.name}`].splice(event.index, 1)
+				that.indoorImageArray.splice(event.index, 1)
+				that.form.indoorImage =that.indoorImageArray.toString()
 			},
 			// 新增图片
 			async afterRead(event,status) {
@@ -335,14 +337,15 @@
 				return new Promise((resolve, reject) => {
 					uploadImage(res, 'cardImages/',
 						result => {
-							if(status==0){
+							if(status==1){
 								that.form.businessLicense = result
-							}else if(status==1){
-								that.form.operateCertificate = result
 							}else if(status==2){
-								that.form.coverImage = result
+								that.form.operateCertificate = result
 							}else if(status==3){
-								that.form.indoorImage = result
+								that.form.coverImage = result
+							}else if(status==4){
+								that.indoorImageArray.push(result)
+								that.form.indoorImage =that.indoorImageArray.toString()
 							}
 							resolve(res)
 						}

uni_merchants_enter/pageA/enter/myCateringdustry/addGroupBuying.vue

@@ -1,22 +1,339 @@
 <template>
-	<view>
-		
+	<view class='content'>
+		<view class='wrap'>
+			<u--form :model="form"  ref="uForm">
+				<u-form-item labelWidth='120' labelPosition='left' label="店铺名称">
+					<view style='text-align:right'>{{form.shopNames}}</view>
+				</u-form-item>
+				<u-form-item labelWidth='120' labelPosition='left' label="团购标题">
+					<u-input inputAlign='right' border='none' placeholder='输入团购标题，不超过20个字' v-model="form.groupTitle" />
+				</u-form-item>
+				<u-form-item labelWidth='120' labelPosition='left' label="可供用餐人数">
+					<view class='flex align-item-center'>
+						<u-input inputAlign='right' border='none' placeholder='最少人数' v-model="form.leastPeople" />
+						<view>人~</view>
+						<u-input inputAlign='right' border='none' placeholder='最多人数' v-model="form.mostPeople" />
+						人
+					</view>
+				</u-form-item>
+				<u-form-item labelWidth='120' labelPosition='left' label="下单后随时退单">
+					<u-radio-group 
+					    v-model="form.chargeableFlag"
+					    placement="row">
+						<u-radio activeColor="#5F7DE9" label="不接受" name='1' ></u-radio>
+						<u-radio activeColor="#5F7DE9" label="接受"  name='0' ></u-radio>
+					</u-radio-group>
+				</u-form-item>
+				<u-form-item labelWidth='140' labelPosition='left' label="活动结束后自动退单">
+					<u-radio-group 
+					    v-model="form.endChargeable"
+					    placement="row">
+						<u-radio activeColor="#5F7DE9" label="不接受" name='1'></u-radio>
+						<u-radio activeColor="#5F7DE9" label="接受" name='0'></u-radio>
+					</u-radio-group>
+				</u-form-item>
+				<u-form-item labelWidth='120' labelPosition='left' label="可团购总数量">
+					<u-input inputAlign='right' border='none' placeholder='输入团购套餐总数' v-model="form.totalQuantity" />
+				</u-form-item>
+				<u-form-item labelWidth='120' labelPosition='left' label="单人可团数量">
+					<u-radio-group 
+						v-model="form.quantityLimited"
+						placement="row">
+						<u-radio activeColor="#5F7DE9" label="限量" name='1'></u-radio>
+						<u-radio activeColor="#5F7DE9" label="不限量" name='0'></u-radio>
+					</u-radio-group>
+				</u-form-item>
+				<u-form-item v-if='form.quantityLimited==1' labelWidth='120' labelPosition='left' label="单人团购上限">
+					<u-input inputAlign='right' border='none' placeholder='输入单个用户最多可团购的数量' v-model="form.groupLimit" />
+				</u-form-item>
+				<u-form-item labelWidth='120' labelPosition='left' label="提前预约时间">
+					<view class='flex align-item-center'>
+						<u-input inputAlign='right' border='none' placeholder='提前预约时间' v-model="form.reservationTime" />小时
+					</view>
+				</u-form-item>
+				<u-form-item labelWidth='120' labelPosition='left' label="活动开始日期">
+					<view style='text-align:right;' @click='selectTime(0)'>{{form.startDate?form.startDate:'活动开始日期'}}<image src="@/static/image/yjt.png" mode=""
+								style="margin-left:10rpx;width:12rpx;height: 21rpx;"></image></view>
+				</u-form-item>
+				
+				<u-form-item labelWidth='120' labelPosition='left' label="活动结束日期">
+					<view style='text-align:right;' @click='selectTime1(1)'>{{form.endDate?form.endDate:'活动结束日期'}}<image src="@/static/image/yjt.png" mode=""
+													style="margin-left:10rpx;width:12rpx;height: 21rpx;"></image></view>
+				</u-form-item>
+				<u-form-item labelWidth='120' labelPosition='top' label="不可用日期">
+					<view class='flex'>
+						<view v-for='item in weekList' class='week_item' :class='item.select?"active":""' @click='selectweek(item)'>{{item.value}}</view>
+					</view>
+					
+				</u-form-item>
+				<u-form-item labelWidth='120' labelPosition='left' label="指定不可用日期">
+					<view style='text-align:right;' @click='show2 = true'>{{form.unavailableDay?'已选'+form.unavailableDay.length+'天':'已选0天'}}</view>
+					<!-- <view class='flex align-item-center'>
+						<u-input inputAlign='right' border='none' placeholder='提前预约时间' v-model="form.unavailableDay" />小时
+					</view> -->
+				</u-form-item>
+				<u-form-item labelWidth='120' labelPosition='left' label="餐位费">
+					<view class='flex align-item-center'>
+						<u-input inputAlign='right' border='none' placeholder='输入餐位费' v-model="form.spaceFee" />元/人
+					</view>
+				</u-form-item>
+				<u-form-item labelWidth='120' labelPosition='left' label="商品打包外带">
+					<u-radio-group 
+						v-model="form.packFlag"
+						placement="row">
+							<u-radio activeColor="#5F7DE9" label="不支持" name='1'></u-radio>
+							<u-radio activeColor="#5F7DE9" label="支持" name='0'></u-radio>
+					</u-radio-group>
+				</u-form-item>
+				<u-form-item labelWidth='120' labelPosition='left' label="包间消费使用">
+					<u-radio-group 
+						v-model="form.roomUsage"
+						placement="row">
+							<u-radio activeColor="#5F7DE9" label="不支持" name='1'></u-radio>
+							<u-radio activeColor="#5F7DE9" label="支持" name='0'></u-radio>
+					</u-radio-group>
+				</u-form-item>
+				<u-form-item labelWidth='140' labelPosition='left' label="与店内其他优惠共享">
+					<u-radio-group 
+						v-model="form.discountSharing"
+						placement="row">
+							<u-radio activeColor="#5F7DE9" label="不支持" name='1'></u-radio>
+							<u-radio activeColor="#5F7DE9" label="支持" name='0'></u-radio>
+					</u-radio-group>
+				</u-form-item>
+				<u-form-item labelWidth='120' labelPosition='left' label="免费打包">
+					<u-radio-group 	
+						v-model="form.freePackaging"
+						placement="row">
+							<u-radio activeColor="#5F7DE9" label="不支持" name='1'></u-radio>
+							<u-radio activeColor="#5F7DE9" label="支持" name='0'></u-radio>
+					</u-radio-group>
+				</u-form-item>
+				<u-form-item labelWidth='120' labelPosition='left' label="发票">
+					<u-radio-group 
+						v-model="form.invoice"
+						placement="row">
+							<u-radio activeColor="#5F7DE9" label="不支持" name='1'></u-radio>
+							<u-radio activeColor="#5F7DE9" label="支持" name='0'></u-radio>
+					</u-radio-group>
+				</u-form-item>
+			</u--form>
+			<view>备注：如部分菜品因时令或其他不可抗因素导致无法提供，商家可用等价菜品替换，具体事宜与顾客协商决定。</view>
+			<view class="footer">
+				<button @click='next' class="submit">下一步</button>
+			</view>
+			<u-calendar @close='show = false' @confirm="confirm" :show="show"></u-calendar>
+			<u-calendar :minDate='minDate' @close='show1 = false' @confirm="confirm" :show="show1"></u-calendar>
+			<u-calendar :show="show2" mode="multiple" monthNum='12' :maxDate='maxDate' @close='show2 = false' @confirm="confirm1"></u-calendar>
+		</view>
 	</view>
 </template>
 
 <script>
+	var that
 	export default {
 		data() {
 			return {
-				
+				value:'',
+				show:false,
+				show1:false,
+				show2:false,
+				status:'',
+				minDate:'',
+				maxDate:'',
+				weekList:[
+					{value:'周一',select:false},
+					{value:'周二',select:false},
+					{value:'周三',select:false},
+					{value:'周四',select:false},
+					{value:'周五',select:false},
+					{value:'周六',select:false},
+					{value:'周日',select:false}],
+				form:{
+					chargeableFlag:"0",
+					endChargeable:"0",
+					quantityLimited:"0",
+					packFlag:"0",
+					roomUsage:"0",
+					discountSharing:"0",
+					freePackaging:"0",
+					invoice:"0",
+				},
 			}
 		},
-		methods: {
+		onLoad(options) {
+			console.log(options)
+			that = this
+			var date = new Date().toISOString().slice(0, 10)
+			this.minDate=date
+			this.form.foodId=options.foodId
+			this.form.shopNames=options.shopNames
+			this.getTime()
+		},
+		onShow(){
 			
+		},
+		methods: {
+			getTime(){
+				var time = new Date();
+				    time.setTime(time.getTime());
+				    var s2 = time.getFullYear()+"-" + (time.getMonth()+1) + "-" + time.getDate();
+				    var monthNum=6; //要减的月数(6)自己定义
+				    var dateArr = s2.split('-'); //s2当前时间
+				    var year = dateArr[0]; //获取当前日期的年份
+				    var month = dateArr[1]; //获取当前日期的月份
+				    var day = dateArr[2]; //获取当前日期的日
+				    var days = new Date(year, month, 0);
+				    days = days.getDate(); //获取当前日期中月的天数
+				    var year2 = year;
+				    var month2 = parseInt(month) + monthNum;
+				    if (month2 <=0) {
+				        year2 = parseInt(year2) - parseInt(month2 / 12 == 0 ? 1 : parseInt(month2) / 12);
+				        month2 = 12 - (Math.abs(month2) % 12);
+				    }
+				    var day2 = day;
+				    var days2 = new Date(year2, month2, 0);
+				    days2 = days2.getDate();
+				    if (day2 > days2) {
+				        day2 = days2;
+				    }
+				    if (month2 < 10) {
+				        month2 = '0' + month2;
+				    }
+				    var t2 = year2 + '-' + month2 + '-' + day2;
+					this.maxDate = t2
+					console.log(t2)
+			},
+			selectweek(item){
+				console.log(item)
+				item.select = !item.select
+				this.$forceUpdate()
+				var arr = this.weekList.filter((item)=>{return item.select == true})
+				console.log(arr)
+				var arr2=[]
+				for(var i=0;i<arr.length;i++){
+					arr2.push(arr[i].value)
+				}
+				this.form.unavailableDate=arr2.toString()
+			},
+			confirm1(e){
+				console.log(e)
+				console.log(e.sort( (a, b)=> {return a.localeCompare(b)   // 按照升序排列 
+				}))
+				var sortDate=e.sort( (a, b)=> {return a.localeCompare(b)})
+				this.form.unavailableDay=sortDate.toString()  // 按照升序排列
+				
+				this.show2 = false
+				
+			},
+			confirm(e){
+				if(this.status==0){
+					this.form.startDate =e[0]
+					this.show = false
+				}else{
+					this.form.endDate =e[0]
+					this.show1 = false
+				}
+					console.log(e)
+			},
+			selectTime(status){
+				this.status=status
+				this.show = true
+			},
+			selectTime1(status){
+				this.status=status
+				this.show1 = true
+			},
+			next(){
+				var time = new Date();
+				var date=time.getFullYear()+"-" + ((time.getMonth()+1)>=10?(time.getMonth()+1):'0'+(time.getMonth()+1)) + "-" + time.getDate()
+				    var s2 =  new Date(date).getTime();
+					console.log(s2,date,this.form.startDate,new Date(this.form.startDate).getTime(),1111)
+				if(new Date(this.form.endDate).getTime()==s2){
+					uni.showToast({
+						icon: "none",
+						title: '结束日期不可晚于当天！',
+						duration: 3000
+					});
+					return
+				}
+				if(new Date(this.form.startDate).getTime()>new Date(this.form.endDate).getTime()){
+					uni.showToast({
+						icon: "none",
+						title: '开始日期不可晚于结束日期！',
+						duration: 3000
+					});
+					return
+				}
+				uni.setStorageSync('groupBuying',JSON.stringify(this.form))
+				uni.navigateTo({
+					url:'/pageA/enter/myCateringdustry/addGroupBuyingNext?foodId='+this.form.foodId
+				})
+			},
+			// 删除图片
+			deletePic(event,status) {
+				this[`fileList${event.name}`].splice(event.index, 1)
+			},
+			// 新增图片
+			async afterRead(event,status) {
+				// 当设置 multiple 为 true 时, file 为数组格式，否则为对象格式
+				let lists = [].concat(event.file)
+				let fileListLen = this[`fileList${event.name}`].length
+				lists.map((item) => {
+					this[`fileList${event.name}`].push({
+						...item,
+						status: 'uploading',
+						message: '上传中'
+					})
+				})
+				for (let i = 0; i < lists.length; i++) {
+					const result = await this.uploadFilePromise(lists[i].url,status)
+					
+					let item = this[`fileList${event.name}`][fileListLen]
+					this[`fileList${event.name}`].splice(fileListLen, 1, Object.assign(item, {
+						status: 'success',
+						message: '',
+						url: result
+					}))
+					fileListLen++
+					console.log(that.form, this[`fileList${event.name}`])
+					
+				}
+			},
+			uploadFilePromise(res,status) {
+				return new Promise((resolve, reject) => {
+					uploadImage(res, 'cardImages/',
+						result => {
+							
+							that.form.dishImage = result
+							resolve(res)
+						}
+					)
+				})
+			},
 		}
 	}
 </script>
 
-<style>
-
+<style lang='scss' scoped>
+	.wrap{
+		padding:20rpx;
+	}
+	/deep/.u-radio-group,/deep/.u-radio-group--row {
+		flex-direction: row-reverse !important;
+		.u-radio{
+			margin-left:10rpx;
+		}
+	}
+	.week_item{
+		border:1px solid #999;
+		padding: 5rpx 10rpx;
+		margin: 10rpx;
+		border-radius: 10rpx;
+	}
+	.week_item.active{
+		background:#5F7DE9;
+		border: 1px solid #5F7DE9;
+		color:#fff;
+	}
 </style>

uni_merchants_enter/pageA/enter/myCateringdustry/addGroupBuyingNext.vue

@@ -1,22 +1,345 @@
 <template>
-	<view>
-		
+	<view class='content'>
+		<view>
+			<view class='flex'>
+				<view v-for='(item,index) in classifyList' class='classify_item' :class='item.select?"active":""'  @click='switchClassify(item)'>{{item.classifyName}}</view>
+			</view>
+			<view class='button' @click='addClassify'>自定义分类</view>
+		</view>
+		<view class="wrap">
+			<view style='padding: 10rpx 0 40rpx 0;' v-for='item in categorizationOfDishes'>
+				<view style='margin-bottom:20rpx;' class='flex justify-space-between align-item-center'>
+					<view class='flex align-item-center'>
+						<view>{{item.classifyName}}</view>
+						<view class='iconfont_no' @click='switchStatus(item)' :class='item.status?"icon_merchants_entershouqi":"icon_merchants_enterzhankai"'></view>
+					</view>
+					<view class='button' @click='addList(item)'>新增</view>
+					
+					
+				</view>
+				<view v-if='item.status'>
+					<view class='flex align-item-center' v-for='(item1,index1) in item.list'>
+						<view>
+							<view  style='margin: 10rpx 20rpx;' class='flex  justify-space-between align-item-center'>
+								<view>菜品名称</view>
+								<u-input inputAlign='right' border='none' placeholder='输入菜品名称，不超过10个字' v-model="item1.dishName" />
+							</view>
+							
+							<view class='flex'>
+								<view class='flex align-item-center'>
+									<u-input @input='compute'  inputAlign='right' border='none' placeholder='输入单价' v-model="item1.dishPrice" />
+									（元/份）
+								</view>
+								<view class="flex align-item-center">
+									<u-input @input='compute' inputAlign='right' border='none' placeholder='输入单价' v-model="item1.number" />
+									（份）
+								</view>
+							</view>
+						</view>
+						<view>
+							<view @click='del(item,index1)' class="iconfont_no icon_merchants_enterjianshao"></view>
+						</view>
+					</view>
+				</view>
+				
+			</view>
+			<view class='flex align-item-center justify-space-between'>
+				原价合计（元）<view>{{form.originalPrice}}</view>
+			</view>
+			<view class='flex align-item-center'>
+				团购价（元）<u-input @input='groupPriceInput' inputAlign='right' border='none' placeholder='输入团购价格' v-model="form.groupPrice" />
+			</view>
+			<view class='flex align-item-center justify-space-between'>
+				折扣<view class='flex align-item-center'><view>{{form.discount?form.discount:'自动计算折扣'}}</view><view>折</view></view>
+			</view>
+			<view>
+				<view>上传图片</view>
+				<view>
+					<u-upload :fileList="fileList1" @afterRead="afterRead($event)" @delete="deletePic" name="1" multiple
+						:maxCount="9">
+					</u-upload>
+				</view>
+			</view>
+		</view>
+		<u-modal :show="isSubmit" content='确认添加团购信息？' @confirm="$u.debounce(confirmSubmit, 500)" showCancelButton
+			@cancel="isSubmit=false" @close="isSubmit=false" closeOnClickOverlay></u-modal>
+		<u-modal :show="show1" content='确认取消该分类？'  @confirm="$u.debounce(classifycancelSubmit, 500)" showCancelButton
+			@cancel="show1=false" @close="show1=false" closeOnClickOverlay>
+		</u-modal>
+		<u-modal :show="show" title='添加分类'  @confirm="$u.debounce(classifySubmit, 500)" showCancelButton
+			@cancel="show=false" @close="show=false" closeOnClickOverlay>
+			<view class="slot-content">
+				<view>
+					<u--input inputAlign='center' v-model="classifyName" placeholder="输入分类名称" border="none"></u--input>
+				</view>
+			</view>
+		</u-modal>
+		<view class="footer">
+			<button @click='submit' class="submit">提交</button>
+		</view>
 	</view>
 </template>
 
 <script>
+	var that = this
+	import uploadImage from '@/components/ossutil/uploadFile.js';
 	export default {
 		data() {
 			return {
-				
+				form:{},
+				show:false,
+				show1:false,
+				classifyList:[],
+				categorizationOfDishes:[],
+				currectClassify:{},
+				dishImageArray:[],
+				fileList1:[],
+				isSubmit:false
 			}
+		},
+		onLoad(options) {
+			that = this
+			this.form.foodId=options.foodId
+			this.form.shopNames=options.shopNames
+			this.$request.baseRequest('admin.tourism.dishClassifyInfo', 'list', {
+				foodId:this.form.foodId,
+				page:1,
+				limit:9999
+			}, failres => {
+				uni.showToast({
+					icon: "none",
+					title: failres.errmsg,
+					duration: 3000
+				});
+			}).then(res => {
+				for(var i=0;i<res.data.items.length;i++){
+					res.data.items[i].select=false
+				}
+				this.classifyList = res.data.items
+			})
+			this.form=JSON.parse(uni.getStorageSync('groupBuying'))
+		},
+		onShow(){
+			
 		},
 		methods: {
+			switchStatus(item){
+				item.status= !item.status
+				this.$forceUpdate()
+				console.log(item,1111111)
+			},
+			submit(){
+				for(var i=0;i<this.categorizationOfDishes.length;i++){
+					for(var q=0;q<this.categorizationOfDishes[i].list.length;q++){
+						if(!this.categorizationOfDishes[i].list[q].dishName){
+							uni.showToast({
+								icon: "none",
+								title: '请输入菜品名称！',
+								duration: 3000
+							});
+							return
+						}
+						if(!this.categorizationOfDishes[i].list[q].dishPrice){
+							uni.showToast({
+								icon: "none",
+								title: '请输入菜品单价！',
+								duration: 3000
+							});
+							return
+						}
+						if(!this.categorizationOfDishes[i].list[q].number){
+							uni.showToast({
+								icon: "none",
+								title: '请输入菜品份数！',
+								duration: 3000
+							});
+							return
+						}
+					}
+				}
+				this.isSubmit = true
+			},
+			confirmSubmit() {
+				uni.showLoading({
+					title: '加载中',
+					mask: true
+				})
+				this.form.foodGroupDetailInfoList=[]
+				for(var i=0;i<this.categorizationOfDishes.length;i++){
+					this.form.foodGroupDetailInfoList=this.form.foodGroupDetailInfoList.concat(this.categorizationOfDishes[i].list)
+				}
+				console.log(this.form)
+				this.$request.baseRequest('admin.tourism.foodGroupInfo', 'add', {
+					foodGroupInfo: JSON.stringify(this.form)
+				}, failres => {
+					uni.showToast({
+						icon: "none",
+						title: failres.errmsg,
+						duration: 3000
+					});
 			
+					uni.hideLoading()
+				}).then(res => {
+					uni.hideLoading()
+					this.isSubmit = false
+					uni.showToast({
+						icon: "success",
+						title: '提交成功',
+						duration: 2000
+					});
+					this.categorizationOfDishes = []
+					this.dishImageArray=[]
+					uni.navigateBack({delta: 2})
+				})
+			},
+			groupPriceInput(){
+				if(this.form.originalPrice){
+					this.form.discount = Number(this.form.groupPrice/this.form.originalPrice).toFixed(2)
+				}
+			},
+			compute(){
+				var prices=0
+				for(var i=0;i<this.categorizationOfDishes.length;i++){
+					for(var q=0;q<this.categorizationOfDishes[i].list.length;q++){
+						if(this.categorizationOfDishes[i].list[q].dishPrice&&this.categorizationOfDishes[i].list[q].number){
+							var price=this.categorizationOfDishes[i].list[q].dishPrice*this.categorizationOfDishes[i].list[q].number
+							prices+=price
+						}
+					}
+				}
+				if(prices){
+					this.form.originalPrice=prices.toFixed(2)
+				}else{
+					this.form.originalPrice=0
+				}
+				if(this.form.groupPrice){
+					this.form.discount = Number(this.form.groupPrice/this.form.originalPrice).toFixed(2)
+				}
+				console.log(prices)
+			},
+			del(item,index){
+				console.log(11111)
+				for(var i=0;i<this.categorizationOfDishes.length;i++){
+					if(this.categorizationOfDishes[i].classifyName==item.classifyName){
+						this.categorizationOfDishes[i].list.splice(index,1)
+					}
+				}
+				this.compute()
+			},
+			classifycancelSubmit(){
+				var index = this.categorizationOfDishes.findIndex((item)=>{return item.classifyName == this.currectClassify.classifyName})
+				this.categorizationOfDishes,splice(index,1)
+			},
+			addList(item){
+				item.list.push({classify:item.classifyName,dishName:'',dishPrice:'',number:''})
+			},
+			addClassify(){
+				this.show = true
+			},
+			classifySubmit() {
+				console.log(this.form)
+				uni.showLoading({
+					title: '加载中',
+					mask: true
+				})
+				this.$request.baseRequest('admin.tourism.dishClassifyInfo', 'add', {
+					dishClassifyInfo: JSON.stringify({foodId:this.form.foodId,classifyName:this.classifyName})
+				}, failres => {
+					uni.showToast({
+						icon: "none",
+						title: failres.errmsg,
+						duration: 3000
+					});
+					uni.hideLoading()
+				}).then(res => {
+					this.show = false
+					uni.showToast({
+						icon: "success",
+						title: '添加分类成功',
+						duration: 2000
+					});
+				})
+			},
+			switchClassify(item){
+				if(item.select){
+					var arr = this.categorizationOfDishes.filter((items)=>{return items.classifyName==item.classifyName})
+					if(arr.length>0&&arr.list.length>0){
+						this.currectClassify = item
+						this.show1 = true
+					}else{
+						item.select=!item.select
+					}
+					// if()
+				}else{
+					item.select=!item.select
+					this.categorizationOfDishes.push({
+						classifyName:item.classifyName,
+						status:false,
+						list:[{classify:item.classifyName,dishName:'',dishPrice:'',number:'',}]})
+				}
+				
+			},
+			// 删除图片
+			deletePic(event,status) {
+				this[`fileList${event.name}`].splice(event.index, 1)
+			},
+			// 新增图片
+			async afterRead(event,status) {
+				// 当设置 multiple 为 true 时, file 为数组格式，否则为对象格式
+				let lists = [].concat(event.file)
+				let fileListLen = this[`fileList${event.name}`].length
+				lists.map((item) => {
+					this[`fileList${event.name}`].push({
+						...item,
+						status: 'uploading',
+						message: '上传中'
+					})
+				})
+				for (let i = 0; i < lists.length; i++) {
+					const result = await this.uploadFilePromise(lists[i].url,status)
+					
+					let item = this[`fileList${event.name}`][fileListLen]
+					this[`fileList${event.name}`].splice(fileListLen, 1, Object.assign(item, {
+						status: 'success',
+						message: '',
+						url: result
+					}))
+					fileListLen++
+					console.log(that.form, this[`fileList${event.name}`])
+					
+				}
+			},
+			uploadFilePromise(res,status) {
+				return new Promise((resolve, reject) => {
+					uploadImage(res, 'cardImages/',
+						result => {
+							that.dishImageArray.push(result)
+							that.form.dishImage =that.dishImageArray.toString()
+							resolve(res)
+						}
+					)
+				})
+			},
 		}
 	}
 </script>
 
-<style>
-
+<style lang='scss' scoped>
+	.wrap{
+		padding:20rpx;
+	}
+	.classify_item{
+		border:1px solid #999;
+		padding: 5rpx 10rpx;
+		margin: 10rpx;
+		border-radius: 10rpx;
+	}
+	.classify_item.active{
+		background:#5F7DE9;
+		border: 1px solid #5F7DE9;
+		color:#fff;
+	}
+	.icon_merchants_enterjianshao{
+		font-size:48rpx;
+	}
 </style>

uni_merchants_enter/pageA/enter/myCateringdustry/addfood.vue

@@ -1,22 +1,265 @@
 <template>
-	<view>
-		
+	<view class='content'>
+		<view class='wrap'>
+			<u--form labelPosition="left" :model="form"  ref="uForm">
+				<u-form-item labelWidth='120' labelPosition='left' label="店铺名称">
+					<view style='text-align:right'>{{form.shopNames}}</view>
+				</u-form-item>
+				<u-form-item
+					label="分类"
+					prop="classify"
+					borderBottom
+					labelWidth='120'
+					ref="item1">
+					<view style='flex-direction:row-reverse ;' class='flex align-item-center'>
+						<view class='add' @click='add'>新增</view>
+						<view style='margin-right:10rpx;' @click='openClassify'>{{form.classify?form.classify:'选择分类'}}<image src="@/static/image/yjt.png" mode=""
+								style="margin-left:10rpx;width:12rpx;height: 21rpx;"></image></view>
+					</view>
+				</u-form-item>
+				<u-form-item
+					label="菜品名称"
+					 labelWidth='120'
+					prop="dishName"
+					borderBottom
+					ref="item1">
+					<u--input inputAlign='right' v-model="form.dishName" placeholder="输入菜品名称.2-8个字" border="none"></u--input>
+				</u-form-item>
+				<u-form-item
+					labelWidth='150'
+					label="菜品单价（选填）"
+					prop="userInfo"
+					ref="item1">
+					<view class='flex align-item-center'>
+						<u--input inputAlign='right' v-model="form.dishPrice" placeholder="输入菜品单价" border="none"></u--input>元
+					</view>
+					
+				</u-form-item>
+				<view class='caution'>注：如不想用户查看价格可在店铺设置中关闭查看功能。</view>
+				<u-form-item labelWidth='240' labelPosition='top' label="上传菜品图片（清晰、美观）">
+					<u-upload :fileList="fileList1" @afterRead="afterRead($event)" @delete="deletePic" name="1" multiple
+						:maxCount="1">
+						
+					</u-upload>
+				</u-form-item>
+			</u--form>
+			<view class="footer">
+				<button @click='submit' class="submit">提交</button>
+			</view>
+		</view>
+		<u-overlay :show="show" @click="show = false">
+				<view style='flex-wrap: wrap;' class='wrap flex'>
+					<view v-for='item in classifyList' style='width:33.3333%;'>
+						<view @click='selectClassify(item)' class='classifyItem' :class='form.classify==item.classifyName?"active":""'>{{item.classifyName}}</view>
+					</view>
+					
+				</view>
+			</u-overlay>
+		<u-modal :show="isSubmit" content='确认添加菜品信息？' @confirm="$u.debounce(confirmSubmit, 500)" showCancelButton
+			@cancel="isSubmit=false" @close="isSubmit=false" closeOnClickOverlay></u-modal>
+			<u-modal :show="show1" title='添加分类'  @confirm="$u.debounce(classifySubmit, 500)" showCancelButton
+				@cancel="show1=false" @close="show1=false" closeOnClickOverlay>
+				<view class="slot-content">
+					<view>
+						<u--input inputAlign='center' v-model="classifyName" placeholder="输入分类名称" border="none"></u--input>
+					</view>
+				</view>
+			</u-modal>
 	</view>
 </template>
 
 <script>
+	var that = this
+	import uploadImage from '@/components/ossutil/uploadFile.js';
 	export default {
 		data() {
 			return {
-				
+				form:{
+					foodId:'',
+					classify:'',
+				},
+				classifyName:'',
+				show:false,
+				show1:false,
+				isSubmit:false,
+				dataList:[],
+				classifyList:[],
+				fileList1:[]
 			}
+		},
+		onLoad(options) {
+			that = this
+			this.form.foodId=options.foodId
+			this.form.shopNames=options.shopNames
+			this.$request.baseRequest('admin.tourism.dishClassifyInfo', 'list', {
+				foodId:this.form.foodId,
+				page:1,
+				limit:9999
+			}, failres => {
+				uni.showToast({
+					icon: "none",
+					title: failres.errmsg,
+					duration: 3000
+				});
+			}).then(res => {
+				this.classifyList = res.data.items
+				this.form.classify = res.data.items[0].classifyName
+			})
+		},
+		onShow(){
+			
 		},
 		methods: {
+			add(){
+				this.show1 = true
+			},
+			openClassify(){
+				this.show = true
+			},
+			selectClassify(item){
+				console.log(item)
+				this.form.classify = item.classifyName
+			},
+			submit(){
+					if(this.form.dishName.length<2||this.form.dishName.length>8){
+							uni.showToast({
+								icon: "none",
+								title: '菜品名称2-8个字！',
+								duration: 3000
+							});
+							return
+						}
+						if(this.form.dishPrice<=0){
+							uni.showToast({
+								icon: "none",
+								title: '菜品单价输入错误！',
+								duration: 3000
+							});
+							return
+						}
+						if(!this.form.dishImage){
+							uni.showToast({
+								icon: "none",
+								title: '菜品图片不能为空！',
+								duration: 3000
+							});
+							return
+						}
+
+				this.isSubmit = true
+			},
+			classifySubmit() {
+				console.log(this.form)
+				uni.showLoading({
+					title: '加载中',
+					mask: true
+				})
+				this.$request.baseRequest('admin.tourism.dishClassifyInfo', 'add', {
+					dishClassifyInfo: JSON.stringify({foodId:this.form.foodId,classifyName:this.classifyName})
+				}, failres => {
+					uni.showToast({
+						icon: "none",
+						title: failres.errmsg,
+						duration: 3000
+					});
 			
+					uni.hideLoading()
+				}).then(res => {
+					this.show1 = false
+					uni.showToast({
+						icon: "success",
+						title: '添加分类成功',
+						duration: 2000
+					});
+				})
+			},
+			confirmSubmit() {
+				console.log(this.form)
+				uni.showLoading({
+					title: '加载中',
+					mask: true
+				})
+				this.$request.baseRequest('admin.tourism.foodDishesInfo', 'add', {
+					foodDishesInfo: JSON.stringify(this.form)
+				}, failres => {
+					uni.showToast({
+						icon: "none",
+						title: failres.errmsg,
+						duration: 3000
+					});
+			
+					uni.hideLoading()
+				}).then(res => {
+					this.isSubmit = false
+					uni.showToast({
+						icon: "success",
+						title: '提交成功',
+						duration: 2000
+					});
+					uni.navigateBack()
+			
+				})
+			},
+			// 删除图片
+			deletePic(event,status) {
+				this[`fileList${event.name}`].splice(event.index, 1)
+			},
+			// 新增图片
+			async afterRead(event,status) {
+				// 当设置 multiple 为 true 时, file 为数组格式，否则为对象格式
+				let lists = [].concat(event.file)
+				let fileListLen = this[`fileList${event.name}`].length
+				lists.map((item) => {
+					this[`fileList${event.name}`].push({
+						...item,
+						status: 'uploading',
+						message: '上传中'
+					})
+				})
+				for (let i = 0; i < lists.length; i++) {
+					const result = await this.uploadFilePromise(lists[i].url,status)
+					
+					let item = this[`fileList${event.name}`][fileListLen]
+					this[`fileList${event.name}`].splice(fileListLen, 1, Object.assign(item, {
+						status: 'success',
+						message: '',
+						url: result
+					}))
+					fileListLen++
+					console.log(that.form, this[`fileList${event.name}`])
+					
+				}
+			},
+			uploadFilePromise(res,status) {
+				return new Promise((resolve, reject) => {
+					uploadImage(res, 'cardImages/',
+						result => {
+							
+							that.form.dishImage = result
+							resolve(res)
+						}
+					)
+				})
+			},
 		}
 	}
 </script>
 
-<style>
-
+<style lang='scss' scoped>
+.wrap{
+	 padding:20rpx;
+ }
+.add,.active{
+	background: #5F7DE9;
+	color: #fff;
+	padding: 10rpx 20rpx;
+	border-radius: 10rpx;
+	font-size: 26rpx;
+ }
+ .classifyItem{
+	padding: 10rpx 20rpx;
+	font-size: 26rpx;
+	text-align: center;
+	margin: 0 30px;
+ }
 </style>

uni_merchants_enter/pageA/enter/myCateringdustry/edit.vue

@@ -0,0 +1,413 @@
+<template>
+	<view class='content'>
+		<view class='wrap'>
+			<u--form  ref="uForm">
+				<u-form-item labelWidth='80' labelPosition='top' label="营业执照">
+					<u-upload height='208' width='320' :fileList="fileList2" @afterRead="afterRead($event,1)" @delete="deletePic" name="2" multiple
+						:maxCount="1">
+						<image style='width:680rpx;height:417rpx;' src="@/static/image/enter/yingyezhizhao.png" mode=""></image>
+					</u-upload>
+				</u-form-item>
+				<u-form-item labelWidth='80' labelPosition='top' label="经营许可证">
+					<u-upload height='208' width='320' :fileList="fileList3" @afterRead="afterRead($event,2)" @delete="deletePic" name="3" multiple
+						:maxCount="1">
+						<image style='width:680rpx;height:417rpx;' src="@/static/image/enter/jingyingxukezheng.png" mode=""></image>
+					</u-upload>
+				</u-form-item>
+				<u-form-item  labelWidth='150' labelPosition='left' label="经营许可证有效期">
+					<view style='text-align:right;' @click='openjyxkz'>{{form.operateCertificateDate?form.operateCertificateDate:'选择日期'}}<image src="@/static/image/yjt.png" mode=""
+								style="margin-left:10rpx;width:12rpx;height: 21rpx;"></image></view>
+				</u-form-item>
+				<uni-calendar
+				   :insert="false"
+				   :lunar="true" 
+					ref="calendar"
+				   :start-date="startDate"
+				   @confirm="confirm"
+				    />
+					<u-form-item  labelWidth='150' labelPosition='left' label="店铺名称">
+						<u-input inputAlign='right' border='none' placeholder='输入店铺名称' v-model="form.shopNames" />
+					</u-form-item>
+					<u-form-item  labelWidth='150' labelPosition='left' label="经营者">
+						<u-input inputAlign='right' border='none' placeholder='输入经营者姓名' v-model="form.operater" />
+					</u-form-item>
+					<u-form-item  labelWidth='150' labelPosition='left' label="经营者手机号">
+						<u-input inputAlign='right' maxlength="15" border='none' placeholder='输入经营者手机号' v-model="form.operaterPhone" />
+					</u-form-item>
+					<u-form-item  labelWidth='150' labelPosition='left' label="验证码">
+						<u-input inputAlign='right' border='none' placeholder='输入验证码' v-model="form.verifyCode" >
+							<template slot="suffix">
+								<u-code ref="uCode"
+									@change="codeChange"
+									seconds="60"
+									changeText="X秒重新获取"
+								></u-code>
+
+								<view class='get_code' @click='getCode'>{{tips}}</view>
+							</template>
+						</u-input>
+					</u-form-item>
+					<u-form-item  labelWidth='150' labelPosition='left' label="业务联系人(选填)">
+						<u-input inputAlign='right' border='none' placeholder='输入联系人姓名' v-model="form.contacts" />
+					</u-form-item>
+					<u-form-item  labelWidth='150' labelPosition='left' label="业务联系电话(选填)">
+						<u-input inputAlign='right' maxlength="15" border='none' placeholder='输入联系电话' v-model="form.contactsPhone" />
+					</u-form-item>
+					<u-form-item labelWidth='80' labelPosition='left' @click='placeSelect(),hideKeyboard()' label="店铺位置">
+						<view style='text-align:right;' v-if="form.province">{{ form.province }}{{ form.city }}{{ form.area }}</view>
+						<view style='text-align:right;' v-else>
+							<text style='text-align:right;'>选择位置 </text>
+							<image src="@/static/image/yjt.png" mode=""
+								style="margin-left:10rpx;width:12rpx;height: 21rpx;"></image>
+						</view>
+					</u-form-item>
+					<u-form-item labelWidth='80' labelPosition='left' label="详细地址">
+						<u-input inputAlign='right' maxlength="15" border='none' placeholder='输入详细地址，不超过15个字' v-model="form.detailedAddress" />
+					</u-form-item>
+					<u-form-item  labelWidth='150' labelPosition='left' label="营业时间">
+						<view style='text-align:right;' @click='selectTime'>{{form.timesection}}<image src="@/static/image/yjt.png" mode=""
+								style="margin-left:10rpx;width:12rpx;height: 21rpx;"></image></view>
+					</u-form-item>
+					<smh-time-range :is-under='show' :time="['18','0','42']" @confrim="confrim" @cancel="cancel"></smh-time-range>
+					<!-- label -->
+					<view class='flex justify-space-between align-item-center'>
+						<view>标签（2-4个，最多5个字）</view> 
+						<view class='add_label' @click='addLabel'>新增</view>
+					</view>
+					<view style='flex-wrap: wrap;' class='flex'>
+						<view style='margin:10rpx;width:47%;' class='flex align-item-center' v-for='item in labelList'>
+							<u-input inputAlign='right' placeholder='输入标签文字' v-model="item.value" />
+							<view class="iconfont_no icon_merchants_enterjianshao"></view>
+						</view>
+					</view>
+					
+				<u-form-item labelWidth='240' labelPosition='top' label="门面及门头照片(1张,店名文字清晰)">
+					<u-upload :fileList="fileList4" @afterRead="afterRead($event,3)" @delete="deletePic" name="4" multiple
+						:maxCount="1">
+						
+					</u-upload>
+				</u-form-item>
+				<u-form-item labelWidth='120' labelPosition='top' label="室内照片(1-6张)">
+					<u-upload :fileList="fileList5" @afterRead="afterRead($event,4)" @delete="deletePic" name="5" multiple
+						:maxCount="6">
+						
+					</u-upload>
+				</u-form-item>
+			</u--form>
+			<view class="footer">
+				<button @click='submit' class="submit">提交</button>
+			</view>
+		</view>
+		<u-modal :show="isSubmit" :content='content' @confirm="$u.debounce(confirmSubmit, 500)" showCancelButton
+			@cancel="isSubmit=false" @close="isSubmit=false" closeOnClickOverlay></u-modal>
+	</view>
+</template>
+
+<script>
+	var that
+	import uploadImage from '@/components/ossutil/uploadFile.js';
+	export default {
+		data() {
+			return {
+				content:'确定提交入驻信息',
+				isSubmit:false,
+				form:{
+					commonId:uni.getStorageSync("userInfo").id,
+					mainBody:'商铺',
+					lookFlag:0,
+					startDate:'',
+					city: '',
+					area: '',
+					province: '',
+					location: '',
+					detailedAddress: '',
+					businessLicense:'',
+					operateCertificate:'',
+					coverImage:'',
+					indoorImage:'',
+					timesection:'09:00~21:00',
+					startDate:'09:00',
+					endDate:'21:00',
+					operateCertificateDate:'',
+				},
+				indoorImageArray:[],
+				tips:'发送验证码',
+				startDate:'',
+				show:false,
+				foodId:'',
+				labelList:[{value:''},{value:''}],
+				fileList2:[],
+				fileList3:[],
+				fileList4:[],
+				fileList5:[],
+				
+			}
+		},
+		onLoad(options) {
+			this.foodId=options.foodId
+			that = this
+		},
+		onShow(){
+			this.$request.baseRequest('admin.tourism.foodInfo', 'get', {
+				id:this.foodId
+			}, failres => {
+				uni.showToast({
+					icon: "none",
+					title: failres.errmsg,
+					duration: 3000
+				});
+						
+				uni.hideLoading()
+			}).then(res => {
+				console.log(res.data)
+				this.form=res.data
+				this.fileList2=[{url:this.form.businessLicense}]
+				this.fileList3=[{url:this.form.operateCertificate}]
+				this.fileList4=[{url:this.form.coverImage}]
+				this.fileList5=[]
+				if(this.form.indoorImage){
+					var arr=this.form.indoorImage.split(',')
+					for(var i=0;i<arr.length;i++){
+						if(arr[i]!=''){
+							this.fileList5.push({url:arr[i]})
+						}
+					}
+					
+				}
+				if(this.form.label){
+					this.labelList=[]
+					var label=this.form.label.split(',')
+					for(var i=0;i<label.length;i++){
+						if(arr[i]!=''){
+							this.labelList.push({value:label[i]})
+						}
+					}
+				}else{
+					this.labelList=[{value:''},{value:''}]
+				}
+			})
+			
+		},
+		methods: {
+			submit(){
+				if(this.labelList.length>0){
+					var arr=[]
+					for(var i=0;i<this.labelList.length;i++){
+						if(!this.labelList[i].value){
+							uni.showToast({
+								icon: "none",
+								title: '标签请输入内容！',
+								duration: 3000
+							});
+							return
+						}
+						if(this.labelList[i].value.length>5){
+							uni.showToast({
+								icon: "none",
+								title: '标签最多5个字！',
+								duration: 3000
+							});
+							return
+						}
+						arr.push(this.labelList[i].value)
+					}
+					this.form.label=arr.toString()
+				}
+				this.isSubmit = true
+			},
+			confirmSubmit() {
+				uni.showLoading({
+					title: '加载中',
+					mask: true
+				})
+				this.form.status = '审核中'
+				this.$request.baseRequest('admin.tourism.foodInfo', 'update', {
+					foodInfo: JSON.stringify(this.form)
+				}, failres => {
+					uni.showToast({
+						icon: "none",
+						title: failres.errmsg,
+						duration: 3000
+					});
+			
+					uni.hideLoading()
+				}).then(res => {
+					this.isSubmit = false
+					uni.showToast({
+						icon: "success",
+						title: '提交成功，请等待平台审核',
+						duration: 2000
+					});
+					uni.navigateBack()
+			
+				})
+			},
+			concel(e){
+				this.show=false
+				console.log(e)
+			},
+			confrim(e){
+				console.log(e)
+				this.show=false
+				this.form.timesection=e.time
+				this.form.startDate=e.start
+				this.form.endDate=e.end
+			},
+			selectTime(){
+				this.show=true
+			},
+			addLabel(){
+				if(this.labelList.length>=4){
+					uni.showToast({
+						icon: "success",
+						title: '最多4个标签！',
+						duration: 2000
+					});
+					return
+				}
+				this.labelList.push({value:''})
+			},
+			codeChange(text) {
+			    this.tips = text;
+			},
+			getCode() {
+				if(!this.form.operaterPhone){
+					uni.showToast({
+						icon: "none",
+						title: '请输入手机号再获取验证码！',
+						duration: 2000
+					});
+					return
+				}
+			    if (this.$refs.uCode.canGetCode) {
+			         // 模拟向后端请求验证码
+			        uni.showLoading({
+			        title: '正在获取验证码'
+			        })
+					this.$request.baseRequest('user', 'sendVerifyCode', {
+						phone: this.form.operaterPhone
+					}, failres => {
+						uni.showToast({
+							icon: "none",
+							title: failres.errmsg,
+							duration: 3000
+						});
+						uni.hideLoading()
+					}).then(res => {
+						
+								
+					})
+			        setTimeout(() => {
+			            uni.hideLoading();
+			            // 这里此提示会被this.start()方法中的提示覆盖
+			         
+			            // 通知验证码组件内部开始倒计时
+			            this.$refs.uCode.start();
+			        }, 2000);
+			    } else {
+			        uni.showToast({
+			        	icon: "success",
+			        	title: '提交成功！',
+			        	duration: 2000
+			        });
+			    }
+			},
+			confirm(e){
+				this.form.operateCertificateDate = e.fulldate
+				this.$forceUpdate()
+				console.log(e)
+			},
+			openjyxkz(){
+				  this.$refs.calendar.open();
+			},
+			placeSelect() {
+				uni.chooseLocation({
+					success: function(res) {
+						console.log(res);
+						that.form.location = res.latitude + ',' + res.longitude
+						let _address = that.$helper.formatLocation(res.address)
+						console.log(_address)
+						that.form.province = _address.Province
+						that.form.city = _address.City
+						that.form.area = _address.Country
+						that.form.detailedAddress = _address.Village
+						that.$forceUpdate()
+					}
+				});
+			},
+			hideKeyboard() {
+				uni.hideKeyboard()
+			},
+			// 删除图片
+			deletePic(event,status) {
+				this[`fileList${event.name}`].splice(event.index, 1)
+				that.indoorImageArray.splice(event.index, 1)
+				that.form.indoorImage =that.indoorImageArray.toString()
+			},
+			// 新增图片
+			async afterRead(event,status) {
+				// 当设置 multiple 为 true 时, file 为数组格式，否则为对象格式
+				let lists = [].concat(event.file)
+				let fileListLen = this[`fileList${event.name}`].length
+				lists.map((item) => {
+					this[`fileList${event.name}`].push({
+						...item,
+						status: 'uploading',
+						message: '上传中'
+					})
+				})
+				for (let i = 0; i < lists.length; i++) {
+					const result = await this.uploadFilePromise(lists[i].url,status)
+					
+					let item = this[`fileList${event.name}`][fileListLen]
+					this[`fileList${event.name}`].splice(fileListLen, 1, Object.assign(item, {
+						status: 'success',
+						message: '',
+						url: result
+					}))
+					fileListLen++
+					console.log(that.form, this[`fileList${event.name}`])
+					
+				}
+			},
+			uploadFilePromise(res,status) {
+				return new Promise((resolve, reject) => {
+					uploadImage(res, 'cardImages/',
+						result => {
+							if(status==1){
+								that.form.businessLicense = result
+							}else if(status==2){
+								that.form.operateCertificate = result
+							}else if(status==3){
+								that.form.coverImage = result
+							}else if(status==4){
+								that.indoorImageArray.push(result)
+								that.form.indoorImage =that.indoorImageArray.toString()
+							}
+							resolve(res)
+						}
+					)
+				})
+			},
+		}
+	}
+</script>
+
+<style lang='scss' scoped>
+ .wrap{
+	 padding:20rpx;
+ }
+ .icon_merchants_enterjianshao{
+	 margin-left:10rpx;
+	 font-size:50rpx;
+	 color:#666;
+ }
+ .add_label,.get_code{
+
+	background: #5F7DE9;
+	color: #fff;
+	padding: 10rpx 20rpx;
+	border-radius: 10rpx;
+	font-size: 26rpx;
+ }
+</style>

uni_merchants_enter/pageA/enter/myCateringdustry/index.vue

@@ -1,22 +1,197 @@
 <template>
-	<view>
-		
+	<view class='content'>
+		<view class='wrap'>
+			<view class='flex align-items-flex-start justify-space-between'>	
+			<view class="flex">
+				<view class="head_sculpture">
+					<u--image :showLoading="true" :src="currectData.coverImage" width="80rpx" height="80rpx" shape="circle"></u--image>
+				</view>
+				<view>
+					<view @click='switchShop' style='font-size:28rpx;'>{{currectData.shopNames}}<image src="@/static/image/yjt.png" mode=""
+								style="margin-left:10rpx;width:12rpx;height: 21rpx;"></image></view>
+					<view style='color:#999;font-size:24rpx;'>{{currectData.detailedAddress}}</view>
+				</view>
+			</view>
+				
+				<view>
+					<view class='caution' v-if='currectData.status!="显示中"&&currectData.status!="已隐藏"'>{{currectData.status}}</view>
+				</view>
+			</view>
+			<view>
+				<view style='font-size:28rpx;'>店铺照片</view>
+				<view  style='flex-wrap: wrap;' class='flex'>
+					<view class='shop_image' v-for='item in currectData.indoorImageArray'>
+						<u--image :showLoading="true" :radius='10' :src="item" width="100rpx" height="100rpx" ></u--image>
+					</view>
+				</view>
+			</view>
+			<view>
+				<view class='switch_show flex' style='font-size:34rpx;'>
+					<view :class='showStatus==0?"active":""' @click='switchShow(0)'>商品展示（{{currectData.displaysNum?currectData.displaysNum:0}}）</view>
+					<view :class='showStatus==1?"active":""' @click='switchShow(1)'>团购（{{currectData.groupNum?currectData.groupNum:0}}）</view>
+				</view>
+				<view v-if='showStatus==0' style='font-size:28rpx;'>
+					<view v-for='item in  currectData.dishClassifyInfoList' v-show='item.dishesNum'>
+						<view>
+							<view>{{item.classifyName}}（{{item.dishesNum}}）</view>
+						</view>
+						<view style='flex-wrap: wrap;text-align:center;' class='flex'>
+							<view style='margin:10rpx;' v-for='item1 in item.foodDishesInfoList'>
+								<u--image :showLoading="true" :src="item1.dishImage" width="150rpx" height="150rpx"  ></u--image>
+								<view>{{item1.dishName}}</view>
+							</view>
+						</view>
+						
+					</view>
+					
+				</view>
+				<view v-if='showStatus==1'>
+					<view style='margin:10rpx;' v-for='item1 in currectData.foodGroupInfoList'>
+						<u--image v-if='item1.showImage' :showLoading="true" :src="item1.showImage":width="width" :height="height"></u--image>
+						<view>{{item1.groupTitle}}</view>
+						<view class='flex justify-space-between align-item-center'>
+							<view>{{item1.groupPrice}}</view>
+							<view class='flex align-item-center'>
+								<view>已收{{item1.soldNum}}.</view>
+								<view>已用{{item1.usedNum}}.</view>
+								<view>待用{{item1.notUseNum}}</view>
+							</view>
+						</view>
+						
+					</view>
+				</view>
+			</view>
+			
+		</view>
+		<view v-if='currectData.status=="显示中"||currectData.status=="已隐藏"' style='margin:20rpx;' class='flex justify-space-between'>
+			<view class='button' @click='addfood'>添加菜品</view>
+			<view class='button' @click='addGroupBuying'>添加团购</view>
+			<view class='button' @click='shopSetting'>店铺设置</view>
+		</view>
+		<view v-else style='margin:20rpx;' class='flex justify-space-between'>
+			<view v-if='currectData.status=="审核中"||currectData.status=="已禁用"' class='unable_button' >添加菜品</view>
+			<view v-if='currectData.status=="审核中"||currectData.status=="已禁用"' class='unable_button' >添加团购</view>
+			<view v-if='currectData.status=="审核中"||currectData.status=="已禁用"' class='unable_button' >店铺设置</view>
+			<view v-if='currectData.status=="已驳回"' ></view>
+			<view v-if='currectData.status=="已驳回"' class='button' @click='editCateringindustry'>编辑店铺信息</view>
+			<view v-if='currectData.status=="已驳回"'></view>
+		</view>
+		<u-picker immediateChange='true' title='选择店铺' @cancel='show = false' @confirm='shopConfirm' :show="show" :columns="columns" keyName="shopNames"></u-picker>
 	</view>
 </template>
 
 <script>
+	var that
 	export default {
 		data() {
 			return {
-				
+				dataList:[],
+				currectData:{},
+				showStatus:0,
+				show:false,
+				height:'',
+				width:'',
+				columns:[]
 			}
 		},
-		methods: {
+		onLoad() {
+			that = this
+		},
+		onShow(){
+			this.height = (uni.getSystemInfoSync().windowWidth/2);
+			
+			this.width = uni.getSystemInfoSync().windowWidth-50;
+			console.log(this.height)
+			uni.showLoading({
+				title: '加载中',
+				mask: true
+			})
+			this.$request.baseRequest('admin.tourism.foodInfo', 'list', {
+				commonId:uni.getStorageSync("userInfo").id,
+				page:1,
+				limit:9999
+			}, failres => {
+				uni.showToast({
+					icon: "none",
+					title: failres.errmsg,
+					duration: 3000
+				});
+						
+				uni.hideLoading()
+			}).then(res => {
+				for(var i=0;i<res.data.items.length;i++){
+					if(res.data.items[i].indoorImage){
+						res.data.items[i].indoorImageArray=res.data.items[i].indoorImage.split(',')
+					}
+					if(res.data.items[i].foodGroupInfoList){
+						for(var q=0;q<res.data.items[i].foodGroupInfoList.length;q++){
+							var data = res.data.items[i].foodGroupInfoList[q]
+							if(data.dishImage){
+								var images = data.dishImage.split(',')
+								data.showImage=images[0]
+							}
+						}
+					}
+				}
+				this.columns = [res.data.items]
+				this.dataList = res.data.items
+				this.currectData = res.data.items[0]
+				uni.hideLoading()
+						
+			})
 			
+		},
+		methods: {
+			shopConfirm(e){
+				console.log(e)
+				this.currectData =e.value[0]
+				this.show = false
+			},
+			switchShop(){
+				this.show = true
+			},
+			switchShow(status){
+				this.showStatus=status
+			},
+			addfood(){
+				uni.navigateTo({
+					url:'/pageA/enter/myCateringdustry/addfood?foodId='+this.currectData.id+'&shopNames='+this.currectData.shopNames
+				})
+			},
+			editCateringindustry(){
+				uni.navigateTo({
+					url:'/pageA/enter/myCateringdustry/edit?foodId='+this.currectData.id
+				})
+			},
+			addGroupBuying(){
+				uni.navigateTo({
+					url:'/pageA/enter/myCateringdustry/addGroupBuying?foodId='+this.currectData.id+'&shopNames='+this.currectData.shopNames
+				})
+			},
+			shopSetting(){
+				uni.setStorageSync('myCateringdustry',JSON.stringify(this.currectData))
+				uni.navigateTo({
+					url:'/pageA/enter/myCateringdustry/shopSetting/index?foodId='+this.currectData.id+'&shopNames='+this.currectData.shopNames
+				})
+			}
 		}
 	}
 </script>
 
-<style>
-
+<style lang='scss' scoped>
+	.wrap{
+		padding:20rpx;
+	}
+	.head_sculpture{
+		padding: 0 20rpx 20rpx 0;
+	}
+	.shop_image{
+		margin:10rpx;
+	}
+	.switch_show{
+		.active{
+			font-weight:600;
+			color:#5F7DE9;
+		}
+	}
 </style>

uni_merchants_enter/pageA/enter/myCateringdustry/shopSetting/index.vue

@@ -1,22 +1,208 @@
 <template>
-	<view>
-		
+	<view class='content'>
+		<view class='wrap'>
+			<view>
+				{{currectData.shopNames}}
+				<image src="@/static/image/yjt.png" mode="" style="margin-left:10rpx;width:12rpx;height: 21rpx;"></image>
+			</view>
+			<view class='title'>营业管理</view>
+			<u-cell-group>
+				<u-cell title="营业时间" :isLink="true" arrow-direction="right">
+					<view @click='selectTime' slot="title" class="u-slot-title flex justify-space-between">
+						<view>营业时间</view>
+						{{currectData.startDate}}~{{currectData.endDate}}
+					</view>
+				</u-cell>
+				<u-cell  title="店铺上架" :isLink="true" arrow-direction="right">
+					<!-- <u-badge count="99" :absolute="false" slot="right-icon"></u-badge> -->
+					<view slot="title" class="u-slot-title flex justify-space-between align-item-center">
+						<view class="">
+							店铺上架
+						</view>
+						<view class='flex  align-item-center'>
+							<view style='margin-right:10rpx;'>{{currectData.status}}</view>
+							<u-switch slot="right-icon" v-model="checked"></u-switch>	
+						</view>
+					</view>
+				</u-cell>
+				<u-cell title="删除店铺" :isLink="true" arrow-direction="right">
+					<view slot="title" class="u-slot-title">
+						<view class="">
+							删除店铺
+						</view>
+					</view>	
+				</u-cell>
+			</u-cell-group>
+			<view class='title'>店铺信息</view>
+			<u-cell-group>
+				<u-cell title="店铺信息" :isLink="true" arrow-direction="right">
+					<view slot="title" class="u-slot-title">
+						<view class="">
+							店铺信息
+						</view>
+					</view>	
+				</u-cell>
+				<u-cell title="店铺图片" :isLink="true" arrow-direction="right">
+					<view slot="title" class="u-slot-title">
+						<view class="">
+							店铺图片
+						</view>
+					</view>	
+				</u-cell>
+				<u-cell title="证照图片" :isLink="true" arrow-direction="right">
+					<view slot="title" class="u-slot-title">
+						<view class="">
+							证照图片
+						</view>
+					</view>	
+				</u-cell>
+				<u-cell title="菜品分类" :isLink="true" arrow-direction="right">
+					<view slot="title" class="u-slot-title">
+						<view class="">
+							菜品分类
+						</view>
+					</view>	
+				</u-cell>
+				<u-cell  title="允许用户查看菜品价格" :isLink="true" arrow-direction="right">
+					<u-switch slot="right-icon" v-model="checked1"></u-switch>
+				</u-cell>
+				
+			</u-cell-group>
+		</view>
+		<smh-time-range :is-under='show' :time="time" @confrim="confrim" @cancel="cancel"></smh-time-range>
 	</view>
 </template>
 
 <script>
+	var that
 	export default {
 		data() {
 			return {
-				
+				checked:true,
+				checked1:true,
+				show:false,
+				time:[],
+				currectData:{
+					
+				},
+				hoursList:[
+					'00:00',
+					'00:30',
+					'01:00',
+					'01:30',
+					'02:00',
+					'02:30',
+					'03:00',
+					'03:30',
+					'04:00',
+					'04:30',
+					'05:00',
+					'05:30',
+					'06:00',
+					'06:30',
+					'07:00',
+					'07:30',
+					'08:00',
+					'08:30',
+					'09:00',
+					'09:30',
+					'10:00',
+					'10:00',
+					'11:00',
+					'11:30',
+					'12:00',
+					'12:30',
+					'13:00',
+					'13:30',
+					'14:00',
+					'14:30',
+					'15:00',
+					'15:30',
+					'16:00',
+					'16:30',
+					'17:00',
+					'17:30',
+					'18:00',
+					'18:30',
+					'19:00',
+					'19:30',
+					'20:00',
+					'20:30',
+					'21:00',
+					'21:30',
+					'22:00',
+					'22:30',
+					'23:00',
+					'23:30',
+					'24:00'],
+			}
+		},
+		onLoad() {
+			that = this
+		},
+		onShow(){
+			if(uni.getStorageSync('myCateringdustry')){
+				this.currectData=JSON.parse(uni.getStorageSync('myCateringdustry'))
+				var start = 0,end = 0
+				for(var i=0;i<this.hoursList.length;i++){
+					if(this.currectData.startDate==this.hoursList[i]){
+						start = i
+					}
+					if(this.currectData.endDate==this.hoursList[i]){
+						end = i
+					}
+				}
+				if(this.currectData.status=='显示中'){
+					this.checked=true
+				}else if(this.currectData.status=='已隐藏'){
+					this.checked=false
+				}
+				if(this.currectData.lookFlag==0){
+					this.checked1 =true
+				}else{
+					this.checked1 =false
+				}
+				this.time=[start,'0',end]
+				console.log(this.time)
 			}
 		},
 		methods: {
-			
+			selectTime(){
+				this.show = true
+			},
+			confrim(e){
+				this.currectData.startDate=e.start
+				this.currectData.endDate=e.end
+				this.$request.baseRequest('admin.tourism.foodInfo', 'update', {
+					foodInfo: JSON.stringify(this.currectData)
+				}, failres => {
+					uni.showToast({
+						icon: "none",
+						title: failres.errmsg,
+						duration: 3000
+					});
+							
+					uni.hideLoading()
+				}).then(res => {
+					uni.showToast({
+						icon: "success",
+						title: '修改营业时间成功',
+						duration: 2000
+					});
+					this.show = false
+							
+				})
+			},
+			cancel(){
+				this.show = false
+			}
 		}
 	}
 </script>
 
-<style>
-
+<style lang='scss' scoped>
+.title{
+	padding:20rpx;
+	font-weight:600;
+}
 </style>

uni_merchants_enter/pages.json

@@ -271,6 +271,15 @@
 						"enablePullDownRefresh": false
 					}
                 
+                }
+                ,{
+                    "path" : "enter/myCateringdustry/edit",
+                    "style" :                                                                                    
+                {
+                    "navigationBarTitleText": "店铺信息",
+                    "enablePullDownRefresh": false
+                }
+                
                 }
             ]
 		}

uni_merchants_enter/pages/enter/enter.vue

@@ -154,7 +154,7 @@
 								cuIcon: '1_canyin-35',
 								color: 'blue',
 								name: '餐饮',
-								url: '/pageA/enter/cateringindustry'
+								url: '/pageA/enter/myCateringdustry/index'
 							},
 							{
 								cuIcon: 'zufang',

uni_merchants_enter/style/icon/iconfont.css

@@ -1,9 +1,9 @@
 @font-face {
   font-family: "iconfont_no"; /* Project id 4108869 */
-  src: url('//at.alicdn.com/t/c/font_4108869_kpacyzkjobd.woff2?t=1686192995404') format('woff2'),
-       url('//at.alicdn.com/t/c/font_4108869_kpacyzkjobd.woff?t=1686192995404') format('woff'),
-       url('//at.alicdn.com/t/c/font_4108869_kpacyzkjobd.ttf?t=1686192995404') format('truetype'),
-       url('//at.alicdn.com/t/c/font_4108869_kpacyzkjobd.svg?t=1686192995404#iconfont_no') format('svg');
+  src: url('//at.alicdn.com/t/c/font_4108869_3enqife4n1a.woff2?t=1686805807796') format('woff2'),
+       url('//at.alicdn.com/t/c/font_4108869_3enqife4n1a.woff?t=1686805807796') format('woff'),
+       url('//at.alicdn.com/t/c/font_4108869_3enqife4n1a.ttf?t=1686805807796') format('truetype'),
+       url('//at.alicdn.com/t/c/font_4108869_3enqife4n1a.svg?t=1686805807796#iconfont_no') format('svg');
 }
 
 .iconfont_no {
@@ -14,12 +14,12 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
-.icon_merchants_entertucenggouxuan:before {
-  content: "\e6a2";
+.icon_merchants_enterzhankai:before {
+  content: "\e633";
 }
 
-.icon_merchants_enteryigouxuan:before {
-  content: "\e63d";
+.icon_merchants_entershouqi:before {
+  content: "\e634";
 }
 
 .icon_merchants_enterweigouxuan:before {

uni_merchants_enter/uni_modules/smh-time-range/components/smh-time-range/smh-time-range.vue

@@ -107,7 +107,8 @@
 					'22:00',
 					'22:30',
 					'23:00',
-					'23:30'],
+					'23:30',
+					'24:00'],
 				minutes,
 			}
 		},

unimall-admin/src/api/tourism/foodInfo.js

@@ -71,3 +71,15 @@ export function exportFoodInfo(query) {
     }
   })
 }
+
+// 审核餐饮入驻信息
+export function auditFoodInfo(query) {
+  return request({
+    method: 'post',
+    params: {
+      _gp: 'admin.tourism.foodInfo',
+      _mt: 'handle',
+      foodInfo:query
+    }
+  })
+}

unimall-admin/src/views/foodInfo/index.vue

@@ -171,8 +171,10 @@
             v-permission="['tourism:foodInfo:edit']"
           >修改</el-button>
           <el-button
+            v-if='scope.row.status=="审核中"'
             size="mini"
             type="text"
+            icon="el-icon-s-check"
             @click="handleAudit(scope.row)"
           >审核</el-button>
           <el-button
@@ -275,41 +277,32 @@
         <el-form-item label="允许用户查看菜品价格(0允许1禁止)" prop="lookFlag">
           <el-input v-model="form.lookFlag" placeholder="请输入允许用户查看菜品价格(0允许1禁止)" />
         </el-form-item>
-        <el-form-item label="状态">
-          <el-radio-group v-model="form.status">
-            <el-radio label="1">请选择字典生成</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="" prop="gmtCreate">
-          <el-date-picker clearable size="small" style="width: 200px"
-            v-model="form.gmtCreate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="" prop="gmtUpdate">
-          <el-date-picker clearable size="small" style="width: 200px"
-            v-model="form.gmtUpdate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="删除标识" prop="deleteFlag">
-          <el-input v-model="form.deleteFlag" placeholder="请输入删除标识" />
-        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+    <el-dialog title="审核" :visible.sync="open1" width="500px">
+      <el-form label-width="80px">
+        <el-form-item label="状态" prop="operateCertificateDate">
+          <el-select style="width:100%;margin-bottom:10px;" v-model="currectData.status" placeholder="请选择状态">
+            <el-option label="显示中" value="显示中"></el-option>
+            <el-option label="已驳回" value="已驳回"></el-option>
+            <el-option label="已禁用" value="已禁用"></el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm1">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import { listFoodInfo, getFoodInfo, delFoodInfo, addFoodInfo, updateFoodInfo, exportFoodInfo } from "@/api/tourism/foodInfo";
+import { listFoodInfo, getFoodInfo, delFoodInfo, addFoodInfo, updateFoodInfo, exportFoodInfo, auditFoodInfo } from "@/api/tourism/foodInfo";
 
 export default {
   data() {
@@ -330,6 +323,8 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      open1: false,
+      currectData:{},
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -364,21 +359,7 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        operateCertificateDate: [
-          { required: true, message: "经营许可证有效期不能为空", trigger: "blur" }
-        ],        startDate: [
-          { required: true, message: "营业开始时间不能为空", trigger: "blur" }
-        ],        endDate: [
-          { required: true, message: "营业结束时间不能为空", trigger: "blur" }
-        ],        lookFlag: [
-          { required: true, message: "允许用户查看菜品价格(0允许1禁止)不能为空", trigger: "blur" }
-        ],        gmtCreate: [
-          { required: true, message: "不能为空", trigger: "blur" }
-        ],        gmtUpdate: [
-          { required: true, message: "不能为空", trigger: "blur" }
-        ],        deleteFlag: [
-          { required: true, message: "删除标识不能为空", trigger: "blur" }
-        ]      }
+          }
     };
   },
   created() {
@@ -463,6 +444,23 @@ export default {
         this.title = "修改餐饮入驻信息";
       });
     },
+    handleAudit(row){
+      this.currectData = row
+      this.open1 = true
+      // const id = row.id
+      
+    },
+    submitForm1: function() {
+      auditFoodInfo({id:this.currectData.id,status:this.currectData.status}).then(response => {
+        if (response.data) {
+                this.msgSuccess("审核成功");
+                this.open1 = false
+                this.getList();
+              } else {
+                this.msgError(response.msg);
+              }
+      });
+    },
     /** 提交按钮 */
     submitForm: function() {
       this.$refs["form"].validate(valid => {