小程序bug修改

pages/index/index.vue

@@ -6,7 +6,7 @@
 			<view class="logoBox">
 				<!-- <image src="../../static/img2/indexlogo.png" mode="" class="logoImg"></image> -->
 				 <image v-if="appletHomeSetting.showImageType==0" :src="appletHomeSetting.showImage" mode="" class="logoImg"></image> 
-			    <view class="showTitleBox">
+			    <view class="showTitleBox" v-if="appletHomeSetting.showTitleType==0">
 					{{appletHomeSetting.showTitle}}
 				</view>
 			</view>
@@ -111,9 +111,10 @@
 		
 			<!-- 有车 -->
 			<!-- 无车 -->
-			<view class="nocarBox" v-if="!carInfo" >
-				<image @click="addCar" v-if="appletHomeSetting.carAddImageType!=1"  :src="appletHomeSetting.carAddImage" mode="" style="width: 100%;height: 148rpx;"></image>
-				<image @click="addCar" v-else  src="http://dmsphoto.66km.com.cn/thFiles/1A5B68D2-6627-406D-A775-550C92979026.png" mode="" style="width: 100%;height: 148rpx;"></image>
+			<view class="nocarBox"  v-if="!carInfo"  ><!-- -->
+				<image @click="addCar"  v-if="appletHomeSetting.carAddImageType!=1"  :src="appletHomeSetting.carAddImage" mode="" style="width: 100%;height: 148rpx;"></image>
+				<image @click="addCar" v-else  :src="appletHomeSetting.carAddImageDefault" mode="" style="width: 100%;height: 148rpx;"></image>
+				<!-- <image @click="addCar" v-else  src="http://dmsphoto.66km.com.cn/thFiles/1A5B68D2-6627-406D-A775-550C92979026.png" mode="" style="width: 100%;height: 148rpx;"></image> -->
 				<!-- <view style="display: flex;">
 					<image v-if="appletHomeSetting.carAddImageType==1" src="../../static/img2/pic.png" mode="" class="carAddImage"></image>
 					<image v-else :src="appletHomeSetting.carAddImage" mode="" class="carAddImage"></image>
@@ -1320,10 +1321,8 @@
 								this.$store.commit('mutationscarInfo', '')
 				  		}else{
 							if(res.data&&res.data!='null'){
-							
 								this.carInfo = res.data
 							}else{
-								
 								this.carInfo=''
 							}
 							 this.$store.commit('mutationscarInfo', this.carInfo)
@@ -1425,9 +1424,8 @@
 				 		this.homeCardList=res.data;
 						this.appletHomeSetting=res.data.appletHomeSetting;
 						this.navigationList=res.data.navigationList
-						var appletHomeSetting=this.appletHomeSetting
-						//this.tabType=appletHomeSetting.sortSettingList[0].type
-						
+					    var appletHomeSetting=this.appletHomeSetting
+						this.setTabBarItemFn()
 						if(this.homeCardList.activityModules.length>0){
 							this.activityModulesShow=true
 						}
@@ -1447,44 +1445,183 @@
 							   that.getCarList()
 							 }
 						}); 
+						var carbg={
+							carAddImage:appletHomeSetting.carAddImage,
+							carAddImageType:appletHomeSetting.carAddImageType,
+							carAddImageDefault:appletHomeSetting.carAddImageDefault,
+							
+						}
 						uni.setStorage({
-							key: 'carAddImage',
-							data: appletHomeSetting.carAddImage,
+							key: 'carbg',
+							data: carbg,
 							 success: function () {
 							  
 							 }
 						}); 
