From 529d0b8982cf30f57ba7e366c0f822c1d82c0b69 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 07 五月 2024 13:37:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
wx/pages/details_dispatch_unit/details_dispatch_unit.vue | 52 ++++++++++++++++++++++++++++++----------------------
1 files changed, 30 insertions(+), 22 deletions(-)
diff --git a/wx/pages/details_dispatch_unit/details_dispatch_unit.vue b/wx/pages/details_dispatch_unit/details_dispatch_unit.vue
index 5e9b14f..98bbc63 100644
--- a/wx/pages/details_dispatch_unit/details_dispatch_unit.vue
+++ b/wx/pages/details_dispatch_unit/details_dispatch_unit.vue
@@ -95,7 +95,7 @@
<view class="details_footer" v-if="info.status === 0">
<u-button type="primary" shape="circle" color="#437CB3" @click="show = true" :plain="true" text="鐢宠閫�鍥�"></u-button>
<view style="width: 44rpx; height: 50rpx;"></view>
- <u-button type="primary" shape="circle" color="#437CB3" text="绛剧讲鐢宠鍗�" @click="openmessage(2)"></u-button>
+ <u-button type="primary" shape="circle" color="#437CB3" :loading="loading" text="绛剧讲鐢宠鍗�" @click="openmessage(2)"></u-button>
</view>
<!-- 宸查��鍥� -->
<view class="details_footer" v-if="info.status === 5 || info.status === 8">
@@ -120,7 +120,7 @@
</view>
<!-- 寰呯缃� -->
<view class="details_footer" v-if="info.status === 0">
- <u-button type="primary" shape="circle" color="#437CB3" text="绛剧讲鐢宠鍗�" @click="openmessage(2)"></u-button>
+ <u-button type="primary" shape="circle" color="#437CB3" :loading="loading" text="绛剧讲鐢宠鍗�" @click="openmessage(2)"></u-button>
</view>
</template>
<!-- 鐢宠閫�鍥炵‘璁ゅ脊绐� -->
@@ -173,7 +173,9 @@
code: '',
num: 0,
error: false,
- timer: null
+ timer: null,
+
+ loading: false
};
},
onLoad(option) {
@@ -209,58 +211,64 @@
},
// 绛剧讲
confirm1() {
- if (!this.code) {
- this.error = 1
- return
- }
+ // if (!this.code) {
+ // this.error = 1
+ // return
+ // }
+ this.loading = true
// 绛剧讲鎶曚繚鍗�
if (this.type === 1) {
this.$u.api.validateCode({
code: this.code
}).then(res => {
if (res.code === 200) {
- this.error = ''
- this.show1 = false
+ // this.error = ''
+ // this.show1 = false
this.$u.api.getJiajianBaoSignLink({ id: this.info.id })
.then(url => {
+ this.loading = false
if (url.code === 200) {
uni.navigateTo({
url: `/pages/webView/webView?url=${encodeURIComponent(url.data)}`
})
}
})
- } else {
- this.error = 2
}
+ // else {
+ // this.error = 2
+ // }
})
- this.show1 = false
+ // this.show1 = false
// 鐢宠鍗�
} else if (this.type === 2) {
this.$u.api.getChangeMemberListOnlineSignLink({
businessId: this.info.id,
code: this.code
}).then(res => {
+ this.loading = false
if (res.code === 200) {
- this.error = ''
- this.show1 = false
+ // this.error = ''
+ // this.show1 = false
uni.navigateTo({
url: `/pages/webView/webView?url=${encodeURIComponent(res.data)}`
})
- } else {
- this.error = 2
}
+ // else {
+ // this.error = 2
+ // }
})
}
},
// 鎵撳紑鍙戦�侀獙璇佺爜寮圭獥
openmessage(type) {
- this.code = ''
- clearInterval(this.timer)
- this.error = ''
- this.timer = null
- this.num = 0
+ // this.code = ''
+ // clearInterval(this.timer)
+ // this.error = ''
+ // this.timer = null
+ // this.num = 0
this.type = type
- this.show1 = true
+ this.confirm1()
+ // this.show1 = true
},
// 鏌ョ湅pdf
seePdf(url) {
--
Gitblit v1.9.3