From 71b17aa943969d0638d311127350cdc959dd5dd2 Mon Sep 17 00:00:00 2001
From: buffeyu <271839173@qq.com>
Date: Sat, 22 Jan 2022 00:17:38 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=A2=E4=BB=B7=E5=88=97=E8=A1=A8=E5=AF=B9?=
 =?UTF-8?q?=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apis/addressManageApi.js                      |   17 +-
 apis/enquiryListApi.js                        |   13 +
 apis/setting.js                               |   32 +
 .../qn-input-number/qn-input-number.vue       |    2 +-
 pages.json                                    |   21 +-
 pages/account-management/index.vue            |  207 ++++
 pages/add-account/index.vue                   |  262 ++++
 pages/add-address-manage/index.vue            |   27 +-
 pages/address-manage/index.vue                |   42 +-
 pages/cart/index.vue                          | 1055 +++++++++--------
 pages/enquiry-list/index.vue                  |  312 ++++-
 pages/mine/index.vue                          |    4 +-
 pages/paper-details/index.vue                 |    6 +-
 pages/store/index.vue                         |    4 +-
 static/imgs/mine/client-default.png           |  Bin 0 -> 13288 bytes
 15 files changed, 1451 insertions(+), 553 deletions(-)
 create mode 100644 apis/enquiryListApi.js
 create mode 100644 apis/setting.js
 create mode 100644 pages/account-management/index.vue
 create mode 100644 pages/add-account/index.vue
 create mode 100644 static/imgs/mine/client-default.png

