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

src/pages/order/complete.vue

@@ -3,7 +3,7 @@
         <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-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>
+			<u-tabs-swiper class="order-tabs" ref="tabs" :current="current" :showBar="showBar" name="panelName" :list="tabList"  @change="swichMenu" bg-color="#2272FF" inactive-color="#a6c6ff" active-color="#fff" height="80" font-size="32"></u-tabs-swiper>
 				<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">
                         <u-form :model="form" ref="uForm">
@@ -208,6 +208,7 @@
     export default {
         data() {
             return {
+                showBar: false,
                 orderId:0,
 				categoryId:0,
 				orderServiceType:'',
@@ -218,7 +219,7 @@
                 tabIndex: 0,
                 scrollTop: 0, //tab标题的滚动条位置
                 oldScrollTop: 0,
-                current: null, // 预设当前项的值
+                current: 0, // 预设当前项的值
                 menuHeight: 0, // 左边菜单的高度
                 menuItemHeight: 0, // 左边菜单item的高度
                 itemId: '', // 栏目右边scroll-view用于滚动的id
@@ -381,7 +382,10 @@
 
                 this.list = list
 				// this.showTab = this.list.length > 1
-                this.current = 0
+                setTimeout(() => {
+                    this.showBar = true
+                    this.current = 0
+                }, 1000)
 				// 异常单处理
 				if (this.auditResultsId) this.checkCompleteError()
                 uni.hideLoading()
@@ -505,12 +509,12 @@
                     this.tabIndex++
                     this.arr = []
                     this.scrollRightTop = 0
-                    this.current = 0
-                    const itemId = this.list[this.tabIndex].items[0].items[0].fieldsId
-                    this.oldItemId = `item${itemId}`
+                    this.current = null
+                    this.itemId = ''
+                    //const itemId = this.list[this.tabIndex].items[0].items[0].fieldsId
+                    //this.oldItemId = `item${itemId}`
                     this.$nextTick(async () => {
-                        if (this.oldItemId) this.itemId = this.oldItemId
-                        this.oldItemId = ''
+                        await this.swichMenu(0)
                     })
                 }
             },
@@ -536,7 +540,11 @@
                     currentStep: this.list[this.tabIndex].panelFieldsName,
                     nextStep: this.list[this.tabIndex + 1].panelFieldsName,
                 }
+                uni.showLoading({
+					title: '加载中'
+				})
                 return this.$u.api.completeNextStep(params, this.orderId).then((res)=>{
+                    uni.hideLoading()
                     if (res.code == 200) {
                         return Promise.resolve(true)
                     } else {
@@ -548,16 +556,6 @@
                     }
                 })
             },
-            tabsChange(index){
-                this.tabIndex = index
-				this.arr = []
-				this.scrollRightTop = 0;
-				this.current = 0;
-				this.$nextTick(function() {
-                    if (this.oldItemId)this.itemId = this.oldItemId
-				    this.getMenuItemTop()
-				})
-            },
             locationCompleteItem(panelIndex,groupIndex,eleIndex){ // 页面定位到某一项
                 this.tabIndex = panelIndex
                 this.current = groupIndex;