Merge branch 'master' of http://218.28.192.34:9999/r/sqys/sqys_xcx

wjt

2024-06-26 59f4dc012a2c42eebd31301444e0f8df9af088e0

Merge branch 'master' of http://218.28.192.34:9999/r/sqys/sqys_xcx

 common/config.js

@@ -3,14 +3,14 @@
    hasHead: true,
    authCallBackUrl: 'https://wxbank.hnnx.com/mer/payOut/getAuthCode.do?authCallBackUrl=',
    webURL: 'https://jmy.jinmingyuan.com/ecosphere-user',
    serverTempl:"http://172.16.61.31:8089",
    serverTempl:"http://172.16.61.11:8089",
    socketTempl:"wss://yqzx.jinmingyuan.com/wsPerCode",
    h5Temp:"https://yqzx.jinmingyuan.com/ecosphere-h5",
    serverUrl: 'http://172.16.61.31:8089',
    h5Url: 'http://172.16.61.31:8089/service-merchant',
    serverUrl: 'http://172.16.61.11:8089',
    h5Url: 'http://172.16.61.11:8089/service-merchant',
    ftpUrl: 'https://yqzx.jinmingyuan.com/file',
    // ftpUrl: 'https://echftp.jinmingyuan.com',
    baseUrl: 'http://172.16.61.31:8089',
    baseUrl: 'http://172.16.61.11:8089',
    wx_appid: 'wxad8cc511da676bd4',
    ali_appid: '2021003199690698'
}
@@ -33,7 +33,7 @@

module.exports = {
    kefuTel: '15824668510',
    config: test,
    config: prod,
    ACCESSTOKEN: "Authorization",
    /* 是否打印请求日志 */
    DEBUG: false,

 pages/hqzc/details.vue

@@ -11,7 +11,7 @@
                发布时间：{{msg.createTime}}
            </view>
        </view>
        <view v-html="msg.docContent">
        <view style="margin-top: 20rpx;" v-html="msg.docContent">
            
        </view>
    </view>
@@ -38,6 +38,7 @@
                    this.msg = val.data.data
                    this.msg.createTime = this.msg.createTime.slice(0, 10)
                    this.msg.docContent = decodeURIComponent(this.msg.docContent)
                    this.msg.docContent = this.msg.docContent.replace(/\<img/gi, '<img style="max-width:100%;height:auto;"')
                    console.log(this.msg.docContent)
                    getDicts('doc_type').then(val => {
                        console.log(this.msg.docType)
@@ -55,6 +56,9 @@

</style>
<style scoped lang="scss">
    img{
        width: 100%;
    }
    .box{
        padding: 32rpx;
    }

 pages/index/index.vue

@@ -9,7 +9,7 @@
                <!-- <p>海关总署贸易持续发展2024年立法...</p>
                <p>国家医疗保障局办公室关于发布管理... </p> -->
            </view>
            <img src="/static/i06.png" class="more"  alt="" />
            <img src="/static/i06.png" class="more"  alt="" style="width: 46rpx;height: 46rpx;"/>
        </view>
        <view class="btnbox">
            <img src="/static/i01.png" class="more" alt="" style="margin-right: 18rpx;" @click="goMyCompany('01')"/>

 pages/registerCompany/registerCompany.vue

@@ -162,6 +162,12 @@
                    success: val => {
                        // console.log(val.tempFilePaths[0])
                        this.uploadImage(val.tempFilePaths[0])
                    },
                    fail: err => {
                        uni.showToast({
                            title: "上传出错",
                            icon: 'none'
                        })
                    }
                })
            },

 policy/dataLook/dataLook.vue

@@ -26,7 +26,7 @@
                    </view>
                    <view class="grid-item">
                        <view class="label">执法申请</view>
                        <view>{{infoData.enforceorderNum || 0}}</view>
                        <view>{{infoData.enforceOrderNum || 0}}</view>
                    </view>
                    <view class="grid-item">
                        <view class="label">已审批</view>

 policy/judgeApply/judgeApply.vue

@@ -2,7 +2,7 @@
    <view>
        <u-navbar placeholder bgColor="#1171E0FF" leftIconColor="white" :autoBack="true">
            <template slot="center">
                <view style="color: white;">申请详情</view>
                <view style="color: white;">审批详情</view>
            </template>
        </u-navbar>
        <view class="top-content"></view>

 qiye/complaint/complaint.vue

@@ -15,28 +15,33 @@
                        {{item.companyName}}
                    </view>
                    <template v-if="item.complaintStatus==0">
                        <view class="r color3">
                        <view class="r color2">
                            待响应
                        </view>
                    </template>
                    <template v-if="item.complaintStatus==1">
                        <view class="r color2">
                        <view class="r color1">
                            处理中
                        </view>
                    </template>
                    <template v-if="item.complaintStatus==2">
                        <view class="r color1">
                        <view class="r color3">
                            已办结
                        </view>
                    </template>
                    <!-- <view class="r color1">
                        待评价
                    </view> -->
                    <template v-if="item.complaintStatus==-1">
                        <view class="r color4">
                            已驳回
                        </view>
                    </template>
                </view>
                <view class="box">
                    <view class="l">
                        <p>执法单位：{{item.executeDeptName}}</p>
                        <p>执法时间：{{item.executeTime}}</p>
                        <p>投诉时间：{{item.complaintTime}}</p>
                    </view>
                    <view class="r" @click="chakan(item.id, item.orderId)">
                        去查看
