美博会版本

common/config/caimeiApi.js

@@ -24,9 +24,9 @@ const caimeiApi = {
 			success: (response) => {
 				if(response.statusCode !== 200){
 					uni.showToast({icon: 'none',title:'服务器连接错误',duration: 2000})
-					callback(response.statusCode);
+					callback(response.statusCode)
 				}else{
-					callback(response.data);
+					callback(response.data)
 				}
 			},
 			fail: (error) => {
@@ -34,7 +34,7 @@ const caimeiApi = {
 					uni.showToast({icon: 'none',title: '网络错误,请稍后重试',duration: 2000})
 				}
 			}
-		 });
+		 })
 	},
 	/**
 	 * @封装公共get数据请求方法有加载动画
@@ -42,7 +42,7 @@ const caimeiApi = {
 	 * @自定义请求头信息
 	 */
 	lodingGet:function(url,data,callback){
-		 uni.showLoading({mask: true,title:'加载中~',});
+		 uni.showLoading({mask: true,title:'加载中~',})
 		 uni.request({
 			url: requestUrl + url,
 			data:data,
@@ -56,9 +56,9 @@ const caimeiApi = {
 			success: (response) => {
 				if(response.statusCode !== 200){
 					uni.showToast({icon: 'none',title: '服务器连接错误',duration: 2000})
-					callback(response.statusCode);
+					callback(response.statusCode)
 				}else{
-					callback(response.data);
+					callback(response.data)
 				}
 			},
 			fail: (error) => {
@@ -68,10 +68,10 @@ const caimeiApi = {
 			},
 			complete: () => {
 				setTimeout(function () {
-					uni.hideLoading();
-				}, 250);
+					uni.hideLoading()
+				}, 250)
 			}
-		 });
+		 })
 	},
 	/**
 	 * @封装公共post数据请求方法
@@ -107,13 +107,13 @@ const caimeiApi = {
 			uni.getStorage({
 				key: key,
 				success: function (res){
-					resolve(res.data);
+					resolve(res.data)
 				},
 				fail: function(res){
 					reject(false)
 				}
 			})
-		});
+		})
 	},
 	setStorage:function(key,data){// 存储本地Storage
 		return new Promise(function(resolve,reject) {
@@ -123,30 +123,30 @@ const caimeiApi = {
 				success: function (res){
 				}
 			})
-		});
+		})
 	},
 	getStorage:function(){// 获取本地userInfo
 		return new Promise(function(resolve,reject) {
 			uni.getStorage({
 				key: 'userInfo',
 				success: function (res){
-					resolve(res.data);
+					resolve(res.data)
 				},
 				fail: function(res){
 					reject(false)
 				}
 			})
-		});
+		})
 	},
 	getStorageAddressKey:function(){// 获取本地地址信息
 		return new Promise(function(resolve,reject) {
 			uni.getStorage({
 				key: 'address_key',
 				success: function (res){
-					resolve(res.data);
+					resolve(res.data)
 				}
 			})
-		});
+		})
 	},
 	loginStatus:function(){
 	// 获取用户是否登陆 1:已登陆,否则未登陆
@@ -155,20 +155,20 @@ const caimeiApi = {
 				key: 'userInfo',
 				success: function (res){
 					if(res.data.code == '1'){
-						resolve(true);
+						resolve(true)
 					} else {
-						resolve(false);
+						resolve(false)
 					}
 				}
 			})
-		});
+		})
 	},
 	navToListPage:function({type,value,id,lType} = {}){	
 	// 跳转到列表页
 		if(lType=='4'){
-			const pages = getCurrentPages();
-			const prevPage = pages[pages.length-2];
-			prevPage.refresh = true;
+			const pages = getCurrentPages()
+			const prevPage = pages[pages.length-2]
+			prevPage.refresh = true
 			prevPage.listData = {
 				type: type,
 				from: value,
@@ -186,9 +186,9 @@ const caimeiApi = {
 	navigateToGoods:function({type,value,id,lType} = {}){
 	// 跳转到列表页
 		if(lType=='4'){
-			const pages = getCurrentPages();
-			const prevPage = pages[pages.length-2];
-			prevPage.refresh = true;
+			const pages = getCurrentPages()
+			const prevPage = pages[pages.length-2]
+			prevPage.refresh = true
 			prevPage.listData = {
 				type: type,
 				from: value,
@@ -229,21 +229,22 @@ const caimeiApi = {
 					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`,
-				 	9:`/second/pages/form/introduce`,
-				 	10:`/second/pages/product/product-list`,
-				 	11:`/second/pages/form/form`,
+				 	8:'/h5/pages/activity/activity-list',
+				 	9:'/second/pages/form/introduce',
+				 	10:'/second/pages/product/product-list',
+				 	11:'/second/pages/form/form',
 				 	12:`/search/pages/search/search?keyWord=${pros.linkParam.keyword}`,
 				 	13:`/h5/pages/article/path?link=${pros.link}`,
 				 	14:`/h5/pages/article/path?link=${pros.link}`,
 				 	15:`/h5/pages/article/path?link=${pros.link}`,
-				 	17:`/pages/login/register-select`,
+					// '-1':`/h5/pages/article/path?link=${pros.link}`,
+				 	17:'/pages/login/register-select',
 				 	18:`/h5/pages/article/path?link=${pros.link}`,
 				 	19:`/search/pages/search/search-supplier?keyWord=${pros.linkParam.keyword}`,
-					21:`/h5/pages/activity/meobohui`
+					21:'/h5/pages/activity/meobohui'
 					
 				}
-				const url = typeMap[pros.linkType];
+				const url = typeMap[pros.linkType]
 				uni.navigateTo({
 				  	url:url
 				})
@@ -258,20 +259,21 @@ const caimeiApi = {
 				4:`/h5/pages/activity/activity?id=${linkId}`,
 				5:`/pages/goods/product?id=${linkId}`,
 				// 7:`/supplier/pages/user/my-shop?shopId=${linkId}`,
-				8:`/h5/pages/activity/activity-list`,
-				9:`/second/pages/form/introduce`,
-				10:`/second/pages/product/product-list`,
-				11:`/second/pages/form/form`,
+				8:'/h5/pages/activity/activity-list',
+				9:'/second/pages/form/introduce',
+				10:'/second/pages/product/product-list',
+				11:'/second/pages/form/form',
 				12:`/search/pages/search/search?keyWord=${keyword}`,
 				13:`/h5/pages/article/path?link=${linkHref}`,
 				14:`/h5/pages/article/path?link=${linkHref}`,
 				15:`/h5/pages/article/path?link=${linkHref}`,
-				17:`/pages/login/register-select`,
+				17:'/pages/login/register-select',
 				18:`/h5/pages/article/path?link=${linkHref}`,
 				19:`/search/pages/search/search-supplier?keyWord=${keyword}`,
-				21:`/h5/pages/activity/meobohui`
+				21:'/h5/pages/activity/meobohui',
+				// '-1':`/h5/pages/article/path?link=${pros.link}`
 			}
-			const url = typeMap[linkType];
+			const url = typeMap[linkType]
 			uni.navigateTo({
 			 	url:url
 			})
@@ -296,8 +298,8 @@ const caimeiApi = {
 		})
 	},
 	isNumber:function(value){//验证是否为数字
-	    var patrn = /^(-)?\d+(\.\d+)?$/;
-	    if (patrn.exec(value) == null || value == "") {
+	    var patrn = /^(-)?\d+(\.\d+)?$/
+	    if (patrn.exec(value) == null || value == '') {
 	         return false
 	    } else {
 	         return true  
@@ -305,8 +307,8 @@ const caimeiApi = {
 	},
 	getWindowHeight:function(){
 		// 获取窗口高度
-		const {windowHeight, pixelRatio} = wx.getSystemInfoSync();
-		return windowHeight;
+		const {windowHeight, pixelRatio} = wx.getSystemInfoSync()
+		return windowHeight
 	},
 	adaptRichTextImg:function(res){
 		/**
@@ -315,34 +317,34 @@ const caimeiApi = {
 		 */ 
 		const html = res.replace(/<img[^>]*>/gi,function(match,capture){			
 			let match1 = match.replace(/<img*/gi, '<img style="width:100% !important;height:auto !important;float:left !important;"'),
-				results = match1.replace(/style=/gi, 'style="width:100%;height:auto;float:left;"');
-			return results;
+				results = match1.replace(/style=/gi, 'style="width:100%;height:auto;float:left;"')
+			return results
 		})
