From a29c2fa753f644503607208c72752e9a2748741d Mon Sep 17 00:00:00 2001
From: jugao <jugao@xogrp.com>
Date: Thu, 29 Apr 2021 18:47:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=91=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/css/common.css             |   7 +
 pages.json                        |  29 ++-
 pages/.DS_Store                   | Bin 6148 -> 10244 bytes
 pages/qHome/achievement.vue       | 286 ++++++++++++++++++++++++++++++
 pages/tabbar/home.vue             |  25 ++-
 pages/tabbar/shop.vue             |  18 +-
 pages/yunProduct/detail.vue       |  18 +-
 pages/yunProduct/newDetail.vue    | 119 +++++++++++++
 pages/yunProduct/storeProduct.vue |   5 +-
 static/base/.DS_Store             | Bin 0 -> 6148 bytes
 static/base/select.png            | Bin 0 -> 2158 bytes
 11 files changed, 477 insertions(+), 30 deletions(-)
 create mode 100644 pages/qHome/achievement.vue
 create mode 100644 pages/yunProduct/newDetail.vue
 create mode 100644 static/base/.DS_Store
 create mode 100644 static/base/select.png

diff --git a/common/css/common.css b/common/css/common.css
index 2a9bbf1..fad3ac8 100644
--- a/common/css/common.css
+++ b/common/css/common.css
@@ -179,4 +179,11 @@ button:after{
 /* input */
 .placeholder{
 	color: #999 !important;
+}
+
+.fix-bottom{
+	position: fixed;
+	bottom: 0rpx;
+	left: 0rpx;
+	right: 0rpx;
 }
\ No newline at end of file
diff --git a/pages.json b/pages.json
index ffaa934..7de15e9 100644
--- a/pages.json
+++ b/pages.json
@@ -35,7 +35,17 @@
 		    "style" : {
 				"navigationStyle":"custom",
 				"navigationBarTitleText": "云商城",
-				"disableScroll": true,
+				"disableScroll": false,
+				"app-plus": {
+					"bounce":"none"
+				}
+			}
+		},{
+		    "path" : "pages/qHome/achievement",
+		    "style" : {
+				"navigationStyle":"custom",
+				"navigationBarTitleText": "打款业绩",
+				"disableScroll": false,
 				"app-plus": {
 					"bounce":"none"
 				}
@@ -45,7 +55,7 @@
 		    "style" : {
 				"navigationStyle":"custom",
 				"navigationBarTitleText": "产品详情",
-				"disableScroll": true,
+				"disableScroll": false,
 				"app-plus": {
 					"bounce":"none"
 				}
@@ -55,13 +65,22 @@
 		    "style" : {
 				"navigationStyle":"custom",
 				"navigationBarTitleText": "云仓备货",
-				"disableScroll": true,
+				"disableScroll": false,
 				"app-plus": {
 					"bounce":"none"
 				}
 			}
-		}
-		,{
+		},{
+		    "path" : "pages/yunProduct/newDetail",
+		    "style" : {
+				"navigationStyle":"custom",
+				"navigationBarTitleText": "资讯详情",
+				"disableScroll": false,
+				"app-plus": {
+					"bounce":"none"
+				}
+			}
+		},{
 		    "path" : "pages/tabbar/cart",
 		    "style" : {
 				"navigationBarTitleText": "购物车",
diff --git a/pages/.DS_Store b/pages/.DS_Store
index 5008ddfcf53c02e82d7eee2e57c38e5672ef89f6..db4aecf70dc4e9449e79ce5c59d99e0ff9b0eaac 100644
GIT binary patch
literal 10244
zcmeHMO^n+_6n@^HY_g$fK}h^9!UEB))IB6XTL~eN4Z8@W3RcZR4^S36Hk*j79UNyP
zv|0$2I3T1I0!|>&9w^+X5QiQ>99nLu{GB)=E<GTXUaDUC<|odK6ED3Wfp%=!&zbkV
zd7r=Wj6D+~vZ`ILOk@*L9tX2?x8O8pV}5pwY!kAi3Tq*r$fpi<S{vnBJsd%s0;7OY
zz$jo8FbWt2{tF7=oz1p<QCM>}3K#{90*L}_e6VpaTamUeEFU^>;!^<FDHQV!*O&+J
z7+czkw0&WDDC!im2TO)pa*APzaQJNohpkB47gmImCBn&)nJqa(v3PdG*&I$*MObq-
z3K#`O6{w<Uh8*&+N9z22vn{~)o*qSPhRe%tD|F$>KRbW<#C!9Xmd2sHn?SW2Y_(vJ
z%|<mC5gh7LObxM;Fz~HhQGF_h^AG$o;E=>_hQsXR{CZw~vj?b74GOV$pu|$9Cf4B#
zV6q2V<#y%F&jW6IMhw~BT!hBo;{0>qA40h{&VjDo!aZQD`Bjd)&;K;wn8FNMWnnZP
zR6!by<gcOyx4<HzCfd>0xy*FOVN^Z~Zlc*pU241Th0}TQw*srn$L^5}esy|H=QaDg
z<fUO$USEBb=rmH7%4;v&7+yIFpj8a5>S?VGd<RaNU*&V-T*4=X8Ma#%W(<#M-eMjU
zigaau{R=D<ugc-ecar|EA%+abBeeYDr9OivHv$I_&v2b$ox|7PfI|wQ^7!-99|zCy
z2x`bB8>R7~Ye)v&+hF2Si?xi-ruanKuX6ctE#acop*|y77@ddBcudpl^fYwYB;W0I
z+H&N*?zUUaPFyPeW=%{^P3LCvh1p`Ecx$n6s@4d5wb+TfovIV9&&}7Gp6@!*$)*=K
z*8E_l<!|}HbJ1}p_M;aWcr6TD0ElbHeWB_1*5~ecG7Ms;8Tb*ePt@_!$!6e%y=vGE
zybj09%K7!G6E{##{=tfWmNBP7zOX)b*Y@_2QhCuXA1UuF+S|vDl@{$sA33_SQ^@D<
zUU=%n%iYtvAAj=MxzE42c!@`mCBO3MHt{<-e~&9gj;&f0w8CHmr7R+c$H(CvDWDC#
z!4AEj_Nxtc^-ZNCDRrm~mW9z9tb{b+!CoK^*x-et^SFIC?N@o6I-hhVtqzq(7Dne`
zGai$iN2(*e{qE4C=AJ#6XdvU%tfO8%-&vL~2kjkn7&g47hLCUHO8eE^^v4emUl1P=
zS{*8bER4oOeE#RC2L>(detH-={ut+>_*EXyOeh^!!wiRzER4p3`ba~w^aciyfL61I
zwa4$w!l}H@-2c!ANAKewS!3%|b^0f)&U2OVG@DVtC}0#Y3hXNdCdJ*_Z2f;F`~Uxa
zrHQ#&qriSsz?xdFEwhEd!K^DSzyu0x9IxPD8^iU5<smpR2rK8y@%X`(;}6L)J|~jb
z6>0mz@^HlQa9AD=D^~OWwLb%vkUh0Zpnn!$WAwDSyFQIG^M5n{XA5>%XV4#<|IPgW
EZ|LV9SO5S3

delta 98
zcmZn(XfcprU|?W$DortDU=RQ@Ie-{MGpJ516q~502;ws^0>w5KPGg_gAhnpCgF}!R
mBnTAa1`@77th%xAJM(0I6-7qI$)+kstROQPHplbKVFm!!rw@hz

diff --git a/pages/qHome/achievement.vue b/pages/qHome/achievement.vue
new file mode 100644
index 0000000..94dbd85
--- /dev/null
+++ b/pages/qHome/achievement.vue
@@ -0,0 +1,286 @@
+<template>
+	<view class="app">		
+		<view class="menu">
+			<view class="menu-item" @click="currentTitle='打款业绩'">
+				<text class="menu-item-txt">打款业绩</text>
+				<view :style="{backgroundColor:currentTitle=='打款业绩'?'#EDAF8B':'white'}" class="menu-item-line"></view>
+			</view>
+			
+			<view class="menu-item" @click="currentTitle='出货业绩'">
+				<text class="menu-item-txt">出货业绩</text>
+				<view :style="{backgroundColor:currentTitle=='出货业绩'?'#EDAF8B':'white'}"  class="menu-item-line"></view>
+			</view>
+			
+			<view class="separator-line"></view>
+		</view>
+		
+		<view class="separator-section"></view>
+		
+		
+		<view class="achievement-head">
+			<view class="achievement-head-left">
+				<text class="achievement-head-time">2021年4月</text>
+				<text class="achievement-head-number">打款业绩：￥99999.00</text>
+			</view>
+			
+			<view class="achievement-head-right">
+				<text class="achievement-head-right-txt">全部</text>
+				<image class="achievement-head-right-img" src="/static/base/select.png"></image>
+			</view>
+		</view>
+
+		
+		
+		<!-- <view class="product-section">
+			<text class="prduct-title">轻未来超纤维阻燃粉轻未来超纤维阻燃粉轻未来超纤维阻燃粉</text>
+			<view class="product-des">
+				<view class="product-price">
+					<text class="product-price-sale">￥5999</text>
+					<text class="product-price-show">￥6999</text>
+				</view>
+				<text class="product-number">库存：2000个</text>
+			</view>
+		</view>
+		
+		
+		<view class="separator-section"></view>
+		
+		
+		<view class="product-detail">
+			<text class="product-detail-title">产品描述</text>
+			<view class="product-detail-wrap">
+				<text class="product-detail-txt">理想，是未来事物的美好想象和希望，也比喻对某事物榛于最完善境界的观念。是人们在实践过程中形成的，有实现可能性的、对未来社会和自身发展的向往和追求；价值观是基于人的一定的思维感官之上而作出的认知、理解、判断或抉择、也就是认定事物、判定是非的一种思维或取向、本产本具有良好疗效；</text>
+			</view>
+			<image class="product-detail-img" src="/static/shop/677088217d8a00aa.jpg"></image>
+		</view>
+		
+		 -->
+	
+		
+		
+	<!-- 	<view class="shop-list">
+			<view class="shop-item">
+				<view class="shop-item-left">
+					<text class="shop-item-left-title">通知 | 关于“轻未来超轻维阻燃粉”外包装升级通知</text>
+					<text class="shop-item-left-time">2021年4月23日</text>
+				</view>
+				<image src="/static/shop/677088217d8a00aa.jpg" class="shop-item-img">
+				</image>
+			</view>
+			
+			<view class="shop-item">
+				<view class="shop-item-left">
+					<text class="shop-item-left-title">通知 | 关于“轻未来超轻维阻燃粉”外包装升级通知</text>
+					<text class="shop-item-left-time">2021年4月23日</text>
+				</view>
+				<image src="/static/shop/677088217d8a00aa.jpg" class="shop-item-img">
+				</image>
+			</view>
+			
+			<view class="shop-item">
+				<view class="shop-item-left">
+					<text class="shop-item-left-title">通知 | 关于“轻未来超轻维阻燃粉”外包装升级通知</text>
+					<text class="shop-item-left-time">2021年4月23日</text>
+				</view>
+				<image src="/static/shop/677088217d8a00aa.jpg" class="shop-item-img">
+				</image>
+			</view>
+		</view> -->
+		
+		
+		
+		
+	</view>
+</template>
+
+<script>
+
+	export default {
+		components: {
+	
+		},
+		data() {
+			return {
+				currentTitle:'打款业绩',
+				navList: [],//导航列表
+				advertList: [],//广告列表
+				hotList: [],//热门推荐
+			   indicatorDots: true,
+				autoplay: true,
+				interval: 2000,
+				duration: 500,
+				swipeImgs:['/static/shop/677088217d8a00aa.jpg','/static/shop/rem.jpg','/static/shop/b7f2be6053cc88b4.jpg']
+			}
+		},
+		computed: {
+			  changeIndicatorDots(e) {
+			            this.indicatorDots = !this.indicatorDots
+			        },
+			        changeAutoplay(e) {
+			            this.autoplay = !this.autoplay
+			        },
+			        intervalChange(e) {
+			            this.interval = e.target.value
+			        },
+			        durationChange(e) {
+			            this.duration = e.target.value
+			        },
+			midAdvert(){
+				if(this.advertList.length === 0) return {};
+				const res = this.advertList.filter(item=> item.advert_type === 'middle');
+				return res.length > 0 ? res[0]: {};
+			},
+			carousel(){
+				return this.advertList.filter(item=> item.advert_type === 'carousel');
+			}
+		},
+		onLoad() {
+			this.loadAdvert();
+			this.loadNavList();
+			
+			setTimeout(()=>{
+				//this.navTo('/pages/address/list')
+			}, 1000)
+		},
+		methods: {
+			toStoreProduct(){
+					this.navTo(`/pages/yunProduct/storeProduct`)
+			},
+			//加载广告 缓存10分钟
+			async loadAdvert(){
+				const res = await this.$request('advert', 'getAdvertList', {}, {
+					cache: 10*60
+				});
+				this.advertList = res.data;
+				this.log(res);
+			},
+			//加载导航 缓存1小时
+			async loadNavList(){
+				const res = await this.$request('advert', 'getNavList', {}, {
+					cache: 60*60*0,
+				});
+				this.navList = res.data;
+			},
+		}
+	}
+</script>
+
+<style>
+	page{
+		background-color: white;
+	}
+</style>
+<style scoped lang="scss">
+	/* 分类 */
+	
+	
+
+	.menu{
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		background-color: white;
+		// background-color: yellow;
+	}
+	
+	
+	.menu-item{
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		flex:1;
+	}
+	
+	.menu-item-txt{
+		width: 200rpx;
+		text-align: center;
+		display: block;
+		font-size: 15px;
+		font-weight: bold;
+		color: #333333;
+		height: 104rpx;
+		line-height: 104rpx;
+	}
+	.menu-item-line{
+		position: relative;
+		top: -20rpx;
+		background-color: #EDAF8B;
+		height:6rpx ;
+		width: 50rpx;
+	}
+	
+	.separator-line{
+		position: absolute;
+		left: 49.98%;
+		width: 2rpx;
+		background-color:#333333 ;
+		height: 33rpx;
+	}
+	
+	.separator-section{
+		background-color: $separatorColor;
+		height: 20rpx;
+	}
+	
+	.achievement-head{
+		
+		margin: 36rpx;
+		// width: 750rpx;
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+		align-items: center;
+	}
+	
+	.achievement-head-time{
+		font-size: 18px;
+		// font-weight: 500;
+		color: #333333;
+		padding: 0rpx 0rpx 20rpx;
+	}
+	.achievement-head-number{
+		padding: 10rpx 0rpx 0rpx;
+		display: block;
+		font-size: 15px;
+		font-weight: 500;
+		color: #999999;
+	}
+	
+	.achievement-head-right{
+		padding: 10rpx 10rpx 10rpx 25rpx;
+		background-color:#F5F5F5 ;
+		margin: 0rpx 10rpx 0rpx 0rpx;
+		border-radius: 6rpx;
+	}
+	
+	.achievement-head-right-txt{
+		font-size: 13px;
+		font-weight: 500;
+		color: #333333;
+	}
+	.achievement-head-right-img{
+		position: relative;
+		top: 2rpx;
+		display: inline-block;
+		width: 20rpx;
+		height: 20rpx;
+		margin: 0rpx 10rpx;
+	}
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+</style>
+
diff --git a/pages/tabbar/home.vue b/pages/tabbar/home.vue
index 75bc352..72f7037 100644
--- a/pages/tabbar/home.vue
+++ b/pages/tabbar/home.vue
@@ -13,15 +13,18 @@
 				<text class="triangle-topleft"></text>
 				<text class="date-txt">2021年</text>
 			</view>
-			<view class="service-item">
-				<text class="service-number">100.00</text>
-				<text class="service-unit">万</text>
-			</view>
-			<text class="service-title">服务业绩(元)</text>
-			<view class="charge-item">
-				<text class="charge-item-money">充值业绩：10.00万</text>
-				<text class="charge-item-money">本月营业额：8000元</text>
+			<view @click="toAchievement">
+				<view class="service-item">
+					<text class="service-number">100.00</text>
+					<text class="service-unit">万</text>
+				</view>
+				<text class="service-title">服务业绩(元)</text>
+				<view class="charge-item">
+					<text class="charge-item-money">充值业绩：10.00万</text>
+					<text class="charge-item-money">本月营业额：8000元</text>
+				</view>
 			</view>
+	
 			
 			
 			<view class="service-item">
@@ -219,7 +222,11 @@
 				//this.navTo('/pages/address/list')
 			}, 1000)
 		},
-		methods: {
+		methods: {
+			toAchievement(){
+				this.navTo('/pages/qHome/achievement')
+				
+			},
 			//加载广告 缓存10分钟
 			async loadAdvert(){
 				const res = await this.$request('advert', 'getAdvertList', {}, {
diff --git a/pages/tabbar/shop.vue b/pages/tabbar/shop.vue
index 0890569..b3be23e 100644
--- a/pages/tabbar/shop.vue
+++ b/pages/tabbar/shop.vue
@@ -8,17 +8,17 @@
 		
 		
 		<swiper class="swiper" indicator-active-color="white" :indicator-dots="indicatorDots" :autoplay="autoplay" :interval="interval" :duration="duration">
-			<swiper-item>
+			<swiper-item @click="toYunProduct()">
 				<view class="swiper-item uni-bg-red">
 					<image class="swiper-img swiper-img-tt" src="/static/shop/677088217d8a00aa.jpg"></image>
 				</view>
 			</swiper-item>
-			<swiper-item>
+			<swiper-item @click="toYunProduct()">
 				<view class="swiper-item uni-bg-green">
 					<image class="swiper-img" src="/static/shop/rem.jpg"></image>
 				</view>
 			</swiper-item>
-			<swiper-item>
+			<swiper-item @click="toYunProduct()">
 				<view class="swiper-item uni-bg-blue">
 					<image class="swiper-img" src="/static/shop/b7f2be6053cc88b4.jpg"></image>
 				</view>
@@ -35,7 +35,7 @@
 		
 		
 		<view class="shop-list">
-			<view class="shop-item" @click="toYunProduct">
+			<view class="shop-item" @click="toNewDetail">
 				<view class="shop-item-left">
 					<text class="shop-item-left-title">通知 | 关于“轻未来超轻维阻燃粉”外包装升级通知</text>
 					<text class="shop-item-left-time">2021年4月23日</text>
@@ -44,7 +44,7 @@
 				</image>
 			</view>
 			
-			<view class="shop-item" @click="toYunProduct">
+			<view class="shop-item" @click="toNewDetail">
 				<view class="shop-item-left">
 					<text class="shop-item-left-title">通知 | 关于“轻未来超轻维阻燃粉”外包装升级通知</text>
 					<text class="shop-item-left-time">2021年4月23日</text>
@@ -53,7 +53,7 @@
 				</image>
 			</view>
 			
-			<view class="shop-item" @click="toYunProduct">
+			<view class="shop-item" @click="toNewDetail">
 				<view class="shop-item-left">
 					<text class="shop-item-left-title">通知 | 关于“轻未来超轻维阻燃粉”外包装升级通知</text>
 					<text class="shop-item-left-time">2021年4月23日</text>
@@ -88,7 +88,8 @@
 			   indicatorDots: true,
 				autoplay: true,
 				interval: 2000,
-				duration: 500
+				duration: 500,
+				swipeImgs:['/static/shop/677088217d8a00aa.jpg','/static/shop/rem.jpg','/static/shop/b7f2be6053cc88b4.jpg']
 			}
 		},
 		computed: {
@@ -122,6 +123,9 @@
 			}, 1000)
 		},
 		methods: {
+			toNewDetail(){
+				this.navTo(`/pages/yunProduct/newDetail`);	
+			},
 			toYunProduct(){
 				let keyword=1
 				this.navTo(`/pages/yunProduct/detail?keyword=${keyword}`);	
diff --git a/pages/yunProduct/detail.vue b/pages/yunProduct/detail.vue
index 6f2baa3..71208fc 100644
--- a/pages/yunProduct/detail.vue
+++ b/pages/yunProduct/detail.vue
@@ -4,16 +4,13 @@
 			<text class="menu-txt" @click="toStoreProduct">云仓备货</text>
 			<text class="menu-txt" style="border-left-width: 0rpx;">云仓提货</text>
 		</view>
-		
-		
-		
 		<swiper class="swiper" indicator-active-color="white" :indicator-dots="indicatorDots" :autoplay="autoplay" :interval="interval" :duration="duration">
-			<swiper-item>
+			<swiper-item v-for="(item,index) in swipeImgs" :key=index>
 				<view class="swiper-item uni-bg-red">
-					<image class="swiper-img swiper-img-tt" src="/static/shop/677088217d8a00aa.jpg"></image>
+					<image class="swiper-img swiper-img-tt" :src="item"></image>
 				</view>
 			</swiper-item>
-			<swiper-item>
+	<!-- 		<swiper-item>
 				<view class="swiper-item uni-bg-green">
 					<image class="swiper-img" src="/static/shop/rem.jpg"></image>
 				</view>
@@ -22,7 +19,7 @@
 				<view class="swiper-item uni-bg-blue">
 					<image class="swiper-img" src="/static/shop/b7f2be6053cc88b4.jpg"></image>
 				</view>
-			</swiper-item>
+			</swiper-item> -->
 		</swiper>
 		
 		
@@ -50,6 +47,9 @@
 		</view>
 		
 		
+	
+		
+		
 	<!-- 	<view class="shop-list">
 			<view class="shop-item">
 				<view class="shop-item-left">
@@ -99,7 +99,8 @@
 			   indicatorDots: true,
 				autoplay: true,
 				interval: 2000,
-				duration: 500
+				duration: 500,
+				swipeImgs:['/static/shop/677088217d8a00aa.jpg','/static/shop/rem.jpg','/static/shop/b7f2be6053cc88b4.jpg']
 			}
 		},
 		computed: {
@@ -179,6 +180,7 @@
 		display: flex;
 		flex-direction: row;
 		align-items: center;
+		background-color: white;
 	}
 	.menu-txt{
 		height: 90rpx;
diff --git a/pages/yunProduct/newDetail.vue b/pages/yunProduct/newDetail.vue
new file mode 100644
index 0000000..71f0f64
--- /dev/null
+++ b/pages/yunProduct/newDetail.vue
@@ -0,0 +1,119 @@
+<template>
+	<view class="app" style="margin: 10rpx 30rpx;">	
+		<text class="new-title">一见倾心 | 轻未来2021大健康引领5G新店品牌战略盛典圆满成功！</text>
+		<text class="new-time">2021年4月24日</text>
+		<image src="/static/shop/677088217d8a00aa.jpg" class="new-img"></image>
+		<text class="new-des">理想，是未来事物的美好想象和希望，也比喻对某事物榛于最完善境界的观念。是人们在实践过程中形成的，有实现可能性的、对未来社会和自身发展的向往和追求；价值观是基于人的一定的思维感官之上而作出的认知、理解、判断或抉择、也就是认定事物、判定是非的一种思维或取向、本产本具有良好疗效；理想，是未来事物的美好想象和希望，也比喻对某事物榛于最完善境界的观念。是人们在实践过程中形成的，有实现可能性的、对未来社会和自身发展的向往和追求；价值观是基于人的一定的思维感官之上而作出的认知、理解、判断或抉择、也就是认定事物、判定是非的一种思维或取向、本产本具有良好疗效；</text>
+	</view>
+</template>
+
+<script>
+
+	export default {
+		components: {
+	
+		},
+		data() {
+			return {
+				navList: [],//导航列表
+				advertList: [],//广告列表
+				hotList: [],//热门推荐
+			   indicatorDots: true,
+				autoplay: true,
+				interval: 2000,
+				duration: 500
+			}
+		},
+		computed: {
+			  changeIndicatorDots(e) {
+			            this.indicatorDots = !this.indicatorDots
+			        },
+			        changeAutoplay(e) {
+			            this.autoplay = !this.autoplay
+			        },
+			        intervalChange(e) {
+			            this.interval = e.target.value
+			        },
+			        durationChange(e) {
+			            this.duration = e.target.value
+			        },
+			midAdvert(){
+				if(this.advertList.length === 0) return {};
+				const res = this.advertList.filter(item=> item.advert_type === 'middle');
+				return res.length > 0 ? res[0]: {};
+			},
+			carousel(){
+				return this.advertList.filter(item=> item.advert_type === 'carousel');
+			}
+		},
+		onLoad() {
+			this.loadAdvert();
+			this.loadNavList();
+			
+			setTimeout(()=>{
+				//this.navTo('/pages/address/list')
+			}, 1000)
+		},
+		methods: {
+			toStoreProduct(){
+					this.navTo(`/pages/yunProduct/storeProduct`)
+			},
+			//加载广告 缓存10分钟
+			async loadAdvert(){
+				const res = await this.$request('advert', 'getAdvertList', {}, {
+					cache: 10*60
+				});
+				this.advertList = res.data;
+				this.log(res);
+			},
+			//加载导航 缓存1小时
+			async loadNavList(){
+				const res = await this.$request('advert', 'getNavList', {}, {
+					cache: 60*60*0,
+				});
+				this.navList = res.data;
+			},
+		}
+	}
+</script>
+
+<style>
+	page{
+		background-color: white;
+	}
+</style>
+<style scoped lang="scss">
+	/* 分类 */
+	
+	
+	.new-title{
+		display: block;
+		line-height: 45rpx;
+		font-size: 15px;
+		font-weight: bold;
+		color: #333333;
+		margin: 50rpx 0rpx 0rpx;
+	}
+	.new-time{
+		display: block;
+		font-size: 13px;
+		font-weight: 500;
+		color: #999999;
+		text-align: right;
+	}
+	.new-img{
+		width: 100%;
+		height: 375rpx;
+		margin: 48rpx 0rpx 50rpx;
+		
+	}
+	.new-des{
+		font-size: 13px;
+		font-weight: 500;
+		color: #999999;
+	}
+	
+	
+	
+</style>
+
diff --git a/pages/yunProduct/storeProduct.vue b/pages/yunProduct/storeProduct.vue
index 0cb3ec6..2fb6fcf 100644
--- a/pages/yunProduct/storeProduct.vue
+++ b/pages/yunProduct/storeProduct.vue
@@ -185,7 +185,8 @@
 	}
 	.product-left{
 		background-color:#F5F5F5 ;
-		height:calc(100vh - 200rpx);
+		height:calc(100vh - 95rpx);
+		// height:calc(100vh - 200rpx);
 	}
 	
 	.product-left-item{
@@ -308,6 +309,8 @@
 	.product-footer{
 		border-top: 1rpx solid $separatorColor;
 		position: absolute;
+		position: fixed;
+		// bottom: 32rpx;
 		bottom: 0rpx;
 		left: 0rpx;
 		right: 0rpx;
diff --git a/static/base/.DS_Store b/static/base/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6
GIT binary patch
literal 6148
zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3
zem<@ulZcFPQ@L2!n>{z**<q8>++&mCkOWA81W14cNZ<zv;LbK1Poaz?KmsK2CSc!(
z0ynLxE!0092;Krf2c+FF_Fe*7ECH>lEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ
zLs35+`xjp>T0<F0fCPF1$Cyrb|F7^5{eNG?83~ZUUlGt@xh*qZDeu<Z%US-OSsOPv
j)R!Z4KLME7ReXlK;d!wEw5GODWMKRea10D2@KpjYNUI8I

literal 0
HcmV?d00001

diff --git a/static/base/select.png b/static/base/select.png
new file mode 100644
index 0000000000000000000000000000000000000000..c96524fd11fe3432f45b5dcc534669edfe93679e
GIT binary patch
literal 2158
zcmd5;`#%%<8~@CZXt69r&YZdBa#%)97lw6aVlk|_>%vJBU6jVg@~zCR%Sl+oH_mca
zu^6R@om@g|qRxn1O03K=_gnMzUH`)Or|%EX^Sqv4p4an!z2EQW^<?;x2rx}UO#lFl
z=!qvQE9*ySs4H``%aPXrXgCq^ZUGm=|GAs`XH?+USG~`dc5cDqJ=Hxlc3oM!_xZX$
zWqEw6wu{MIhQ30!h>#9fG8PH0W`5b89$EojS*5;NZUO9VspVr0iDEitE*kICPR>4J
zv9(RJbjMN6p^t*2%_*14=BAu~D@hg)CGyw06f=wAu8lH`tVqyxJ<G)Oq#Al+(wwdX
zQ0X|J%!f^8=ebY~aMMPIzS;v(Wwmc*?_+)gD!4D2_~OO{05LhMhB_3nhXr(=soX5L
zH^u>W=%w~|`I}7uz7qH4+rbV0!<dMN(Bnb7UW-aRT2|T@=FHcO%eqf=oyIb1PvUNa
z_BqBiPLn1$OgV2h7vdLbi5e=;?e~|2!~i{g{dn0z(y$$kI)1(!=ZAP|Njw|E(eQ$p
zwA!0;BhGcYqxD#hK74$OaSGS6JJ*lJ;r9f~Lupe~P;EN^1LvZ)cW##>`aJN3C!sf@
zK8%6sy2KbFj=R;MS4}br=*7dGqQtyK3*8s~0N(U4cXfP5#b|@@mWaVg3?kwJ5zAZQ
zVPq|q?P~|%8`#hhDo3<uuvLM4q9+(f0t{^s7xPQNnfG-n>}3yb?uQr5;i_?GTwYW;
zR46yP?zQO&Pgu_WIu;BH4g}@xR|kay*;Izpec>oRp*2|27N`1)on74ILQ)fim6LPD
z{A$1NNTeS^-;8+n?M5KLcFnyJ#qPP3jYHsCY;wuRcF(k3VExSy*w*WTDQ&a$zUGEJ
z_D{B^?lB;{%F!p@y`{d>AkTSl2aCPinw#P)Nj3+QpGHX0jkS-UoZbg2Pj&rxQa~wt
zu!;4Ls;gUzQLv9sQI7veIBIpZj`-?7FZ6(38bRmG!N7EfCc0X|ihi)nUQ!im1d_2A
z^EmboMyV3V`$7`x`GZO)OQ5HxN19mr-UWo^GIbMK5rT>?Ou)~}pHqqenk2CO{s;3!
zi^8UCzgoC;=FxM%o27?^?tw=Bj5Z$G2$tCg(bZ3CR5lRGx}%yuO)vD=T*Fks!Q_hY
zfGGAtG3hkSOM;AmM7xj?t*5cur{dkq+rVR;*dybFI~v}x4NWR*DeEtN3U_gmF*(`4
zLeOw-%xV-~amKVe<7T4OTiJq(tHGv}4}aL^KqL2F+UMPW{5Ak^zQ31KihVQ+^yxO&
zLq?2XGM$Id3fW(aiDs@lfvxIQ>N$PCUzuuCCZ+LzM>H;WW~eAP=HKoZXmPT}PSG0;
zErtchKLe_U=vrV8UI_otN5T(S+>N&ZeGmUNjQZ?+i*&+p()9B?FCHblJqE@a8ymZI
zm_k{^%)PpQ&r?_QX{?NJeX~?5U3YdvuJ0Z+1Z|@|Jw4kF_}M~)>HVH|j!2P0e8O>6
zq);dZPPGnM0}I|@eWIn(Ir-0OPT6$e6lhRH#HXIX43RQ#-2X<wGwR;pnM<uADXk)Z
z;F>@eOy2&h7yNs^IqQ_xyZf%uja1rNY@y3x=6QA272!Ui!9sd@W@+CYvyQSb#PISY
z0wmKfB2g(^8_4td0og(&a+A8N%;BmSg6@#g8}D-X-^lDIOw-SAym;c_s%e!UiqHgh
zr|NaWmNE9dJGgOEFPExZUO<HI=!FQgW8>*HlA(mXd?jNAa(ID!i}xti1jTRUPnrS@
zn6?DVUvuHpcgPdocw0v2>%AZwo4hnN__(@ymH@EbmQ@pNY3x+_(syJ@Vc~Z|n9;3Z
zsX4Itz~yoUS)~`F$Qe&#mjX~pf~XSiN4gek(6kP~Q^Txv4_WS<3ksGE(+$IyjNC>q
z6W`4n;y=2?6<<%a&pdj=EaO@A%!P}C5K7?dYSF&XlRr7YVnV&}<1dJOf(|fH6WD5v
zTaAYEpPoV+sCL(;L4-J+mw8nyNtu#<MkIy}M}Q}~`!)dm)j#bp>z*{@_c;|KN|X%%
zNa^Z-ZALxs7ZkKz)iqOEX*U?DsoM4gbA-bd$G-{`gr}(q+m(Dpz-PWhoAaV!aBVAY
z+FItxw_rQ=^vLDrbnW#lPH&)1$T7jXAZ2Y;TPzk=I!0GTdALC%Yx-+xy;c|uCcgI3
zz=L{i-R|K%vxDq`5y)dHQ~;*QrkS~p4j7E!OkCWQZ^ySGQlaJ#JGHX=I>jM=2&p-7
zw)AOWg-+jl5P4QSr_d59<}_Ch7k7&CX%!`p8s5HB^H*c--(FBs$9Yfs2*c0&AEE`>
zJmNux7t-XIb7S)HO0Eeig<$1$UXJ!QS0YU3&}kLxdh)P&0B7=k4hiRQf|WN%*l>AI
zLIC3pGCZMXaAlUKE_9!^21R~^nCO%PG-ll0+Ix>UNlLe+@@BRTxaxLa_0<g8E#C1%
zElcu)+NezT!X3YdRwNZmj~&_sKhs2>5O9eb8Ak&^AL;Z4P=KUj7b&wek)lDe+9sq0
zTPeN*YT$3fjZ7r=?3Z>+NkvFvf}^1^s&t(~j`Ol0XbE%QcR9l#!l0LrVH)5_Z<lk@
d|5vlR4*4qDQUdSG&s6>qfOvp}uXK-0`!B(B;xGUJ

literal 0
HcmV?d00001