From 78dd96d3db3ff54deda77611b5dfea33e40914a3 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 12 六月 2024 11:07:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/staff/task/index.vue | 8 +++
h5/static/empty.png | 0
h5/pages/staffLogin/login.vue | 67 +++++++++++++++++++++++++++------
h5/pages/staff/meetingCalendar.vue | 8 ++++
h5/pages/staff/vehicle/sendACar.vue | 5 ++
h5/App.vue | 4 +
h5/pages/applicationRecord/applicationRecord.vue | 5 ++
h5/pages/staff/meetingManager.vue | 4 ++
8 files changed, 87 insertions(+), 14 deletions(-)
diff --git a/h5/App.vue b/h5/App.vue
index 205586a..8b2e485 100644
--- a/h5/App.vue
+++ b/h5/App.vue
@@ -225,7 +225,9 @@
color: #999999;
font-size: 28rpx;
}
-
+.fs24{
+ font-size: 24rpx;
+}
.mr24 {
margin-right: 24rpx;
}
diff --git a/h5/pages/applicationRecord/applicationRecord.vue b/h5/pages/applicationRecord/applicationRecord.vue
index 5317783..ea490a1 100644
--- a/h5/pages/applicationRecord/applicationRecord.vue
+++ b/h5/pages/applicationRecord/applicationRecord.vue
@@ -64,6 +64,10 @@
<view class="box_list_item_nr_text">{{ item.createDate }} 鎻愪氦</view>
</view>
</view>
+ <view v-if="list.length === 0" style="text-align: center;">
+ <image src="@/static/empty.png" style="width: 320rpx;margin: 120rpx auto 0" mode="widthFix" />
+ <view class="placeholder9 fs24">鏆傛棤鏁版嵁</view>
+ </view>
</view>
</view>
</template>
@@ -108,6 +112,7 @@
},
tabsClick(val) {
this.pagination.page = 0
+ this.list = []
this.status = val
this.getList()
},
diff --git a/h5/pages/staff/meetingCalendar.vue b/h5/pages/staff/meetingCalendar.vue
index d290617..4a58c6d 100644
--- a/h5/pages/staff/meetingCalendar.vue
+++ b/h5/pages/staff/meetingCalendar.vue
@@ -93,6 +93,10 @@
<view class="value">{{ item.remark || item.meetingRemark }}</view>
</view>
</view>
+ <view v-if="myMeetingList.length === 0" style="text-align: center;">
+ <image src="@/static/empty.png" style="width: 320rpx;margin: 60rpx auto 0" mode="widthFix" />
+ <view class="placeholder9 fs24">鏆傛棤鏁版嵁</view>
+ </view>
</view>
</view>
</template>
@@ -141,6 +145,10 @@
<view class="value">{{ item.remark || item.meetingRemark }}</view>
</view>
</view>
+ <view v-if="recordList.length === 0" style="text-align: center;">
+ <image src="@/static/empty.png" style="width: 320rpx;margin: 120rpx auto 0" mode="widthFix" />
+ <view class="placeholder9 fs24">鏆傛棤鏁版嵁</view>
+ </view>
</view>
</view>
</template>
diff --git a/h5/pages/staff/meetingManager.vue b/h5/pages/staff/meetingManager.vue
index 513f25d..ac93057 100644
--- a/h5/pages/staff/meetingManager.vue
+++ b/h5/pages/staff/meetingManager.vue
@@ -74,6 +74,10 @@
<view class="value">{{ item.remark || item.meetingRemark }}</view>
</view>
</view>
+ <view v-if="myMeetingList.length === 0" style="text-align: center;">
+ <image src="@/static/empty.png" style="width: 320rpx;margin: 120rpx auto 0" mode="widthFix" />
+ <view class="placeholder9 fs24">鏆傛棤鏁版嵁</view>
+ </view>
</view>
</view>
</template>
diff --git a/h5/pages/staff/task/index.vue b/h5/pages/staff/task/index.vue
index f9d7c2f..84cd0a7 100644
--- a/h5/pages/staff/task/index.vue
+++ b/h5/pages/staff/task/index.vue
@@ -118,6 +118,10 @@
</view>
</view>
</view>
+ <view v-if="dataList.length === 0" style="text-align: center;">
+ <image src="@/static/empty.png" style="width: 320rpx;margin: 120px auto 0" mode="widthFix" />
+ <view class="placeholder9 fs24">鏆傛棤鏁版嵁</view>
+ </view>
</view>
<!-- 绛涢�� -->
<u-popup
@@ -279,7 +283,9 @@
}).then(res => {
this.dataList = [...this.dataList, ...res.data.records]
this.dataList.forEach(i => {
- i.param1 = JSON.parse(i.param1)
+ if(i.param1){
+ i.param1 = JSON.parse(i.param1)
+ }
})
console.log('dataList', this.dataList)
})
diff --git a/h5/pages/staff/vehicle/sendACar.vue b/h5/pages/staff/vehicle/sendACar.vue
index b243345..aaba5d3 100644
--- a/h5/pages/staff/vehicle/sendACar.vue
+++ b/h5/pages/staff/vehicle/sendACar.vue
@@ -47,6 +47,10 @@
</view>
</view>
</view>
+ <view v-if="dataList.length === 0" style="text-align: center;">
+ <image src="@/static/empty.png" style="width: 320rpx;margin: 120rpx auto 0" mode="widthFix" />
+ <view class="placeholder9 fs24">鏆傛棤鏁版嵁</view>
+ </view>
</view>
<!-- 閫夋嫨杞﹁締 -->
<u-picker
@@ -171,6 +175,7 @@
<style lang="scss">
.main_app {
background: #f7f7f7;
+ min-height: 100vh;
padding: 0;
}
.app_header {
diff --git a/h5/pages/staffLogin/login.vue b/h5/pages/staffLogin/login.vue
index f6252d7..5d9f5b7 100644
--- a/h5/pages/staffLogin/login.vue
+++ b/h5/pages/staffLogin/login.vue
@@ -31,25 +31,39 @@
</view>
<view class="deal_wrap">
- <checkbox @change="dealChange" />
+ <image
+ @click="changeFalg"
+ v-if="ProtocolFlag"
+ src="@/static/meeting/icon/ic_choose_sel@2x.png"
+ mode="widthFix"
+ class="checked"
+ ></image>
+ <image
+ @click="changeFalg"
+ v-if="!ProtocolFlag"
+ src="@/static/meeting/icon/ic_choose@2x.png"
+ mode="widthFix"
+ class="checked"
+ ></image>
<text>鐧诲綍鍗冲悓鎰�</text>
- <text class="deal" @click="isShowProtocol = true"
- >銆婂畨娉扮墿娴佺敤鎴峰崗璁��</text
- >
+ <text class="deal" @click="showContent">銆婂畨娉扮墿娴佺敤鎴峰崗璁��</text>
</view>
<!-- -->
<u-popup
:show="isShowProtocol"
@close="isShowProtocol = false"
+ :round="8"
mode="center"
>
- <view class="modal">111</view>
+ <view class="modal">
+ <view v-html="htmlText"></view>
+ </view>
</u-popup>
</view>
</template>
<script>
-import { loginPost, loginCaptcha, getUserInfo } from '@/api'
+import { loginPost, loginCaptcha, getUserInfo, getSystemDictData } from '@/api'
import { mapState, mapMutations } from 'vuex'
export default {
name: 'login',
@@ -61,7 +75,9 @@
password: '',
},
isShowProtocol: false,
- captcha: {}
+ ProtocolFlag: false,
+ captcha: {},
+ htmlText: ''
}
},
@@ -71,8 +87,20 @@
methods: {
...mapMutations(["setToken", "setUserInfo"]),
- dealChange(e) {
- console.log(e)
+ changeFalg() {
+ this.ProtocolFlag = !this.ProtocolFlag
+ },
+ getContent() {
+ getSystemDictData({
+ dictCode: 'SYSTEM',
+ label: 'USER_PROTOCOL'
+ }).then(res => {
+ this.htmlText = res.data.code
+ this.isShowProtocol = true
+ })
+ },
+ showContent() {
+ this.getContent()
},
initCaptcha() {
loginCaptcha().then(res => {
@@ -81,7 +109,11 @@
},
onLogin() {
- const { form } = this
+ const { form, ProtocolFlag } = this
+ if (!ProtocolFlag) return uni.showToast({
+ title: '璇峰厛闃呰骞跺悓鎰忕敤鎴峰崗璁�',
+ icon: 'none'
+ })
if (!form.username) return uni.showToast({
title: '璐﹀彿涓嶈兘涓虹┖',
icon: 'none'
@@ -142,7 +174,7 @@
font-weight: 600;
color: #333333;
margin-top: 40rpx;
- margin-bottom: 120rpx;
+ margin-bottom: 80rpx;
}
.login_list {
width: 100%;
@@ -183,7 +215,7 @@
width: 100%;
padding: 0 60rpx;
box-sizing: border-box;
- margin-top: 80rpx;
+ margin-top: 60rpx;
.for_psd {
color: $uni-color-primary;
margin-top: 40rpx;
@@ -211,12 +243,23 @@
left: 0;
text-align: center;
bottom: 108rpx;
+ display: flex;
+ justify-content: center;
+ align-items: center;
.deal {
color: $uni-color-primary;
+ }
+ .checked{
+ width: 48rpx;
+ margin-right: 12rpx;
}
}
}
.modal {
+ width: 690rpx;
+ min-height: 920rpx;
+ max-height: 720px;
+ border-radius: 24rpx;
padding: 32rpx;
}
</style>
diff --git a/h5/static/empty.png b/h5/static/empty.png
new file mode 100644
index 0000000..953c40f
--- /dev/null
+++ b/h5/static/empty.png
Binary files differ
--
Gitblit v1.9.3