Merge branch 'developerB' of git.caimei365.com:caimei-repository/caimei-applets-caimei into developerB

components/cm-custom/custom-p.vue

@@ -144,7 +144,7 @@
 		height: 100%;
 		background: rgba(255, 255, 255, 0.6);
 		font-size: 28rpx;
-		color: #666666;
+		color: #999999;
 		position: relative;
 		box-sizing: border-box;
 		position:absolute ;
@@ -158,7 +158,7 @@
 			left: 0;
 			top: 0;
 			font-size: 34rpx;
-			color: #666666;
+			color: #999999;
 			z-index: 10;
 		}
 		.input{

components/cm-module/cm-seller/home.vue

@@ -10,14 +10,28 @@
 			<navbars :list="navBarsList" v-if="isRequest"></navbars>
 		</view>	
 		<view class="container-section tui-skeleton">
-			<!-- 推荐专区 -->
-			<hot-product :list="RecommendList" :userIdentity="userIdentity" v-if="isRequest"></hot-product>
-			<!-- 楼层 -->
-			<pages-product :list="pagesList" v-if="isRequest"></pages-product>
-			<!-- 商品专题 -->
-			<special-product :list="specialList" :listB="specialProList" v-if="isRequest"></special-product>
-			<!-- 供应商专题 -->
-			<supplier-list :list="supplierList" v-if="isRequest"></supplier-list>
+			<view v-for="(item,index) in flootData" :key="index">
+				<template v-if="item.type === 1">
+					<!-- 推荐专区 -->
+					<hot-product :list="RecommendList" :userIdentity="userIdentity" v-if="isRequest"></hot-product>
+				</template>
+				<template v-if="item.type === 3">
+					<!-- 供应商专题 -->
+					<supplier-list :list="item.floorData" v-if="isRequest"></supplier-list>
+				</template>
+				<template v-if="item.type === 4">
+					<!-- 商品专题 -->
+					<special-product :list="item.floorData" v-if="isRequest"></special-product>
+				</template>
+				<template v-if="item.type === 5">
+					<!-- 小专题 -->
+					<small-product :list="item.floorData" v-if="isRequest"></small-product>
+				</template>
+				<template v-if="item.type === 6">
+					<!-- 楼层 -->
+					<pages-product :list="item.subFloors" v-if="isRequest"></pages-product>
+				</template>
+			</view>
 		</view>
 		<!-- 侧边 -->
 		<scroll-top v-if="isScrollTop"></scroll-top>
@@ -33,6 +47,7 @@
 	import hotProduct from '@/components/cm-module/homeIndex/hotProduct.vue'
 	import pagesProduct from '@/components/cm-module/homeIndex/pagesProduct.vue'
 	import specialProduct from '@/components/cm-module/homeIndex/specialProduct.vue'
+	import smallProduct from '@/components/cm-module/homeIndex/smallProduct.vue'
 	import supplierList from '@/components/cm-module/homeIndex/supplierList.vue'
 	import { userInfoLogin } from "@/api/use.js"
 	import { mapState,mapMutations} from 'vuex';
@@ -45,6 +60,7 @@
 			navbars,
 			pagesProduct,
 			specialProduct,
+			smallProduct,
 			supplierList
 		},
 		data() {
@@ -75,41 +91,14 @@
 				navBarsList:[],//导航分类
 				pagesList:[],//楼层
 				RecommendList:[],//热门推荐
-				specialList:[],//商品专题轮播
-				specialProList:[],//商品专题商品
-				supplierList:[],//供应商列表
-				organizeProducts:[],//常用商品
-				productsClassifyList:[
-					{classifyImage:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/04/%E7%BB%84%201238.png',classifyName:'采美'},
-					{classifyImage:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/04/%E7%BB%84%201238.png',classifyName:'采美'},
-					{classifyImage:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/04/%E7%BB%84%201238.png',classifyName:'采美'},
-					{classifyImage:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/04/%E7%BB%84%201238.png',classifyName:'采美'},
-					{classifyImage:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/04/%E7%BB%84%201238.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/B0/Cmis217Z9LCABdf_AAAfdMmM_xY655.png'},
-					{text:'在线客服',icon:'https://img.caimei365.com/group1/M00/03/B0/Cmis217Z9BSAXPobAAApo6I0Tlo684.png'}
-				],
-				navServerList:[
-					{text:'会员优惠',icon:'../../../static/temp/server1@2x.png',path:'/pages/service/member'},
-					{text:'售后无忧',icon:'../../../static/temp/server2@2x.png',path:'/pages/service/aftersale'},
-					{text:'购物须知',icon:'../../../static/temp/server3@2x.png',path:'/pages/service/shoppingnotice'},
-					{text:'联系我们',icon:'../../../static/temp/server4@2x.png',path:''},
-				],
 				isScrollTop:false,
 				isRequest:false
 			}
 		},
 		created() {
 			this.$api.getStorage().then((resolve) =>{
-				this.userID = resolve.userID
+				this.userID = resolve.userID ? resolve.userID : 0
 				this.userIdentity = resolve.userIdentity
-				this.GetHomeFloorInfo()
 				this.getHomeInformation()
 			})
 		},
@@ -133,23 +122,7 @@
 			},
 			GetHomeFloorInfo(){//初始化首页楼层数据
 				this.CommonService.GetHomeFloorInfo({}).then(response =>{
-					let data = response.data
-					data.forEach((item,index) => {
-						switch(item.type){
-							case 3:
-								this.supplierList = item.floorData
-								break;	
-							case 4:
-								this.specialList = item.floorData
-								break;	
-							case 5:
-								this.specialProList = item.floorData
-								break;	
-							case 6:
-								this.pagesList = item.subFloors
-								break;
-						}
-					})
+					this.flootData = response.data
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000)
 				})
@@ -158,15 +131,9 @@
 				this.CommonService.GetHomeModulesDataInfo({ userId:this.userID }).then(res =>{
 					let data = res.data;
 					this.bannerImageList = data.bannerImageList
-					this.mallPageModules = data.mallPageModules
-					this.firstModulesName= data.firstModulesName
-					this.secondModulesName= data.secondModulesName
-					this.firstModulesImage= data.firstModulesImage
-					this.secondModulesImage= data.secondModulesImage
-					this.thirdModulesName= data.thirdModulesName
-					this.productsClassifyList = data.productsClassifyList
 					this.$store.commit('updateAllNum',data.shoppingCartCount)
 					this.GetHomeInit();
+					this.GetHomeFloorInfo()
 					this.GetHomeRecommendInfo()
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000)

components/cm-module/cm-seller/user.vue

@@ -12,7 +12,7 @@
 							<text class="u-tips">协销人员</text>
 						</view>
 					</view>
-					<view class="header-icon"><image :src="headpic == null? '../../../static/temp/icon-seller@3x.png' : headpic" mode=""></image></view>
+					<view class="header-icon"><image :src="headpic == null? 'http://static-b.caimei365.com/app/img/icon/icon-seller@3x.png' : headpic" mode=""></image></view>
 				</view>
 				<!-- 订单 -->
 				<view class="user-order">

components/cm-module/headerNavbar/header-poduct.vue

@@ -144,7 +144,7 @@
 		height: 100%;
 		background: rgba(255, 255, 255, 0.6);
 		font-size: 28rpx;
-		color: #666666;
+		color: #999999;
 		position: relative;
 		box-sizing: border-box;
 		position:absolute ;
@@ -158,7 +158,7 @@
 			left: 0;
 			top: 0;
 			font-size: 34rpx;
-			color: #666666;
+			color: #999999;
 			z-index: 10;
 		}
 		.input{

components/cm-module/homeIndex/banner.vue

@@ -64,10 +64,9 @@
 				 if(floor.linkType){
 					 const typeMap = {
 					 	1:`/pages/goods/goods-instrument?linkId=${floor.linkParam.id}&title=${floor.title}`,
-					 	2:`/pages/search/search-instrument?keyword=${floor.title}`,
+					 	2:`/pages/goods/instrument-details?id=${floor.linkParam.id}`,
 						4:`/h5/pages/activity/activity?id=${floor.linkParam.id}`,
 					 	5:`/pages/goods/product?id=${floor.linkParam.id}`,
-					 	6:`/pages/goods/instrument-details?id=${floor.linkParam.id}`,
 					 	7:`/supplier/pages/user/my-shop?shopId=${floor.linkParam.id}`,
 					 	8:`/h5/pages/activity/activity-list`,
 					 	9:`/second/pages/form/introduce`,

components/cm-module/homeIndex/index.vue

@@ -124,7 +124,7 @@
 				</view>
 				<view class="f-text tui-skeleton-fillet">
 					<view class="">
-						<image class="logo" src="../../../static/logo-c@2x.png" mode=""></image>
+						<image class="logo" src="http://static-b.caimei365.com/app/img/icon/logo-c@2x.png" mode=""></image>
 						<text class="">采美365网</text>
 					</view>
 				</view>

components/cm-module/homeIndex/pagesProduct.vue

@@ -64,9 +64,8 @@
 				 if(floor.linkType){
 					 const typeMap = {
 					 	1:`/pages/goods/goods-instrument?linkId=${floor.linkParam.id}&title=${floor.title}`,
-					 	2:`/pages/search/search-instrument?keyword=${floor.title}`,
+					 	2:`/pages/goods/instrument-details?id=${floor.linkParam.id}`,
 					 	5:`/pages/goods/product?id=${floor.linkParam.id}`,
-					 	6:`/pages/goods/instrument-details?id=${floor.linkParam.id}`,
 					 	7:`/supplier/pages/user/my-shop?shopId=${floor.linkParam.id}`,
 					 	8:`/h5/pages/activity/activity-list`,
 					 	9:`/second/pages/form/introduce`,

components/cm-module/homeIndex/smallProduct.vue

@@ -0,0 +1,124 @@
+<template>
+	<view class="special-content clearfix">
+		<view class="swiper-goods-box">
+			<view class="goods-box-item" v-for="(item,index) in productList" :key="index" @click="NavToDetailPage(item)">
+				<image :src="item.image" mode="" class="box-item-image"></image>
+				<view class="box-item-mask">{{ item.title }}</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default{
+		name:"specialContent",
+		props:{
+			list:{
+				type:Array
+			}
+		},
+		data() {
+			return{
+				current:0,
+				productList:[]
+			}
+		},
+		created(){
+			this.initData(this.list)
+		},
+		computed: {
+	
+		},
+		methods:{
+			initData(list){
+				this.productList = list
+			},
+			swiperChange(e) {//轮播图切换
+				const index = e.detail.current;
+				this.current = index;
+			},
+			NavToDetailPage(floor) {//跳转
+				console.log(floor)
+				/**
+				 * 页面跳转类型
+				 * 1、二级页面,2、搜索项目仪器,3、直播页面,4、自由页面,5、商品详情,6、仪器项目详情,7、供应商主页
+				 * 8、专题活动页,9、二手市场介绍,10、二手商品列表,11、二手商品发布,12、商品搜索,13、信息详情
+				 * 14、品牌招商介绍页,15、维修保养介绍页,16、首页,17、注册页,18、信息中心,19、供应商列表
+				 **/
+				 if(floor.linkType){
+					 const typeMap = {
+					 	1:`/pages/goods/goods-instrument?linkId=${floor.linkParam.id}&title=${floor.title}`,
+					 	2:`/pages/goods/instrument-details?id=${floor.linkParam.id}`,
+					 	5:`/pages/goods/product?id=${floor.linkParam.id}`,
+					 	7:`/supplier/pages/user/my-shop?shopId=${floor.linkParam.id}`,
+					 	8:`/h5/pages/activity/activity-list`,
+					 	9:`/second/pages/form/introduce`,
+					 	10:`/second/pages/product/product-list`,
+					 	11:`/second/pages/form/form`,
+					 	12:`/pages/search/search?keyWord=${floor.title}`,
+					 	13:`/h5/pages/article/page?link=${floor.link}`,
+					 	14:`/h5/pages/article/page?link=${floor.link}`,
+					 	15:`/h5/pages/article/page?link=${floor.link}`,
+					 	17:`/pages/login/register-select`,
+					 	18:`/h5/pages/article/page?link=${floor.link}`,
+					 	19:`/pages/search/search-supplier?keyWord=${floor.title}`
+					 }
+					 const url = typeMap[floor.linkType];
+					 this.$api.navigateTo(url)
+				 }
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.special-content{
+		background-color: #F7F7F7;
+		width: 100%;
+		height: auto;
+		box-sizing: border-box;
+		padding: 0 24rpx;
+	}
+	.swiper-goods-box{
+		width: 100%;
+		height: auto;
+		float: left;
+		.goods-box-item{
+			width: 340rpx;
+			height: 340rpx;
+			float: left;
+			margin-right: 20rpx;
+			margin-bottom: 20rpx;
+			&:nth-child(2n){
+				margin-right: 0;
+			}
+			position: relative;
+			.box-item-image{
+				width: 340rpx;
+				height: 340rpx;
+				display: block;
+			}
+			.box-item-mask{
+				width: 100%;
+				height: 64rpx;
+				background: rgba(0,0,0,.36);
+				line-height: 64rpx;
+				font-size: $font-size-26;
+				text-align: center;
+				color: #FFFFFF;
+				position: absolute;
+				bottom: 0;
+				left: 0;
+				box-sizing: border-box;
+				padding:0 20rpx;
+				white-space: normal;
+				word-break: break-all;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				display: -webkit-box;
+				-webkit-box-orient: vertical;
+				-webkit-line-clamp: 1;
+			}
+		}
+	}
+</style>

components/cm-module/homeIndex/specialProduct.vue

@@ -15,12 +15,6 @@
 				</view>	  
 			</view>
 		</view>
-		<view class="swiper-goods-box">
-			<view class="goods-box-item" v-for="(item,index) in productList" :key="index" @click="NavToDetailPage(item)">
-				<image :src="item.image" mode="" class="box-item-image"></image>
-				<view class="box-item-mask">{{ item.title }}</view>
-			</view>
-		</view>
 	</view>
 </template>
 
@@ -30,29 +24,23 @@
 		props:{
 			list:{
 				type:Array
-			},
-			listB:{
-				type:Array
 			}
-			
 		},
 		data() {
 			return{
 				current:0,
-				bannerList:[],
-				productList:[]
+				bannerList:[]
 			}
 		},
 		created(){
-			this.initData(this.list,this.listB)
+			this.initData(this.list)
 		},
 		computed: {
 	
 		},
 		methods:{
-			initData(list,listB){
+			initData(list){
 				this.bannerList = list
-				this.productList = listB
 			},
 			swiperChange(e) {//轮播图切换
 				const index = e.detail.current;
@@ -69,9 +57,8 @@
 				 if(floor.linkType){
 					 const typeMap = {
 					 	1:`/pages/goods/goods-instrument?linkId=${floor.linkParam.id}&title=${floor.title}`,
-					 	2:`/pages/search/search-instrument?keyword=${floor.title}`,
+					 	2:`/pages/goods/instrument-details?id=${floor.linkParam.id}`,
 					 	5:`/pages/goods/product?id=${floor.linkParam.id}`,
-					 	6:`/pages/goods/instrument-details?id=${floor.linkParam.id}`,
 					 	7:`/supplier/pages/user/my-shop?shopId=${floor.linkParam.id}`,
 					 	8:`/h5/pages/activity/activity-list`,
 					 	9:`/second/pages/form/introduce`,
@@ -165,46 +152,5 @@
 			transition: all 0.4s;
 		}
 	}
-	.swiper-goods-box{
-		width: 100%;
-		height: auto;
-		float: left;
-		.goods-box-item{
-			width: 340rpx;
-			height: 340rpx;
-			float: left;
-			margin-right: 20rpx;
-			margin-bottom: 20rpx;
-			&:nth-child(2n){
-				margin-right: 0;
-			}
-			position: relative;
-			.box-item-image{
-				width: 340rpx;
-				height: 340rpx;
-				display: block;
-			}
-			.box-item-mask{
-				width: 100%;
-				height: 64rpx;
-				background: rgba(0,0,0,.36);
-				line-height: 64rpx;
-				font-size: $font-size-26;
-				text-align: center;
-				color: #FFFFFF;
-				position: absolute;
-				bottom: 0;
-				left: 0;
-				box-sizing: border-box;
-				padding:0 20rpx;
-				white-space: normal;
-				word-break: break-all;
-				overflow: hidden;
-				text-overflow: ellipsis;
-				display: -webkit-box;
-				-webkit-box-orient: vertical;
-				-webkit-line-clamp: 1;
-			}
-		}
-	}
+	
 </style>

components/cm-module/homeIndex/supplierList.vue

@@ -77,6 +77,7 @@
 		width: 100%;
 		height: auto;
 		float: left;
+		margin-top: 24rpx;
 		.goods-box-item{
 			width: 160rpx;
 			height: 200rpx;

components/cm-module/orderDetails/orderInformation.vue

@@ -7,7 +7,7 @@
 					<!-- <text class="bage-buss" v-if="orderData.orderSubmitType == 3 || orderData.orderSubmitType == 4">协销</text>
 					<text class="bage-auto" v-if="orderData.orderSubmitType == 0 || orderData.orderSubmitType == 1 ||orderData.orderSubmitType == 2">自主</text> -->
 					<text class="bage-text">订单编号：<label class="label">{{orderData.orderNo =='undefined' ? '' : orderData.orderNo}}</label></text>
-					<!-- <image class="bage-icon" src="../../../static/temp/icon-type@3x.png" mode="widthFix" v-if="orderData.secondHandOrderFlag == 1"></image> -->
+					<!-- <image class="bage-icon" src="http://static-b.caimei365.com/app/img/icon/icon-type@3x.png" mode="widthFix" v-if="orderData.secondHandOrderFlag == 1"></image> -->
 				</view>
 			</view>
 			<view class="information-view same">

components/cm-module/productDetails/instrument-recommend.vue

@@ -21,8 +21,7 @@
 		props:{
 			list: {
 				// Unistars类型
-				type: Array,
-				default: []
+				type: Array
 			}
 		},
 		components:{
@@ -48,9 +47,8 @@
 				 if(value.linkType){
 					 const typeMap = {
 					 	1:`/pages/goods/goods-instrument?linkId=${value.linkParam.id}&title=${value.title}`,
-					 	2:`/pages/search/search-instrument?keyword=${value.title}`,
+						2:`/pages/goods/instrument-details?id=${value.linkParam.id}`,
 					 	5:`/pages/goods/product?id=${value.linkParam.id}`,
-					 	6:`/pages/goods/instrument-details?id=${value.linkParam.id}`,
 					 	7:`/supplier/pages/user/my-shop?shopId=${value.linkParam.id}`,
 					 	8:`/h5/pages/activity/activity-list`,
 					 	9:`/second/pages/form/introduce`,

components/cm-module/supplier/home.vue

@@ -10,14 +10,28 @@
 			<navbars :list="navBarsList" v-if="isRequest"></navbars>
 		</view>	
 		<view class="container-section tui-skeleton">
-			<!-- 推荐专区 -->
-			<hot-product :list="RecommendList" :userIdentity="userIdentity" v-if="isRequest"></hot-product>
-			<!-- 楼层 -->
-			<pages-product :list="pagesList" v-if="isRequest"></pages-product>
-			<!-- 商品专题 -->
-			<special-product :list="specialList" :listB="specialProList" v-if="isRequest"></special-product>
-			<!-- 供应商专题 -->
-			<supplier-list :list="supplierList" v-if="isRequest"></supplier-list>
+			<view v-for="(item,index) in flootData" :key="index">
+				<template v-if="item.type === 1">
+					<!-- 推荐专区 -->
+					<hot-product :list="RecommendList" :userIdentity="userIdentity" v-if="isRequest"></hot-product>
+				</template>
+				<template v-if="item.type === 3">
+					<!-- 供应商专题 -->
+					<supplier-list :list="item.floorData" v-if="isRequest"></supplier-list>
+				</template>
+				<template v-if="item.type === 4">
+					<!-- 商品专题 -->
+					<special-product :list="item.floorData" v-if="isRequest"></special-product>
+				</template>
+				<template v-if="item.type === 5">
+					<!-- 小专题 -->
+					<small-product :list="item.floorData" v-if="isRequest"></small-product>
+				</template>
+				<template v-if="item.type === 6">
+					<!-- 楼层 -->
+					<pages-product :list="item.subFloors" v-if="isRequest"></pages-product>
+				</template>
+			</view>
 		</view>
 		<!-- 侧边 -->
 		<scroll-top v-if="isScrollTop"></scroll-top>
@@ -33,6 +47,7 @@
 	import hotProduct from '@/components/cm-module/homeIndex/hotProduct.vue'
 	import pagesProduct from '@/components/cm-module/homeIndex/pagesProduct.vue'
 	import specialProduct from '@/components/cm-module/homeIndex/specialProduct.vue'
+	import smallProduct from '@/components/cm-module/homeIndex/smallProduct.vue'
 	import supplierList from '@/components/cm-module/homeIndex/supplierList.vue'
 	import { userInfoLogin } from "@/api/use.js"
 	import { mapState,mapMutations} from 'vuex';
@@ -45,6 +60,7 @@
 			navbars,
 			pagesProduct,
 			specialProduct,
+			smallProduct,
 			supplierList
 		},
 		data() {
@@ -71,45 +87,18 @@
 				isLogin:false,
 				skeletonShow: true,
 				userIdentity:'',
+				flootData:[],//楼层
 				bannerImageList:[],//轮播
 				navBarsList:[],//导航分类
-				pagesList:[],//楼层
 				RecommendList:[],//热门推荐
-				specialList:[],//商品专题轮播
-				specialProList:[],//商品专题商品
-				supplierList:[],//供应商列表
-				organizeProducts:[],//常用商品
-				productsClassifyList:[
-					{classifyImage:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/04/%E7%BB%84%201238.png',classifyName:'采美'},
-					{classifyImage:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/04/%E7%BB%84%201238.png',classifyName:'采美'},
-					{classifyImage:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/04/%E7%BB%84%201238.png',classifyName:'采美'},
-					{classifyImage:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/04/%E7%BB%84%201238.png',classifyName:'采美'},
-					{classifyImage:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/04/%E7%BB%84%201238.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/B0/Cmis217Z9LCABdf_AAAfdMmM_xY655.png'},
-					{text:'在线客服',icon:'https://img.caimei365.com/group1/M00/03/B0/Cmis217Z9BSAXPobAAApo6I0Tlo684.png'}
-				],
-				navServerList:[
-					{text:'会员优惠',icon:'../../../static/temp/server1@2x.png',path:'/pages/service/member'},
-					{text:'售后无忧',icon:'../../../static/temp/server2@2x.png',path:'/pages/service/aftersale'},
-					{text:'购物须知',icon:'../../../static/temp/server3@2x.png',path:'/pages/service/shoppingnotice'},
-					{text:'联系我们',icon:'../../../static/temp/server4@2x.png',path:''},
-				],
 				isScrollTop:false,
 				isRequest:false
 			}
 		},
 		created() {
 			this.$api.getStorage().then((resolve) =>{
-				this.userID = resolve.userID
+				this.userID = resolve.userID ? resolve.userID : 0
 				this.userIdentity = resolve.userIdentity
-				this.GetHomeFloorInfo()
 				this.getHomeInformation()
 			})
 		},
@@ -133,23 +122,7 @@
 			},
 			GetHomeFloorInfo(){//初始化首页楼层数据
 				this.CommonService.GetHomeFloorInfo({}).then(response =>{
-					let data = response.data
-					data.forEach((item,index) => {
-						switch(item.type){
-							case 3:
-								this.supplierList = item.floorData
-								break;	
-							case 4:
-								this.specialList = item.floorData
-								break;	
-							case 5:
-								this.specialProList = item.floorData
-								break;	
-							case 6:
-								this.pagesList = item.subFloors
-								break;
-						}
-					})
+					this.flootData = response.data
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000)
 				})
@@ -158,15 +131,9 @@
 				this.CommonService.GetHomeModulesDataInfo({ userId:this.userID }).then(res =>{
 					let data = res.data;
 					this.bannerImageList = data.bannerImageList
-					this.mallPageModules = data.mallPageModules
-					this.firstModulesName= data.firstModulesName
-					this.secondModulesName= data.secondModulesName
-					this.firstModulesImage= data.firstModulesImage
-					this.secondModulesImage= data.secondModulesImage
-					this.thirdModulesName= data.thirdModulesName
-					this.productsClassifyList = data.productsClassifyList
 					this.$store.commit('updateAllNum',data.shoppingCartCount)
 					this.GetHomeInit();
+					this.GetHomeFloorInfo()
 					this.GetHomeRecommendInfo()
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000)

components/cm-module/supplier/supplierDetails.vue

@@ -2,7 +2,7 @@
 	<!-- 供应商信息 -->
 	<view class="supplier clearfix">
 		<view class="product-supplier" @click="goSupplier">
-			<view class="logo"><img :src="shopData.logo" alt=""></view>
+			<view class="logo"><img :src="shopData.logo ? shopData.logo : 'http://static-b.caimei365.com/app/img/icon/icon-shoplogo.png'" alt=""></view>
 			<view class="main">
 				<view class="name">{{ shopData.name }}</view>
 				<view class="massgs">

components/cm-module/supplier/user.vue

@@ -91,7 +91,6 @@
 	</view>
 </template>
 <script>
-	import defalutLogo from '@/static/temp/logo@3x.png'
 	import authorize from '@/common/config/authorize.js'
 	import uniBadge from '@/components/uni-badge/uni-badge.vue'
 	import { mapState,mapMutations } from 'vuex'
@@ -115,7 +114,7 @@
 				},
 				CustomBar:this.CustomBar,// 顶部导航栏高度
 				StatusBar: this.StatusBar,
-				defalutLogo:defalutLogo,
+				defalutLogo:'http://static-b.caimei365.com/app/img/icon/logo@3x.png',
 				bgImgUrl:'https://img.caimei365.com/group1/M00/03/B0/Cmis217Z_i6ASHobAAhl69yz3SM078.png',
 				name:'这里是供应商的名字',
 				headpic:'',
@@ -143,7 +142,7 @@
 			},
 			BadgeType(n){
 				let num ='';
-				if( n>100 ){ num = '99+' } else{ num = n;}
+				if( n>999 ){ num = '999+' } else{ num = n;}
 				return num;
 			},
 		},

h5/pages/activity/activity.vue

@@ -24,19 +24,19 @@
 			console.log(option)
 			switch(option.id){
 				case '277':
-					this.activityPath = 'https://static-b.caimei365.com/app/caimei-h5/html/2020/caimeih5_01.html'
+					this.activityPath = 'https://static-b.caimei365.com/app/caimei-activity-h5/html/2020/caimeih5_01.html'
 					uni.setNavigationBarTitle({title:'三昭国际优惠'});
 					break;
 				case '278':
-					this.activityPath = 'https://static-b.caimei365.com/app/caimei-h5/html/2020/caimeih5_02.html'
+					this.activityPath = 'https://static-b.caimei365.com/app/caimei-activity-h5/html/2020/caimeih5_02.html'
 					uni.setNavigationBarTitle({title:'点斗优惠'});
 					break;
 				case '280':
-					this.activityPath = 'https://static-b.caimei365.com/app/caimei-h5/html/2020/caimeih5_03.html'
+					this.activityPath = 'https://static-b.caimei365.com/app/caimei-activity-h5/html/2020/caimeih5_03.html'
 					uni.setNavigationBarTitle({title:'唯美概念DEP优惠'});
 					break;
 				case '223':
-					this.activityPath = 'https://static-b.caimei365.com/app/caimei-h5/html/2020/caimeih5_99.html'
+					this.activityPath = 'https://static-b.caimei365.com/app/caimei-activity-h5/html/2020/caimeih5_99.html'
 					uni.setNavigationBarTitle({title:'品牌OEM服务'});
 					break;
 			}

pages/authorization/authorization.vue

@@ -2,7 +2,7 @@
 	<view class="container login" :style="{paddingTop:CustomBar+'px'}">
 		<cu-custom :navbar-data='nvabarData' @navigateBack="hanldNavigateBack"></cu-custom>
 		<view class="login-main">
-			<image class="logo" src="../../static/login-logo@3x.png" mode=""></image>
+			<image class="logo" src="http://static-b.caimei365.com/app/img/icon/login-logo@3x.png" mode=""></image>
 			<text class="logo-text">生美/医美采购服务平台</text>
 		</view>
 		<view class="login-content">

pages/goods/goods-secondary.vue

@@ -230,9 +230,8 @@
 				 if(floor.linkType){
 					 const typeMap = {
 					 	1:`/pages/goods/goods-instrument?linkId=${floor.linkParam.id}&title=${floor.title}`,
-					 	2:`/pages/search/search-instrument?keyword=${floor.title}`,
+					 	2:`/pages/goods/instrument-details?id=${floor.linkParam.id}`,
 					 	5:`/pages/goods/product?id=${floor.linkParam.id}`,
-					 	6:`/pages/goods/instrument-details?id=${floor.linkParam.id}`,
 					 	7:`/supplier/pages/user/my-shop?shopId=${floor.linkParam.id}`,
 					 	8:`/h5/pages/activity/activity-list`,
 					 	9:`/second/pages/form/introduce`,

pages/goods/instrument-details.vue

@@ -53,14 +53,20 @@
 				</view>
 			</view>	
 			<view class="product-details service" v-show="tabCurrentIndex == 1">
-				<view class="content service">
+				<view class="content service" v-if="crmDetailList[tabCurrentIndex].content">
 					{{ crmDetailList[tabCurrentIndex].content }}
 				</view>
+				<view class="content service">
+					<view class="content-none">暂无内容</view>
+				</view>
 			</view>	
 			<view class="product-details service" v-show="tabCurrentIndex == 2">
-				<view class="content service">
+				<view class="content service" v-if="crmDetailList[tabCurrentIndex].content">
 					{{ crmDetailList[tabCurrentIndex].content }}
 				</view>
+				<view class="content service">
+					<view class="content-none">暂无内容</view>
+				</view>
 			</view>	
 			<view class="product-details recommend">
 				<!-- 相关推荐 -->
@@ -424,6 +430,14 @@
 				font-size: $font-size-26;
 				color: #666666;
 			}
+			.content-none{
+				width: 100%;
+				height: 80rpx;
+				line-height: 80rpx;
+				font-size: $font-size-26;
+				color: #999999;
+				text-align: center;
+			}
 		}
 		&.recommend{
 			background-color: #F7F7F7;

pages/goods/product.vue

@@ -89,7 +89,7 @@
 						<text class="iconfont icon-xiayibu"></text>
 					</view>
 					<view class="product-supplier" @click="goSupplier">
-						<view class="logo"><img :src="shop.logo" alt=""></view>
+						<view class="logo"><img :src="shop.logo ? shop.logo :'http://static-b.caimei365.com/app/img/icon/icon-shoplogo.png'" alt=""></view>
 						<view class="main">
 							<view class="name">{{shop.name}}</view>
 							<view class="massgs">

pages/login/information.vue

@@ -127,7 +127,7 @@
 					<view class="label zz">医疗执业许可证</view>
 					<view class="upload-picture">
 						<view class="upload-none" v-if="uploadMedicalImage == ''||uploadMedicalImage == null" @click="chooseMedicalImage">
-							<image src="http://static-b.caimei365.com/app/img/upload/club-zizhi.png"></image>
+							<image src="http://static-b.caimei365.com/app/img/upload/club-yiliao.png"></image>
 						</view>
 						<view class="upload-image" v-else>
 							<image :src="uploadMedicalImage" mode=""  @click="viewMedicalImage"></image>
@@ -830,7 +830,6 @@
 						}
 					}
 					&.picker{
-						padding: 0 24rpx;
 						width: 654rpx;
 						height: 88rpx;
 						line-height: 88rpx;
@@ -1120,9 +1119,9 @@
 				}
 			}
 			.register-btn{
-				width: 702rpx;
+				width: 600rpx;
 				height: 88rpx;
-				border-radius: 14rpx;
+				border-radius: 44rpx;
 				font-size: $font-size-28;
 				line-height: 88rpx;
 				color: #FFFFFF;

pages/search/search-order.vue

@@ -35,7 +35,7 @@
 									<text class="bage-buss tui-skeleton-fillet" v-if="order.orderSubmitType == 3 || order.orderSubmitType == 4">协销</text>
 									<text class="bage-auto tui-skeleton-fillet" v-if="order.orderSubmitType == 0 || order.orderSubmitType == 1 || order.orderSubmitType == 2">自主</text>
 									<text class="bage-text tui-skeleton-fillet">订单号：{{order.orderNo}}</text>
-									<image class="bage-icon" src="../../static/temp/icon-type@3x.png" mode="widthFix" v-if="order.secondHandOrderFlag == 1"></image>
+									<image class="bage-icon" src="http://static-b.caimei365.com/app/img/icon/icon-type@3x.png" mode="widthFix" v-if="order.secondHandOrderFlag == 1"></image>
 								</view>
 								<view class="order-title-b">
 									<view class="order-title-btxt tui-skeleton-fillet">下单时间：{{order.orderTime}}</view>

pages/tabBar/home/home.vue

@@ -141,7 +141,7 @@
 				</view>
 				<view class="f-text tui-skeleton-fillet">
 					<view class="">
-						<image class="logo" src="../../../static/logo-c@2x.png" mode=""></image>
+						<image class="logo" src="http://static-b.caimei365.com/app/img/icon/logo-c@2x.png" mode=""></image>
 						<text class="">采美365网</text>
 					</view>
 				</view>

pages/tabBar/home/index.vue

@@ -10,14 +10,28 @@
 			<navbars :list="navBarsList" v-if="isRequest"></navbars>
 		</view>	
 		<view class="container-section tui-skeleton">
-			<!-- 推荐专区 -->
-			<hot-product :list="RecommendList" :userIdentity="userIdentity" v-if="isRequest"></hot-product>
-			<!-- 楼层 -->
-			<pages-product :list="pagesList" v-if="isRequest"></pages-product>
-			<!-- 商品专题 -->
-			<special-product :list="specialList" :listB="specialProList" v-if="isRequest"></special-product>
-			<!-- 供应商专题 -->
-			<supplier-list :list="supplierList" v-if="isRequest"></supplier-list>
+			<view v-for="(item,index) in flootData" :key="index">
+				<template v-if="item.type === 1">
+					<!-- 推荐专区 -->
+					<hot-product :list="RecommendList" :userIdentity="userIdentity" v-if="isRequest"></hot-product>
+				</template>
+				<template v-if="item.type === 3">
+					<!-- 供应商专题 -->
+					<supplier-list :list="item.floorData" v-if="isRequest"></supplier-list>
+				</template>
+				<template v-if="item.type === 4">
+					<!-- 商品专题 -->
+					<special-product :list="item.floorData" v-if="isRequest"></special-product>
+				</template>
+				<template v-if="item.type === 5">
+					<!-- 小专题 -->
+					<small-product :list="item.floorData" v-if="isRequest"></small-product>
+				</template>
+				<template v-if="item.type === 6">
+					<!-- 楼层 -->
+					<pages-product :list="item.subFloors" v-if="isRequest"></pages-product>
+				</template>
+			</view>
 		</view>
 		<!-- 侧边 -->
 		<scroll-top v-if="isScrollTop"></scroll-top>
@@ -33,6 +47,7 @@
 	import hotProduct from '@/components/cm-module/homeIndex/hotProduct.vue'
 	import pagesProduct from '@/components/cm-module/homeIndex/pagesProduct.vue'
 	import specialProduct from '@/components/cm-module/homeIndex/specialProduct.vue'
+	import smallProduct from '@/components/cm-module/homeIndex/smallProduct.vue'
 	import supplierList from '@/components/cm-module/homeIndex/supplierList.vue'
 	import { userInfoLogin } from "@/api/use.js"
 	import { mapState,mapMutations} from 'vuex';
@@ -45,6 +60,7 @@
 			navbars,
 			pagesProduct,
 			specialProduct,
+			smallProduct,
 			supplierList
 		},
 		data() {
@@ -71,6 +87,7 @@
 				isLogin:false,
 				skeletonShow: true,
 				userIdentity:'',
+				flootData:[],//楼层
 				bannerImageList:[],//轮播
 				navBarsList:[],//导航分类
 				pagesList:[],//楼层
@@ -154,6 +171,7 @@
 			GetHomeFloorInfo(){//初始化首页楼层数据
 				this.CommonService.GetHomeFloorInfo({}).then(response =>{
 					let data = response.data
+					this.flootData = data
 					data.forEach((item,index) => {
 						switch(item.type){
 							case 3:

pages/tabBar/user/user.vue

@@ -4,7 +4,7 @@
 		<view class="user-section">
 			<view class="header" :style="{height:(CustomBar+90)-StatusBar+'px',paddingTop:CustomBar+'px',background:'url('+ bgImgUrl +')',backgroundSize:'cover'}">
 				<view class="header-main" v-if="hasLogin">
-					<view class="header-icon"><image :src="headpic == null? '../../../static/temp/icon-club@3x.png' : headpic" mode=""></image></view>
+					<view class="header-icon"><image :src="headpic == null? 'http://static-b.caimei365.com/app/img/icon/icon-club@3x.png' : headpic" mode=""></image></view>
 					<view class="header-text">
 						<view class="user-item">
 							<text class="u-h1">{{name}}</text>
@@ -16,7 +16,7 @@
 				</view>
 				<view class="header-main-none" v-else>
 					<view class="header-icon" @click="navigator('/pages/login/login')">
-						<image src="../../../static/temp/icon-club@3x.png" mode=""></image>
+						<image src="http://static-b.caimei365.com/app/img/icon/icon-club@3x.png" mode=""></image>
 					</view>
 					<view class="header-text">
 						<view class="user-item">

pages/user/address/address.vue

@@ -265,8 +265,8 @@
 	}
 	.add-btn{
 		position: fixed;
-		left: 24rpx;
-		right: 24rpx;
+		left: 75rpx;
+		right: 75rpx;
 		bottom: 34rpx;
 		z-index: 95;
 		display: flex;

pages/user/operator/list.vue

@@ -2,7 +2,7 @@
 	<view class="container operator clearfix">
 		<view class="operator-top clearfix">
 			<view class="operator-title">
-				<view class="head"><image :src="clubImage == null ? '../../../static/temp/icon-club@3x.png' : clubImage" mode=""></image></view>
+				<view class="head"><image :src="clubImage == null ? 'http://static-b.caimei365.com/app/img/icon/icon-club@3x.png' : clubImage" mode=""></image></view>
 				<view class="title">{{clubName}}</view>
 			</view>
 			<view class="operator-search">
@@ -27,7 +27,7 @@
 				<scroll-view scroll-y="true" >
 					<view class="list" v-for="(item, index) in operatorList" :key="index" @click.stop="showOperatorModel(item)">
 						<view class="list-left">
-							<view class="list-head"><image :src="item.headimgurl ? item.headimgurl : '../../../static/temp/icon-seller@3x.png'" mode=""></image></view>
+							<view class="list-head"><image :src="item.headimgurl ? item.headimgurl : 'http://static-b.caimei365.com/app/img/icon/icon-seller@3x.png'" mode=""></image></view>
 							<view class="list-tel">
 								<text class="txt">{{item.linkName}}</text>
 								<text class="txt">{{item.mobile}}</text>

pages/user/order/order-list.vue

@@ -25,7 +25,7 @@
 										<text class="bage-buss tui-skeleton-fillet" v-if="order.orderSubmitType == 3 || order.orderSubmitType == 4">协销</text>
 										<text class="bage-auto tui-skeleton-fillet" v-if="order.orderSubmitType == 0 || order.orderSubmitType == 1 || order.orderSubmitType == 2">自主</text>
 										<text class="bage-text tui-skeleton-fillet">订单号：{{order.orderNo}}</text>
-										<image class="bage-icon" src="../../../static/temp/icon-type@3x.png" mode="widthFix" v-if="order.secondHandOrderFlag == 1"></image>
+										<image class="bage-icon" src="http://static-b.caimei365.com/app/img/icon/icon-type@3x.png" mode="widthFix" v-if="order.secondHandOrderFlag == 1"></image>
 									</view>
 									<view class="order-title-b">
 										<view class="order-title-btxt tui-skeleton-fillet">下单时间：{{order.orderTime}}</view>

seller/pages/club/allClub-list.vue

@@ -25,7 +25,7 @@
 			<view v-else class="club-list">
 					<view class="list" v-for="(item, index) in clubList" :key="index">
 						<view class="list-left">
-							<view class="list-head"><image :src="item.headpic ? item.headpic : '../../../static/temp/icon-club@3x.png'" mode=""></image></view>
+							<view class="list-head"><image :src="item.headpic ? item.headpic : 'http://static-b.caimei365.com/app/img/icon/icon-club@3x.png'" mode=""></image></view>
 							<view class="list-tel">
 								<text class="txt">{{item.name == null ? item.username : item.name}}</text>
 								<text class="txt sm">

seller/pages/club/club-list.vue

@@ -26,7 +26,7 @@
 				<scroll-view scroll-y="true" >
 					<view class="list" v-for="(item, index) in clubList" :key="index">
 						<view class="list-left">
-							<view class="list-head"><image :src="item.headpic ? item.headpic : '../../../static/temp/icon-club@3x.png'" mode=""></image></view>
+							<view class="list-head"><image :src="item.headpic ? item.headpic : 'http://static-b.caimei365.com/app/img/icon/icon-club@3x.png'" mode=""></image></view>
 						</view>
 						<view class="list-item">
 							<view class="list-title">

seller/pages/club/list.vue

@@ -33,7 +33,7 @@
 				<scroll-view scroll-y="true" >
 					<view class="list" v-for="(item, index) in clubList" :key="index">
 						<view class="list-left">
-							<view class="list-head"><image :src="item.headpic ? item.headpic : '../../../static/temp/icon-club@3x.png'" mode=""></image></view>
+							<view class="list-head"><image :src="item.headpic ? item.headpic : 'http://static-b.caimei365.com/app/img/icon/icon-club@3x.png'" mode=""></image></view>
 							<view class="list-tel">
 								<text class="txt">{{item.userIdentity ===2 ? item.name : item.linkMan1}}</text>
 								<text class="txt sm">

seller/pages/index/index.vue

@@ -83,7 +83,7 @@
 			},
 			onPullDownRefresh(){
 				if(this.show_index == 0){
-					this.$refs.home.getSellerHomeInfo()
+					this.$refs.home.getHomeInformation()
 				}else if(this.show_index == 2){
 					this.$refs.user.initData()
 				}

seller/pages/login/login.vue

@@ -2,7 +2,7 @@
 	<view class="container login" :style="{paddingTop:CustomBar+'px'}" v-if="isSeller">
 		<cu-custom :navbar-data='nvabarData'  @navigateBack="hanldNavigateBack"></cu-custom>
 		<view class="login-main">
-			<image class="logo" src="../../../static/login-logo@3x.png" mode=""></image>
+			<image class="logo" src="http://static-b.caimei365.com/app/img/icon/login-logo@3x.png" mode=""></image>
 			<text class="logo-text">生美/医美采购服务平台</text>
 		</view>
 		<view class="login-form">

seller/pages/order/order-historylist.vue

@@ -28,7 +28,7 @@
 										<text class="bage-buss tui-skeleton-fillet" v-if="order.orderSubmitType == 3 || order.orderSubmitType == 4">协销</text>
 										<text class="bage-auto tui-skeleton-fillet" v-if="order.orderSubmitType == 0 || order.orderSubmitType == 1 || order.orderSubmitType == 2">自主</text>
 										<text class="bage-text tui-skeleton-fillet">订单号：{{order.orderNo}}({{order.orderID}})</text>
-										<image class="bage-icon" src="../../../static/temp/icon-type@3x.png" mode="widthFix" v-if="order.secondHandOrderFlag == 1"></image>
+										<image class="bage-icon" src="http://static-b.caimei365.com/app/img/icon/icon-type@3x.png" mode="widthFix" v-if="order.secondHandOrderFlag == 1"></image>
 									</view>
 									<view class="order-title-b">
 										<view class="order-title-btxt tui-skeleton-fillet">下单时间：{{order.orderTime}}</view>

seller/pages/order/order-list.vue

@@ -37,7 +37,7 @@
 										<text class="bage-buss tui-skeleton-fillet" v-if="order.orderSubmitType == 3 || order.orderSubmitType == 4">协销</text>
 										<text class="bage-auto tui-skeleton-fillet" v-if="order.orderSubmitType == 0 || order.orderSubmitType == 1 || order.orderSubmitType == 2">自主</text>
 										<text class="bage-text tui-skeleton-fillet">订单号：{{order.orderNo}}({{order.orderID}})</text>
-										<image class="bage-icon" src="../../../static/temp/icon-type@3x.png" mode="widthFix" v-if="order.secondHandOrderFlag == 1"></image>
+										<image class="bage-icon" src="http://static-b.caimei365.com/app/img/icon/icon-type@3x.png" mode="widthFix" v-if="order.secondHandOrderFlag == 1"></image>
 									</view>
 									<view class="order-title-b">
 										<view class="order-title-btxt tui-skeleton-fillet">下单时间：{{order.orderTime}}</view>

seller/pages/search/search-order.vue

@@ -35,7 +35,7 @@
 									<text class="bage-buss tui-skeleton-fillet" v-if="order.orderSubmitType == 3 || order.orderSubmitType == 4">协销</text>
 									<text class="bage-auto tui-skeleton-fillet" v-if="order.orderSubmitType == 0 || order.orderSubmitType == 1 || order.orderSubmitType == 2">自主</text>
 									<text class="bage-text tui-skeleton-fillet">订单号：{{order.orderNo}}({{order.orderID}})</text>
-									<image class="bage-icon" src="../../../static/temp/icon-type@3x.png" mode="widthFix" v-if="order.secondHandOrderFlag == 1"></image>
+									<image class="bage-icon" src="http://static-b.caimei365.com/app/img/icon/icon-type@3x.png" mode="widthFix" v-if="order.secondHandOrderFlag == 1"></image>
 								</view>
 								<view class="order-title-b">
 									<view class="order-title-btxt tui-skeleton-fillet">下单时间：{{order.orderTime}}</view>

supplier/pages/index/index.vue

@@ -83,7 +83,7 @@
 			},
 			onPullDownRefresh(){
 				if(this.show_index == 0){
-					this.$refs.home.getSellerHomeInfo()
+					this.$refs.home.getHomeInformation()
 				}else if(this.show_index == 2){
 					this.$refs.user.initData()
 				}

supplier/pages/login/share-login.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="container login">
 		<view class="login-main">
-			<image class="logo" src="@/static/login-logo@3x.png" mode=""></image>
+			<image class="logo" src="http://static-b.caimei365.com/app/img/icon/login-logo@3x.png" mode=""></image>
 			<text class="logo-text">生美/医美采购服务平台</text>
 		</view>
 		<view class="login-input">

supplier/pages/user/my-product.vue

@@ -193,8 +193,23 @@
 				
 			}
 		},
-		onLoad(){
-		
+		onLoad(option){
+			switch(option.listType){
+				case '0':
+					this.listQuery.validFlag =''
+					break;
+				case '1':
+					this.listQuery.validFlag = 2
+					break;
+				case '2':
+					this.listQuery.validFlag = 3
+					break;
+			}
+			this.$api.getComStorage('userInfo').then((resolve) =>{
+				this.listQuery.shopID = resolve.shopID
+				this.GetProductListInfo()
+				this.GetPrimaryClassification()
+			})
 		},
 		filters: {
 			NumFormat:function(text) {//处理金额
@@ -606,11 +621,7 @@
 			}, 200)
 		},
 		onShow(){
-			this.$api.getComStorage('userInfo').then((resolve) =>{
-				this.listQuery.shopID = resolve.shopID
-				this.GetProductListInfo()
-				this.GetPrimaryClassification()
-			})
+			
 		}	
 	}
 </script>

supplier/pages/user/my-shop.vue

@@ -6,13 +6,14 @@
 			<view class="shop-search-main">
 				<view class="shop-search">
 					<text class="iconfont icon-sousuo"></text>
-					<input class="input" maxlength="20" type="text" value="" v-model.trim="listQuery.keyword" confirm-type="search" @confirm="SubMitSearch()" placeholder="搜索本店铺商品" />
+					<input class="input" maxlength="20" type="text" value=""  @focus="onFocus" @input="onShowClose" v-model.trim="listQuery.keyword" confirm-type="search" @confirm="SubMitSearch()" placeholder="搜索本店铺商品" />
+					<text class="iconfont icon-shanchu1" v-if="isShowClose" @click.stop="delInputText()"></text>
 				</view>
 			</view>
 			<view class="container-shop tui-skeleton">
 				<!-- 轮播 -->
 				<view class="product-supplier" @click="goSupplier">
-					<view class="logo"><img :src="shopLogo" alt=""></view>
+					<view class="logo"><img :src="shopLogo ? shopLogo : 'http://static-b.caimei365.com/app/img/icon/icon-shoplogo.png'" alt=""></view>
 					<view class="main">
 						<view class="name">{{ shopName }}</view>
 						<view class="massgs">
@@ -252,7 +253,9 @@
 				shopName:'',
 				shopLogo:'',
 				normalNum:0,
+				isFocus:false,
 				isEmpty:false,
+				isShowClose:false,	//是否显示清空输入框图标
 				skeletonShow: true,
 				bannerImageList:[],
 				recommendList:[],
@@ -271,8 +274,8 @@
 		onLoad(option) {
 			this.listQuery.id = this.supplierId = option.shopId
 			this.$api.getStorage().then((resolve) =>{
-				this.shopId = resolve.shopID
-				this.userID = resolve.userID
+				this.shopId = resolve.shopID ? resolve.shopID : 0
+				this.userID = resolve.userID ? resolve.shopID : 0
 				this.userIdentity = resolve.userIdentity
 				this.InitShopDataInfo()
 			}).catch( error =>{
@@ -423,6 +426,28 @@
 				}
 				return false
 			},
+			onShowClose () {//输入框输入时触发
+				this.inputEmpty(this.listQuery.keyword)
+			},
+			onFocus () { //输入框获取焦点时触发
+				this.inputEmpty(this.listQuery.keyword)
+			},
+			delInputText () { //清除输入框内容
+				this.listQuery.keyword = ''
+				this.isShowClose = false
+				this.isShowWrapper = false
+				this.inputEmpty(this.listQuery.keyword)
+				this.initGetSerachRecord()
+			},
+			inputEmpty(val){
+				if(val != ''){
+					this.isShowClose = true
+					this.isFocus = true
+				}else{					
+					this.isShowClose = false
+					this.isFocus = true
+				}
+			},
 			goSupplier(){//跳供应商资料页
 				this.$api.navigateTo('/supplier/pages/user/supplier?shopId='+this.supplierId)
 			},
@@ -480,6 +505,7 @@
 			border-radius: 33rpx;
 			background-color: #F7F7F7;
 			box-sizing: border-box;
+			position: relative;
 			.icon-sousuo{
 				width: 80rpx;
 				height: 66rpx;
@@ -490,6 +516,19 @@
 				text-align: center;
 				font-size: 36rpx;
 			}
+			.icon-shanchu1{
+				width: 80rpx;
+				height: 66rpx;
+				display: block;
+				color: #8A8A8A;
+				line-height: 66rpx;
+				text-align: center;
+				font-size: 36rpx;
+				position: absolute;
+				right: 0;
+				top: 0;
+				z-index: 100;
+			}
 			.input{
 				width: 580rpx;
 				height: 66rpx;

supplier/pages/user/operator/list.vue

@@ -80,7 +80,6 @@
 </template>
 
 <script>
-	import defalutLogo from '@/static/temp/logo@3x.png'
 	import authorize from '@/common/config/authorize.js'	
 	import tuiLoadmore from "@/components/tui-components/loadmore/loadmore"
 	import tuiNomore from "@/components/tui-components/nomore/nomore"
@@ -94,7 +93,7 @@
 				shopId:'',
 				shopName:'',
 				shopLogo:'',
-				defalutLogo:defalutLogo,
+				defalutLogo:'http://static-b.caimei365.com/app/img/icon/logo@3x.png',
 				isEmpty:false,
 				nomoreText: '上拉显示更多',
 				hasNextPage:false,