From a346cc0db38430b27c8c7c85d27247729b33cb50 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Mon, 20 Jun 2022 11:18:40 +0800
Subject: [PATCH] =?UTF-8?q?bug=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                |  4 ++++
 apis/request.js                     |  2 +-
 components/empty/empty.vue          |  8 +++++++-
 order/addCourse/addCourse.vue       |  6 ++++--
 order/editCourse/editCourse.vue     |  5 +++--
 order/orderDetail/orderDetail.vue   | 11 +++++-----
 order/ordered/ordered.vue           |  2 +-
 order/orders/orders.vue             |  2 +-
 pages.json                          |  9 +++++----
 pages/addStaff/addStaff.vue         |  2 +-
 pages/clientDetail/clientDetail.vue | 18 +++++++++--------
 pages/clients/clients.vue           |  4 ++--
 pages/phone/phone.vue               | 31 ++++++++++++++++-------------
 pages/qrcode/qrcode.vue             |  6 +++++-
 pages/teams/teams.vue               |  1 +
 styles/common.scss                  |  8 ++++----
 16 files changed, 72 insertions(+), 47 deletions(-)

diff --git a/apis/modules/user.js b/apis/modules/user.js
index 7af8fc2..bd40a38 100644
--- a/apis/modules/user.js
+++ b/apis/modules/user.js
@@ -45,4 +45,8 @@ export const checkIfAnAccountExists = account => {
   return post(`users/applets/mine/checkIfAnAccountExists?account=${account}`)
 }
 
+export const checkIfThePhoneNumberExists = phone => {
+  return post(`users/applets/mine/checkIfThePhoneNumberExists?phone=${phone}`)
+}
+
 export const updateUserAvatars = `http://39.108.250.202:9000/users/users/userAccount/updateUserAvatars`
