commit - m 清理

common/config/config.js

@@ -1,10 +1,10 @@
 let URL_CONFIG = ""
 if(process.env.NODE_ENV === 'development'){
     // 开发环境
-	URL_CONFIG = 'http://192.168.2.68:8008'	 //涛涛联调地址
+	// 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-b.caimei365.com'	 //采美测试地址
 	// URL_CONFIG = 'https://spi.caimei365.com'
 }else{
     // 生产环境

components/cm-module/supplier/banner.vue

@@ -1,9 +1,14 @@
 <template>
 	<view>
 		<view class="swiper-banner-box" >
-			<swiper class="tui-banner-swiper tui-banner tui-skeleton-fillet" :autoplay="true" :interval="5000" :duration="500"  @change="swiperChange" :circular="true">
+			<swiper v-if="list.length>0"  class="tui-banner-swiper tui-banner tui-skeleton-fillet" :autoplay="true" :interval="5000" :duration="500"  @change="swiperChange" :circular="true">
 				<swiper-item v-for="(item,index) in list" :key="index">
-					<image :src="item ? item : defaultbanner" class="tui-slide-image" mode="scaleToFill"/>
+					<image  :src="item" class="tui-slide-image" mode="scaleToFill"/>
+				</swiper-item>
+			</swiper>
+			<swiper v-else  class="tui-banner-swiper tui-banner tui-skeleton-fillet" :autoplay="true" :interval="5000" :duration="500"  @change="swiperChange" :circular="true">
+				<swiper-item >
+					<image :src="defaultbanner" class="tui-slide-image" mode="scaleToFill"/>
 				</swiper-item>
 			</swiper>
 			<view class="swiper__dots-box" v-if="list.length > 1">
@@ -32,7 +37,7 @@
 			}
 		},
 		created(){
-			
+			console.log(this.list)
 		},
 		computed: {
 	

pages/goods/goods-secondary.vue

@@ -123,7 +123,8 @@
 						this.isActivityFlag = true
 						this.GetPromotionsrList()
 					}else{
-						this.GetPageTopicInfo(this.headTab.list[0].linkParam.id)
+						this.headTabId = this.headTab.list[0].linkParam.id
+						this.GetPageTopicInfo(this.headTabId)
 					}
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000)
@@ -250,6 +251,16 @@
 				}	
 			}
 		},
+		onPullDownRefresh() {//下拉刷新
+			if(this.isActivityFlag){
+				this.listQuery.pageNum =1
+				this.GetPromotionsrListBottomData()
+				uni.stopPullDownRefresh()
+			}else{
+				this.GetPageTopicInfo(this.headTabId)
+				uni.stopPullDownRefresh()
+			}
+		},
 		onPageScroll(e){//实时获取到滚动的值
 			if(e.scrollTop>600){
 				this.isScrollTop = true

pages/user/account/account.vue

@@ -270,6 +270,7 @@
 		},
 		onPullDownRefresh() {//下拉刷新
 			this.getAccountInitData(this.tabCurrentIndex,this.year,this.month)
+			uni.stopPullDownRefresh()
 		},
 		onShow() {
 			// this.accountList = []

services/ajax.env.js

@@ -1,10 +1,10 @@
 let URL_CONFIG = ""
 if(process.env.NODE_ENV === 'development'){
     // 开发环境
-	URL_CONFIG = 'http://192.168.2.68:8008'	 //涛涛联调地址
+	// 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-b.caimei365.com'	 //采美测试地址
 	// URL_CONFIG = 'https://spi.caimei365.com'
 }else{
     // 生产环境

supplier/pages/user/my-shop.vue

@@ -308,7 +308,9 @@
 			GetSupplierHomeProduct(){//主推商品
 				this.ShopService.GetSupplierHomeProduct({supplierId:this.supplierId}).then(response =>{
 					let data = response.data
-					this.QueryProductPrice(data)
+					if(data.length>0){
+						this.QueryProductPrice(data)
+					}
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000)
 				})