diff --git a/apis/addressManageApi.js b/apis/addressManageApi.js
index 67b164f..e9eb485 100644
--- a/apis/addressManageApi.js
+++ b/apis/addressManageApi.js
@@ -24,7 +24,22 @@ export const createAddress = (data = {}) => {
 // 删除收货地址 
 export const delAddress = (data = {}) => {
   return http.post({
-    url: '/uec​/delete​/enterprise-shipping-address',
+    url: '/uec/delete/enterprise-shipping-address',
+    data
+  })
+}
+// 设置默认地址 
+export const setDefaultAddress = (data = {}) => {
+  return http.post({
+    url: '/uec/set/enterprise-shipping-address/as/default',
+    data
+  })
+}
+// 通过id查询企业收货地址 /uec/get/enterprise-shipping-address-detail
+
+export const getAddressDetail = (data = {}) => {
+  return http.get({
+    url: '/uec/get/enterprise-shipping-address-detail',
     data
   })
 }
\ No newline at end of file
diff --git a/apis/enquiryListApi.js b/apis/enquiryListApi.js
new file mode 100644
index 0000000..f700d3d
--- /dev/null
+++ b/apis/enquiryListApi.js
@@ -0,0 +1,13 @@
+import http from '../utils/http/index.js'
+// 获取获取询价结果列表
+export function getEnquiryOrder(data) {
+  return http.get(
+    {
+      url: '/base-paper-trading/get/enquiry-order/result-list',
+      data
+    },
+    {
+      hideLoading: true
+    }
+  )
+}
\ No newline at end of file
diff --git a/apis/setting.js b/apis/setting.js
new file mode 100644
index 0000000..742b965
--- /dev/null
+++ b/apis/setting.js
@@ -0,0 +1,32 @@
+import http from '../utils/http/index.js'
+// 修改员工姓名
+export function employeeName(data) {
+  return http.post({
+    url: '/yyt-uec/update/my/employee-name?userId='+data.userId +'&enterpriseId=' +data.enterpriseId,
+    data
+  })
+}
+// 新增员工
+export function addEmployee(data) {
+  return http.post({
+    url: '/yyt-uec/enterprise/add/employee?userId='+data.userId +'&enterpriseId=' +data.enterpriseId,
+    data
+  })
+}
+// 员工列表
+export function employeeList(data) {
+	return http.get({
+		url: '/yyt-uec/enterprise/get/employee-list',
+		data
+	})
+}
+// 删除员工
+export function deleteEmployee(data) {
+	return http.post({
+		url: '/yyt-uec/enterprise/delete/employee?enterpriseId='+data.enterpriseId,
+		data
+	})
+}
+
+
+
diff --git a/components/qn-input-number/qn-input-number.vue b/components/qn-input-number/qn-input-number.vue
index 599604b..9651ea7 100644
--- a/components/qn-input-number/qn-input-number.vue
+++ b/components/qn-input-number/qn-input-number.vue
@@ -15,7 +15,7 @@
 export default {
 	props: {
 		quantity: {
-			type: Number,
+			type: [Number, String],
 			default: 0
 		}
 	},
diff --git a/pages.json b/pages.json
index 5b2450d..7e74dec 100644
--- a/pages.json
+++ b/pages.json
@@ -118,7 +118,8 @@
       "path": "pages/enquiry-list/index",
       "style": {
         "navigationBarTitleText": "询价列表",
-        "enablePullDownRefresh": false
+        "enablePullDownRefresh": false,
+		 "navigationStyle": "custom"
       }
     },
     {
@@ -134,7 +135,23 @@
         "navigationBarTitleText": "新建收货地址",
         "enablePullDownRefresh": false
       }
-    }
+    },
+	{
+	  "path": "pages/account-management/index",
+	  "style": {
+	    "navigationBarTitleText": "账号管理",
+	    "navigationStyle": "custom",
+	    "enablePullDownRefresh": false
+	  }
+	},
+	{
+	  "path": "pages/add-account/index",
+	  "style": {
+	    "navigationBarTitleText": "新增企业账号",
+	    "navigationStyle": "custom",
+	    "enablePullDownRefresh": false
+	  }
+	}
   ],
   "globalStyle": {
     "navigationBarTextStyle": "black",
diff --git a/pages/account-management/index.vue b/pages/account-management/index.vue
new file mode 100644
index 0000000..b63c50b
--- /dev/null
+++ b/pages/account-management/index.vue
@@ -0,0 +1,207 @@
+<template>
+	<view class="account-management">
+		<view>
+			<uni-nav-bar left-icon="back" @clickLeft="back" statusBar fixed title="">
+				<view class="account-management-title">账号管理</view>
+				<view slot="left"></view>
+				<view slot="right" class="add-account" @click="addAccount">添加账号</view>
+			</uni-nav-bar>
+		</view>
+		<view class="">
+			<scroll-list style="touch-action: none" ref="orderRef" :option="orderOption" @load="orderUp" @refresh="orderDown">
+				<view class="account-list" v-for="(item,index) in list" :key="index">
+					<view class="account-iamge-width"><image class="list-image" src="/static/imgs/mine/client-default.png" mode=""></image></view>
+					<view class="account-text">
+						<view class="account-name"><text>{{item.name}}-{{item.title}}</text></view>
+						<view class="account-phone"><text>{{item.mobile}}</text></view>
+					</view>
+					<view class="account-delete" @click="deleteAccount(item)"><text>删除账号</text></view>
+				</view>
+			</scroll-list>
+		</view>
+		<uni-popup ref="popup" type="dialog">
+		    <uni-popup-dialog type="info" mode="base" title="确认删除该账号？" :duration="2000" :before-close="true" @close="close" @confirm="confirm">
+				<view class="account-dialog-text">
+					<text>账号删除后无法在使用系统，请谨慎操作</text>
+				</view>
+			</uni-popup-dialog>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+import { back, go2 } from '@/utils/hook.js'
+import { employeeList,deleteEmployee } from '@/apis/setting.js'
+export default {
+	data() {
+		return {
+			orderOption: {
+				size: 10,
+				auto: true,
+				emptyText: '暂无用户~',
+				background: '#F7F8FA',
+				fontSize: '40rpx'
+			},
+			params: {
+				asc: '',
+				desc: '',
+				enterpriseId: this.$store.state.companyInfo.id,
+			},
+			pagination: {
+				pageNum: 0, // 初始会执行一次下拉加载
+				pageSize: 10
+			},
+			list:[],
+			deleteId:''
+		}
+	},
+	onShow() {
+		this.getList()
+	},
+	methods: {
+		back,
+		addAccount() {
+			go2('add-account')
+		},
+		deleteAccount(item){
+			// deleteEmployee
+			this.$refs.popup.open()
+			this.deleteId = item.id
+		},
+		confirm(){
+			var params= {
+				id:this.deleteId,
+				enterpriseId: this.$store.state.companyInfo.id,
+			}
+			deleteEmployee(params)
+				.then(res => {
+					if (res) {
+						uni.showToast({
+							title: '删除成功',
+							icon: 'success'
+						})
+						this.close()
+						this.pagination.pageNum = 1
+						this.getList()
+					} 
+				})
+				.catch(err => {
+					reject(err)
+				})
+		},
+		close(){
+			 this.$refs.popup.close()
+		},
+		// 获取用户列表
+		getList() {
+			return new Promise((resolve, reject) => {
+				employeeList({ ...this.params, ...this.pagination })
+					.then(res => {
+						if (res) {
+							if (this.pagination.pageNum == 1) {
+								this.list = res.records
+							} else {
+								this.list = this.list.concat(res.records)
+							}
+							resolve({ list: this.list, total: res.total })
+						} else {
+							reject()
+						}
+					})
+					.catch(err => {
+						reject(err)
+					})
+			})
+		},
+		//用户分页
+		orderUp(page) {
+			this.pagination.pageNum++
+			this.getList()
+				.then(({ list, total }) => {
+					this.$refs.orderRef.refreshSuccess({ list, total })
+				})
+				.catch(() => {
+					this.$refs.orderRef.loadFail()
+				})
+		},
+		//用户分页
+		orderDown() {
+			this.pagination.pageNum = 1
+			this.getList()
+				.then(({ list, total }) => {
+					this.$refs.orderRef.refreshSuccess({ list, total })
+				})
+				.catch(() => {
+					this.$refs.orderRef.refreshFail()
+				})
+		}
+	}
+}
+</script>
+
+<style lang="scss">
+.account-management {
+	.account-management-title {
+		width: 100%;
+		font-size: 36rpx;
+		color: #000000;
+		letter-spacing: 0;
+		text-align: center;
+		font-weight: 500;
+	}
+	.add-account {
+		font-size: 28rpx;
+		color: #007aff;
+		text-align: right;
+		line-height: 40rpx;
+		font-weight: 500;
+	}
+	.list-image {
+		width: 100rpx;
+		height: 100rpx;
+		border-radius: 50rpx;
+	}
+	.account-list {
+		display: flex;
+		align-items: center;
+		height: 148rpx;
+		background-color: #ffffff;
+	}
+	.account-name {
+		font-size: 30rpx;
+		color: #333333;
+		letter-spacing: 0;
+		font-weight: 500;
+	}
+	.account-phone {
+		font-size: 26rpx;
+		color: #888888;
+		letter-spacing: 0;
+		text-align: left;
+		line-height: 32rpx;
+		font-weight: 400;
+	}
+	.account-delete {
+		font-size: 28rpx;
+		color: #f5222d;
+		text-align: right;
+		line-height: 40rpx;
+		font-weight: 400;
+	}
+	.account-text {
+		width: 60%;
+		line-height: 60rpx;
+	}
+	.account-iamge-width {
+		margin-left: 32rpx;
+		width: 15%;
+	}
+	.account-dialog-text{
+		font-size: 28rpx;
+		color: #969799;
+		text-align: center;
+		line-height: 40rpx;
+		font-weight: 400;
+	}
+}
+</style>
diff --git a/pages/add-account/index.vue b/pages/add-account/index.vue
new file mode 100644
index 0000000..41f470a
--- /dev/null
+++ b/pages/add-account/index.vue
@@ -0,0 +1,262 @@
+<template>
+	<view class="add-account">
+		<view>
+			<uni-nav-bar left-icon="back" @clickLeft="back" statusBar fixed title="">
+				<view class="add-account-title">新增企业账号</view>
+				<view slot="left"></view>
+				<view slot="right"></view>
+			</uni-nav-bar>
+		</view>
+		<view class="">
+			<view class="add-paper-list">
+				<view>
+					<text class="add-paper-start"><uni-icons custom-prefix="iconfont" type="icon-required" size="14" color="#F5222D"></uni-icons></text>
+					<text class="add-paper-text">手机号</text>
+				</view>
+				<view class="add-paper-input">
+					<qn-easyinput
+						type="number"
+						:maxlength="11"
+						:styles="{ disableColor: '#fff' }"
+						v-model="form.mobile"
+						:inputBorder="false"
+						text="right"
+						placeholder="请输入手机号"
+					></qn-easyinput>
+				</view>
+			</view>
+			<view class="add-paper-border"></view>
+			<view class="add-paper-list">
+				<view>
+					<text class="add-paper-start"><uni-icons custom-prefix="iconfont" type="icon-required" size="14" color="#F5222D"></uni-icons></text>
+					<text class="add-paper-text">用户号</text>
+				</view>
+				<view class="add-paper-input">
+					<qn-easyinput type="text" :styles="{ disableColor: '#fff' }" v-model="form.name" :inputBorder="false" text="right" placeholder="请输入用户号"></qn-easyinput>
+				</view>
+			</view>
+			<view class="add-paper-border"></view>
+			<view class="add-paper-list" @click="paperpopupShow()">
+				<view>
+					<text class="add-paper-start"><uni-icons custom-prefix="iconfont" type="icon-required" size="14" color="#F5222D"></uni-icons></text>
+					<text class="add-paper-text">职务</text>
+				</view>
+				<!-- categoryId -->
+				<view class="">
+					<text v-if="form.title === ''" class="add-paph-text">点击选择职务</text>
+					<text v-else>{{ form.title }}</text>
+					<text><uni-icons type="right" color="#000000" size="18"></uni-icons></text>
+				</view>
+			</view>
+		</view>
+		<view class="uploud-btn">
+			<view class=""><button type="primary" class="btn-class" plain="true" @click="cencelList()">取消</button></view>
+			<view class=""><button type="primary" class="btn-class-upload" @click="uploadData()">确认</button></view>
+		</view>
+		<uni-popup ref="paperpopup" type="bottom">
+			<view class="popup_modal">
+				<!-- <slot name="title"><view class="popup_modal-title">选择纸种</view></slot> -->
+				<scroll-view scroll-y="true" class="popup_modal-scroll">
+					<view @click="paperSelectChange(item)" class="popup_modal-scroll-item" v-for="item in paperList" :key="item.id">{{ item.name }}</view>
+					<uGap></uGap>
+					<view class="cencel-btn" @click="cencelbtn">取消</view>
+				</scroll-view>
+			</view>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+import { back, go2, uploadFile } from '@/utils/hook.js'
+import uGap from '@/components/u-gap/u-gap.vue'
+import { addEmployee } from '@/apis/setting.js'
+const validateFields = ['mobile', 'name', 'title']
+export default {
+	data() {
+		return {
+			form: {
+				title: ''
+			},
+			paperList: [
+				{
+					name: '管理员',
+					id: '1'
+				},
+				{
+					name: '业务员',
+					id: '2'
+				},
+				{
+					name: '司机',
+					id: '3'
+				},
+				{
+					name: '分切',
+					id: '4'
+				},
+				{
+					name: '库管',
+					id: '5'
+				}
+			]
+		}
+	},
+	components: { uGap },
+	methods: {
+		back,
+		paperpopupShow() {
+			this.$refs.paperpopup.open('bottom')
+		},
+		paperSelectChange(item) {
+			this.$set(this.form, 'title', item.name)
+			this.$refs.paperpopup.close()
+		},
+		cencelbtn() {
+			this.$refs.paperpopup.close()
+		},
+		cencelList(){
+			back()
+		},
+		uploadData() {
+			for (let i = 0; i < validateFields.length; i++) {
+				if (this.form[validateFields[i]] === null || this.form[validateFields[i]] === '') {
+					uni.showToast({
+						title: '请完善信息',
+						icon: 'none'
+					})
+					return
+				}
+			}
+			var params = {
+				...this.form,
+				enterpriseId: this.$store.state.companyInfo.id,
+				// userId:this.$store.state.userInfo.userId,
+			}
+			addEmployee(params).then(res => {
+				if (res) {
+					uni.showToast({
+						title: '添加成功',
+						icon: 'success'
+					})
+					setTimeout(() => {
+						back()
+					}, 1000)
+				}
+			})
+		}
+	}
+}
+</script>
+
+<style lang="scss">
+.add-account {
+	.add-account-title {
+		width: 100%;
+		font-size: 36rpx;
+		color: #000000;
+		letter-spacing: 0;
+		text-align: center;
+		font-weight: 500;
+	}
+	.add-account {
+		font-size: 28rpx;
+		color: #007aff;
+		text-align: right;
+		line-height: 40rpx;
+		font-weight: 500;
+	}
+	.add-paper-border {
+		border-bottom: 2rpx solid #d8d8d8;
+		margin-left: 32rpx;
+	}
+	.add-paper-list {
+		height: 88rpx;
+		background: #ffffff;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		padding-left: 32rpx;
+		padding-right: 32rpx;
+	}
+	.add-paper-text {
+		font-size: 28rpx;
+		color: #000000;
+		letter-spacing: 0;
+		font-weight: 400;
+	}
+	.add-paper-start {
+		font-size: 28rpx;
+		color: #f5222d;
+		letter-spacing: 0;
+		font-weight: 400;
+	}
+	.add-paper-input {
+		width: 40%;
+	}
+	.popup_modal {
+		width: 750rpx;
+		height: 600rpx;
+		background-color: #fff;
+		border-radius: 10rpx 10rpx 0 0;
+		.popup_modal-title {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			justify-content: center;
+			width: 750rpx;
+			height: 88rpx;
+			font-weight: 600;
+			border-bottom: 2rpx solid #d8d8d8;
+		}
+		.popup_modal-scroll {
+			width: 750rpx;
+			height: 600rpx;
+			.popup_modal-scroll-item {
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				justify-content: center;
+				width: 750rpx;
+				height: 88rpx;
+				padding: 0rpx 32rpx;
+				border-bottom: 2rpx solid #d8d8d8;
+			}
+		}
+	}
+	.cencel-btn {
+		font-size: 32rpx;
+		color: #646566;
+		text-align: center;
+		line-height: 44rpx;
+		font-weight: 400;
+		margin-top: 40rpx;
+	}
+	.add-paph-text {
+		font-size: 28rpx;
+		color: #888888;
+		letter-spacing: 0;
+		font-weight: 400;
+	}
+	.btn-class {
+		height: 88rpx;
+		border-radius: 10rpx;
+		line-height: 80rpx;
+		width: 150px;
+	}
+	.btn-class-upload {
+		height: 88rpx;
+		border-radius: 10rpx;
+		line-height: 80rpx;
+		width: 200px;
+	}
+	.uploud-btn {
+		    display: flex;
+		    justify-content: space-between;
+		    padding: 20rpx 32rpx;
+		    background-color: #ffffff;
+		    position: absolute;
+		    bottom: 0rpx;
+		    width: 100%;
+	}
+}
+</style>
diff --git a/pages/add-address-manage/index.vue b/pages/add-address-manage/index.vue
index 8f3139c..0111af3 100644
--- a/pages/add-address-manage/index.vue
+++ b/pages/add-address-manage/index.vue
@@ -63,7 +63,7 @@ import { getArea } from '@/apis/commonApi.js'
 import { back } from '@/utils/hook.js'
 import qnFooter from '@/components/qn-footer/qn-footer.vue'
 import qnDataPicker from '@/components/qn-data-picker/qn-data-picker.vue'
-import { createAddress } from '@/apis/addressManageApi.js'
+import { createAddress, getAddressDetail } from '@/apis/addressManageApi.js'
 export default {
 	components: { uGap, qnFooter, qnDataPicker },
 	data() {
@@ -85,7 +85,8 @@ export default {
 				streetName: '',
 			},
 			hasSelected: false,
-			items: []
+			items: [],
+			id: null,
 		}
 	},
 	mounted() {
@@ -95,8 +96,22 @@ export default {
 			}
 		})
 	},
