From d71cd65494106212e3fccec37e6f6f9f8514c15e Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Tue, 5 Jul 2022 18:04:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0loading=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apis/modules/order.js               |  4 ++
 apis/request.js                     |  3 +-
 config/request.js                   |  4 +-
 order/addCourse/addCourse.vue       |  8 +++-
 order/curClient/curClient.vue       | 74 +++++++++++++++++++----------
 order/orderDetail/orderDetail.vue   |  8 +++-
 order/ordered/ordered.vue           |  8 +++-
 order/orders/orders.vue             |  1 -
 pages/clientDetail/clientDetail.vue |  8 +++-
 pages/index/index.vue               |  5 +-
 10 files changed, 87 insertions(+), 36 deletions(-)

diff --git a/apis/modules/order.js b/apis/modules/order.js
index 202586c..0d8332b 100644
--- a/apis/modules/order.js
+++ b/apis/modules/order.js
@@ -31,4 +31,8 @@ export const orderList = (data) => {
 
 export const del = (data) => {
   return post('nakadai/nakadai/order/delete', data)
+}
+
+export const miniProgramOrderRecord = (data) => {
+  return post('nakadai/nakadai/applets/order/miniProgramOrderRecord', data)
 }
\ No newline at end of file
diff --git a/apis/request.js b/apis/request.js
index 20fb794..a75d827 100644
--- a/apis/request.js
+++ b/apis/request.js
@@ -14,11 +14,12 @@ const request = options => {
 	const header = Object.assign({}, config.headers, {
 		token: uni.getStorageSync('token')
 	})
-	const otherUrl = ['generateInvitationCode', 'weChatAppletCallback', 'userBinding', 'getUserRolesPermissionMenu']
+	const otherUrl = ['getTeamsByAccountId']
 	return new Promise((resolve, reject)=>{
 		const { url } = options
 		uni.request({
 			header,
+			// url: (otherUrl.map(e => config.baseURL.includes(e)) ? 'http://192.168.31.137:9000/' : config.baseURL) + url,
 			url: config.baseURL + url,
 			method: options.method || 'GET', // 请求类型，默认为GET
 			data: options.data || {}, // 请求参数，默认空对象
diff --git a/config/request.js b/config/request.js
index 923a5ae..042bc89 100644
--- a/config/request.js
+++ b/config/request.js
@@ -1,12 +1,12 @@
 /**
 /**
- * axios 配置文件
+ * 请求配置文件
  * @author yujialong
  */
 
 export default {
   // baseURL: 'https://huorantech.cn/',
-  // baseURL: 'http://192.168.31.137:9000/',
+  // baseURL: 'http://192.168.31.151:9000/',
   baseURL: 'http://121.37.12.51/',
   headers: {
     'Content-Type': 'application/json;charset=UTF-8'
diff --git a/order/addCourse/addCourse.vue b/order/addCourse/addCourse.vue
index b06fef6..c570a2e 100644
--- a/order/addCourse/addCourse.vue
+++ b/order/addCourse/addCourse.vue
@@ -110,6 +110,9 @@
 		methods: {
 			// 获取课程列表
 			getList() {
+				uni.showLoading({
+					title: '加载中'
+				})
 				AppletsDataProductList({
 					sort: 'desc',
 					keywords: this.keyword,
@@ -144,7 +147,10 @@
 					const noMore = this.list.length === data.total // 是否加载完所有数据
 					this.status = noMore ? 'noMore' : 'more' // 加载完了则设置为noMore
 					this.reachBottom = noMore ? -1 : 0 // 加载完了则设置为-1
-				}).catch(e => {})
+					uni.hideLoading()
+				}).catch(e => {
+					uni.hideLoading()
+				})
 			},
 			initList() {
 				this.page = 1
diff --git a/order/curClient/curClient.vue b/order/curClient/curClient.vue
index 8cf0fa9..f3a856e 100644
--- a/order/curClient/curClient.vue
+++ b/order/curClient/curClient.vue
@@ -33,8 +33,8 @@
 									<view class="line">
 										<text class="name">订单内容：</text>
 										<view class="val ell-wrap">
-											<view :class="{ell: !item.toggle}">{{ item.orderContent }}</view>
-											<view v-if="item.orderContent.length > 14" class="toggle" @click.stop="toggle(item)">{{ item.toggle ? '收起' : '展开' }}</view>
+											<view :class="{ell: !item.toggle}">{{ item.productName }}</view>
+											<view v-if="item.productName.length > 14" class="toggle" @click.stop="toggle(item)">{{ item.toggle ? '收起' : '展开' }}</view>
 										</view>
 									</view>
 									<view class="line">
@@ -50,6 +50,7 @@
 					</uni-swipe-action-item>
 				</uni-swipe-action>
 			</view>
+			<uni-load-more :status="status" />
 		</template>
 		<empty v-else></empty>
 		
@@ -59,7 +60,7 @@
 </template>
 
 <script>
-	import { orderList, del } from '@/apis/modules/order.js'
+	import { miniProgramOrderRecord, del } from '@/apis/modules/order.js'
 	export default {
 		data() {
 			return {
@@ -86,13 +87,13 @@
 						],
 					}
 				],
+				reachBottom: 0, // 是否是上拉加载。0->否,1->是,-1->加载完所有数据
+				status: 'more', // 上拉加载状态 more|loading|noMore
 				filterForm: {},
-				isFilter: 0, // 是否是在筛选。0->否,1->是
 				searchTimer: null,
 				orderStatus: '',
 				keyword: '',
 				list: [],
-				listAll: [],
 				page: 1,
 				pageSize: 10,
 				delOption: [{
@@ -107,10 +108,18 @@
 			keyword () {
 				clearTimeout(this.searchTimer)
 				this.searchTimer = setTimeout(() => {
-					this.filter()
+					this.initList()
 				}, 500)
 			}
 		},
+		// 上拉加载
+		onReachBottom() {
+			if (this.reachBottom >= 0) {
+				this.reachBottom = 1
+				this.status = 'loading'
+				this.getList()
+			}
+		},
 		// 下拉刷新
 		onPullDownRefresh() {
 			this.getList()
@@ -123,23 +132,42 @@
 			const { options } = pages[pages.length - 1]
 			this.customerId = options.customerId
 			this.customerName = options.name
-			this.getList()
+			// this.initList()
 		},
 		methods: {
 			getList() {
-				orderList({
-					cityId: '',
-					customerName: this.customerName,
+				uni.showLoading({
+					title: '加载中'
+				})
+				const team = uni.getStorageSync('team')
+				miniProgramOrderRecord({
+					businessManagerId: this.$util.getBmId(),
+					teamId: team.id,
+					customerId: this.customerId,
 					orderStatus: this.orderStatus,
-					orderType: '',
-					pageNo: 1,
-					pageSize: 10000,
-					provinceId: ''
-				}).then(({ orderPage }) => {
-					const { orders } = orderPage
-					this.list = orders
-					this.listAll = orders
-				}).catch(e => {})
+					isAdmin: +team.isTeam, // 是否是管理员(0否 1是)
+					pageNum: this.page,
+					pageSize: this.pageSize,
+					keywords: this.keyword
+				}).then(({ data }) => {
+					const { records } = data
+					records.map(e => {
+						e.toggle = e.productName.length < 14 // 超过了14个字才需要显示展开按钮
+					})
+					this.list = this.reachBottom > 0 ? [...this.list, ...records] : records
+					this.page++ // 每次获取了数据后page+1
+					const noMore = this.list.length === data.total // 是否加载完所有数据
+					this.status = noMore ? 'noMore' : 'more' // 加载完了则设置为noMore
+					this.reachBottom = noMore ? -1 : 0 // 加载完了则设置为-1
+					uni.hideLoading()
+				}).catch(e => {
+					uni.hideLoading()
+				})
+			},
+			initList() {
+				this.page = 1
+				this.reachBottom = 0
+				this.getList()
 			},
 			// 展开
 			toggle(item) {
@@ -149,13 +177,7 @@
 			subFinsh(val) {
 				const { orderStatus } = val
 				this.orderStatus = orderStatus.length ? orderStatus[0] : ''
-				this.getList()
-			},
-			// 筛选
-			filter() {
-				const list = this.listAll
-				const { keyword } = this
-				this.list = list.filter(e => e.orderNumber.includes(keyword) || e.orderContent.includes(keyword))
+				this.initList()
 			},
 			// 跳转详情
 			toDetail(item) {
diff --git a/order/orderDetail/orderDetail.vue b/order/orderDetail/orderDetail.vue
index cf0d528..1825548 100644
--- a/order/orderDetail/orderDetail.vue
+++ b/order/orderDetail/orderDetail.vue
@@ -238,6 +238,9 @@
 		methods: {
 			// 获取详情
 			getInfo() {
+				uni.showLoading({
+					title: '加载中'
+				})
 				getDetail({
 					orderId: this.orderId
 				}).then(({ orderDetails }) => {
@@ -247,7 +250,10 @@
 					this.courses = order.orderOther
 					this.handleProduct(order.orderOther)
 					this.calcTotal()
-				}).catch(e => {})
+					uni.hideLoading()
+				}).catch(e => {
+					uni.hideLoading()
+				})
 			},
 			// 转换产品列表
 			handleProduct(list) {
diff --git a/order/ordered/ordered.vue b/order/ordered/ordered.vue
index d8cf4ea..e412121 100644
--- a/order/ordered/ordered.vue
+++ b/order/ordered/ordered.vue
@@ -134,6 +134,9 @@
 		},
 		methods: {
 			getList() {
+				uni.showLoading({
+					title: '加载中'
+				})
 				getProductsSubscribedByCustomers({
 					customeId: this.customerId
 				}).then(({ data }) => {
@@ -193,7 +196,10 @@
 					})
 					this.list = data
 					this.listAll = data
-				}).catch(e => {})
+					uni.hideLoading()
+				}).catch(e => {
+					uni.hideLoading()
+				})
 			},
 			// 筛选确定回调
 			subFinsh(val) {
diff --git a/order/orders/orders.vue b/order/orders/orders.vue
index 85dc1bf..778a2c2 100644
--- a/order/orders/orders.vue
+++ b/order/orders/orders.vue
@@ -103,7 +103,6 @@
 					}
 				],
 				reachBottom: 0, // 是否是上拉加载。0->否,1->是,-1->加载完所有数据
-				isFilter: 0, // 是否是在筛选。0->否,1->是
 				status: 'more', // 上拉加载状态 more|loading|noMore
 				searchTimer: null,
 				orderStatus: '',
diff --git a/pages/clientDetail/clientDetail.vue b/pages/clientDetail/clientDetail.vue
index 355849d..df4f45c 100644
--- a/pages/clientDetail/clientDetail.vue
+++ b/pages/clientDetail/clientDetail.vue
@@ -183,6 +183,9 @@
 		methods: {
 			// 获取详情
 			getInfo() {
+				uni.showLoading({
+					title: '加载中'
+				})
 				queryCustomerDetails({
 					customerId: this.customerId
 				}).then(({ result }) => {
@@ -190,7 +193,10 @@
 					this.form = customer
 					!this.isDetail && customer.industryClassId && this.getIndustry()
 					this.customerType = this.customerTypeList.find(e => e.value === customer.customerType).name
-				}).catch(e => {})
+					uni.hideLoading()
+				}).catch(e => {
+					uni.hideLoading()
+				})
 			},
 			// 获取学校列表
 			getSchool() {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 35530cd..b794d0f 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -131,11 +131,12 @@
 			// 查询当前角色权限
 			getAuth() {
 				uni.getStorageSync('token') && getUserRolesPermissionMenu({
-					teamId: this.teamId,
+					teamId: this.list.find(e => e.teamId === this.teamId).partnerClassificationId,
 					platformId: 4
 				}).then(({ permissionMenu }) => {
 					uni.hideLoading()
 					const auth = []
+					// 生成权限数组
 					const generateAuth = (list, parent) => {
 						list.map(e => {
 							const name = `${parent ? parent + ':' : ''}${e.name}`
@@ -162,7 +163,7 @@
 					data.map(e => {
 						const n = e.partnerClassificationList
 						e.id = n.id
-						e.teamId = n.isTeam == 1 ? e.partnerClassificationId : n.id
+						e.teamId = e.isTeam == 1 ? e.partnerClassificationId : n.id
 						e.partnerClassificationName = n.partnerClassificationName
 						delete e.partnerClassificationList
 					})