feat: 订单bug

components/uNavBar/index.vue

@@ -1,14 +1,16 @@
 <template>
 	<view style="background-color: #fff;">
-	<u-navbar :title="title" :bgColor="bgColor" :titleStyle="titleStyle">
-		<view class="u-nav-slot" slot="left" style="display: flex;">
-			<u-icon v-if="showIcon" name="arrow-left" size="44" :color="leftIconColor" @tap="toBack(backUrl)"></u-icon>
-			<u-line v-if="showHome&&showIcon" direction="column" :hairline="false" length="0" margin="0 15rpx"></u-line>
-			<u-icon v-if="showHome&&showIcon" name="home" size="48" :color="leftIconColor" @tap="toHome"></u-icon>
-		</view>
-	</u-navbar>
-	<!-- 底部渐变色 -->
-	<view class="bottomBg" :style="{'height':mt+'px'}" v-if="bgColor=='transparent'"></view>
+		<u-navbar :title="title" :bgColor="bgColor" :titleStyle="titleStyle">
+			<view class="u-nav-slot" slot="left" style="display: flex;">
+				<u-icon v-if="showIcon" name="arrow-left" size="44" :color="leftIconColor"
+					@tap="toBack(backUrl)"></u-icon>
+				<u-line v-if="showHome&&showIcon" direction="column" :hairline="false" length="0"
+					margin="0 15rpx"></u-line>
+				<u-icon v-if="showHome&&showIcon" name="home" size="48" :color="leftIconColor" @tap="toHome"></u-icon>
+			</view>
+		</u-navbar>
+		<!-- 底部渐变色 -->
+		<view class="bottomBg" :style="{'height':mt+'px'}" v-if="bgColor=='transparent'"></view>
 	</view>
 </template>
 
@@ -70,17 +72,17 @@
 					}
 					let canNavBack = getCurrentPages();
 					if (canNavBack && canNavBack.length > 1) uni.navigateBack();
