From 0625228b5cb4e79278f25c22ddb91ec1fc839e4d Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Wed, 20 Mar 2024 17:37:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E5=91=98=E4=B8=AD=E5=BF=83=E6=88=B7?=
=?UTF-8?q?=E9=A1=B5=E9=9D=A2,=E7=99=BB=E5=BD=95=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
miniprogram/app.json | 3 +-
miniprogram/pages/formid/formid.wxml | 2 +-
miniprogram/pages/formid/formid.wxss | 7 +-
miniprogram/pages/login/login.js | 94 +++++-
miniprogram/pages/login/login.wxml | 15 +-
miniprogram/pages/login/login.wxss | 318 +++++++++---------
miniprogram/project.private.config.json | 9 +-
.../centralHousehold/centralHousehold.js | 6 +-
.../centralHousehold/centralHousehold.json | 12 +-
.../centralHousehold/centralHousehold.wxml | 21 +-
.../centralHousehold/centralHousehold.wxss | 58 +++-
.../centralHousehold/pages/images/bg.png | Bin 0 -> 39334 bytes
miniprogram/utils/api.js | 8 +-
13 files changed, 343 insertions(+), 210 deletions(-)
create mode 100644 miniprogram/subpages/centralHousehold/pages/images/bg.png
diff --git a/miniprogram/app.json b/miniprogram/app.json
index a6c7ebe..f4a4c84 100644
--- a/miniprogram/app.json
+++ b/miniprogram/app.json
@@ -275,7 +275,8 @@
"backgroundColor": "#FFFFFF",
"borderStyle": "white",
"custom": true,
- "list": [{
+ "list": [
+ {
"pagePath": "pages/home/home",
"text": "首页",
"iconPath": "images/main/icon01.png",
diff --git a/miniprogram/pages/formid/formid.wxml b/miniprogram/pages/formid/formid.wxml
index d3db513..9a3d040 100644
--- a/miniprogram/pages/formid/formid.wxml
+++ b/miniprogram/pages/formid/formid.wxml
@@ -9,7 +9,7 @@
-
+
*
身份证号
diff --git a/miniprogram/pages/formid/formid.wxss b/miniprogram/pages/formid/formid.wxss
index 7ddd7ce..118fac5 100644
--- a/miniprogram/pages/formid/formid.wxss
+++ b/miniprogram/pages/formid/formid.wxss
@@ -4,9 +4,9 @@
overflow-y: scroll ;
overflow-x: hidden;
}
-.gray{
+/* .gray{
background-color: #fafafa;
-}
+} */
.gray-font{
color:#808080 ;
}
@@ -19,6 +19,9 @@
margin: 20rpx auto;
}
+ .basic-info:nth-child(eveb){
+ background-color: #fafafa !important;
+ }
.basic-info .list-item {
width: 100%;
height: 100rpx;
diff --git a/miniprogram/pages/login/login.js b/miniprogram/pages/login/login.js
index 60c87a0..308130c 100644
--- a/miniprogram/pages/login/login.js
+++ b/miniprogram/pages/login/login.js
@@ -1,10 +1,72 @@
-var index_1 = require("../../utils/index.js");
+// pages/login/login.js
+var api = require("../../utils/api.js");
+
Page({
+
+ /**
+ * 页面的初始数据
+ */
data: {
- userName: '',
- password: ''
+ userName: '13000000001',
+ password: '123456'
},
- handleLogin: function () {
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad(options) {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload() {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh() {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom() {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage() {
+
+ },
+ handleLogin () {
var that = this;
if (that.data.userName == '') {
wx.showToast({
@@ -34,17 +96,18 @@ Page({
password: that.data.password,
wxCode: code
};
- index_1.login(params).then(function (res) {
+ api.userLogin(params).then( (res) =>{
console.log(res);
- if (res.code == '0') {
+ if (res.code == 0) {
wx.setStorageSync('token', res.data.token);
wx.setStorageSync('userTagKey', res.data.userTagKey);
wx.setStorageSync('deptDataScopeList', JSON.stringify(res.data.deptDataScopeList));
wx.redirectTo({
- url: '/pages/index/index'
+ url: '/pages/home/home'
});
}
else {
+ console.log(222);
wx.showToast({
title: res.msg,
icon: 'none',
@@ -57,19 +120,22 @@ Page({
}
});
},
- getUserName: function (e) {
+ getUserName(e) {
this.setData({
userName: e.detail.value
});
},
- getPassword: function (e) {
+ getPassword (e) {
this.setData({
password: e.detail.value
});
},
- onShow: function () {
- },
- onLoad: function () {
+ toRegister(){
+ // wx.navigateTo({
+ // url: `/subpages/home/pages/newsDetail/newsDetail`
+ // })
+ wx.navigateTo({
+ url: `/pages/formid/formid`
+ })
}
-});
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9naW4uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJsb2dpbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLHlDQUF1QztBQUN2QyxJQUFJLENBQUM7SUFDSCxJQUFJLEVBQUU7UUFDSixRQUFRLEVBQUUsRUFBRTtRQUNaLFFBQVEsRUFBRSxFQUFFO0tBQ2I7SUFFRCxXQUFXLEVBQUU7UUFDWCxJQUFJLElBQUksR0FBRyxJQUFJLENBQUE7UUFDZixJQUFJLElBQUksQ0FBQyxJQUFJLENBQUMsUUFBUSxJQUFJLEVBQUUsRUFBRTtZQUM1QixFQUFFLENBQUMsU0FBUyxDQUFDO2dCQUNYLEtBQUssRUFBRSxRQUFRO2dCQUNmLElBQUksRUFBRSxNQUFNO2dCQUNaLFFBQVEsRUFBRSxJQUFJO2FBQ2YsQ0FBQyxDQUFBO1lBQ0YsT0FBTyxLQUFLLENBQUE7U0FDYjtRQUNELElBQUksSUFBSSxDQUFDLElBQUksQ0FBQyxRQUFRLElBQUksRUFBRSxFQUFFO1lBQzVCLEVBQUUsQ0FBQyxTQUFTLENBQUM7Z0JBQ1gsS0FBSyxFQUFFLE9BQU87Z0JBQ2QsSUFBSSxFQUFFLE1BQU07Z0JBQ1osUUFBUSxFQUFFLElBQUk7YUFDZixDQUFDLENBQUE7WUFDRixPQUFPLEtBQUssQ0FBQTtTQUNiO1FBRUQsRUFBRSxDQUFDLEtBQUssQ0FBQztZQUNQLE9BQU8sRUFBUCxVQUFRLEdBQUc7Z0JBQ1QsRUFBRSxDQUFDLFdBQVcsQ0FBQztvQkFDYixLQUFLLEVBQUUsU0FBUztpQkFDakIsQ0FBQyxDQUFBO2dCQUNGLElBQUksSUFBSSxHQUFHLEdBQUcsQ0FBQyxJQUFJLENBQUE7Z0JBQ25CLElBQUksSUFBSSxFQUFFO29CQUNSLElBQUksTUFBTSxHQUFHO3dCQUNYLFFBQVEsRUFBRSxJQUFJLENBQUMsSUFBSSxDQUFDLFFBQVE7d0JBQzVCLFFBQVEsRUFBRSxJQUFJLENBQUMsSUFBSSxDQUFDLFFBQVE7d0JBQzVCLE1BQU0sRUFBRSxJQUFJO3FCQUNiLENBQUE7b0JBQ0QsYUFBSyxDQUFDLE1BQU0sQ0FBQyxDQUFDLElBQUksQ0FBQyxVQUFDLEdBQVE7d0JBQzFCLE9BQU8sQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUE7d0JBQ2hCLElBQUksR0FBRyxDQUFDLElBQUksSUFBSSxHQUFHLEVBQUU7NEJBQ25CLEVBQUUsQ0FBQyxjQUFjLENBQUMsT0FBTyxFQUFFLEdBQUcsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUE7NEJBQzFDLEVBQUUsQ0FBQyxjQUFjLENBQUMsWUFBWSxFQUFFLEdBQUcsQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLENBQUE7NEJBQ3BELEVBQUUsQ0FBQyxjQUFjLENBQUMsbUJBQW1CLEVBQUUsSUFBSSxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLGlCQUFpQixDQUFDLENBQUMsQ0FBQTs0QkFFbEYsRUFBRSxDQUFDLFVBQVUsQ0FBQztnQ0FDWixHQUFHLEVBQUUsb0JBQW9COzZCQUMxQixDQUFDLENBQUE7eUJBQ0g7NkJBQU07NEJBQ0wsRUFBRSxDQUFDLFNBQVMsQ0FBQztnQ0FDWCxLQUFLLEVBQUUsR0FBRyxDQUFDLEdBQUc7Z0NBQ2QsSUFBSSxFQUFFLE1BQU07Z0NBQ1osUUFBUSxFQUFFLElBQUk7NkJBQ2YsQ0FBQyxDQUFBO3lCQUNIO3dCQUNELEVBQUUsQ0FBQyxXQUFXLEVBQUUsQ0FBQTtvQkFDbEIsQ0FBQyxDQUFDLENBQUE7aUJBQ0g7WUFDSCxDQUFDO1NBQ0YsQ0FBQyxDQUFBO1FBQ0YsT0FBTyxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUMsQ0FBQTtJQUN2QixDQUFDO0lBQ0QsV0FBVyxFQUFYLFVBQVksQ0FBNkI7UUFDdkMsSUFBSSxDQUFDLE9BQU8sQ0FBQztZQUNYLFFBQVEsRUFBRSxDQUFDLENBQUMsTUFBTSxDQUFDLEtBQUs7U0FDekIsQ0FBQyxDQUFBO1FBQ0YsT0FBTyxDQUFDLEdBQUcsQ0FBQyxVQUFVLEVBQUUsSUFBSSxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsQ0FBQTtJQUM3QyxDQUFDO0lBQ0QsV0FBVyxFQUFYLFVBQVksQ0FBNkI7UUFDdkMsSUFBSSxDQUFDLE9BQU8sQ0FBQztZQUNYLFFBQVEsRUFBRSxDQUFDLENBQUMsTUFBTSxDQUFDLEtBQUs7U0FDekIsQ0FBQyxDQUFBO1FBQ0YsT0FBTyxDQUFDLEdBQUcsQ0FBQyxVQUFVLEVBQUUsSUFBSSxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsQ0FBQTtJQUM3QyxDQUFDO0lBQ0QsTUFBTTtRQUNKLE9BQU8sQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLENBQUE7SUFDbkIsQ0FBQztJQUNELE1BQU07SUFFTixDQUFDO0NBQ0YsQ0FBQyxDQUFBIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgbG9naW4gfSBmcm9tICcuLi8uLi9hcGkvaW5kZXgnXG5QYWdlKHtcbiAgZGF0YToge1xuICAgIHVzZXJOYW1lOiAnJyxcbiAgICBwYXNzd29yZDogJydcbiAgfSxcbiAgLy8gQHRzLWlnbm9yZVxuICBoYW5kbGVMb2dpbjogZnVuY3Rpb24gKCkge1xuICAgIGxldCB0aGF0ID0gdGhpc1xuICAgIGlmICh0aGF0LmRhdGEudXNlck5hbWUgPT0gJycpIHtcbiAgICAgIHd4LnNob3dUb2FzdCh7XG4gICAgICAgIHRpdGxlOiAn6K+36L6T5YWl55So5oi35ZCNJyxcbiAgICAgICAgaWNvbjogJ25vbmUnLFxuICAgICAgICBkdXJhdGlvbjogMjAwMFxuICAgICAgfSlcbiAgICAgIHJldHVybiBmYWxzZVxuICAgIH1cbiAgICBpZiAodGhhdC5kYXRhLnBhc3N3b3JkID09ICcnKSB7XG4gICAgICB3eC5zaG93VG9hc3Qoe1xuICAgICAgICB0aXRsZTogJ+ivt+i+k+WFpeWvhueggScsXG4gICAgICAgIGljb246ICdub25lJyxcbiAgICAgICAgZHVyYXRpb246IDIwMDBcbiAgICAgIH0pXG4gICAgICByZXR1cm4gZmFsc2VcbiAgICB9XG5cbiAgICB3eC5sb2dpbih7XG4gICAgICBzdWNjZXNzKHJlcykge1xuICAgICAgICB3eC5zaG93TG9hZGluZyh7XG4gICAgICAgICAgdGl0bGU6ICfnmbvlvZXkuK3vvIzor7fnqI3lkI4nLFxuICAgICAgICB9KVxuICAgICAgICBsZXQgY29kZSA9IHJlcy5jb2RlXG4gICAgICAgIGlmIChjb2RlKSB7XG4gICAgICAgICAgbGV0IHBhcmFtcyA9IHtcbiAgICAgICAgICAgIHVzZXJuYW1lOiB0aGF0LmRhdGEudXNlck5hbWUsXG4gICAgICAgICAgICBwYXNzd29yZDogdGhhdC5kYXRhLnBhc3N3b3JkLFxuICAgICAgICAgICAgd3hDb2RlOiBjb2RlXG4gICAgICAgICAgfVxuICAgICAgICAgIGxvZ2luKHBhcmFtcykudGhlbigocmVzOiBhbnkpID0+IHtcbiAgICAgICAgICAgIGNvbnNvbGUubG9nKHJlcylcbiAgICAgICAgICAgIGlmIChyZXMuY29kZSA9PSAnMCcpIHtcbiAgICAgICAgICAgICAgd3guc2V0U3RvcmFnZVN5bmMoJ3Rva2VuJywgcmVzLmRhdGEudG9rZW4pXG4gICAgICAgICAgICAgIHd4LnNldFN0b3JhZ2VTeW5jKCd1c2VyVGFnS2V5JywgcmVzLmRhdGEudXNlclRhZ0tleSlcbiAgICAgICAgICAgICAgd3guc2V0U3RvcmFnZVN5bmMoJ2RlcHREYXRhU2NvcGVMaXN0JywgSlNPTi5zdHJpbmdpZnkocmVzLmRhdGEuZGVwdERhdGFTY29wZUxpc3QpKVxuICAgICAgICAgICAgICBcbiAgICAgICAgICAgICAgd3gucmVkaXJlY3RUbyh7XG4gICAgICAgICAgICAgICAgdXJsOiAnL3BhZ2VzL2luZGV4L2luZGV4J1xuICAgICAgICAgICAgICB9KVxuICAgICAgICAgICAgfSBlbHNlIHtcbiAgICAgICAgICAgICAgd3guc2hvd1RvYXN0KHtcbiAgICAgICAgICAgICAgICB0aXRsZTogcmVzLm1zZyxcbiAgICAgICAgICAgICAgICBpY29uOiAnbm9uZScsXG4gICAgICAgICAgICAgICAgZHVyYXRpb246IDIwMDBcbiAgICAgICAgICAgICAgfSlcbiAgICAgICAgICAgIH1cbiAgICAgICAgICAgIHd4LmhpZGVMb2FkaW5nKClcbiAgICAgICAgICB9KVxuICAgICAgICB9XG4gICAgICB9XG4gICAgfSlcbiAgICBjb25zb2xlLmxvZygnMjIyMjIyJylcbiAgfSxcbiAgZ2V0VXNlck5hbWUoZTogeyBkZXRhaWw6IHsgdmFsdWU6IGFueSB9IH0pIHtcbiAgICB0aGlzLnNldERhdGEoe1xuICAgICAgdXNlck5hbWU6IGUuZGV0YWlsLnZhbHVlXG4gICAgfSlcbiAgICBjb25zb2xlLmxvZygndXNlck5hbWUnLCB0aGlzLmRhdGEudXNlck5hbWUpXG4gIH0sXG4gIGdldFBhc3N3b3JkKGU6IHsgZGV0YWlsOiB7IHZhbHVlOiBhbnkgfSB9KSB7XG4gICAgdGhpcy5zZXREYXRhKHtcbiAgICAgIHBhc3N3b3JkOiBlLmRldGFpbC52YWx1ZVxuICAgIH0pXG4gICAgY29uc29sZS5sb2coJ3Bhc3N3b3JkJywgdGhpcy5kYXRhLnBhc3N3b3JkKVxuICB9LFxuICBvblNob3cgKCkge1xuICAgIGNvbnNvbGUubG9nKCfmmL7npLonKVxuICB9LFxuICBvbkxvYWQgKCkge1xuXG4gIH1cbn0pXG4iXX0=
\ No newline at end of file
+})
\ No newline at end of file
diff --git a/miniprogram/pages/login/login.wxml b/miniprogram/pages/login/login.wxml
index e127e1d..fc8f107 100644
--- a/miniprogram/pages/login/login.wxml
+++ b/miniprogram/pages/login/login.wxml
@@ -6,22 +6,23 @@
-
+
-
+
-
+
-
+
- 登 录
+ 登 录
+ 去注册
diff --git a/miniprogram/pages/login/login.wxss b/miniprogram/pages/login/login.wxss
index 76eea11..b8ebac4 100644
--- a/miniprogram/pages/login/login.wxss
+++ b/miniprogram/pages/login/login.wxss
@@ -1,165 +1,165 @@
page {
- width: 100%;
- height: 100vh;
-}
-.main-bg {
- width: 100%;
- height: 100%;
- background:#fff;
- position: relative;
-}
-
-.header .header-bg {
+ width: 100%;
+ height: 100vh;
+ }
+ .main-bg {
+ width: 100%;
+ height: 100%;
+ background:#fff;
+ position: relative;
+ }
+
+ .header .header-bg {
+ width: 100%;
+ height: 100%;
+ /* position: absolute;
+ z-index: 10;
+ left: 0;
+ top: 0; */
+ position: absolute;
+ height: 100%;
+ z-index: -999;
+ }
+
+ .main-bg image{
+ width: 100%;
+ height: 100%;
+ object-fit: cover;
+ position: absolute;
+ left: 0;
+ top: 0;
+ }
+
+ .login-top{
+ width: 100%;
+ height: 310rpx;
+ z-index: 100;
+ position: relative;
+ box-sizing: border-box;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ }
+ .login-top .picture{
+ flex: 1;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: flex-end;
+ height: 100%;
+ }
+
+ .login-top .picture .picture-bg{
+ width: 160rpx;
+ height: 160rpx;
+ position: relative;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ }
+
+ .data-name{
+ width: 96rpx;
+ height: 36rpx;
+ text-align: center;
+ position: relative;
+ left: 85rpx;
+ top: -22rpx;
+ }
+ .data-name image{
width: 100%;
height: 100%;
- /* position: absolute;
- z-index: 10;
+ object-fit: cover;
+ position: absolute;
left: 0;
- top: 0; */
+ top: 0;
+ }
+ .data-name .name{
+ font-size:24rpx;
+ font-family:PingFang SC;
+ font-weight:500;
+ position: relative;
+ color:rgba(255,255,255,1);
+ }
+
+
+ .login-bottom{
+ width: 100%;
+ height: 570rpx;
+ z-index: 100;
+ position: relative;
+ box-sizing: border-box;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ top: 127rpx;
+ }
+ .login-bottom .info{
+ flex: 1;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: flex-end;
+ }
+
+ .login-bottom .info .info-bg{
+ width: 640rpx;
+ height: 520rpx;
+ position: relative;
+ background:rgba(255,255,255,1);
+ box-shadow:0px 8px 10px 0px rgba(33,155,138,0.22);
+ border-radius: 24rpx;
+ }
+ .login-bottom .info .info-bg .name{
+ width:560rpx;
+ height:88rpx;
+ background:rgba(248,248,248,1);
+ border-radius:44rpx;
+ position: relative;
+ margin-top: 97rpx;
+ left: 39rpx;
+ }
+ .name-pw-bg{
+ width: 34rpx;
+ height: 34rpx;
+ float: left;
position: absolute;
+ left: 41rpx;
+ margin-top: 27rpx;
+ }
+ .info-input{
+ float: left;
+ width: 395rpx;
height: 100%;
- z-index: -999;
-}
-
-.main-bg image{
- width: 100%;
- height: 100%;
- object-fit: cover;
- position: absolute;
- left: 0;
- top: 0;
-}
-
-.login-top{
- width: 100%;
- height: 310rpx;
- z-index: 100;
- position: relative;
- box-sizing: border-box;
- display: flex;
- justify-content: center;
- align-items: center;
-}
-.login-top .picture{
- flex: 1;
- display: flex;
- flex-direction: column;
- align-items: center;
- justify-content: flex-end;
- height: 100%;
-}
-
-.login-top .picture .picture-bg{
- width: 160rpx;
- height: 160rpx;
- position: relative;
- display: flex;
- align-items: center;
- justify-content: center;
-}
-
-.data-name{
- width: 96rpx;
- height: 36rpx;
- text-align: center;
- position: relative;
- left: 85rpx;
- top: -22rpx;
-}
-.data-name image{
- width: 100%;
- height: 100%;
- object-fit: cover;
- position: absolute;
- left: 0;
- top: 0;
-}
-.data-name .name{
- font-size:24rpx;
- font-family:PingFang SC;
- font-weight:500;
- position: relative;
- color:rgba(255,255,255,1);
-}
-
-
-.login-bottom{
- width: 100%;
- height: 570rpx;
- z-index: 100;
- position: relative;
- box-sizing: border-box;
- display: flex;
- justify-content: center;
- align-items: center;
- top: 127rpx;
-}
-.login-bottom .info{
- flex: 1;
- display: flex;
- flex-direction: column;
- align-items: center;
- justify-content: flex-end;
-}
-
-.login-bottom .info .info-bg{
- width: 640rpx;
- height: 500rpx;
- position: relative;
- background:rgba(255,255,255,1);
- box-shadow:0px 8px 10px 0px rgba(33,155,138,0.22);
- border-radius: 24rpx;
-}
-.login-bottom .info .info-bg .name{
- width:560rpx;
- height:88rpx;
- background:rgba(248,248,248,1);
- border-radius:44rpx;
- position: relative;
- margin-top: 97rpx;
- left: 39rpx;
-}
-.name-pw-bg{
- width: 34rpx;
- height: 34rpx;
- float: left;
- position: absolute;
- left: 41rpx;
- margin-top: 27rpx;
-}
-.info-input{
- float: left;
- width: 395rpx;
- height: 100%;
- position: absolute;
- margin-left: 107rpx;
-}
-.info-input input{
- margin-top: 15rpx;
- font-size:30rpx;
-}
-.login-bottom .info .info-bg .password{
- width:560rpx;
- height:88rpx;
- background:rgba(248,248,248,1);
- border-radius:44rpx;
- position: relative;
- margin-top: 29rpx;
- left: 39rpx;
-}
-
-.login-bottom .info .info-bg .login{
- width:560rpx;
- height:88rpx;
- background:#f5071ad6;
- border-radius:44rpx;
- position: relative;
- margin-top: 82rpx;
- left: 39rpx;
- text-align: center;
- line-height: 88rpx;
- font-size:36rpx;
- font-family:PingFang SC;
- font-weight:500;
- color:rgba(255,255,255,1);
-}
\ No newline at end of file
+ position: absolute;
+ margin-left: 107rpx;
+ }
+ .info-input input{
+ margin-top: 15rpx;
+ font-size:30rpx;
+ }
+ .login-bottom .info .info-bg .password{
+ width:560rpx;
+ height:88rpx;
+ background:rgba(248,248,248,1);
+ border-radius:44rpx;
+ position: relative;
+ margin-top: 29rpx;
+ left: 39rpx;
+ }
+
+ .login-bottom .info .info-bg .login{
+ width:560rpx;
+ height:88rpx;
+ background:#f5071ad6;
+ border-radius:44rpx;
+ position: relative;
+ margin-top: 50rpx;
+ left: 39rpx;
+ text-align: center;
+ line-height: 88rpx;
+ font-size:36rpx;
+ font-family:PingFang SC;
+ font-weight:500;
+ color:rgba(255,255,255,1);
+ }
\ No newline at end of file
diff --git a/miniprogram/project.private.config.json b/miniprogram/project.private.config.json
index a4cd3e6..7b508b0 100644
--- a/miniprogram/project.private.config.json
+++ b/miniprogram/project.private.config.json
@@ -4,6 +4,13 @@
"condition": {
"miniprogram": {
"list": [
+ {
+ "name": "首页",
+ "pathName": "pages/home/home",
+ "query": "",
+ "launchMode": "default",
+ "scene": null
+ },
{
"name": "带参数二维码",
"pathName": "pages/index/index",
@@ -179,7 +186,7 @@
]
}
},
- "libVersion": "2.32.2",
+ "libVersion": "2.14.1",
"setting": {
"compileHotReLoad": true,
"bigPackageSizeSupport": false
diff --git a/miniprogram/subpages/centralHousehold/pages/centralHousehold/centralHousehold.js b/miniprogram/subpages/centralHousehold/pages/centralHousehold/centralHousehold.js
index 1aadca7..5ff6e93 100644
--- a/miniprogram/subpages/centralHousehold/pages/centralHousehold/centralHousehold.js
+++ b/miniprogram/subpages/centralHousehold/pages/centralHousehold/centralHousehold.js
@@ -1,10 +1,14 @@
const api = require('../../../../utils/partApi')
+const app = getApp()
+
Page({
/**
* 页面的初始数据
*/
data: {
+ statusHeight: app.globalData.deviceInfo.statusHeight, // 自定义头部状态栏高度
+ navigationHeight: app.globalData.deviceInfo.navigationHeight,
selectedValue: '',
selectList: [{
label: '是',
@@ -17,7 +21,7 @@ Page({
newArr: [],
multiIds: [],
multiIndex: [0, 0],
- informFlag: false,
+ informFlag: true,
selectedStatus: false,
streetList: [],
pickerValue: '',
diff --git a/miniprogram/subpages/centralHousehold/pages/centralHousehold/centralHousehold.json b/miniprogram/subpages/centralHousehold/pages/centralHousehold/centralHousehold.json
index ac28cbc..73d0770 100644
--- a/miniprogram/subpages/centralHousehold/pages/centralHousehold/centralHousehold.json
+++ b/miniprogram/subpages/centralHousehold/pages/centralHousehold/centralHousehold.json
@@ -1,7 +1,13 @@
{
"usingComponents": {
- "wux-picker": "../../../../../dist/picker/index"
+ "wux-picker": "../../../../../dist/picker/index",
+ "wux-icon": "../../../../../dist/icon/index"
+
},
- "navigationBarBackgroundColor": "#e33131",
- "navigationBarTextStyle": "white"
+ "navigationStyle": "custom",
+ "navigationBarTextStyle": "white",
+ "enablePullDownRefresh": true,
+ "backgroundColor": "#f8f8f8",
+ "backgroundTextStyle": "dark"
+
}
\ No newline at end of file
diff --git a/miniprogram/subpages/centralHousehold/pages/centralHousehold/centralHousehold.wxml b/miniprogram/subpages/centralHousehold/pages/centralHousehold/centralHousehold.wxml
index 87a1d11..928c558 100644
--- a/miniprogram/subpages/centralHousehold/pages/centralHousehold/centralHousehold.wxml
+++ b/miniprogram/subpages/centralHousehold/pages/centralHousehold/centralHousehold.wxml
@@ -1,13 +1,16 @@
+
-
-
-
-
-
-
+
+
+
-
+