1

manifest.json

@@ -17,7 +17,9 @@
             "delay" : 0
         },
         /* 模块配置 */
-        "modules" : {},
+        "modules" : {
+            "Camera" : {}
+        },
         /* 应用发布信息 */
         "distribute" : {
             /* android打包配置 */

pages/bianji/index.vue

@@ -1,7 +1,7 @@
 <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="name" :shadow="0" :showback="true"></tm-menubars>
 		<div class="zhuti">
 			<!-- 衣橱 -->
 			<tm-sheet class="yichu" style="margin-bottom: 40px !important;">
@@ -52,10 +52,13 @@ export default {
 			quanbuList:[],
 			yixuanList:[],
 			chooseindex:-1,
-			type:1
+			type:1,
+			name:'添加穿搭'
 		};
 	},
 	onLoad(e) {
+		console.log()
+		this.name=e.name?'明日计划':'添加穿搭'
 		this.type=e.type?e.type:1;//1今天2明天
 	},
 	created() {

pages/dapei/index.vue

@@ -18,7 +18,7 @@
 				<view class="mt-20 text-align-center" v-if="tianqiList">
 					<image class="taiyang" src="/static/img/106.png" mode="widthFix"></image>
 					<text class="text-size-s ml-15">{{tianqiList.templow}}°c~{{tianqiList.temphigh}}°c</text>
-					<text class="text-size-s ml-15">{{tianqiList.week}}</text>
+					<view class="text-size-s ml-15">{{tianqiList.date}} <text class="text-size-s ml-15">{{tianqiList.week}}</text></view>
 				</view>
 				<view v-if="alltouList[0]" class="bianji" @click="bianji(1,alltouList[0].data)">{{alltouList[0].data !=0?'更换穿搭':'添加穿搭'}}</view>
 			</view>
@@ -33,7 +33,7 @@
 				<view class="mt-20 text-align-center" v-if="tianqiList">
 					<image class="taiyang" src="/static/img/106.png" mode="widthFix"></image>
 					<text class="text-size-s ml-15">最高温度{{tianqiList.daily[1].day.temphigh}}°C</text>
-					<text class="text-size-s ml-15">{{tianqiList.daily[1].week}}</text>
+					<view class="text-size-s ml-15">{{tianqiList.daily[1].date}} <text class="text-size-s ml-15">{{tianqiList.daily[1].week}}</text></view>
 				</view>
 				<view v-if="alltouList[1]" class="bianji" @click="bianji(2,alltouList[1].data)">{{alltouList[1].data !=0?'更换穿搭':'添加穿搭'}}</view>
 			</view>
@@ -383,5 +383,5 @@ export default {
 	.fudong{position:fixed;right:10px;bottom:150px;background: #303030;width: 130px;height: 60px;
 	border-radius: 30px 0px 0px 30px;font-size: 14px;text-align: center;}
 	.sao{width: 60%;display: block;margin: 0 auto;margin-bottom: 60px;}
-	/deep/ .scroll-view_H{height:245px !important;}
+	/deep/ .scroll-view_H{height:260px !important;}
 </style>

pages/dizhi/index.vue

@@ -15,7 +15,7 @@
 				</view>
 			</view>
 		</div>
-		<tm-button :round="24" class="sao mb-40 mt-40" block @click="xinjian">新建收获地址</tm-button>
+		<tm-button :round="24" class="sao mb-40 mt-40" block @click="xinjian">新建收货地址</tm-button>
 		<!-- 弹出层消息 -->
 		<tm-message ref="toast"></tm-message>
 	</view>

pages/gengduo/index.vue

@@ -1,28 +1,26 @@
 <template>
-	<view :style="{ minHeight: sys.windowHeight + 'px' }" :class="[$tm.vx.state().tmVuetify.black ? 'black' : ' ']"
+	<view :class="[$tm.vx.state().tmVuetify.black ? 'black' : ' ']"
 		class="bodycont">
 		<tm-menubars ref="fenleig" title="分类" :shadow="0" :showback="true"></tm-menubars>
-		<div class="cont" :style="{ height: (sys.windowHeight-80) + 'px' }">
-			<tm-sheet black>
-				<tm-sliderNav :style="{ height: (sys.windowHeight-80) + 'px' }" class="zuo fl" @change="change"
-					:list="list" text color="red">
-
-				</tm-sliderNav>
-				<view class="fr you" :style="{ height: (sys.windowHeight-80) + 'px' }">
-					<view class="huadong">
-						<view class="py-10 text-size-g dianz mingri text-align-center mt-40">
-							<image src="/static/img/88.png" mode="widthFix"></image>
-							<text class="text-white">精选推荐</text>
-						</view>
-						<view class="yiguicla mt-20 ml-20 fl" v-for="item in quanbuList" @click="sort(item.id)">
+		<div class="cont">
+			<tm-sliderNav :activeIndex="activeIndex" class="zuo fl" @change="change" :list="list" text color="red"></tm-sliderNav>
+			<view class="fr you">
+				<view class="huadong">
+					<view class="py-10 text-size-g dianz mingri text-align-center mt-40">
+						<image src="/static/img/88.png" mode="widthFix"></image>
+						<text class="text-white">精选推荐</text>
+					</view>
+					<view class="yiguicla mt-20 fl" v-for="item in quanbuList" @click="sort(item.id)">
+						<view class="waicont">
 							<image :src="item.src" mode="widthFix"></image>
 							<view class="wenzi text-align-center text-size-m mt-8">{{item.text}}</view>
 						</view>
-						<view style="width:100%;height:40px;clear: both;"></view>
 					</view>
+					<tm-empty v-if="quanbuList.length ==0" label="暂无数据" color="white" icon="icon-paperplane-fill"></tm-empty>
+					<view style="width:100%;height:40px;clear: both;"></view>
 				</view>
-				<view style="clear: both;"></view>
-			</tm-sheet>
+			</view>
+			<view style="clear: both;"></view>
 		</div>
 		<!-- 弹出层消息 -->
 		<tm-message ref="toast"></tm-message>
@@ -36,16 +34,15 @@
 		data() {
 			return {
 				list: [],
-				quanbuList: [
-					// 	{
-					// 	src: '/static/img/45.png',
-					// 	text: 'NEO CITY 涂鸦',
-					// 	type: '手提包'
-					// }, 
-				]
+				quanbuList: {},
+				activeIndex:0,
+				frist:2,
 			};
 		},
-		onLoad() {
+		onLoad(e) {
+			this.activeIndex=e.index?e.index:0;
+			this.frist=e.index?1:2;
+			console.log(this.activeIndex)
 		},
 		created() {
 			this.sys = uni.getSystemInfoSync();
@@ -60,7 +57,6 @@
 					method: 'get',
 					data: that.reqData
 				}).then(res => {
-					console.log(res.data);
 					if (res.data.code == 200) {
 						res.data.data.forEach(item => {
 							that.list.push({
@@ -69,7 +65,7 @@
 								title: item.category_name
 							})
 						})
-						this.change(0)
+						this.change(this.activeIndex)
 					} else {
 						that.$refs.toast.show({
 							model: 'error',
@@ -81,6 +77,11 @@
 			// 切换更换二级分类
 			change(e) {
 				let that = this;
+				if(this.frist==2){
+					this.activeIndex=e;
+				}
+				this.frist=2;
+				console.log(e)
 				myRequest({
 					url: '/api/ShopGoods/getMallChildrenClassification',
 					method: 'post',
@@ -117,85 +118,95 @@
 </script>
 
 <style lang="scss">
-	/deep/ .tm-menubars .body {
-		background-color: #1b1b1b !important;
+	page,uni-page-body,.bodycont{
+		height: 100% !important;
+		overflow: hidden;
+	}
+	// /deep/ .tm-menubars .body {
+	// 	background-color: #1b1b1b !important;
+	// }
+	.huadong{
+		width: 90%;
+		margin: 0 auto;
 	}
-
-	// /deep/ .zhuti{padding: 10px 10px;}
-	// page,.bodycont{height:100%;}
 	/deep/ .cont {
 		overflow: hidden;
+		height: calc(100% - 45px) !important;
 	}
-
 	/deep/ .kuang {
 		margin: 0 !important;
 		padding: 0px !important;
 	}
-
 	/deep/ .zuo .grey-darken-4.bk {
 		background-color: #0D0D0D !important;
 	}
-
-	/deep/ .zuo .uni-scroll-view-content {
-		background-color: #0D0D0D !important;
-	}
-
+	// /deep/ .zuo .uni-scroll-view-content {
+	// 	background-color: #0D0D0D !important;
+	// }
 	/deep/ .cont .shadow-white-5 {
 		padding: 0px !important;
 		margin: 0px !important
 	}
-
 	/deep/ .zuo .border-red-l-2.bk {
 		border-left-color: #0178FD !important;
 	}
-
 	/deep/ .zuo .text-red,
 	/deep/ .zuo .text-grey-darken-1 {
 		color: white !important;
 	}
-
 	.yiguicla image {
 		width: 100%;
 		display: block;
-		margin: 0 auto;
+		
 		margin-top: 5px;
 		border-radius: 10px;
 	}
-
-	.yiguicla {
-		width: 45%;
+	.waicont{
+		overflow: hidden;
 		border-radius: 10px;
+		width: 80%;
+		height: 100%;
+		margin: 0 auto;
+		position: relative;
+	}
+	.yiguicla{
+		width: 50%;
 		position: relative;
 		padding: 0px !important;
+		text-align: center;
 	}
-
 	.wenzi {
 		position: absolute;
 		bottom: 0px;
-		background: #BCC2C7;
+		background: rgba(158,165,172,0.8);
 		color: white;
 		width: 100%;
-		height: 25px;
-		border-radius: 0px 0px 10px 10px;
+		height: 27px;
+		line-height: 27px;
+		font-size: 13px;
 	}
-
-	// /deep/ .zuo uni-scroll-view{height: calc(100% - 45px) !important;}
 	.mingri image {
 		width: 25px;
 		margin-right: 12px;
 		vertical-align: middle;
 	}
-
 	.mingri text {
 		vertical-align: middle;
 	}
-
 	.you {
-		width: calc(100% - 100px);
+		width: calc(100% - 80px);
+		overflow: auto;
+		background-color: #1b1b1b !important;
+		height: 100%;
 		overflow: auto;
 	}
-
 	.zuo {
 		overflow: hidden;
+		width: 80px !important;
+		text-align: center;
+		background-color: #0D0D0D !important;
+	}
+	/deep/ uni-scroll-view{
+		width: 80px !important;
 	}
 </style>

pages/index/index.vue

@@ -21,7 +21,7 @@
 			</view>
 		</view>
 		<view class="zhuti mt-50">
-			<tm-grid :grid="5" :list="list3" :icon-size="140" font-color="white"></tm-grid>
+			<tm-grid :grid="5" @change="clickup" :list="list3" :icon-size="140" font-color="white"></tm-grid>
 			<!-- 今日穿搭 -->
 			<tm-sheet class="lunbo bushan1">
 				<view class="py-10 text-size-g dianz">
@@ -147,6 +147,8 @@
 				</view>
 			</tm-sheet>
 		</view>
+		<!-- 弹出层消息 -->
+		<tm-message ref="toast"></tm-message>
 	</view>
 </template>
 
@@ -212,6 +214,12 @@
 			this.getCity()
 		},
 		methods: {
+			clickup(){
+				this.$refs.toast.show({
+					model: 'wait',
+					label: '开发中，敬请期待'
+				})
+			},
 			getCity(){
 				var that=this;
 				uni.getLocation({
@@ -397,7 +405,7 @@
 			tiao(e) {
 				console.log(e)
 				uni.navigateTo({
-					url: "/pages/bianji/index",
+					url: "/pages/bianji/index?name=1",
 				})
 			},
 			tiaoclick(e) {

pages/registered/index.vue

@@ -99,27 +99,21 @@ export default {
 				that.$refs.toast.show({model:'warn',label:'请输入手机号'})
 				return
 			}
-			uni.request({
-				url: "https://apitest.yitutianxia.com/common/SendSms?mobile="+that.reqData.mobile,
-				method: "get",
-				data:{},
-				dataType:'json',
-				success : function(res) {
-					console.log(res)
-					if (res.data.code == 200) {
-						that.$refs.toast.show({model:'success',label:res.data.msg})
-						that.yzmvar.text="已发送";
-						setTimeout(function(){
-							that.yzmvar.text="发送验证码";
-						},15000)
-					}else{
-						that.$refs.toast.show({model:'error',label:res.data.msg})
-					}
-				},
-				error : function(e) {
-					alert("网络异常，请重试");
+			myRequest({
+				url: "/api/Login/sendCode?mobile="+that.reqData.mobile,
+				method:'get',
+				data:{}
+			}).then(res => {
+				if (res.data.code == 200) {
+					that.$refs.toast.show({model:'success',label:res.data.msg})
+					that.yzmvar.text="已发送";
+					setTimeout(function(){
+						that.yzmvar.text="发送验证码";
+					},15000)
+				}else{
+					that.$refs.toast.show({model:'error',label:res.data.msg})
 				}
-			});
+			})
 		},
 		login(){
 			uni.navigateTo({

pages/shop/index.vue

@@ -52,8 +52,8 @@
 				<tm-dragGrid :list="list1" :col="3" disabled="false" class="mt-40 mb-40 remen" :icon-size="160"
 					v-if="list1.length!=0">
 					<template v-slot:default="{item}">
-						<view class="flex-center flex-col" @click="tiaozhuan()">
-							<tm-icons :size="160" :name="item.icon" :color="item.color"></tm-icons>
+						<view class="flex-center flex-col" @click="tiaozhuan(item)">
+							<tm-icons class="divcont" :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>
 						</view>
@@ -117,7 +117,7 @@
 				current: 0,
 				activeIndex: 0,
 				soso: '',
-				addr: ['江西省', '南昌市', '西湖区'],
+				addr: ['江苏省', '南京市', '栖霞区'],
 				value: '',
 				list: [],
 				list1: [],
@@ -248,7 +248,8 @@
 						res.data.data.forEach(item => {
 							that.list3.push({
 								icon: item.image,
-								text: item.category_name
+								text: item.category_name,
+								id:item.id
 							})
 						})
 					} else {
@@ -274,7 +275,8 @@
 						res.data.data.forEach(item => {
 							that.list1.push({
 								icon: item.image,
-								text: item.category_name
+								text: item.category_name,
+								pid:item.pid
 							})
 						})
 					} else {
@@ -293,7 +295,6 @@
 					method: 'get',
 				}).then(res => {
 					if (res.data.code == 200) {
-						console.log(res.data.data, '22');
 						res.data.data.forEach(item => {
 							that.list4.push({
 								icon: item.image,
@@ -359,10 +360,15 @@
 					this.isBottom = true;
 				}
 			},
-			tiaozhuan() {
-				uni.navigateTo({
-					url: "/pages/gengduo/index",
-				})
+			tiaozhuan(e) {
+				for(let i=0;i<this.list3.length;i++){
+					if(this.list3[i].id==e.pid){
+						uni.navigateTo({
+							url: "/pages/gengduo/index?index="+i,
+						})
+					}
+				}
+				
 			},
 			// 广告详情
 			xiangqing() {
@@ -440,8 +446,9 @@
 				// }
 			},
 			zhonglei(e) {
+				console.log(e)
 				uni.navigateTo({
-					url: "/pages/gengduo/index",
+					url: "/pages/gengduo/index?index="+e.index,
 				})
 			}
 		},
@@ -618,4 +625,8 @@
 	/deep/ .shangpin .text-red {
 		color: white !important;
 	}
+	.divcont{
+		border-radius: 50px;
+		overflow: hidden;
+	}
 </style>

pages/sort/index.vue

@@ -2,7 +2,7 @@
 	<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: 30px !important;" v-if="listdata.length!=0" >
+			<tm-sheet class="kuang" style="padding-bottom: 30px !important;" >
 				<view style="width: 94%;margin:0 auto;" class="remen">
 					<view v-for="(item,index) in listdata"  class="round-5 contone black mt-20" :class="index%2==0?'fl':'fr'" @click="goDetail(item)">
 						<image class="logo" :src="item.image" mode="widthFix"></image>
@@ -21,12 +21,14 @@
 							</view>
 						</view>
 					</view>
+					<tm-empty v-if="listdata.length ==0" label="暂无数据" color="white" icon="icon-paperplane-fill"></tm-empty>
 					<view style="clear: both;"></view>
 					<view style="clear: both;" class="more ma-40 pt-40" @click="gengmore()" v-if="listdata.length<total" >
 						<image src="/static/img/30.png" mode="widthFix"></image>
 						<text class="text-size-s">下拉加载更多~</text>
 					</view>
 				</view>
+				
 			</tm-sheet>
 			<view style="height:60px"></view>
 		</div>
@@ -40,7 +42,7 @@ export default {
 	data() {
 		return {
 			typeclick:1,
-			listdata:[],
+			listdata:{},
 			soId:'',
 			page:1,
 			pagesize:8,
@@ -110,6 +112,7 @@ export default {
 						that.listdata=[]
 					}
 				}else{
+					that.listdata=[]
 					that.$refs.toast.show({
 						model: 'error',
 						label: res.data.msg

pages/zhaohui/index.vue

@@ -65,27 +65,21 @@ export default {
 				that.$refs.toast.show({model:'warn',label:'请输入手机号'})
 				return
 			}
-			uni.request({
-				url: "https://apitest.yitutianxia.com/common/SendSms?mobile="+that.reqData.mobile,
-				method: "get",
-				data:{},
-				dataType:'json',
-				success : function(res) {
-					console.log(res)
-					if (res.data.code == 200) {
-						that.$refs.toast.show({model:'success',label:res.data.msg})
-						that.yzmvar.text="已发送";
-						setTimeout(function(){
-							that.yzmvar.text="发送验证码";
-						},15000)
-					}else{
-						that.$refs.toast.show({model:'error',label:res.data.msg})
-					}
-				},
-				error : function(e) {
-					alert("网络异常，请重试");
+			myRequest({
+				url: "/api/Login/sendCode?mobile="+that.reqData.mobile,
+				method:'get',
+				data:{}
+			}).then(res => {
+				if (res.data.code == 200) {
+					that.$refs.toast.show({model:'success',label:res.data.msg})
+					that.yzmvar.text="已发送";
+					setTimeout(function(){
+						that.yzmvar.text="发送验证码";
+					},15000)
+				}else{
+					that.$refs.toast.show({model:'error',label:res.data.msg})
 				}
-			});
+			})
 		},
 	},
 }

tm-vuetify/components/tm-sliderNav/tm-sliderNav.vue

@@ -73,6 +73,11 @@
 					return [];
 				}
 			},
+			// activeIndex
+			activeIndex: {
+				type: Number |String,
+				default: 0 // set a default value for the prop
+			},
 			// 显示标签的key.
 			rangKey:{
 				type:String,
@@ -129,8 +134,7 @@
 			return {
 				activeHeight:0,
 				activeWidth:0,
-				activeIndex:0,
-				formaData:[]
+				formaData:[],
 			};
 		},
 		computed:{
@@ -176,7 +180,7 @@
 		},
 		methods: {
 			change(index) {
-				this.activeIndex=index;
+				// this.activeIndex=index;
 				this.$emit('change',index);
 			}
 		},

unpackage/cache/apk/apkurl

@@ -1 +1 @@
-https://ide.dcloud.net.cn/build/download/c07f5450-c78a-11ed-9fc4-b7a21152eb4c
+https://ide.dcloud.net.cn/build/download/e7610930-c922-11ed-b80d-bbbbc1fe0b5e