Lou
2024-04-15 36f976d81c7b013efba8032330c56f3512065c72
更新
10 files modified
1 files added
1 files deleted
96 ■■■■■ changed files
common/setting.js 4 ●●●● patch | view | raw | blame | history
pages/home/index.vue 15 ●●●●● patch | view | raw | blame | history
static/icon/nav-28.png patch | view | raw | blame | history
subPackage/bs/views/repairList.vue 7 ●●●● patch | view | raw | blame | history
subPackage/house/member/householdLabel.vue 17 ●●●● patch | view | raw | blame | history
subPackage/search/index.vue 2 ●●● patch | view | raw | blame | history
subPackage/user/district/index.vue 8 ●●●● patch | view | raw | blame | history
subPackage/user/test.vue 21 ●●●●● patch | view | raw | blame | history
subPackage/workbench/views/report.vue 4 ●●●● patch | view | raw | blame | history
subPackage/workbench/views/reportAudit.vue 7 ●●●●● patch | view | raw | blame | history
subPackage/workbench/views/reportDetail.vue 7 ●●●●● patch | view | raw | blame | history
subPackage/workbench/views/reportList.vue 4 ●●●● patch | view | raw | blame | history
common/setting.js
@@ -10,8 +10,8 @@
    version: '2.0.0',
    // 开发环境接口Url
    // devUrl: 'http://z4042833u6.wicp.vip',
    // devUrl: 'http://192.168.2.111:9528',
    devUrl: 'https://srgdjczzxtpt.com:2080/api',
    devUrl: 'http://192.168.2.111:9528',
    // devUrl: 'https://srgdjczzxtpt.com:2080/api',
    // devUrl: 'https://kt39592615.goho.co',
    minioBaseUrl: "https://srgdjczzxtpt.com:2080/gminio/jczz/",
    // minioBaseUrl: "http://192.168.0.101:9528/",
pages/home/index.vue
@@ -419,6 +419,11 @@
                                text: "便民热线",
                                path: '/subPackage/hotLine/index'
                            },
                            {
                                icon: "/static/icon/nav-28.png",
                                text: "统战上报",
                                path: "/subPackage/bs/views/addRepair?title=统战上报&type=6"
                            },
                        ]
                    },
                    {
@@ -492,6 +497,11 @@
                                icon: "/static/icon/nav-03.png",
                                text: "便民热线",
                                path: '/subPackage/hotLine/index'
                            },
                            {
                                icon: "/static/icon/nav-26.png",
                                text: "统战上报",
                                path: "/subPackage/bs/views/addRepair?title=统战上报&type=6"
                            },
                        ]
                    }, {
@@ -571,6 +581,11 @@
                                text: "便民热线",
                                path: '/subPackage/hotLine/index'
                            },
                            {
                                icon: "/static/icon/nav-28.png",
                                text: "统战上报",
                                path: "/subPackage/bs/views/addRepair?title=统战上报&type=6"
                            },
                        ]
                    },
                    {
static/icon/nav-28.png
subPackage/bs/views/repairList.vue
@@ -24,7 +24,8 @@
                <view class="list-item bgc-ff mb-20" v-for="item in dataList" :key="item.id" @click="pushPage(item)">
                    <view class="item-title flex a-i-c j-c-s-b mb-20">
                        <text class="f-32 fw">{{ getTypeName(item.type) }}</text>
                        <u-tag class="u_tag" size="mini" plain plainFill :text="getStatusName(item.status)"></u-tag>
                        <u-tag class="u_tag" size="mini" plain plainFill
                            :text="getStatusName(item.confirmFlag)"></u-tag>
                    </view>
                    <view class="item-row flex a-i-c j-c-s-b">
                        <text class="f-28">时间</text>
@@ -85,6 +86,10 @@
                    {
                        name: "企业商户上报",
                        type: 5
                    },
                    {
                        name: "统战上报",
                        type: 6
                    }
                ],