@@ -143,7 +148,7 @@
            },
            getList() {
                let data = uni.getStorageSync("qiyedata")
                //this.queryParams.companyId = data.companyId
                this.queryParams.companyId = data.companyId
                logList({...this.queryParams}).then(val => {
                    console.log(val.data)
                    this.total = val.data.total
@@ -245,4 +250,7 @@
        color: #3EB47A;
        
    }
    .color4{
        color: gray;
    }
</style>

 qiye/complaint/details.vue

@@ -8,7 +8,9 @@
        <view class="donw-box"></view>
        <view class="page-main">
            <view class="title">
                已评价
                <template v-if="msg.orderStatus>2&&msg.isEva==0">已执法待评价</template>
                <template v-if="msg.orderStatus>2&&msg.isEva==1">已评价</template>
                <template v-if="msg.orderStatus==2">待执法</template>
            </view>
            <view class="wbox">
                <view class="item">
@@ -110,12 +112,16 @@
                                <span>申诉主题：</span>
                                {{dictLabel1}}
                            </view>
                            <view class="p">
                            <view class="p" style="margin-bottom: 18rpx;">
                                <span>申诉内容：</span>
                                {{details.complaintReason}}
                            </view>

                            <view class="p"  v-if="item.nodeName == '已驳回'">

                                <span>申诉内容：</span>

                                <span>驳回原因：</span>
                                {{item.nodeReason}}
                            </view>

                            <view class="p"  v-if="item.nodeName == '已办结' && item.nodeReason">

                                <span>办结结果：</span>

                                {{item.nodeReason}}

                            </view>
                        </view>
@@ -126,10 +132,10 @@
                    <view class="font">
                        <view class="h">
                            <view class="s">
                                已驳回
                                {{item.nodeName}}
                            </view>
                            <view class="time">
                                2024-06-07 12:14
                                {{item.nodeTime}}
                            </view>
                        </view>
                        <view class="b">
@@ -335,7 +341,8 @@
        border-radius: 5px;
        box-sizing: border-box;
        margin: 0 32rpx;
	
        position: relative;
        z-index: 10;

        .t {
            padding: 24rpx;
            border-bottom: 1px solid #EEEEEE;

 qiye/qiyeIndex/qiyeIndex.vue

@@ -7,7 +7,7 @@
            <view class="font">
                <p v-for="(item,index) in list1" class="u-line-1" :key="index">{{item.docTitle}}</p>
            </view>
            <img src="/static/i06.png" class="more"  alt="" />
            <img src="/static/i06.png" class="more"  alt="" style="width: 46rpx;height: 46rpx;"/>
        </view>
        <view class="wbox">
            <view class="name">
@@ -90,11 +90,13 @@
                    this.companyCode = this.msg.companyCode
                    uni.setStorageSync('qiyedata', this.msg)
                    setTimeout(() => {
                        this.$nextTick(() => {
                        this.$refs.uqrcode.toTempFilePath({
                          success: res => {
                            this.uqrcodeImage = res.tempFilePath
                          }
                        });
                        })
                    }, 500)
                    // this.msg.createTime = this.msg.createTime.slice(0, 10)
                    // this.msg.docContent = decodeURIComponent(this.msg.docContent)

 qiye/record/details.vue

@@ -169,16 +169,21 @@
            </view>

        </view>

        <view class="bottom" v-if="msg.orderStatus==3 || msg.orderStatus== 4">

            <view class="one" v-if="msg.isEva==1">

            <view class="one" v-if="msg.isComplaint != 1 && msg.isEva == 1">

                <view class="b1" @click="open()">

                    投诉

                </view>

            </view>

            <view class="two" v-if="msg.isEva==0">

            <view class="two" v-if="msg.isComplaint != 1 && msg.isEva != 1">

                <view class="b2" @click="open()">

                    投诉

                </view>

                <view class="b3" @click="pingjia()">

                    我要评价

                </view>

            </view>

            <view class="one" v-if="msg.isComplaint == 1 && msg.isEva != 1">

                <view class="b1" @click="pingjia()">

                    我要评价

                </view>

            </view>

@@ -248,10 +253,10 @@
                // const value = val.data.data.find(item => item.dictCode == this.msg.enforceType)
                // this.type = value.dictLabel
            })

            this.getdata()
            // this.getdata()

        },
        onShow(options) {
			
            this.getdata()

        },

        methods: {
            getdata(){
@@ -379,16 +384,19 @@
        }



        .imgbox {

            display: flex;

            flex-wrap: wrap;

            justify-content: space-between;

            display: grid;

            grid-template-columns: 1fr 1fr 1fr;

            grid-gap: 10rpx;

            // display: flex;

            // flex-wrap: wrap;

            // justify-content: space-between;

            border-radius: 10rpx;



            img {

                width: 198rpx;

                height: 198rpx;

                margin-bottom: 20rpx;



                border-radius: 10rpx;

            }

        }

    }