首页分类商品

common/config/caimeiApi.js

@@ -23,7 +23,8 @@ const caimeiApi = {
 			method: 'GET',
 			success: (response) => {
 				if(response.statusCode !== 200){
-					uni.showToast({icon: 'none',title:'网络链接超时',duration: 2000})
+					uni.showToast({icon: 'none',title:'服务器连接错误',duration: 2000})
+					callback(response.statusCode);
 				}else{
 					callback(response.data);
 				}
@@ -54,7 +55,8 @@ const caimeiApi = {
 			method: 'GET',
 			success: (response) => {
 				if(response.statusCode !== 200){
-					uni.showToast({icon: 'none',title: '网络链接超时',duration: 2000})
+					uni.showToast({icon: 'none',title: '服务器连接错误',duration: 2000})
+					callback(response.statusCode);
 				}else{
 					callback(response.data);
 				}

common/config/config.js

@@ -1,9 +1,9 @@
 let URL_CONFIG = ""
 if(process.env.NODE_ENV === 'development'){
     // 开发环境
-	// URL_CONFIG = 'http://192.168.1.22:8008'	 //裴裴联调地址
+	URL_CONFIG = 'http://192.168.1.22:8008'	 //裴裴联调地址
 	// URL_CONFIG = 'http://192.168.1.26:8008'	 //超超联调地址
-    URL_CONFIG = 'https://spi-b.caimei365.com'//采美测试地址
+    // URL_CONFIG = 'https://spi-b.caimei365.com'//采美测试地址
 }else{
     // 生产环境
     URL_CONFIG = 'https://spi.caimei365.com'

components/cm-module/home/navigationTab.vue

@@ -1,9 +1,9 @@
 <template name="navigation">
 	<!-- 自定义分类导航栏 -->
 	<view class="tabbar clearfix">
-		<view class="cate-item" v-for="(nav,idx) in navList" :key="idx" @click="navToListPage(nav)">
-			<image :src="nav.classifyImage"></image>
-			<text>{{nav.classifyName}}</text>
+		<view class="cate-item" v-for="(nav,idx) in tabList" :key="idx" @click.stop="navToListPage(nav)">
+			<image class="tui-skeleton-fillet" :src="nav.classifyImage"></image>
+			<text class="tui-skeleton-rect">{{nav.classifyName}}</text>
 		</view>
 	</view>
 </template>
@@ -13,7 +13,7 @@
 	export default{
 		name:'navigation',
 		props:{
-		    navList: { // 由父页面传递的数据
+		    tabList: { // 由父页面传递的数据
 				type: Array,
 				value: [],
 		    },
@@ -25,6 +25,7 @@
 			}
 		},
 		created() {
+			
 		},
 		onLoad(){
 			
@@ -47,7 +48,6 @@
 	.cate-item {
 		width: 118rpx;
 		margin-right:28rpx;
-		margin-bottom:28rpx;
 		display: flex;
 		float: left;
 		flex-direction: column;
@@ -65,6 +65,7 @@
 			width: 90rpx;
 			height: 90rpx;
 			margin-bottom: 8rpx;
+			border-radius: 50%;
 		}	
 	}
 </style>

components/cm-module/listTemplate/commodityList.vue

@@ -118,8 +118,10 @@
 			getListFromServer(loadMore) {
 				this.$api.getStorage().then((resolve) =>{
 					this.userID = resolve.userID ? resolve.userID : '';
+					console.log('22222222222222')
 					this.getQueryGoodslist(loadMore)
 				}).catch(resolve =>{
+					console.log('22222222222222')
 					this.getQueryGoodslist(loadMore)
 				})
 			},

components/cm-module/productDetails/evaluate.vue

@@ -147,7 +147,7 @@
 		height: 100rpx;
 		line-height: 100rpx;
 		padding: 0 24rpx;
-		font-size: $font-size-32;
+		font-size: $font-size-28;
 		color: #999999;
 		text-align: center;
 	}

components/cm-module/productDetails/recommend.vue

@@ -133,7 +133,7 @@
 		height: 100rpx;
 		line-height: 100rpx;
 		padding: 0 24rpx;
-		font-size: $font-size-32;
+		font-size: $font-size-28;
 		color: #999999;
 		text-align: center;
 	}

components/seller/home.vue

@@ -7,46 +7,44 @@
 				<bt-search :clickPath="clickPath" :toestText='hotSearchText'></bt-search>
 			</view>
 			<view class="banner-section">
-				<!-- <uni-swiper-dot :info="bannerList" :current="current" field="content" :mode="mode" > -->
-				<swiper class="banner tui-banner tui-skeleton-rect" circular @change="swiperChange" :autoplay="true" :interval="5000" :duration="500" :circular="false">
+				<swiper class="banner tui-banner tui-skeleton-rect" circular @change="swiperChange" :autoplay="true" :interval="5000" :duration="500" :circular="true">
 					<swiper-item v-for="(item, index) in bannerImageList" :key="index" class="banner-item"> 
 						<image :src="item" />
 					</swiper-item>
 				</swiper>
 				<view class="swiper__dots-box" v-if="bannerImageList.length > 1">
-					<view v-for="(item,idx) in bannerImageList" 
-						  :key="idx" 
+					<view v-for="(item,idx) in bannerImageList" :key="idx" 
 						  :class="[idx===current?'swiper__dots-long':'none']" 
-						  :data-index="current" class="swiper__dots-item" />
+						  :data-index="current" class="swiper__dots-item">
+					</view>	  
 				</view>
-				<!-- </uni-swiper-dot> -->
 			</view>
 			<view class="cate-section clearfix">
 				<!-- 自定义分类导航栏 -->
 				<view class="tabbar clearfix">
-					<view class="cate-item" v-for="(nav,idx) in productsClassify" :key="idx" @click.stop="navToListPage(nav)">
-						<image class="tui-skeleton-fillet" :src="nav.classifyImage"></image>
+					<view class="cate-item" v-for="(nav,idx) in productsClassifyList" :key="idx" @click.stop="navToListPage(nav)">
+						<image class="tui-skeleton-circular" :src="nav.classifyImage"></image>
 						<text class="tui-skeleton-rect">{{nav.classifyName}}</text>
 					</view>
 				</view>
 				<!-- 优选分类 -->
 				<view class="tabbar clearfix">
 					<view class="cate-item-info" @click.stop="this.$api.navToListPage({type:'1',value:firstModulesName})">
-						<image class="tui-skeleton-fillet" :src="firstModulesImage"></image>
+						<image class="tui-skeleton-circular" :src="firstModulesImage"></image>
 						<text class="tui-skeleton-fillet">{{firstModulesName}}</text>
 					</view>
 					<view class="cate-item-info" @click.stop="this.$api.navToListPage({type:'2',value:secondModulesName})">
-						<image class="tui-skeleton-fillet" :src="secondModulesImage"></image>
+						<image class="tui-skeleton-circular" :src="secondModulesImage"></image>
 						<text class="tui-skeleton-fillet">{{secondModulesName}}</text>
 					</view>
 					<view class="cate-item-info" @click="showTost">
-						<image class="tui-skeleton-fillet" :src="navInforList[0].icon"></image>
+						<image class="tui-skeleton-circular" :src="navInforList[0].icon"></image>
 						<text class="tui-skeleton-fillet">{{navInforList[0].text}}</text>
 					</view>
 					<view class="cate-item-info">
 						<!-- #ifdef MP-WEIXIN -->
 						<button class="contact-btn" open-type="contact" @bindcontact="handleContact">
-							<image class="tui-skeleton-fillet" :src="navInforList[1].icon"></image>
+							<image class="tui-skeleton-circular" :src="navInforList[1].icon"></image>
 						</button>	
 						<!-- #endif -->
 						<text class="tui-skeleton-fillet">{{navInforList[1].text}}</text>
@@ -134,6 +132,7 @@
 
 <script>
 	import tuiSkeleton from "@/components/tui-skeleton/tui-skeleton"
+	import navigationTab from "@/components/cm-module/home/navigationTab.vue"
 	import authorize from '@/common/config/authorize.js'
 	import modalLayer from "@/components/modal-layer"
 	import btSearch from '@/components/uni-search/bt-search.vue'
@@ -144,6 +143,7 @@
 	export default {
 		components:{
 			tuiSkeleton,
+			navigationTab,
 			modalLayer,
 			btSearch,
 			uniStars,
@@ -168,21 +168,21 @@
 				bannerImageList:[],
 				skeletonShow: true,
 				organizeProducts:[],//常用商品
+				productsClassifyList:[
+					{classifyImage:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/04/icon-vip%403x.png',classifyName:'采美采购'},
+					{classifyImage:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/04/icon-vip%403x.png',classifyName:'采美采购'},
+					{classifyImage:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/04/icon-vip%403x.png',classifyName:'采美采购'},
+					{classifyImage:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/04/icon-vip%403x.png',classifyName:'采美采购'},
+					{classifyImage:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/04/icon-vip%403x.png',classifyName:'采美采购'}
+				],//分类导航
 				firstModulesName:'https://img.caimei365.com/group1/M00/03/8C/Cmis215XHXSAAZU0AACaPrfbB8I435.png', //优惠模块1
 				secondModulesName:'', //优惠模块2
 				firstModulesImage:'https://img.caimei365.com/group1/M00/03/8C/Cmis215XHXSAAZU0AACaPrfbB8I435.png',//优惠模块icon1
 				secondModulesImage:'',//优惠模块icon2
 				thirdModulesName:'', //优惠模块3
 				navInforList:[
-					{text:'会员中心',icon:'https://img.caimei365.com/group1/M00/03/8C/Cmis215XHXSAAZU0AACaPrfbB8I435.png'},
-					{text:'在线客服',icon:'https://img.caimei365.com/group1/M00/03/8D/Cmis215XHXWABv0rAACt9b8scec656.png'}
-				],
-				productsClassify:[
-					{classifyName:'针剂',classifyImage:'https://img.caimei365.com/group1/M00/03/7A/Cmis213wz86AQuJBAABgU_SS4II914.png'},
-					{classifyName:'线材/假体',classifyImage:'https://img.caimei365.com/group1/M00/03/7A/Cmis213wz-OAei3KAABf7oyhz8c939.png'},
-					{classifyName:'仪器',classifyImage:'https://img.caimei365.com/group1/M00/03/7A/Cmis213w0AeAJGGSAABlVRKhWFE375.png'},
-					{classifyName:'护肤',classifyImage:'https://img.caimei365.com/group1/M00/03/7A/Cmis213w0ByABQfJAABdoMz4qTo227.png'},
-					{classifyName:'易耗品',classifyImage:'https://img.caimei365.com/group1/M00/03/7A/Cmis213w0DKAKKaaAABbkEy5ilM324.png'}
+					{text:'会员中心',icon:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/04/icon-vip%403x.png'},
+					{text:'在线客服',icon:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/04/icon-kefu%403x.png'}
 				],
 				navServerList:[
 					{text:'会员优惠',icon:'../../static/temp/server1@2x.png',path:'/pages/service/member'},
@@ -207,6 +207,7 @@
 				queryHomeInfo({}).then(res =>{
 					let data = res.data;
 					this.bannerImageList = data.bannerImageList
+					this.productsClassifyList = data.productsClassifyList
 					this.mallPageModules = data.mallPageModules
 					this.firstModulesName= data.firstModulesName
 					this.secondModulesName= data.secondModulesName
@@ -266,7 +267,6 @@
 				// 	success(res) {
 				// 		console.log(res)
 				// 		// 打开成功
-						
 				// 	}
 				// })
 			},
@@ -375,7 +375,6 @@
 		.cate-item {
 			width: 118rpx;
 			margin-right:28rpx;
-			margin-bottom:28rpx;
 			display: flex;
 			float: left;
 			flex-direction: column;
@@ -393,11 +392,12 @@
 				width: 90rpx;
 				height: 90rpx;
 				margin-bottom: 8rpx;
+				border-radius: 50%;
 			}	
 		}
 		.cate-item-info {
-			width: 160rpx;
-			margin-right:20.666rpx;
+			width: 118rpx;
+			margin-right:76.5rpx;
 			display: flex;
 			float: left;
 			flex-direction: column;
@@ -409,12 +409,13 @@
 				margin-right: 0;
 			}
 			image {
-				width: 160rpx;
+				width: 90rpx;
 				height: 90rpx;
 				margin-bottom: 16rpx;
+				border-radius:50%;
 			}	
 			button.contact-btn{
-				width: 160rpx;
+				width: 118rpx;
 				height: 90rpx;
 				margin: 0;
 				padding: 0;
@@ -430,46 +431,22 @@
 				background-color:#FFFFFF;
 				margin-bottom: 16rpx;
 				image{
-					width: 160rpx;
+					width: 90rpx;
 					height: 90rpx;
 					margin-bottom: 0;
+					border-radius:50%;
 				}
 			}
 		}
 	}
-	/* 活动 */
-	.hot-section{
-		padding:0 24rpx 48rpx 24rpx; 
-		background: #FFFFFF;
-		.ht-l{
-			width: 339rpx;
-			height: 188rpx;
-			float: left;
-			image{
-				width: 339rpx;
-				height: 188rpx;
-				border-radius:10rpx;
-			}
-		}
-		.ht-r{
-			width: 339rpx;
-			height: 188rpx;
-			float: right;
-			image{
-				width: 339rpx;
-				height: 188rpx;
-				border-radius:10rpx;
-			}
-		}
-	}
 	.hotgoods-section{
 		padding: 4rpx 0 24rpx 24rpx;
 		background: #fff;
 		.s-header{
 			display:flex;
 			align-items:center;
-			height: 40rpx;
-			line-height: 40rpx;
+			height: 50rpx;
+			line-height: 50rpx;
 			.tip{
 				flex: 4;
 				font-size: 30rpx;

pages/goods/goods.vue

@@ -34,11 +34,17 @@
 					key: 'commodity_id',
 					success: function (res) {
 					    const id = res.data;
-						if(type === '商品分类') {
-							self.serverUrl = `/product/listByTinyTypeID?tinyTypeID=${id}`;
-							self.emptyText = '该分类暂时还没有商品哟，去逛逛别的吧~';
-							self.$refs.childList.getListFromServer();
+						switch(type){
+							case '商品分类':
+								self.serverUrl = `/product/listByTinyTypeID?tinyTypeID=${id}`;
+								self.emptyText = '该分类暂时还没有商品哟，去逛逛别的吧~';
+								break;
+							case '导航分类':
+								self.serverUrl = `/home/classify?classifyId=${id}`;
+								self.emptyText = '该分类暂时还没有商品哟，去逛逛别的吧~';
+								break;
 						}
+						self.$refs.childList.getListFromServer();
 					}
 				})
 				if(type !== '商品分类') {

pages/login/bindOperator.vue

@@ -91,8 +91,17 @@
 			}
 		},
 		onLoad(option) {
+			console.log(option)
 			uni.setStorageSync('bind_id', option.userID);
 			this.getVerificationCode()
+			authorize.getSetting().then(wxResponse =>{// console.log('是否已授权',res);//0:为取消授权 1:为已授权 2:为未操作
+				if(wxResponse == 1){
+					this.getWxAuthorize()
+				}else{
+					this.$api.navigateTo('/pages/authorization/authorization')
+					this.isUserInfo = true
+				}
+			})	
 		},
 		computed: {
 			...mapState(['isWxAuthorize'])
@@ -145,7 +154,13 @@
 					this.$util.msg('验证码格式不正确',2000)
 					return
 				}
-				this.bindingWechatLogin()
+				authorize.getSetting().then(wxResponse =>{// console.log('是否已授权',res);//0:为取消授权 1:为已授权 2:为未操作
+					if(wxResponse == 1){
+						this.bindingWechatLogin()
+					}else{
+						this.$api.navigateTo('/pages/authorization/authorization')
+					}
+				})	
 			},
 			getVerificationCode(){//图形验证
 				getImageCode().then(res => {
@@ -165,7 +180,7 @@
 				if( this.imageCode == ''){
 					this.$util.msg('请输入图形验证码',2000);
 					return
-				}
+				}			
 				let params = {
 						userId:uni.getStorageSync('bind_id'),
 						mobile:this.bindMobile,
@@ -197,6 +212,7 @@
 					this.isMobileDisabled = false;
 				})
 			},
+			
 			bindingWechatLogin(){//获取用户基本信息登录
 				wx.getUserInfo({
 					success: res => {
@@ -214,20 +230,14 @@
 							this.$api.switchTabTo('/pages/tabBar/home/home')
 						}).catch(response =>{
 							this.$util.msg(response.msg,2000)
-							this.isUserInfo = false
+							this.isUserInfo = true
 						})			
 					}
 				})
 			}
 		},
 		onShow() {
-			authorize.getSetting().then(wxResponse =>{// console.log('是否已授权',res);//0:为取消授权 1:为已授权 2:为未操作
-				if(wxResponse == 1){
-					this.getWxAuthorize()
-				}else{
-					this.$api.navigateTo('/pages/authorization/authorization')
-				}
-			})	
+
 		}
 	}
 </script>

pages/tabBar/category/category.vue

@@ -58,12 +58,6 @@
 			this.initData();
 		},
 		methods: {
-			// 跳转至商品列表
-			navToList(id){
-				uni.navigateTo({
-					url: `/pages/product/list?cate_id=${id}`
-				})
-			},
 			// 数据初始化
 			initData() {
 				this.getProductCate();

pages/tabBar/home/home.vue

@@ -7,7 +7,6 @@
 				<bt-search :clickPath="clickPath" :toestText='hotSearchText'></bt-search>
 			</view>
 			<view class="banner-section">
-				<!-- <uni-swiper-dot :info="bannerList" :current="current" field="content" :mode="mode" > -->
 				<swiper class="banner tui-banner tui-skeleton-rect" circular @change="swiperChange" :autoplay="true" :interval="5000" :duration="500" :circular="true">
 					<swiper-item v-for="(item, index) in bannerImageList" :key="index" class="banner-item"> 
 						<image :src="item" />
@@ -19,34 +18,33 @@
 						  :class="[idx===current?'swiper__dots-long':'none']" 
 						  :data-index="current" class="swiper__dots-item" />
 				</view>
-				<!-- </uni-swiper-dot> -->
 			</view>
 			<view class="cate-section clearfix">
 				<!-- 自定义分类导航栏 -->
 				<view class="tabbar clearfix">
-					<view class="cate-item" v-for="(nav,idx) in productsClassify" :key="idx" @click.stop="navToListPage(nav)">
-						<image class="tui-skeleton-fillet" :src="nav.classifyImage"></image>
+					<view class="cate-item" v-for="(nav,idx) in productsClassifyList" :key="idx" @click.stop="navToListPage(nav)">
+						<image class="tui-skeleton-circular" :src="nav.classifyImage"></image>
 						<text class="tui-skeleton-rect">{{nav.classifyName}}</text>
 					</view>
 				</view>
 				<!-- 优选分类 -->
 				<view class="tabbar clearfix">
 					<view class="cate-item-info" @click.stop="this.$api.navToListPage({type:'1',value:firstModulesName})">
-						<image class="tui-skeleton-fillet" :src="firstModulesImage"></image>
+						<image class="tui-skeleton-circular" :src="firstModulesImage"></image>
 						<text class="tui-skeleton-fillet">{{firstModulesName}}</text>
 					</view>
 					<view class="cate-item-info" @click.stop="this.$api.navToListPage({type:'2',value:secondModulesName})">
-						<image class="tui-skeleton-fillet" :src="secondModulesImage"></image>
+						<image class="tui-skeleton-circular" :src="secondModulesImage"></image>
 						<text class="tui-skeleton-fillet">{{secondModulesName}}</text>
 					</view>
 					<view class="cate-item-info" @click="showTost">
-						<image class="tui-skeleton-fillet" :src="navInforList[0].icon"></image>
+						<image class="tui-skeleton-circular" :src="navInforList[0].icon"></image>
 						<text class="tui-skeleton-fillet">{{navInforList[0].text}}</text>
 					</view>
 					<view class="cate-item-info">
 						<!-- #ifdef MP-WEIXIN -->
 						<button class="contact-btn" open-type="contact" @bindcontact="handleContact">
-							<image class="tui-skeleton-fillet" :src="navInforList[1].icon"></image>
+							<image class="tui-skeleton-circular" :src="navInforList[1].icon"></image>
 						</button>	
 						<!-- #endif -->
 						<text class="tui-skeleton-fillet">{{navInforList[1].text}}</text>
@@ -55,9 +53,9 @@
 			</view>
 			<!-- 热销商品 -->
 			<view class="hotgoods-section">
-				<view class="s-header tui-skeleton-fillet" @click="this.$api.navToListPage({type:'3',value:thirdModulesName})">
-					<text class="tip">{{thirdModulesName}}</text>
-					<text class="tit">更多</text>
+				<view class="s-header" @click="this.$api.navToListPage({type:'3',value:thirdModulesName})">
+					<text class="tip tui-skeleton-fillet">{{thirdModulesName}}</text>
+					<text class="tit tui-skeleton-fillet">更多</text>
 					<text class="iconfont icon-xiayibu"></text>
 				</view>
 				<view class="hotgoods-swiper">
@@ -136,6 +134,7 @@
 
 <script>
 	import tuiSkeleton from "@/components/tui-skeleton/tui-skeleton"
+	import navigationTab from "@/components/cm-module/home/navigationTab.vue"
 	import authorize from '@/common/config/authorize.js'
 	import modalLayer from "@/components/modal-layer"
 	import btSearch from '@/components/uni-search/bt-search.vue'
@@ -146,6 +145,7 @@
 	export default {
 		components:{
 			tuiSkeleton,
+			navigationTab,
 			modalLayer,
 			btSearch,
 			uniStars,
@@ -166,24 +166,23 @@
 				modallayer:false,
 				isLogin:false,
 				bannerImageList:[],
-				hotGoodsList:[],
 				skeletonShow: true,
 				organizeProducts:[],//常用商品
+				productsClassifyList:[
+					{classifyImage:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/04/icon-vip%403x.png',classifyName:'采美采购'},
+					{classifyImage:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/04/icon-vip%403x.png',classifyName:'采美采购'},
+					{classifyImage:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/04/icon-vip%403x.png',classifyName:'采美采购'},
+					{classifyImage:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/04/icon-vip%403x.png',classifyName:'采美采购'},
+					{classifyImage:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/04/icon-vip%403x.png',classifyName:'采美采购'}
+				],//分类导航
 				firstModulesName:'https://img.caimei365.com/group1/M00/03/8C/Cmis215XHXSAAZU0AACaPrfbB8I435.png', //优惠模块1
 				secondModulesName:'', //优惠模块2
 				firstModulesImage:'https://img.caimei365.com/group1/M00/03/8C/Cmis215XHXSAAZU0AACaPrfbB8I435.png',//优惠模块icon1
 				secondModulesImage:'',//优惠模块icon2
 				thirdModulesName:'', //优惠模块3
 				navInforList:[
-					{text:'会员中心',icon:'https://img.caimei365.com/group1/M00/03/8C/Cmis215XHXSAAZU0AACaPrfbB8I435.png'},
-					{text:'在线客服',icon:'https://img.caimei365.com/group1/M00/03/8D/Cmis215XHXWABv0rAACt9b8scec656.png'}
-				],
-				productsClassify:[
-					{classifyName:'针剂',classifyImage:'https://img.caimei365.com/group1/M00/03/7A/Cmis213wz86AQuJBAABgU_SS4II914.png'},
-					{classifyName:'线材/假体',classifyImage:'https://img.caimei365.com/group1/M00/03/7A/Cmis213wz-OAei3KAABf7oyhz8c939.png'},
-					{classifyName:'仪器',classifyImage:'https://img.caimei365.com/group1/M00/03/7A/Cmis213w0AeAJGGSAABlVRKhWFE375.png'},
-					{classifyName:'护肤',classifyImage:'https://img.caimei365.com/group1/M00/03/7A/Cmis213w0ByABQfJAABdoMz4qTo227.png'},
-					{classifyName:'易耗品',classifyImage:'https://img.caimei365.com/group1/M00/03/7A/Cmis213w0DKAKKaaAABbkEy5ilM324.png'}
+					{text:'会员中心',icon:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/04/icon-vip%403x.png'},
+					{text:'在线客服',icon:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/04/icon-kefu%403x.png'}
 				],
 				navServerList:[
 					{text:'会员优惠',icon:'../../../static/temp/server1@2x.png',path:'/pages/service/member'},
@@ -236,6 +235,7 @@
 					this.firstModulesImage= data.firstModulesImage
 					this.secondModulesImage= data.secondModulesImage
 					this.thirdModulesName= data.thirdModulesName
+					this.productsClassifyList = data.productsClassifyList
 					this.skeletonShow = false;
 					if(this.isWxAuthorize){
 						this.$store.commit('updateAllNum',data.shoppingCartCount)
@@ -268,7 +268,7 @@
 					key: 'commodity_id',
 					data: nav.id,
 					success: function () {
-						self.$api.navToListPage({type:'商品分类',value:nav.classifyName,id:nav.id});
+						self.$api.navToListPage({type:'导航分类',value:nav.classifyName,id:nav.id});
 					}
 				})
 			},
@@ -419,7 +419,6 @@
 		.cate-item {
 			width: 118rpx;
 			margin-right:28rpx;
-			margin-bottom:28rpx;
 			display: flex;
 			float: left;
 			flex-direction: column;
@@ -437,11 +436,12 @@
 				width: 90rpx;
 				height: 90rpx;
 				margin-bottom: 8rpx;
+				border-radius: 50%;
 			}	
 		}
 		.cate-item-info {
-			width: 160rpx;
-			margin-right:20.666rpx;
+			width: 118rpx;
+			margin-right:76.5rpx;
 			display: flex;
 			float: left;
 			flex-direction: column;
@@ -453,12 +453,13 @@
 				margin-right: 0;
 			}
 			image {
-				width: 160rpx;
+				width: 90rpx;
 				height: 90rpx;
 				margin-bottom: 16rpx;
+				border-radius: 50%;
 			}	
 			button.contact-btn{
-				width: 160rpx;
+				width: 118rpx;
 				height: 90rpx;
 				margin: 0;
 				padding: 0;
@@ -474,46 +475,22 @@
 				background-color:#FFFFFF;
 				margin-bottom: 16rpx;
 				image{
-					width: 160rpx;
+					width: 90rpx;
 					height: 90rpx;
 					margin-bottom: 0;
+					border-radius: 50%;
 				}
 			}
 		}
 	}
-	/* 活动 */
-	.hot-section{
-		padding:0 24rpx 48rpx 24rpx; 
-		background: #FFFFFF;
-		.ht-l{
-			width: 339rpx;
-			height: 188rpx;
-			float: left;
-			image{
-				width: 339rpx;
-				height: 188rpx;
-				border-radius:10rpx;
-			}
-		}
-		.ht-r{
-			width: 339rpx;
-			height: 188rpx;
-			float: right;
-			image{
-				width: 339rpx;
-				height: 188rpx;
-				border-radius:10rpx;
-			}
-		}
-	}
 	.hotgoods-section{
 		padding: 4rpx 0 24rpx 24rpx;
 		background: #fff;
 		.s-header{
 			display:flex;
 			align-items:center;
-			height: 40rpx;
-			line-height: 40rpx;
+			height: 50rpx;
+			line-height: 50rpx;
 			.tip{
 				flex: 4;
 				font-size: 30rpx;