1

pages.json

@@ -352,6 +352,24 @@
 					"titleNView": false
 				}
 			}
+		},
+		{
+			"path": "pages/baocun/index",
+			"style": {
+				"navigationBarTitleText": "我的",
+				"app-plus":{
+					"titleNView": false
+				}
+			}
+		},
+		{
+			"path": "pages/bianjigh/index",
+			"style": {
+				"navigationBarTitleText": "我的",
+				"app-plus":{
+					"titleNView": false
+				}
+			}
 		}
 	],
 	"tabBar": { 

pages/baocun/index.vue

@@ -0,0 +1,161 @@
+<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">
+						<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>
+						<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="activeIndex1" :list="list1" range-key="title"></tm-tabs> -->
+					</view>
+					<!-- <view v-if="off==1" class="text-align-center mt-20 text-white">丝缎质感纹理风衣</view> -->
+					<!-- <view v-if="off==1" class="text-align-center mt-10 text-size-s">丝滑如肌肤</view> -->
+				</view>
+			</tm-sheet>
+		</div>
+		<!-- <view class="goumai shangpin" v-if="off==1" >
+			<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 :round="24" class="sao mb-40 mt-40" block>保存</tm-button> -->
+		<view class="anniu">
+			<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:1,
+			list:['时尚','商务'],
+			activeIndex:0,
+			list1:['开会','聚餐'],
+			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:6,//1加入购物车，2购物车，3前往购买，4,5
+			typeclick:8,//1加入购物车，2购物车，3前往购买，4,5
+			
+		};
+	},
+	onLoad(e) {
+		if(e){
+			
+		}
+	},
+	created() {
+		this.sys = uni.getSystemInfoSync();
+	},
+	methods: {
+		jiarufuFun(data){
+			uni.navigateTo({
+				url: "/pages/shopdetail/index",
+			})
+			console.log(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>

pages/bianji/index.vue

@@ -10,10 +10,12 @@
 				<tm-tabs @change="fenlei"  v-if="yixuanor==1" class="C1b1b1b qiehuan" color="white" align="left"  v-model="activeIndexfl" :list="listfl" range-key="title"></tm-tabs>
 				<view class="biaoti text-white mt-30 text-size-m"><view class="mr-10" v-if="yixuanor==0"></view>{{yixuanor==0?'场景':'请选择场景'}}</view>
 				<tm-tabs @change="changjing" class="C1b1b1b qiehuan" color="white"  align="left"  v-model="activeIndexcj" :list="listcj" range-key="title"></tm-tabs>
+				<!-- 可预约 -->
 				<view v-if="yixuanor==1" class="yiguicla black pa-6 ma-4 fl" @click="gaoliang(index,item)" :class="chooseindex==index?'C0178FD':''" v-for="(item,index) in quanbuList">
 					<image :src="item.image" mode="widthFix"></image>
 					<view class="text-size-m mt-20 mb-20 ml-10">{{item.title}}</view>
 				</view>
+				<!-- 已预约 -->
 				<view v-if="yixuanor==0" class="yiguicla black pa-6 ma-4 fl" @click="gaoliang(index,item)" :class="chooseindex==index?'C0178FD':''" v-for="(item,index) in yixuanList">
 					<image :src="item.image" mode="widthFix"></image>
 					<view class="text-size-m mt-20 mb-20 ml-10">{{item.title}}</view>
@@ -25,8 +27,8 @@
 					<text class="text-size-s">下拉加载更多~</text>
 				</view> -->
 			</tm-sheet>
-			<tm-button v-if="yixuanor==0 && yixuanList.length !=0" theme="gray" :round="24" class="sao mb-40" block>删除</tm-button>
-			<tm-button v-if="yixuanor==1" :round="24" class="sao mb-40" block>保存</tm-button>
+			<tm-button @click="shanchu" v-if="yixuanor==0 && yixuanList.length !=0" theme="gray" :round="24" class="sao mb-40" block>取消删除</tm-button>
+			<tm-button @click="yuyue" v-if="yixuanor==1" :round="24" class="sao mb-40" block>预约</tm-button>
 		</div>
 		<!-- 弹出层消息 -->
 		<tm-message ref="toast"></tm-message>
@@ -41,7 +43,7 @@ export default {
 			listcjall:[],
 			listfl:[],
 			yixuanor:0,//0已选
-			list:['已选穿搭','可选穿搭'],
+			list:['已预约穿搭','可预约穿搭'],
 			listcj:[],
 			active:0,
 			activeIndexfl:0,
@@ -60,6 +62,49 @@ export default {
 		this.getCj();
 	},
 	methods: {
+		shanchu(){
+			var that=this;
+			if(this.chooseindex==-1){
+				that.$refs.toast.show({model:'warn',label:'请选择要删除的衣物'})
+				return
+			}
+			var id=this.yixuanList[this.chooseindex].id;
+			myRequest({
+				url: "/api/Collocation/deleteTomorrowAppointment",
+				method:'post',
+				data:{id:id}
+			}).then(res => {
+				if (res.data.code == 200) {
+					that.$refs.toast.show({model:'success',label:res.data.msg})
+					that.chooseindex=-1;
+					that.getCj();
+				}else{
+					that.$refs.toast.show({model:'error',label:res.data.msg})
+				}
+			})
+		},
+		yuyue(){
+			var that=this;
+			var scene_id=this.listcjall[this.activeIndexcj].id;
+			if(this.chooseindex==-1){
+				that.$refs.toast.show({model:'warn',label:'请选择衣物'})
+				return
+			}
+			var id=this.quanbuList[this.chooseindex].id;
+			myRequest({
+				url: "/api/Collocation/makeAppointmentTomorrow",
+				method:'post',
+				data:{id:id,scene_id:scene_id}
+			}).then(res => {
+				if (res.data.code == 200) {
+					that.$refs.toast.show({model:'success',label:'预约成功'})
+					that.chooseindex=-1;
+					that.getFl();
+				}else{
+					that.$refs.toast.show({model:'error',label:res.data.msg})
+				}
+			})
+		},
 		fenlei(e){
 			var id=this.listflall[e].id;
 			this.getKxuan(id)
@@ -75,10 +120,14 @@ export default {
 			if(e==0){
 				var id=this.listcjall[0].id;
 				this.getYxuan(id)
+			}else{
+				var id=this.listflall[0].id;
+				this.getKxuan(id)
 			}
 		},
 		getYxuan(id){
 			var that=this;
+			that.yixuanList=[];
 			myRequest({
 				url: "/api/Collocation/getAppointmentMatching",
 				method:'post',
@@ -86,10 +135,10 @@ export default {
 			}).then(res => {
 				if (res.data.code == 200) {
 					if(res.data.data.length != 0){
-						that.quanbuList=res.data.data;
+						that.yixuanList=res.data.data;
 					}
 				}else{
-					that.quanbuList=[];
+					that.yixuanList=[];
 				}
 			})
 		},
@@ -103,6 +152,8 @@ export default {
 				if (res.data.code == 200) {
 					if(res.data.data.length != 0){
 						that.quanbuList=res.data.data;
+					}else{
+						that.quanbuList=[]
 					}
 				}else{
 					that.quanbuList=[];
@@ -119,6 +170,7 @@ export default {
 				if (res.data.code == 200) {
 					if(res.data.data.length != 0){
 						// that.listfl=['全部'];
+						that.listcj=[];
 						for(let i=0;i<res.data.data.length;i++){
 							that.listcj.push(res.data.data[i].scene_name)
 						}
@@ -140,6 +192,7 @@ export default {
 				if (res.data.code == 200) {
 					if(res.data.data.length != 0){
 						// that.listfl=['全部'];
+						that.listfl=[];
 						for(let i=0;i<res.data.data.length;i++){
 							that.listfl.push(res.data.data[i].category_name)
 						}
@@ -205,7 +258,7 @@ export default {
 	}
 	/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;}
+	.yiguicla{width: 47%;border-radius: 10px;height: 204px;}
 	.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;

pages/bianjigh/index.vue

@@ -0,0 +1,266 @@
+<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;">
+				<!-- <view class="flex-center"><tm-segTabs @change="shifouxuan" :round="24" :margin="[32,10]" font-size="s" :list="list" color="white" activeFontColor="red" bg-color="bg-gradient-red-lighten" v-model="active"></tm-segTabs></view> -->
+				<view class="biaoti text-white mt-10 text-size-m"><view class="mr-10"></view>分类</view>
+				<tm-tabs @change="fenlei" class="C1b1b1b qiehuan" color="white" align="left"  v-model="activeIndexfl" :list="listfl" range-key="title"></tm-tabs>
+				<!-- <view class="biaoti text-white mt-30 text-size-m"><view class="mr-10" v-if="yixuanor==0"></view>{{yixuanor==0?'场景':'请选择场景'}}</view> -->
+				<!-- <tm-tabs @change="changjing" class="C1b1b1b qiehuan" color="white"  align="left"  v-model="activeIndexcj" :list="listcj" range-key="title"></tm-tabs> -->
+				<!-- 可预约 -->
+				<view class="yiguicla black pa-6 ma-4 fl" @click="gaoliang(index,item)" :class="chooseindex==index?'C0178FD':''" v-for="(item,index) in quanbuList">
+					<image :src="item.image" mode="widthFix"></image>
+					<view class="text-size-m mt-20 mb-20 ml-10">{{item.title}}</view>
+				</view>
+				<!-- 已预约 -->
+				<!-- <view v-if="yixuanor==0" class="yiguicla black pa-6 ma-4 fl" @click="gaoliang(index,item)" :class="chooseindex==index?'C0178FD':''" v-for="(item,index) in yixuanList">
+					<image :src="item.image" mode="widthFix"></image>
+					<view class="text-size-m mt-20 mb-20 ml-10">{{item.title}}</view>
+				</view> -->
+				<!-- <tm-empty v-if="yixuanor==0 && yixuanList.length ==0" label="暂无数据" color="white" icon="icon-paperplane-fill"></tm-empty> -->
+				<view style="clear: both;"></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 @click="shanchu" v-if="yixuanor==0 && yixuanList.length !=0" theme="gray" :round="24" class="sao mb-40" block>取消删除</tm-button> -->
+			<tm-button @click="yuyue" :round="24" class="sao mb-40" block>保存</tm-button>
+		</div>
+		<!-- 弹出层消息 -->
+		<tm-message ref="toast"></tm-message>
+	</view>
+</template>	
+<script>
+import{myRequest} from '@/api/request.js'
+export default {
+	data() {
+		return {
+			listflall:[],
+			listcjall:[],
+			listfl:[],
+			yixuanor:0,//0已选
+			list:['已预约穿搭','可预约穿搭'],
+			listcj:[],
+			active:0,
+			activeIndexfl:0,
+			activeIndexcj:0,
+			quanbuList:[],
+			yixuanList:[],
+			chooseindex:-1
+		};
+	},
+	onLoad() {
+		
+	},
+	created() {
+		this.sys = uni.getSystemInfoSync();
+		this.getFl();
+		this.getCj();
+	},
+	methods: {
+		shanchu(){
+			var that=this;
+			if(this.chooseindex==-1){
+				that.$refs.toast.show({model:'warn',label:'请选择要删除的衣物'})
+				return
+			}
+			var id=this.yixuanList[this.chooseindex].id;
+			myRequest({
+				url: "/api/Collocation/deleteTomorrowAppointment",
+				method:'post',
+				data:{id:id}
+			}).then(res => {
+				if (res.data.code == 200) {
+					that.$refs.toast.show({model:'success',label:res.data.msg})
+					that.chooseindex=-1;
+					that.getCj();
+				}else{
+					that.$refs.toast.show({model:'error',label:res.data.msg})
+				}
+			})
+		},
+		yuyue(){
+			var that=this;
+			// var scene_id=this.listcjall[this.activeIndexcj].id;
+			// if(this.chooseindex==-1){
+			// 	that.$refs.toast.show({model:'warn',label:'请选择衣物'})
+			// 	return
+			// }
+			// var id=this.quanbuList[this.chooseindex].id;
+			// myRequest({
+			// 	url: "/api/Collocation/makeAppointmentTomorrow",
+			// 	method:'post',
+			// 	data:{id:id,scene_id:scene_id}
+			// }).then(res => {
+			// 	if (res.data.code == 200) {
+			// 		that.$refs.toast.show({model:'success',label:'预约成功'})
+			// 		that.chooseindex=-1;
+			// 		that.getFl();
+			// 	}else{
+			// 		that.$refs.toast.show({model:'error',label:res.data.msg})
+			// 	}
+			// })
+		},
+		fenlei(e){
+			var id=this.listflall[e].id;
+			this.getKxuan(id)
+		},
+		changjing(e){
+			var id=this.listcjall[e].id;
+			this.getYxuan(id)
+		},
+		shifouxuan(e){
+			this.activeIndexcj=0;
+			this.chooseindex=-1;
+			this.yixuanor=e;
+			if(e==0){
+				var id=this.listcjall[0].id;
+				this.getYxuan(id)
+			}else{
+				var id=this.listflall[0].id;
+				this.getKxuan(id)
+			}
+		},
+		getYxuan(id){
+			var that=this;
+			that.yixuanList=[];
+			myRequest({
+				url: "/api/Collocation/getAppointmentMatching",
+				method:'post',
+				data:{scene_id:id}
+			}).then(res => {
+				if (res.data.code == 200) {
+					if(res.data.data.length != 0){
+						that.yixuanList=res.data.data;
+					}
+				}else{
+					that.yixuanList=[];
+				}
+			})
+		},
+		getKxuan(id){
+			var that=this;
+			myRequest({
+				url: "/api/Collocation/getPlanTomorrow",
+				method:'post',
+				data:{id:id}
+			}).then(res => {
+				if (res.data.code == 200) {
+					if(res.data.data.length != 0){
+						that.quanbuList=res.data.data;
+					}
+				}else{
+					that.quanbuList=[];
+				}
+			})
+		},
+		getCj(){
+			var that=this;
+			myRequest({
+				url: "/api/Scene/sceneList",
+				method:'post',
+				data:{}
+			}).then(res => {
+				if (res.data.code == 200) {
+					if(res.data.data.length != 0){
+						// that.listfl=['全部'];
+						that.listcj=[];
+						for(let i=0;i<res.data.data.length;i++){
+							that.listcj.push(res.data.data[i].scene_name)
+						}
+						that.listcjall=res.data.data;
+						that.getYxuan(that.listcjall[0].id)
+					}
+				}else{
+					that.listcj=[];
+				}
+			})
+		},
+		getFl(){
+			var that=this;
+			myRequest({
+				url: "/api/Category/getCollocationClassList",
+				method:'post',
+				data:{}
+			}).then(res => {
+				if (res.data.code == 200) {
+					if(res.data.data.length != 0){
+						// that.listfl=['全部'];
+						that.listfl=[];
+						for(let i=0;i<res.data.data.length;i++){
+							that.listfl.push(res.data.data[i].category_name)
+						}
+						that.listflall=res.data.data;
+						that.getKxuan(that.listflall[0].id);
+					}
+				}else{
+					that.listfl=[];
+				}
+			})
+		},
+		gengmore(){
+			
+		},
+		gaoliang(index){
+			this.chooseindex=index
+		}
+	},
+}
+</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;height: 204px;}
+	.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;}
+	.biaoti view{width:5px;height:19px;background: #0178FD;float: left;border-radius: 10px;}
+</style>

pages/changan/index.vue

@@ -99,7 +99,7 @@ export default {
 	methods: {
 		baocun(){
 			uni.navigateTo({
-				url: "/pages/zidingyi/index?type=1",
+				url: "/pages/baocun/index",
 			})
 		},
 		shanchu(){

pages/dapei/index.vue

@@ -8,7 +8,7 @@
 		<!-- 天气 -->
 		<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>
+				<image class="chuanda" src="/static/img/107.png"></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>
@@ -43,15 +43,17 @@
 		<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>
+				<tm-tabs @change="fenlei" class="C1b1b1b qiehuan" color="white"  align="left"  v-model="activeIndex1" :list="listfl" range-key="title"></tm-tabs>
 				<view class="yiguicla black pa-6 ma-4 fl" v-for="(item,index) in quanbuList" @click="zidingyibianji()">
-					<image :src="item.src" mode="widthFix"></image>
-					<view class="text-size-m mt-20 mb-20 ml-10">{{item.text}}</view>
+					<image :src="item.image" mode="widthFix"></image>
+					<view class="text-size-m mt-20 mb-20 ml-10">{{item.title}}</view>
 				</view>
-				<view style="clear: both;" class="more ma-30 pt-40" @click="gengmore()">
+				<view style="clear: both;"></view>
+				<tm-empty v-if="quanbuList.length ==0" label="暂无数据" color="white" icon="icon-paperplane-fill"></tm-empty>
+				<!-- <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>
+				</view> -->
 			</tm-sheet>
 			<tm-button :round="24" class="sao" block @click="zidingyi()">自定义搭配</tm-button>
 		</div>
@@ -65,29 +67,13 @@ 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
+			quanbuList:[],
+			chooseindex:-1,
+			listfl:[],
+			listflall:[]
+			
 		};
 	},
 	onLoad() {
@@ -96,8 +82,54 @@ export default {
 	created() {
 		this.sys = uni.getSystemInfoSync();
 		this.gettianqi();
+		this.getFl();
 	},
 	methods: {
+		fenlei(e){
+			var id=this.listflall[e].id;
+			this.getKxuan(id)
+		},
+		getFl(){
+			var that=this;
+			myRequest({
+				url: "/api/Category/getCollocationClassList",
+				method:'post',
+				data:{}
+			}).then(res => {
+				if (res.data.code == 200) {
+					if(res.data.data.length != 0){
+						// that.listfl=['全部'];
+						that.listfl=[];
+						for(let i=0;i<res.data.data.length;i++){
+							that.listfl.push(res.data.data[i].category_name)
+						}
+						that.listflall=res.data.data;
+						that.getKxuan(that.listflall[0].id);
+					}
+				}else{
+					that.listfl=[];
+				}
+			})
+		},
+		getKxuan(id){
+			var that=this;
+			myRequest({
+				url: "/api/Collocation/getCollocationList",
+				method:'post',
+				data:{category_id:id}
+			}).then(res => {
+				if (res.data.code == 200) {
+					
+					if(res.data.data.length != 0){
+						that.quanbuList=res.data.data.data;
+					}else{
+						that.quanbuList=[];
+					}
+				}else{
+					that.quanbuList=[];
+				}
+			})
+		},
 		gettianqi(){
 			var that=this;
 			// uni.getLocation({
@@ -134,7 +166,7 @@ export default {
 		},
 		bianji(){
 			uni.navigateTo({
-				url: "/pages/bianji/index",
+				url: "/pages/bianjigh/index",
 			})
 		},
 		zidingyibianji(){
@@ -210,4 +242,5 @@ export default {
 	.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;}
+	/deep/ .scroll-view_H{height:245px !important;}
 </style>

pages/index/index.vue

@@ -45,6 +45,7 @@ export default {
 	},
 	onLoad(index) {
 		this.$tm.theme.setBlack(true);
+		console.log("111")
 		if(index.index==1){
 			this.showpage=1;
 			this.initBtn()

pages/shop/index.vue

@@ -84,7 +84,7 @@
 		</view>
 		<view v-if="gouwuche.length!=0" class="fudong" @click="qugowuche">
 			<image src="../../static/img/87.png" mode="widthFix"></image>
-			<view class="shuzigwc">{{gouwuche.length}}</view>
+			<!-- <view class="shuzigwc"></view> -->
 		</view>
 		<view style="width:100%;height:60px;"></view>
 		<!-- 弹出层消息 -->

pages/shouye/index.vue

@@ -27,7 +27,7 @@
 				</view>
 				<view class="pb-20 text-size-g">
 					<view class="text-white" style="display: flex;justify-content: space-between;">
-						<view v-if="list.length !=0" class=""
+						<view v-if="list.length !=0"
 							style="display: flex;align-items: center; justify-content: center;width: 46%;font-size: 16px;font-weight: bold;">
 							{{list[current].name}}
 						</view>

pages/wardrobe/index.vue

@@ -136,7 +136,8 @@ export default {
 			have:0,
 			chukudata:[],
 			current:0,
-			qiuid:''
+			qiuid:'',
+			quanbuchang:[]
 		};
 	},
 	onLoad() {
@@ -212,6 +213,7 @@ export default {
 			}).then(res => {
 				if (res.data.code == 200) {
 					if(res.data.data.length != 0){
+						that.quanbuchang=res.data.data.chang;
 						that.quanbuList=that.quanbuList.concat(res.data.data.data);
 						that.total=res.data.data.total;
 						that.count=res.data.data.count;

pages/yifu/index.vue

@@ -40,7 +40,7 @@
 			<tm-sheet class="kuang" v-if="alldata !=0 && alldata.data.length !=0">
 				<view style="width: 98%;margin:0 auto;margin-top:20px !important;">
 					<view class="text-white text-align-center pt-20">类似衣物</view>
-					<view class="yiguicla black pa-6 ma-4 fl mb-20" v-for="item in alldata.data" @click="yifu()">
+					<view class="yiguicla black pa-6 ma-4 fl mb-20" v-for="item in alldata.data" @click="yifu(item.id)">
 						<image :src="item.image" mode="widthFix"></image>
 						<view class="text-align-center text-size-m mt-8">{{item.brand}}{{item.color}}</view>
 						<view class="text-align-center text-size-m mt-6 mb-6">{{item.goods_name}}</view>
@@ -71,14 +71,16 @@
 			<!-- <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="activeIndex1" :list="list1" range-key="title"></tm-tabs> -->
 			<!-- <tm-tabs class="C1b1b1b qiehuan" color="white"  align="left"  v-model="activeIndex1" :list="list1" range-key="title"></tm-tabs> -->
-			<view class="yiguicla1 black pa-6 ma-4 fl" v-for="(item,index) in quanbuList1" @click="yuyue">
-				<image :src="item.src" mode="widthFix"></image>
-				<view class="text-size-m mt-20 mb-20 ml-10">{{item.text}}</view>
+			<view class="yiguicla1 black pa-6 ma-4 fl" v-for="(item,index) in quanbuList1" @click="yuyue(item.id)">
+				<image :src="item.image" mode="widthFix"></image>
+				<view class="text-size-m mt-20 mb-20 ml-10">{{item.title}}</view>
 			</view>
-			<view style="clear: both;" class="more ma-30 pt-40" @click="gengmore()">
+			<tm-empty v-if="quanbuList1.length ==0" label="暂无数据" color="white" icon="icon-paperplane-fill"></tm-empty>
+			<view style="clear: both;"></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>
+			</view> -->
 		</tm-sheet>
 		
 		
@@ -96,7 +98,7 @@
 				</view>
 				<view class="anniu">
 					<tm-button @click="quxiao()" theme="gray" size="n">关闭弹框</tm-button>
-					<tm-button @click="chuFun()" class="fr" theme="primary" size="n">取消出库</tm-button>
+					<tm-button @click="quxchuFun()" class="fr" theme="primary" size="n">取消出库</tm-button>
 				</view>
 			</view>
 		</tm-poup>
@@ -143,41 +145,60 @@ export default {
 			typeclick1:3,//1加入购物车，2购物车，3前往购买，4,5
 			typeclick:6,//1加入购物车，2购物车，3前往购买，4,5
 			list5:[ '搭配内的购物清单'],
-			quanbuList1:[{
-				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:'日常穿搭',
-				off:false
-			}],
+			quanbuList1:[],
 			alldata:0,
-			chukudata:[]
+			chukudata:[],
+			qiuid:''
 		};
 	},
 	onLoad(e) {
 		this.id=e.id?e.id:'4';
-		this.getXiangq()
+		this.getXiangq();
+		this.getfangan();
 	},
 	created() {
 		this.sys = uni.getSystemInfoSync();
 	},
 	methods: {
-		yuyue(){
+		quxchuFun(){
+			var that=this;
+			console.log(that.chukudata[0].id)
+			myRequest({
+				url: "/api/Goods/cancelDelivery",
+				method:'post',
+				data:{qiu_id:that.qiuid,id:that.chukudata[0].id}
+			}).then(res => {
+				console.log(res.data)
+				if (res.data.code == 200) {
+					that.show_1=false;
+					that.$refs.toast.show({model:'success',label:res.data.msg})
+				}else{
+					that.$refs.toast.show({model:'error',label:res.data.msg})
+				}
+			})
+		},
+		getfangan(){
+			var that=this;
+			myRequest({
+				url: "/api/Collocation/matchingScheme",
+				method:'post',
+				data:{id:that.id}
+			}).then(res => {
+				if (res.data.code == 200) {
+					that.quanbuList1=res.data.data;
+				}else{
+					that.quanbuList1=[];
+				}
+			})
+		},
+		yifu(id){
+			this.id=id;
+			this.getXiangq();
+			this.getfangan();
+		},
+		yuyue(id){
 			uni.navigateTo({
-				url: "/pages/zidingyikan/index",
+				url: "/pages/zidingyikan/index?id="+id+"&type=1",
 			})
 		},
 		obTstr2(o){
@@ -285,6 +306,7 @@ export default {
 				if (res.data.code == 200) {
 					that.show_1=true;
 					that.chukudata=res.data.data;
+					that.qiuid=res.data.data[0].qiu_id
 					that.list1.push(res.data.data[0].image)
 					that.$refs.toast.show({model:'success',label:'出库成功'})
 				}else{

pages/zidingyi/index.vue

@@ -15,8 +15,8 @@
 					<view>
 						<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="activeIndex1" :list="list1" 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="activeIndex1" :list="list1" range-key="title"></tm-tabs> -->
 					</view>
 					<!-- <view v-if="off==1" class="text-align-center mt-20 text-white">丝缎质感纹理风衣</view> -->
 					<!-- <view v-if="off==1" class="text-align-center mt-10 text-size-s">丝滑如肌肤</view> -->
@@ -92,7 +92,7 @@ export default {
 				itemId: 0
 			}],
 			typeclick1:6,//1加入购物车，2购物车，3前往购买，4,5
-			typeclick:6,//1加入购物车，2购物车，3前往购买，4,5
+			typeclick:7,//1加入购物车，2购物车，3前往购买，4,5
 		};
 	},
 	onLoad(e) {
@@ -105,9 +105,9 @@ export default {
 	},
 	methods: {
 		jiarufuFun(data){
-			uni.navigateTo({
-				url: "/pages/shopdetail/index",
-			})
+			// uni.navigateTo({
+			// 	url: "/pages/shopdetail/index",
+			// })
 			console.log(data)
 		},
 	},

pages/zidingyikan/index.vue

@@ -93,7 +93,8 @@ export default {
 			pos:'center',
 			chukudata:[],
 			current:0,
-			list1:[]
+			list1:[],
+			mingriyuanList:[]
 		};
 	},
 	onLoad(e) {
@@ -124,6 +125,7 @@ export default {
 					for(let i=0;i<data.length;i++){
 						that.listmingri.push(data[i].scene_name)
 					}
+					that.mingriyuanList=data;
 					this.$forceUpdate()
 				}else{
 					
@@ -156,8 +158,20 @@ export default {
 				}
 			})
 		},
-		yuyue(){
-			
+		yuyue(e){
+			var that=this;
+			var scene_id=that.mingriyuanList[e.index].id;
+			myRequest({
+				url: "/api/Collocation/makeAppointmentTomorrow",
+				method:'post',
+				data:{id:that.id,scene_id:scene_id}
+			}).then(res => {
+				if (res.data.code == 200) {
+					that.$refs.toast.show({model:'success',label:'预约成功'})
+				}else{
+					that.$refs.toast.show({model:'error',label:res.data.msg})
+				}
+			})
 		},
 		quxchuFun(){
 			var that=this;