高敬炎 2 年之前
父节点
当前提交
a8e18fe925

+ 2 - 2
uni_applet/pages/find/find.vue

@@ -22,7 +22,7 @@
 		<view>
 			<u-swiper :list="fileList"
 			autoplay
-			imgMode='aspectFill'
+			imgMode='aspectFit'
 			height='200'
 			radius='0'
 			:circular="true"
@@ -361,6 +361,6 @@
 		right:0;bottom:10px;
 	}
 	.applet-colors-tianjia2{
-		font-size:30px;
+		font-size:100px;
 	}
 </style>

+ 1 - 0
uni_merchants_enter/pageA/enter/cateringindustry.vue

@@ -112,6 +112,7 @@
 				content:'确定提交入驻信息',
 				isSubmit:false,
 				form:{
+					commonId:uni.getStorageSync("userInfo").id,
 					mainBody:'商铺',
 					lookFlag:0,
 					startDate:'',

+ 23 - 2
uni_merchants_enter/pageA/enter/homestay.vue

@@ -50,6 +50,15 @@
 						</u-input>
 					</u-form-item>
 				</u-form-item>
+				<!-- <u-form-item>
+					<view class="flex service align-center">
+						<view @click='' :class='consentStatus?"icon_merchants_entergouxuan":"icon_merchants_enterweigouxuan"' class="iconfont_no"></view>
+						我已阅读并同意
+						<navigator
+							url="/pageA/webview?can_share=false&url=https://liangxin.zthymaoyi.com/userAgreement.html"
+							class="path" hover-class="navigator-hover">《民宿入驻协议》</navigator>的相关规定
+					</view>
+				</u-form-item> -->
 			</u--form>
 			<view class="footer">
 				<button @click='submit' class="submit">提交</button>
@@ -67,13 +76,15 @@
 		data() {
 			return {
 				form:{
+					commonId:uni.getStorageSync("userInfo").id,
 				},
+				consentStatus:false,
 				tips:'发送验证码',
 				startDate:'',
 				isSubmit:false,
 				fileList4:[],
 				fileList6:[],
-				content:'确定提交店铺信息',
+				content:'确定提交入驻信息',
 			}
 		},
 		onLoad() {
@@ -151,7 +162,7 @@
 					this.isSubmit = false
 					uni.showToast({
 						icon: "success",
-						title: '提交成功',
+						title: '提交成功,请等待平台审核',
 						duration: 2000
 					});
 					uni.navigateBack()
@@ -258,4 +269,14 @@
  	 background:url('https://taohaoliang.oss-cn-beijing.aliyuncs.com/pcfiles/card.png') no-repeat center;
  	 background-size: 100%;
  }
+ .path {
+ 	color: #2772FB;
+ 
+ }
+ .icon_merchants_enterweigouxuan{
+	 color:#999;
+ }
+ .icon_merchants_entergouxuan{
+	 color:#5F7DE9;
+ }
 </style>

+ 10 - 1
uni_merchants_enter/pages.json

@@ -92,7 +92,16 @@
 				    }
 				    
 				}
