From 88137407996a518c9d5121294a5a5dbebab34f8e Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Fri, 10 Jun 2022 11:21:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81=E7=AD=89=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apis/modules/user.js                |  8 +++-
 config/product.js                   |  2 +-
 pages/clientDetail/clientDetail.vue |  5 +-
 pages/detail/detail.vue             | 39 ++++++++++++++-
 pages/editCourse/editCourse.vue     |  2 +-
 pages/index/index.vue               | 28 +++++------
 pages/orderDetail/orderDetail.vue   | 73 ++++++++++++++++-------------
 pages/password/password.vue         | 39 ++++++++++++---
 pages/qrcode/qrcode.vue             | 18 ++++---
 pages/setting/setting.vue           |  6 +++
 styles/common.scss                  |  1 +
 11 files changed, 151 insertions(+), 70 deletions(-)

diff --git a/apis/modules/user.js b/apis/modules/user.js
index b212ed2..ae8f2e6 100644
--- a/apis/modules/user.js
+++ b/apis/modules/user.js
@@ -7,4 +7,10 @@ export const login = (data) => {
 
 export const userBinding = (data) => {
   return post('users/users/user/userBinding', data)
-}
\ No newline at end of file
+}
+
+export const examinePassword = (data) => {
+  return post('users/users/userAccount/examinePassword', data)
+}
+
+export const updateUserAvatars = `http://39.108.250.202:9000/users/users/userAccount/updateUserAvatars`
\ No newline at end of file
diff --git a/config/product.js b/config/product.js
index b3646e0..ea2a564 100644
--- a/config/product.js
+++ b/config/product.js
@@ -5,5 +5,5 @@
  */
 
 export default {
-	normalIcon: 'https://huoran.oss-cn-shenzhen.aliyuncs.com/20220609/png/1534733700683030528.png'
+	normalIcon: 'https://huoran.oss-cn-shenzhen.aliyuncs.com/20220609/png/1534733700683030528.png' // 通用图标
 }
