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 0000000..37557b5
Binary files /dev/null and b/static/imgs/mine/client-default.png differ