From 937730558ce4a861499597a0f22ed806c8656d09 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Wed, 14 Aug 2024 18:01:44 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E9=87=87=E8=B4=AD?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E5=88=97=E8=A1=A8=E5=92=8C=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/purchase_product_offer.js              |   5 +
 config/app.js                              |   4 +-
 pageQuota/purchase_product_offer/index.vue | 210 +++++++++++++++++++++
 pages.json                                 |   7 +
 pages/my/my.vue                            |   2 +-
 pagesOrder/settle/settle.vue               |  16 +-
 6 files changed, 236 insertions(+), 8 deletions(-)
 create mode 100644 api/purchase_product_offer.js
 create mode 100644 pageQuota/purchase_product_offer/index.vue

diff --git a/api/purchase_product_offer.js b/api/purchase_product_offer.js
new file mode 100644
index 0000000..83e8260
--- /dev/null
+++ b/api/purchase_product_offer.js
@@ -0,0 +1,5 @@
+import request from '@/utils/request';
+
+export const purchaseProductOfferLists = (data) => {
+	return request.get('/purchase_product_offer/purchaseproductoffer/lists', data);
+}
\ No newline at end of file
diff --git a/config/app.js b/config/app.js
index f1f7802..5657b7c 100644
--- a/config/app.js
+++ b/config/app.js
@@ -3,9 +3,9 @@ let WSS_URL
 import store from "@/store/user.js"
 // 环境
 // let env = "dev"
-let env = "prod"
+// let env = "prod"
 // let env = "release";
-// let env = "local";
+let env = "local";
 
 switch (env) {
 	case 'dev':
diff --git a/pageQuota/purchase_product_offer/index.vue b/pageQuota/purchase_product_offer/index.vue
new file mode 100644
index 0000000..30b3c4a
--- /dev/null
+++ b/pageQuota/purchase_product_offer/index.vue
@@ -0,0 +1,210 @@
+<template>
+	<view>
+		<view class="content">
+			<up-transition mode="slide-left">
+				<view class="a" v-if="goodsList1.length>0">
+					<view class="card" v-for="(item,index) in goodsList1" :key='index'>
+						<view class="head">
+							<!-- <text> {{orer_sn}}</text> -->
+							<!-- <text style="color: #989898;">{{time}}</text> -->
+						</view>
+						<view class="card-content">
+							<view class="card-content-l" style="width: 152rpx;height: 152rpx;">
+								<image style="width: 152rpx;height: 152rpx;" :src="item.image" mode=""></image>
+							</view>
+							<view class="card-content-r">
+								<view class="title ellipsis">
+									{{item.store_name}}
+								</view>
+								<view class="need">
+									需求量： {{item.need_num}}
+								</view>
+							</view>
+
+						</view>
+						<view class="card-footer" v-if="item.nums && item.price">
+							共{{item.nums}}{{item.unit_name}}&nbsp; &nbsp;合计:<text
+								style="font-size: 28rpx;color: #FC452F;font-weight: 700;">￥{{item.nums*item.price}}</text>
+						</view>
+						<up-line style="margin-top: 30rpx;" color="#F3F3F3"></up-line>
+					</view>
+				</view>
+				<up-empty @click='test2' v-else mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png">
+				</up-empty>
+				<!-- <button @click="test2">叫我按钮</button> -->
+			</up-transition>
+		</view>
+	</view>
+</template>
+
+
+<script setup>
+	import {
+		ref,
+		reactive,
+	} from "vue"
+	import {
+		purchaseProductOfferLists
+	} from "@/api/purchase_product_offer.js"
+
+	const test2 = () => {
+		console.log("点解")
+		uni.navigateTo({
+			url: '/pages/index/index'
+		})
+	}
+	// 状态图片url
+	const successPng = ref('https://lihai001.oss-cn-chengdu.aliyuncs.com/attach/739c3202405071458553459.png')
+	const errPng = ref('https://lihai001.oss-cn-chengdu.aliyuncs.com/attach/04c2c202405071501462462.png')
+	const waitPng = ref('https://lihai001.oss-cn-chengdu.aliyuncs.com/attach/274ad202405111523222891.png')
+
+
+
+	// tabsindex
+	const tabIndex = ref(1)
+	const {
+		windowWidth
+	} = uni.getSystemInfoSync();
+	const tabsLeft = ref(((windowWidth / 2) - 26) / 2)
+	const tabsRight = ref(tabsLeft.value + (windowWidth / 2))
+	// tabsindex结束
+
+	const priceBlur = (index, goodsList) => {
+		goodsList[index].price = Number(goodsList[index].price).toFixed(2)
+	}
+
+	// 列表
+	const showGoods = ref(false)
+	const showGoods1 = ref(false)
+	const goodsList = ref([])
+	const goodsList1 = ref([])
+
+	const getGoodsList = async (type) => {
+		let res = await purchaseProductOfferLists({
+			type
+		})
+		goodsList1.value = res.data.lists
+	}
+
+
+	getGoodsList(tabIndex.value)
+</script>
+
+<style lang="scss">
+	.head {
+		padding: 20rpx;
+		background-color: white;
+		position: relative;
+
+		.act {
+			color: #20B128;
+		}
+
+		.line {
+			width: 26px;
+			height: 5rpx;
+			background-color: #20B128;
+			border-radius: 50rpx;
+			position: absolute;
+			transition: 300ms;
+		}
+	}
+
+	.content {
+		padding: 20rpx;
+		padding-bottom: 150rpx;
+
+		.card {
+			width: 710rpx;
+			margin: 0 auto;
+			padding: 20rpx;
+			box-sizing: border-box;
+			background-color: white;
+
+
+
+			.card-content {
+				display: flex;
+				position: relative;
+
+				.card-content-l {
+					margin-right: 20rpx;
+					position: relative;
+
+					.status {
+						width: 152rpx;
+						height: 40rpx;
+						background-color: rgba(0, 0, 0, .3);
+						text-align: center;
+						color: white;
+						font-size: 24rpx;
+						line-height: 40rpx;
+						position: absolute;
+						bottom: 0;
+					}
+				}
+
+				.card-content-r {
+					display: flex;
+					flex-direction: column;
+					justify-content: space-between;
+
+					.title {
+						font-size: 30rpx;
+						width: 500rpx;
+					}
+
+					.need {
+						color: #777777;
+						font-size: 24rpx;
+					}
+
+					.ipt {
+						display: flex;
+						height: 56rpx;
+
+					}
+				}
+
+				.status-png {
+					position: absolute;
+					right: 20rpx;
+				}
+
+			}
+
+			.card-footer {
+				margin-top: 30rpx;
+				text-align: right;
+				font-size: 28rpx;
+				color: #060606;
+			}
+		}
+
+		.submit-btn {
+			position: fixed;
+			bottom: 50rpx;
+			width: 710rpx;
+			margin: 0 auto;
+		}
+	}
+
+	.detail {
+		width: 88rpx;
+		height: 88rpx;
+		border-radius: 88rpx;
+		text-align: center;
+		line-height: 88rpx;
+		background-color: #50C758;
+		color: white;
+		position: absolute;
+		bottom: 300rpx;
+		right: 20rpx;
+	}
+
+	.ellipsis {
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+</style>
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 5c4b519..e9e6a40 100644
--- a/pages.json
+++ b/pages.json
@@ -306,6 +306,13 @@
 						"navigationBarTitleText": "余额明细",
 						"enablePullDownRefresh": true
 					}
+				},
+				{
+					"path" : "purchase_product_offer/index",
+					"style" : 
+					{
+						"navigationBarTitleText" : "采购商品列表"
+					}
 				}
 			]
 		}
diff --git a/pages/my/my.vue b/pages/my/my.vue
index 16cc26c..8289072 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -124,7 +124,7 @@
 				<up-cell title="支付密码" :isLink="true" url="/pagesOrder/setPayPassword/index"></up-cell>
 				<up-cell title="商品列表" :isLink="true" url="pages/product/product" v-if="userInfo.system_store_id>0"></up-cell>
 				<up-cell title="订单列表" :isLink="true" url="pagesOrder/delivery/index" v-if="userInfo.system_store_id>0"></up-cell>
-				
+				<up-cell title="采购列表" :isLink="true" url="pageQuota/purchase_product_offer/index"></up-cell>
 			</up-cell-group>
 		</view>
 
diff --git a/pagesOrder/settle/settle.vue b/pagesOrder/settle/settle.vue
index b1f8337..6c4e350 100644
--- a/pagesOrder/settle/settle.vue
+++ b/pagesOrder/settle/settle.vue
@@ -92,7 +92,7 @@
 					<text>¥</text>{{ c_price(orderInfo.pay_price, 0) }}<text>.{{ c_price(orderInfo.pay_price, 1) }}</text>
 				</view>
 				<view v-else>
-					<up-skeleton :loading="true" :animate="true" ></up-skeleton>
+					<up-skeleton :loading="true" :animate="true"></up-skeleton>
 				</view>
 			</view>
 			<view class="row">
@@ -101,15 +101,21 @@
 			</view>
 			<view class="row" v-if="[4,5,6].includes(userInfo.user_ship)" style="color: red;">
 				<view>优惠减免</view>
-				<view>
+				<view v-if="orderInfo.frozen_money">
 					<text>¥</text>{{ c_price(orderInfo.frozen_money, 0) }}<text>.{{ c_price(orderInfo.frozen_money, 1) }}</text>
 				</view>
+				<view v-else>
+					<up-skeleton :loading="true" :animate="true"></up-skeleton>
+				</view>
 			</view>
 			<view class="row" v-if="userInfo.user_ship==1 ">
 				<view>优惠返还</view>
-				<view>
+				<view v-if="orderInfo.activity_price">
 					<text>¥</text>{{ c_price(orderInfo.activity_price, 0) }}<text>.{{ c_price(orderInfo.activity_price, 1) }}</text>
 				</view>
+				<view v-else>
+					<up-skeleton :loading="true" :animate="true"></up-skeleton>
+				</view>
 			</view>
 		</view>
 
@@ -260,10 +266,10 @@
 
 	const userInfo = useUserStore().userInfo;
 	const shop_Info = ref({})
-	
+
 	//  用户选择的门店信息
 	let STORE_INFO = uni.getStorageSync('STORE_INFO');
-	if (STORE_INFO){
+	if (STORE_INFO) {
 		shop_Info.value = JSON.parse(STORE_INFO)
 	}