From 1566b4d41df5e5d284d80f59385c1f5f8bb1ec3d Mon Sep 17 00:00:00 2001
From: buffeyu <yeqingyu@dimine.net>
Date: Mon, 24 Jan 2022 14:33:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B4=AD=E7=89=A9=E8=BD=A6?=
 =?UTF-8?q?=E3=80=81=E8=AF=A2=E4=BB=B7=E8=AE=A2=E5=8D=95=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apis/enquiryListApi.js         | 13 ++++++++
 pages/cart/index.vue           |  6 ++--
 pages/enquiry-list/index.vue   | 61 ++++++++++++++++++++++++++--------
 pages/for-comparison/index.vue |  3 +-
 pages/paper-details/index.vue  |  3 +-
 5 files changed, 67 insertions(+), 19 deletions(-)

diff --git a/apis/enquiryListApi.js b/apis/enquiryListApi.js
index f700d3d..921dea6 100644
--- a/apis/enquiryListApi.js
+++ b/apis/enquiryListApi.js
@@ -10,4 +10,17 @@ export function getEnquiryOrder(data) {
       hideLoading: true
     }
   )
+}
+/**
+ * 询价单去下单
+ * swagger:https://api-ops-yyt-test.qniao.cn//base-paper-trading/swagger-ui/index.html?urls.primaryName=CustomerApi#/%E5%8E%9F%E7%BA%B8%E8%AE%A2%E5%8D%95/createCustomerOrderByEnquiryUsingPOST
+ * 
+ */
+export function createByEnquiry(data) {
+  return http.post(
+    {
+      url: '/base-paper-trading/buyer/paper/goods/reserve/by-enquiry',
+      data
+    }
+  )
 }
\ No newline at end of file
diff --git a/pages/cart/index.vue b/pages/cart/index.vue
index 2d963aa..0f76900 100644
--- a/pages/cart/index.vue
+++ b/pages/cart/index.vue
@@ -151,12 +151,12 @@ export default {
 				this.list.forEach(shop => {
 					shop.carItemList.forEach(good => {
 						if (good.checked) {
-							num += Number(good.price) * Number(good.quantity)
+							num += Number(good.price) * Number(good.weight)
 						}
 					})
 				})
 			}
