YZM hai 1 ano
pai
achega
cda01d416f

+ 1 - 0
App.vue

@@ -46,4 +46,5 @@
 	/deep/ .kuang{margin:0 !important;padding: 0px !important;}
 	.C929297{color: #929297 !important;}
 	.C0178FD{background-color:#0178FD !important;}
+	/deep/ .uni-tabbar-border{background: #212121 !important;}
 </style>

+ 4 - 2
manifest.json

@@ -17,7 +17,9 @@
             "delay" : 0
         },
         /* 模块配置 */
-        "modules" : {},
+        "modules" : {
+            "Push" : {}
+        },
         /* 应用发布信息 */
         "distribute" : {
             /* android打包配置 */
@@ -50,7 +52,7 @@
                 "push" : {
                     "unipush" : {
                         "version" : "2",
-                        "offline" : true
+                        "offline" : false
                     }
                 }
             }

+ 40 - 18
pages.json

@@ -10,14 +10,17 @@
 					"titleNView": false
 				}
 			}
+		},{
+			"path": "pages/shouye/index",
+			"style": {
+				"navigationBarTitleText": "我的"
+				
+			}
 		},
 		{
 			"path": "pages/wardrobe/index",
 			"style": {
-				"navigationBarTitleText": "衣厨",
-				"app-plus": {
-					"titleNView": false
-				}
+				"navigationBarTitleText": "衣厨"
 			}
 		},
 		{
@@ -47,15 +50,7 @@
 				}
 			}
 		},
-		{
-			"path": "pages/shouye/index",
-			"style": {
-				"navigationBarTitleText": "我的",
-				"app-plus": {
-					"titleNView": false
-				}
-			}
-		},
+		
 		{
 			"path": "pages/putstorage/index",
 			"style": {
@@ -376,9 +371,9 @@
             "style" :                                                                                    
             {
                 "navigationBarTitleText": "列表",
-								"app-plus": {
-									"titleNView": false
-								}
+				"app-plus": {
+					"titleNView": false
+				}
             }
             
         }
@@ -388,13 +383,40 @@
 		"selectedColor": "#82cfd5",
 		"borderStyle": "#fff",
 		"backgroundColor": "white",
-		"iconfontSrc": "static/icon/iconfont.ttf"
+		"iconfontSrc": "static/icon/iconfont.ttf",
+		"list": [{
+				"pagePath": "pages/index/index",
+				"iconPath": "/static/img/31.png",
+				"selectedIconPath": "/static/img/31.png",
+				"text": "首页"
+			}, {
+				"pagePath": "pages/wardrobe/index",
+				"iconPath": "/static/img/32.png",
+				"selectedIconPath": "/static/img/32.png",
+				"text": "衣橱"
+			}, {
+				"pagePath": "pages/dapei/index",
+				"iconPath": "/static/img/103.png",
+				"selectedIconPath": "/static/img/103.png",
+				"text": "搭配"
+			}, {
+				"pagePath": "pages/shop/index",
+				"iconPath": "/static/img/34.png",
+				"selectedIconPath": "/static/img/34.png",
+				"text": "商城"
+			}, {
+				"pagePath": "pages/user/index",
+				"iconPath": "/static/img/35.png",
+				"selectedIconPath": "/static/img/35.png",
+				"text": "衣橱"
+			}]
 	},
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "uni-app",
 		"navigationBarBackgroundColor": "#F8F8F8",
