1

pages/changan/index.vue

@@ -0,0 +1,273 @@
+<template>
+	<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">
+			<view class="dingwei ml-20" v-if="itemuser!=0">
+				<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">{{itemuser.username}}的衣橱</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 class="dingwei" v-if="itemuser==0">
+				<text style="vertical-align: middle;" class="text-size-m mr-20">暂无家庭成员去添加</text>
+				<image @click="tianjia" style="vertical-align: middle;" src="/static/img/42.png" mode="widthFix"></image>
+			</view>
+		</view>
+		<!-- 推荐 -->
+		<view class="zhuti">
+			<!-- 衣橱 -->
+			<tm-sheet class="yichu" style="margin-bottom: 70px !important;">
+				<tm-tabs class="C1b1b1b qiehuan" @change="fenleichange" 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.aa?'C0178FD':''" v-for="(item,index) in quanbuList" @click="yifu(index,item)">
+					<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 class="anniu">
+				<tm-button @click="quxiao" :round="24" class="fl" theme="gray" size="n">取消</tm-button>
+				<tm-button :round="24" class="fl" theme="primary" size="n">取出</tm-button>
+			</view>
+			<view class="anniu">
+				<tm-button :round="24" class="fl" theme="red" size="n">删除</tm-button>
+				<tm-button :round="24" class="fl" theme="primary" size="n">保存</tm-button>
+			</view>
+		</view>
+	</view>
+</template>	
+<script>
+import{myRequest} from '@/api/request.js'
+export default {
+	data() {
+		return {
+			itemuser:0,
+			soso:'',
+			activeIndex:0,
+			list:[],
+			listlx:[],
+			quanbuList:[{
+				src:'/static/img/45.png',
+				text:'NEO CITY 涂鸦',
+				type:'手提包',
+				aa:false
+			},{
+				src:'/static/img/46.png',
+				text:'满印迷你标识',
+				type:'围巾',
+				aa:false
+			},{
+				src:'/static/img/47.png',
+				text:'大号版型夹克',
+				type:'新品',
+				aa:false
+			},{
+				src:'/static/img/45.png',
+				text:'NEO CITY 涂鸦',
+				type:'手提包',
+				aa:false
+			},{
+				src:'/static/img/46.png',
+				text:'满印迷你标识',
+				type:'围巾',
+				aa:false
+			},{
+				src:'/static/img/47.png',
+				text:'大号版型夹克',
+				type:'新品',
+				aa:false
+			}],
+			chooseindex:-1
+		};
+	},
+	onLoad() {
+		console.log("111")
+	},
+	created() {
+		this.sys = uni.getSystemInfoSync();
+		console.log("222")
+		// this.getfenltext()
+		this.fenleichange();
+	},
+	methods: {
+		quxiao(){
+			for(let i=0;i<this.quanbuList.length;i++){
+				this.quanbuList[i].aa=false;
+			}
+		},
+		chuku(){
+			uni.navigateTo({
+				url: "/pages/quchu/index",
+			})
+		},
+		sosoFun(){
+			uni.navigateTo({
+				url: "/pages/shopsoso/index",
+			})
+		},
+		fenleichange(e){
+			var that=this;
+			myRequest({
+				url: "/api/MemberInfo/getFamilyMember",
+				method:'post',
+				data:{family_id:uni.getStorageSync("family_id")}
+			}).then(res => {
+				console.log(res.data)
+				if (res.data.code == 200) {
+					if(res.data.data.length != 0){
+						var wu=0;
+						for(let i=0;i<res.data.data.length;i++){
+							if(res.data.data[i].checked==1){
+								wu=1;
+								that.itemuser=res.data.data[i];
+							}
+						}
+						if(wu==0){
+							that.itemuser=res.data.data[0];
+						}
+					}else{
+						that.itemuser=0;
+					}
+				}else{
+					that.itemuser=0;
+				}
+			})
+		},
+		getfenltext(){
+			var that=this;
+			myRequest({
+				url: "/api/Category/list",
+				method:'post',
+				data:{}
+			}).then(res => {
+				console.log(res.data)
+				if (res.data.code == 200) {
+					if(res.data.data.length != 0){
+						that.list=['全部'];
+						for(let i=0;i<res.data.data.length;i++){
+							that.list.push(res.data.data[i].category_name)
+						}
+						that.listlx=res.data.data;
+					}
+				}else{
+					that.list=[];
+					that.listlx=[];
+				}
+			})
+		},
+		yifu(index,item){
+			
+			item.aa=! item.aa
+			console.log(item)
+		},
+		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:'新品',
+					aa:false
+				})
+			}
+			this.quanbuList=this.quanbuList.concat(list2)
+			console.log(this.quanbuList)
+		},
+		gengmore(){
+			this.randouh()
+		},
+		change(e){
+			uni.$tm.toast(`你选中了${e}`);
+		},
+		changece(e){
+			uni.$tm.toast(`您选中了:${e}`)
+		},
+		dapei(item){
+			console.log(item)
+		},
+		xiangqing(item){
+			console.log(item)
+		},
+		ruku(){
+			uni.navigateTo({
+				url: "/pages/putstorage/index",
+			})
+		},
+		tianjia(){
+			uni.navigateTo({
+				url: "/pages/chuanghome/index",
+			})
+		}
+	},
+}
+</script>
+
+<style lang="scss">
+	/deep/ uni-scroll-view{
+		height: auto !important;
+	}
+	/deep/ .tm-menubars .body{
+		background-color: #1b1b1b !important;
+	}
+	.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{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;}
+	.fudong{position:fixed;right:10px;bottom:150px;background: #303030;width: 130px;height: 60px;
+	border-radius: 30px 0px 0px 30px;font-size: 14px;text-align: center;}
+	.fudimg{width: 60px;height:60px}
+	.anniu{width: 78%;margin: 0 auto;margin-top: 20px;padding-bottom: 30px;text-align: center;}
+	/deep/ .tm-button .tm-button-btn uni-button{min-width: 120px !important;}
+	/deep/ .tm-button .red{color: white !important;}
+</style>