diff --git a/pages/clientDetail/clientDetail.vue b/pages/clientDetail/clientDetail.vue
index dbe56e9..c5ae3f1 100644
--- a/pages/clientDetail/clientDetail.vue
+++ b/pages/clientDetail/clientDetail.vue
@@ -282,7 +282,8 @@
 
 <style scoped lang="scss">
 .page {
-	padding-bottom: 150rpx;
+	height: calc(100vh - 120rpx - env(safe-area-inset-bottom));
+	overflow: auto;
 }
 .info {
 	.name {
@@ -294,7 +295,7 @@
 .action {
 	z-index: 2;
 	position: fixed;
-	bottom: 0;
+	bottom: env(safe-area-inset-bottom);
 	display: flex;
 	justify-content: space-around;
 	width: 100%;
diff --git a/pages/detail/detail.vue b/pages/detail/detail.vue
index fdb618f..dbb42ec 100644
--- a/pages/detail/detail.vue
+++ b/pages/detail/detail.vue
@@ -27,9 +27,46 @@
 			const pages = getCurrentPages()
 			const { options } = 
 			this.src = `http://view.xdocin.com/xdoc?_xdoc=${this.files[pages[pages.length - 1].options.id]}`
+			// this.preview()
 		},
 		methods: {
-			
+			preview() {
+				uni.showLoading({
+					title: '加载中',
+					mask: true
+				  })
+				  //下载文件资源到本地
+				  uni.downloadFile({
+					url: this.src,
+					success: function(res) {
+					  console.log('downloadFile ==> ',res)
+					  uni.hideLoading();
+					  var filePath = res.tempFilePath;
+					  uni.showLoading({
+						title: '正在打开',
+						mask: true
+					  })
+					  // 新开页面打开文档，支持格式：doc, xls, ppt, pdf, docx, xlsx, pptx。
+					  uni.openDocument({
+						filePath: filePath,
+						fileType: 'docx',// 文件类型，指定文件类型打开文件，有效值 doc, xls, ppt, pdf, docx, xlsx, pptx 
+						// showMenu: true, // 允许出现分享功能
+						success: res => {
+						  uni.hideLoading();
+						  console.log('打开文档成功',res);
+						},
+						fail: openError => {
+						  uni.hideLoading();
+						  console.log('fail:' + JSON.stringify(openError));
+						}
+					  });
+					},
+					fail: function(err) {
+					  uni.hideLoading();
+					  console.log('fail:' + JSON.stringify(err));
+					}
+				  });
+			}
 		}
 	}
 </script>
diff --git a/pages/editCourse/editCourse.vue b/pages/editCourse/editCourse.vue
index c811e5f..a933bca 100644
--- a/pages/editCourse/editCourse.vue
+++ b/pages/editCourse/editCourse.vue
@@ -309,7 +309,7 @@
 
 <style scoped lang="scss">
 .page {
-	height: calc(100vh - 140rpx);
+	height: calc(100vh - 140rpx - env(safe-area-inset-bottom));
 	overflow: auto;
 }
 .block {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index b640e0b..df49aab 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -2,7 +2,7 @@
 	<view class="page">
 		<image class="bg" src="@/static/image/index/index2.png" mode="widthFix"></image>
 		<view class="team">
-			<uni-data-picker class="picker-input" placeholder="切换团队" popup-title="切换团队" preload :clear-icon="false" :localdata="list" :map="{text: 'partnerClassificationName', value: 'partnerId'}" v-model="partnerId" @change="teamChange"></uni-data-picker>
+			<uni-data-picker class="picker-input" placeholder="切换团队" popup-title="切换团队" preload :clear-icon="false" :localdata="list" :map="{text: 'partnerClassificationName', value: 'teamId'}" v-model="teamId" @change="teamChange"></uni-data-picker>
 		</view>
 		
 		<view class="banner">
@@ -107,7 +107,7 @@
 	export default {
 		data() {
 			return {
-				partnerId: this.$util.getBmId() || '',
+				teamId: uni.getStorageSync('team').teamId || '',
 				list: [],
 				id: '',
 				teamList: []
@@ -125,12 +125,11 @@
 						treeList().then(({ treeList }) => {
 							this.teamList = treeList
 							this.getId(treeList, '', data[0].teamId)
-							data[0].teamId = this.id
 							// 依据团队id查询团队下的全部商务经理(集合)
-							getTheBusinessManagerIdsUnderTheTeam(this.id).then(res => {
+							this.id && getTheBusinessManagerIdsUnderTheTeam(this.id).then(res => {
 								data[0].businessManagerIds = res
 								// 默认选择第一个团队
-								this.partnerId = data[0].partnerId
+								this.teamId = data[0].teamId
 								uni.setStorageSync('team', data[0])
 							}).catch(e => {})
 						}).catch(e => {})
@@ -150,15 +149,15 @@
 			},
 			// 团队选择回调
 			teamChange() {
-				const { partnerId } = this
-				const e = this.list.find(e => e.partnerId == partnerId)
-				this.getId(this.teamList, '', e.teamId)
-				e.teamId = this.id
-				
-				getTheBusinessManagerIdsUnderTheTeam(this.id).then(res => {
-					e.businessManagerIds = res
-					uni.setStorageSync('team', e)
-				}).catch(e => {})
+				const { teamId } = this
+				const e = this.list.find(e => e.teamId == teamId)
+				if (e) {
+					this.getId(this.teamList, '', e.teamId)
+					this.id && getTheBusinessManagerIdsUnderTheTeam(this.id).then(res => {
+						e.businessManagerIds = res
+						uni.setStorageSync('team', e)
+					}).catch(e => {})
+				}
 			},
 			// 提示暂未开放
 			toPanel(i) {
@@ -173,6 +172,7 @@
 	position: relative;
 	min-height: 100%;
 	padding: 30rpx 22rpx;
+	box-sizing: border-box;
 }
 .bg {
 	z-index: -1;
diff --git a/pages/orderDetail/orderDetail.vue b/pages/orderDetail/orderDetail.vue
index 347a557..5abff57 100644
--- a/pages/orderDetail/orderDetail.vue
+++ b/pages/orderDetail/orderDetail.vue
@@ -114,9 +114,9 @@
 					</view>
 					<view class="info">
 						总采购成本:
-						<text class="num num1">{{ purchase }}</text>元
+						<text class="num num1">{{ form.purchaseCost }}</text>元
 						总产品利润:
-						<text class="num"> {{ profit }}</text> 元
+						<text class="num"> {{ form.profit }}</text> 元
 					</view>
 				</view>
 				<view v-if="!isDetail" class="btn" @click="submit">提交</view>
@@ -164,12 +164,13 @@
 					phone: '',
 					orderAmount: 0,
 					customerName: '',
+					profit: 0, // 利润
+					purchaseCost: '', // 采购成本
+					teamId: uni.getStorageSync('team').teamId,
 					businessManagerId: this.$util.getBmId()
 				},
 				courseList: {},
 				courses: [], // 缓存的产品列表
-				purchase: 0,
-				profit: 0,
 				contract: { // 合同信息
 					contractName: '',   // 合同名称
 					contractFile: '',  // 合同文件
@@ -335,29 +336,33 @@
 			},
 			// 计算订单总额
 			calcTotal() {
-				let total = 0
-				const list = this.courses
-				let purchase = 0 // 总采购成本
-				let profit = 0 // 总利润
-				/**
-				 * 1）总采购成本+总产品利润=总成交价格
-
-					（2）单个产品采购成本 =结算价+平台服务费
-
-					（3）平台服务费=结算价*10%
-
-					（4）单个产品的利润=成交价-采购成本
-
-					总成本和总利润为单个产品的采购成本价和利润的和
-				 */
-				list.map(e => {
-					const curPurchase = +e.settlementPrice + +e.serviceFee
-					purchase += curPurchase
-					profit += +e.finalPrice - curPurchase
-				})
-				this.purchase = Math.round(purchase)
-				this.profit = Math.round(profit)
-				this.form.orderAmount = +this.purchase + +this.profit
+				const { form } = this
+				// 老数据没有这两个字段，则手动计算
+				if (!form.purchaseCost && !form.profit) {
+					let total = 0
+					const list = this.courses
+					let purchase = 0 // 总采购成本
+					let profit = 0 // 总利润
+					/**
+					 * 1）总采购成本+总产品利润=总成交价格
+					
+						（2）单个产品采购成本 =结算价+平台服务费
+					
+						（3）平台服务费=结算价*10%
+					
+						（4）单个产品的利润=成交价-采购成本
+					
+						总成本和总利润为单个产品的采购成本价和利润的和
+					 */
+					list.map(e => {
+						const curPurchase = +e.settlementPrice + +e.serviceFee
+						purchase += curPurchase
+						profit += +e.finalPrice - curPurchase
+					})
+					form.purchaseCost = Math.round(purchase)
+					form.profit = Math.round(profit)
+				}
+				form.orderAmount = +form.purchaseCost + +form.profit
 			},
 			// 提交
 			submit() {
@@ -395,11 +400,11 @@
 
 <style scoped lang="scss">
 .page {
-	height: calc(100vh - 300rpx);
+	height: calc(100vh - 300rpx - env(safe-area-inset-bottom));
 	overflow: auto;
 }
 .show {
-	height: calc(100vh - 130rpx);
+	height: calc(100vh - 130rpx - env(safe-area-inset-bottom));
 }
 .pro-wrap {
 	position: relative;
@@ -465,7 +470,7 @@
 }
 .bottom {
 	position: fixed;
-	bottom: 0;
+	bottom: env(safe-area-inset-bottom);
 	width: 100%;
 }
 /deep/.add-btn {
@@ -498,7 +503,8 @@
 		font-size: 24rpx;
 		color: #666;
 		.num {
-			font-size: 30rpx;
+			margin: 0 5rpx;
+			font-size: 34rpx;
 			color: #007EFF;
 		}
 	}
@@ -506,7 +512,8 @@
 		font-size: 24rpx;
 		color: #333;
 		.num {
-			font-size: 24rpx;
+			margin: 0 5rpx;
+			font-size: 32rpx;
 			color: #007EFF;
 		}
 	}
@@ -517,7 +524,7 @@
 		width: 196rpx;
 		margin-left: 27rpx;
 		line-height: 80rpx;
-		font-size: 30rpx;
+		font-size: 32rpx;
 		text-align: center;
 		color: #fff;
 		border-radius: 10rpx;
diff --git a/pages/password/password.vue b/pages/password/password.vue
index 1d268ab..94d0c0b 100644
--- a/pages/password/password.vue
+++ b/pages/password/password.vue
@@ -1,27 +1,49 @@
 <template>
 	<view class="page">
 		<view class="input">
-			<uni-easyinput type="password" v-model="password" placeholder="请输入旧密码"></uni-easyinput>
+			<uni-easyinput type="password" v-model.trim="form.password" placeholder="请输入旧密码"></uni-easyinput>
 		</view>
 		<view class="input">
-			<uni-easyinput type="password" v-model="password" placeholder="请输入新密码"></uni-easyinput>
+			<uni-easyinput type="password" v-model.trim="form.newPassword" placeholder="请输入新密码"></uni-easyinput>
 		</view>
 		<view class="input">
-			<uni-easyinput type="password" v-model="password" placeholder="请再次输入新密码"></uni-easyinput>
+			<uni-easyinput type="password" v-model.trim="form.reNewPassword" placeholder="请再次输入新密码"></uni-easyinput>
 		</view>
-		<button type="primary" @click="submit('valiForm')">确认</button>
+		<button type="primary" @click="submit">确认</button>
 	</view>
 </template>
 
 <script>
+	import { examinePassword } from '@/apis/modules/user.js'
 	export default {
 		data() {
 			return {
-				
+				form: {
+					password: '',
+					newPassword: '',
+					reNewPassword: ''
+				},
 			}
 		},
 		methods: {
-			
+			submit() {
+				const { form } = this
+				const { password, newPassword, reNewPassword } = form
+				if(!password) return this.$util.errMsg('请输入旧密码')
+				if(!newPassword) return this.$util.errMsg('请输入新密码')
+				if(!reNewPassword) return this.$util.errMsg('请确认新密码')
+				if(newPassword.length < 6 || reNewPassword.length < 6) return this.$util.errMsg('请输入6位数以上的密码')
+				if(newPassword !== reNewPassword) return this.$util.errMsg('输入的新密码不一致，请重新确认')
+				if(password === newPassword) return this.$util.errMsg('旧密码跟新密码不能一致')
+	
+				form.accountId = uni.getStorageSync('team').accountId
+				examinePassword(form).then(res => {
+					this.$util.sucMsg('修改成功！')
+					setTimeout(() => {
+						uni.navigateBack()
+					}, 1000)
+				}).catch(e => {})
+			}
 		}
 	}
 </script>
@@ -31,7 +53,10 @@
 	padding: 20px;
 	background-color: #fff;
 }
-.input {
+/deep/.input {
 	margin-bottom: 15px;
+	.is-input-border {
+		border-color: #dedede !important;
+	}
 }
 </style>
diff --git a/pages/qrcode/qrcode.vue b/pages/qrcode/qrcode.vue
index 5ded198..10db43f 100644
--- a/pages/qrcode/qrcode.vue
+++ b/pages/qrcode/qrcode.vue
@@ -11,9 +11,7 @@
 						<view class="com">{{ team.partnerClassificationName }}</view>
 					</view>
 				</view>
-				<view class="qrcode">
-					<u-qrcode ref="qrcode" canvas-id="qrcode" :size="size" :value="link"></u-qrcode>
-				</view>
+				<u-qrcode ref="qrcode" canvas-id="qrcode" :size="size" :value="link"></u-qrcode>
 				<view class="tips">扫一扫，加入我们吧</view>
 			</view>
 			<view class="warn">邀请二维码失效日期：{{ expireTime }}</view>
@@ -37,12 +35,12 @@
 		},
 		onShow() {
 			this.getQrcode()
-			
 		},
 		methods: {
 			// 生成二维码
 			getQrcode() {
 				const { team } = this
+				// 生成邀请码
 				generateInvitationCode(uni.getStorageSync('team').accountId).then(({ expireTime }) => {
 					const date = new Date(Date.now() + expireTime * 1000) // 返回的秒，要*1000
 					this.expireTime = `${date.getFullYear()}-${this.$util.preZero(date.getMonth() + 1)}-${this.$util.preZero(date.getDate())} ${this.$util.preZero(date.getHours())}:${this.$util.preZero(date.getMinutes())}:${this.$util.preZero(date.getMinutes())}`
@@ -57,11 +55,14 @@
 
 <style scoped lang="scss">
 .page {
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	height: 100%;
 	overflow: hidden;
 }
 .wrap {
 	padding-bottom: 40rpx;
-	margin: 120rpx 80rpx 0;
 	text-align: center;
 	background-color: #fff;
 	.inner {
@@ -70,6 +71,7 @@
 	.info {
 		display: flex;
 		align-items: center;
+		margin-bottom: 30rpx;
 		text-align: left;
 	}
 	.avatar {
@@ -79,7 +81,6 @@
 		border-radius: 50%;
 	}
 	.invite {
-		margin-bottom: 10rpx;
 		font-size: 26rpx;
 	}
 	.name {
@@ -90,11 +91,8 @@
 	.com {
 		font-size: 30rpx;
 	}
-	.qrcode {
-		margin-top: 80rpx;
-	}
 	.tips {
-		margin: 80rpx 0 20rpx;
+		margin: 30rpx 0 20rpx;
 		font-size: 12px;
 		color: #333;
 	}
diff --git a/pages/setting/setting.vue b/pages/setting/setting.vue
index c8d0aa3..0c360d4 100644
--- a/pages/setting/setting.vue
+++ b/pages/setting/setting.vue
@@ -3,6 +3,7 @@
 		<uni-list>
 			<uni-list-item :show-extra-icon="true" showArrow :extra-icon="phoneIcon" title="手机号" rightText="135617623" />
 			<uni-list-item :show-extra-icon="true" showArrow :extra-icon="mailIcon" title="邮箱" rightText="135617623" />
+			<uni-list-item :show-extra-icon="true" showArrow :extra-icon="accountIcon" title="账号" rightText="135617623" />
 			<uni-list-item :show-extra-icon="true" showArrow :extra-icon="pwdIcon" title="密码" rightText="******" clickable  @click="toPage('../password/password')" />
 		</uni-list>
 	</view>
@@ -22,6 +23,11 @@
 					size: '22',
 					type: 'email'
 				},
+				accountIcon: {
+					color: '#007eff',
+					size: '22',
+					type: 'account'
+				},
 				pwdIcon: {
 					color: '#007eff',
 					size: '22',
diff --git a/styles/common.scss b/styles/common.scss
index 5b513b5..d0fe58f 100644
--- a/styles/common.scss
+++ b/styles/common.scss
@@ -143,6 +143,7 @@ ul {
 .btn-wrap {
 	z-index: 2;
 	position: fixed;
+	// bottom: env(safe-area-inset-bottom);
 	bottom: 0;
 	display: flex;
 	justify-content: flex-end;