commit -m

components/cm-module/homeIndex/navbars.vue

@@ -1,20 +1,12 @@
 <template name="navbars">
 	<view>
 		<view class="navbars-content clearfix">
-			<view class="nav-item" v-for="(item,index) in navList" :key="index" @click="tabClick(index)">
+			<view class="nav-item" v-for="(item,index) in navList" :key="index" @click="NavToDetailPage(item,index)">
 				<view class="icon">
 					<image class="icon-image" :src="item.icon" mode="widthFix"></image>
 					<image class="icon-new" src="../../../static/temp/icon-new.png" mode="widthFix" v-if="index === 7"></image>
 				</view>
 				<view class="name">{{ item.name }}</view>
-				<view class="nav-cell-main" v-if="index === current">
-					<view class="nav-cell" v-for="(cell,idx) in item.children" :key="idx">
-						<view class="icon">
-							<image class="icon-image" :src="cell.icon" mode="widthFix"></image>
-						</view>
-						<view class="name">{{ cell.name }}</view>
-					</view>
-				</view>
 			</view>
 		</view>
 	</view>
@@ -32,39 +24,61 @@
 			return{
 				current:100,
 				navList:[
-					{
-						name:'找产品',
-						icon:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/11/%E6%89%BE%E4%BA%A7%E5%93%81.png',
-						children:[
-							{name:'商品专题',icon:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/11/%E6%89%BE%E4%BA%A7%E5%93%81.png'},
-							{name:'导入液',icon:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/11/%E6%89%BE%E4%BB%AA%E5%99%A8.png'},
-							{name:'高端院用产品',icon:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/11/%E6%89%BE%E4%BB%AA%E5%99%A8.png'},
-							{name:'术后修护',icon:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/11/%E6%89%BE%E4%BB%AA%E5%99%A8.png'},
-							{name:'科学护肤品',icon:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/11/%E6%89%BE%E4%BB%AA%E5%99%A8.png'},
-						]
-					},
-					{name:'找仪器',icon:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/11/%E6%89%BE%E4%BB%AA%E5%99%A8.png'},
-					{name:'找项目',icon:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/11/%E6%89%BE%E9%A1%B9%E7%9B%AE.png'},
-					{name:'信息平台',icon:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/11/%E4%BF%A1%E6%81%AF%E5%B9%B3%E5%8F%B0.png'},
-					{name:'二手市场',icon:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/11/%E4%BA%8C%E6%89%8B%E5%B8%82%E5%9C%BA.png'},
-					{name:'正品联盟',icon:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/11/%E6%AD%A3%E5%93%81%E8%81%94%E7%9B%9F.png'},
-					{name:'品牌招商',icon:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/11/%E5%93%81%E7%89%8C%E6%8B%9B%E5%95%86.png'},
-					{name:'维修',icon:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/11/%E7%BB%B4%E4%BF%AE.png'},
-					
+					{icon:'http://static-b.caimei365.com/app/img/icon/icon-nav1.png'},
+					{icon:'http://static-b.caimei365.com/app/img/icon/icon-nav2.png'},
+					{icon:'http://static-b.caimei365.com/app/img/icon/icon-nav3.png'},
+					{icon:'http://static-b.caimei365.com/app/img/icon/icon-nav4.png'},
+					{icon:'http://static-b.caimei365.com/app/img/icon/icon-nav5.png'},
+					{icon:'http://static-b.caimei365.com/app/img/icon/icon-nav6.png'},
+					{icon:'http://static-b.caimei365.com/app/img/icon/icon-nav7.png'},
+					{icon:'http://static-b.caimei365.com/app/img/icon/icon-nav8.png'},
 				]
 			}
 		},
 		created(){
-			
+			this.initData(this.list)
 		},
 		computed: {
 	
 		},
 		methods:{
-			tabClick(index) {//轮播图切换
-				this.current = index;
+			initData(list){
+				this.navList = this.ReturnNewNavList(this.navList,list)
+				console.log(this.navList)
 			},
-			
+			ReturnNewNavList(listA,listB){
+				let NewArray = []
+				listA.map((item,index)=>{
+					for (let i = 0; i < listB.length; i++) {
+						if(index == i){
+							NewArray.push(Object.assign(item,listB[i]))
+						}
+					}
+				});
+				return NewArray
+			},
+			NavToDetailPage(item,index) {//跳转
+				console.log(index)
+				/**
+				 * 页面跳转类型
+				 * 0、1、2、二级页面,
+				 * 3、5、6、7、嵌h5页面
+				 * 4、二手商品列表
+				 **/
+				 const typeMap = {
+					0:`/pages/goods/goods-instrument?linkId=${item.id}`,
+					1:`/pages/goods/goods-instrument?linkId=${item.id}`,
+					2:`/pages/goods/goods-instrument?linkId=${item.id}`,
+					3:`/h5/pages/article/page?linkType=${index}`,
+					4:`/second/pages/product/product-list`,
+					5:`/h5/pages/article/page?linkType=${index}`,
+					6:`/h5/pages/article/page?linkType=${index}`,
+					7:`/h5/pages/article/page?linkType=${index}`,
+				 }
+				 const url = typeMap[index];
+				 console.log(url)
+				 this.$api.navigateTo(url)
+			}
 		}
 	}
 </script>

components/cm-module/homeIndex/pagesProduct.vue

@@ -52,69 +52,37 @@
 		methods:{
 			initData(res){
 				this.pagesProductList = res
-				console.log(this.hotProductList)
 			},
 			NavToDetailPage(floor) {//跳转
 				console.log(floor)
-				switch(floor.linkType){
-					case 1://二级页面
-						this.$api.navigateTo(`/pages/goods/goods-instrument?linkId=${floor.linkParam.id}&title=${floor.title}`)
-						break;
-					case 2://搜索项目仪器 
-						this.$api.navigateTo(`/pages/search/search-instrument?linkId=${floor.linkParam.id}`)
-						break;
-					case 3://直播页面
-						this.$api.navigateTo(``)
-						break;
-					case 4://自由页面
-						this.$api.navigateTo(`/pages/goods/goods-instrument?linkId=${floor.linkParam.id}`)
-						break;
-					case 5://商品详情
-						this.$api.navigateTo(`/pages/goods/product?id=${floor.linkParam.id}`)
-						break;
-					case 6://仪器项目详情
-						this.$api.navigateTo(`/pages/goods/instrument-details?id=${floor.linkParam.id}`)
-						break;
-					case 7://供应商主页 
-						this.$api.navigateTo(`/supplier/pages/user/my-shop?shopId=${floor.linkParam.id}`)
-						break;
-					case 8://专题活动页
-						this.$api.navigateTo(`/h5/pages/activity/activity-list`)
-						break;
-					case 9://二手市场介绍
-						this.$api.navigateTo(`/second/pages/form/introduce`)
-						break;
-					case 10://二手商品列表
-						this.$api.navigateTo(`/second/pages/product/product-list`)
-						break;
-					case 11://二手商品发布
-						this.$api.navigateTo(`/second/pages/form/form`)
-						break;
-					case 12://商品搜索
-						this.$api.navigateTo(`/pages/search/search?keyWord=${floor.title}`)
-						break;
-					case 13://信息详情
-						this.$api.navigateTo(`/pages/goods/goods-instrument?linkId=${floor.linkParam.id}`)
-						break;
-					case 14://品牌招商介绍页 
-						this.$api.navigateTo(`/pages/goods/goods-instrument?linkId=${floor.linkParam.id}`)
-						break;
-					case 15://维修保养介绍页 
-						this.$api.navigateTo(`/pages/goods/goods-instrument?linkId=${floor.linkParam.id}`)
-						break;
-					case 16://首页
-						this.$api.switchTabTo(`/pages/tabBar/home/index`)
-						break;
-					case 17://注册页 
-						this.$api.navigateTo(`/pages/login/register-select`)
-						break;
-					case 18://信息中心
-						this.$api.navigateTo(`/pages/login/register-select`)
-						break;
-					case 19://供应商列表
-						this.$api.navigateTo(`/pages/login/register-select`)
-						break;
-				}
+				/**
+				 * 页面跳转类型
+				 * 1、二级页面,2、搜索项目仪器,3、直播页面,4、自由页面,5、商品详情,6、仪器项目详情,7、供应商主页
+				 * 8、专题活动页,9、二手市场介绍,10、二手商品列表,11、二手商品发布,12、商品搜索,13、信息详情
+				 * 14、品牌招商介绍页,15、维修保养介绍页,16、首页,17、注册页,18、信息中心,19、供应商列表
+				 **/
+				 if(floor.linkType){
+					 const typeMap = {
+					 	1:`/pages/goods/goods-instrument?linkId=${floor.linkParam.id}&title=${floor.title}`,
+					 	2:`/pages/search/search-instrument?linkId=${floor.linkParam.id}`,
+					 	5:`/pages/goods/product?id=${floor.linkParam.id}`,
+					 	6:`/pages/goods/instrument-details?id=${floor.linkParam.id}`,
+					 	7:`/supplier/pages/user/my-shop?shopId=${floor.linkParam.id}`,
+					 	8:`/h5/pages/activity/activity-list`,
+					 	9:`/second/pages/form/introduce`,
+					 	10:`/second/pages/product/product-list`,
+					 	11:`/second/pages/form/form`,
+					 	12:`/pages/search/search?keyWord=${floor.title}`,
+					 	13:`/h5/pages/article/page?link=${floor.link}`,
+					 	14:`/h5/pages/article/page?link=${floor.link}`,
+					 	15:`/h5/pages/article/page?link=${floor.link}`,
+					 	17:`/pages/login/register-select`,
+					 	18:`/h5/pages/article/page?link=${floor.link}`,
+					 	19:`/pages/search/search-supplier?keyWord=${floor.title}`
+					 }
+					 const url = typeMap[floor.linkType];
+					 this.$api.navigateTo(url)
+				 }
 			}
 		}
 	}

h5/pages/activity/activity-list.vue

@@ -4,8 +4,8 @@
 			<view class="list" v-for="(item, index) in list" :key="index">
 				<image class="list-image" :src="item.image" mode="scaleToFill"></image>
 				<view class="title">{{item.title}}</view>
-				<view class="time">
-					<view class="text">{{item.detail}}</view>
+				<view class="time" v-show="item.status!=3">
+					<view class="text">{{item.detail }}</view>
 				</view>
 			</view>
 			<!--加载loadding-->
@@ -17,13 +17,21 @@
 </template>
 
 <script>
+	import tuiLoadmore from "@/components/tui-components/loadmore/loadmore"
+	import tuiNomore from "@/components/tui-components/nomore/nomore"
 	export default {
+		components:{
+			tuiLoadmore,
+			tuiNomore,
+		},
 	    data() {
 	        return {
 				isEmpty:false,
 				nomoreText: '上拉显示更多',
-				pageNum:1,
-				pageSize:10,
+				listQuery:{
+					pageNum:1,
+					pageSize:10,
+				},
 				hasNextPage:false,
 				loadding: false,
 				pullUpOn: true,
@@ -31,118 +39,72 @@
 				allowDataStatus:true,
 				wrapperHeight:'100%',
 				scrollHeight:'',
-			    list:[
-				   {
-					   "id":997,
-					   "status":2,
-					   "title":"采美优惠：双11第二波惊喜福利来袭！！！",
-					   "detail":"2020-10-29～2020-11-30",
-					   "link":"https://www.caimei365.com/page.html?id=274",
-					   "image":"https://img.caimei365.com/group1/M00/03/C2/Cmis2F-bzCOATrdjAAQxN7DRfks231.jpg",
-					   "beginTime":"2020-10-28T16:00:00.000+00:00",
-					   "endTime":"2020-11-30T15:59:59.000+00:00"
-				   },
-				   {
-					   "id":996,
-					   "status":2,
-					   "title":"采美优惠 | 别让心爱的产品/仪器躺在购物车里让它躺在你的店里！",
-					   "detail":"2020-10-22～2020-11-30",
-					   "link":"https://www.caimei365.com/page.html?id=273",
-					   "image":"https://img.caimei365.com/group1/M00/03/C1/Cmis2F-SlLiAC2lgAAVioC57lLw433.jpg",
-					   "beginTime":"2020-10-21T16:00:00.000+00:00",
-					   "endTime":"2020-11-30T15:59:59.000+00:00"
-				   },
-				   {
-					   "id":995,
-					   "status":2,
-					   "title":"采美优惠 | 德玛莉澎湃系列买十送二有了它们秋季护肤一点都不难",
-					   "detail":"2020-10-15～2020-11-15",
-					   "link":"https://www.caimei365.com/page.html?id=272",
-					   "image":"https://img.caimei365.com/group1/M00/03/CE/Cmis21-H8OSAGDhVAAMGgZ2d6vA013.jpg",
-					   "beginTime":"2020-10-14T16:00:00.000+00:00",
-					   "endTime":"2020-11-15T15:59:59.000+00:00"
-				   },
-				   {
-					   "id":983,
-					   "status":3,
-					   "title":"采美优惠 | 晓宫主系列买三送一畅饮秋天里的N杯奶茶",
-					   "detail":"",
-					   "link":"https://www.caimei365.com/cmpage/info-4-271.html",
-					   "image":"https://img.caimei365.com/group1/M00/03/BC/Cmis2F9y9CuAGyhqAELYh8rIUkQ318.jpg",
-					   "beginTime":"2019-09-28T16:00:00.000+00:00",
-					   "endTime":"2020-10-29T15:59:59.000+00:00"
-				   },
-				   {
-					   "id":982,
-					   "status":3,
-					   "title":"采美优惠 | 塑欣填充玻尿酸满十就送货比三家还是这里的风景独好",
-					   "detail":"",
-					   "link":"https://www.caimei365.com/cmpage/info-4-270.html",
-					   "image":"https://img.caimei365.com/group1/M00/03/BA/Cmis2F9sXoCAMew_AAVnnTEnzjs592.jpg",
-					   "beginTime":"2020-09-23T16:00:00.000+00:00",
-					   "endTime":"2020-10-24T15:59:59.000+00:00"
-				   },
-				   {
-					   "id":981,
-					   "status":3,
-					   "title":"采美临期 | 点斗临期产品史上最低价格 1.9折 数量有限 欲购从先",
-					   "detail":"",
-					   "link":"https://www.caimei365.com/cmpage/info-4-269.html",
-					   "image":"https://img.caimei365.com/group1/M00/03/CA/Cmis219kIu6Ac7oqAAhfDhDakds337.jpg",
-					   "beginTime":"2020-09-17T16:00:00.000+00:00",
-					   "endTime":"2020-10-18T15:59:59.000+00:00"
-				   },
-				   {
-					   "id":980,
-					   "status":3,
-					   "title":"9月10美博会仪器延期",
-					   "detail":"",
-					   "link":"https://www.caimei365.com/cmpage/info-4-268.html",
-					   "image":"https://img.caimei365.com/group1/M00/03/B5/Cmis2F9bLrGAG5UyAAMbOsIEo1I083.jpg",
-					   "beginTime":"2020-09-09T16:00:00.000+00:00",
-					   "endTime":"2020-09-18T15:59:59.000+00:00"
-				   },
-				   {
-					   "id":979,
-					   "status":3,
-					   "title":"	采美优惠 | 瑞恺迪小气泡 美博会线上一口价11000元/台 代理商都拿不到的",
-					   "detail":"",
-					   "link":"https://www.caimei365.com/cmpage/info-4-267.html",
-					   "image":"https://img.caimei365.com/group1/M00/03/B4/Cmis2F9Z2NOAH7nUAANj_11D4Jo019.jpg",
-					   "beginTime":"2020-09-02T16:00:00.000+00:00",
-					   "endTime":"2020-10-02T15:59:59.000+00:00"
-				   },
-				   {
-					   "id":955,
-					   "status":3,
-					   "title":"采美优惠 | 购买冷风机赠送价值5000元的口罩。",
-					   "detail":"",
-					   "link":"https://www.caimei365.com/cmpage/info-4-266.html",
-					   "image":"https://img.caimei365.com/group1/M00/03/B0/Cmis2F9HcJuAExCdAAT1g6O9xwM704.jpg",
-					   "beginTime":"2020-08-26T16:00:00.000+00:00",
-					   "endTime":"2020-09-27T15:59:59.000+00:00"
-				   },
-				   {
-					   "id":954,
-					   "status":3,
-					   "title":"采美优惠 | 买伯纳赫送点斗 买一送一送完为止！",
-					   "detail":"",
-					   "link":"https://www.caimei365.com/cmpage/info-4-265.html",
-					   "image":"https://img.caimei365.com/group1/M00/03/AF/Cmis2F8_K9-APOEpAANFhTKvw1A467.jpg",
-					   "beginTime":"2020-08-19T16:00:00.000+00:00",
-					   "endTime":"2020-09-20T15:59:59.000+00:00"
-				   }
-			   ],
+			    list:[],
 	        }
 	    },
 		onLoad(option) {
 			
 		},
 		methods:{
-			
+			GetPromotionsrList(){//获取专题列表
+				this.ProductService.GetPromotionsrList(this.listQuery).then(response =>{
+					let responseData = response.data
+					if(responseData.list&&responseData.list.length > 0){
+						this.isEmpty = false
+						this.hasNextPage = responseData.hasNextPage
+						this.list = responseData.list
+						this.pullFlag = false;
+						setTimeout(()=>{this.pullFlag = true;},500)
+						if(this.hasNextPage){
+							this.pullUpOn = false
+							this.nomoreText = '上拉显示更多'
+						}else{
+							this.pullUpOn = true
+							this.loadding = false
+							this.nomoreText = '已至底部'
+						}
+					}else{
+						this.isEmpty = true
+					}
+				}).catch(error =>{
+					this.$util.msg(error.msg,2000)
+				})
+			},
+			GetPromotionsrListBottomData(){
+				this.listQuery.pageNum+=1
+				this.ProductService.GetPromotionsrList(this.listQuery).then(response =>{
+					let responseData = response.data
+					if(responseData.list&&responseData.list.length > 0){
+						this.hasNextPage = response.data.hasNextPage
+						this.list = this.list.concat(responseData.list) 
+						this.pullFlag = false;// 防上拉暴滑
+						setTimeout(()=>{this.pullFlag = true;},500)
+						if(this.hasNextPage){
+							this.pullUpOn = false
+							this.nomoreText = '上拉显示更多'
+						}else{
+							this.pullUpOn = false
+							this.loadding = false
+							this.nomoreText = '已至底部'
+						}
+					}
+				}).catch(error =>{
+					this.$util.msg(error.msg,2000)
+				})
+			},
 			navToDetailPage() {//跳转商品详情页
 				this.$api.navigateTo(`/pages/goods/product?id=${this.productID}`)
 			},
+		},
+		onReachBottom() {
+			if(this.hasNextPage){
+				this.loadding = true
+				this.pullUpOn = true
+				this.GetPromotionsrListBottomData()
+			}	
+		},
+		onShow() {
+			this.GetPromotionsrList()
 		}
 	}
 </script>

h5/pages/article/page.vue

@@ -15,14 +15,28 @@
 	                }
 	            },
 				productID:'',
-				activityPath:'https://www.caimei365.com/info/center-3-1.html'
+				activityPath:'',
+				
 	        }
 	    },
 		onLoad(option) {
-			console.log(option)
-			this.activityPath = option.path
-			this.productID = option.productID
-			uni.setNavigationBarTitle({title:'多重精华,多重修复'});
+			// console.log(option)
+			switch(option.linkType){
+				case '3':
+					this.activityPath = 'https://www.caimei365.com/info/center-2-1.html'
+					break;
+				case '5':
+					this.activityPath = 'https://www.caimei365.com/topic.html?type=6'
+					break;
+				case '6':
+					this.activityPath = 'https://www.caimei365.com/investment.html'
+					break;
+				case '7':
+					this.activityPath = 'https://www.caimei365.com/repair.html'
+					break;
+			}
+			// console.log(this.activityPath)
+			// uni.setNavigationBarTitle({title:'多重精华,多重修复'});
 		},
 		methods:{
 			navToDetailPage() {//跳转商品详情页

pages.json

@@ -503,7 +503,7 @@
 				{
 					"path": "pages/article/page",
 					"style": {
-						"navigationBarTitleText": "新品上线",
+						"navigationBarTitleText": "采美365",
 						"enablePullDownRefresh":true
 					}
 				},

pages/tabBar/home/index.vue

@@ -151,6 +151,14 @@
 					})
 				})
 			},		
+			GetHomeInit(){//金刚区分类
+				this.CommonService.GetHomeInit({}).then(response =>{
+					let data = response.data
+					this.navBarsList = data.topMenuList
+				}).catch(error =>{
+					this.$util.msg(error.msg,2000)
+				})
+			},
 			GetHomeFloorInfo(){//初始化首页楼层数据
 				this.CommonService.GetHomeFloorInfo({}).then(response =>{
 					let data = response.data
@@ -158,11 +166,9 @@
 						switch(item.type){
 							case 3:
 								this.supplierList = item.floorData
-								console.log(this.supplierList)
 								break;	
 							case 4:
 								this.specialList = item.floorData
-								console.log(this.specialList)
 								break;	
 							case 5:
 								this.specialProList = item.floorData
@@ -188,6 +194,7 @@
 					this.thirdModulesName= data.thirdModulesName
 					this.productsClassifyList = data.productsClassifyList
 					this.$store.commit('updateAllNum',data.shoppingCartCount)
+					this.GetHomeInit();
 					this.GetHomeRecommendInfo()
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000)
@@ -216,7 +223,6 @@
 				productIds = productIdArr.join(",");
 				this.ProductService.querySearchProductPrice({userId: this.userID,productIds:productIds}).then(response =>{
 					this.RecommendList = this.ReturnNewProducts(this.RecommendList,response.data);
-					console.log(this.RecommendList)
 					this.skeletonShow = false;
 					this.isRequest = true
 				}).catch(error =>{

services/product.service.js

@@ -103,4 +103,8 @@ export default class ProductService {
 	GetPageTopicBanner (data = {}) {
 		return this.AjaxService.get({ url:'/page/topic/info', data, isLoading: false })
 	}
+	/* 活动专题列表 */
+	GetPromotionsrList (data = {}) {
+		return this.AjaxService.get({ url:'/promotions/list', data, isLoading: false })
+	}
 }