-		"backgroundColor": "#F8F8F8"
+		"backgroundColor": "#F8F8F8",
+		"navigationStyle": "custom"
 	},
 	"condition": { //模式配置,仅开发期间生效
 		"current": 0, //当前激活的模式(list 的索引项)

+ 591 - 68
pages/index/index.vue

@@ -1,77 +1,600 @@
 <template>
-	<view>
-		<!-- 首页 -->
-		<HomePage v-if="showpage==0"></HomePage>
-		<!-- 衣柜 -->
-		<MardPage ref="yigui" v-if="showpage==1" @fatherMethod="initBtn"></MardPage>
-		<!-- 搭配 -->
-		<DapeiPage ref="chuanda" v-if="showpage==2" @fatherMethod="initshow"></DapeiPage>
-		<!-- 商城 -->
-		<ShopPage v-if="showpage==3"></ShopPage>
-		<!-- 我的 -->
-		<UserPage v-if="showpage==4"></UserPage>
-		<!-- 底部 -->
-		<view>
-			<tm-bottomnavigation :auto-selected="false" :activeIndex="showpage" @change="changepage" style="height:50px" :list="list_1"></tm-bottomnavigation>
+	<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 bushan1">
+				<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="pb-20 text-size-g">
+					<view class="text-white" style="display: flex;justify-content: space-between;">
+						<view v-if="list.length !=0"
+							style="display: flex;align-items: center; justify-content: center;width: 46%;font-size: 16px;font-weight: bold;">
+							{{list[current].name}}
+						</view>
+						<view class="qiehuan" v-if="list.length !=0">
+							<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>
+					<tm-empty v-if="list.length ==0" label="暂无推荐" color="white" icon="icon-paperplane-fill"></tm-empty>
+				</view>
+			</tm-sheet>
+			<!-- 明日计划 -->
+			<tm-sheet class="lunbo1 bushan2">
+				<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(item.id)" 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>
+										<!-- <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 shopGoodsList" @click="xiangqing()">
+								<image class="chuandaimg fl" :src="item.image" mode="widthFix"></image>
+								<view class="chuandazi fr">
+									<view class="text-size-m text-weight-b text-overflow-2">{{item.goods_name}}</view>
+									<view class="tm-cartCellListFood-label text-size-s text-grey py-8">{{item.goods_details}}
+									</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>
+							</view>
+						</view>
+					</view>
+					<view style="clear: both;"></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 HomePage from "@/pages/shouye/index"
-import MardPage from "@/pages/wardrobe/index"
-import DapeiPage from "@/pages/dapei/index"
-import ShopPage from "@/pages/shop/index"
-import UserPage from "@/pages/user/index"
-export default {
-	components:{
-		HomePage,
-		MardPage,
-		DapeiPage,
-		ShopPage,
-		UserPage
-	},
-	data() {
-		return {
-			list_1: [
-				{iconSize: 60,showDot:false,icon: '/static/img/31.png',noIcon:'/static/img/31.png', value: '首页' },
-				{iconSize: 60,showDot:false,icon: '/static/img/32.png',noIcon:'/static/img/32.png', value: '衣橱' },
-				{iconSize: 60,showDot:false, icon: '/static/img/103.png',noIcon:'/static/img/103.png', value: '穿搭' },
-				{iconSize: 60,showDot:false, icon: '/static/img/34.png',noIcon:'/static/img/34.png', value: '商城' },
-				{iconSize: 60,showDot:false, icon: '/static/img/35.png',noIcon:'/static/img/35.png', value: '我的' }
-			],
-			showpage:0
-		};
-	},
-	onLoad(index) {
-		this.$tm.theme.setBlack(true);
-		if(index.index==1){
-			this.showpage=1;
-			this.initBtn()
-		}else if(index.index==2){
-			console.log(222)
-			this.showpage=2;
-			this.initshow()
-		}else{
-			this.showpage=0;
-		}
-	},
-	created() {
-		uni.onPushMessage((res) => {
-			console.log("收到推送消息:",res) //监听推送消息
-		})
-	},
-	methods: {
-		initBtn(){
-			this.$refs.yigui.qingkong();
-			this.$refs.yigui.getQiu();
+	import {
+		myRequest
+	} from '@/api/request.js'
+	export default {
+		data() {
+			return {
+				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万人追捧'
+				}],
+				list: [],
+				list1: [],
+				current: 0,
+				current1: 0,
+				listdata: [],
+				pagesize:2,
+				page:1,
+				shopGoodsList:[]
+			};
+		},
+		onLoad() {
+			// #ifdef MP
+			this.top = uni.upx2px(150);
+			// #endif
 		},
-		initshow(){
-			this.$refs.chuanda.shuaxin()
+		created() {
+			var that = this;
+			setTimeout(function() {
+				if (uni.getStorageSync("token") == "") {
+					uni.redirectTo({
+						url: "/pages/login/index"
+					})
+				}
+			}, 1000)
+			this.sys = uni.getSystemInfoSync();
+			this.getService();
+			this.getremmend();
+			this.getHot();
+			this.getPlan();
+			this.biaoshen();
 		},
-		changepage(info){
-			this.showpage=info.index
-		}
+		methods: {
+			biaoshen(){
+				let that = this;
+				myRequest({
+					url: "/api/ShopGoods/shopGoodsList",
+					method: 'get',
+					data: {}
+				}).then(res => {
+					if (res.data.code == 200) {
+						that.shopGoodsList=res.data.data;
+						// res.data.data.forEach(item => {
+						// 	that.list3.push({
+						// 		icon: item.img,
+						// 		text: item.name,
+						// 		sort: item.sort
+						// 	})
+						// })
+					} else {
+						that.$refs.toast.show({
+							model: 'error',
+							label: res.data.msg
+						})
+					}
+				})
+			},
+			qiehuandizhi(e){
+				if(e[2]!=null){
+					this.offshow=false;
+					this.chengshi=e[1];
+				}
+			},
+			xiangqing(){
+				uni.navigateTo({
+					url: "/pages/shopdetail/index",
+				})
+			},
+			// 获取用户服务列表
+			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.img,
+								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 => {
+					if (res.data.code == 200) {
+						res.data.data.forEach(item => {
+							that.list.push({
+								src: item.image,
+								name: item.title,
+								id:item.id
+							})
+						})
+					} 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 => {
+					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/ShopCollocation/hotList",
+					method: 'get',
+					data: {page:that.page,pagesize:that.pagesize}
+				}).then(res => {
+					if (res.data.code == 200) {
+						res.data.data.data.forEach(item => {
+							that.listdata.push({
+								image: item.image,
+								text: item.title,
+								id:item.id
+							})
+						})
+					} else {
+						that.$refs.toast.show({
+							model: 'error',
+							label: res.data.msg
+						})
+					}
+				})
+			},
+			tiaodapei(id) {
+				console.log(id)
+				uni.navigateTo({
+					url: "/pages/shouyedetail/index?id="+id,
+				})
+			},
+			tiao() {
+				uni.navigateTo({
+					url: "/pages/bianji/index",
+				})
+			},
+			tiaoclick(e) {
+				uni.navigateTo({
+					url: "/pages/zidingyikan/index?id="+e.data.id+"&type=1",
+				})
+			},
+			jinriFun(e) {
+				this.current = e;
+			},
+			sosoFun() {
+				uni.navigateTo({
+					url: "/pages/sousuo/index",
+				})
+			},
+			gengmore() {
+			},
+			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;
 	}
-};
-</script>
+	// 防止闪
+	/deep/ .zhuti .tm-grid{min-height: 70px !important;}
+	/deep/ .zhuti .bushan1{min-height: 160px !important;}
+	/deep/ .zhuti .bushan2{min-height: 157px !important;}
+</style>

+ 77 - 0
pages/index/index备份.vue

@@ -0,0 +1,77 @@
+<template>
+	<view>
+		<!-- 首页 -->
+		<!-- <HomePage v-if="showpage==0"></HomePage> -->
+		<!-- 衣柜 -->
+		<!-- <MardPage ref="yigui" v-if="showpage==1" @fatherMethod="initBtn"></MardPage> -->
+		<!-- 搭配 -->
+		<!-- <DapeiPage ref="chuanda" v-if="showpage==2" @fatherMethod="initshow"></DapeiPage> -->
+		<!-- 商城 -->
+		<!-- <ShopPage v-if="showpage==3"></ShopPage> -->
+		<!-- 我的 -->
+		<!-- <UserPage v-if="showpage==4"></UserPage> -->
+		<!-- 底部 -->
+		<!-- <view>
+			<tm-bottomnavigation :auto-selected="false" :activeIndex="showpage" @change="changepage" style="height:50px" :list="list_1"></tm-bottomnavigation>
+		</view> -->
+	</view>
+</template>
+
+<script>
+import HomePage from "@/pages/shouye/index"
+import MardPage from "@/pages/wardrobe/index"
+import DapeiPage from "@/pages/dapei/index"
+import ShopPage from "@/pages/shop/index"
+import UserPage from "@/pages/user/index"
+export default {
+	components:{
+		HomePage,
+		MardPage,
+		DapeiPage,
+		ShopPage,
+		UserPage
+	},
+	data() {
+		return {
+			// list_1: [
+			// 	{iconSize: 60,showDot:false,icon: '/static/img/31.png',noIcon:'/static/img/31.png', value: '首页' },
+			// 	{iconSize: 60,showDot:false,icon: '/static/img/32.png',noIcon:'/static/img/32.png', value: '衣橱' },
+			// 	{iconSize: 60,showDot:false, icon: '/static/img/103.png',noIcon:'/static/img/103.png', value: '穿搭' },
+			// 	{iconSize: 60,showDot:false, icon: '/static/img/34.png',noIcon:'/static/img/34.png', value: '商城' },
+			// 	{iconSize: 60,showDot:false, icon: '/static/img/35.png',noIcon:'/static/img/35.png', value: '我的' }
+			// ],
+			// showpage:0
+		};
+	},
+	onLoad(index) {
+		// this.$tm.theme.setBlack(true);
+		// if(index.index==1){
+		// 	this.showpage=1;
+		// 	this.initBtn()
+		// }else if(index.index==2){
+		// 	console.log(222)
+		// 	this.showpage=2;
+		// 	this.initshow()
+		// }else{
+		// 	this.showpage=0;
+		// }
+	},
+	created() {
+		uni.onPushMessage((res) => {
+			console.log("收到推送消息:",res) //监听推送消息
+		})
+	},
+	methods: {
+		initBtn(){
+			this.$refs.yigui.qingkong();
+			this.$refs.yigui.getQiu();
+		},
+		initshow(){
+			this.$refs.chuanda.shuaxin()
+		},
+		changepage(info){
+			this.showpage=info.index
+		}
+	}
+};
+</script>

+ 61 - 9
pages/luru/index.vue

@@ -28,21 +28,36 @@
 				<view v-if="active==2">
 					<image block class="nicheng" mode="widthFix" :src="koutu"></image>
 					<view class="you black mt-30">
-						<tm-input :required="true" title="商品名称" v-model="reqData.goods_name" align="right"></tm-input>
-						<tm-pickers class="tan" :default-value.sync="category_danarr" rang-key="category_name" :list="category_arr">
-							<tm-input :required="true" title="分类" placeholder="请选择分类" disabled :value="obTstr1(category_danarr,'category_name')" right-icon="icon-angle-right"></tm-input>
+						<!-- <tm-pickers v-for="item in arrbig" class="tan" :default-value.sync="item.choosevalue" rang-key="category_name" list="[]">
+							<tm-input title="分类" placeholder="请选择分类" disabled :value="obTstrnew(category_danarr,'')" right-icon="icon-angle-right"></tm-input>
+						</tm-pickers> -->
+						<tm-pickers v-for="(item,index) in arrbig" @confirm="xuanze" :indexfu="index" :list="item.value">
+							<tm-input title="分类" placeholder="请选择分类" v-model="item.choosename" disabled right-icon="icon-angle-right"></tm-input>
 						</tm-pickers>
-						<tm-pickers class="tan" :default-value.sync="role_danarr" rang-key="username" :list="role_arr">
+						<!-- <tm-listitem
+							v-for="item in arrbig"
+							:left-icon-size="80"
+							value="打开"
+							title="支付"
+							label="微信和支付宝微信和支付宝微信和支付宝微信和支付宝"
+							left-icon="https://cdn.roundicons.com/wp-content/uploads/2017/09/Lego-freebie-icon.png"
+							show-left-icon
+						></tm-listitem> -->
+						<!-- <tm-input :required="true" title="商品名称" v-model="reqData.goods_name" align="right"></tm-input> -->
+						<!-- <tm-pickers class="tan" :default-value.sync="category_danarr" rang-key="category_name" :list="category_arr">
+							<tm-input :required="true" title="分类" placeholder="请选择分类" :value="obTstr1(category_danarr,'category_name')" right-icon="icon-angle-right"></tm-input>
+						</tm-pickers> -->
+						<!-- <tm-pickers class="tan" :default-value.sync="role_danarr" rang-key="username" :list="role_arr">
 							<tm-input title="所属成员" :required="true" placeholder="请选择所属成员" disabled :value="obTstr3(role_danarr)" right-icon="icon-angle-right"></tm-input>
-						</tm-pickers>
-						<tm-input title="年份" v-model="reqData.year" align="right"></tm-input>
+						</tm-pickers> -->
+						<!-- <tm-input title="年份" v-model="reqData.year" align="right"></tm-input>
 						<tm-input title="颜色" v-model="reqData.color" align="right"></tm-input>
 						<tm-pickers class="tan" :default-value.sync="size_danarr" rang-key="title" :list="size_arr">
 							<tm-input title="尺码" placeholder="请选择尺码" disabled :value="obTstr2(size_danarr)" right-icon="icon-angle-right"></tm-input>
 						</tm-pickers>
 						<tm-input title="适用人群" v-model="reqData.type" align="right"></tm-input>
 						<tm-input title="品牌" v-model="reqData.brand" align="right"></tm-input>
-						<tm-input title="材料" v-model="reqData.science" align="right"></tm-input>
+						<tm-input title="材料" v-model="reqData.science" align="right"></tm-input> -->
 						
 					</view>
 					<tm-button :round="24" class="sao mb-40 mt-40" @click="chuangjianFun()" block>提交</tm-button>
@@ -74,8 +89,9 @@ import { pathToBase64, base64ToPath } from '@/js_sdk/mmmm-image-tools/index.js'
 export default {
 	data() {
 		return {
+			arrbig:[],
 			koutu:'/static/img/53.png',
-			active:1,
+			active:2,
 			category_arr:[],
 			category_danarr:[],
 			size_arr:[
@@ -111,8 +127,15 @@ export default {
 		this.sys = uni.getSystemInfoSync();
 		this.getFl();
 		this.getCY();
+		this.jiaobenFun()
 	},
 	methods: {
+		xuanze(data){
+			var index=data[0].index;
+			// this.arrbig[index].choosename=data[0].data;
+			console.log(data[0].data)
+			console.log(this.arrbig)
+		},
 		getFl(){
 			var that=this;
 			myRequest({
@@ -180,7 +203,36 @@ export default {
 				success: function (res) {
 					that.imgpath = res.tempFilePaths[0]   //先获得本地文件的路径列表,存储到数组
 					console.log(that.imgpath)          //注意该api会将路径转换为blob格式
-					that.getBase64Image(that.imgpath);
+					// that.getBase64Image(that.imgpath);
+					// 调脚本接口
+					that.jiaobenFun()
+				}
+			})
+		},
+		obTstrnew(o){
+			if(Array.isArray(o)){
+				if(o.length.length===0) return "";
+				return o[0]?.category_name??""
+			}
+			return ''
+		},
+		jiaobenFun(){
+			var that=this;
+			myRequest({
+				url: "/api/Goods/selectScript",
+				method:'post',
+				data:that.reqData
+			}).then(res => {
+				console.log(res.data)
+				if (res.data.code == 200) {
+					var arrbig=[
+						{name:"颜色",value:["白色","绿色","蓝色"],choosevalue:'',choosename:''}
+					]
+					that.arrbig=arrbig;
+					that.active=2;
+					console.log(that.arrbig)
+				}else{
+					
 				}
 			})
 		},

+ 6 - 2
pages/shouye/index.vue

@@ -20,7 +20,7 @@
 		<view class="zhuti mt-50">
 			<tm-grid :grid="5" :list="list3" :icon-size="140" font-color="white"></tm-grid>
 			<!-- 今日穿搭 -->
-			<tm-sheet class="lunbo">
+			<tm-sheet class="lunbo bushan1">
 				<view class="py-10 text-size-g dianz">
 					<image src="/static/img/6.png" mode="widthFix"></image>
 					<text class="text-white">今日穿搭推荐</text>
@@ -53,7 +53,7 @@
 				</view>
 			</tm-sheet>
 			<!-- 明日计划 -->
-			<tm-sheet class="lunbo1">
+			<tm-sheet class="lunbo1 bushan2">
 				<view class="py-10 text-size-g dianz mingri">
 					<image src="/static/img/17.png" mode="widthFix"></image>
 					<text class="text-white">明日计划</text>
@@ -593,4 +593,8 @@
 		width: 30px !important;
 		margin-top: 10px !important;
 	}
+	// 防止闪
+	/deep/ .zhuti .tm-grid{min-height: 70px !important;}
+	/deep/ .zhuti .bushan1{min-height: 160px !important;}
+	/deep/ .zhuti .bushan2{min-height: 157px !important;}
 </style>

+ 6 - 2
tm-vuetify/components/tm-pickers/tm-pickers.vue

@@ -10,7 +10,7 @@
 			</view>
 			<tm-pickersView v-if="showpop" @change="$emit('change',$event)" @aniStart="aniisTrue=false" @aniEnd="aniisTrue=true" ref="tmPicKersTest" :defaultValue="dataValue"
 			:itemHeight="itemHeight" :list="list" :rangKey="rangKey"
-			:childrenKey="childrenKey" :black="black_tmeme" :disabled="disabled"
+			:childrenKey="childrenKey" :black="black_tmeme" :indexfu="indexfu" :disabled="disabled"
 			:bgColor="bgColor"
 			></tm-pickersView>
 			<view class="pa-32">
@@ -94,6 +94,10 @@
 				type:String|Boolean,
 				default:false
 			},
+			indexfu:{
+				type: String | Number,
+				default: "text"
+			},
 			// 背景颜色,主题色名称。
 			bgColor:{
 				type:String,
@@ -158,7 +162,7 @@
 		},
 		methods: {
 			confirm() {
-				
+				console.log(this.indexfu)
 				if(!this.aniisTrue){
 					console.log('no');
 					return ;

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 1
unpackage/dist/dev/app-plus/app-config-service.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/app-plus/app-service.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 122 - 126
unpackage/dist/dev/app-plus/app-view.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/app-plus/manifest.json


BIN=BIN
unpackage/dist/dev/app-plus/static/img/110.png


BIN=BIN
unpackage/dist/dev/app-plus/static/img/gouwuche.png


Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio