From d5a0deb0d29dfef5d557fc3c8d2d37d1720073bc Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Fri, 13 May 2022 16:29:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E8=BE=93=E5=85=A5=E6=96=87?=
 =?UTF-8?q?=E5=AD=97=E8=B7=B3=E5=8A=A8=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                          | 40 +++++++++------
 pages/clientDetail/clientDetail.vue | 66 +++++++++++++++----------
 pages/clients/clients.vue           | 12 ++---
 pages/orders/orders.vue             | 17 +++----
 pages/qrcode/qrcode.vue             | 76 +++++++++++++++++++++++++++++
 5 files changed, 150 insertions(+), 61 deletions(-)
 create mode 100644 pages/qrcode/qrcode.vue

diff --git a/pages.json b/pages.json
index 77ac90b..8528340 100644
--- a/pages.json
+++ b/pages.json
@@ -1,5 +1,29 @@
 {
 	"pages": [
+		{
+            "path" : "pages/clients/clients",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "客户列表",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path" : "pages/orders/orders",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "订单列表",
+                "enablePullDownRefresh": false
+            }
+        },
+        {
+            "path" : "pages/qrcode/qrcode",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "邀请加入",
+                "enablePullDownRefresh": false
+            }
+        },
         {
             "path" : "pages/send/send",
             "style" :                                                                                    
@@ -31,14 +55,6 @@
                 "navigationBarTitleText": "添加成员",
                 "enablePullDownRefresh": false
             }
-        },
-		{
-            "path" : "pages/clients/clients",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "客户列表",
-                "enablePullDownRefresh": true
-            }
         },
 		{
 			"path": "pages/index/index",
@@ -46,14 +62,6 @@
 				"navigationBarTitleText": "首页"
 			}
 		},
-        {
-            "path" : "pages/orders/orders",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "订单列表",
-                "enablePullDownRefresh": false
-            }
-        },
         {
             "path" : "pages/orderDetail/orderDetail",
             "style" :                                                                                    
diff --git a/pages/clientDetail/clientDetail.vue b/pages/clientDetail/clientDetail.vue
index 58e59db..03837f2 100644
--- a/pages/clientDetail/clientDetail.vue
+++ b/pages/clientDetail/clientDetail.vue
@@ -1,9 +1,8 @@
 <template>
-	<view class="page">
+	<view :class="{page: isDetail}">
 		<uni-card v-if="customerId" :is-shadow="false" :border="false" is-full>
 			<view class="info">
 				<view class="name">{{ form.customerName }}</view>
-				<view class="text">客户编号：2124232</view>
 				<view class="text">客户类型：{{ customerType }}</view>
 				<view class="text">产品到期时间：{{ form.expireDate || '' }}</view>
 			</view>
@@ -33,22 +32,22 @@
 						</uni-data-picker>
 					</uni-forms-item>
 					<uni-forms-item label="联系人姓名" name="name" required>
-						<uni-easyinput v-model="form.name" placeholder="请输入联系人姓名" :disabled="isDetail" />
+						<uni-easyinput ref="nameInput" placeholder="请输入联系人姓名" :disabled="isDetail" />
 					</uni-forms-item>
 					<uni-forms-item label="手机" name="phone">
-						<uni-easyinput v-model="form.phone" placeholder="请输入手机" :disabled="isDetail" />
+						<uni-easyinput ref="phoneInput" placeholder="请输入手机" :disabled="isDetail" />
 					</uni-forms-item>
 					<uni-forms-item label="账号" name="account" required>
-						<uni-easyinput v-model="form.account" placeholder="请以院校首字母+admin的格式来设置" :disabled="isDetail" />
+						<uni-easyinput ref="accountInput" placeholder="请以院校首字母+admin的格式来设置" :disabled="isDetail" />
 					</uni-forms-item>
 					<uni-forms-item label="职务" name="position">
-						<uni-easyinput v-model="form.position" placeholder="请输入职务" :disabled="isDetail" />
+						<uni-easyinput ref="positionInput" placeholder="请输入职务" :disabled="isDetail" />
 					</uni-forms-item>
 					<uni-forms-item label="邮箱" name="email">
-						<uni-easyinput v-model="form.email" placeholder="请输入邮箱" :disabled="isDetail" />
+						<uni-easyinput ref="emailInput" placeholder="请输入邮箱" :disabled="isDetail" />
 					</uni-forms-item>
 					<uni-forms-item label="产品到期时间">
-						<uni-datetime-picker type="datetime" return-type="timestamp" v-model="form.expireDate" disabled />
+						<uni-easyinput v-model="form.expireDate" disabled />
 					</uni-forms-item>
 					<uni-forms-item label="客户类型">
 						<uni-easyinput v-model="customerType" disabled />
@@ -181,6 +180,11 @@
 				}).then(({ result }) => {
 					const { customer } = result
 					this.form = customer
+					this.$refs.nameInput.val = customer.name
+					this.$refs.phoneInput.val = customer.phone
+					this.$refs.accountInput.val = customer.account
+					this.$refs.positionInput.val = customer.position
+					this.$refs.emailInput.val = customer.email
 					this.customerType = this.customerTypeList.find(e => e.value === customer.customerType).name
 				}).catch(e => {})
 			},
