Merge branch 'master' of https://git.liliju.com/YZM/wardrobe

# Conflicts:
#	pages/changan/index.vue
#	pages/wardrobe/index.vue
#	unpackage/dist/dev/app-plus/app-service.js
#	unpackage/dist/dev/app-plus/app-view.js

pages/changan/index.vue

@@ -18,7 +18,11 @@
 			<!-- 衣橱 -->
 			<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>
+<<<<<<< HEAD
 				<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)">
+>>>>>>> e34c4cd0946b018b2b1c677817c08c382bc29746
 					<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,6 +56,7 @@ export default {
 			quanbuList:[{
 				src:'/static/img/45.png',
 				text:'NEO CITY 涂鸦',
+<<<<<<< HEAD
 				type:'手提包'
 			},{
 				src:'/static/img/46.png',
@@ -73,6 +78,35 @@ export default {
 				src:'/static/img/47.png',
 				text:'大号版型夹克',
 				type:'新品'
+=======
+				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
+>>>>>>> e34c4cd0946b018b2b1c677817c08c382bc29746
 			}],
 			chooseindex:-1
 		};
@@ -89,7 +123,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 +188,7 @@ export default {
 		},
 		yifu(index,item){
 			
-			item.aa=! item.aa
+			item.off=! item.off
 			console.log(item)
 		},
 		qiehuanFun(){
@@ -169,7 +203,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/dizhi/index.vue

@@ -62,9 +62,9 @@ export default {
 	},
 	methods: {
 		xinjian(){
-			uni.navigateTo({
-				url: "/pages/shouhuodi/index",
-			})
+			// uni.navigateTo({
+			// 	url: "/pages/shouhuodi/index",
+			// })
 		}
 	},
 }

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

@@ -0,0 +1,383 @@
+<template>
+	<view :style="{ minHeight: sys.windowHeight + 'px' }" :class="[$tm.vx.state().tmVuetify.black ? 'black' : ' ']">
+		<tm-menubars title="" :shadow="0" :showback="false"></tm-menubars>
+		<view class="C1b1b1b">
+			<tm-search v-model="soso" color="white" confirm-text="" @click="sosoFun">
+				<!-- <template #right>
+					<view class="xiangji">
+						<image src="/static/img/xiangji.png" mode="widthFix"></image>
+					</view>
+				</template> -->
+			</tm-search>
+			<view class="dingwei">
+				<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">{{chengshi}}</text>
+				</tm-quickCity>
+				
+			</view>
+		</view>
+		<view class="zhuti mt-50">
+			<tm-grid :grid="5" :list="list3" :icon-size="140" font-color="white"></tm-grid>
+			<!-- 今日穿搭 -->
+			<tm-sheet class="lunbo">
+				<view class="py-10 text-size-g dianz">
+					<image src="/static/img/6.png" mode="widthFix"></image>
+					<text class="text-white">今日穿搭推荐</text>
+				</view>
+				<view class="mt-20 text-size-g">
+					<view class="text-white">
+						西装夹克高级感穿搭 | 彰显
+						<view class="qiehuan">
+							<tm-translate class="fl a_1" :auto="true" ref="a_1" :duration="80"  animation-name="zoomIn">
+								<image v-if="current==0" class="anniu mr-10" src="/static/img/14.png" mode="widthFix"></image>
+								<image v-if="current!=0" @click="xia()" class="anniu mr-10" src="/static/img/12.png" mode="widthFix"></image>
+							</tm-translate>
+							<tm-swiper @click="tiaoclick" @change="jinriFun" class="tu fl" :previmage="false" :noSwiping="true" :height="220" :width="250" :current="current" :margin="8"  :autoplay="false" :list="list"></tm-swiper>
+							<tm-translate class="fl a_1" :auto="true" ref="a_5" :duration="80"  animation-name="zoomIn">
+								<image v-if="current<(list.length-1)" @click="shang()" class="anniu fl ml-10" src="/static/img/13.png" mode="widthFix"></image>
+								<image v-if="current>(list.length-2)" class="anniu fl ml-10" src="/static/img/11.png" mode="widthFix"></image>
+							</tm-translate>
+						</view>
+					</view>
+					<view class="text-white">秋冬复古型男典范</view>
+				</view>
+				<view class="touxiang mt-30">
+					<image src="/static/img/7.png" mode="widthFix"></image>
+					<text class="text-white text-size-m">可樂crys</text>
+				</view>
+				<view class="shoucang mt-30">
+					<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>
+						</tm-translate>
+					</view>
+					<view class="fl di" @click="zan">
+						<tm-translate ref="a_2" :auto="true" :duration="80"  animation-name="zoomIn">
+							<image :src="dianzan?'/static/img/16.png':'/static/img/9.png'" mode="widthFix" style="margin-right: 15px;"></image>
+						</tm-translate>
+					</view>
+					<view style="clear: both;"></view>
+				</view>
+			</tm-sheet>
+			<!-- 明日计划 -->
+			<tm-sheet class="lunbo1">
+				<view class="py-10 text-size-g dianz mingri">
+					<image src="/static/img/17.png" mode="widthFix"></image>
+					<text class="text-white">明日计划</text>
+				</view>
+				<view class="mt-20 text-size-g jihua">
+					<tm-translate class="a_1" ref="a_6" :auto="true" :duration="80"  animation-name="zoomIn">
+						<image @click="jihuashang()" class="anniu mr-10" src="/static/img/18.png" mode="widthFix"></image>
+					</tm-translate>
+					<view class="bbb">
+						<tm-swiper @click="tiao" class="aaa" :previmage="false" :noSwiping="true" :current="current1" :autoplay="false" :list="list1"></tm-swiper>
+					</view>
+					<tm-translate class="a_1" ref="a_4" :auto="true" :duration="80"  animation-name="zoomIn" style="right: 0px;">
+						<image @click="jihuaxia()" class="anniu mr-10" src="/static/img/19.png" mode="widthFix"></image>
+					</tm-translate>
+					<view style="clear: both;"></view>
+				</view>
+			</tm-sheet>
+			<!-- 热门穿搭 -->
+			<tm-sheet class="lunbo1" style="margin-bottom: 70px !important;">
+				<view class="py-10 text-size-g dianz mingri">
+					<image src="/static/img/24.png" mode="widthFix"></image>
+					<text class="text-white">热门穿搭</text>
+				</view>
+				<view class="text-size-g jihua remen">
+					<view style="width: 48%;" class="fl">
+						<view @click="tiaodapei()" v-for="(item,index) in listdata" v-if="index%2==0" class="round-3 shadow-2 overflow pa-10 mt-20" :class="[$tm.vx.state().tmVuetify.black ? 'black' : 'white']">
+							<image class="logo" :src="item.image" mode="widthFix"></image>
+							<view class="pa-10 text-size-s">
+								<view class="text-overflow-2">
+									<text>{{item.text}}</text>
+								</view>
+								<view class="mt-2 flex-between flex-center">
+									<view class="touxiang mt-30">
+										<image src="/static/img/7.png" mode="widthFix"></image>
+										<text class="text-white text-size-m">可樂crys</text>
+									</view>
+									<view >
+										<!-- <tm-translate ref="a_2" :duration="80"  animation-name="fadeIn"> -->
+											<image class="remenzan" :src="dianzan1?'/static/img/29.png':'/static/img/9.png'" mode="widthFix"></image>
+										<!-- </tm-translate> -->
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+					<view style="width: 46%;" class="fr">
+						<view style="width: 100%;" class="fr round-3 shadow-2 overflow pa-10 mt-20" :class="[$tm.vx.state().tmVuetify.black ? 'black' : 'white']">
+							<view class="py-10 text-size-m dianz mingri">
+								<text style="vertical-align: middle;" class="text-white">销量飙升榜</text>
+								<image style="width: 25px;margin-left: 8px;" src="/static/img/36.png" mode="widthFix"></image>
+							</view>
+							<view class="py-10 text-size-s dianz mingri">
+								<text class="text-white">亿万新品趋势洞察</text>
+							</view>
+							<view class="mt-10" v-for="item in list2">
+								<image class="chuandaimg fl" :src="item.img" mode="widthFix"></image>
+								<view class="chuandazi fr">
+									<view class="text-size-m text-weight-b text-overflow-2">{{item.title}}</view>
+									<view class="tm-cartCellListFood-label text-size-s text-grey py-8">{{item.text}}</view>
+									<image class="gengduo fr" src="/static/img/40.png" mode="widthFix"></image>
+								</view>
+								<view style="clear: both;"></view>
+							</view>
+						</view>
+						<view style="clear: both;"></view>
+						<view v-for="(item,index) in listdata" v-if="index%2==1" class="round-3 shadow-2 overflow pa-10 mt-20" :class="[$tm.vx.state().tmVuetify.black ? 'black' : 'white']">
+							<image class="logo" :src="item.image" mode="widthFix"></image>
+							<view class="pa-10 text-size-s">
+								<view class="text-overflow-2">
+									<text>{{item.text}}</text>
+								</view>
+								<view class="mt-24 flex-between flex-center">
+									<view class="touxiang mt-30">
+										<image src="/static/img/7.png" mode="widthFix"></image>
+										<text class="text-white text-size-m">可樂crys</text>
+									</view>
+									<view >
+										<!-- <tm-translate ref="a_7" :duration="80"  animation-name="fadeIn"> -->
+											<image class="remenzan" :src="dianzan1?'/static/img/29.png':'/static/img/9.png'" mode="widthFix"></image>
+										<!-- </tm-translate> -->
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+					
+					<view style="clear: both;" class="more ma-40 pt-40" @click="gengmore()">
+						<image src="/static/img/30.png" mode="widthFix"></image>
+						<text class="text-size-s">下拉加载更多~</text>
+					</view>
+				</view>
+			</tm-sheet>
+		</view>
+
+	
+	</view>
+</template>
+		
+<script>
+	import{myRequest} from '@/api/request.js'
+	export default {
+		data() {
+			return {
+				offshow:false,
+				chengshi:"南京",
+				defaultValue:[],
+				soso:'',
+				aab:false,
+				shoucangsrc:true,
+				dianzan:true,
+				dianzan1:true,
+				list3:[
+					{icon:'/static/img/1.png',text:'预约家政'},
+					{icon:'/static/img/2.png',text:'预约服务'},
+					{icon:'/static/img/3.png',text:'自助录入'},
+					{icon:'/static/img/4.png',text:'鞋服洗护'},
+					{icon:'/static/img/5.png',text:'闲置交换'},
+				],
+				top: 60,
+				sys: null,
+				list2:[{
+					img:'/static/img/39.png',
+					title:'单品推荐',
+					text:'3.9万人追捧'
+				},{
+					img:'/static/img/37.png',
+					title:'单品推荐',
+					text:'3.9万人追捧'
+				},{
+					img:'/static/img/38.png',
+					title:'单品推荐',
+					text:'3.9万人追捧'
+				}],
+				list:[
+					'/static/img/10.png',
+					'/static/img/10.png',
+					'/static/img/10.png',
+					'/static/img/10.png',
+					'/static/img/10.png',
+					'/static/img/10.png',
+				],
+				list1:[			
+					{src:'/static/img/20.png',title:'开会'},
+					{src:'/static/img/21.png',title:'聚餐'},
+					{src:'/static/img/22.png',title:'运动'},
+					{src:'/static/img/23.png',title:'娱乐'},
+					{src:'/static/img/20.png',title:'开会'},
+					{src:'/static/img/21.png',title:'聚餐'},
+					{src:'/static/img/22.png',title:'运动'},
+				],
+				current:0,
+				current1:0,
+				listdata:[]
+			};
+		},
+		onLoad() {
+			// #ifdef MP
+			this.top = uni.upx2px(150);
+			// #endif
+			
+		},
+		created() {
+			var that=this;
+			setTimeout(function(){
+				if(uni.getStorageSync("token")==""){
+					uni.redirectTo({
+						url:"/pages/login/index"
+					})
+				}
+			},1000)
+			this.sys = uni.getSystemInfoSync();
+			this.randouh()
+		},
+		methods: {
+			qiehuandizhi(e){
+				if(e[2]!=null){
+					this.offshow=false;
+					this.chengshi=e[1];
+				}
+			},
+			tiaodapei(){
+				uni.navigateTo({
+					url: "/pages/zidingyi/index?off=2",
+				})
+			},
+			tiao(){
+				uni.navigateTo({
+					url: "/pages/dapeizidingyi/index",
+				})
+			},
+			tiaoclick(e){
+				console.log(e)
+				uni.navigateTo({
+					url: "/pages/shouyedetail/index",
+				})
+			},
+			jinriFun(e){
+				this.current=e;
+			},
+			sosoFun(){
+				uni.navigateTo({
+					url: "/pages/sousuo/index",
+				})
+			},
+			gengmore(){
+				this.randouh()
+			},
+			itemClick(e){
+				console.log(e);
+				uni.$tm.toast(e.dirIndex+':'+e.childrenIndex)
+			},
+			randouh(){
+				let list2 = [],that=this;
+				for(let i=0;i<8;i++){
+					list2.push({
+						image:'../../static/img/25.png',
+						text:'西装穿搭 | 韩系又A又飒休闲西装 高级感'
+					})
+				}
+				this.listdata=this.listdata.concat(list2)
+			},
+			jihuashang(){
+				if(this.current1 ==0){
+					return
+				}
+				this.$refs.a_6.play()
+				this.current1=this.current1-1;
+			},
+			jihuaxia(){
+				if(this.current1 > (this.list1.length-5)){
+					return
+				}
+				this.$refs.a_4.play()
+				this.current1=this.current1+1;
+			},
+			shouc(){
+				this.shoucangsrc=! this.shoucangsrc;
+				this.$refs.a_3.play()
+			},
+			zan(){
+				this.dianzan=! this.dianzan;
+				this.$refs.a_2.play()
+			},
+			shang(){
+				this.$refs.a_5.play()
+				this.current=this.current+1;
+			},
+			xia(){
+				this.$refs.a_1.play()
+				this.current=this.current-1;
+			}
+		},
+	}
+</script>
+
+<style lang="scss">
+	/deep/ .tm-menubars .body{
+		background-color: #1b1b1b !important;
+	}
+	/deep/ .aaa uni-image{
+		width: 52px !important;
+		height: 52px !important;
+	}
+	/deep/ .aaa uni-swiper-item{
+		width: 55px !important;
+		height: 80px !important;
+		padding: 0 5px !important;
+	}
+	.xiangji image{
+		width: 30px;
+		height: 22px;
+	}
+	.suosou image{
+		width: 40px;
+	}
+	/deep/ .icon-search{
+		font-size: 23px !important;
+		color: #8E8E93 !important;
+	}
+	/deep/ .tm-search{
+		width: 94%;
+		margin: 0 auto;
+		background-color: #414141 !important;
+		border-radius: 10px;
+	}
+	/deep/ .tm-search .grey-darken-5{
+		background-color: #414141 !important;
+	}
+	.dingwei{width: 92%;margin: 0 auto;margin-top: 20px;padding-bottom: 20px;}
+	.dingwei image{width: 25px;margin-right: 10px;	}
+	/deep/ .tm-col{width: 20% !important;}
+	.zhuti{padding: 10px 10px;}
+	/deep/ .lunbo{margin:0 !important;padding: 8px !important;margin-top: 50px !important;}
+	.dianz image{width: 35px;vertical-align: middle;margin-right: 10px;}
+	/deep/ .text-size-s span,/deep/ .text-size-g{font-size: 15px;}
+	.touxiang image{width: 40px;margin-right: 10px;vertical-align: middle;}
+	.shoucang image{width: 45px;}
+	.qiehuan{float: right;}
+	.qiehuan .a_1{margin-top: 25%;}
+	.qiehuan .anniu{width: 20px;height: 20px !important;}
+	.di{background: #0D0D0D;width: 45px;height: 45px;text-align: center;line-height: 50px;border-radius: 30px;}
+	.mingri image{width: 30px;margin-right: 12px;}
+	.di image{width: 22px;margin: 0 !important;height: 20px !important;}
+	.jihua image{width: 30px;height: 30px;}
+	.jihua{position: relative;}
+	.jihua .a_1{position: absolute;top: 10%;}
+	.bbb{width: 75% !important;margin: 0 auto !important;}
+	/deep/ .bbb uni-swiper{width: 100% !important;height: 90px !important;}
+	/deep/ .bbb .flex-start{background:rgba(0, 0, 0, 0) !important;padding: 0 !important;width: 100% !important;text-align: center;margin-top: 30px;}
+	/deep/ .lunbo1{margin:0 !important;padding: 8px !important;margin-top: 20px !important;}
+	.remenzan{width: 18px !important;margin-top: 10px;}
+	.remen .logo{width: 100%;}
+	.more{text-align: center;}
+	.more image{margin-right: 10px;vertical-align: middle;}
+	.chuandaimg{width: 50% !important;}
+	.chuandazi{width: 48% !important;}
+	/deep/ .lunbo1 .fulled{width: 100% !important;}
+	/deep/ .gengduo{width: 30px !important;margin-top: 10px !important;}
+</style>

pages/shouye/index.vue

@@ -10,11 +10,11 @@
 				</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>
 		</view>
 		<view class="zhuti mt-50">
@@ -26,38 +26,29 @@
 					<text class="text-white">今日穿搭推荐</text>
 				</view>
 				<view class="mt-20 text-size-g">
-					<view class="text-white">
-						西装夹克高级感穿搭 | 彰显
+					<view class="text-white" style="display: flex;justify-content: space-between;">
+						<view class=""
+							style="display: flex;align-items: center; justify-content: center;width: 46%;font-size: 16px;font-weight: bold;">
+							{{list[current].name}}
+						</view>
 						<view class="qiehuan">
-							<tm-translate class="fl a_1" :auto="true" ref="a_1" :duration="80"  animation-name="zoomIn">
-								<image v-if="current==0" class="anniu mr-10" src="/static/img/14.png" mode="widthFix"></image>
-								<image v-if="current!=0" @click="xia()" class="anniu mr-10" src="/static/img/12.png" mode="widthFix"></image>
+							<tm-translate class="fl a_1" :auto="true" ref="a_1" :duration="80" animation-name="zoomIn">
+								<image v-if="current==0" class="anniu mr-10" src="/static/img/14.png" mode="widthFix">
+								</image>
+								<image v-if="current!=0" @click="xia()" class="anniu mr-10" src="/static/img/12.png"
+									mode="widthFix"></image>
 							</tm-translate>
-							<tm-swiper @click="tiaoclick" @change="jinriFun" class="tu fl" :previmage="false" :noSwiping="true" :height="220" :width="250" :current="current" :margin="8"  :autoplay="false" :list="list"></tm-swiper>
-							<tm-translate class="fl a_1" :auto="true" ref="a_5" :duration="80"  animation-name="zoomIn">
-								<image v-if="current<(list.length-1)" @click="shang()" class="anniu fl ml-10" src="/static/img/13.png" mode="widthFix"></image>
-								<image v-if="current>(list.length-2)" class="anniu fl ml-10" src="/static/img/11.png" mode="widthFix"></image>
+							<tm-swiper @click="tiaoclick" @change="jinriFun" class="tu fl" :previmage="false"
+								:noSwiping="true" :height="220" :width="250" :current="current" :margin="8"
+								:autoplay="false" :list="list"></tm-swiper>
+							<tm-translate class="fl a_1" :auto="true" ref="a_5" :duration="80" animation-name="zoomIn">
+								<image v-if="current<(list.length-1)" @click="shang()" class="anniu fl ml-10"
+									src="/static/img/13.png" mode="widthFix"></image>
+								<image v-if="current>(list.length-2)" class="anniu fl ml-10" src="/static/img/11.png"
+									mode="widthFix"></image>
 							</tm-translate>
 						</view>
 					</view>
-					<view class="text-white">秋冬复古型男典范</view>
-				</view>
-				<view class="touxiang mt-30">
-					<image src="/static/img/7.png" mode="widthFix"></image>
-					<text class="text-white text-size-m">可樂crys</text>
-				</view>
-				<view class="shoucang mt-30">
-					<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>
-						</tm-translate>
-					</view>
-					<view class="fl di" @click="zan">
-						<tm-translate ref="a_2" :auto="true" :duration="80"  animation-name="zoomIn">
-							<image :src="dianzan?'/static/img/16.png':'/static/img/9.png'" mode="widthFix" style="margin-right: 15px;"></image>
-						</tm-translate>
-					</view>
-					<view style="clear: both;"></view>
 				</view>
 			</tm-sheet>
 			<!-- 明日计划 -->
@@ -67,13 +58,16 @@
 					<text class="text-white">明日计划</text>
 				</view>
 				<view class="mt-20 text-size-g jihua">
-					<tm-translate class="a_1" ref="a_6" :auto="true" :duration="80"  animation-name="zoomIn">
-						<image @click="jihuashang()" class="anniu mr-10" src="/static/img/18.png" mode="widthFix"></image>
+					<tm-translate class="a_1" ref="a_6" :auto="true" :duration="80" animation-name="zoomIn">
+						<image @click="jihuashang()" class="anniu mr-10" src="/static/img/18.png" mode="widthFix">
+						</image>
 					</tm-translate>
 					<view class="bbb">
-						<tm-swiper class="aaa" :previmage="false" :noSwiping="true" :current="current1" :autoplay="false" :list="list1"></tm-swiper>
+						<tm-swiper @click="tiao" class="aaa" :previmage="false" :noSwiping="true" :current="current1"
+							:autoplay="false" :list="list1"></tm-swiper>
 					</view>
-					<tm-translate class="a_1" ref="a_4" :auto="true" :duration="80"  animation-name="zoomIn" style="right: 0px;">
+					<tm-translate class="a_1" ref="a_4" :auto="true" :duration="80" animation-name="zoomIn"
+						style="right: 0px;">
 						<image @click="jihuaxia()" class="anniu mr-10" src="/static/img/19.png" mode="widthFix"></image>
 					</tm-translate>
 					<view style="clear: both;"></view>
@@ -87,20 +81,18 @@
 				</view>
 				<view class="text-size-g jihua remen">
 					<view style="width: 48%;" class="fl">
-						<view v-for="(item,index) in listdata" v-if="index%2==0" class="round-3 shadow-2 overflow pa-10 mt-20" :class="[$tm.vx.state().tmVuetify.black ? 'black' : 'white']">
+						<view @click="tiaodapei()" v-for="(item,index) in listdata" v-if="index%2==0"
+							class="round-3 shadow-2 overflow pa-10 mt-20"
+							:class="[$tm.vx.state().tmVuetify.black ? 'black' : 'white']">
 							<image class="logo" :src="item.image" mode="widthFix"></image>
 							<view class="pa-10 text-size-s">
 								<view class="text-overflow-2">
 									<text>{{item.text}}</text>
 								</view>
 								<view class="mt-2 flex-between flex-center">
-									<view class="touxiang mt-30">
-										<image src="/static/img/7.png" mode="widthFix"></image>
-										<text class="text-white text-size-m">可樂crys</text>
-									</view>
-									<view >
+									<view>
 										<!-- <tm-translate ref="a_2" :duration="80"  animation-name="fadeIn"> -->
-											<image class="remenzan" :src="dianzan1?'/static/img/29.png':'/static/img/9.png'" mode="widthFix"></image>
+										<!-- <image class="remenzan" :src="dianzan1?'/static/img/29.png':'/static/img/9.png'" mode="widthFix"></image> -->
 										<!-- </tm-translate> -->
 									</view>
 								</view>
@@ -108,10 +100,12 @@
 						</view>
 					</view>
 					<view style="width: 46%;" class="fr">
-						<view style="width: 100%;" class="fr round-3 shadow-2 overflow pa-10 mt-20" :class="[$tm.vx.state().tmVuetify.black ? 'black' : 'white']">
+						<view style="width: 100%;" class="fr round-3 shadow-2 overflow pa-10 mt-20"
+							:class="[$tm.vx.state().tmVuetify.black ? 'black' : 'white']">
 							<view class="py-10 text-size-m dianz mingri">
 								<text style="vertical-align: middle;" class="text-white">销量飙升榜</text>
-								<image style="width: 25px;margin-left: 8px;" src="/static/img/36.png" mode="widthFix"></image>
+								<image style="width: 25px;margin-left: 8px;" src="/static/img/36.png" mode="widthFix">
+								</image>
 							</view>
 							<view class="py-10 text-size-s dianz mingri">
 								<text class="text-white">亿万新品趋势洞察</text>
@@ -120,34 +114,28 @@
 								<image class="chuandaimg fl" :src="item.img" mode="widthFix"></image>
 								<view class="chuandazi fr">
 									<view class="text-size-m text-weight-b text-overflow-2">{{item.title}}</view>
-									<view class="tm-cartCellListFood-label text-size-s text-grey py-8">{{item.text}}</view>
+									<view class="tm-cartCellListFood-label text-size-s text-grey py-8">{{item.text}}
+									</view>
 									<image class="gengduo fr" src="/static/img/40.png" mode="widthFix"></image>
 								</view>
 								<view style="clear: both;"></view>
 							</view>
 						</view>
 						<view style="clear: both;"></view>
-						<view v-for="(item,index) in listdata" v-if="index%2==1" class="round-3 shadow-2 overflow pa-10 mt-20" :class="[$tm.vx.state().tmVuetify.black ? 'black' : 'white']">
+						<view v-for="(item,index) in listdata" v-if="index%2==1"
+							class="round-3 shadow-2 overflow pa-10 mt-20"
+							:class="[$tm.vx.state().tmVuetify.black ? 'black' : 'white']">
 							<image class="logo" :src="item.image" mode="widthFix"></image>
 							<view class="pa-10 text-size-s">
 								<view class="text-overflow-2">
 									<text>{{item.text}}</text>
 								</view>
 								<view class="mt-24 flex-between flex-center">
-									<view class="touxiang mt-30">
-										<image src="/static/img/7.png" mode="widthFix"></image>
-										<text class="text-white text-size-m">可樂crys</text>
-									</view>
-									<view >
-										<!-- <tm-translate ref="a_7" :duration="80"  animation-name="fadeIn"> -->
-											<image class="remenzan" :src="dianzan1?'/static/img/29.png':'/static/img/9.png'" mode="widthFix"></image>
-										<!-- </tm-translate> -->
-									</view>
 								</view>
 							</view>
 						</view>
 					</view>
-					
+
 					<view style="clear: both;" class="more ma-40 pt-40" @click="gengmore()">
 						<image src="/static/img/30.png" mode="widthFix"></image>
 						<text class="text-size-s">下拉加载更多~</text>
@@ -155,211 +143,429 @@
 				</view>
 			</tm-sheet>
 		</view>
-
-	
 	</view>
 </template>
-		
+
 <script>
-	import{myRequest} from '@/api/request.js'
+	import {
+		myRequest
+	} from '@/api/request.js'
 	export default {
 		data() {
 			return {
-				defaultValue:[],
-				soso:'',
-				aab:false,
-				shoucangsrc:true,
-				dianzan:true,
-				dianzan1:true,
-				list3:[
-					{icon:'/static/img/1.png',text:'预约家政'},
-					{icon:'/static/img/2.png',text:'预约服务'},
-					{icon:'/static/img/3.png',text:'自助录入'},
-					{icon:'/static/img/4.png',text:'鞋服洗护'},
-					{icon:'/static/img/5.png',text:'闲置交换'},
-				],
+				offshow:false,
+				chengshi:"南京",
+				defaultValue: [],
+				soso: '',
+				aab: false,
+				shoucangsrc: true,
+				dianzan: true,
+				dianzan1: true,
+				list3: [],
 				top: 60,
 				sys: null,
-				list2:[{
-					img:'/static/img/39.png',
-					title:'单品推荐',
-					text:'3.9万人追捧'
-				},{
-					img:'/static/img/37.png',
-					title:'单品推荐',
-					text:'3.9万人追捧'
-				},{
-					img:'/static/img/38.png',
-					title:'单品推荐',
-					text:'3.9万人追捧'
+				list2: [{
+					img: '/static/img/39.png',
+					title: '单品推荐',
+					text: '3.9万人追捧'
+				}, {
+					img: '/static/img/37.png',
+					title: '单品推荐',
+					text: '3.9万人追捧'
+				}, {
+					img: '/static/img/38.png',
+					title: '单品推荐',
+					text: '3.9万人追捧'
 				}],
-				list:[
-					'/static/img/10.png',
-					'/static/img/10.png',
-					'/static/img/10.png',
-					'/static/img/10.png',
-					'/static/img/10.png',
-					'/static/img/10.png',
-				],
-				list1:[			
-					{src:'/static/img/20.png',title:'开会'},
-					{src:'/static/img/21.png',title:'聚餐'},
-					{src:'/static/img/22.png',title:'运动'},
-					{src:'/static/img/23.png',title:'娱乐'},
-					{src:'/static/img/20.png',title:'开会'},
-					{src:'/static/img/21.png',title:'聚餐'},
-					{src:'/static/img/22.png',title:'运动'},
-				],
-				current:0,
-				current1:0,
-				listdata:[]
+				list: [],
+				list1: [],
+				current: 0,
+				current1: 0,
+				listdata: []
 			};
 		},
 		onLoad() {
 			// #ifdef MP
 			this.top = uni.upx2px(150);
 			// #endif
-			
 		},
 		created() {
-			var that=this;
-			setTimeout(function(){
-				if(uni.getStorageSync("token")==""){
+			var that = this;
+			setTimeout(function() {
+				if (uni.getStorageSync("token") == "") {
 					uni.redirectTo({
-						url:"/pages/login/index"
+						url: "/pages/login/index"
 					})
 				}
-			},1000)
+			}, 1000)
 			this.sys = uni.getSystemInfoSync();
-			this.randouh()
+			this.getService();
+			this.getremmend();
+			this.getHot();
+			this.getPlan();
 		},
 		methods: {
-			tiaoclick(e){
+			// 获取用户服务列表
+			getService() {
+				let that = this;
+				myRequest({
+					url: "/api/Service/serviceList",
+					method: 'get',
+					data: that.reqData
+				}).then(res => {
+					if (res.data.code == 200) {
+						res.data.data.forEach(item => {
+							that.list3.push({
+								icon: item.simg,
+								text: item.name,
+								sort: item.sort
+							})
+						})
+					} else {
+						that.$refs.toast.show({
+							model: 'error',
+							label: res.data.msg
+						})
+					}
+				})
+			},
+			// 获取穿搭推荐
+			getremmend() {
+				let that = this;
+				myRequest({
+					url: "/api/Collocation/recommendList",
+					method: 'get',
+					data: that.reqData
+				}).then(res => {
+					// console.log(res.data)
+					if (res.data.code == 200) {
+						res.data.data.forEach(item => {
+							that.list.push({
+								src: item.thumb,
+								name: item.title
+							})
+						})
+					} else {
+						that.$refs.toast.show({
+							model: 'error',
+							label: res.data.msg
+						})
+					}
+				})
+			},
+			// 获取明日计划
+			getPlan() {
+				let that = this;
+				myRequest({
+					url: "/api/Scene/sceneList",
+					method: 'get',
+					data: that.reqData
+				}).then(res => {
+					console.log(res.data)
+					if (res.data.code == 200) {
+						res.data.data.forEach(item => {
+							that.list1.push({
+								src: item.img,
+								title: item.scene_name
+							})
+						})
+					} else {
+						that.$refs.toast.show({
+							model: 'error',
+							label: res.data.msg
+						})
+					}
+				})
+			},
+			// 获取热门穿搭
+			getHot() {
+				let that = this;
+				myRequest({
+					url: "/api/Collocation/hotList",
+					method: 'get',
+					data: that.reqData
+				}).then(res => {
+					if (res.data.code == 200) {
+						res.data.data.forEach(item => {
+							that.listdata.push({
+								image: item.thumb,
+								text: item.title
+							})
+						})
+					} else {
+						that.$refs.toast.show({
+							model: 'error',
+							label: res.data.msg
+						})
+					}
+				})
+			},
+			tiaodapei() {
+				uni.navigateTo({
+					url: "/pages/zidingyi/index",
+				})
+			},
+			tiao() {
+				uni.navigateTo({
+					url: "/pages/dapeizidingyi/index",
+				})
+			},
+			tiaoclick(e) {
 				console.log(e)
 				uni.navigateTo({
 					url: "/pages/shouyedetail/index",
 				})
 			},
-			jinriFun(e){
-				this.current=e;
+			jinriFun(e) {
+				this.current = e;
 			},
-			sosoFun(){
+			sosoFun() {
 				uni.navigateTo({
 					url: "/pages/sousuo/index",
 				})
 			},
-			gengmore(){
-				this.randouh()
+			gengmore() {
 			},
-			itemClick(e){
+			itemClick(e) {
 				console.log(e);
-				uni.$tm.toast(e.dirIndex+':'+e.childrenIndex)
+				uni.$tm.toast(e.dirIndex + ':' + e.childrenIndex)
 			},
-			randouh(){
-				let list2 = [],that=this;
-				for(let i=0;i<8;i++){
+			randouh() {
+				let list2 = [],
+					that = this;
+				for (let i = 0; i < 8; i++) {
 					list2.push({
-						image:'../../static/img/25.png',
-						text:'西装穿搭 | 韩系又A又飒休闲西装 高级感'
+						image: '../../static/img/25.png',
+						text: '西装穿搭 | 韩系又A又飒休闲西装 高级感'
 					})
 				}
-				this.listdata=this.listdata.concat(list2)
+				this.listdata = this.listdata.concat(list2)
 			},
-			jihuashang(){
-				if(this.current1 ==0){
+			jihuashang() {
+				if (this.current1 == 0) {
 					return
 				}
 				this.$refs.a_6.play()
-				this.current1=this.current1-1;
+				this.current1 = this.current1 - 1;
 			},
-			jihuaxia(){
-				if(this.current1 > (this.list1.length-5)){
+			jihuaxia() {
+				if (this.current1 > (this.list1.length - 5)) {
 					return
 				}
 				this.$refs.a_4.play()
-				this.current1=this.current1+1;
+				this.current1 = this.current1 + 1;
 			},
-			shouc(){
-				this.shoucangsrc=! this.shoucangsrc;
+			shouc() {
+				this.shoucangsrc = !this.shoucangsrc;
 				this.$refs.a_3.play()
 			},
-			zan(){
-				this.dianzan=! this.dianzan;
+			zan() {
+				this.dianzan = !this.dianzan;
 				this.$refs.a_2.play()
 			},
-			shang(){
+			shang() {
 				this.$refs.a_5.play()
-				this.current=this.current+1;
+				this.current = this.current + 1;
 			},
-			xia(){
+			xia() {
 				this.$refs.a_1.play()
-				this.current=this.current-1;
+				this.current = this.current - 1;
 			}
 		},
 	}
 </script>
 
 <style lang="scss">
-	/deep/ .tm-menubars .body{
+	/deep/ .tm-menubars .body {
 		background-color: #1b1b1b !important;
 	}
-	/deep/ .aaa uni-image{
+
+	/deep/ .aaa uni-image {
 		width: 52px !important;
 		height: 52px !important;
 	}
-	/deep/ .aaa uni-swiper-item{
+
+	/deep/ .aaa uni-swiper-item {
 		width: 55px !important;
 		height: 80px !important;
 		padding: 0 5px !important;
 	}
-	.xiangji image{
+
+	.xiangji image {
 		width: 30px;
 		height: 22px;
 	}
-	.suosou image{
+
+	.suosou image {
 		width: 40px;
 	}
-	/deep/ .icon-search{
+
+	/deep/ .icon-search {
 		font-size: 23px !important;
 		color: #8E8E93 !important;
 	}
-	/deep/ .tm-search{
+
+	/deep/ .tm-search {
 		width: 94%;
 		margin: 0 auto;
 		background-color: #414141 !important;
 		border-radius: 10px;
 	}
-	/deep/ .tm-search .grey-darken-5{
+
+	/deep/ .tm-search .grey-darken-5 {
 		background-color: #414141 !important;
 	}
-	.dingwei{width: 92%;margin: 0 auto;margin-top: 20px;padding-bottom: 20px;}
-	.dingwei image{width: 25px;margin-right: 10px;	}
-	/deep/ .tm-col{width: 20% !important;}
-	.zhuti{padding: 10px 10px;}
-	/deep/ .lunbo{margin:0 !important;padding: 8px !important;margin-top: 50px !important;}
-	.dianz image{width: 35px;vertical-align: middle;margin-right: 10px;}
-	/deep/ .text-size-s span,/deep/ .text-size-g{font-size: 15px;}
-	.touxiang image{width: 40px;margin-right: 10px;vertical-align: middle;}
-	.shoucang image{width: 45px;}
-	.qiehuan{float: right;}
-	.qiehuan .a_1{margin-top: 25%;}
-	.qiehuan .anniu{width: 20px;height: 20px !important;}
-	.di{background: #0D0D0D;width: 45px;height: 45px;text-align: center;line-height: 50px;border-radius: 30px;}
-	.mingri image{width: 30px;margin-right: 12px;}
-	.di image{width: 22px;margin: 0 !important;height: 20px !important;}
-	.jihua image{width: 30px;height: 30px;}
-	.jihua{position: relative;}
-	.jihua .a_1{position: absolute;top: 10%;}
-	.bbb{width: 75% !important;margin: 0 auto !important;}
-	/deep/ .bbb uni-swiper{width: 100% !important;height: 90px !important;}
-	/deep/ .bbb .flex-start{background:rgba(0, 0, 0, 0) !important;padding: 0 !important;width: 100% !important;text-align: center;margin-top: 30px;}
-	/deep/ .lunbo1{margin:0 !important;padding: 8px !important;margin-top: 20px !important;}
-	.remenzan{width: 18px !important;margin-top: 10px;}
-	.remen .logo{width: 100%;}
-	.more{text-align: center;}
-	.more image{margin-right: 10px;vertical-align: middle;}
-	.chuandaimg{width: 50% !important;}
-	.chuandazi{width: 48% !important;}
-	/deep/ .lunbo1 .fulled{width: 100% !important;}
-	/deep/ .gengduo{width: 30px !important;margin-top: 10px !important;}
+
+	.dingwei {
+		width: 92%;
+		margin: 0 auto;
+		margin-top: 20px;
+		padding-bottom: 20px;
+	}
+
+	.dingwei image {
+		width: 25px;
+		margin-right: 10px;
+	}
+
+	/deep/ .tm-col {
+		width: 20% !important;
+	}
+
+	.zhuti {
+		padding: 10px 10px;
+	}
+
+	/deep/ .lunbo {
+		margin: 0 !important;
+		padding: 8px !important;
+		margin-top: 50px !important;
+	}
+
+	.dianz image {
+		width: 35px;
+		vertical-align: middle;
+		margin-right: 10px;
+	}
+
+	/deep/ .text-size-s span,
+	/deep/ .text-size-g {
+		font-size: 15px;
+	}
+
+	.touxiang image {
+		width: 40px;
+		margin-right: 10px;
+		vertical-align: middle;
+	}
+
+	.shoucang image {
+		width: 45px;
+	}
+
+	.qiehuan {
+		float: right;
+	}
+
+	.qiehuan .a_1 {
+		margin-top: 25%;
+	}
+
+	.qiehuan .anniu {
+		width: 20px;
+		height: 20px !important;
+	}
+
+	.di {
+		background: #0D0D0D;
+		width: 45px;
+		height: 45px;
+		text-align: center;
+		line-height: 50px;
+		border-radius: 30px;
+	}
+
+	.mingri image {
+		width: 30px;
+		margin-right: 12px;
+	}
+
+	.di image {
+		width: 22px;
+		margin: 0 !important;
+		height: 20px !important;
+	}
+
+	.jihua image {
+		width: 30px;
+		height: 30px;
+	}
+
+	.jihua {
+		position: relative;
+	}
+
+	.jihua .a_1 {
+		position: absolute;
+		top: 10%;
+	}
+
+	.bbb {
+		width: 75% !important;
+		margin: 0 auto !important;
+	}
+
+	/deep/ .bbb uni-swiper {
+		width: 100% !important;
+		height: 90px !important;
+	}
+
+	/deep/ .bbb .flex-start {
+		background: rgba(0, 0, 0, 0) !important;
+		padding: 0 !important;
+		width: 100% !important;
+		text-align: center;
+		margin-top: 30px;
+	}
+
+	/deep/ .lunbo1 {
+		margin: 0 !important;
+		padding: 8px !important;
+		margin-top: 20px !important;
+	}
+
+	.remenzan {
+		width: 18px !important;
+		margin-top: 10px;
+	}
+
+	.remen .logo {
+		width: 100%;
+	}
+
+	.more {
+		text-align: center;
+	}
+
+	.more image {
+		margin-right: 10px;
+		vertical-align: middle;
+	}
+
+	.chuandaimg {
+		width: 50% !important;
+	}
+
+	.chuandazi {
+		width: 48% !important;
+	}
+
+	/deep/ .lunbo1 .fulled {
+		width: 100% !important;
+	}
+
+	/deep/ .gengduo {
+		width: 30px !important;
+		margin-top: 10px !important;
+	}
 </style>

pages/shouyedetail/index.vue

@@ -97,9 +97,9 @@ export default {
 	},
 	methods: {
 		jiarufuFun(data){
-			// uni.navigateTo({
-			// 	url: "/pages/gouwuche/index",
-			// })
+			uni.navigateTo({
+				url: "/pages/shopdetail/index",
+			})
 			console.log(data)
 			// this.gouwuche.push(data)
 		},

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'},

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,11 @@
 			<!-- 衣橱 -->
 			<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>
+<<<<<<< HEAD
 				<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">
+>>>>>>> e34c4cd0946b018b2b1c677817c08c382bc29746
 					<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>
@@ -70,14 +74,18 @@
 			</tm-sheet>
 		</view>
 		<!-- 待取衣服 -->
-		<tm-translate ref="a_1" :auto="true" animation-name="fadeLeft">
-			<view class="fudong" @click="chuku">
-				<image src="/static/img/96.png" class="fudimg fl"></image>
-				<view class="pt-20">待取衣物</view>
-				<view>(<text style="color: #FFCC00;">3</text>件)</view>
-			</view>
-		</tm-translate>
 		
+		<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="qiuqu">
+		    		<image src="/static/img/96.png" class="fudimg fl"></image>
+		    		<view class="pt-20">待取衣物</view>
+		    		<view>(<text style="color: #FFCC00;">3</text>件)</view>
+		    	</view>
+		    </tm-translate>
+		  </view>
+		</css-float-ball>
 	</view>
 </template>	
 <script>
@@ -85,6 +93,7 @@ import{myRequest} from '@/api/request.js'
 export default {
 	data() {
 		return {
+			floatBallPosition:{x: 400, y: 750},
 			itemuser:0,
 			soso:'',
 			activeIndex:0,
@@ -135,6 +144,19 @@ export default {
 		this.fenleichange();
 	},
 	methods: {
+<<<<<<< HEAD
+=======
+		tiao(){
+			uni.navigateTo({
+				url: "/pages/zidingyi/index",
+			})
+		},
+		qiuqu(){
+			uni.navigateTo({
+				url: "/pages/yifu/index",
+			})
+		},
+>>>>>>> e34c4cd0946b018b2b1c677817c08c382bc29746
 		fenleichangeFun(){
 			var that=this;
 			// role_id:,id:
@@ -157,7 +179,11 @@ export default {
 				// }
 			})
 		},
+<<<<<<< HEAD
 		longtap(){
+=======
+		tiaozhuan(){
+>>>>>>> e34c4cd0946b018b2b1c677817c08c382bc29746
 			console.log("111")
 			uni.navigateTo({
 				url: "/pages/changan/index",

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{

uni_modules/css-float-ball/changelog.md

@@ -0,0 +1,25 @@
+## 1.1.1（2022-05-20）
+修复已知问题
+## 1.0.9（2022-04-11）
+补充组件API说明
+## 1.0.8（2022-04-11）
+补充注释与使用说明
+## 1.0.7（2022-02-11）
+解决app上悬浮球变形问题
+## 1.0.6（2022-02-11）
+悬浮球全部交由外部实现
+## 1.0.5（2022-02-11）
+加入插槽,将内部交由外部实现
+减少防抖时间间隔
+增加内部插槽示例
+## 1.0.4（2022-02-11）
+修复页面滚动时，悬浮球位移问题
+## 1.0.3（2022-02-11）
+修复单独使用组件缺少样式问题
+## 1.0.2（2022-02-11）
+修复已知问题
+## 1.0.1（2022-02-11）
+悬浮球可超出边缘，修复已知问题
+## 1.0.0 （2022-02-10）
+
+基于uni-app的通用组件（支持App，微信小程序）; 可拖拽的悬浮球，保持不同页面位置一致

uni_modules/css-float-ball/components/css-float-ball/css-float-ball.vue

@@ -0,0 +1,65 @@
+<template>
+  <view class="float-ball-wrap" :style="{zIndex}">
+    <movable-area class="float-ball-movable-area">
+      <!--悬浮球主体-->
+      <movable-view :x="value.x" :y="value.y" class="float-ball" direction="all" inertia :animation="false"
+                    @change="drag" out-of-bounds>
+        <!--悬浮球外部插槽-->
+		<slot></slot>
+      </movable-view>
+    </movable-area>
+  </view>
+</template>
+
+<script>
+import {debounce} from './util'
+
+export default {
+  name: 'css-float-ball',
+  props: {
+    zIndex: {
+      type: [String, Number],
+      default: 999,
+    },
+    autoBox: {
+      type: [Boolean],
+      default: true,
+    },
+    value: {
+      type: Object,
+      required: true,
+      default() {
+        return {x: 360, y: 256}
+      }
+    },
+    //防抖时长
+    debounce:{
+      type: Number,
+      default:128,
+    },
+  },
+  computed: {},
+  data() {
+    return {}
+  },
+  methods: {
+    /**
+     * 拖动时，更新globalData，也可以用vuex替代
+     * @param e
+     */
+    drag(e) {
+      const _this = this;
+      debounce(function () {
+        getApp().globalData.globalFloatBallPosition = e.detail;
+      }, _this.debounce)
+    },
+  },
+}
+</script>
+<style lang="scss" scoped>
+@import "index";
+
+.default-icon-hover {
+  opacity: 0.6;
+}
+</style>

uni_modules/css-float-ball/components/css-float-ball/index.scss

@@ -0,0 +1,37 @@
+.defaultFlex{
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.float-ball-wrap {
+  position: fixed;
+  top: 0;
+  left: 0;
+  z-index: 9999;
+  width: 100vw;
+  height: 100vh;
+  pointer-events: none;
+  overflow: hidden;
+
+}
+.float-ball-movable-area {
+  @extend .defaultFlex;
+  position: relative;
+  top: -2.5%;
+  left: -5%;
+  z-index: 16;
+  width: 110%;
+  height: 105%;
+
+
+}
+.float-ball {
+  flex: 1;
+  pointer-events: auto;
+  width: auto;
+  height: auto;
+  @extend .defaultFlex;
+  z-index: 16;
+  background-color: white;
+  border-radius: 50%;
+}

uni_modules/css-float-ball/components/css-float-ball/mixin.js

@@ -0,0 +1,21 @@
+export default {
+    data() {
+        return {
+            floatBallPosition: {x: 360, y: 256}
+        }
+    },
+    methods: {
+        /**
+         * 调用getApp()获取globalData中的悬浮球最新位置
+         */
+        floatBallPositionChange(){
+            this.floatBallPosition = getApp().globalData.globalFloatBallPosition
+        },
+    },
+    /**
+     * 页面显示时
+     */
+    onShow() {
+        this.floatBallPositionChange();
+    },
+}

uni_modules/css-float-ball/components/css-float-ball/util.js

@@ -0,0 +1,64 @@
+let timeout = null;
+
+/**
+ * 最好用lodash的debounce!!!
+ * 防抖原理：一定时间内，只有最后一次操作，再过wait毫秒后才执行函数
+ * @param {Function} func 要执行的回调函数
+ * @param {Number} wait 延时的时间
+ * @param {Boolean} immediate 是否立即执行
+ * @return null
+ */
+function debounce(func, wait = 500, immediate = false) {
+  // 清除定时器
+  if (timeout !== null) clearTimeout(timeout);
+  // 立即执行，此类情况一般用不到
+  if (immediate) {
+    var callNow = !timeout;
+    timeout = setTimeout(function () {
+      timeout = null;
+    }, wait);
+    if (callNow) typeof func === 'function' && func();
+  } else {
+    // 设置定时器，当最后一次操作后，timeout不会再被清除，所以在延时wait毫秒后执行func回调方法
+    timeout = setTimeout(function () {
+      typeof func === 'function' && func();
+    }, wait);
+  }
+}
+
+let timer, flag;
+
+/**
+ * 最好用lodash的throttle!!!
+ * 节流原理：在一定时间内，只能触发一次
+ * @param {Function} func 要执行的回调函数
+ * @param {Number} wait 延时的时间
+ * @param {Boolean} immediate 是否立即执行
+ * @return null
+ */
+function throttle(func, wait = 500, immediate = true) {
+  if (immediate) {
+    if (!flag) {
+      flag = true;
+      // 如果是立即执行，则在wait毫秒内开始时执行
+      typeof func === 'function' && func();
+      timer = setTimeout(() => {
+        flag = false;
+      }, wait);
+    }
+  } else {
+    if (!flag) {
+      flag = true
+      // 如果是非立即执行，则在wait毫秒内的结束处执行
+      timer = setTimeout(() => {
+        flag = false
+        typeof func === 'function' && func();
+      }, wait);
+    }
+    
+  }
+}
+export {
+  throttle,
+  debounce
+}

uni_modules/css-float-ball/package.json

@@ -0,0 +1,84 @@
+{
+  "id": "css-float-ball",
+  "displayName": "uniapp-movable 可拖动悬浮球",
+  "version": "1.1.1",
+  "description": "导入组件并将统一方法mixin至页面当中，保证引用悬浮球的页面，悬浮位置一致。",
+  "keywords": [
+    "悬浮球",
+    "可拖动悬浮球",
+    "uniapp",
+    "movable-view",
+    "movable-area"
+],
+  "repository": "",
+  "engines": {
+    "HBuilderX": "^3.3.10"
+  },
+  "dcloudext": {
+    "category": [
+        "前端组件",
+        "通用组件"
+    ],
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "插件不采集任何数据",
+      "permissions": "无"
+    },
+    "npmurl": ""
+  },
+  "uni_modules": {
+    "dependencies": [],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "Vue": {
+          "vue2": "y",
+          "vue3": "u"
+        },
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "n"
+        },
+        "H5-mobile": {
+          "Safari": "u",
+          "Android Browser": "u",
+          "微信浏览器(Android)": "u",
+          "QQ浏览器(Android)": "u"
+        },
+        "H5-pc": {
+          "Chrome": "u",
+          "IE": "u",
+          "Edge": "u",
+          "Firefox": "u",
+          "Safari": "u"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "u",
+          "百度": "u",
+          "字节跳动": "u",
+          "QQ": "u"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        }
+      }
+    }
+  }
+}

uni_modules/css-float-ball/readme.md

@@ -0,0 +1,77 @@
+## Attributes
+
+------
+|   参数	           |  说明        |  类型       |  可选值    | 默认值|
+| ----             |    ----    |    ----    |   ----    | ---- |
+|  value / v-model |    悬浮球位置 |    Object  | — | — |
+| zIndex |    叠加顺序    |    String/Number    | — | 999 |
+| debounce |    防抖时长    |    Number    | — | 128 |
+## 组件引用
+
+------
+### App.vue
+```vue
+<script>
+export default {
+  globalData: {
+    //定义全局变量以供各个页面使用
+    globalFloatBallPosition: {x: 360, y: 256},
+  },
+}
+</script>
+```
+### 需引用页面
+```vue
+<template>
+  <view class="workbench-wrap">
+    <!-- floatBallPosition已在插件的mixin文件中定义 -->
+    <css-float-ball v-model="floatBallPosition">
+      <!-- <ball/> 为自己实现的球本体。如示例内的<ball/>组件 -->
+      <!-- <ball/> -->
+      <view class="float-ball-icon" hover-class="default-icon-hover" @click="()=>{}">
+        <icon type="success" :size="48"/>
+      </view>
+    </css-float-ball>
+    <view class="workbench-main-wrap">
+    </view>
+  </view>
+</template>
+
+<script>
+// pages.json 中 easycom 为自动读取uni_modules内插件时，可省略
+// import CssFloatBall from  '@/uni_modules/css-float-ball/components/css-float-ball/css-float-ball'
+// import Ball from  '@/components/ball/ball'
+import FloatBallMixin from '../../uni_modules/css-float-ball/components/css-float-ball/mixin'
+
+export default {
+  name: 'WorkBench',
+  // pages.json 中 easycom 为自动读取uni_modules内插件时，可省略
+  // components:{
+  //   CssFloatBall,
+  //   Ball,
+  // },
+  mixins:[FloatBallMixin],
+}
+</script>
+<style lang="scss" scoped>
+@import "index";
+.float-ball-icon {
+  background-color: #FFF;
+  width: 128rpx;
+  height: 128rpx;
+  border-radius: 50%;
+  @extend .defaultFlex;
+  -webkit-box-shadow: 0rpx 8rpx 20rpx 8rpx rgba(204, 204, 204, 0.47);
+  -moz-box-shadow: 0rpx 8rpx 20rpx 8rpx rgba(204, 204, 204, 0.47);
+  box-shadow: 0rpx 8rpx 20rpx 8rpx rgba(204, 204, 204, 0.47);
+}
+</style>
+```
+## PS:
+在安卓、微信小程序流畅度还可以，其他平台暂未测试
+
+pages.json 中 easycom 为自动读取uni_modules内插件时，可省略引入组件
+
+防抖可以用lodash的debounce
+
+欢迎斧正

uni_modules/uni-scss/changelog.md

@@ -0,0 +1,6 @@
+## 1.0.2（2021-11-22）
+- 修复 / 符号在 vue 不同版本兼容问题引起的报错问题
+## 1.0.1（2021-11-22）
+- 修复 vue3中scss语法兼容问题
+## 1.0.0（2021-11-18）
+- init

uni_modules/uni-scss/index.scss

@@ -0,0 +1 @@
+@import './styles/index.scss';

uni_modules/uni-scss/manifest.json

@@ -0,0 +1,95 @@
+{
+	"name" : "",
+	"appid" : "",
+	"description": "应用描述",
+	"versionName": "1.0.0",
+	"versionCode": "100",
+	"transformPx": false,
+	/* 5+App特有相关 */
+	"app-plus": {
+		"usingComponents": true,
+		"splashscreen": {
+			"alwaysShowBeforeRender": true,
+			"waiting": true,
+			"autoclose": true,
+			"delay": 0
+		},
+		"modules": {
+			"OAuth": {},
+			"Payment": {},
+			"Push": {},
+			"Share": {},
+			"Speech": {},
+			"VideoPlayer": {}
+		},
+		/* 应用发布信息 */
+		"distribute": {
+			/* android打包配置 */
+			"android": {
+				"permissions": [
+					"<uses-feature android:name=\"android.hardware.camera\"/>",
+					"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
+					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_MOCK_LOCATION\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
+					"<uses-permission android:name=\"android.permission.CAMERA\"/>",
+					"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+					"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+					"<uses-permission android:name=\"android.permission.GET_TASKS\"/>",
+					"<uses-permission android:name=\"android.permission.INTERNET\"/>",
+					"<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
+					"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+					"<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
+					"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.READ_SMS\"/>",
+					"<uses-permission android:name=\"android.permission.RECEIVE_BOOT_COMPLETED\"/>",
+					"<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
+					"<uses-permission android:name=\"android.permission.SEND_SMS\"/>",
+					"<uses-permission android:name=\"android.permission.SYSTEM_ALERT_WINDOW\"/>",
+					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+					"<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
+					"<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
+					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
+					"<uses-permission android:name=\"android.permission.WRITE_SMS\"/>",
+					"<uses-permission android:name=\"android.permission.RECEIVE_USER_PRESENT\"/>"
+				]
+			},
+			/* ios打包配置 */
+			"ios": {
+				"UIBackgroundModes": ["audio"]
+			},
+			/* SDK配置 */
+			"sdkConfigs": {
+				"speech": {
+					"ifly": {}
+				}
+			},
+			"orientation": ["portrait-primary"]
+		}
+	},
+	/* 快应用特有相关 */
+	"quickapp": {},
+	/* 小程序特有相关 */
+	"mp-weixin": {
+		"appid": "",
+		"setting": {
+			"urlCheck": false
+		},
+		"usingComponents": true
+	},
+	"h5": {
+		"template": "template.h5.html",
+		"router": {
+			"mode": "history",
+			"base": "/h5/"
+		}
+	}
+}

uni_modules/uni-scss/package.json

@@ -0,0 +1,82 @@
+{
+  "id": "uni-scss",
+  "displayName": "uni-scss 辅助样式",
+  "version": "1.0.2",
+  "description": "uni-sass是uni-ui提供的一套全局样式 ，通过一些简单的类名和sass变量，实现简单的页面布局操作，比如颜色、边距、圆角等。",
+  "keywords": [
+    "uni-scss",
+    "uni-ui",
+    "辅助样式"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": "^3.1.0"
+  },
+  "dcloudext": {
+    "category": [
+        "uni-app前端模板",
+        "前端页面模板"
+    ],
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+  },
+  "uni_modules": {
+    "dependencies": [],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "u"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "n",
+          "联盟": "n"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}

uni_modules/uni-scss/readme.md

@@ -0,0 +1,4 @@
+`uni-sass` 是 `uni-ui`提供的一套全局样式 ，通过一些简单的类名和`sass`变量，实现简单的页面布局操作，比如颜色、边距、圆角等。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-sass)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 

uni_modules/uni-scss/styles/index.scss

@@ -0,0 +1,7 @@
+@import './setting/_variables.scss';
+@import './setting/_border.scss';
+@import './setting/_color.scss';
+@import './setting/_space.scss';
+@import './setting/_radius.scss';
+@import './setting/_text.scss';
+@import './setting/_styles.scss';

uni_modules/uni-scss/styles/setting/_border.scss

@@ -0,0 +1,3 @@
+.uni-border {
+	border: 1px $uni-border-1 solid;
+}

uni_modules/uni-scss/styles/setting/_color.scss

@@ -0,0 +1,66 @@
+
+// TODO 暂时不需要 class ，需要用户使用变量实现 ，如果使用类名其实并不推荐
+// @mixin get-styles($k,$c) {
+// 	@if $k == size or $k == weight{
+// 		font-#{$k}:#{$c}
+// 	}@else{
+// 		#{$k}:#{$c}
+// 	}
+// }
+$uni-ui-color:(
+	// 主色
+	primary: $uni-primary,
+	primary-disable: $uni-primary-disable,
+	primary-light: $uni-primary-light,
+	// 辅助色
+	success: $uni-success,
+	success-disable: $uni-success-disable,
+	success-light: $uni-success-light,
+	warning: $uni-warning,
+	warning-disable: $uni-warning-disable,
+	warning-light: $uni-warning-light,
+	error: $uni-error,
+	error-disable: $uni-error-disable,
+	error-light: $uni-error-light,
+	info: $uni-info,
+	info-disable: $uni-info-disable,
+	info-light: $uni-info-light,
+	// 中性色
+	main-color: $uni-main-color,
+	base-color: $uni-base-color,
+	secondary-color: $uni-secondary-color,
+	extra-color: $uni-extra-color,
+	// 背景色
+	bg-color: $uni-bg-color,
+	// 边框颜色
+	border-1: $uni-border-1,
+	border-2: $uni-border-2,
+	border-3: $uni-border-3,
+	border-4: $uni-border-4,
+	// 黑色
+	black:$uni-black,
+	// 白色
+	white:$uni-white,
+	// 透明
+	transparent:$uni-transparent
+) !default;
+@each $key, $child in $uni-ui-color {
+	.uni-#{"" + $key} {
+		color: $child;
+	}
+	.uni-#{"" + $key}-bg {
+		background-color: $child;
+	}
+}
+.uni-shadow-sm {
+	box-shadow: $uni-shadow-sm;
+}
+.uni-shadow-base {
+	box-shadow: $uni-shadow-base;
+}
+.uni-shadow-lg {
+	box-shadow: $uni-shadow-lg;
+}
+.uni-mask {
+	background-color:$uni-mask;
+}

uni_modules/uni-scss/styles/setting/_radius.scss

@@ -0,0 +1,55 @@
+@mixin radius($r,$d:null ,$important: false){
+  $radius-value:map-get($uni-radius, $r) if($important, !important, null);
+  // Key exists within the $uni-radius variable
+  @if (map-has-key($uni-radius, $r) and  $d){
+		@if $d == t {
+				border-top-left-radius:$radius-value;
+				border-top-right-radius:$radius-value;
+		}@else if $d == r {
+				border-top-right-radius:$radius-value;
+				border-bottom-right-radius:$radius-value;
+		}@else if $d == b {
+				border-bottom-left-radius:$radius-value;
+				border-bottom-right-radius:$radius-value;
+		}@else if $d == l {
+				border-top-left-radius:$radius-value;
+				border-bottom-left-radius:$radius-value;
+		}@else if $d == tl {
+				border-top-left-radius:$radius-value;
+		}@else if $d == tr {
+				border-top-right-radius:$radius-value;
+		}@else if $d == br {
+				border-bottom-right-radius:$radius-value;
+		}@else if $d == bl {
+				border-bottom-left-radius:$radius-value;
+		}
+  }@else{
+		border-radius:$radius-value;
+  }
+}
+
+@each $key, $child in $uni-radius {
+	@if($key){
+		.uni-radius-#{"" + $key} {
+				@include radius($key)
+		}
+	}@else{
+		.uni-radius {
+				@include radius($key)
+		}
+	}
+}
+
+@each $direction in t, r, b, l,tl, tr, br, bl {
+	@each $key, $child in $uni-radius {
+		@if($key){
+			.uni-radius-#{"" + $direction}-#{"" + $key} {
+				@include radius($key,$direction,false)
+			}
+		}@else{
+			.uni-radius-#{$direction} {
+				@include radius($key,$direction,false)
+			}
+		}
+	}
+}

uni_modules/uni-scss/styles/setting/_space.scss

@@ -0,0 +1,56 @@
+
+@mixin fn($space,$direction,$size,$n) {
+	@if $n {
+		#{$space}-#{$direction}: #{$size*$uni-space-root}px
+	} @else {
+		 #{$space}-#{$direction}: #{-$size*$uni-space-root}px
+	}
+}
+@mixin get-styles($direction,$i,$space,$n){
+	@if $direction == t {
+		@include fn($space, top,$i,$n);
+	} 
+	@if $direction == r {
+		@include fn($space, right,$i,$n);
+	} 
+	@if $direction == b {
+		@include fn($space, bottom,$i,$n);
+	} 
+	@if $direction == l {
+	 @include fn($space, left,$i,$n);
+	} 
+	@if $direction == x {
+		@include fn($space, left,$i,$n);
+		@include fn($space, right,$i,$n);
+	} 
+	@if $direction == y {
+		@include fn($space, top,$i,$n);
+		@include fn($space, bottom,$i,$n);
+	} 
+	@if $direction == a {
+		@if $n {
+			#{$space}:#{$i*$uni-space-root}px;
+		} @else {
+			#{$space}:#{-$i*$uni-space-root}px;
+		}
+	} 
+}
+
+@each $orientation in m,p {
+	$space: margin;
+	@if $orientation == m {
+		$space: margin;
+	} @else {
+		$space: padding;
+	}
+	@for $i from 0 through 16 {
+		@each $direction in t, r, b, l, x, y, a {
+			.uni-#{$orientation}#{$direction}-#{$i} { 
+				@include  get-styles($direction,$i,$space,true);
+			} 
+			.uni-#{$orientation}#{$direction}-n#{$i} { 
+				@include  get-styles($direction,$i,$space,false);
+			}
+		}
+	}
+}

uni_modules/uni-scss/styles/setting/_styles.scss

@@ -0,0 +1,167 @@
+/* #ifndef APP-NVUE */
+
+$-color-white:#fff;
+$-color-black:#000;
+@mixin base-style($color) {
+	color: #fff;
+	background-color: $color;
+	border-color: mix($-color-black, $color, 8%);
+	&:not([hover-class]):active {
+		background: mix($-color-black, $color, 10%);
+		border-color: mix($-color-black, $color, 20%);
+		color: $-color-white;
+		outline: none;
+	}
+}
+@mixin is-color($color) {
+	@include base-style($color);
+	&[loading] {
+		@include base-style($color);
+		&::before {
+			margin-right:5px;
+		}
+	}
+	&[disabled] {
+	  &,
+		&[loading],
+	  &:not([hover-class]):active {
+	    color: $-color-white;
+			border-color: mix(darken($color,10%), $-color-white);
+	    background-color: mix($color, $-color-white);
+	  }
+	}
+
+}
+@mixin base-plain-style($color) {
+	color:$color;
+	background-color: mix($-color-white, $color, 90%);
+	border-color: mix($-color-white, $color, 70%);
+	&:not([hover-class]):active {
+	  background: mix($-color-white, $color, 80%);
+	  color: $color;
+	  outline: none;
+		border-color: mix($-color-white, $color, 50%);
+	}
+}
+@mixin is-plain($color){
+	&[plain] {
+		@include base-plain-style($color);
+		&[loading] {
+			@include base-plain-style($color);
+			&::before {
+				margin-right:5px;
+			}
+		}
+		&[disabled] {
+		  &,
+		  &:active {
+		    color: mix($-color-white, $color, 40%);
+		    background-color: mix($-color-white, $color, 90%);
+				border-color: mix($-color-white, $color, 80%);
+		  }
+		}
+	}
+}
+
+
+.uni-btn {
+	margin: 5px;
+	color: #393939;
+	border:1px solid #ccc;
+	font-size: 16px;
+	font-weight: 200;
+	background-color: #F9F9F9;
+	// TODO 暂时处理边框隐藏一边的问题
+	overflow: visible;
+	&::after{
+		border: none;
+	}
+
+	&:not([type]),&[type=default] {
+		color: #999;
+		&[loading] {
+			background: none;
+			&::before {
+				margin-right:5px;
+			}
+		}
+
+
+
+		&[disabled]{
+			color: mix($-color-white, #999, 60%);
+		  &,
+			&[loading],
+		  &:active {
+				color: mix($-color-white, #999, 60%);
+		    background-color: mix($-color-white,$-color-black , 98%);
+				border-color: mix($-color-white,  #999, 85%);
+		  }
+		}
+
+		&[plain] {
+			color: #999;
+			background: none;
+			border-color: $uni-border-1;
+			&:not([hover-class]):active {
+				background: none;
+			  color: mix($-color-white, $-color-black, 80%);
+				border-color: mix($-color-white, $-color-black, 90%);
+			  outline: none;
+			}
+			&[disabled]{
+			  &,
+				&[loading],
+			  &:active {
+			    background: none;
+					color: mix($-color-white, #999, 60%);
+					border-color: mix($-color-white,  #999, 85%);
+			  }
+			}
+		}
+	}
+
+	&:not([hover-class]):active {
+	  color: mix($-color-white, $-color-black, 50%);
+	}
+
+	&[size=mini] {
+		font-size: 16px;
+		font-weight: 200;
+		border-radius: 8px;
+	}
+
+
+
+	&.uni-btn-small {
+		font-size: 14px;
+	}
+	&.uni-btn-mini {
+		font-size: 12px;
+	}
+
+	&.uni-btn-radius {
+		border-radius: 999px;
+	}
+	&[type=primary] {
+		@include is-color($uni-primary);
+		@include is-plain($uni-primary)
+	}
+	&[type=success] {
+		@include is-color($uni-success);
+		@include is-plain($uni-success)
+	}
+	&[type=error] {
+		@include is-color($uni-error);
+		@include is-plain($uni-error)
+	}
+	&[type=warning] {
+		@include is-color($uni-warning);
+		@include is-plain($uni-warning)
+	}
+	&[type=info] {
+		@include is-color($uni-info);
+		@include is-plain($uni-info)
+	}
+}
+/* #endif */

uni_modules/uni-scss/styles/setting/_text.scss

@@ -0,0 +1,24 @@
+@mixin get-styles($k,$c) {
+	@if $k == size or $k == weight{
+		font-#{$k}:#{$c}
+	}@else{
+		#{$k}:#{$c}
+	}
+}
+
+@each $key, $child in $uni-headings {
+	/* #ifndef APP-NVUE */
+	.uni-#{$key} {
+		@each $k, $c in $child {
+			@include get-styles($k,$c)
+		}
+	}
+	/* #endif */
+	/* #ifdef APP-NVUE */
+	.container .uni-#{$key} {
+		@each $k, $c in $child {
+			@include get-styles($k,$c)
+		}
+	}
+	/* #endif */
+}

uni_modules/uni-scss/styles/setting/_variables.scss

@@ -0,0 +1,146 @@
+// @use "sass:math";
+@import  '../tools/functions.scss';
+// 间距基础倍数
+$uni-space-root: 2 !default;
+// 边框半径默认值
+$uni-radius-root:5px !default;
+$uni-radius: () !default;
+// 边框半径断点
+$uni-radius: map-deep-merge(
+  (
+    0: 0,
+		// TODO 当前版本暂时不支持 sm 属性
+    // 'sm': math.div($uni-radius-root, 2),
+    null: $uni-radius-root,
+    'lg': $uni-radius-root * 2,
+    'xl': $uni-radius-root * 6,
+    'pill': 9999px,
+    'circle': 50%
+  ),
+  $uni-radius
+);
+// 字体家族
+$body-font-family: 'Roboto', sans-serif !default;
+// 文本
+$heading-font-family: $body-font-family !default;
+$uni-headings: () !default;
+$letterSpacing: -0.01562em;
+$uni-headings: map-deep-merge(
+  (
+    'h1': (
+      size: 32px,
+			weight: 300,
+			line-height: 50px,
+			// letter-spacing:-0.01562em
+    ),
+    'h2': (
+      size: 28px,
+      weight: 300,
+      line-height: 40px,
+      // letter-spacing: -0.00833em
+    ),
+    'h3': (
+      size: 24px,
+      weight: 400,
+      line-height: 32px,
+      // letter-spacing: normal
+    ),
+    'h4': (
+      size: 20px,
+      weight: 400,
+      line-height: 30px,
+      // letter-spacing: 0.00735em
+    ),
+    'h5': (
+      size: 16px,
+      weight: 400,
+      line-height: 24px,
+      // letter-spacing: normal
+    ),
+    'h6': (
+      size: 14px,
+      weight: 500,
+      line-height: 18px,
+      // letter-spacing: 0.0125em
+    ),
+    'subtitle': (
+      size: 12px,
+      weight: 400,
+      line-height: 20px,
+      // letter-spacing: 0.00937em
+    ),
+    'body': (
+      font-size: 14px,
+			font-weight: 400,
+			line-height: 22px,
+			// letter-spacing: 0.03125em
+    ),
+    'caption': (
+      'size': 12px,
+      'weight': 400,
+      'line-height': 20px,
+      // 'letter-spacing': 0.03333em,
+      // 'text-transform': false
+    )
+  ),
+  $uni-headings
+);
+
+
+
+// 主色
+$uni-primary: #2979ff !default;
+$uni-primary-disable:lighten($uni-primary,20%) !default;
+$uni-primary-light: lighten($uni-primary,25%) !default;
+
+// 辅助色
+// 除了主色外的场景色，需要在不同的场景中使用（例如危险色表示危险的操作）。
+$uni-success: #18bc37 !default;
+$uni-success-disable:lighten($uni-success,20%) !default;
+$uni-success-light: lighten($uni-success,25%) !default;
+
+$uni-warning: #f3a73f !default;
+$uni-warning-disable:lighten($uni-warning,20%) !default;
+$uni-warning-light: lighten($uni-warning,25%) !default;
+
+$uni-error: #e43d33 !default;
+$uni-error-disable:lighten($uni-error,20%) !default;
+$uni-error-light: lighten($uni-error,25%) !default;
+
+$uni-info: #8f939c !default;
+$uni-info-disable:lighten($uni-info,20%) !default;
+$uni-info-light: lighten($uni-info,25%) !default;
+
+// 中性色
+// 中性色用于文本、背景和边框颜色。通过运用不同的中性色，来表现层次结构。
+$uni-main-color: #3a3a3a !default; 			// 主要文字
+$uni-base-color: #6a6a6a !default;			// 常规文字
+$uni-secondary-color: #909399 !default;	// 次要文字
+$uni-extra-color: #c7c7c7 !default;			// 辅助说明
+
+// 边框颜色
+$uni-border-1: #F0F0F0 !default;
+$uni-border-2: #EDEDED !default;
+$uni-border-3: #DCDCDC !default;
+$uni-border-4: #B9B9B9 !default;
+
+// 常规色
+$uni-black: #000000 !default;
+$uni-white: #ffffff !default;
+$uni-transparent: rgba($color: #000000, $alpha: 0) !default;
+
+// 背景色
+$uni-bg-color: #f7f7f7 !default;
+
+/* 水平间距 */
+$uni-spacing-sm: 8px !default;
+$uni-spacing-base: 15px !default;
+$uni-spacing-lg: 30px !default;
+
+// 阴影
+$uni-shadow-sm:0 0 5px rgba($color: #d8d8d8, $alpha: 0.5) !default;
+$uni-shadow-base:0 1px 8px 1px rgba($color: #a5a5a5, $alpha: 0.2) !default;
+$uni-shadow-lg:0px 1px 10px 2px rgba($color: #a5a4a4, $alpha: 0.5) !default;
+
+// 蒙版
+$uni-mask: rgba($color: #000000, $alpha: 0.4) !default;

uni_modules/uni-scss/styles/tools/functions.scss

@@ -0,0 +1,19 @@
+// 合并 map
+@function map-deep-merge($parent-map, $child-map){
+	$result: $parent-map;
+	@each $key, $child in $child-map {
+		$parent-has-key: map-has-key($result, $key);
+		$parent-value: map-get($result, $key);
+		$parent-type: type-of($parent-value);
+		$child-type: type-of($child);
+		$parent-is-map: $parent-type == map;
+		$child-is-map: $child-type == map;
+			
+		@if (not $parent-has-key) or ($parent-type != $child-type) or (not ($parent-is-map and $child-is-map)){
+			$result: map-merge($result, ( $key: $child ));
+		}@else {
+			$result: map-merge($result, ( $key: map-deep-merge($parent-value, $child) ));
+		}
+	}
+	@return $result;
+};

uni_modules/uni-scss/theme.scss

@@ -0,0 +1,31 @@
+// 间距基础倍数
+$uni-space-root: 2;
+// 边框半径默认值
+$uni-radius-root:5px;
+// 主色
+$uni-primary: #2979ff;
+// 辅助色
+$uni-success: #4cd964;
+// 警告色
+$uni-warning: #f0ad4e;
+// 错误色
+$uni-error: #dd524d;
+// 描述色
+$uni-info: #909399;
+// 中性色
+$uni-main-color: #303133;
+$uni-base-color: #606266;
+$uni-secondary-color: #909399;
+$uni-extra-color: #C0C4CC;
+// 背景色
+$uni-bg-color: #f5f5f5;
+// 边框颜色
+$uni-border-1: #DCDFE6;
+$uni-border-2: #E4E7ED;
+$uni-border-3: #EBEEF5;
+$uni-border-4: #F2F6FC;
+
+// 常规色
+$uni-black: #000000;
+$uni-white: #ffffff;
+$uni-transparent: rgba($color: #000000, $alpha: 0);

uni_modules/uni-scss/variables.scss

@@ -0,0 +1,62 @@
+@import './styles/setting/_variables.scss';
+// 间距基础倍数
+$uni-space-root: 2;
+// 边框半径默认值
+$uni-radius-root:5px;
+
+// 主色
+$uni-primary: #2979ff;
+$uni-primary-disable:mix(#fff,$uni-primary,50%);
+$uni-primary-light: mix(#fff,$uni-primary,80%);
+
+// 辅助色
+// 除了主色外的场景色，需要在不同的场景中使用（例如危险色表示危险的操作）。
+$uni-success: #18bc37;
+$uni-success-disable:mix(#fff,$uni-success,50%);
+$uni-success-light: mix(#fff,$uni-success,80%);
+
+$uni-warning: #f3a73f;
+$uni-warning-disable:mix(#fff,$uni-warning,50%);
+$uni-warning-light: mix(#fff,$uni-warning,80%);
+
+$uni-error: #e43d33;
+$uni-error-disable:mix(#fff,$uni-error,50%);
+$uni-error-light: mix(#fff,$uni-error,80%);
+
+$uni-info: #8f939c;
+$uni-info-disable:mix(#fff,$uni-info,50%);
+$uni-info-light: mix(#fff,$uni-info,80%);
+
+// 中性色
+// 中性色用于文本、背景和边框颜色。通过运用不同的中性色，来表现层次结构。
+$uni-main-color: #3a3a3a; 			// 主要文字
+$uni-base-color: #6a6a6a;			// 常规文字
+$uni-secondary-color: #909399;	// 次要文字
+$uni-extra-color: #c7c7c7;			// 辅助说明
+
+// 边框颜色
+$uni-border-1: #F0F0F0;
+$uni-border-2: #EDEDED;
+$uni-border-3: #DCDCDC;
+$uni-border-4: #B9B9B9;
+
+// 常规色
+$uni-black: #000000;
+$uni-white: #ffffff;
+$uni-transparent: rgba($color: #000000, $alpha: 0);
+
+// 背景色
+$uni-bg-color: #f7f7f7;
+
+/* 水平间距 */
+$uni-spacing-sm: 8px;
+$uni-spacing-base: 15px;
+$uni-spacing-lg: 30px;
+
+// 阴影
+$uni-shadow-sm:0 0 5px rgba($color: #d8d8d8, $alpha: 0.5);
+$uni-shadow-base:0 1px 8px 1px rgba($color: #a5a5a5, $alpha: 0.2);
+$uni-shadow-lg:0px 1px 10px 2px rgba($color: #a5a4a4, $alpha: 0.5);
+
+// 蒙版
+$uni-mask: rgba($color: #000000, $alpha: 0.4);