Bladeren bron

1.头像
2.保养手册

guo 2 jaren geleden
bovenliggende
commit
f4c9fa3a85
3 gewijzigde bestanden met toevoegingen van 96 en 99 verwijderingen
  1. 1 1
      pages/index/handbook.vue
  2. 83 70
      pages/index/paint.vue
  3. 12 28
      pages/user/user.vue

+ 1 - 1
pages/index/handbook.vue

@@ -89,7 +89,7 @@
 				uni.showLoading({
 					title: '加载中'
 				})
-				let url = 'worldKeepCar/worldHome/queryPlan',
+				let url = 'openweiXinCardInfoController/queryPlan',
 					params = {
 						mileage: this.mileage,
 						liyangId: this.liyangId,

+ 83 - 70
pages/index/paint.vue

@@ -8,7 +8,8 @@
 					<view class="car" v-else>暂无</view>
 				</image>
 			</view>
-			<image @click="goCarlist" src="../../static/img/big_rightArrow.png" mode="" style="width: 30rpx;height: 30rpx;"></image>
+			<image @click="goCarlist" src="../../static/img/big_rightArrow.png" mode=""
+				style="width: 30rpx;height: 30rpx;"></image>
 		</view>
 
 		<view class="main" v-if="itemList">
@@ -87,9 +88,10 @@
 				<view class="tkMain" @click.stop>
 					<view class="selectItem" v-for="(item,index) in selectItemList" :key="index">
 						<view class="name">{{item.name}}</view>
-						<view class="priceRight">
-							<view class="price">¥ {{item.money?item.money:0}}</view>
-							<image @click="deleteItem(item,index)" src="../../static/img/icon_delete.png" mode="" style="width: 26rpx;height: 26rpx;margin-left: 10rpx;"></image>
+						<view class="priceRight">
+							<view class="price">¥ {{item.money?item.money:0}}</view>
+							<image @click="deleteItem(item,index)" src="../../static/img/icon_delete.png" mode=""
+								style="width: 26rpx;height: 26rpx;margin-left: 10rpx;"></image>
 						</view>
 					</view>
 
@@ -123,50 +125,50 @@
 		onLoad() {
 			this.getData();
 		},
-		methods: {
-			goCarlist(){
-				uni.navigateTo({
-					url:'../user/addCar/cailist'
-				})
-			},
-			empty(){
-				var that=this;
-				uni.showModal({
-				    title: '提示',
-				    content: '确定要清空已选项目吗',
-				    success: function (res) {
-						if(res.confirm){
-							that.selectItemList = [];
-							  that.qingdanShow=false;
-							  that.getData();
-							  }
-						 }
-				       
-				    
-				});
-				
-			},
-			deleteItem(item,index){
-				
-				// 更新数据
-				for (var i = 0; i < this.itemList.length; i++) {
-					let dic = this.itemList[i];
-					
-					dic.list.forEach((item2, index) => {
-						
-						if (item.id == item2.ID) {
-							
-							item2.type = 0;
-							dic.num -= 1;
-							
-						}
-						
-					})
-					
-				}
-				
-				
-				this.selectItemList.splice(index,1);
+		methods: {
+			goCarlist() {
+				uni.navigateTo({
+					url: '../user/addCar/cailist'
+				})
+			},
+			empty() {
+				var that = this;
+				uni.showModal({
+					title: '提示',
+					content: '确定要清空已选项目吗',
+					success: function(res) {
+						if (res.confirm) {
+							that.selectItemList = [];
+							that.qingdanShow = false;
+							that.getData();
+						}
+					}
+
+
+				});
+
+			},
+			deleteItem(item, index) {
+
+				// 更新数据
+				for (var i = 0; i < this.itemList.length; i++) {
+					let dic = this.itemList[i];
+
+					dic.list.forEach((item2, index) => {
+
+						if (item.id == item2.ID) {
+
+							item2.type = 0;
+							dic.num -= 1;
+
+						}
+
+					})
+
+				}
+
+
+				this.selectItemList.splice(index, 1);
 			},
 			caidanClick() {
 				this.qingdanShow = !this.qingdanShow
@@ -200,9 +202,10 @@
 					if (v.type != 0) {
 						count += 1;
 
-					}
+					}
 				})
-
	
+
+
 				item.num = count;
 
 				//组合选中的
@@ -235,7 +238,7 @@
 
 			},
 			changeState(item) {
-				item.open = !item.open		
+				item.open = !item.open
 			},
 			leftClick(item, index) {
 				this.leftIndex = index
@@ -263,7 +266,8 @@
 								item['open'] = false
 							}
 						})
