党员中心户页面,登录接口

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",

miniprogram/pages/formid/formid.wxml

@@ -9,7 +9,7 @@
                 <input confirm-type="next" bindblur="bindRealNameInput" bindinput="bindRealNameInput" value="{{form.realName}}" placeholder-class="placeholder-style" placeholder="请输入" />
             </view>
         </view>
-        <view class="list-item gray ">
+        <view class="list-item  ">
             <view class="left">
                 <text class="must">*</text>
                 <view class="title">身份证号</view>

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;

miniprogram/pages/login/login.wxml

@@ -6,22 +6,23 @@
    <view class="info">
    <view class="info-bg">
      <view class="name">
-       <view class="name-pw-bg">
+       <!-- <view class="name-pw-bg">
         <image src="../../../../../../assets/images/name.png"></image>
-       </view>
+       </view> -->
        <view class="info-input">
-         <input bindinput="getUserName" placeholder="请输入用户名"></input>
+         <input bindinput="getUserName" placeholder="请输入用户名" value="{{userName}}"></input>
        </view>
      </view>
      <view class="password">
-        <view class="name-pw-bg">
+        <!-- <view class="name-pw-bg">
           <image src="../../../../../../assets/images/password.png"></image>
-        </view>
+        </view> -->
         <view class="info-input">
-         <input bindinput="getPassword" password placeholder="请输入密码"></input>
+         <input bindinput="getPassword" password placeholder="请输入密码" value="{{password}}"></input>
         </view>
      </view>
-     <view class="login" bindtap="handleLogin">登 录</view>
+     <view class="login" bind:tap="handleLogin">登 录</view>
+     <view style="color: #f72f3f;font-size: 28rpx; cursor: pointer;text-align: center;margin-top: 20rpx;" bind:tap="toRegister">去注册</view>
    </view>
    </view>
   </view>

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);
-}
+    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);
+  }

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

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: '',

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"
+
 }

miniprogram/subpages/centralHousehold/pages/centralHousehold/centralHousehold.wxml

@@ -1,13 +1,16 @@
 <!--subpages/redSail/pages/registerParty/registerParty.wxml-->
+<view class="header"  wx:if="{{informFlag}}">
+    <wux-icon type="ios-arrow-back" class="back" color="#fff" size="25" style=" top: {{statusHeight + 5}}px;"/>
+    <view class="navigation" style="height: {{navigationHeight}}px; top: {{statusHeight}}px;">
+        党员中心户
+    </view>
+</view>
 <block wx:if="{{informFlag}}">
     <block>
         <view class="basic-info">
-            <view class="list-item ">
-                <view class="contentImage">
-                    <image src="{{form.faceImg}}"></image>
-                </view>
-            </view>
-            <view class="list-item ">
+                    <image  class="contentImage"src="{{form.faceImg}}"></image>
+                    <image src="../images/bg.png" alt="" class="topBg"></image>
+            <!-- <view class="list-item ">
                 <view class="left">
                     <text class="must"></text>
                     <view class="title">姓名</view>
@@ -33,7 +36,7 @@
                 <view class="right">
                     <input class="textStyle" confirm-type="next" disabled="{{true}}" bindtap="handleClickDisabled" bindblur="bindRealMobileInput" bindinput="bindRealMobileInput" value="{{form.mobile}}" placeholder-class="placeholder-style" placeholder="请输入" />
                 </view>
-            </view>
+            </view> -->
 
             <!-- <view class="list-item gray">
                 <view class="left">
@@ -47,7 +50,7 @@
                     </radio-group>
                 </view>
             </view> -->
-            <view class="list-item " wx:if="{{form.freelance==0}}">
+            <!-- <view class="list-item " wx:if="{{form.freelance==0}}">
                 <view class="left">
                     <text class="must"></text>
                     <view class="title">工作单位</view>
@@ -71,7 +74,7 @@
                         </van-button>
                     </view>
                 </picker>
-            </view>
+            </view> -->
             <!-- <view class="list-item gray">
                 <view class="left">
                     <text class="must">*</text>

miniprogram/subpages/centralHousehold/pages/centralHousehold/centralHousehold.wxss

@@ -3,11 +3,45 @@ page {
     width: 100%;
     height: auto;
     overflow-y: auto;
-    background: #f5f5f5;
+    background: linear-gradient(180deg, #E82C19 0%, #F7F7F9 50%);
     font-family: PingFang SC;
     margin: 0 auto;
 }
+.header {
+    width: 100%;
+    height: 150rpx;
+    /* position: fixed;
+    top: 0;
+    left: 0;
+    z-index: 1000; */
+}
 
+.header .header-bg {
+    width: 100%;
+    height: 100%;
+    /* position: absolute;
+    z-index: 10;
+    left: 0;
+    top: 0; */
+    position: absolute;
+    height: 100%;
+    z-index: -999;
+}
+
+.header .navigation {
+    width: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    color: #fff;
+    font-size: 32rpx;
+    position: relative;
+    z-index: 1;
+}
+.header .back{
+    position: absolute;
+    left: 20rpx;
+}
 .gray {
     background-color: #fafafa;
 }
@@ -49,6 +83,7 @@ page {
 .buttom_btn {
     position: fixed;
     bottom: 0;
+    left: 0;
     height: 120rpx;
     background-color: #fff;
     width: 100%;
@@ -77,6 +112,8 @@ page {
     box-sizing: border-box;
     padding: 0 20rpx;
     margin: 20rpx auto;
+    position: relative;
+    top: 150rpx;
 }
 
 .basic-info .list-item {
@@ -153,12 +190,17 @@ page {
     color: #3f3e3e8a;
 }
 .contentImage {
-    width: 100%;
-    text-align: center;
-    margin: 10rpx;
-}
-.contentImage image {
-    width: 300rpx;
-    height: 300rpx;
+    width: 200rpx;
+    height: 200rpx;
     border-radius: 50%;
+    position: absolute;
+    top: -120rpx;
+    left: 50%;
+    transform: translateX(-100rpx);
+    z-index: 3;
+    border: 10rpx solid #fff;
+}
+.topBg{
+    height: 150rpx;
+    width: 100%;
 }

miniprogram/utils/api.js

@@ -51,7 +51,7 @@ module.exports = {
     getWxPhone: getWxPhone,
     getComplete: getComplete,
     getInvitation: getInvitation,
-    userLoginlog: userLoginlog,
+    userLogin: userLogin,
     userInfoSignUp: userInfoSignUp,
     getAppMenu: getAppMenu,
     standardbearerApply: standardbearerApply,
@@ -463,10 +463,10 @@ function getInvitation(id) {
     return fly.get(`app-user/user/ma/v3/getInvitation/${id}`)
 }
 /**
- *小程序用户登录日志
+ *小程序用户登录
  */
-function userLoginlog(para) {
-    return fly.post("app-user/userloginlog", para)
+function userLogin(para) {
+    return fly.post("analysis/user/login", para)
 }
 
 /**