Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/H5/threeSide

董国庆

2025-03-18 4825fe42306e56d7c9217c73283d992b2b22996d

Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/H5/threeSide

 H5/pages/authentication/authentication.vue

@@ -260,17 +260,16 @@

                    this.form.avatar = this.imgUrls[0];
                    if (this.detail) {
                        await edit(this.form);
                        let res = await edit(this.form);
                        console.log(res);
                    } else {
                        await apply(this.form);
                        let res = await apply(this.form);
                        console.log(res);
                    }
                    this.$refs.savePop.showPopup();
                    this.loading = false;
                } catch (error) {
                    uni.showToast({
                        title: '提交失败，请重试',
                        icon: 'none'
                    });
					
                } finally {
                    this.loading = false;
                }

 H5/pages/work-detail/work-detail.vue

@@ -80,7 +80,7 @@
                            <view class="label">联系电话</view>
                            <view class="value">{{ orderInfo.reporterPhone || '' }}</view>
                        </view>
                        <view class="flex j-between" v-if="!isParty">
                        <view class="flex j-between" v-if="isParty">
                            <view class="label">所属部门</view>
                            <view class="value">{{ orderInfo.departmentName || "" }}</view>
                        </view>

 H5/utils/request.js

@@ -19,8 +19,9 @@

    return new Promise(function(resolve, reject) {
        let token = uni.getStorageSync('token')
        token = 'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOjE2MjAxLCJ0eXBlIjoxLCJleHAiOjE3NDM1NTY2NzYsImNyZWF0ZWQiOjE3NDIyNjA2NzY0MTJ9.GWvz0-m7-R6mz-gEICWywIV_lhc5vKU0_KUJN4MxxY8qa8_1Q_n-tzPSDltiu8cwAEBbsn8QZ4N4MHwzukDzIA'
        uni.setStorageSync('token',token)
        token =
            'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOjE2MjAxLCJ0eXBlIjoxLCJleHAiOjE3NDM1NTY2NzYsImNyZWF0ZWQiOjE3NDIyNjA2NzY0MTJ9.GWvz0-m7-R6mz-gEICWywIV_lhc5vKU0_KUJN4MxxY8qa8_1Q_n-tzPSDltiu8cwAEBbsn8QZ4N4MHwzukDzIA'
        uni.setStorageSync('token', token)
        let header = {
            'content-type': type ? 'application/x-www-form-urlencoded;charset=UTF-8' : 'application/json',
            'Authorization': token,
@@ -62,6 +63,7 @@
                        icon: 'none',
                        mask: true,
                    })
                    reject(res.data);
                    return
                }
                if (res.data.code == 401 || res.data.code == 510 || res.data.code == 504 || res.data
@@ -101,7 +103,6 @@
                    icon: 'none',
                    mask: true,
                })

            },
            fail(err) {
                if (lodingFlag) {