样式修改

pages/index/shopList.vue

@@ -41,7 +41,7 @@
 				
 			<view class="shoplineLeft">
 				<image :src="item.photoPath" mode="" class="shopImg" v-if="item.photoPath"></image>
-				<image :src="item.photoPath" mode="" class="shopImg" v-else-if="item.photoPath2"></image>
+				<image :src="item.photoPath2" mode="" class="shopImg" v-else-if="item.photoPath2"></image>
 				<image src="../../static/timg/noimg.png" mode="" class="shopImg" v-else></image>
 			</view>
 			<view class="shopright">

pages/shop/confirm.vue

@@ -30,19 +30,25 @@
 				<view class="contlineRight">{{shopName}}</view>
 			</view>
 			<view class="contLine">
-				<view class="contlineLeft">车牌号</view>
-				<view class="contlineRight" @click="goCarlist">
-					<span>{{carInfo.plateNumber}}</span>
-					<image src="../../static/timg/icon_arrow_right.png" mode="" class="contlineRightJt"></image>
+				<view class="contlineLeft">服务车辆</view>
+				<view class="contlineRight2" @click="goCarlist">
+					<view>
+						<span>{{carInfo.plateNumber}}</span>
+						<image src="../../static/timg/icon_arrow_right.png" mode="" class="contlineRightJt"></image>
+					</view>
+					<view class="carModelCK">
+						{{carInfo.carModel?carInfo.carModel:'选择车型'}}
+					</view>
+					
 				</view>
 			</view>
-			<view class="contLine">
+			<!-- <view class="contLine">
 				<view class="contlineLeft">车型</view>
 				<view class="contlineRight carModelRight" @click="goCarlist">
-					<span class="carModel">{{carInfo.carModel?carInfo.carModel:'选择车辆'}}</span>
+					<span class="carModel">{{carInfo.carModel?carInfo.carModel:'选择车型'}}</span>
 					<image src="../../static/timg/icon_arrow_right.png" mode="" class="contlineRightJt"></image>
 				</view>
-			</view>
+			</view> -->
 			<view class="contLine">
 				<view class="contlineLeft">联系人</view>
 				<view class="contlineRight">
@@ -457,7 +463,13 @@
 	white-space: nowrap;
 	overflow: hidden;
 	text-overflow: ellipsis;
-	width: 450rpx;
+	width: 500rpx;
+	text-align: right;
+}
+.contlineRight2{
+	color: #333333;
+	line-height: 40rpx;
+	width: 550rpx;
 	text-align: right;
 }
 .contlineRightInput{
@@ -582,5 +594,9 @@
 	padding-left: 24rpx;
 	
 }
-
+.carModelCK{
+	font-weight: 400;
+	font-size: 24rpx;
+	color: #666666;
+}
 </style>

pages/shop/goodsDetail.vue

@@ -201,7 +201,7 @@
 								<image :src="shopInfo.doorImg1" v-if="shopInfo.doorImg1" mode="" class="buyShopContImg"></image>
 								<image :src="shopInfo.doorImg2" v-else-if="shopInfo.doorImg2" mode="" class="buyShopContImg"></image>
 								<image src="/static/timg/noimg.png" v-else class="buyShopContImg"></image>
-								<view class="buyShopContAdress">{{shopInfo.address}}</view>
+								<view class="buyShopContAdress">{{shopInfo.provinceName}}{{shopInfo.cityName}}{{shopInfo.areaName}}{{shopInfo.address}}</view>
 								<view class="buyShopJl" v-if="shopInfo.distance&&shopInfo.distance!= '0.00'">{{shopInfo.distance}}km</view>
 							</view>
 						</view>