subPackage/house/member/householdLabel.vue
@@ -23,13 +23,26 @@
                </view>
                <view v-for="(item, index) in labelBtnList" :key="index" class="label-crad">
                    <newBoxTitle :title="item.name"></newBoxTitle>
                    <view class="label-btn-box">
                    <!-- <block v-if="item.children[0].children.length"> -->
                    <u-collapse accordion :border="false" v-for="(c, k) in item.children" :key="k">
                        <u-collapse-item :title="c.name">
                            <view class="label-btn-box">
                                <view v-for="(i, k) in c.children" :key="k">
                                    <u-button size="mini" type="primary" :color="$setLabelColor(i.color)"
                                        :style="{color: $setLabelColor(i.color) && '#fff'}" :text="i.name"
                                        @click="showLabelPopup(i,index,k)"></u-button>
                                </view>
                            </view>
                        </u-collapse-item>
                    </u-collapse>
                    <!-- </block> -->
                    <!-- <view class="label-btn-box" v-else>
                        <view v-for="(item, k) in item.children" :key="k">
                            <u-button size="mini" type="primary" :color="$setLabelColor(item.color)"
                                :style="{color: $setLabelColor(item.color) && '#fff'}" :text="item.name"
                                @click="showLabelPopup(item,index,k)"></u-button>
                        </view>
                    </view>
                    </view> -->
                </view>
            </view>
        </view>
subPackage/search/index.vue
@@ -63,7 +63,7 @@
                switch (item.typeName) {
                    case "通知公告":
                        uni.navigateTo({
                            url: "/subPackage/article/detail?id=${item.tableId}&type=${item.type}"
                            url: `/subPackage/article/detail?id=${item.tableId}&type=${item.type}`
                        })
                        break;
                    case "经营场所":
subPackage/user/district/index.vue
@@ -10,12 +10,12 @@
                <text>{{detail.communityName}}</text>
            </view>
            <view class="item-row flex j-c-s-b a-i-c">
                <text>房屋住址</text>
                <text>小区住址</text>
                <text class="address">{{detail.address}}</text>
            </view>
            <view class="item-row flex j-c-s-b a-i-c">
                <text>党组织名称</text>
                <text class="address">{{detail.organizationName}}</text>
                <text class="address">{{detail.organizationName || ""}}</text>
            </view>
            <view class="item-row flex j-c-s-b a-i-c">
                <text>党组织类型</text>
@@ -27,11 +27,11 @@
            </view>
            <view class="item-row flex j-c-s-b a-i-c">
                <text>负责人姓名</text>
                <text class="address">{{detail.chargePerson}}</text>
                <text class="address">{{detail.chargePerson ||  ""}}</text>
            </view>
            <view class="item-row flex j-c-s-b a-i-c">
                <text>负责人手机号</text>
                <text class="address">{{detail.phone}}</text>
                <text class="address">{{detail.phone || ""}}</text>
            </view>
        </view>
        <view class="box bgc-ff" v-if="detail.remark">
subPackage/user/test.vue
File was deleted
subPackage/workbench/views/report.vue
@@ -105,6 +105,10 @@
                    {
                        name: "企业商户上报",
                        type: 5
                    },
                    {
                        name: "统战上报",
                        type: 6
                    }
                ],
                tabIndex: 0,
subPackage/workbench/views/reportAudit.vue
@@ -28,6 +28,9 @@
                <view class="text">审核信息</view>
            </view> -->
            <caption-row title="审核信息" />
            <view class="stauts mt-20" v-if="confirmFlag == 3 && !defaultData.taskRepairStepList">
                已处理
            </view>
            <view class="step">
                <view class="step-list " v-for="i in defaultData.taskRepairStepList"
                    v-if="defaultData.taskRepairStepList.length">
@@ -204,6 +207,10 @@
                    {
                        name: "企业商户上报",
                        type: 5
                    },
                    {
                        name: "统战上报",
                        type: 6
                    }
                ],
                form: {
subPackage/workbench/views/reportDetail.vue
@@ -29,6 +29,9 @@
                <view class="text">审核信息</view>
            </view> -->
                <caption-row title="审核信息" />
                <view class="stauts mt-20" v-if="confirmFlag == 3 && !defaultData.taskRepairStepList">
                    已处理
                </view>
                <view class="step">
                    <view class="step-list " v-for="i in defaultData.taskRepairStepList"
                        v-if="defaultData.taskRepairStepList.length">
@@ -188,6 +191,10 @@
                    {
                        name: "企业商户上报",
                        type: 5
                    },
                    {
                        name: "统战上报",
                        type: 6
                    }
                ],
                form: {
subPackage/workbench/views/reportList.vue
@@ -105,6 +105,10 @@
                    {
                        name: "企业商户上报",
                        type: 5
                    },
                    {
                        name: "统战上报",
                        type: 6
                    }
                ],
                tabIndex: 0,