commit -m 测试优化~

common/config/caimeiApi.js

@@ -239,7 +239,7 @@ const caimeiApi = {
 				 	15:`/h5/pages/article/page?link=${pros.link}`,
 				 	17:`/pages/login/register-select`,
 				 	18:`/h5/pages/article/page?link=${pros.link}`,
-				 	19:`/search/pages//search-supplier?keyWord=${pros.name}`
+				 	19:`/search/pages/search/search-supplier?keyWord=${pros.name}`
 				}
 				const url = typeMap[pros.linkType];
 				uni.navigateTo({

components/cm-custom/cm-drag.vue

@@ -13,7 +13,7 @@
 			<text v-if="cartNum > 0" class="uni-badge uni-badge-error uni-small uni-badge--small icon-num">
 				{{cartNum >= 100 ? '99+' : cartNum}}
 			</text>
-			<image src='https://static-b.caimei365.com/app/img/icon/icon-cart-active@3x.png' mode="widthFix"></image>
+			<image src='https://static.caimei365.com/app/img/icon/icon-cart-active@3x.png' mode="widthFix"></image>
 		</view>
 	</view>
 </template>

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

@@ -21,13 +21,13 @@
 							<view class="title">{{small.name}}</view>
 							<view class="list" v-if="small.tinytypeList.length > 0">
 								<view class="box" v-for="(pro,proIndex) in small.tinytypeList" :key="proIndex" @click.stop="navToListPage(pro,3)">
-									<image :src="pro.crmIcon ? pro.crmIcon : 'https://static-b.caimei365.com/app/img/icon/icon-noneproduct.jpg'"></image>
+									<image :src="pro.crmIcon ? pro.crmIcon : 'https://static.caimei365.com/app/img/icon/icon-noneproduct.jpg'"></image>
 									<view class="text">{{pro.name}}</view>
 								</view>
 							</view>
 							<view v-else class="no-data">
 								<view class="box" @click.stop="navToListPage(small,2)">
-									<image :src="small.crmIcon ? small.crmIcon : 'https://static-b.caimei365.com/app/img/icon/icon-noneproduct.jpg'"></image>
+									<image :src="small.crmIcon ? small.crmIcon : 'https://static.caimei365.com/app/img/icon/icon-noneproduct.jpg'"></image>
 									<view class="text">全部商品</view>
 								</view>
 							</view>
@@ -38,7 +38,7 @@
 							<view class="title">{{first.name}}</view>
 							<view class="no-data">
 								<view class="box" @click.stop="navToListPage(first,1)">
-									<image src="https://static-b.caimei365.com/app/img/icon/icon-noneproduct.jpg"></image>
+									<image src="https://static.caimei365.com/app/img/icon/icon-noneproduct.jpg"></image>
 									<view class="text">全部商品</view>
 								</view>
 							</view>

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

@@ -24,7 +24,7 @@
 					<view class="order-section">
 						<view class="order-item" @click="navigator('/seller/pages/order/order-list?listType=1')" hover-class="common-hover"  :hover-stay-time="50">
 							<view class="order-icon">
-								<image src="https://static-b.caimei365.com/app/img/icon/order5@3x.png" mode=""></image>
+								<image src="https://static.caimei365.com/app/img/icon/order5@3x.png" mode=""></image>
 								<text 	v-if="beforeConfirmCount>0" 
 										class="uni-badge uni-badge-error uni-small uni-badge--small icon-num" 
 										:class="[beforeConfirmCount < 10 ? 'goleft':'']">
@@ -35,7 +35,7 @@
 						</view>
 						<view class="order-item" @click="navigator('/seller/pages/order/order-list?listType=2')"  hover-class="common-hover" :hover-stay-time="50">
 							<view class="order-icon">
-								<image src="https://static-b.caimei365.com/app/img/icon/order1@3x.png" mode=""></image>
+								<image src="https://static.caimei365.com/app/img/icon/order1@3x.png" mode=""></image>
 								<text  v-if="beforePayCount >0" 
 									   class="uni-badge uni-badge-error uni-small uni-badge--small icon-num " 
 									   :class="[beforePayCount < 10 ? 'goleft':'']">
@@ -46,7 +46,7 @@
 						</view>
 						<view class="order-item" @click="navigator('/seller/pages/order/order-list?listType=3')" hover-class="common-hover"  :hover-stay-time="50">
 							<view class="order-icon">
-								<image src="https://static-b.caimei365.com/app/img/icon/static/temp/order2@3x.png" mode=""></image>
+								<image src="https://static.caimei365.com/app/img/icon/static/temp/order2@3x.png" mode=""></image>
 								<text   v-if="beforeShipCount >0" 
 										class="uni-badge uni-badge-error uni-small uni-badge--small icon-num" 
 										:class="[beforeShipCount < 10 ? 'goleft':'']">
@@ -57,7 +57,7 @@
 						</view>
 						<view class="order-item" @click="navigator('/seller/pages/order/order-list?listType=4')" hover-class="common-hover"  :hover-stay-time="50">
 							<view class="order-icon">
-								<image src="https://static-b.caimei365.com/app/img/icon/static/temp/order3@3x.png" mode=""></image>
+								<image src="https://static.caimei365.com/app/img/icon/static/temp/order3@3x.png" mode=""></image>
 								<text 	v-if="shippedCount>0" 
 										class="uni-badge uni-badge-error uni-small uni-badge--small icon-num" 
 										:class="[shippedCount < 10 ? 'goleft':'']">
@@ -68,7 +68,7 @@
 						</view>
 						<view class="order-item" @click="navigator('/seller/pages/order/order-list?listType=5')" hover-class="common-hover"  :hover-stay-time="50">
 							<view class="order-icon">
-								<image src="https://static-b.caimei365.com/app/img/icon/static/temp/order4@3x.png" mode=""></image>
+								<image src="https://static.caimei365.com/app/img/icon/static/temp/order4@3x.png" mode=""></image>
 								<text 	v-if="refundsCount >0"
 										class="uni-badge uni-badge-error uni-small uni-badge--small icon-num" 
 										:class="[refundsCount < 10 ? 'goleft':'']">

components/cm-module/homeIndex/pageSpecial.vue

@@ -3,7 +3,7 @@
 		<view class="container-pages clearfix">
 			<scroll-view scroll-x>
 				<view class="tui-goods__list">
-					<view class="tui-goods__item" v-if="tempData.liveList">
+					<view class="tui-goods__item" v-if="tempData.liveList != ''">
 						<view class="tui-group-name" @click="LiveGoPath">
 							<view class="tui-group-title"><text>精彩直播</text></view>
 							<view class="iconfont icon-xiayibu"></view>
@@ -22,7 +22,7 @@
 							<view class="tui-goods__text" v-if="flIndex > 0">{{ live.liveTitle }}</view>
 						</view>
 					</view>
-					<view class="tui-goods__item" v-if="tempData.cmImageList">
+					<view class="tui-goods__item" v-if="tempData.cmImageList != ''">
 						<view class="tui-group-name" @click="NewActivityList">
 							<view class="tui-group-title"><text>最新活动</text></view>
 							<view class="iconfont icon-xiayibu"></view>
@@ -35,7 +35,7 @@
 							<view class="tui-goods__text" v-if="flIndex > 0">{{ cmImage.title }}</view>
 						</view>
 					</view>
-					<view class="tui-goods__item" v-if="tempData.infoList">
+					<view class="tui-goods__item" v-if="tempData.infoList != ''">
 						<view class="tui-group-name" @click="NavArticlePath('https://www.caimei365.com/info/center-3-1.html')">
 							<view class="tui-group-title"><text>热门文章</text></view>
 							<view class="iconfont icon-xiayibu"></view>
@@ -66,7 +66,7 @@
 		data() {
 			return{
 				tempData:{},
-				iconLive:'https://static-b.caimei365.com/app/img/icon/icon-live.gif'
+				iconLive:'https://static.caimei365.com/app/img/icon/icon-live.gif'
 			}
 		},
 		filters: {
@@ -95,7 +95,7 @@
 				this.tempData = data
 			},
 			NavArticlePath(LINK){
-				 this.$api.navigateTo(`/h5/pages/article/page?link=${LINK}`)
+				 this.$api.navigateTo(`/h5/pages/article/path?link=${LINK}`)
 			},
 			NewActivityList(){
 				this.$api.navigateTo('/h5/pages/activity/activity-list')

components/cm-module/homeIndex/supplierList.vue

@@ -7,7 +7,7 @@
 			<view class="tui-sub__desc">采美正品联盟 质量保证</view>
 		</view>
 		<view class="supplier-banner">
-			<image :src="banner" mode=""></image>
+			<image :src="banner" mode="" @click="BannerNavigateTo(supplierObj.linkType,supplierObj.linkParam.id,supplierObj.wwwLink,supplierObj.linkParam.keyword)"></image>
 		</view>
 		<view class="swiper-goods-box">
 			<view class="goods-box-item" v-for="(item,index) in supplierObj.qualitySupplierList" :key="index" @click="NavToDetailPage(item)">
@@ -43,6 +43,9 @@
 				this.banner = data.crmImage
 				this.supplierList = data.qualitySupplierList
 			},
+			BannerNavigateTo(linkType,linkId,linkHref,keyword) {//跳转
+				this.$api.BannerNavigateTo(linkType,linkId,linkHref,keyword)
+			},
 			NavToDetailPage(item) {//跳转
 				this.$api.navigateTo(`/supplier/pages/user/my-shop?shopId=${item.linkParam.id}`)
 			}

components/cm-module/supplier/category.vue

@@ -21,13 +21,13 @@
 							<view class="title">{{small.name}}</view>
 							<view class="list" v-if="small.tinytypeList.length > 0">
 								<view class="box" v-for="(pro,proIndex) in small.tinytypeList" :key="proIndex" @click.stop="navToListPage(pro,3)">
-									<image :src="pro.crmIcon ? pro.crmIcon : 'https://static-b.caimei365.com/app/img/icon/icon-noneproduct.jpg'"></image>
+									<image :src="pro.crmIcon ? pro.crmIcon : 'https://static.caimei365.com/app/img/icon/icon-noneproduct.jpg'"></image>
 									<view class="text">{{pro.name}}</view>
 								</view>
 							</view>
 							<view v-else class="no-data">
 								<view class="box" @click.stop="navToListPage(small,2)">
-									<image :src="small.crmIcon ? small.crmIcon : 'https://static-b.caimei365.com/app/img/icon/icon-noneproduct.jpg'"></image>
+									<image :src="small.crmIcon ? small.crmIcon : 'https://static.caimei365.com/app/img/icon/icon-noneproduct.jpg'"></image>
 									<view class="text">全部商品</view>
 								</view>
 							</view>
@@ -38,7 +38,7 @@
 							<view class="title">{{first.name}}</view>
 							<view class="no-data">
 								<view class="box" @click.stop="navToListPage(first,1)">
-									<image src="https://static-b.caimei365.com/app/img/icon/icon-noneproduct.jpg"></image>
+									<image src="https://static.caimei365.com/app/img/icon/icon-noneproduct.jpg"></image>
 									<view class="text">全部商品</view>
 								</view>
 							</view>

h5/pages/other/repair.vue

@@ -16,7 +16,7 @@
 		data(){
 			return{
 				isIphoneX:this.$store.state.isIphoneX,
-				banner:'https://static-b.caimei365.com/app/img/bg/icon-weixiu.jpg',
+				banner:'https://static.caimei365.com/app/img/bg/icon-weixiu.jpg',
 			}
 		},
 		onLoad(option) {

pages/goods/product.vue

@@ -181,7 +181,7 @@
 					<view class="bottom-btn" :style="{paddingBottom :isIphoneX ? '68rpx' : '0rpx'}">
 						<view class="bottom-le">
 							<view class="item-bt" @click="this.$api.switchTabTo('/pages/tabBar/home/index')">
-								<image src="https://static-b.caimei365.com/app/img/icon/icon-logo.png"></image>
+								<image src="https://static.caimei365.com/app/img/icon/icon-logo.png"></image>
 							</view>
 							<view class="item-bt">
 								<!-- #ifdef MP-WEIXIN -->
@@ -191,7 +191,7 @@
 								<!-- #endif -->
 							</view>
 							<view class="item-bt" @click="buyProductCart()">
-								<image src="https://static-b.caimei365.com/app/img/icon/icon-cart-active@3x.png"></image>
+								<image src="https://static.caimei365.com/app/img/icon/icon-cart-active@3x.png"></image>
 								<text  	v-if="hasLogin && goodsData.cartCount>0"
 										class="uni-badge uni-badge-error uni-small uni-badge--small icon-num"
 										:class="[goodsData.cartCount < 10 ? 'goleft':'']">

pages/tabBar/category/index.vue

@@ -20,13 +20,13 @@
 							<view class="title">{{small.name}}</view>
 							<view class="list" v-if="small.tinytypeList.length > 0">
 								<view class="box" v-for="(pro,proIndex) in small.tinytypeList" :key="proIndex" @click.stop="navToListPage(pro,3)">
-									<image :src="pro.crmIcon ? pro.crmIcon : 'https://static-b.caimei365.com/app/img/icon/icon-noneproduct.jpg'"></image>
+									<image :src="pro.crmIcon ? pro.crmIcon : 'https://static.caimei365.com/app/img/icon/icon-noneproduct.jpg'"></image>
 									<view class="text">{{pro.name}}</view>
 								</view>
 							</view>
 							<view v-else class="no-data">
 								<view class="box" @click.stop="navToListPage(small,2)">
-									<image :src="small.crmIcon ? small.crmIcon : 'https://static-b.caimei365.com/app/img/icon/icon-noneproduct.jpg'"></image>
+									<image :src="small.crmIcon ? small.crmIcon : 'https://static.caimei365.com/app/img/icon/icon-noneproduct.jpg'"></image>
 									<view class="text">全部商品</view>
 								</view>
 							</view>
@@ -37,7 +37,7 @@
 							<view class="title">{{first.name}}</view>
 							<view class="no-data">
 								<view class="box" @click.stop="navToListPage(first,1)">
-									<image src="https://static-b.caimei365.com/app/img/icon/icon-noneproduct.jpg"></image>
+									<image src="https://static.caimei365.com/app/img/icon/icon-noneproduct.jpg"></image>
 									<view class="text">全部商品</view>
 								</view>
 							</view>

pages/tabBar/user/user.vue

@@ -42,7 +42,7 @@
 					<view class="order-section">
 						<view class="order-item" @click="navigator('/pages/user/order/order-list?state=1')" hover-class="common-hover"  :hover-stay-time="50">
 							<view class="order-icon">
-								<image src="https://static-b.caimei365.com/app/img/icon/order5@3x.png" mode=""></image>
+								<image src="https://static.caimei365.com/app/img/icon/order5@3x.png" mode=""></image>
 								<text 	v-if="confirmedCount>0 && hasLogin" 
 										class="uni-badge uni-badge-error uni-small uni-badge--small icon-num" 
 										:class="[confirmedCount < 10 ? 'goleft':'']">
@@ -53,7 +53,7 @@
 						</view>
 						<view class="order-item" @click="navigator('/pages/user/order/order-list?state=2')"  hover-class="common-hover" :hover-stay-time="50">
 							<view class="order-icon">
-								<image src="https://static-b.caimei365.com/app/img/icon/order1@3x.png" mode=""></image>
+								<image src="https://static.caimei365.com/app/img/icon/order1@3x.png" mode=""></image>
 								<text  v-if="paymentCount >0 && hasLogin" 
 									   class="uni-badge uni-badge-error uni-small uni-badge--small icon-num " 
 									   :class="[paymentCount < 10 ? 'goleft':'']">
@@ -64,7 +64,7 @@
 						</view>
 						<view class="order-item" @click="navigator('/pages/user/order/order-list?state=3')" hover-class="common-hover"  :hover-stay-time="50">
 							<view class="order-icon">
-								<image src="https://static-b.caimei365.com/app/img/icon/order2@3x.png" mode=""></image>
+								<image src="https://static.caimei365.com/app/img/icon/order2@3x.png" mode=""></image>
 								<text   v-if="waitShipmentsCount >0 && hasLogin" 
 										class="uni-badge uni-badge-error uni-small uni-badge--small icon-num" 
 										:class="[waitShipmentsCount < 10 ? 'goleft':'']">
@@ -75,7 +75,7 @@
 						</view>
 						<view class="order-item" @click="navigator('/pages/user/order/order-list?state=4')" hover-class="common-hover"  :hover-stay-time="50">
 							<view class="order-icon">
-								<image src="https://static-b.caimei365.com/app/img/icon/order3@3x.png" mode=""></image>
+								<image src="https://static.caimei365.com/app/img/icon/order3@3x.png" mode=""></image>
 								<text 	v-if="shipmentsCount>0 && hasLogin" 
 										class="uni-badge uni-badge-error uni-small uni-badge--small icon-num" 
 										:class="[shipmentsCount < 10 ? 'goleft':'']">
@@ -86,7 +86,7 @@
 						</view>
 						<view class="order-item" @click="navigator('/pages/user/order/order-list?state=5')" hover-class="common-hover"  :hover-stay-time="50">
 							<view class="order-icon">
-								<image src="https://static-b.caimei365.com/app/img/icon/order4@3x.png" mode=""></image>
+								<image src="https://static.caimei365.com/app/img/icon/order4@3x.png" mode=""></image>
 								<text 	v-if="salesReturnCount >0 && hasLogin"
 										class="uni-badge uni-badge-error uni-small uni-badge--small icon-num" 
 										:class="[salesReturnCount < 10 ? 'goleft':'']">

search/pages/search/search-instrument.vue

@@ -79,8 +79,8 @@
 					}
 				})	
 			}
