chenrui
/
zdxtLawEnforcementCodeView
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改*号 必填文字描述 

修改首页初始化加载
master
chenrui 2 years ago
parent
3805455a68
commit
9c6b6b093d
5 changed files with 245 additions and 233 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 19
      src/views/Home.vue
  2. 432
      src/views/enforceHome.vue
  3. 6
      src/views/enterprise/complaint.vue
  4. 19
      src/views/enterprise/complaintNoScan.vue
  5. 2
      src/views/enterprise/qrCode.vue

19
src/views/Home.vue
View File

@ -1,5 +1,6 @@
<template>
<div class="home app_content">
<Loading class="loading-div" type="spinner" v-show="isLoading" color="#1989fa"/>
<div class="home app_content" v-if="!isLoading">
<!-- 导航栏 -->
<!-- <div class="header_body">-->
<!-- <header-nav :leftArrow="false" titelText="执法监督码"></header-nav>-->
@ -53,11 +54,11 @@
import {getEnterpriseMerchantAuthorization, getSiqLoginAuth, getSiqLoginAuthTest, siqCode} from '../api/Home';
import {showSuccessToast} from "vant";
import 'vant/es/toast/style';
const {useCommon} = $globalStore;
const router = useRouter();
const route = useRoute();
let carouselList = reactive([]); // 轮播列表
const isLoading = ref(true);
let freshMap = reactive({
refreshLoad: false, // 是否刷新
listLoading: false, // 是否加载中
@ -147,12 +148,12 @@
onMounted(() => {
// console.log(useCommon.phonenumber)
// useCommon.SET_USER_PHONENUMBER(success.data.phonenumber);
// new Vconsolefrom();
new Vconsolefrom();
// const access_key = '6374106c5eb449a4ad6c2430f30796e6';
// const access_secret = '434fec85aa5846e88bbeb8fac6cf6d7f';
// generateRandomNumber()
isLoading.value = useCommon.firstLoad;
siqCode(null, success => {
let access_key = "";
let access_secret = "";
@ -172,14 +173,17 @@
const signature = sha1(str).toString().toLowerCase();
//深i企鉴权测试
getSiqLoginAuthTest({userId: "1608644307579883522", userName: "汪鑫"}, success => {
// getSiqLoginAuthTest({userId: "1795031916332843009", userName: "陈瑞"}, success => {
// getSiqLoginAuthTest({userId: "1608644307579883522", userName: "汪鑫"}, success => {
getSiqLoginAuthTest({userId: "1795031916332843009", userName: "陈瑞"}, success => {
console.log(success.data);
useCommon.SET_USER_PHONENUMBER(success.data.phonenumber.toString());
useCommon.SET_USER_ID(success.data.userId);
useCommon.SET_USER_ENTERPRISE_NUMBER(success.data.enterpriseNumber);
useCommon.SET_TOKEN(success.data.token);
console.log(useCommon.userId);
if(useCommon.firstLoad){
isLoading.value = false;
}
getEnterpriseMerchant(success.data.phonenumber.toString());
}, error => {
})
@ -212,6 +216,9 @@
// useCommon.SET_USER_ID(success.data.userId);
// useCommon.SET_USER_ENTERPRISE_NUMBER(success.data.enterpriseNumber);
// getEnterpriseMerchant(success.data.phonenumber.toString());
// if(useCommon.firstLoad){
// isLoading.value = false;
// }
// }, error => {
// console.log("error : " + error)
// })

432
src/views/enforceHome.vue
View File

@ -1,5 +1,5 @@
<template>
<Loading class="loading-div" type="spinner" v-show="isLoading" color="#1989fa"/>
<Loading class="loading-div" type="spinner" v-show="isLoading" color="#1989fa" />
<div class="home app_content" v-if="!isLoading">
<!-- 导航栏 -->
<!-- <div class="header_body">
@ -7,8 +7,8 @@
</div> -->
<!-- 中间 -->
<div class="warp_body">
<div class="warp_body" >
<div class="logobox"></div>
<!-- <div class="streamer" @click="">
<i></i>
@ -18,14 +18,14 @@
</div> -->
<van-notice-bar
:text="noticeStr"
:key="freshMap.key"
left-icon="volume-o"
scrollable
:speed="100"
class="streamer"
:text="noticeStr"
:key="freshMap.key"
left-icon="volume-o"
scrollable
:speed="100"
class="streamer"
/>
<!-- <div class="container streamer" id="notification-container":key="freshMap.key">
<div class="notification" id="notification">
{{ notificationtext }}
@ -72,10 +72,9 @@
<script setup name="Home">
import Vconsolefrom from 'vconsole';
import {Loading} from 'vant';
import { Loading } from 'vant';
import {getEnterpriseMerchantAuthorization, getSzyptLoginAuth} from '../api/Home';
import {queryEnforcementInspectionProgramListNoPermission} from "@/api/enforce";
const isLoading = ref(true);
const {useCommon} = $globalStore;
const router = useRouter();
@ -90,26 +89,26 @@
key: 0,
});
// 模拟异步数据加载
// setTimeout(() => {
// setTimeout(() => {
// // 如果不是执法用户 则跳转
// router.push(
// {
// path: "/noAccess"
// });
isLoading.value = false;
// isLoading.value = false;
// }, 3000);
//定时器
let noticeObj = reactive({
noticeList: [],
notificationtext: "",
noticeTimer: null,
itemWidth: 0,
offset: 0,
step: 3,
speed: 20,
noticeList: [],
notificationtext: "",
noticeTimer: null,
itemWidth: 0,
offset: 0,
step: 3,
speed: 20,
});
const data = reactive({});
@ -162,43 +161,43 @@
path: "/enforce/enforceNotice",
});
}
const queryList = () => {
queryEnforcementInspectionProgramListNoPermission({}, success => {
console.log(success)
if (success.data.length > 4) {
for (let i = 0; i < 1; i++) {
carouselList.push(success.data[i]);
noticeObj.noticeList.push(success.data[i].planName)
// noticeStr += success.data[i].planName + " ";
// noticeStr += success.data[i].planName != null ?success.data[i].planName + "":"";
}
noticeStr += success.data[0].planName != null ? success.data[0].planName + "" : "";
} else {
carouselList = success.data;
for (let i = 0; i <= success.data.length; i++) {
// carouselList.push(success.data[i]);
noticeObj.noticeList.push(success.data[i].planName);
}
noticeStr += success.data[0].planName != null ? success.data[0].planName + "" : "";
}
freshMap.key = 1
console.log(carouselList);
// timerObj.timer = setInterval(flushMessage, 4000);
setNotificationMove();
}, error => {
})
}
const flushMessage = () => {
timerObj.value++;
freshMap.key = timerObj.value;
if (carouselList.length == timerObj.value) {
timerObj.value = 0;
const queryList = () =>{
queryEnforcementInspectionProgramListNoPermission({},success =>{
console.log(success)
if(success.data.length > 4 ){
for (let i = 0; i < 1; i++) {
carouselList.push(success.data[i]);
noticeObj.noticeList.push(success.data[i].planName)
// noticeStr += success.data[i].planName + " ";
// noticeStr += success.data[i].planName != null ?success.data[i].planName + "":"";
}
noticeStr += success.data[0].planName != null ?success.data[0].planName + "":"";
}else{
carouselList = success.data;
for (let i = 0; i <= success.data.length; i++) {
// carouselList.push(success.data[i]);
noticeObj.noticeList.push(success.data[i].planName);
}
noticeStr += success.data[0].planName != null ?success.data[0].planName + "":"";
}
freshMap.key = timerObj.value;
noticeStr = carouselList[timerObj.value].planName
freshMap.key = 1
console.log(carouselList);
// timerObj.timer = setInterval(flushMessage, 4000);
setNotificationMove();
},error =>{
})
}
const flushMessage =() =>{
timerObj.value++;
freshMap.key = timerObj.value;
if(carouselList.length == timerObj.value){
timerObj.value = 0;
}
freshMap.key = timerObj.value;
noticeStr = carouselList[timerObj.value].planName
}
//下拉刷新
const onRefresh = () => {
@ -224,16 +223,14 @@
// getSzyptLoginAuth(route?.query?.code,success =>{
getSzyptLoginAuth(code, success => {
console.log(success.data)
if (null != success.data) {
useCommon.SET_USER_ID(success.data.userId);
useCommon.SET_TOKEN(success.data.token);
useCommon.SET_USER_ID(success.data.userId);
useCommon.SET_TOKEN(success.data.token);
if(useCommon.firstLoad){
isLoading.value = false;
}
if (useCommon.firstLoad) {
isLoading.value = false;
}
//设置已经初始化
useCommon.SET_IS_FIRST_LOAD(false)
queryList();
//设置已经初始化
useCommon.SET_IS_FIRST_LOAD(false)
queryList();
// 如果不是执法用户 则跳转
// if (!success.data.lawOfficer) {
// router.push(
@ -252,53 +249,53 @@
// }, error => {
// })
// queryList();
});
const setNotificationMove = () => {
// 清除定时器
clearInterval(noticeObj.noticeTimer);
const notificationContainer = document.getElementById(
"notification-container"
);
const notificationWidth = notificationContainer.offsetWidth;
let index = 0;
// 播报内容赋值
noticeObj.notificationtext = noticeObj.noticeList[index];
const notification = document.getElementById("notification");
noticeObj.offset = notificationWidth;
// 初始化x轴平移距离
const setNotificationMove =()=>{
// 清除定时器
clearInterval(noticeObj.noticeTimer);
const notificationContainer = document.getElementById(
"notification-container"
);
const notificationWidth = notificationContainer.offsetWidth;
let index = 0;
// 播报内容赋值
noticeObj.notificationtext = noticeObj.noticeList[index];
const notification = document.getElementById("notification");
noticeObj.offset = notificationWidth;
// 初始化x轴平移距离
notification.style.transform = `translateX(${noticeObj.offset}px)`;
// 当前通知的宽度
noticeObj.itemWidth = noticeObj.notificationtext.length * 20;
noticeObj.noticeTimer = setInterval(() => {
noticeObj.offset -= noticeObj.step;
if (noticeObj.offset < -noticeObj.itemWidth) {
noticeObj.offset = notificationWidth;
if (index >= noticeObj.noticeList.length - 1) {
index = 0;
} else {
index++;
}
noticeObj.notificationtext = noticeObj.noticeList[index];
noticeObj.itemWidth = noticeObj.notificationtext.length * 20;
}
notification.style.transform = `translateX(${noticeObj.offset}px)`;
// 当前通知的宽度
noticeObj.itemWidth = noticeObj.notificationtext.length * 20;
noticeObj.noticeTimer = setInterval(() => {
noticeObj.offset -= noticeObj.step;
if (noticeObj.offset < -noticeObj.itemWidth) {
noticeObj.offset = notificationWidth;
if (index >= noticeObj.noticeList.length - 1) {
index = 0;
} else {
index++;
}
noticeObj.notificationtext = noticeObj.noticeList[index];
noticeObj.itemWidth = noticeObj.notificationtext.length * 20;
}
notification.style.transform = `translateX(${noticeObj.offset}px)`;
}, noticeObj.speed);
}, noticeObj.speed);
}
const delayNoticeMove = () => {
const notification = document.getElementById("notification");
let currentOffset = notification.style.transform;
if (currentOffset) {
currentOffset = currentOffset.split("(")[1];
currentOffset = currentOffset.substring(0, currentOffset.indexOf("px"));
let duration = ((Number(currentOffset) + noticeObj.itemWidth) / noticeObj.step) * noticeObj.speed;
// 判断当前还有多久滚动完毕 添加一个setTimeout等待滚动结束后重新计时
setTimeout(() => {
this.setNotificationMove();
}, duration);
} else {
this.setNotificationMove();
}
const delayNoticeMove = () =>{
const notification = document.getElementById("notification");
let currentOffset = notification.style.transform;
if (currentOffset) {
currentOffset = currentOffset.split("(")[1];
currentOffset = currentOffset.substring(0, currentOffset.indexOf("px"));
let duration = ((Number(currentOffset) + noticeObj.itemWidth) / noticeObj.step) * noticeObj.speed;
// 判断当前还有多久滚动完毕 添加一个setTimeout等待滚动结束后重新计时
setTimeout(() => {
this.setNotificationMove();
}, duration);
} else {
this.setNotificationMove();
}
}
</script>
@ -311,14 +308,14 @@
background-color: #f4f4f4;
.warp_body {
position: relative;
margin: 0;
width: 100%;
height: 100%;
background: #c6e6ff url("../assets/images/bg_el.jpg") no-repeat top;
background-size: auto 100%;
overflow-x: hidden;
overflow-y: auto;
position: relative;
margin: 0;
width: 100%;
height: 100%;
background: #c6e6ff url("../assets/images/bg_el.jpg") no-repeat top;
background-size: auto 100%;
overflow-x: hidden;
overflow-y: auto;
.carousel_box {
height: 4rem;
@ -349,40 +346,39 @@
border-radius: 0.27rem;
.box-qr-code-text {
position: absolute;
z-index: 10;
top: 10%;
right: 0.35rem;
display: block;
font-size: 0.5rem;
position: absolute;
z-index: 10;
top: 10%;
right: 0.35rem;
display: block;
font-size: 0.5rem;
}
}
.box-qr-code::before {
content: "";
position: absolute;
top: -0.14rem;
left: -0.14rem;
z-index: 0;
width: calc(100% + 0.13rem);
height: calc(100% + 0.13rem);
background-color: #fff;
border: 0.14rem solid rgba(255, 255, 255, 0.5);
border-radius: 0.27rem;
content: "";
position: absolute;
top: -0.14rem;
left: -0.14rem;
z-index: 0;
width: calc(100% + 0.13rem);
height: calc(100% + 0.13rem);
background-color: #fff;
border: 0.14rem solid rgba(255,255,255,0.5);
border-radius: 0.27rem;
}
.box-qr-code::after {
content: "";
position: absolute;
top: 0;
left: 0;
z-index: 1;
width: 100%;
height: 100%;
border-radius: 0.27rem;
background: #fff url("../assets/images/item_scan.jpg") no-repeat left;
background-size: auto 100%;
border: 0.01rem solid #8db4ff;
content: "";
position: absolute;
top: 0;
left: 0;
z-index: 1;
width: 100%;
height: 100%;
border-radius: 0.27rem;
background: #fff url("../assets/images/item_scan.jpg") no-repeat left;
background-size: auto 100%;
border: 0.01rem solid #8db4ff;
}
.box-info {
@ -394,40 +390,39 @@
border-radius: 0.27rem;
.box-info-text {
position: absolute;
z-index: 10;
top: 10%;
right: 0.35rem;
display: block;
font-size: 0.5rem;
position: absolute;
z-index: 10;
top: 10%;
right: 0.35rem;
display: block;
font-size: 0.5rem;
}
}
.box-info::before {
content: "";
position: absolute;
top: -0.14rem;
left: -0.14rem;
z-index: 0;
width: calc(100% + 0.13rem);
height: calc(100% + 0.13rem);
background-color: #fff;
border: 0.14rem solid rgba(255, 255, 255, 0.5);
border-radius: 0.27rem;
content: "";
position: absolute;
top: -0.14rem;
left: -0.14rem;
z-index: 0;
width: calc(100% + 0.13rem);
height: calc(100% + 0.13rem);
background-color: #fff;
border: 0.14rem solid rgba(255,255,255,0.5);
border-radius: 0.27rem;
}
.box-info::after {
content: "";
position: absolute;
top: 0;
left: 0;
z-index: 1;
width: 100%;
height: 100%;
border-radius: 0.27rem;
background: #fff url("../assets/images/item_check.jpg") no-repeat left;
background-size: auto 100%;
border: 1px solid #8db4ff;
content: "";
position: absolute;
top: 0;
left: 0;
z-index: 1;
width: 100%;
height: 100%;
border-radius: 0.27rem;
background: #fff url("../assets/images/item_check.jpg") no-repeat left;
background-size: auto 100%;
border: 1px solid #8db4ff;
}
.box-complaint {
@ -439,41 +434,40 @@
border-radius: 0.27rem;
.box-complaint-text {
position: absolute;
z-index: 10;
top: 10%;
right: 0.35rem;
display: block;
font-size: 0.5rem;
position: absolute;
z-index: 10;
top: 10%;
right: 0.35rem;
display: block;
font-size: 0.5rem;
}
}
}
.box-complaint::before {
content: "";
position: absolute;
top: -0.14rem;
left: -0.14rem;
z-index: 0;
width: calc(100% + 0.13rem);
height: calc(100% + 0.13rem);
background-color: #fff;
border: 0.14rem solid rgba(255, 255, 255, 0.5);
border-radius: 0.27rem;
content: "";
position: absolute;
top: -0.14rem;
left: -0.14rem;
z-index: 0;
width: calc(100% + 0.13rem);
height: calc(100% + 0.13rem);
background-color: #fff;
border: 0.14rem solid rgba(255,255,255,0.5);
border-radius: 0.27rem;
}
.box-complaint::after {
content: "";
position: absolute;
top: 0;
left: 0;
z-index: 1;
width: 100%;
height: 100%;
border-radius: 0.27rem;
background: #fff url("../assets/images/item_count.jpg") no-repeat left;
background-size: auto 100%;
border: 0.01rem solid #8db4ff;
content: "";
position: absolute;
top: 0;
left: 0;
z-index: 1;
width: 100%;
height: 100%;
border-radius: 0.27rem;
background: #fff url("../assets/images/item_count.jpg") no-repeat left;
background-size: auto 100%;
border: 0.01rem solid #8db4ff;
}
.recommend_box {
@ -596,21 +590,17 @@
background: url("../assets/images/logo.png") no-repeat;
background-size: 100% auto;
}
.loading-div {
position: absolute;
top: 45%;
left: 48%;
.loading-div{
position: absolute;
top: 45%;
left: 48%;
}
.notice-bar-container {
margin-bottom: 0.27rem;
margin-bottom: 0.27rem;
}
.notice-bar-container:last-child {
margin-bottom: 0;
margin-bottom: 0;
}
/* .notification{
height: 100%;
font-size: 0.27rem;
@ -620,17 +610,17 @@
}*/
@media screen and (max-width: 380px) {
.home .warp_body {
background: #c6e6ff url("../assets/images/bg_el.jpg") no-repeat top;
background-size: 100% auto;
}
.home .warp_body {
background: #c6e6ff url("../assets/images/bg_el.jpg") no-repeat top;
background-size: 100% auto;
}
}
@media screen and (min-width: 540px) {
.home .warp_body {
background: #c6e6ff url("../assets/images/bg_el.jpg") no-repeat top;
background-size: 100% auto;
}
.home .warp_body {
background: #c6e6ff url("../assets/images/bg_el.jpg") no-repeat top;
background-size: 100% auto;
}
}
</style>

6
src/views/enterprise/complaint.vue
View File

@ -41,11 +41,11 @@
</view>
<Popup :visible="popupVisible" :content="popupContent" @close="closePopup" @reciveData="reciveData"/>
<!-- <van-field
<van-field
v-model="submitData.enforceTypeText"
required
label="投诉类型"
placeholder="必填 请选择"
placeholder="请选择"
readonly
clickable
is-link
@ -58,7 +58,7 @@
@cancel="data.showPicker = false"
@confirm="onConfirm"
/>
</van-popup>-->
</van-popup>
<van-divider class="divdsty"/>
<van-field
v-model="submitData.problemDescription"

19
src/views/enterprise/complaintNoScan.vue
View File

@ -67,7 +67,20 @@
</div>
<van-divider class="divdsty" />
<van-field
v-model="submitData.enterpriseAddress"
rows="3"
autosize
label="涉事地址"
type="textarea"
placeholder="请填写详细地址"
required
:rules="[{ required: true, message: '请填写详细地址' }]"
show-word-limit
/>
<van-divider class="divdsty" />
<van-field
v-model="submitData.linkman"
label="联系人"
@ -590,7 +603,9 @@ const goBack = () => {
font-size: 0.3rem;
padding: 0px 10px;
width: 80%;
color: #969799
color: #969799;
height: 10%;
padding-bottom: 0.2rem;
}
}

2
src/views/enterprise/qrCode.vue
View File

@ -24,7 +24,7 @@
:src="data.qrCodeUrl"
/>
</div>
<span class="qr_code_text">扫一扫上面的二维码，获取企业执法信息</span>
<!-- <span class="qr_code_text">扫一扫上面的二维码，获取企业执法信息</span> -->
</div>
<van-action-bar>
<van-action-bar-button color="#2b75fd" text="下载二维码" @click="download(data.qrCodeUrl)" />

Write Preview
Loading…
Cancel
Save