1

mer_uniapp/api/merchant.js

@@ -49,7 +49,13 @@ export function getMerIndexInfoApi(id) {
 export function getMerSearchApi(data) {
   return request.get(`merchant/search/list`, data, {noAuth:true});
 }
-
+/** 
+ * 精选商户搜索列表
+ * @param Obj data
+ */
+export function getMerActivitySearchApi(data) {
+  return request.get(`merchant/search/list/activity`, data, {noAuth:true});
+}
 /**
  * 商户入驻申请
  * @param Obj data
@@ -79,7 +85,14 @@ export function getMerStreetApi(data) {
  * @param Obj data
  */
 export function getMerProListApi(data) {
-  return request.get(`product/merchant/pro/list/v1`, data , {noAuth:true});
+  return request.get(`product/merchant/pro/list`, data , {noAuth:true});
+}
+/**
+ * 商户精选商品列表
+ * @param Obj data
+ */
+export function getMerActivityProListApi(data) {
+  return request.get(`product/merchant/activity/pro/list`, data , {noAuth:true});
 }
 
 /**

mer_uniapp/api/product.js

@@ -86,7 +86,16 @@ export function getCategoryList() {
  * @param object data
  */
 export function productList(data) {
-	return request.get('product/list/v1', data, {
+	return request.get('product/list', data, {
+		noAuth: true
+	});
+}
+/**
+ * 精选商品列表 搜索页面
+ * @param object data
+ */
+export function productActivityList(data) {
+	return request.get('product/activity/list', data, {
 		noAuth: true
 	});
 }

mer_uniapp/pages/goods/goods_list/index.vue

@@ -148,10 +148,12 @@
 	// | Author: CRMEB Team <admin@crmeb.com>
 	// +----------------------------------------------------------------------
 	import {
-		productList
+		productList,productActivityList
 	} from '@/api/product.js';
 	import {
 		getMerSearchApi,
+		getMerActivitySearchApi,
+		getMerActivityProListApi,
 		getMerProListApi,
 		getSecondHandListApi
 	} from '@/api/merchant.js';
@@ -274,7 +276,8 @@
 				goodScroll: true,
 				isShow: false,
 				fairCateId: '',
-				showCateDrawer: false
+				showCateDrawer: false,
+				isActivity: false,
 			};
 		},
 		// 滚动监听
@@ -287,8 +290,9 @@
 			this.upPng = `${this.urlDomain}crmebimage/presets/up_red.png`;
 			this.merId = options.merId ? Number(options.merId) : 0;
 			this.cateId = options.cateId ? Number(options.cateId) : '';
-			this.fairCateId = Number(options.fairCateId) || ''
-			if (this.cateId) {
+			this.fairCateId = Number(options.fairCateId) || '';
+			this.isActivity=options.isActivity;
+			if (this.isActivity) {
 				uni.setNavigationBarTitle({
 					title: '精选商品'
 				});
@@ -407,7 +411,8 @@
 				that.loadTitle = '';
 				that.whereMer.keywords = encodeURIComponent(that.keyword);
 				that.cateId ? that.whereMer.productType = that.cateId : '';
-				getMerSearchApi(that.whereMer).then(res => {
+				let merchantSearchApi=this.isActivity?getMerActivitySearchApi:getMerSearchApi;
+				merchantSearchApi(that.whereMer).then(res => {
 					let list = res.data.list;
 					let merchantList = that.$util.SplitArray(list, that.merchantList);
 					let loadend = list.length < that.whereMer.limit;
@@ -534,7 +539,9 @@
 						that.loadTitle = '加载更多'
 					})
 				} else {
-					this.merId === 0 ? productList(that.where).then(res => {
+					let productApi=this.isActivity?productActivityList:productList;
+					let merchantProductApi=this.isActivity?getMerActivityProListApi:getMerProListApi;
+					this.merId === 0 ?productApi(that.where).then(res => {
 						let list = res.data.list;
 						let productList = that.$util.SplitArray(list, that.productList);
 						let loadend = list.length < that.where.limit;
@@ -547,7 +554,7 @@
 					}).catch(err => {
 						that.loading = false;
 						that.loadTitle = '加载更多'
-					}) : getMerProListApi(that.where).then(res => {
+					}) : merchantProductApi(that.where).then(res => {
 						let list = res.data.list;
 						let productList = that.$util.SplitArray(list, that.productList);
 						let loadend = list.length < that.where.limit;

mer_uniapp/pages/index/index.vue

@@ -332,7 +332,8 @@
 				this.$util.navigateTo('/pages/goods/goods_search/index');
 			},
 			goGenDuo() {
-				this.$util.navigateTo(`/pages/goods/goods_list/index?cateId=${this.cateId}`);
+				const isActivity=true;
+				this.$util.navigateTo(`/pages/goods/goods_list/index?isActivity=${isActivity}&cateId=${this.cateId}`);
 			},
 			//配送时间转换
 			convertMinutes(minutes) {

mer_uniapp/pages/takeout/index.vue

@@ -29,7 +29,7 @@
 							<text v-if="recommendObj.isFreeDeliverFee" class="goods-info" style="color: #E5AD21;margin-left: 18rpx;">免配送费</text>
 							<view v-if="recommendObj.isFreeDeliverFee && recommendObj.freeDeliverFee > 0" style="color: #999999;font-size: 21rpx;margin-left: 10rpx;text-decoration: line-through;">¥
 								{{recommendObj.freeDeliverFee}}</view>
-							<text v-if="!recommendObj.isFreeDeliverFee" style="color: #999999;font-size: 21rpx;margin-left: 10rpx;">配送费¥
+							<text v-if="!recommendObj.isFreeDeliverFee" style="color: #999999;font-size: 21rpx;margin-left: 2rpx;">配送费¥
 								{{recommendObj.distCosts}}</text>
 							<text class="goods-info" style="margin-left: 10rpx;">{{recommendObj.distance}}</text>
 						</view>