commit -m 直播

h5/pages/article/page-image.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="activity">
-		<image :src="banner" mode="widthFix"></image>
+		<image :src="banner" mode="widthFix" @click="previewImg()"></image>
 	</view>
 </template>
 
@@ -14,17 +14,26 @@
 	                }
 	            },
 				banner:'',
-				
+				productImage:[],
 	        }
 	    },
 		onLoad(option) {
 			this.banner = option.image
+			this.productImage.push(option.image)
 			uni.setNavigationBarTitle({title:option.title});
 		},
 		methods:{
 			navToDetailPage() {//跳转商品详情页
 				this.$api.navigateTo(`/pages/goods/product?id=${this.productID}`)
 			},
+			previewImg (index) {//顶部商品图片预览
+				let previewUrls = this.productImage
+				uni.previewImage({
+					current: 0, 	//图片索引
+					urls: previewUrls, //必须是http图片，本地图片无效
+					longPressActions:''
+				})
+			}
 		}
 	}
 </script>

h5/pages/article/path-live.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="activity">
-		<image :src="banner" mode="widthFix"></image>
+		<image :src="banner" mode="widthFix" @click="previewImg()"></image>
 	</view>
 </template>
 
@@ -9,18 +9,28 @@
 	    data() {
 	        return {
 				banner:'',
+				productImage:[]
 	        }
 	    },
 		onLoad() {
-			
+			this.GetHomeLiveAdvertising()
 		},
 		methods:{
 			GetHomeLiveAdvertising(){
 				this.CommonService.GetHomeLiveAdvertising().then(response =>{
 					this.banner = response.data
+					this.productImage.push(response.data)
 				}).catch(error =>{
 					this.$util.msg(error.msg,3000);
 				})
+			},
+			previewImg (index) {//顶部商品图片预览
+				let previewUrls = this.productImage
+				uni.previewImage({
+					current: 0, 	//图片索引
+					urls: previewUrls, //必须是http图片，本地图片无效
+					longPressActions:''
+				})
 			}
 		},
 		onPullDownRefresh() {
@@ -30,7 +40,7 @@
 			}, 200)
 		},
 		onShow() {
-			this.GetHomeLiveAdvertising()
+			
 		}
 	}
 </script>

pages/goods/good-floorMore.vue

@@ -103,7 +103,7 @@
 		},
 		onPullDownRefresh() {
 			setTimeout(() => {
-				this.GetHomeFloorContentDetails();
+				this.GetHomeFloorContentDetails(this.pageType);
 				uni.stopPullDownRefresh()
 			}, 200)
 		},

pages/tabBar/category/index.vue

@@ -26,7 +26,7 @@
 							</view>
 							<view v-else class="no-data">
 								<view class="box" @click.stop="navToListPage(small,2)">
-									<image :src="small.crmIcon ? small.crmIcon : 'https://static.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>
@@ -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.caimei365.com/app/img/icon/icon-noneproduct.jpg"></image>
+									<image :src="first.crmIcon ? first.crmIcon : 'https://static.caimei365.com/app/img/icon/icon-noneproduct.jpg'"></image>
 									<view class="text">全部商品</view>
 								</view>
 							</view>

services/ajax.env.js

@@ -4,7 +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-t.caimei365.com'	 //采美测试地址
+    // URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
 	// URL_CONFIG = 'https://spi.caimei365.com'
 }else{
     // 生产环境