From 79b6dd46cdc922a3e29eab4992a9fe1ed941553d Mon Sep 17 00:00:00 2001
From: yangsanTT <812952667@qq.com>
Date: Fri, 13 Aug 2021 22:51:50 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=B0=83=E6=95=B4=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages.json | 24 +++---
pages/login/login.vue | 61 ++------------
pages/order/confirmation.vue | 40 +--------
pages/tabBar/user/user.vue | 68 ++++++++--------
pages/user/order_details/order_details.vue | 33 --------
pages/user/order_list/order_list.vue | 90 +++++++++++++--------
static/css/login.scss | 36 ++++++---
static/img/adresw.png | Bin 0 -> 7568 bytes
static/img/jingbi.png | Bin 0 -> 6812 bytes
static/img/logo2.jpg | Bin 0 -> 3765 bytes
static/img/order1.png | Bin 0 -> 5497 bytes
static/img/order2.png | Bin 0 -> 7000 bytes
static/img/order3.png | Bin 0 -> 6781 bytes
static/img/order4.png | Bin 0 -> 3674 bytes
static/img/order5.png | Bin 0 -> 3016 bytes
uni.scss | 12 ++-
16 files changed, 142 insertions(+), 222 deletions(-)
create mode 100644 static/img/adresw.png
create mode 100644 static/img/jingbi.png
create mode 100644 static/img/logo2.jpg
create mode 100644 static/img/order1.png
create mode 100644 static/img/order2.png
create mode 100644 static/img/order3.png
create mode 100644 static/img/order4.png
create mode 100644 static/img/order5.png
diff --git a/pages.json b/pages.json
index 5b7653a..57f05d8 100644
--- a/pages.json
+++ b/pages.json
@@ -19,6 +19,17 @@
}]
}
}
+ },{
+ "path": "pages/login/login",
+ "style": {
+ "navigationBarBackgroundColor": "#0083f5",
+ "backgroundColorTop": "#0083f5",
+ "navigationBarTextStyle": "white",
+ "app-plus": {
+ "bounce": "none", //关闭窗口回弹效果
+ "softinputNavBar": "none"
+ }
+ }
}, {
"path": "pages/goods/refuel-succes/refuel-succes",
"style": {
@@ -175,18 +186,7 @@
}
}
},
- {
- "path": "pages/login/login",
- "style": {
- "navigationBarBackgroundColor": "#0083f5",
- "backgroundColorTop": "#0083f5",
- "navigationBarTextStyle": "white",
- "app-plus": {
- "bounce": "none", //关闭窗口回弹效果
- "softinputNavBar": "none"
- }
- }
- },
+
{
"path": "pages/login/register",
"style": {
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 0b1e925..65f7e8b 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -2,37 +2,22 @@
-
+
-
+
-
+
登 录
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -159,15 +144,6 @@
},
doLogin() {
uni.hideKeyboard();
- //验证手机号码
- // if (!(/^1(3|4|5|6|7|8|9)\d{9}$/.test(this.phoneNumber))) {
- // uni.showToast({
- // title: '请填写正确手机号码',
- // icon: "none"
- // });
- // return false;
- // }
-
if (this.phoneNumber == '') {
uni.showToast({
title: '请填写账号',
@@ -218,31 +194,6 @@
})
}
})
- //模板示例比对本地储存的用户信息，实际使用中请替换为上传服务器比对。
- // setTimeout(()=>{
- // let md5PW = md5(this.passwd)
- // uni.getStorage({
- // key: 'UserList',
- // success: (res)=>{
- // for(let i in res.data){
- // let row = res.data[i];
- // if(row.username==this.phoneNumber){
- // uni.hideLoading()
- // //比对密码
- // if(md5PW == res.data[i].passwd){
- // uni.showToast({title: '登录成功',icon:"success"});
- // }else{
- // uni.showToast({title: '账号或密码不正确',icon:"none"});
- // }
- // }
- // }
- // },
- // fail:function(e){
- // uni.hideLoading()
- // uni.showToast({title: '手机号码未注册',icon:"none"});
- // }
- // });
- // },1000)
}
}
}
@@ -276,7 +227,7 @@
display: flex;
justify-content: center;
align-items: center;
- color: rgba($color: #ffffff, $alpha: 0.8);
+ color: #333333;
font-size: 28upx;
}
diff --git a/pages/order/confirmation.vue b/pages/order/confirmation.vue
index afaae95..913f79a 100644
--- a/pages/order/confirmation.vue
+++ b/pages/order/confirmation.vue
@@ -1,25 +1,6 @@
-
-
+
卡券信息
@@ -51,25 +32,6 @@
-
-
diff --git a/pages/tabBar/user/user.vue b/pages/tabBar/user/user.vue
index 750e4f1..609fa52 100644
--- a/pages/tabBar/user/user.vue
+++ b/pages/tabBar/user/user.vue
@@ -22,28 +22,20 @@
-
-