活动

common/config/config.js

@@ -2,9 +2,9 @@ let URL_CONFIG = ""
 if(process.env.NODE_ENV === 'development'){
     // 开发环境
 	// URL_CONFIG = 'http://192.168.1.33:8008'	 //俊俊联调地址
-	// URL_CONFIG = 'http://192.168.1.40:8008'	 //裴裴联调地址
+	URL_CONFIG = 'http://192.168.1.40:8008'	 //裴裴联调地址
 	// URL_CONFIG = 'http://192.168.1.20:8008'	 //超超联调地址
-    URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
+    // URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
 	// URL_CONFIG = 'https://spi.caimei365.com'
 }else{
     // 生产环境

h5/pages/activity/activity_mid.vue

@@ -11,7 +11,7 @@
 							<scroll-view scroll-x class="nav z" scroll-with-animation :scroll-left="headTab.scrollLeft">
 								<block v-for="(item,index) in headTab.list" :key="index">
 									<view class="cu-item" :class="index==headTab.TabCur?'select':''" @tap="tabSelect(index,item)" :data-id="index">
-										<view>{{item.name}}</view>
+										<view>{{item}}</view>
 										<view class="tab-dot bg-white"/>
 									</view>
 								</block>
@@ -23,12 +23,12 @@
 		</view>
 		<view class="activity-container">
 			<view class="activity-section one clearfix" v-for="(item, index) in dataList">
-				<view class="section-title">{{item.title}}</view>
+				<view class="section-title">{{item.name}}</view>
 				<view class="section-main">
-					<view class="product-list" v-for="(pros, index) in item.enSList" :key="index"  @click.stop="navToDetailPage(item.productID)">
-						<view class="list-rebate">66折</view>
+					<view class="product-list" v-for="(pros, index) in item.productList" :key="index"  @click.stop="navToDetailPage(item.productID)">
+						<view class="list-rebate">{{pros.activityDiscount}}折</view>
 						<view class="list-image">
-							<image :src="pros.img" mode=""></image>
+							<image :src="pros.mainImage" mode=""></image>
 						</view>
 						<view class="list-name">{{pros.name}}</view>
 						<template v-if="hasLogin">
@@ -45,8 +45,8 @@
 							</template>
 							<template v-else>
 								<view class="list-price">
-									<view class="price-new">￥<text class="big">196600</text><text>.00</text></view>
-									<view class="price-old">￥<text class="big">198800</text><text>.00</text></view>
+									<view class="price-new">￥<text class="big">{{pros.retailPrice}}</text><text>.00</text></view>
+									<view class="price-old">￥<text class="big">{{pros.price1}}</text><text>.00</text></view>
 								</view>
 							</template>
 						</template>
@@ -81,74 +81,9 @@
 			  headTab: {
 			  	TabCur: 0, 
 			  	scrollLeft: 0, 
-			  	list: [
-			  		{name:'恩盛'},
-			  		{name:'德玛利'},
-			  		{name:'华熙生物'},
-			  		{name:'优裴斯'},
-			  		{name:'基本演绎'},
-			  		{name:'易耗品'},
-			  		{name:'基本演绎'},
-			  		{name:'哈哈哈'},
-			  		{name:'囖囖咯'},
-			  	],
+			  	list: [],
 			  }, 
-			  dataList:[
-				  {
-					title:'恩盛',
-					enSList:[
-					    {name:'采美商城的老客户在采美小程序上进行使用购买',img:'https://img.caimei365.com/group1/M00/03/95/Cmis2F778GGALIeNAAGtOmuO4Sk263.jpg',price:'18888.00'},
-					    {name:'采美商城的老客户在采美小程序上进行使用购买',img:'https://img.caimei365.com/group1/M00/03/95/Cmis2F778GGALIeNAAGtOmuO4Sk263.jpg',price:'18888.00'},
-					    {name:'采美商城的老客户在采美小程序上进行使用购买',img:'https://img.caimei365.com/group1/M00/03/95/Cmis2F778GGALIeNAAGtOmuO4Sk263.jpg',price:'18888.00'},
-					    {name:'采美商城的老客户在采美小程序上进行使用购买',img:'https://img.caimei365.com/group1/M00/03/95/Cmis2F778GGALIeNAAGtOmuO4Sk263.jpg',price:'18888.00'},
-					]
-				  },
-				  {
-					title:'华熙生物',
-					enSList:[
-					    {name:'采美商城的老客户在采美小程序上进行使用购买',img:'https://img.caimei365.com/group1/M00/03/95/Cmis2F778GGALIeNAAGtOmuO4Sk263.jpg',price:'18888.00',small:'.00'},
-					    {name:'采美商城的老客户在采美小程序上进行使用购买',img:'https://img.caimei365.com/group1/M00/03/95/Cmis2F778GGALIeNAAGtOmuO4Sk263.jpg',price:'18888.00',small:'.00'},
-					    {name:'采美商城的老客户在采美小程序上进行使用购买',img:'https://img.caimei365.com/group1/M00/03/95/Cmis2F778GGALIeNAAGtOmuO4Sk263.jpg',price:'18888.00',small:'.00'},
-					    {name:'采美商城的老客户在采美小程序上进行使用购买',img:'https://img.caimei365.com/group1/M00/03/95/Cmis2F778GGALIeNAAGtOmuO4Sk263.jpg',price:'18888.00',small:'.00'},
-					]
-				  },
-				  {
-					title:'易耗品',
-					enSList:[
-					    {name:'采美商城的老客户在采美小程序上进行使用购买',img:'https://img.caimei365.com/group1/M00/03/95/Cmis2F778GGALIeNAAGtOmuO4Sk263.jpg',price:'18888.00',small:'.00'},
-					    {name:'采美商城的老客户在采美小程序上进行使用购买',img:'https://img.caimei365.com/group1/M00/03/95/Cmis2F778GGALIeNAAGtOmuO4Sk263.jpg',price:'18888.00',small:'.00'},
-					    {name:'采美商城的老客户在采美小程序上进行使用购买',img:'https://img.caimei365.com/group1/M00/03/95/Cmis2F778GGALIeNAAGtOmuO4Sk263.jpg',price:'18888.00',small:'.00'},
-					    {name:'采美商城的老客户在采美小程序上进行使用购买',img:'https://img.caimei365.com/group1/M00/03/95/Cmis2F778GGALIeNAAGtOmuO4Sk263.jpg',price:'18888.00',small:'.00'},
-					]
-				  },
-				  {
-					title:'优斐斯',
-					enSList:[
-					    {name:'采美商城的老客户在采美小程序上进行使用购买',img:'https://img.caimei365.com/group1/M00/03/95/Cmis2F778GGALIeNAAGtOmuO4Sk263.jpg',price:'18888.00',small:'.00'},
-					    {name:'采美商城的老客户在采美小程序上进行使用购买',img:'https://img.caimei365.com/group1/M00/03/95/Cmis2F778GGALIeNAAGtOmuO4Sk263.jpg',price:'18888.00',small:'.00'},
-					    {name:'采美商城的老客户在采美小程序上进行使用购买',img:'https://img.caimei365.com/group1/M00/03/95/Cmis2F778GGALIeNAAGtOmuO4Sk263.jpg',price:'18888.00',small:'.00'},
-					    {name:'采美商城的老客户在采美小程序上进行使用购买',img:'https://img.caimei365.com/group1/M00/03/95/Cmis2F778GGALIeNAAGtOmuO4Sk263.jpg',price:'18888.00',small:'.00'},
-					]
-				  },
-				  {
-					title:'优斐斯',
-					enSList:[
-					    {name:'采美商城的老客户在采美小程序上进行使用购买',img:'https://img.caimei365.com/group1/M00/03/95/Cmis2F778GGALIeNAAGtOmuO4Sk263.jpg',price:'18888.00',small:'.00'},
-					    {name:'采美商城的老客户在采美小程序上进行使用购买',img:'https://img.caimei365.com/group1/M00/03/95/Cmis2F778GGALIeNAAGtOmuO4Sk263.jpg',price:'18888.00',small:'.00'},
-					    {name:'采美商城的老客户在采美小程序上进行使用购买',img:'https://img.caimei365.com/group1/M00/03/95/Cmis2F778GGALIeNAAGtOmuO4Sk263.jpg',price:'18888.00',small:'.00'},
-					    {name:'采美商城的老客户在采美小程序上进行使用购买',img:'https://img.caimei365.com/group1/M00/03/95/Cmis2F778GGALIeNAAGtOmuO4Sk263.jpg',price:'18888.00',small:'.00'},
-					]
-				  },
-				  {
-					title:'优斐斯',
-					enSList:[
-					    {name:'采美商城的老客户在采美小程序上进行使用购买',img:'https://img.caimei365.com/group1/M00/03/95/Cmis2F778GGALIeNAAGtOmuO4Sk263.jpg',price:'18888.00',small:'.00'},
-					    {name:'采美商城的老客户在采美小程序上进行使用购买',img:'https://img.caimei365.com/group1/M00/03/95/Cmis2F778GGALIeNAAGtOmuO4Sk263.jpg',price:'18888.00',small:'.00'},
-					    {name:'采美商城的老客户在采美小程序上进行使用购买',img:'https://img.caimei365.com/group1/M00/03/95/Cmis2F778GGALIeNAAGtOmuO4Sk263.jpg',price:'18888.00',small:'.00'},
-					    {name:'采美商城的老客户在采美小程序上进行使用购买',img:'https://img.caimei365.com/group1/M00/03/95/Cmis2F778GGALIeNAAGtOmuO4Sk263.jpg',price:'18888.00',small:'.00'},
-					]
-				  },
-			  ]
+			  dataList:[]
 	        }
 	    },
 		onLoad(option) {
@@ -167,6 +102,9 @@
 			initData(){
 				this.ActivityService.GetRepeatActivityBrandList().then(response =>{
 					console.log(response)
+					let data = response.data
+					this.headTab.list = data.brandNames
+					this.dataList = data.brandList
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000)
 				})
@@ -259,7 +197,7 @@
 					width: 340rpx;
 					height: 526rpx;
 					padding: 20rpx;
-					border-radius: 24rpx;
+					border-radius: 20rpx;
 					background-color: #FFFFFF;
 					float: left;
 					margin-right:20rpx;

services/activity.service.js

@@ -8,6 +8,6 @@ export default class ActivityService {
 	}
 	/* 小程序支付-活动接口 */
 	GetRepeatActivityBrandList (data = {}) {
-		return this.AjaxService.get({ url:'/repeat/activityBrandList', data, isLoading: true })
+		return this.AjaxService.get({ url:'/repeat/activityProduct', data, isLoading: true })
 	}
 }

services/ajax.env.js

@@ -2,9 +2,9 @@ let URL_CONFIG = ""
 if(process.env.NODE_ENV === 'development'){
     // 开发环境
 	// URL_CONFIG = 'http://192.168.1.33:8008'	 //俊俊联调地址
-	// URL_CONFIG = 'http://192.168.1.40:8008'	 //裴裴联调地址
+	URL_CONFIG = 'http://192.168.1.40:8008'	 //裴裴联调地址
 	// URL_CONFIG = 'http://192.168.1.20:8008'	 //超超联调地址
-    URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
+    // URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
 	// URL_CONFIG = 'https://spi.caimei365.com'
 }else{
     // 生产环境