From 6918d5d6a3e83d3a8990da5efe68a144255255d4 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 26 六月 2024 15:03:50 +0800
Subject: [PATCH] ‘’
---
h5/pages/staff/visitorReport.vue | 7 ++++---
h5/static/staff/liucheng_fail@2x.png | 0
h5/pages/staffLogin/login.vue | 8 ++++----
h5/pages/staff/task/visitorReport.vue | 21 ++++++++++++++++-----
h5/pages/staff/vehicle/index.vue | 1 +
h5/manifest.json | 1 +
6 files changed, 26 insertions(+), 12 deletions(-)
diff --git a/h5/manifest.json b/h5/manifest.json
index 89b9a59..6e448ff 100644
--- a/h5/manifest.json
+++ b/h5/manifest.json
@@ -92,6 +92,7 @@
"/admin_interface" : {
// 杩欎釜瀛楁鍚嶉渶涓庝綘閰嶇疆鐨刡asePrefixUrl涓�鑷达紝绯荤粺璇嗗埆鍒板甫鏈�/dev-api璇锋眰鐨勫湴鍧�鏃讹紝浼氬湪鍓嶉潰鎷兼帴涓婁唬鐞嗘湇鍔″櫒鍦板潃
"target" : "http://192.168.0.173/admin_interface", // 浠ｇ悊鏈嶅姟鍣ㄥ煙鍚嶆垨IP鍦板潃
+ // "target" : "http://192.168.0.135:10010", // 浠ｇ悊鏈嶅姟鍣ㄥ煙鍚嶆垨IP鍦板潃
"changeOrigin" : true, // 鍏佽璺ㄥ煙
"pathRewrite" : {
"^/admin_interface" : "" // 閲嶅啓鍦板潃锛屽鏋滃疄闄呮帴鍙ｄ腑鏄笉甯�/dev-api锛岄渶瑕佸皢杩欎釜鍓嶇紑缃┖锛屽洜涓鸿繖涓墠缂�鍙槸涓轰簡璇嗗埆鐢紝璇嗗埆瀹屼箣鍚庡氨娌＄敤浜�
diff --git a/h5/pages/staff/task/visitorReport.vue b/h5/pages/staff/task/visitorReport.vue
index 27b121f..566fe2c 100644
--- a/h5/pages/staff/task/visitorReport.vue
+++ b/h5/pages/staff/task/visitorReport.vue
@@ -39,8 +39,8 @@
<view class="item">
<view class="label">棰勮鍏�/绂诲洯鏃堕棿</view>
<view class="value" v-if="info.starttime"
- >{{ info.starttime.slice(0, 16) }} 鑷�
- {{ info.endtime.slice(0, 16) }}</view
+ >{{ info.starttime.slice(5, 16) }} 鑷�
+ {{ info.endtime.slice(5, 16) }}</view
>
</view>
<view class="emyty"></view>
@@ -57,6 +57,10 @@
<view class="label">闅忚溅浜烘暟</view>
<view class="value">{{ info.memberNum }}浜�</view>
</view>
+ <view class="item">
+ <view class="label">璁垮鍗曚綅</view>
+ <view class="value">{{ info.companyName }}浜�</view>
+ </view>
<view class="item">
<view class="label">鏉ヨ浜嬬敱</view>
<view class="value">{{ info.reason }}</view>
@@ -87,17 +91,24 @@
"
/>
<image
+ v-if="item.status == 1"
class="status"
src="@/static/staff/liucheng_success@2x.png"
mode="widthFix"
/>
+ <image
+ v-if="item.status == 2"
+ class="status"
+ src="@/static/staff/liucheng_fail@2x.png"
+ mode="widthFix"
+ />
</view>
<view class="content">
<view class="head">
<view class="event">{{ item.title }}</view>
- <view class="time">{{ item.checkDate }}</view>
+ <view class="time" v-if="item.createDate">{{ item.createDate.slice(0, 16) }}</view>
</view>
- <view class="name_wrap">
+ <view class="name_wrap" v-if="item.type == 0">
<text
>{{ item.memberName
}}<text class="status" v-if="item.statusInfo"
@@ -109,7 +120,7 @@
item.checkInfo
}}</view>
<!-- 鎶勯�佷汉 -->
- <view v-if="item.approveType == 1" class="children">
+ <view class="children">
<view
class="child"
v-for="child in item.approveList"
diff --git a/h5/pages/staff/vehicle/index.vue b/h5/pages/staff/vehicle/index.vue
index 120a602..f38ca36 100644
--- a/h5/pages/staff/vehicle/index.vue
+++ b/h5/pages/staff/vehicle/index.vue
@@ -91,6 +91,7 @@
font-size: 34rpx;
color: #222222;
line-height: 48rpx;
+ text-align: center;
}
}
.banner {
diff --git a/h5/pages/staff/visitorReport.vue b/h5/pages/staff/visitorReport.vue
index 039eb66..302abb9 100644
--- a/h5/pages/staff/visitorReport.vue
+++ b/h5/pages/staff/visitorReport.vue
@@ -6,13 +6,14 @@
<text>*</text>
<text>琚浜哄鍚�</text>
</view>
- <view class="list_item_content" @click="showName = true">
+ <!-- <view class="list_item_content" @click="showName = true"> -->
+ <view class="list_item_content">
<text :style="{ color: form1.receptMemberName ? '#000000' : '' }">{{
form1.receptMemberName
? form1.receptMemberName + " " + form1.receptCompanyName
: "璇烽�夋嫨"
}}</text>
- <u-icon name="arrow-right" color="#CCCCCC" size="20"></u-icon>
+ <!-- <u-icon name="arrow-right" color="#CCCCCC" size="20"></u-icon> -->
</view>
</view>
<view class="list_item">
@@ -234,7 +235,7 @@
const userInfo = uni.getStorageSync('userInfo') || {}
this.$set(this.form1, 'receptMemberName', userInfo.realname)
this.$set(this.form1, 'receptMemberId', userInfo.id || '')
- this.$set(this.form1, 'receptCompanyName', userInfo.company.companyName || '')
+ this.$set(this.form1, 'receptCompanyName', userInfo.company.name || '')
// this.getvisit()
// this.getVisit1()
// this.getUserValid()
diff --git a/h5/pages/staffLogin/login.vue b/h5/pages/staffLogin/login.vue
index d3fc3bf..572006f 100644
--- a/h5/pages/staffLogin/login.vue
+++ b/h5/pages/staffLogin/login.vue
@@ -122,10 +122,10 @@
title: '瀵嗙爜涓嶈兘涓虹┖',
icon: 'none'
})
- if (!form.code) return uni.showToast({
- title: '楠岃瘉鐮佷笉鑳戒负绌�',
- icon: 'none'
- })
+ // if (!form.code) return uni.showToast({
+ // title: '楠岃瘉鐮佷笉鑳戒负绌�',
+ // icon: 'none'
+ // })
loginPost({
...form,
uuid: this.captcha.uuid,
diff --git a/h5/static/staff/liucheng_fail@2x.png b/h5/static/staff/liucheng_fail@2x.png
new file mode 100644
index 0000000..c686a8c
--- /dev/null
+++ b/h5/static/staff/liucheng_fail@2x.png
Binary files differ
--
Gitblit v1.9.3