From 0a8c5da7f2ae651ae0e16a41d87ae72a99a6a0ef Mon Sep 17 00:00:00 2001
From: dengxiongfei <dengxiongfei@qniao.cn>
Date: Wed, 26 Jan 2022 12:18:53 +0800
Subject: [PATCH 1/6] bug

---
 pages/cart/index.vue  | 1088 +++++++++++++++++++++--------------------
 pages/mine/index.vue  |    9 +-
 pages/store/index.vue |   30 +-
 3 files changed, 578 insertions(+), 549 deletions(-)

diff --git a/pages/cart/index.vue b/pages/cart/index.vue
index 5baa75a..44e3ed3 100644
--- a/pages/cart/index.vue
+++ b/pages/cart/index.vue
@@ -1,555 +1,565 @@
 <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>
+  <view class="wrapper">
+    <view v-if="!hasLogin" class="flex-row-center-center">
+      <view style="margin-top: 400rpx">
+        <text style="font-size: 34rpx">请先</text>
+        <text style="color: #007aff; font-size: 34rpx" @click="go2('login')">登录</text>
+      </view>
+    </view>
+    <view v-else>
+      <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>
+  </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 { 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'
 import { round } from '@/utils/index.js'
 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 += round( good.price * good.weight, 4)
-						}
-					})
-				})
-			}
-			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: el.supplierId,
-							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,
-				// purchaserEnterpriseId: '677166943471538176',
-				// userId: '573244119569272832',
-			}
-			// console.log('params', params)
-			closePaperReserve(params).then(res => {
-				if(res) {
-					go2('order-make', { orderId: res.orderId })
-				}
-			})
-		},
-		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
-			good.weight = round(good.gramWeight * good.width * good.length * good.quantity * 1e-12, 4)
-			// let buyTon = Number(good.gramWeight) * Number(good.quantity)
-			// good.weight = (buyTon / (1000 * 1000)).toFixed(4)
-		}
-	}
+  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) {
+        that.option.height = res.windowHeight * (750 / res.windowWidth) - 180
+      }
+    })
+  },
+  onShow() {
+    this.hasLogin && this.downCallback()
+  },
+  computed: {
+    hasLogin() {
+      return this.$store.state.qnToken != ''
+    },
+    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 += round(good.price * good.weight, 4)
+            }
+          })
+        })
+      }
+      return num
+    }
+  },
+  methods: {
+    go2,
+    // 跳转详情
+    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: el.supplierId,
+              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
+        // purchaserEnterpriseId: '677166943471538176',
+        // userId: '573244119569272832',
+      }
+      // console.log('params', params)
+      closePaperReserve(params).then((res) => {
+        if (res) {
+          go2('order-make', { orderId: res.orderId })
+        }
+      })
+    },
+    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
+      good.weight = round(good.gramWeight * good.width * good.length * good.quantity * 1e-12, 4)
+      // 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;
-			}
-		}
-	}
+.wrapper {
+  .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>
+</style>
diff --git a/pages/mine/index.vue b/pages/mine/index.vue
index d522f8a..cb3c815 100644
--- a/pages/mine/index.vue
+++ b/pages/mine/index.vue
@@ -27,7 +27,7 @@
               </view>
             </view>
           </view>
-          <view class="logout" @click="logout">
+          <view v-if="hasLogin" class="logout" @click="logout">
             <text class="text">退出登录</text>
             <image class="icon" src="/static/imgs/mine/logout-icon.png"></image>
           </view>
@@ -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" @click="go2('account-management')">
+        <view class="icon-item" style="margin-right: 64rpx" @click="loginGo2('account-management')">
           <image class="icon" src="/static/imgs/mine/account-icon.png"></image>
           <text class="label">账号管理</text>
         </view>
@@ -105,13 +105,11 @@
           <text class="label">我的询价</text>
         </view>
         <view class="icon-item" style="margin-right: 64rpx" @click="loginGo2('address-manage')">
-          <image class="icon" src="/static/imgs/mine/address-icon.png"  @click="go2('address-manage')"></image>
+          <image class="icon" src="/static/imgs/mine/address-icon.png"></image>
           <text class="label">收货地址</text>
         </view>
       </view>
     </view>
-    <view @click="loginGo2('test')">test</view>
-    <view @click="loginGo2('order-detail')">order-detail</view>
     <view @click="loginGo2('enterprise-info')">enterprise-info</view>
   </view>
 </template>
@@ -217,6 +215,7 @@ export default {
         }
       })
     this.hasLogin && getBaseInfo({}, true)
+    !this.hasLogin && (this.fsInfo.status = -1)
   }
 }
 </script>
diff --git a/pages/store/index.vue b/pages/store/index.vue
index 58067ee..19a14de 100644
--- a/pages/store/index.vue
+++ b/pages/store/index.vue
@@ -1,6 +1,6 @@
 <template>
-  <view class="warpper">
-	  <uni-nav-bar statusBar fixed title="店铺首页"></uni-nav-bar>
+  <view class="wrapper">
+    <uni-nav-bar statusBar fixed title="店铺首页"></uni-nav-bar>
     <view class="top-box">
       <view class="">
         <!-- <image class="image" src="https://qncloud.oss-cn-shenzhen.aliyuncs.com/paper_shopkeeper/paper-default-small.png" mode=""></image> -->
@@ -50,7 +50,7 @@
           </view>
           <view class="footer">
             <view class="left">
-              <text class="price">{{ item.priceRange }}</text>
+              <text :class="{ price: true, 'price-single': hasLogin, 'price-range': !hasLogin }">{{ transformPrice(item.priceRange) }}</text>
               <!-- <text class="unit">/吨</text> -->
             </view>
             <view class="btn">马上抢</view>
@@ -157,13 +157,28 @@ export default {
       this.params.name = value
       this.pagination.pageNum = 1
       this.getList()
+    },
+    transformPrice(value) {
+      if (this.hasLogin) {
+        return `¥${value}`
+      } else {
+        return `¥${value - 150}~¥${value - 0 + 400}`
+      }
+    }
+  },
+  onShow() {
+    this.downCallback()
+  },
+  computed: {
+    hasLogin() {
+      return this.$store.state.qnToken != ''
     }
   }
 }
 </script>
 
 <style lang="scss">