-			return num
+			return num.toFixed(4)
 		}
 	},
 	methods: {
@@ -199,7 +199,7 @@ export default {
 				// purchaserEnterpriseId: '677166943471538176',
 				// userId: '573244119569272832',
 			}
-			console.log('params', params)
+			// console.log('params', params)
 			closePaperReserve(params).then(res => {
 				if(res) {
 					go2('order-make', { orderId: res.orderId })
diff --git a/pages/enquiry-list/index.vue b/pages/enquiry-list/index.vue
index 3d65687..48ed8a1 100644
--- a/pages/enquiry-list/index.vue
+++ b/pages/enquiry-list/index.vue
@@ -13,23 +13,38 @@
 					<view class="header">
 						<view class="header-title">{{ item.belongEnterpriseName }}</view>
 						<view class="header-value">
-							<text :class="(item.status == 30131 || item.status == 30138) ? 'failure' : ''">{{ item.status | statusName }}</text>
+							<text :class="item.status == 30131 || item.status == 30138 ? 'failure' : ''">{{ item.status | statusName }}</text>
 						</view>
 					</view>
-					<view class="box">
+					<view class="box" v-if="item.status != 30116 || item.status != 30131">
 						<view class="list-box" v-for="(sitem, sindex) in item.itemList" :key="sindex">
 							<image class="image" :src="sitem.productImg || 'https://qncloud.oss-cn-shenzhen.aliyuncs.com/ztb_pic/testPic.jfif'" mode=""></image>
 							<view class="info-box">
-								<view class="name">{{sitem.brandName}}</view>
-								<view class="value">{{sitem.categoryName}}/{{sitem.paperName}}/{{sitem.gramWeight}}g/{{sitem.width}}*{{sitem.length}}/{{sitem.quantity}}张</view>
+								<view class="name">{{ sitem.brandName }}</view>
+								<view class="value">
+									{{ sitem.categoryName }}/{{ sitem.paperName }}/{{ sitem.gramWeight }}g/{{ sitem.width }}*{{ sitem.length }}/{{ sitem.quantity }}张
+								</view>
 							</view>
 						</view>
 					</view>
-					<view class="other" v-if="item.status == 30114">
-						<view class="left">{{item.createTime}}</view>
+					<view class="box" v-else>
+						<view class="list-box" v-for="(sitem, sindex) in item.reply.replyItemList" :key="sindex">
+							<image class="image" :src="sitem.productImg || 'https://qncloud.oss-cn-shenzhen.aliyuncs.com/ztb_pic/testPic.jfif'" mode=""></image>
+							<view class="info-box">
+								<view class="name">{{ sitem.brandName }}</view>
+								<view class="value">
+									{{ sitem.categoryName }}/{{ sitem.paperName }}/{{ sitem.gramWeight }}g/{{ sitem.width }}*{{ sitem.length }}/{{ sitem.quantity }}张
+								</view>
+							</view>
+						</view>
+					</view>
+					<view class="other" v-if="item.status == 30116 || item.status == 30131">
+						<view class="left">{{ item.createTime }}</view>
 						<view class="right">
-							<view class=""><text class="price" v-if="item.reply">¥ {{item.reply.totalPrice}}</text></view>
-							<view class="btn" @tap="placeOrderTap(item)" v-if="item.status == 30116">去下单</view>
+							<view class="">
+								<text class="price" v-if="item.reply">¥ {{ item.reply.totalPrice }}</text>
+							</view>
+							<view class="btn" @tap="placeOrderTap(item,item.reply.replyItemList)" v-if="item.status == 30116">去下单</view>
 						</view>
 					</view>
 				</view>
@@ -41,7 +56,7 @@
 <script>
 import { go2, back } from '@/utils/hook.js'
 import uGap from '@/components/u-gap/u-gap.vue'
-import { getEnquiryOrder } from '@/apis/enquiryListApi.js'
+import { getEnquiryOrder, createByEnquiry } from '@/apis/enquiryListApi.js'
 export default {
 	components: { uGap },
 	data() {
@@ -54,11 +69,10 @@ export default {
 				emptyText: '暂无数据~',
 				background: '#F7F8FA',
 				disabled: false,
-				 emptyImage: '/static/imgs/order/order-empty.png'
+				emptyImage: '/static/imgs/order/order-empty.png'
 			},
-			
+
 			pagination: {
-				enterpriseId: this.$store.state.companyInfo.id || null,
 				status: 0,
 				pageNum: 0, // 初始会执行一次下拉加载
 				pageSize: 10
@@ -141,8 +155,27 @@ export default {
 				})
 		},
 		// 确认下单
-		placeOrderTap(item) {
-				go2('order-make', { orderId: item.id })
+		placeOrderTap(item, replyItemList) {
+			console.log('replyItemList', replyItemList)
+			const params = {
+				enquiryId: item.id,
+				orderGoodsList: replyItemList,
+				purchaserEnterpriseId: this.$store.state.companyInfo.id,
+				userId: this.$store.state.userInfo.userId,
+				// purchaserEnterpriseId: '677166943471538176',
+				// userId: '573244119569272832',
+			}
+			createByEnquiry(params).then(res => {
+				if (res) {
+					uni.showToast({
+						title: '下单成功',
+						icon: 'success'
+					})
+					setTimeout(() => {
+						go2('order-make', { orderId: item.orderId })
+					}, 500)
+				}
+			})
 		}
 	}
 }
diff --git a/pages/for-comparison/index.vue b/pages/for-comparison/index.vue
index ec39fc8..0358d9f 100644
--- a/pages/for-comparison/index.vue
+++ b/pages/for-comparison/index.vue
@@ -1,5 +1,6 @@
 <template>
 	<view class="content">
+		<uni-nav-bar left-icon="back" @clickLeft="back" statusBar fixed title="实单询比价"></uni-nav-bar>
 		<view>
 			<view class="hint-box">全网优质原纸供应商，20分钟极速响应。</view>
 			<view class="qn-form-item qn-form-item">
@@ -171,7 +172,7 @@ export default {
 					disabled: true
 				},
 				{
-					name: '特规分切',
+					name: '大度',
 					width: '889',
 					length: '1194',
 					disabled: true
diff --git a/pages/paper-details/index.vue b/pages/paper-details/index.vue
index 5c84bae..bf14f91 100644
--- a/pages/paper-details/index.vue
+++ b/pages/paper-details/index.vue
@@ -250,6 +250,7 @@ export default {
 		},
 		// 重量切换
 		weightTap(item, index) {
+			console.log('item', item)
 			this.kgActive = index
 			this.buyPaperDto.gramWeight = item.weight
 			this.buyPaperDto.unitPrice = item.listPrice
@@ -278,7 +279,7 @@ export default {
 				const params = {
 					  length: this.specificationObj.length,
 					  productId: this.info.id,
-					  productSkuId: this.info.skuList[0].id,
+					  productSkuId: this.buyPaperDto.productSkuId,
 					  quantity: this.buyPaperDto.pieceQuantity,
 					  supplierId: this.info.supplierId,
 					  width: this.specificationObj.width,