-	        ]
+	            ,{
+                    "path" : "webview",
+                    "style" :                                                                                    
+                {
+                    "navigationBarTitleText": "",
+                    "enablePullDownRefresh": false
+                }
+                
+                }
+            ]
 		}
 	],
 	"preloadRule": {

+ 299 - 61
uni_merchants_enter/pages/enter/enter.vue

@@ -1,15 +1,86 @@
 <template>
 	<view>
+		<view>
+			<u-swiper :list="fileList"
+			autoplay
+			imgMode='aspectFit'
+			height='200'
+			radius='0'
+			:circular="true"
+			@change="e => current = e.current" @click="click">
+				<view slot="indicator" class="indicator">
+					<view
+			            class="indicator__dot"
+			            v-for="(item, index) in fileList"
+			            :key="index"
+			            :class="[index === current && 'indicator__dot--active']">
+			        </view>
+				</view>
+			</u-swiper>
+		</view>
 		<view>
 			 <luyj-grid-link :list="list" @gridExc="clickGrid"></luyj-grid-link>
-			<!-- <button @click="toDetail('/pageA/enter/cateringindustry')">餐饮</button>
-			<button @click="toDetail('/pageA/enter/homestay')">民宿</button>
-			<button @click="toDetail('/pageA/enter/hotel')">酒店</button> -->
+			 <u-modal :show="showAuthorizePhone" :showConfirmButton="false">
+			 	<view class="slot-content">
+			 		<view class="auth-card">
+			 			<view class="img">
+			 				<img class="avatar-img" src="@/static/image/logo.png" mode="widthFix">
+			 			</view>
+			 			<view class="content">手机登录后才能查看名片哦~</view>
+			 		</view>
+			 		<view class="auth-btncard">
+			 			<view class="btn-unok">
+			 				<u-button :customStyle="customStyleUnOk" @click="showAuthorizePhone=false" :plain="true">
+			 					拒绝</u-button>
+			 			</view>
+			 			<view class="btn-ok">
+			 				<u-button :customStyle="customStyleOk" open-type="getPhoneNumber"
+			 					@getphonenumber="getPhoneNumber"> 立即登录</u-button>
+			 			</view>
+			 		</view>
+			 	</view>
+			 </u-modal>
+			<u-modal :show="showAuthorizeUser" :showConfirmButton="false">
+				<view class="slot-content">
+					<view class="auth-card">
+						<view class="img">
+							<img class="avatar-img" src="/static/image/logo.png" mode="widthFix">
+						</view>
+						<view class="content">邀请您补全个人信息<br></br>(昵称、头像)</view>
+						<view style="margin-left: 100rpx;margin-right: 100rpx">
+							<u-form :model="userInfo" ref="uForm">
+								<u-form-item label="头像">
+									<button class="avatar-wrapper" open-type="chooseAvatar" @chooseavatar="onChooseAvatar"
+										slot="right">
+										<image class="avatar"
+											:src="userInfo.head?userInfo.head:'https://mmbiz.qpic.cn/mmbiz/icTdbqWNOwNRna42FI242Lcia07jQodd2FJGIYQfG0LAJGFxM4FbnQP6yfMxBgJ0F3YRqJCJ1aPAK2dQagdusBZg/0'">
+										</image>
+									</button>
+								</u-form-item>
+								<u-form-item label="昵称">
+									<u-input inputAlign='right' v-model="userInfo.nickname" class="weui-input"
+										@blur="userNameInput" placeholder="请输入昵称" border="false" />
+									<!-- <input type="nickname" :value="userInfo.nickname" class="weui-input" @blur="userNameInput" placeholder="请输入昵称"/> -->
+								</u-form-item>
+							</u-form>
+						</view>
+					</view>
+					<view class="auth-btncard">
+						<view class="btn-unok"><u-button :customStyle="customStyleUnOk" @click="authUser(0)">
+								拒绝</u-button>
+						</view>
+						<view class="btn-ok">
+							<u-button :customStyle="customStyleOk" @click="authUser(1)"> 允许</u-button>
+						</view>
+					</view>
+				</view>
+			</u-modal>
 		</view>
 	</view>
 </template>
 
 <script>
+	var that
 	import luyjGridLink from '@/uni_modules/lxm-fold-link/luyj-grid-link/components/luyj-grid-link/luyj-grid-link.vue'
 	export default {
 		components: {
@@ -17,75 +88,242 @@
 		},
 		data() {
 			return {
-				list: [{
-				            title: '全部分类',
-				            // cur: 'basic',
-				            bgColor: '', // 背景颜色
-				            color: 'blue',
-				            title_show: true,
-				            showAll: false,
-				            colNumber: 4, // 显示的列数
-				            iconsList: [{
-				                    cuIcon: '1_canyin-35',
-				                    color: 'blue',
-				                    name: '餐饮',
-				                    url: '/pageA/enter/cateringindustry'
-				                },
-				                {
-				                    cuIcon: 'zufang',
-				                    color: 'blue',
-				                    name: '民宿',
-				                    url: '/pageA/enter/homestay'
-				                },
-				                {
-				                    cuIcon: 'jiudian-38',
-				                    color: 'blue',
-				                    name: '酒店',
-				                    url: '/pageA/enter/hotel'
-				                }
-				            ]
-				        },
-						{
-						            title: '我的入驻',
-						            // cur: 'basic',
-						            bgColor: '', // 背景颜色
-						            color: 'blue',
-						            title_show: true,
-						            showAll: false,
-						            colNumber: 4, // 显示的列数
-						            iconsList: [{
-						                    cuIcon: '1_canyin-35',
-						                    color: 'blue',
-						                    name: '餐饮',
-						                    url: '/pageA/enter/cateringindustry'
-						                },
-						                {
-						                    cuIcon: 'zufang',
-						                    color: 'blue',
-						                    name: '民宿',
-						                    url: '/pageA/enter/homestay'
-						                },
-						                {
-						                    cuIcon: 'jiudian-38',
-						                    color: 'blue',
-						                    name: '酒店',
-						                    url: '/pageA/enter/hotel'
-						                }
-						            ]
-						        },
+				fileList:[],
+				showAuthorizePhone:false,
+				showAuthorizeUser:false,
+				userInfo: {
+					head: '',
+					nickname: '',
+					phone: '',
+				},
+				customStyleUnOk: {
+					marginTop: '20rpx',
+					color: '#5F7DE9',
+					border: '2px solid #5F7DE9',
+					"border-radius": "10px",
+					fontSize: "32rpx"
+				},
+				customStyleOk: {
+					marginTop: '20rpx',
+					color: '#fff',
+					border: '2px solid #5F7DE9',
+					"border-radius": "10px",
+					fontSize: "32rpx",
+					background: "#5F7DE9"
+				},
+				list: [
+					{
+				        title: '全部分类',
+				        // cur: 'basic',
+				        bgColor: '', // 背景颜色
+				        color: 'blue',
+				        title_show: true,
+				        showAll: false,
+				        colNumber: 4, // 显示的列数
+				        iconsList: [
+							{
+								cuIcon: '1_canyin-35',
+								color: 'blue',
+								name: '餐饮',
+								url: '/pageA/enter/cateringindustry'
+							},
+							{
+								cuIcon: 'zufang',
+								color: 'blue',
+								name: '民宿',
+								url: '/pageA/enter/homestay'
+							},
+							{
+				                cuIcon: 'jiudian-38',
+				                color: 'blue',
+				                name: '酒店',
+				                 url: '/pageA/enter/hotel'
+				            }
+				        ]
+				    },
+					{
+						title: '我的入驻',
+						// cur: 'basic',
+						bgColor: '', // 背景颜色
+						color: 'blue',
+						title_show: true,
+						showAll: false,
+						colNumber: 4, // 显示的列数
+						iconsList: [
+							{
+								cuIcon: '1_canyin-35',
+								color: 'blue',
+								name: '餐饮',
+								url: '/pageA/enter/cateringindustry'
+							},
+							{
+								cuIcon: 'zufang',
+								color: 'blue',
+								name: '民宿',
+								url: '/pageA/enter/homestay'
+							},
+							{
+						        cuIcon: 'jiudian-38',
+						        color: 'blue',
+						        name: '酒店',
+						         url: '/pageA/enter/hotel'
+						    }
+						]
+						},
 				    ], 
 			}
 		},
+		onLoad(){
+			that = this
+			this.getList()
+		},
+		onShow: function() {
+			let _isLoad = uni.getStorageSync("scanAddCardToIndex")
+			if (uni.getStorageSync("userInfo").phone) {
+				// that.$request.baseRequest('admin.unimall.cardNewsInfo', 'list', {
+				// 	receiveId: uni.getStorageSync("userInfo").id,
+				// }, failres => {
+				// 	console.log('res+++++', failres.errmsg)
+				// 	that.$refs.uToast.show({
+				// 		type: 'error',
+				// 		message: failres.errmsg,
+				// 	})
+				// }).then(res => {
+				// 	that.noticeList = res.data.items
+				// 	if (that.noticeList.length > 0) {
+				// 		var data = that.noticeList.filter((item) => {
+				// 			return item.newsFlag == 0
+				// 		})
+				// 		that.unread = data ? data.length : 0
+				// 	}
+				// 	console.log(that.unread)
+				// })
+			} else {
+				this.showAuthorizePhone = true
+			}
+		
+		},
 		methods: {
+			getList(){
+				 this.$request.baseRequest('admin.tourism.carouselManagement', 'list', {
+					page: 1,
+					limit: 9999,
+					classify:'商家版首页'
+				 }, failres => {
+					uni.showToast({
+						icon: "none",
+						title: failres.errmsg,
+						duration: 3000
+					});	
+				 }).then(res => {
+					this.fileList=res.data.items
+				 })
+			},
 			toDetail(url){
 				uni.navigateTo({
 					url:url
 				})
-			}
+			},
+			async getPhoneNumber(e) {
+				that.userInfo = await this.$request.wxlogin()
+				that.userInfo.phone = await this.$request.getPhone(e, that.userInfo)
+				this.showAuthorizePhone = false
+				this.showAuthorizeUser = true
+			
+			},
+			async authUser(type) {
+				//同步信息,没有头像和昵称自动生成
+				this.userInfo = await this.$request.syncInfo(this.userInfo)
+				if (this.userInfo.openId) {
+					uni.setStorageSync("userInfo", that.userInfo)
+					that.showAuthorizeUser = false
+					// that.mescroll.resetUpScroll()
+				}
+			},
 		}
 	}
 </script>
 
-<style>
+<style lang="scss" scoped>
+.slot-content {
+		width: 100%;
+	}
+
+
+
+	/deep/.u-checkbox-group {
 
+		position: absolute;
+		right: 20px;
+		z-index: 99;
+		top: 30px;
+	}
+
+	/deep/.u-checkbox__icon-wrap.u-checkbox__icon-wrap--square {
+		border-color: #D7DEEB !important;
+	}
+
+
+
+	/deep/.mescroll-body {
+		min-height: 558px !important;
+		height: 558px !important;
+		background-color: green;
+		overflow: scroll !important;
+	}
+
+	.auth-btncard {
+		display: flex !important;
+		justify-content: space-between !important;
+
+		.btn-unok {
+			width: 40%;
+		}
+
+		.btn-ok {
+			width: 40%;
+		}
+	}
+
+	.auth-card {
+		text-align: center;
+
+		.avatar-img {
+			width: 250rpx;
+		}
+
+		.title {
+			font-size: 20rpx;
+		}
+
+		.content {
+			font-size: 32rpx;
+			font-weight: bold;
+			color: #1A1A1A;
+			margin-bottom: 30rpx;
+		}
+	}
+
+	.avatar-wrapper {
+		color: #333 !important;
+		border: none !important;
+		border-radius: 0 !important;
+		background-color: transparent !important;
+		padding: 0;
+	}
+
+	.avatar-wrapper::after {
+		border: none !important;
+	}
+
+	.avatar {
+		width: 100rpx;
+		height: 100rpx;
+		overflow: hidden;
+		border-radius: 100%;
+	}
+
+	/deep/.u-popup__content {
+		border-radius: 20rpx !important;
+	}
 </style>

二进制
uni_merchants_enter/static/image/enter/camera.png


二进制
uni_merchants_enter/static/logo.png


+ 20 - 4
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_ntpjbi3tz9.woff2?t=1686127618358') format('woff2'),
-       url('//at.alicdn.com/t/c/font_4108869_ntpjbi3tz9.woff?t=1686127618358') format('woff'),
-       url('//at.alicdn.com/t/c/font_4108869_ntpjbi3tz9.ttf?t=1686127618358') format('truetype'),
-       url('//at.alicdn.com/t/c/font_4108869_ntpjbi3tz9.svg?t=1686127618358#iconfont_no') format('svg');
+  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');
 }
 
 .iconfont_no {
@@ -14,6 +14,22 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon_merchants_entertucenggouxuan:before {
+  content: "\e6a2";
+}
+
+.icon_merchants_enteryigouxuan:before {
+  content: "\e63d";
+}
+
+.icon_merchants_enterweigouxuan:before {
+  content: "\e63e";
+}
+
+.icon_merchants_entergouxuan:before {
+  content: "\e615";
+}
+
 .icon_merchants_enterjianshao:before {
   content: "\e8b1";
 }

+ 0 - 358
unimall-admin/src/views/certificateManagementInfo/index.vue

@@ -1,358 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">
-      <el-form-item label="个人id" prop="commonId">
-        <el-input
-          v-model="queryParams.commonId"
-          placeholder="请输入个人id"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <!-- <el-form-item label="证件名称" prop="certificateName">
-        <el-input
-          v-model="queryParams.certificateName"
-          placeholder="请输入证件名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="证件图" prop="certificateImage">
-        <el-input
-          v-model="queryParams.certificateImage"
-          placeholder="请输入证件图"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="gmtCreate">
-        <el-date-picker clearable size="small" style="width: 200px"
-          v-model="queryParams.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="queryParams.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="queryParams.deleteFlag"
-          placeholder="请输入删除标识"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <!-- <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-permission="['unimall:certificateManagementInfo:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-permission="['unimall:certificateManagementInfo:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-permission="['unimall:certificateManagementInfo:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-permission="['unimall:certificateManagementInfo:export']"
-        >导出</el-button>
-      </el-col>
-    </el-row> -->
-
-    <el-table v-loading="loading" :data="certificateManagementInfoList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <!-- <el-table-column label="" align="center" prop="id" /> -->
-      <el-table-column label="个人id" align="center" prop="commonId" />
-      <el-table-column label="证件名称" align="center" prop="certificateName" />
-      <el-table-column label="证件图" align="center" prop="gmtCreate" width="180">
-        <template slot-scope="scope">
-          <img :src="scope.row.certificateImage" width="40">
-        </template>
-      </el-table-column>
-      <!-- <el-table-column label="" align="center" prop="gmtCreate" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.gmtCreate) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="" align="center" prop="gmtUpdate" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.gmtUpdate) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="删除标识" align="center" prop="deleteFlag" /> -->
-      <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-permission="['unimall:certificateManagementInfo:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-permission="['unimall:certificateManagementInfo:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column> -->
-    </el-table>
-    
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.page"
-      :limit.sync="queryParams.limit"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改证件管理对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px">
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="个人id" prop="commonId">
-          <el-input v-model="form.commonId" placeholder="请输入个人id" />
-        </el-form-item>
-        <el-form-item label="证件名称" prop="certificateName">
-          <el-input v-model="form.certificateName" placeholder="请输入证件名称" />
-        </el-form-item>
-        <el-form-item label="证件图" prop="certificateImage">
-          <el-input v-model="form.certificateImage" placeholder="请输入证件图" />
-        </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>
-  </div>
-</template>
-
-<script>
-import { listCertificateManagementInfo, getCertificateManagementInfo, delCertificateManagementInfo, addCertificateManagementInfo, updateCertificateManagementInfo, exportCertificateManagementInfo } from "@/api/card/certificateManagementInfo";
-
-export default {
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 总条数
-      total: 0,
-      // 证件管理表格数据
-      certificateManagementInfoList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        page: 1,
-        limit: 10,
-        commonId: undefined,
-        certificateName: undefined,
-        certificateImage: undefined,
-        gmtCreate: undefined,
-        gmtUpdate: undefined,
-        deleteFlag: undefined
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        gmtCreate: [
-          { required: true, message: "不能为空", trigger: "blur" }
-        ],        gmtUpdate: [
-          { required: true, message: "不能为空", trigger: "blur" }
-        ],        deleteFlag: [
-          { required: true, message: "删除标识不能为空", trigger: "blur" }
-        ]      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询证件管理列表 */
-    getList() {
-      this.loading = true;
-      listCertificateManagementInfo(this.queryParams).then(response => {
-        this.certificateManagementInfoList = response.data.data.items
-        this.total = response.data.data.count
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: undefined,
-        commonId: undefined,
-        certificateName: undefined,
-        certificateImage: undefined,
-        gmtCreate: undefined,
-        gmtUpdate: undefined,
-        deleteFlag: undefined
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.page = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!=1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加证件管理";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids.join(',')
-      getCertificateManagementInfo(id).then(response => {
-        this.form = response.data.data
-        this.open = true;
-        this.title = "修改证件管理";
-      });
-    },
-    /** 提交按钮 */
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != undefined) {
-            updateCertificateManagementInfo(this.form).then(response => {
-              if (response.data) {
-                this.msgSuccess("修改成功");
-                this.open = false;
-                this.getList();
-              } else {
-                this.msgError(response.msg);
-              }
-            });
-          } else {
-            addCertificateManagementInfo(this.form).then(response => {
-              if (response.data) {
-                this.msgSuccess("新增成功");
-                this.open = false;
-                this.getList();
-              } else {
-                this.msgError(response.msg);
-              }
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids.join(',')
-      this.$confirm('是否确认删除证件管理编号为"' + ids + '"的数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delCertificateManagementInfo(ids);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        }).catch(function() {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有证件管理数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return exportCertificateManagementInfo(queryParams);
-        }).then(response => {
-          this.download(response.data.data);
-        }).catch(function() {});
-    }
-  }
-};
-</script>

+ 0 - 421
unimall-admin/src/views/circleManagementInfo/index.vue

@@ -1,421 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">
-      <!-- <el-form-item label="个人id" prop="commonId">
-        <el-input
-          v-model="queryParams.commonId"
-          placeholder="请输入个人id"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
-      <el-form-item label="圈子名称" prop="circleName">
-        <el-input v-model="queryParams.circleName" placeholder="请输入圈子名称" clearable size="small"
-          @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-input v-model="queryParams.status" placeholder="请输入0未审核 1已通过" clearable size="small"
-          @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <!-- <el-form-item label="" prop="gmtCreate">
-        <el-date-picker clearable size="small" style="width: 200px"
-          v-model="queryParams.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="queryParams.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="queryParams.deleteFlag"
-          placeholder="请输入删除标识"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd"
-          v-permission="['unimall:circleManagementInfo:add']">新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="success" icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
-          v-permission="['unimall:circleManagementInfo:edit']">修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="danger" icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
-          v-permission="['unimall:circleManagementInfo:remove']">删除</el-button>
-      </el-col>
-      <!-- <el-col :span="1.5">
-        <el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport"
-          v-permission="['unimall:circleManagementInfo:export']">导出</el-button>
-      </el-col> -->
-    </el-row>
-
-    <el-table v-loading="loading" :data="circleManagementInfoList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <!-- <el-table-column label="" align="center" prop="id" /> -->
-      <!-- <el-table-column label="个人id" align="center" prop="commonId" /> -->
-      <el-table-column label="圈子名称" align="center" prop="circleName" />
-      <el-table-column label="圈子标签" align="center" prop="circleLabel" />
-      <el-table-column label="头像" align="center" prop="circleHead">
-        <template slot-scope="scope">
-          <img :src="scope.row.circleHead" width="40">
-        </template>
-      </el-table-column>
-
-      <el-table-column label="状态" align="center" prop="status">
-        <template slot-scope="scope">
-          <span v-if="scope.row.status == 0">未审核</span>
-          <span v-if="scope.row.status == 1">已通过</span>
-          <span v-if="scope.row.status == 3">已驳回</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="gmtCreate" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.gmtCreate) }}</span>
-        </template>
-      </el-table-column>
-      <!-- <el-table-column label="" align="center" prop="gmtUpdate" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.gmtUpdate) }}</span>
-        </template>
-      </el-table-column> -->
-      <!-- <el-table-column label="删除标识" align="center" prop="deleteFlag" /> -->
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button size="mini" type="text" @click="handle(scope.row)"
-            v-permission="['unimall:circleManagementInfo:edit']" v-if="scope.row.status == '0'">通过</el-button>
-          <el-button size="mini" type="text" @click="handle(scope.row, 1)"
-            v-permission="['unimall:circleManagementInfo:edit']" v-if="scope.row.status == '0'">驳回</el-button>
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-            v-permission="['unimall:circleManagementInfo:edit']">修改</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-            v-permission="['unimall:circleManagementInfo:remove']">删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.page" :limit.sync="queryParams.limit"
-      @pagination="getList" />
-
-    <!-- 添加或修改圈子管理对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px">
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <!-- <el-form-item label="个人id" prop="commonId">
-          <el-input v-model="form.commonId" placeholder="请输入个人id" />
-        </el-form-item> -->
-        <el-form-item label="圈子名称" prop="circleName">
-          <el-input v-model="form.circleName" placeholder="请输入圈子名称" />
-        </el-form-item>
-        <el-form-item label="圈子标签" prop="circleLabel">
-          <el-input v-model="form.circleLabel" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="圈子头像" prop="picUrl">
-          <el-upload :action="uploadPath" :headers="headers" :limit="5" :file-list="imgsFileList"
-            :on-exceed="uploadOverrun" :on-success="handleimgsUrl" :on-remove="handleRemove" multiple
-            accept=".jpg, .jpeg, .png, .gif" list-type="picture-card">
-            <i class="el-icon-plus" />
-          </el-upload>
-        </el-form-item>
-        <!-- <el-form-item label="0未审核 1已通过">
-          <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="isShowhandle">
-      <div>
-        <el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="textarea">
-        </el-input>
-      </div>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="isShowhandle = false">取 消</el-button>
-        <el-button type="primary" @click="handleSubmit">确 定</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { circleManagementInfoHandle, listCircleManagementInfo, getCircleManagementInfo, delCircleManagementInfo, addCircleManagementInfo, updateCircleManagementInfo, exportCircleManagementInfo } from "@/api/card/circleManagementInfo";
-import { uploadPath } from '@/api/storage'
-import { getToken } from '@/utils/auth'
-export default {
-  data() {
-    return {
-      selectObj:{},
-      textarea: '',
-      isShowhandle: false,
-      imgsFileList: [],
-      uploadPath,
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 总条数
-      total: 0,
-      // 圈子管理表格数据
-      circleManagementInfoList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        page: 1,
-        limit: 10,
-        commonId: undefined,
-        circleName: undefined,
-        circleLabel: undefined,
-        status: undefined,
-        gmtCreate: undefined,
-        gmtUpdate: undefined,
-        deleteFlag: undefined
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        status: [
-          { 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" }
-        ]
-      }
-    };
-  },
-  computed: {
-    headers() {
-      return {
-        accessToken: getToken()
-      }
-    }
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    handleimgsUrl(response, file, fileList) {
-      if (response.errno === 200) {
-        this.form.circleHead = response.url
-      }
-    },
-    uploadOverrun: function () {
-      this.$message({
-        type: 'error',
-        message: '上传文件个数超出限制!最多上传5张图片!'
-      })
-    },
-    handleimgsUrl(response, file, fileList) {
-      if (response.errno === 200) {
-        this.form.circleHead = response.url
-      }
-    },
-    handleRemove: function (file, fileList) {
-      this.form.circleHead = ""
-    },
-    /** 查询圈子管理列表 */
-    getList() {
-      this.loading = true;
-      listCircleManagementInfo(this.queryParams).then(response => {
-        this.circleManagementInfoList = response.data.data.items
-        this.total = response.data.data.count
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: undefined,
-        commonId: undefined,
-        circleName: undefined,
-        circleLabel: undefined,
-        status: "0",
-        circleHead: '',
-        gmtCreate: undefined,
-        gmtUpdate: undefined,
-        deleteFlag: undefined
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.page = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length != 1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加圈子管理";
-    },
-    handleSubmit() {
-      this.selectObj.reason = this.textarea
-      this.selectObj.status = 3
-      circleManagementInfoHandle(this.selectObj).then(response => {
-        if (response.data) {
-          this.msgSuccess("驳回成功!");
-          this.isShowhandle = false 
-          this.getList();
-        } else {
-          this.msgError(response.msg);
-        }
-      });
-    },
-    // 审核
-    handle(row, type) {
-      this.selectObj = row
-      if (type == 1) {
-        this.isShowhandle = true
-      } else {
-        row.status =1
-        circleManagementInfoHandle(row).then(response => {
-          if (response.data) {
-            this.msgSuccess("新增成功");
-            this.getList();
-          } else {
-            this.msgError(response.msg);
-          }
-        });
-      }
-      console.log(row)
-      debugger
-
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      this.imgsFileList = []
-      const id = row.id || this.ids.join(',')
-      this.imgsFileList.push({
-        url: row.circleHead
-      })
-      getCircleManagementInfo(id).then(response => {
-        this.form = response.data.data
-        this.open = true;
-        this.title = "修改圈子管理";
-      });
-    },
-    /** 提交按钮 */
-    submitForm: function () {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != undefined) {
-            updateCircleManagementInfo(this.form).then(response => {
-              if (response.data) {
-                this.msgSuccess("修改成功");
-                this.open = false;
-                this.getList();
-              } else {
-                this.msgError(response.msg);
-              }
-            });
-          } else {
-            addCircleManagementInfo(this.form).then(response => {
-              if (response.data) {
-                this.msgSuccess("新增成功");
-                this.open = false;
-                this.getList();
-              } else {
-                this.msgError(response.msg);
-              }
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids.join(',')
-      this.$confirm('是否确认删除圈子管理编号为"' + ids + '"的数据项?', "警告", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      }).then(function () {
-        return delCircleManagementInfo(ids);
-      }).then(() => {
-        this.getList();
-        this.msgSuccess("删除成功");
-      }).catch(function () { });
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有圈子管理数据项?', "警告", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      }).then(function () {
-        return exportCircleManagementInfo(queryParams);
-      }).then(response => {
-        this.download(response.data.data);
-      }).catch(function () { });
-    }
-  }
-};
-</script>

+ 9 - 146
unimall-admin/src/views/foodInfo/index.vue

@@ -1,15 +1,6 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">
-      <el-form-item label="个人id" prop="commonId">
-        <el-input
-          v-model="queryParams.commonId"
-          placeholder="请输入个人id"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="主体(商铺/个人)" prop="mainBody">
         <el-input
           v-model="queryParams.mainBody"
@@ -28,51 +19,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="门面照片" prop="coverImage">
-        <el-input
-          v-model="queryParams.coverImage"
-          placeholder="请输入门面照片"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="省" prop="province">
-        <el-input
-          v-model="queryParams.province"
-          placeholder="请输入省"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="市" prop="city">
-        <el-input
-          v-model="queryParams.city"
-          placeholder="请输入市"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="区" prop="area">
-        <el-input
-          v-model="queryParams.area"
-          placeholder="请输入区"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="定位" prop="location">
-        <el-input
-          v-model="queryParams.location"
-          placeholder="请输入定位"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="详细地址" prop="detailedAddress">
         <el-input
           v-model="queryParams.detailedAddress"
@@ -127,87 +73,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="营业执照" prop="businessLicense">
-        <el-input
-          v-model="queryParams.businessLicense"
-          placeholder="请输入营业执照"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="经营许可证" prop="operateCertificate">
-        <el-input
-          v-model="queryParams.operateCertificate"
-          placeholder="请输入经营许可证"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="经营许可证有效期" prop="operateCertificateDate">
-        <el-date-picker clearable size="small" style="width: 200px"
-          v-model="queryParams.operateCertificateDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择经营许可证有效期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="营业开始时间" prop="startDate">
-        <el-date-picker clearable size="small" style="width: 200px"
-          v-model="queryParams.startDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择营业开始时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="营业结束时间" prop="endDate">
-        <el-date-picker clearable size="small" style="width: 200px"
-          v-model="queryParams.endDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择营业结束时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="允许用户查看菜品价格(0允许1禁止)" prop="lookFlag">
-        <el-input
-          v-model="queryParams.lookFlag"
-          placeholder="请输入允许用户查看菜品价格(0允许1禁止)"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-        <el-form-item label="状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择状态" clearable size="small">
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="" prop="gmtCreate">
-        <el-date-picker clearable size="small" style="width: 200px"
-          v-model="queryParams.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="queryParams.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="queryParams.deleteFlag"
-          placeholder="请输入删除标识"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -215,7 +80,7 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="primary"
           icon="el-icon-plus"
@@ -223,7 +88,7 @@
           @click="handleAdd"
           v-permission="['tourism:foodInfo:add']"
         >新增</el-button>
-      </el-col>
+      </el-col> -->
       <el-col :span="1.5">
         <el-button
           type="success"
@@ -266,7 +131,6 @@
       <el-table-column label="省" align="center" prop="province" />
       <el-table-column label="市" align="center" prop="city" />
       <el-table-column label="区" align="center" prop="area" />
-      <el-table-column label="定位" align="center" prop="location" />
       <el-table-column label="详细地址" align="center" prop="detailedAddress" />
       <el-table-column label="经营者" align="center" prop="operater" />
       <el-table-column label="经营者手机号" align="center" prop="operaterPhone" />
@@ -282,12 +146,12 @@
       </el-table-column>
       <el-table-column label="营业开始时间" align="center" prop="startDate" width="180">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.startDate) }}</span>
+          <span>{{ scope.row.startDate }}</span>
         </template>
       </el-table-column>
       <el-table-column label="营业结束时间" align="center" prop="endDate" width="180">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.endDate) }}</span>
+          <span>{{ scope.row.endDate }}</span>
         </template>
       </el-table-column>
       <el-table-column label="允许用户查看菜品价格(0允许1禁止)" align="center" prop="lookFlag" />
@@ -297,12 +161,6 @@
           <span>{{ parseTime(scope.row.gmtCreate) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="" align="center" prop="gmtUpdate" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.gmtUpdate) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="删除标识" align="center" prop="deleteFlag" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -312,6 +170,11 @@
             @click="handleUpdate(scope.row)"
             v-permission="['tourism:foodInfo:edit']"
           >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleAudit(scope.row)"
+          >审核</el-button>
           <el-button
             size="mini"
             type="text"