-.warpper {
+.wrapper {
   .header {
     justify-content: space-between;
     .header-title {
@@ -314,11 +329,16 @@ export default {
           flex-shrink: 1;
         }
         .price {
-          font-size: 34rpx;
           color: #f5222d;
           letter-spacing: 0;
           font-weight: 600;
         }
+        .price-single {
+          font-size: 34rpx;
+        }
+        .price-range {
+          font-size: 24rpx;
+        }
         .unit {
           font-size: 24rpx;
           color: #f5222d;

From 711f109785973eb3bfea5d305963a7ddb59dcd2a Mon Sep 17 00:00:00 2001
From: dengxiongfei <dengxiongfei@qniao.cn>
Date: Wed, 26 Jan 2022 13:03:57 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E8=AF=A2=E4=BB=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/for-comparison/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/for-comparison/index.vue b/pages/for-comparison/index.vue
index 87b1c4f..9164fc2 100644
--- a/pages/for-comparison/index.vue
+++ b/pages/for-comparison/index.vue
@@ -85,7 +85,7 @@
         </view>
         <view class="value">
           <view class="value">
-            <qn-easyinput :maxlength="20" v-model="form.quantity" :inputBorder="false" text="right" placeholder="请输入数量"></qn-easyinput>
+            <qn-easyinput :maxlength="20" type="number" v-model="form.quantity" :inputBorder="false" text="right" placeholder="请输入数量"></qn-easyinput>
           </view>
         </view>
       </view>

From 0106b943e7672428763eae5e87f96e01baeb327c Mon Sep 17 00:00:00 2001
From: dengxiongfei <dengxiongfei@qniao.cn>
Date: Wed, 26 Jan 2022 16:31:29 +0800
Subject: [PATCH 3/6] bug

---
 components/scroll-list/scroll-list.vue | 62 +++++++++++++-------------
 pages.json                             |  1 +
 pages/notification-page/index.vue      |  2 +-
 pages/paper-details/index.vue          | 15 +++++--
 pages/store/index.vue                  | 23 ++++++----
 utils/http/index.js                    |  2 +-
 6 files changed, 60 insertions(+), 45 deletions(-)

diff --git a/components/scroll-list/scroll-list.vue b/components/scroll-list/scroll-list.vue
index 261facc..e820af6 100644
--- a/components/scroll-list/scroll-list.vue
+++ b/components/scroll-list/scroll-list.vue
@@ -24,11 +24,12 @@
           </view>
         </view>
         <view class="empty-wrap" v-if="showEmpty">
-          <slot name="empty" v-if="$slots.empty"></slot>
-          <view class="empty-view" v-else>
-            <image class="empty-image" :src="defaultOption.emptyImage || images.empty" mode="aspectFit"></image>
-            <text class="empty-text" :style="[emptyTextStyle]">{{ emptyText }}</text>
-          </view>
+          <slot name="empty">
+            <view class="empty-view flex-col-center-center">
+              <image class="empty-image" :src="defaultOption.emptyImage || images.empty" mode="aspectFit"></image>
+              <text class="empty-text" :style="[emptyTextStyle]">{{ emptyText }}</text>
+            </view>
+          </slot>
         </view>
         <view class="list-content"><slot></slot></view>
         <view class="pull-up-wrap" v-if="showPullUp">
@@ -614,31 +615,7 @@ export default {
           }
         }
       }
-      .empty-wrap {
-        top: 0;
-        left: 0;
-        width: 100%;
-        height: 100%;
-        display: flex;
-        position: absolute;
-        align-items: center;
-        flex-direction: column;
-        .empty-view {
-          margin: auto;
-          display: flex;
-          align-items: center;
-          margin-bottom: 400rpx;
-          flex-direction: column;
-          .empty-image {
-            width: 600rpx;
-            height: 600rpx;
-          }
-          .empty-text {
-            color: #606266;
-            margin-top: 20rpx;
-          }
-        }
-      }
+
       .list-content {
       }
       .pull-up-wrap {
@@ -666,4 +643,29 @@ export default {
     }
   }
 }
+.empty-wrap {
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  display: flex;
+  position: absolute;
+  align-items: center;
+  flex-direction: column;
+  .empty-view {
+    margin: auto;
+    display: flex;
+    align-items: center;
+    margin-bottom: 400rpx;
+    flex-direction: column;
+    .empty-image {
+      width: 600rpx;
+      height: 600rpx;
+    }
+    .empty-text {
+      color: #606266;
+      margin-top: 20rpx;
+    }
+  }
+}
 </style>
diff --git a/pages.json b/pages.json
index e1d26a6..cb52117 100644
--- a/pages.json
+++ b/pages.json
@@ -111,6 +111,7 @@
       "path": "pages/paper-details/index",
       "style": {
         "navigationBarTitleText": "纸品详情",
+        "navigationStyle": "custom",
         "enablePullDownRefresh": false
       }
     },
diff --git a/pages/notification-page/index.vue b/pages/notification-page/index.vue
index 043a353..25e5f34 100644
--- a/pages/notification-page/index.vue
+++ b/pages/notification-page/index.vue
@@ -36,7 +36,7 @@ export default {
                 // 允许回退
                 this.backInfo.isBack = true
                 this.backInfo.isBackTo = 'order-list'
-                go2('order-detail', { orderId: orderId })
+                go2('order-detail', { orderId: orderId }, true)
               } else {
                 this.handleResultError({ fn: this.certifySign, data: orderId, errType: '订单合同签约' })
               }
diff --git a/pages/paper-details/index.vue b/pages/paper-details/index.vue
index 36b7fff..5221d36 100644
--- a/pages/paper-details/index.vue
+++ b/pages/paper-details/index.vue
@@ -1,5 +1,6 @@
 <template>
-  <view class="warpper">
+  <view class="wrapper">
+    <uni-nav-bar left-icon="back" @clickLeft="back" statusBar fixed title="纸品详情"></uni-nav-bar>
     <view class="swiper-dot">
       <uni-swiper-dot :info="info.imgList" :current="current" field="content" mode="indexes" style="height: 100%">
         <swiper class="swiper-box" @change="swiperChange" style="height: 100%">
@@ -141,7 +142,7 @@
 import uGap from '@/components/u-gap/u-gap.vue'
 import qnFooter from '@/components/qn-footer/qn-footer.vue'
 import qnInputNumber from '@/components/qn-input-number/qn-input-number.vue'
-import { go2 } from '@/utils/hook.js'
+import { go2, back } from '@/utils/hook.js'
 import { getPaperDetail, createGoodsReserve, createShoppingCar } from '@/apis/paperDetailsApi.js'
 import { round } from '@/utils/index.js'
 export default {
@@ -214,11 +215,17 @@ export default {
   computed: {
     buyTon() {
       let num = 0
-	  num = round(this.buyPaperDto.gramWeight * this.buyPaperDto.width * this.buyPaperDto.length * this.buyPaperDto.pieceQuantity * 1e-12, 4)
+      num = round(this.buyPaperDto.gramWeight * this.buyPaperDto.width * this.buyPaperDto.length * this.buyPaperDto.pieceQuantity * 1e-12, 4)
       return num
     }
   },
+  watch: {
+    buyTon(newVal) {
+      this.buyPaperDto.buyTon = newVal
+    }
+  },
   methods: {
+    back,
     // 查询店铺纸品详情
     queryData() {
       getPaperDetail(this.params).then((res) => {
@@ -346,7 +353,7 @@ export default {
 </script>
 
 <style lang="scss">
-.warpper {
+.wrapper {
   .swiper-dot {
     width: 100%;
     height: 500rpx;
diff --git a/pages/store/index.vue b/pages/store/index.vue
index 19a14de..2ebc144 100644
--- a/pages/store/index.vue
+++ b/pages/store/index.vue
@@ -26,7 +26,7 @@
         type="text"
         class="easyinput"
         prefixIcon="search"
-        @confirm="searchConfirm"
+        @input="searchConfirm"
       />
     </view>
     <scroll-list ref="list" :option="option" @load="upCallback" @refresh="downCallback" style="background-color: #ffffff">
@@ -93,12 +93,10 @@ export default {
         supplierId: this.$store.state.supplierId || null
         // supplierId: '677166944742412288'
       },
-      customerInfo: {}
+      customerInfo: {},
+      timer: null
     }
   },
-  onLoad() {
-    this.getCustomer()
-  },
   methods: {
     seeDetailsTap(item) {
       loginGo2('paper-details', { id: item.id })
@@ -123,9 +121,10 @@ export default {
               } 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 })
+            } else {
+              reject()
             }
           })
           .catch((err) => {
@@ -155,8 +154,13 @@ export default {
     },
     searchConfirm(value) {
       this.params.name = value
-      this.pagination.pageNum = 1
-      this.getList()
+      if (this.timer) {
+        clearTimeout(this.timer)
+        this.timer = null
+      }
+      this.timer = setTimeout(() => {
+        this.downCallback()
+      }, 500)
     },
     transformPrice(value) {
       if (this.hasLogin) {
@@ -168,6 +172,7 @@ export default {
   },
   onShow() {
     this.downCallback()
+    this.getCustomer()
   },
   computed: {
     hasLogin() {
@@ -357,7 +362,7 @@ export default {
           height: 48rpx;
           background: #ff4849;
           border-radius: 27rpx;
-          ont-size: 26rpx;
+          font-size: 26rpx;
           color: #ffffff;
           letter-spacing: 0;
           font-weight: 400;
diff --git a/utils/http/index.js b/utils/http/index.js
index f506123..ec31575 100644
--- a/utils/http/index.js
+++ b/utils/http/index.js
@@ -92,7 +92,7 @@ const resInterceptor = (response, options) => {
   if (statusCode >= 200 && statusCode < 300) {
     if (res.code == 0) {
       // 将成功的null置位1
-      return res.data || 1
+      return res.data === null ? 1 : res.data
     } else {
       uni.showToast({
         title: res.message,

From aa3a395069ba7168a881c99b5e8b49a877b2dcc5 Mon Sep 17 00:00:00 2001
From: dengxiongfei <dengxiongfei@qniao.cn>
Date: Wed, 26 Jan 2022 18:03:30 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E7=BA=BF=E6=9D=A1=20=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E5=9B=BE=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/qn-form-item/qn-form-item.vue      |   2 +-
 components/qn-header/qn-header.vue            |   2 +-
 .../qn-input-number/qn-input-number.vue       | 149 +++---
 pages/add-account/index.vue                   | 499 +++++++++---------
 pages/add-address-manage/index.vue            | 499 +++++++++---------
 pages/address-manage/index.vue                | 481 +++++++++--------
 pages/cart/index.vue                          |  36 +-
 pages/enquiry-list/index.vue                  |   8 +-
 pages/enterprise-info/index.vue               |   6 +-
 pages/for-comparison/index.vue                |   8 +-
 pages/order-detail/index.vue                  |   2 +-
 pages/order-make/index.vue                    |   4 +-
 pages/paper-details/index.vue                 |  12 +-
 pages/store/index.vue                         |   1 +
 14 files changed, 872 insertions(+), 837 deletions(-)

diff --git a/components/qn-form-item/qn-form-item.vue b/components/qn-form-item/qn-form-item.vue
index 4b0febf..93b783c 100644
--- a/components/qn-form-item/qn-form-item.vue
+++ b/components/qn-form-item/qn-form-item.vue
@@ -54,7 +54,7 @@ export default {
   flex-direction: row;
   align-items: center;
   justify-content: space-between;
-  border-bottom: 2rpx solid #d8d8d8;
+  border-bottom: 2rpx solid rgba(221, 221, 221, 0.5);
   min-height: 80rpx;
   .label {
     flex-grow: 0;
diff --git a/components/qn-header/qn-header.vue b/components/qn-header/qn-header.vue
index 01f3c4a..92656dc 100644
--- a/components/qn-header/qn-header.vue
+++ b/components/qn-header/qn-header.vue
@@ -38,6 +38,6 @@ export default {
   display: flex;
   flex-direction: row;
   align-items: center;
-  border-bottom: 2rpx solid #d8d8d8;
+  border-bottom: 2rpx solid rgba(221, 221, 221, 0.5);
 }
 </style>
diff --git a/components/qn-input-number/qn-input-number.vue b/components/qn-input-number/qn-input-number.vue
index 7f42ae1..34f0fcd 100644
--- a/components/qn-input-number/qn-input-number.vue
+++ b/components/qn-input-number/qn-input-number.vue
@@ -1,79 +1,92 @@
 <template>
-	<view class="warpper">
-		<view class="minus-box" @tap="minusTap">
-			<uni-icons size="16" custom-prefix="iconfont" type="icon-Less" color="#007AFF"></uni-icons>
-			<!-- <uni-icons size="16" type="minus" color="#007AFF"></uni-icons> -->
-		</view>
-		<view class="" style="padding: 0rpx 4rpx;">
-			<uni-easyinput :inputBorder="false" class="quantity-input" type="number" :value="value" placeholder="请输入" @blur="blur" @confirm="confirm"></uni-easyinput>
-		</view>
-		<view class="minus-box" @tap="addTap"><uni-icons size="16" type="plusempty" color="#007AFF"></uni-icons></view>
-	</view>
+  <view class="warpper">
+    <view class="minus-box" @tap="minusTap">
+      <uni-icons size="16" custom-prefix="iconfont" type="icon-Less" color="#007AFF"></uni-icons>
+      <!-- <uni-icons size="16" type="minus" color="#007AFF"></uni-icons> -->
+    </view>
+    <view class="" style="padding: 0rpx 4rpx">
+      <qn-easyinput
+        :inputBorder="false"
+        class="quantity-input"
+        style="height: 64rpx"
+        :clearable="false"
+        type="number"
+        :value="value"
+        placeholder="请输入"
+        @blur="blur"
+        @confirm="confirm"
+      ></qn-easyinput>
+    </view>
+    <view class="minus-box" @tap="addTap"><uni-icons size="16" type="plusempty" color="#007AFF"></uni-icons></view>
+  </view>
 </template>
 
 <script>
 export default {
-	props: {
-		quantity: {
-			type: [Number, String],
-			default: 0
-		}
-	},
-	data() {
-		return {
-			value: 0
-		}
-	},
-	watch: {
-		quantity: {
-			handler(nv, ov) {
-				this.value = nv
-			},
-			immediate: true,
-		}
-	},
-	methods: {
-		blur(e) {
-			this.$emit('change', e.detail.value)
-		},
-		confirm(value) {
-			if (value.trim()) {
-				this.$emit('change', value)
-			}
-		},
-		minusTap() {
-			if (this.value == 0) {
-				return
-			}
-			this.value--
-			this.$emit('change', this.value)
-		},
-		addTap() {
-			this.value++
-			this.$emit('change', this.value)
-		}
-	}
+  props: {
+    quantity: {
+      type: [Number, String],
+      default: 0
+    }
+  },
+  data() {
+    return {
+      value: 0
+    }
+  },
+  watch: {
+    quantity: {
+      handler(nv, ov) {
+        this.value = nv
+      },
+      immediate: true
+    }
+  },
+  methods: {
+    blur(e) {
+      this.$emit('change', e.detail.value)
+    },
+    confirm(value) {
+      if (value.trim()) {
+        this.$emit('change', value)
+      }
+    },
+    minusTap() {
+      if (this.value == 0) {
+        return
+      }
+      this.value--
+      this.$emit('change', this.value)
+    },
+    addTap() {
+      this.value++
+      this.$emit('change', this.value)
+    }
+  }
 }
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 .warpper {
-	display: flex;
-	flex-direction: row;
-	align-items: center;
-	.minus-box {
-		width: 64rpx;
-		height: 64rpx;
-		line-height: 64rpx;
-		text-align: center;
-		background: #f2f3f5;
-		border-radius: 8rpx;
-		color: #007aff;
-	}
-	.quantity-input {
-		width: 120rpx;
-		height: 64rpx;
-		background: #f2f3f5;
-	}
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  .minus-box {
+    width: 64rpx;
+    height: 64rpx;
+    line-height: 64rpx;
+    text-align: center;
+    background: #f2f3f5;
+    border-radius: 8rpx;
+    color: #007aff;
+  }
+  .quantity-input {
+    width: 120rpx;
+    height: 64rpx;
+    background: #f2f3f5;
+    /deep/ .uni-easyinput__content {
+      min-height: 64rpx;
+    }
+  }
 }
 </style>
diff --git a/pages/add-account/index.vue b/pages/add-account/index.vue
index 41f470a..fa3c7ca 100644
--- a/pages/add-account/index.vue
+++ b/pages/add-account/index.vue
@@ -1,69 +1,76 @@
 <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>
+  <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>
@@ -72,191 +79,191 @@ 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)
-				}
-			})
-		}
-	}
+  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%;
-	}
+  .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 rgba(221, 221, 221, 0.5);
+    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 rgba(221, 221, 221, 0.5);
+    }
+    .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 rgba(221, 221, 221, 0.5);
+      }
+    }
+  }
+  .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 2c8b9fc..8ddc2fb 100644
--- a/pages/add-address-manage/index.vue
+++ b/pages/add-address-manage/index.vue
@@ -1,63 +1,84 @@
 <template>
-	<view class="warpper">
-		<view>
-			<uni-nav-bar left-icon="back" @clickLeft="back" statusBar fixed :title="titleText"></uni-nav-bar>
-		</view>
-		<view class="qn-form-item">
-			<view class="label"><text class="label__text">收货人</text></view>
-			<view class="value">
-				<qn-easyinput :maxlength="20" @blur="showCompany" v-model="form.receiver" :inputBorder="false" text="left" placeholder="请填写收货人姓名"></qn-easyinput>
-			</view>
-		</view>
-		<view class="qn-form-item">
-			<view class="label"><text class="label__text">手机号</text></view>
-			<view class="value">
-				<qn-easyinput :maxlength="11" type="number" v-model="form.receiverMobile" :inputBorder="false" text="left" placeholder="请填写收货人手机号"></qn-easyinput>
-			</view>
-		</view>
-		<view class="qn-form-item">
-			<view class="label"><text class="label__text">所在地区</text></view>
-			<view class="value">
-				<!-- <qn-easyinput v-model="form.shortName" :inputBorder="false" text="right" placeholder="选择所在区域"></qn-easyinput> -->
-				<qn-data-picker
-					:readonly="hasSelected"
-					text="left"
-					:border="false"
-					class="qn-picker"
-					placeholder="点击选择"
-					popup-title="请选择城市"
-					:map="{ text: 'name', value: 'id' }"
-					@change="onAreaChange"
-					:clear-icon="true"
-					:localdata="items"
-				>
-					<text v-if="form.districtId">{{ `${form.provinceName || ''}/${form.cityName || ''}/${form.districtName || ''}/${form.streetName || ''}` }}</text>
-				</qn-data-picker>
-			</view>
-		</view>
-		<view class="qn-form-item">
-			<view class="label"><text class="label__text">详细地址</text></view>
-			<view class="value">
-				<qn-easyinput :maxlength="120" @blur="showCompany" v-model="form.detail" :inputBorder="false" text="left" placeholder="街道/门牌号/小区/乡镇/村等"></qn-easyinput>
-			</view>
-		</view>
-		<uGap></uGap>
-		<view class="default-address">
-			<view class="">
-				<view class="title">设置为默认地址</view>
-				<view class="tip">提醒：每次下单会默认使用该地址</view>
-			</view>
-			<view class=""><switch :checked="form.isDefault == 1" @change="switchChange"  style="transform:scale(0.8)" /></view>
-		</view>
-		<qn-footer fixed height="120rpx">
-			<view class="button-area">
-				<!-- <view class="button button__cancel" @click="back">
+  <view class="warpper">
+    <view>
+      <uni-nav-bar left-icon="back" @clickLeft="back" statusBar fixed :title="titleText"></uni-nav-bar>
+    </view>
+    <view class="qn-form-item">
+      <view class="label"><text class="label__text">收货人</text></view>
+      <view class="value">
+        <qn-easyinput
+          :maxlength="20"
+          @blur="showCompany"
+          v-model="form.receiver"
+          :inputBorder="false"
+          text="left"
+          placeholder="请填写收货人姓名"
+        ></qn-easyinput>
+      </view>
+    </view>
+    <view class="qn-form-item">
+      <view class="label"><text class="label__text">手机号</text></view>
+      <view class="value">
+        <qn-easyinput
+          :maxlength="11"
+          type="number"
+          v-model="form.receiverMobile"
+          :inputBorder="false"
+          text="left"
+          placeholder="请填写收货人手机号"
+        ></qn-easyinput>
+      </view>
+    </view>
+    <view class="qn-form-item">
+      <view class="label"><text class="label__text">所在地区</text></view>
+      <view class="value">
+        <!-- <qn-easyinput v-model="form.shortName" :inputBorder="false" text="right" placeholder="选择所在区域"></qn-easyinput> -->
+        <qn-data-picker
+          :readonly="hasSelected"
+          text="left"
+          :border="false"
+          class="qn-picker"
+          placeholder="点击选择"
+          popup-title="请选择城市"
+          :map="{ text: 'name', value: 'id' }"
+          @change="onAreaChange"
+          :clear-icon="true"
+          :localdata="items"
+        >
+          <text v-if="form.districtId">{{ `${form.provinceName || ''}/${form.cityName || ''}/${form.districtName || ''}/${form.streetName || ''}` }}</text>
+        </qn-data-picker>
+      </view>
+    </view>
+    <view class="qn-form-item">
+      <view class="label"><text class="label__text">详细地址</text></view>
+      <view class="value">
+        <qn-easyinput
+          :maxlength="120"
+          @blur="showCompany"
+          v-model="form.detail"
+          :inputBorder="false"
+          text="left"
+          placeholder="街道/门牌号/小区/乡镇/村等"
+        ></qn-easyinput>
+      </view>
+    </view>
+    <uGap></uGap>
+    <view class="default-address">
+      <view class="">
+        <view class="title">设置为默认地址</view>
+        <view class="tip">提醒：每次下单会默认使用该地址</view>
+      </view>
+      <view class=""><switch :checked="form.isDefault == 1" @change="switchChange" style="transform: scale(0.8)" /></view>
+    </view>
+    <qn-footer fixed height="120rpx">
+      <view class="button-area">
+        <!-- <view class="button button__cancel" @click="back">
 		  <text class="text">取消</text>
 		</view> -->
-				<view class="button button__submit" @click="addTap"><text class="text" style="color: white">保存</text></view>
-			</view>
-		</qn-footer>
-	</view>
+        <view class="button button__submit" @click="addTap"><text class="text" style="color: white">保存</text></view>
+      </view>
+    </qn-footer>
+  </view>
 </template>
 
 <script>
@@ -68,191 +89,191 @@ import qnFooter from '@/components/qn-footer/qn-footer.vue'
 import qnDataPicker from '@/components/qn-data-picker/qn-data-picker.vue'
 import { createAddress, getAddressDetail } from '@/apis/addressManageApi.js'
 export default {
-	components: { uGap, qnFooter, qnDataPicker },
-	data() {
-		return {
-			form: {
-				cityId: '',
-				cityName: '',
-				detail: '',
-				districtId:'',
-				districtName: '',
-				enterpriseId: this.$store.state.companyInfo.id,
-				id: '',
-				isDefault: '0',
-				provinceId: '',
-				provinceName: '',
-				receiver: '',
-				receiverMobile: '',
-				streetId: '',
-				streetName: '',
-			},
-			hasSelected: false,
-			items: [],
-			id: null,
-		}
-	},
-	mounted() {
-		getArea().then(res => {
-			if (res) {
-				this.items = res
-			}
-		})
-	},
-	onLoad(option) {
-		this.titleText = option.type
-		if(option.id) {
-		this.id = option.id
-			this.getAddressDetail()
-		}
-	},
-	methods: {
-		back,
-		// 通过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
-				this.form.provinceId = province.value
-				this.form.provinceName = province.text
-				this.form.cityId = city.value
-				this.form.cityName = city.text
-				this.form.districtId = district.value
-				this.form.districtName = district.text
-				this.form.streetId = street.value
-				this.form.streetName = street.text
-			} else {
-				this.form.provinceId = null
-				this.form.provinceName = null
-				this.form.cityId = null
-				this.form.cityName = null
-				this.form.districtId = null
-				this.form.districtName = null
-				this.form.streetId = null
-				this.form.streetName = null
-			}
-		},
-		// 设置默认地址
-		switchChange(e) {
-			 this.form.isDefault = e.target.value ? '1' : '0'
-		},
-		showCompany() {},
-		// 保存
-		addTap() {
-			createAddress(this.form).then(res => {
-				if (res) {
-					uni.showToast({
-						title: '保存成功',
-						icon: 'success'
-					})
-					setTimeout(() => {
-						back()
-					}, 1000)
-				}
-			})
-		}
-	}
+  components: { uGap, qnFooter, qnDataPicker },
+  data() {
+    return {
+      form: {
+        cityId: '',
+        cityName: '',
+        detail: '',
+        districtId: '',
+        districtName: '',
+        enterpriseId: this.$store.state.companyInfo.id,
+        id: '',
+        isDefault: '0',
+        provinceId: '',
+        provinceName: '',
+        receiver: '',
+        receiverMobile: '',
+        streetId: '',
+        streetName: ''
+      },
+      hasSelected: false,
+      items: [],
+      id: null
+    }
+  },
+  mounted() {
+    getArea().then((res) => {
+      if (res) {
+        this.items = res
+      }
+    })
+  },
+  onLoad(option) {
+    this.titleText = option.type
+    if (option.id) {
+      this.id = option.id
+      this.getAddressDetail()
+    }
+  },
+  methods: {
+    back,
+    // 通过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
+        this.form.provinceId = province.value
+        this.form.provinceName = province.text
+        this.form.cityId = city.value
+        this.form.cityName = city.text
+        this.form.districtId = district.value
+        this.form.districtName = district.text
+        this.form.streetId = street.value
+        this.form.streetName = street.text
+      } else {
+        this.form.provinceId = null
+        this.form.provinceName = null
+        this.form.cityId = null
+        this.form.cityName = null
+        this.form.districtId = null
+        this.form.districtName = null
+        this.form.streetId = null
+        this.form.streetName = null
+      }
+    },
+    // 设置默认地址
+    switchChange(e) {
+      this.form.isDefault = e.target.value ? '1' : '0'
+    },
+    showCompany() {},
+    // 保存
+    addTap() {
+      createAddress(this.form).then((res) => {
+        if (res) {
+          uni.showToast({
+            title: '保存成功',
+            icon: 'success'
+          })
+          setTimeout(() => {
+            back()
+          }, 1000)
+        }
+      })
+    }
+  }
 }
 </script>
 
 <style lang="scss" scoped>
-.warpper {
-	.warpper-title {
-		width: 100%;
-		font-size: 36rpx;
-		color: #000000;
-		letter-spacing: 0;
-		text-align: center;
-		font-weight: 500;
-	}
-	.qn-form-item {
-		width: 750rpx;
-		padding: 0rpx 32rpx;
-		background-color: #fff;
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		// justify-content: space-between;
-		border-bottom: 2rpx solid #d8d8d8;
-		min-height: 88rpx;
-		.label {
-			flex-grow: 0;
-			flex-shrink: 0;
-			display: flex;
-			flex-direction: row;
-			align-items: center;
-			justify-content: flex-start;
-			margin-right: 20rpx;
-			.label__text {
-				font-size: 28rpx;
-				color: #000000;
-			}
-		}
-		.value {
-			flex-grow: 1;
-			flex-shrink: 1;
-			text-align: right;
-		}
-	}
-	.default-address {
-		display: flex;
-		flex-direction: row;
-		justify-content: space-between;
-		align-items: center;
-		padding: 0rpx 32rpx;
-		height: 133rpx;
-		background: #ffffff;
-		.title {
-			font-size: 30rpx;
-			color: #333333;
-			letter-spacing: 0;
-			font-weight: 400;
-		}
-		.tip {
-			padding-top: 10rpx;
-			font-size: 24rpx;
-			color: #888888;
-			letter-spacing: 0;
-			font-weight: 400;
-		}
-	}
-	.button-area {
-		width: 750rpx;
-		padding: 0 32rpx;
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		// justify-content: space-between;
-		.button {
-			flex-grow: 0;
-			flex-shrink: 0;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			border-radius: 10rpx;
-			.text {
-				font-size: 30rpx;
-				font-weight: 500;
-				text-align: center;
-			}
-		}
-		.button__cancel {
-			width: 270rpx;
-			height: 88rpx;
-			border: 2rpx solid #979797;
-		}
-		.button__submit {
-			width: 100%;
-			height: 88rpx;
-			background: #007aff;
-		}
-	}
+.warpper {
+  .warpper-title {
+    width: 100%;
+    font-size: 36rpx;
+    color: #000000;
+    letter-spacing: 0;
+    text-align: center;
+    font-weight: 500;
+  }
+  .qn-form-item {
+    width: 750rpx;
+    padding: 0rpx 32rpx;
+    background-color: #fff;
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    // justify-content: space-between;
+    border-bottom: 2rpx solid rgba(221, 221, 221, 0.5);
+    min-height: 88rpx;
+    .label {
+      flex-grow: 0;
+      flex-shrink: 0;
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      justify-content: flex-start;
+      margin-right: 20rpx;
+      .label__text {
+        font-size: 28rpx;
+        color: #000000;
+      }
+    }
+    .value {
+      flex-grow: 1;
+      flex-shrink: 1;
+      text-align: right;
+    }
+  }
+  .default-address {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+    padding: 0rpx 32rpx;
+    height: 133rpx;
+    background: #ffffff;
+    .title {
+      font-size: 30rpx;
+      color: #333333;
+      letter-spacing: 0;
+      font-weight: 400;
+    }
+    .tip {
+      padding-top: 10rpx;
+      font-size: 24rpx;
+      color: #888888;
+      letter-spacing: 0;
+      font-weight: 400;
+    }
+  }
+  .button-area {
+    width: 750rpx;
+    padding: 0 32rpx;
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    // justify-content: space-between;
+    .button {
+      flex-grow: 0;
+      flex-shrink: 0;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      border-radius: 10rpx;
+      .text {
+        font-size: 30rpx;
+        font-weight: 500;
+        text-align: center;
+      }
+    }
+    .button__cancel {
+      width: 270rpx;
+      height: 88rpx;
+      border: 2rpx solid #979797;
+    }
+    .button__submit {
+      width: 100%;
+      height: 88rpx;
+      background: #007aff;
+    }
+  }
 }
 </style>
diff --git a/pages/address-manage/index.vue b/pages/address-manage/index.vue
index da59724..c99880d 100644
--- a/pages/address-manage/index.vue
+++ b/pages/address-manage/index.vue
@@ -1,51 +1,43 @@
 <template>
-	<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" @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 @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">
-					<view class="" @tap="delTap(item, index)">删除</view>
-					<view class="edit" @tap="editTap(item, index)">编辑</view>
-				</view>
-			</view>
-		</view>
-		<qn-footer fixed height="120rpx">
-			<view class="button-area">
-				<!-- <view class="button button__cancel" @click="back">
+  <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" @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 @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">
+          <view class="" @tap="delTap(item, index)">删除</view>
+          <view class="edit" @tap="editTap(item, index)">编辑</view>
+        </view>
+      </view>
+    </view>
+    <qn-footer fixed height="120rpx">
+      <view class="button-area">
+        <!-- <view class="button button__cancel" @click="back">
 	      <text class="text">取消</text>
 	    </view> -->
-				<view class="button button__submit" @click="addTap"><text class="text" style="color: white">添加地址</text></view>
-			</view>
-		</qn-footer>
-		<uni-popup ref="popup" type="center" :mask-click="false">
-			<view class="popup-box">
-				<view class="tip-title">
-					确定要删除改地址吗？
-				</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>
-	</view>
+        <view class="button button__submit" @click="addTap"><text class="text" style="color: white">添加地址</text></view>
+      </view>
+    </qn-footer>
+    <uni-popup ref="popup" type="center" :mask-click="false">
+      <view class="popup-box">
+        <view class="tip-title">确定要删除改地址吗？</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>
+  </view>
 </template>
 
 <script>
@@ -53,84 +45,83 @@ import { go2, back, setCache } from '@/utils/hook.js'
 import qnFooter from '@/components/qn-footer/qn-footer.vue'
 import { getAddress, delAddress, setDefaultAddress } from '@/apis/addressManageApi.js'
 export default {
-	components:{ qnFooter },
+  components: { qnFooter },
   data() {
     return {
       /**
        * 页面操作类型 none: 无操作, select: 选择
        */
       operation: 'none',
-	  list: [],
-	  id: null
+      list: [],
+      id: null
     }
   },
   onShow() {
-  	this.queryData()
+    this.queryData()
   },
- 
+
   methods: {
     go2,
     back,
-	// 查询收货地址
-	queryData() {
-		const params = {
-			enterpriseId: this.$store.state.companyInfo.id
-		}
-		getAddress(params).then(res => {
-			if(res) {
-				this.list = res
-			}
-		})
-	},
-	// 设置默认地址
-	radioTap(item) {
-		setDefaultAddress({id: item.id}).then(res =>{
-			if(res) {
-				this.queryData()
-			}
-		})
-	},
+    // 查询收货地址
+    queryData() {
+      const params = {
+        enterpriseId: this.$store.state.companyInfo.id
+      }
+      getAddress(params).then((res) => {
+        if (res) {
+          this.list = res
+        }
+      })
+    },
+    // 设置默认地址
+    radioTap(item) {
+      setDefaultAddress({ id: item.id }).then((res) => {
+        if (res) {
+          this.queryData()
+        }
+      })
+    },
     // 选择地址
     selectAddress(item) {
       if (this.operation === 'select') {
         setCache('address', item)
         back()
       }
-    },
+    },
 
-	// 新增收货地址
-	addTap() {
-		go2('add-address-manage',{type:'新增地址'})
-	},
-	// 删除
-	delTap(item, index) {
-		this.id = item.id
-		this.$refs.popup.open('center')
-		// this.$refs.popup.close()
-	},
-	// 编辑
-	editTap(item, index) {
-		go2('add-address-manage', {id: item.id,type:'编辑地址'})
-	},
-	confirmTap() {
-		delAddress({id: this.id}).then(res => {
-			this.$refs.popup.close()
-			if(res) {
-				uni.showToast({
-					title: '删除成功',
-					icon: 'success'
-				})
-				this.queryData()
-			}
-		})
-		
-	},
-	cancelTap() {
-		this.$refs.popup.close()
-	}
+    // 新增收货地址
+    addTap() {
+      go2('add-address-manage', { type: '新增地址' })
+    },
+    // 删除
+    delTap(item, index) {
+      this.id = item.id
+      this.$refs.popup.open('center')
+      // this.$refs.popup.close()
+    },
+    // 编辑
+    editTap(item, index) {
+      go2('add-address-manage', { id: item.id, type: '编辑地址' })
+    },
+    confirmTap() {
+      delAddress({ id: this.id }).then((res) => {
+        this.$refs.popup.close()
+        if (res) {
+          uni.showToast({
+            title: '删除成功',
+            icon: 'success'
+          })
+          this.queryData()
+        }
+      })
+    },
+    cancelTap() {
+      this.$refs.popup.close()
+    }
   },
   onLoad(option) {
-    if (option) {
+    if (option) {
       this.operation = option.operation
     }
   }
@@ -139,149 +130,149 @@ export default {
 
 <style lang="scss" scoped>
 .warpper {
-	.content {
-		padding-bottom: 16rpx;
-		.info-box {
-			max-height: 197rpx;
-			background: #ffffff;
-			padding: 27rpx 32rpx;
-			border-bottom: 2rpx solid #d8d8d8;
-			.name {
-				ont-size: 30rpx;
-				color: #333333;
-				letter-spacing: 0;
-				font-weight: 400;
-			}
-			.address {
-				padding-top: 16rpx;
-				font-size: 28rpx;
-				color: #333333;
-				letter-spacing: 0;
-				font-weight: 400;
-			}
-		}
-		.other {
-			display: flex;
-			flex-direction: row;
-			justify-content: space-between;
-			align-items: center;
-			padding: 0rpx 32rpx;
-			height: 80rpx;
-			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;
-				letter-spacing: 0;
-				font-weight: 400;
-			}
-			.right {
-				display: flex;
-				flex-direction: row;
-				justify-content: space-between;
-				font-size: 28rpx;
-				color: #888888;
-				letter-spacing: 0;
-				font-weight: 400;
-				.edit {
-					padding-left: 32rpx;
-				}
-			}
-		}
-	}
-	.button-area {
-		width: 750rpx;
-		padding: 0 32rpx;
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		// justify-content: space-between;
-		.button {
-			flex-grow: 0;
-			flex-shrink: 0;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			border-radius: 10rpx;
-			.text {
-				font-size: 30rpx;
-				font-weight: 500;
-				text-align: center;
-			}
-		}
-		.button__cancel {
-			width: 270rpx;
-			height: 88rpx;
-			border: 2rpx solid #979797;
-		}
-		.button__submit {
-			width: 100%;
-			height: 88rpx;
-			background: #007aff;
-		}
-	}
-	.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;
-			}
-		}
-	}
+  .content {
+    padding-bottom: 16rpx;
+    .info-box {
+      max-height: 197rpx;
+      background: #ffffff;
+      padding: 27rpx 32rpx;
+      border-bottom: 2rpx solid rgba(221, 221, 221, 0.5);
+      .name {
+        ont-size: 30rpx;
+        color: #333333;
+        letter-spacing: 0;
+        font-weight: 400;
+      }
+      .address {
+        padding-top: 16rpx;
+        font-size: 28rpx;
+        color: #333333;
+        letter-spacing: 0;
+        font-weight: 400;
+      }
+    }
+    .other {
+      display: flex;
+      flex-direction: row;
+      justify-content: space-between;
+      align-items: center;
+      padding: 0rpx 32rpx;
+      height: 80rpx;
+      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;
+        letter-spacing: 0;
+        font-weight: 400;
+      }
+      .right {
+        display: flex;
+        flex-direction: row;
+        justify-content: space-between;
+        font-size: 28rpx;
+        color: #888888;
+        letter-spacing: 0;
+        font-weight: 400;
+        .edit {
+          padding-left: 32rpx;
+        }
+      }
+    }
+  }
+  .button-area {
+    width: 750rpx;
+    padding: 0 32rpx;
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    // justify-content: space-between;
+    .button {
+      flex-grow: 0;
+      flex-shrink: 0;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      border-radius: 10rpx;
+      .text {
+        font-size: 30rpx;
+        font-weight: 500;
+        text-align: center;
+      }
+    }
+    .button__cancel {
+      width: 270rpx;
+      height: 88rpx;
+      border: 2rpx solid #979797;
+    }
+    .button__submit {
+      width: 100%;
+      height: 88rpx;
+      background: #007aff;
+    }
+  }
+  .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 rgba(221, 221, 221, 0.5);
+      .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/cart/index.vue b/pages/cart/index.vue
index 44e3ed3..2f531dc 100644
--- a/pages/cart/index.vue
+++ b/pages/cart/index.vue
@@ -9,9 +9,9 @@
     <view v-else>
       <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>
+        <view slot="right" class="right-title" @tap="delTap">删除</view>
       </uni-nav-bar>
-      <view class="" v-if="pageShow">
+      <view class="">
         <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>
@@ -36,10 +36,15 @@
                 <!-- <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>
+                <image
+                  class="image"
+                  @tap="seeDetailsTap(subItem)"
+                  :src="subItem.productImg || 'https://qncloud.oss-cn-shenzhen.aliyuncs.com/paper_shopkeeper/paper-default-small.png'"
+                  mode=""
+                ></image>
                 <view class="right">
                   <view class="name">{{ subItem.productName }}</view>
-                  <view class="measure">{{ subItem.gramWeight }}g｜{{ subItem.width }}*{{ subItem.length }}</view>
+                  <view class="measure">{{ subItem.gramWeight }}g｜{{ subItem.width }}*{{ subItem.length }} | {{ subItem.quantity }}张</view>
                   <view class="weight">预估重量：{{ subItem.weight }}吨</view>
                   <view class="price-row">
                     <view class="value">¥{{ subItem.price }}</view>
@@ -49,6 +54,9 @@
               </view>
             </view>
           </view>
+          <view slot="empty">
+            <no-data></no-data>
+          </view>
         </scroll-list>
         <view class="footer-box">
           <view class="row">
@@ -82,7 +90,6 @@
           </view>
         </view>
       </uni-popup>
-      <no-data v-if="!pageShow"></no-data>
     </view>
   </view>
 </template>
@@ -99,7 +106,6 @@ export default {
   components: { uGap, qnInputNumber, qnFooter, noData },
   data() {
     return {
-      pageShow: true,
       option: {
         size: 10,
         auto: true,
@@ -161,7 +167,7 @@ export default {
         this.list.forEach((shop) => {
           shop.carItemList.forEach((good) => {
             if (good.checked) {
-              num += round(good.price * good.weight, 4)
+              num += round(good.price * good.weight, 2)
             }
           })
         })
@@ -223,10 +229,6 @@ export default {
           .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) => {
@@ -254,7 +256,8 @@ export default {
         .then(({ list, total }) => {
           this.$refs.list.refreshSuccess({ list, total })
         })
-        .catch(() => {
+        .catch((e) => {
+          console.error('e:', e)
           this.$refs.list.refreshFail()
         })
     },
@@ -330,8 +333,7 @@ export default {
             title: '删除成功！',
             icon: 'success'
           })
-          this.pagination.pageNum = 1
-          this.getList()
+          this.downCallback()
         }
       })
     },
@@ -391,7 +393,7 @@ export default {
     display: flex;
     flex-direction: row;
     align-items: center;
-    border-top: 2rpx solid #d8d8d8;
+    border-top: 2rpx solid rgba(221, 221, 221, 0.5);
     padding: 28rpx 32rpx 40rpx 32rpx;
     .list-row {
       flex: 1;
@@ -430,7 +432,7 @@ export default {
         color: #888888;
         font-weight: 400;
         text-align: right;
-        padding-top: 4rpx;
+        padding-top: 8rpx;
       }
       .price-row {
         display: flex;
@@ -533,7 +535,7 @@ export default {
       align-items: center;
       height: 100rpx;
       background: #ffffff;
-      border-top: 2rpx solid #dddddd;
+      border-top: 2rpx solid rgba(221, 221, 221, 0.5);
       .cancel-text {
         flex-grow: 1;
         flex-shrink: 1;
diff --git a/pages/enquiry-list/index.vue b/pages/enquiry-list/index.vue
index 5ed5789..73edcc1 100644
--- a/pages/enquiry-list/index.vue
+++ b/pages/enquiry-list/index.vue
@@ -199,7 +199,7 @@ export default {
     align-items: center;
     justify-content: space-between;
     padding: 0 32rpx;
-    // border-bottom: 2rpx solid #DDDDDD;
+    // border-bottom: 2rpx solid rgba(221,221,221,0.5);
     background-color: #fff;
     border-bottom: 2rpx solid rgba($color: #dddddd, $alpha: 0.8);
     height: 90rpx;
@@ -228,7 +228,7 @@ export default {
       height: 88rpx;
       background: #ffffff;
       padding: 0rpx 32rpx;
-      border-bottom: 2rpx solid #dddddd;
+      border-bottom: 2rpx solid rgba(221, 221, 221, 0.5);
       .header-title {
         font-size: 30rpx;
         color: #333333;
@@ -250,7 +250,7 @@ export default {
       background-color: #fff;
       padding: 24rpx 32rpx;
       .list-box:nth-last-child(even) {
-        border-bottom: 2rpx solid #dddddd;
+        border-bottom: 2rpx solid rgba(221, 221, 221, 0.5);
       }
       .list-box {
         display: flex;
@@ -293,7 +293,7 @@ export default {
       padding: 0rpx 32rpx;
       height: 80rpx;
       background: #ffffff;
-      border-top: 2rpx solid #dddddd;
+      border-top: 2rpx solid rgba(221, 221, 221, 0.5);
       .left {
         font-size: 26rpx;
         color: #888888;
diff --git a/pages/enterprise-info/index.vue b/pages/enterprise-info/index.vue
index 58e5914..03ff24c 100644
--- a/pages/enterprise-info/index.vue
+++ b/pages/enterprise-info/index.vue
@@ -468,7 +468,7 @@ export default {
   flex-direction: row;
   align-items: center;
   justify-content: space-between;
-  border-bottom: 2rpx solid #d8d8d8;
+  border-bottom: 2rpx solid rgba(221, 221, 221, 0.5);
   min-height: 80rpx;
   .label {
     flex-grow: 0;
@@ -511,7 +511,7 @@ export default {
     width: 750rpx;
     height: 88rpx;
     font-weight: 600;
-    border-bottom: 2rpx solid #d8d8d8;
+    border-bottom: 2rpx solid rgba(221, 221, 221, 0.5);
   }
   .popup_modal-scroll {
     width: 750rpx;
@@ -524,7 +524,7 @@ export default {
       width: 750rpx;
       height: 88rpx;
       padding: 0rpx 32rpx;
-      border-bottom: 2rpx solid #d8d8d8;
+      border-bottom: 2rpx solid rgba(221, 221, 221, 0.5);
     }
   }
 }
diff --git a/pages/for-comparison/index.vue b/pages/for-comparison/index.vue
index 9164fc2..6e0178d 100644
--- a/pages/for-comparison/index.vue
+++ b/pages/for-comparison/index.vue
@@ -475,7 +475,7 @@ export default {
   display: flex;
   flex-direction: row;
   justify-content: space-between;
-  border-bottom: 2rpx solid #d8d8d8;
+  border-bottom: 2rpx solid rgba(221, 221, 221, 0.5);
   .label {
     flex-grow: 0;
     flex-shrink: 0;
@@ -521,7 +521,7 @@ export default {
   flex-direction: row;
   align-items: center;
   justify-content: space-between;
-  border-bottom: 2rpx solid #d8d8d8;
+  border-bottom: 2rpx solid rgba(221, 221, 221, 0.5);
   min-height: 80rpx;
   .label {
     flex-grow: 0;
@@ -564,7 +564,7 @@ export default {
     width: 750rpx;
     height: 88rpx;
     font-weight: 600;
-    border-bottom: 2rpx solid #d8d8d8;
+    border-bottom: 2rpx solid rgba(221, 221, 221, 0.5);
   }
   .popup_modal-scroll {
     width: 750rpx;
@@ -577,7 +577,7 @@ export default {
       width: 750rpx;
       height: 88rpx;
       padding: 0rpx 32rpx;
-      border-bottom: 2rpx solid #d8d8d8;
+      border-bottom: 2rpx solid rgba(221, 221, 221, 0.5);
     }
   }
 }
diff --git a/pages/order-detail/index.vue b/pages/order-detail/index.vue
index dda61a6..b79b4c8 100644
--- a/pages/order-detail/index.vue
+++ b/pages/order-detail/index.vue
@@ -476,7 +476,7 @@ export default {
   background-color: #ffffff;
   .order-row {
     padding: 24rpx 0;
-    border-bottom: 2rpx solid #d8d8d8;
+    border-bottom: 2rpx solid rgba(221, 221, 221, 0.5);
     .label {
       font-size: 28rpx;
       color: #000000;
diff --git a/pages/order-make/index.vue b/pages/order-make/index.vue
index 641c279..29542aa 100644
--- a/pages/order-make/index.vue
+++ b/pages/order-make/index.vue
@@ -280,7 +280,7 @@ export default {
     align-items: center;
     justify-content: flex-start;
     padding: 24rpx 0 40rpx;
-    border-bottom: 2rpx solid #dddddd;
+    border-bottom: 2rpx solid rgba(221, 221, 221, 0.5);
     .img {
       width: 100rpx;
       height: 100rpx;
@@ -376,7 +376,7 @@ export default {
     flex-direction: row;
     align-items: center;
     justify-content: space-between;
-    border-bottom: 2rpx solid #d8d8d8;
+    border-bottom: 2rpx solid rgba(221, 221, 221, 0.5);
     .left {
       display: flex;
       flex-direction: row;
diff --git a/pages/paper-details/index.vue b/pages/paper-details/index.vue
index 5221d36..da287f2 100644
--- a/pages/paper-details/index.vue
+++ b/pages/paper-details/index.vue
@@ -159,7 +159,7 @@ export default {
           disabled: true
         },
         {
-          name: '特规分切',
+          name: '大度',
           width: '889',
           length: '1194',
           disabled: true
@@ -299,12 +299,12 @@ export default {
       // 加入购物车
       if (this.shoppingCarType == 1) {
         const params = {
-          length: this.specificationObj.length,
+          length: this.buyPaperDto.length,
           productId: this.info.id,
           productSkuId: this.buyPaperDto.productSkuId,
           quantity: this.buyPaperDto.pieceQuantity,
           supplierId: this.info.supplierId,
-          width: this.specificationObj.width,
+          width: this.buyPaperDto.width,
           enterpriseId: this.$store.state.companyInfo.id,
           userId: this.$store.state.userInfo.userId
         }
@@ -438,7 +438,7 @@ export default {
   }
   .other {
     padding: 0rpx 32rpx;
-    border-bottom: 2rpx solid #d8d8d8;
+    border-bottom: 2rpx solid rgba(221, 221, 221, 0.5);
     background: #ffffff;
     .title {
       font-size: 28rpx;
@@ -519,7 +519,7 @@ export default {
         // align-items: center;
         // height: 240rpx;
         background: #ffffff;
-        border-bottom: 2rpx solid #d8d8d8;
+        border-bottom: 2rpx solid rgba(221, 221, 221, 0.5);
         padding: 40rpx 0rpx;
         .image {
           flex: 0 0 160rpx;
@@ -560,7 +560,7 @@ export default {
       }
     }
     .choose-box {
-      border-bottom: 2rpx solid #d8d8d8;
+      border-bottom: 2rpx solid rgba(221, 221, 221, 0.5);
       padding: 24rpx 32rpx;
       .label {
         font-size: 30rpx;
diff --git a/pages/store/index.vue b/pages/store/index.vue
index 2ebc144..f020ae0 100644
--- a/pages/store/index.vue
+++ b/pages/store/index.vue
@@ -288,6 +288,7 @@ export default {
       background: #ffffff;
       box-shadow: 0rpx 8rpx 28rpx 0rpx rgba(112, 112, 112, 0.1);
       border-radius: 10rpx;
+      margin-bottom: 20rpx;
       .special-img {
         width: 110rpx;
         height: 110rpx;

From 0982c18bbe1e2303820264872bd2c92a76ecabe5 Mon Sep 17 00:00:00 2001
From: dengxiongfei <dengxiongfei@qniao.cn>
Date: Wed, 26 Jan 2022 20:44:45 +0800
Subject: [PATCH 5/6] bug

---
 pages.json                    |  3 ++-
 pages/cart/index.vue          |  2 +-
 pages/order-list/index.vue    |  2 +-
 pages/paper-details/index.vue | 31 ++++++++++++++++++++++++++++-
 pages/store/index.vue         |  2 +-
 utils/hook.js                 |  2 +-
 utils/index.js                | 37 +++++++++++++++++++++++++++++++++++
 7 files changed, 73 insertions(+), 6 deletions(-)

diff --git a/pages.json b/pages.json
index cb52117..fe422e2 100644
--- a/pages.json
+++ b/pages.json
@@ -160,7 +160,8 @@
     "navigationBarTextStyle": "black",
     "navigationBarTitleText": "uni-app",
     "navigationBarBackgroundColor": "#F8F8F8",
-    "backgroundColor": "#F8F8F8"
+    "backgroundColor": "#F8F8F8",
+    "app-plus": { "titleNView": false }
   },
   "tabBar": {
     "color": "#888",
diff --git a/pages/cart/index.vue b/pages/cart/index.vue
index 2f531dc..58d90cd 100644
--- a/pages/cart/index.vue
+++ b/pages/cart/index.vue
@@ -189,7 +189,7 @@ export default {
           if (good.checked) {
             let obj = {
               buyTon: good.weight,
-              gramWeight: good.weight,
+              gramWeight: good.gramWeight,
               length: good.length,
               mallSupplierId: el.supplierId,
               pieceQuantity: good.quantity,
diff --git a/pages/order-list/index.vue b/pages/order-list/index.vue
index 63029ee..987a719 100644
--- a/pages/order-list/index.vue
+++ b/pages/order-list/index.vue
@@ -39,7 +39,7 @@
           <view class="order-footer">
             <view class="left">
               <text style="font-size: 26rpx; color: #888888; margin-right: 8rpx">交货时间:</text>
-              <text style="font-size: 26rpx; color: #333333">{{ item.deliveryLeadtime || '-' }}天</text>
+              <text style="font-size: 26rpx; color: #333333">{{ item.deliveryLeadtime || '-' }}</text>
             </view>
             <view class="right">
               <text style="font-size: 30rpx; color: #ff5368">￥ {{ item.totalOfferPrice }}</text>
diff --git a/pages/paper-details/index.vue b/pages/paper-details/index.vue
index da287f2..33d7d43 100644
--- a/pages/paper-details/index.vue
+++ b/pages/paper-details/index.vue
@@ -145,6 +145,24 @@ import qnInputNumber from '@/components/qn-input-number/qn-input-number.vue'
 import { go2, back } from '@/utils/hook.js'
 import { getPaperDetail, createGoodsReserve, createShoppingCar } from '@/apis/paperDetailsApi.js'
 import { round } from '@/utils/index.js'
+const validateFields = [
+  {
+    value: 'length',
+    label: '纸品长度'
+  },
+  {
+    value: 'width',
+    label: '纸品宽度'
+  },
+  {
+    value: 'gramWeight',
+    label: '纸品克重'
+  },
+  {
+    value: 'pieceQuantity',
+    label: '购买数量'
+  }
+]
 export default {
   components: { uGap, qnFooter, qnInputNumber },
   data() {
@@ -209,7 +227,7 @@ export default {
     }
   },
   onLoad(option) {
-    this.params.productId = option.id
+    this.params.productId = option.paperId
     this.queryData()
   },
   computed: {
@@ -296,6 +314,17 @@ export default {
     },
     // 确定
     confirm() {
+      // 校验
+      for (let i = 0; i < validateFields.length; i++) {
+        let item = validateFields[i]
+        if (!this.buyPaperDto[item.value]) {
+          uni.showToast({
+            title: item.label + '必须大于0',
+            icon: 'none'
+          })
+          return
+        }
+      }
       // 加入购物车
       if (this.shoppingCarType == 1) {
         const params = {
diff --git a/pages/store/index.vue b/pages/store/index.vue
index f020ae0..42dab85 100644
--- a/pages/store/index.vue
+++ b/pages/store/index.vue
@@ -99,7 +99,7 @@ export default {
   },
   methods: {
     seeDetailsTap(item) {
-      loginGo2('paper-details', { id: item.id })
+      loginGo2('paper-details', { paperId: item.id })
     },
     // 获取店铺信息
     getCustomer() {
diff --git a/utils/hook.js b/utils/hook.js
index 12c3219..db0757e 100644
--- a/utils/hook.js
+++ b/utils/hook.js
@@ -118,7 +118,7 @@ export function uploadImage(sourceType = ['album', 'camera'], count = 1) {
       },
       fail: (err) => {
         console.error('chooseImage error:', err)
-        reject(err)
+        resolve(null)
       }
     })
   })
diff --git a/utils/index.js b/utils/index.js
index 70fc59d..21174d0 100644
--- a/utils/index.js
+++ b/utils/index.js
@@ -124,3 +124,40 @@ export const makeSocket = async ({ pageInfo = '', retry = false }) => {
 export function round(number, precision) {
   return Math.round(+number + 'e' + precision) / Math.pow(10, precision)
 }
+
+/**
+ * {beyond:是否超出目标时间,day:天,hours:小时,minutes:分钟,seconds:秒钟}
+ * @param time 计算时间
+ * @param target 对照时间
+ * @returns 时间差对象
+ */
+export const difTime = (time, target) => {
+  let begin = new Date(time).getTime()
+  // 兼容ios时间
+  let end = new Date(target.replace(/-/g, '/')).getTime()
+  let beyond = begin < end ? false : true
+  let diff = Math.abs(begin - end)
+  // 计算天数
+  let day = Math.floor(diff / (24 * 3600 * 1000))
+  day != day ? (day = 0) : ''
+  diff = diff % (24 * 3600 * 1000)
+  // 计算小时数
+  let hours = Math.floor(diff / (3600 * 1000))
+  hours != hours ? (hours = 0) : ''
+  diff = diff % (3600 * 1000)
+  // 计算分钟数
+  let minutes = Math.floor(diff / (60 * 1000))
+  minutes != minutes ? (minutes = 0) : ''
+  diff = diff % (60 * 1000)
+  // 计算秒数
+  let seconds = Math.floor(diff / 1000)
+  seconds != seconds ? (seconds = 0) : ''
+  diff = diff % 1000
+  return {
+    beyond,
+    day,
+    hours,
+    minutes,
+    seconds
+  }
+}

From c0792529c3bc37e5294f6ce06f9367925abd99b6 Mon Sep 17 00:00:00 2001
From: dengxiongfei <dengxiongfei@qniao.cn>
Date: Wed, 26 Jan 2022 22:05:28 +0800
Subject: [PATCH 6/6] bug

---
 apis/commonApi.js             |  9 +++++++
 pages.json                    |  6 ++---
 pages/order-make/index.vue    |  7 +++++
 pages/paper-details/index.vue | 49 ++++++++++++++++++++++++++++++-----
 pages/store/index.vue         |  6 ++---
 5 files changed, 63 insertions(+), 14 deletions(-)

diff --git a/apis/commonApi.js b/apis/commonApi.js
index 3482615..16dd7d3 100644
--- a/apis/commonApi.js
+++ b/apis/commonApi.js
@@ -37,6 +37,15 @@ function syncStore(res) {
       mobile: res.mobile,
       avatar: null
     })
+  } else {
+    if (res) {
+      store.commit('setUserInfo', {
+        name: '',
+        userId: res.userId,
+        mobile: res.mobile,
+        avatar: null
+      })
+    }
   }
 }
 
diff --git a/pages.json b/pages.json
index fe422e2..8038f69 100644
--- a/pages.json
+++ b/pages.json
@@ -5,7 +5,8 @@
       "style": {
         "navigationBarTitleText": "店铺首页",
         "navigationStyle": "custom"
-      }
+      },
+      "h5": { "titleNView": false }
     },
     {
       "path": "pages/cart/index",
@@ -160,8 +161,7 @@
     "navigationBarTextStyle": "black",
     "navigationBarTitleText": "uni-app",
     "navigationBarBackgroundColor": "#F8F8F8",
-    "backgroundColor": "#F8F8F8",
-    "app-plus": { "titleNView": false }
+    "backgroundColor": "#F8F8F8"
   },
   "tabBar": {
     "color": "#888",
diff --git a/pages/order-make/index.vue b/pages/order-make/index.vue
index 29542aa..8063572 100644
--- a/pages/order-make/index.vue
+++ b/pages/order-make/index.vue
@@ -198,6 +198,13 @@ export default {
       if (this.loading) {
         return
       }
+      if (!this.deliveryAddress.addressId) {
+        uni.showToast({
+          title: '请选择收货地址',
+          icon: 'none'
+        })
+        return
+      }
       this.loading = true
       let itemsRemarkList = []
       // 拼接订单信息
diff --git a/pages/paper-details/index.vue b/pages/paper-details/index.vue
index 33d7d43..abddf95 100644
--- a/pages/paper-details/index.vue
+++ b/pages/paper-details/index.vue
@@ -58,15 +58,15 @@
     <qn-footer fixed height="100rpx">
       <view class="footer-row">
         <view class="left">
-          <view class="">
+          <view @click="storeTap">
             <image class="icon" src="/static/imgs/paperDetails/shop-icon.png"></image>
-            <view class="label" @tap="storeTap">店铺</view>
+            <view class="label">店铺</view>
           </view>
-          <view class="">
+          <view @click="shoppingCartTap">
             <image class="icon" src="/static/imgs/paperDetails/shopping-trolley.png"></image>
-            <view class="label" @tap="shoppingCartTap">购物车</view>
+            <view class="label">购物车</view>
           </view>
-          <view class="" @tap="addShoppingTap(1)">
+          <view @click="addShoppingTap(1)">
             <image class="icon" src="/static/imgs/paperDetails/add-shopping-trolley.png"></image>
             <view class="label">加购物车</view>
           </view>
@@ -227,14 +227,35 @@ export default {
     }
   },
   onLoad(option) {
-    this.params.productId = option.paperId
-    this.queryData()
+    if (option.paperId) {
+      this.params.productId = option.paperId
+      if (this.hasLogin) {
+        this.queryData()
+      } else {
+        this.$store.commit('setNextPage', { name: 'paper-detail', data: { paperId: option.paperId } })
+        go2('login')
+      }
+    } else {
+      uni.showToast({
+        title: '参数错误',
+        icon: 'fail',
+        success: () => {
+          back()
+        }
+      })
+    }
   },
   computed: {
     buyTon() {
       let num = 0
       num = round(this.buyPaperDto.gramWeight * this.buyPaperDto.width * this.buyPaperDto.length * this.buyPaperDto.pieceQuantity * 1e-12, 4)
       return num
+    },
+    hasCompany() {
+      return this.$store.state.companyInfo.id != null
+    },
+    hasLogin() {
+      return this.$store.state.qnToken != ''
     }
   },
   watch: {
@@ -266,6 +287,13 @@ export default {
     },
     // 立即订购
     addShoppingTap(type) {
+      if (!this.hasCompany) {
+        uni.showToast({
+          title: '请先完善公司信息',
+          icon: 'none'
+        })
+        return
+      }
       this.shoppingCarType = type
       this.buyPaperDto = {
         buyTon: 0,
@@ -283,6 +311,13 @@ export default {
 
     // 路由到实单询比价
     inquiryTap() {
+      if (!this.hasCompany) {
+        uni.showToast({
+          title: '请先完善公司信息',
+          icon: 'none'
+        })
+        return
+      }
       go2('for-comparison', { id: this.info.supplierId, productImg: this.info.imgList[0] })
     },
     closeTap() {
diff --git a/pages/store/index.vue b/pages/store/index.vue
index 42dab85..5b2b6b5 100644
--- a/pages/store/index.vue
+++ b/pages/store/index.vue
@@ -30,8 +30,8 @@
       />
     </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" @tap="seeDetailsTap(item)">
+      <view class="content flex-row-start-start">
+        <view class="box" v-for="(item, index) in list" :key="index" @tap="seeDetailsTap(item)" :style="{ marginRight: index % 2 != 0 ? '0' : '20rpx' }">
           <view class="image-box">
             <view class=""><image class="special-img" :src="item.isPromoting ? '/static/imgs/store/special-offe.png' : ''" mode=""></image></view>
             <image
@@ -278,8 +278,6 @@ export default {
   }
   .content {
     display: flex;
-    flex-direction: row;
-    justify-content: space-between;
     flex-wrap: wrap;
     padding: 0rpx 32rpx 20rpx 32rpx;
     .box {