Browse Source

bug修改

twt 2 years ago
parent
commit
f1104677c3
3 changed files with 42 additions and 19 deletions
  1. 6 0
      pages/addjk/choice.vue
  2. 34 17
      pages/europeOrder/eorderDetail.vue
  3. 2 2
      pages/europeOrder/europeOrder.vue

+ 6 - 0
pages/addjk/choice.vue

@@ -140,6 +140,11 @@
 		line-height: 44px;
 		font-size: 16px;
 		font-weight: 700;
+		position: fixed;
+		width: 750rpx;
+		left: 0;
+		top: 0;
+		z-index: 11;
 	}
 	.uni-page-head-btnBox{
 		width: 40px;
@@ -155,6 +160,7 @@
 	}
 	.zhidingyiBox{
 		padding: 20rpx 24rpx;
+		margin-top: 44px;
 	}
 	.zhidingyi{
 		background: #ffffff;

+ 34 - 17
pages/europeOrder/eorderDetail.vue

@@ -4,12 +4,12 @@
 	   <view class="top">
 		   
 		   <view class="nav" >
-			   <view>
-				     <image src="../../static/img/baiback22.png" mode="" class="gobackImg" @click="goback"></image>
+			   <view class="zdyNavLeft">
+				     <image src="../../static/img/nav_icon_back.png" mode="" class="backImg" @click="goback"></image>
 					<!-- <image src="../../static/img/baigoindex22.png" mode="" class="goIndexImg" @click="goIndex()"></image> -->
 			   </view>
 			 
-			   <view>订单详情</view>
+			   <view class="zdyNavTitle">订单详情</view>
 			   <view style="width: 92rpx;"></view>
 		   </view>
 		   <view style="height: 44px;"></view>
@@ -62,7 +62,7 @@
 		 			<!--   <view class="timeRight" @click="qrcodeClick">订单码</view> -->
 		 		   </view>
 		 		   <view class="shopBox">
-		 			   <image src="../../static/img/newshop.png" mode="" class="shopBoximg"></image>
+		 			   <image src="../../static/img/newshop.png" mode="" class="shopBoximg1"></image>
 		 			   <view class="shopCont">
 		 				   <view class="shopName">{{orderData.shopName}}</view>
 		 				 
@@ -612,37 +612,50 @@ export default {
 		left: 0;
 		background: rgba(0,0,0,0.7);
 	}
+	.zdyNavLeft {
+		display: flex;
+		align-items: center;
+	}
 	.top{
 		width: 750rpx;
 		height: 242rpx;
-		background: #FF4F00;
+		background: #3F90F7;
 		/* background: linear-gradient(134deg, #FF8635 0%, #FF4828 100%); */
 	}
 	.nav{
 		line-height: 44px;
 		font-size: 34rpx;
-		font-weight: 600;
+		/* font-weight: 600; */
 		display: flex;
 		justify-content: space-between;
-		color: #FFFFFF;
+		/* color: #FFFFFF; */
 		position: fixed;
 		width: 100vw;
 		left: 0;
 		z-index: 1111;
-		background: #FF4F00;
+		background: #FFFFFF;
 	}
-	.gobackImg{
-		width: 92rpx;
-		height: 88rpx;
-		/* padding: 12px; */
+	.backImg{
+		width: 44rpx;
+		height: 44rpx;
+		margin-left: 10rpx;
+		margin-right: 20rpx;
 		
 	}
+	.zdyNavTitle {
+	    
+		height: 44px;
+		background: #FFFFFF;
+		text-align: center;
+		font-size: 34rpx;
+		line-height: 44px;
+	}
 	.SheetState{
-		font-size: 44rpx;
+		font-size: 34rpx;
 		font-weight: 500;
 		color: #FFFFFF;
-		padding-left: 24rpx;
-		padding-top: 24rpx;
+		text-align: center;
+		padding-top: 40rpx;
 	}
 	
 	.orderTop{
@@ -674,6 +687,9 @@ export default {
 	.shopBoximg{
 		width: 40rpx;height: 40rpx;
 	}
+	.shopBoximg1{
+		width: 40rpx;height: 44rpx;
+	}
 	.shopRightImg{
 		width: 52rpx;height: 38rpx;
 	}
@@ -904,7 +920,7 @@ export default {
 		background: #F5F5F5;
 	}
 	.timesfActive{
-		background: #FF4F00;
+		background: #3F90F7;
 		
 	}
 	.timesfActive .timeSfNum{
@@ -985,7 +1001,8 @@ export default {
 	.timecomplete{
 		width: 690rpx;
 		height: 74rpx;
-		background: linear-gradient(124deg, #FF8700 0%, #FF4F00 100%);
+		/* background: linear-gradient(124deg, #FF8700 0%, #FF4F00 100%); */
+		background: #3F90F7;
 		border-radius: 37rpx;
 		line-height: 74rpx;
 		text-align: center;

+ 2 - 2
pages/europeOrder/europeOrder.vue

@@ -422,8 +422,8 @@ export default {
 		text-align: center;
 	}
 	.tabActive{
-		color: #FF4F00;
-		border-bottom: 4rpx solid #FF4F00;
+		color: #3F90F7;
+		border-bottom: 4rpx solid #3F90F7;
 	}
 	.flex2{
 		display: flex;