-					else{
-						if(uni.getStorageSync('homestayId')==''){
+					else {
+						if (uni.getStorageSync('merchantId') != '') {
 							uni.reLaunch({
 								url: '/pagesHouse/home/index'
 							})
-						}else{
+						} else if (uni.getStorageSync('homestayId') != '') {
 							uni.reLaunch({
 								url: '/pages/home/index'
 							})
 						}
-						
+
 					}
 				} else {
 					if (this.tabUrls.find(u => u == url)) uni.reLaunch({
@@ -90,14 +92,14 @@
 						url
 					});
 				}
-				this.$emit('goBack',url)
+				this.$emit('goBack', url)
 			},
 			toHome() {
-				if(uni.getStorageSync('homestayId')==''){
+				if (uni.getStorageSync('merchantId') != '') {
 					uni.reLaunch({
 						url: '/pagesHouse/home/index'
 					})
-				}else{
+				} else if (uni.getStorageSync('homestayId') != '') {
 					uni.reLaunch({
 						url: '/pages/home/index'
 					})
@@ -115,11 +117,12 @@
 	.u-navbar--fixed {
 		z-index: 99999 !important;
 	}
-	.bottomBg{
-		background: linear-gradient(to bottom,#E7F1FF,#fff);
+
+	.bottomBg {
+		background: linear-gradient(to bottom, #E7F1FF, #fff);
 		position: fixed;
 		width: 100%;
 		z-index: 10;
-		top:0;
+		top: 0;
 	}
 </style>

pages.json

@@ -140,6 +140,14 @@
 				"enablePullDownRefresh": false,
 				"navigationStyle": "custom"
 			}
+		},
+		{
+			"path": "pages/HotelMerchandise/record",
+			"style": {
+				"navigationBarTitleText": "核销记录",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
 		}
 
 	],
@@ -317,6 +325,13 @@
 						"enablePullDownRefresh": false
 					}
 				},
+				{
+					"path": "Mine/Businesses/Catering",
+					"style": {
+						"navigationBarTitleText": "商户信息",
+						"enablePullDownRefresh": false
+					}
+				},
 				{
 					"path": "HotelMerchandise/index",
 					"style": {

pages/HotelMerchandise/addCommodity.vue

@@ -21,8 +21,17 @@
 				</view> -->
 				<view class="cellBox">
 					<text style="font-size: 32rpx; font-weight: 700;">类型</text>
-					<input v-model="fromData.comboType" type="text" placeholder="请输入类型"
-						style="width: 210rpx;height: 42rpx; font-size: 30rpx;flex:1" />
+					<!-- 	<u-radio-group v-model="radiovalue1" placement="column" @change="groupChange">
+						<u-radio :customStyle="{marginBottom: '10px'}" v-for="(item, index) in radiolist1" :key="index"
+							:label="item.name" :name="item.name" @change="radioChange">
+						</u-radio>
+					</u-radio-group> -->
+					<u-radio-group @change="selectType" size="32" iconSize="24" v-model="fromData.comboType"
+						placement="row" activeColor='#1372FF'>
+						<u-radio labelSize='30' label="包桌" :name='1'></u-radio>
+						<u-radio labelSize='30' label="按人头" :name='2' v-if="tabIndex==0"></u-radio>
+					</u-radio-group>
+
 				</view>
 				<view class="uploadPic">
 					<view style=" margin-left: 16rpx; margin-bottom: 22rpx;">
@@ -75,6 +84,7 @@
 			</view>
 		</view>
 
+
 	</view>
 
 	</view>
@@ -102,12 +112,27 @@
 					status: '0', //是否上下架: 1是0否
 					comboExplain: '', //说明
 					homestayId: uni.getStorageSync('homestayId'),
-				}
+				},
+				radiolist1: [{
+						name: '包桌',
+						disabled: false
+					},
+					{
+						name: '按人头',
+						disabled: false
+					},
+				],
+				tabIndex: 0,
 			}
 
 		},
 		onLoad() {},
 		methods: {
+			selectType(type) {
+				console.log(type);
+				this.typeIndex = type;
+				this.fromData.comboType = type
+			},
 			// 保存  上架
 			Shelves(status) {
 
@@ -232,6 +257,10 @@
 </script>
 
 <style lang="scss">
+	.u-radio__icon-wrap--circle {
+		margin-top: 10rpx !important;
+	}
+
 	.uicon-camera-fill {
 		font-size: 50rpx !important;
 	}

pages/HotelMerchandise/index.vue

@@ -1,11 +1,12 @@
 <template>
-	<view class="pages" :style="{'min-height':h+'px','padding-top':(mt)+'px'}">
+	<view class="pages" :style="{'min-height':(h+mt)+'px','padding-top':(mt)+'px'}">
+		<!-- <view class="pages" :style="{'min-height':h+'px'}"> -->
 		<c-nav-bar title="商品管理"></c-nav-bar>
 		<view class="tb">
 			<view class="tabs">
-				<view v-for="(item,index) in tabList" :key="index" @tap="changeTab1(item,index)">
-					<!-- <text :class="index==current?'active':''">{{item.name}}({{mytotal}})</text> -->
+				<view v-for="(item,index) in tabList" :key="index" @tap="changeTab1(index)">
 					<text :class="index==current?'active':''">{{item.name}}</text>
+					<text v-if="index==current">({{roomType.length}})</text>
 				</view>
 			</view>
 		</view>
@@ -28,6 +29,7 @@
 						批量操作
 					</view>
 				</view>
+
 			</view>
 
 
@@ -55,52 +57,57 @@
 			</view>
 		</view>
 
-		<!-- 房型选择 -->
-		<view class="type" v-for="(item,index) in roomType" :key="index">
-			<view class="left" v-if="Selected==true">
-				<view class="image">
-					<image @tap="selectPerson(item,index)"
-						:src="selectedTags.includes(item)?'https://i.ringzle.com/file/20240228/c741a340e19642c59473e6f4a6d2f4be.png':'https://i.ringzle.com/file/20231027/db588133d67548fc82dfb0d128eac9a8.png'">
-					</image>
-				</view>
-			</view>
-			<view style="width: 100%;">
-				<view class="right">
-					<view class="right-left">
-						<image :src="item.coverImg" mode=""></image>
+		<view class="" style="padding-bottom: 160rpx;">
+			<!-- 房型选择 -->
+			<view class="type" v-for="item,index in roomType" :key="index" style="">
+				<view class="left" v-if="Selected==true">
+					<view class="image">
+						<!-- 	<image @tap="selectPerson(item,index)"
+							:src="isSelect?'https://i.ringzle.com/file/20240228/c741a340e19642c59473e6f4a6d2f4be.png':'https://i.ringzle.com/file/20231027/db588133d67548fc82dfb0d128eac9a8.png'">
+						</image> -->
+						<image @tap="selectPerson(item,index)"
+							:src="selectedTags.includes(item)?'https://i.ringzle.com/file/20240228/c741a340e19642c59473e6f4a6d2f4be.png':'https://i.ringzle.com/file/20231027/db588133d67548fc82dfb0d128eac9a8.png'">
+						</image>
 					</view>
-					<view class="right-right">
-						<view class="top">
-							<text style="font-size: 30rpx; color: #333;">{{item.name||item.goodsName}}</text>
+				</view>
+				<!-- <view @click="goEditTypeInfo(item.houseBaseId)" style="width: 100%;"> -->
+				<view style="width: 100%;">
+					<view class="right">
+						<view class="right-left">
+							<image :src="item.cover" mode=""></image>
 						</view>
-						<view class="under">
-							<view style="font-size: 24rpx; color: #777;">销量：{{item.salesVolume||item.soldNum}}</view>
-							<view style="font-size: 36rpx; color: #FF4141; font-weight: Bold; margin-top: 16rpx;">
-								￥{{item.discountPrice||item.normalPrice}}</view>
+						<view class="right-right">
+							<view class="top">
+								<text style="font-size: 30rpx; color: #333;">{{item.comboName}}</text>
+							</view>
+							<view class="under">
+								<view style="font-size: 24rpx; color: #777;">销量：{{item.saleNums}}</view>
+								<view style="font-size: 36rpx; color: #FF4141; font-weight: Bold; margin-top: 16rpx;">
+									￥{{item.price}}</view>
+							</view>
 						</view>
 					</view>
-				</view>
-				<view class="type-btn">
-					<view class="type-btn-left">
+					<view class="type-btn">
+						<view class="type-btn-left">
 
-					</view>
-					<view class="type-btn-right">
-						<view class="" @click="shanchu(item,index)">
-							删除
 						</view>
-						<view class="" @click="gaijia(item,index)">
-							改价格
-						</view>
-						<view v-if="canyinmeishi" class="" @click="xiajia(item,index)">
-							{{fromData.status==0?'下架':'上架'}}
-						</view>
-
-						<view v-if="!canyinmeishi" class="" @click="xiajia1(item,index)">
-							{{fromData.status==0?'上架':'下架'}}
+						<view class="type-btn-right">
+							<view class="" @click="del(item)">
+								删除
+							</view>
+							<view @click="gaijia(item,index)">
+								改价格
+							</view>
+							<view class="" @click="Undered(item)" v-if="item.status==1">
+								下架
+							</view>
+							<view class="" @click="Undered(item)" v-else>
+								上架
+							</view>
 						</view>
 					</view>
-				</view>
 
+				</view>
 			</view>
 		</view>
 
@@ -109,6 +116,9 @@
 			<view class="bottom-btn">
 				<view class="left">
 					<view class="image">
+						<!-- 	<image
+							:src="isSelect?'https://i.ringzle.com/file/20240228/c741a340e19642c59473e6f4a6d2f4be.png':'https://i.ringzle.com/file/20231027/db588133d67548fc82dfb0d128eac9a8.png'">
+						</image> -->
 						<image
 							:src="selectedTags.length>0?'https://i.ringzle.com/file/20240228/c741a340e19642c59473e6f4a6d2f4be.png':'https://i.ringzle.com/file/20231027/db588133d67548fc82dfb0d128eac9a8.png'">
 						</image>
@@ -118,22 +128,83 @@
 					</view>
 				</view>
 				<view class="right">
-					<view v-if="canyinmeishi" class="right-btn" @click="piliangxiajia">
-						{{fromData.status==0?'批量下架':'批量上架'}}
+					<view class="right-btn" @click="piliangxiajia()">
+						<!-- 批量下架 -->
+						{{fromData.status==1?'批量下架':'批量上架'}}
 					</view>
-					<view v-if="!canyinmeishi" class="right-btn" @click="piliangxiajia">
-						{{fromData.status==0?'批量上架':'批量下架'}}
-					</view>
-					<view class="right-btn" @click="piliangshanchu">
+					<view class="right-btn" @click="Pricinged()">
 						批量删除
 					</view>
 				</view>
 			</view>
 		</view>
 
+		<!-- 新增按钮 -->
+		<view class="btn-btn" @click="addType()" v-else>
+			<view class="btn">
+				添加商品
+			</view>
+		</view>
 
-		<!-- 改价弹出框 -->
-		<u-popup :show="showPricing" @close="closegaijia" @open="opengaijia" :round="10">
+		<u-popup :show="showPricing" @close="close" :round="30">
+			<view class="pop-pop">
+				<view class="hander-one">
+					<view class="image">
+						<image src="https://i.ringzle.com/file/20240317/fdb4de4c4413429bb5a98b3f6c2bd856.png" mode="">
+						</image>
+					</view>
+					<view class="text">
+						<view class="text1">
+							删除选中的商品
+						</view>
+						<view class="text2">
+							删除后的商品不可在前台继续售卖，是否继续
+						</view>
+					</view>
+				</view>
+				<view class="hander-two">
+					<view class="pop-btn-del" @click="showPricing=false">
+						取消
+					</view>
+					<view class="pop-btn-add" @click="GoOndel()">
+						继续提交
+					</view>
+				</view>
+			</view>
+		</u-popup>
+		<u-popup :show="showPricingUnder" @close="close" :round="30">
+			<view class="pop-pop">
+				<view class="hander-one">
+					<view class="image">
+						<image src="https://i.ringzle.com/file/20240317/fdb4de4c4413429bb5a98b3f6c2bd856.png" mode="">
+						</image>
+					</view>
+					<view class="text">
+						<view class="text1" v-if="Shelves==false">
+							下架选中的商品
+						</view>
+						<view class="text1" v-else>
+							上架选中的商品
+						</view>
+						<view class="text2" v-if="Shelves==false">
+							下架后商品不可在前台继续售卖，是否继续？
+						</view>
+						<view class="text2" v-else>
+							确定上架售卖吗？是否继续？
+						</view>
+					</view>
+				</view>
+				<view class="hander-two">
+					<view class="pop-btn-del" @click="showPricingUnder=false">
+						取消
+					</view>
+					<view class="pop-btn-add" @click="GoOnUnder()">
+						继续提交
+					</view>
+				</view>
+			</view>
+		</u-popup>
+		<u-popup :show="showPricinggaijia" @close="close" :round="10">
 			<view class="gaijiadiv">
 				<view class="toubu">
 					改价格
@@ -146,7 +217,7 @@
 						clearable></u--input>
 				</view>
 				<view class="queding">
-					<view class="queding1" @click="closegaijia">
+					<view class="queding1" @click="showPricinggaijia=false">
 						取消
 					</view>
 					<view class="queding2" @click="quedingjiae">
@@ -156,31 +227,11 @@
 
 			</view>
 		</u-popup>
-		<!-- 下架弹出框 -->
-		<u-modal :show="xiajiashow" :title="fromData.status==0?'下架选中的商品':'上架选中的商品'"
-			:content="fromData.status==0?'下架后商品不可在前台继续售卖，是否继续?':'上架后商品可在前台售卖，是否继续?'" showConfirmButton='true'
-			showCancelButton='true' @confirm='quedingxiajia' @cancel='quxiaoxiajia'></u-modal>
-
-		<!-- 下架弹出框渔家乐 -->
-		<u-modal :show="xiajiashow1" :title="fromData.status==1?'下架选中的商品':'上架选中的商品'"
-			:content="fromData.status==1?'下架后商品不可在前台继续售卖，是否继续?':'上架后商品可在前台售卖，是否继续?'" showConfirmButton='true'
-			showCancelButton='true' @confirm='quedingxiajia' @cancel='quxiaoxiajia'></u-modal>
-
-
-		<!-- 删除弹出框 -->
-		<u-modal :show="shanchushow" title="删除选中的商品" content='删除后的商品不可在前台继续售卖，是否继续?' showConfirmButton='true'
-			showCancelButton='true' @confirm='quedingshanchu' @cancel='quxiaoshanchu'></u-modal>
-
-
-
-
 		<view class="mainContain">
 			<!-- <view class="nodata" v-if='dataList.length==0'>
 				<NoData></NoData>
 			</view> -->
 		</view>
-
-		<u-toast ref="uToast"></u-toast>
 	</view>
 </template>
 
@@ -196,449 +247,195 @@
 			return {
 				h: uni.getSystemInfoSync().windowHeight,
 				mt: uni.getSystemInfoSync().statusBarHeight + 44,
-				newprice: '',
-				lsdata: {},
 				current: 0,
-				canyinmeishi: false,
-				xiajiashow: false,
-				xiajiashow1: false,
-				shanchushow: false,
-				tabList: [],
+				tabList: [{
+						name: '出售中'
+					},
+					{
+						name: '待上架'
+					},
+				],
 				homestayId: uni.getStorageSync('homestayId') || 0,
 				roomType: [],
 				selectedTags: [],
-				mytotal: 0,
 				isSelect: false,
 				Selected: false,
 				showPricing: false,
+				showPricingUnder: false,
+				Shelves: false,
 				areaShow: false,
 				list1: [{
-						name: '创建时间',
-						id: 1,
+						name: '创建时间'
 					},
 					{
-						name: '价格从高到低',
-						id: 2,
+						name: '上架时间'
 					},
 					{
-						name: '价格从低到高',
-						id: 4,
+						name: '价格从高到低'
 					},
 					{
-						name: '销量从高到低',
-						id: 2,
+						name: '价格从低到高'
 					},
+					// {
+					// 	name: '销量从高到低'
+					// },
 				],
 				areaShowIndex: null,
 				fromData: {
-					merchantId: uni.getStorageSync('merchantId'), //商户id
-					limit: 99999,
+					homestayId: uni.getStorageSync('homestayId'),
+					limit: 10,
 					page: 1,
-					sortType: '', //选择条件：1创建时间 2销量从高到低 3价格从高到低 4价格从低到高
-					status: 0, //状态：0上架1下架
-				}
+					order: '',
+					orderField: "",
+					status: 1
+				},
+				ids: [],
+				obj: {},
+				showPricinggaijia: false,
+				newprice: '',
+				id: '',
+				from: {}
 			}
 		},
 		onLoad(option) {
-
-
-			console.log('111111111111111111', uni.getStorageSync('merchantType'))
-			//this.getHousekeeping();
-			if (uni.getStorageSync('merchantType') == 4) {
-				this.canyinmeishi = true;
-				this.tabList = [{
-						name: '出售中',
-						id: 0
-					},
-					{
-						name: '待上架',
-						id: 1
-					},
-				]
-				this.getRepast(); //获取商品列表（餐饮美食）
-
-			} else {
-				this.canyinmeishi = false;
-				this.tabList = [{
-						name: '出售中',
-						id: 1
-					},
-					{
-						name: '待上架',
-						id: 0
-					},
-				]
-				this.fromData = {
-					merchantId: uni.getStorageSync('merchantId'), //商户id
-					limit: 99999,
-					page: 1,
-					sortType: '', //选择条件：1创建时间 2销量从高到低 3价格从高到低 4价格从低到高
-					status: 1, //状态：0上架1下架
-				}
-
-				this.yujialedata(); //获取商品列表（渔家乐）
-			}
-
+			// if (uni.getStorageSync('merchantType') == 4) {
+			this.getRepast()
+			// } else {
+			// }
 		},
 		methods: {
-			getHousekeeping() {
-				this.$api.get('/sys/dict/type/all').then(res => {
-					let alldata = res.data.data.find((p) => p.dictType == 'food_type').dataList;
-					console.log('alldata', alldata)
+
+			Pricinged() {
+				this.$api.del('/merchant/hotel/repast', this.ids).then(res => {
+					if (res.data.code == 0) {
+						this.getRepast()
+						this.showPricing = false
+						this.ids = []
+					} else this.$showToast(res.data.msg);
 				})
 			},
 
 			piliangxiajia() {
-				if (uni.getStorageSync('merchantType') == 4) {
-					if (this.selectedTags.length == 0) {
-						this.$refs.uToast.show({
-							type: 'success',
-							title: '',
-							message: "请选择数据",
-							iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/default.png'
-						})
-
-					} else {
-						let namesArray = this.selectedTags.map(obj => obj.id);
-						let postdata = {
-							discountPrice: 0,
-							id: namesArray,
-							status: this.fromData.status == 1 ? 0 : 1,
-						};
-						this.$api.post('/scenic/goods/batchUpDownFrame', postdata).then(res => {
-							this.$refs.uToast.show({
-								type: 'success',
-								title: '',
-								message: "成功",
-								iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/default.png'
-							})
-							this.selectedTags = [];
-							this.Selected = false;
-							this.getRepast(); //获取商品列表
-						})
-					}
-
-				} else {
-					if (this.selectedTags.length == 0) {
-						this.$refs.uToast.show({
-							type: 'success',
-							title: '',
-							message: "请选择数据",
-							iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/default.png'
-						})
-
-					} else {
-
-
-						let postdata = this.selectedTags.map((item, index, arr) => {
-							let json = {};
-							json.id = item.id;
-							json.merchantId = uni.getStorageSync('merchantId');
-							json.status = item.status == 0 ? 1 : 0;
-							return json
-						})
-						// let namesArray = this.selectedTags.map(obj => obj.id);
-						// let postdata = {
-						// 	id: namesArray,
-						// 	status: this.fromData.status,
-						// };
-						this.$api.post('/scenic/goods/batchUpDownFrame', postdata).then(res => {
-							this.$refs.uToast.show({
-								type: 'success',
-								title: '',
-								message: "成功",
-								iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/default.png'
-							})
-							this.selectedTags = [];
-							this.Selected = false;
-							this.yujialedata(); //获取商品列表（渔家乐）
-						})
-					}
-				}
+				this.$api.post('/merchant/hotel/repast/batchPutAway', this.from).then(res => {
+					this.selectedTags = [];
+					this.Selected = false;
+					this.getRepast(); //获取商品列表
+				})
 			},
 
-			piliangshanchu() {
-				if (uni.getStorageSync('merchantType') == 4) {
-
-					if (this.selectedTags.length == 0) {
-						this.$refs.uToast.show({
-							type: 'success',
-							title: '',
-							message: "请选择数据",
-							iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/default.png'
-						})
-
-					} else {
-						let namesArray = this.selectedTags.map(obj => obj.id);
-
-						//status: this.fromData.status,
-						this.$api.del('/api/merchant/food/delProduct', namesArray).then(res => {
-							this.$refs.uToast.show({
-								type: 'success',
-								title: '',
-								message: "成功",
-								iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/default.png'
-							})
-							this.selectedTags = [];
-							this.Selected = false;
-							this.getRepast(); //获取商品列表
-						})
-					}
-
-				} else {
-					if (this.selectedTags.length == 0) {
-						this.$refs.uToast.show({
-							type: 'success',
-							title: '',
-							message: "请选择数据",
-							iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/default.png'
-						})
-
-					} else {
-						let namesArray = this.selectedTags.map(obj => obj.id);
-
-						//status: this.fromData.status,
-						this.$api.del('/scenic/goods', namesArray).then(res => {
-							this.$refs.uToast.show({
-								type: 'success',
-								title: '',
-								message: "成功",
-								iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/default.png'
-							})
-							this.selectedTags = [];
-							this.Selected = false;
-							this.yujialedata(); //获取商品列表（渔家乐）
-						})
-					}
+			quedingjiae() {
+				let obj = {
+					price: this.newprice,
+					id: this.id
 				}
-			},
-			shanchu(e, i) {
-				//console.log('111111111111111111', e, i)
-				this.lsdata = e;
-				this.shanchushow = true;
-			},
-			quedingshanchu() {
-				if (uni.getStorageSync('merchantType') == 4) {
-					//（餐饮美食）
-					let postdata = [this.lsdata.id];
-					//status: this.fromData.status,
-					console.log('postdata', postdata)
-					this.$api.del('/api/merchant/food/delProduct', postdata).then(res => {
-						this.$refs.uToast.show({
-							type: 'success',
-							title: '',
-							message: "成功",
-							iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/default.png'
-						})
-						this.quxiaoshanchu();
-						this.getRepast(); //获取商品列表
-					})
+				this.$api.put('/merchant/hotel/repast', obj).then(res => {
 
-				} else {
-					//（渔家乐）
-					let postdata = [this.lsdata.id];
-					//status: this.fromData.status,
-					console.log('postdata', postdata)
-					this.$api.del('/scenic/goods', postdata).then(res => {
-						this.$refs.uToast.show({
-							type: 'success',
-							title: '',
-							message: "成功",
-							iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/default.png'
-						})
-						this.quxiaoshanchu();
-						this.yujialedata(); //获取商品列表（渔家乐）
-					})
+					this.getRepast(); //获取商品列表
+					this.showPricinggaijia = false;
+				})
 
-				}
-			},
-			quxiaoshanchu() {
-				// console.log('quxiaoxiajia',this.lsdata)
-				this.lsdata = {};
-				this.shanchushow = false;
 			},
 
-
-			gaijia(e, i) {
-				console.log('111111111111111111', e, i)
-				this.showPricing = true;
-				this.lsdata = e;
-			},
 			closegaijia() {
 				this.showPricing = false;
 				this.newprice = '';
-				this.lsdata = {};
 			},
-			quedingjiae() {
-				if (uni.getStorageSync('merchantType') == 4) {
-					//获取商品列表（餐饮美食）
-					//console.log('111111111111111111', this.newprice)
-					let postdata = {
-						discountPrice: this.newprice,
-						ids: [this.lsdata.id],
-						status: this.fromData.status,
-					};
-					//console.log('postdata', postdata)
-					this.$api.post('/api/merchant/food/updateDiscountPrice', postdata).then(res => {
-						this.$refs.uToast.show({
-							type: 'success',
-							title: '',
-							message: "成功",
-							iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/default.png'
-						})
-						this.closegaijia();
-						this.getRepast(); //获取商品列表
-					})
-
+			gaijia(e, i) {
+				this.showPricinggaijia = true;
+				this.id = e.id
+			},
+			selectPerson(e, i) {
+				if (this.selectedTags.includes(e)) {
+					this.selectedTags = this.selectedTags.filter(t => t !== e);
+					this.ids.splice(i, 1)
 				} else {
-					//获取商品列表（渔家乐）
-					if (this.lsdata.goodsType == 1) {
-						let postdata = {
-							discountPrice: this.newprice,
-							id: this.lsdata.id,
-							status: this.fromData.status,
-						};
-						console.log('postdata', postdata)
-						this.$api.put('/scenic/goods', postdata).then(res => {
-							this.$refs.uToast.show({
-								type: 'success',
-								title: '',
-								message: "成功",
-								iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/default.png'
-							})
-							this.closegaijia();
-							this.yujialedata(); //获取商品列表（渔家乐）
-						})
-					} else {
-						let postdata = {
-							normalPrice: this.newprice,
-							id: this.lsdata.id,
-							status: this.fromData.status,
-						};
-						console.log('postdata', postdata)
-						this.$api.put('/scenic/goods', postdata).then(res => {
-							this.$refs.uToast.show({
-								type: 'success',
-								title: '',
-								message: "成功",
-								iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/default.png'
-							})
-							this.closegaijia();
-							this.yujialedata(); //获取商品列表（渔家乐）
-						})
+					this.selectedTags.push(e);
+					this.ids.push(e.id)
+					this.from = {
+						ids: this.ids,
+						status: e.status == 1 ? 0 : 1
 					}
-
 				}
 			},
-			opengaijia() {},
-
-
-			xiajia1(e, i) {
-				console.log('111111111111111111', e, i)
-				this.lsdata = e;
-				this.xiajiashow1 = true;
+			// 添加商品
+			addType() {
+				uni.navigateTo({
+					url: '/pages/HotelMerchandise/addCommodity'
+				})
 			},
-			xiajia(e, i) {
-				console.log('111111111111111111', e, i)
-				this.lsdata = e;
-				this.xiajiashow = true;
+			close() {
+				this.showPricing = false
+				this.showPricingUnder = false
+				this.showPricinggaijia = false
 			},
-			quedingxiajia() {
-				if (uni.getStorageSync('merchantType') == 4) {
-					//获取商品列表（餐饮美食）
-					let postdata = {
-						discountPrice: this.lsdata.discountPrice,
-						ids: [this.lsdata.id],
-						status: this.fromData.status,
-					};
-					this.$api.post('/api/merchant/food/updateStatus', postdata).then(res => {
-						this.$refs.uToast.show({
-							type: 'success',
-							title: '',
-							message: "下架成功",
-							iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/default.png'
-						})
-						this.quxiaoxiajia();
-						this.getRepast(); //获取商品列表
-					})
-				} else {
-					//获取商品列表（渔家乐）
-					let postdata = {
-						id: this.lsdata.id,
-						status: this.fromData.status == 1 ? 0 : 1,
-					};
-					this.$api.put('/scenic/goods', postdata).then(res => {
-						this.$refs.uToast.show({
-							type: 'success',
-							title: '',
-							message: "下架成功",
-							iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/default.png'
-						})
-						this.quxiaoxiajia();
-						this.yujialedata();
-					})
-				}
+			// 删除商品
+			del(item) {
+				// let ids = []
+				this.ids.push(item.id)
+				this.showPricing = true
 			},
-			quxiaoxiajia() {
-				// console.log('quxiaoxiajia',this.lsdata)
-				this.lsdata = {};
-				this.xiajiashow = false;
-				this.xiajiashow1 = false;
+			GoOndel() {
+				this.$api.del('/merchant/hotel/repast', this.ids).then(res => {
+					if (res.data.code == 0) {
+						this.getRepast()
+						this.showPricing = false
+						this.ids = []
+					} else this.$showToast(res.data.msg);
+				})
 			},
-
-			selectPerson(e, i) {
-				if (this.selectedTags.includes(e)) {
-					this.selectedTags = this.selectedTags.filter(t => t !== e);
+			// 上下架商品
+			Undered(item) {
+				this.ids.push(item.id)
+				this.showPricingUnder = true
+				if (item.status == 1) {
+					this.obj = {
+						ids: this.ids,
+						status: 0
+					}
 				} else {
-					this.selectedTags.push(e);
+					this.Shelves = true
+					this.obj = {
+						ids: this.ids,
+						status: 1
+					}
 				}
-				console.log(' this.selectedTags', this.selectedTags)
 
 			},
-			yujialedata() {
-				this.$api.get('/scenic/goods/page', this.fromData).then(res => {
-					console.log(res.data.data.list);
-					this.roomType = res.data.data.list;
-					this.mytotal = res.data.data.total;
+
+			GoOnUnder() {
+				this.$api.post('/merchant/hotel/repast/batchPutAway', this.obj).then(res => {
+					if (res.data.code == 0) {
+						this.getRepast()
+						this.showPricingUnder = false
+						this.ids = []
+					} else this.$showToast(res.data.msg);
 				})
 			},
-
 			getRepast() {
-				this.$api.get('/api/merchant/food/product/page', this.fromData).then(res => {
-					console.log(res.data.data.list);
-					this.roomType = res.data.data.list;
-					this.mytotal = res.data.data.total;
+				this.Shelves = false
+				this.$api.get('/merchant/hotel/repast/page', this.fromData).then(res => {
+					this.roomType = res.data.data.list
 				})
 			},
+
 			// 区域筛选
 			clickareaShow(e, i) {
-
-				this.areaShowIndex = i;
-				this.areaShow = false;
-				this.fromData.sortType = e.id;
-				this.fromData.page = 1;
-				this.getRepast();
+				this.areaShowIndex = i
 			},
 			// 上架时间
 			areaShowed() {
-				console.log(123);
 				this.areaShow = !this.areaShow
 			},
-			changeTab1(e, i) {
-				this.roomType = [];
-				this.selectedTags = [];
-				this.current = i;
-				this.fromData.status = e.id;
-				this.fromData.page = 1;
-
-				if (uni.getStorageSync('merchantType') == 4) {
-
-					this.getRepast(); //获取商品列表（餐饮美食）
-
+			changeTab1(index) {
+				this.current = index;
+				if (index == 0) {
+					this.fromData.status = 1
+					this.getRepast()
 				} else {
-
-					this.yujialedata(); //获取商品列表（渔家乐）
+					this.fromData.status = 0
+					this.getRepast()
 				}
+
 			},
 			// 批量显示
 			showList() {
@@ -714,8 +511,6 @@
 				right: 30rpx;
 			}
 		}
-
-
 	}
 
 	.Doublactive {
@@ -986,49 +781,73 @@
 	}
 
 	.pop-pop {
-		height: 65vh;
+		height: 30vh;
 		padding: 46rpx 20rpx 0;
+		border-radius: 16rpx 16rpx 0 0;
 
 		.hander-one {
-			display: flex;
-			justify-content: space-between;
+
+			// display: flex;
+			// justify-content: space-between;
+			text-align: center;
+
+			.image {
+				margin: 0 auto;
+				width: 64rpx;
+				height: 64rpx;
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
 
 			.text {
-				font-size: 36rpx;
-				color: #333333;
-				font-weight: bold;
 
+				.text1 {
+					margin-top: 24rpx;
+					font-size: 32rpx;
+					color: #111111;
+					font-weight: bold;
+				}
+
+				.text2 {
+					font-size: 28rpx;
+					color: #999999;
+					font-weight: Regular;
+					margin: 23rpx 0 64rpx;
+				}
 			}
 
-			.del {}
 		}
 
 		.hander-two {
 			display: flex;
+			justify-content: space-between;
 			align-items: center;
 			margin: 30rpx 0;
 
-			.hander-two-text {
-				font-size: 30rpx;
-				color: #333333;
+			.pop-btn-del {
+				margin: 0 15rpx;
+				padding: 22rpx 136rpx;
+				font-size: 32rpx;
+				color: #111111;
 				font-weight: Regular;
+				background-color: #F0F2F5;
+				border-radius: 50rpx;
 			}
 
-			.hander-two-image {
-				display: flex;
-				align-items: center;
+			.pop-btn-add {
+				border-radius: 50rpx;
+				margin: 0 15rpx;
+				background-color: #1372FF;
+				padding: 22rpx 100rpx;
+				font-size: 32rpx;
+				color: #FFFFFF;
+				font-weight: Regular;
+			}
 
-				.image {
-					margin: 0 10rpx;
-					width: 30rpx;
-					height: 30rpx;
 
-					image {
-						width: 100%;
-						height: 100%;
-					}
-				}
-			}
 		}
 
 		.hander-three {

pages/HotelMerchandise/index2.vue

@@ -1,8 +0,0 @@
-<template>
-</template>
-
-<script>
-</script>
-
-<style>
-</style>

pages/HotelMerchandise/record.vue

@@ -0,0 +1,162 @@
+<template>
+	<view class="page" :style="{'min-height':(h)+'px','padding-top':mt+'px'}">
+		<c-nav-bar title="核销记录"></c-nav-bar>
+		<view class="top">
+			<view class="time" @click="show=true">
+				<u-icon name="calendar" :label="dateStr" labelPos="right" labelColor="#666" color="#666" space="7px"
+					size="25px"></u-icon>
+				<u-icon name="arrow-down" color="#999" size="20px" style="margin-left: 20rpx;"></u-icon>
+			</view>
+			<view class="right">共{{totalNum}}单 收入¥{{totalAmount}}</view>
+		</view>
+		<view class="list">
+			<view class="item" v-for="(item,index) in data" :key="index">
+				<image :src="item.cover"></image>
+				<view class="" style="width: 100%; display: flex; justify-content: space-between;">
+					<view class="mid">
+						<view style="font-size: 30rpx; color: #111111; font-weight: bold; margin: 24rpx 0 30rpx;">
+							{{item.comboName}}
+						</view>
+						<!-- <text>{{item.num}}人 · 出游{{item.playLength}}小时</text> -->
+						<view>核销时间：{{item.checkinTime}}</view>
+					</view>
+					<view class="price">¥{{item.orderAmount}}</view>
+				</view>
+
+			</view>
+		</view>
+		<u-datetime-picker @confirm="confirmDate" @cancel="show=false" :show="show" v-model="value1"
+			visibleItemCount="6" mode="year-month"></u-datetime-picker>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				dateStr: new Date().Format('yyyy年-MM月'),
+				date: new Date().Format('yyyy-MM'),
+				show: false,
+				k: '',
+				data: [],
+				value1: Number(new Date()),
+				merchantId: uni.getStorageSync('merchantId'),
+				totalAmount: 0,
+				totalNum: 0,
+			}
+		},
+		onLoad() {
+			this.getdata();
+		},
+		methods: {
+			getdata() {
+				this.$api.get('/merchant/hotel/order/getMerchantOrderPageList', {
+					limit: 50,
+					page: 1,
+					homestayId: uni.getStorageSync('homestayId'),
+					orderStatus: 2,
+
+				}).then(res => {
+					if (res.data.code == 0) {
+						var arr = []
+						res.data.data.list.forEach((item, index) => {
+							this.totalAmount += item.orderAmount
+						});
+						this.totalNum = res.data.data.total;
+						this.data = res.data.data.list;
+					}
+					console.log(res)
+				})
+			},
+
+			confirmDate(e) {
+				// 创建一个Date对象并传入时间戳
+				const date = new Date(e.value);
+				// 使用Date对象的方法获取年、月、日、小时、分钟和秒
+				const year = date.getFullYear();
+				const month = ('0' + (date.getMonth() + 1)).slice(-2);
+				const day = ('0' + date.getDate()).slice(-2);
+				// 格式化时间
+				let formattedTime = "";
+				formattedTime = `${year}-${month}`;
+				this.dateStr = `${year}年-${month}月`
+				this.date = formattedTime;
+				this.show = false;
+				this.getdata()
+			},
+
+		}
+	}
+</script>
+
+<style lang="less" scoped>
+	.page {
+		box-sizing: border-box;
+	}
+
+	.top {
+		padding: 24rpx 30rpx;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+
+		.time {
+			display: flex;
+			align-items: center;
+			gap: 0 10rpx;
+		}
+
+		.right {
+			color: #999;
+			font-size: 24rpx;
+
+		}
+
+	}
+
+	.list {
+		padding: 0 30rpx;
+
+		.item {
+			padding: 30rpx 0;
+			border-bottom: 1rpx solid #EFEFEF;
+			display: flex;
+			justify-content: space-between;
+
+			image {
+				border-radius: 16rpx;
+				width: 136rpx;
+				min-width: 136rpx;
+				height: 136rpx;
+
+			}
+
+			.mid {
+				margin: 0 30rpx 0 20rpx;
+
+				text {
+					display: inline-block;
+					font-size: 28rpx;
+					color: #777;
+
+					&:first-child {
+						font-size: 30rpx;
+						color: #111;
+						font-weight: bold;
+					}
+
+					&:nth-child(2) {
+						margin: 18rpx 0;
+					}
+				}
+			}
+
+			.price {
+				line-height: 80rpx;
+				font-size: 32rpx;
+				color: #111111;
+				font-weight: bold;
+			}
+		}
+	}
+</style>

pages/home/index.vue

@@ -16,7 +16,7 @@
 				<view @tap="toTurn">
 					<text v-if="item">{{item.stayedInRooms||0}}</text>
 					<text v-else>0</text>
-					<text>已入住</text>
+					<text>已入住 </text>
 				</view>
 				<view>
 					<text v-if="item">{{item.yestOrders||0}}</text>
@@ -68,7 +68,7 @@
 				</view>
 				<text>商品管理</text>
 			</view>
-			<view @click="toHref()">
+			<view @click="toHref('/pages/HotelMerchandise/record')">
 				<view class="image">
 					<image :src="icons[2]"></image>
 				</view>
@@ -100,7 +100,7 @@
 					<text v-else-if='item.orderStatus==1' class="green">已预订</text>
 					<text v-else-if='item.orderStatus==5' class="green">已退款</text>
 					<text v-else-if='item.orderStatus==4' class="green">已取消</text>
-					<text v-else-if='item.orderStatus==2' class="green">已入住</text>
+					<text v-else-if='item.orderStatus==2' class="green">{{item.orderType==2?'已入住':'已核销'}}</text>
 					<text v-else-if='item.orderStatus==3' class="green">已退房</text>
 					<text v-else :class="statusClass[item.orderStatus]">{{status[item.orderStatus]}}</text>
 				</view>
@@ -122,7 +122,8 @@
 						@tap="cancle(item)">拒绝</view>
 					<view class="btn" v-if="item.orderStatus==-1" @tap="toConfrimOrder(item)">确认订单</view>
 					<view class="btn" v-if="item.orderStatus==1&&item.istoday" @tap="checkIn(2,item)">办理入住</view>
-					<view class="btn" v-if="item.orderStatus==2" @tap="toBltf(item)">办理退房</view>
+					<view class="btn" v-if="item.orderStatus==2&&item.orderType==2" @tap="toBltf(item)">办理退房</view>
+
 					<view class="btn"
 						v-if="item.orderStatus==3||item.orderStatus==4||(item.orderStatus==1&&!item.istoday)"
 						:class="(item.orderStatus==3||item.orderStatus==4||(item.orderStatus==1&&!item.istoday))?'btn_xq':''"
@@ -313,9 +314,15 @@
 				})
 			},
 			handleDetail(item) {
-				uni.navigateTo({
-					url: '/pages/house/orderInfo?orderId=' + item.id
-				})
+				if (item.orderType == 2) {
+					uni.navigateTo({
+						url: '/pages/house/orderInfo?orderId=' + item.id
+					})
+				} else {
+					uni.navigateTo({
+						url: '/pages/house/orderDetails?orderId=' + item.id
+					})
+				}
 			},
 			toAll() {
 				uni.navigateTo({

pages/login/select.vue

@@ -51,14 +51,14 @@
 				})
 			},
 			toHome(item) { //1711268640588517378   1721450548101648385
-			uni.setStorageSync('merchantType',item.merchantType);
-				if (item.merchantType == 2) {//民宿
+				uni.setStorageSync('merchantType', item.merchantType);
+				if (item.merchantType == 2) { //民宿
 					uni.setStorageSync('homestayId', item.merchantId);
-					uni.setStorageSync('merchantId','');
+					uni.setStorageSync('merchantId', '');
 					uni.reLaunch({
 						url: '/pages/home/index'
 					})
-				} else {//渔家乐和餐饮
+				} else { //渔家乐和餐饮
 					uni.setStorageSync('homestayId', '');
 					uni.setStorageSync('merchantId', item.merchantId);
 					uni.setStorageSync('merchantName', item.merchantName);
@@ -66,7 +66,7 @@
 						url: '/pagesHouse/home/index'
 					})
 				}
-				
+
 			}
 		}
 	}

pagesHouse/HotelMerchandise/index.vue

@@ -337,7 +337,6 @@
 
 					} else {
 
-
 						let postdata = this.selectedTags.map((item, index, arr) => {
 							let json = {};
 							json.id = item.id;
@@ -595,13 +594,13 @@
 			},
 
 			selectPerson(e, i) {
+				console.log('+++++++', e, i);
 				if (this.selectedTags.includes(e)) {
 					this.selectedTags = this.selectedTags.filter(t => t !== e);
 				} else {
 					this.selectedTags.push(e);
 				}
 				console.log(' this.selectedTags', this.selectedTags)
-
 			},
 			yujialedata() {
 				this.$api.get('/scenic/goods/page', this.fromData).then(res => {

pagesHouse/Mine/Businesses/Businesses.vue

@@ -19,7 +19,7 @@
 				<view class="">
 					商户类型
 				</view>
-				<view class="">
+				<view class="" v-if="">
 					渔家乐
 				</view>
 				<!-- 	<view class="right">
@@ -31,7 +31,8 @@
 					企业名称
 				</view>
 				<view class="right">
-					<input type="text" v-model="list.busName" border="none" placeholder="请输入" style="height: 48rpx;" />
+					<input type="text" v-model="list.companyName" border="none" placeholder="请输入"
+						style="height: 48rpx;" />
 				</view>
 			</view>
 
@@ -82,7 +83,8 @@
 					企业地址
 				</view>
 				<view class="right">
-					<input type="text" v-model="list.address" border="none" placeholder="请输入" style="height: 48rpx;" />
+					<input type="text" v-model="list.areaDetail" border="none" placeholder="请输入"
+						style="height: 48rpx;" />
 				</view>
 			</view>
 
@@ -129,18 +131,18 @@
 					<image :src="list.licensePic" mode=""></image>
 					<view>营业执照</view>
 				</view>
-				<view @click="usccl">
+				<!-- 	<view @click="usccl">
 					<image :src="list.usccl" mode=""></image>
 					<view>统一社会信息代码证</view>
-				</view>
+				</view> -->
 				<view @click="shopSign">
-					<image :src="list.shopSign" mode=""></image>
-					<view>门头照</view>
+					<image :src="list.storeFrontPic" mode=""></image>
+					<view>门头照/店铺照片</view>
 				</view>
-				<view @click="shopImgs">
+				<!-- 	<view @click="shopImgs">
 					<image :src="list.shopImgs" mode=""></image>
 					<view>店铺照片</view>
-				</view>
+				</view> -->
 
 			</view>
 		</view>
@@ -203,10 +205,11 @@
 					}
 				],
 				fishermanId: uni.getStorageSync('merchantId'),
+				merchantType: uni.getStorageSync('merchantType'),
 				list: {},
 				dto: {
 					name: '', //商户名称
-					busName: '', //企业名称
+					companyName: '', //企业名称
 					merchantType: 10, //商户类型
 					companyType: '', //企业类型
 					legalPerson: '', //企业法人
@@ -218,11 +221,11 @@
 					idCardFront: '', //法人身份证国徽面
 					idCardReverse: '', //法人身份证人像面
 					licensePic: '', //营业执照
-					usccl: '', //统一社会信息代码证
-					shopSign: '', //门头照
+					// usccl: '', //统一社会信息代码证
+					storeFrontPic: '', //门头照
 					shopImgs: '', //店铺照片
 					id: '',
-					address: '', //企业地址
+					areaDetail: '', //企业地址
 				},
 				typeList: {},
 				companyType: ''
@@ -239,7 +242,7 @@
 				// 	console.log(res.data);
 				// })
 				let id = this.fishermanId
-				this.$api.get(`/merchant/merchantFisherman/home/${id}`).then(res => {
+				this.$api.get(`/api/merchant/food/merchant/${id}`).then(res => {
 					console.log(res.data);
 					this.list = res.data.data
 					this.getDict()
@@ -261,7 +264,7 @@
 			merchant() {
 				this.dto.idCardFront = this.list.idCardFront
 				this.dto.name = this.list.name
-				this.dto.busName = this.list.busName
+				this.dto.companyName = this.list.companyName
 				this.dto.merchantType = this.list.merchantType
 				this.dto.companyType = this.list.companyType
 				this.dto.legalPerson = this.list.legalPerson
@@ -269,14 +272,14 @@
 				this.dto.creditCode = this.list.creditCode
 				this.dto.idCardReverse = this.list.idCardReverse
 				this.dto.licensePic = this.list.licensePic
-				this.dto.usccl = this.list.usccl
-				this.dto.shopSign = this.list.shopSign
+				// this.dto.usccl = this.list.usccl
+				this.dto.storeFrontPic = this.list.storeFrontPic
 				this.dto.shopImgs = this.list.shopImgs
 				this.dto.linkName = this.list.linkName
 				this.dto.phone = this.list.phone
-				this.dto.address = this.list.address
+				this.dto.areaDetail = this.list.areaDetail
 				this.dto.id = uni.getStorageSync('merchantId')
-				this.$api.put('/merchant/merchantFisherman/home', this.dto).then(res => {
+				this.$api.put('/api/merchant/food/updateMerchantInfo', this.dto).then(res => {
 					console.log('0000', res.data);
 					if (res.data.code == 0) {
 						this.$showToast('保存成功');
@@ -367,32 +370,32 @@
 				});
 
 			}, // 上传统一社会信息代码证
-			usccl() {
-				uni.chooseImage({
-					sourceType: ['album'], //从相册选择
-					success: chooseImageRes => {
-						const tempFilePaths = chooseImageRes.tempFilePaths;
-						uni.uploadFile({
-							url: 'https://i.ringzle.com/island-cloud-server/oss/file/upload', // 仅为示例，非真实的接口地址
-							filePath: tempFilePaths[0],
-							name: 'file',
-							header: {
-								token: wx.getStorageSync('access_token')
-							},
-							success: res => {
-								// uploadFile上传成功后，根据和后台的约定msgCode判断接口调用状态
-								let data = JSON.parse(res.data);
-								this.dto.usccl = data.data.url
-								this.list.usccl = data.data.url
-							}
-						});
-					},
-					fail: err => {
-						this.myToast('图片上传失败', 'none');
-					}
-				});
-
-			}, // 上传门头照
+			// usccl() {
+			// 	uni.chooseImage({
+			// 		sourceType: ['album'], //从相册选择
+			// 		success: chooseImageRes => {
+			// 			const tempFilePaths = chooseImageRes.tempFilePaths;
+			// 			uni.uploadFile({
+			// 				url: 'https://i.ringzle.com/island-cloud-server/oss/file/upload', // 仅为示例，非真实的接口地址
+			// 				filePath: tempFilePaths[0],
+			// 				name: 'file',
+			// 				header: {
+			// 					token: wx.getStorageSync('access_token')
+			// 				},
+			// 				success: res => {
+			// 					// uploadFile上传成功后，根据和后台的约定msgCode判断接口调用状态
+			// 					let data = JSON.parse(res.data);
+			// 					this.dto.usccl = data.data.url
+			// 					this.list.usccl = data.data.url
+			// 				}
+			// 			});
+			// 		},
+			// 		fail: err => {
+			// 			this.myToast('图片上传失败', 'none');
+			// 		}
+			// 	});
+
+			// }, // 上传门头照
 			shopSign() {
 				uni.chooseImage({
 					sourceType: ['album'], //从相册选择
@@ -408,8 +411,8 @@
 							success: res => {
 								// uploadFile上传成功后，根据和后台的约定msgCode判断接口调用状态
 								let data = JSON.parse(res.data);
-								this.dto.shopSign = data.data.url
-								this.list.shopSign = data.data.url
+								this.dto.storeFrontPic = data.data.url
+								this.list.storeFrontPic = data.data.url
 							}
 						});
 					},
@@ -502,7 +505,7 @@
 		font-weight: bold;
 		font-size: 28rpx;
 		color: #FFFFFF;
-		height:88rpx;
+		height: 88rpx;
 		line-height: 88rpx;
 	}
 

pagesHouse/Mine/Businesses/Catering.vue

@@ -0,0 +1,645 @@
+<template>
+	<view class="page" :style="{'min-height':h+'px'}">
+
+		<view class="tenant-title">
+			<text>基本信息</text>
+		</view>
+		<view class="from-content">
+			<view class="one-realName">
+				<view class="realName">
+					商户名称
+				</view>
+				<!-- <u--input v-model="realName" border="none" pl ></u--input> -->
+				<view class="right">
+					<input type="text" v-model="list.name" border="none" placeholder="请输入昵称" />
+				</view>
+			</view>
+
+			<view class="one" @click="nav">
+				<view class="">
+					商户类型
+				</view>
+				<view class="">
+					<!-- 渔家乐 -->
+					餐饮美食
+				</view>
+				<!-- 	<view class="right">
+					<input type="text" v-model="list.phone" border="none" placeholder="请输入" style="height: 48rpx;" />
+				</view> -->
+			</view>
+			<view class="one-mobile">
+				<view class="mobile">
+					企业名称
+				</view>
+				<view class="right">
+					<input type="text" v-model="list.companyName" border="none" placeholder="请输入"
+						style="height: 48rpx;" />
+				</view>
+			</view>
+
+			<view class="one">
+				<view class="">
+					企业类型
+				</view>
+				<view class="right">
+					<input type="text" v-model="companyType" border="none" placeholder="请输入"
+						style="height: 48rpx; text-align: right;" />
+				</view>
+			</view>
+
+			<view class="one-mobile">
+				<view class="mobile">
+					企业法人
+				</view>
+
+				<view class="right">
+					<input type="text" v-model="list.legalPerson" border="none" placeholder="请输入"
+						style="height: 48rpx;" />
+				</view>
+			</view>
+
+			<view class="one-mobile">
+				<view class="mobile">
+					法人身份证号码
+				</view>
+
+				<view class="right">
+					<input type="text" v-model="list.idCard" border="none" placeholder="请输入" style="height: 48rpx;" />
+				</view>
+			</view>
+
+			<view class="one-mobile">
+				<view class="mobile" style="width: 350rpx;">
+					统一社会信用代码
+				</view>
+
+				<view class="right">
+					<input type="text" v-model="list.creditCode" border="none" placeholder="请输入"
+						style="height: 48rpx;" />
+				</view>
+			</view>
+
+			<view class="one-mobile">
+				<view class="mobile">
+					企业地址
+				</view>
+				<view class="right">
+					<input type="text" v-model="list.areaDetail" border="none" placeholder="请输入"
+						style="height: 48rpx;" />
+				</view>
+			</view>
+
+		</view>
+
+		<view class="tenant-title">
+			<text>联系人信息</text>
+		</view>
+		<view class="from-content">
+			<view class="one-mobile">
+				<view class="mobile">
+					联系人姓名
+				</view>
+
+				<view class="right">
+					<input type="text" v-model="list.linkName" border="none" placeholder="请输入" style="height: 48rpx;" />
+				</view>
+			</view>
+
+			<view class="one-mobile">
+				<view class="mobile">
+					联系人号码
+				</view>
+				<view class="right">
+					<input type="text" v-model="list.phone" border="none" placeholder="请输入" style="height: 48rpx;" />
+				</view>
+			</view>
+		</view>
+
+		<view class="tenant-title">
+			<text>商家相册</text>
+		</view>
+		<view class="from-content" style="padding: 30rpx;">
+			<view class="tenant-image">
+				<view @click="idCardFront">
+					<image :src="list.idCardFront" mode=""></image>
+					<view>法人身份证国徽面</view>
+				</view>
+				<view @click="idCardReverse">
+					<image :src="list.idCardReverse" mode=""></image>
+					<view>法人身份证人像面</view>
+				</view>
+				<view @click="licensePic">
+					<image :src="list.licensePic" mode=""></image>
+					<view>营业执照</view>
+				</view>
+				<!-- 	<view @click="usccl">
+					<image :src="list.usccl" mode=""></image>
+					<view>统一社会信息代码证</view>
+				</view> -->
+				<view @click="shopSign">
+					<image :src="list.storeFrontPic" mode=""></image>
+					<view>门头照/店铺照片</view>
+				</view>
+				<!-- 	<view @click="shopImgs">
+					<image :src="list.shopImgs" mode=""></image>
+					<view>店铺照片</view>
+				</view> -->
+
+			</view>
+		</view>
+		<!-- 选择弹框学历要求 -->
+		<u-popup :show="showTwo" @close="close" :round="24" @open="open">
+			<view class="pop">
+				<view class="hander">
+					<view class="left" @click="showTwo=false">
+						取消
+					</view>
+					<view class="center">
+						<!-- 学历要求 -->
+					</view>
+					<view class="right" @click="showTwo=false">
+						确定
+					</view>
+				</view>
+
+				<view class="At-last" v-for="item,index in JobList">
+					<view class="item" @click="choose(item,index)" :class="indexDb==index?'activeItem':''">
+						{{item.name}}
+					</view>
+				</view>
+
+			</view>
+		</u-popup>
+
+		<view class="from-content">
+			<button class="tenant-button" @click="merchant">
+				立即保存
+			</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				h: uni.getSystemInfoSync().windowHeight - 87,
+				mt: uni.getSystemInfoSync().statusBarHeight + 44,
+				titleHeader: '个人信息',
+				fileList: [],
+				JobList: [{
+						name: '不限'
+					}, {
+						name: '高中',
+					},
+					{
+						name: '中专/技校',
+					},
+					{
+						name: '大专',
+					},
+					{
+						name: '本科',
+					},
+					{
+						name: '硕士',
+					}
+				],
+				fishermanId: uni.getStorageSync('merchantId'),
+				list: {},
+				dto: {
+					name: '', //商户名称
+					companyName: '', //企业名称
+					merchantType: 4, //商户类型
+					companyType: '', //企业类型
+					legalPerson: '', //企业法人
+					idCard: '', //法人身份证号码
+					creditCode: '', //统一社区信用代码
+					areaDetail: '', //企业地址
+					linkName: '', //联系人姓名
+					phone: '', //联系人号码
+					idCardFront: '', //法人身份证国徽面
+					idCardReverse: '', //法人身份证人像面
+					licensePic: '', //营业执照
+					// usccl: '', //统一社会信息代码证
+					storeFrontPic: '', //门头照
+					shopImgs: '', //店铺照片
+					id: '',
+					areaDetail: '', //企业地址
+				},
+				typeList: {},
+				companyType: ''
+			}
+		},
+		onLoad() {
+			this.getList()
+		},
+
+		methods: {
+			// 获取数据 
+			getList() {
+				// this.$api.get('/merchant/merchantFisherman/home?id=' + this.homestayId).then(res => {
+				// 	console.log(res.data);
+				// })
+				let id = this.fishermanId
+				this.$api.get(`/api/merchant/food/merchant/${id}`).then(res => {
+					console.log(res.data);
+					this.list = res.data.data
+					this.getDict()
+				})
+			},
+			// 获取企业类型字典
+			getDict() {
+				this.$api.get('/sys/dict/type/all').then(res => {
+					console.log(res.data)
+					//this.$store.state.Dict = Object.assign(res.data);
+					// this.dictValue
+					this.typeList = res.data.data.find((p) => p.dictType == 'CompanyType').dataList;
+					console.log(this.typeList);
+					this.companyType = this.typeList.find((p) => p.dictValue == this.list.companyType).dictLabel
+					console.log(this.companyType);
+				})
+			},
+			// 立即保存
+			merchant() {
+				this.dto.idCardFront = this.list.idCardFront
+				this.dto.name = this.list.name
+				this.dto.companyName = this.list.companyName
+				this.dto.merchantType = this.list.merchantType
+				this.dto.companyType = this.list.companyType
+				this.dto.legalPerson = this.list.legalPerson
+				this.dto.idCard = this.list.idCard
+				this.dto.creditCode = this.list.creditCode
+				this.dto.idCardReverse = this.list.idCardReverse
+				this.dto.licensePic = this.list.licensePic
+				// this.dto.usccl = this.list.usccl
+				this.dto.storeFrontPic = this.list.storeFrontPic
+				this.dto.shopImgs = this.list.shopImgs
+				this.dto.linkName = this.list.linkName
+				this.dto.phone = this.list.phone
+				this.dto.areaDetail = this.list.areaDetail
+				this.dto.id = uni.getStorageSync('merchantId')
+				this.$api.put('/api/merchant/food/updateMerchantInfo', this.dto).then(res => {
+					console.log('0000', res.data);
+					if (res.data.code == 0) {
+						this.$showToast('保存成功');
+						setTimeout(() => {
+							this.getList()
+						}, 1000)
+
+					}
+				})
+			},
+			// 上传头像法人身份证国徽面
+			idCardFront() {
+				uni.chooseImage({
+					sourceType: ['album'], //从相册选择
+					success: chooseImageRes => {
+						const tempFilePaths = chooseImageRes.tempFilePaths;
+						uni.uploadFile({
+							url: 'https://i.ringzle.com/island-cloud-server/oss/file/upload', // 仅为示例，非真实的接口地址
+							filePath: tempFilePaths[0],
+							name: 'file',
+							header: {
+								token: wx.getStorageSync('access_token')
+							},
+							success: res => {
+								// uploadFile上传成功后，根据和后台的约定msgCode判断接口调用状态
+								let data = JSON.parse(res.data);
+								this.dto.idCardFront = data.data.url
+								this.list.idCardFront = data.data.url
+							}
+						});
+					},
+					fail: err => {
+						this.myToast('图片上传失败', 'none');
+					}
+				});
+
+			},
+			// 上传法人身份证人像面
+			idCardReverse() {
+				uni.chooseImage({
+					sourceType: ['album'], //从相册选择
+					success: chooseImageRes => {
+						const tempFilePaths = chooseImageRes.tempFilePaths;
+						uni.uploadFile({
+							url: 'https://i.ringzle.com/island-cloud-server/oss/file/upload', // 仅为示例，非真实的接口地址
+							filePath: tempFilePaths[0],
+							name: 'file',
+							header: {
+								token: wx.getStorageSync('access_token')
+							},
+							success: res => {
+								// uploadFile上传成功后，根据和后台的约定msgCode判断接口调用状态
+								let data = JSON.parse(res.data);
+								this.dto.idCardReverse = data.data.url
+								this.list.idCardReverse = data.data.url
+							}
+						});
+					},
+					fail: err => {
+						this.myToast('图片上传失败', 'none');
+					}
+				});
+
+			}, // 上传营业执照
+			licensePic() {
+				uni.chooseImage({
+					sourceType: ['album'], //从相册选择
+					success: chooseImageRes => {
+						const tempFilePaths = chooseImageRes.tempFilePaths;
+						uni.uploadFile({
+							url: 'https://i.ringzle.com/island-cloud-server/oss/file/upload', // 仅为示例，非真实的接口地址
+							filePath: tempFilePaths[0],
+							name: 'file',
+							header: {
+								token: wx.getStorageSync('access_token')
+							},
+							success: res => {
+								// uploadFile上传成功后，根据和后台的约定msgCode判断接口调用状态
+								let data = JSON.parse(res.data);
+								this.dto.licensePic = data.data.url
+								this.list.licensePic = data.data.url
+							}
+						});
+					},
+					fail: err => {
+						this.myToast('图片上传失败', 'none');
+					}
+				});
+
+			}, // 上传统一社会信息代码证
+			// usccl() {
+			// 	uni.chooseImage({
+			// 		sourceType: ['album'], //从相册选择
+			// 		success: chooseImageRes => {
+			// 			const tempFilePaths = chooseImageRes.tempFilePaths;
+			// 			uni.uploadFile({
+			// 				url: 'https://i.ringzle.com/island-cloud-server/oss/file/upload', // 仅为示例，非真实的接口地址
+			// 				filePath: tempFilePaths[0],
+			// 				name: 'file',
+			// 				header: {
+			// 					token: wx.getStorageSync('access_token')
+			// 				},
+			// 				success: res => {
+			// 					// uploadFile上传成功后，根据和后台的约定msgCode判断接口调用状态
+			// 					let data = JSON.parse(res.data);
+			// 					this.dto.usccl = data.data.url
+			// 					this.list.usccl = data.data.url
+			// 				}
+			// 			});
+			// 		},
+			// 		fail: err => {
+			// 			this.myToast('图片上传失败', 'none');
+			// 		}
+			// 	});
+
+			// }, // 上传门头照
+			shopSign() {
+				uni.chooseImage({
+					sourceType: ['album'], //从相册选择
+					success: chooseImageRes => {
+						const tempFilePaths = chooseImageRes.tempFilePaths;
+						uni.uploadFile({
+							url: 'https://i.ringzle.com/island-cloud-server/oss/file/upload', // 仅为示例，非真实的接口地址
+							filePath: tempFilePaths[0],
+							name: 'file',
+							header: {
+								token: wx.getStorageSync('access_token')
+							},
+							success: res => {
+								// uploadFile上传成功后，根据和后台的约定msgCode判断接口调用状态
+								let data = JSON.parse(res.data);
+								this.dto.storeFrontPic = data.data.url
+								this.list.storeFrontPic = data.data.url
+							}
+						});
+					},
+					fail: err => {
+						this.myToast('图片上传失败', 'none');
+					}
+				});
+
+			}, // 上传店铺照片
+			shopImgs() {
+				uni.chooseImage({
+					sourceType: ['album'], //从相册选择
+					success: chooseImageRes => {
+						const tempFilePaths = chooseImageRes.tempFilePaths;
+						uni.uploadFile({
+							url: 'https://i.ringzle.com/island-cloud-server/oss/file/upload', // 仅为示例，非真实的接口地址
+							filePath: tempFilePaths[0],
+							name: 'file',
+							header: {
+								token: wx.getStorageSync('access_token')
+							},
+							success: res => {
+								// uploadFile上传成功后，根据和后台的约定msgCode判断接口调用状态
+								let data = JSON.parse(res.data);
+								this.dto.shopImgs = data.data.url
+								this.list.shopImgs = data.data.url
+							}
+						});
+					},
+					fail: err => {
+						this.myToast('图片上传失败', 'none');
+					}
+				});
+
+			},
+		}
+
+
+	}
+</script>
+
+<style lang="scss" scoped>
+	.page {
+		box-sizing: border-box;
+		// padding: 30rpx;
+		// padding-top: 150rpx;
+
+	}
+
+	//标题样式
+	.tenant-title {
+		height: 88rpx;
+		background: #F5F8FA;
+		padding-left: 30rpx;
+
+		text {
+			line-height: 88rpx;
+			font-size: 28rpx;
+			color: #007A69;
+		}
+	}
+
+	//商家相册样式
+	.tenant-image {
+		width: 100%;
+		display: flex;
+		flex-wrap: wrap;
+		justify-content: space-around;
+
+		>view {
+			width: 47%;
+			text-align: center;
+
+			image {
+				width: 100%;
+				height: 212rpx;
+				background: #F6F8F9;
+			}
+
+			view {
+				margin: 15rpx 0 45rpx 0;
+			}
+		}
+	}
+
+	//保存样式
+	.tenant-button {
+		background: #007A69;
+		border-radius: 40rpx;
+		font-weight: bold;
+		font-size: 28rpx;
+		color: #FFFFFF;
+		height: 88rpx;
+		line-height: 88rpx;
+	}
+
+	.from-content {
+		padding: 30rpx;
+
+
+		.title {
+			margin: 40rpx 0 36rpx;
+			font-size: 30rpx;
+			font-weight: Regular;
+			color: #111111;
+		}
+
+
+		.one-image {
+			width: 100%;
+			display: flex;
+			justify-content: space-between;
+
+			.image {
+				width: 124rpx;
+				height: 124rpx;
+				border-radius: 100rpx;
+
+				image {
+					width: 100%;
+					height: 100%;
+					border-radius: 100rpx;
+				}
+
+			}
+
+
+			.user {
+				margin-top: 24rpx;
+				font-size: 30rpx;
+				color: #111;
+				font-weight: Regular;
+			}
+
+		}
+
+		.one-realName {
+			width: 100%;
+			display: flex;
+			align-items: center;
+			height: 120rpx;
+			line-height: 120rpx;
+			border-bottom: 1rpx solid #EFEFEF;
+
+			.realName {
+				width: 188rpx;
+				height: 120rpx;
+				font-size: 30rpx;
+				color: #333333;
+				font-weight: Regular;
+			}
+
+			.right {
+				text-align: right;
+				width: 100%;
+				font-size: 30rpx;
+				color: #666666;
+				font-weight: Regular;
+				// display: flex;
+				// justify-content: space-between;
+			}
+		}
+
+		.one-mobile {
+			display: flex;
+			width: 100%;
+			align-items: center;
+			height: 120rpx;
+			line-height: 120rpx;
+			border-bottom: 1rpx solid #EFEFEF;
+
+			.right {
+				width: 100%;
+				text-align: right;
+				font-size: 30rpx;
+				color: #666666;
+				font-weight: Regular;
+			}
+
+			.mobile {
+				width: 380rpx !important;
+				height: 120rpx;
+				font-size: 30rpx;
+				color: #333333;
+				font-weight: Regular;
+			}
+
+			.replacement {
+				border-radius: 50rpx;
+				width: 80rpx;
+				height: 48rpx;
+				line-height: 48rpx;
+				border: 1rpx solid #025EA7;
+				color: #025EA7;
+				font-weight: Regular;
+				font-size: 24rpx;
+				text-align: center;
+			}
+		}
+
+		.one {
+			height: 120rpx;
+			line-height: 120rpx;
+			display: flex;
+			border-bottom: 1rpx solid #EFEFEF;
+			justify-content: space-between;
+			align-items: center;
+			font-size: 30rpx;
+			color: #333333;
+			font-weight: Regular;
+		}
+	}
+
+	.btn {
+		margin: 120rpx auto;
+		width: 650rpx;
+		height: 88rpx;
+		display: flex;
+		background-color: #01B9F9;
+		line-height: 88rpx;
+		border-radius: 50rpx;
+
+		.btn-btn {
+			margin: 0 auto;
+			font-size: 32rpx;
+			color: #FFFFFF;
+			font-weight: Regular;
+		}
+	}
+</style>

pagesHouse/Mine/index.vue

@@ -46,7 +46,15 @@
 			<view class="w_right" @tap="toTurn('/pagesMy/wallet/index',true)">去结算</view>
 		</view>
 
-		<view class="one" @tap="toTurn('/pagesHouse/Mine/Businesses/Businesses',true)">
+		<view class="one" v-if="merchantType==10" @tap="toTurn('/pagesHouse/Mine/Businesses/Businesses',true)">
+			<view class="">
+				商户信息
+			</view>
+			<view class="">
+				<u-icon name="arrow-right"></u-icon>
+			</view>
+		</view>
+		<view class="one" v-if="merchantType==4" @tap="toTurn('/pagesHouse/Mine/Businesses/Catering',true)">
 			<view class="">
 				商户信息
 			</view>
@@ -114,6 +122,7 @@
 				],
 				price: 0, //钱包余额
 				merchantName: uni.getStorageSync('merchantName'),
+				merchantType: uni.getStorageSync('merchantType'),
 				dto: {}
 			}
 		},

pagesHouse/Mine/ordersList/details/details.vue

@@ -6,9 +6,13 @@
 			<view class="head">
 				<text v-if="merchantType==10">{{FishJialeOcfg[infoMation.status]}}</text>
 				<text v-esle>{{FishJialeOcfg2[infoMation.orderStatus]}}</text>
-				<view class="time" v-if="merchantType==4">
+				<!-- <view class="time" v-if="merchantType==4">
 					有效期：{{infoMation.activityStartTime&&infoMation.activityStartTime.substring(0,10)}}至{{infoMation.activityEndTime&&infoMation.activityEndTime.substring(0,10)}}
+				</view> -->
+				<view class="time" v-if="merchantType==4">
+					有效期：{{infoMation.activityStartTime}}至{{infoMation.activityEndTime}}
 				</view>
+
 			</view>
 			<view class="ticketInfo">
 				<!-- <view class="hander-titles">
@@ -20,16 +24,17 @@
 					</view>
 				</view> -->
 				<view v-if="merchantType==10" class="dateAndType">
-					<u-icon name="calendar" size="40" color="#272636" style="display: flex;align-items: center;"></u-icon>
+					<u-icon name="calendar" size="40" color="#272636"
+						style="display: flex;align-items: center;"></u-icon>
 					<text>{{infoMation.payTime}}出发/{{infoMation.orderType==3?'拼船':'包船'}}</text>
 				</view>
 				<view class="ticketInfo-hander">
 					<view class="image">
-						<image :src="infoMation.coverImg" mode="aspectFill"></image>
+						<image :src="infoMation.productImg" mode="aspectFill"></image>
 					</view>
 					<view class="right">
 						<view class="name">
-							{{infoMation.goodsName}}
+							{{infoMation.merchantName}}
 						</view>
 						<view class="tip">
 							<text v-if='infoMation.orderType==3'>价格：￥{{infoMation.avePrice}}/人</text>
@@ -37,7 +42,10 @@
 							<text v-if='infoMation.orderType==1'>价格：￥{{infoMation.discountPrice}}/艘</text>
 						</view>
 						<view class="price">
-							<text>数量：</text>X<text>{{infoMation.detailDto.length}}</text>
+							<view class="" v-if="merchantType==10">
+								<text>数量：</text>X<text>{{infoMation.detailDto.length}}</text>
+							</view>
+							<text>{{infoMation.notice}}</text>
 						</view>
 					</view>
 				</view>
@@ -48,12 +56,12 @@
 				</view>
 				<view class="li" v-for="(item,inex) in infoMation.productsDetail" :key="index">
 					<text>{{item.name}}</text>
-					<text>{{item.number}}</text>
+					<text>（{{item.number}}份）</text>
 					<text>￥{{item.price}}</text>
 				</view>
 			</view>
 			<!-- 游客信息 -->
-			<view class="orderInfo yk" style="padding-bottom: 30rpx;">
+			<view class="orderInfo yk" style="padding-bottom: 30rpx;" v-if="merchantType==10">
 				<view class="tit">游客信息</view>
 				<u-cell :border="false" v-for="(i,index) in infoMation.detailDto">
 					<text slot="icon" class="txt">{{i.touristName}}</text>
@@ -200,7 +208,7 @@
 			}
 		},
 		methods: {
-			init(){
+			init() {
 				if (this.merchantType == 10) {
 					this.info()
 				} else {
@@ -253,12 +261,13 @@
 					content: '确定核销订单？',
 					success: function(res) {
 						if (res.confirm) {
-							that.$api.get('/scenic/order/orderWriteOff/'+this.infoMation.orderCode).then(res => {
-								if (res.data.code === 0) {
-									that.$showToast('订单已核销');
-									that.init();
-								} else that.$showToast(res.data.msg)
-							})
+							that.$api.get('/scenic/order/orderWriteOff/' + this.infoMation.orderCode).then(
+								res => {
+									if (res.data.code === 0) {
+										that.$showToast('订单已核销');
+										that.init();
+									} else that.$showToast(res.data.msg)
+								})
 						}
 					}
 				});
@@ -345,15 +354,16 @@
 				color: #111;
 
 				&:first-child {
-					width: 80rpx;
+					width: 200rpx;
 				}
 
 				&:nth-child(2) {
 					color: #999;
 					text-align: right;
+
 					display: inline-block;
 					flex: 1;
-					margin-right: 30rpx;
+					margin-right: 60rpx;
 				}
 			}
 		}
@@ -412,8 +422,15 @@
 			font-weight: Regular;
 			margin: 0 20rpx 0 30rpx;
 		}
-		&.yk{
-			.txt,.icon,.val {font-size: 30rpx;color: #333;}
+
+		&.yk {
+
+			.txt,
+			.icon,
+			.val {
+				font-size: 30rpx;
+				color: #333;
+			}
 		}
 
 	}

pagesHouse/Verification/check.vue

@@ -2,12 +2,12 @@
 	<view class="page" :style="{'min-height':(h)+'px','padding-top':mt+'px'}">
 		<c-nav-bar title="核销" @goBack="back()"></c-nav-bar>
 		<view class="types">
-			<view class="item bg1" @tap="scanCode(0)">
+			<view class="item bg2" @tap="scanCode(0)">
 				<view class="n">扫码核销</view>
 				<u-icon name="arrow-right" color="#fff" size="26" label="点击扫描" label-color="#fff" label-size="28" cu
 					label-pos="left"></u-icon>
 			</view>
-			<view class="item bg2" @tap="scanCode(1)">
+			<view class="item bg1" @tap="scanCode(1)">
 				<view class="n">扫身份证</view>
 				<u-icon name="arrow-right" color="#fff" size="26" label="点击扫描" label-color="#fff" label-size="28"
 					label-pos="left"></u-icon>
@@ -92,7 +92,7 @@
 			},
 			scanCode(type) {
 				uni.scanCode({
-					onlyFromCamera:true,
+					onlyFromCamera: true,
 					success: (res) => {
 						console.log('扫码结果：' + res.result);
 						// 扫码成功后的操作，例如：
@@ -106,14 +106,14 @@
 			// 处理扫码结果的函数，可以根据实际需求进行扩展
 			handleScanResult(result, type) {
 				// 例如：导航到某个页面，或者处理其他业务逻辑
-				let sendData={};
-				sendData.playDate=this.orderInfo.playDate;
-				sendData.playTime=this.orderInfo.playTime;
-				sendData.playLength=this.orderInfo.playLength||1;
-				sendData.merchantId=this.orderInfo.merchantId;
-				sendData.orderType=this.orderInfo.orderType;
-				sendData.type=type;
-				sendData.writeOffCode=result;
+				let sendData = {};
+				sendData.playDate = this.orderInfo.playDate;
+				sendData.playTime = this.orderInfo.playTime;
+				sendData.playLength = this.orderInfo.playLength || 1;
+				sendData.merchantId = this.orderInfo.merchantId;
+				sendData.orderType = this.orderInfo.orderType;
+				sendData.type = type;
+				sendData.writeOffCode = result;
 				console.log(sendData)
 
 				this.$api.post('/scenic/order/scanCode', sendData).then(res => {
@@ -129,7 +129,7 @@
 						} else {
 							this.data.push(res.data.data)
 						}
-					}else{
+					} else {
 						this.$showToast(res.data.msg)
 					}
 				})

pagesMy/orderList/orderList.vue

@@ -18,7 +18,7 @@
 					<text v-else-if='item.orderStatus==1' class="green">已预订</text>
 					<text v-else-if='item.orderStatus==5' class="green">已退款</text>
 					<text v-else-if='item.orderStatus==4' class="green">已取消</text>
-					<text v-else-if='item.orderStatus==2' class="green">已入住</text>
+					<text v-else-if='item.orderStatus==2' class="green">{{item.orderType==2?'已入住':'已核销'}}</text>
 					<text v-else-if='item.orderStatus==3' class="green">已退房</text>
 					<text v-else :class="statusClass[item.orderStatus]">{{status[item.orderStatus]}}</text>
 				</view>