加跳转

pages/changan/index.vue

@@ -18,7 +18,7 @@
 			<!-- 衣橱 -->
 			<tm-sheet class="yichu" style="margin-bottom: 70px !important;">
 				<tm-tabs class="C1b1b1b qiehuan" @change="fenleichange" color="white"  align="left"  v-model="activeIndex" :list="list" range-key="title"></tm-tabs>
-				<view class="yiguicla black pa-6 ma-4 fl" v-for="(item,index) in quanbuList" @click="yifu(index,item)">
+				<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>
@@ -52,27 +52,33 @@ export default {
 			quanbuList:[{
 				src:'/static/img/45.png',
 				text:'NEO CITY 涂鸦',
-				type:'手提包'
+				type:'手提包',
+				off:false
 			},{
 				src:'/static/img/46.png',
 				text:'满印迷你标识',
-				type:'围巾'
+				type:'围巾',
+				off:false
 			},{
 				src:'/static/img/47.png',
 				text:'大号版型夹克',
-				type:'新品'
+				type:'新品',
+				off:false
 			},{
 				src:'/static/img/45.png',
 				text:'NEO CITY 涂鸦',
-				type:'手提包'
+				type:'手提包',
+				off:false
 			},{
 				src:'/static/img/46.png',
 				text:'满印迷你标识',
-				type:'围巾'
+				type:'围巾',
+				off:false
 			},{
 				src:'/static/img/47.png',
 				text:'大号版型夹克',
-				type:'新品'
+				type:'新品',
+				off:false
 			}],
 			chooseindex:-1
 		};
