Merge branch 'dev' of https://git.banshouhui.com/lijundan/self-support into dev

src/pages/order/complete.vue

@@ -2,7 +2,7 @@
     <view class="pg-complete">
         <complete-check :show="completeCheck.status" :list-data="completeCheck.result" :pass="pass" @close="closeCheckResult" @confirm="confirm" :confirm-button-text="completeCheck.confirmText" :cancel-button-text="completeCheck.cancelText"></complete-check>
         <view class="com-content">
-            <u-navbar :background="{background: '#2272FF'}" back-icon-color="#fff" :title-size="32" title-color="#fff" :border-bottom="false" :title="list[tabIndex].panelName" title-bold></u-navbar>
+            <u-navbar :background="{background: '#2272FF'}" back-icon-color="#fff" :title-size="32" title-color="#fff" :border-bottom="false" :title="list[tabIndex].panelName" title-bold :custom-back="backGo"></u-navbar>
 			<u-tabs class="order-tabs" ref="tabs" :current="current" name="panelName" :list="tabList"  @change="swichMenu" bg-color="#2272FF" inactive-color="#a6c6ff" active-color="#fff" height="80" font-size="32"></u-tabs>
 				<view class="u-menu-wrap">
                     <scroll-view :scroll-top="scrollRightTop" style="height: 100%;" scroll-y scroll-with-animation class="right-box" @scroll="rightScroll" :scroll-into-view="itemId">
@@ -177,6 +177,8 @@
             confirm: {
                 confirmText: '确定',
                 action: 'nextAction',
+                cancelText: '取消',
+                cancelAction: 'closeCheckResult'
             }
         }
         if (name === 'partnerInspectItem') { // 勘察
@@ -808,7 +810,14 @@
             },
 			handleTouchstart() { // 防止输入光标滚动出现错乱
 				uni.hideKeyboard()
-			}
+			},
+            // 返回上一页更新订单状态
+            backGo() {
+                const pages = getCurrentPages()
+                const beforePage = pages[pages.length - 2]
+                beforePage.$vm.loadOrderDetail()
+                uni.navigateBack()
+            }
 		}
     }
 </script>