From 196004334d785fff75c35d930a0ecdb38ab87400 Mon Sep 17 00:00:00 2001
From: dengxiongfei <dengxiongfei@qniao.cn>
Date: Thu, 27 Jan 2022 18:25:06 +0800
Subject: [PATCH] bug

---
 pages/add-account/index.vue       | 499 +++++++++++++++---------------
 pages/mine/index.vue              |  17 +-
 pages/quotation-details/index.vue |   7 +-
 3 files changed, 270 insertions(+), 253 deletions(-)

diff --git a/pages/add-account/index.vue b/pages/add-account/index.vue
index 81f751d..63bdfeb 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.supplierInfo.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.supplierInfo.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 #d8d8d8;
+    margin-left: 32rpx;
+  }
+  .add-paper-list {
+    height: 88rpx;
+    background: #ffffff;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding-left: 32rpx;
+    padding-right: 32rpx;
+  }
+  .add-paper-text {
+    font-size: 28rpx;
+    color: #000000;
+    letter-spacing: 0;
+    font-weight: 400;
+  }
+  .add-paper-start {
+    font-size: 28rpx;
+    color: #f5222d;
+    letter-spacing: 0;
+    font-weight: 400;
+  }
+  .add-paper-input {
+    width: 40%;
+  }
+  .popup_modal {
+    width: 750rpx;
+    height: 600rpx;
+    background-color: #fff;
+    border-radius: 10rpx 10rpx 0 0;
+    .popup_modal-title {
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      justify-content: center;
+      width: 750rpx;
+      height: 88rpx;
+      font-weight: 600;
+      border-bottom: 2rpx solid #d8d8d8;
+    }
+    .popup_modal-scroll {
+      width: 750rpx;
+      height: 600rpx;
+      .popup_modal-scroll-item {
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        justify-content: center;
+        width: 750rpx;
+        height: 88rpx;
+        padding: 0rpx 32rpx;
+        border-bottom: 2rpx solid #d8d8d8;
+      }
+    }
+  }
+  .cencel-btn {
+    font-size: 32rpx;
+    color: #646566;
+    text-align: center;
+    line-height: 44rpx;
+    font-weight: 400;
+    margin-top: 40rpx;
+  }
+  .add-paph-text {
+    font-size: 28rpx;
+    color: #888888;
+    letter-spacing: 0;
+    font-weight: 400;
+  }
+  .btn-class {
+    height: 88rpx;
+    border-radius: 10rpx;
+    line-height: 80rpx;
+    width: 150px;
+  }
+  .btn-class-upload {
+    height: 88rpx;
+    border-radius: 10rpx;
+    line-height: 80rpx;
+    width: 200px;
+  }
+  .uploud-btn {
+    display: flex;
+    justify-content: space-between;
+    padding: 20rpx 32rpx;
+    background-color: #ffffff;
+    position: absolute;
+    bottom: 0rpx;
+    width: 100%;
+  }
 }
 </style>
diff --git a/pages/mine/index.vue b/pages/mine/index.vue
index 22c6976..dd58a73 100644
--- a/pages/mine/index.vue
+++ b/pages/mine/index.vue
@@ -109,11 +109,11 @@
           <image class="icon" src="/static/imgs/mine/order-icon.png"></image>
           <text class="label">订单管理</text>
         </view> -->
-        <view class="icon-item" @click="loginGo2('credit-order-list')">
+        <view class="icon-item" @click="handleJump('credit-order-list')">
           <image class="icon" src="/static/imgs/mine/finance-icon.png"></image>
           <text class="label">账期订单融资</text>
         </view>
-        <view class="icon-item" @click="loginGo2('contract-manage')">
+        <view class="icon-item" @click="handleJump('contract-manage')">
           <image class="icon" src="/static/imgs/mine/contract-icon.png"></image>
           <text class="label">合同管理</text>
         </view>
@@ -131,8 +131,8 @@
         </view> -->
       </view>
     </view>
-    <view @click="go2('client-credit')">client-credit</view>
-    <view @click="go2('enterprise-info')">enterprise-info</view>
+    <!-- <view @click="go2('client-credit')">client-credit</view>
+    <view @click="go2('enterprise-info')">enterprise-info</view> -->
     <view class="share-area" v-if="visible">
       <view class="close-icon">
         <uni-icons @click="closeShare" type="close" size="35" color="white"></uni-icons>
@@ -235,6 +235,15 @@ export default {
     },
     go2,
     loginGo2,
+    handleJump(page) {
+      if (!this.hasCompany) {
+        uni.showToast({
+          title: '您还没有企业，请先加入企业',
+          icon: 'none'
+        })
+      }
+      loginGo2(page)
+    },
     makeVip() {
       if (this.hasCompany) {
         this.visible = true
diff --git a/pages/quotation-details/index.vue b/pages/quotation-details/index.vue
index e27d77b..dbe4cb7 100644
--- a/pages/quotation-details/index.vue
+++ b/pages/quotation-details/index.vue
@@ -58,7 +58,7 @@
       </view>
       <view class="">
         <text class="submit-content-order-title">合计：</text>
-        <text class="submit-content-order-money">¥ {{ upDataObj.totalAllPrice }}</text>
+        <text class="submit-content-order-money">¥ {{ upDataObj.totalPrice }}</text>
       </view>
     </view>
     <uGap></uGap>
@@ -84,6 +84,7 @@ import { back, go2 } from '@/utils/hook.js'
 import qnHeader from '@/components/qn-header/qn-header.vue'
 import uGap from '@/components/u-gap/u-gap.vue'
 import { enquiryReplyDetail } from '@/apis/trade.js'
+import { round } from '@/utils/index.js'
 export default {
   components: {
     qnHeader,
@@ -157,9 +158,9 @@ export default {
     priceFree() {
       for (let i = 0; i < this.upDataObj.itemList.length; i++) {
         var totalAllPrice = parseFloat(this.upDataObj.totalAllPrice) + parseFloat(this.upDataObj.itemList[i].totalPrice)
-        this.upDataObj.totalAllPrice = totalAllPrice.toFixed(2)
+        this.upDataObj.totalAllPrice = round(totalAllPrice, 2)
         var otherFee = parseFloat(this.upDataObj.otherFee) + parseFloat(this.upDataObj.itemList[i].otherFee)
-        this.upDataObj.otherFee = otherFee.toFixed(2)
+        this.upDataObj.otherFee = round(otherFee, 2)
       }
     },
     // 修改报价按钮