-			if(option.keyword){
-				this.listQuery.keyword = option.keyword
+			if(option.keyWord){
+				this.listQuery.keyword = option.keyWord
 				this.GetSearchEquipmentList();
 			}
 		},

search/pages/search/search-supplier.vue

@@ -118,8 +118,9 @@
 					}
 				})	
 			}
-			if(option.keyword){
-				this.listQuery.keyword = option.keyword
+			if(option.keyWord){
+				console.log(option.keyWord)
+				this.listQuery.keyword = option.keyWord
 				this.GetSearchSupplierList();
 			}
 		},

search/pages/search/search.vue

@@ -273,11 +273,11 @@
 							break;
 						case 2:
 							this.setSearchHistoryAdd()
-							this.$api.navigateTo(`/search/pages/search/search-supplier?keyword=${this.listQuery.keyword}`);
+							this.$api.navigateTo(`/search/pages/search/search-supplier?keyWord=${this.listQuery.keyword}`);
 							break;
 						case 3:
 							this.setSearchHistoryAdd()
-							this.$api.navigateTo(`/search/pages/search/search-instrument?keyword=${this.listQuery.keyword}`);
+							this.$api.navigateTo(`/search/pages/search/search-instrument?keyWord=${this.listQuery.keyword}`);
 							break;
 					}
 				}

