更改生产环境

components/Tabbar/index.vue

@@ -20,26 +20,26 @@
 			return {
 				tabbarValue: 0,
 				list: [{
-						activeImg: 'https://i.ringzle.com/file/20240106/57895bbc5414416ea5de2a537ed23dc3.png',
-						inactiveImg: 'https://i.ringzle.com/file/20240106/29bd09ef7eb748f1820c335f86f74c61.png',
+						activeImg: 'https://fsy.shengsi.gov.cn/file/20240106/57895bbc5414416ea5de2a537ed23dc3.png',
+						inactiveImg: 'https://fsy.shengsi.gov.cn/file/20240106/29bd09ef7eb748f1820c335f86f74c61.png',
 						text: '首页',
 						path: '/pages/home/index'
 					},
 					{
-						activeImg: 'https://i.ringzle.com/file/20240106/584d0a4108c44fa5bc566d0d0082e07d.png',
-						inactiveImg: 'https://i.ringzle.com/file/20240106/9561cd3843694891998a34ed41be0ec8.png',
+						activeImg: 'https://fsy.shengsi.gov.cn/file/20240106/584d0a4108c44fa5bc566d0d0082e07d.png',
+						inactiveImg: 'https://fsy.shengsi.gov.cn/file/20240106/9561cd3843694891998a34ed41be0ec8.png',
 						text: '房态',
 						path: '/pages/house/index'
 					},
 					{
-						activeImg: 'https://i.ringzle.com/file/20240106/41a218ecacd543b28faf20760712c372.png',
-						inactiveImg: 'https://i.ringzle.com/file/20240106/9873e71314e44c22aa880bec2ecdac85.png',
+						activeImg: 'https://fsy.shengsi.gov.cn/file/20240106/41a218ecacd543b28faf20760712c372.png',
+						inactiveImg: 'https://fsy.shengsi.gov.cn/file/20240106/9873e71314e44c22aa880bec2ecdac85.png',
 						text: '统计',
 						path: '/pages/statistics/index'
 					},
 					{
-						activeImg: 'https://i.ringzle.com/file/20240106/daf6362d4d6745c29501cf30a4d99bc2.png',
-						inactiveImg: 'https://i.ringzle.com/file/20240106/8c1f9fc0b5604ef7b966d98f2ffb1d2e.png',
+						activeImg: 'https://fsy.shengsi.gov.cn/file/20240106/daf6362d4d6745c29501cf30a4d99bc2.png',
+						inactiveImg: 'https://fsy.shengsi.gov.cn/file/20240106/8c1f9fc0b5604ef7b966d98f2ffb1d2e.png',
 						text: '我的',
 						path: '/pages/my/index'
 					}

components/Tabbares/index.vue

@@ -20,20 +20,20 @@
 			return {
 				tabbarValues: 0,
 				list: [{
-						activeImg: 'https://i.ringzle.com/file/20240320/eb54f2488b4f45c9929d2fa78b104b80.png',
-						inactiveImg: 'https://i.ringzle.com/file/20240106/29bd09ef7eb748f1820c335f86f74c61.png',
+						activeImg: 'https://fsy.shengsi.gov.cn/file/20240320/eb54f2488b4f45c9929d2fa78b104b80.png',
+						inactiveImg: 'https://fsy.shengsi.gov.cn/file/20240106/29bd09ef7eb748f1820c335f86f74c61.png',
 						text: '首页',
 						paths: '/pagesHouse/home/index'
 					},
 					{
-						activeImg: 'https://i.ringzle.com/file/20240320/df1512af95ff4f639e37b2fa905d7808.png',
-						inactiveImg: 'https://i.ringzle.com/file/20240320/07590c34e1fc45e2af4786607418039b.png',
+						activeImg: 'https://fsy.shengsi.gov.cn/file/20240320/df1512af95ff4f639e37b2fa905d7808.png',
+						inactiveImg: 'https://fsy.shengsi.gov.cn/file/20240320/07590c34e1fc45e2af4786607418039b.png',
 						text: '扫码核验',
 						paths: '/pagesHouse/Verification/index'
 					},
 					{
-						activeImg: 'https://i.ringzle.com/file/20240320/319f9665e40b40c7b056e1e50c8e1ce5.png',
-						inactiveImg: 'https://i.ringzle.com/file/20240320/81146a88ac964a8ab1effff76f44c9d1.png',
+						activeImg: 'https://fsy.shengsi.gov.cn/file/20240320/319f9665e40b40c7b056e1e50c8e1ce5.png',
+						inactiveImg: 'https://fsy.shengsi.gov.cn/file/20240320/81146a88ac964a8ab1effff76f44c9d1.png',
 						text: '我的',
 						paths: '/pagesHouse/Mine/index'
 					}

http/baseApi.js

@@ -5,8 +5,8 @@
 // const BaseApi = 'http://192.168.2.39:8080' //肖添伟
 // const BaseApi = 'http://192.168.3.6:8080' //朱壮波
 
-const BaseApi = 'https://i.ringzle.com/island-cloud-server' //测试服务器 
-
+const BaseApi = 'https://fsy.shengsi.gov.cn/island-cloud-server' //测试服务器 
+//const BaseApi = 'https://fsy.shengsi.gov.cn/island-cloud-server' //生产服务器
 export {
 	BaseApi
 }

pages/HotelMerchandise/addCommodity.vue

@@ -201,7 +201,7 @@
 			uploadFilePromisecover(url) {
 				return new Promise((resolve, reject) => {
 					let a = uni.uploadFile({
-						url: 'https://i.ringzle.com/island-cloud-server/oss/file/upload',
+						url: 'https://fsy.shengsi.gov.cn/island-cloud-server/oss/file/upload',
 						filePath: url,
 						name: 'file',
 						header: {
@@ -225,7 +225,7 @@
 			uploadFilePromise(url) {
 				return new Promise((resolve, reject) => {
 					let a = uni.uploadFile({
-						url: 'https://i.ringzle.com/island-cloud-server/oss/file/upload',
+						url: 'https://fsy.shengsi.gov.cn/island-cloud-server/oss/file/upload',
 						filePath: url,
 						name: 'file',
 						header: {

pages/HotelMerchandise/index.vue

@@ -18,7 +18,7 @@
 				</view>
 				<view class="right" @click="showList">
 					<view class="image">
-						<image src="https://i.ringzle.com/file/20240313/f3d301b3bc4544ffaf5a0d96a761dd00.png" mode="">
+						<image src="https://fsy.shengsi.gov.cn/file/20240313/f3d301b3bc4544ffaf5a0d96a761dd00.png" mode="">
 						</image>
 					</view>
 					<view class="text">
@@ -92,7 +92,7 @@
 				<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'">
+							:src="isSelect?'https://fsy.shengsi.gov.cn/file/20240228/c741a340e19642c59473e6f4a6d2f4be.png':'https://fsy.shengsi.gov.cn/file/20231027/db588133d67548fc82dfb0d128eac9a8.png'">
 						</image> -->
 						<image
 							:src="selectedTags.length>0?'https://fsy.shengsi.gov.cn/file/20240619/ab6bcbe73e114802a93baa7c40c7ac97.png':'https://fsy.shengsi.gov.cn/file/20240619/bf140a7159e249e7bf47be677a5d9585.png'">
@@ -125,7 +125,7 @@
 			<view class="pop-pop">
 				<view class="hander-one">
 					<view class="image">
-						<image src="https://i.ringzle.com/file/20240317/fdb4de4c4413429bb5a98b3f6c2bd856.png" mode="">
+						<image src="https://fsy.shengsi.gov.cn/file/20240317/fdb4de4c4413429bb5a98b3f6c2bd856.png" mode="">
 						</image>
 					</view>
 					<view class="text">
@@ -151,7 +151,7 @@
 			<view class="pop-pop">
 				<view class="hander-one">
 					<view class="image">
-						<image src="https://i.ringzle.com/file/20240317/fdb4de4c4413429bb5a98b3f6c2bd856.png" mode="">
+						<image src="https://fsy.shengsi.gov.cn/file/20240317/fdb4de4c4413429bb5a98b3f6c2bd856.png" mode="">
 						</image>
 					</view>
 					<view class="text">

pages/HotelMerchandise/index2.vue

@@ -21,7 +21,7 @@
 				</view>
 				<view class="right" @click="showList">
 					<view class="image">
-						<image src="https://i.ringzle.com/file/20240313/f3d301b3bc4544ffaf5a0d96a761dd00.png" mode="">
+						<image src="https://fsy.shengsi.gov.cn/file/20240313/f3d301b3bc4544ffaf5a0d96a761dd00.png" mode="">
 						</image>
 					</view>
 					<view class="text">
@@ -43,7 +43,7 @@
 									</view>
 									<view class="image" v-if="areaShowIndex == index">
 										<image
-											src="https://i.ringzle.com/file/20240316/16dd69efb40242de83da8207539ec73e.png"
+											src="https://fsy.shengsi.gov.cn/file/20240316/16dd69efb40242de83da8207539ec73e.png"
 											mode=""></image>
 									</view>
 								</view>
@@ -59,7 +59,7 @@
 			<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'">
+						:src="selectedTags.includes(item)?'https://fsy.shengsi.gov.cn/file/20240228/c741a340e19642c59473e6f4a6d2f4be.png':'https://fsy.shengsi.gov.cn/file/20231027/db588133d67548fc82dfb0d128eac9a8.png'">
 					</image>
 				</view>
 			</view>
@@ -109,7 +109,7 @@
 			<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'">
+						:src="selectedTags.includes(item)?'https://fsy.shengsi.gov.cn/file/20240228/c741a340e19642c59473e6f4a6d2f4be.png':'https://fsy.shengsi.gov.cn/file/20231027/db588133d67548fc82dfb0d128eac9a8.png'">
 					</image>
 				</view>
 			</view>
@@ -159,7 +159,7 @@
 				<view class="left">
 					<view class="image">
 						<image
-							:src="selectedTags.length>0?'https://i.ringzle.com/file/20240228/c741a340e19642c59473e6f4a6d2f4be.png':'https://i.ringzle.com/file/20231027/db588133d67548fc82dfb0d128eac9a8.png'">
+							:src="selectedTags.length>0?'https://fsy.shengsi.gov.cn/file/20240228/c741a340e19642c59473e6f4a6d2f4be.png':'https://fsy.shengsi.gov.cn/file/20231027/db588133d67548fc82dfb0d128eac9a8.png'">
 						</image>
 					</view>
 					<view class="text">
@@ -218,7 +218,7 @@
 			<view class="pop-pop">
 				<view class="hander-one">
 					<view class="image">
-						<image src="https://i.ringzle.com/file/20240317/fdb4de4c4413429bb5a98b3f6c2bd856.png" mode="">
+						<image src="https://fsy.shengsi.gov.cn/file/20240317/fdb4de4c4413429bb5a98b3f6c2bd856.png" mode="">
 						</image>
 					</view>
 					<view class="text">
@@ -244,7 +244,7 @@
 			<view class="pop-pop">
 				<view class="hander-one">
 					<view class="image">
-						<image src="https://i.ringzle.com/file/20240317/fdb4de4c4413429bb5a98b3f6c2bd856.png" mode="">
+						<image src="https://fsy.shengsi.gov.cn/file/20240317/fdb4de4c4413429bb5a98b3f6c2bd856.png" mode="">
 						</image>
 					</view>
 					<view class="text">

pages/home/index.vue

@@ -173,10 +173,10 @@
 				list: [],
 				statusClass: ['', 'green', 'blue', 'grey', 'grey'],
 				status: ['', '已预订', '已入住', '已退房', '已取消'],
-				icons: ['https://i.ringzle.com/file/20240316/11f5fb8c696445bfa3b4f711480f01ae.png',
-					'https://i.ringzle.com/file/20240316/67b6030b8e5b4270bb6bec4336966dbf.png',
-					'https://i.ringzle.com/file/20240316/f53883f0f0ba463aa63476d9a4370c3c.png',
-					'https://i.ringzle.com/file/20240316/fb22921cc3654a33998b50bf825eca18.png'
+				icons: ['https://fsy.shengsi.gov.cn/file/20240316/11f5fb8c696445bfa3b4f711480f01ae.png',
+					'https://fsy.shengsi.gov.cn/file/20240316/67b6030b8e5b4270bb6bec4336966dbf.png',
+					'https://fsy.shengsi.gov.cn/file/20240316/f53883f0f0ba463aa63476d9a4370c3c.png',
+					'https://fsy.shengsi.gov.cn/file/20240316/fb22921cc3654a33998b50bf825eca18.png'
 				],
 				page: 1,
 				limit: 10,
@@ -495,7 +495,7 @@
 		.bg {
 			width: 100%;
 			height: 743rpx;
-			background: url(https://i.ringzle.com/file/20240107/8bc656fc64fd4386a6b336a7dc8c86d0.png) no-repeat;
+			background: url(https://fsy.shengsi.gov.cn/file/20240107/8bc656fc64fd4386a6b336a7dc8c86d0.png) no-repeat;
 			background-size: 100% 100%;
 			box-sizing: border-box;
 

pages/house/WriteOffResults.vue

@@ -3,7 +3,7 @@
 		<c-nav-bar title="核销结果" showIcon="true" :titleStyle="titleStyle"></c-nav-bar>
 
 		<view class="result">
-			<image src="https://i.ringzle.com/file/20240319/331e202150fa4f328b8441db8dc0415e.png" mode="aspectFill">
+			<image src="https://fsy.shengsi.gov.cn/file/20240319/331e202150fa4f328b8441db8dc0415e.png" mode="aspectFill">
 			</image>
 			<text>核销成功</text>
 			<view>￥<span>{{price}}</span></view>

pages/house/createOrder.vue

@@ -362,7 +362,6 @@
 				uni.$once('toSendData', () => {
 					uni.$emit('sendData', this.dataForm)
 				})
-				console.log(this.dataForm)
 				uni.navigateTo({
 					url: '/pages/house/stayCheck',
 					events: {
@@ -494,7 +493,6 @@
 					newDataForm.detailFormList[0].checkInPersonList;
 				//入住人里面身份证
 				//let len = this.tempCheckInPersonList;
-				console.log(newDataForm.detailFormList[0].checkInPersonList)
 				checkInPersonList.forEach((element, i) => {
 					//姓名 checkInName,idCard,checkInPhone
 					//新增直接加密，编辑判断是否修改

pages/login/appIndex.vue

@@ -1,7 +1,7 @@
-<template>
-	<view class="page" :style="{'min-height':h+'px'}">
-		<view class="box">
-			<view class="text">您好！欢迎使用<br>游嵊泗商家服务平台</view>
+<template>
+	<view class="page" :style="{'min-height':h+'px'}">
+		<view class="box">
+			<view class="text">您好！欢迎使用<br>游嵊泗商家服务平台</view>
 			<view class="login">
 				<view class="item">
 					<u--input
@@ -32,18 +32,18 @@
 						readonly
 						v-model="userType"
 					></u--input>
-				</view> -->
+				</view> -->
 				<button @click="login">登录</button>
-				<u-picker :show="typeShow" :columns="columns" @close="typeShow=false" @cancel="typeShow=false" @confirm="confirm"></u-picker>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
+				<u-picker :show="typeShow" :columns="columns" @close="typeShow=false" @cancel="typeShow=false" @confirm="confirm"></u-picker>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
 				typeShow:false,
 				userType:'',
 				columns:[['酒店民宿','商家']],
@@ -52,15 +52,15 @@
 					username:'',
 					password:'',
 					usertype:'1',
-					captcha:'666',
-					uuid: "",
+					captcha:'666',
+					uuid: "",
 					grant_type: "password",
-				}
-			}
-		},
-		onLoad() {
-			uni.clearStorageSync();
-		},
+				}
+			}
+		},
+		onLoad() {
+			uni.clearStorageSync();
+		},
 		methods: {
 			confirm(e){
 				this.userType = e.value[0];
@@ -72,7 +72,7 @@
 				if(!this.dataFrom.password) return this.$showToast('请输入密码');
 				// if(!this.dataFrom.usertype) return this.$showToast('请选择类型');
 				
-				uni.setStorageSync('authorization','Basic cmVucmVuaW86cmVucmVuaW8=');
+				uni.setStorageSync('authorization','Basic cmVucmVuaW86cmVucmVuaW8=');
 				let that = this;
 				this.$api.post("/auth/oauth/token", {
 					...this.dataFrom,
@@ -94,38 +94,38 @@
 						})
 					}else that.$showToast(res.data.msg)
 				})
-			}
-		}
-	}
-</script>
-
-<style scoped lang="less">
-	.page{
-		background: url(https://i.ringzle.com/file/20240109/472b6b7b9ea44652b85e73c796876378.png) no-repeat;
-		background-size: 100% 100%;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		.box{
-			width: calc(100% - 180rpx);
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-			image{
-				width: 480rpx;
-				height: 520rpx;
-			}
-			.text{
-				text-align: center;
-				font-size: 56rpx;
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 800;
-				color: #FFFFFF;
-				line-height: 96rpx;
-			}
-			.login{
-				margin-top: 80rpx;
-				width: 100%;
+			}
+		}
+	}
+</script>
+
+<style scoped lang="less">
+	.page{
+		background: url(https://fsy.shengsi.gov.cn/file/20240109/472b6b7b9ea44652b85e73c796876378.png) no-repeat;
+		background-size: 100% 100%;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		.box{
+			width: calc(100% - 180rpx);
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			image{
+				width: 480rpx;
+				height: 520rpx;
+			}
+			.text{
+				text-align: center;
+				font-size: 56rpx;
+				font-family: PingFang SC, PingFang SC;
+				font-weight: 800;
+				color: #FFFFFF;
+				line-height: 96rpx;
+			}
+			.login{
+				margin-top: 80rpx;
+				width: 100%;
 				
 				.item{
 					margin-bottom: 40rpx;
@@ -133,20 +133,20 @@
 						color: #FFFFFF !important;
 					}
 				}
-				
-				button{
-					width: 100%;
-					height: 100%;
-					background: #FFFFFF;
-					border-radius: 48rpx 48rpx 48rpx 48rpx;
-					line-height: 96rpx;
-					text-align: center;
-					font-size: 34rpx;
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 400;
-					color: #145EE6;
-				}
-			}
-		}
-	}
+				
+				button{
+					width: 100%;
+					height: 100%;
+					background: #FFFFFF;
+					border-radius: 48rpx 48rpx 48rpx 48rpx;
+					line-height: 96rpx;
+					text-align: center;
+					font-size: 34rpx;
+					font-family: PingFang SC, PingFang SC;
+					font-weight: 400;
+					color: #145EE6;
+				}
+			}
+		}
+	}
 </style>

pages/login/index.vue

@@ -1,126 +1,126 @@
-<template>
-	<view class="page" :style="{'min-height':h+'px'}">
-		<view class="box">
-			<!-- 	<image src="https://i.ringzle.com/file/20240109/d6c4691423cf40c2bdf9210d389cdd1e.png"></image>
-			<view class="text">您好！欢迎使用<br>游嵊泗商家服务平台</view> -->
-			<!-- <view class="" @click="aa()">核销</view> -->
-			<view class="login">
-				<button open-type="getPhoneNumber" @getphonenumber="decryptPhoneNumber">授权手机号登录</button>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-
-			}
-		},
-		onLoad() {
-			uni.clearStorageSync();
-		},
-		methods: {
-			aa() {
-				uni.reLaunch({
-					url: "/pagesHouse/hexiao/index"
-				})
-			},
-			//获取手机号进行登录
-			decryptPhoneNumber(e) {
-				if (e.detail.code) this.wxLogin(e.detail.code);
-			},
-			// 登录
-			wxLogin(code) {
-				uni.showLoading({
-					title: '登录中'
-				});
-				let that = this;
-				wx.login({
-					success(res) {
-						that.$api.post('/auth/oauth/token', {
-							code: res.code,
-							phoneCode: code,
-							grant_type: 'merchantWeChat',
-							captcha: 'aaa'
-						}, false).then(result => {
-							if (result.data.code === 0) {
-								uni.setStorageSync('authorization', result.data.token_type + ' ' + result
-									.data.access_token);
-								uni.setStorageSync('access_token', result.data.access_token);
-								that.$api.get('/sys/user/info').then(resu => {
-									if (resu.data.code === 0) {
-										that.$showToast('登录成功');
-										uni.setStorageSync('userInfo', resu.data.data);
-										setTimeout(() => {
-											uni.reLaunch({
-												url: '/pages/login/select?userInfo=' +
-													encodeURIComponent(JSON
-														.stringify(resu.data.data))
-											})
-										}, 1500)
-									} else that.$showToast(resu.data.msg)
-								})
+<template>
+	<view class="page" :style="{'min-height':h+'px'}">
+		<view class="box">
+			<!-- 	<image src="https://fsy.shengsi.gov.cn/file/20240109/d6c4691423cf40c2bdf9210d389cdd1e.png"></image>
+			<view class="text">您好！欢迎使用<br>游嵊泗商家服务平台</view> -->
+			<!-- <view class="" @click="aa()">核销</view> -->
+			<view class="login">
+				<button open-type="getPhoneNumber" @getphonenumber="decryptPhoneNumber">授权手机号登录</button>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			}
+		},
+		onLoad() {
+			uni.clearStorageSync();
+		},
+		methods: {
+			aa() {
+				uni.reLaunch({
+					url: "/pagesHouse/hexiao/index"
+				})
+			},
+			//获取手机号进行登录
+			decryptPhoneNumber(e) {
+				if (e.detail.code) this.wxLogin(e.detail.code);
+			},
+			// 登录
+			wxLogin(code) {
+				uni.showLoading({
+					title: '登录中'
+				});
+				let that = this;
+				wx.login({
+					success(res) {
+						that.$api.post('/auth/oauth/token', {
+							code: res.code,
+							phoneCode: code,
+							grant_type: 'merchantWeChat',
+							captcha: 'aaa'
+						}, false).then(result => {
+							if (result.data.code === 0) {
+								uni.setStorageSync('authorization', result.data.token_type + ' ' + result
+									.data.access_token);
+								uni.setStorageSync('access_token', result.data.access_token);
+								that.$api.get('/sys/user/info').then(resu => {
+									if (resu.data.code === 0) {
+										that.$showToast('登录成功');
+										uni.setStorageSync('userInfo', resu.data.data);
+										setTimeout(() => {
+											uni.reLaunch({
+												url: '/pages/login/select?userInfo=' +
+													encodeURIComponent(JSON
+														.stringify(resu.data.data))
+											})
+										}, 1500)
+									} else that.$showToast(resu.data.msg)
+								})
 							} else{
 								if(result.data.msg.indexOf('请先申请成为商家')>-1){
 									uni.navigateTo({ url: '/pages/login/apply' })
 								}else that.$showToast(result.data.msg)
-							} 
-						})
-					}
-				})
-			}
-		}
-	}
-</script>
-
-<style scoped lang="less">
-	.page {
-		background: url(https://i.ringzle.com/file/20240523/474a7a2656cb499d851cf7665f9d7d6a.png) no-repeat;
-		background-size: 100% 100%;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-
-		.box {
-			width: calc(100% - 180rpx);
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-
-			image {
-				width: 480rpx;
-				height: 520rpx;
-			}
-
-			.text {
-				text-align: center;
-				font-size: 56rpx;
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 800;
-				color: #FFFFFF;
-				line-height: 96rpx;
-			}
-
-			.login {
-				margin-top: 780rpx;
-				width: 100%;
-				height: 96rpx;
-
-				button {
-					width: 100%;
-					height: 100%;
-					background: #1372FF;
-					border-radius: 48rpx 48rpx 48rpx 48rpx;
-					line-height: 96rpx;
-					text-align: center;
-					font-size: 32rpx;
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 400;
-					color: #FFFFFF;
-				}
-			}
-		}
-	}
+							} 
+						})
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style scoped lang="less">
+	.page {
+		background: url(https://fsy.shengsi.gov.cn/file/20240523/474a7a2656cb499d851cf7665f9d7d6a.png) no-repeat;
+		background-size: 100% 100%;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+
+		.box {
+			width: calc(100% - 180rpx);
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+
+			image {
+				width: 480rpx;
+				height: 520rpx;
+			}
+
+			.text {
+				text-align: center;
+				font-size: 56rpx;
+				font-family: PingFang SC, PingFang SC;
+				font-weight: 800;
+				color: #FFFFFF;
+				line-height: 96rpx;
+			}
+
+			.login {
+				margin-top: 780rpx;
+				width: 100%;
+				height: 96rpx;
+
+				button {
+					width: 100%;
+					height: 100%;
+					background: #1372FF;
+					border-radius: 48rpx 48rpx 48rpx 48rpx;
+					line-height: 96rpx;
+					text-align: center;
+					font-size: 32rpx;
+					font-family: PingFang SC, PingFang SC;
+					font-weight: 400;
+					color: #FFFFFF;
+				}
+			}
+		}
+	}
 </style>

pages/login/select.vue

@@ -1,26 +1,26 @@
-<template>
-	<view class="page" :style="{'height':h+'px','padding-top':mt+'px'}">
-		<c-nav-bar title="选择门店" backUrl="/pages/login/index" @goBack="goBack" :showHome="false"></c-nav-bar>
-		<view class="card" v-for="(item,index) in list" :key="index" @tap="toHome(item)">
-			<view>
-				<text>{{item.merchantName}}</text>
-				<text>{{item.typeName}}</text>
-			</view>
-			<view>进店</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				//userInfo: null,
-				merchantId: '',
-				types: [],
-				list: []
-			}
-		},
+<template>
+	<view class="page" :style="{'height':h+'px','padding-top':mt+'px'}">
+		<c-nav-bar title="选择门店" backUrl="/pages/login/index" @goBack="goBack" :showHome="false"></c-nav-bar>
+		<view class="card" v-for="(item,index) in list" :key="index" @tap="toHome(item)">
+			<view>
+				<text>{{item.merchantName}}</text>
+				<text>{{item.typeName}}</text>
+			</view>
+			<view>进店</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				//userInfo: null,
+				merchantId: '',
+				types: [],
+				list: []
+			}
+		},
 		created() {
 			if(uni.getStorageSync('userInfo')) this.getType();
 			else{
@@ -34,10 +34,10 @@
 						url: '/pages/login/index'
 					})
 				// #endif
-			}
-		},
-		onLoad(option) {
-			//if (option.userInfo) this.userInfo = JSON.parse(decodeURIComponent(option.userInfo));
+			}
+		},
+		onLoad(option) {
+			//if (option.userInfo) this.userInfo = JSON.parse(decodeURIComponent(option.userInfo));
 			if(uni.getStorageSync('userInfo')) this.getList();
 			else{
 				// #ifdef APP-PLUS
@@ -50,108 +50,108 @@
 						url: '/pages/login/index'
 					})
 				// #endif
-			}
-		},
-		methods: {
-			goBack(e) {
-				uni.clearStorageSync();
-			},
-			getType() {
-				this.$api.post('/api/dict/getListByTypes', ['BusinessType']).then(res => {
-					if (res.data.code === 0) {
-						this.types = res.data.data
-					} else this.$showToast(res.data.msg);
-				})
-			},
-			getList() {
-				this.$api.post('/merchant/register/getMerchantStoreList').then(res => {
-					if (res.data.code === 0) {
-						this.list = res.data.data;
-						this.list.forEach(l => {
-							let t = this.types.find(t => t.dictValue == l.merchantType);
-							l.typeName = t ? t.dictLabel : ''
-						})
-					} else this.$showToast(res.data.msg);
-				})
-			},
-			toHome(item) { //1711268640588517378   1721450548101648385
-				uni.setStorageSync('merchantType', item.merchantType);
-				if (item.merchantType == 2) { //民宿
-					uni.setStorageSync('homestayId', item.merchantId);
-					uni.setStorageSync('merchantId', '');
-					uni.reLaunch({
-						url: '/pages/home/index'
-					})
-				} else { //渔家乐和餐饮
-					uni.setStorageSync('homestayId', '');
-					uni.setStorageSync('merchantId', item.merchantId);
-					uni.setStorageSync('merchantName', item.merchantName);
-					uni.reLaunch({
-						url: '/pagesHouse/home/index'
-					})
-				}
-
-			}
-		}
-	}
-</script>
-
-<style scoped lang="less">
-	.page {
-		background: #F3F4F4;
-		padding-bottom: 20rpx;
-		box-sizing: border-box;
-		overflow-y: auto;
-
-		.card {
-			width: calc(100% - 60rpx);
-			height: 180rpx;
-			background: #FFFFFF;
-			border-radius: 10rpx 10rpx 10rpx 10rpx;
-			margin: 20rpx 30rpx 0;
-			padding: 0 30rpx 0 60rpx;
-			box-sizing: border-box;
-			background: url(https://i.ringzle.com/file/20240109/1ee084be17f74dde94617dcb7f7c8af3.png) no-repeat;
-			background-size: 100% 100%;
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
-
-			&>view {
-				&:first-child {
-					display: flex;
-					flex-direction: column;
-
-					text {
-						font-size: 32rpx;
-						font-family: PingFang SC, PingFang SC;
-						font-weight: 800;
-						color: #1E3A62;
-
-						&:last-child {
-							font-size: 24rpx;
-							font-family: PingFang SC, PingFang SC;
-							font-weight: 400;
-							color: #1E3A62;
-							margin-top: 10rpx;
-						}
-					}
-				}
-
-				&:last-child {
-					width: 140rpx;
-					height: 56rpx;
-					border-radius: 36rpx 36rpx 36rpx 36rpx;
-					border: 1rpx solid #70849F;
-					background: transparent;
-					line-height: 56rpx;
-					text-align: center;
-					font-size: 28rpx;
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 800;
-					color: #1E3A62;
-				}
-			}
-		}
-	}
+			}
+		},
+		methods: {
+			goBack(e) {
+				uni.clearStorageSync();
+			},
+			getType() {
+				this.$api.post('/api/dict/getListByTypes', ['BusinessType']).then(res => {
+					if (res.data.code === 0) {
+						this.types = res.data.data
+					} else this.$showToast(res.data.msg);
+				})
+			},
+			getList() {
+				this.$api.post('/merchant/register/getMerchantStoreList').then(res => {
+					if (res.data.code === 0) {
+						this.list = res.data.data;
+						this.list.forEach(l => {
+							let t = this.types.find(t => t.dictValue == l.merchantType);
+							l.typeName = t ? t.dictLabel : ''
+						})
+					} else this.$showToast(res.data.msg);
+				})
+			},
+			toHome(item) { //1711268640588517378   1721450548101648385
+				uni.setStorageSync('merchantType', item.merchantType);
+				if (item.merchantType == 2) { //民宿
+					uni.setStorageSync('homestayId', item.merchantId);
+					uni.setStorageSync('merchantId', '');
+					uni.reLaunch({
+						url: '/pages/home/index'
+					})
+				} else { //渔家乐和餐饮
+					uni.setStorageSync('homestayId', '');
+					uni.setStorageSync('merchantId', item.merchantId);
+					uni.setStorageSync('merchantName', item.merchantName);
+					uni.reLaunch({
+						url: '/pagesHouse/home/index'
+					})
+				}
+
+			}
+		}
+	}
+</script>
+
+<style scoped lang="less">
+	.page {
+		background: #F3F4F4;
+		padding-bottom: 20rpx;
+		box-sizing: border-box;
+		overflow-y: auto;
+
+		.card {
+			width: calc(100% - 60rpx);
+			height: 180rpx;
+			background: #FFFFFF;
+			border-radius: 10rpx 10rpx 10rpx 10rpx;
+			margin: 20rpx 30rpx 0;
+			padding: 0 30rpx 0 60rpx;
+			box-sizing: border-box;
+			background: url(https://fsy.shengsi.gov.cn/file/20240109/1ee084be17f74dde94617dcb7f7c8af3.png) no-repeat;
+			background-size: 100% 100%;
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+
+			&>view {
+				&:first-child {
+					display: flex;
+					flex-direction: column;
+
+					text {
+						font-size: 32rpx;
+						font-family: PingFang SC, PingFang SC;
+						font-weight: 800;
+						color: #1E3A62;
+
+						&:last-child {
+							font-size: 24rpx;
+							font-family: PingFang SC, PingFang SC;
+							font-weight: 400;
+							color: #1E3A62;
+							margin-top: 10rpx;
+						}
+					}
+				}
+
+				&:last-child {
+					width: 140rpx;
+					height: 56rpx;
+					border-radius: 36rpx 36rpx 36rpx 36rpx;
+					border: 1rpx solid #70849F;
+					background: transparent;
+					line-height: 56rpx;
+					text-align: center;
+					font-size: 28rpx;
+					font-family: PingFang SC, PingFang SC;
+					font-weight: 800;
+					color: #1E3A62;
+				}
+			}
+		}
+	}
 </style>

pages/my/houseList.vue

@@ -157,7 +157,7 @@
 				console.log(url)
 				return new Promise((resolve, reject) => {
 					let a = uni.uploadFile({
-						url: 'https://i.ringzle.com/island-cloud-server/oss/file/upload',
+						url: 'https://fsy.shengsi.gov.cn/island-cloud-server/oss/file/upload',
 						filePath: url,
 						name: 'file',
 						header: {

pages/my/houseList1.vue

@@ -281,7 +281,7 @@
 				console.log(url)
 				return new Promise((resolve, reject) => {
 					let a = uni.uploadFile({
-						url: 'https://i.ringzle.com/island-cloud-server/oss/file/upload',
+						url: 'https://fsy.shengsi.gov.cn/island-cloud-server/oss/file/upload',
 						filePath: url,
 						name: 'file',
 						header: {

pages/my/index.vue

@@ -52,25 +52,25 @@
 					fontWeight: "bold",
 					color: '#FFFFFF'
 				},
-				avatar: 'https://i.ringzle.com/file/20240107/d61321708599457bbcca1c089154e635.png',
+				avatar: 'https://fsy.shengsi.gov.cn/file/20240107/d61321708599457bbcca1c089154e635.png',
 				name: '未知',
 				menus: [{
-						img: 'https://i.ringzle.com/file/20240107/83bca90dfb3f4b1fba36115dc7269219.png',
+						img: 'https://fsy.shengsi.gov.cn/file/20240107/83bca90dfb3f4b1fba36115dc7269219.png',
 						title: '待确认',
 						path: ''
 					},
 					{
-						img: 'https://i.ringzle.com/file/20240107/7e7825255bbc4d06ae5d75e7bb23db71.png',
+						img: 'https://fsy.shengsi.gov.cn/file/20240107/7e7825255bbc4d06ae5d75e7bb23db71.png',
 						title: '未支付',
 						path: ''
 					},
 					{
-						img: 'https://i.ringzle.com/file/20240107/c368a627821244929ab6477acb46fb15.png',
+						img: 'https://fsy.shengsi.gov.cn/file/20240107/c368a627821244929ab6477acb46fb15.png',
 						title: '已预订',
 						path: ''
 					},
 					{
-						img: 'https://i.ringzle.com/file/20240107/656b5cc9e9514a08a3f2abd86d86b4ca.png',
+						img: 'https://fsy.shengsi.gov.cn/file/20240107/656b5cc9e9514a08a3f2abd86d86b4ca.png',
 						title: '已取消',
 						path: ''
 					}
@@ -109,7 +109,7 @@
 			width: 100%;
 			height: 412rpx;
 			padding: 0 60rpx;
-			background: url(https://i.ringzle.com/file/20240107/fc66824bcef14a3b9e19f8b966a128c7.png) no-repeat;
+			background: url(https://fsy.shengsi.gov.cn/file/20240107/fc66824bcef14a3b9e19f8b966a128c7.png) no-repeat;
 			background-size: 100% 100%;
 			box-sizing: border-box;
 			position: relative;

pagesHouse/HotelMerchandise/index.vue

@@ -22,7 +22,7 @@
 				</view>
 				<view class="right" @click="showList">
 					<view class="image">
-						<image src="https://i.ringzle.com/file/20240313/f3d301b3bc4544ffaf5a0d96a761dd00.png" mode="">
+						<image src="https://fsy.shengsi.gov.cn/file/20240313/f3d301b3bc4544ffaf5a0d96a761dd00.png" mode="">
 						</image>
 					</view>
 					<view class="text">
@@ -47,7 +47,7 @@
 										</view>
 										<view class="image" v-if="areaShowIndex == index">
 											<image
-												src="https://i.ringzle.com/file/20240316/16dd69efb40242de83da8207539ec73e.png"
+												src="https://fsy.shengsi.gov.cn/file/20240316/16dd69efb40242de83da8207539ec73e.png"
 												mode=""></image>
 										</view>
 									</view>
@@ -63,7 +63,7 @@
 										</view>
 										<view class="image" v-if="areaShowIndex == index">
 											<image
-												src="https://i.ringzle.com/file/20240316/16dd69efb40242de83da8207539ec73e.png"
+												src="https://fsy.shengsi.gov.cn/file/20240316/16dd69efb40242de83da8207539ec73e.png"
 												mode=""></image>
 										</view>
 									</view>
@@ -80,7 +80,7 @@
 			<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'">
+						:src="selectedTags.includes(item)?'https://fsy.shengsi.gov.cn/file/20240228/c741a340e19642c59473e6f4a6d2f4be.png':'https://fsy.shengsi.gov.cn/file/20231027/db588133d67548fc82dfb0d128eac9a8.png'">
 					</image>
 				</view>
 			</view>
@@ -171,7 +171,7 @@
 				<view class="left">
 					<view class="image">
 						<image
-							:src="selectedTags.length>0?'https://i.ringzle.com/file/20240228/c741a340e19642c59473e6f4a6d2f4be.png':'https://i.ringzle.com/file/20231027/db588133d67548fc82dfb0d128eac9a8.png'">
+							:src="selectedTags.length>0?'https://fsy.shengsi.gov.cn/file/20240228/c741a340e19642c59473e6f4a6d2f4be.png':'https://fsy.shengsi.gov.cn/file/20231027/db588133d67548fc82dfb0d128eac9a8.png'">
 						</image>
 					</view>
 					<view class="text">
@@ -399,7 +399,7 @@
 					// 	json.name = item.dictLabel;
 					// 	json.type = item.dictValue;
 					// 	json.icon =
-					// 		'https://i.ringzle.com/file/20231125/a314703e463d43c7808714d1b29632ad.png';
+					// 		'https://fsy.shengsi.gov.cn/file/20231125/a314703e463d43c7808714d1b29632ad.png';
 					// 	return json
 					// })					
 				})

pagesHouse/Mine/PersonalEditing/PersonalEditing.vue

@@ -112,7 +112,7 @@
 						this.list = res.data.data;
 						if (!res.data.data.shopSign) {
 							this.list.shopSign =
-								'https://i.ringzle.com/file/20240225/26feb8cc8f744123a980211ebdfb8d40.png';
+								'https://fsy.shengsi.gov.cn/file/20240225/26feb8cc8f744123a980211ebdfb8d40.png';
 						}
 					}
 				})
@@ -126,7 +126,7 @@
 						this.$api.detectionContent(tempFilePaths[0], 2).then(result => {
 							if (result.code === 0) {
 								uni.uploadFile({
-									url: 'https://i.ringzle.com/island-cloud-server/oss/file/upload', // 仅为示例，非真实的接口地址
+									url: 'https://fsy.shengsi.gov.cn/island-cloud-server/oss/file/upload', // 仅为示例，非真实的接口地址
 									filePath: tempFilePaths[0],
 									name: 'file',
 									header: {

pagesHouse/Mine/index.vue

@@ -1,485 +1,485 @@
-<template>
-	<view class="page" :style="{'min-height':(h-th)+'px','padding-top':mt+'px'}">
-		<image class="bg_img" src="https://i.ringzle.com/file/20240129/3931d06eaa3346c9955aa7e5e535a95b.png"
-			mode="widthFix"></image>
-		<!-- <view class="account" :style="{'margin-top':(mt-44)+'px'}"> -->
-		<view class="account">
-			<view class="a_left">
-				<view class="al_avatar">
-					<image :src="dto.storeFrontPic"></image>
-				</view>
-				<view class="al_name_edit">
-					<text>{{dto.name==''?'临时商户':dto.name}}</text>
-					<view class="ane_edit" @tap="toTurn('/pagesHouse/Mine/PersonalEditing/PersonalEditing',true)">
-						<text>编辑</text>
-						<image src="https://i.ringzle.com/file/20240129/e824a765b6c24ac6aafbb49b12c23aa9.png"></image>
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="orders box">
-			<view class="o_title">
-				<text>我的订单</text>
-				<view class="ot_all" @tap="toTurn('/pagesHouse/Mine/ordersList/index?type=&index=-1',true)">
-					<!-- <view class="ot_all" @tap="toToast"> -->
-					<text>全部订单</text>
-					<!-- <image src="../../static/index/steamerTicket/icon_yjt.png"></image> -->
-				</view>
-			</view>
-			<view class="o_menus">
-				<view v-for="(item,index) in orderMenus" :key="index"
-					@tap="toTurn('/pagesHouse/Mine/ordersList/index?type='+item.type+'&index='+index,true)">
-					<!-- <view v-for="(item,index) in orderMenus" :key="index" @tap="toToast"> -->
-					<image :src="item.img"></image>
-					<text>{{item.text}}</text>
-				</view>
-			</view>
-		</view>
-
-		<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>
-			<view class="">
-				<u-icon name="arrow-right"></u-icon>
-			</view>
-		</view>
-
-		<view class="" style="padding: 24rpx; background-color: #fff; margin: 0 20rpx ; border-radius: 16rpx;position: relative;">
-			<view class="one-input">
-				<u-row customStyle="margin-bottom: 10px">
-					<u-col span="7.8">
-						<view class="demo-layout bg-purple-light">
-							<view class="one2">
-								<!-- {{myList.islandName}} -->
-								{{dto.companyName}}
-							</view>
-							<view class="two2">
-								{{dto.areaDetail}}
-							</view>
-						</view>
-					</u-col>
-					<u-col span="4" @click="navigation">
-						<view class="demo-layout bg-purple">
-						</view>
-					</u-col>
-				</u-row>
-			</view>
-		</view>
-		<Tabbares :tabbarid="2"></Tabbares>
-	</view>
-</template>
-
-<script>
-	export default {
-
-		data() {
-			return {
-				h: uni.getSystemInfoSync().windowHeight,
-				w: uni.getSystemInfoSync().windowWidth,
-				mt: uni.getSystemInfoSync().statusBarHeight + 44,
-				avatar: 'https://i.ringzle.com/file/20240129/5b4a757190334fa7ae8616620c770bc4.png', 
-				name: '游客',
-				orderMenus: [ //type:1 待付款、2 待使用、3 待评价、4 退款/售后
-					{
-						type: 0,
-						img: 'https://i.ringzle.com/file/20240129/818fa751cf8d4772ac1cf818522a7f54.png',
-						text: '待支付'
-					},
-					{
-						type: 4,
-						img: 'https://i.ringzle.com/file/20240129/c4ef5f92f5274dbe9e281ad509571fc3.png',
-						text: '待使用'
-					},
-					{
-						type: 3,
-						img: 'https://i.ringzle.com/file/20240129/2a73e5e9afcf4d759b31e5332a21d012.png',
-						text: '已完成'
-					},
-					{
-						type: -3,
-						img: 'https://i.ringzle.com/file/20240129/f3fd049aaffb4768aa115572851a2bb1.png',
-						text: '退款/售后'
-					}
-				],
-				price: 0, //钱包余额
-				merchantName: uni.getStorageSync('merchantName'),
-				merchantType: uni.getStorageSync('merchantType'),
-				dto: {}
-			}
-		},
-		onLoad() {
-			this.getInfo();
-		},
-		methods: {
-			toTurn(url, login) { //login 是否需要验证登录跳转
-				if (!url) return this.$showToast('正在开发中...')
-				uni.navigateTo({
-					url
-				});
-
-			},
-			getInfo() {
-				this.$api.get('/api/merchant/food/merchant/' + uni.getStorageSync('merchantId')).then(res => {
-					if (res.data.code == 0) {
-						this.dto = res.data.data;
-						if (!res.data.data.shopSign) {
-							this.dto.shopSign =
-								'https://i.ringzle.com/file/20240225/26feb8cc8f744123a980211ebdfb8d40.png';
-						}
-						//this.shopImgs = res.data.data.split(',');
-					}
-				})
-			},
-		}
-	}
-</script>
-<style scoped lang="less">
-	.page {
-		background: #F5F8FA;
-		padding-bottom: 256rpx;
-		box-sizing: border-box;
-
-		.bg_img {
-			width: 100%;
-			position: absolute;
-			top: 0;
-			left: 0;
-			z-index: 0;
-		}
-
-		.account {
-			width: 100%;
-			display: flex;
-			justify-content: space-between;
-
-			.a_left {
-				padding: 10rpx 0 0 40rpx;
-				display: flex;
-				z-index: 1;
-
-				.al_avatar {
-					width: 120rpx;
-					height: 120rpx;
-					border-radius: 50%;
-					background: #FFFFFF;
-					padding: 4rpx;
-					box-sizing: border-box;
-
-					image {
-						width: 100%;
-						height: 100%;
-						border-radius: 50%;
-					}
-				}
-
-				.al_name_edit {
-					margin-left: 30rpx;
-					display: flex;
-					flex-direction: column;
-
-					&>text {
-						font-size: 36rpx;
-						font-family: PingFang-SC, PingFang-SC;
-						font-weight: bold;
-						color: #111111;
-						line-height: 50rpx;
-						padding-top: 4rpx;
-					}
-
-					.ane_edit {
-						width: 120rpx;
-						height: 54rpx;
-						border-radius: 27rpx;
-						border: 1rpx solid #D3D7DE;
-						margin-top: 10rpx;
-						display: flex;
-						align-items: center;
-						justify-content: center;
-
-						&>text {
-							font-size: 26rpx;
-							font-family: PingFangSC, PingFang SC;
-							font-weight: 400;
-							color: #5A697C;
-							line-height: 37rpx;
-						}
-
-						&>image {
-							margin-left: 8rpx;
-							width: 24rpx;
-							height: 24rpx;
-						}
-					}
-				}
-			}
-
-
-		}
-
-		.one {
-			// padding: ;
-			margin: 0 40rpx;
-			height: 120rpx;
-			line-height: 120rpx;
-			display: flex;
-			// border-bottom: 1rpx solid #EFEFEF;
-			justify-content: space-between;
-			align-items: center;
-			font-size: 36rpx;
-			color: #111111;
+<template>
+	<view class="page" :style="{'min-height':(h-th)+'px','padding-top':mt+'px'}">
+		<image class="bg_img" src="https://fsy.shengsi.gov.cn/file/20240129/3931d06eaa3346c9955aa7e5e535a95b.png"
+			mode="widthFix"></image>
+		<!-- <view class="account" :style="{'margin-top':(mt-44)+'px'}"> -->
+		<view class="account">
+			<view class="a_left">
+				<view class="al_avatar">
+					<image :src="dto.storeFrontPic"></image>
+				</view>
+				<view class="al_name_edit">
+					<text>{{dto.name==''?'临时商户':dto.name}}</text>
+					<view class="ane_edit" @tap="toTurn('/pagesHouse/Mine/PersonalEditing/PersonalEditing',true)">
+						<text>编辑</text>
+						<image src="https://fsy.shengsi.gov.cn/file/20240129/e824a765b6c24ac6aafbb49b12c23aa9.png"></image>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="orders box">
+			<view class="o_title">
+				<text>我的订单</text>
+				<view class="ot_all" @tap="toTurn('/pagesHouse/Mine/ordersList/index?type=&index=-1',true)">
+					<!-- <view class="ot_all" @tap="toToast"> -->
+					<text>全部订单</text>
+					<!-- <image src="../../static/index/steamerTicket/icon_yjt.png"></image> -->
+				</view>
+			</view>
+			<view class="o_menus">
+				<view v-for="(item,index) in orderMenus" :key="index"
+					@tap="toTurn('/pagesHouse/Mine/ordersList/index?type='+item.type+'&index='+index,true)">
+					<!-- <view v-for="(item,index) in orderMenus" :key="index" @tap="toToast"> -->
+					<image :src="item.img"></image>
+					<text>{{item.text}}</text>
+				</view>
+			</view>
+		</view>
+
+		<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>
+			<view class="">
+				<u-icon name="arrow-right"></u-icon>
+			</view>
+		</view>
+
+		<view class="" style="padding: 24rpx; background-color: #fff; margin: 0 20rpx ; border-radius: 16rpx;position: relative;">
+			<view class="one-input">
+				<u-row customStyle="margin-bottom: 10px">
+					<u-col span="7.8">
+						<view class="demo-layout bg-purple-light">
+							<view class="one2">
+								<!-- {{myList.islandName}} -->
+								{{dto.companyName}}
+							</view>
+							<view class="two2">
+								{{dto.areaDetail}}
+							</view>
+						</view>
+					</u-col>
+					<u-col span="4" @click="navigation">
+						<view class="demo-layout bg-purple">
+						</view>
+					</u-col>
+				</u-row>
+			</view>
+		</view>
+		<Tabbares :tabbarid="2"></Tabbares>
+	</view>
+</template>
+
+<script>
+	export default {
+
+		data() {
+			return {
+				h: uni.getSystemInfoSync().windowHeight,
+				w: uni.getSystemInfoSync().windowWidth,
+				mt: uni.getSystemInfoSync().statusBarHeight + 44,
+				avatar: 'https://fsy.shengsi.gov.cn/file/20240129/5b4a757190334fa7ae8616620c770bc4.png', 
+				name: '游客',
+				orderMenus: [ //type:1 待付款、2 待使用、3 待评价、4 退款/售后
+					{
+						type: 0,
+						img: 'https://fsy.shengsi.gov.cn/file/20240129/818fa751cf8d4772ac1cf818522a7f54.png',
+						text: '待支付'
+					},
+					{
+						type: 4,
+						img: 'https://fsy.shengsi.gov.cn/file/20240129/c4ef5f92f5274dbe9e281ad509571fc3.png',
+						text: '待使用'
+					},
+					{
+						type: 3,
+						img: 'https://fsy.shengsi.gov.cn/file/20240129/2a73e5e9afcf4d759b31e5332a21d012.png',
+						text: '已完成'
+					},
+					{
+						type: -3,
+						img: 'https://fsy.shengsi.gov.cn/file/20240129/f3fd049aaffb4768aa115572851a2bb1.png',
+						text: '退款/售后'
+					}
+				],
+				price: 0, //钱包余额
+				merchantName: uni.getStorageSync('merchantName'),
+				merchantType: uni.getStorageSync('merchantType'),
+				dto: {}
+			}
+		},
+		onLoad() {
+			this.getInfo();
+		},
+		methods: {
+			toTurn(url, login) { //login 是否需要验证登录跳转
+				if (!url) return this.$showToast('正在开发中...')
+				uni.navigateTo({
+					url
+				});
+
+			},
+			getInfo() {
+				this.$api.get('/api/merchant/food/merchant/' + uni.getStorageSync('merchantId')).then(res => {
+					if (res.data.code == 0) {
+						this.dto = res.data.data;
+						if (!res.data.data.shopSign) {
+							this.dto.shopSign =
+								'https://fsy.shengsi.gov.cn/file/20240225/26feb8cc8f744123a980211ebdfb8d40.png';
+						}
+						//this.shopImgs = res.data.data.split(',');
+					}
+				})
+			},
+		}
+	}
+</script>
+<style scoped lang="less">
+	.page {
+		background: #F5F8FA;
+		padding-bottom: 256rpx;
+		box-sizing: border-box;
+
+		.bg_img {
+			width: 100%;
+			position: absolute;
+			top: 0;
+			left: 0;
+			z-index: 0;
+		}
+
+		.account {
+			width: 100%;
+			display: flex;
+			justify-content: space-between;
+
+			.a_left {
+				padding: 10rpx 0 0 40rpx;
+				display: flex;
+				z-index: 1;
+
+				.al_avatar {
+					width: 120rpx;
+					height: 120rpx;
+					border-radius: 50%;
+					background: #FFFFFF;
+					padding: 4rpx;
+					box-sizing: border-box;
+
+					image {
+						width: 100%;
+						height: 100%;
+						border-radius: 50%;
+					}
+				}
+
+				.al_name_edit {
+					margin-left: 30rpx;
+					display: flex;
+					flex-direction: column;
+
+					&>text {
+						font-size: 36rpx;
+						font-family: PingFang-SC, PingFang-SC;
+						font-weight: bold;
+						color: #111111;
+						line-height: 50rpx;
+						padding-top: 4rpx;
+					}
+
+					.ane_edit {
+						width: 120rpx;
+						height: 54rpx;
+						border-radius: 27rpx;
+						border: 1rpx solid #D3D7DE;
+						margin-top: 10rpx;
+						display: flex;
+						align-items: center;
+						justify-content: center;
+
+						&>text {
+							font-size: 26rpx;
+							font-family: PingFangSC, PingFang SC;
+							font-weight: 400;
+							color: #5A697C;
+							line-height: 37rpx;
+						}
+
+						&>image {
+							margin-left: 8rpx;
+							width: 24rpx;
+							height: 24rpx;
+						}
+					}
+				}
+			}
+
+
+		}
+
+		.one {
+			// padding: ;
+			margin: 0 40rpx;
+			height: 120rpx;
+			line-height: 120rpx;
+			display: flex;
+			// border-bottom: 1rpx solid #EFEFEF;
+			justify-content: space-between;
+			align-items: center;
+			font-size: 36rpx;
+			color: #111111;
 			font-weight: bold;
-			position: relative;
-		}
-
-		.box {
-			width: calc(100% - 40rpx);
-			margin: 0 20rpx;
-			box-sizing: border-box;
-			background: #FFFFFF;
-			border-radius: 20rpx;
-			position: relative;
-		}
-
-		.bg-img {
-			background-color: #F0F8F6 !important;
-		}
-
-		.one-input {
-			box-sizing: border-box;
-			// width: 100%;
-			height: 128rpx;
-			background: #F0F8F6;
-			// line-height: 128rpx;
-			border-radius: 16rpx;
-			padding: 0 20rpx;
-			// margin: 0 20rpx;
-
-			.bg-purple-light {
-
-				// display: flex;
-				.one2 {
-					// height: 36rpx !important;
-					font-size: 26rpx;
-					color: #000000;
-					margin: 12rpx 6rpx;
-					font-weight: bold;
-				}
-
-				.two2 {
-					font-size: 24rpx;
-					color: #666666;
-					// height: 36rpx !important;
-					margin: 6rpx 6rpx;
-					font-weight: Regular;
-				}
-			}
-
-			.bg-purple {
-				// align-items: center;
-				// display: flex;
-				text-align: center;
-				// text-align: right;
-				font-size: 24rpx;
-				color: #808080;
-				background-image: url('https://i.ringzle.com/file/20240129/dcf2338517e344c697ef7cd853ce2234.png');
-				background-repeat: no-repeat;
-				background-size: 100% 100%;
-				width: 240rpx;
-				height: 128rpx;
-
-
-				.one1 {
-					margin: auto 110rpx;
-					padding-top: 30rpx;
-					width: 46rpx;
-					height: 46rpx;
-
-					image {
-						width: 100%;
-						height: 100%;
-						// width: 46rpx;
-						// height: 46rpx;
-					}
-
-				}
-
-				.two1 {
-
-					margin: 4rpx 12rpx;
-					font-size: 22rpx;
-					color: #007A69;
-
-					text {
-						margin-left: 30rpx;
-					}
-				}
-			}
-		}
-
-		.wallet {
-			margin-top: 32rpx;
-			padding: 34rpx 40rpx 30rpx 31rpx;
-			// background: url(https://i.ringzle.com/file/20240129/062264cb5e224845b86e4567c2ec37a6.png) no-repeat;
-			// background-size: 100% 100%;
-			background-color: #fff;
-			display: flex;
-			justify-content: space-between;
-
-			.w_left {
-				.wl_top {
-					display: flex;
-					align-items: center;
-
-					image {
-						width: 30rpx;
-						height: 30rpx;
-					}
-
-					text {
-						margin-left: 12rpx;
-						font-size: 26rpx;
-						font-family: PingFangSC, PingFang SC;
-						font-weight: 400;
-						color: #111;
-						line-height: 37rpx;
-					}
-				}
-
-				.wl_price {
-					margin-top: 17rpx;
-
-					span {
-						font-size: 36rpx;
-						font-family: DINAlternate, DINAlternate;
-						font-weight: bold;
-						color: #111;
-						line-height: 42rpx;
-					}
-
-					text {
-						font-size: 48rpx;
-						font-family: DINAlternate, DINAlternate;
-						font-weight: bold;
-						color: #111;
-						line-height: 56rpx;
-						margin-left: 10rpx;
-					}
-				}
-			}
-
-			.w_right {
-				margin-top: 16rpx;
-				width: 156rpx;
-				height: 60rpx;
-				// background: linear-gradient(270deg, #D6F6ED 0%, #FFFFFF 100%);
-				background-color: #007A69;
-				border-radius: 36rpx;
-				line-height: 60rpx;
-				text-align: center;
-				font-size: 26rpx;
-				font-family: PingFang-SC, PingFang-SC;
-				font-weight: bold;
-				color: #FFFFFF;
-			}
-
-			.w_right-image {
-				margin-top: 16rpx;
-				width: 156rpx;
-				// height: 60rpx;
-				// background: linear-gradient(270deg, #D6F6ED 0%, #FFFFFF 100%);
-				background-color: #007A69;
-				background-image: url('https://i.ringzle.com/file/20240225/b918fbd7e3424908a10497c4e4f71fda.png');
-				background-repeat: no-repeat;
-				background-size: 100% 100%;
-				border-radius: 36rpx;
-				// line-height: 60rpx;
-				text-align: center;
-				font-size: 26rpx; 
-				font-family: PingFang-SC, PingFang-SC;
-				font-weight: bold;
-				color: #FFFFFF;
-			}
-		}
-
-		.orders {
-			// margin-top: 20rpx;
-			margin-top: 40rpx;
-			padding: 40rpx 0;
-
-			.o_title {
-				width: 100%;
-				padding: 0 20rpx;
-				box-sizing: border-box;
-				display: flex;
-				align-items: center;
-				justify-content: space-between;
-
-				&>text {
-					font-size: 36rpx;
-					font-family: PingFang-SC, PingFang-SC;
-					font-weight: bold;
-					color: #1C1E41;
-					line-height: 36rpx;
-				}
-
-				.ot_all {
-					display: flex;
-					align-items: center;
-
-					&>text {
-						font-size: 28rpx;
-						font-family: PingFangSC, PingFang SC;
-						font-weight: 400;
-						color: #808080;
-						line-height: 28rpx;
-					}
-
-					&>image {
-						margin-left: 8rpx;
-						width: 24rpx;
-						height: 24rpx;
-					}
-				}
-			}
-
-			.o_menus {
-				margin-top: 44rpx;
-				display: flex;
-				align-items: center;
-				justify-content: space-around;
-
-				&>view {
-					width: 25%;
-					display: flex;
-					flex-direction: column;
-					align-items: center;
-
-					image {
-						width: 54rpx;
-						height: 54rpx;
-					}
-
-					text {
-						font-size: 26rpx;
-						font-family: PingFangSC, PingFang SC;
-						font-weight: 400;
-						color: #111111;
-						line-height: 26rpx;
-						margin-top: 24rpx;
-					}
-				}
-			}
-		}
-
-
-	}
+			position: relative;
+		}
+
+		.box {
+			width: calc(100% - 40rpx);
+			margin: 0 20rpx;
+			box-sizing: border-box;
+			background: #FFFFFF;
+			border-radius: 20rpx;
+			position: relative;
+		}
+
+		.bg-img {
+			background-color: #F0F8F6 !important;
+		}
+
+		.one-input {
+			box-sizing: border-box;
+			// width: 100%;
+			height: 128rpx;
+			background: #F0F8F6;
+			// line-height: 128rpx;
+			border-radius: 16rpx;
+			padding: 0 20rpx;
+			// margin: 0 20rpx;
+
+			.bg-purple-light {
+
+				// display: flex;
+				.one2 {
+					// height: 36rpx !important;
+					font-size: 26rpx;
+					color: #000000;
+					margin: 12rpx 6rpx;
+					font-weight: bold;
+				}
+
+				.two2 {
+					font-size: 24rpx;
+					color: #666666;
+					// height: 36rpx !important;
+					margin: 6rpx 6rpx;
+					font-weight: Regular;
+				}
+			}
+
+			.bg-purple {
+				// align-items: center;
+				// display: flex;
+				text-align: center;
+				// text-align: right;
+				font-size: 24rpx;
+				color: #808080;
+				background-image: url('https://fsy.shengsi.gov.cn/file/20240129/dcf2338517e344c697ef7cd853ce2234.png');
+				background-repeat: no-repeat;
+				background-size: 100% 100%;
+				width: 240rpx;
+				height: 128rpx;
+
+
+				.one1 {
+					margin: auto 110rpx;
+					padding-top: 30rpx;
+					width: 46rpx;
+					height: 46rpx;
+
+					image {
+						width: 100%;
+						height: 100%;
+						// width: 46rpx;
+						// height: 46rpx;
+					}
+
+				}
+
+				.two1 {
+
+					margin: 4rpx 12rpx;
+					font-size: 22rpx;
+					color: #007A69;
+
+					text {
+						margin-left: 30rpx;
+					}
+				}
+			}
+		}
+
+		.wallet {
+			margin-top: 32rpx;
+			padding: 34rpx 40rpx 30rpx 31rpx;
+			// background: url(https://fsy.shengsi.gov.cn/file/20240129/062264cb5e224845b86e4567c2ec37a6.png) no-repeat;
+			// background-size: 100% 100%;
+			background-color: #fff;
+			display: flex;
+			justify-content: space-between;
+
+			.w_left {
+				.wl_top {
+					display: flex;
+					align-items: center;
+
+					image {
+						width: 30rpx;
+						height: 30rpx;
+					}
+
+					text {
+						margin-left: 12rpx;
+						font-size: 26rpx;
+						font-family: PingFangSC, PingFang SC;
+						font-weight: 400;
+						color: #111;
+						line-height: 37rpx;
+					}
+				}
+
+				.wl_price {
+					margin-top: 17rpx;
+
+					span {
+						font-size: 36rpx;
+						font-family: DINAlternate, DINAlternate;
+						font-weight: bold;
+						color: #111;
+						line-height: 42rpx;
+					}
+
+					text {
+						font-size: 48rpx;
+						font-family: DINAlternate, DINAlternate;
+						font-weight: bold;
+						color: #111;
+						line-height: 56rpx;
+						margin-left: 10rpx;
+					}
+				}
+			}
+
+			.w_right {
+				margin-top: 16rpx;
+				width: 156rpx;
+				height: 60rpx;
+				// background: linear-gradient(270deg, #D6F6ED 0%, #FFFFFF 100%);
+				background-color: #007A69;
+				border-radius: 36rpx;
+				line-height: 60rpx;
+				text-align: center;
+				font-size: 26rpx;
+				font-family: PingFang-SC, PingFang-SC;
+				font-weight: bold;
+				color: #FFFFFF;
+			}
+
+			.w_right-image {
+				margin-top: 16rpx;
+				width: 156rpx;
+				// height: 60rpx;
+				// background: linear-gradient(270deg, #D6F6ED 0%, #FFFFFF 100%);
+				background-color: #007A69;
+				background-image: url('https://fsy.shengsi.gov.cn/file/20240225/b918fbd7e3424908a10497c4e4f71fda.png');
+				background-repeat: no-repeat;
+				background-size: 100% 100%;
+				border-radius: 36rpx;
+				// line-height: 60rpx;
+				text-align: center;
+				font-size: 26rpx; 
+				font-family: PingFang-SC, PingFang-SC;
+				font-weight: bold;
+				color: #FFFFFF;
+			}
+		}
+
+		.orders {
+			// margin-top: 20rpx;
+			margin-top: 40rpx;
+			padding: 40rpx 0;
+
+			.o_title {
+				width: 100%;
+				padding: 0 20rpx;
+				box-sizing: border-box;
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+
+				&>text {
+					font-size: 36rpx;
+					font-family: PingFang-SC, PingFang-SC;
+					font-weight: bold;
+					color: #1C1E41;
+					line-height: 36rpx;
+				}
+
+				.ot_all {
+					display: flex;
+					align-items: center;
+
+					&>text {
+						font-size: 28rpx;
+						font-family: PingFangSC, PingFang SC;
+						font-weight: 400;
+						color: #808080;
+						line-height: 28rpx;
+					}
+
+					&>image {
+						margin-left: 8rpx;
+						width: 24rpx;
+						height: 24rpx;
+					}
+				}
+			}
+
+			.o_menus {
+				margin-top: 44rpx;
+				display: flex;
+				align-items: center;
+				justify-content: space-around;
+
+				&>view {
+					width: 25%;
+					display: flex;
+					flex-direction: column;
+					align-items: center;
+
+					image {
+						width: 54rpx;
+						height: 54rpx;
+					}
+
+					text {
+						font-size: 26rpx;
+						font-family: PingFangSC, PingFang SC;
+						font-weight: 400;
+						color: #111111;
+						line-height: 26rpx;
+						margin-top: 24rpx;
+					}
+				}
+			}
+		}
+
+
+	}
 </style>

pagesHouse/Mine/ordersList/outcome.vue

@@ -3,7 +3,7 @@
 
 		<view class="result">
 			<view class="image">
-				<image src="https://i.ringzle.com/file/20240225/1667bc4cf6fa41b48a0ad18ffe1aa7c2.png" mode="aspectFill">
+				<image src="https://fsy.shengsi.gov.cn/file/20240225/1667bc4cf6fa41b48a0ad18ffe1aa7c2.png" mode="aspectFill">
 				</image>
 			</view>
 			<text>核销成功</text>

pagesHouse/Verification/check.vue

@@ -1,424 +1,424 @@
-<template>
-	<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 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 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>
-			</view>
-		</view>
-		<view class="orderInfo">
-			<view class="tit">
-				订单详情
-			</view>
-			<view class="time">{{orderInfo.playDate}} {{orderInfo.playTime}}出发</view>
-			<view class="bottom">
-				<text>{{orderInfo.num}}人</text>
-				<text>出游·{{orderInfo.playLength||0}}小时</text>
-				<text>¥{{orderInfo.realPrice}}</text>
-			</view>
-		</view>
-		<view class="list">
-			<view class="tit">{{boatNo}} 共({{data.length}})人</view>
-			<view class="item" v-for="(i,index) in data" :key="index">
-				<text class="type" :class="i.remark=='book'?'t1':'t2'">{{i.remark=='book'?'预订单':'现场单'}}</text>
-				<view class="personInfo">
-					<view class="name">{{i.touristName|handle(1)}}</view>
-					<view class="code">
-						身份证 {{i.touristCode|handle(3)}}
-					</view>
-				</view>
-				<u-icon name="minus-circle" size="36" color="#FEA400" @tap="jian(index)"
-					v-if="i.remark!='book'"></u-icon>
-			</view>
-		</view>
-		<view class="list">
-			<view class="tit">选择渔船</view>
-			<view class="typeItem">
-				<view class="txt" v-for="(t,i) in types" :key="i" @click="typeIndex=i" :class="typeIndex==i?'on':''">
-					{{t.boatNo}}
-					<image v-if="typeIndex==i"
-						src="https://i.ringzle.com/file/20240320/b458b03f8f654a51a921656b8aa955de.png"></image>
-				</view>
-
-			</view>
-		</view>
-		<view class="btn">
-			<text @click="hexiao">开始发船</text>
-		</view>
-	</view>
-</template>
-
-<script>
-	import {
-		encrypt,
-		decrypt,
-		tuomin
-	} from '../../utils/aes.js'
-	var that;
-	export default {
-		data() {
-			return {
-				typeIndex: null,
-				types: [],
-				date: new Date().Format('yyyy-MM-dd'),
-				show: false,
-				data: [],
-				merchantId: uni.getStorageSync('merchantId'),
-				playTime: '',
-				boatNo: '',
-				type: '',
-				orderInfo: {},
-				keyName: ''
-			}
-		},
-		onLoad(opt) {
-			that = this;
-			this.playTime = opt.playTime || '';
-			this.boatNo = opt.boatNo || '';
-			this.getOrderInfo();
-			this.getTypes();
-		},
-		filters: {
-			handle(val, type) {
-				return tuomin(val, type);
-			}
-		},
-		methods: {
-			getTypes() {
-				this.$api.get('/scenic/api/boat/page', {
-					page: -1
-				}).then(res => {
-					if (res.data.code == 0) {
-						this.types = res.data.data.list;
-					}
-				})
-			},
-			back() {
-				this.keyName = this.orderInfo.playDate + this.orderInfo.playTime + this.boatNo;
-				uni.setStorageSync(this.keyName, JSON.stringify(this.data));
-				//decodeURIComponent
-			},
-			getOrderInfo() {
-				this.$api.post('/scenic/api/order/queryStartOrderInfo', {
-					merchantId: this.merchantId,
-					boatNo: this.boatNo
-				}).then(res => {
-					if (res.data.code == 0) {
-						this.orderInfo = res.data.data;
-						this.keyName = this.orderInfo.playDate + this.orderInfo.playTime + this.boatNo;
-						if (uni.getStorageSync(this.keyName)) {
-							this.data = JSON.parse(uni.getStorageSync(this.keyName)) || [];
-						}
-					}
-				})
-			},
+<template>
+	<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 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 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>
+			</view>
+		</view>
+		<view class="orderInfo">
+			<view class="tit">
+				订单详情
+			</view>
+			<view class="time">{{orderInfo.playDate}} {{orderInfo.playTime}}出发</view>
+			<view class="bottom">
+				<text>{{orderInfo.num}}人</text>
+				<text>出游·{{orderInfo.playLength||0}}小时</text>
+				<text>¥{{orderInfo.realPrice}}</text>
+			</view>
+		</view>
+		<view class="list">
+			<view class="tit">{{boatNo}} 共({{data.length}})人</view>
+			<view class="item" v-for="(i,index) in data" :key="index">
+				<text class="type" :class="i.remark=='book'?'t1':'t2'">{{i.remark=='book'?'预订单':'现场单'}}</text>
+				<view class="personInfo">
+					<view class="name">{{i.touristName|handle(1)}}</view>
+					<view class="code">
+						身份证 {{i.touristCode|handle(3)}}
+					</view>
+				</view>
+				<u-icon name="minus-circle" size="36" color="#FEA400" @tap="jian(index)"
+					v-if="i.remark!='book'"></u-icon>
+			</view>
+		</view>
+		<view class="list">
+			<view class="tit">选择渔船</view>
+			<view class="typeItem">
+				<view class="txt" v-for="(t,i) in types" :key="i" @click="typeIndex=i" :class="typeIndex==i?'on':''">
+					{{t.boatNo}}
+					<image v-if="typeIndex==i"
+						src="https://fsy.shengsi.gov.cn/file/20240320/b458b03f8f654a51a921656b8aa955de.png"></image>
+				</view>
+
+			</view>
+		</view>
+		<view class="btn">
+			<text @click="hexiao">开始发船</text>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		encrypt,
+		decrypt,
+		tuomin
+	} from '../../utils/aes.js'
+	var that;
+	export default {
+		data() {
+			return {
+				typeIndex: null,
+				types: [],
+				date: new Date().Format('yyyy-MM-dd'),
+				show: false,
+				data: [],
+				merchantId: uni.getStorageSync('merchantId'),
+				playTime: '',
+				boatNo: '',
+				type: '',
+				orderInfo: {},
+				keyName: ''
+			}
+		},
+		onLoad(opt) {
+			that = this;
+			this.playTime = opt.playTime || '';
+			this.boatNo = opt.boatNo || '';
+			this.getOrderInfo();
+			this.getTypes();
+		},
+		filters: {
+			handle(val, type) {
+				return tuomin(val, type);
+			}
+		},
+		methods: {
+			getTypes() {
+				this.$api.get('/scenic/api/boat/page', {
+					page: -1
+				}).then(res => {
+					if (res.data.code == 0) {
+						this.types = res.data.data.list;
+					}
+				})
+			},
+			back() {
+				this.keyName = this.orderInfo.playDate + this.orderInfo.playTime + this.boatNo;
+				uni.setStorageSync(this.keyName, JSON.stringify(this.data));
+				//decodeURIComponent
+			},
+			getOrderInfo() {
+				this.$api.post('/scenic/api/order/queryStartOrderInfo', {
+					merchantId: this.merchantId,
+					boatNo: this.boatNo
+				}).then(res => {
+					if (res.data.code == 0) {
+						this.orderInfo = res.data.data;
+						this.keyName = this.orderInfo.playDate + this.orderInfo.playTime + this.boatNo;
+						if (uni.getStorageSync(this.keyName)) {
+							this.data = JSON.parse(uni.getStorageSync(this.keyName)) || [];
+						}
+					}
+				})
+			},
 			scanCode(type) {
-				uni.scanCode({
-					onlyFromCamera: true,
-					success: (res) => {
-						console.log('扫码结果：' + res.result);
-						// 扫码成功后的操作，例如：
-						that.handleScanResult(res.result, type, '');
-					},
-					fail: (err) => {
-						console.error('扫码失败：' + err);
-					}
-				});
-			},
-			// 处理扫码结果的函数，可以根据实际需求进行扩展
-			handleScanResult(result, type, name) {
-				// 例如：导航到某个页面，或者处理其他业务逻辑
-				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.boatNo = this.boatNo;
-				if(type==0) sendData.writeOffCode = result;
+				uni.scanCode({
+					onlyFromCamera: true,
+					success: (res) => {
+						console.log('扫码结果：' + res.result);
+						// 扫码成功后的操作，例如：
+						that.handleScanResult(res.result, type, '');
+					},
+					fail: (err) => {
+						console.error('扫码失败：' + err);
+					}
+				});
+			},
+			// 处理扫码结果的函数，可以根据实际需求进行扩展
+			handleScanResult(result, type, name) {
+				// 例如：导航到某个页面，或者处理其他业务逻辑
+				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.boatNo = this.boatNo;
+				if(type==0) sendData.writeOffCode = result;
 				else if(type==1){
 					sendData.touristCode = encrypt(result);
 					sendData.touristName = encrypt(name);
-				} 
-				this.$api.post('/scenic/api/order/scanCode', sendData).then(res => {
-					if (res.data.code == 0) {
-						if (this.data.findIndex((item) => {
-								return item.touristCode == res.data.data.touristCode
-							}) > -1) {
-							this.$showToast('该核验码已扫')
-						} else {
-							this.data.push(res.data.data);
-						}
-					} else {
-						this.$showToast(res.data.msg)
-					}
-				})
-			},
-			check() {
-				uni.navigateTo({
-					url: '/pagesHouse/Verification/check'
-				})
-			},
-			hexiao() {
-				if (this.data.length == 0) {
-					return this.$showToast('请选择核销人')
-				}
-				if (this.typeIndex == null) {
-					return this.$showToast('请选择渔船')
-				}
+				} 
+				this.$api.post('/scenic/api/order/scanCode', sendData).then(res => {
+					if (res.data.code == 0) {
+						if (this.data.findIndex((item) => {
+								return item.touristCode == res.data.data.touristCode
+							}) > -1) {
+							this.$showToast('该核验码已扫')
+						} else {
+							this.data.push(res.data.data);
+						}
+					} else {
+						this.$showToast(res.data.msg)
+					}
+				})
+			},
+			check() {
+				uni.navigateTo({
+					url: '/pagesHouse/Verification/check'
+				})
+			},
+			hexiao() {
+				if (this.data.length == 0) {
+					return this.$showToast('请选择核销人')
+				}
+				if (this.typeIndex == null) {
+					return this.$showToast('请选择渔船')
+				}
 				let boatCode = this.types[this.typeIndex].boatNo;
 				let newData = JSON.parse(JSON.stringify(this.data));
 				newData.forEach(d=>{
 					d.touristCode = encrypt(d.touristCode);
 					d.touristName = encrypt(d.touristName);
-				})
-				this.$api.post('/scenic/api/order/sailWriteOff', {
-					playDate:this.orderInfo.playDate,
-					playTime:this.orderInfo.playTime,
-					playLength:this.orderInfo.playLength,
-					orderType: this.orderInfo.orderType,
-					touristList: newData,
-					boatCode: boatCode
-				}).then(res => {
-					if (res.data.code == 0) {
-						uni.navigateTo({
-							url: "/pagesHouse/Verification/success?boatNo=" + this.boatNo + '&price=' +
-								this.orderInfo.realPrice
-						})
-					}else this.$showToast(res.data.msg)
-				})
-				uni.removeStorageSync(this.keyName);
+				})
+				this.$api.post('/scenic/api/order/sailWriteOff', {
+					playDate:this.orderInfo.playDate,
+					playTime:this.orderInfo.playTime,
+					playLength:this.orderInfo.playLength,
+					orderType: this.orderInfo.orderType,
+					touristList: newData,
+					boatCode: boatCode
+				}).then(res => {
+					if (res.data.code == 0) {
+						uni.navigateTo({
+							url: "/pagesHouse/Verification/success?boatNo=" + this.boatNo + '&price=' +
+								this.orderInfo.realPrice
+						})
+					}else this.$showToast(res.data.msg)
+				})
+				uni.removeStorageSync(this.keyName);
 			},
 			jian(index){
 				if(this.data.length>index) this.data.splice(index,1);
-			}
-		}
-	}
-</script>
-
-<style lang="less" scoped>
-	/deep/.u-icon {
-		justify-content: flex-end;
-	}
-
-	.btn {
-		position: fixed;
-		bottom: 0;
-		left: 0;
-		z-index: 1;
-		padding: 16rpx 30rpx 36rpx 30rpx;
-		width: 100%;
-		box-sizing: border-box;
-		background: #fff;
-
-		text {
-			display: block;
-			background-color: #007A69;
-			color: #007A69;
-			color: #fff;
-			height: 88rpx;
-			line-height: 88rpx;
-			border-radius: 44rpx;
-			text-align: center;
-			font-size: 32rp;
-			font-weight: bold;
-			box-sizing: border-box;
-
-
-		}
-
-	}
-
-	.page {
-		background: #F5F8FA;
-		padding: 20rpx 24rpx 160rpx;
-		box-sizing: border-box;
-
-		.types {
-			display: flex;
-			gap: 36rpx;
-			justify-content: space-between;
-
-
-			.n {
-				margin-bottom: 20rpx;
-				color: #fff;
-			}
-
-			.item {
-				width: 330rpx;
-				height: 156rpx;
-				padding: 34rpx 24rpx;
-				font-size: 36rpx;
-				font-weight: bold;
-				box-sizing: border-box;
-			}
-
-			.bg2 {
-				background: url('https://i.ringzle.com/file/20240316/3fc9f6a78557492e98caa50392411e3a.png') no-repeat center;
-				background-size: 100%;
-			}
-
-			.bg1 {
-				background: url('https://i.ringzle.com/file/20240316/8a927d5d4da84728b6bb0896541baccf.png') no-repeat center;
-				background-size: 100%;
-			}
-		}
-
-		.orderInfo {
-			background-color: #fff;
-			color: #333;
-			padding: 0 24rpx 36rpx;
-			margin: 20rpx 0 0;
-			background: #fff;
-			border-radius: 16rpx;
-
-			.tit {
-				padding: 32rpx 0 24rpx;
-				font-size: 32rpx;
-			}
-
-			.time {
-				font-size: 36rpx;
-				font-weight: bold;
-				margin-bottom: 32rpx;
-			}
-
-			.bottom {
-				display: flex;
-				align-items: center;
-
-				text {
-					&:first-child {
-						width: 88rpx;
-						height: 54rpx;
-						background-color: #007A69;
-						color: #fff;
-						font-size: 34rpx;
-						font-weight: bold;
-						margin-right: 10rpx;
-						text-align: center;
-						border-radius: 12rpx;
-					}
-
-					&:nth-child(2) {
-						width: 200rpx;
-						flex: 1;
-					}
-
-					&:last-child {
-						font-size: 30rpx;
-						font-weight: bold;
-					}
-				}
-			}
-		}
-
-	}
-
-	.list {
-		box-sizing: border-box;
-		padding: 0 24rpx 0;
-		border-radius: 16rpx;
-		background-color: #fff;
-		margin-top: 20rpx;
-
-		.tit {
-			font-size: 36rpx;
-			font-weight: bold;
-			color: #111;
-			padding: 36rpx 0 17rpx;
-		}
-
-		.typeItem {
-			display: flex;
-			justify-content: space-between;
-			flex-wrap: wrap;
-			gap: 20rpx 0;
-			padding-bottom: 50rpx;
-
-			.txt {
-				display: inline-block;
-				width: 316rpx;
-				height: 80rpx;
-				background: #fff;
-				border-radius: 16rpx;
-				text-align: center;
-				line-height: 80rpx;
-				border: 2rpx solid #EFEFEF;
-				color: #333;
-				position: relative;
-
-				&.on {
-					color: #007A69;
-					background: rgba(0, 122, 105, 0.06);
-					border: 2rpx solid #007A69;
-
-					image {
-						position: absolute;
-						bottom: 0;
-						right: 0;
-						width: 34rpx;
-						height: 26rpx;
-						z-index: 11;
-					}
-				}
-
-			}
-		}
-
-		.item {
-			display: flex;
-			justify-content: space-between;
-			padding: 24rpx 0;
-			align-items: center;
-
-			.type {
-				width: 110rpx;
-				height: 48rpx;
-				text-align: center;
-				display: inline-block;
-				line-height: 48rpx;
-				border-radius: 11rpx;
-				font-size: 26rpx;
-				font-weight: bold;
-				color: #111;
-				margin-right: 16rpx;
-			}
-
-			.t1 {
-				background-color: #F0F8F6;
-				color: #007A69;
-			}
-
-			.t2 {
-				background-color: #E8EFFD;
-				color: #326EE0;
-			}
-
-			.personInfo {
-				flex: 1;
-
-				.name {
-					font-size: 30rpx;
-					color: #111;
-					margin-bottom: 16rpx;
-				}
-
-				.code {
-					color: #666;
-					font-size: 28rpx;
-				}
-			}
-
-		}
-	}
+			}
+		}
+	}
+</script>
+
+<style lang="less" scoped>
+	/deep/.u-icon {
+		justify-content: flex-end;
+	}
+
+	.btn {
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		z-index: 1;
+		padding: 16rpx 30rpx 36rpx 30rpx;
+		width: 100%;
+		box-sizing: border-box;
+		background: #fff;
+
+		text {
+			display: block;
+			background-color: #007A69;
+			color: #007A69;
+			color: #fff;
+			height: 88rpx;
+			line-height: 88rpx;
+			border-radius: 44rpx;
+			text-align: center;
+			font-size: 32rp;
+			font-weight: bold;
+			box-sizing: border-box;
+
+
+		}
+
+	}
+
+	.page {
+		background: #F5F8FA;
+		padding: 20rpx 24rpx 160rpx;
+		box-sizing: border-box;
+
+		.types {
+			display: flex;
+			gap: 36rpx;
+			justify-content: space-between;
+
+
+			.n {
+				margin-bottom: 20rpx;
+				color: #fff;
+			}
+
+			.item {
+				width: 330rpx;
+				height: 156rpx;
+				padding: 34rpx 24rpx;
+				font-size: 36rpx;
+				font-weight: bold;
+				box-sizing: border-box;
+			}
+
+			.bg2 {
+				background: url('https://fsy.shengsi.gov.cn/file/20240316/3fc9f6a78557492e98caa50392411e3a.png') no-repeat center;
+				background-size: 100%;
+			}
+
+			.bg1 {
+				background: url('https://fsy.shengsi.gov.cn/file/20240316/8a927d5d4da84728b6bb0896541baccf.png') no-repeat center;
+				background-size: 100%;
+			}
+		}
+
+		.orderInfo {
+			background-color: #fff;
+			color: #333;
+			padding: 0 24rpx 36rpx;
+			margin: 20rpx 0 0;
+			background: #fff;
+			border-radius: 16rpx;
+
+			.tit {
+				padding: 32rpx 0 24rpx;
+				font-size: 32rpx;
+			}
+
+			.time {
+				font-size: 36rpx;
+				font-weight: bold;
+				margin-bottom: 32rpx;
+			}
+
+			.bottom {
+				display: flex;
+				align-items: center;
+
+				text {
+					&:first-child {
+						width: 88rpx;
+						height: 54rpx;
+						background-color: #007A69;
+						color: #fff;
+						font-size: 34rpx;
+						font-weight: bold;
+						margin-right: 10rpx;
+						text-align: center;
+						border-radius: 12rpx;
+					}
+
+					&:nth-child(2) {
+						width: 200rpx;
+						flex: 1;
+					}
+
+					&:last-child {
+						font-size: 30rpx;
+						font-weight: bold;
+					}
+				}
+			}
+		}
+
+	}
+
+	.list {
+		box-sizing: border-box;
+		padding: 0 24rpx 0;
+		border-radius: 16rpx;
+		background-color: #fff;
+		margin-top: 20rpx;
+
+		.tit {
+			font-size: 36rpx;
+			font-weight: bold;
+			color: #111;
+			padding: 36rpx 0 17rpx;
+		}
+
+		.typeItem {
+			display: flex;
+			justify-content: space-between;
+			flex-wrap: wrap;
+			gap: 20rpx 0;
+			padding-bottom: 50rpx;
+
+			.txt {
+				display: inline-block;
+				width: 316rpx;
+				height: 80rpx;
+				background: #fff;
+				border-radius: 16rpx;
+				text-align: center;
+				line-height: 80rpx;
+				border: 2rpx solid #EFEFEF;
+				color: #333;
+				position: relative;
+
+				&.on {
+					color: #007A69;
+					background: rgba(0, 122, 105, 0.06);
+					border: 2rpx solid #007A69;
+
+					image {
+						position: absolute;
+						bottom: 0;
+						right: 0;
+						width: 34rpx;
+						height: 26rpx;
+						z-index: 11;
+					}
+				}
+
+			}
+		}
+
+		.item {
+			display: flex;
+			justify-content: space-between;
+			padding: 24rpx 0;
+			align-items: center;
+
+			.type {
+				width: 110rpx;
+				height: 48rpx;
+				text-align: center;
+				display: inline-block;
+				line-height: 48rpx;
+				border-radius: 11rpx;
+				font-size: 26rpx;
+				font-weight: bold;
+				color: #111;
+				margin-right: 16rpx;
+			}
+
+			.t1 {
+				background-color: #F0F8F6;
+				color: #007A69;
+			}
+
+			.t2 {
+				background-color: #E8EFFD;
+				color: #326EE0;
+			}
+
+			.personInfo {
+				flex: 1;
+
+				.name {
+					font-size: 30rpx;
+					color: #111;
+					margin-bottom: 16rpx;
+				}
+
+				.code {
+					color: #666;
+					font-size: 28rpx;
+				}
+			}
+
+		}
+	}
 </style>

pagesHouse/Verification/checkApp.vue

@@ -1,69 +1,69 @@
-<template>
-	<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 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 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>
-			</view>
-		</view>
-		<view class="orderInfo">
-			<view class="tit">
-				订单详情
-			</view>
-			<view class="time">{{orderInfo.playDate}} {{orderInfo.playTime}}出发</view>
-			<view class="bottom">
-				<text>{{orderInfo.num}}人</text>
-				<text>出游·{{orderInfo.playLength||0}}小时</text>
-				<text>¥{{orderInfo.realPrice}}</text>
-			</view>
-		</view>
-		<view class="list">
-			<view class="tit">{{boatNo}} 共({{data.length}})人</view>
-			<view class="item" v-for="(i,index) in data" :key="index">
-				<text class="type" :class="i.remark=='book'?'t1':'t2'">{{i.remark=='book'?'预订单':'现场单'}}</text>
-				<view class="personInfo">
-					<view class="name">{{i.touristName|handle(1)}}</view>
-					<view class="code">
-						身份证 {{i.touristCode|handle(3)}}
-					</view>
-				</view>
-				<u-icon name="minus-circle" size="36" color="#FEA400" @tap="jian(index)"
-					v-if="i.remark!='book'"></u-icon>
-			</view>
-		</view>
-		<view class="list">
-			<view class="tit">选择渔船</view>
-			<view class="typeItem">
-				<view class="txt" v-for="(t,i) in types" :key="i" @click="typeIndex=i" :class="typeIndex==i?'on':''">
-					{{t.boatNo}}
-					<image v-if="typeIndex==i"
-						src="https://i.ringzle.com/file/20240320/b458b03f8f654a51a921656b8aa955de.png"></image>
-				</view>
-
-			</view>
-		</view>
-		<view class="btn">
-			<text @click="hexiao">开始发船</text>
-		</view>
-	</view>
-</template>
-
-<script>
-	import {
-		encrypt,
-		decrypt,
-		tuomin
-	} from '../../utils/aes.js'
-	var that;
-	const lcReader = uni.requireNativePlugin('LcReader');
-	const modal = uni.requireNativePlugin('modal');
+<template>
+	<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 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 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>
+			</view>
+		</view>
+		<view class="orderInfo">
+			<view class="tit">
+				订单详情
+			</view>
+			<view class="time">{{orderInfo.playDate}} {{orderInfo.playTime}}出发</view>
+			<view class="bottom">
+				<text>{{orderInfo.num}}人</text>
+				<text>出游·{{orderInfo.playLength||0}}小时</text>
+				<text>¥{{orderInfo.realPrice}}</text>
+			</view>
+		</view>
+		<view class="list">
+			<view class="tit">{{boatNo}} 共({{data.length}})人</view>
+			<view class="item" v-for="(i,index) in data" :key="index">
+				<text class="type" :class="i.remark=='book'?'t1':'t2'">{{i.remark=='book'?'预订单':'现场单'}}</text>
+				<view class="personInfo">
+					<view class="name">{{i.touristName|handle(1)}}</view>
+					<view class="code">
+						身份证 {{i.touristCode|handle(3)}}
+					</view>
+				</view>
+				<u-icon name="minus-circle" size="36" color="#FEA400" @tap="jian(index)"
+					v-if="i.remark!='book'"></u-icon>
+			</view>
+		</view>
+		<view class="list">
+			<view class="tit">选择渔船</view>
+			<view class="typeItem">
+				<view class="txt" v-for="(t,i) in types" :key="i" @click="typeIndex=i" :class="typeIndex==i?'on':''">
+					{{t.boatNo}}
+					<image v-if="typeIndex==i"
+						src="https://fsy.shengsi.gov.cn/file/20240320/b458b03f8f654a51a921656b8aa955de.png"></image>
+				</view>
+
+			</view>
+		</view>
+		<view class="btn">
+			<text @click="hexiao">开始发船</text>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		encrypt,
+		decrypt,
+		tuomin
+	} from '../../utils/aes.js'
+	var that;
+	const lcReader = uni.requireNativePlugin('LcReader');
+	const modal = uni.requireNativePlugin('modal');
 	var globalEvent = uni.requireNativePlugin('globalEvent');
 	
 	// 依赖引入
@@ -71,75 +71,75 @@
 	const IntentFilter = plus.android.importClass('android.content.IntentFilter')
 	const main = plus.android.runtimeMainActivity()
 	// pda广播名称
-	const SCANACTION = "scan.rcv.message"//扫描名称
-	export default {
-		data() {
-			return {
-				typeIndex: null,
-				types: [],
-				date: new Date().Format('yyyy-MM-dd'),
-				show: false,
-				data: [],
-				merchantId: uni.getStorageSync('merchantId'),
-				playTime: '',
-				boatNo: '',
-				type: '',
-				orderInfo: {},
-				keyName: ''
-			}
-		},
-		onLoad(opt) {
-			that = this;
-			this.playTime = opt.playTime || '';
-			this.boatNo = opt.boatNo || '';
-			this.getOrderInfo();
-			this.getTypes();
+	const SCANACTION = "scan.rcv.message"//扫描名称
+	export default {
+		data() {
+			return {
+				typeIndex: null,
+				types: [],
+				date: new Date().Format('yyyy-MM-dd'),
+				show: false,
+				data: [],
+				merchantId: uni.getStorageSync('merchantId'),
+				playTime: '',
+				boatNo: '',
+				type: '',
+				orderInfo: {},
+				keyName: ''
+			}
+		},
+		onLoad(opt) {
+			that = this;
+			this.playTime = opt.playTime || '';
+			this.boatNo = opt.boatNo || '';
+			this.getOrderInfo();
+			this.getTypes();
 
 			this.initSDK();
 			globalEvent.addEventListener('readInfo', function(e) {
 				if(e.Id&&e.Name) that.handleScanResult(e.Id,1,e.Name);
-			});
-		},
-		filters: {
-			handle(val, type) {
-				return tuomin(val, type);
-			}
+			});
+		},
+		filters: {
+			handle(val, type) {
+				return tuomin(val, type);
+			}
 		},
 		destroyed() {
 			this.keyName = this.orderInfo.playDate + this.orderInfo.playTime + this.boatNo;
 			uni.setStorageSync(this.keyName, JSON.stringify(this.data));
-		},
-		methods: {
-			initSDK() {
-				// 调用异步方法
-				lcReader.initSDK({
-					'name': 'unimp',
-					'age': 1
-				});
-			},
-			getTypes() {
-				this.$api.get('/scenic/api/boat/page', {
-					page: -1
-				}).then(res => {
-					if (res.data.code == 0) {
-						this.types = res.data.data.list;
-					}
-				})
-			},
-			getOrderInfo() {
-				this.$api.post('/scenic/api/order/queryStartOrderInfo', {
-					merchantId: this.merchantId,
-					boatNo: this.boatNo
-				}).then(res => {
-					if (res.data.code == 0) {
-						this.orderInfo = res.data.data;
-						this.keyName = this.orderInfo.playDate + this.orderInfo.playTime + this.boatNo;
-						if (uni.getStorageSync(this.keyName)) {
-							this.data = JSON.parse(uni.getStorageSync(this.keyName)) || [];
-						}
-					}
-				})
-			},
+		},
+		methods: {
+			initSDK() {
+				// 调用异步方法
+				lcReader.initSDK({
+					'name': 'unimp',
+					'age': 1
+				});
+			},
+			getTypes() {
+				this.$api.get('/scenic/api/boat/page', {
+					page: -1
+				}).then(res => {
+					if (res.data.code == 0) {
+						this.types = res.data.data.list;
+					}
+				})
+			},
+			getOrderInfo() {
+				this.$api.post('/scenic/api/order/queryStartOrderInfo', {
+					merchantId: this.merchantId,
+					boatNo: this.boatNo
+				}).then(res => {
+					if (res.data.code == 0) {
+						this.orderInfo = res.data.data;
+						this.keyName = this.orderInfo.playDate + this.orderInfo.playTime + this.boatNo;
+						if (uni.getStorageSync(this.keyName)) {
+							this.data = JSON.parse(uni.getStorageSync(this.keyName)) || [];
+						}
+					}
+				})
+			},
 			scanCode(type) {
 				let mg = '请按下按钮进行二维码扫描';
 				if(type==1) mg = '请放置身份证进行读取';
@@ -148,7 +148,7 @@
 				else if(type==1){
 					// lcReader.sigleRead();//单次读卡
 					lcReader.cycleReadCard();//循环读卡
-				}
+				}
 			},
 			//扫二维码或条形码
 			scanCodeByEwm(){
@@ -168,299 +168,299 @@
 					}
 				})
 				main.registerReceiver(receiver, filter);
-			},
-			// 处理扫码结果的函数，可以根据实际需求进行扩展
-			handleScanResult(result, type, name) {
-				// 例如：导航到某个页面，或者处理其他业务逻辑
-				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.boatNo = this.boatNo;
-				if(type==0) sendData.writeOffCode = result;
+			},
+			// 处理扫码结果的函数，可以根据实际需求进行扩展
+			handleScanResult(result, type, name) {
+				// 例如：导航到某个页面，或者处理其他业务逻辑
+				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.boatNo = this.boatNo;
+				if(type==0) sendData.writeOffCode = result;
 				else if(type==1){
 					sendData.touristCode = encrypt(result);
 					sendData.touristName = encrypt(name);
-				} 
-
-				this.$api.post('/scenic/api/order/scanCode', sendData).then(res => {
-					if (res.data.code == 0) {
-						if (this.data.findIndex((item) => {
-								return item.touristCode == res.data.data.touristCode
+				} 
+
+				this.$api.post('/scenic/api/order/scanCode', sendData).then(res => {
+					if (res.data.code == 0) {
+						if (this.data.findIndex((item) => {
+								return item.touristCode == res.data.data.touristCode
 							}) > -1) {
 								let mg = '该核验码已扫';
-								if(type==1) mg = '该身份证已扫';
-							this.$showToast(mg);
-						} else {
-							this.data.push(res.data.data);
+								if(type==1) mg = '该身份证已扫';
+							this.$showToast(mg);
+						} else {
+							this.data.push(res.data.data);
 						}
-						if(type==1) lcReader.cancelCycle();//关闭循环读卡
-					} else {
+						if(type==1) lcReader.cancelCycle();//关闭循环读卡
+					} else {
 						this.$showToast(res.data.msg)
-						if(type==1) lcReader.cancelCycle();//关闭循环读卡
-					}
-				})
-			},
-			check() {
-				uni.navigateTo({
-					url: '/pagesHouse/Verification/check'
-				})
-			},
-			hexiao() {
-				if (this.data.length == 0) {
-					return this.$showToast('请选择核销人')
-				}
-				if (this.typeIndex == null) {
-					return this.$showToast('请选择渔船')
-				}
+						if(type==1) lcReader.cancelCycle();//关闭循环读卡
+					}
+				})
+			},
+			check() {
+				uni.navigateTo({
+					url: '/pagesHouse/Verification/check'
+				})
+			},
+			hexiao() {
+				if (this.data.length == 0) {
+					return this.$showToast('请选择核销人')
+				}
+				if (this.typeIndex == null) {
+					return this.$showToast('请选择渔船')
+				}
 				let boatCode = this.types[this.typeIndex].boatNo;
 				let newData = JSON.parse(JSON.stringify(this.data));
 				newData.forEach(d=>{
 					d.touristCode = encrypt(d.touristCode);
 					d.touristName = encrypt(d.touristName);
-				})
-				this.$api.post('/scenic/api/order/sailWriteOff', {
-					playDate:this.orderInfo.playDate,
-					playTime:this.orderInfo.playTime,
-					playLength:this.orderInfo.playLength,
-					orderType: this.orderInfo.orderType,
-					touristList: newData,
-					boatCode: boatCode
-				}).then(res => {
-					if (res.data.code == 0) {
-						uni.navigateTo({
-							url: "/pagesHouse/Verification/success?boatNo=" + this.boatNo + '&price=' +
-								this.orderInfo.realPrice
-						})
-					}else this.$showToast(res.data.msg)
-				})
-				uni.removeStorageSync(this.keyName);
+				})
+				this.$api.post('/scenic/api/order/sailWriteOff', {
+					playDate:this.orderInfo.playDate,
+					playTime:this.orderInfo.playTime,
+					playLength:this.orderInfo.playLength,
+					orderType: this.orderInfo.orderType,
+					touristList: newData,
+					boatCode: boatCode
+				}).then(res => {
+					if (res.data.code == 0) {
+						uni.navigateTo({
+							url: "/pagesHouse/Verification/success?boatNo=" + this.boatNo + '&price=' +
+								this.orderInfo.realPrice
+						})
+					}else this.$showToast(res.data.msg)
+				})
+				uni.removeStorageSync(this.keyName);
 			},
 			jian(index){
 				if(this.data.length>index) this.data.splice(index,1);
-			}
-		}
-	}
-</script>
-
-<style lang="less" scoped>
-	/deep/.u-icon {
-		justify-content: flex-end;
-	}
-
-	.btn {
-		position: fixed;
-		bottom: 0;
-		left: 0;
-		z-index: 1;
-		padding: 16rpx 30rpx 36rpx 30rpx;
-		width: 100%;
-		box-sizing: border-box;
-		background: #fff;
-
-		text {
-			display: block;
-			background-color: #007A69;
-			color: #007A69;
-			color: #fff;
-			height: 88rpx;
-			line-height: 88rpx;
-			border-radius: 44rpx;
-			text-align: center;
-			font-size: 32rp;
-			font-weight: bold;
-			box-sizing: border-box;
-
-
-		}
-
-	}
-
-	.page {
-		background: #F5F8FA;
-		padding: 20rpx 24rpx 160rpx;
-		box-sizing: border-box;
-
-		.types {
-			display: flex;
-			gap: 36rpx;
-			justify-content: space-between;
-
-
-			.n {
-				margin-bottom: 20rpx;
-				color: #fff;
-			}
-
-			.item {
-				width: 330rpx;
-				height: 156rpx;
-				padding: 34rpx 24rpx;
-				font-size: 36rpx;
-				font-weight: bold;
-				box-sizing: border-box;
-			}
-
-			.bg2 {
-				background: url('https://i.ringzle.com/file/20240316/3fc9f6a78557492e98caa50392411e3a.png') no-repeat center;
-				background-size: 100%;
-			}
-
-			.bg1 {
-				background: url('https://i.ringzle.com/file/20240316/8a927d5d4da84728b6bb0896541baccf.png') no-repeat center;
-				background-size: 100%;
-			}
-		}
-
-		.orderInfo {
-			background-color: #fff;
-			color: #333;
-			padding: 0 24rpx 36rpx;
-			margin: 20rpx 0 0;
-			background: #fff;
-			border-radius: 16rpx;
-
-			.tit {
-				padding: 32rpx 0 24rpx;
-				font-size: 32rpx;
-			}
-
-			.time {
-				font-size: 36rpx;
-				font-weight: bold;
-				margin-bottom: 32rpx;
-			}
-
-			.bottom {
-				display: flex;
-				align-items: center;
-
-				text {
-					&:first-child {
-						width: 88rpx;
-						height: 54rpx;
-						background-color: #007A69;
-						color: #fff;
-						font-size: 34rpx;
-						font-weight: bold;
-						margin-right: 10rpx;
-						text-align: center;
-						border-radius: 12rpx;
-					}
-
-					&:nth-child(2) {
-						width: 200rpx;
-						flex: 1;
-					}
-
-					&:last-child {
-						font-size: 30rpx;
-						font-weight: bold;
-					}
-				}
-			}
-		}
-
-	}
-
-	.list {
-		box-sizing: border-box;
-		padding: 0 24rpx 0;
-		border-radius: 16rpx;
-		background-color: #fff;
-		margin-top: 20rpx;
-
-		.tit {
-			font-size: 36rpx;
-			font-weight: bold;
-			color: #111;
-			padding: 36rpx 0 17rpx;
-		}
-
-		.typeItem {
-			display: flex;
-			justify-content: space-between;
-			flex-wrap: wrap;
-			gap: 20rpx 0;
-			padding-bottom: 50rpx;
-
-			.txt {
-				display: inline-block;
-				width: 316rpx;
-				height: 80rpx;
-				background: #fff;
-				border-radius: 16rpx;
-				text-align: center;
-				line-height: 80rpx;
-				border: 2rpx solid #EFEFEF;
-				color: #333;
-				position: relative;
-
-				&.on {
-					color: #007A69;
-					background: rgba(0, 122, 105, 0.06);
-					border: 2rpx solid #007A69;
-
-					image {
-						position: absolute;
-						bottom: 0;
-						right: 0;
-						width: 34rpx;
-						height: 26rpx;
-						z-index: 11;
-					}
-				}
-
-			}
-		}
-
-		.item {
-			display: flex;
-			justify-content: space-between;
-			padding: 24rpx 0;
-			align-items: center;
-
-			.type {
-				width: 110rpx;
-				height: 48rpx;
-				text-align: center;
-				display: inline-block;
-				line-height: 48rpx;
-				border-radius: 11rpx;
-				font-size: 26rpx;
-				font-weight: bold;
-				color: #111;
-				margin-right: 16rpx;
-			}
-
-			.t1 {
-				background-color: #F0F8F6;
-				color: #007A69;
-			}
-
-			.t2 {
-				background-color: #E8EFFD;
-				color: #326EE0;
-			}
-
-			.personInfo {
-				flex: 1;
-
-				.name {
-					font-size: 30rpx;
-					color: #111;
-					margin-bottom: 16rpx;
-				}
-
-				.code {
-					color: #666;
-					font-size: 28rpx;
-				}
-			}
-
-		}
-	}
+			}
+		}
+	}
+</script>
+
+<style lang="less" scoped>
+	/deep/.u-icon {
+		justify-content: flex-end;
+	}
+
+	.btn {
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		z-index: 1;
+		padding: 16rpx 30rpx 36rpx 30rpx;
+		width: 100%;
+		box-sizing: border-box;
+		background: #fff;
+
+		text {
+			display: block;
+			background-color: #007A69;
+			color: #007A69;
+			color: #fff;
+			height: 88rpx;
+			line-height: 88rpx;
+			border-radius: 44rpx;
+			text-align: center;
+			font-size: 32rp;
+			font-weight: bold;
+			box-sizing: border-box;
+
+
+		}
+
+	}
+
+	.page {
+		background: #F5F8FA;
+		padding: 20rpx 24rpx 160rpx;
+		box-sizing: border-box;
+
+		.types {
+			display: flex;
+			gap: 36rpx;
+			justify-content: space-between;
+
+
+			.n {
+				margin-bottom: 20rpx;
+				color: #fff;
+			}
+
+			.item {
+				width: 330rpx;
+				height: 156rpx;
+				padding: 34rpx 24rpx;
+				font-size: 36rpx;
+				font-weight: bold;
+				box-sizing: border-box;
+			}
+
+			.bg2 {
+				background: url('https://fsy.shengsi.gov.cn/file/20240316/3fc9f6a78557492e98caa50392411e3a.png') no-repeat center;
+				background-size: 100%;
+			}
+
+			.bg1 {
+				background: url('https://fsy.shengsi.gov.cn/file/20240316/8a927d5d4da84728b6bb0896541baccf.png') no-repeat center;
+				background-size: 100%;
+			}
+		}
+
+		.orderInfo {
+			background-color: #fff;
+			color: #333;
+			padding: 0 24rpx 36rpx;
+			margin: 20rpx 0 0;
+			background: #fff;
+			border-radius: 16rpx;
+
+			.tit {
+				padding: 32rpx 0 24rpx;
+				font-size: 32rpx;
+			}
+
+			.time {
+				font-size: 36rpx;
+				font-weight: bold;
+				margin-bottom: 32rpx;
+			}
+
+			.bottom {
+				display: flex;
+				align-items: center;
+
+				text {
+					&:first-child {
+						width: 88rpx;
+						height: 54rpx;
+						background-color: #007A69;
+						color: #fff;
+						font-size: 34rpx;
+						font-weight: bold;
+						margin-right: 10rpx;
+						text-align: center;
+						border-radius: 12rpx;
+					}
+
+					&:nth-child(2) {
+						width: 200rpx;
+						flex: 1;
+					}
+
+					&:last-child {
+						font-size: 30rpx;
+						font-weight: bold;
+					}
+				}
+			}
+		}
+
+	}
+
+	.list {
+		box-sizing: border-box;
+		padding: 0 24rpx 0;
+		border-radius: 16rpx;
+		background-color: #fff;
+		margin-top: 20rpx;
+
+		.tit {
+			font-size: 36rpx;
+			font-weight: bold;
+			color: #111;
+			padding: 36rpx 0 17rpx;
+		}
+
+		.typeItem {
+			display: flex;
+			justify-content: space-between;
+			flex-wrap: wrap;
+			gap: 20rpx 0;
+			padding-bottom: 50rpx;
+
+			.txt {
+				display: inline-block;
+				width: 316rpx;
+				height: 80rpx;
+				background: #fff;
+				border-radius: 16rpx;
+				text-align: center;
+				line-height: 80rpx;
+				border: 2rpx solid #EFEFEF;
+				color: #333;
+				position: relative;
+
+				&.on {
+					color: #007A69;
+					background: rgba(0, 122, 105, 0.06);
+					border: 2rpx solid #007A69;
+
+					image {
+						position: absolute;
+						bottom: 0;
+						right: 0;
+						width: 34rpx;
+						height: 26rpx;
+						z-index: 11;
+					}
+				}
+
+			}
+		}
+
+		.item {
+			display: flex;
+			justify-content: space-between;
+			padding: 24rpx 0;
+			align-items: center;
+
+			.type {
+				width: 110rpx;
+				height: 48rpx;
+				text-align: center;
+				display: inline-block;
+				line-height: 48rpx;
+				border-radius: 11rpx;
+				font-size: 26rpx;
+				font-weight: bold;
+				color: #111;
+				margin-right: 16rpx;
+			}
+
+			.t1 {
+				background-color: #F0F8F6;
+				color: #007A69;
+			}
+
+			.t2 {
+				background-color: #E8EFFD;
+				color: #326EE0;
+			}
+
+			.personInfo {
+				flex: 1;
+
+				.name {
+					font-size: 30rpx;
+					color: #111;
+					margin-bottom: 16rpx;
+				}
+
+				.code {
+					color: #666;
+					font-size: 28rpx;
+				}
+			}
+
+		}
+	}
 </style>

pagesHouse/Verification/details.vue

@@ -19,7 +19,7 @@
 			<view class="ticketInfo">
 				<view class="hander-titles">
 					<view class="image">
-						<image src="https://i.ringzle.com/file/20240225/0db2e93d80054b459c6e40466fa852c0.png" mode="">
+						<image src="https://fsy.shengsi.gov.cn/file/20240225/0db2e93d80054b459c6e40466fa852c0.png" mode="">
 						</image>
 					</view>
 					<view class="names">

pagesHouse/Verification/ems.vue

@@ -1,27 +1,27 @@
-<template>
-	<view class="page" :style="{'min-height':(h)+'px','padding-top':mt+'px'}">
-	<c-nav-bar title="核销"></c-nav-bar>
-		<image @click="hexiao" src="https://i.ringzle.com/file/20240317/d5f047e986a04bff9cfbfef2c5dab095.png"></image>
-		
-		
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				boatNo:'',
-				price:''
-				//merchantType:uni.getStorageSync('merchantType');
-			}
-		},
-		onLoad(opt) {
-			
-		},
-		methods: {
+<template>
+	<view class="page" :style="{'min-height':(h)+'px','padding-top':mt+'px'}">
+	<c-nav-bar title="核销"></c-nav-bar>
+		<image @click="hexiao" src="https://fsy.shengsi.gov.cn/file/20240317/d5f047e986a04bff9cfbfef2c5dab095.png"></image>
+		
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				boatNo:'',
+				price:''
+				//merchantType:uni.getStorageSync('merchantType');
+			}
+		},
+		onLoad(opt) {
+			
+		},
+		methods: {
 			hexiao() {
-				  console.log('21321321',)
+				  console.log('21321321',)
 				uni.scanCode({
 					onlyFromCamera: true,
 					success: (res) => {
@@ -43,50 +43,50 @@
 						console.log('扫描二维码出现错误')
 					}
 				})
-				
-			}
-		}
-	}
-</script>
-
-<style scoped lang="less">
-	.page{
-		text-align: center;
-		box-sizing: border-box;
-	}
-	image{
-		width: 345rpx;
-		height: 345rpx;
-		margin: 80rpx 0 24rpx;
-	}
-	.tip{
-		font-size: 32rpx;
-		color: #111;
-		text{
-			margin-right:12rpx;
-		}
-		
-	}
-	.price{
-		margin: 28rpx 0 110rpx;
-		text{
-			&:first-child{
-				font-size: 36rpx;
-			}
-			&:last-child{
-				font-size: 48rpx;
-				font-weight: bold;
-			}
-		}
-	}
-	.btn{
-		width: 610rpx;
-		height: 88rpx;
-		line-height: 88rpx;
-		background-color: #007A69;
-		color: #fff;
-		font-size: 32rpx;
-		border-radius: 46rpx;
-		margin: 0 auto;
-	}
+				
+			}
+		}
+	}
+</script>
+
+<style scoped lang="less">
+	.page{
+		text-align: center;
+		box-sizing: border-box;
+	}
+	image{
+		width: 345rpx;
+		height: 345rpx;
+		margin: 80rpx 0 24rpx;
+	}
+	.tip{
+		font-size: 32rpx;
+		color: #111;
+		text{
+			margin-right:12rpx;
+		}
+		
+	}
+	.price{
+		margin: 28rpx 0 110rpx;
+		text{
+			&:first-child{
+				font-size: 36rpx;
+			}
+			&:last-child{
+				font-size: 48rpx;
+				font-weight: bold;
+			}
+		}
+	}
+	.btn{
+		width: 610rpx;
+		height: 88rpx;
+		line-height: 88rpx;
+		background-color: #007A69;
+		color: #fff;
+		font-size: 32rpx;
+		border-radius: 46rpx;
+		margin: 0 auto;
+	}
 </style>