@@ -89,7 +95,7 @@ export default {
 	methods: {
 		quxiao(){
 			for(let i=0;i<this.quanbuList.length;i++){
-				this.quanbuList[i].aa=false;
+				this.quanbuList[i].off=false;
 			}
 		},
 		chuku(){
@@ -154,7 +160,7 @@ export default {
 		},
 		yifu(index,item){
 			
-			item.aa=! item.aa
+			item.off=! item.off
 			console.log(item)
 		},
 		qiehuanFun(){
@@ -169,7 +175,7 @@ export default {
 					src:'/static/img/47.png',
 					text:'大号版型夹克',
 					type:'新品',
-					aa:false
+					off:false
 				})
 			}
 			this.quanbuList=this.quanbuList.concat(list2)

pages/dapei/index.vue

@@ -100,11 +100,11 @@ export default {
 		dapei(type){
 			if(type==1){
 				uni.navigateTo({
-					url: "/pages/zidingyi/index?off="+type,
+					url: "/pages/dapeizidingyi/index?off="+type,
 				})
 			}else{
 				uni.navigateTo({
-					url: "/pages/dapeizidingyi/index",
+					url: "/pages/dapeizidingyi/index?off="+type,
 				})
 			}
 			

pages/dapeizidingyi/index.vue

@@ -5,7 +5,11 @@
 		<div class="zhuti">
 			<!-- 衣橱 -->
 			<tm-sheet class="yichu" style="margin-bottom: 40px !important;">
+				<!-- <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>
+				<!-- <tm-tabs class="C1b1b1b qiehuan" color="white"  align="left"  v-model="activeIndex1" :list="list1" range-key="title"></tm-tabs> -->
 				<view class="yiguicla black pa-6 ma-4 fl" v-for="(item,index) in quanbuList" @click="zidingyi(1)">
 					<image :src="item.src" mode="widthFix"></image>
 					<view class="text-size-m mt-20 mb-20 ml-10">{{item.text}}</view>
@@ -25,8 +29,8 @@ import{myRequest} from '@/api/request.js'
 export default {
 	data() {
 		return {
-			list:[ '预约穿搭'],
-			list1:['时尚','商务'],
+			list:['时尚','商务'],
+			list1:['开会','聚餐'],
 			activeIndex:0,
 			activeIndex1:0,
 			quanbuList:[{
@@ -125,4 +129,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;}
+	.biaoti view{width:5px;height:19px;background: #0178FD;float: left;border-radius: 10px;}
 </style>

pages/shop/index.vue

@@ -27,7 +27,7 @@
 			<tm-sheet :shadow="24" class="jiaoxi">
 				<tm-grid @change="zhonglei" class="mt-20 mb-20" :grid="5" :list="list3" :icon-size="120" font-color="white"></tm-grid>
 			</tm-sheet>
-			<tm-sheet :shadow="24" class="jiaoxi xiao">
+			<!-- <tm-sheet :shadow="24" class="jiaoxi xiao">
 				<view class="yifu1 fl">
 					<image src="/static/img/78.png" mode="widthFix"></image>
 				</view>
@@ -39,14 +39,14 @@
 					</view>
 				</view>
 				<view style="clear: both;"></view>
-			</tm-sheet>
+			</tm-sheet> -->
 			<tm-sheet :shadow="24" class="jiaoxi xiao">
 				<tm-tabs align="center" class="qiehuan1" v-model="activeIndex" :list="list2" range-key="title"></tm-tabs>
 			</tm-sheet>
 			<tm-sheet :shadow="24" class="jiaoxi xiao" style="height:160px;">
-				<tm-dragGrid :list="list1" :col="3" disabled="false" class="mt-40 mb-40 remen" :icon-size="160">
+				<tm-dragGrid  :list="list1" :col="3" disabled="false" class="mt-40 mb-40 remen" :icon-size="160">
 					<template v-slot:default="{item}">
-						<view class="flex-center flex-col">
+						<view class="flex-center flex-col" @click="tiaozhuan()">
 							<tm-icons :size="160" :name="item.icon" :color="item.color"></tm-icons>
 							<text class="text-size-m text-white pt-10">{{item.text}}</text>
 							<text class="text-size-m text-white pt-10">{{item.jie}}</text>
@@ -55,7 +55,7 @@
 				</tm-dragGrid>
 			</tm-sheet>
 		</view>
-		<view class="guanggao">
+		<view class="guanggao" @click="xiangqing">
 			<image style="width:100%;" src="/static/img/82.png" mode="widthFix"></image>
 			<view class="wenzi">
 				<view class="mt-10">额外打九折</view>
@@ -160,6 +160,11 @@ export default {
 		this.sys = uni.getSystemInfoSync();
 	},
 	methods: {
+		tiaozhuan(){
+			uni.navigateTo({
+				url: "/pages/gengduo/index",
+			})
+		},
 		xiangqing(e){
 			uni.navigateTo({
 				url: "/pages/shopdetail/index",

pages/shouye/index.vue

@@ -10,9 +10,9 @@
 				</template> -->
 			</tm-search>
 			<view class="dingwei">
-				<tm-quickCity  color="blue" :defaultValue.sync="defaultValue">
+				<tm-quickCity  color="blue" v-model="offshow" :defaultValue.sync="defaultValue" @change="qiehuandizhi">
 					<image style="vertical-align: middle;" src="/static/img/dingwei.png" mode="widthFix"></image>
-					<text style="vertical-align: middle;" class="text-size-g">北京Beijing</text>
+					<text style="vertical-align: middle;" class="text-size-g">{{chengshi}}</text>
 				</tm-quickCity>
 				
 			</view>
@@ -165,6 +165,8 @@
 	export default {
 		data() {
 			return {
+				offshow:false,
+				chengshi:"南京",
 				defaultValue:[],
 				soso:'',
 				aab:false,
@@ -234,9 +236,15 @@
 			this.randouh()
 		},
 		methods: {
+			qiehuandizhi(e){
+				if(e[2]!=null){
+					this.offshow=false;
+					this.chengshi=e[1];
+				}
+			},
 			tiaodapei(){
 				uni.navigateTo({
-					url: "/pages/zidingyi/index",
+					url: "/pages/zidingyi/index?off=2",
 				})
 			},
 			tiao(){

pages/user/index.vue

@@ -56,6 +56,7 @@
 	</view>
 </template>	
 <script>
+	// {title:'我的钱包',type:'1'},{title:'我的消息',type:'4'},
 import{myRequest} from '@/api/request.js'
 export default {
 	data() {
@@ -63,10 +64,8 @@ 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'},
@@ -85,9 +84,9 @@ export default {
 	methods: {
 		tiaozhuan(type){
 			if(type==1){
-				// uni.navigateTo({
-				// 	url: "/pages/qianbao/index",
-				// })
+				uni.navigateTo({
+					url: "/pages/qianbao/index",
+				})
 			}else if(type==2){
 				uni.navigateTo({
 					url: "/pages/pingjia/index",

pages/wardrobe/index.vue

@@ -17,7 +17,7 @@
 		<!-- 推荐 -->
 		<view class="zhuti">
 			<div>
-				<tm-sheet class="lunbo1 fl">
+				<tm-sheet class="lunbo1 fl" @click="tiao">
 					<view class="flex-between flex-center">
 						<view class="tuijian">
 							<text class="text-white text-size-lg">校园穿搭</text>
@@ -35,7 +35,7 @@
 						</view>
 					</view>
 				</tm-sheet>
-				<tm-sheet class="lunbo1 fr">
+				<tm-sheet class="lunbo1 fr" @click="tiao">
 					<view class="flex-between flex-center">
 						<view class="tuijian">
 							<text class="text-white text-size-lg">日常出勤</text>
@@ -58,7 +58,7 @@
 			<!-- 衣橱 -->
 			<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="yiguicla black pa-6 ma-4 fl" :class="index==chooseindex?'C0178FD':''" v-for="(item,index) in quanbuList" @longtap="longtap">
+				<view class="yiguicla black pa-6 ma-4 fl" :class="index==chooseindex?'C0178FD':''" v-for="(item,index) in quanbuList" @click="tiaozhuan">
 					<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>
@@ -71,10 +71,10 @@
 		</view>
 		<!-- 待取衣服 -->
 		
-		<css-float-ball v-model="floatBallPosition">
+		<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="chuku">
+		    	<view class="fudong" @click="qiuqu">
 		    		<image src="/static/img/96.png" class="fudimg fl"></image>
 		    		<view class="pt-20">待取衣物</view>
 		    		<view>(<text style="color: #FFCC00;">3</text>件)</view>
@@ -140,6 +140,16 @@ export default {
 		this.fenleichange();
 	},
 	methods: {
+		tiao(){
+			uni.navigateTo({
+				url: "/pages/zidingyi/index",
+			})
+		},
+		qiuqu(){
+			uni.navigateTo({
+				url: "/pages/yifu/index",
+			})
+		},
 		fenleichangeFun(){
 			var that=this;
 			// role_id:,id:
@@ -162,11 +172,11 @@ export default {
 				// }
 			})
 		},
-		longtap(){
+		tiaozhuan(){
 			console.log("111")
-			// uni.navigateTo({
-			// 	url: "/pages/changan/index",
-			// })
+			uni.navigateTo({
+				url: "/pages/changan/index",
+			})
 		},
 		chuku(){
 			uni.navigateTo({

pages/yifu/index.vue

@@ -40,7 +40,7 @@
 					<view style="clear: both;"></view>
 				</view>
 			</tm-sheet>
-			<tm-sheet class="kuang">
+			<!-- <tm-sheet class="kuang">
 				<view style="width: 98%;margin:0 auto;margin-top:20px !important;">
 					<view class="text-white text-align-center pt-20">品牌信息</view>
 					<tm-listitem
@@ -53,7 +53,7 @@
 						show-left-icon
 					></tm-listitem>
 				</view>
-			</tm-sheet>
+			</tm-sheet> -->
 			<tm-button :round="24" class="sao mb-40" block @click="show_1=true">出库</tm-button>
 		</div>
 		

pages/zidingyi/index.vue

@@ -1,22 +1,22 @@
 <template>
 	<view :style="{ minHeight: sys.windowHeight + 'px' }"
 		:class="[$tm.vx.state().tmVuetify.black ? 'black' : ' ']">
-		<tm-menubars title="消息列表" :shadow="0" :showback="true"></tm-menubars>
+		<tm-menubars title="搭配详情" :shadow="0" :showback="true"></tm-menubars>
 		<div class="zhuti">
 			<tm-sheet class="kuang" style="padding-bottom: 10px !important;">
 				<view style="width: 94%;margin:0 auto;">
 					<image class="chuanda" src="/static/img/108.png" mode="widthFix"></image>
 					<view class="shuru" v-if="off==1">
 						<tm-form>
-							<view class="text-size-m text-white">请输入家庭名称</view>
-							<tm-input v-model="familyname" name="title" clear placeholder="请输入" clear></tm-input>
+							<view class="text-size-m text-white">请输入搭配名称</view>
+							<tm-input v-model="familyname" name="title" clear placeholder="出席重要场合" clear></tm-input>
 						</tm-form>
 					</view>
 					<view v-if="off==1" >
 						<view class="biaoti text-white mt-30 text-size-m"><view class="mr-10"></view>分类</view>
 						<tm-tabs class="C1b1b1b qiehuan" color="white"  align="left"  v-model="activeIndex" :list="list" range-key="title"></tm-tabs>
 						<view class="biaoti text-white mt-30 text-size-m"><view class="mr-10"></view>场景</view>
-						<tm-tabs class="C1b1b1b qiehuan" color="white"  align="left"  v-model="activeIndex" :list="list" range-key="title"></tm-tabs>
+						<tm-tabs class="C1b1b1b qiehuan" color="white"  align="left"  v-model="activeIndex1" :list="list1" range-key="title"></tm-tabs>
 					</view>
 					<view v-if="off==2" class="text-align-center mt-20 text-white">丝缎质感纹理风衣</view>
 					<view v-if="off==2" class="text-align-center mt-10 text-size-s">丝滑如肌肤</view>
@@ -51,9 +51,11 @@ export default {
 	data() {
 		return {
 			familyname:'',
-			off:2,
+			off:1,
 			list:['时尚','商务'],
 			activeIndex:0,
+			list1:['开会','聚餐'],
+			activeIndex:0,
 			activeIndex1:0,
 			list5:[ '搭配内的购物清单'],
 			test: [{
@@ -95,7 +97,7 @@ export default {
 	},
 	onLoad(e) {
 		if(e){
-			this.off=e.off;
+			this.off=e.off?e.off:1;
 			if(e.off==1){
 				this.typeclick=5;
 			}else{