hejianhao
2025-03-18 0f261ee7835b4087425920d99559bc3e71a3ce6d
Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/H5/threeSide
6个文件已修改
35 ■■■■ 已修改文件
H5/pages/authentication/authentication.vue 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/pages/index/index.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/pages/work-detail/work-detail.vue 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/utils/request.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
management/config/env.ts 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
management/src/pages/party/manage/components/addAndEdit.jsx 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/pages/authentication/authentication.vue
@@ -262,18 +262,16 @@
                    this.form.avatar = this.imgUrls[0];
                    if (this.detail) {
                        await edit(this.form);
                        this.loading = false;
                        let res = await edit(this.form);
                        console.log(res);
                    } else {
                        await apply(this.form);
                        this.loading = false;
                        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/index/index.vue
@@ -86,13 +86,13 @@
                <view class="flex a-center">
                    <view class="msg mr-19" @click="changeActive(1)" :class="isactive == 1 ? 'active' : ''">
                        消息
                        <view class="tips">
                        <view v-if="noreadlist.length > 0" class="tips">
                            {{ noreadlist.length }}
                        </view>
                    </view>
                    <view class="representative" @click="changeActive(2)" :class="isactive == 2 ? 'active' : ''">
                        待办
                        <view class="tips">
                        <view v-if="noreadlists.length > 0" class="tips">
                            {{ noreadlists.length }}
                        </view>
                    </view>
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>
@@ -100,7 +100,8 @@
            <view class="cardInfo">
                <view class="flex j-between a-center">
                    <view class="title">诉求号:{{ orderInfo.serialNumber || '' }}</view>
                    <view class="flex a-center" v-if="orderInfo.status == 0&&orderInfo.listControlsButtonStatus == 0"
                    <view class="flex a-center"
                        v-if="(orderInfo.status == 0||orderInfo.status == 6)&&orderInfo.listControlsButtonStatus == 0"
                        @click.stop="applyOverTime">
                        <view class="apply">延期申请</view>
                        <image src="../../static/detailImg/right.png" class="rightIcon shrink0"></image>
@@ -134,11 +135,11 @@
                <view v-if="!isParty">
                    <view class="flex j-between">
                        <view class="label">录入人</view>
                        <view class="value">{{ orderInfo.nickname || '' }}</view>
                        <view class="value">{{ orderInfo.reportUserName || '' }}</view>
                    </view>
                    <view class="flex j-between">
                        <view class="label">录入人联系方式</view>
                        <view class="value">{{ orderInfo.contactNumber || '' }}</view>
                        <view class="value">{{ orderInfo.reportUserPhone || '' }}</view>
                    </view>
                </view>
H5/utils/request.js
@@ -62,6 +62,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 +102,6 @@
                    icon: 'none',
                    mask: true,
                })
            },
            fail(err) {
                if (lodingFlag) {
management/config/env.ts
@@ -1,7 +1,7 @@
export default {
  dev: {
    SERVER_URL: 'http://192.168.110.188:6194',
    // SERVER_URL: 'https://huacheng.psciio.com',
    // SERVER_URL: 'http://192.168.110.188:6194',
    SERVER_URL: 'https://huacheng.psciio.com',
  },
  test: {
    SERVER_URL: '',
management/src/pages/party/manage/components/addAndEdit.jsx
@@ -44,7 +44,7 @@
    name: 'file',
    action: 'https://huacheng.psciio.com/api/huacheng-communitybackstage/communitypartybuilding/uploadimage',
    headers: {
      Authorization: `Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOjE2MTc2LCJ0eXBlIjoxLCJleHAiOjE3NDM0OTM5NzYsImNyZWF0ZWQiOjE3NDIxOTc5NzY5NDB9.Lph5ktdjynkIhOdkfFa6pgPM9rQJ2bcGJdk8i9_GOs-ZRR79PrqWWgwgAXsUwOdYUInEDdP90uBXxvBV8SJhvA`,
      Authorization: 'Bearer ' + localStorage.getItem('token')
    },
  };