-		return html;	
+		return html	
 	},
 	FormatMoney:function(num){
 		// 金额千分位
 		return num.toString().replace(/\d+/, function (n) { // 先提取整数部分
 			return n.replace(/(\d)(?=(\d{3})+$)/g, function ($1) { // 对整数部分添加分隔符
-				return $1 + ",";
-			});
-		});
+				return $1 + ','
+			})
+		})
 	},
 	formatDate:function(){
 		//获取当前时间
-		let date = new Date();
-		let y = date.getFullYear();
-		let MM = date.getMonth() + 1;
-		MM = MM < 10 ? ('0' + MM) : MM;
-		let d = date.getDate();
-		d = d < 10 ? ('0' + d) : d;
-		let h = date.getHours();
-		h = h < 10 ? ('0' + h) : h;
-		let m = date.getMinutes();
-		m = m < 10 ? ('0' + m) : m;
-		let s = date.getSeconds();
-		s = s < 10 ? ('0' + s) : s;
-	    return y + '-' + MM + '-' + d + ' ' + h + ':' + m + ':' + s;
+		let date = new Date()
+		let y = date.getFullYear()
+		let MM = date.getMonth() + 1
+		MM = MM < 10 ? ('0' + MM) : MM
+		let d = date.getDate()
+		d = d < 10 ? ('0' + d) : d
+		let h = date.getHours()
+		h = h < 10 ? ('0' + h) : h
+		let m = date.getMinutes()
+		m = m < 10 ? ('0' + m) : m
+		let s = date.getSeconds()
+		s = s < 10 ? ('0' + s) : s
+	    return y + '-' + MM + '-' + d + ' ' + h + ':' + m + ':' + s
 	},
 	regexSets:function() {
 		let sets = {
@@ -350,19 +352,19 @@ const caimeiApi = {
 			'phoneAndTelephone': /^([1]\d{10}|([\(（]?0[0-9]{2,3}[）\)]?[-]?)?([2-9][0-9]{6,7})+(\-[0-9]{1,4})?)$/,
 			'bankNum': /^([1-9]{1})(\d{18})$/,
 			'invalidChar': /^[\s\u4e00-\u9fa5a-z0-9_-]{0,}$/
-		};
-		return sets;
+		}
+		return sets
 	},
 	timestampToTime:function(timestamp) {
 		// 时间戳转日期
-	   let date = new Date(timestamp * 1000);//时间戳为10位需*1000，时间戳为13位的话不需乘1000
-	   let Y = date.getFullYear() + '-';
-	   let M = (date.getMonth()+1 < 10 ? '0'+(date.getMonth()+1) : date.getMonth()+1) + '-';
-	   let D = (date.getDate() < 10 ? '0'+date.getDate() : date.getDate()) + ' ';
-	   let h = (date.getHours() < 10 ? '0'+date.getHours() : date.getHours()) + ':';
-	   let m = (date.getMinutes() < 10 ? '0'+date.getMinutes() : date.getMinutes()) + ':';
-	   let s = (date.getSeconds() < 10 ? '0'+date.getSeconds() : date.getSeconds());
-	   return `${Y}${M}${D}${h}${m}${s}`;
+	   let date = new Date(timestamp * 1000)//时间戳为10位需*1000，时间戳为13位的话不需乘1000
+	   let Y = date.getFullYear() + '-'
+	   let M = (date.getMonth()+1 < 10 ? '0'+(date.getMonth()+1) : date.getMonth()+1) + '-'
+	   let D = (date.getDate() < 10 ? '0'+date.getDate() : date.getDate()) + ' '
+	   let h = (date.getHours() < 10 ? '0'+date.getHours() : date.getHours()) + ':'
+	   let m = (date.getMinutes() < 10 ? '0'+date.getMinutes() : date.getMinutes()) + ':'
+	   let s = (date.getSeconds() < 10 ? '0'+date.getSeconds() : date.getSeconds())
+	   return `${Y}${M}${D}${h}${m}${s}`
 	}
 }
 
