commit -m banner 优化

common/config/caimeiApi.js

@@ -226,7 +226,7 @@ const caimeiApi = {
 				const typeMap = {
 				 	1:`/pages/goods/goods-instrument?linkId=${pros.linkParam.id}&title=${pros.name}`,
 				 	2:`/pages/goods/instrument-details?id=${pros.linkParam.id}`,
-					4:`/h5/pages/activity/activity?id=${pros.linkParam.id}`,
+					4:`/h5/pages/activity/activity?title=${pros.crmTitle}&link=${pros.crmLink}`,
 				 	5:`/pages/goods/product?id=${pros.linkParam.id}`,
 				 	7:`/supplier/pages/user/my-shop?shopId=${pros.linkParam.id}`,
 				 	8:`/h5/pages/activity/activity-list`,

h5/pages/activity/activity-list.vue

@@ -32,6 +32,7 @@
 				isEmpty:false,
 				nomoreText: '上拉显示更多',
 				listQuery:{
+					source:2,
 					pageNum:1,
 					pageSize:10,
 				},
@@ -97,7 +98,7 @@
 			},
 			NavigateToActivity(item){//跳转活动详情
 				if(item.status!=3){
-					this.$api.navigateTo(`/h5/pages/activity/activity?id=${item.linkParam.id}`)
+					this.$api.navigateTo(`/h5/pages/activity/activity?title=${item.title}&link=${item.crmLink}`)
 				}else{
 					this.$util.msg('活动已经结束',2000)
 				}

h5/pages/activity/activity.vue

@@ -1,69 +1,50 @@
-<template>
-	<view class="activity">
-	   <web-view :webview-styles="webviewStyles" :src="activityPath"></web-view>
-	   <!-- 侧边 -->
-	   <scroll-top :isScrollTop="isScrollTop" :bottom="200"></scroll-top>
-	</view>
-</template>
-
-<script>
-	export default {
-	    data() {
-	        return {
-	            webviewStyles: {
-	                progress: {
-	                    color: '#FF3333'
-	                }
-	            },
-				productID:'',
-				activityPath:'',
-				isScrollTop:false
-	        }
-	    },
-		onLoad(option) {
-			console.log(option)
-			switch(option.id){
-				case '276':
-					this.activityPath = 'https://static.caimei365.com/app/caimei-activity-h5/html/2020/caimeih5_04.html'
-					uni.setNavigationBarTitle({title:'保信亚太全脂然,买二送一'});
-					break;
-				case '281':
-					this.activityPath = 'https://static.caimei365.com/app/caimei-activity-h5/html/2020/caimeih5_05.html'
-					uni.setNavigationBarTitle({title:'润月雅优惠'});
-					break;
-				case '284':
					this.activityPath = 'https://static.caimei365.com/app/caimei-activity-h5/html/2020/caimeih5_07.html'
					uni.setNavigationBarTitle({title:' 光疗术后修复专场'});
-					break;
-				case '285':
-					this.activityPath = 'https://static.caimei365.com/app/caimei-activity-h5/html/2020/caimeih5_08.html'
-					uni.setNavigationBarTitle({title:'低价风暴'});
-					break;
-				case '223':
-					this.activityPath = 'https://static.caimei365.com/app/caimei-activity-h5/html/2020/caimeih5_99.html'
-					uni.setNavigationBarTitle({title:'品牌OEM服务'});
-					break;
-			}
-			
-		},
-		methods:{
-			
-		},
-		onPageScroll(e){//实时获取到滚动的值
-			if(e.scrollTop>600){
-				this.isScrollTop = true
-			}else{
-				this.isScrollTop = false
-			}	
-		},
-	}
-</script>
-	
-<style lang="scss">
-	.activity{
-		width: 100%;
-		height: auto;
-		image{
-			width: 100%;
-			height: auto;
-		}
-	}
-</style>
+<template>
+	<view class="activity">
+	   <web-view :webview-styles="webviewStyles" :src="activityPath"></web-view>
+	   <!-- 侧边 -->
+	   <scroll-top :isScrollTop="isScrollTop" :bottom="200"></scroll-top>
+	</view>
+</template>
+
+<script>
+	export default {
+	    data() {
+	        return {
+	            webviewStyles: {
+	                progress: {
+	                    color: '#FF3333'
+	                }
+	            },
+				productID:'',
+				activityPath:'',
+				isScrollTop:false
+	        }
+	    },
+		onLoad(option) {
+			console.log(option)
+			uni.setNavigationBarTitle({title:option.title});
+			this.activityPath = option.link;
+		},
+		methods:{
+			
+		},
+		onPageScroll(e){//实时获取到滚动的值
+			if(e.scrollTop>600){
+				this.isScrollTop = true
+			}else{
+				this.isScrollTop = false
+			}	
+		},
+	}
+</script>
+	
+<style lang="scss">
+	.activity{
+		width: 100%;
+		height: auto;
+		image{
+			width: 100%;
+			height: auto;
+		}
+	}
+</style>

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{
     // 生产环境