From e2b96c0c12b8bb945985bb82edb5c8a4f7afcf7a Mon Sep 17 00:00:00 2001
From: sunshine <1467939124@qq.com>
Date: Fri, 19 Jul 2024 16:01:21 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=A1=B5=E8=83=8C?=
=?UTF-8?q?=E6=99=AF=EF=BC=8C=E5=AF=BC=E8=88=AA=E6=A0=8F=E5=9B=BE=E6=A0=87?=
=?UTF-8?q?=E6=9B=B4=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/config.js | 2 +-
src/pages.json | 10 +++++-----
src/pages/login.vue | 5 +++++
src/static/images/login/background.svg | 1 +
src/static/images/tabbar/home.png | Bin 3265 -> 501 bytes
src/static/images/tabbar/home_.png | Bin 3229 -> 526 bytes
src/static/images/tabbar/material.png | Bin 0 -> 493 bytes
src/static/images/tabbar/material_.png | Bin 0 -> 506 bytes
src/static/images/tabbar/mine.png | Bin 4235 -> 712 bytes
src/static/images/tabbar/mine_.png | Bin 4219 -> 688 bytes
src/static/images/tabbar/work.png | Bin 4108 -> 791 bytes
src/static/images/tabbar/work_.png | Bin 5008 -> 767 bytes
12 files changed, 12 insertions(+), 6 deletions(-)
create mode 100644 src/static/images/login/background.svg
create mode 100644 src/static/images/tabbar/material.png
create mode 100644 src/static/images/tabbar/material_.png
diff --git a/src/config.js b/src/config.js
index 01f1100..e3d4cf7 100644
--- a/src/config.js
+++ b/src/config.js
@@ -1,7 +1,7 @@
// 应用全局配置
const config = {
// baseUrl: 'http://47.106.185.127:48080',127.0.0.1
- baseUrl: 'http://127.0.0.1:48080',
+ baseUrl: 'http://47.106.185.127:48080',
// 应用信息
appInfo: {
// 应用名称
diff --git a/src/pages.json b/src/pages.json
index 6f1efcb..1115e2c 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -311,16 +311,16 @@
},
{
"pagePath": "pages/work",
- "iconPath": "static/images/tabbar/work.png",
- "selectedIconPath": "static/images/tabbar/work_.png",
+ "iconPath": "static/images/tabbar/material.png",
+ "selectedIconPath": "static/images/tabbar/material_.png",
"text": "投料"
},
- {
+ /*{
"pagePath": "pages/template",
"iconPath": "static/images/tabbar/work.png",
"selectedIconPath": "static/images/tabbar/work_.png",
"text": "模板"
- },
+ },*/
{
"pagePath": "pages/mine",
"iconPath": "static/images/tabbar/mine.png",
@@ -332,6 +332,6 @@
"globalStyle": {
"navigationBarTextStyle": "black",
"navigationBarTitleText": "BESURE",
- "navigationBarBackgroundColor": "#FFFFFF"
+ "navigationBarBackgroundColor": "#ffffff"
}
}
diff --git a/src/pages/login.vue b/src/pages/login.vue
index 33675b3..4470ec3 100644
--- a/src/pages/login.vue
+++ b/src/pages/login.vue
@@ -112,6 +112,11 @@ page {
.normal-login-container {
width: 100%;
+ min-height: 100vh;
+ overflow: hidden;
+ background-image: url(@/static/images/login/background.svg);
+ background-repeat: no-repeat;
+ background-size: 100% 100%;
.logo-content {
width: 100%;
diff --git a/src/static/images/login/background.svg b/src/static/images/login/background.svg
new file mode 100644
index 0000000..d19ca49
--- /dev/null
+++ b/src/static/images/login/background.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/static/images/tabbar/home.png b/src/static/images/tabbar/home.png
index 50acdfdde68a0b48c62409c2706e8da8eee36910..4484f6e9ba38437cc06c746ec4cd5df373e8df8e 100644
GIT binary patch
literal 501
zcmVPx#1am@3R0s$N2z&@+hyVZqpGibPR7i>4l`&4kKoCX$Osup?ELln!Zs0uuZ~|zl
z2o(hd&?7;~1*nr7a0Ix)vN-`&gybSgN3ofqz%iQ;#{molzuUim=k0i88~7v9SHjM@
z3jo&uAR?E>m|^W8Yi*yI2cah-C)>id0$FQQX1440M8p_lo~ml_7LXn@KP=sjXec5(
z%)HOc18Z$sRcB*I0i+lDBGNI&Oo3u<=OVIijCn4rRoYP*B-dVXQ=(k}J!XEe)~?IG
z=Sm>$d?w`wi5^uo1<(%cr@XW2YJP1;8#*bZs(ULC07zHoSqd7BMgstq!`+}XuTc(i
z&fTbL{|68NfU5SLb2p(!05F+M+T-!~)_Z^YQ%I<0vw7F;cCR{}&XfVbdp{(iS|NGe
zGw=O9@bTyl>V^P7qtO8JS0P%MaU5edo56d(6rRuLFRJ<)dQlYhsvuDmq19@AtV4Pn
z$Lr1EGyQkdiWg>0pA<$SCk|P{l6J4K%f2}
rb%}_c3lI^VER32p1#tNbb<6bzX~CJ0T^)P600000NkvXXu0mjf9S6}R
literal 3265
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
diff --git a/src/static/images/tabbar/home_.png b/src/static/images/tabbar/home_.png
index a408f71b28693f358228ff050e2d04617ba1e007..59e923af9aff02797e7e1e9d60e7c1f355c0245c 100644
GIT binary patch
literal 526
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
diff --git a/src/static/images/tabbar/material.png b/src/static/images/tabbar/material.png
new file mode 100644
index 0000000000000000000000000000000000000000..b1edbf5baa18adc5bd0f1c9be1c9ee858515f080
GIT binary patch
literal 493
zcmVP000#T1^@s6vnxdy00001b5ch_0Itp)
z=>Px#1am@3R0s$N2z&@+hyVZqmq|oHR7i=flud5pKoEt$0$bP?1PRHr2F@@S;1J;i
zneD7|h^(@mxkE0J1q(L48VRvMM!}YG4DwHB5sk<4;P7L=T~|HT>#FM4;(6XL;DL7V
z+jZR^)u4EumjFgfBB|@TW;NJpQGmKy27rh#91byzf1ET;@qPcx+@0^e(WQpP!7j7B3I$6>qOGMP+RtyaWwT;ywgQoZ#lVblEl
z3w__maU7=8DeLu`FbvDQ*VY!_>-DfKiy#Q9wEISXmt|S>`+We8$Kxr1C#BR&BQuH!
zgTVmPGz&B4c^+5IXaFeS}!e;8^8(R>4&>00000NkvXXu0mjf)70U%
literal 0
HcmV?d00001
diff --git a/src/static/images/tabbar/material_.png b/src/static/images/tabbar/material_.png
new file mode 100644
index 0000000000000000000000000000000000000000..cf7be2b9528a4ec87dd3d2f1dba510171b6d8f49
GIT binary patch
literal 506
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
Ar~m)}
diff --git a/src/static/images/tabbar/work.png b/src/static/images/tabbar/work.png
index 21e130d8e788d2ad97508c62ae7d65d618481b47..7a48a9e45bcde7f6c51ab36d51721ea2e235a2e6 100644
GIT binary patch
literal 791
zcmV+y1L*vTP)P000*V1^@s6{^R5m00001b5ch_0Itp)
z=>Px#1am@3R0s$N2z&@+hyVZr!AV3xR7i=Xl`&}BKoo}mclO|vW>AP!lchEUVo0$l
z1Uke+wKYQ^(4i@0?CxafP`Y+&pvlmw6uNb20)Y-Gv|tx9bVx~V2`Mdj=whE72|9H>8yB06dEl0$4Xqb2|(mq6&Zl05J0bfTbvq2shg8_Im)4s{ybj
zr7TAQ0Dy=}0QQwqw}+e@9UbL_5HA62nx^^d`1rU)MEd}S#9c=-GcykXtVAWF9Ensa
z^#oU2RFzWBrPFDSnY`zy)oR^}OGY^o%shMjodr@5U3smfu-yE^N4xA4PGm60IUO7RYXL40PX--j)P51Oms9&d!Xz3&u*V>
z+ueE2nfX2q4w6!?b~>G==Xurn`T1!8pIp~1`My8O*n#6XOO|EzPI;rzSYzft*=+X5
z5G1skIRJYA3d{`Gbulie8zM^WI8L`j3jjbw&@>I1OlB0MG&MD~U#V1v4)YM??Ck9E
z_0`f>qW=TxgD9oSmzS42h`Cy>LAwBU#{u;qwOTDhL`h|QaB*?5<~YtOfSpkwP18OP
zLGt;$&&=y12A(qWQa+#eEz4>SU8Px*cVEvvTfVHl~Sc7ZKYC4ODR7}DgPcG9u@}k{{VfS
VU)J>h1oHp@002ovPDHLkV1fnzQOf`T
literal 4108
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
G{r><2moMf3
diff --git a/src/static/images/tabbar/work_.png b/src/static/images/tabbar/work_.png
index 80b979c5a3356c09cf37f1ca742c0da982293448..1ffdc3b28fd90e6abdc731c70932419d7f3e9b8e 100644
GIT binary patch
literal 767
zcmVP000*V1^@s6{^R5m00001b5ch_0Itp)
z=>Px#1am@3R0s$N2z&@+hyVZrsYygZR7i=X)jddCQ53-O|9LSIiV*~%*_uJnp%6uA
zhh}JoLTwR*4pk5|)Tu2*hYm#xfySwVT96K&UKo5c+rCWtqepXhfi})Ay8SQ*f
zI5<9J_)$pm^*I1i{otL~*8)>^iNN&HtSr|7NuaMhl+GVAWCs~FqVfjCb~nIM=e$N7
z0Dxde7h5Yy?XXnhiK^f2W)_o$+%x&(YN1RYA|o9$N+i(MDQV`#ALfc6#&F{c%i~lvydT*zcN#X8UiQ>$0bse
z0hv)qTm;3F>M@XWq?u4*lc*HeGTIB=z92nlbP+L>))1ik)mObyQc?oGCi2G(l!aCV
zfswaA_+*+*0RUHx+?+f`8-7GfWU{ytyHGM~hO>yxhJ~yFa5N_~twMWQsDiR)k;n0`B-zUbjEZMVY)ndpu(mLE}Jmygav$*#`?Mba8SNi#u6D_6lEI77fK9B{i2R}
z9aZzRP2+dyRyXewI|TQ#&Q&R-a|MQoo}cp7Jsmeo{0a}sXA4q^wT$+f$|lfPGEZMk
zt578jy9J5e(-x(C0lEyB9Dx1?{Ui|dy4fOXy&x?}BBS?2*sebV{{z(^s~L@mvJUoF
zi_3tC0X9_GXazb$;z{*1(Z*@x597HaqYCQ{p*G%IkZ?#&&f3>L_Vb4fg+p>eREoI*
zV~rrHerPqXYa$@a4p7$oOQ`18+5l1|OOcQ*;sE8%BBAg#u{N*`Q~`2P*{_T_o|Dy#
xMo=CXA^f0U(oT7&n6`DgSyKp7;8ryN@DKi$DFs1>f2IHc002ovPDHLkV1fX)OT7R9
literal 5008
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
a-+ox4z)NM}p*%Hd0~qR>BFnTL9{&eNattW|
From 6e6fd66eb07bf13807cbc5818c8d69e3833cdbe2 Mon Sep 17 00:00:00 2001
From: sunshine <1467939124@qq.com>
Date: Fri, 19 Jul 2024 18:07:30 +0800
Subject: [PATCH 2/2] =?UTF-8?q?navbar=E6=B7=BB=E5=8A=A0=E8=83=8C=E6=99=AF?=
=?UTF-8?q?=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages.json | 18 +++++++-------
src/pages/index.vue | 25 ++++++++++++++++---
src/pages/login.vue | 22 +++++++++++++++--
src/pages/mine.vue | 32 +++++++++++++++++++++---
src/pages/report.vue | 19 ++++++++++++++
src/pages/work.vue | 20 ++++++++++++++-
src/pages_mine/pages/help/index.vue | 32 +++++++++++++++++-------
src/pages_mine/pages/info/edit.vue | 20 ++++++++++++++-
src/pages_mine/pages/info/index.vue | 23 +++++++++++++++--
src/pages_mine/pages/pwd/index.vue | 34 ++++++++++++++++++++------
src/static/images/icon/background.png | Bin 0 -> 21119 bytes
11 files changed, 205 insertions(+), 40 deletions(-)
create mode 100644 src/static/images/icon/background.png
diff --git a/src/pages.json b/src/pages.json
index 1115e2c..04bc267 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -15,20 +15,20 @@
{
"path": "pages/index",
"style": {
- "navigationBarTitleText": "生产计划",
+ "navigationStyle": "custom",
"enablePullDownRefresh": true
}
},
{
"path": "pages/login",
"style": {
- "navigationBarTitleText": "登录"
+ "navigationStyle": "custom"
}
},
{
"path": "pages/work",
"style": {
- "navigationBarTitleText": "近三天投料记录",
+ "navigationStyle": "custom",
"enablePullDownRefresh": true
}
},
@@ -36,7 +36,7 @@
{
"path": "pages/mine",
"style": {
- "navigationBarTitleText": "个人中心"
+ "navigationStyle": "custom"
}
},
{
@@ -60,7 +60,7 @@
{
"path": "pages/report",
"style": {
- "navigationBarTitleText": "生产报工",
+ "navigationStyle": "custom",
"enablePullDownRefresh": true
}
}
@@ -119,19 +119,19 @@
{
"path": "info/index",
"style": {
- "navigationBarTitleText": "个人信息"
+ "navigationStyle": "custom"
}
},
{
"path": "info/edit",
"style": {
- "navigationBarTitleText": "编辑资料"
+ "navigationStyle": "custom"
}
},
{
"path": "pwd/index",
"style": {
- "navigationBarTitleText": "修改密码"
+ "navigationStyle": "custom"
}
},
{
@@ -143,7 +143,7 @@
{
"path": "help/index",
"style": {
- "navigationBarTitleText": "常见问题"
+ "navigationStyle": "custom"
}
},
{
diff --git a/src/pages/index.vue b/src/pages/index.vue
index ab87aaa..fd47b28 100644
--- a/src/pages/index.vue
+++ b/src/pages/index.vue
@@ -1,7 +1,19 @@
-
+
+
+
+
-
@@ -219,8 +231,13 @@ function planProgress(plan){
}
-
diff --git a/src/pages_mine/pages/help/index.vue b/src/pages_mine/pages/help/index.vue
index 91c0584..4544c77 100644
--- a/src/pages_mine/pages/help/index.vue
+++ b/src/pages_mine/pages/help/index.vue
@@ -1,6 +1,19 @@
-
-
+
+
+
+
+
{{ item.title }}
@@ -62,21 +75,22 @@
page {
background-color: #f8f8f8;
}
-
- .help-container {
- margin-bottom: 100rpx;
- padding: 30rpx;
+ .sticky {
+ background: linear-gradient(180deg, #d4e9ff 0%, #f3f9ff 100%);
+ backdrop-filter: blur(27.18px);
+ box-shadow: 0 1px 1px 0 rgba(0, 72, 145, 0.1),
+ 0 0.5px 0 0 rgba(0, 0, 0, 0.1);
}
.list-title {
- margin-bottom: 30rpx;
+ padding: 30rpx;
}
.childList {
background: #ffffff;
- box-shadow: 0px 0px 10rpx rgba(193, 193, 193, 0.2);
+ box-shadow: 0 0 10rpx rgba(193, 193, 193, 0.2);
border-radius: 16rpx;
- margin-top: 10rpx;
+ margin-top: 30rpx;
}
.line {
diff --git a/src/pages_mine/pages/info/edit.vue b/src/pages_mine/pages/info/edit.vue
index 27e6eed..504b3ef 100644
--- a/src/pages_mine/pages/info/edit.vue
+++ b/src/pages_mine/pages/info/edit.vue
@@ -1,5 +1,18 @@
+
+
+
@@ -100,7 +113,12 @@ export default {
page {
background-color: #ffffff;
}
-
+.sticky {
+ background: linear-gradient(180deg, #d4e9ff 0%, #f3f9ff 100%);
+ backdrop-filter: blur(27.18px);
+ box-shadow: 0 1px 1px 0 rgba(0, 72, 145, 0.1),
+ 0 0.5px 0 0 rgba(0, 0, 0, 0.1);
+}
.example {
padding: 15px;
background-color: #fff;
diff --git a/src/pages_mine/pages/info/index.vue b/src/pages_mine/pages/info/index.vue
index 2e8f6e0..2432fd2 100644
--- a/src/pages_mine/pages/info/index.vue
+++ b/src/pages_mine/pages/info/index.vue
@@ -1,5 +1,18 @@
-
+
+
+
+
@@ -48,8 +61,14 @@ function register(){
-
diff --git a/src/pages_mine/pages/pwd/index.vue b/src/pages_mine/pages/pwd/index.vue
index 37d3b63..6ef96e0 100644
--- a/src/pages_mine/pages/pwd/index.vue
+++ b/src/pages_mine/pages/pwd/index.vue
@@ -1,6 +1,19 @@
-
-
+
+
+
+
+
@@ -79,13 +92,18 @@
}
-
diff --git a/src/static/images/icon/background.png b/src/static/images/icon/background.png
new file mode 100644
index 0000000000000000000000000000000000000000..f160d2f70e0f67074432acdee8f31d04dd7fdb57
GIT binary patch
literal 21119
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