YZM 2 years ago
parent
commit
33e3824bee

+ 4 - 2
pages/changan/index.vue

@@ -18,10 +18,11 @@
 			<!-- 衣橱 -->
 			<tm-sheet class="yichu" style="margin-bottom: 70px !important;">
 				<tm-tabs class="C1b1b1b qiehuan" @change="fenleichangeFun" color="white"  align="left"  v-model="activeIndex" :list="list" range-key="title"></tm-tabs>
-				<view class="yiguicla black pa-6 ma-4 fl" :class="item.off==1?'C0178FD':''" v-for="(item,index) in quanbuList" @click="yifu(item,index)">
+				<view style="position: relative;" class="yiguicla black pa-6 ma-4 fl" :class="item.off==1?'C0178FD':''" v-for="(item,index) in quanbuList" @click="yifu(item,index)">
 					<image :src="item.image" mode="widthFix"></image>
-					<view :class="item.is_have==0?'text-gray':''" class="text-align-center text-size-m mt-8">{{item.brand}}</view>
+					<view  class="text-align-center text-size-m mt-8">{{item.brand}}</view>
 					<view :class="item.is_have==0?'text-gray':''" class="text-align-center text-size-m mt-6 mb-6">{{item.goods_name}}</view>
+					<view v-if="item.is_have==0" class="hui"></view>
 				</view>
 				<view style="clear: both;"></view>
 				<view v-if="quanbuList.length<total" class="more ma-30 pt-40" @click="gengmore()">
@@ -369,4 +370,5 @@ export default {
 	}
 	/deep/ .tcc .anniu .gray.bk{color: white !important;}
 	.tcc .anniu{width: 88%;margin: 0 auto;margin-top: 20px;}
+	/deep/ .hui{position: absolute;background: rgba(0,0,0,0.4);z-index: 1;top: 0;left: 0;width: 100%;height: 100%;}
 </style>

+ 3 - 3
pages/dapei/index.vue

@@ -14,7 +14,7 @@
 					<text class="text-size-s ml-15">16°c~20°c</text>
 					<text class="text-size-s ml-15">星期一</text>
 				</view>
-				<view class="bianji" @click="bianji()">编辑穿搭</view>
+				<view class="bianji" @click="bianji()">更换穿搭</view>
 			</view>
 			<view class="scroll-view-item_H">
 				<view class="chuanda">
@@ -30,7 +30,7 @@
 				</view>
 				<view class="bianji" @click="bianji()">添加穿搭</view>
 			</view>
-			<view class="scroll-view-item_H">
+			<!-- <view class="scroll-view-item_H">
 				<image class="chuanda" src="/static/img/107.png" mode="widthFix"></image>
 				<view class="mt-20 text-align-center">
 					<image class="taiyang" src="/static/img/106.png" mode="widthFix"></image>
@@ -38,7 +38,7 @@
 					<text class="text-size-s ml-15">星期一</text>
 				</view>
 				<view class="bianji" @click="bianji()">编辑穿搭</view>
-			</view>
+			</view> -->
 		</scroll-view>
 		<div class="zhuti">
 			<!-- 衣橱 -->

+ 2 - 2
pages/shouye/index.vue

@@ -312,7 +312,7 @@
 			},
 			tiaodapei() {
 				uni.navigateTo({
-					url: "/pages/zidingyi/index?type=1",
+					url: "/pages/shouyedetail/index",
 				})
 			},
 			tiao() {
@@ -323,7 +323,7 @@
 			tiaoclick(e) {
 				console.log(e)
 				uni.navigateTo({
-					url: "/pages/shouyedetail/index",
+					url: "/pages/zidingyikan/index?type=1",
 				})
 			},
 			jinriFun(e) {

+ 7 - 4
pages/wardrobe/index.vue

@@ -60,10 +60,11 @@
 			<tm-sheet class="yichu" style="margin-bottom: 70px !important;">
 				<tm-tabs class="C1b1b1b qiehuan" @change="fenleichangeFun" color="white"  align="left"  v-model="activeIndex" :list="list" range-key="title"></tm-tabs>
 				<view class="pa-10 text-size-s">柜中{{have}}件 共{{count}}条</view>
-				<view class="yiguicla black pa-6 ma-4 fl" v-for="(item,index) in quanbuList" @longtap="longtap()" @click="xiangqing(item)">
+				<view style="position: relative;" class="yiguicla black pa-6 ma-4 fl" v-for="(item,index) in quanbuList" @longtap="longtap()" @click="xiangqing(item)">
 					<image :src="item.image" mode="widthFix"></image>
-					<view :class="item.is_have==0?'text-gray':''" class="text-align-center text-size-m mt-8">{{item.brand}}</view>
-					<view :class="item.is_have==0?'text-gray':''" class="text-align-center text-size-m mt-6 mb-6">{{item.goods_name}}</view>
+					<view class="text-align-center text-size-m mt-8">{{item.brand}}</view>
+					<view class="text-align-center text-size-m mt-6 mb-6">{{item.goods_name}}</view>
+					<view v-if="item.is_have==0" class="hui"></view>
 				</view>
 				<view style="clear: both;"></view>
 				<view v-if="quanbuList.length<total" class="more ma-30 pt-40" @click="gengmore()">
@@ -75,7 +76,8 @@
 		</view>
 		<!-- 待取衣服 -->
 			<tm-flotbutton class="qiu" @change="anniu" show-actions position="bottomRight" actions-pos="top" label="" :show-text="true"
-				 :actions="listqiu"></tm-flotbutton>
+				 :actions="listqiu">
+			</tm-flotbutton>
 		<!-- <css-float-ball v-model="floatBallPosition" >
 		  <view class="float-ball-icon" hover-class="default-icon-hover">
 		    <tm-translate ref="a_1" :auto="true" animation-name="fadeLeft">
@@ -430,4 +432,5 @@ export default {
 	/deep/ .qiu .flex-center uni-image{width: 45px !important;height:45px !important;}
 	/deep/ .showValue{display: none !important;}
 	/deep/ .menulistAction{height: 350px;overflow: auto;}
+	/deep/ .hui{position: absolute;background: rgba(0,0,0,0.4);z-index: 1;top: 0;left: 0;width: 100%;height: 100%;}
 </style>

+ 6 - 1
pages/zidingyikan/index.vue

@@ -38,7 +38,9 @@
 		</view>
 		<tm-button v-if="off==2" :round="24" class="sao mb-40 mt-40" block>保存</tm-button>
 		<view class="anniu" v-if="off==1">
-			<tm-button :round="24" theme="gray" size="n">预约明日</tm-button>
+			<tm-menu direction="top" :list="['聚餐穿','开会穿']" @change="yuyue">
+				<tm-button :round="24" theme="gray" size="n">预约明日</tm-button>
+			</tm-menu>
 			<tm-button :round="24" class="fr" theme="primary" size="n">全部取出</tm-button>
 		</view>
 		<!-- 弹出层消息 -->
@@ -109,6 +111,9 @@ export default {
 		this.sys = uni.getSystemInfoSync();
 	},
 	methods: {
+		yuyue(){
+			
+		},
 		jiarufuFun(data){
 			uni.navigateTo({
 				url: "/pages/shopdetail/index",