From 0755575f087ce596d88faf52a14eca1d0a2c4501 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=94=90=E6=98=8E=E6=98=8E?= <970899069@qq.com>
Date: Wed, 4 Jan 2023 16:13:43 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=AE=A2=E5=8D=95=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=EF=BC=8C=E8=B0=83=E6=95=B4=E7=A1=AE=E8=AE=A4=E6=96=B9?=
 =?UTF-8?q?=E6=A1=88=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                          |  1 +
 manifest.json                    |  2 +-
 pages/work/confirmScheme.vue     | 27 ++++++++++++-------
 pages/work/confirmSchemeInfo.vue |  4 +--
 pages/work/orders.vue            | 46 +++++++++++++++++++++++++++-----
 5 files changed, 60 insertions(+), 20 deletions(-)

diff --git a/App.vue b/App.vue
index 01129aa..e9f2876 100644
--- a/App.vue
+++ b/App.vue
@@ -8,6 +8,7 @@
 	            platform: plus.os.name,
 	            version	: plus.runtime.version
 	        }).then(res => {
+				console.log(res)
 	            if (res.update) {
 	                uni.showModal({
 	                    title		: "更新提示",
diff --git a/manifest.json b/manifest.json
index 77f73cb..c06637e 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
     "name" : "抖火",
     "appid" : "__UNI__C305C03",
     "description" : "",
-    "versionName" : "1.1.1",
+    "versionName" : "1.1.3",
     "versionCode" : "100",
     "transformPx" : false,
     /* 5+App特有相关 */
diff --git a/pages/work/confirmScheme.vue b/pages/work/confirmScheme.vue
index 47c018d..c22de7e 100644
--- a/pages/work/confirmScheme.vue
+++ b/pages/work/confirmScheme.vue
@@ -1,7 +1,10 @@
 <template>
 	<view class="content">
 		<view class="scheme-item" v-for="(item, index) in list" :key="index">
-			<view class="no">{{item.order.order_no}}</view>
+			<view class="no">
+				<view class="no-text nowrap">{{item.order.order_no}}</view>
+				<text class="no-status nowrap">{{item.status.text}}</text>
+			</view>
 			<view class="scheme-content">
 				<view class="scheme-flex" @click="item.is_show_type = !item.is_show_type">
 					<label>业务类型</label>
@@ -18,14 +21,6 @@
 						<view class="item-flex-value">￥{{citem.price}}</view>
 					</view>
 				</view>
-				<view class="scheme-flex">
-					<label>应确认方案</label>
-					<view class="value nowrap">{{item.confirm.all}}份</view>
-				</view>
-				<view class="scheme-flex">
-					<label>应确认方案</label>
-					<view class="value nowrap">{{item.confirm.confirm}}份</view>
-				</view>
 				<view class="scheme-flex">
 					<label>当前方案</label>
 					<view class="value nowrap">{{item.institution.title}}<text class="tag">{{item.business_type.title}}</text></view>
@@ -41,7 +36,7 @@
 					<view class="user-name">{{item.order.manager.nickname}}</view>
 				</view>
 				<view class="btns">
-					<view class="btns-item" @click="$Router.push({name: 'ConfirmSchemeInfo', params: {schemeId: item.business_order_close_scheme_id}})">确认方案</view>
+					<view class="btns-item" v-if="item.status.value === 1" @click="$Router.push({name: 'ConfirmSchemeInfo', params: {schemeId: item.business_order_close_scheme_id}})">确认方案</view>
 				</view>
 			</view>
 		</view>
@@ -68,6 +63,7 @@
 				current	: 1,
 				has_more: false,
 			}
+			this.$store.commit('setOrderId', this.$Route.query.orderId)
 			this.getList()
 		},
 		methods: {
@@ -129,6 +125,17 @@
 			line-height: 90rpx;
 			border-bottom: solid 1rpx #f6f6f6;
 			font-size: 30rpx;
+			display: flex;
+			justify-content: space-between;
+			.no-text{
+				width: calc(100% - 200rpx);
+			}
+			.no-status{
+				width: 200rpx;
+				text-align: right;
+				color: $main-color;
+				font-weight: bold;
+			}
 		}
 		.scheme-content{
 			padding: 20rpx 30rpx;
diff --git a/pages/work/confirmSchemeInfo.vue b/pages/work/confirmSchemeInfo.vue
index 5da9eea..e4dc4fc 100644
--- a/pages/work/confirmSchemeInfo.vue
+++ b/pages/work/confirmSchemeInfo.vue
@@ -117,8 +117,8 @@
 						title: '提示',
 						content: res,
 						showCancel: false,
-						success() {
-							this.$Route.back()
+						success: () => {
+							this.$Router.back()
 						}
 					})
 				}).catch(err => {
diff --git a/pages/work/orders.vue b/pages/work/orders.vue
index f48c4ec..765a559 100644
--- a/pages/work/orders.vue
+++ b/pages/work/orders.vue
@@ -77,11 +77,13 @@
 						<view class="btns-item btns-border" v-if="item.status.value == 5" @click="$Router.push({name: 'WorkPerfectChoose', params: {orderId: item.business_order_id, type: 'perfect'}})">完善</view>
 						<view class="btns-item btns-border" v-if="item.status.value == 6" @click="$Router.push({name: 'WorkPerfectChoose', params: {orderId: item.business_order_id }})">查看资料</view>
 						<!-- type: 'perfect' -->
-						<view class="btns-item btns-border" v-if="item.status.value == 9 && item.is_my" @click="$Router.push({name: 'ConfirmScheme', params: {orderId: item.business_order_id,}})">去确认</view>
+						<view class="btns-item btns-border" v-if="item.can.confirm && item.is_my" @click="$Router.push({name: 'ConfirmScheme', params: {orderId: item.business_order_id,}})">去确认</view>
 						<view class="btns-item" @click="$Router.push({name: 'OrderInfo', params: {orderId: item.business_order_id}})">查看</view>
 					</view>
 				</view>
 			</view>
+			<!-- 分页 -->
+			<u-loadmore v-if="pagesShow" :status="status" />
 		</view>
 		<!-- 订单是空的 -->
 		<view class="order-null" v-else>
@@ -130,6 +132,14 @@
 				actionLevels: [],
 				getSignState: false,
 				getNextTab	: false,
+				// 分页
+				page		: {
+					current	: 1,
+					has_more: false,
+				},
+				pagesShow	: false,
+				status   	: ''
+				
 			};
 		},
 		created() {
@@ -152,7 +162,6 @@
 					this.tabType = this.tabs[this.tabsCurrent].val
 					this.getList()
 					this.getNextTab = false;
-					this.$store.commit('setOrderId', null)
 					return
 				}
 				this.getList()
@@ -164,6 +173,8 @@
 			onTabs(e){
 				this.tabsCurrent = e.index
 				this.tabType = e.val
+				this.page = { current: 1, has_more: false }
+				this.orders = []
 				this.getList()
 			},
 			// 变更当前列表状态
@@ -177,15 +188,27 @@
 			},
 			// 获取列表
 			getList(){
-				this.$store.commit('setOrderId', null)
+				uni.showLoading({
+					title: '加载中...',
+					mask : true
+				})
+				if(this.$store.getters.getOrderId != null){
+					this.page = { current: 1, has_more: false }
+					this.$store.commit('setOrderId', null)
+				}
 				lists({
-					status: this.tabType
+					status: this.tabType,
+					page  : this.page.current 
 				}).then(res => {
-					let { data } = res;
+					let { data, page } = res;
 					data.map(val => {
 						val.is_show_type = false
 					})
-					this.orders = data
+					let atList   = page.current == 1 ? [] : this.orders
+					this.orders 	= atList.concat(data)
+					this.page  		= page
+					this.pagesShow 	= false
+					uni.hideLoading()
 				}).catch(err => {
 					uni.showToast({
 						title: err.message,
@@ -195,7 +218,6 @@
 			},
 			// 获取转让对象
 			onTransfers(index, item){
-				console.log(index)
 				levels(item.business_order_id).then(res => {
 					let ActionSheet = []
 					for(let key in res){
@@ -313,6 +335,16 @@
 					phoneNumber: phone
 				})
 			}
+		},
+		onReachBottom() {
+			this.pagesShow = true;
+			if(this.page.has_more){
+				this.status    = 'loading';
+				this.page.current++
+				this.getList()
+				return
+			}
+			this.status    = 'nomore';
 		}
 	}
 </script>