guo 2 years ago
parent
commit
6423e847a5
3 changed files with 24 additions and 13 deletions
  1. 15 5
      pages/index/paint.vue
  2. 3 3
      pages/index/vipCard.vue
  3. 6 5
      pages/user/historySpend.vue

+ 15 - 5
pages/index/paint.vue

@@ -40,7 +40,7 @@
 					</view>
 
 					<!--  -->
-					<view class="itemBox">
+					<view class="itemBox" v-if="item2.open==true">
 						<view class="type" :class="{orangeLine:item2.type==1}" @click="select(item2,'1')">
 							<view class="typeName" :class="{orangeColor:item2.type==1}">喷漆</view>
 							<view class="money"><span class="renminbi">¥</span>{{item2.PSalePrice?item2.PSalePrice:'0'}}</view>
@@ -94,10 +94,20 @@
 
 					// id: this.id,
 				}, 'GET').then(res => {
-					uni.hideLoading();
-					this.itemList = res.data;
-
-
+					uni.hideLoading();
+					let List = res.data;
+					
+					for (var i = 0; i < List.length; i++) {
+						List[i].list.forEach((item, index) => {
+						for (const key in item) {
+							item['open'] = false
+						}
+					})
+					}
+					
+					this.itemList = List;
+					
+					console.log('列表=',this.itemList);
 
 				})
 			},

+ 3 - 3
pages/index/vipCard.vue

@@ -131,9 +131,9 @@
 				<view style="margin-left: 10rpx;color: #3C3C3C;font-size: 24rpx;">不展示剩余为0项</view>
 			</view>
 
-			<view class="itemBox" v-for="(item,index) in vipData.carMoneyList">
+			<view v-for="(item,index) in vipData.carMoneyList">
 				<!-- 不展示剩余为0项 -->
-				<view v-if="disCz&&item.Money!=0">
+				<view v-if="disCz&&item.Money!=0" class="itemBox">
 				<view class="itemTop">
 					<view class="itemName">{{item.PacKName}}</view>
 					<view class="tiaokuan" @click="useCl(item.useComment)">使用条款</view>
@@ -164,7 +164,7 @@
 				</view>
 				
 				<!-- 展示所有 -->
-				<view v-if="!disCz">
+				<view v-if="!disCz" class="itemBox">
 				<view class="itemTop">
 					<view class="itemName">{{item.PacKName}}</view>
 					<view class="tiaokuan" @click="useCl(item.useComment)">使用条款</view>

+ 6 - 5
pages/user/historySpend.vue

@@ -9,10 +9,10 @@
 
 			<view class="shopName">{{item.ShopName}}</view>
 			
-			<view class="itemN">
+			<view class="itemN" v-if="item.listItems.length != 0">
 				<view class="itemContent" v-if="item.listItems.length != 0" v-for="(v,i) in item.listItems">{{v.ItemName}},</view>
 			</view>
-			<view class="itemN">
+			<view class="itemN" v-if="item.listParts.length != 0">
 				<view class="itemContent" v-if="item.listParts.length != 0" v-for="(v,i) in item.listParts">{{v.GoodsName}},</view>
 			</view>
 			
@@ -154,17 +154,18 @@
 	}
 
 	.itemN {
-		margin: 15rpx 0rpx;
+		margin-top: 15rpx;
 		display: flex;
 		/* 隐藏文字显示 ...不换行 */
 		overflow: hidden;
 		text-overflow: ellipsis;
 		white-space: nowrap;
-	}
+	}
+	
 	.shopName{
 		color: #666666;
 		font-size: 24rpx;
-		margin: 15rpx 0rpx;
+		margin-top: 15rpx;
 		/* 隐藏文字显示 ...不换行 */
 		overflow: hidden;
 		text-overflow: ellipsis;