@@ -237,24 +241,33 @@
 			},
 			// 提交
 			submit(ref) {
-				this.$refs.form.validate().then(res => {
-					if (this.nameRepeat) return this.$util.errMsg('客户已存在！')
-					if (this.customerId) {
-						updateCustomer(this.form).then(res => {
-							this.$util.sucMsg('编辑成功')
-							setTimeout(() => {
-								this.$util.to('../clients/clients')
-							}, 1500)
-						}).catch(res => {})
-					} else {
-						addCustomer(this.form).then(res => {
-							this.$util.sucMsg('添加成功')
-							setTimeout(() => {
-								uni.navigateBack()
-							}, 1500)
-						}).catch(res => {})
-					}
-				}).catch(err => {})
+				const refs = this.$refs
+				const { form } = this
+				form.name = refs.nameInput.val
+				form.account = refs.accountInput.val
+				form.position = refs.positionInput.val
+				form.phone = refs.phoneInput.val
+				form.email = refs.emailInput.val
+				this.$nextTick(() => {
+					this.$refs.form.validate().then(res => {
+						if (this.nameRepeat) return this.$util.errMsg('客户已存在！')
+						if (this.customerId) {
+							updateCustomer(form).then(res => {
+								this.$util.sucMsg('编辑成功')
+								setTimeout(() => {
+									this.$util.to('../clients/clients')
+								}, 1500)
+							}).catch(res => {})
+						} else {
+							addCustomer(form).then(res => {
+								this.$util.sucMsg('添加成功')
+								setTimeout(() => {
+									uni.navigateBack()
+								}, 1500)
+							}).catch(res => {})
+						}
+					}).catch(err => {})
+				})
 			},
 		}
 	}
@@ -266,6 +279,7 @@
 }
 .info {
 	.name {
+		margin-bottom: 5px;
 		font-size: 16px;
 		color: #333;
 	}
diff --git a/pages/clients/clients.vue b/pages/clients/clients.vue
index 1a80446..80cb13f 100644
--- a/pages/clients/clients.vue
+++ b/pages/clients/clients.vue
@@ -3,8 +3,6 @@
 		<ul class="tab">
 			<li v-for="(tab, i) in tabs" :class="{active: curTab === tab.id}" @click="tabChange(tab)">{{ tab.name }}</li>
 		</ul>
-		
-		
 
 		<uni-card :is-shadow="false" :border="false" padding="0" is-full>
 			<view class="filter">
@@ -74,7 +72,6 @@
 					}
 				],
 				reachBottom: 0, // 是否是上拉加载。0->否,1->是,-1->加载完所有数据
-				isFilter: 0, // 是否是在筛选。0->否,1->是
 				status: 'more', // 上拉加载状态 more|loading|noMore
 				searchTimer: null,
 				customerType: '',
@@ -91,7 +88,6 @@
 			keyword (newName, oldName) {
 				clearTimeout(this.searchTimer)
 				this.searchTimer = setTimeout(() => {
-					this.isFilter = 1
 					this.initList()
 				}, 500)
 			}
@@ -111,8 +107,8 @@
 				this.getList()
 			}
 		},