-					}
	
+					}
+
 					this.itemList = List;
 
 					// console.log('列表=', this.itemList);
@@ -315,6 +319,8 @@
 	.main {
 		display: flex;
 		height: calc(100vh - 310rpx);
+		
+
 	}
 
 	.mainLeft {
@@ -327,7 +333,8 @@
 		padding: 30rpx 20rpx;
 		font-size: 26rpx;
 		text-align: center;
-		position: relative;
+		position: relative;
+		
 	}
 
 	.leftTitle {
@@ -356,7 +363,9 @@
 
 	.mainRight {
 		width: 596rpx;
-		background-color: #FFFFFF;
+		overflow-y: scroll;
+		background-color: #FFFFFF;
+		
 	}
 
 	.rightTop {
@@ -664,15 +673,18 @@
 	.bottom {
 
 		position: fixed;
-		left: 0;
+		left: 0;
 		bottom: 0;
-		width: 100vw;
-		height: 120rpx;
		background: #FFFFFF;
-		box-shadow: 0px -2px 20px 0px rgba(153, 153, 153, 0.2);
-		padding-bottom: constant(safe-area-inset-bottom);
		padding-bottom: env(safe-area-inset-bottom);
-		box-sizing: content-box;
		z-index: 11;
-		
-		display: flex;
+		width: 100vw;
+		height: 120rpx;
+		background: #FFFFFF;
+		box-shadow: 0px -2px 20px 0px rgba(153, 153, 153, 0.2);
+		padding-bottom: constant(safe-area-inset-bottom);
+		padding-bottom: env(safe-area-inset-bottom);
+		box-sizing: content-box;
+		z-index: 11;
+
+		display: flex;
 		justify-content: space-between;
 	}
 
@@ -767,12 +779,12 @@
 		width: 750rpx;
 		height: 90rpx;
 		background: #FFFFFF;
-		border-radius: 24rpx 24rpx 0px 0px;
-		display: flex;
+		border-radius: 24rpx 24rpx 0px 0px;
+		display: flex;
 		justify-content: space-between;
 	}
 
-	
+
 	.topTopright {
 		/* display: flex; */
 		padding-top: 29rpx;
@@ -812,11 +824,12 @@
 		justify-content: space-between;
 
 		color: #333333;
-		font-size: 26rpx;
+		font-size: 26rpx;
+		align-items: center;
+	}
+
+	.priceRight {
+		display: flex;
 		align-items: center;
-	}
-	.priceRight{
-		display: flex;
-		align-items: center;
 	}
 </style>

+ 12 - 28
pages/user/user.vue

@@ -197,7 +197,7 @@
 	export default {
 		data() {
 			return {
-				iStatusBarHeight: '',
+				
 				userInfo: '',
 				shopData: '',
 				numList: '',
@@ -216,36 +216,20 @@
 			}
 		},
 		onLoad(opt) {
-			var that = this;
-			// uni.getLocation({
-			// 	type: 'gcj02',
-			// 	success: function(res) {
-			// 		console.log(res)
-			// 		that.location.lat = res.latitude
-			// 		that.location.lng = res.longitude
-
-			// 		that.queryMyDetail() 
-
-			// 	},
-			// 	fail(err) {
-
-			// 	}
-			// });
-			this.iStatusBarHeight = uni.getSystemInfoSync().statusBarHeight;
-			//const wxOpenData = uni.getStorageSync("wxOpenData");
-			const wxOpenData = this.$store.state.wxOpenData;
-			this.wxOpenData=wxOpenData
-			//console.log()
-			if (wxOpenData) {
+			
+			
+            this.ext=this.$common.getExtStoreId();
+		},
+		onShow() {
+			const wxOpenData = this.$store.state.wxOpenData;
+			this.wxOpenData=wxOpenData
+			//console.log()
+			if (wxOpenData) {
 				this.headImg = wxOpenData.loginInfo.customerInfo.headImgurl;
 				this.nickName = wxOpenData.loginInfo.customerInfo.wxNickName;
-				this.phone = wxOpenData.loginInfo.customerInfo.mobilePhone;
-				this.uid = wxOpenData.loginInfo.uid;
+				this.phone = wxOpenData.loginInfo.customerInfo.mobilePhone;
+				this.uid = wxOpenData.loginInfo.uid;
 			}
-			//this.userInfo = uni.getStorageSync("userInfo")
-            this.ext=this.$common.getExtStoreId();
-		},
-		onShow() {
 			this.userInfo = this.$store.state.userInfo;
 			if (this.userInfo) {
 				this.queryMyDetail();