dev #5

Merged
mkm merged 26 commits from dev into master 2024-12-30 16:22:20 +08:00
2 changed files with 42 additions and 24 deletions
Showing only changes of commit 79cef97d78 - Show all commits

View File

@ -17,4 +17,8 @@ export const storeProductListApi = (data) => {
*/ */
export const storeProductWholesaleListApi = (data) => { export const storeProductWholesaleListApi = (data) => {
return request.get('/product/product/wholesale_lists', data); return request.get('/product/product/wholesale_lists', data);
} }
export const BranchProductListsApi = (data) => {
return request.get('/branch_product/BranchProduct/lists', data);
}

View File

@ -115,8 +115,7 @@
</viewPopup> </viewPopup>
<scroll-view class="list" id='drag_area' style="overscroll-behavior: none;" @scroll="hideHeadView" <scroll-view class="list" id='drag_area' style="overscroll-behavior: none;" @scroll="hideHeadView"
scroll-y @scrolltolower="loadMoreGood"> 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" <view class="shop-img"
:style="{ backgroundImage: `url(${item.image}?x-oss-process=image/format,webp)` }"> :style="{ backgroundImage: `url(${item.image}?x-oss-process=image/format,webp)` }">
</view> </view>
@ -125,18 +124,6 @@
<view class="goods-name" style="font-size: 28rpx;color: #060606;"> <view class="goods-name" style="font-size: 28rpx;color: #060606;">
{{ item.store_name }} {{ item.store_name }}
</view> </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;" <view class="shop-content-li" style="justify-content: space-between;"
v-if="item.store_info"> v-if="item.store_info">
<view style="display: flex;"> <view style="display: flex;">
@ -145,14 +132,41 @@
</view> </view>
</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">
<view class="shop-content-li-l">起批量</view> <view style="margin-right: 60rpx;">
<view class="shop-content-li-r">{{ item.batch }}{{ item.unit_name }}起卖</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 >
<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>
<!-- <view class="btn">
<u--icon name="plus-circle-fill" size="20" color="#20b128"></u--icon>
</view> -->
</view> </view>
</view> </view>
</view> </view>
@ -176,7 +190,7 @@
} from "vue" } from "vue"
import { import {
goodListApi, goodListApi,
storeProductWholesaleListApi, BranchProductListsApi,
goodClassListApi goodClassListApi
} from "@/api/good.js" } from "@/api/good.js"
@ -312,7 +326,7 @@
// top_cate_id: "", // top_cate_id: "",
// two_cate_id: "" // two_cate_id: ""
} }
storeProductWholesaleListApi(data).then(res => { BranchProductListsApi(data).then(res => {
for (let key in res.data.extend) { for (let key in res.data.extend) {
priceKey[key] = res.data.extend[key] priceKey[key] = res.data.extend[key]
} }