From 79cef97d78c58d8f982705c6603ad963f9fd9038 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Wed, 25 Sep 2024 17:59:39 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=92=8C=E9=A1=B5=E9=9D=A2=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=EF=BC=8C=E4=BC=98=E5=8C=96=E5=95=86=E5=93=81=E9=87=87=E8=B4=AD?=
 =?UTF-8?q?=E5=92=8C=E8=AE=A2=E5=8D=95=E8=8E=B7=E5=8F=96=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/good.js                        |  6 ++-
 pagesOrder/store_product/index.vue | 60 ++++++++++++++++++------------
 2 files changed, 42 insertions(+), 24 deletions(-)

diff --git a/api/good.js b/api/good.js
index fe8ee69..487f397 100644
--- a/api/good.js
+++ b/api/good.js
@@ -17,4 +17,8 @@ export const storeProductListApi = (data) => {
  */
 export const storeProductWholesaleListApi = (data) => {
 	return request.get('/product/product/wholesale_lists', data);
-}
\ No newline at end of file
+}
+
+export const BranchProductListsApi = (data) => {
+	return request.get('/branch_product/BranchProduct/lists', data);
+}
diff --git a/pagesOrder/store_product/index.vue b/pagesOrder/store_product/index.vue
index 74b9458..02fc463 100644
--- a/pagesOrder/store_product/index.vue
+++ b/pagesOrder/store_product/index.vue
@@ -115,8 +115,7 @@
 				</viewPopup>
 				<scroll-view class="list" id='drag_area' style="overscroll-behavior: none;" @scroll="hideHeadView"
 					scroll-y @scrolltolower="loadMoreGood">
-					<view class="shop-item" v-for="(item, index) in goodList" :key="item.id"
-						>
+					<view class="shop-item" v-for="(item, index) in goodList" :key="item.id">
 						<view class="shop-img"
 							:style="{ backgroundImage: `url(${item.image}?x-oss-process=image/format,webp)` }">
 						</view>
@@ -125,18 +124,6 @@
 							<view class="goods-name" style="font-size: 28rpx;color: #060606;">
 								{{ item.store_name }}
 							</view>
-							<view class="shop-content-li" v-if="priceKey.off_activity==1">
-								<view class="shop-content-li-l">
-									售价
-								</view>
-								<view class="shop-content-li-r" style="color:#FC452F ;">￥<text
-										style="font-size: 30rpx;">{{item[priceKey.price]}}</text>/{{ item.unit_name }}
-								</view>
-								<view class="tag" v-if="item.tag">
-									<view class="icon" />
-									{{item.tag}}
-								</view>
-							</view>
 							<view class="shop-content-li" style="justify-content: space-between;"
 								v-if="item.store_info">
 								<view style="display: flex;">
@@ -145,14 +132,41 @@
 								</view>
 
 							</view>
-							<view class="shop-content-li" style="justify-content: space-between;" v-if="item.batch">
-								<view style="display: flex;">
-									<view class="shop-content-li-l">起批量</view>
-									<view class="shop-content-li-r">{{ item.batch }}{{ item.unit_name }}起卖</view>
+
+							<view class="shop-content-li">
+								<view style="margin-right: 60rpx;">
+									<span class="shop-content-li-l">
+										铺货量
+									</span>
+									<span class="shop-content-li-r" style="color:#FC452F ;"><text
+											style="font-size: 30rpx;">{{item.sales}}</text>
+									</span>
+								</view>
+								<view >
+
+									<span class="shop-content-li-l">
+										销售量
+									</span>
+									<span class="shop-content-li-r" style="color:#FC452F ;"><text
+											style="font-size: 30rpx;">{{item.sales}}</text>
+									</span>
+								</view>
+							</view>
+							<view class="shop-content-li">
+								<view class="shop-content-li-l">
+									库存
+								</view>
+								<view class="shop-content-li-r" style="color:#FC452F ;"><text
+										style="font-size: 30rpx;">{{item.stock}}</text>
+								</view>
+							</view>
+							<view class="shop-content-li">
+								<view class="shop-content-li-l">
+									价值
+								</view>
+								<view class="shop-content-li-r" style="color:#FC452F ;">￥<text
+										style="font-size: 30rpx;">{{item.total_price}}</text>
 								</view>
-								<!-- <view class="btn">
-									<u--icon name="plus-circle-fill" size="20" color="#20b128"></u--icon>
-								</view> -->
 							</view>
 						</view>
 					</view>
@@ -176,7 +190,7 @@
 	} from "vue"
 	import {
 		goodListApi,
-		storeProductWholesaleListApi,
+		BranchProductListsApi,
 		goodClassListApi
 	} from "@/api/good.js"
 
@@ -312,7 +326,7 @@
 			// top_cate_id: "",
 			// two_cate_id: ""
 		}
-		storeProductWholesaleListApi(data).then(res => {
+		BranchProductListsApi(data).then(res => {
 			for (let key in res.data.extend) {
 				priceKey[key] = res.data.extend[key]
 			}