-	onLoad() {},
-	methods: {
+	onLoad(option) {
+		if(option.id) {
+		this.id = option.id
+			this.getAddressDetail()
+		}
+	},
+	methods: {
+		// 通过id查询收货地址
+		getAddressDetail() {
+			getAddressDetail({id: this.id}).then(res => {
+				// console.log('收货地址详情', res)
+				if(res) {
+					this.form = Object.assign({}, res)
+				} 
+			})
+		},
 		onAreaChange(e) {
 			if (e.detail.value && e.detail.value.length > 0) {
 				const [province, city, district, street] = e.detail.value
@@ -127,9 +142,9 @@ export default {
 		// 保存
 		addTap() {
 			createAddress(this.form).then(res => {
-				if (res) {
+				if (res) {
 					uni.showToast({
-						title: '添加成功',
+						title: '保存成功',
 						icon: 'success'
 					})
 					setTimeout(() => {
diff --git a/pages/address-manage/index.vue b/pages/address-manage/index.vue
index 12818a1..eb51d80 100644
--- a/pages/address-manage/index.vue
+++ b/pages/address-manage/index.vue
@@ -2,15 +2,15 @@
 	<view class="warpper">
 		<uni-nav-bar left-icon="back" @clickLeft="back" statusBar fixed title="收货地址"></uni-nav-bar>
 		<view class="content" v-for="(item, index) in list" :key="index">
-			<view class="info-box">
+			<view class="info-box" @tap="selectAddress(item)">
 				<view class="name">{{item.receiver}}  {{item.receiverMobile}}</view>
 				<view class="address">{{item.provinceName}}{{item.cityName}}{{item.districtName}}{{item.streetName}}{{item.detail}}</view>
 			</view>
 			<view class="other">
 				<view class="left">
-					<label>
-						<radio :value="item.isDefault == 0" :checked="item.isDefault == 0" style="transform:scale(0.8)" />
-						设置为默认
+					<label @tap="radioTap(item)">
+						<radio :checked="item.isDefault == 1" style="transform:scale(0.8)" />
+						<text :class="item.isDefault == 1 ? 'radioText' : 'not-radioText'">{{item.isDefault == 1 ? '已设为默认' : '设为默认'}}</text>
 					</label>
 				</view>
 				<view class="right">
@@ -51,7 +51,7 @@
 <script>
 import { go2, back, setCache } from '@/utils/hook.js'
 import qnFooter from '@/components/qn-footer/qn-footer.vue'
-import { getAddress, delAddress } from '@/apis/addressManageApi.js'
+import { getAddress, delAddress, setDefaultAddress } from '@/apis/addressManageApi.js'
 export default {
 	components:{ qnFooter },
   data() {
@@ -67,7 +67,7 @@ export default {
   onShow() {
   	this.queryData()
   },
-  onLoad() {},
+ 
   methods: {
     go2,
     back,
@@ -78,10 +78,17 @@ export default {
 		}
 		getAddress(params).then(res => {
 			if(res) {
-				console.log('收货地址', res)
 				this.list = res
 			}
 		})
+	},
+	// 设置默认地址
+	radioTap(item) {
+		setDefaultAddress({id: item.id}).then(res =>{
+			if(res) {
+				this.queryData()
+			}
+		})
 	},
     // 选择地址
     selectAddress(item) {
@@ -89,7 +96,8 @@ export default {
         setCache('address', item)
         back()
       }
-    },
+    },
+
 	// 新增收货地址
 	addTap() {
 		go2('add-address-manage')
@@ -102,7 +110,7 @@ export default {
 	},
 	// 编辑
 	editTap(item, index) {
-		go2('add-address-manage')
+		go2('add-address-manage', {id: item.id})
 	},
 	confirmTap() {
 		delAddress({id: this.id}).then(res => {
@@ -122,7 +130,7 @@ export default {
 	}
   },
   onLoad(option) {
-    if (option) {
+    if (option) {
       this.operation = option.operation
     }
   }
@@ -159,7 +167,19 @@ export default {
 			align-items: center;
 			padding: 0rpx 32rpx;
 			height: 80rpx;
-			background: #ffffff;
+			background: #ffffff;
+			.radioText {
+				font-size: 28rpx;
+				color: #007AFF;
+				letter-spacing: 0;
+				font-weight: 400;
+			}
+			.not-radioText {
+				font-size: 28rpx;
+				color: #888888;
+				letter-spacing: 0;
+				font-weight: 400;
+			}
 			.left {
 				font-size: 28rpx;
 				color: #007aff;
diff --git a/pages/cart/index.vue b/pages/cart/index.vue
index 3ee63c8..a1bd75b 100644
--- a/pages/cart/index.vue
+++ b/pages/cart/index.vue
@@ -1,507 +1,550 @@
-<template>
-	<view class="warpper">
-		<uni-nav-bar :fixed="true" color="#ffffff" background-color="#ffffff" :status-bar="true">
-			<view slot="left" class="left-title">购物车</view>
-			<view slot="right" v-if="pageShow" class="right-title" @tap="delTap">删除</view>
-		</uni-nav-bar>
-		<view class="" v-if="pageShow">
-			<scroll-list ref="list" :option="option" @load="upCallback" @refresh="downCallback" style="background-color: #FFFFFF;">
-				<view class="group-box" v-for="(item, index) in list" :key="index">
-					<uGap></uGap>
-					<view class="group-checkbox">
-						<view class="checkbox" @tap="checkboxGroupTap(item, index)">
-							<image
-								class="select-img"
-								:src="item.checkedGroup ? '/static/imgs/cart/shopping-cart-select.png' : '/static/imgs/cart/shopping-cart-not-select.png'"
-								mode=""
-							></image>
-							<!-- <checkbox-group @change="onCheck"><checkbox value="cb" :checked="checked" color="#000000" style="transform: scale(0.7)" /></checkbox-group> -->
-						</view>
-						<view class="">{{ item.supplierName }}</view>
-					</view>
-					<view class="list-box" v-for="(subItem, subIndex) in item.carItemList" :key="subIndex">
-						<view class="checkbox" @tap="checkboxTap(item, subItem)">
-							<image
-								class="select-img"
-								:src="subItem.checked ? '/static/imgs/cart/shopping-cart-select.png' : '/static/imgs/cart/shopping-cart-not-select.png'"
-								mode=""
-							></image>
-							<!-- <checkbox-group @change="onCheck"><checkbox value="cb" :checked="checked" color="#000000" style="transform: scale(0.7)" /></checkbox-group> -->
-						</view>
-						<view class="list-row">
-							<image class="image" src="https://qncloud.oss-cn-shenzhen.aliyuncs.com/ztb_pic/testPic.jfif" mode=""></image>
-							<view class="right">
-								<view class="name">{{ subItem.productName }}</view>
-								<view class="measure">{{ subItem.gramWeight }}g｜{{ subItem.width }}*{{ subItem.length }}</view>
-								<view class="weight">预估重量：{{ subItem.weight }}吨</view>
-								<view class="price-row">
-									<view class="value">¥{{ subItem.price }}</view>
-									<view class=""><qnInputNumber :quantity="subItem.quantity" @change="change($event,item, subItem)" /></view>
-								</view>
-							</view>
-						</view>
-					</view>
-				</view>
-			</scroll-list>
-			<view class="footer-box">
-				<view class="row">
-					<view class="left" @tap="selectAll">
-						<view class="">
-							<image
-								class="select-img"
-								:src="allSelected ? '/static/imgs/cart/shopping-cart-select.png' : '/static/imgs/cart/shopping-cart-not-select.png'"
-								mode=""
-							></image>
-						</view>
-						<view class=""><text class="check-text">全选</text></view>
-					</view>
-					<view class="right">
-						<view class="">
-							<text class="name">应付：</text>
-							<text class="value">¥{{totalPrice}}</text>
-						</view>
-						<view class="right-balance-btn" >结算</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		<uni-popup ref="popup" type="center" :mask-click="false">
-			<view class="popup-box">
-				<view class="tip-title">{{ allSelected ? '确定将购物车纸品删除吗？' : '确定将当前纸品删除吗？' }}</view>
-				<view class="operation-row">
-					<view class="cancel-text" @tap="cancelTap">取消</view>
-					<view class="line"></view>
-					<view class="confirm-text" @tap="confirmTap">确定</view>
-				</view>
-			</view>
-		</uni-popup>
-		<no-data v-if="!pageShow"></no-data>
-	</view>
-</template>
-
-<script>
-import uGap from '@/components/u-gap/u-gap.vue'
-import qnFooter from '@/components/qn-footer/qn-footer.vue'
-import { back, go2 } from '@/utils/hook.js'
-import qnInputNumber from '@/components/qn-input-number/qn-input-number.vue'
-import { getShoppingCarList, removeShoppingCar, closePaperReserve } from '@/apis/cartApi.js'
-import noData from './no-data.vue'
-export default {
-	components: { uGap, qnInputNumber, qnFooter, noData },
-	data() {
-		return {
-			pageShow: true,
-			option: {
-				size: 10,
-				auto: true,
-				// height: '90%',
-				emptyText: '暂无数据~',
-				background: '#F7F8FA',
-				disabled: false
-			},
-			params: {
-				userId: this.$store.state.userInfo.userId || null
-			},
-			pagination: {
-				pageNum: 0, // 初始会执行一次下拉加载
-				pageSize: 10
-			},
-			checked: false,
-			list: [],
-			idList: []
-		}
-	},
-	created() {
-		let that = this
-		uni.getSystemInfo({
-			success: function(res) {
-				console.log('状态栏的高', res.statusBarHeight)
-				that.option.height = res.windowHeight * (750 / res.windowWidth) - 180
-			}
-		})
-	},
-	onShow() {
-		this.getList()
-	},
-	onLoad() {},
-	computed: {
-		allSelected: {
-			get() {
-				if (this.list && this.list.length) {
-					return this.list.every(shop => {
-						return shop.checkedGroup
-					})
-				}
-				return false
-			},
-			set(val) {
-				if (this.list && this.list.length) {
-					this.list.forEach(shop => {
-						shop.checkedGroup = val
-						shop.carItemList.forEach(good => {
-							good.checked = val
-						})
-					})
-				}
-			}
-		},
-		totalPrice() {
-			let num = 0
-			if (this.list && this.list.length) { 
-				this.list.forEach(shop => {
-					shop.carItemList.forEach(good => {
-						if(good.checked) {
-							num += Number(good.price) * Number(good.quantity)
-						}
-					})
-				})
-			}
-			return num
-		} 
-	},
-	methods: {
-		getList() {
-			return new Promise((resolve, reject) => {
-				getShoppingCarList({ ...this.params, ...this.pagination })
-					.then(res => {
-						// console.log('购物车', res)
-						if (res) {
-							if (res.records.length == 0) {
-								this.pageShow = false
-								return
-							}
-							res.records.forEach(el => {
-								el.checkedGroup = false
-								el.carItemList.forEach(item => {
-									item.checked = false
-								})
-							})
-							if (this.pagination.pageNum == 1) {
-								this.list = res.records
-							} else {
-								this.list = this.list.concat(res.records)
-							}
-							// this.list = []
-							// this.list = [...this.list, ...[1, 2, 3, 4, 5, 6, 7, 8, 9, 10]]
-							resolve({ list: this.list, total: res.total })
-						}
-					})
-					.catch(err => {
-						reject(err)
-					})
-			})
-		},
-		downCallback() {
-			this.pagination.pageNum = 1
-			this.getList()
-				.then(({ list, total }) => {
-					this.$refs.list.refreshSuccess({ list, total })
-				})
-				.catch(() => {
-					this.$refs.list.refreshFail()
-				})
-		},
-		upCallback() {
-			this.pagination.pageNum++
-			this.getList()
-				.then(({ list, total }) => {
-					this.$refs.list.loadSuccess({ list, total })
-				})
-				.catch(() => {
-					this.$refs.list.loadFail()
-				})
-		},
-		// 分组全选
-		checkboxGroupTap(item, index) {
-			item.checkedGroup = !item.checkedGroup
-			item.carItemList.forEach(el => {
-				el.checked = item.checkedGroup
-			})
-		},
-		/**
-		 * @param {Object} shop
-		 * @param {Object} good 子项
-		 */
-		checkboxTap(shop, good) {
-			good.checked = !good.checked
-			// 所在店铺根据商品是否全部选中
-			shop.checkedGroup = this.isShopSelectedAll(shop.carItemList)
-		},
-		// 店铺中的商品是否全选
-		isShopSelectedAll(products) {
-			let tempArr = true
-			for (var j = 0; j < products.length; j++) {
-				if (!products[j].checked) {
-					tempArr = false
-					break
-				}
-			}
-			return tempArr
-		},
-		// 全选
-		selectAll() {
-			this.allSelected = !this.allSelected
-		},
-		delTap() {
-			// idList
-			this.idList = []
-			this.list.forEach(el => {
-				el.carItemList.forEach(good => {
-					if (good.checked) {
-						this.idList.push(good.id)
-					}
-				})
-			})
-			console.log('this.idList', this.idList)
-			if (this.idList.length === 0) {
-				uni.showToast({
-					title: '暂未选择商品',
-					icon: 'none'
-				})
-				return
-			}
-			this.$refs.popup.open('center')
-		},
-		confirmTap() {
-			const params = {
-				idList: this.idList,
-				userId: this.$store.state.userInfo.userId
-			}
-			removeShoppingCar(params).then(res => {
-				this.$refs.popup.close()
-				if(res) {
-					uni.showToast({
-						title: '删除成功！',
-						icon: 'success'
-					})
-					this.pagination.pageNum = 1
-					this.getList()
-				}
-			})
-			
-		},
-		cancelTap() {
-			this.$refs.popup.close()
-		},
-		/**
-		 * @param {Number} num
-		 * 计数器返回值
-		 */
-		change(num, shop, good) {
-			good.quantity = num
-		}
-	}
-}
-</script>
-
-<style lang="scss">
-.warpper {
-	.left-title {
-		font-size: 40rpx;
-		color: #000000;
-		letter-spacing: 0;
-		font-weight: 500;
-	}
-	.right-title {
-		font-size: 28rpx;
-		color: #f5222d;
-		text-align: right;
-		font-weight: 500;
-		float: right;
-	}
-	.group-box {
-		// padding: 0rpx 32rpx;
-		.group-checkbox {
-			display: flex;
-			flex-direction: row;
-			align-items: center;
-			height: 88rpx;
-			background: #ffffff;
-			padding: 0rpx 32rpx;
-		}
-	}
-	.select-img {
-		width: 32rpx;
-		height: 32rpx;
-	}
-	.checkbox {
-		flex: 0 0 35rpx;
-		margin-right: 20rpx;
-	}
-	.list-box {
-		width: 100%;
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		border-top: 2rpx solid #d8d8d8;
-		padding: 28rpx 32rpx 40rpx 32rpx;
-		.list-row {
-			flex: 1;
-			display: flex;
-			flex-direction: row;
-			.image {
-				flex: 0 0 180rpx;
-				width: 180rpx;
-				height: 180rpx;
-				border-radius: 8px;
-				margin-right: 16rpx;
-			}
-			.right {
-				flex: 1;
-				width: 100%;
-			}
-			.name {
-				font-size: 34rpx;
-				color: #333333;
-				letter-spacing: 0;
-				text-align: left;
-				font-weight: 600;
-				padding-top: 10rpx;
-			}
-			.measure {
-				font-size: 24rpx;
-				color: #333333;
-				letter-spacing: 0;
-				text-align: left;
-				font-weight: 500;
-				margin-top: 16rpx;
-			}
-			.weight {
-				text-align: center;
-				font-size: 24rpx;
-				color: #888888;
-				font-weight: 400;
-				text-align: right;
-				padding-top: 4rpx;
-			}
-			.price-row {
-				display: flex;
-				flex-direction: row;
-				align-items: center;
-				justify-content: space-between;
-				padding-top: 12rpx;
-				.value {
-					font-size: 30rpx;
-					color: #f5222d;
-					letter-spacing: 0;
-					text-align: left;
-					font-weight: 500;
-				}
-			}
-		}
-	}
-	.footer-box {
-		.check-text {
-			font-size: 24rpx;
-			color: #333333;
-			letter-spacing: 0;
-			text-align: center;
-			font-weight: 400;
-			padding-left: 12rpx;
-			vertical-align: middle;
-		}
-		.row {
-			display: flex;
-			flex-direction: row;
-			align-items: center;
-			height: 96rpx;
-			background: #ffffff;
-			padding: 0rpx 32rpx;
-			.left {
-				flex: 0 0 200rpx;
-				display: flex;
-				flex-direction: row;
-				// align-items: center;
-			}
-			.right {
-				// flex: 1;
-				flex-shrink: 1;
-				flex-grow: 1;
-				// width: 100%;
-				display: flex;
-				flex-direction: row;
-				justify-content: space-between;
-				align-items: center;
-				.name {
-					font-size: 28rpx;
-					color: rgba(0, 0, 0, 0.85);
-					text-align: right;
-					font-weight: 400;
-				}
-				.value {
-					vertical-align: middle;
-					font-size: 36rpx;
-					color: #f5222d;
-					letter-spacing: 0;
-					text-align: left;
-					font-weight: 500;
-				}
-			}
-			.right-balance-btn {
-				width: 201rpx;
-				height: 76rpx;
-				line-height: 76rpx;
-				background: #007aff;
-				border-radius: 38rpx;
-				font-size: 32rpx;
-				color: #ffffff;
-				letter-spacing: 0;
-				text-align: center;
-				font-weight: 400;
-			}
-		}
-	}
-	.popup-box {
-		width: 540rpx;
-		height: 226rpx;
-		background: #ffffff;
-		border-radius: 14rpx;
-		.tip-title {
-			display: flex;
-			flex-direction: row;
-			justify-content: center;
-			align-items: center;
-			height: 126rpx;
-			font-size: 32rpx;
-			color: #333333;
-			letter-spacing: 0;
-			text-align: center;
-			font-weight: 400;
-		}
-		.operation-row {
-			display: flex;
-			flex-direction: row;
-			justify-content: space-around;
-			align-items: center;
-			height: 100rpx;
-			background: #ffffff;
-			border-top: 2rpx solid #dddddd;
-			.cancel-text {
-				flex-grow: 1;
-				flex-shrink: 1;
-				font-size: 36rpx;
-				color: #000000;
-				letter-spacing: 0;
-				text-align: center;
-				font-weight: 400;
-			}
-			.line {
-				flex-grow: 0;
-				flex-shrink: 0;
-				width: 2rpx;
-				height: 100rpx;
-				border-left: 2rpx solid #dcdee3;
-			}
-			.confirm-text {
-				flex-grow: 1;
-				flex-shrink: 1;
-				font-size: 36rpx;
-				color: #108ee9;
-				letter-spacing: 0;
-				text-align: center;
-				font-weight: 400;
-			}
-		}
-	}
-}
+<template>
+	<view class="warpper">
+		<uni-nav-bar :fixed="true" color="#ffffff" background-color="#ffffff" :status-bar="true">
+			<view slot="left" class="left-title">购物车</view>
+			<view slot="right" v-if="pageShow" class="right-title" @tap="delTap">删除</view>
+		</uni-nav-bar>
+		<view class="" v-if="pageShow">
+			<scroll-list ref="list" :option="option" @load="upCallback" @refresh="downCallback" style="background-color: #FFFFFF;">
+				<view class="group-box" v-for="(item, index) in list" :key="index">
+					<uGap></uGap>
+					<view class="group-checkbox">
+						<view class="checkbox" @tap="checkboxGroupTap(item, index)">
+							<image
+								class="select-img"
+								:src="item.checkedGroup ? '/static/imgs/cart/shopping-cart-select.png' : '/static/imgs/cart/shopping-cart-not-select.png'"
+								mode=""
+							></image>
+							<!-- <checkbox-group @change="onCheck"><checkbox value="cb" :checked="checked" color="#000000" style="transform: scale(0.7)" /></checkbox-group> -->
+						</view>
+						<view class="">{{ item.supplierName }}</view>
+					</view>
+					<view class="list-box" v-for="(subItem, subIndex) in item.carItemList" :key="subIndex">
+						<view class="checkbox" @tap="checkboxTap(item, subItem)">
+							<image
+								class="select-img"
+								:src="subItem.checked ? '/static/imgs/cart/shopping-cart-select.png' : '/static/imgs/cart/shopping-cart-not-select.png'"
+								mode=""
+							></image>
+							<!-- <checkbox-group @change="onCheck"><checkbox value="cb" :checked="checked" color="#000000" style="transform: scale(0.7)" /></checkbox-group> -->
+						</view>
+						<view class="list-row">
+							<image class="image" @tap="seeDetailsTap(subItem)" src="https://qncloud.oss-cn-shenzhen.aliyuncs.com/ztb_pic/testPic.jfif" mode=""></image>
+							<view class="right">
+								<view class="name">{{ subItem.productName }}</view>
+								<view class="measure">{{ subItem.gramWeight }}g｜{{ subItem.width }}*{{ subItem.length }}</view>
+								<view class="weight">预估重量：{{ subItem.weight }}吨</view>
+								<view class="price-row">
+									<view class="value">¥{{ subItem.price }}</view>
+									<view class=""><qnInputNumber :quantity="subItem.quantity" @change="change($event, item, subItem)" /></view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</scroll-list>
+			<view class="footer-box">
+				<view class="row">
+					<view class="left" @tap="selectAll">
+						<view class="">
+							<image
+								class="select-img"
+								:src="allSelected ? '/static/imgs/cart/shopping-cart-select.png' : '/static/imgs/cart/shopping-cart-not-select.png'"
+								mode=""
+							></image>
+						</view>
+						<view class=""><text class="check-text">全选</text></view>
+					</view>
+					<view class="right">
+						<view class="">
+							<text class="name">应付：</text>
+							<text class="value">¥{{ totalPrice }}</text>
+						</view>
+						<view class="right-balance-btn" @tap="closeAnAccountTap">结算</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<uni-popup ref="popup" type="center" :mask-click="false">
+			<view class="popup-box">
+				<view class="tip-title">{{ allSelected ? '确定将购物车纸品删除吗？' : '确定将当前纸品删除吗？' }}</view>
+				<view class="operation-row">
+					<view class="cancel-text" @tap="cancelTap">取消</view>
+					<view class="line"></view>
+					<view class="confirm-text" @tap="confirmTap">确定</view>
+				</view>
+			</view>
+		</uni-popup>
+		<no-data v-if="!pageShow"></no-data>
+	</view>
+</template>
+
+<script>
+import uGap from '@/components/u-gap/u-gap.vue'
+import qnFooter from '@/components/qn-footer/qn-footer.vue'
+import { back, go2 } from '@/utils/hook.js'
+import qnInputNumber from '@/components/qn-input-number/qn-input-number.vue'
+import { getShoppingCarList, removeShoppingCar, closePaperReserve } from '@/apis/cartApi.js'
+import noData from './no-data.vue'
+export default {
+	components: { uGap, qnInputNumber, qnFooter, noData },
+	data() {
+		return {
+			pageShow: true,
+			option: {
+				size: 10,
+				auto: true,
+				// height: '90%',
+				emptyText: '暂无数据~',
+				background: '#F7F8FA',
+				disabled: false
+			},
+			params: {
+				userId: this.$store.state.userInfo.userId || null
+			},
+			pagination: {
+				pageNum: 0, // 初始会执行一次下拉加载
+				pageSize: 10
+			},
+			checked: false,
+			list: [],
+			idList: []
+		}
+	},
+	created() {
+		let that = this
+		uni.getSystemInfo({
+			success: function(res) {
+				// console.log('状态栏的高', res.statusBarHeight)
+				that.option.height = res.windowHeight * (750 / res.windowWidth) - 180
+			}
+		})
+	},
+	onShow() {
+		this.getList()
+	},
+	onLoad() {},
+	computed: {
+		allSelected: {
+			get() {
+				if (this.list && this.list.length) {
+					return this.list.every(shop => {
+						return shop.checkedGroup
+					})
+				}
+				return false
+			},
+			set(val) {
+				if (this.list && this.list.length) {
+					this.list.forEach(shop => {
+						shop.checkedGroup = val
+						shop.carItemList.forEach(good => {
+							good.checked = val
+						})
+					})
+				}
+			}
+		},
+		totalPrice() {
+			let num = 0
+			if (this.list && this.list.length) {
+				this.list.forEach(shop => {
+					shop.carItemList.forEach(good => {
+						if (good.checked) {
+							num += Number(good.price) * Number(good.quantity)
+						}
+					})
+				})
+			}
+			return num
+		}
+	},
+	methods: {
+		// 跳转详情
+		seeDetailsTap(item) {
+			// go2('paper-details', { id: '681179176769818624' })
+		},
+		// 结算
+		closeAnAccountTap() {
+			let orderGoodsList = []
+			this.list.forEach(el => {
+				el.carItemList.forEach(good => {
+					if (good.checked) {
+						let obj = {
+							buyTon: good.weight,
+							gramWeight: good.weight,
+							length: good.length,
+							mallSupplierId: good.id,
+							pieceQuantity: good.quantity,
+							productId: good.productId,
+							productSkuId: good.productSkuId,
+							unitPrice: good.price,
+							width: good.width
+						}
+						orderGoodsList.push(obj)
+					}
+				})
+			})
+			if (orderGoodsList.length === 0) {
+				uni.showToast({
+					title: '暂未选择商品',
+					icon: 'none'
+				})
+				return
+			}
+			const params = {
+				orderGoodsList: orderGoodsList,
+				purchaserEnterpriseId: this.$store.state.companyInfo.id,
+				userId: this.$store.state.userInfo.userId,
+			}
+			closePaperReserve(params).then(res => {
+				if(res) {
+					
+				}
+			})
+		},
+		getList() {
+			return new Promise((resolve, reject) => {
+				getShoppingCarList({ ...this.params, ...this.pagination })
+					.then(res => {
+						console.log('购物车', res)
+						if (res) {
+							if (res.records.length == 0) {
+								this.pageShow = false
+								return
+							}
+							res.records.forEach(el => {
+								el.checkedGroup = false
+								el.carItemList.forEach(item => {
+									item.checked = false
+								})
+							})
+							if (this.pagination.pageNum == 1) {
+								this.list = res.records
+							} else {
+								this.list = this.list.concat(res.records)
+							}
+							// this.list = []
+							// this.list = [...this.list, ...[1, 2, 3, 4, 5, 6, 7, 8, 9, 10]]
+							resolve({ list: this.list, total: res.total })
+						}
+					})
+					.catch(err => {
+						reject(err)
+					})
+			})
+		},
+		downCallback() {
+			this.pagination.pageNum = 1
+			this.getList()
+				.then(({ list, total }) => {
+					this.$refs.list.refreshSuccess({ list, total })
+				})
+				.catch(() => {
+					this.$refs.list.refreshFail()
+				})
+		},
+		upCallback() {
+			this.pagination.pageNum++
+			this.getList()
+				.then(({ list, total }) => {
+					this.$refs.list.loadSuccess({ list, total })
+				})
+				.catch(() => {
+					this.$refs.list.loadFail()
+				})
+		},
+		// 分组全选
+		checkboxGroupTap(item, index) {
+			item.checkedGroup = !item.checkedGroup
+			item.carItemList.forEach(el => {
+				el.checked = item.checkedGroup
+			})
+		},
+		/**
+		 * @param {Object} shop
+		 * @param {Object} good 子项
+		 */
+		checkboxTap(shop, good) {
+			good.checked = !good.checked
+			// 所在店铺根据商品是否全部选中
+			shop.checkedGroup = this.isShopSelectedAll(shop.carItemList)
+		},
+		// 店铺中的商品是否全选
+		isShopSelectedAll(products) {
+			let tempArr = true
+			for (var j = 0; j < products.length; j++) {
+				if (!products[j].checked) {
+					tempArr = false
+					break
+				}
+			}
+			return tempArr
+		},
+		// 全选
+		selectAll() {
+			this.allSelected = !this.allSelected
+		},
+		delTap() {
+			// idList
+			this.idList = []
+			this.list.forEach(el => {
+				el.carItemList.forEach(good => {
+					if (good.checked) {
+						this.idList.push(good.id)
+					}
+				})
+			})
+			if (this.idList.length === 0) {
+				uni.showToast({
+					title: '暂未选择商品',
+					icon: 'none'
+				})
+				return
+			}
+			this.$refs.popup.open('center')
+		},
+		confirmTap() {
+			const params = {
+				idList: this.idList,
+				userId: this.$store.state.userInfo.userId
+			}
+			removeShoppingCar(params).then(res => {
+				this.$refs.popup.close()
+				if (res) {
+					uni.showToast({
+						title: '删除成功！',
+						icon: 'success'
+					})
+					this.pagination.pageNum = 1
+					this.getList()
+				}
+			})
+		},
+		cancelTap() {
+			this.$refs.popup.close()
+		},
+		/**
+		 * @param {Number} num
+		 * 计数器返回值
+		 */
+		change(num, shop, good) {
+			good.quantity = num
+			let buyTon = Number(good.gramWeight) * Number(good.quantity)
+			good.weight = (buyTon / (1000 * 1000)).toFixed(4)
+		}
+	}
+}
+</script>
+
+<style lang="scss">
+.warpper {
+	.left-title {
+		font-size: 40rpx;
+		color: #000000;
+		letter-spacing: 0;
+		font-weight: 500;
+	}
+	.right-title {
+		font-size: 28rpx;
+		color: #f5222d;
+		text-align: right;
+		font-weight: 500;
+		float: right;
+	}
+	.group-box {
+		// padding: 0rpx 32rpx;
+		.group-checkbox {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			height: 88rpx;
+			background: #ffffff;
+			padding: 0rpx 32rpx;
+		}
+	}
+	.select-img {
+		width: 32rpx;
+		height: 32rpx;
+	}
+	.checkbox {
+		flex: 0 0 35rpx;
+		margin-right: 20rpx;
+	}
+	.list-box {
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		border-top: 2rpx solid #d8d8d8;
+		padding: 28rpx 32rpx 40rpx 32rpx;
+		.list-row {
+			flex: 1;
+			display: flex;
+			flex-direction: row;
+			.image {
+				flex: 0 0 180rpx;
+				width: 180rpx;
+				height: 180rpx;
+				border-radius: 8px;
+				margin-right: 16rpx;
+			}
+			.right {
+				flex: 1;
+				width: 100%;
+			}
+			.name {
+				font-size: 34rpx;
+				color: #333333;
+				letter-spacing: 0;
+				text-align: left;
+				font-weight: 600;
+				padding-top: 10rpx;
+			}
+			.measure {
+				font-size: 24rpx;
+				color: #333333;
+				letter-spacing: 0;
+				text-align: left;
+				font-weight: 500;
+				margin-top: 16rpx;
+			}
+			.weight {
+				text-align: center;
+				font-size: 24rpx;
+				color: #888888;
+				font-weight: 400;
+				text-align: right;
+				padding-top: 4rpx;
+			}
+			.price-row {
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				justify-content: space-between;
+				padding-top: 12rpx;
+				.value {
+					font-size: 30rpx;
+					color: #f5222d;
+					letter-spacing: 0;
+					text-align: left;
+					font-weight: 500;
+				}
+			}
+		}
+	}
+	.footer-box {
+		.check-text {
+			font-size: 24rpx;
+			color: #333333;
+			letter-spacing: 0;
+			text-align: center;
+			font-weight: 400;
+			padding-left: 12rpx;
+			vertical-align: middle;
+		}
+		.row {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			height: 96rpx;
+			background: #ffffff;
+			padding: 0rpx 32rpx;
+			.left {
+				flex: 0 0 200rpx;
+				display: flex;
+				flex-direction: row;
+				// align-items: center;
+			}
+			.right {
+				// flex: 1;
+				flex-shrink: 1;
+				flex-grow: 1;
+				// width: 100%;
+				display: flex;
+				flex-direction: row;
+				justify-content: space-between;
+				align-items: center;
+				.name {
+					font-size: 28rpx;
+					color: rgba(0, 0, 0, 0.85);
+					text-align: right;
+					font-weight: 400;
+				}
+				.value {
+					vertical-align: middle;
+					font-size: 36rpx;
+					color: #f5222d;
+					letter-spacing: 0;
+					text-align: left;
+					font-weight: 500;
+				}
+			}
+			.right-balance-btn {
+				width: 201rpx;
+				height: 76rpx;
+				line-height: 76rpx;
+				background: #007aff;
+				border-radius: 38rpx;
+				font-size: 32rpx;
+				color: #ffffff;
+				letter-spacing: 0;
+				text-align: center;
+				font-weight: 400;
+			}
+		}
+	}
+	.popup-box {
+		width: 540rpx;
+		height: 226rpx;
+		background: #ffffff;
+		border-radius: 14rpx;
+		.tip-title {
+			display: flex;
+			flex-direction: row;
+			justify-content: center;
+			align-items: center;
+			height: 126rpx;
+			font-size: 32rpx;
+			color: #333333;
+			letter-spacing: 0;
+			text-align: center;
+			font-weight: 400;
+		}
+		.operation-row {
+			display: flex;
+			flex-direction: row;
+			justify-content: space-around;
+			align-items: center;
+			height: 100rpx;
+			background: #ffffff;
+			border-top: 2rpx solid #dddddd;
+			.cancel-text {
+				flex-grow: 1;
+				flex-shrink: 1;
+				font-size: 36rpx;
+				color: #000000;
+				letter-spacing: 0;
+				text-align: center;
+				font-weight: 400;
+			}
+			.line {
+				flex-grow: 0;
+				flex-shrink: 0;
+				width: 2rpx;
+				height: 100rpx;
+				border-left: 2rpx solid #dcdee3;
+			}
+			.confirm-text {
+				flex-grow: 1;
+				flex-shrink: 1;
+				font-size: 36rpx;
+				color: #108ee9;
+				letter-spacing: 0;
+				text-align: center;
+				font-weight: 400;
+			}
+		}
+	}
+}
 </style>
diff --git a/pages/enquiry-list/index.vue b/pages/enquiry-list/index.vue
index e042861..3d65687 100644
--- a/pages/enquiry-list/index.vue
+++ b/pages/enquiry-list/index.vue
@@ -1,20 +1,292 @@
-<template>
-  <view>
-    <uni-nav-bar left-icon="back" @clickLeft="back" statusBar fixed title="询价列表"></uni-nav-bar>
-  </view>
-</template>
-
-<script>
-import { go2, back } from '@/utils/hook.js'
-export default {
-  data() {
-    return {}
-  },
-  methods: {
-    go2,
-    back
-  }
-}
-</script>
-
-<style lang="scss" scoped></style>
+<template>
+	<view class="warpper">
+		<uni-nav-bar left-icon="back" @clickLeft="back" statusBar fixed title="询价列表"></uni-nav-bar>
+		<view class="">
+			<view class="status-bar">
+				<view v-for="(item, index) in statusBarArray" :key="index" :class="{ box: true, 'box--selected': current == index }" @click="selectStatus(item, index)">
+					{{ item }}
+				</view>
+			</view>
+			<scroll-list ref="list" :option="option" @load="upCallback" @refresh="downCallback" style="background-color: #ffffff">
+				<view class="content" v-for="(item, index) in list" :key="index">
+					<uGap v-if="index > 0"></uGap>
+					<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>
+						</view>
+					</view>
+					<view class="box">
+						<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>
+						</view>
+					</view>
+					<view class="other" v-if="item.status == 30114">
+						<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>
+					</view>
+				</view>
+			</scroll-list>
+		</view>
+	</view>
+</template>
+
+<script>
+import { go2, back } from '@/utils/hook.js'
+import uGap from '@/components/u-gap/u-gap.vue'
+import { getEnquiryOrder } from '@/apis/enquiryListApi.js'
+export default {
+	components: { uGap },
+	data() {
+		return {
+			current: 0,
+			statusBarArray: ['全部', '待报价', '已报价', '已成交'],
+			option: {
+				size: 10,
+				auto: true,
+				emptyText: '暂无数据~',
+				background: '#F7F8FA',
+				disabled: false,
+				 emptyImage: '/static/imgs/order/order-empty.png'
+			},
+			
+			pagination: {
+				enterpriseId: this.$store.state.companyInfo.id || null,
+				status: 0,
+				pageNum: 0, // 初始会执行一次下拉加载
+				pageSize: 10
+			},
+			list: []
+		}
+	},
+	filters: {
+		statusName(e) {
+			let name = ''
+			switch (e) {
+				case 30114:
+					name = '待报价'
+					break
+				case 30116:
+					name = '已报价'
+					break
+				case 30131:
+					name = '已成交'
+					break
+				case 30138:
+					name = '已失效'
+					break
+				default:
+					break
+			}
+			return name
+		}
+	},
+	onShow() {
+		// this.getList()
+	},
+	methods: {
+		go2,
+		back,
+		selectStatus(item, index) {
+			this.current = index
+			this.pagination.status = index
+			this.downCallback()
+		},
+		getList() {
+			return new Promise((resolve, reject) => {
+				getEnquiryOrder({ ...this.pagination })
+					.then(res => {
+						// console.log('询价列表', res.records)
+						if (res) {
+							if (this.pagination.pageNum == 1) {
+								this.list = res.records
+							} else {
+								this.list = this.list.concat(res.records)
+							}
+							resolve({ list: this.list, total: res.total })
+						} else {
+							reject()
+						}
+					})
+					.catch(err => {
+						reject(err)
+					})
+			})
+		},
+		downCallback() {
+			this.pagination.pageNum = 1
+			this.getList()
+				.then(({ list, total }) => {
+					this.$refs.list.refreshSuccess({ list, total })
+				})
+				.catch(() => {
+					this.$refs.list.refreshFail()
+				})
+		},
+		upCallback() {
+			this.pagination.pageNum++
+			this.getList()
+				.then(({ list, total }) => {
+					this.$refs.list.loadSuccess({ list, total })
+				})
+				.catch(() => {
+					this.$refs.list.loadFail()
+				})
+		},
+		// 确认下单
+		placeOrderTap(item) {
+				go2('order-make', { orderId: item.id })
+		}
+	}
+}
+</script>
+
+<style lang="scss" scoped>
+.warpper {
+	display: flex;
+	flex-direction: column;
+	flex: 1;
+	height: 100vh;
+	.status-bar {
+		flex-grow: 0;
+		flex-shrink: 0;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 0 32rpx;
+		// border-bottom: 2rpx solid #DDDDDD;
+		background-color: #fff;
+		border-bottom: 2rpx solid rgba($color: #dddddd, $alpha: 0.8);
+		height: 90rpx;
+		.box {
+			height: 86rpx;
+			flex-grow: 0;
+			flex-shrink: 0;
+			color: #000000;
+			font-size: 28rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			// border-bottom: 4rpx solid #f8f8f8;
+		}
+		.box--selected {
+			border-bottom: 4rpx solid #007aff;
+			color: #007aff;
+		}
+	}
+	.content {
+		.header {
+			display: flex;
+			flex-direction: row;
+			justify-content: space-between;
+			align-items: center;
+			height: 88rpx;
+			background: #ffffff;
+			padding: 0rpx 32rpx;
+			border-bottom: 2rpx solid #dddddd;
+			.header-title {
+				font-size: 30rpx;
+				color: #333333;
+				letter-spacing: 0;
+				font-weight: 500;
+			}
+			.header-value {
+				font-size: 30rpx;
+				color: #ff5368;
+				letter-spacing: 0;
+				text-align: right;
+				font-weight: 500;
+				.failure {
+					color: #888888;
+				}
+			}
+		}
+		.box {
+			padding: 24rpx 32rpx;
+			.list-box:nth-last-child(even) {
+				border-bottom: 2rpx solid #dddddd;
+			}
+			.list-box {
+				display: flex;
+				flex-direction: row;
+				height: 148rpx;
+				background: #ffffff;
+
+				padding: 24rpx 0rpx;
+				.image {
+					width: 100rpx;
+					height: 100rpx;
+					flex: 0 0 100rpx;
+					margin-right: 20rpx;
+				}
+				.info-box {
+					.name {
+						font-size: 30rpx;
+						color: #333333;
+						letter-spacing: 0;
+						text-align: left;
+						font-weight: 400;
+						padding-top: 4rpx;
+					}
+					.value {
+						font-size: 26rpx;
+						color: #888888;
+						letter-spacing: 0;
+						text-align: left;
+						font-weight: 400;
+						padding-top: 26rpx;
+					}
+				}
+			}
+		}
+		.other {
+			display: flex;
+			flex-direction: row;
+			justify-content: space-between;
+			align-items: center;
+			padding: 0rpx 32rpx;
+			height: 80rpx;
+			background: #ffffff;
+			border-top: 2rpx solid #dddddd;
+			.left {
+				font-size: 26rpx;
+				color: #888888;
+				letter-spacing: 0;
+				text-align: left;
+				font-weight: 400;
+			}
+			.right {
+				display: flex;
+				align-items: center;
+				.price {
+					font-size: 30rpx;
+					color: #ff5368;
+					letter-spacing: 0;
+					text-align: right;
+					font-weight: 500;
+				}
+				.btn {
+					margin-left: 24rpx;
+					width: 132rpx;
+					height: 54rpx;
+					line-height: 54rpx;
+					background: #007aff;
+					border-radius: 27rpx;
+					font-size: 28rpx;
+					color: #ffffff;
+					letter-spacing: 0;
+					text-align: center;
+					font-weight: 500;
+				}
+			}
+		}
+	}
+}
+</style>
diff --git a/pages/mine/index.vue b/pages/mine/index.vue
index 0ce0904..a804713 100644
--- a/pages/mine/index.vue
+++ b/pages/mine/index.vue
@@ -96,7 +96,7 @@
         <text style="font-size: 30rpx; color: rgba(0, 0, 0, 0.85); font-weight: 600">其他工具</text>
       </view>
       <view class="icon-area">
-        <view class="icon-item" style="margin-right: 64rpx">
+        <view class="icon-item" style="margin-right: 64rpx" @click="go2('account-management')">
           <image class="icon" src="/static/imgs/mine/account-icon.png"></image>
           <text class="label">账号管理</text>
         </view>
@@ -105,7 +105,7 @@
           <text class="label">我的询价</text>
         </view>
         <view class="icon-item" style="margin-right: 64rpx">
-          <image class="icon" src="/static/imgs/mine/address-icon.png"></image>
+          <image class="icon" src="/static/imgs/mine/address-icon.png"  @click="go2('address-manage')"></image>
           <text class="label">收货地址</text>
         </view>
       </view>
diff --git a/pages/paper-details/index.vue b/pages/paper-details/index.vue
index 08c0add..5c84bae 100644
--- a/pages/paper-details/index.vue
+++ b/pages/paper-details/index.vue
@@ -249,9 +249,11 @@ export default {
 			this.$refs.popup.close()
 		},
 		// 重量切换
-		weightTap(item, index) {
+		weightTap(item, index) {
 			this.kgActive = index
-			this.buyPaperDto.gramWeight = item.weight
+			this.buyPaperDto.gramWeight = item.weight
+			this.buyPaperDto.unitPrice = item.listPrice
+			this.buyPaperDto.productSkuId = item.id
 		},
 		// 规格切换
 		specificationTap(item, index) {
diff --git a/pages/store/index.vue b/pages/store/index.vue
index 200b437..5e8d7e2 100644
--- a/pages/store/index.vue
+++ b/pages/store/index.vue
@@ -30,7 +30,7 @@
 		</view>
 		<scroll-list ref="list" :option="option" @load="upCallback" @refresh="downCallback" style="background-color: #FFFFFF;">
 			<view class="content">
-				<view class="box" v-for="(item, index) in list" :key="index" >
+				<view class="box" v-for="(item, index) in list" :key="index"  @tap="seeDetailsTap(item)">
 					<view class="image-box">
 						<view class=""><image class="special-img" :src="item.isPromoting ? '/static/imgs/store/special-offe.png' : ''" mode=""></image></view>
 						<image class="image" :src="item.litPicUrl || 'https://qncloud.oss-cn-shenzhen.aliyuncs.com/ztb_pic/testPic.jfif'" mode=""></image>
@@ -48,7 +48,7 @@
 							<text class="price">{{ item.priceRange }}</text>
 							<!-- <text class="unit">/吨</text> -->
 						</view>
-						<view class="btn" @tap="seeDetailsTap(item)">马上抢</view>
+						<view class="btn">马上抢</view>
 					</view>
 				</view>
 			</view>
diff --git a/static/imgs/mine/client-default.png b/static/imgs/mine/client-default.png
new file mode 100644
index 0000000000000000000000000000000000000000..37557b540cac7836a7607171d86a39650c747bb6
GIT binary patch
literal 13288
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

literal 0
HcmV?d00001