YZM 2 years ago
parent
commit
1118ecbbb2

+ 25 - 9
pages/changan/index.vue

@@ -30,19 +30,19 @@
 				</view>
 			</tm-sheet>
 			<view class="anniu">
-				<tm-button @click="quxiao" :round="24" class="fl" theme="gray" size="n">取消</tm-button>
+				<tm-button @click="quxiao1" :round="24" class="fl" theme="gray" 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>
+				<tm-button :round="24" @click="baocun" 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>
+					<tm-swiper @change="qiehuanLb" :current="current" :indicator-dots="false" :round="6" :ani3d="190"  :autoplay="false" :list="list1"></tm-swiper>
+					<view class="text-white text-align-center mt-15">{{chukudata[current].brand}}{{chukudata[current].color}}{{chukudata[current].goods_name}}</view>
+					<view class="text-white text-align-center mt-10 text-size-s">{{chukudata[current].description}}</view>
+					<image class="guayi" :src="chukudata[current].ygimage" mode="widthFix"></image>
+					<view class="text-white text-align-center mt-15">衣物位于 {{chukudata[current].ygposition}} {{chukudata[current].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>
@@ -82,7 +82,8 @@ export default {
 			show_1:false,
 			pos:'center',
 			chukudata:[],
-			ids:[]
+			ids:[],
+			current:0
 		};
 	},
 	onLoad() {
@@ -95,12 +96,22 @@ export default {
 		this.fenleichange();
 	},
 	methods: {
+		baocun(){
+			uni.navigateTo({
+				url: "/pages/zidingyi/index?type=1",
+			})
+		},
 		shanchu(){
 			// for(let i=0;i<this.quanbuList.length;i++){
 			// 	this.quanbuList[i].off=false;
 			// 	this.$forceUpdate()
 			// }
 		},
+		qiehuanLb(e){
+			var that=this;
+			this.current=e;
+			console.log(e)
+		},
 		queren(){
 			var that=this;
 			this.list1=[]
@@ -121,7 +132,7 @@ export default {
 				}
 			})
 		},
-		quxiao(){
+		quxiao1(){
 			for(let i=0;i<this.quanbuList.length;i++){
 				this.quanbuList[i].off=false;
 				this.$forceUpdate()
@@ -129,6 +140,7 @@ export default {
 		},
 		chuku(){
 			var id=[],a=0;
+			var that=this;
 			if(this.quanbuList.length==0){
 				that.$refs.toast.show({model:'error',label:'请选择衣物'})
 				return
@@ -141,6 +153,10 @@ export default {
 					}
 				}
 			}
+			if(id.length==0){
+				that.$refs.toast.show({model:'error',label:'请选择在库衣物'})
+				return
+			}
 			this.content="有"+(a-id.length)+"衣物已经出库,在库衣物将添加至出库清单"
 			this.ids=id;
 			this.show=true;

+ 43 - 3
pages/dapei/index.vue

@@ -37,14 +37,14 @@
 					<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()">编辑穿搭</view>
+				<view class="bianji" @click="bianji()">编辑穿搭</view>
 			</view>
 		</scroll-view>
 		<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(2)">
+				<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>
 				</view>
@@ -95,13 +95,53 @@ export default {
 	},
 	created() {
 		this.sys = uni.getSystemInfoSync();
+		this.gettianqi();
 	},
 	methods: {
+		gettianqi(){
+			var that=this;
+			// uni.getLocation({
+			// 	type: 'wgs84',
+			// 	geocode:true,//设置该参数为true可直接获取经纬度及城市信息
+			// 	success: function (res) {
+			// 		console.log(res)
+			// 		// that.addrDel = res;
+			// 	},
+			// 	fail: function () {
+			// 		uni.showToast({
+			// 			title: '获取地址失败,将导致部分功能不可用',
+			// 			icon:'none'
+			// 		});
+			// 	}
+			// });
+			uni.request({
+				url: "https://jisutqybmf.market.alicloudapi.com/weather/query",
+				method: "get",
+				header: {
+					'Authorization':'APPCODE e4b9accfb1f246cb8c0766a54efe8730'
+				},
+				data:{
+					city:'南京'
+				},
+				dataType:'json',
+				success : function(data) {
+					
+				},
+				error : function(e) {
+					alert("网络异常,请重试");
+				}
+			});
+		},
 		bianji(){
 			uni.navigateTo({
 				url: "/pages/bianji/index",
 			})
 		},
+		zidingyibianji(){
+			uni.navigateTo({
+				url: "/pages/zidingyi/index?type=1",
+			})
+		},
 		dapei(){
 			uni.navigateTo({
 				url: "/pages/dapeizidingyi/index?type=1",
@@ -113,7 +153,7 @@ export default {
 		},
 		zidingyi(){
 			uni.navigateTo({
-				url: "/pages/changan/index?off=1",
+				url: "/pages/changan/index",
 			})
 		}
 	},

+ 86 - 31
pages/gouwuche/index.vue

@@ -2,19 +2,22 @@
 	<view :style="{ minHeight: sys.windowHeight + 'px' }"
 		:class="[$tm.vx.state().tmVuetify.black ? 'black' : ' ']">
 		<tm-menubars title="消息列表" :shadow="0" :showback="true"></tm-menubars>
-		<view class="zhuti shangpin" style="margin-bottom: 170px !important;padding-bottom:70px">
+		<view class="zhuti shangpin">
 			<tm-sheet :padding="[0, 0]" class="jiaoxi xiao">
 				<view v-for="item in test">
-					<tm-checkbox style="float: left;padding:2px !important;margin-top:9%;" v-model="item.checked" label=""></tm-checkbox>
-					<tm-cartCellListFood class="shuliang" :typeclick="typeclick" :mdata="item" :cart-num.sync="item.buy"></tm-cartCellListFood>
+					<tm-checkbox @change="choose" style="float: left;padding:2px !important;margin-top:9%;" v-model="item.checked" label=""></tm-checkbox>
+					<tm-cartCellListFood @change="shuliangjia(item)" class="shuliang" :typeclick="typeclick" :mdata="item" :cart-num.sync="item.buy"></tm-cartCellListFood>
 				</view>
 			</tm-sheet>
 		</view>
 		<view class="dibu">
-			<!-- <tm-listitem title="优惠券"></tm-listitem> -->
+			
 			<tm-listitem class="liebiao" value="免费" :round="24" :shadow="12" title="邮费" :show-right-icon="false"></tm-listitem>
-			<tm-listitem class="liebiao jiageList" value="¥529" :round="24" :shadow="12" title="价格" :show-right-icon="false"></tm-listitem>
-			<tm-button theme="primary" :round="24" block class="mt-50 logincla">立即付款</tm-button>
+			<tm-listitem class="liebiao jiageList" :value="'¥'+zongjia" :round="24" :shadow="12" title="价格" :show-right-icon="false"></tm-listitem>
+			<view class="text-align-center">
+				<tm-button theme="red" @click="shanchu" :round="24" class="mt-50 logincla">删除</tm-button>
+				<tm-button theme="primary" :round="24" class="mt-50 logincla">立即付款</tm-button>
+			</view>
 		</view>
 		<!-- 弹出层消息 -->
 		<tm-message ref="toast"></tm-message>
@@ -25,29 +28,8 @@ import{myRequest} from '@/api/request.js'
 export default {
 	data() {
 		return {
-			
-			beizu:'',
-			test: [{
-				img: '../../static/img/83.png',
-				title: '丝缎质感纹理风衣',
-				label: '黑色 - 6518/320',
-				size:'S',
-				price: '1299',
-				id: 3,
-				buy: 0,
-				itemId: 0,
-				checked:false,
-			},{
-				img: '../../static/img/84.png',
-				title: '产品3(任选)',
-				size:'S',
-				label: '这个产品是只有几个融会',
-				price: 36.2,
-				id: 3,
-				buy: 0,
-				itemId: 0,
-				checked:false
-			}],
+			zongjia:0,
+			test: [],
 			typeclick:2,//1加入购物车,2购物车
 		};
 	},
@@ -56,8 +38,81 @@ export default {
 	},
 	created() {
 		this.sys = uni.getSystemInfoSync();
+		this.getList()
 	},
 	methods: {
+		shanchu(){
+			var that=this,data=this.test,ids=[];
+			for(let i=0;i<data.length;i++){
+				if(data[i].checked){
+					ids.push(data[i].id)
+				}
+			}
+			if(ids.length==0){
+				that.$refs.toast.show({model:'success',label:'请选择商品'})
+				return
+			}
+			myRequest({
+				url: "/api/ShopCart/deleteOneGoods",
+				method:'post',
+				data:{id:ids}
+			}).then(res => {
+				if (res.data.code == 200) {
+					this.getList()
+					that.$refs.toast.show({model:'success',label:res.data.msg})
+				}else{
+					that.$refs.toast.show({model:'error',label:res.data.msg})
+				}
+			})
+		},
+		shuliangjia(num){
+			this.jiage();
+		},
+		choose(){
+			this.jiage()
+		},
+		jiage(){
+			var data=this.test,jiage=0;
+			for(let i=0;i<data.length;i++){
+				if(data[i].checked){
+					var danjia=JSON.parse(data[i].price);
+					var shuliang=data[i].buy;
+					jiage=jiage+(danjia*shuliang);
+				}
+			}
+			this.zongjia=jiage;
+		},
+		getList(){
+			var that=this;
+			myRequest({
+				url: "/api/ShopCart/shopCartList",
+				method:'post',
+				data:{}
+			}).then(res => {
+				if (res.data.code == 200) {
+					if(res.data.data.length != 0){
+						that.test=[];
+						for(let i=0;i<res.data.data.length;i++){
+							var obj={
+								img: res.data.data[i].goods_image,
+								title: res.data.data[i].goods_name,
+								// label: '黑色 - 6518/320',
+								// size:'S',
+								price: res.data.data[i].goods_price,
+								id: res.data.data[i].id,
+								buy: res.data.data[i].goods_num,
+								itemId: res.data.data[i].id,
+								checked:false,
+							};
+							that.test.push(obj)
+						}
+						that.jiage()
+					}
+				}else{
+					that.test=[];
+				}
+			})
+		},
 	},
 }
 </script>
@@ -66,7 +121,7 @@ export default {
 	/deep/ .tm-menubars .body{
 		background-color: #1b1b1b !important;
 	}
-	/deep/ .jiaoxi{margin:0 !important;padding: 8px !important;}
+	/deep/ .jiaoxi{margin:0 !important;padding: 8px !important;margin-bottom: 200px !important;}
 	/deep/ .shangpin .white.bk{background-color:#1b1b1b!important;}
 	/deep/ .shangpin .tm-cartCellListFood{    padding: 0px 0px 15px 0px !important;
 	margin-top: 5px !important;margin-bottom: 20px !important;
@@ -80,6 +135,6 @@ export default {
 	.dibu{background: #0D0D0D;position: fixed;bottom:0px;width: 100%;}
 	/deep/ .liebiao .grey-darken-4.bk{background: #0D0D0D !important;padding: 0px;margin: 0px;
 	width: 100%;border-radius: 0px !important;}
-	.logincla{width: 88%;margin:0 auto;margin-top:20px;margin-bottom:30px;}
+	.logincla{width: 40%;margin:0 auto;margin-top:20px;margin-bottom:30px;}
 	/deep/ .jiageList .d-inline-block{font-size: 18px !important;color: white !important;}
 </style>

+ 0 - 2
pages/index/index.vue

@@ -57,8 +57,6 @@ export default {
 	methods: {
 		initBtn(){
 			this.$refs.yigui.qingkong();
-			this.$refs.yigui.fenleichange();
-			this.$refs.yigui.getfenltext();
 		},
 		changepage(info){
 			this.showpage=info.index

+ 2 - 2
pages/shouyedetail/index.vue

@@ -30,7 +30,7 @@
 			<div class="zhuti">
 				<view class="text-white">BALENCIAGA / adidas TRIPLE S男士运动鞋</view>
 				<view class="text-gray text-size-m mt-20">adidas 白色、黑色和灰色双层泡沫和网布 Triple S 运动鞋是与 adidas 携手推出的合作款。</view>
-				<view class="shoucang mt-30 fr">
+				<!-- <view class="shoucang mt-30 fr">
 					<view class="fl di mr-20" @click="shouc">
 						<tm-translate ref="a_3" :auto="true" :duration="80"  animation-name="zoomIn">
 							<image :src="shoucangsrc?'/static/img/15.png':'/static/img/8.png'" mode="widthFix" style="margin-right: 15px;"></image>
@@ -41,7 +41,7 @@
 							<image :src="dianzan?'/static/img/16.png':'/static/img/9.png'" mode="widthFix" style="margin-right: 15px;"></image>
 						</tm-translate>
 					</view>
-				</view>
+				</view> -->
 				<view style="clear: both;"></view>
 			</div>
 		</tm-sheet>

+ 3 - 1
pages/user/index.vue

@@ -56,7 +56,7 @@
 	</view>
 </template>	
 <script>
-	// {title:'我的钱包',type:'1'},{title:'我的消息',type:'4'},{title:'衣服录入',type:'10'},{title:'创建家庭',type:'8'},
+	// {title:'衣服录入',type:'10'},{title:'创建家庭',type:'8'},
 import{myRequest} from '@/api/request.js'
 export default {
 	data() {
@@ -64,8 +64,10 @@ export default {
 			show:false,
 			on:true,
 			libiaoList:[
+			{title:'我的钱包',type:'1'},
 			{title:'我的评价',type:'2'},
 			{title:'意见反馈',type:'3'},
+			{title:'我的消息',type:'4'},
 			{title:'我的关注',type:'5'},
 			{title:'系统通知',type:'6'},
 			{title:'历史记录',type:'7'},

+ 84 - 25
pages/wardrobe/index.vue

@@ -74,7 +74,7 @@
 			</tm-sheet>
 		</view>
 		<!-- 待取衣服 -->
-			<tm-flotbutton class="qiu" show-actions position="bottomLeft" actions-pos="top" label="" :show-text="true"
+			<tm-flotbutton class="qiu" @change="anniu" show-actions position="bottomRight" 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">
@@ -89,23 +89,25 @@
 		</css-float-ball> -->
 		<!-- 弹出 -->
 		<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="1" :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>
+				<tm-swiper @change="qiehuanLb" :current="current" :indicator-dots="false" :round="6" :ani3d="190"  :autoplay="false" :list="list1"></tm-swiper>
+				<view class="text-white text-align-center mt-15">{{chukudata[current].brand}}{{chukudata[current].color}}{{chukudata[current].goods_name}}</view>
+				<view class="text-white text-align-center mt-10 text-size-s">{{chukudata[current].description}}</view>
+				<image class="guayi" :src="chukudata[current].ygimage" mode="widthFix"></image>
+				<view class="text-white text-align-center mt-15">衣物位于 {{chukudata[current].ygposition}} {{chukudata[current].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>
+		<!-- 弹出层消息 -->
+		<tm-message ref="toast"></tm-message>
 	</view>
 </template>	
 <script>
@@ -113,12 +115,8 @@ 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],
+			listqiu:[],
+			offset: [0, 0],
 			show_1:false,
 			pos:'center',
 			floatBallPosition:{x: 400, y: 750},
@@ -128,17 +126,15 @@ export default {
 			list:[],
 			listlx:[],
 			quanbuList:[],
-			list1:[
-				'../../static/img/100.png',
-				'../../static/img/100.png',
-				'../../static/img/100.png',
-			],
+			list1:[],
 			pagesize:6,
 			page:1,
 			total:0,
 			count:0,
 			have:0,
-			offset: [16, 50]
+			chukudata:[],
+			current:0,
+			qiuid:''
 		};
 	},
 	onLoad() {
@@ -153,10 +149,57 @@ export default {
 		this.sys = uni.getSystemInfoSync();
 		this.getfenltext()
 		this.fenleichange();
+		this.getQiu()
 	},
 	methods: {
 		qingkong(){
-			this.quanbuList=[];
+			this.fenleichange();
+			this.getfenltext();
+		},
+		qiehuanLb(e){
+			var that=this;
+			this.current=e;
+		},
+		anniu(e){
+			var that=this;
+			console.log(this.chukudata)
+			that.qiuid=that.listqiu[e].id;
+			myRequest({
+				url: "/api/Goods/getBallClothing",
+				method:'post',
+				data:{id:that.qiuid}
+			}).then(res => {
+				if (res.data.code == 200) {
+					that.current=0;
+					that.show_1=true;
+					that.chukudata=res.data.data;
+					that.list1=[];
+					for(let i=0;i<res.data.data.length;i++){
+						that.list1.push(res.data.data[i].image)
+					}
+				}else{
+					
+				}
+			})
+		},
+		getQiu(){
+			var that=this;
+			myRequest({
+				url: "/api/Goods/getBall",
+				method:'post',
+				data:{}
+			}).then(res => {
+				if (res.data.code == 200) {
+					if(res.data.data.length != 0){
+						that.listqiu=res.data.data;
+						for(let i=0;i<that.listqiu.length;i++){
+							that.listqiu[i]["icon"]='/static/img/96.png'
+						}
+					}
+				}else{
+					that.listqiu=[];
+				}
+			})
 		},
 		getList(){
 			var that=this;
@@ -181,7 +224,22 @@ export default {
 			this.show_1=false;
 		},
 		chuFun(){
-			this.show_1=false;
+			var that=this;
+			myRequest({
+				url: "/api/Goods/cancelDelivery",
+				method:'post',
+				data:{qiu_id:that.qiuid,id:that.chukudata[that.current].id}
+			}).then(res => {
+				console.log(res.data)
+				if (res.data.code == 200) {
+					that.show_1=false;
+					that.getQiu()
+					that.$refs.toast.show({model:'success',label:res.data.msg})
+				}else{
+					that.$refs.toast.show({model:'error',label:res.data.msg})
+				}
+			})
+			
 		},
 		chuangjian(){
 			uni.navigateTo({
@@ -210,7 +268,7 @@ export default {
 		},
 		sosoFun(){
 			uni.navigateTo({
-				url: "/pages/shopsoso/index",
+				url: "/pages/sousuo/index",
 			})
 		},
 		fenleichange(){
@@ -342,7 +400,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: 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;}
 	.anniu{width: 80%;margin: 0 auto;margin-top: 20px;}
 	/deep/ .anniu .gray.bk{color: white !important;}
@@ -371,4 +429,5 @@ export default {
 	/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;}
+	/deep/ .menulistAction{height: 350px;overflow: auto;}
 </style>

+ 13 - 18
pages/zidingyi/index.vue

@@ -6,27 +6,27 @@
 			<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==2">
+					<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 v-if="off==2" >
+					<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 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="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>
+		</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>
@@ -36,10 +36,10 @@
 				<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==2" :round="24" class="sao mb-40 mt-40" block>保存</tm-button>
-		<view class="anniu" v-if="off==1">
-			<tm-button :round="24" theme="gray" size="n">预约明日</tm-button>
-			<tm-button :round="24" class="fr" theme="primary" size="n">全部取出</tm-button>
+		<!-- <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>
@@ -91,18 +91,13 @@ export default {
 				buy: 0,
 				itemId: 0
 			}],
-			typeclick1:3,//1加入购物车,2购物车,3前往购买,4,5
-			typeclick:5,//1加入购物车,2购物车,3前往购买,4,5
+			typeclick1:6,//1加入购物车,2购物车,3前往购买,4,5
+			typeclick:6,//1加入购物车,2购物车,3前往购买,4,5
 		};
 	},
 	onLoad(e) {
 		if(e){
-			this.off=e.type?e.type:1;
-			if(this.off==1){
-				this.typeclick=5;
-			}else{
-				this.typeclick=6;
-			}
+			
 		}
 	},
 	created() {

+ 165 - 0
pages/zidingyikan/index.vue

@@ -0,0 +1,165 @@
+<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==2">
+						<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==2" >
+						<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 v-if="off==2" :round="24" class="sao mb-40 mt-40" block>保存</tm-button>
+		<view class="anniu" v-if="off==1">
+			<tm-button :round="24" theme="gray" size="n">预约明日</tm-button>
+			<tm-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:3,//1加入购物车,2购物车,3前往购买,4,5
+			typeclick:5,//1加入购物车,2购物车,3前往购买,4,5
+		};
+	},
+	onLoad(e) {
+		if(e){
+			this.off=e.type?e.type:1;
+			if(this.off==1){
+				this.typeclick=5;
+			}else{
+				this.typeclick=6;
+			}
+		}
+	},
+	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>