@@ -1191,6 +1191,7 @@ button{
 	.buyShop{
 		background: #F9F9F9;
 		border-radius:6rpx;
+		overflow: hidden;
 	}
 	.buyShopTop{
 		display: flex;justify-content: space-between;
@@ -1212,7 +1213,7 @@ button{
 		font-size: 26rpx;
 		color: #222222;
 		line-height: 37rpx;
-		padding-left: 8rpx;
+		/* padding-left: 8rpx; */
 	}
 	.buyShopCont{
 		display: flex;

pages/subPack/aboutUS.vue

@@ -22,6 +22,7 @@
 			    unionID:'',
 				memberTitle:'',
 				scene:'',
+				title:'',
 			}
 		},
 		onLoad(opt) {
@@ -35,6 +36,10 @@
 					title: this.memberTitle,
 				});
 			}else{
+				this.title=opt.title
+				uni.setNavigationBarTitle({
+					title: this.title,
+				});
 				if(opt.scene&&opt.scene!='undefined'){
 					this.scene=opt.scene;
 					this.getShareParams()

pages/subPack/refundDetail.vue

@@ -63,7 +63,7 @@
 		 	<view class="itemName" v-if="data.openSheet.sheetType!=5">{{data.openSheetRefund.itemName}}</view>
 			<view class="itemName" v-if="data.openSheet.sheetType==5">钣喷</view>
 			<view class="priceBox">
-				<view class="price">¥{{data.openSheet.realMoney}}</view>
+				<view class="price">¥{{data.openSheetRefund.money}}</view>
 			</view>
 		 </view>
 	 </view>

pages/user/user.vue

@@ -240,15 +240,15 @@
 						    <image class="carjt" src="../../static/img2/jt1.png" mode=""></image>
 						</view>
 					</view>
-					<view class="klineRow" @click="gonavigateTo('historySpend')">
+					<view class="klineRow"  v-if="showSetting.isMaintenanceRecord==1" @click="gonavigateTo('historySpend')">
 						<image class="klineIcon" src="../../static/img2/byjl.png" mode=""></image>
 					    <view class="KlineTxt">保养记录</view>
 					</view>
-					<view class="klineRow" @click="gonavigateTo('checkReport')">
+					<view class="klineRow" v-if="showSetting.isCarConditionReport==1" @click="gonavigateTo('checkReport')">
 						<image class="klineIcon" src="../../static/img2/ckbg.png" mode=""></image>
 					    <view class="KlineTxt">车况报告</view>
 					</view>
-					<view class="klineRow" @click="gonavigateTo('../index/rescue')">
+					<view class="klineRow" v-if="showSetting.is24HRescue==1" @click="gonavigateTo('../index/rescue')">
 						<image class="klineIcon"  style="width: 58rpx;height: 49rpx;padding-bottom: 2rpx;"
 						src="../../static/img2/24.png" mode=""></image>
 					    <view class="KlineTxt">24小时救援</view>
@@ -284,26 +284,26 @@
 				</view> -->
 			</view>
 			
-			<view class="klineCont">
+			<view class="klineCont" v-if="showSetting.isShowService==1||showSetting.isMineOrder==1||showSetting.isRescueRecord==1||showSetting.isCarMatch==1||showSetting.isMineDeposit==1">
 				<view class="klineTitle">更多推荐</view>
 				<view class="kline">
 					<view class="klineRow" v-if="showSetting.isShowService==1" @click="gonavigateTo('../user/expertServices')">
 						<image class="klineIcon" src="../../static/img2/icon_fwzj.png" mode=""></image>
 					    <view class="KlineTxt2">服务顾问</view>
 					</view>
-					<view class="klineRow" @click="gonavigateTo('myBespeak')">
+					<view class="klineRow"  v-if="showSetting.isMineOrder==1" @click="gonavigateTo('myBespeak')">
 						<image class="klineIcon" src="../../static/img2/icon_yuyue.png" mode=""></image>
 					    <view class="KlineTxt2">我的预约</view>
 					</view>
-					<view class="klineRow" @click="gonavigateTo('../subPack/rescueOrder')">
+					<view class="klineRow" v-if="showSetting.isRescueRecord==1" @click="gonavigateTo('../subPack/rescueOrder')">
 						<image class="klineIcon" src="../../static/img2/jyjl.png" mode=""></image>
 					    <view class="KlineTxt2">救援记录</view>
 					</view>
-					<view class="klineRow" @click="gonavigateTo('../index/onlineBooking')">
+					<view class="klineRow" v-if="showSetting.isCarMatch==1" @click="gonavigateTo('../subPack/maintain')">
 						<image class="klineIcon" src="../../static/img2/clsp.png" mode=""></image>
 					    <view class="KlineTxt2">车辆适配</view>
 					</view>
-					<view class="klineRow"  @click="gonavigateTo('../subPack/depositList')">
+					<view class="klineRow" v-if="showSetting.isMineDeposit==1"  @click="gonavigateTo('../subPack/depositList')">
 						<image class="klineIcon" src="../../static/img2/icon_jydd.png" mode=""></image>
 					    <view class="KlineTxt2">我的寄存</view>
 					</view>
@@ -320,37 +320,37 @@
 					    <view class="KlineTxt2">分享好友</view>
 					</view>
 					</button>
-					<view class="klineRow" @click="gonavigateTo('../subPack/luckList')" v-if="numList.shopSettings.luckdrawDisabled">
+					<view class="klineRow" v-if="showSetting.isActivityGift==1" @click="gonavigateTo('../subPack/luckList')"><!--  v-if="numList.shopSettings.luckdrawDisabled" -->
 						<image class="klineIcon" src="../../static/img2/hdjp.png" mode=""></image>
 					    <view class="KlineTxt2">活动奖品</view>
 					</view>
-					<view class="klineRow" @click="gonavigateTo('../referral/referral')" v-if="numList.customerInfo.rebateState==1&&numList.shopSettings.introductionDisabled">
+					<view class="klineRow" v-if="numList.customerInfo.rebateState==1&&showSetting.isCustomerReferral==1" @click="gonavigateTo('../referral/referral')" ><!-- v-if="numList.customerInfo.rebateState==1&&numList.shopSettings.introductionDisabled" -->
 						<image class="klineIcon" src="../../static/img2/kehuzjs.png" mode=""></image>
 					    <view class="KlineTxt2">客户转介绍</view>
 					</view>
-					<view class="klineRow" @click="gonavigateTo('../partner/partner')" v-if="numList.customerInfo.pState==1&&numList.shopSettings.partnerDisabled">
+					<view class="klineRow" v-if="numList.customerInfo.pState==1&&showSetting.isOwnerPartner==1" @click="gonavigateTo('../partner/partner')" ><!-- v-if="numList.customerInfo.pState==1&&numList.shopSettings.partnerDisabled" -->
 						<image class="klineIcon" src="../../static/img2/chezhu.png" mode=""></image>
 					    <view class="KlineTxt2">车主合伙人</view>
 					</view>
-					<view class="klineRow" @click="gonavigateTo('myAppraise')">
+					<view class="klineRow" v-if="showSetting.isMineEvaluation==1" @click="gonavigateTo('myAppraise')">
 						<image class="klineIcon" src="../../static/img2/icon_pingjia.png" mode=""></image>
 					    <view class="KlineTxt2">我的评价</view>
 					</view>
-					<view class="klineRow" @click="gonavigateTo('../subPack/feedBack')">
+					<view class="klineRow"  v-if="showSetting.isSuggestionFeedback==1" @click="gonavigateTo('../subPack/feedBack')">
 						<image class="klineIcon" src="../../static/img2/yjfk.png" mode=""></image>
 					    <view class="KlineTxt2">建议反馈</view>
 					</view>
 					<view class="klineRow" @click="gomember(showSetting.memberTitle)">
 						<image class="klineIcon" src="../../static/img2/huiyuan.png" mode=""></image>
-					    <view class="KlineTxt2">关于会员</view>
+					    <view class="KlineTxt2">{{showSetting.memberTitle}}</view><!-- 关于会员 -->
 					</view>
-					<view class="klineRow" @click="gonavigateaboutUS">
+					<view class="klineRow" @click="gonavigateaboutUS(showSetting.aboutTitle)">
 						<image class="klineIcon" src="../../static/img2/gongs.png" mode=""></image>
-					    <view class="KlineTxt2">公司介绍</view>
+					    <view class="KlineTxt2">{{showSetting.aboutTitle}}</view><!-- 公司介绍 -->
 					</view>
 					<view class="klineRow" @click="makePhoneCall(showSetting.tel)">
 						<image class="klineIcon" src="../../static/img2/kefu.png" mode=""></image>
-					    <view class="KlineTxt2">联系客服</view>
+					    <view class="KlineTxt2">{{showSetting.telTitle}}</view><!-- 联系客服 -->
 					</view>
 				</view>
 			</view>
@@ -802,9 +802,9 @@
 				}
 			
 			},
-			gonavigateaboutUS(){
+			gonavigateaboutUS(title){
 				uni.navigateTo({
-					url: '../subPack/aboutUS?unionID='+this.numList.customerInfo.unionID
+					url: '../subPack/aboutUS?unionID='+this.numList.customerInfo.unionID+'&title='+title
 				})
 				
 			},