pagesHouse/Verification/handiwork.vue

@@ -7,7 +7,7 @@
 
 					</view>
 					<view class="one">
-						<image src="https://i.ringzle.com/file/20240225/dc4ab62598874a89ae24f26d30d631d1.png" mode="">
+						<image src="https://fsy.shengsi.gov.cn/file/20240225/dc4ab62598874a89ae24f26d30d631d1.png" mode="">
 						</image>
 					</view>
 				</view>

pagesHouse/home/index.vue

@@ -110,11 +110,11 @@
 		data() {
 			return {
 				merchantName: uni.getStorageSync('merchantName'),
-				emg: 'https://i.ringzle.com/file/20240224/91173dde1cb44b139129e12ad4971f1d.png',
-				icons: ['https://i.ringzle.com/file/20240316/cb736aa1ebea42b68f73a0532bac1875.png',
-					'https://i.ringzle.com/file/20240224/70ab9f9d1a144c95927dedc6e84bcce7.png',
-					'https://i.ringzle.com/file/20240224/3f990c250f444ac9a5d9f334f322c98e.png',
-					'https://i.ringzle.com/file/20240224/7ca1bfa6e348438e83edc5af0589f847.png'
+				emg: 'https://fsy.shengsi.gov.cn/file/20240224/91173dde1cb44b139129e12ad4971f1d.png',
+				icons: ['https://fsy.shengsi.gov.cn/file/20240316/cb736aa1ebea42b68f73a0532bac1875.png',
+					'https://fsy.shengsi.gov.cn/file/20240224/70ab9f9d1a144c95927dedc6e84bcce7.png',
+					'https://fsy.shengsi.gov.cn/file/20240224/3f990c250f444ac9a5d9f334f322c98e.png',
+					'https://fsy.shengsi.gov.cn/file/20240224/7ca1bfa6e348438e83edc5af0589f847.png'
 				],
 				info: {},
 				list: [],
@@ -329,7 +329,7 @@
 			width: 100%;
 			height: auto;
 			padding: 0 18rpx;
-			background: url(https://i.ringzle.com/file/20240224/343febca7aa149c5aa0ee8c9365b2d3e.png) no-repeat;
+			background: url(https://fsy.shengsi.gov.cn/file/20240224/343febca7aa149c5aa0ee8c9365b2d3e.png) no-repeat;
 			background-size: 100% 100%;
 			box-sizing: border-box;
 

pagesHouse/home/orderBillDetail.vue

@@ -2,7 +2,7 @@
 	<view class="page" :style="{'min-height':(h-th)+'px','padding-top':mt+'px'}">
 		<c-nav-bar title="账单详情"></c-nav-bar>
 		<view class="box">
-			<image src="https://i.ringzle.com/file/20240224/d2b9acd9522747ac89239dcde0894c93.png"></image>
+			<image src="https://fsy.shengsi.gov.cn/file/20240224/d2b9acd9522747ac89239dcde0894c93.png"></image>
 			<text class="tit" v-if="merchantType==10">{{infoMation.playDate}}
 				{{infoMation.playTime}}出发/{{infoMation.orderType==2?'包船':'拼船'}}/{{infoMation.boatNo}}</text>
 			<text class="tit" v-else>{{infoMation.productName}}</text>

pagesMy/code/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="page" :style="{'min-height':h+'px','padding-top':mt+'px'}">
 		<c-nav-bar title="预订二维码" :showHome="false"></c-nav-bar>
-		<image src="https://i.ringzle.com/file/20240115/4cfb2a681dba4431800e88ba903d61a6.png" class="title" mode="widthFix"></image>
+		<image src="https://fsy.shengsi.gov.cn/file/20240115/4cfb2a681dba4431800e88ba903d61a6.png" class="title" mode="widthFix"></image>
 		<view class="code">
 			<image :src="img" mode="scaleToFill"></image>
 		</view>
@@ -33,7 +33,7 @@
 <style scoped lang="less">
 	.page{
 		box-sizing: border-box;
-		background: url(https://i.ringzle.com/file/20240115/95e355588e3c4df9847d3a586d79aa44.png) no-repeat;
+		background: url(https://fsy.shengsi.gov.cn/file/20240115/95e355588e3c4df9847d3a586d79aa44.png) no-repeat;
 		background-size: 100% 100%;
 		display: flex;
 		flex-direction: column;

pagesMy/stayInfo/roomPosition.vue

@@ -1,443 +1,443 @@
-<template>
-	<!-- <view class="pages" :style="{'height':(h)+'px','padding-top':mt+'px'}"> -->
-<view class="pages" :style="{'height':(h-th)+'px','padding-top':mt+'px'}">
-		<c-nav-bar title="酒店民宿信息" :showIcon="true"></c-nav-bar>
-		<view class="content">
-			<view class="card">
-				<!-- <view class="card1" @tap="open()"> -->
-				<!-- 	<view class="card1">
-					<text style="font-size: 30rpx; color: #333; font-weight: Regular; ">
-						<text>所属城市</text>
-						<text style="margin-left: 30rpx; text-align: right; width: 100%;"
-							v-if="str.name==undefined||str.name==''">请选择所属城市</text>
-						<text style="margin-left: 30rpx; text-align: right; width: 100%;" v-else>{{str.name}}</text>
-					</text>
-					<u-icon name="arrow-right" size="24"></u-icon>
-				</view> -->
-				<view class="card1">
-					<text style="margin-right: 30rpx; font-size: 30rpx; color: #333; font-weight: Regular; ">所属城市</text>
-					<u--input class="card-input" inputAlign="right" placeholder="请输入您的地址" border="none"
-						v-model="str.name" style="text-align: right; font-size: Regular;"></u--input>
-				</view>
-			</view>
-			<view class="card">
-				<view class="card1">
-					<text style="margin-right: 30rpx; font-size: 30rpx; color: #333; font-weight: Regular; ">详细地址</text>
-					<u--input class="card-input" inputAlign="right" placeholder="请输入您的地址" border="none"
-						v-model="formData.areaDetail" style="text-align: right; font-size: Regular;"></u--input>
-				</view>
-			</view>
-			<view class="card">
-				<view class="card1">
-					<text class="label">联系电话</text>
-					<u--input inputAlign="right" placeholder="请输入内容" border="none" v-model="stayInfo.landlinePhone"
-						style="text-align: right;"></u--input>
-				</view>
-			</view>
-			<view class="card c2">
-				<!-- <view class="tit">内饰照片</view> -->
-
-				<view class="label" style="color: #333; font-size: 30rpx; margin:20rpx 0 28rpx; font-weight: Heavy;">
-					内饰照片</view>
-				<view class="imgs">
-					<!-- <image src="" v-for="(item,index) in imgUrlList" :key="index"></image> -->
-					<u-upload ref="uUpload" uploadText="上传图片" :fileList="imgUrlList" :maxSize="10 * 1024 * 1024"
-						width="200" height="120" @afterRead="afterRead" @delete="deletePic">
-					</u-upload>
-				</view>
-			</view>
-			<view class="card" style="padding-bottom: 240rpx;">
-				<view class="card1">
-					<text>地图位置</text>
-				</view>
-				<!-- <view style="margin-top: 20rpx;" class="collapseTitle">
-					点击地图可调整至更精确位置
-				</view> -->
-				<view style="margin-top: 20rpx;">
-					<view class="content-map">
-						<map style="width: 100%;height: 100%;" :latitude="latitude" :longitude="longitude" :scale="16"
-							:title="title" />
-					</view>
-				</view>
-			</view>
-			<cityPicker :column="column" :default-value="defaultValue" :mask-close-able="maskCloseAble"
-				@confirm="confirm" @cancel="cancel" :visible="visible" />
-		</view>
-		<view class="bottom" @click="save">
-			<view class="btn">
-				确定
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import cityPicker from '@/uni_modules/piaoyi-cityPicker/components/piaoyi-cityPicker/piaoyi-cityPicker'
-	// 引入高德地图api提供的微信小程序的接口
-	var amapFile = require('@/utils/amap-wx.130.js');
-	// 创建地图
-	var myAmapFun = new amapFile.AMapWX({
-		key: '1173b1eb83eb93bff1fb4a5987503a51'
-	}); //key值要申请为 去高德地图申请微信小程序的key
-	// var myAmapFun = new amapFile.AMapWX({key: ''}); //key我的
-	export default {
-		data() {
-			return {
-				selectIndex: undefined,
-				selectAddr: {},
-				searchWords: "",
-				id: 1, // 使用 marker点击事件 需要填写id
-				title: 'map',
-				latitude: 39.91667, // 纬度
-				longitude: 116.41667, // 经度
-				markers: [{
-					latitude: 39.91667, // 纬度
-					longitude: 116.41667, // 经度
-					width: 30,
-					height: 30,
-					iconPath: ''
-					// iconPath: '../../static/ditu.png'
-				}],
-				dataTips: [],
-				// type: '',
-				value: '',
-				value1: '',
-				fileList: [],
-				fileList1: [],
-				imgUrlList: [],
-				fileList2: [],
-				result: '',
-				visible: false,
-				maskCloseAble: true,
-				str: {
-					name: '浙江省舟山市嵊泗县'
-				},
-				defaultValue: '330922',
-				// defaultValue: ['河北省','唐山市','丰南区'],
-				column: 3,
-				address: '',
-				formData: {},
-				stayInfo: {
-					picList: []
-				},
-				homestayId: uni.getStorageSync('homestayId') || 0,
-			}
-		},
-		components: {
-			cityPicker
-		},
-		onLoad(option) {
-			this.getStayInfo()
-			// var self = this;
-			// this.myPosition()
-			// uni.getLocation({
-			// 	type: 'gcj02',
-			// 	success: function(res) {
-			// 		console.log(res, '当前地址定位');
-			// 		if (res.errMsg == "getLocation:ok") {
-			// 			console.log(self.mark, 'onload里面看看');
-			// 			self.longitude = res.longitude;
-			// 			self.latitude = res.latitude;
-			// 			self.$set(self.markers[0], "longitude", res.longitude);
-			// 			self.$set(self.markers[0], "latitude", res.latitude);
-			// 			self.mapFlafg = true;
-			// 			console.log(self.markers, "markers")
-			// 			// self.markers[0].longitude = res.longitude;
-			// 			// self.markers[0].latitude = res.latitude;
-			// 		}
-			// 	},
-			// 	complete: () => {
-			// 		// 获取当前位置的地点列表
-			// 		myAmapFun.getPoiAround({
-			// 			location: self.longitude + ',' + self.latitude,
-			// 			success: (data) => {
-			// 				console.log("获取当前的列表", data);
-			// 				this.dataTips = data.poisData;
-			// 			},
-			// 			fail: (info) => {
-			// 				console.log(info, '点击地图错误信息1')
-			// 			}
-			// 		})
-			// 	}
-			// });
-		},
-		methods: {
-
-			getStayInfo() {
-				this.$api.get('/merchant/hotel/mine/getMerchantHomestayInfo/' + this.homestayId).then(res => {
-					if (res.data.code == 0) {
-						this.stayInfo = res.data.data;
-						this.formData = this.stayInfo
-						this.latitude = this.formData.lat
-						this.longitude = this.formData.lon
-						this.markers[0].latitude = this.formData.lat
-						this.markers[0].longitude = this.formData.lon
-						this.stayInfo.picList.forEach((item) => {
-							this.imgUrlList.push({
-								url: item
-							})
-						})
-					}
-				})
-			},
-			// 确定保存
+<template>
+	<!-- <view class="pages" :style="{'height':(h)+'px','padding-top':mt+'px'}"> -->
+<view class="pages" :style="{'height':(h-th)+'px','padding-top':mt+'px'}">
+		<c-nav-bar title="酒店民宿信息" :showIcon="true"></c-nav-bar>
+		<view class="content">
+			<view class="card">
+				<!-- <view class="card1" @tap="open()"> -->
+				<!-- 	<view class="card1">
+					<text style="font-size: 30rpx; color: #333; font-weight: Regular; ">
+						<text>所属城市</text>
+						<text style="margin-left: 30rpx; text-align: right; width: 100%;"
+							v-if="str.name==undefined||str.name==''">请选择所属城市</text>
+						<text style="margin-left: 30rpx; text-align: right; width: 100%;" v-else>{{str.name}}</text>
+					</text>
+					<u-icon name="arrow-right" size="24"></u-icon>
+				</view> -->
+				<view class="card1">
+					<text style="margin-right: 30rpx; font-size: 30rpx; color: #333; font-weight: Regular; ">所属城市</text>
+					<u--input class="card-input" inputAlign="right" placeholder="请输入您的地址" border="none"
+						v-model="str.name" style="text-align: right; font-size: Regular;"></u--input>
+				</view>
+			</view>
+			<view class="card">
+				<view class="card1">
+					<text style="margin-right: 30rpx; font-size: 30rpx; color: #333; font-weight: Regular; ">详细地址</text>
+					<u--input class="card-input" inputAlign="right" placeholder="请输入您的地址" border="none"
+						v-model="formData.areaDetail" style="text-align: right; font-size: Regular;"></u--input>
+				</view>
+			</view>
+			<view class="card">
+				<view class="card1">
+					<text class="label">联系电话</text>
+					<u--input inputAlign="right" placeholder="请输入内容" border="none" v-model="stayInfo.landlinePhone"
+						style="text-align: right;"></u--input>
+				</view>
+			</view>
+			<view class="card c2">
+				<!-- <view class="tit">内饰照片</view> -->
+
+				<view class="label" style="color: #333; font-size: 30rpx; margin:20rpx 0 28rpx; font-weight: Heavy;">
+					内饰照片</view>
+				<view class="imgs">
+					<!-- <image src="" v-for="(item,index) in imgUrlList" :key="index"></image> -->
+					<u-upload ref="uUpload" uploadText="上传图片" :fileList="imgUrlList" :maxSize="10 * 1024 * 1024"
+						width="200" height="120" @afterRead="afterRead" @delete="deletePic">
+					</u-upload>
+				</view>
+			</view>
+			<view class="card" style="padding-bottom: 240rpx;">
+				<view class="card1">
+					<text>地图位置</text>
+				</view>
+				<!-- <view style="margin-top: 20rpx;" class="collapseTitle">
+					点击地图可调整至更精确位置
+				</view> -->
+				<view style="margin-top: 20rpx;">
+					<view class="content-map">
+						<map style="width: 100%;height: 100%;" :latitude="latitude" :longitude="longitude" :scale="16"
+							:title="title" />
+					</view>
+				</view>
+			</view>
+			<cityPicker :column="column" :default-value="defaultValue" :mask-close-able="maskCloseAble"
+				@confirm="confirm" @cancel="cancel" :visible="visible" />
+		</view>
+		<view class="bottom" @click="save">
+			<view class="btn">
+				确定
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import cityPicker from '@/uni_modules/piaoyi-cityPicker/components/piaoyi-cityPicker/piaoyi-cityPicker'
+	// 引入高德地图api提供的微信小程序的接口
+	var amapFile = require('@/utils/amap-wx.130.js');
+	// 创建地图
+	var myAmapFun = new amapFile.AMapWX({
+		key: '1173b1eb83eb93bff1fb4a5987503a51'
+	}); //key值要申请为 去高德地图申请微信小程序的key
+	// var myAmapFun = new amapFile.AMapWX({key: ''}); //key我的
+	export default {
+		data() {
+			return {
+				selectIndex: undefined,
+				selectAddr: {},
+				searchWords: "",
+				id: 1, // 使用 marker点击事件 需要填写id
+				title: 'map',
+				latitude: 39.91667, // 纬度
+				longitude: 116.41667, // 经度
+				markers: [{
+					latitude: 39.91667, // 纬度
+					longitude: 116.41667, // 经度
+					width: 30,
+					height: 30,
+					iconPath: ''
+					// iconPath: '../../static/ditu.png'
+				}],
+				dataTips: [],
+				// type: '',
+				value: '',
+				value1: '',
+				fileList: [],
+				fileList1: [],
+				imgUrlList: [],
+				fileList2: [],
+				result: '',
+				visible: false,
+				maskCloseAble: true,
+				str: {
+					name: '浙江省舟山市嵊泗县'
+				},
+				defaultValue: '330922',
+				// defaultValue: ['河北省','唐山市','丰南区'],
+				column: 3,
+				address: '',
+				formData: {},
+				stayInfo: {
+					picList: []
+				},
+				homestayId: uni.getStorageSync('homestayId') || 0,
+			}
+		},
+		components: {
+			cityPicker
+		},
+		onLoad(option) {
+			this.getStayInfo()
+			// var self = this;
+			// this.myPosition()
+			// uni.getLocation({
+			// 	type: 'gcj02',
+			// 	success: function(res) {
+			// 		console.log(res, '当前地址定位');
+			// 		if (res.errMsg == "getLocation:ok") {
+			// 			console.log(self.mark, 'onload里面看看');
+			// 			self.longitude = res.longitude;
+			// 			self.latitude = res.latitude;
+			// 			self.$set(self.markers[0], "longitude", res.longitude);
+			// 			self.$set(self.markers[0], "latitude", res.latitude);
+			// 			self.mapFlafg = true;
+			// 			console.log(self.markers, "markers")
+			// 			// self.markers[0].longitude = res.longitude;
+			// 			// self.markers[0].latitude = res.latitude;
+			// 		}
+			// 	},
+			// 	complete: () => {
+			// 		// 获取当前位置的地点列表
+			// 		myAmapFun.getPoiAround({
+			// 			location: self.longitude + ',' + self.latitude,
+			// 			success: (data) => {
+			// 				console.log("获取当前的列表", data);
+			// 				this.dataTips = data.poisData;
+			// 			},
+			// 			fail: (info) => {
+			// 				console.log(info, '点击地图错误信息1')
+			// 			}
+			// 		})
+			// 	}
+			// });
+		},
+		methods: {
+
+			getStayInfo() {
+				this.$api.get('/merchant/hotel/mine/getMerchantHomestayInfo/' + this.homestayId).then(res => {
+					if (res.data.code == 0) {
+						this.stayInfo = res.data.data;
+						this.formData = this.stayInfo
+						this.latitude = this.formData.lat
+						this.longitude = this.formData.lon
+						this.markers[0].latitude = this.formData.lat
+						this.markers[0].longitude = this.formData.lon
+						this.stayInfo.picList.forEach((item) => {
+							this.imgUrlList.push({
+								url: item
+							})
+						})
+					}
+				})
+			},
+			// 确定保存
 			save() {
-				if(!this.latitude||!this.longitude) return this.$showToast('请进行地图标点')
-				// if (!this.$u.test.mobile(this.stayInfo.landlinePhone)) {
-				// 	this.$showToast('请输入正确手机号');
-				// 	return
-				// }
-				this.stayInfo.introduction = null
-				this.stayInfo.picList = [];
-				this.imgUrlList.forEach((i) => {
-					if (i.url) {
-						this.stayInfo.picList.push(i.url)
-					}
-				})
-				this.$api.post('/merchant/hotel/mine/updMHomestayInfo', this.stayInfo).then(res => {
-					console.log(res)
-					if (res.data.code == 0) {
-						this.$showToast('保存成功');
-						// setTimeout(() => {
-						// 	this.getStayInfo()
-						// }, 1000)
-					} else this.$showToast(res.data.msg);
-				})
-			},
-			// 删除图片
-			deletePic(event) {
-				this.imgUrlList.splice(event.index, 1)
-			},
-			// 新增图片
-			async afterRead(event) {
-				let lists = [].concat(event.file)
-				let fileListLen = this.imgUrlList.length
-				lists.map((item) => {
-					this.imgUrlList.push({
-						...item,
-						status: 'uploading',
-						message: '上传中'
-					})
-				})
-				for (let i = 0; i < lists.length; i++) {
-					const result = await this.uploadFilePromise(lists[i].url)
-					let item = this.imgUrlList[fileListLen]
-					this.imgUrlList.splice(fileListLen, 1, Object.assign(item, {
-						status: 'success',
-						message: '',
-						url: result
-					}))
-					fileListLen++
-				}
-				console.log(this.imgUrlList)
-			},
-			uploadFilePromise(url) {
-				return new Promise((resolve, reject) => {
-					let a = uni.uploadFile({
-						url: 'https://i.ringzle.com/island-cloud-server/oss/file/upload', // 仅为示例，非真实的接口地址
-						filePath: url,
-						name: 'file',
-						formData: {
-							user: 'test'
-						},
-						success: (res) => {
-							console.log(res)
-							let data = JSON.parse(res.data);
-							console.log(data)
-							resolve(data.data.url)
-						}
-					});
-				})
-			},
-
-
-
-
-
-
-
-			changeBegin() {
-				this.visible = true
-			},
-			myPosition() {
-				var myAmapFun = new amapFile.AMapWX({
-					key: '1173b1eb83eb93bff1fb4a5987503a51'
-				});
-				let that = this;
-				//获取地址
-				myAmapFun.getRegeo({
-					success: function(data) {
-						that.longitude = data[0].longitude
-						that.latitude = data[0].latitude
-						console.log(that.longitude, that.latitude, '1111');
-					},
-					fail: function(info) {
-						//失败回调
-						console.log(info)
-						uni.navigateBack();
-					}
-				})
-			},
-			open() {
-				this.visible = true
-			},
-			confirm(val) {
-				this.str = val
-				console.log(this.str, '333')
-				this.visible = false
-			},
-			cancel() {
-				this.visible = false
-			},
-			onShareAppMessage(res) {
-				if (res.from === 'button') { // 来自页面内分享按钮
-					console.log(res.target, '1')
-				}
-				return {
-					title: 'data-cityPicker省市区地址选择器！',
-					path: '/pages/cityPicker/cityPicker'
-				}
-			},
-			onShareTimeline(res) {
-				if (res.from === 'button') { // 来自页面内分享按钮
-					console.log(res.target, '2')
-				}
-				return {
-					title: 'data-cityPicker省市区地址选择器！'
-				}
-			},
-			change() {
-
-			},
-			close() {
-
-			},
-
-		}
-	}
-</script>
-<style lang="less">
-	.u-upload__wrap__preview__image {
-		width: 196rpx !important;
-		height: 130rpx !important;
-	}
-
-	.u-upload__button {
-		width: 196rpx !important;
-		height: 130rpx !important;
-	}
-
-	.card ::v-deep .u-icon__icon {
-		font-size: 30rpx !important;
-		margin-bottom: 10rpx;
-		left: 2rpx !important;
-		top: 6rpx !important;
-	}
-</style>
-<style lang="scss" scoped>
-	/deep/.u-cell__body {
-		padding: 0;
-	}
-
-	::v-deep .u-cell__body {
-		padding: 0;
-	}
-
-	.pages {
-		box-sizing: border-box;
-		height: 100%;
-		background: #F9FAFC;
-
-		.content {
-			padding: 20rpx;
-			height: 100%;
-
-			.card {
-				background: #fff;
-				border-radius: 16rpx;
-				padding: 30rpx 33rpx;
-				margin-bottom: 20rpx;
-
-				.upload {
-					margin-top: 48rpx;
-					width: 100%;
-					height: 200rpx;
-					border-radius: 16rpx;
-					background-color: #F5F8FA;
-					display: flex;
-					align-items: center;
-					text-align: center;
-
-					.upload-one {
-						margin: 0 245rpx;
-						width: 200rpx;
-						height: 200rpx;
-
-						image {
-							width: 100%;
-							height: 100%;
-						}
-					}
-				}
-
-				.collapseTitle {
-					font-size: 22rpx;
-					color: #a5a5a5;
-					margin-bottom: 20rpx;
-				}
-
-				.card1 {
-					display: flex;
-					flex-direction: row;
-					justify-content: space-between;
-					align-items: center;
-
-					text {
-						font-size: 30rpx;
-						color: #333;
-						font-weight: Regular;
-					}
-
-					.card-input {
-						font-size: 30rpx;
-						color: #333;
-						font-weight: Regular;
-					}
-
-					.as-content {
-						color: #a5a5a5;
-
-					}
-				}
-			}
-		}
-
-		.content-map {
-			border: 1rpx solid black;
-			height: 355rpx;
-		}
-
-		.bottom {
-			position: fixed;
-			bottom: 0;
-			z-index: 999999;
-			background: #fff;
-			width: 100%;
-			padding: 20rpx 0 30rpx;
-			box-sizing: border-box;
-
-			.btn {
-				background: #33AFFC;
-				color: white;
-				text-align: center;
-				height: 96rpx;
-				margin: 0 auto;
-				font-size: 34rpx;
-				line-height: 96rpx;
-				align-self: center;
-				border-radius: 48rpx;
-				width: 690rpx;
-			}
-		}
-	}
+				if(!this.latitude||!this.longitude) return this.$showToast('请进行地图标点')
+				// if (!this.$u.test.mobile(this.stayInfo.landlinePhone)) {
+				// 	this.$showToast('请输入正确手机号');
+				// 	return
+				// }
+				this.stayInfo.introduction = null
+				this.stayInfo.picList = [];
+				this.imgUrlList.forEach((i) => {
+					if (i.url) {
+						this.stayInfo.picList.push(i.url)
+					}
+				})
+				this.$api.post('/merchant/hotel/mine/updMHomestayInfo', this.stayInfo).then(res => {
+					console.log(res)
+					if (res.data.code == 0) {
+						this.$showToast('保存成功');
+						// setTimeout(() => {
+						// 	this.getStayInfo()
+						// }, 1000)
+					} else this.$showToast(res.data.msg);
+				})
+			},
+			// 删除图片
+			deletePic(event) {
+				this.imgUrlList.splice(event.index, 1)
+			},
+			// 新增图片
+			async afterRead(event) {
+				let lists = [].concat(event.file)
+				let fileListLen = this.imgUrlList.length
+				lists.map((item) => {
+					this.imgUrlList.push({
+						...item,
+						status: 'uploading',
+						message: '上传中'
+					})
+				})
+				for (let i = 0; i < lists.length; i++) {
+					const result = await this.uploadFilePromise(lists[i].url)
+					let item = this.imgUrlList[fileListLen]
+					this.imgUrlList.splice(fileListLen, 1, Object.assign(item, {
+						status: 'success',
+						message: '',
+						url: result
+					}))
+					fileListLen++
+				}
+				console.log(this.imgUrlList)
+			},
+			uploadFilePromise(url) {
+				return new Promise((resolve, reject) => {
+					let a = uni.uploadFile({
+						url: 'https://fsy.shengsi.gov.cn/island-cloud-server/oss/file/upload', // 仅为示例，非真实的接口地址
+						filePath: url,
+						name: 'file',
+						formData: {
+							user: 'test'
+						},
+						success: (res) => {
+							console.log(res)
+							let data = JSON.parse(res.data);
+							console.log(data)
+							resolve(data.data.url)
+						}
+					});
+				})
+			},
+
+
+
+
+
+
+
+			changeBegin() {
+				this.visible = true
+			},
+			myPosition() {
+				var myAmapFun = new amapFile.AMapWX({
+					key: '1173b1eb83eb93bff1fb4a5987503a51'
+				});
+				let that = this;
+				//获取地址
+				myAmapFun.getRegeo({
+					success: function(data) {
+						that.longitude = data[0].longitude
+						that.latitude = data[0].latitude
+						console.log(that.longitude, that.latitude, '1111');
+					},
+					fail: function(info) {
+						//失败回调
+						console.log(info)
+						uni.navigateBack();
+					}
+				})
+			},
+			open() {
+				this.visible = true
+			},
+			confirm(val) {
+				this.str = val
+				console.log(this.str, '333')
+				this.visible = false
+			},
+			cancel() {
+				this.visible = false
+			},
+			onShareAppMessage(res) {
+				if (res.from === 'button') { // 来自页面内分享按钮
+					console.log(res.target, '1')
+				}
+				return {
+					title: 'data-cityPicker省市区地址选择器！',
+					path: '/pages/cityPicker/cityPicker'
+				}
+			},
+			onShareTimeline(res) {
+				if (res.from === 'button') { // 来自页面内分享按钮
+					console.log(res.target, '2')
+				}
+				return {
+					title: 'data-cityPicker省市区地址选择器！'
+				}
+			},
+			change() {
+
+			},
+			close() {
+
+			},
+
+		}
+	}
+</script>
+<style lang="less">
+	.u-upload__wrap__preview__image {
+		width: 196rpx !important;
+		height: 130rpx !important;
+	}
+
+	.u-upload__button {
+		width: 196rpx !important;
+		height: 130rpx !important;
+	}
+
+	.card ::v-deep .u-icon__icon {
+		font-size: 30rpx !important;
+		margin-bottom: 10rpx;
+		left: 2rpx !important;
+		top: 6rpx !important;
+	}
+</style>
+<style lang="scss" scoped>
+	/deep/.u-cell__body {
+		padding: 0;
+	}
+
+	::v-deep .u-cell__body {
+		padding: 0;
+	}
+
+	.pages {
+		box-sizing: border-box;
+		height: 100%;
+		background: #F9FAFC;
+
+		.content {
+			padding: 20rpx;
+			height: 100%;
+
+			.card {
+				background: #fff;
+				border-radius: 16rpx;
+				padding: 30rpx 33rpx;
+				margin-bottom: 20rpx;
+
+				.upload {
+					margin-top: 48rpx;
+					width: 100%;
+					height: 200rpx;
+					border-radius: 16rpx;
+					background-color: #F5F8FA;
+					display: flex;
+					align-items: center;
+					text-align: center;
+
+					.upload-one {
+						margin: 0 245rpx;
+						width: 200rpx;
+						height: 200rpx;
+
+						image {
+							width: 100%;
+							height: 100%;
+						}
+					}
+				}
+
+				.collapseTitle {
+					font-size: 22rpx;
+					color: #a5a5a5;
+					margin-bottom: 20rpx;
+				}
+
+				.card1 {
+					display: flex;
+					flex-direction: row;
+					justify-content: space-between;
+					align-items: center;
+
+					text {
+						font-size: 30rpx;
+						color: #333;
+						font-weight: Regular;
+					}
+
+					.card-input {
+						font-size: 30rpx;
+						color: #333;
+						font-weight: Regular;
+					}
+
+					.as-content {
+						color: #a5a5a5;
+
+					}
+				}
+			}
+		}
+
+		.content-map {
+			border: 1rpx solid black;
+			height: 355rpx;
+		}
+
+		.bottom {
+			position: fixed;
+			bottom: 0;
+			z-index: 999999;
+			background: #fff;
+			width: 100%;
+			padding: 20rpx 0 30rpx;
+			box-sizing: border-box;
+
+			.btn {
+				background: #33AFFC;
+				color: white;
+				text-align: center;
+				height: 96rpx;
+				margin: 0 auto;
+				font-size: 34rpx;
+				line-height: 96rpx;
+				align-self: center;
+				border-radius: 48rpx;
+				width: 690rpx;
+			}
+		}
+	}
 </style>

pagesMy/stayInfo/stayInfo.vue

@@ -122,7 +122,7 @@
 			uploadFilePromise(url) {
 				return new Promise((resolve, reject) => {
 					let a = uni.uploadFile({
-						url: 'https://i.ringzle.com/island-cloud-server/oss/file/upload', // 仅为示例，非真实的接口地址
+						url: 'https://fsy.shengsi.gov.cn/island-cloud-server/oss/file/upload', // 仅为示例，非真实的接口地址
 						filePath: url,
 						name: 'file',
 						formData: {