Merge branch 'devlop' of http://git.qniao.cn/qniao/paper-shopkeeper-H5 into devlop

pages/cart/index.vue

@@ -86,6 +86,7 @@ import { back, go2 } from '@/utils/hook.js'
 import qnInputNumber from '@/components/qn-input-number/qn-input-number.vue'
 import { getShoppingCarList, removeShoppingCar, closePaperReserve } from '@/apis/cartApi.js'
 import noData from './no-data.vue'
+import { round } from '@/utils/index.js'
 export default {
 	components: { uGap, qnInputNumber, qnFooter, noData },
 	data() {
@@ -151,12 +152,12 @@ export default {
 				this.list.forEach(shop => {
 					shop.carItemList.forEach(good => {
 						if (good.checked) {
-							num += Number(good.price) * Number(good.weight)
+							num += round( good.price * good.weight, 4)
 						}
 					})
 				})
 			}
-			return num.toFixed(4)
+			return num
 		}
 	},
 	methods: {
@@ -333,8 +334,9 @@ export default {
 		 */
 		change(num, shop, good) {
 			good.quantity = num
-			let buyTon = Number(good.gramWeight) * Number(good.quantity)
-			good.weight = (buyTon / (1000 * 1000)).toFixed(4)
+			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)
 		}
 	}
 }

pages/enquiry-list/index.vue

@@ -11,7 +11,7 @@
         <view class="content" v-for="(item, index) in list" :key="index">
           <uGap v-if="index > 0"></uGap>
           <view class="header">
-            <view class="header-title">{{ item.belongEnterpriseName }}</view>
+            <view class="header-title">{{ item.id }}</view>
             <view class="header-value">
               <text :class="item.status == 30131 || item.status == 30138 ? 'failure' : ''">{{ item.status | statusName }}</text>
             </view>

pages/paper-details/index.vue

@@ -143,6 +143,7 @@ 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 { getPaperDetail, createGoodsReserve, createShoppingCar } from '@/apis/paperDetailsApi.js'
+import { round } from '@/utils/index.js'
 export default {
   components: { uGap, qnFooter, qnInputNumber },
   data() {
@@ -213,10 +214,8 @@ export default {
   computed: {
     buyTon() {
       let num = 0
-      num = Number(this.buyPaperDto.gramWeight) * Number(this.buyPaperDto.pieceQuantity)
-
-      this.buyPaperDto.buyTon = num / (1000 * 1000)
-      return this.buyPaperDto.buyTon.toFixed(4)
+	  num = round(this.buyPaperDto.gramWeight * this.buyPaperDto.width * this.buyPaperDto.length * this.buyPaperDto.pieceQuantity * 1e-12, 4)
+      return num
     }
   },
   methods: {

pages/store/index.vue

@@ -1,9 +1,6 @@
 <template>
   <view class="warpper">
-    <qnHeader class="header">
-      <view class="header-title">店铺首页</view>
-      <view class=""></view>
-    </qnHeader>
+	  <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> -->

utils/index.js

@@ -116,3 +116,11 @@ export const makeSocket = async ({ pageInfo = '', retry = false }) => {
 
   return socket
 }
+/**
+ * 正数的四舍五入
+ * @value {number} num 需要四舍五入的数字
+ * @value {number} precision 小数点后保留的位数
+ */
+export function round(number, precision) {
+  return Math.round(+number + 'e' + precision) / Math.pow(10, precision)
+}