1

App.vue

@@ -40,4 +40,6 @@
 	}
 	.fl{float: left;}
 	.fr{float:right;}
+	.zhuti{padding: 10px 10px;}
+	.C929297{color: #929297 !important;}
 </style>

pages.json

@@ -118,6 +118,15 @@
 					"titleNView": false
 				}
 			}
+		},
+		{
+			"path": "pages/qiehuan/index",
+			"style": {
+				"navigationBarTitleText": "我的",
+				"app-plus":{
+					"titleNView": false
+				}
+			}
 		}
 	],
 	"tabBar": { 

pages/chuanghome/index.vue

@@ -1,27 +1,99 @@
 <template>
 	<view :style="{ minHeight: sys.windowHeight + 'px' }"
 		:class="[$tm.vx.state().tmVuetify.black ? 'black' : ' ']">
-		<tm-message ref="toast"></tm-message>
-		<tm-menubars title="创建家庭" :shadow="0" :showback="false"></tm-menubars>
-		<tm-sheet :shadow="24" v-if="active==1">
-			<tm-steps model="number" color="bg-gradient-blue-accent" activeFontColor="blue" line-color="bg-gradient-blue-accent" v-model="active" :list="list"></tm-steps>
-			<view class="mt-20">
-				<text class="text-primary text-size-s">扫柜体上的二维码和衣柜绑定</text>
-			</view>
-			<image block class="zhanshi" mode="widthFix" src="https://picsum.photos/300?k=1"></image>
-			<tm-button theme="bg-gradient-blue-accent" @click="saoma()" block>扫二维码</tm-button>
-		</tm-sheet>
-		<tm-sheet :shadow="24" v-if="active==2">
-			<view class="flex fulled-height" >
-				<view style="width: 80px;">
-					111
+		<tm-menubars title="创建家庭" :shadow="0" :showback="true"></tm-menubars>
+		<div class="zhuti">
+			<tm-sheet class="kuang" style="padding-bottom: 70px !important;">
+				<image v-if="(active==1 || active==2)" class="jindu" src="/static/img/49.png" mode="widthFix"></image>
+				<image v-if="active==3" class="jindu" src="/static/img/50.png" mode="widthFix"></image>
+				<image v-if="active==4" class="jindu" src="/static/img/51.png" mode="widthFix"></image>
+				<view class="wenzi flex-between flex-center" style="margin-top: 10px;">
+					<view>
+						<text class="text-white text-size-m">创建家庭</text>
+					</view>
+					<view>
+						<text class="text-white text-size-m">创建角色</text>
+					</view>
+					<view>
+						<text class="text-white text-size-m">创建成功</text>
+					</view>
+				</view>
+				<!-- <view class="wenzi flex-between flex-center">
+					<view>
+						<text class="text-size-s">2022-11-28</text>
+					</view>
+					<view>
+						<text class="text-size-s">等待审批</text>
+					</view>
+					<view>
+						<text class="text-size-s">等待审批</text>
+					</view>
+				</view> -->
+				<view v-if="active==1">
+					<view class="mt-20 ml-15">
+						<text class="text-white text-size-m">*扫描柜体上的二维码和衣柜绑定</text>
+					</view>
+					<image block class="zhanshi" mode="widthFix" src="/static/img/48.png"></image>
+					<tm-button :round="24" class="sao mb-40" @click="saoma()" block>扫二维码</tm-button>
+				</view>
+				<view v-if="active==2">
+					<tm-translate ref="a_1" :auto="true" animation-name="zoomIn">
+						<image block class="nicheng" mode="widthFix" src="/static/img/52.png"></image>
+					</tm-translate>
+					<view class="text-align-center mt-20 mb-40">
+						<text class="text-size-m">衣柜和手机关联成功</text>
+					</view>
+					<view class="black shuru pa-30">
+						<tm-form>
+							<view class="text-size-m">请输入家庭名称</view>
+							<tm-input name="title" v-model="name" clear placeholder="相亲相爱一家人"></tm-input>
+						</tm-form>
+					</view>
+					<tm-button :round="24" class="sao mb-40 mt-40" @click="chuangjianFun()" block>创建家庭</tm-button>
+				</view>
+				<view v-if="active==3">
+					<view>
+						<view class="fl zuo" style="width:70px;">
+							<view class="flex-center flex-col mt-30" style="position: relative;" v-for="(item,index) in renList">
+								<image block mode="widthFix" src="/static/img/53.png"></image>
+								<tm-badges icon="icon-times" @click="shanchu(item.timestamp)" v-if="index != 0"></tm-badges>
+							</view>
+							<view class="flex-center flex-col mt-30" style="position: relative;" v-if="renList.length<4">
+								<image block mode="widthFix" src="/static/img/54.png" @click="add()"></image>
+							</view>
+							
+						</view>
+						<view class="fr you black mt-30" style="width: calc(100% - 100px); ">
+							<tm-input  :required="true"  title="用户名" v-model="reqData.username" placeholder="你想叫自己什么" align="right"></tm-input>
+							<tm-input  :required="true"  title="身高（cm）" v-model="reqData.height" align="right"></tm-input>
+							<tm-input  :required="true"  title="体重（kg）" v-model="reqData.weight" align="right"></tm-input>
+							<tm-pickers class="tan" :default-value.sync="reqData.shencai" rang-key="title" :list="chelianglis">
+								<tm-input name="shencai" title="身材" placeholder="请选择车型" disabled :value="obTstr2(reqData.shencai)" right-icon="icon-angle-right"></tm-input>
+							</tm-pickers>
+						</view>
+					</view>
+					<view style="clear: both;"></view>
+					<tm-button :round="24" class="sao mb-40" style="margin-top: 50px;" @click="tijiao()" block>下一步</tm-button>
 				</view>
-				<view style="width:calc(100% - 160rpx);">
-					222
+				<view v-if="active==4">
+					<tm-translate ref="a_1" :auto="true" animation-name="zoomIn">
+						<image block class="nicheng" mode="widthFix" src="/static/img/52.png"></image>
+					</tm-translate>
+					<view class="text-align-center mt-20">
+						<text class="text-size-m text-white">家庭创建成功！</text>
+					</view>
+					<view class="text-align-center mb-40">
+						<text class="text-size-m">衣柜和手机关联成功</text>
+					</view>
+					<view class="px-24">
+						<tm-button theme="primary" :round="24" block class="mt-50 logincla">添加衣服</tm-button>
+						<tm-button @click="quindex()" theme="primary" :round="24" block class="mt-30 quindex">进入首页</tm-button>
+					</view>
 				</view>
-			</view>
-			<tm-button theme="bg-gradient-blue-accent" @click="saoma()" block>下一步</tm-button>
-		</tm-sheet>
+			</tm-sheet>
+		</div>
+		<!-- 弹出层消息 -->
+		<tm-message ref="toast"></tm-message>
 	</view>
 </template>	
 <script>
@@ -29,15 +101,31 @@ import{myRequest} from '@/api/request.js'
 export default {
 	data() {
 		return {
-			active:1,
-			list:['创建家庭','创建角色','创建成功'],
-			list2:[
-				{text:'苏州'},
-				{text:'北京'},
-				{text:'广东'},
-				{text:'江西',dot:8},
-				{text:'深圳'},
+			shencaiList:[
+				{title:"梨形",id:21},
+				{title:"标准",id:31},
+				{title:"胖子",id:41},
+				{title:"瘦子",id:51},
+				{title:"模特",id:61},
+			],
+			shenxing:'',
+			active:3,
+			name:'',
+			val_1:'',
+			chelianglis:[
+				{title:"标准",id:21},
+				{title:"偏瘦",id:31},
+				{title:"偏胖",id:41},
+				{title:"梨形",id:51},
+				{title:"S型",id:61},
 			],
+			reqData:{
+				username:'',
+				height:'',
+				weight:'',
+				shencai:[]
+			},
+			renList:[]
 		};
 	},
 	onLoad() {
@@ -45,12 +133,47 @@ export default {
 	},
 	created() {
 		this.sys = uni.getSystemInfoSync();
+		this.add()
 	},
 	methods: {
+		quindex(){
+			uni.navigateTo({
+				url: "/pages/index/index",
+			})
+		},
+		tijiao(){
+			// console.log(this.renList)
+			// for(let i=0;i<this.renList.length;i++){
+			// 	if(this.renList[i].){}
+			// }
+			// this.active=4;
+		},
+		add(){
+			var timestamp = Date.parse(new Date());
+			var obj={
+				username:'',
+				height:'',
+				weight:'',
+				shencai:[],
+				timestamp:timestamp
+			}
+			this.renList.push(obj)
+		},
+		shanchu(timestamp){
+			var index = this.renList.findIndex((item) => {
+			  return item.timestamp == timestamp;
+			});
+			this.renList.splice(index, 1);
+		},
+		obTstr2(o){
+			if(Array.isArray(o)){
+				if(o.length.length===0) return "";
+				return o[0]?.title??""
+			}
+			return ''
+		},
 		saoma(){
-			console.log("111")
 			var that=this;
-			that.active=2;
 			uni.scanCode({
 				scanType: ['barCode'],
 				success: function (res) {
@@ -63,6 +186,14 @@ export default {
 				}
 			})
 		},
+		chuangjianFun(){
+			var that=this;
+			if(that.name==""){
+				that.$refs.toast.show({model:'warn',label:'请输入家庭名称'})
+				return
+			}
+			that.active=3;
+		}
 	},
 }
 </script>
@@ -77,4 +208,32 @@ export default {
 	/deep/ .tm-menubars .body{
 		background-color: #1b1b1b !important;
 	}
+	/deep/ .kuang{margin:0 !important;padding: 14px !important;margin-bottom: 40px !important;}
+	/deep/ .kuang uni-button{background-color: #303440 !important;}
+	.jindu{width: 90%;margin: 0 auto;display: block;}
+	.wenzi{width: 94%;margin: 0 auto;}
+	.nicheng{width: 130px;height:132px;display: block;margin:0 auto;margin-top: 50px;}
+	/deep/ .shuru .grey-darken-5{
+		background-color: #0d0d0d!important;
+		padding: 0px !important;
+	}
+	.shuru{border:1px solid #303030;border-radius: 10px;}
+	/deep/ .shuru .text-primary.bk{color:#303030 !important;}
+	/deep/ .shuru .border-grey-darken-4-b-1{border-bottom:none !important;}
+	.zuo image{width:60px;display: block;}
+	.you{border:1px solid #303030;border-radius: 10px;padding:10px;height: 300px;}
+	/deep/ .you .grey-darken-5{
+		background-color: #0d0d0d!important;
+		padding: 0px !important;
+	}
+	/deep/ .you .text-red{color: white;}
+	/deep/ .tan .active{background-color: #AAAAAA !important;}
+	/deep/ .tan .tm-poups .grey-darken-5{background-color: gray !important;}
+	/deep/ .tan uni-input{text-align: right;}
+	/deep/ .you .border-grey-darken-4-b-1 {
+	    border-bottom: solid 1px #313131 !important;
+	}
+	/deep/ .tm--badges{position: absolute;top: 0px;right:6px}
+	.logincla{margin-top: 100px;}
+	/deep/ .quindex uni-button{background-color: #0A84FF !important;}
 </style>

pages/qiehuan/index.vue

@@ -0,0 +1,31 @@
+<template>
+	<view :style="{ minHeight: sys.windowHeight + 'px' }"
+		:class="[$tm.vx.state().tmVuetify.black ? 'black' : ' ']">
+		<tm-menubars title="用户新增/切换" :shadow="0" :showback="true"></tm-menubars>
+		
+	</view>
+</template>	
+<script>
+import{myRequest} from '@/api/request.js'
+export default {
+	data() {
+		return {
+			
+		};
+	},
+	onLoad() {
+		
+	},
+	created() {
+		this.sys = uni.getSystemInfoSync();
+	},
+	methods: {
+	},
+}
+</script>
+
+<style lang="scss">
+	/deep/ .tm-menubars .body{
+		background-color: #1b1b1b !important;
+	}
+</style>

pages/shouye/index.vue

@@ -2,23 +2,19 @@
 	<view :style="{ minHeight: sys.windowHeight + 'px' }" :class="[$tm.vx.state().tmVuetify.black ? 'black' : ' ']">
 		<tm-menubars title="" :shadow="0" :showback="false"></tm-menubars>
 		<view class="C1b1b1b">
-			<tm-search v-model="soso" color="white">
-				<template #right>
+			<tm-search v-model="soso" color="white" confirm-text="">
+				<!-- <template #right>
 					<view class="xiangji">
 						<image src="/static/img/xiangji.png" mode="widthFix"></image>
 					</view>
-				</template>
+				</template> -->
 			</tm-search>
 			<view class="dingwei">
 				<image style="vertical-align: middle;" src="/static/img/dingwei.png" mode="widthFix"></image>
 				<text style="vertical-align: middle;" class="text-size-g">北京Beijing</text>
 			</view>
-
-			
-
 		</view>
 		<view class="zhuti mt-50">
-			
 			<tm-grid :grid="5" :list="list3" :icon-size="140" font-color="white"></tm-grid>
 			<!-- 今日穿搭 -->
 			<tm-sheet class="lunbo">
@@ -30,12 +26,12 @@
 					<view class="text-white">
 						西装夹克高级感穿搭 | 彰显
 						<view class="qiehuan">
-							<tm-translate :auto="zidong" class="fl a_1" ref="a_1" :duration="1000"  animation-name="fadeIn">
+							<tm-translate class="fl a_1" :auto="true" ref="a_1" :duration="80"  animation-name="zoomIn">
 								<image v-if="current==0" class="anniu mr-10" src="/static/img/14.png" mode="widthFix"></image>
 								<image v-if="current!=0" @click="xia()" class="anniu mr-10" src="/static/img/12.png" mode="widthFix"></image>
 							</tm-translate>
 							<tm-swiper class="tu fl" :previmage="false" :noSwiping="true" :height="220" :width="250" :current="current" :margin="8"  :autoplay="false" :list="list"></tm-swiper>
-							<tm-translate :auto="zidong" class="fl a_1" ref="a_5" :duration="1000"  animation-name="fadeIn">
+							<tm-translate class="fl a_1" :auto="true" ref="a_5" :duration="80"  animation-name="zoomIn">
 								<image v-if="current<(list.length-1)" @click="shang()" class="anniu fl ml-10" src="/static/img/13.png" mode="widthFix"></image>
 								<image v-if="current>(list.length-2)" class="anniu fl ml-10" src="/static/img/11.png" mode="widthFix"></image>
 							</tm-translate>
@@ -49,12 +45,12 @@
 				</view>
 				<view class="shoucang mt-30">
 					<view class="fl di mr-20" @click="shouc">
-						<tm-translate ref="a_3" :duration="80"  animation-name="fadeIn">
+						<tm-translate ref="a_3" :auto="true" :duration="80"  animation-name="zoomIn">
 							<image :src="shoucangsrc?'/static/img/15.png':'/static/img/8.png'" mode="widthFix" style="margin-right: 15px;"></image>
 						</tm-translate>
 					</view>
 					<view class="fl di" @click="zan">
-						<tm-translate ref="a_2" :duration="80"  animation-name="fadeIn">
+						<tm-translate ref="a_2" :auto="true" :duration="80"  animation-name="zoomIn">
 							<image :src="dianzan?'/static/img/16.png':'/static/img/9.png'" mode="widthFix" style="margin-right: 15px;"></image>
 						</tm-translate>
 					</view>
@@ -68,13 +64,13 @@
 					<text class="text-white">明日计划</text>
 				</view>
 				<view class="mt-20 text-size-g jihua">
-					<tm-translate class="a_1" ref="a_6" :duration="80"  animation-name="zoomIn">
+					<tm-translate class="a_1" ref="a_6" :auto="true" :duration="80"  animation-name="zoomIn">
 						<image @click="jihuashang()" class="anniu mr-10" src="/static/img/18.png" mode="widthFix"></image>
 					</tm-translate>
 					<view class="bbb">
 						<tm-swiper class="aaa" :previmage="false" :noSwiping="true" :current="current1" :autoplay="false" :list="list1"></tm-swiper>
 					</view>
-					<tm-translate class="a_1" ref="a_4" :duration="80"  animation-name="zoomIn" style="right: 0px;">
+					<tm-translate class="a_1" ref="a_4" :auto="true" :duration="80"  animation-name="zoomIn" style="right: 0px;">
 						<image @click="jihuaxia()" class="anniu mr-10" src="/static/img/19.png" mode="widthFix"></image>
 					</tm-translate>
 					<view style="clear: both;"></view>
@@ -167,7 +163,7 @@
 		data() {
 			return {
 				soso:'',
-				zidong:false,
+				aab:false,
 				shoucangsrc:true,
 				dianzan:true,
 				dianzan1:true,
@@ -223,19 +219,23 @@
 		},
 		created() {
 			var that=this;
+			
 			setTimeout(function(){
 				console.log(1111)
-				that.zidong=true
-				if(uni.getStorageSync("token")==""){
-					uni.redirectTo({
-						url:"/pages/login/index"
-					})
-				}
-				
-			},2000)
+				// if(uni.getStorageSync("token")==""){
+				// 	uni.redirectTo({
+				// 		url:"/pages/login/index"
+				// 	})
+				// }
+				// that.$refs.a_2.play();
+				// that.$refs.a_3.play();
+				// that.$refs.a_1.play();
+				// that.$refs.a_5.play();
+			},1000)
 			
 			this.sys = uni.getSystemInfoSync();
 			this.randouh()
+			
 		},
 		methods: {
 			gengmore(){
@@ -300,7 +300,7 @@
 		height: 52px !important;
 	}
 	/deep/ .aaa uni-swiper-item{
-		width: 52px !important;
+		width: 55px !important;
 		height: 80px !important;
 		padding: 0 5px !important;
 	}
@@ -324,18 +324,10 @@
 	/deep/ .tm-search .grey-darken-5{
 		background-color: #414141 !important;
 	}
-	.dingwei{
-		width: 92%;
-		margin: 0 auto;
-		margin-top: 20px;
-		padding-bottom: 20px;
-	}
-	.dingwei image{
-		width: 25px;
-		margin-right: 10px;	
-	}
+	.dingwei{width: 92%;margin: 0 auto;margin-top: 20px;padding-bottom: 20px;}
+	.dingwei image{width: 25px;margin-right: 10px;	}
 	/deep/ .tm-col{width: 20% !important;}
-	.zhuti{padding: 10px 20px;}
+	.zhuti{padding: 10px 10px;}
 	/deep/ .lunbo{margin:0 !important;padding: 8px !important;margin-top: 50px !important;}
 	.dianz image{width: 35px;vertical-align: middle;margin-right: 10px;}
 	/deep/ .text-size-s span,/deep/ .text-size-g{font-size: 15px;}
@@ -343,11 +335,11 @@
 	.shoucang image{width: 45px;}
 	.qiehuan{float: right;}
 	.qiehuan .a_1{margin-top: 25%;}
-	.qiehuan .anniu{width: 20px;}
+	.qiehuan .anniu{width: 20px;height: 20px !important;}
 	.di{background: #0D0D0D;width: 45px;height: 45px;text-align: center;line-height: 50px;border-radius: 30px;}
 	.mingri image{width: 30px;margin-right: 12px;}
-	.di image{width: 22px;margin: 0 !important;}
-	.jihua image{width: 30px;}
+	.di image{width: 22px;margin: 0 !important;height: 20px !important;}
+	.jihua image{width: 30px;height: 30px;}
 	.jihua{position: relative;}
 	.jihua .a_1{position: absolute;top: 10%;}
 	.bbb{width: 75% !important;margin: 0 auto !important;}

pages/user/index.vue

@@ -1,12 +1,57 @@
 <template>
 	<view :style="{ minHeight: sys.windowHeight + 'px' }"
-		:class="[$tm.vx.state().tmVuetify.black ? 'black' : ' ']">
-		<tm-message ref="toast"></tm-message>
-		<tm-menubars title="我的" :shadow="0" :showback="false"></tm-menubars>
-		<tm-button theme="primary" @click="show=true">退出</tm-button>
-		<tm-button theme="primary">上传图片</tm-button>
-		<tm-button theme="primary" @click="chuangjian()">创建家庭</tm-button>
+		:class="[$tm.vx.state().tmVuetify.black ? 'black' : ' ']" style="padding-bottom:50px;">
+		<tm-menubars title="" :shadow="0" :showback="false"></tm-menubars>
+		<view class="tou C1b1b1b">
+			<view class="info">
+				<image class="chuandaimg fl" src="/static/img/55.png" mode="widthFix"></image>
+				<view class="chuandazi fl ml-30">
+					<view class="text-size-lg text-weight-b text-overflow-2 mt-20">Hahhhnxsm_</view>
+					<view class="tm-cartCellListFood-label text-size-s text-grey">15077854701</view>
+					<tm-button size="s" class="mt-10">编辑个人资料</tm-button>
+				</view>
+				<view style="clear: both;"></view>
+				<tm-row class="sange mt-40 pb-30">
+					<tm-col color="" >
+						<view class="py-10 text-size-xs">
+							<image class="sange1" src="/static/img/56.png"></image>
+							<text>我的订单</text>
+							<view class="aa"></view>
+						</view>
+					</tm-col>
+					<tm-col color="" >
+						<view class="py-10 text-size-xs">
+							<image class="sange2" src="/static/img/57.png"></image>
+							<text>我的订单</text>
+							<view class="aa"></view>
+						</view>
+					</tm-col>
+					<tm-col color="">
+						<view class="py-10 text-size-xs">
+							<image class="sange3" src="/static/img/58.png"></image>
+							<text>我的订单</text>
+						</view>
+					</tm-col>
+				</tm-row>
+			</view>
+		</view>
+		<!-- 列表 -->
+		<tm-grouplist class="liebiao pt-20">
+			<tm-listitem v-for="item in libiaoList" @click="tiaozhuan(item.type)" :title="item.title" left-icon="" show-left-icon :show-right-icon="item.type==9?false:true">
+				<template #rightValue v-if="item.type==9">
+					<view class="xiangji">
+						<tm-col :grid="3"><tm-switch :text="['','']" color="primary" v-model="on"></tm-switch></tm-col>
+					</view>
+				</template>
+			</tm-listitem>
+		</tm-grouplist>
+		<view class="px-24">
+			<tm-button@click="show=true" theme="primary" :round="24" block class="mt-50 logincla">退出账号</tm-button>
+		</view>
+		<!-- <tm-button theme="primary">上传图片</tm-button> -->
 		<tm-dialog v-model="show" content="确认退出系统？" @confirm="queren"></tm-dialog>
+		<!-- 弹出层消息 -->
+		<tm-message ref="toast"></tm-message>
 	</view>
 </template>	
 <script>
@@ -14,7 +59,19 @@ import{myRequest} from '@/api/request.js'
 export default {
 	data() {
 		return {
-			show:false
+			show:false,
+			on:true,
+			libiaoList:[
+				{title:'我的钱包',type:'1'},
+				{title:'我的评价',type:'2'},
+				{title:'意见反馈',type:'3'},
+				{title:'我的消息',type:'4'},
+				{title:'我的关注',type:'5'},
+				{title:'系统通知',type:'6'},
+				{title:'历史记录',type:'7'},
+				{title:'创建家庭',type:'8'},
+				{title:'内容推送',type:'9'},
+				]
 		};
 	},
 	onLoad() {
@@ -25,10 +82,12 @@ export default {
 		console.log(this.$store.state)
 	},
 	methods: {
-		chuangjian(){
-			uni.navigateTo({
-				url: "/pages/chuanghome/index",
-			})
+		tiaozhuan(type){
+			if(type==8){
+				uni.navigateTo({
+					url: "/pages/chuanghome/index",
+				})
+			}
 		},
 		queren(){
 			var that=this;
@@ -58,4 +117,19 @@ export default {
 	/deep/ .tm-menubars .body{
 		background-color: #1b1b1b !important;
 	}
+	.chuandaimg{width: 100px;}
+	.info{width: 90%;margin:0 auto;}
+	/deep/ .info uni-button{background-color: #303440 !important;}
+	.sange image{vertical-align: middle;margin-right: 8px;}
+	/deep/ .tm-col{width: 33% !important;}
+	.sange1{width: 22px;height: 22px;}
+	.sange2{width: 18px;height: 22px;}
+	.sange3{width: 22px;height: 22px;}
+	.aa{float: right;width: 1px;height: 18px;background-color: #D8D8D8;margin-top: 2px;}
+	/deep/ .tm-grouplist{margin:5px !important;margin-top: 15px !important;}
+	/deep/ .liebiao .grey-darken-4.bk{background-color: #0D0D0D !important;}
+	/deep/ .liebiao .py-24{padding-top: 15px;padding-bottom: 15px;}
+	/deep/ .logincla .primary{
+		background-color: #303440 !important;
+	}
 </style>

pages/wardrobe/index.vue

@@ -1,26 +1,76 @@
 <template>
-	<view :style="{ minHeight: sys.windowHeight + 'px' }"
-		:class="[$tm.vx.state().tmVuetify.black ? 'black' : ' ']">
-		<tm-menubars title="衣橱" :shadow="0" :showback="false">
-			<template #right>
-				<view class="pl-24">
-					<tm-button theme="indigo" size="s" @click="ruku">入库</tm-button>
-				</view>
-			</template>
-			
-		</tm-menubars>
-		<tm-tabs @change="change" :fllowTheme="false" bg-color="orange" color="yellow"  v-model="activeIndex" :list="list" range-key="title"></tm-tabs>
-		<tm-sheet :shadow="24" :padding="[24,32]">
-			<tm-album @click="dapei" :max="4" :gutter="10" :round="0" :grid="3" :list="list2"></tm-album>
-		</tm-sheet>
-		<view class="flex fulled-height" >
-			<view class="fulled-height " :class="$tm.vx.state().tmVuetify.black ? 'grey-darken-4 bk' : 'grey-lighten-5'">
-				<tm-sliderNav :fontSize="24"  @change="changece"  color="blue" :round="0" :width="120" :list="list3" rang-key="text"></tm-sliderNav>
-			</view>
-			<view class="fulled-height "  :class="$tm.vx.state().tmVuetify.black ? 'black ' : 'white'" style="width:calc(100% - 160rpx);">
-				<tm-album @click="xiangqing" class="shangright" :max="6" :grid="3" :list="list4"></tm-album>
+	<view :style="{ minHeight: sys.windowHeight + 'px' }" :class="[$tm.vx.state().tmVuetify.black ? 'black' : ' ']">
+		<tm-menubars title="" :shadow="0" :showback="false"></tm-menubars>
+		<view class="C1b1b1b">
+			<tm-search v-model="soso" color="white" confirm-text="">
+				<!-- <template #right>
+					<view class="xiangji">
+						<image src="/static/img/xiangji.png" mode="widthFix"></image>
+					</view>
+				</template> -->
+			</tm-search>
+			<view class="dingwei">
+				<image class="touxiang" style="vertical-align: middle;" src="/static/img/41.png" mode="widthFix"></image>
+				<text style="vertical-align: middle;" class="text-size-m mr-20">“我”的衣橱</text>
+				<image @click="qiehuanFun" style="vertical-align: middle;" src="/static/img/42.png" mode="widthFix"></image>
+				<text @click="qiehuanFun" style="vertical-align: middle;" class="text-size-m">切换</text>
 			</view>
 		</view>
+		<!-- 推荐 -->
+		<view class="zhuti">
+			<div>
+				<tm-sheet class="lunbo1 fl">
+					<view class="flex-between flex-center">
+						<view class="tuijian">
+							<text class="text-white text-size-lg">校园穿搭</text>
+						</view>
+						<view >
+							<text class="text-size-s C929297">详情</text>
+						</view>
+					</view>
+					<view class="flex-between flex-center mt-20 pa-8" style="border-radius: 4px;" :class="[$tm.vx.state().tmVuetify.black ? 'black' : ' ']">
+						<view class="tuijiantp">
+							<image style="vertical-align: middle;" src="/static/img/43.png" mode="widthFix"></image>
+						</view>
+						<view class="tuijiantp">
+							<image class="fr" style="vertical-align: middle;" src="/static/img/44.png" mode="widthFix"></image>
+						</view>
+					</view>
+				</tm-sheet>
+				<tm-sheet class="lunbo1 fr">
+					<view class="flex-between flex-center">
+						<view class="tuijian">
+							<text class="text-white text-size-lg">日常出勤</text>
+						</view>
+						<view >
+							<text class="text-size-s C929297">详情</text>
+						</view>
+					</view>
+					<view class="flex-between flex-center mt-20 pa-8" style="border-radius: 4px;" :class="[$tm.vx.state().tmVuetify.black ? 'black' : ' ']">
+						<view class="tuijiantp">
+							<image style="vertical-align: middle;" src="/static/img/43.png" mode="widthFix"></image>
+						</view>
+						<view class="tuijiantp">
+							<image class="fr" style="vertical-align: middle;" src="/static/img/44.png" mode="widthFix"></image>
+						</view>
+					</view>
+				</tm-sheet>
+				<view style="clear: both;"></view>
+			</div>
+			<!-- 衣橱 -->
+			<tm-sheet class="yichu" style="margin-bottom: 70px !important;">
+				<tm-tabs class="C1b1b1b qiehuan" color="white"  align="split"  v-model="activeIndex" :list="list" range-key="title"></tm-tabs>
+				<view class="yiguicla black pa-6 ma-4 fl" v-for="item in quanbuList">
+					<image :src="item.src" mode="widthFix"></image>
+					<view class="text-align-center text-size-m mt-8">{{item.text}}</view>
+					<view class="text-align-center text-size-m mt-6 mb-6">{{item.type}}</view>
+				</view>
+				<view style="clear: both;" class="more ma-30 pt-40" @click="gengmore()">
+					<image src="/static/img/30.png" mode="widthFix"></image>
+					<text class="text-size-s">下拉加载更多~</text>
+				</view>
+			</tm-sheet>
+		</view>
 	</view>
 </template>	
 <script>
@@ -28,50 +78,34 @@
 export default {
 	data() {
 		return {
+			soso:'',
 			activeIndex:0,
-			list:[ '爸爸','媳妇','儿子'],
-			active: 2,
-			list2:[{
-				src:'https://picsum.photos/300?k=0',
-				text:'推荐穿搭1',
-				type:'tiao'
+			list:[ '全部','上衣','裤子','鞋子','配饰'],
+			quanbuList:[{
+				src:'/static/img/45.png',
+				text:'NEO CITY 涂鸦',
+				type:'手提包'
 			},{
-				src:'https://picsum.photos/300?k=1',
-				text:'推荐穿搭2',
-				type:'tiao'
+				src:'/static/img/46.png',
+				text:'满印迷你标识',
+				type:'围巾'
 			},{
-				src:'https://picsum.photos/300?k=2',
-				text:'推荐穿搭3',
-				type:'tiao'
-			}],
-			list3:[
-				{text:'苏州'},
-				{text:'北京'},
-				{text:'广东'},
-				{text:'江西',dot:8},
-				{text:'深圳'},
-			],
-			list4:[{
-				src:'https://picsum.photos/300?k=0',
-				text:'标题0',
-				type:'tiao'
+				src:'/static/img/47.png',
+				text:'大号版型夹克',
+				type:'新品'
 			},{
-				src:'https://picsum.photos/300?k=1',
-				text:'标题1',
-				type:'tiao'
+				src:'/static/img/45.png',
+				text:'NEO CITY 涂鸦',
+				type:'手提包'
 			},{
-				src:'https://picsum.photos/300?k=2',
-				text:'标题2',
-				type:'tiao'
+				src:'/static/img/46.png',
+				text:'满印迷你标识',
+				type:'围巾'
 			},{
-				src:'https://picsum.photos/300?k=1',
-				text:'标题1',
-				type:'tiao'
-			},{
-				src:'https://picsum.photos/300?k=2',
-				text:'标题2',
-				type:'tiao'
-			}],
+				src:'/static/img/47.png',
+				text:'大号版型夹克',
+				type:'新品'
+			}]
 		};
 	},
 	onLoad() {
@@ -81,6 +115,26 @@ export default {
 		this.sys = uni.getSystemInfoSync();
 	},
 	methods: {
+		qiehuanFun(){
+			uni.navigateTo({
+				url: "/pages/qiehuan/index",
+			})
+		},
+		randouh(){
+			let list2 = [],that=this;
+			for(let i=0;i<6;i++){
+				list2.push({
+					src:'/static/img/47.png',
+					text:'大号版型夹克',
+					type:'新品'
+				})
+			}
+			this.quanbuList=this.quanbuList.concat(list2)
+			console.log(this.quanbuList)
+		},
+		gengmore(){
+			this.randouh()
+		},
 		change(e){
 			uni.$tm.toast(`你选中了${e}`);
 		},
@@ -112,4 +166,48 @@ export default {
 	.shangright{
 		padding: 10px;
 	}
+	// 
+	.xiangji image{
+		width: 30px;
+		height: 22px;
+	}
+	.suosou image{
+		width: 40px;
+	}
+	/deep/ .icon-search{
+		font-size: 23px !important;
+		color: #8E8E93 !important;
+	}
+	/deep/ .tm-search{
+		width: 94%;
+		margin: 0 auto;
+		background-color: #414141 !important;
+		border-radius: 10px;
+	}
+	/deep/ .tm-search .grey-darken-5{
+		background-color: #414141 !important;
+	}
+	.dingwei{width: 92%;margin: 0 auto;margin-top: 20px;padding-bottom: 20px;}
+	.dingwei image{width: 25px;margin-right: 10px;	}
+	.dingwei .touxiang{width: 50px;margin-right: 3px;	}
+	/deep/ .lunbo1{margin:0 !important;padding: 4px !important;margin-top: 5px !important;width: 46.6% !important;}
+	.tuijiantp{width: 100%;}
+	.tuijiantp image{width: 97% !important;}
+	.yichu{margin:0 !important;padding: 4px !important;margin-top: 10px !important;}
+	/deep/ .qiehuan .text-white{
+		font-size: 14px;
+		background: #303440;
+		height: 28px;
+		vertical-align: middle;
+		line-height: 28px;
+		border-radius: 20px;
+		padding-left: 14px;
+		padding-right: 14px;
+		margin-top: 17%;
+	}
+	/deep/ .qiehuan .tm-tabs-con-item-border{display: none;}
+	.yiguicla image{width: 95%;display: block;margin: 0 auto;margin-top: 5px;}
+	.yiguicla{width: 30%;border-radius: 10px;}
+	.more{text-align: center;}
+	.more image{margin-right: 10px;vertical-align: middle;width: 30px;}
 </style>

unpackage/dist/dev/app-plus/app-config-service.js

@@ -1,8 +1,8 @@
 
 var isReady=false;var onReadyCallbacks=[];
 var isServiceReady=false;var onServiceReadyCallbacks=[];
-var __uniConfig = {"pages":["pages/index/index","pages/wardrobe/index","pages/dapei/index","pages/shop/index","pages/user/index","pages/shouye/index","pages/putstorage/index","pages/registered/index","pages/login/index","pages/xieyi/index","pages/zhaohui/index","pages/zhtijiao/index","pages/chuanghome/index"],"window":{"navigationBarTextStyle":"black","navigationBarTitleText":"uni-app","navigationBarBackgroundColor":"#F8F8F8","backgroundColor":"#F8F8F8"},"tabBar":{"color":"#999","selectedColor":"#82cfd5","borderStyle":"#fff","backgroundColor":"white","iconfontSrc":"static/icon/iconfont.ttf"},"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","renderer":"auto","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":false},"appname":"testApp","compilerVersion":"3.4.7","entryPagePath":"pages/index/index","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000}};
-var __uniRoutes = [{"path":"/pages/index/index","meta":{"isQuit":true},"window":{"navigationBarTitleText":"","titleNView":false}},{"path":"/pages/wardrobe/index","meta":{},"window":{"navigationBarTitleText":"衣厨","titleNView":false}},{"path":"/pages/dapei/index","meta":{},"window":{"navigationBarTitleText":"消息","titleNView":false}},{"path":"/pages/shop/index","meta":{},"window":{"navigationBarTitleText":"商场","titleNView":false}},{"path":"/pages/user/index","meta":{},"window":{"navigationBarTitleText":"我的","titleNView":false}},{"path":"/pages/shouye/index","meta":{},"window":{"navigationBarTitleText":"我的","titleNView":false}},{"path":"/pages/putstorage/index","meta":{},"window":{"navigationBarTitleText":"我的","titleNView":false}},{"path":"/pages/registered/index","meta":{},"window":{"navigationBarTitleText":"我的","titleNView":false}},{"path":"/pages/login/index","meta":{},"window":{"navigationBarTitleText":"我的","titleNView":false}},{"path":"/pages/xieyi/index","meta":{},"window":{"navigationBarTitleText":"我的","titleNView":false}},{"path":"/pages/zhaohui/index","meta":{},"window":{"navigationBarTitleText":"我的","titleNView":false}},{"path":"/pages/zhtijiao/index","meta":{},"window":{"navigationBarTitleText":"我的","titleNView":false}},{"path":"/pages/chuanghome/index","meta":{},"window":{"navigationBarTitleText":"我的","titleNView":false}}];
+var __uniConfig = {"pages":["pages/index/index","pages/wardrobe/index","pages/dapei/index","pages/shop/index","pages/user/index","pages/shouye/index","pages/putstorage/index","pages/registered/index","pages/login/index","pages/xieyi/index","pages/zhaohui/index","pages/zhtijiao/index","pages/chuanghome/index","pages/qiehuan/index"],"window":{"navigationBarTextStyle":"black","navigationBarTitleText":"uni-app","navigationBarBackgroundColor":"#F8F8F8","backgroundColor":"#F8F8F8"},"tabBar":{"color":"#999","selectedColor":"#82cfd5","borderStyle":"#fff","backgroundColor":"white","iconfontSrc":"static/icon/iconfont.ttf"},"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","renderer":"auto","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":false},"appname":"testApp","compilerVersion":"3.4.7","entryPagePath":"pages/index/index","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000}};
+var __uniRoutes = [{"path":"/pages/index/index","meta":{"isQuit":true},"window":{"navigationBarTitleText":"","titleNView":false}},{"path":"/pages/wardrobe/index","meta":{},"window":{"navigationBarTitleText":"衣厨","titleNView":false}},{"path":"/pages/dapei/index","meta":{},"window":{"navigationBarTitleText":"消息","titleNView":false}},{"path":"/pages/shop/index","meta":{},"window":{"navigationBarTitleText":"商场","titleNView":false}},{"path":"/pages/user/index","meta":{},"window":{"navigationBarTitleText":"我的","titleNView":false}},{"path":"/pages/shouye/index","meta":{},"window":{"navigationBarTitleText":"我的","titleNView":false}},{"path":"/pages/putstorage/index","meta":{},"window":{"navigationBarTitleText":"我的","titleNView":false}},{"path":"/pages/registered/index","meta":{},"window":{"navigationBarTitleText":"我的","titleNView":false}},{"path":"/pages/login/index","meta":{},"window":{"navigationBarTitleText":"我的","titleNView":false}},{"path":"/pages/xieyi/index","meta":{},"window":{"navigationBarTitleText":"我的","titleNView":false}},{"path":"/pages/zhaohui/index","meta":{},"window":{"navigationBarTitleText":"我的","titleNView":false}},{"path":"/pages/zhtijiao/index","meta":{},"window":{"navigationBarTitleText":"我的","titleNView":false}},{"path":"/pages/chuanghome/index","meta":{},"window":{"navigationBarTitleText":"我的","titleNView":false}},{"path":"/pages/qiehuan/index","meta":{},"window":{"navigationBarTitleText":"我的","titleNView":false}}];
 __uniConfig.onReady=function(callback){if(__uniConfig.ready){callback()}else{onReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"ready",{get:function(){return isReady},set:function(val){isReady=val;if(!isReady){return}const callbacks=onReadyCallbacks.slice(0);onReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});
 __uniConfig.onServiceReady=function(callback){if(__uniConfig.serviceReady){callback()}else{onServiceReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"serviceReady",{get:function(){return isServiceReady},set:function(val){isServiceReady=val;if(!isServiceReady){return}const callbacks=onServiceReadyCallbacks.slice(0);onServiceReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});
 service.register("uni-app-config",{create(a,b,c){if(!__uniConfig.viewport){var d=b.weex.config.env.scale,e=b.weex.config.env.deviceWidth,f=Math.ceil(e/d);Object.assign(__uniConfig,{viewport:f,defaultFontSize:Math.round(f/20)})}return{instance:{__uniConfig:__uniConfig,__uniRoutes:__uniRoutes,global:void 0,window:void 0,document:void 0,frames:void 0,self:void 0,location:void 0,navigator:void 0,localStorage:void 0,history:void 0,Caches:void 0,screen:void 0,alert:void 0,confirm:void 0,prompt:void 0,fetch:void 0,XMLHttpRequest:void 0,WebSocket:void 0,webkit:void 0,print:void 0}}}});