1

pages/changan/index.vue

@@ -17,25 +17,45 @@
 		<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.off?'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>
+				<tm-tabs class="C1b1b1b qiehuan" @change="fenleichangeFun" color="white"  align="left"  v-model="activeIndex" :list="list" range-key="title"></tm-tabs>
+				<view class="yiguicla black pa-6 ma-4 fl" :class="item.off==1?'C0178FD':''" v-for="(item,index) in quanbuList" @click="yifu(item,index)">
+					<image :src="item.image" mode="widthFix"></image>
+					<view :class="item.is_have==0?'text-gray':''" class="text-align-center text-size-m mt-8">{{item.brand}}</view>
+					<view :class="item.is_have==0?'text-gray':''" class="text-align-center text-size-m mt-6 mb-6">{{item.goods_name}}</view>
 				</view>
-				<view style="clear: both;" class="more ma-30 pt-40" @click="gengmore()">
+				<view style="clear: both;"></view>
+				<view v-if="quanbuList.length<total" 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" @click="shanchu" class="fl" theme="red" size="n">删除</tm-button>
+				<tm-button :round="24" @click="chuku" class="fl" theme="primary" size="n">出库</tm-button>
 				<tm-button :round="24" class="fl" theme="primary" size="n">保存</tm-button>
 			</view>
+			<tm-poup v-model="show_1" :position="pos" class="tcc">
+				<view style="position: relative !important;" v-if="chukudata.length !=0">
+					<view style="height: 10px;"></view>
+					<tm-swiper :current="0" :indicator-dots="false" :round="6" :ani3d="190"  :autoplay="false" :list="list1"></tm-swiper>
+					<view class="text-white text-align-center mt-15">{{chukudata[0].brand}}{{chukudata[0].color}}{{chukudata[0].goods_name}}</view>
+					<view class="text-white text-align-center mt-10 text-size-s">{{chukudata[0].description}}</view>
+					<image class="guayi" :src="chukudata[0].ygimage" mode="widthFix"></image>
+					<view class="text-white text-align-center mt-15">衣物位于 {{chukudata[0].ygposition}} {{chukudata[0].is_have}}号衣柜</view>
+					<view class="text-white text-align-center mt-15">
+						<image class="aniOn deng" src="/static/img/101.png" mode="widthFix"></image>
+						<text style="vertical-align: middle;">指示灯已亮，请取出衣柜</text>
+					</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>
+					</view>
+				</view>
+			</tm-poup>
+			<!-- 弹出层消息 -->
+			<tm-message ref="toast"></tm-message>
+			<tm-dialog v-model="show" :content="content" @confirm="queren"></tm-dialog>
 		</view>
 	</view>
 </template>	
