From 9417c0cbada6d5e20c052872362a84c941805c5b Mon Sep 17 00:00:00 2001
From: 346149741 <346149741@qq.com>
Date: 星期六, 22 六月 2024 19:31:44 +0800
Subject: [PATCH] Merge branch 'master' of http://218.28.192.34:9999/r/sqys/sqys_xcx
---
policy/applyRecord/applyRecord.scss | 2 +-
policy/translateRecord/translateRecord.scss | 2 +-
policy/components/index.vue | 2 +-
policy/policyIndex/policyIndex.vue | 2 +-
policy/dataLook/dataLook.vue | 2 +-
pages/companyLogin/companyLogin.vue | 6 +++---
policy/reportRecord/reportRecord.scss | 2 +-
policy/reportPage/reportPage.scss | 2 +-
policy/scodePage/scodePage.vue | 30 ++++++++++++++++++------------
policy/translate/translate.scss | 2 +-
policy/scodePage/scodePage.scss | 2 +-
11 files changed, 30 insertions(+), 24 deletions(-)
diff --git a/pages/companyLogin/companyLogin.vue b/pages/companyLogin/companyLogin.vue
index dca311f..984f5aa 100644
--- a/pages/companyLogin/companyLogin.vue
+++ b/pages/companyLogin/companyLogin.vue
@@ -146,15 +146,15 @@
getInfo().then(val => {
uni.setStorageSync('userInfo', val.data.data)
if(this.form.userType == '02') {
- uni.redirectTo({
+ uni.reLaunch({
url:`/qiye/qiyeIndex/qiyeIndex`
})
} else if(this.form.userType == '01'){
- uni.redirectTo({
+ uni.reLaunch({
url:`/policy/policyIndex/policyIndex?id=${val.data.data.deptId}`
})
} else {
- uni.redirectTo({
+ uni.reLaunch({
url:`/policy/policyIndex/policyIndex`
})
}
diff --git a/policy/applyRecord/applyRecord.scss b/policy/applyRecord/applyRecord.scss
index 673bb9b..2075fbc 100644
--- a/policy/applyRecord/applyRecord.scss
+++ b/policy/applyRecord/applyRecord.scss
@@ -52,7 +52,7 @@
}
}
.line{
- border-bottom: 3rpx dotted #F4F4F4;
+ border-bottom: 3rpx dashed #F4F4F4;
margin: 24rpx 0;
}
.set-line1{
diff --git a/policy/components/index.vue b/policy/components/index.vue
index 3df9939..cb01a36 100644
--- a/policy/components/index.vue
+++ b/policy/components/index.vue
@@ -24,7 +24,7 @@
<image src="/static/policy/zhi2.png" v-if="isJudge" @click="recordZhifa" mode="widthFix"></image>
<image src="/static/policy/zhi3.png" v-if="userAuth" @click="report" mode="widthFix"></image>
<image src="/static/policy/zhi4.png" v-if="userAuth" @click="applyRecord" mode="widthFix"></image>
- <image src="/static/policy/zhi5.png" @click="goDataLook" v-if="userType == '02'" mode="widthFix">
+ <image src="/static/policy/zhi5.png" @click="goDataLook" v-if="userType == '00'" mode="widthFix">
</image>
</view>
</view>
diff --git a/policy/dataLook/dataLook.vue b/policy/dataLook/dataLook.vue
index d5d6813..3265eb7 100644
--- a/policy/dataLook/dataLook.vue
+++ b/policy/dataLook/dataLook.vue
@@ -257,7 +257,7 @@
},
// 鑾峰彇鎵ф硶淇℃伅
getTotalInfo() {
- getTotalInfo(this.pageQuerm).then(val => {
+ getTotalInfo().then(val => {
// console.log(val)
this.infoData = val.data.data
})
diff --git a/policy/policyIndex/policyIndex.vue b/policy/policyIndex/policyIndex.vue
index 0ad4e1f..182a5c4 100644
--- a/policy/policyIndex/policyIndex.vue
+++ b/policy/policyIndex/policyIndex.vue
@@ -1,6 +1,6 @@
<template>
<view class="padding-bottom">
- <policyIndexVue v-if="activeNumber == 0" :isJudge="isJudge" :userType="userInfo.userType" :userAuth="userAuth"></policyIndexVue>
+ <policyIndexVue v-if="activeNumber == 0" :isJudge="isJudge" :userType="userInfo.data.userType" :userAuth="userAuth"></policyIndexVue>
<minePage v-if="activeNumber == 1" :userInfo="userInfo" :roleGroup="roleGroup"></minePage>
<tabsCom :activeNumber.sync="activeNumber"></tabsCom>
</view>
diff --git a/policy/reportPage/reportPage.scss b/policy/reportPage/reportPage.scss
index 8d1bc72..6dfed67 100644
--- a/policy/reportPage/reportPage.scss
+++ b/policy/reportPage/reportPage.scss
@@ -39,7 +39,7 @@
}
}
.line{
- border-bottom: 3rpx dotted #F4F4F4;
+ border-bottom: 3rpx dashed #F4F4F4;
margin: 24rpx 0;
}
.set-line1{
diff --git a/policy/reportRecord/reportRecord.scss b/policy/reportRecord/reportRecord.scss
index 60d7083..a7c73cb 100644
--- a/policy/reportRecord/reportRecord.scss
+++ b/policy/reportRecord/reportRecord.scss
@@ -42,7 +42,7 @@
}
}
.line{
- border-bottom: 3rpx dotted #F4F4F4;
+ border-bottom: 3rpx dashed #F4F4F4;
margin: 24rpx 0;
}
.set-line1{
diff --git a/policy/scodePage/scodePage.scss b/policy/scodePage/scodePage.scss
index 4dc32cf..13056aa 100644
--- a/policy/scodePage/scodePage.scss
+++ b/policy/scodePage/scodePage.scss
@@ -129,7 +129,7 @@
}
}
.border{
- border: 2rpx dotted #F4F4F4;
+ border: 2rpx dashed #F4F4F4;
margin: 24rpx 0;
}
.font-13{
diff --git a/policy/scodePage/scodePage.vue b/policy/scodePage/scodePage.vue
index 4c861d8..c71c691 100644
--- a/policy/scodePage/scodePage.vue
+++ b/policy/scodePage/scodePage.vue
@@ -11,18 +11,24 @@
<image src="/static/policy/back.png" mode="widthFix" class="back-image"></image>
<view class="page-box">
<view class="code-hint">
- <view>
- <image src="/static/policy/success.png" mode="widthFix"></image>
- <!-- <image src="/static/policy/error.png" mode="widthFix"></image> -->
- <text>鎴愬姛-缁跨爜</text>
- <!-- <text>澶辫触-绾㈢爜</text> -->
- </view>
- <view class="hint">
- 鍙姝や紒涓氳繘琛屾牳鏌�
- </view>
- <view class="hint">
- 璇锋牳鏌ヤ紒涓氫俊鎭�
- </view>
+ <template v-if="color == 'green'">
+ <view>
+ <image src="/static/policy/success.png" mode="widthFix"></image>
+ <text>鎴愬姛-缁跨爜</text>
+ </view>
+ <view class="hint">
+ 鍙姝や紒涓氳繘琛屾牳鏌�
+ </view>
+ </template>
+ <template v-if="color == 'red'">
+ <view >
+ <image src="/static/policy/error.png" mode="widthFix"></image>
+ <text>澶辫触-绾㈢爜</text>
+ </view>
+ <view class="hint">
+ 璇锋牳鏌ヤ紒涓氫俊鎭�
+ </view>
+ </template>
</view>
<!-- 浜岀淮鐮� -->
<view class="qrcode">
diff --git a/policy/translate/translate.scss b/policy/translate/translate.scss
index 1828f2e..02ac25b 100644
--- a/policy/translate/translate.scss
+++ b/policy/translate/translate.scss
@@ -58,7 +58,7 @@
}
}
.line{
- border-bottom: 3rpx dotted #F4F4F4;
+ border-bottom: 3rpx dashed #F4F4F4;
margin: 24rpx 0;
}
.set-line1{
diff --git a/policy/translateRecord/translateRecord.scss b/policy/translateRecord/translateRecord.scss
index 673bb9b..2075fbc 100644
--- a/policy/translateRecord/translateRecord.scss
+++ b/policy/translateRecord/translateRecord.scss
@@ -52,7 +52,7 @@
}
}
.line{
- border-bottom: 3rpx dotted #F4F4F4;
+ border-bottom: 3rpx dashed #F4F4F4;
margin: 24rpx 0;
}
.set-line1{
--
Gitblit v1.9.1