seller/pages/index/index.vue

@@ -44,9 +44,9 @@
 				isHomeData: false,
 				isIphoneX:this.$store.state.isIphone,
 				tab_nav_list :[//菜单列表
-					{'id':0,'name':'首页',icon:'https://static-b.caimei365.com/app/img/icon/icon-home@3x.png',iconAc:'https://static-b.caimei365.com/app/img/icon/icon-home-active@3x.png'},
-					{'id':1,'name':'分类',icon:'https://static-b.caimei365.com/app/img/icon/icon-sort@3x.png',iconAc:'https://static-b.caimei365.com/app/img/icon/icon-sort-active@3x.png'},
-					{'id':2,'name':'我的',icon:'https://static-b.caimei365.com/app/img/icon/icon-user@3x.png',iconAc:'https://static-b.caimei365.com/app/img/icon/icon-user-active@3x.png'}
+					{'id':0,'name':'首页',icon:'https://static.caimei365.com/app/img/icon/icon-home@3x.png',iconAc:'https://static.caimei365.com/app/img/icon/icon-home-active@3x.png'},
+					{'id':1,'name':'分类',icon:'https://static.caimei365.com/app/img/icon/icon-sort@3x.png',iconAc:'https://static.caimei365.com/app/img/icon/icon-sort-active@3x.png'},
+					{'id':2,'name':'我的',icon:'https://static.caimei365.com/app/img/icon/icon-user@3x.png',iconAc:'https://static.caimei365.com/app/img/icon/icon-user-active@3x.png'}
 				],
 				nvabarData: {		//顶部自定义导航
 					showCapsule: 0, // 是否显示左上角图标  1表示显示  0表示不显示,

supplier/pages/index/index.vue

@@ -44,9 +44,9 @@
 				isHomeData: false,
 				isIphoneX:this.$store.state.isIphone,
 				tab_nav_list :[//菜单列表
-					{'id':0,'name':'首页',icon:'https://static-b.caimei365.com/app/img/icon/icon-home@3x.png',iconAc:'https://static-b.caimei365.com/app/img/icon/icon-home-active@3x.png'},
-					{'id':1,'name':'分类',icon:'https://static-b.caimei365.com/app/img/icon/icon-sort@3x.png',iconAc:'https://static-b.caimei365.com/app/img/icon/icon-sort-active@3x.png'},
-					{'id':2,'name':'我的',icon:'https://static-b.caimei365.com/app/img/icon/icon-user@3x.png',iconAc:'https://static-b.caimei365.com/app/img/icon/icon-user-active@3x.png'}
+					{'id':0,'name':'首页',icon:'https://static.caimei365.com/app/img/icon/icon-home@3x.png',iconAc:'https://static.caimei365.com/app/img/icon/icon-home-active@3x.png'},
+					{'id':1,'name':'分类',icon:'https://static.caimei365.com/app/img/icon/icon-sort@3x.png',iconAc:'https://static.caimei365.com/app/img/icon/icon-sort-active@3x.png'},
+					{'id':2,'name':'我的',icon:'https://static.caimei365.com/app/img/icon/icon-user@3x.png',iconAc:'https://static.caimei365.com/app/img/icon/icon-user-active@3x.png'}
 				],
 				nvabarData: {		//顶部自定义导航
 					showCapsule: 0, // 是否显示左上角图标  1表示显示  0表示不显示,