@@ -48,39 +68,21 @@ export default {
 			soso:'',
 			activeIndex:0,
 			list:[],
+			list1:[],
 			listlx:[],
-			quanbuList:[{
-				src:'/static/img/45.png',
-				text:'NEO CITY 涂鸦',
-				type:'手提包',
-				off:false
-			},{
-				src:'/static/img/46.png',
-				text:'满印迷你标识',
-				type:'围巾',
-				off:false
-			},{
-				src:'/static/img/47.png',
-				text:'大号版型夹克',
-				type:'新品',
-				off:false
-			},{
-				src:'/static/img/45.png',
-				text:'NEO CITY 涂鸦',
-				type:'手提包',
-				off:false
-			},{
-				src:'/static/img/46.png',
-				text:'满印迷你标识',
-				type:'围巾',
-				off:false
-			},{
-				src:'/static/img/47.png',
-				text:'大号版型夹克',
-				type:'新品',
-				off:false
-			}],
-			chooseindex:-1
+			quanbuList:[],
+			chooseindex:-1,
+			pagesize:6,
+			page:1,
+			total:0,
+			count:0,
+			have:0,
+			show:false,
+			content:'',
+			show_1:false,
+			pos:'center',
+			chukudata:[],
+			ids:[]
 		};
 	},
 	onLoad() {
@@ -89,79 +91,145 @@ export default {
 	created() {
 		this.sys = uni.getSystemInfoSync();
 		console.log("222")
-		// this.getfenltext()
+		this.getfenltext()
 		this.fenleichange();
 	},
 	methods: {
+		shanchu(){
+			// for(let i=0;i<this.quanbuList.length;i++){
+			// 	this.quanbuList[i].off=false;
+			// 	this.$forceUpdate()
+			// }
+		},
+		queren(){
+			var that=this;
+			this.list1=[]
+			myRequest({
+				url: "/api/Goods/takeClothes",
+				method:'post',
+				data:{id:that.ids}
+			}).then(res => {
+				if (res.data.code == 200) {
+					that.show_1=true;
+					that.chukudata=res.data.data;
+					for(let i=0;i<res.data.data.length;i++){
+						that.list1.push(res.data.data[i].image)
+					}
+					that.$refs.toast.show({model:'success',label:'出库成功'})
+				}else{
+					that.$refs.toast.show({model:'error',label:res.data.msg})
+				}
+			})
+		},
 		quxiao(){
 			for(let i=0;i<this.quanbuList.length;i++){
 				this.quanbuList[i].off=false;
+				this.$forceUpdate()
 			}
 		},
 		chuku(){
-			uni.navigateTo({
-				url: "/pages/quchu/index",
-			})
+			var id=[],a=0;
+			if(this.quanbuList.length==0){
+				that.$refs.toast.show({model:'error',label:'请选择衣物'})
+				return
+			}
+			for(let i=0;i<this.quanbuList.length;i++){
+				if(this.quanbuList[i].off){
+					a=a+1;
+					if(this.quanbuList[i].off && this.quanbuList[i].is_have !=0){
+						id.push(this.quanbuList[i].id)
+					}
+				}
+			}
+			this.content="有"+(a-id.length)+"衣物已经出库，在库衣物将添加至出库清单"
+			this.ids=id;
+			this.show=true;
 		},
 		sosoFun(){
 			uni.navigateTo({
 				url: "/pages/shopsoso/index",
 			})
 		},
-		fenleichange(e){
+		getfenltext(){
 			var that=this;
 			myRequest({
-				url: "/api/MemberInfo/getFamilyMember",
+				url: "/api/Category/list",
 				method:'post',
-				data:{family_id:uni.getStorageSync("family_id")}
+				data:{}
 			}).then(res => {
-				console.log(res.data)
 				if (res.data.code == 200) {
 					if(res.data.data.length != 0){
-						var wu=0;
+						that.list=['全部'];
 						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];
-							}
+							that.list.push(res.data.data[i].category_name)
 						}
-						if(wu==0){
-							that.itemuser=res.data.data[0];
+						that.listlx=res.data.data;
+					}
+				}else{
+					that.list=[];
+					that.listlx=[];
+				}
+			})
+		},
+		getList(){
+			var that=this;
+			myRequest({
+				url: "/api/Goods/classificationData",
+				method:'post',
+				data:{role_id:that.itemuser.id,id:that.activeIndex,page:that.page,pagesize:that.pagesize}
+			}).then(res => {
+				if (res.data.code == 200) {
+					if(res.data.data.length != 0){
+						that.quanbuList=that.quanbuList.concat(res.data.data.data);
+						for(let i=0;i<that.quanbuList.length;i++){
+							that.quanbuList[i].off=false;
 						}
-					}else{
-						that.itemuser=0;
+						that.total=res.data.data.total;
+						that.count=res.data.data.count;
+						that.have=res.data.data.have;
 					}
 				}else{
-					that.itemuser=0;
+					that.quanbuList=[];
 				}
 			})
 		},
-		getfenltext(){
+		fenleichangeFun(){
+			this.page=1;
+			this.quanbuList=[]
+			this.getList()
+		},
+		fenleichange(){
 			var that=this;
 			myRequest({
-				url: "/api/Category/list",
+				url: "/api/MemberInfo/getFamilyMember",
 				method:'post',
-				data:{}
+				data:{family_id:uni.getStorageSync("family_id")}
 			}).then(res => {
 				console.log(res.data)
 				if (res.data.code == 200) {
 					if(res.data.data.length != 0){
-						that.list=['全部'];
+						var wu=0;
 						for(let i=0;i<res.data.data.length;i++){
-							that.list.push(res.data.data[i].category_name)
+							if(res.data.data[i].checked==1){
+								wu=1;
+								that.itemuser=res.data.data[i];
+							}
 						}
-						that.listlx=res.data.data;
+						if(wu==0){
+							that.itemuser=res.data.data[0];
+						}
+						that.getList();
+					}else{
+						that.itemuser=0;
 					}
 				}else{
-					that.list=[];
-					that.listlx=[];
+					that.itemuser=0;
 				}
 			})
 		},
-		yifu(index,item){
-			
-			item.off=! item.off
-			console.log(item)
+		yifu(item,index){
+			item.off=!item.off;
+			this.$forceUpdate()
 		},
 		qiehuanFun(){
 			uni.navigateTo({
@@ -181,31 +249,14 @@ export default {
 			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",
-			})
-		}
+		quxiao(){
+			this.show_1=false;
+		},
 	},
 }
 </script>
@@ -267,7 +318,39 @@ 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;}
 	.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;}
+	.anniu{width: 100%;margin: 0 auto;padding-bottom: 30px;text-align: center;}
+	/deep/ .tm-button .tm-button-btn uni-button{min-width: 77px !important;}
 	/deep/ .tm-button .red{color: white !important;}
+	
+	/deep/ .tcc .tm-poup-wk{width: 90% !important;position:relative;height: 580px !important;}
+	/deep/ .tcc .uni-swiper-slides{width: 100%;}
+	/deep/ .tcc uni-swiper{width: 100% !important;}
+	/deep/ .uni-swiper-slides{width: 160px !important;}
+	/deep/ .tcc uni-image{width: 160px !important;}
+	.tcc .guayi{width: 70% !important;display: block;margin:0 auto;margin-top:15px !important;}
+	.tcc .deng{width:25px !important;height:25px !important;vertical-align: middle;margin-right:8px;}
+	.aniOn{
+		animation:doudong 0.5s linear infinite;
+		background:linear-gradient();
+		background: -webkit-linear-gradient();
+	}
+	@keyframes doudong {
+		0%{
+			transform: rotate(-2deg) translateX(2rpx) translateY(2rpx);
+		}
+		25%{
+			transform: rotate(0deg) translateX(-2rpx) translateY(-2rpx);
+		}
+		50%{
+			transform: rotate(0deg) translateX(0rpx) translateY(-2rpx);
+		}
+		75%{
+			transform: rotate(0deg) translateX(0rpx) translateY(2rpx);
+		}
+		100%{
+			transform: rotate(-2deg) translateX(2rpx) translateY(2rpx);
+		}
+	}
+	/deep/ .tcc .anniu .gray.bk{color: white !important;}
+	.tcc .anniu{width: 88%;margin: 0 auto;margin-top: 20px;}
 </style>

pages/dapei/index.vue

@@ -53,7 +53,7 @@
 					<text class="text-size-s">下拉加载更多~</text>
 				</view>
 			</tm-sheet>
-			<tm-button :round="24" class="sao" block @click="zidingyi(1)">自定义搭配</tm-button>
+			<tm-button :round="24" class="sao" block @click="zidingyi()">自定义搭配</tm-button>
 		</div>
 		<!-- 弹出层消息 -->
 		<tm-message ref="toast"></tm-message>
@@ -111,9 +111,9 @@ export default {
 		gengmore(){
 			
 		},
-		zidingyi(off){
+		zidingyi(){
 			uni.navigateTo({
-				url: "/pages/zidingyi/index?off="+off,
+				url: "/pages/changan/index?off=1",
 			})
 		}
 	},

pages/shop/index.vue

@@ -82,11 +82,13 @@
 				<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>
-		<!-- <view v-if="gouwuche.length!=0" class="fudong" @click="qugowuche">
+		<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> -->
+		</view>
 		<view style="width:100%;height:60px;"></view>
+		<!-- 弹出层消息 -->
+		<tm-message ref="toast"></tm-message>
 	</view>
 </template>	
 <script>
@@ -102,39 +104,10 @@ export default {
 			list:[],
 			list1:[],
 			list2:[ '热门','折扣'],
-			list3:[
-				// {icon:'/static/img/69.png',text:'服装'},
-				// {icon:'/static/img/70.png',text:'家具'},
-				// {icon:'/static/img/71.png',text:'箱包'},
-				// {icon:'/static/img/72.png',text:'配饰'},
-				// {icon:'/static/img/74.png',text:'更多'},
-			],
-			list4:[
-				// {icon:'/static/img/83.png',text:'双面穿千鸟格风衣',jie:'¥ 899.00'},
-				// {icon:'/static/img/84.png',text:'休闲版型风衣',jie:'¥ 899.00'},
-				// {icon:'/static/img/85.png',text:'防水双面穿风衣',jie:'¥ 899.00'},
-			],
+			list3:[],
+			list4:[],
 			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
-			// }
-			],
+			test: [],
 			typeclick:1,//1加入购物车，2购物车
 			gouwuche:[],
 		};
@@ -149,8 +122,23 @@ export default {
 		this.changeTab(1);
 		this.getHot();
 		this.getRecommend()
+		this.getGwc()
 	},
 	methods: {
+		getGwc(){
+			let that = this;
+			myRequest({
+				url: "/api/ShopCart/shopCartList",
+				method: 'get',
+				data: that.reqData
+			}).then(res => {
+				if (res.data.code == 200) {
+					that.gouwuche=res.data.data;
+				} else {
+					that.gouwuche=[]
+				}
+			})
+		},
 		getBanner(){
 			let that = this;
 			myRequest({
@@ -158,7 +146,6 @@ export default {
 				method: 'get',
 				data: that.reqData
 			}).then(res => {
-				console.log(res.data);
 				if (res.data.code == 200) {
 					res.data.data.forEach(item => {
 						that.list.push({
@@ -181,7 +168,6 @@ export default {
 				method: 'get',
 				data: that.reqData
 			}).then(res => {
-				console.log(res.data);
 				if (res.data.code == 200) {
 					res.data.data.forEach(item => {
 						that.list3.push({
@@ -200,78 +186,74 @@ export default {
 		
 		// 热门、折扣
 		changeTab(activeIndex){
-				let that = this;
-						myRequest({
-							url: "/api/ShopGoods/thenBuckle",
-							method: 'post',
-							data: {
-								'type':that.activeIndex+1
-							}
-						}).then(res => {
-							console.log(res.data);
-							if (res.data.code == 200) {
-								that.list1=[];
-								res.data.data.forEach(item => {
-									that.list1.push({
-										icon: item.image,
-										text:item.category_name
-									})
-								})
-							} else {
-								that.$refs.toast.show({
-									model: 'error',
-									label: res.data.msg
-								})
-							}
+			let that = this;
+			myRequest({
+				url: "/api/ShopGoods/thenBuckle",
+				method: 'post',
+				data: {
+					'type':that.activeIndex+1
+				}
+			}).then(res => {
+				if (res.data.code == 200) {
+					that.list1=[];
+					res.data.data.forEach(item => {
+						that.list1.push({
+							icon: item.image,
+							text:item.category_name
 						})
+					})
+				} else {
+					that.$refs.toast.show({
+						model: 'error',
+						label: res.data.msg
+					})
+				}
+			})
 		},	
 		getHot(){
 			let that = this;
-					myRequest({
-						url: "/api/ShopGoods/popularGoods",
-						method: 'get',
-					}).then(res => {
-						console.log(res.data);
-						if (res.data.code == 200) {
-							res.data.data.forEach(item => {
-								that.list4.push({
-									icon: item.image,
-									text:item.goods_name,
-									// jie:item.sale_price
-								})
-							})
-						} else {
-							that.$refs.toast.show({
-								model: 'error',
-								label: res.data.msg
-							})
-						}
+			myRequest({
+				url: "/api/ShopGoods/popularGoods",
+				method: 'get',
+			}).then(res => {
+				if (res.data.code == 200) {
+					res.data.data.forEach(item => {
+						that.list4.push({
+							icon: item.image,
+							text:item.goods_name,
+							// jie:item.sale_price
+						})
 					})
+				} else {
+					that.$refs.toast.show({
+						model: 'error',
+						label: res.data.msg
+					})
+				}
+			})
 		},
 		getRecommend(){
 			let that = this;
-					myRequest({
-						url: "/api/ShopGoods/recommend",
-						method: 'get',
-					}).then(res => {
-						console.log(res.data);
-						if (res.data.code == 200) {
-							res.data.data.forEach(item => {
-								that.test.push({
-									img: item.image,
-									title:item.goods_name,
-									price:item.sale_price,
-									itemId:item.id
-									// label:''
-								})
-							})
-						} else {
-							that.$refs.toast.show({
-								model: 'error',
-								label: res.data.msg
-							})
-						}
+			myRequest({
+				url: "/api/ShopGoods/recommend",
+				method: 'get',
+			}).then(res => {
+				if (res.data.code == 200) {
+					res.data.data.forEach(item => {
+						that.test.push({
+							img: item.image,
+							title:item.goods_name,
+							price:item.sale_price,
+							itemId:item.id
+						})
+					})
+				} else {
+					that.$refs.toast.show({
+						model: 'error',
+						label: res.data.msg
 					})
+				}
+			})
 		},
 		tiaozhuan(){
 			uni.navigateTo({
@@ -291,7 +273,9 @@ export default {
 			this.addr = e;
 		},
 		qugowuche(){
-			
+			uni.navigateTo({
+				url: "/pages/gouwuche/index",
+			})
 		},
 		sosoFun(){
 			uni.navigateTo({
@@ -301,26 +285,42 @@ export default {
 		shang(){
 			this.$refs.a_5.play()
 			this.current=this.current+1;
-			console.log(this.current)
 		},
 		xia(){
 			this.$refs.a_1.play()
 			this.current=this.current-1;
-			console.log(this.current)
 		},
 		jiarufuFun(data){
-			uni.navigateTo({
-				url: "/pages/gouwuche/index",
-			})
-			// console.log(data)
-			// this.gouwuche.push(data)
-		},
-		zhonglei(e){
-			// if(e.index==4){
+			var that=this;
+			console.log(data)
+			if(data.type==2){
+				myRequest({
+					url: "/api/ShopCart/addShopCart",
+					method:'post',
+					data:{
+						goods_id:data.data.itemId,
+						goods_name:data.data.title,
+						goods_image:data.data.img,
+						goods_price:data.data.price,
+						goods_num:1
+					}
+				}).then(res => {
+					if (res.data.code == 200) {
+						that.$refs.toast.show({model:'success',label:res.data.msg})
+					}else{
+						that.$refs.toast.show({model:'error',label:res.data.msg})
+					}
+				})
+			}else{
 				uni.navigateTo({
-					url: "/pages/gengduo/index",
+					url: "/pages/shopdetail/index",
 				})
-			// }
+			}
+		},
+		zhonglei(e){
+			uni.navigateTo({
+				url: "/pages/gengduo/index",
+			})
 		}
 	},
 }

pages/shouye/index.vue

@@ -205,6 +205,12 @@
 			this.getPlan();
 		},
 		methods: {
+			qiehuandizhi(e){
+				if(e[2]!=null){
+					this.offshow=false;
+					this.chengshi=e[1];
+				}
+			},
 			xiangqing(){
 				uni.navigateTo({
 					url: "/pages/shopdetail/index",

pages/wardrobe/index.vue

@@ -23,9 +23,9 @@
 						<view class="tuijian">
 							<text class="text-white text-size-lg">校园穿搭</text>
 						</view>
-						<view >
+						<!-- <view >
 							<text class="text-size-s C929297">详情</text>
-						</view>
+						</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">
@@ -41,9 +41,9 @@
 						<view class="tuijian">
 							<text class="text-white text-size-lg">日常出勤</text>
 						</view>
-						<view >
+						<!-- <view >
 							<text class="text-size-s C929297">详情</text>
-						</view>
+						</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">
@@ -60,22 +60,23 @@
 			<tm-sheet class="yichu" style="margin-bottom: 70px !important;">
 				<tm-tabs class="C1b1b1b qiehuan" @change="fenleichangeFun" color="white"  align="left"  v-model="activeIndex" :list="list" range-key="title"></tm-tabs>
 				<view class="pa-10 text-size-s">柜中{{have}}件 共{{count}}条</view>
-				<view class="yiguicla black pa-6 ma-4 fl" :class="item.is_have==1?'C0178FD':''"  v-for="(item,index) in quanbuList" @longtap="longtap()" @click="xiangqing()">
+				<view class="yiguicla black pa-6 ma-4 fl" v-for="(item,index) in quanbuList" @longtap="longtap()" @click="xiangqing(item)">
 					<image :src="item.image" mode="widthFix"></image>
-					<view class="text-align-center text-size-m mt-8">{{item.brand}}</view>
-					<view class="text-align-center text-size-m mt-6 mb-6">{{item.goods_name}}</view>
+					<view :class="item.is_have==0?'text-gray':''" class="text-align-center text-size-m mt-8">{{item.brand}}</view>
+					<view :class="item.is_have==0?'text-gray':''" class="text-align-center text-size-m mt-6 mb-6">{{item.goods_name}}</view>
 				</view>
 				<view style="clear: both;"></view>
 				<view v-if="quanbuList.length<total" 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-empty v-if="quanbuList.length ==0" label="暂无数据" color="white" icon="icon-paperplane-fill"></tm-empty>
 			</tm-sheet>
 		</view>
 		<!-- 待取衣服 -->
-		
-		<css-float-ball v-model="floatBallPosition" >
+			<tm-flotbutton class="qiu" show-actions position="bottomLeft" actions-pos="top" label="" :show-text="true"
+				 :actions="listqiu"></tm-flotbutton>
+		<!-- <css-float-ball v-model="floatBallPosition" >
 		  <view class="float-ball-icon" hover-class="default-icon-hover">
 		    <tm-translate ref="a_1" :auto="true" animation-name="fadeLeft">
 		    	<view class="fudong" @click="show_1=true">
@@ -85,7 +86,7 @@
 		    	</view>
 		    </tm-translate>
 		  </view>
-		</css-float-ball>
+		</css-float-ball> -->
 		<!-- 弹出 -->
 		<tm-poup v-model="show_1" :position="pos" class="tcc">
 			<view style="position: relative !important;">
@@ -112,6 +113,12 @@ import{myRequest} from '@/api/request.js'
 export default {
 	data() {
 		return {
+			listqiu:[
+				{icon: '/static/img/96.png'},
+				{icon: '/static/img/96.png'},
+				{icon: '/static/img/96.png'}
+			],
+			offset: [16, 50],
 			show_1:false,
 			pos:'center',
 			floatBallPosition:{x: 400, y: 750},
@@ -126,14 +133,16 @@ export default {
 				'../../static/img/100.png',
 				'../../static/img/100.png',
 			],
-			pagesize:2,
+			pagesize:6,
 			page:1,
 			total:0,
 			count:0,
-			have:0
+			have:0,
+			offset: [16, 50]
 		};
 	},
 	onLoad() {
+		this.offset = [16, 99]
 		if(!uni.getStorageSync("token")){
 			uni.navigateTo({
 				url: "/pages/login/index",
@@ -189,9 +198,9 @@ export default {
 				url: "/pages/zidingyi/index",
 			})
 		},
-		xiangqing(){
+		xiangqing(item){
 			uni.navigateTo({
-				url: "/pages/yifu/index",
+				url: "/pages/yifu/index?id="+item.id,
 			})
 		},
 		fenleichangeFun(){
@@ -359,4 +368,7 @@ export default {
 			transform: rotate(-2deg) translateX(2rpx) translateY(2rpx);
 		}
 	}
+	/deep/ .qiu .flex-center{width: 45px !important;height:45px !important;background: none !important;}
+	/deep/ .qiu .flex-center uni-image{width: 45px !important;height:45px !important;}
+	/deep/ .showValue{display: none !important;}
 </style>

pages/yifu/index.vue

@@ -6,11 +6,11 @@
 			<view style="width: 90%;margin:0 auto;">
 				<tm-tabs align="left" class="qiehuan1" v-model="activeIndex" :list="list" range-key="title"></tm-tabs>
 			</view>
-			<image v-if="activeIndex==0" class="touxiang" src="/static/img/63.png" mode="widthFix"></image>
+			<image v-if="activeIndex==0 && alldata !=0" class="touxiang" :src="alldata.detail.image" mode="widthFix"></image>
 		</view>
 		<div class="zhuti" style="padding-bottom:60px !important;" v-if="activeIndex==0">
-			<view class="text-align-center text-size-lg">新款冬季羽绒服</view>
-			<view class="text-align-center text-size-s mt-10 text-gray">蓬松、轻盈、温暖</view>
+			<view class="text-align-center text-size-lg" v-if="alldata !=0">{{alldata.detail.brand}}{{alldata.detail.color}}{{alldata.detail.goods_name}}</view>
+			<view class="text-align-center text-size-s mt-10 text-gray" v-if="alldata !=0">{{alldata.detail.description}}</view>
 			<tm-sheet class="kuang" style="padding-bottom: 30px !important;">
 				<view style="width: 98%;margin:0 auto;margin-top:20px !important;position: relative;">
 					<view class="text-white text-align-center pt-20">衣物参数</view>
@@ -18,24 +18,32 @@
 						<image src="/static/img/64.png" mode="widthFix"></image>
 						<text>{{xianshi?'修改':'保存'}}</text>
 					</view>
-					<view class="you black mt-30">
-						<tm-input :disabled="xianshi" title="衣长" v-model="reqData.username" align="right"></tm-input>
-						<tm-input :disabled="xianshi" title="上市年份" v-model="reqData.height" align="right"></tm-input>
-						<tm-input :disabled="xianshi" title="颜色" v-model="reqData.weight" align="right"></tm-input>
-						<tm-input :disabled="xianshi" title="尺码" v-model="reqData.username" align="right"></tm-input>
-						<tm-input :disabled="xianshi" title="品牌" v-model="reqData.height" align="right"></tm-input>
-						<tm-input :disabled="xianshi" title="主材含量" v-model="reqData.weight" align="right"></tm-input>
-						<tm-input :disabled="xianshi" title="适用对象" v-model="reqData.weight" align="right"></tm-input>
+					<view class="you black mt-30" v-if="alldata !=0">
+						<tm-input :disabled="xianshi" :required="true" title="商品名称" v-model="alldata.detail.goods_name" align="right"></tm-input>
+						<tm-pickers :disabled="xianshi" class="tan" :default-value.sync="category_danarr" rang-key="category_name" :list="category_arr">
+							<tm-input :required="true" title="分类" placeholder="请选择分类" disabled :value="obTstr1(category_danarr,'category_name')" right-icon="icon-angle-right"></tm-input>
+						</tm-pickers>
+						<tm-pickers :disabled="xianshi" class="tan" :default-value.sync="role_danarr" rang-key="username" :list="role_arr">
+							<tm-input title="所属成员" :required="true" placeholder="请选择所属成员" disabled :value="obTstr3(role_danarr)" right-icon="icon-angle-right"></tm-input>
+						</tm-pickers>
+						<tm-input :disabled="xianshi" title="年份" v-model="alldata.detail.year" align="right"></tm-input>
+						<tm-input :disabled="xianshi" title="颜色" v-model="alldata.detail.color" align="right"></tm-input>
+						<tm-pickers :disabled="xianshi" class="tan" :default-value.sync="size_danarr" rang-key="title" :list="size_arr">
+							<tm-input title="尺码" placeholder="请选择尺码" disabled :value="obTstr2(size_danarr)" right-icon="icon-angle-right"></tm-input>
+						</tm-pickers>
+						<tm-input :disabled="xianshi" title="适用人群" v-model="alldata.detail.type" align="right"></tm-input>
+						<tm-input :disabled="xianshi" title="品牌" v-model="alldata.detail.brand" align="right"></tm-input>
+						<tm-input :disabled="xianshi" title="材料" v-model="alldata.detail.science" align="right"></tm-input>
 					</view>
 				</view>
 			</tm-sheet>
-			<tm-sheet class="kuang">
+			<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 quanbuList" @click="yifu()">
-						<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 class="yiguicla black pa-6 ma-4 fl mb-20" v-for="item in alldata.data" @click="yifu()">
+						<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>
 					</view>
 					<view style="clear: both;"></view>
 				</view>
@@ -54,7 +62,7 @@
 					></tm-listitem>
 				</view>
 			</tm-sheet> -->
-			<tm-button :round="24" class="sao mb-40" block @click="show_1=true">出库</tm-button>
+			<tm-button v-if="alldata!=0 && alldata.detail.is_have !=0" :round="24" class="sao mb-40" block @click="chuku()">出库</tm-button>
 		</div>
 		<!-- 搭配 -->
 		<tm-sheet v-if="activeIndex==1" class="yichu" style="margin-bottom: 40px !important;">
@@ -75,20 +83,20 @@
 		
 		
 		<tm-poup v-model="show_1" :position="pos" class="tcc">
-			<view style="position: relative !important;">
+			<view style="position: relative !important;" v-if="chukudata.length !=0">
 				<view style="height: 10px;"></view>
 				<tm-swiper :current="0" :indicator-dots="false" :round="6" :ani3d="190"  :autoplay="false" :list="list1"></tm-swiper>
-				<view class="text-white text-align-center mt-15">丝缎质感纹理风衣</view>
-				<view class="text-white text-align-center mt-10 text-size-s">黑色 - 6518/320</view>
-				<image class="guayi" src="/static/img/102.png" mode="widthFix"></image>
-				<view class="text-white text-align-center mt-15">衣物位于 挂衣区 5号衣柜</view>
+				<view class="text-white text-align-center mt-15">{{chukudata[0].brand}}{{chukudata[0].color}}{{chukudata[0].goods_name}}</view>
+				<view class="text-white text-align-center mt-10 text-size-s">{{chukudata[0].description}}</view>
+				<image class="guayi" :src="chukudata[0].ygimage" mode="widthFix"></image>
+				<view class="text-white text-align-center mt-15">衣物位于 {{chukudata[0].ygposition}} {{chukudata[0].is_have}}号衣柜</view>
 				<view class="text-white text-align-center mt-15">
 					<image class="aniOn deng" src="/static/img/101.png" mode="widthFix"></image>
 					<text style="vertical-align: middle;">指示灯已亮，请取出衣柜</text>
 				</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="quxiao()" theme="gray" size="n">关闭弹框</tm-button>
+					<tm-button @click="chuFun()" class="fr" theme="primary" size="n">取消出库</tm-button>
 				</view>
 			</view>
 		</tm-poup>
@@ -101,70 +109,40 @@ import{myRequest} from '@/api/request.js'
 export default {
 	data() {
 		return {
+			category_arr:[],
+			category_danarr:[],
+			role_arr:[],
+			role_danarr:[],
+			size_arr:[
+				{title:"S",id:1},
+				{title:"M",id:2},
+				{title:"L",id:3},
+				{title:"XL",id:4},
+				{title:"XXL",id:5},
+				{title:"其他",id:6},
+			],
+			size_danarr:[],
 			show_1:false,
-			show_2:false,
 			pos:'center',
 			xianshi:true,
-			list1:[		
-				'../../static/img/100.png'
-			],
+			list1:[],
 			list:[ '商品介绍','搭配方案'],
 			activeIndex:0,
 			activeIndex5:0,
 			reqData:{
-				username:'1',
-				height:'1',
-				weight:'1',
+				goods_name:'',
+				category_id:'',
+				year:'',
+				color:'',
+				type:'',
+				size:'',
+				brand:'',
+				science:'',
+				role_id:''
 			},
-			quanbuList:[{
-				src:'/static/img/45.png',
-				text:'NEO CITY 涂鸦',
-				type:'手提包'
-			},{
-				src:'/static/img/46.png',
-				text:'满印迷你标识',
-				type:'围巾'
-			},{
-				src:'/static/img/47.png',
-				text:'大号版型夹克',
-				type:'新品'
-			}],
-			test1: [{
-				img: '../../static/img/83.png',
-				title: '丝缎质感纹理风衣',
-				label: '黑色 - 6518/320',
-				id: 3,
-				buy: 0,
-				itemId: 0
-			}],
 			typeclick1:3,//1加入购物车，2购物车，3前往购买，4,5
 			typeclick:6,//1加入购物车，2购物车，3前往购买，4,5
 			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
-			}],
 			quanbuList1:[{
 				src:'/static/img/44.png',
 				text:'日常穿搭'
@@ -185,35 +163,177 @@ export default {
 				text:'日常穿搭',
 				off:false
 			}],
+			alldata:0,
+			chukudata:[]
 		};
 	},
-	onLoad() {
-		
+	onLoad(e) {
+		this.id=e.id?e.id:'4';
+		this.getXiangq()
 	},
 	created() {
 		this.sys = uni.getSystemInfoSync();
 	},
 	methods: {
+		obTstr2(o){
+			if(Array.isArray(o)){
+				if(o.length.length===0) return "";
+				return o[0]?.title??""
+			}
+			return ''
+		},
+		getCY(){
+			var that=this;
+			myRequest({
+				url: "/api/MemberInfo/getFamilyMember",
+				method:'post',
+				data:{family_id:uni.getStorageSync("family_id")}
+			}).then(res => {
+				if (res.data.code == 200) {
+					that.role_arr=res.data.data;
+					var id=that.alldata.detail.role_id;
+					for(let i=0;i<res.data.data.length;i++){
+						if(id==res.data.data[i].id){
+							this.role_danarr=[{
+								username:res.data.data[i].username,
+								id:res.data.data[i].id
+							}]
+						}
+					}
+					var sid=that.alldata.detail.size;
+					for(let i=0;i<that.size_arr.length;i++){
+						if(sid==that.size_arr[i].id){
+							this.size_danarr.push(that.size_arr[i])
+						}
+					}
+					
+				}else{
+					that.role_arr=[];
+				}
+			})
+		},
+		obTstr3(o){
+			if(Array.isArray(o)){
+				if(o.length.length===0) return "";
+				return o[0]?.username??""
+			}
+			return ''
+		},
+		getFl(){
+			var that=this;
+			myRequest({
+				url: "/api/Category/list",
+				method:'post',
+				data:{}
+			}).then(res => {
+				
+				if (res.data.code == 200) {
+					this.category_arr=res.data.data;
+					var id=that.alldata.detail.category_id;
+					for(let i=0;i<res.data.data.length;i++){
+						if(id==res.data.data[i].id){
+							this.category_danarr=[{
+								category_name:res.data.data[i].category_name,
+								id:res.data.data[i].id
+							}]
+						}
+					}
+				}else{
+					that.category_arr=[];
+				}
+			})
+		},
+		obTstr1(o){
+			if(Array.isArray(o)){
+				if(o.length.length===0) return "";
+				return o[0]?.category_name??""
+			}
+			return ''
+		},
+		getXiangq(){
+			var that=this;
+			myRequest({
+				url: "/api/Goods/getDetail",
+				method:'post',
+				data:{id:that.id}
+			}).then(res => {
+				if (res.data.code == 200) {
+					that.alldata=res.data.data;
+					that.getFl();
+					that.getCY();
+				}else{
+					that.alldata=[];
+				}
+			})
+		},
 		gengmore(){
 			
 		},
-		yuyue(){
-			this.$refs.toast.show({model:'success',label:'预约成功'})
-		},
-		mingri(){
-			this.show_2=true
+		chuku(){
+			var that=this;
+			that.list1=[];
+			myRequest({
+				url: "/api/Goods/takeClothes",
+				method:'post',
+				data:{id:[that.id]}
+			}).then(res => {
+				if (res.data.code == 200) {
+					that.show_1=true;
+					that.chukudata=res.data.data;
+					that.list1.push(res.data.data[0].image)
+					that.$refs.toast.show({model:'success',label:'出库成功'})
+				}else{
+					that.$refs.toast.show({model:'error',label:res.data.msg})
+				}
+			})
 		},
 		xiugaiFun(){
+			var that=this;
+			if(! this.xianshi){
+				if(that.category_danarr.length==0){
+					that.$refs.toast.show({model:'warn',label:'请选择分类'})
+					return
+				}else{
+					that.reqData.category_id=that.category_danarr[0].id
+				}
+				if(that.role_danarr.length==0){
+					that.$refs.toast.show({model:'warn',label:'请选择成员'})
+					return
+				}else{
+					that.reqData.role_id=that.role_danarr[0].id
+				}
+				if(that.size_danarr.length!=0){
+					that.reqData.size=that.size_danarr[0].id
+				}
+				that.reqData.goods_name=that.alldata.detail.goods_name;
+				if(that.reqData.goods_name==""){
+					that.$refs.toast.show({model:'warn',label:'请输入商品名称'})
+					return
+				}
+				that.reqData.year=that.alldata.detail.year;
+				that.reqData.color=that.alldata.detail.color;
+				that.reqData.type=that.alldata.detail.type;
+				that.reqData.brand=that.alldata.detail.brand;
+				that.reqData.science=that.alldata.detail.science;
+				that.reqData.id=that.alldata.detail.id;
+				myRequest({
+					url: "/api/Goods/updateGoods",
+					method:'post',
+					data:that.reqData
+				}).then(res => {
+					if (res.data.code == 200) {
+						that.$refs.toast.show({model:'success',label:res.data.msg})
+					}else{
+						that.$refs.toast.show({model:'error',label:res.data.msg})
+					}
+				})
+				console.log(this.reqData)
+			}
 			this.xianshi=!this.xianshi;
 		},
 		quxiao(){
 			this.show_1=false;
 		},
-		chuFun(){
-			uni.navigateTo({
-				url: "/pages/index/index?index=1",
-			})
-		}
 	},
 }
 </script>
@@ -250,7 +370,7 @@ export default {
 	/deep/ .tcc uni-swiper{width: 100% !important;}
 	/deep/ .uni-swiper-slides{width: 160px !important;}
 	/deep/ .tcc uni-image{width: 160px !important;}
-	.tcc .guayi{width: 90% !important;display: block;margin:0 auto;margin-top:15px !important;}
+	.tcc .guayi{width: 60% !important;display: block;margin:0 auto;margin-top:15px !important;}
 	.tcc .deng{width:25px !important;height:25px !important;vertical-align: middle;margin-right:8px;}
 	.aniOn{
 		animation:doudong 0.5s linear infinite;

tm-vuetify/components/tm-cartCellListFood/tm-cartCellListFood.vue

@@ -10,7 +10,7 @@
 			width:imgWidth+'rpx',
 			height:imgWidth+'rpx'
 		}">
-			<tm-images :width="imgWidth" :height="imgWidth" :round="3"  :src="mdata[keyMap['img']]"></tm-images>
+			<image @click="quxq(mdata)" style="width:90px;height:90px;" :round="3"  :src="mdata[keyMap['img']]"></image>
 		</view>
 		<view class="tm-cartCellListFood-r fulled ">
 			<view class="pl-15">
@@ -213,11 +213,14 @@
 		},
 		methods:{
 			jiaru(data){
-				this.$emit('jiaruFun', data);
+				this.$emit('jiaruFun', {data:data,type:2});
 			},
 			genghuan(){
 				this.$emit('genghuan', data);
 			},
+			quxq(data){
+				this.$emit('jiaruFun', {data:data,type:1});
+			},
 			jian(){
 				const buyNum = this.cNum;
 				if(buyNum<=0) {