-						uni.setTabBarItem({
-						   index: 0,
-						   text: '首页',
-						   iconPath:appletHomeSetting.homeImageUnCheck,
-						   selectedIconPath: appletHomeSetting.homeImageCheck
-						})
-						uni.setTabBarItem({
-						   index: 1,
-						   text: '商城',
-						   iconPath:appletHomeSetting.mallImageUnCheck,
-						   selectedIconPath: appletHomeSetting.mallImageCheck
-						})
-						uni.setTabBarItem({
-						   index: 2,
-						   text: '活动',
-						   iconPath:appletHomeSetting.activityImageUnCheck,
-						   selectedIconPath: appletHomeSetting.activityImageCheck
-						})
-						uni.setTabBarItem({
-						   index: 3,
-						   text: '门店',
-						   iconPath:appletHomeSetting.storeImageUnCheck,
-						   selectedIconPath: appletHomeSetting.storeImageCheck
-						})
-						uni.setTabBarItem({
-						   index: 4,
-						   text: '我的',
-						   iconPath:appletHomeSetting.mineImageUnCheck,
-						   selectedIconPath: appletHomeSetting.mineImageCheck
-						})
+						
 				  })
+			 },
+			 setTabBarItemFn(){
+				 var appletHomeSetting=this.appletHomeSetting
+				/* uni.setTabBarStyle({
+				   // color: '#FF0000',
+				   selectedColor: '#'+this.themeColor,
+				 }) */
+				 if(appletHomeSetting.showHomeType==1){
+				 	if(this.themeColor=='6F2BE8'){
+				 		var backgroundImage='/static/tabimg/index6F2BE8.png'
+				 	}else if(this.themeColor=='1677FF'){
+				 		var backgroundImage='/static/tabimg/index1677FF.png'
+				 	}else if(this.themeColor=='FF4F00'){
+				 		var backgroundImage='/static/tabimg/indexFF4F00.png'
+				 	}else if(this.themeColor=='D53533'){
+				 		var backgroundImage='/static/tabimg/index1.png'
+				 	}else{
+						var backgroundImage='/static/tabimg/index1.png'
+					}
+				 
+				 	uni.setTabBarItem({
+				 	  index: 0,
+				 	  text: '首页',
+					  iconPath:'/static/tabimg/index2.png',
+				 	  selectedIconPath: backgroundImage
+				 	})
+				 }else{
+				 	uni.setTabBarItem({
+				 	   index: 0,
+				 	   text: '首页',
+				 	   iconPath:appletHomeSetting.homeImageUnCheck,
+				 	   selectedIconPath: appletHomeSetting.homeImageCheck
+				 	})
+				 }
+				 //商城
+				 if(appletHomeSetting.showMallType==1){
+					 if(this.themeColor=='6F2BE8'){
+					 	var backgroundImage='/static/tabimg/shop6F2BE8.png'
+					 }else
+					 if(this.themeColor=='1677FF'){
+					 	var backgroundImage='/static/tabimg/shop1677FF.png'
+					 }else
+					 if(this.themeColor=='FF4F00'){
+					 	var backgroundImage='/static/tabimg/shopFF4F00.png'
+					 }else
+					 if(this.themeColor=='D53533'){
+					 	var backgroundImage='/static/tabimg/shop1.png'
+					 }else{
+						 var backgroundImage='/static/tabimg/shop1.png'
+					 }
+					
+					 uni.setTabBarItem({
+					   index: 1,
+					   text: '商城',
+					    iconPath:'/static/tabimg/shop2.png',
+					    selectedIconPath: backgroundImage
+					 })
+				 }else{
+					 uni.setTabBarItem({
+					    index: 1,
+					    text: '商城',
+					    iconPath:appletHomeSetting.mallImageUnCheck,
+					    selectedIconPath: appletHomeSetting.mallImageCheck
+					 })
+				 }
+				 if(appletHomeSetting.showActivityType==1){
+				 			if(this.themeColor=='6F2BE8'){
+				 				var backgroundImage='/static/tabimg/activty6F2BE8.png'
+				 			}else
+				 			if(this.themeColor=='1677FF'){
+				 				var backgroundImage='/static/tabimg/activty1677FF.png'
+				 			}else
+				 			if(this.themeColor=='FF4F00'){
+				 				var backgroundImage='/static/tabimg/activtyFF4F00.png'
+				 			}else
+				 			if(this.themeColor=='D53533'){
+				 				var backgroundImage='/static/tabimg/activity1.png'
+				 			}else{
+								var backgroundImage='/static/tabimg/activity1.png'
+							}
+				 		
+				 			uni.setTabBarItem({
+				 			  index: 2,
+				 			  text: '活动',
+							  iconPath:'/static/tabimg/activty2.png',
+				 			  selectedIconPath: backgroundImage
+				 			})		 
+				 }else{
+				 	
+				 	uni.setTabBarItem({
+				 	   index: 2,
+				 	   text: '活动',
+				 	   iconPath:appletHomeSetting.activityImageUnCheck,
+				 	   selectedIconPath: appletHomeSetting.activityImageCheck
+				 	})				 
+				 }
+				 //门店
+				 if(appletHomeSetting.showStoreType==1){
+				 		if(this.themeColor=='6F2BE8'){
+				 			var backgroundImage='/static/tabimg/shop6F2BE8.png'
+				 		}else
+				 		if(this.themeColor=='1677FF'){
+				 			var backgroundImage='/static/tabimg/shop1677FF.png'
+				 		}else
+				 		if(this.themeColor=='FF4F00'){
+				 			var backgroundImage='/static/tabimg/shopFF4F00.png'
+				 		}else
+				 		if(this.themeColor=='D53533'){
+				 			var backgroundImage='/static/tabimg/shop1.png'
+				 		}else{
+				 			var backgroundImage='/static/tabimg/shop1.png'
+				 		}
+				 									 		
+				 		uni.setTabBarItem({
+				 		  index: 3,
+				 		  text: '门店',
+				 		  iconPath:'/static/tabimg/shop2.png',
+				 		  selectedIconPath: backgroundImage
+				 		})		 			 
+				 }else{
+				 	uni.setTabBarItem({
+				 	   index: 3,
+				 	   text: '门店',
+				 	   iconPath:appletHomeSetting.storeImageUnCheck,
+				 	   selectedIconPath: appletHomeSetting.storeImageCheck
+				 	})				 
+				 }
+				 if(appletHomeSetting.showMineType==1){
+				 			if (this.themeColor == '6F2BE8') {
+				 				var backgroundImage = '/static/tabimg/me6F2BE8.png'
+				 			}else
+				 			if (this.themeColor == '1677FF') {
+				 				var backgroundImage = '/static/tabimg/me1677FF.png'
+				 			}else
+				 			if (this.themeColor == 'FF4F00') {
+				 				var backgroundImage = '/static/tabimg/meFF4F00.png'
+				 			}else
+				 			if (this.themeColor == 'D53533') {
+				 				var backgroundImage = '/static/tabimg/me1.png'
+				 			}else{
+								var backgroundImage = '/static/tabimg/me1.png'
+							}
+				 		
+				 			uni.setTabBarItem({
+				 				index: 4,
+				 				text: '我的',
+								iconPath:'/static/tabimg/me2.png',
+				 				selectedIconPath: backgroundImage
+				 			})		 
+				 }else{
+				 	uni.setTabBarItem({
+				 	   index: 4,
+				 	   text: '我的',
+				 	   iconPath:appletHomeSetting.mineImageUnCheck,
+				 	   selectedIconPath: appletHomeSetting.mineImageCheck
+				 	})				 
+				 }
+				 
+				 
+				
+				 
+				 
 			 },
 			 getShopinfo(num,shopId){
 				 var that=this;

pages/subPack/maintain.vue

@@ -15,15 +15,15 @@
 			<!-- <view class="glInput" v-if="milage">{{milage}}km</view>
 			 <view class="glInput" v-else>暂无填写</view> -->
 			<!-- <input type="text" v-else placeholder="暂无填写" class="glInput"/> -->
-			 <input type="text" @blur="milageBlur" v-if="carInfo.milage" v-model="carInfo.milage" class="glInput"/>
-			 <input type="text"  @blur="milageBlur" v-model="carInfo.milage"  v-else placeholder="暂无填写" class="glInput"/>
+			 <input type="number" @blur="milageBlur" v-if="carInfo.milage" v-model="carInfo.milage" class="glInput"/>
+			 <input type="number"  @blur="milageBlur" v-model="carInfo.milage"  v-else placeholder="暂无填写" class="glInput"/>
 			 <image src="../../static/img2/xia.png" mode="" class="xiaIcon"></image>
 		 </view>
 	 </view>
 	 <view class="msBox">
 		 <view class="msLine">
 			 <image class="msIcon" src="../../static/img2/zp.png" mode=""></image>
-			 <view class="msTxt">正品保障</view>
+			 <view class="msTxt">正品保障1</view>
 		 </view>
 		 <view class="msLine">
 			 <image class="msIcon" src="../../static/img2/jp.png" mode=""></image>
@@ -99,6 +99,14 @@
 					 </view>
 				 </view>
 			 </view>
+			 <view v-if="list.length==0&&isLoding">
+				 <view  class="nodataBox" style="margin-top: 80rpx;">
+				 	<view style="text-align: center;">
+				 		<image class="nodataImg" src="http://dmsphoto.66km.com.cn/thFiles/FB1CBE1D-D56F-4921-AEB9-6364E7AC96BE.png" mode=""></image>
+				 	</view>
+				 	<view class="nodataTxt">暂无推荐</view>
+				 </view>
+			 </view>
 		 </view>
 	 
 	 <view style="height: 220rpx;"></view>
@@ -213,13 +221,14 @@
 				itemDefault:'',
 				lineItem:'',
 				maintainProjectID:'',
-				qdNum:1,
+				qdNum:0,
 				milage:'',
 				multiArray: [
 					['亚洲', '欧洲'],
 					['中国', '日本'],
 					['公里']
 				],
+				isLoding:false,
 			}
 		},
 		onLoad(opt) {
@@ -421,11 +430,17 @@
 				uni.showLoading({
 					title: '加载中'
 				})
+				this.isLoding=false;
 				this.$http('open-apply/get-recommend', {
 				    carId:this.carInfo.id,
 					bizId:this.maintainProjectID
 				}, 'GET').then(res => {
 					uni.hideLoading();
+				    this.isLoding=true;
+					this.list=''
+					this.itemDefault=''
+					this.qdNum=0
+					this.totalPrice=0
 					if(!res.data.data){
 						this.list=''
 						this.itemDefault=''

pages/user/bespeakDetail.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="box">
          <homenav :iStatusBarHeight="iStatusBarHeight" :title="'预约详情'" ></homenav>
-		<view class="top" >
+		<view class="top" :style="{background:'#'+themeColor}">
 			<view class="orderState">
 				<image src="../../static/img/icon_order_def.png" mode="" style="width: 44rpx;height: 44rpx;"></image>
 				

pages/user/myOrder/myOrder.vue

@@ -46,8 +46,8 @@
 				<view class="itemName">{{item.CreateTime}}</view>
                 <view class="itemName" style="padding-top: 2rpx;padding-bottom: 0;">{{item.ShopName}}</view>
 				<view class="package" v-if="item.SheetType==7" style="display: flex;">
-					<view class="itemName" v-if="item.packageName">{{item.packageName}}</view>
-					<view class="itemName" v-if="item.packageQty" style="padding-left: 10rpx;">x{{item.packageQty}}</view>
+					<view class="packageName" v-if="item.packageName">{{item.packageName}}</view>
+					<view class="packageQty" v-if="item.packageQty" style="padding-left: 10rpx;">共{{item.packageQty}}件</view>
 				</view>
 				<view class="bottom" v-if="item.SheetState == 1">
 					<view class="cancel" @click.stop="cancelBespeak(item)">取消订单</view>
@@ -598,4 +598,19 @@
 				display: flex;
 				justify-content: flex-end;
 			}
+.packageName{
+	font-size: 22rpx;
+	color: #FF0035;
+	border-radius: 5rpx;
+	border: 1px solid #FF0035;
+	padding: 2rpx 8rpx;
+}
+.package{
+	justify-content: space-between;
+	padding-top: 10rpx;padding-bottom: 10rpx;
+}
+.packageQty{
+	font-size: 26rpx;
+	color: #666666;
+}
 </style>

pages/user/user.vue

@@ -5,8 +5,10 @@
 			<view class="customerMes">
 				<image @click="updateUserInfo" v-if="showSetting.showImageType==0" :src="showSetting.showImage" mode=""
 					style="width: 110rpx;height: 110rpx;border-radius: 55rpx;"></image>
-				<image @click="updateUserInfo" v-else src="http://dmsphoto.66km.com.cn/thFiles/64CD12A3-588E-4201-90F6-5428F6ACD9F9.png" mode=""
-					style="width: 110rpx;height: 110rpx;border-radius: 55rpx;"></image>
+					<image @click="updateUserInfo" v-else :src="showSetting.showImageDefault" mode=""
+						style="width: 110rpx;height: 110rpx;border-radius: 55rpx;"></image>
+			<!-- 	<image @click="updateUserInfo" v-else src="http://dmsphoto.66km.com.cn/thFiles/64CD12A3-588E-4201-90F6-5428F6ACD9F9.png" mode=""
+					style="width: 110rpx;height: 110rpx;border-radius: 55rpx;"></image> -->
 				<view class="mes">
 					<view class="nick">
 						<view class="nickName" v-if="customerName">{{customerName}}</view>
@@ -254,9 +256,9 @@
 				</view>
 			</view>
 			
-			<view class="klineCont"  v-if="!carInfo"><!-- -->
-			     <image @click="addCar" v-if="carAddImage==1" src="http://dmsphoto.66km.com.cn/thFiles/1A5B68D2-6627-406D-A775-550C92979026.png" mode="" style="width: 100%;height: 148rpx;"></image>
-			     <image @click="addCar" v-else :src="carAddImage" mode="" style="width: 100%;height: 148rpx;"></image>
+			<view class="klineCont" v-if="!carInfo" style="padding: 12rpx 16rpx;" ><!-- -->
+			     <image @click="addCar" v-if="carbg.carAddImageType!=1" :src="carbg.carAddImage" mode="" style="width: 100%;height: 148rpx;"></image>
+			     <image @click="addCar" v-else :src="carbg.carAddImageDefault" mode="" style="width: 100%;height: 148rpx;"></image>
 				<!-- <view class="klineTitle">我的爱车</view>
 				<view class="addCarBox">
 					<view class="addCar">
@@ -584,7 +586,7 @@
 				f2cIndex:'',
 				customerName:'',
 				carInfo:'',
-				carAddImage:'',
+				carbg:'',
 			}
 		},
 		onLoad(opt) {
@@ -616,15 +618,15 @@
 					selectedIconPath: backgroundImage
 				}) */
 			}
-			uni.setNavigationBarColor({
+			/* uni.setNavigationBarColor({
 				frontColor: "#000000",
 				backgroundColor: '#' + this.themeColor
-			})
+			}) */
 			this.getVersionInfo()
 			// const accountInfo = wx.getAccountInfoSync();
 			// var version_number = accountInfo.miniProgram.version;
 			// console.log(version_number)
-			this.carAddImage=uni.getStorageSync("carAddImage")
+			this.carbg=uni.getStorageSync("carbg")
 		},
 		onShow() {
 			const wxOpenData = this.$store.state.wxOpenData;

utils/request.js

@@ -9,7 +9,7 @@ import $store from '../store'
 const extConfig = uni.getExtConfigSync();		
 console.log(extConfig)
 const baseUrl=extConfig.url+'/'
-//const baseUrl='http://192.168.1.7:20187/'
+//const baseUrl='http://192.168.1.13:20187/'
 //const baseUrl='http://api.dms.66km.com.cn/'
 //const baseUrl='http://192.168.1.9:20187/' 
 //const baseUrl='https://store-api.qdbtl.cn/'