From 59f4dc012a2c42eebd31301444e0f8df9af088e0 Mon Sep 17 00:00:00 2001
From: wjt <1797368093@qq.com>
Date: 星期三, 26 六月 2024 10:13:12 +0800
Subject: [PATCH] Merge branch 'master' of http://218.28.192.34:9999/r/sqys/sqys_xcx
---
qiye/qiyeIndex/qiyeIndex.vue | 14
qiye/complaint/details.vue | 351 +++++++++++++-------------
policy/judgeApply/judgeApply.vue | 2
qiye/complaint/complaint.vue | 20 +
policy/dataLook/dataLook.vue | 2
common/config.js | 10
pages/hqzc/details.vue | 6
qiye/record/details.vue | 322 ++++++++++++------------
pages/index/index.vue | 2
pages/registerCompany/registerCompany.vue | 6
10 files changed, 385 insertions(+), 350 deletions(-)
diff --git a/common/config.js b/common/config.js
index c171ea5..ad8596c 100644
--- a/common/config.js
+++ b/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,
diff --git a/pages/hqzc/details.vue b/pages/hqzc/details.vue
index 5565333..ee0e71b 100644
--- a/pages/hqzc/details.vue
+++ b/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;
}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index b97cb8d..4d5e1b1 100644
--- a/pages/index/index.vue
+++ b/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')"/>
diff --git a/pages/registerCompany/registerCompany.vue b/pages/registerCompany/registerCompany.vue
index d17a0e8..1710cf7 100644
--- a/pages/registerCompany/registerCompany.vue
+++ b/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'
+ })
}
})
},
diff --git a/policy/dataLook/dataLook.vue b/policy/dataLook/dataLook.vue
index a987964..426dd7c 100644
--- a/policy/dataLook/dataLook.vue
+++ b/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>
diff --git a/policy/judgeApply/judgeApply.vue b/policy/judgeApply/judgeApply.vue
index 5efaef0..4342bcd 100644
--- a/policy/judgeApply/judgeApply.vue
+++ b/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>
diff --git a/qiye/complaint/complaint.vue b/qiye/complaint/complaint.vue
index 97fadaa..93e7ea1 100644
--- a/qiye/complaint/complaint.vue
+++ b/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)">
鍘绘煡鐪�
@@ -136,14 +141,14 @@
this.getList()
},
methods: {
- chakan(id, orderId){
+ chakan(id,orderId){
uni.navigateTo({
url: `/qiye/complaint/details?id=${id}&orderId=${orderId}`
})
},
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>
\ No newline at end of file
diff --git a/qiye/complaint/details.vue b/qiye/complaint/details.vue
index 98ec88e..a5b1b47 100644
--- a/qiye/complaint/details.vue
+++ b/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">
@@ -45,53 +47,53 @@
</view>
</view>
<view style="height: 20rpx;"></view>
- <template v-if="orderId">
- <view class="wbox">
- <view class="item">
- <view class="k">
- 鎵ф硶涓婚
- </view>
- <view class="v">
- {{details.enforceReason}}
- </view>
- </view>
- <view class="item">
- <view class="k">
- 鎵ф硶杩囩▼
- </view>
- </view>
- <view class="imgbox">
- <img :src="baseUrl+item" v-for="(item,index) in orderDetailsMsg.regionImgs" :key="index" class="more" @click="imgclick(item)" alt="" />
-
- </view>
- <view class="item">
- <view class="k">
- 鎵ф硶缁撴灉
- </view>
- <view class="v" style="color: #EB4746;">
- <!-- {{details.regionStatus == 0? "姝ｅ父" : "鍋滀笟鏁撮】" }} -->
- {{orderDetailsMsg.regionReason}}
- </view>
- </view>
- <view class="item">
- <view class="k">
- 鎵ф硶鏃堕棿
- </view>
- <view class="v">
- {{details.executeTime}}
- </view>
- </view>
- </view>
- <view style="height: 20rpx;"></view>
+ <template v-if="orderId">
+ <view class="wbox">
+ <view class="item">
+ <view class="k">
+ 鎵ф硶涓婚
+ </view>
+ <view class="v">
+ {{details.enforceReason}}
+ </view>
+ </view>
+ <view class="item">
+ <view class="k">
+ 鎵ф硶杩囩▼
+ </view>
+ </view>
+ <view class="imgbox">
+ <img :src="baseUrl+item" v-for="(item,index) in orderDetailsMsg.regionImgs" :key="index" class="more" @click="imgclick(item)" alt="" />
+
+ </view>
+ <view class="item">
+ <view class="k">
+ 鎵ф硶缁撴灉
+ </view>
+ <view class="v" style="color: #EB4746;">
+ <!-- {{details.regionStatus == 0? "姝ｅ父" : "鍋滀笟鏁撮】" }} -->
+ {{orderDetailsMsg.regionReason}}
+ </view>
+ </view>
+ <view class="item">
+ <view class="k">
+ 鎵ф硶鏃堕棿
+ </view>
+ <view class="v">
+ {{details.executeTime}}
+ </view>
+ </view>
+ </view>
+ <view style="height: 20rpx;"></view>
</template>
<view class="wbox2">
<view class="t">
鎶曡瘔璁板綍
</view>
<view class="jilu" :class="{start: item.nodeName == '鍙戣捣鎶曡瘔' || item.nodeName == '宸插姙缁�', handler: item.nodeName == '澶勭悊涓�', nonde: index == nodeList.length - 1}" v-for="(item,index) in nodeList" :key="index">
- <image src="/static/policy/icon.png" class="img" alt="" mode="widthFix" v-if="item.nodeName == '鍙戣捣鎶曡瘔'"/>
- <image src="/static/guocheng.png" class="img" alt="" mode="widthFix" v-if="item.nodeName == '澶勭悊涓�'"/>
- <image src="/static/policy/refject.png" class="img" mode="widthFix" alt="" v-if="item.nodeName == '宸查┏鍥�'"/>
+ <image src="/static/policy/icon.png" class="img" alt="" mode="widthFix" v-if="item.nodeName == '鍙戣捣鎶曡瘔'"/>
+ <image src="/static/guocheng.png" class="img" alt="" mode="widthFix" v-if="item.nodeName == '澶勭悊涓�'"/>
+ <image src="/static/policy/refject.png" class="img" mode="widthFix" alt="" v-if="item.nodeName == '宸查┏鍥�'"/>
<image src="/static/policy/icon.png" class="img" alt="" mode="widthFix" v-if="item.nodeName == '宸插姙缁�'"/>
<view class="font" style="width: calc(100% - 50rpx);">
<view class="h" >
@@ -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>
+ {{item.nodeReason}}
</view>
- <view class="p" v-if="item.nodeName == '宸查┏鍥�'">
- <span>鐢宠瘔鍐呭锛�</span>
+ <view class="p" v-if="item.nodeName == '宸插姙缁�' && item.nodeReason">
+ <span>鍔炵粨缁撴灉锛�</span>
{{item.nodeReason}}
</view>
</view>
@@ -126,7 +132,33 @@
<view class="font">
<view class="h">
<view class="s">
- 宸查┏鍥�
+ {{item.nodeName}}
+ </view>
+ <view class="time">
+ {{item.nodeTime}}
+ </view>
+ </view>
+ <view class="b">
+ <view class="name">
+ {{details.companyUser}}
+ </view>
+ <view class="p">
+ <span>鐢宠瘔涓婚锛�</span>
+ {{dictLabel1}}
+ </view>
+ <view class="p">
+ <span>鐢宠瘔鍐呭锛�</span>
+ {{details.complaintReason}}
+ </view>
+ </view>
+ </view>
+ </view>
+ <view class="jilu">
+ <image src="/static/guocheng.png" class="img" alt="" />
+ <view class="font">
+ <view class="h">
+ <view class="s">
+ 澶勭悊涓�
</view>
<view class="time">
2024-06-07 12:14
@@ -146,123 +178,97 @@
</view>
</view>
</view>
- </view>
- <view class="jilu">
- <image src="/static/guocheng.png" class="img" alt="" />
- <view class="font">
- <view class="h">
- <view class="s">
- 澶勭悊涓�
- </view>
- <view class="time">
- 2024-06-07 12:14
- </view>
- </view>
- <view class="b">
- <view class="name">
- {{details.companyUser}}
- </view>
- <view class="p">
- <span>鐢宠瘔涓婚锛�</span>
- {{dictLabel1}}
- </view>
- <view class="p">
- <span>鐢宠瘔鍐呭锛�</span>
- {{details.complaintReason}}
- </view>
- </view>
- </view>
</view>
- -->
+ -->
</view>
</view>
</view>
</template>
-<script>
- import { complaintDetails, orderNodeList, orderComplaintNodeList } from '@/api/qiye.js'
- import { orderDetails } from '@/api/policy.js'
- import { config } from '@/common/config.js'
+<script>
+ import { complaintDetails, orderNodeList, orderComplaintNodeList } from '@/api/qiye.js'
+ import { orderDetails } from '@/api/policy.js'
+ import { config } from '@/common/config.js'
import { getDicts } from '@/api/data.js'
export default {
data() {
return {
- details: {},
- orderId: "",
- orderDetailsMsg: {},
- baseUrl: config.baseUrl,
- dictLabel: "",
- dictLabel1: "",
+ details: {},
+ orderId: "",
+ orderDetailsMsg: {},
+ baseUrl: config.baseUrl,
+ dictLabel: "",
+ dictLabel1: "",
nodeList: []
}
- },
- onLoad(options) {
- this.complaint(options.id)
- if(options.orderId) {
- this.orderId = options.orderId
- this.orderDetails()
- } else {
- this.orderNodeList(options.id)
- }
},
- methods: {
- orderNodeList(id) {
- orderNodeList({id}).then(val => {
- // console.log(val)
- this.nodeList = val.data.data
- })
- },
- // 鑾峰彇鎶曡瘔绫诲瀷
- getComtype() {
- getDicts('complaint_type').then(val => {
- console.log(val)
- this.dictLabel1 = val.data.data.find(item => item.dictCode == this.details.complaintType).dictLabel
-
- })
- },
- enforceType() {
- getDicts('enforce_type').then(val => {
- console.log(val)
- this.dictLabel = val.data.data.find(item => item.dictCode == this.orderDetailsMsg.enforceType).dictLabel
-
- })
+ onLoad(options) {
+ this.complaint(options.id)
+ if(options.orderId) {
+ this.orderId = options.orderId
+ this.orderDetails()
+ } else {
+ this.orderNodeList(options.id)
+ }
+ },
+ methods: {
+ orderNodeList(id) {
+ orderNodeList({id}).then(val => {
+ // console.log(val)
+ this.nodeList = val.data.data
+ })
},
- imgclick(url) {
+ // 鑾峰彇鎶曡瘔绫诲瀷
+ getComtype() {
+ getDicts('complaint_type').then(val => {
+ console.log(val)
+ this.dictLabel1 = val.data.data.find(item => item.dictCode == this.details.complaintType).dictLabel
+
+ })
+ },
+ enforceType() {
+ getDicts('enforce_type').then(val => {
+ console.log(val)
+ this.dictLabel = val.data.data.find(item => item.dictCode == this.orderDetailsMsg.enforceType).dictLabel
+
+ })
+ },
+ imgclick(url) {
url = this.baseUrl + url
uni.previewImage({
urls: [url]
})
- },
- complaint(details) {
- complaintDetails(details).then(val => {
- // console.log(val.data.data)
- this.details = val.data.data
- this.getComtype()
- })
- },
- orderDetails() {
- orderDetails({ orderId: this.orderId}).then(val => {
- // console.log(val.data.data)
- val.data.data.regionImgs = val.data.data.regionImgs.split(",")
- this.orderDetailsMsg = val.data.data
- this.orderComplaintNodeList()
- this.enforceType()
- })
- },
- orderComplaintNodeList() {
- orderComplaintNodeList({ orderId: this.orderId }).then(val => {
- console.log(val.data.data, 'val===')
- this.nodeList = val.data.data
- })
+ },
+ complaint(details) {
+ complaintDetails(details).then(val => {
+ // console.log(val.data.data)
+ this.details = val.data.data
+ this.getComtype()
+ })
+ },
+ orderDetails() {
+ orderDetails({ orderId: this.orderId}).then(val => {
+ // console.log(val.data.data)
+ val.data.data.regionImgs = val.data.data.regionImgs.split(",")
+ this.orderDetailsMsg = val.data.data
+ this.orderComplaintNodeList()
+ this.enforceType()
+ })
+ },
+ orderComplaintNodeList() {
+ orderComplaintNodeList({ orderId: this.orderId }).then(val => {
+ console.log(val.data.data, 'val===')
+ this.nodeList = val.data.data
+ })
}
}
}
</script>
<style>
- page {
- background: #F4F4F4;
+ page {
+ background: #F4F4F4;
}
</style>
<style lang="scss" scoped>
@@ -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;
@@ -344,33 +351,33 @@
font-weight: bold;
}
- }
+ }
.jilu{
display: flex;
justify-content: space-between;
- padding: 24rpx;
- position: relative;
- &::before{
- content: '';
- display: inline-block;
- width: 2rpx;
- height: 100%;
- background: #eb47460d;
- position: absolute;
- left: 44rpx;
- top: 30rpx;
- z-index: 99;
- }
+ padding: 24rpx;
+ position: relative;
+ &::before{
+ content: '';
+ display: inline-block;
+ width: 2rpx;
+ height: 100%;
+ background: #eb47460d;
+ position: absolute;
+ left: 44rpx;
+ top: 30rpx;
+ z-index: 99;
+ }
.img{
width: 50rpx;
height: 50rpx;
- margin-right: 24rpx;
- position: relative;
+ margin-right: 24rpx;
+ position: relative;
z-index: 100;
}
- .font{
+ .font{
width: calc(100% - 70rpx);
.h{
display: flex;
@@ -406,20 +413,20 @@
}
}
}
- }
- .handler{
- &::before {
- background: #fe7b320d;
- }
- }
- .start{
- &::before{
- background: #E7F8F0;
- }
- }
- .nonde{
- &::before{
- background: none;
- }
- }
+ }
+ .handler{
+ &::before {
+ background: #fe7b320d;
+ }
+ }
+ .start{
+ &::before{
+ background: #E7F8F0;
+ }
+ }
+ .nonde{
+ &::before{
+ background: none;
+ }
+ }
</style>
\ No newline at end of file
diff --git a/qiye/qiyeIndex/qiyeIndex.vue b/qiye/qiyeIndex/qiyeIndex.vue
index 29a3e63..56ea366 100644
--- a/qiye/qiyeIndex/qiyeIndex.vue
+++ b/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.$refs.uqrcode.toTempFilePath({
- success: res => {
- this.uqrcodeImage = res.tempFilePath
- }
- });
+ 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)
diff --git a/qiye/record/details.vue b/qiye/record/details.vue
index 2d43f43..9a88159 100644
--- a/qiye/record/details.vue
+++ b/qiye/record/details.vue
@@ -7,9 +7,9 @@
</u-navbar>
<view class="donw-box"></view>
<view class="page-main">
- <view class="title">
- <template v-if="msg.isEva==0">鏈瘎浠�</template>
- <template v-if="msg.isEva==1">宸茶瘎浠�</template>
+ <view class="title">
+ <template v-if="msg.isEva==0">鏈瘎浠�</template>
+ <template v-if="msg.isEva==1">宸茶瘎浠�</template>
<template v-if="msg.orderStatus==2">寰呮墽娉�</template>
</view>
<view class="wbox">
@@ -64,10 +64,10 @@
{{msg.regionReason || '鎵ф硶杩囩▼寰呬笂鎶�'}}
</view>
</view>
- <view class="imgbox" v-if="img.length">
+ <view class="imgbox" v-if="img.length">
<template >
<img v-for="(item,index) in img" :key="index" :src="item" class="more" alt="" @click="imgclick(item)" />
- </template>
+ </template>
<!-- <img src="/static/i01.png" class="more" @click="imgclick('/static/i01.png')" alt="" />
<img src="/static/i02.png" class="more" alt="" />
@@ -95,66 +95,66 @@
<view class="wbox2" v-if="msg.isEva==1">
<view class="t">
鎵ф硶璇勪环
- </view>
- <template v-for="(item,index) in qlist">
- <view class="sbox" v-if="item.questionType==2">
- <view class="t2">
- {{item.questionName}}
- </view>
- <view class="xbox">
- <view>
- <img src="/static/qiye/xing1.png" alt="" />
- <view>
- 寰堢碂绯�
- </view>
- </view>
- <view>
- <img v-if="item.getScore>=2" src="/static/qiye/xing1.png" alt="" />
- <img v-else src="/static/qiye/xing2.png" alt="" />
- <view :class="item.getScore==2?'hei':''">
- 涓嶆弧鎰�
- </view>
- </view>
- <view>
- <img v-if="item.getScore>=3" src="/static/qiye/xing1.png" alt="" />
- <img v-else src="/static/qiye/xing2.png" alt="" />
- <view :class="item.getScore==3?'hei':''">
- 涓�鑸埇
- </view>
- </view>
- <view>
- <img v-if="item.getScore>=4" src="/static/qiye/xing1.png" alt="" />
- <img v-else src="/static/qiye/xing2.png" alt="" />
- <view :class="item.getScore==4?'hei':''">
- 婊℃剰
- </view>
- </view>
- <view>
- <img v-if="item.getScore>=5" src="/static/qiye/xing1.png" alt="" />
- <img v-else src="/static/qiye/xing2.png" alt="" />
- <view :class="item.getScore==5?'hei':''">
- 闈炲父婊℃剰
- </view>
- </view>
- </view>
- <view class="line"></view>
- </view>
- <view class="sbox" v-if="item.questionType==1">
- <view class="t2">
- {{item.questionName}}
- </view>
- <u-radio-group v-model="item.remark">
- <u-radio v-for="(aa, ii) in item.answerList" :key="ii" :name="aa.answerId"
- :disabled="item.remark!=aa.answerId">
- {{aa.answerName}}
- </u-radio>
- </u-radio-group>
- <!-- <u-radio-group v-model="value">
- <u-radio name="orange">閫変腑</u-radio>
- <u-radio name="1" :disabled="true">鏈�変腑</u-radio>
- </u-radio-group> -->
- <view class="line"></view>
- </view>
+ </view>
+ <template v-for="(item,index) in qlist">
+ <view class="sbox" v-if="item.questionType==2">
+ <view class="t2">
+ {{item.questionName}}
+ </view>
+ <view class="xbox">
+ <view>
+ <img src="/static/qiye/xing1.png" alt="" />
+ <view>
+ 寰堢碂绯�
+ </view>
+ </view>
+ <view>
+ <img v-if="item.getScore>=2" src="/static/qiye/xing1.png" alt="" />
+ <img v-else src="/static/qiye/xing2.png" alt="" />
+ <view :class="item.getScore==2?'hei':''">
+ 涓嶆弧鎰�
+ </view>
+ </view>
+ <view>
+ <img v-if="item.getScore>=3" src="/static/qiye/xing1.png" alt="" />
+ <img v-else src="/static/qiye/xing2.png" alt="" />
+ <view :class="item.getScore==3?'hei':''">
+ 涓�鑸埇
+ </view>
+ </view>
+ <view>
+ <img v-if="item.getScore>=4" src="/static/qiye/xing1.png" alt="" />
+ <img v-else src="/static/qiye/xing2.png" alt="" />
+ <view :class="item.getScore==4?'hei':''">
+ 婊℃剰
+ </view>
+ </view>
+ <view>
+ <img v-if="item.getScore>=5" src="/static/qiye/xing1.png" alt="" />
+ <img v-else src="/static/qiye/xing2.png" alt="" />
+ <view :class="item.getScore==5?'hei':''">
+ 闈炲父婊℃剰
+ </view>
+ </view>
+ </view>
+ <view class="line"></view>
+ </view>
+ <view class="sbox" v-if="item.questionType==1">
+ <view class="t2">
+ {{item.questionName}}
+ </view>
+ <u-radio-group v-model="item.remark">
+ <u-radio v-for="(aa, ii) in item.answerList" :key="ii" :name="aa.answerId"
+ :disabled="item.remark!=aa.answerId">
+ {{aa.answerName}}
+ </u-radio>
+ </u-radio-group>
+ <!-- <u-radio-group v-model="value">
+ <u-radio name="orange">閫変腑</u-radio>
+ <u-radio name="1" :disabled="true">鏈�変腑</u-radio>
+ </u-radio-group> -->
+ <view class="line"></view>
+ </view>
</template>
@@ -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="b2" @click="open()">
+ <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>
@@ -193,11 +198,11 @@
<view class="font">
鎶曡瘔涓婚
</view>
- <view>
- <u-radio-group v-model="complaintType">
- <u-radio v-for="(aa, ii) in list" :key="ii" :name="aa.dictCode">
- {{aa.dictLabel}}
- </u-radio>
+ <view>
+ <u-radio-group v-model="complaintType">
+ <u-radio v-for="(aa, ii) in list" :key="ii" :name="aa.dictCode">
+ {{aa.dictLabel}}
+ </u-radio>
</u-radio-group>
</view>
<view class="font">
@@ -215,65 +220,65 @@
</view>
</template>
-<script>
- import { order } from '@/api/index.js'
- import { getDicts } from '@/api/data.js'
- import { config } from '@/common/config'
+<script>
+ import { order } from '@/api/index.js'
+ import { getDicts } from '@/api/data.js'
+ import { config } from '@/common/config'
import { orderComplaint } from '@/api/qiye.js'
export default {
data() {
- return {
- complaintType:'',
- complaintReason:'',
- id:'',
- msg:{},
- type:'',
- img:[],
+ return {
+ complaintType:'',
+ complaintReason:'',
+ id:'',
+ msg:{},
+ type:'',
+ img:[],
baseUrl: config.baseUrl,
xing: 5,
value: 'orange',
//type: 2,
show: false,
list: [
- ],
+ ],
qlist:[]
}
- },
- onLoad(options) {
- this.id = options.id
- //this.getdata(options.id)
- getDicts('complaint_type').then(val => {
- this.list = val.data.data
- console.log(this.list)
- // const value = val.data.data.find(item => item.dictCode == this.msg.enforceType)
- // this.type = value.dictLabel
- })
- this.getdata()
- },
- onShow(options) {
-
},
- methods: {
- getdata(){
+ onLoad(options) {
+ this.id = options.id
+ //this.getdata(options.id)
+ getDicts('complaint_type').then(val => {
+ this.list = val.data.data
+ console.log(this.list)
+ // const value = val.data.data.find(item => item.dictCode == this.msg.enforceType)
+ // this.type = value.dictLabel
+ })
+ // this.getdata()
+ },
+ onShow(options) {
+ this.getdata()
+ },
+ methods: {
+ getdata(){
order(this.id).then(val => {
-
+
this.msg = val.data.data
getDicts('enforce_type').then(val => {
const value = val.data.data.find(item => item.dictCode == this.msg.enforceType)
this.type = value.dictLabel
- })
- let arr = this.msg.regionImgs.split(",");
- for(let i = 0;i<arr.length;i++){
- this.img.push(this.baseUrl+arr[i])
- }
- this.qlist = this.msg.evaluateVo.questionList
- for(let i = 0;i<this.qlist.length;i++){
- if(this.qlist[i].questionType==1&&this.qlist[i].remark){
- this.qlist[i].remark = Number(this.qlist[i].remark)
- }
- }
-
- })
+ })
+ let arr = this.msg.regionImgs.split(",");
+ for(let i = 0;i<arr.length;i++){
+ this.img.push(this.baseUrl+arr[i])
+ }
+ this.qlist = this.msg.evaluateVo.questionList
+ for(let i = 0;i<this.qlist.length;i++){
+ if(this.qlist[i].questionType==1&&this.qlist[i].remark){
+ this.qlist[i].remark = Number(this.qlist[i].remark)
+ }
+ }
+
+ })
},
daxing(a) {
this.xing = a
@@ -282,11 +287,11 @@
uni.previewImage({
urls: [url]
})
- },
- pingjia(){
- uni.navigateTo({
- url: `/qiye/record/evaluate?id=${this.msg.orderId}`
- })
+ },
+ pingjia(){
+ uni.navigateTo({
+ url: `/qiye/record/evaluate?id=${this.msg.orderId}`
+ })
},
open() {
this.show = true
@@ -296,34 +301,34 @@
this.$emit('cancel')
},
entery() {
- this.$emit('entery')
- if(this.complaintType==''){
- uni.showToast({
- title: '璇烽�夋嫨鎶曡瘔涓婚',
- icon: 'none'
- })
- return
- }
- if(this.complaintReason==''){
- uni.showToast({
- title: '璇疯緭鍏ユ姇璇夊唴瀹�',
- icon: 'none'
- })
- return
- }
- let data = {
- orderId:Number(this.id),
- complaintType:this.complaintType,
- complaintReason:this.complaintReason
- }
- console.log(data)
- //return;
- orderComplaint(data).then(val => {
- uni.showToast({
- title: '鎻愪氦鎴愬姛',
- icon: 'none'
- })
- this.show = false
+ this.$emit('entery')
+ if(this.complaintType==''){
+ uni.showToast({
+ title: '璇烽�夋嫨鎶曡瘔涓婚',
+ icon: 'none'
+ })
+ return
+ }
+ if(this.complaintReason==''){
+ uni.showToast({
+ title: '璇疯緭鍏ユ姇璇夊唴瀹�',
+ icon: 'none'
+ })
+ return
+ }
+ let data = {
+ orderId:Number(this.id),
+ complaintType:this.complaintType,
+ complaintReason:this.complaintReason
+ }
+ console.log(data)
+ //return;
+ orderComplaint(data).then(val => {
+ uni.showToast({
+ title: '鎻愪氦鎴愬姛',
+ icon: 'none'
+ })
+ this.show = false
})
},
@@ -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;
}
}
}
@@ -458,7 +466,7 @@
margin-top: 20rpx;
flex-wrap: wrap;
.u-radio {
- margin-right: 20rpx;
+ margin-right: 20rpx;
margin-bottom: 20rpx;
}
}
@@ -521,10 +529,10 @@
.page-box {
padding: 24rpx 0;
- .font{
- color: #4a4e60;
- font-size: 32rpx;
- margin-top: 20rpx;
+ .font{
+ color: #4a4e60;
+ font-size: 32rpx;
+ margin-top: 20rpx;
}
.title1 {
font-size: 36rpx;
--
Gitblit v1.9.1