@@ -392,4 +394,4 @@ module.exports = {
 	timestampToTime: caimeiApi.timestampToTime,
 	BannerNavigateTo:caimeiApi.BannerNavigateTo,
 	FlooryNavigateTo:caimeiApi.FlooryNavigateTo 
-};
+}

components/cm-module/articleTemplate/templateA.vue

@@ -1,9 +1,14 @@
 <template>
 	<view class="container article-list">
-		<view class="section clearfix" v-for="(item,index) in productList" :key="index" @click="navigaitionTo(item)">
-			<image :src="item.adsImage" mode="aspectFit" class="cover"></image>
+		<view
+			class="section clearfix"
+			v-for="(item, index) in productList"
+			:key="index"
+			@click="navigaitionTo(item)"
+		>
+			<image :src="item.appletsImage" mode="aspectFit" class="cover"></image>
 			<view class="article-text">
-				<view class="title">{{item.name}}</view>
+				<view class="title">{{ item.name }}</view>
 				<view class="content" v-text="item.content"></view>
 			</view>
 		</view>
@@ -11,42 +16,42 @@
 </template>
 
 <script>
+import caimeiApi from '@/common/config/caimeiApi.js'
 export default {
-	data(){
-		return{
-			productList:[]
+	data() {
+		return {
+			productList: []
 		}
 	},
-	props:{
+	props: {
 		pageData: {
 			type: Object
 		},
 		userIdentity: {
 			type: Number
 		},
-		flag:{
-			type:Boolean,
-			default:false
+		flag: {
+			type: Boolean,
+			default: false
 		}
 	},
 	created() {
-		this.initData(this.pageData);
+		this.initData(this.pageData)
 	},
-	methods:{
-		initData(data){
-			if(this.flag){
+	methods: {
+		initData(data) {
+			if (this.flag) {
 				this.productList = data.floorImageList
-			}else{
-				this.productList = data.floorImageList.slice(0,4);
+			} else {
+				this.productList = data.floorImageList.slice(0, 4)
 			}
 		},
-		navigaitionTo(item){
-			console.log(item);
-			if(item.link){
-				uni.navigateTo({
-					url:`/h5/pages/article/path?link=${item.link}`
-				})
+		navigaitionTo(item) {
+			console.log(item)
+			if (item.adsImage === '' && item.linkType === -1) {
+				return
 			}
+			caimeiApi.FlooryNavigateTo(item)
 		}
 	}
 }
@@ -79,6 +84,12 @@ export default {
 				height: 37rpx;
 				color: #3a3a3a;
 				margin-bottom: 18rpx;
+				word-break: break-all;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				display: -webkit-box;
+				-webkit-line-clamp: 1;
+				-webkit-box-orient: vertical;
 			}
 			.content {
 				font-size: 24rpx;
@@ -87,7 +98,7 @@ export default {
 				word-break: break-all;
 				overflow: hidden;
 				text-overflow: ellipsis;
-				display: -webkit-inline-box;
+				display: -webkit-box;
 				-webkit-line-clamp: 4;
 				-webkit-box-orient: vertical;
 			}

components/cm-module/articleTemplate/templateB.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="container article-list">
 		<view class="section clearfix" v-for="(item,index) in productList" :key="index" @click="navigaitionTo(item)">
-			<image :src="item.adsImage" mode="aspectFit" class="cover"></image>
+			<image :src="item.appletsImage" mode="aspectFit" class="cover"></image>
 			<view class="article-text">
 				<view class="title">{{item.name}}</view>
 				<view class="content" v-text="item.content"></view>
@@ -11,6 +11,7 @@
 </template>
 
 <script>
+import caimeiApi from '@/common/config/caimeiApi.js'
 export default {
 	data(){
 		return{
@@ -41,12 +42,10 @@ export default {
 			}
 		},
 		navigaitionTo(item){
-			console.log(item);
-			if(item.link){
-				uni.navigateTo({
-					url:`/h5/pages/article/path?link=${item.link}`
-				})
+			if (item.adsImage === '' && item.linkType === -1) {
+				return
 			}
+			caimeiApi.FlooryNavigateTo(item)
 		}
 	}
 }
@@ -83,6 +82,12 @@ export default {
 				height: 37rpx;
 				color: #3a3a3a;
 				margin-bottom: 16rpx;
+				word-break: break-all;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				display: -webkit-box;
+				-webkit-line-clamp: 1;
+				-webkit-box-orient: vertical;
 			}
 			.content {
 				font-size: 24rpx;
@@ -91,7 +96,7 @@ export default {
 				word-break: break-all;
 				overflow: hidden;
 				text-overflow: ellipsis;
-				display: -webkit-inline-box;
+				display: -webkit-box;
 				-webkit-line-clamp: 2;
 				-webkit-box-orient: vertical;
 			}

components/cm-module/articleTemplate/templateC.vue

@@ -2,7 +2,7 @@
 	<scroll-view scroll-x="true" class="container article-list">
 		<view class="section" v-for="(item,index) in productList" :key="index" @click="navigaitionTo(item)">
 			<view class="cover">
-				<image :src="item.adsImage" mode="widthFix" class="cover-gg"></image>
+				<image :src="item.appletsImage" mode="widthFix" class="cover-gg"></image>
 			</view>
 			<view class="article-text">
 				<view class="title">{{item.name}}</view>
@@ -13,6 +13,7 @@
 </template>
 
 <script>
+import caimeiApi from '@/common/config/caimeiApi.js'
 export default {
 	data(){
 		return{
@@ -35,12 +36,10 @@ export default {
 			this.productList = data.floorImageList;
 		},
 		navigaitionTo(item){
-			console.log(item);
-			if(item.link){
-				uni.navigateTo({
-					url:`/h5/pages/article/path?link=${item.link}`
-				})
+			if (item.adsImage === '' && item.linkType === -1) {
+				return
 			}
+			caimeiApi.FlooryNavigateTo(item)
 		}
 	}
 }
@@ -84,6 +83,12 @@ export default {
 				height: 37rpx;
 				color: #3a3a3a;
 				margin-bottom: 16rpx;
+				word-break: break-all;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				display: -webkit-box;
+				-webkit-line-clamp: 1;
+				-webkit-box-orient: vertical;
 			}
 			.content {
 				white-space: normal;
@@ -93,7 +98,7 @@ export default {
 				word-break: break-all;
 				overflow: hidden;
 				text-overflow: ellipsis;
-				display: -webkit-inline-box;
+				display: -webkit-box;
 				-webkit-line-clamp: 2;
 				-webkit-box-orient: vertical;
 			}

components/cm-module/articleTemplate/templateD.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="container article-list clearfix">
 		<view class="section" v-for="(item,index) in productList" :key="index" @click="navigaitionTo(item)">
-			<image :src="item.adsImage" mode="aspectFit" class="cover"></image>
+			<image :src="item.appletsImage" mode="aspectFit" class="cover"></image>
 			<view class="article-text">
 				<view class="title">{{item.name}}</view>
 				<view class="content" v-text="item.content"></view>
@@ -11,6 +11,7 @@
 </template>
 
 <script>
+import caimeiApi from '@/common/config/caimeiApi.js'
 export default {
 	data(){
 		return{
@@ -41,12 +42,10 @@ export default {
 			}
 		},
 		navigaitionTo(item){
-			console.log(item);
-			if(item.link){
-				uni.navigateTo({
-					url:`/h5/pages/article/path?link=${item.link}`
-				})
+			if (item.adsImage === '' && item.linkType === -1) {
+				return
 			}
+			caimeiApi.FlooryNavigateTo(item)
 		}
 	}
 }
@@ -91,6 +90,12 @@ export default {
 				height: 37rpx;
 				color: #3a3a3a;
 				margin-bottom: 16rpx;
+				word-break: break-all;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				display: -webkit-box;
+				-webkit-line-clamp: 1;
+				-webkit-box-orient: vertical;
 			}
 			.content {
 				font-size: 24rpx;
@@ -99,7 +104,7 @@ export default {
 				word-break: break-all;
 				overflow: hidden;
 				text-overflow: ellipsis;
-				display: -webkit-inline-box;
+				display: -webkit-box;
 				-webkit-line-clamp: 2;
 				-webkit-box-orient: vertical;
 			}

components/cm-module/pcitureTemplate/templateA.vue

@@ -11,7 +11,7 @@
 			>
 				<swiper-item class="clearfix" v-for="(list,index1) in productList" :key="index1">
 					<view class="img-box" v-for="(product,index2) in list" :key="index2" @click="navigaitionTo(product)">
-						<image :src="product.adsImage" mode="aspectFill"></image>
+						<image :src="product.appletsImage" mode="aspectFill"></image>
 					</view>
 				</swiper-item>
 			</swiper>
@@ -32,6 +32,7 @@
 <script>
 import { mapState, mapMutations } from 'vuex'
 import uniGrader from '@/components/uni-grade/uni-grade.vue'
+import caimeiApi from '@/common/config/caimeiApi.js'
 export default {
 	name: 'templateH',
 	components: {
@@ -77,11 +78,16 @@ export default {
 			this.swiperCurrent = index
 		},
 		navigaitionTo(item){
-			console.log(item);
-			if(item.link){
+			const _item = JSON.parse(item)
+			if (item.adsImage === '' && item.linkType === -1) {
+				return
+			}else if(item.linkType === -1){
+				console.log(item);
 				uni.navigateTo({
-					url:`/h5/pages/article/path?link=${item.link}`
+					url:`/h5/pages/activity/activity-detail?detail=${item}`
 				})
+			}else{
+				caimeiApi.FlooryNavigateTo(item)
 			}
 		}
 	}

components/cm-module/pcitureTemplate/templateB.vue

@@ -11,7 +11,7 @@
 			>
 				<swiper-item class="clearfix" v-for="(list,index1) in productList" :key="index1">
 					<view class="img-box"  v-for="(product,index2) in list" :key="index2" @click="navigaitionTo(product)">
-						<image :src="product.adsImage" mode="aspectFill"></image>
+						<image :src="product.appletsImage" mode="aspectFill"></image>
 					</view>
 				</swiper-item>
 			</swiper>
@@ -32,6 +32,7 @@
 <script>
 import { mapState, mapMutations } from 'vuex'
 import uniGrader from '@/components/uni-grade/uni-grade.vue'
+import caimeiApi from '@/common/config/caimeiApi.js'
 export default {
 	name: 'templateH',
 	components: {
@@ -80,12 +81,10 @@ export default {
 			this.swiperCurrent = index
 		},
 		navigaitionTo(item){
-			console.log(item);
-			if(item.link){
-				uni.navigateTo({
-					url:`/h5/pages/article/path?link=${item.link}`
-				})
+			if (item.adsImage === '' && item.linkType === -1) {
+				return
 			}
+			caimeiApi.FlooryNavigateTo(item)
 		}
 	}
 }

components/cm-module/pcitureTemplate/templateC.vue

@@ -1,12 +1,13 @@
 <template>
 	<scroll-view scroll-x="true" class="picture">
 		<view class="section" v-for="(item , index) in productList" @click="navigaitionTo(item)">
-			<image :src="item.adsImage" mode="heightFix"></image>
+			<image :src="item.appletsImage" mode="heightFix"></image>
 		</view>
 	</scroll-view>
 </template>
 
 <script>
+import caimeiApi from '@/common/config/caimeiApi.js'
 export default{
 	data(){
 		return{
@@ -29,12 +30,10 @@ export default{
 			this.productList = data.floorImageList;
 		},
 		navigaitionTo(item){
-			console.log(item);
-			if(item.link){
-				uni.navigateTo({
-					url:`/h5/pages/article/path?link=${item.link}`
-				})
+			if (item.adsImage === '' && item.linkType === -1) {
+				return
 			}
+			caimeiApi.FlooryNavigateTo(item)
 		}
 	}
 }

components/cm-module/pcitureTemplate/templateD.vue

@@ -1,12 +1,13 @@
 <template>
 	<view class="picture">
 		<view class="section" v-for="(item,index) in productList" :key="index" @click="navigaitionTo(item)">
-			<image :src="item.adsImage" mode="widthFix"></image>
+			<image :src="item.appletsImage" mode="widthFix"></image>
 		</view>
 	</view>
 </template>
 
 <script>
+import caimeiApi from '@/common/config/caimeiApi.js'
 export default{
 	data(){
 		return{
@@ -48,12 +49,10 @@ export default{
 			
 		},
 		navigaitionTo(item){
-			console.log(item);
-			if(item.link){
-				uni.navigateTo({
-					url:`/h5/pages/article/path?link=${item.link}`
-				})
+			if (item.adsImage === '' && item.linkType === -1) {
+				return
 			}
+			caimeiApi.FlooryNavigateTo(item)
 		}
 	}
 }

components/cm-module/pcitureTemplate/templateE.vue

@@ -11,7 +11,7 @@
 			>
 				<swiper-item class="clearfix"  v-for="(list,index1) in productList" :key="index1">
 					<view class="img-box"  v-for="(product,index2) in list" :key="index2" @click="navigaitionTo(product)">
-						<image :src="product.adsImage" mode="aspectFill"></image>
+						<image :src="product.appletsImage" mode="aspectFill"></image>
 					</view>
 				</swiper-item>
 			</swiper>
@@ -32,6 +32,7 @@
 <script>
 import { mapState, mapMutations } from 'vuex'
 import uniGrader from '@/components/uni-grade/uni-grade.vue'
+import caimeiApi from '@/common/config/caimeiApi.js'
 export default {
 	name: 'templateH',
 	components: {
@@ -77,12 +78,10 @@ export default {
 			this.swiperCurrent = index
 		},
 		navigaitionTo(item){
-			console.log(item);
-			if(item.link){
-				uni.navigateTo({
-					url:`/h5/pages/article/path?link=${item.link}`
-				})
+			if (item.adsImage === '' && item.linkType === -1) {
+				return
 			}
+			caimeiApi.FlooryNavigateTo(item)
 		}
 	}
 }

components/cm-module/pcitureTemplate/templateF.vue

@@ -1,12 +1,13 @@
 <template>
 	<view class="picture">
 		<view class="section" v-for="(item,index) in productList" :key="index" @click="navigaitionTo(item)">
-			<image :src="item.adsImage" mode="heightFix"></image>
+			<image :src="item.appletsImage" mode="heightFix"></image>
 		</view>
 	</view>
 </template>
 
 <script>
+import caimeiApi from '@/common/config/caimeiApi.js'
 export default{
 	data(){
 		return{
@@ -47,12 +48,10 @@ export default{
 			}
 		},
 		navigaitionTo(item){
-			console.log(item);
-			if(item.link){
-				uni.navigateTo({
-					url:`/h5/pages/article/path?link=${item.link}`
-				})
+			if (item.adsImage === '' && item.linkType === -1) {
+				return
 			}
+			caimeiApi.FlooryNavigateTo(item)
 		}
 	}
 }

h5/pages/activity/activity-topic.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="container floor clearfix">
 		<!-- top -->
-		<view class="container-top" v-if="isRequest && headImage!==''"><image :src="headImage" mode="widthFix"></image></view>
+		<view class="container-top" @click="BannerNavigateTo(pageInfo.linkType,pageInfo.linkParam.id,pageInfo.headLink,pageInfo.keyword)" v-if="isRequest && headImage!==''"><image :src="headImage" ></image></view>
 		<tui-skeleton v-if="skeletonShow" backgroundColor="#fafafa" borderRadius="10rpx" :isLoading	="true" :loadingType="5"></tui-skeleton>
 		<!-- 楼层 -->
 		<view class="container-section tui-skeleton">
@@ -41,7 +41,8 @@
 				isScrollTop:false,
 				pageId:'',
 				typeSort:'',
-				headImage:''
+				headImage:'',
+				pageInfo:{}
 			}
 		},
 		onLoad(option) {
@@ -75,10 +76,13 @@
 				this.CommonService.GetActivityFloorData({pageId:this.pageId,userId:this.userID,source:2}).then(response =>{
 					let data = response.data
 					console.log(data);
+					uni.setNavigationBarTitle({title:data.page.title});
 					this.typeSort = data.page.typeSort
 					this.pageList = data.floorList
 					this.headImage = data.page.crmHeadImage
+					this.pageInfo = data.page
 					this.isRequest =true
+					
 					// this.GetHomeInit()
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000)
@@ -106,6 +110,10 @@
 				})
 				return systeminfo
 			},
+			BannerNavigateTo(linkType,linkId,linkHref,keyword) {//跳转商品详情页
+				console.log(linkType,linkId,linkHref,keyword);
+				this.$api.BannerNavigateTo(linkType,linkId,linkHref,keyword)
+			}
 		},
 		onPageScroll(e){//实时获取到滚动的值
 			if(e.scrollTop>400){
@@ -149,7 +157,7 @@
 	}
 	.container-top{
 		width: 100%;
-		height: 500rpx;
+		height: 340rpx;
 		float: left;
 		image{
 			width: 100%;

pages.json

@@ -568,6 +568,13 @@
 						"enablePullDownRefresh":true
 					}
 				},
+				{
+					"path": "pages/activity/activity-detail",
+					"style": {
+						"navigationBarTitleText": "活动专题页",
+						"enablePullDownRefresh":true
+					}
+				},
 				{
 					"path": "pages/activity/activity-floorMore",
 					"style": {

search/pages/search/search-instrument.vue

@@ -42,6 +42,7 @@
 	import wxLogin from "@/common/config/wxLogin.js"
 	import tuiLoadmore from "@/components/tui-components/loadmore/loadmore"
 	import tuiNomore from "@/components/tui-components/nomore/nomore"
+	import { mapState } from 'vuex'
 	export default {
 		components:{
 			tuiLoadmore,

search/pages/search/search-supplier.vue

@@ -77,6 +77,7 @@
 	import uniStars from '@/components/uni-stars/uni-stars.vue'
 	import authorize from '@/common/config/authorize.js'	
 	import wxLogin from "@/common/config/wxLogin.js"
+	import { mapState } from 'vuex'
 	
 	export default {
 		components:{

search/pages/search/search.vue

@@ -210,7 +210,7 @@
 			}
 		},
 		computed: {
-			...mapState(['hasLogin','userInfo','isWxAuthorize'])
+			...mapState(['hasLogin','userInfo','isWxAuthorize','hasLogin','userInfo','identity'])
 		},
 		onLoad(option) {
 			console.log(option)
@@ -243,9 +243,6 @@
 				return Number(text).toFixed(2);
 			},
 		},
-		computed: {
-			...mapState(['hasLogin','userInfo','identity'])
-		},
 		methods:{
 			GetHomeHotSearchTerms(){//金刚区分类
 				this.CommonService.GetHomeHotSearchTerms({}).then(response =>{

second/pages/form/form.vue

@@ -3,7 +3,7 @@
 	     <view class="bannerimg"><image src="https://static.caimei365.com/app/img/bg/secondbg.jpg"></image></view>
 	      <view class="my-maintenance" >
 	            <view class="newsTitle">
-					<view class="nestext">欢迎您来到采美365网二手商品市场，您可以在这里发布二手设备/产品信息，每个商品需要收取您100元的展示费，展示期为6个月； 为了完整展示您的商品，请您认真填写以下内容，谢谢合作</view>
+					<view class="nestext">欢迎您来到采美365网二手商品市场，您可以在这里发布二手设备/产品信息，每个商品需要收取您100元的展示费，展示期为3个月； 为了完整展示您的商品，请您认真填写以下内容，谢谢合作</view>
 	             </view>
 				 <form>
 					 <view class="row fenlei"> 
@@ -26,7 +26,7 @@
 						  </view>
 						  <view class="linqi_text" v-show="secondParams.secondHandType==2">
 							  <view class="jiaobiao"></view>
-							  <p class="p">临期产品是指临近保质期的产品，距离到期日最好在6个月以上</p>
+							  <p class="p">临期产品是指临近保质期的产品，距离到期日最好在3个月以上</p>
 						  </view>
 					 </view>
 					 <view class="row">
@@ -224,7 +224,7 @@
 			<view class="secondBj thebj"   v-show="vShow_secondBj" :class="vShow_secondBj?'show':''">
 				<view class="bjmain theresult">
 					<span class="title">发布提示</span>
-					<p>发布二手商品，采美需要收取您每个商品100元的展示费，展示期为6个月</br>
+					<p>发布二手商品，采美需要收取您每个商品100元的展示费，展示期为3个月</br>
 						支付完成后，商品会在1-2个工作日内进行审核，审核通过后，商品会立即上线</p>
 					<view class="paybtn">
 						<view class="thegopay gozhofubao" @click.stop="quxiao">取消发布</view>

second/pages/product/product-details.vue

@@ -231,9 +231,6 @@
 				}	
 			}
 		},
-		computed: {
-			...mapState(['hasLogin','isWxAuthorize'])
-		},
 		methods:{
 			initData(){// 初始化商品详情查询
 				this.SecondService.ProductDetail({productId:this.productID}).then(response =>{	

services/ajax.env.js

@@ -5,8 +5,8 @@ if(process.env.NODE_ENV === 'development'){
 	// URL_CONFIG = 'http://192.168.2.67:8008'	 //裴裴联调地址
 	// URL_CONFIG = 'http://192.168.2.81: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'

services/config.env.js

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

supplier/pages/user/my-shop.vue

@@ -272,9 +272,7 @@
 				total:0
 			}
 		},
-		computed: {
-			...mapState(['isWxAuthorize'])
-		},
+		
 		onLoad(option) {
 			if(option.type =='share'){
 				if(uni.getStorageSync('_WX_State')){
@@ -300,7 +298,7 @@
 			},
 		},
 		computed: {
-			...mapState(['hasLogin','userInfo','isActivity'])
+			...mapState(['hasLogin','userInfo','isActivity','isWxAuthorize'])
 		},
 		methods: {
 			...mapMutations(['login','logout']),