\ No newline at end of file
diff --git a/apis/request.js b/apis/request.js
index 04948d3..9f0f320 100644
--- a/apis/request.js
+++ b/apis/request.js
@@ -19,7 +19,7 @@ const request = options => {
 		const { url } = options
 		uni.request({
 			header,
-			url: (otherUrl.find(e => url.includes(e)) ? 'http://192.168.31.137:9000/' : config.baseURL) + url,
+			url: (otherUrl.find(e => url.includes(e)) ? 'http://192.168.31.151:9000/' : config.baseURL) + url,
 			method: options.method || 'GET', // 请求类型，默认为GET
 			data: options.data || {}, // 请求参数，默认空对象
 			success: ({ data }) => {
diff --git a/components/empty/empty.vue b/components/empty/empty.vue
index cf72351..42d2f06 100644
--- a/components/empty/empty.vue
+++ b/components/empty/empty.vue
@@ -1,12 +1,18 @@
 <template>
 	<view class="none">
 		<image src="../../static/image/none.png" mode="widthFix"></image>
-		<view class="text">暂无数据</view>
+		<view class="text">{{ text }}</view>
 	</view>
 </template>
 
 <script>
 	export default {
+		props: {
+			text: {
+			    type: String,
+			    default: '暂无数据'
+			},
+		},
 		data() {
 			return {
 				
diff --git a/order/addCourse/addCourse.vue b/order/addCourse/addCourse.vue
index c18a9a8..3fcc905 100644
--- a/order/addCourse/addCourse.vue
+++ b/order/addCourse/addCourse.vue
@@ -155,6 +155,7 @@
 			},
 			// 生成产品参数
 			createParam(e) {
+				const { orderType } = this
 				return {
 					dataOrCourseId: e.id, // id
 					productName: e.productName, // 名称
@@ -164,7 +165,7 @@
 					remainingPeriod: '', // 剩余期限
 					marketValue: '', // 市场价
 					marketPrice: e.marketPrice, // 市场单价
-					finalPrice: this.orderType === 2 ? 0 : '', // 成交价
+					finalPrice: orderType == 2 ? 0 : '', // 成交价
 					discountRate: '', // 折扣率
 					accountNum: e.productType === 2 ? '' : 1, // 账号数
 					totalAmount: '', // 总价
@@ -174,7 +175,7 @@
 					productType: e.productType, // 课程分类 (0->理论 1-实训 2 数据产品) 
 					options: 1,
 					miniProgramPictureAddress: e.miniProgramPictureAddress, // 图标
-					settlementPrice: '', // 结算价
+					settlementPrice: orderType == 2 ? 0 : '', // 结算价
 					settlementMethod: e.settlementMethod, // 结算方式，0为单价，1为分成
 					settlementPriceUnit: e.settlementPrice, // 结算单价
 					businessProportion: e.businessProportion, // 商务占比
@@ -273,6 +274,7 @@
 	}
 }
 .btn-wrap {
+	position: fixed;
 	justify-content: space-between;
 	.btn {
 		width: 340rpx;
diff --git a/order/editCourse/editCourse.vue b/order/editCourse/editCourse.vue
index ef48cd4..a7d5cd7 100644
--- a/order/editCourse/editCourse.vue
+++ b/order/editCourse/editCourse.vue
@@ -309,8 +309,9 @@
 
 <style scoped lang="scss">
 .page {
-	height: calc(100vh - 140rpx - env(safe-area-inset-bottom));
-	overflow: auto;
+	padding-bottom: 130rpx;
+	// height: calc(100vh - 140rpx - env(safe-area-inset-bottom));
+	// overflow: auto;
 	-webkit-overflow-scrolling: touch;
 }
 .block {
diff --git a/order/orderDetail/orderDetail.vue b/order/orderDetail/orderDetail.vue
index b23f89e..01cb424 100644
--- a/order/orderDetail/orderDetail.vue
+++ b/order/orderDetail/orderDetail.vue
@@ -400,12 +400,10 @@
 
 <style scoped lang="scss">
 .page {
-	height: calc(100vh - 300rpx - env(safe-area-inset-bottom));
-	overflow: auto;
-	-webkit-overflow-scrolling: touch;
+	padding-bottom: 400rpx;
 }
 .show {
-	height: calc(100vh - 130rpx - env(safe-area-inset-bottom));
+	padding-bottom: 260rpx;
 }
 .pro-wrap {
 	position: relative;
@@ -471,8 +469,11 @@
 }
 .bottom {
 	position: fixed;
-	bottom: env(safe-area-inset-bottom);
+	bottom: 0;
+	padding-bottom: env(safe-area-inset-bottom);
 	width: 100%;
+	background-color: #fff;
+	box-sizing: border-box;
 }
 /deep/.add-btn {
 	display: flex;
diff --git a/order/ordered/ordered.vue b/order/ordered/ordered.vue
index 2e39cc4..9d20252 100644
--- a/order/ordered/ordered.vue
+++ b/order/ordered/ordered.vue
@@ -2,7 +2,7 @@
 	<view>
 		<view class="filter">
 			<uni-search-bar class="search" radius="30" placeholder="请输入产品名称" v-model="keyword" clearButton="auto" cancelButton="none" />
-			<uni-icons class="icon" custom-prefix="iconfont" type="icon-filter" size="18" color="#007eff" @click="popup = true"></uni-icons>
+			<uni-icons class="icon" custom-prefix="iconfont" type="icon-filter" size="22" color="#007eff" @click="popup = true"></uni-icons>
 		</view>
 		
 		<ul class="tab">
diff --git a/order/orders/orders.vue b/order/orders/orders.vue
index 11fef16..9897e0f 100644
--- a/order/orders/orders.vue
+++ b/order/orders/orders.vue
@@ -3,7 +3,7 @@
 		<view class="filter">
 			<uni-search-bar class="search" radius="30" placeholder="请输入姓名、订单号" v-model="keyword" clearButton="auto" cancelButton="none" />
 			<view :class="['sort', sort]" @click="switchSort"></view>
-			<uni-icons class="icon" custom-prefix="iconfont" type="icon-filter" size="18" color="#007eff" @click="popup = true"></uni-icons>
+			<uni-icons class="icon" custom-prefix="iconfont" type="icon-filter" size="22" color="#007eff" @click="popup = true"></uni-icons>
 		</view>
 		<ul class="tab">
 			<li v-for="(tab, i) in tabs" :class="{active: curTab === tab.id}" @click="tabChange(tab)">{{ tab.name }}</li>
diff --git a/pages.json b/pages.json
index bc7eeda..e7fb31d 100644
--- a/pages.json
+++ b/pages.json
@@ -52,7 +52,7 @@
             "path" : "pages/addStaff/addStaff",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "添加成员",
+                "navigationBarTitleText": "邀请成员",
                 "enablePullDownRefresh": false
             }
         },
@@ -189,7 +189,7 @@
 	},
 	"globalStyle": {
 		"navigationBarTextStyle": "white",
-		"navigationBarTitleText": "或然CRM系统",
+		"navigationBarTitleText": "或然合伙人运营管理平台",
 		"navigationBarBackgroundColor": "#007EFF",
 		"backgroundColor": "#f5f5f5",
 		"app-plus": {
@@ -201,6 +201,8 @@
 		"selectedColor": "#007FFF",
 		"borderStyle": "white",
 		"backgroundColor": "#ffffff",
+		"fontSize": "16px",
+		"iconWidth": "30px",
 		"list": [{
 			"pagePath": "pages/index/index",
 			"iconPath": "static/image/tab1.png",
@@ -210,8 +212,7 @@
 			"pagePath": "pages/teams/teams",
 			"iconPath": "static/image/tab2.png",
 			"selectedIconPath": "static/image/tab2-1.png",
-			"text": "团队",
-			"visible": false
+			"text": "团队"
 		}, {
 			"pagePath": "pages/person/person",
 			"iconPath": "static/image/tab3.png",
diff --git a/pages/addStaff/addStaff.vue b/pages/addStaff/addStaff.vue
index c45aee5..a48c611 100644
--- a/pages/addStaff/addStaff.vue
+++ b/pages/addStaff/addStaff.vue
@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<uni-section title="邀请员工" type="line">
+		<uni-section title="邀请成员" type="line">
 			<uni-list>
 				<uni-list-item thumb-size="sm" showArrow title="二维码邀请" clickable :to="`../qrcode/qrcode`">
 					<template v-slot:header>
diff --git a/pages/clientDetail/clientDetail.vue b/pages/clientDetail/clientDetail.vue
index 1459c21..dd95955 100644
--- a/pages/clientDetail/clientDetail.vue
+++ b/pages/clientDetail/clientDetail.vue
@@ -59,11 +59,11 @@
 					<view v-if="isDetail" class="val">{{ form.email }}</view>
 					<input v-else type="text" placeholder="请输入" v-model="form.email">
 				</view>
-				<view class="line">
+				<view v-if="customerId" class="line">
 					<view class="name">产品到期时间</view>
 					<view class="val">{{ form.expireDate }}</view>
 				</view>
-				<view class="line">
+				<view v-if="customerId" class="line">
 					<view class="name">客户类型</view>
 					<view class="val">{{ customerType }}</view>
 				</view>
@@ -215,8 +215,8 @@
 			// 客户名称选择回调
 			schoolChange(school) {
 				const { form } = this
-				const { schoolId } = form
-				form.schoolId = school.schoolId
+				const { schoolId } = school
+				form.schoolId = schoolId
 				form.customerName = school.schoolName
 				form.provinceId = school.provinceId
 				form.provinceName = school.provinceName
@@ -269,7 +269,7 @@
 					}).catch(res => {})
 				} else {
 					addCustomer(form).then(res => {
-						this.$util.sucMsg('添加成功')
+						this.$util.sucMsg('创建客户成功！你现在可以去订单给客户下单了。')
 						setTimeout(() => {
 							uni.navigateBack()
 						}, 1500)
@@ -282,8 +282,9 @@
 
 <style scoped lang="scss">
 .page {
-	height: calc(100vh - 120rpx - env(safe-area-inset-bottom));
-	overflow: auto;
+	padding-bottom: 170rpx;
+	// height: calc(100vh - 120rpx - env(safe-area-inset-bottom));
+	// overflow: auto;
 	-webkit-overflow-scrolling: touch;
 }
 .info {
@@ -296,11 +297,12 @@
 .action {
 	z-index: 2;
 	position: fixed;
-	bottom: env(safe-area-inset-bottom);
+	bottom: 0;
 	display: flex;
 	justify-content: space-around;
 	width: 100%;
 	padding: 5px 10px;
+	padding-bottom: env(safe-area-inset-bottom);
 	background-color: #fff;
 	border-top: 1px solid #f3f3f3;
 	box-sizing: border-box;
diff --git a/pages/clients/clients.vue b/pages/clients/clients.vue
index e526fca..bb18d03 100644
--- a/pages/clients/clients.vue
+++ b/pages/clients/clients.vue
@@ -2,7 +2,7 @@
 	<view class="page">
 		<view class="filter">
 			<uni-search-bar class="search" radius="30" placeholder="请输入客户名称" v-model="keyword" clearButton="auto" cancelButton="none" />
-			<uni-icons class="icon" custom-prefix="iconfont" type="icon-filter" size="18" color="#007eff" @click="popup = true"></uni-icons>
+			<uni-icons class="icon" custom-prefix="iconfont" type="icon-filter" size="22" color="#007eff" @click="popup = true"></uni-icons>
 		</view>
 		<ul class="tab">
 			<li v-for="(tab, i) in tabs" :class="{active: curTab === tab.id}" @click="tabChange(tab)">{{ tab.name }}</li>
@@ -39,7 +39,7 @@
 			</ul>
 			<uni-load-more :status="status" />
 		</template>
-		<empty v-else></empty>
+		<empty v-else text="您当前暂无有下单的客户，请快去给客户下订单吧"></empty>
 		
 		<uni-icons class="plus" type="plus-filled" size="60" color="#007eff" @click="$util.to('../clientDetail/clientDetail')"></uni-icons>
 		<filter-popup :data="filterData" :form.sync="filterForm" v-model="popup" title="全部筛选" height="1104rpx" @finsh="subFinsh"></filter-popup>
diff --git a/pages/phone/phone.vue b/pages/phone/phone.vue
index 23f6390..ddec52e 100644
--- a/pages/phone/phone.vue
+++ b/pages/phone/phone.vue
@@ -1,10 +1,10 @@
 <template>
 	<view class="page">
 		<view class="input">
-			<uni-easyinput v-model="form.phone" placeholder="请填写你的手机号" :clearable="false" />
+			<uni-easyinput v-model="form.phone" placeholder="请填写你的手机号" maxlength="11" :clearable="false" />
 		</view>
 		<view class="input code-wrap">
-			<uni-easyinput class="code" v-model="form.code" placeholder="验证码" :clearable="false" />
+			<uni-easyinput class="code" v-model="form.code" placeholder="验证码" maxlength="6" :clearable="false" />
 			<view class="send-code" @click="sendCode" :disabled="codeDisabled">{{ btnText }}</view>
 		</view>
 		<button type="primary" @click="submit">确认</button>
@@ -12,7 +12,7 @@
 </template>
 
 <script>
-	import { sendPhoneOrEmailCode, changePhoneNumber } from '@/apis/modules/user.js'
+	import { sendPhoneOrEmailCode, changePhoneNumber, checkIfThePhoneNumberExists } from '@/apis/modules/user.js'
 	export default {
 		data() {
 			return {
@@ -36,17 +36,20 @@
 				const { phone } = this.form
 				if (!phone) return this.$util.errMsg('请输入手机号')
 				if (!/^1[3456789]\d{9}$/.test(phone) && !/^([a-zA-Z]|[0-9])(\w|\-)+@[a-zA-Z0-9]+\.([a-zA-Z]{2,4})$/.test(phone)) return this.$util.errMsg('请输入正确的手机号')
-				sendPhoneOrEmailCode({
-					userId: this.userId,
-					phone,
-					types: 2
-				}).then(({ message }) => {
-					if (message.opener) {
-						this.phoneCountdown()
-						this.phoneOpener = message.opener
-					} else {
-						this.$util.errMsg(message)
-					}
+				// 手机号判重
+				checkIfThePhoneNumberExists(phone).then(() => {
+					sendPhoneOrEmailCode({
+						userId: this.userId,
+						phone,
+						types: 2
+					}).then(({ message }) => {
+						if (message.opener) {
+							this.phoneCountdown()
+							this.phoneOpener = message.opener
+						} else {
+							this.$util.errMsg(message)
+						}
+					}).catch(res => {})
 				}).catch(res => {})
 			},
 			// 验证码倒计时
diff --git a/pages/qrcode/qrcode.vue b/pages/qrcode/qrcode.vue
index cdaf633..0b9e35c 100644
--- a/pages/qrcode/qrcode.vue
+++ b/pages/qrcode/qrcode.vue
@@ -6,7 +6,7 @@
 					<image class="avatar" :src="avatar" mode=""></image>
 					<view class="text">
 						<view class="invite">
-							<text class="name">{{ userName }}</text> 邀请你加入
+							<text class="name">{{ userName }}</text> 邀请你加入城市合伙人计划
 						</view>
 						<view class="com">{{ team.partnerClassificationName }}</view>
 					</view>
@@ -66,6 +66,10 @@
 	text-align: center;
 	background-color: #fff;
 	.inner {
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
 		padding: 40rpx 80rpx 0;
 	}
 	.info {
diff --git a/pages/teams/teams.vue b/pages/teams/teams.vue
index f18e352..5f09a56 100644
--- a/pages/teams/teams.vue
+++ b/pages/teams/teams.vue
@@ -84,6 +84,7 @@
 			// 获取列表
 			getList() {
 				teamList({
+					type: 1,
 					pageNum: this.page,
 					pageSize: this.pageSize,
 					keyWord: this.keyword,
diff --git a/styles/common.scss b/styles/common.scss
index 01d05a4..81de704 100644
--- a/styles/common.scss
+++ b/styles/common.scss
@@ -49,13 +49,13 @@ ul {
 			content: '';
 			display: block;
 			margin-bottom: 5rpx;
-			border: 11rpx solid transparent;
+			border: 15rpx solid transparent;
 			border-bottom-color: #B9B9B9;
 		}
 		&:after {
 			content: '';
 			display: block;
-			border: 11rpx solid transparent;
+			border: 15rpx solid transparent;
 			border-top-color: #B9B9B9;
 		}
 		&.desc:before {
@@ -175,9 +175,9 @@ ul {
 	}
 }
 .btn-wrap {
-	z-index: 2;
+	z-index: 10;
 	position: fixed;
-	// bottom: env(safe-area-inset-bottom);
+	bottom: env(safe-area-inset-bottom);
 	bottom: 0;
 	display: flex;
 	justify-content: flex-end;