Merge branch 'main' of http://git.njrzwl.cn:3000/wangmingchuan/yanzong_qianduan

pages/news3/LogisticsDetails.vue

@@ -1,11 +1,10 @@
 <template>
-	<view>
-		<view class="bgImg"
-			:style="{ background: `url(${$picUrl+'/static/news3/walletBg.png'})`, 'background-size': 'cover' }">
+	<view class="bg_style">
+		<view class="bgImg">
 			<view style="width:100%;position:sticky;">
 				<view class="navBarContent">
 					<u-icon name="arrow-left" @click="onBack"
-						style="position: absolute;top:50%;left:40upx;transform: translateY(-50%);" color="#000"
+						style="position: absolute;top:50%;left:16px;transform: translateY(-50%);" color="#000"
 						size="35"></u-icon>
 					<text>物流信息</text>
 				</view>
@@ -25,7 +24,8 @@
 		</view>
 		<!-- 物流轨迹 -->
 		<view class="logis-detail" v-if="logisticsItem">
-			<view class="logis-item" :class="{ first: index === 0 }" v-for="(item, index) in logisticsItem.items" :key="index">
+			<view class="logis-item" :class="{ first: index === 0 }" v-for="(item, index) in logisticsItem.items"
+				:key="index">
 				<view class="logis-item-content">
 					<view class="logis-item-content__describe">
 						<text class="f-26">{{ item.context }}</text>
@@ -35,8 +35,8 @@
 					</view>
 				</view>
 			</view>
-			<view class="all-details" style="padding: 50px 0;font-size: 16px;" v-if="!logisticsItem.items">暂无物流信息</view>
 		</view>
+		<view class="all-details" style="padding: 50px 0;font-size: 16px;background: #fff;" v-else>暂无物流信息</view>
 	</view>
 </template>
 
@@ -105,6 +105,13 @@
 		padding-bottom: 40upx;
 	}
 
+	.bg_style {
+		width: 100%;
+		background: url(https://www.royaum.com.cn/static/news/login-bg.png) center 0 no-repeat;
+		background-size: 100% auto;
+		min-height: 100vh;
+	}
+
 	.all-details {
 		width: 100%;
 		font-size: 14px;
@@ -112,8 +119,8 @@
 	}
 
 	.navBarContent {
-		height: 100upx;
-		line-height: 100upx;
+		height: 140upx;
+		line-height: 140upx;
 		text-align: center;
 		position: relative;
 
@@ -128,7 +135,7 @@
 
 	.bgImg {
 		width: 100%;
-		height: 130px;
+		height: 160px;
 		position: relative;
 	}
 

pages/news3/LogisticsInquiry.vue

@@ -1,22 +1,20 @@
 <template>
-	<view>
-		<view class="bgImg"
-			:style="{ background: `url(${$picUrl+'/static/news3/walletBg.png'})`, 'background-size': 'cover' }">
+	<view class="bg_style">
+		<view class="bgImg">
 			<view style="width:100%;">
 				<view class="navBarContent">
 					<u-icon name="arrow-left" @click="onBack"
-						style="position: absolute;top:50%;left:40upx;transform: translateY(-50%);" color="#000"
+						style="position: absolute;top:50%;left:16px;transform: translateY(-50%);" color="#000"
 						size="35">
 					</u-icon>
 					<text>物流查询</text>
 				</view>
 			</view>
-			<!-- <image :src="$picUrl+'/static/news3/walletBg.png'" mode="widthFix" class="bgImg"></image> -->
 			<view class="contentDes">
 				<u-field v-model="logisticsNum" label="物流单号" placeholder="请填写物流单号">
 				</u-field>
 				<view class="btnGroup">
-					<view class="btnItem" @click="scanCode">
+					<view class="btnItem" @click="scanCode" style="margin-right:35px;">
 						<image :src="$picUrl+'/static/news3/scan.png'" mode="widthFix"></image>
 						<text>扫码识别</text>
 					</view>
@@ -87,30 +85,40 @@
 	page {
 		background-color: #F7F8FA;
 		min-height: 100%;
-		padding-bottom: 140upx;
-		background: linear-gradient(180deg, #FFE4E8 0%, #F7F8FA 40%);
+		height: 100%;
+
+	}
+
+	.bg_style {
+		width: 100%;
+		background: url(https://www.royaum.com.cn/static/news/login-bg.png) center 0 no-repeat;
+		background-size: 100% auto;
+		min-height: 100vh;
 	}
 
 	.bgImg {
 		width: 100%;
-		height: 200px;
+		height: 180px;
 		position: relative;
 	}
 
 	.contentDes {
 		position: relative;
 		z-index: 2;
-		margin: 26upx;
+		margin: 0upx 26upx;
+
 		background-color: #fff;
+
 		background: #FFFFFF;
 		border-radius: 6px 6px 6px 6px;
 		opacity: 1;
-		padding: 28upx;
+		padding: 0 28upx;
+
 	}
 
 	.navBarContent {
-		height: 100upx;
-		line-height: 100upx;
+		height: 140upx;
+		line-height: 140upx;
 		text-align: center;
 		position: relative;