-		onLoad() {
-			this.getList()
+		onShow() {
+			this.initList()
 		},
 		methods: {
 			getList() {
@@ -125,16 +121,16 @@
 					size: this.pageSize
 				}).then(({ message }) => {
 					// 未加载完所有数据，并且不是筛选，则拼接list，否则直接赋值
-					this.list = (this.reachBottom >= 0 && !this.isFilter) ? [...this.list, ...message.list] : message.list
+					this.list = this.reachBottom > 0 ? [...this.list, ...message.list] : message.list
 					this.page++ // 每次获取了数据后page+1
 					const noMore = this.list.length === message.totalCount // 是否加载完所有数据
 					this.status = noMore ? 'noMore' : 'more' // 加载完了则设置为noMore
 					this.reachBottom = noMore ? -1 : 0 // 加载完了则设置为-1
-					this.isFilter = 0 // 获取数据后筛选状态重置为0
 				}).catch(e => {})
 			},
 			initList() {
 				this.page = 1
+				this.reachBottom = 0
 				this.getList()
 			},
 			// 筛选确定回调
diff --git a/pages/orders/orders.vue b/pages/orders/orders.vue
index fc4d88d..cb7d301 100644
--- a/pages/orders/orders.vue
+++ b/pages/orders/orders.vue
@@ -4,12 +4,14 @@
 			<li v-for="(tab, i) in tabs" :class="{active: curTab === tab.id}" @click="tabChange(tab)">{{ tab.name }}</li>
 		</ul>
 		
-		<sl-filter :independence="true" :menuList="menuList" @result="result"></sl-filter>
-		
 		<uni-card :is-shadow="false" :border="false" padding="0" is-full>
 			<uni-search-bar class="search" radius="5" placeholder="请输入姓名、订单号" clearButton="auto" cancelButton="none" @confirm="search" />
 		</uni-card>
 		
+		<view class="filter">
+			<sl-filter :independence="true" :menuList="menuList" @result="result"></sl-filter>
+		</view>
+		
 		<uni-card :is-shadow="false" :border="false" is-full>
 			<ul class="list">
 				<li @click="toDetail({})">
@@ -166,16 +168,9 @@
 	}
 </script>
 
-<style lang="scss">
-.top {
-	display: flex;
-	align-items: center;
-	padding: 5px 15px 5px 5px;
+<style scoped lang="scss">
+.filter {
 	margin-bottom: 10px;
-	background-color: #fff;
-	.search {
-		flex: 1;
-	}
 }
 .list {
 	.num {
diff --git a/pages/qrcode/qrcode.vue b/pages/qrcode/qrcode.vue
new file mode 100644
index 0000000..9ca1023
--- /dev/null
+++ b/pages/qrcode/qrcode.vue
@@ -0,0 +1,76 @@
+<template>
+	<view class="page">
+		<view class="wrap">
+			<view class="info">
+				<image class="avatar" src="../../static/avatar.jpg" mode=""></image>
+				<view class="text">
+					<view class="invite">
+						<text class="name">Jane</text> 邀请你加入
+					</view>
+					<view class="com">宁德时代股份有限公司</view>
+				</view>
+			</view>
+			<image class="qrcode" src="https://pic.baike.soso.com/p/20130307/20130307133645-1010261466.jpg" mode=""></image>
+			<view class="tips">扫一扫，加入我们吧</view>
+			<view class="warn">邀请二维码失效日期：2022年2月2日</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+.wrap {
+	padding: 20px 40px;
+	margin: 60px 40px 0;
+	text-align: center;
+	background-color: #fff;
+	.info {
+		display: flex;
+		align-items: center;
+		text-align: left;
+	}
+	.avatar {
+		width: 40px;
+		height: 40px;
+		margin-right: 10px;
+		border-radius: 50%;
+	}
+	.invite {
+		margin-bottom: 5px;
+		font-size: 15px;
+	}
+	.name {
+		font-size: 13px;
+		color: $uni-primary;
+	}
+	.com {
+		font-size: 13px;
+	}
+	.qrcode {
+		width: 280px;
+		height: 280px;
+		margin-top: 20px;
+	}
+	.tips {
+		margin: 10px 0 10px;
+		font-size: 12px;
+		color: #333;
+	}
+	.warn {
+		font-size: 12px;
+		color: #f00;
+	}
+}
+</style>