pages/dapei/index.vue

@@ -1,14 +1,59 @@
 <template>
 	<view :style="{ minHeight: sys.windowHeight + 'px' }"
 		:class="[$tm.vx.state().tmVuetify.black ? 'black' : ' ']">
-		<tm-menubars title="消息列表" :shadow="0" :showback="true"></tm-menubars>
+		<tm-menubars title="搭配" :shadow="0" :showback="true"></tm-menubars>
+		<view class="C1b1b1b pb-20">
+			<tm-tabs align="left" class="qiehuan1" v-model="activeIndex" :list="list" range-key="title"></tm-tabs>
+		</view>
+		<!-- 天气 -->
+		<scroll-view class="scroll-view_H" scroll-x="true">
+			<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>
+					<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="dapei(1)">编辑穿搭</view>
+			</view>
+			<view class="scroll-view-item_H">
+				<view class="chuanda">
+					<view class="text-white text-size-lg">南京市</view>
+					<view class="text-size-lg mt-15 text-weight-b" style="color: #FFCC00;">8°C</view>
+					<view class="text-white text-size-lg mt-15">局部地区降雨</view>
+					<view class="text-gray text-size-lg mt-10">最低0°c 最高9°c</view>
+				</view>
+				<view class="mt-20 text-align-center">
+					<image class="taiyang" src="/static/img/106.png" mode="widthFix"></image>
+					<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="dapei(2)">添加穿搭</view>
+			</view>
+			<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>
+					<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="dapei(1)">编辑穿搭</view>
+			</view>
+		</scroll-view>
 		<div class="zhuti">
-			<tm-sheet class="kuang" style="padding-bottom: 70px !important;">
-				<view style="width: 94%;margin:0 auto;">
-					
+			<!-- 衣橱 -->
+			<tm-sheet class="yichu" style="margin-bottom: 40px !important;">
+				<tm-tabs class="C1b1b1b qiehuan" color="white"  align="left"  v-model="activeIndex1" :list="list1" range-key="title"></tm-tabs>
+				<view class="yiguicla black pa-6 ma-4 fl" v-for="(item,index) in quanbuList" @click="zidingyi(2)">
+					<image :src="item.src" mode="widthFix"></image>
+					<view class="text-size-m mt-20 mb-20 ml-10">{{item.text}}</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>
-			<tm-button :round="24" class="sao mb-40 mt-40" block>提交</tm-button>
+			<tm-button :round="24" class="sao" block @click="zidingyi(1)">自定义搭配</tm-button>
 		</div>
 		<!-- 弹出层消息 -->
 		<tm-message ref="toast"></tm-message>
