针对apk进行修改(不影响小程序端)

components/uNavBar1/index.vue

@@ -79,9 +79,9 @@
 <style lang="scss" scoped>
 	::v-deep .u-nav-slot {
 		display: flex;
-		padding: 8rpx 16rpx;
+		padding: 8rpx 16rpx 8rpx 0;
 		width: 150rpx;
-		background-color: rgba(0, 0, 0, 0.2);
+		// background-color: rgba(0, 0, 0, 0.2);
 		border-radius: 30rpx;
 		color: #fff;
 	}

pages/HotelMerchandise/addCommodity.vue

@@ -150,7 +150,7 @@
 							this.$showToast('保存成功');
 
 							setTimeout(() => {
-								uni.redirectTo({
+								uni.navigateTo({
 									url: '/pages/HotelMerchandise/index'
 								})
 								// uni.navigateBack(1)
@@ -160,7 +160,7 @@
 							this.$showToast('上架成功');
 
 							setTimeout(() => {
-								uni.redirectTo({
+								uni.navigateTo({
 									url: '/pages/HotelMerchandise/index'
 								})
 								// uni.navigateBack(1)

pages/home/index.vue

@@ -210,7 +210,7 @@
 		methods: {
 			// 跳转
 			toHref(url) {
-				uni.redirectTo({
+				uni.navigateTo({
 					url: url
 				})
 			},
@@ -417,7 +417,7 @@
 			//办理入住
 			checkIn(orderStatus, item) {
 				this.orderInfo = item;
-				uni.redirectTo({
+				uni.navigateTo({
 					url: "/pages/house/createOrder?id=" + this.orderInfo.id + '&orderStatus=' + orderStatus
 				})
 			},

pages/house/createOrder.vue

@@ -489,7 +489,7 @@
 					if (res.data.code == 0) {
 						this.$showToast('操作成功');
 						setTimeout(() => {
-							uni.redirectTo({
+							uni.navigateTo({
 								url: '/pagesMy/orderList/orderList'
 							})
 						}, 1500)

pages/house/orderInfo.vue

@@ -251,13 +251,13 @@
 			},
 			//办理入住
 			checkIn(orderStatus) {
-				uni.redirectTo({
+				uni.navigateTo({
 					url: "/pages/house/createOrder?id=" + this.orderInfo.id + '&orderStatus=' + orderStatus
 				})
 			},
 			// 编辑
 			edit() {
-				uni.redirectTo({
+				uni.navigateTo({
 					url: "/pages/house/createOrder?id=" + this.orderInfo.id
 				})
 			},

pages/login/index.vue

@@ -1,16 +1,16 @@
 <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>
+		<!-- 	<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>
+				<button open-type="getPhoneNumber" @getphonenumber="decryptPhoneNumber">授权手机号登录</button>
 			</view>
 		</view>
 	</view>
 </template>
-
+ 
 <script>
 	export default {
 		data() {
@@ -68,7 +68,7 @@
 
 <style scoped lang="less">
 	.page{
-		background: url(https://i.ringzle.com/file/20240109/472b6b7b9ea44652b85e73c796876378.png) no-repeat;
+		background: url(https://i.ringzle.com/file/20240523/474a7a2656cb499d851cf7665f9d7d6a.png) no-repeat;
 		background-size: 100% 100%;
 		display: flex;
 		align-items: center;
@@ -91,20 +91,20 @@
 				line-height: 96rpx;
 			}
 			.login{
-				margin-top: 80rpx;
+				margin-top: 780rpx;
 				width: 100%;
 				height: 96rpx;
 				button{
 					width: 100%;
 					height: 100%;
-					background: #FFFFFF;
+					background: #1372FF;
 					border-radius: 48rpx 48rpx 48rpx 48rpx;
 					line-height: 96rpx;
 					text-align: center;
-					font-size: 34rpx;
+					font-size: 32rpx;
 					font-family: PingFang SC, PingFang SC;
 					font-weight: 400;
-					color: #145EE6;
+					color: #FFFFFF;
 				}
 			}
 		}

pagesHouse/Mine/ordersList/details/details.vue

@@ -11,23 +11,14 @@
 				</view>
 			</view>
 			<view class="ticketInfo">
-				<!-- <view class="hander-titles">
-					<view class="names">
-						{{list.fishermanName}}
-					</view>
-					<view class="rights">
-						<u-icon name="arrow-right"></u-icon>
-					</view>
-				</view> -->
 				<view v-if="merchantType==10" class="dateAndType">
 					<u-icon name="calendar" size="40" color="#272636" style="display: flex;align-items: center;"></u-icon>
 					<text>{{infoMation.playDate}} {{infoMation.playTime}}出发/{{infoMation.orderType==3?'拼船':'包船'}}</text>
 				</view>
 				<view class="ticketInfo-hander">
 					<view class="image">
-						<image :src="infoMation.isFisheringGoodsDTO.coverImg" mode="aspectFill" v-if="merchantType==10"></image>
+						<image :src="isFisheringGoodsDTOCoverImg" mode="aspectFill" v-if="merchantType==10&&isFisheringGoodsDTOCoverImg"></image>
 						<image :src="infoMation.productImg&&infoMation.productImg.split(',')[0]" mode="aspectFill" v-else></image>
-						
 					</view>
 					<view class="right">
 						<view class="name">
@@ -198,7 +189,8 @@
 				},
 				list: {},
 				infoMation: {},
-				orderCode: '',
+				orderCode: '',
+				isFisheringGoodsDTOCoverImg:''
 			}
 		},
 		onLoad(opt) {
@@ -213,7 +205,6 @@
 			delNotice(val){
 				if (val) {
 					return JSON.parse(val)[0].notice
-					
 				}
 			},
 			delArr(val) {
@@ -236,7 +227,8 @@
 				this.$api.get('/api/fishering/personCenterOrderDetail/' + this.orderCode).then(res => {
 					console.log(res)
 					if (res.data.code == 0) {
-						this.infoMation = res.data.data;
+						this.infoMation = res.data.data;
+						this.isFisheringGoodsDTOCoverImg = this.infoMation.isFisheringGoodsDTO.coverImg||'';
 					}
 				})
 			},
@@ -246,7 +238,8 @@
 					orderCode: this.orderCode
 				}).then(res => {
 					if (res.data.code == 0) {
-						this.infoMation = res.data.data;
+						this.infoMation = res.data.data;
+						this.isFisheringGoodsDTOCoverImg = this.infoMation.isFisheringGoodsDTO.coverImg||'';
 						this.infoMation.productsDetail = JSON.parse(res.data.data.productsDetail);
 					}
 				})

pagesHouse/Mine/ordersList/outcome.vue

@@ -31,7 +31,7 @@
 		},
 		methods: {
 			toDetails() {
-				uni.redirectTo({
+				uni.navigateTo({
 					url: '/pagesHouse/home/bill'
 				})
 			},

pagesHouse/Verification/check.vue

@@ -189,7 +189,7 @@
 					boatCode: boatCode
 				}).then(res => {
 					if (res.data.code == 0) {
-						uni.redirectTo({
+						uni.navigateTo({
 							url: "/pagesHouse/Verification/success?boatNo=" + this.boatNo + '&price=' +
 								this.orderInfo.realPrice
 						})

pagesHouse/Verification/checkApp.vue

@@ -231,7 +231,7 @@
 					boatCode: boatCode
 				}).then(res => {
 					if (res.data.code == 0) {
-						uni.redirectTo({
+						uni.navigateTo({
 							url: "/pagesHouse/Verification/success?boatNo=" + this.boatNo + '&price=' +
 								this.orderInfo.realPrice
 						})

pagesHouse/Verification/recordDetails.vue

@@ -1,22 +1,22 @@
 <template>
 	<view class="page" :style="{'min-height':h+'px','padding-top':mt+'px'}">
 		<c-nav-bar title="核销记录"></c-nav-bar>
-		<view class="box ship_time">
+		<view class="box ship_time" v-if="itemorderEntity">
 			<view class="hx_title">
-				发船信息：{{item.orderEntity.playDate}} {{item.orderEntity.playTime}}/{{orderType[item.orderEntity.orderType]}}/{{item.orderEntity.boatNo}}
+				发船信息：{{itemorderEntity.playDate}} {{itemorderEntity.playTime}}/{{orderType[itemorderEntity.orderType]}}/{{itemorderEntity.boatNo}}
 			</view>
 			<view class="st_info">
-				<text>订单编号：{{item.orderEntity.orderCode}}</text>
-				<view class="sti_xq" @tap="toOrderDetails(item.orderEntity.orderCode)">详情</view>
+				<text>订单编号：{{itemorderEntity.orderCode}}</text>
+				<view class="sti_xq" @tap="toOrderDetails(itemorderEntity.orderCode)">详情</view>
 			</view>
 			<view class="st_info">
-				<text>出游时间：{{item.orderEntity.playLength}}小时</text>
+				<text>出游时间：{{itemorderEntity.playLength}}小时</text>
 			</view>
 			<view class="st_info">
-				<text>联系号码：{{item.orderEntity.linkPhone}}</text>
+				<text>联系号码：{{itemorderEntity.linkPhone}}</text>
 			</view>
 			<view class="st_info">
-				<text>渔船号：{{item.orderEntity.boatCode}}</text>
+				<text>渔船号：{{itemorderEntity.boatCode}}</text>
 			</view>
 		</view>
 		<view class="box person_info">
@@ -54,7 +54,8 @@
 					3:'拼船'
 				},
 				orderCode:'',
-				item:null
+				item:null,
+				itemorderEntity:''
 			}
 		},
 		onLoad(option) {
@@ -65,7 +66,8 @@
 			getDetails(){
 				this.$api.get('/scenic/api/order/writeOffRecordInfo/'+this.orderCode).then(res=>{
 					if(res.data.code===0){
-						this.item = res.data.data;
+						this.item = res.data.data;
+						this.itemorderEntity = this.item.orderEntity;
 						this.item.bookList.forEach(l=>{
 							l.touristCode = l.touristCode.replace(/^(.{6})(?:\d+)(.{4})$/, '\$1******\$2');
 						})

pagesHouse/home/index.vue

@@ -225,7 +225,7 @@
 				})
 			},
 			toHref(url) {
-				uni.redirectTo({
+				uni.navigateTo({
 					url: url
 				})
 			},