commit -m 修改美博会

App.vue

@@ -58,13 +58,13 @@
 				}
 			})
 			this.refresh()
-			if(uni.getStorageSync('isActivityStatus')){
-				const  lockTime = uni.getStorageSync('lockTime')
-				const  eTime = this.diffTime(lockTime)
-				this.$store.dispatch('setActivityFn',eTime)
-			}else{
-				this.$store.dispatch('setActivityFn',true)
-			}
+			// if(uni.getStorageSync('isActivityStatus')){
+			// 	const  lockTime = uni.getStorageSync('lockTime')
+			// 	const  eTime = this.diffTime(lockTime)
+			// 	this.$store.dispatch('setActivityFn',eTime)
+			// }else{
+			// 	this.$store.dispatch('setActivityFn',true)
+			// }
 		},
 		methods:{
 			refresh(){

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

@@ -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.caimei365.com/app/img/icon/static/temp/order2@3x.png" mode=""></image>
+								<image src="https://static.caimei365.com/app/img/icon/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.caimei365.com/app/img/icon/static/temp/order3@3x.png" mode=""></image>
+								<image src="https://static.caimei365.com/app/img/icon/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.caimei365.com/app/img/icon/static/temp/order4@3x.png" mode=""></image>
+								<image src="https://static.caimei365.com/app/img/icon/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/customer.vue

@@ -32,7 +32,7 @@
 		data() {
 			return{
 				clickPath:'/search/pages/search/search',
-				hotSearchText:'搜索商品/供应商/项目仪器',
+				hotSearchText:'搜索商品/项目仪器',
 				CustomBar:this.CustomBar,// 顶部导航栏高度
 				StatusBar: this.StatusBar,
 				fontSizeSetting:this.fontSizeSetting,

pages/goods/product.vue

@@ -98,7 +98,7 @@
 						<text class="name">品牌  起订量  分类...</text>
 						<text class="iconfont icon-xiayibu"></text>
 					</view>
-					<view class="product-supplier" @click="goSupplier">
+					<view class="product-supplier" v-if="isNoneSupplier" @click="goSupplier">
 						<view class="logo"><img :src="shop.logo ? shop.logo :'https://static.caimei365.com/app/img/icon/icon-shoplogo.png'" alt=""></view>
 						<view class="main">
 							<view class="name">{{shop.name}}</view>
@@ -354,6 +354,7 @@
 				sectionTopRangeArr: [],
 				winHeight:'',
 				isShowButton:true,
+				isNoneSupplier:false
 			}
 		},
 		onLoad(option) {

pages/tabBar/home/index.vue

@@ -19,7 +19,7 @@
 		<!-- 侧边 -->
 		<scroll-top :isScrollTop="isScrollTop" :bottom="50"></scroll-top>
 		<!-- 活动弹窗 -->
-		<activityAlert :show="isActivity" @click="handleClick" @cancel="handleCancelClick"></activityAlert>
+		<!-- <activityAlert :show="isActivity" @click="handleClick" @cancel="handleCancelClick"></activityAlert> -->
 	</view>
 </template>
 

pages/tabBar/user/user.vue

@@ -100,9 +100,9 @@
 			</view>
 			<!-- 底部跳转 -->
 			<view class="foot-list">
-				<view class="list-cell-avtiv" @click="navigator('/pages/user/coupon/coupon')">
+<!-- 				<view class="list-cell-avtiv" @click="navigator('/pages/user/coupon/coupon')">
 					<image src="http://static.caimei365.com/app/meibohui/meibo_coupon_03.png" mode=""></image>
-				</view>
+				</view> -->
 				<view class="list-cell-item" v-show="hasLogin">
 					<view class="list-cell" v-show="userIdentity == 4" @click="navigator(`/pages/login/apply?clubStatus=${clubStatus}`)" hover-class="cell-hover" :hover-stay-time="50">
 						<text class="cell-icon"><text class="iconfont icon-shengjihuiyuanjigou"></text></text>

search/pages/search/search.vue

@@ -9,7 +9,7 @@
 				<tui-bubble-popup :show="show" :mask="true" position="absolute" direction="top" @close="topBubble" width="140rpx"
 				 left="10rpx" bottom="0rpx" translateY="100%" triangleRight="60rpx" triangleTop="-22rpx" :maskBgColor="maskBgColor">
 					<view class="tui-menu-item" @tap="selectTabs(1)">产品</view>
-					<view class="tui-menu-item" @tap="selectTabs(2)">供应商</view>
+					<!-- <view class="tui-menu-item" @tap="selectTabs(2)">供应商</view> -->
 					<view class="tui-menu-item" @tap="selectTabs(3)">项目仪器</view>
 				</tui-bubble-popup>
 			</view>

services/ajax.env.js

@@ -4,8 +4,8 @@ if(process.env.NODE_ENV === 'development'){
 	// URL_CONFIG = 'http://192.168.2.68:8008'	 //涛涛联调地址
 	// URL_CONFIG = 'http://192.168.2.67:8008'	 //裴裴联调地址
 	// URL_CONFIG = 'http://192.168.2.75:8008'	 //超超联调地址
-    // URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
-	URL_CONFIG = 'https://spi.caimei365.com'
+    URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
+	// URL_CONFIG = 'https://spi.caimei365.com'
 }else{
     // 生产环境
 	// URL_CONFIG = 'https://spi-b.caimei365.com'