@@ -19,10 +64,30 @@ import{myRequest} from '@/api/request.js'
 export default {
 	data() {
 		return {
-			checked1:false,
-			checked2:false,
-			checked3:false,
-			beizu:''
+			list:[ '预约穿搭'],
+			list1:['时尚','商务'],
+			activeIndex:0,
+			activeIndex1:0,
+			quanbuList:[{
+				src:'/static/img/44.png',
+				text:'日常穿搭',
+			},{
+				src:'/static/img/44.png',
+				text:'日常穿搭',
+			},{
+				src:'/static/img/44.png',
+				text:'日常穿搭',
+			},{
+				src:'/static/img/44.png',
+				text:'日常穿搭',
+			},{
+				src:'/static/img/44.png',
+				text:'日常穿搭',
+			},{
+				src:'/static/img/44.png',
+				text:'日常穿搭',
+			}],
+			chooseindex:-1
 		};
 	},
 	onLoad() {
@@ -32,21 +97,26 @@ export default {
 		this.sys = uni.getSystemInfoSync();
 	},
 	methods: {
-		aa(num){
-			if(num==1){
-				this.checked1=true;
-				this.checked2=false;
-				this.checked3=false;
-			}else if(num==2){
-				this.checked1=false;
-				this.checked2=true;
-				this.checked3=false;
-			}else if(num==3){
-				this.checked1=false;
-				this.checked2=false;
-				this.checked3=true;
+		dapei(type){
+			if(type==1){
+				uni.navigateTo({
+					url: "/pages/zidingyi/index?off="+type,
+				})
+			}else{
+				uni.navigateTo({
+					url: "/pages/dapeizidingyi/index",
+				})
 			}
+			
 		},
+		gengmore(){
+			
+		},
+		zidingyi(off){
+			uni.navigateTo({
+				url: "/pages/zidingyi/index?off="+off,
+			})
+		}
 	},
 }
 </script>
@@ -55,6 +125,50 @@ export default {
 	/deep/ .tm-menubars .body{
 		background-color: #1b1b1b !important;
 	}
-	/deep/ .zhuti{padding: 10px 10px;}
-	/deep/ .kuang{margin:0 !important;padding: 0px !important;}
+	/deep/ .qiehuan1 .text-primary{color: white !important;}
+	.chuanda{width: 100%;height: 144px;}
+	.taiyang{width: 25px;}
+	.bianji{border: 1px solid #303440;width: 80px;height: 30px;background: #303440;font-size: 15px;
+	text-align: center;line-height: 30px;border-radius: 5px;margin: 0 auto;margin-top: 10px;border:1px solid white;}
+	.scroll-view_H {
+		white-space: nowrap;
+		width: 100%;
+		background: #1B1B1B;
+		padding-bottom: 15px;
+	}
+	.scroll-view-item {
+		height: 300rpx;
+		text-align: center;
+		font-size: 36rpx;
+	}
+	.scroll-view-item_H {
+		display: inline-block;
+		width: 150px;
+		text-align: center;
+		font-size: 36rpx;
+		margin-left: 10px;
+		background: #0D0D0D;
+		padding: 6px;
+		border-radius: 10px;
+	}
+	.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: 47%;border-radius: 10px;}
+	.more{text-align: center;}
+	.more image{margin-right: 10px;vertical-align: middle;width: 30px;}
+	.fudong{position:fixed;right:10px;bottom:150px;background: #303030;width: 130px;height: 60px;
+	border-radius: 30px 0px 0px 30px;font-size: 14px;text-align: center;}
+	.sao{width: 60%;display: block;margin: 0 auto;margin-bottom: 60px;}
 </style>

pages/dapeizidingyi/index.vue

@@ -0,0 +1,128 @@
+<template>
+	<view :style="{ minHeight: sys.windowHeight + 'px' }"
+		:class="[$tm.vx.state().tmVuetify.black ? 'black' : ' ']">
+		<tm-menubars title="添加穿搭" :shadow="0" :showback="true"></tm-menubars>
+		<div class="zhuti">
+			<!-- 衣橱 -->
+			<tm-sheet class="yichu" style="margin-bottom: 40px !important;">
+				<tm-tabs class="C1b1b1b qiehuan" color="white"  align="left"  v-model="activeIndex1" :list="list1" range-key="title"></tm-tabs>
+				<view class="yiguicla black pa-6 ma-4 fl" v-for="(item,index) in quanbuList" @click="zidingyi(1)">
+					<image :src="item.src" mode="widthFix"></image>
+					<view class="text-size-m mt-20 mb-20 ml-10">{{item.text}}</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>
+		</div>
+		<!-- 弹出层消息 -->
+		<tm-message ref="toast"></tm-message>
+	</view>
+</template>	
+<script>
+import{myRequest} from '@/api/request.js'
+export default {
+	data() {
+		return {
+			list:[ '预约穿搭'],
+			list1:['时尚','商务'],
+			activeIndex:0,
+			activeIndex1:0,
+			quanbuList:[{
+				src:'/static/img/44.png',
+				text:'日常穿搭',
+			},{
+				src:'/static/img/44.png',
+				text:'日常穿搭',
+			},{
+				src:'/static/img/44.png',
+				text:'日常穿搭',
+			},{
+				src:'/static/img/44.png',
+				text:'日常穿搭',
+			},{
+				src:'/static/img/44.png',
+				text:'日常穿搭',
+			},{
+				src:'/static/img/44.png',
+				text:'日常穿搭',
+			}],
+			chooseindex:-1
+		};
+	},
+	onLoad() {
+		
+	},
+	created() {
+		this.sys = uni.getSystemInfoSync();
+	},
+	methods: {
+		dapei(){
+			uni.navigateTo({
+				url: "/pages/dapeizidingyi/index?off=1",
+			})
+		},
+		gengmore(){
+			
+		},
+		zidingyi(off){
+			uni.navigateTo({
+				url: "/pages/zidingyi/index?off="+off,
+			})
+		}
+	},
+}
+</script>
+
+<style lang="scss">
+	/deep/ .tm-menubars .body{
+		background-color: #1b1b1b !important;
+	}
+	/deep/ .qiehuan1 .text-primary{color: white !important;}
+	.chuanda{width: 100%;height: 144px;}
+	.taiyang{width: 25px;}
+	.bianji{border: 1px solid #303440;width: 80px;height: 30px;background: #303440;font-size: 15px;
+	text-align: center;line-height: 30px;border-radius: 5px;margin: 0 auto;margin-top: 10px;border:1px solid white;}
+	.scroll-view_H {
+		white-space: nowrap;
+		width: 100%;
+		background: #1B1B1B;
+		padding-bottom: 15px;
+	}
+	.scroll-view-item {
+		height: 300rpx;
+		text-align: center;
+		font-size: 36rpx;
+	}
+	.scroll-view-item_H {
+		display: inline-block;
+		width: 150px;
+		text-align: center;
+		font-size: 36rpx;
+		margin-left: 10px;
+		background: #0D0D0D;
+		padding: 6px;
+		border-radius: 10px;
+	}
+	.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: 47%;border-radius: 10px;}
+	.more{text-align: center;}
+	.more image{margin-right: 10px;vertical-align: middle;width: 30px;}
+	.fudong{position:fixed;right:10px;bottom:150px;background: #303030;width: 130px;height: 60px;
+	border-radius: 30px 0px 0px 30px;font-size: 14px;text-align: center;}
+	.sao{width: 60%;display: block;margin: 0 auto;margin-bottom: 60px;}
+</style>

pages/dizhi/index.vue

@@ -0,0 +1,93 @@
+<template>
+	<view :style="{ minHeight: sys.windowHeight + 'px' }"
+		:class="[$tm.vx.state().tmVuetify.black ? 'black' : ' ']">
+		<tm-menubars title="消息列表" :shadow="0" :showback="true"></tm-menubars>
+		<div class="dizhi">
+			<view class="contdz pt-20">
+				<view>
+					<text>薛定谔</text>
+					<text class="ml-40 text-gray text-size-m">178****5566</text>
+					<tm-button class="ml-50" :round="10" theme="gray" size="s">学校</tm-button>
+				</view>
+				<view class="text-gray text-size-s mt-15">
+					<text>江苏省南京市江宁区 淳化街道弘景大道3666号</text>
+					<image class="fr xiugai" src="/static/img/109.png" mode="widthFix"></image>
+				</view>
+			</view>
+			<view class="contdz pt-20">
+				<view>
+					<text>薛定谔</text>
+					<text class="ml-40 text-gray text-size-m">178****5566</text>
+					<tm-button class="ml-50" :round="10" theme="gray" size="s">学校</tm-button>
+				</view>
+				<view class="text-gray text-size-s mt-15">
+					<text>江苏省南京市江宁区 淳化街道弘景大道3666号</text>
+					<image class="fr xiugai" src="/static/img/109.png" mode="widthFix"></image>
+				</view>
+			</view>
+			<view class="contdz pt-20">
+				<view>
+					<text>薛定谔</text>
+					<text class="ml-40 text-gray text-size-m">178****5566</text>
+					<tm-button class="ml-50" :round="10" theme="gray" size="s">学校</tm-button>
+				</view>
+				<view class="text-gray text-size-s mt-15">
+					<text>江苏省南京市江宁区 淳化街道弘景大道3666号</text>
+					<image class="fr xiugai" src="/static/img/109.png" mode="widthFix"></image>
+				</view>
+			</view>
+			
+		</div>
+		<tm-button :round="24" class="sao mb-40 mt-40" block>新建收获地址</tm-button>
+		<!-- 弹出层消息 -->
+		<tm-message ref="toast"></tm-message>
+	</view>
+</template>	
+<script>
+import{myRequest} from '@/api/request.js'
+export default {
+	data() {
+		return {
+			checked1:false,
+			checked2:false,
+			checked3:false,
+			beizu:''
+		};
+	},
+	onLoad() {
+		
+	},
+	created() {
+		this.sys = uni.getSystemInfoSync();
+	},
+	methods: {
+		aa(num){
+			if(num==1){
+				this.checked1=true;
+				this.checked2=false;
+				this.checked3=false;
+			}else if(num==2){
+				this.checked1=false;
+				this.checked2=true;
+				this.checked3=false;
+			}else if(num==3){
+				this.checked1=false;
+				this.checked2=false;
+				this.checked3=true;
+			}
+		},
+	},
+}
+</script>
+
+<style lang="scss">
+	/deep/ .tm-menubars .body{
+		background-color: #1b1b1b !important;
+	}
+	/deep/ .zhuti{padding: 10px 10px;}
+	/deep/ .kuang{margin:0 !important;padding: 0px !important;}
+	.sao{width: 88%;margin:0 auto;margin-top: 30px;}
+	.dizhi{background: #1B1B1B;}
+	.xiugai{width: 18px;height:18px;}
+	.contdz{width: 90%;margin:0 auto;border-bottom: 1px solid #303030;padding-bottom: 15px;}
+</style>

pages/index/index.vue

@@ -36,7 +36,7 @@ export default {
 			list_1: [
 				{iconSize: 60,showDot:false,icon: '/static/img/31.png',noIcon:'/static/img/31.png', value: '首页' },
 				{iconSize: 60,showDot:false,icon: '/static/img/32.png',noIcon:'/static/img/32.png', value: '衣橱' },
-				{iconSize: 60,showDot:false, icon: '/static/img/103.png',noIcon:'/static/img/103.png', value: '消息' },
+				{iconSize: 60,showDot:false, icon: '/static/img/103.png',noIcon:'/static/img/103.png', value: '穿搭' },
 				{iconSize: 60,showDot:false, icon: '/static/img/34.png',noIcon:'/static/img/34.png', value: '商城' },
 				{iconSize: 60,showDot:false, icon: '/static/img/35.png',noIcon:'/static/img/35.png', value: '我的' }
 			],

pages/qianbao/index.vue

@@ -1,62 +1,434 @@
 <template>
-	<view :style="{ minHeight: sys.windowHeight + 'px' }"
-		:class="[$tm.vx.state().tmVuetify.black ? 'black' : ' ']">
-		<tm-menubars title="消息列表" :shadow="0" :showback="true"></tm-menubars>
-		<div class="zhuti">
-			<tm-sheet class="kuang" style="padding-bottom: 70px !important;">
-				<view style="width: 94%;margin:0 auto;">
-					<view>
-						<text class="fl text-white">我的钱包</text>
-						<text class="fr">规则</text>
+	<view :style="{ minHeight: sys.windowHeight + 'px' }" :class="[$tm.vx.state().tmVuetify.black ? 'black' : ' ']">
+		<tm-menubars title="我的钱包" :shadow="0" :showback="true"></tm-menubars>
+
+		<div class="zhuti" style="padding-bottom:60px !important;">
+			<tm-sheet class="kuang">
+				<view style="padding: 12px 12px 0;position: relative;">
+					<view class="my_top">
+						<text>我的钱包</text>
+						<text>规则</text>
+					</view>
+					<view class="my_rest">
+						<view style="display: flex;flex-direction: column;align-items: center;margin-bottom: 20px;">
+							<text class="rest_money">{{rest}}</text>
+							<text style="color: #fff;font-size: 15px;">钱包余额</text>
+						</view>
+						<view class="my_fun">
+							<view class="fun_btn" @click="goPay">充值</view>
+							<view class="fun_btn" @click="goCash">提现</view>
+						</view>
+					</view>
+					<image src="../../static/img/104.png" mode="widthFix" style="width: 104px;height: 70px;"></image>
+				</view>
+			</tm-sheet>
+			<tm-sheet class="kuang">
+				<view class="" style="padding: 20px 10px;">
+					<view class="line_bottom  btm_flex" v-for="item in optList" :key="item.id">
+						<view style="display: flex;flex-direction: column;">
+							<text class="btm_info" style="font-size: 16px;color: #ffffff;">{{item.way}}</text>
+							<text class="btm_info" style="font-size: 14px;">{{item.from}}</text>
+							<text class="btm_info" style="font-size: 13px;">{{item.time}}</text>
+						</view>
+						<view style="color: #ffcc00;font-size: 14px;">+￥{{item.money}}</view>
 					</view>
 				</view>
 			</tm-sheet>
 		</div>
+		<tm-poup v-model="show" position="center" width="95%" height="400px">
+			<view class="" style="background-color: #303030;height: 100%;">
+				<view class="price_title">
+					<!-- 占位 -->
+					<text></text>
+					<text>充值</text>
+					<image src="../../static/img/105.png" mode="widthFix"
+						style="width: 24px;height: 24px;vertical-align: middle;" @click="goCancal"></image>
+				</view>
+				<view class="">
+					<view class="price_box">
+						<view :class="selectType==index?'price_info_active':'price_info_Inactive'"
+							v-for="(item,index) in payList" :key="item.id" @click="selectIndex(index)">
+							<text class="info_pri">{{item.price}}</text>
+							<text class="info_mark" style="font-size: 13px;">({{item.mark}}元)</text>
+						</view>
+					</view>
+
+					<view class="inps">
+						<tm-input :border-bottom="false" :vertical="true" title="" v-model="prices"
+							placeholder="自定义充值金额" align="left" bg-color="rgba(30, 30, 30, 1)" round="5">
+						</tm-input>
+						<view class="btns">
+							<view class="quxiao" @click="goConfirm">取消</view>
+							<view class="queding" @click="goConfirm">确认 </view>
+						</view>
+					</view>
+				</view>
+			</view>
+
+
+		</tm-poup>
 		<!-- 弹出层消息 -->
 		<tm-message ref="toast"></tm-message>
 	</view>
-</template>	
+</template>
 <script>
-import{myRequest} from '@/api/request.js'
-export default {
-	data() {
-		return {
-			checked1:false,
-			checked2:false,
-			checked3:false,
-			beizu:''
-		};
-	},
-	onLoad() {
-		
-	},
-	created() {
-		this.sys = uni.getSystemInfoSync();
-	},
-	methods: {
-		aa(num){
-			if(num==1){
-				this.checked1=true;
-				this.checked2=false;
-				this.checked3=false;
-			}else if(num==2){
-				this.checked1=false;
-				this.checked2=true;
-				this.checked3=false;
-			}else if(num==3){
-				this.checked1=false;
-				this.checked2=false;
-				this.checked3=true;
+	import {
+		myRequest
+	} from '@/api/request.js'
+	export default {
+		data() {
+			return {
+				selectType: 0,
+				prices: '',
+				show: false,
+				rest: '2136',
+				optList: [{
+					way: '充值',
+					from: '通过苹果应用内支付（IAP）支出',
+					time: '2022-05-07 00:01 已到账',
+					money: '100.00'
+				}],
+				// 充值列表
+				payList: [{
+						price: '233',
+						mark: '233'
+					},
+					{
+						price: '666',
+						mark: '666'
+					},
+					{
+						price: '1000',
+						mark: '1000'
+					},
+					{
+						price: '6666',
+						mark: '6666'
+					}
+				],
+				listdata: []
+			};
+		},
+		onLoad() {},
+		created() {
+			this.sys = uni.getSystemInfoSync();
+			this.randouh()
+		},
+		methods: {
+			selectIndex(index) {
+				console.log(index, '2');
+				this.selectType = index;
+			},
+			randouh() {
+				let list2 = [],
+					that = this;
+				for (let i = 0; i < 8; i++) {
+					list2.push({
+						image: '../../static/img/90.png',
+						text: '帽子',
+						jiage: '¥ 359.00',
+						xiaol: '128'
+					})
+				}
+				this.listdata = this.listdata.concat(list2)
+				console.log(this.listdata)
+			},
+			gengmore() {
+				this.randouh()
+			},
+			goPay() {
+				this.show = true;
+			},
+			goCancal() {
+				this.show = false
+			},
+			goConfirm() {
+				this.show = false;
+			},
+			goCash() {
+				console.log('提现');
 			}
 		},
-	},
-}
+	}
 </script>
 
 <style lang="scss">
-	/deep/ .tm-menubars .body{
+	/deep/ .tm-menubars .body {
 		background-color: #1b1b1b !important;
 	}
-	/deep/ .zhuti{padding: 10px 10px;}
-	/deep/ .kuang{margin:0 !important;padding: 0px !important;}
+
+	/deep/ .zhuti {
+		padding: 10px;
+	}
+
+	/deep/ .kuang {
+		margin: 0 !important;
+		padding: 0px !important;
+	}
+
+	.my_top {
+		font-size: 16px;
+		color: #fff;
+		display: flex;
+		justify-content: space-between;
+		margin-bottom: 40px;
+	}
+
+	.my_rest {
+		position: absolute;
+		left: 0;
+		top: 40px;
+		width: 100%;
+		z-index: 22;
+
+		.rest_money {
+			font-size: 24px;
+			color: #ffcc00;
+			font-weight: bold;
+			line-height: 36px;
+		}
+
+		.my_fun {
+			display: flex;
+			color: #ffffff;
+			align-items: center;
+			justify-content: space-between;
+			box-sizing: border-box;
+			padding: 0px 80px;
+		}
+
+		.fun_btn {
+			padding: 5px 23px;
+			background: #0178FD;
+			border-radius: 20px;
+		}
+	}
+
+	.kuang .line_bottom {
+		padding: 10px;
+		border-bottom: 1px solid rgba(129, 129, 129, 0.2);
+	}
+
+	.btm_info {
+		margin: 5px 0;
+	}
+
+	.btm_flex {
+		display: flex;
+		justify-content: space-between;
+	}
+
+	.kuang .line_bottom:last-child {
+		border-bottom: none;
+	}
+
+	.line_my {
+		margin: 10px 0;
+		display: flex;
+		font-size: 14px;
+	}
+
+	.price_title {
+		height: 54px;
+		display: flex;
+		color: #ffffff;
+		padding: 0px 16px;
+		align-items: center;
+		background: #0178fd;
+		justify-content: space-between;
+	}
+
+	.price_box {
+		width: 100%;
+		padding: 13px;
+		display: flex;
+		flex-wrap: wrap;
+		justify-content: space-between;
+		box-sizing: border-box;
+	}
+
+	.price_info_active,
+	.price_info_Inactive {
+		width: 30%;
+		height: 80px;
+		display: flex;
+		border-radius: 10px;
+		background: rgba(37, 37, 37, 0.5);
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		margin: 0px 0 8px;
+
+		.info_pri {
+			margin-bottom: 3px;
+			font-size: 19px;
+		}
+	}
+
+	.price_info_active {
+		border: 1px solid #0178fd;
+
+		.info_pri {
+			color: #0178fd;
+		}
+
+		.info_mark {
+			color: #0178fd;
+		}
+	}
+
+	.price_info_Inactive {
+		border: 1px solid #AAAAAA;
+
+		.info_pri {
+			color: #ffffff;
+		}
+
+		.info_mark {}
+	}
+
+	/deep/ .qiehuan1 .text-primary {
+		color: white !important;
+	}
+
+	.touxiang {
+		width: 100%;
+		display: block;
+		margin-top: 10px;
+	}
+
+	.xiugai image {
+		width: 18px;
+		vertical-align: middle;
+		margin-right: 5px;
+	}
+
+	.xiugai text {
+		vertical-align: middle;
+	}
+
+	.xiugai {
+		position: absolute;
+		right: 5px;
+		top: 10px;
+	}
+
+	.you {
+		border-radius: 10px;
+		padding: 10px;
+		width: 88%;
+		margin: 0 auto;
+		margin-top: 20px;
+	}
+
+	/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/ .inps .grey-darken-5 {
+		background-color: transparent !important;
+	}
+
+	.yiguicla image {
+		width: 95%;
+		display: block;
+		margin: 0 auto;
+		margin-top: 5px;
+	}
+
+	.yiguicla {
+		width: 30%;
+		border-radius: 10px;
+	}
+
+	.sao {
+		width: 88%;
+		margin: 0 auto;
+		margin-top: 40px;
+	}
+
+	/deep/ .mx-32 {
+		margin: 0px !important;
+		margin-top: 15px !important;
+	}
+
+	.logo {
+		width: 100%;
+	}
+
+	.dingwei {
+		width: 21%;
+		margin-top: 3%;
+	}
+
+	.contone {
+		width: 48%;
+	}
+
+	.remenzan {
+		width: 18px !important;
+		margin-top: 10px;
+	}
+
+	.more {
+		text-align: center;
+	}
+
+	.more image {
+		margin-right: 10px;
+		vertical-align: middle;
+		width: 30px;
+	}
+
+	.btns {
+		margin: 33px 0px;
+		display: flex;
+		justify-content: space-between;
+		padding: 0px 30px;
+		color: #ffffff;
+	}
+
+	.quxiao {
+		border-radius: 10px;
+		font-size: 14px;
+		background: #303440;
+		width: 120px;
+		height: 35px;
+		text-align: center;
+		line-height: 35px;
+	}
+
+	.queding {
+		border-radius: 10px;
+		font-size: 14px;
+		background: #0178fd;
+		width: 120px;
+		height: 35px;
+		text-align: center;
+		line-height: 35px;
+	}
+	/deep/ .uni-scroll-view-content{
+		background: #303030;
+	}
 </style>

pages/user/index.vue

@@ -12,24 +12,24 @@
 				</view>
 				<view style="clear: both;"></view>
 				<tm-row class="sange mt-40 pb-30">
-					<tm-col color="" >
+					<tm-col color="" @click="dingdan">
 						<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="" @click="dingdan">
+					<tm-col color="" @click="dizhi">
 						<view class="py-10 text-size-xs">
 							<image class="sange2" src="/static/img/57.png"></image>
-							<text>我的订单</text>
+							<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>
+							<text>我的设置</text>
 						</view>
 					</tm-col>
 				</tm-row>
@@ -115,6 +115,11 @@ export default {
 				})
 			}
 		},
+		dizhi(){
+			uni.navigateTo({
+				url: "/pages/dizhi/index",
+			})
+		},
 		dingdan(){
 			uni.navigateTo({
 				url: "/pages/dingdan/index",

pages/wardrobe/index.vue

@@ -58,7 +58,7 @@
 			<!-- 衣橱 -->
 			<tm-sheet class="yichu" style="margin-bottom: 70px !important;">
 				<tm-tabs class="C1b1b1b qiehuan" @change="fenleichange" color="white"  align="left"  v-model="activeIndex" :list="list" range-key="title"></tm-tabs>
-				<view class="yiguicla black pa-6 ma-4 fl" :class="index==chooseindex?'C0178FD':''" v-for="(item,index) in quanbuList" @click="yifu(index)">
+				<view class="yiguicla black pa-6 ma-4 fl" :class="index==chooseindex?'C0178FD':''" v-for="(item,index) in quanbuList" @longpress="longpress(item)">
 					<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>
@@ -77,6 +77,7 @@
 				<view>(<text style="color: #FFCC00;">3</text>件)</view>
 			</view>
 		</tm-translate>
+		
 	</view>
 </template>	
 <script>
@@ -135,6 +136,12 @@ export default {
 		this.fenleichange();
 	},
 	methods: {
+		longpress(){
+			console.log("111")
+			uni.navigateTo({
+				url: "/pages/changan/index",
+			})
+		},
 		chuku(){
 			uni.navigateTo({
 				url: "/pages/quchu/index",

pages/zidingyi/index.vue

@@ -0,0 +1,164 @@
+<template>
+	<view :style="{ minHeight: sys.windowHeight + 'px' }"
+		:class="[$tm.vx.state().tmVuetify.black ? 'black' : ' ']">
+		<tm-menubars title="消息列表" :shadow="0" :showback="true"></tm-menubars>
+		<div class="zhuti">
+			<tm-sheet class="kuang" style="padding-bottom: 10px !important;">
+				<view style="width: 94%;margin:0 auto;">
+					<image class="chuanda" src="/static/img/108.png" mode="widthFix"></image>
+					<view class="shuru" v-if="off==1">
+						<tm-form>
+							<view class="text-size-m text-white">请输入家庭名称</view>
+							<tm-input v-model="familyname" name="title" clear placeholder="请输入" clear></tm-input>
+						</tm-form>
+					</view>
+					<view v-if="off==1" >
+						<view class="biaoti text-white mt-30 text-size-m"><view class="mr-10"></view>分类</view>
+						<tm-tabs class="C1b1b1b qiehuan" color="white"  align="left"  v-model="activeIndex" :list="list" range-key="title"></tm-tabs>
+						<view class="biaoti text-white mt-30 text-size-m"><view class="mr-10"></view>场景</view>
+						<tm-tabs class="C1b1b1b qiehuan" color="white"  align="left"  v-model="activeIndex" :list="list" range-key="title"></tm-tabs>
+					</view>
+					<view v-if="off==2" class="text-align-center mt-20 text-white">丝缎质感纹理风衣</view>
+					<view v-if="off==2" class="text-align-center mt-10 text-size-s">丝滑如肌肤</view>
+				</view>
+			</tm-sheet>
+		</div>
+		<view class="goumai shangpin" v-if="off==2" >
+			<view class="pt-20"><text class="ml-20">衣物名</text><text class="fr mr-20 text-gray text-size-s">丝缎质感纹理风衣</text></view>
+			<view class="pa-20"><tm-cartCellListFood  v-on:jiaruFun="jiarufuFun" v-for="item in test1" :typeclick="typeclick1" :mdata="item" :cart-num.sync="item.buy"></tm-cartCellListFood></view>
+		</view>
+		<tm-sheet :shadow="24" class="jiaoxi xiao">
+			<tm-tabs align="center" class="qiehuan1" v-model="activeIndex" :list="list5" range-key="title"></tm-tabs>
+		</tm-sheet>
+		<!-- 单品 -->
+		<view class="zhuti shangpin">
+			<tm-sheet :padding="[0, 0]" class="jiaoxi xiao">
+				<tm-cartCellListFood  v-on:jiaruFun="jiarufuFun" v-for="item in test" :typeclick="typeclick" :mdata="item" :cart-num.sync="item.buy"></tm-cartCellListFood>
+			</tm-sheet>
+		</view>
+		<tm-button v-if="off==1" :round="24" class="sao mb-40 mt-40" block>保存</tm-button>
+		<view class="anniu" v-if="off==2">
+			<tm-button :round="24" theme="gray" size="n">预约明日</tm-button>
+			<tm-button :round="24" class="fr" theme="primary" size="n">全部取出</tm-button>
+		</view>
+		<!-- 弹出层消息 -->
+		<tm-message ref="toast"></tm-message>
+	</view>
+</template>	
+<script>
+import{myRequest} from '@/api/request.js'
+export default {
+	data() {
+		return {
+			familyname:'',
+			off:2,
+			list:['时尚','商务'],
+			activeIndex:0,
+			activeIndex1:0,
+			list5:[ '搭配内的购物清单'],
+			test: [{
+				img: '../../static/img/83.png',
+				title: '丝缎质感纹理风衣',
+				label: '黑色 - 6518/320',
+				price: '1299',
+				id: 3,
+				buy: 0,
+				itemId: 0
+			},{
+				img: '../../static/img/84.png',
+				title: '产品3（任选）',
+				label: '这个产品是只有几个融会',
+				price: 36.2,
+				id: 3,
+				buy: 0,
+				itemId: 0
+			},{
+				img: '../../static/img/83.png',
+				title: '产品3（任选）',
+				label: '这个产品是只有几个融会',
+				price: 36.2,
+				id: 3,
+				buy: 0,
+				itemId: 0
+			}],
+			test1: [{
+				img: '../../static/img/83.png',
+				title: '丝缎质感纹理风衣',
+				label: '黑色 - 6518/320',
+				id: 3,
+				buy: 0,
+				itemId: 0
+			}],
+			typeclick1:3,//1加入购物车，2购物车，3前往购买，4,5
+			typeclick:5,//1加入购物车，2购物车，3前往购买，4,5
+		};
+	},
+	onLoad(e) {
+		if(e){
+			this.off=e.off;
+			if(e.off==1){
+				this.typeclick=5;
+			}else{
+				this.typeclick=6;
+			}
+		}
+	},
+	created() {
+		this.sys = uni.getSystemInfoSync();
+	},
+	methods: {
+		jiarufuFun(data){
+			// uni.navigateTo({
+			// 	url: "/pages/gouwuche/index",
+			// })
+			// console.log(data)
+			// this.gouwuche.push(data)
+		},
+	},
+}
+</script>
+
+<style lang="scss">
+	/deep/ .tm-menubars .body{
+		background-color: #1b1b1b !important;
+	}
+	/deep/ .zhuti{padding: 10px 10px;}
+	/deep/ .kuang{margin:0 !important;padding: 0px !important;}
+	.chuanda{width: 100%;margin-top:10px;}
+	.shuru{background: #0D0D0D;padding: 10px;margin-top: 20px;}
+	/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;}
+	/deep/ .qiehuan .tm-tabs-con-item-border{display: none;}
+	/deep/ .qiehuan .tm-tabs-con-item-text{background: #303440;height: 26px;line-height: 26px;
+	padding-left: 14px;padding-right: 14px;margin-top: 17%;border-radius: 20px;margin-left: 10px;}
+	/deep/ .qiehuan .text-white{
+		font-size: 14px;
+		background: #0178FD;
+		height: 26px;
+		vertical-align: middle;
+		line-height: 26px;
+		border-radius: 20px;
+		padding-left: 14px;
+		padding-right: 14px;
+		margin-top: 17%;
+	}
+	.biaoti view{width:5px;height:19px;background: #0178FD;float: left;border-radius: 10px;}
+	/deep/ .qiehuan1 .text-primary{color: white !important;}
+	/deep/ .jiaoxi{margin:0 !important;padding: 8px !important;}
+	/deep/ .shangpin .white.bk{background-color:#1b1b1b!important;}
+	/deep/ .shangpin .tm-cartCellListFood{padding: 0px 0px 5px 0px !important;
+	margin-top: 5px !important;border-bottom: 1px solid #1B1B1B;}
+	/deep/ .shangpin .border-t-1.bk{border-top:1px solid #1b1b1b!important;}
+	/deep/ .shangpin .round-3{width:120px !important;height:110px !important;}
+	/deep/ .shangpin .tm-cartCellListFood-img{width:120px !important;height:110px !important;}
+	/deep/ .shangpin .title{color: white !important;}
+	/deep/ .shangpin .text-red{color: white !important;}
+	.sao{width: 88%;display: block;margin: 0 auto;padding-bottom: 60px;margin-top: 20px;}
+	.goumai{background: #1B1B1B;margin-bottom: 10px;}
+	.anniu{width: 70%;margin: 0 auto;margin-top: 20px;padding-bottom: 30px;}
+</style>