From e333d366495e2406618c5b0daf3fe53a759903a6 Mon Sep 17 00:00:00 2001
From: 付延余 <f-yanyu@outlook.com>
Date: 星期二, 23 八月 2022 11:20:09 +0800
Subject: [PATCH] 日计划
---
pages/login/login.vue | 4 ++--
pages/jihua/jihua.vue | 46 +++++++++++++++++++++++++++++++++-------------
2 files changed, 35 insertions(+), 15 deletions(-)
diff --git a/pages/jihua/jihua.vue b/pages/jihua/jihua.vue
index e3c5bf5..6ae6f05 100644
--- a/pages/jihua/jihua.vue
+++ b/pages/jihua/jihua.vue
@@ -11,6 +11,13 @@
</view>
<view class="main-inside">
<view v-if="isTomJihua == '鍏ㄩ儴'">
+ <u-empty
+ v-if="fyData.length == 0"
+ mode="data"
+ icon="http://cdn.uviewui.com/uview/empty/data.png"
+ class="empty-container"
+ >
+ </u-empty>
<view class="main-block-box" v-for="(item, index) in fyData" :key="item.id">
<view class="jihua-main-line">
<!-- <view class="name">瀹㈡埛鍚嶇О锛歿{item.customerName || ''}}</view> -->
@@ -35,6 +42,13 @@
<u-button class="xiugai-btn" type="primary" text="鎻愪氦" @click="dataFormSubmit"></u-button>
</view>
<view v-if="isTomJihua == '宸茶缃殑璁″垝'">
+ <u-empty
+ v-if="fyData.length == 0"
+ mode="data"
+ icon="http://cdn.uviewui.com/uview/empty/data.png"
+ class="empty-container"
+ >
+ </u-empty>
<view class="main-block-box" v-for="(item, index) in fyData" :key="item.id">
<view class="jihua-main-line">
<view class="name">瀹㈡埛鍚嶇О锛歿{ item.customerName || '' }}</view>
@@ -51,20 +65,18 @@
<view>璁″垝杞︽暟锛�</view>
<u--input placeholder="璇疯緭鍏ュ彂杩愯溅鏁�" border="surround" v-model="item.numPlan" @change="inputTotalChange(item)"></u--input>
</view>
- <view>瀹為檯鍙戣溅鏁帮細{{ item.order.numReal || '' }}</view>
+ <view>瀹為檯鍙戣溅鏁帮細{{ item.order.numReal == null ? '鏆傛棤' : item.order.numReal }}</view>
</view>
</view>
</view>
<u-button class="xiugai-btn" type="primary" text="淇敼" @click="getOrderCarNum"></u-button>
</view>
- <!-- <u-empty
- v-if="fyData.length == 0"
- mode="data"
- icon=""
- >
- </u-empty> -->
+
</view>
</view>
+ <view class="back-top-container">
+ <u-back-top :scroll-top="scrollTop" icon="arrow-up" mode='square'></u-back-top>
+ </view>
<!-- 鑿滃崟鏍� -->
<popup-menu @menuShow="menushow" ref="menuRef"></popup-menu>
</view>
@@ -95,7 +107,8 @@
},
isTomJihua: '鍏ㄩ儴',
editRow: '', //淇敼琛岀殑琛�
- menuShow: false
+ menuShow: false,
+ scrollTop: 0 // 杩斿洖椤堕儴鎸夐挳缁戝畾
};
},
onShow() {
@@ -104,6 +117,9 @@
}
this.init();
},
+ onPageScroll(e) {
+ this.scrollTop = e.scrollTop;
+ },
// 鐐瑰嚮瀵艰埅鏍忚彍鍗曞悗
onNavigationBarButtonTap(e) {
// console.log(e);
@@ -282,6 +298,7 @@
.u-input {
height: vww(16);
width: vww(100);
+ z-index: 1;
}
.u-button {
position: fixed !important;
@@ -307,6 +324,10 @@
font-size: vww(12) !important;
line-height: vww(12) !important;
}
+ .u-empty{
+ width:100%;
+ height:vww(300);
+ }
}
.qiehuan-box {
@@ -315,8 +336,8 @@
left: 0;
right: 0;
width: 100%;
- height:vww(44);
- // z-index: 1;
+ height: vww(44);
+ z-index: 10;
background-color: #fff;
}
@@ -341,9 +362,8 @@
display: flex;
flex-direction: column;
width: 100%;
- padding: vww(0) vww(10) vww(70) vww(10);
+ padding: vww(44) vww(10) vww(70) vww(10);
box-sizing: border-box;
- margin-top: vww(44);
.main-inside {
width: 100%;
height: calc(100% - vww(44));
@@ -356,7 +376,7 @@
left: 0;
right: 0;
width: 100%;
- // z-index: 1;
+ z-index: 10;
background-color: #fff;
}
diff --git a/pages/login/login.vue b/pages/login/login.vue
index f441335..4956eb1 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -4,11 +4,11 @@
<view class="inputBox">
<view class="phone">
<image src="@/static/login/phone.png" mode="鍔犺浇閿欒"></image>
- <input type="text" placeholder="璇疯緭鍏ユ墜鏈哄彿" v-model="formData.username" />
+ <input type="text" placeholder="璇疯緭鍏ョ敤鎴峰悕/鎵嬫満鍙�" v-model="formData.username" />
</view>
<view class="password">
<image src="@/static/login/lock.png" mode="鍔犺浇閿欒" />
- <input type="password" placeholder="璇疯緭鍏ュ瘑鐮�" v-model="formData.password" />
+ <input type="password" placeholder="璇疯緭鍏ヨ处鍙峰瘑鐮�" v-model="formData.password" />
</view>
<view class="loginBtn"><button type="default" @click="loginSubmit">鐧诲綍</button></view>
</view>
--
Gitblit v1.9.1