冲突

api/goods/index.js

@@ -9,14 +9,18 @@ const api = {
   specData: 'goods/specData',
   skuInfo: 'goods/skuInfo',
   recommended: 'goods/recommended',
-  poster: 'goods/poster'
+  poster: 'goods/poster',
+  serveList:'goods.service/list'
 }
 
 // 商品浏览记录
 export const browseHistory = (param, option) => {
   return request.get(api.browseHistory, param, option)
 }
-
+// 商品浏览记录
+export const serveList = (param, option) => {
+  return request.get(api.serveList, param, option)
+}
 // 商品列表
 export const list = (param, option) => {
   return request.get(api.list, param, option)

api/home/index.js

@@ -3,6 +3,9 @@ import request from '@/utils/request'
 // api地址
 const api = {
   list: 'goods/list',
+  chartsGoodsJing:'goods/chartsGoodsJing',
+  brandList:'goods/brandList',
+  typeList:'category/list'
 }
 
 // 商品列表
@@ -10,3 +13,18 @@ export const list = (param, option) => {
   return request.get(api.list, param, option)
 }
 
+// 首页排行榜
+export const chartsGoodsJing = (param, option) => {
+  return request.get(api.chartsGoodsJing, param, option)
+}
+
+
+// 商品/大牌正品/新品首发列表
+export const brandList = (param, option) => {
+  return request.get(api.brandList, param, option)
+}
+
+// 首页分类
+export const typeList = (param, option) => {
+  return request.get(api.typeList, param, option)
+}

pages/news/recycling/confirm1.vue

@@ -788,7 +788,12 @@
 			}
 		}
 	}
-
+	.photo {
+					display: flex;
+					justify-content: flex-start;
+					padding: 20rpx 0;
+					overflow: hidden;
+				}
 	.file_img {
 		overflow: hidden;
 		position: relative;