bug修改，登录等页面重画

assets/js/http/userApi.js

@@ -43,7 +43,7 @@ const UserApi = {
   // 退出
   logout: (params) => http.post(`${URL_CONFIG}sys/logout`, params),
   // 个人信息
-  mineInfo: (params) => http.get(`${URL_CONFIG}company/payContactsManagement/queryByIdMeeting`, params),
+  mineInfo: (params) => http.get(`${URL_CONFIG}company/payContactsManagement/queryByIdGetContract`, params),
   // 编辑个人信息提交
   editMineInfo: (params) => http.post(`${URL_CONFIG}company/payContactsManagement/companyEdit`, params),
   // 我的资料

pages/forgetPassword/forgetPassword.js

@@ -88,11 +88,6 @@ Page({
   },
   clearrepeatval(){
     this.data.vals = []
-    wx.showToast({
-      title: '禁止复制粘贴请手动输入',
-      icon: 'none',
-      duration: 2000
-    })
     this.setData({
       password: ''
     })
@@ -100,11 +95,6 @@ Page({
   },
   clearrepeatvalVerify(){
     this.data.valsVerify = []
-    wx.showToast({
-      title: '禁止复制粘贴请手动输入',
-      icon: 'none',
-      duration: 2000
-    })
     this.setData({
       verifyPassword: ''
     })

pages/forgetPassword/forgetPassword.wxml

@@ -1,30 +1,30 @@
 <view class="container-box">
   <form bindsubmit="formSubmit" class="form-box">
-    <view class="form-item">
+    <view class="item">
-      <view class="text-label">手机号</view>
+      <view class="label">手机号</view>
-      <view class="text-value">
+      <view class="value">
         <input name="phone" bindinput="bindInputPhone" value="{{phone}}" placeholder="请输入手机号" />
       </view>
     </view>
-    <view class="form-item">
+    <view class="item">
-      <view class="text-label">验证码</view>
+      <view class="label">验证码</view>
-      <view class="text-value">
+      <view class="value">
         <input name="verifyCode" value="{{verifyCode}}" placeholder="请输入验证码" />
       </view>
       <view wx:if="{{showGetCaptcha}}" class="captcha" bindtap="getVerCode">获取验证码</view>
       <view wx:else="{{showGetCaptcha}}" class="captcha count">{{count}}</view>
     </view>
-    <view class="form-item">
+    <view class="item">
-      <view class="text-label">新密码</view>
+      <view class="label">新密码</view>
-      <view class="text-value text-password">
+      <view class="value text-password">
         <input name="password" value="{{password}}" bindinput="handlePasswordInput" password="{{show}}" placeholder="请输入新密码" />
         <image src="../../assets/images/show.png" class="show" wx:if="{{!show}}" bindtap="showPassword"></image>
         <image src="../../assets/images/none.png" class="show" wx:if="{{show}}" bindtap="showPassword"></image>
       </view>
     </view>
-    <view class="form-item">
+    <view class="item">
-      <view class="text-label">确认密码</view>
+      <view class="label">确认密码</view>
-      <view class="text-value text-password">
+      <view class="value text-password">
         <input name="verifyPassword" bindinput="handleVerifyPasswordInput" value="{{verifyPassword}}" password="{{showVerify}}" placeholder="请输入确认密码" />
         <image src="../../assets/images/show.png" class="show" wx:if="{{!showVerify}}" bindtap="showPasswordVerify"></image>
         <image src="../../assets/images/none.png" class="show" wx:if="{{showVerify}}" bindtap="showPasswordVerify"></image>

pages/forgetPassword/forgetPassword.wxss

@@ -3,20 +3,132 @@ page {
   width: 100%;
   color: #333;
 }
+.container-box{
+  overflow-x: hidden;
+}
+
 .form-box{
-  transform: translateY(50%);
+  display: block;
+  box-sizing: border-box;
+  width: 100%;
+  height: auto;
+  background-color: #fff;
+  border-top-left-radius: 15px;
+  border-top-right-radius: 15px;
+  padding: 30px 20px;
 }
-.text-value{
+.form-box .item {
   position: relative;
+  display: block !important;
+  width: 100%;
+  margin-bottom: 25px;
 }
-.text-password input{
+.form-box .label{
-  padding-right: 30px;
+  width: 100%;
+  color: #A4A4A4;
+  font-size: 12px;
+  margin-bottom: 10px;
+}
+.form-box .value{
+  width: 100%;
+}
+.form-box .value input{
+  width: 100%;
+  box-sizing: border-box;
+  background-color: #F2F2F4;
+  border-radius: 8px;
+  color: #333;
+  font-size: 15px;
+  height: 50px;
+  padding: 0 90px 0 20px;
+}
+.form-box .captcha{
+  color: #069F99;
+  position: absolute;
+  right: 10px;
+  font-size: 13px;
+  top: 55%;
+  z-index: 9;
+}
+.form-box .view-flex{
+  width: 100%;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  height: 50px;
+}
+.form .view-flex .value{
+  flex: 1;
+}
+.form-box .captchaImage{
+  width: 140px;
+  height: 50px;
+  flex-shrink: 0;
+  margin-left: 20px;
+}
+.form-box .captchaImage image{
+  width: 100%;
+  height: 50px;
+  border-radius: 10px;
+}
+.form-box .count {
+  color: #999;
+}
+.btn-area button{
+  background-color: #069F99 !important;
+  height: 50px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  border-radius: 10px;
+}
+.other-way{
+  color: #A4A4A4;
+  font-size: 12px;
+  display: block;
+  width: 100%;
+  text-align: center;
+  margin-top: 70px;
+  letter-spacing: 1px;
+}
+.weixin{
+  margin-top: 30px !important;
+  width: 55px !important;
+  height: 55px !important;
+  background-color: #F2F2F4;
+  border-radius: 10px;
+  margin: auto;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.weixin image{
+  width: 32px !important;
+  height: 26px !important;
+}
+.forget{
+  color: #999;
+  font-size: 14px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-top: 20px;
+}
+.weixin{
+  width: 100%;
+  display: flex;
+  justify-content: center;
+  margin-top: 70px;
+}
+.weixin image{
+  width: 50px;
+  height: 50px;
 }
 .show{
   width: 15px;
   height: 15px;
   position: absolute;
   right: 10px;
-  top: 8px;
+  top: 58%;
   z-index: 9;
-}
+}

pages/login/login.js

@@ -93,6 +93,7 @@ Page({
     wx.getStorage({
       key: 'authorize',
       success(result){
+        console.log(result)
         // 做过查看微信用户信息
         if(result.data){ // 做过用户信息获取
           wx.showToast({

pages/login/login.json

@@ -1,4 +1,4 @@
 {
-  "navigationBarTitleText": "登录",
+  "usingComponents": {},
-  "usingComponents": {}
+  "navigationStyle": "custom"
 }

pages/login/login.wxml

@@ -1,14 +1,22 @@
 <view class="container-box">
+  <view class="home-bg">
+    <!-- 顶部背景图 mode="scaleToFill" 按照宽高填充，忽略图片原比例-->
+    <image mode="scaleToFill" src="../../assets/images/login-bg.png"></image>
+    <view class="bg-text">
+      <text>您好，欢迎使用</text>
+      <text>标准所协同工作平台</text>
+    </view>
+  </view>
   <form bindsubmit="formSubmit" class="form-box">
-    <view class="form-item">
+    <view class="item">
-      <view class="text-label">手机号</view>
+      <view class="label">手机号</view>
-      <view class="text-value">
+      <view class="value">
         <input name="phone" bindinput="bindInputPhone" placeholder="请输入手机号" />
       </view>
     </view>
-    <view class="form-item">
+    <view class="item">
-      <view class="text-label">验证码</view>
+      <view class="label">验证码</view>
-      <view class="text-value">
+      <view class="value">
         <input name="captcha" placeholder="请输入验证码" />
       </view>
       <view wx:if="{{showGetCaptcha}}" class="captcha" bindtap="getVerCode">获取验证码</view>
@@ -21,6 +29,7 @@
       <text bindtap="phonePassword">手机密码登录</text>
       <text bindtap="updateInfo">忘记密码？</text>
     </view>
+    <text class="other-way">或用以下方式登录</text>
     <view class="weixin">
       <image src="../../assets/images/wx.png" bindtap="wxLogin"></image>
     </view>

pages/login/login.wxss

@@ -2,9 +2,112 @@ page {
   overflow-x: hidden;
   width: 100%;
   color: #333;
+  box-sizing: border-box;
+}
+.container-box{
+  overflow-x: hidden;
 }
 .form-box{
-  transform: translateY(20%);
+  transform: translateY(-50px) !important;
+}
+.home-bg{
+  height: 200pt;
+}
+.bg-text{
+  position: relative;
+  top: -100pt;
+  left: 34pt;
+  color: #fff;
+}
+.bg-text text:nth-child(1){
+  display: block;
+  font-size: 15px;
+  margin-bottom: 8px;
+}
+.bg-text text:nth-child(2){
+  display: block;
+  font-size: 18px;
+  font-weight: 600;
+  letter-spacing: 1px;
+}
+.form-box{
+  display: block;
+  box-sizing: border-box;
+  width: 100%;
+  height: auto;
+  background-color: #fff;
+  border-top-left-radius: 15px;
+  border-top-right-radius: 15px;
+  transform: translateY(-10%);
+  padding: 30px 20px;
+}
+.form-box .item {
+  position: relative;
+  display: block !important;
+  width: 100%;
+  margin-bottom: 25px;
+}
+.form-box .label{
+  width: 100%;
+  color: #A4A4A4;
+  font-size: 12px;
+  margin-bottom: 10px;
+}
+.form-box .value{
+  width: 100%;
+}
+.form-box .value input{
+  width: 100%;
+  box-sizing: border-box;
+  background-color: #F2F2F4;
+  border-radius: 8px;
+  color: #333;
+  font-size: 15px;
+  height: 50px;
+  padding: 0 90px 0 20px;
+}
+.form-box .captcha{
+  color: #069F99;
+  position: absolute;
+  right: 10px;
+  font-size: 13px;
+  top: 55%;
+  z-index: 9;
+}
+.form-box .count {
+  color: #999;
+}
+.btn-area button{
+  background-color: #069F99 !important;
+  height: 50px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  border-radius: 10px;
+}
+.other-way{
+  color: #A4A4A4;
+  font-size: 12px;
+  display: block;
+  width: 100%;
+  text-align: center;
+  margin-top: 70px;
+  letter-spacing: 1px;
+}
+.weixin{
+  margin-top: 30px !important;
+  width: 55px !important;
+  height: 55px !important;
+  background-color: #F2F2F4;
+  border-radius: 10px;
+  margin: auto;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.weixin image{
+  width: 32px !important;
+  height: 26px !important;
 }
 .forget{
   color: #999;

pages/mineInfo/mineInfo.js

@@ -12,7 +12,7 @@ Page({
       name: '',
       companyName: '',
       post: '',
-      gender: '1',
+      gender: null,
       phone: '',
       contactAddress: '',
       email: '',

pages/mineInfo/mineInfo.wxml

@@ -23,7 +23,7 @@
 		<view class="form-item" wx:if="{{isDisabled}}">
       <view class="text-label">性别</view>
       <view class="text-value">
-        <input name="gender" disabled="{{isDisabled}}" value="{{form.gender == 1 ? '男' : '女'}}" placeholder="请选择性别" />
+        <input name="gender" disabled="{{isDisabled}}" value="{{form.gender == 1 ? '男' : form.gender == 2 ? '女' : ''}}" placeholder="请选择性别" />
       </view>
     </view>
 		<view class="form-item" wx:if="{{!isDisabled}}">
@@ -32,7 +32,7 @@
         <radio-group class="flex-center" name="gender">
         <label class="flex-center" wx:for="{{sexArr}}" wx:for-item="item" wx:key="value">
           <view class="">
-            <radio value="{{item.value}}" checked="{{item.checked}}"/>
+            <radio value="{{item.value}}" checked="{{item.checked}}" />
           </view>
           <view class="">{{item.name}}</view>
         </label>

pages/phonePassword/phonePassword.js

@@ -52,11 +52,6 @@ Page({
   },
   clearrepeatval(){
     this.data.vals = []
-    wx.showToast({
-      title: '禁止复制粘贴请手动输入',
-      icon: 'none',
-      duration: 2000
-    })
     this.setData({
       password: ''
     })

pages/phonePassword/phonePassword.json

@@ -1,4 +1,5 @@
 {
   "navigationBarTitleText": "登录",
-  "usingComponents": {}
+  "usingComponents": {},
+  "navigationStyle": "custom"
 }

pages/phonePassword/phonePassword.wxml

@@ -1,27 +1,37 @@
 <!--pages/meeting/meeting.wxml-->
-<view>
+<view class="container-box">
+  <view class="home-bg">
+    <!-- 顶部背景图 mode="scaleToFill" 按照宽高填充，忽略图片原比例-->
+    <image mode="scaleToFill" src="../../assets/images/login-bg.png"></image>
+    <view class="bg-text">
+      <text>您好，欢迎使用</text>
+      <text>标准所协同工作平台</text>
+    </view>
+  </view>
 	<form bindsubmit="formSubmit" class="form-box">
-    <view class="form-item">
+    <view class="item">
-      <view class="text-label">手机号</view>
+      <view class="label">手机号</view>
-      <view class="text-value">
+      <view class="value">
         <input name="phone" value="{{phone}}" placeholder="请输入手机号" />
       </view>
     </view>
-    <view class="form-item">
+    <view class="item">
-      <view class="text-label">密码</view>
+      <view class="label">密码</view>
-      <view class="text-value text-password">
+      <view class="value text-password">
         <input name="password" value="{{password}}" password="{{show}}" placeholder="请输入密码" bindinput="handlePasswordInput" />
         <image src="../../assets/images/show.png" class="show" wx:if="{{!show}}" bindtap="showPassword"></image>
         <image src="../../assets/images/none.png" class="show" wx:if="{{show}}" bindtap="showPassword"></image>
       </view>
     </view>
-    <view class="form-item">
+    <view class="item">
-      <view class="text-label">验证码</view>
+      <view class="label">验证码</view>
-      <view class="text-value">
+      <view class="view-flex">
-        <input name="captcha" placeholder="请输入验证码" value="{{captcha}}" />
+        <view class="value">
-      </view>
+          <input name="captcha" style="padding-right: 0 !important;"  placeholder="请输入验证码" value="{{captcha}}" />
-      <view class="captcha" wx:if="{{form.requestCodeSuccess}}" bindtap="handleChangeCheckCode">
+        </view>
-        <image src="{{form.randCodeImage}}" mode="aspectFill"></image>
+        <view class="captchaImage" wx:if="{{form.requestCodeSuccess}}" bindtap="handleChangeCheckCode">
+          <image src="{{form.randCodeImage}}" mode="aspectFill"></image>
+        </view>
       </view>
       <view class="captcha count" wx:if="{{!form.requestCodeSuccess}}" bindtap="handleChangeCheckCode">重新获取</view>
     </view>

pages/phonePassword/phonePassword.wxss

@@ -1,16 +1,133 @@
-/* pages/meeting/meeting.wxss */
+page {
+  overflow-x: hidden;
+  width: 100%;
+  color: #333;
+}
+.container-box{
+  overflow-x: hidden;
+}
 .form-box{
-  transform: translateY(25%);
+  transform: translateY(-50px) !important;
 }
-
+.home-bg{
-.text-label {
+  height: 200pt;
-  width: 60px !important;
 }
-.text-value{
+.bg-text{
   position: relative;
+  top: -100pt;
+  left: 34pt;
+  color: #fff;
 }
-.text-password input{
+.bg-text text:nth-child(1){
-  padding-right: 30px;
+  display: block;
+  font-size: 15px;
+  margin-bottom: 8px;
+}
+.bg-text text:nth-child(2){
+  display: block;
+  font-size: 18px;
+  font-weight: 600;
+  letter-spacing: 1px;
+}
+.form-box{
+  display: block;
+  box-sizing: border-box;
+  width: 100%;
+  height: auto;
+  background-color: #fff;
+  border-top-left-radius: 15px;
+  border-top-right-radius: 15px;
+  transform: translateY(-10%);
+  padding: 30px 20px;
+}
+.form-box .item {
+  position: relative;
+  display: block !important;
+  width: 100%;
+  margin-bottom: 25px;
+}
+.form-box .label{
+  width: 100%;
+  color: #A4A4A4;
+  font-size: 12px;
+  margin-bottom: 10px;
+}
+.form-box .value{
+  width: 100%;
+}
+.form-box .value input{
+  width: 100%;
+  box-sizing: border-box;
+  background-color: #F2F2F4;
+  border-radius: 8px;
+  color: #333;
+  font-size: 15px;
+  height: 50px;
+  padding: 0 90px 0 20px;
+}
+.form-box .captcha{
+  color: #069F99;
+  position: absolute;
+  right: 10px;
+  font-size: 13px;
+  top: 55%;
+  z-index: 9;
+}
+.form-box .view-flex{
+  width: 100%;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  height: 50px;
+}
+.form .view-flex .value{
+  flex: 1;
+}
+.form-box .captchaImage{
+  width: 140px;
+  height: 50px;
+  flex-shrink: 0;
+  margin-left: 20px;
+}
+.form-box .captchaImage image{
+  width: 100%;
+  height: 50px;
+  border-radius: 10px;
+}
+.form-box .count {
+  color: #999;
+}
+.btn-area button{
+  background-color: #069F99 !important;
+  height: 50px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  border-radius: 10px;
+}
+.other-way{
+  color: #A4A4A4;
+  font-size: 12px;
+  display: block;
+  width: 100%;
+  text-align: center;
+  margin-top: 70px;
+  letter-spacing: 1px;
+}
+.weixin{
+  margin-top: 30px !important;
+  width: 55px !important;
+  height: 55px !important;
+  background-color: #F2F2F4;
+  border-radius: 10px;
+  margin: auto;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.weixin image{
+  width: 32px !important;
+  height: 26px !important;
 }
 .forget{
   color: #999;
@@ -20,25 +137,21 @@
   align-items: center;
   margin-top: 20px;
 }
-.captcha{
+.weixin{
-  padding: 0 !important;
-  background-color: #fff !important;
-}
-.count{
-  background-color: #f5f5f5 !important;
-  color: #999 !important;
-}
-.captcha image{
-  display: block;
   width: 100%;
-  height: 90%;
+  display: flex;
-  border-radius: 5px;
+  justify-content: center;
+  margin-top: 70px;
+}
+.weixin image{
+  width: 50px;
+  height: 50px;
 }
 .show{
   width: 15px;
   height: 15px;
   position: absolute;
   right: 10px;
-  top: 8px;
+  top: 58%;
   z-index: 9;
-}
+}

pages/setPassword/setPassword.js

@@ -29,11 +29,6 @@ Page({
   },
   clearrepeatval(){
     this.data.valsNew = []
-    wx.showToast({
-      title: '禁止复制粘贴请手动输入',
-      icon: 'none',
-      duration: 2000
-    })
     this.setData({
       newPassword: ''
     })
@@ -41,11 +36,6 @@ Page({
   },
   clearrepeatvalVerify(){
     this.data.valsVerify = []
-    wx.showToast({
-      title: '禁止复制粘贴请手动输入',
-      icon: 'none',
-      duration: 2000
-    })
     this.setData({
       verifyPassword: ''
     })
@@ -155,13 +145,14 @@ Page({
         verifyPassword: encrypt(this.data.rsaPublicKey, e.detail.value.verifyPassword), // 确认密码
         rsaPublicKey: this.data.rsaPublicKey
       }
-      // 请求短信登录start
+      // 请求登录start
       UserApi.setPassword(params).then(res => {
+        console.log(res)
         if (res.success) {
           // 成功设置密码，跳转首页
           wx.setStorage({
             key: 'X-Access-Token',
-            data: that.data.password
+            data: this.data.password
           })
           wx.setStorage({
             key: 'userInfo',
@@ -195,7 +186,7 @@ Page({
     })
   },
   onLoad(options){
-    // this.data.userInfo = JSON.parse(options.userInfo)
+    this.data.userInfo = JSON.parse(options.userInfo)
   },
   /**
    * 生命周期函数--监听页面显示

pages/setPassword/setPassword.wxml

@@ -2,17 +2,17 @@
 <view class="container-box">
 	<text class="set-password">初次登录请设置密码</text>
 	<form bindsubmit="formSubmit" class="form-box">
-    <view class="form-item">
+    <view class="item">
-      <view class="text-label">密码</view>
+      <view class="label">密码</view>
-      <view class="text-value text-password">
+      <view class="value text-password">
         <input name="newPassword" bindinput="handlePasswordInput" value="{{newPassword}}" password="{{show}}" placeholder="请输入密码" />
         <image src="../../assets/images/show.png" class="show" wx:if="{{!show}}" bindtap="showPassword"></image>
         <image src="../../assets/images/none.png" class="show" wx:if="{{show}}" bindtap="showPassword"></image>
       </view>
     </view>
-    <view class="form-item">
+    <view class="item">
-      <view class="text-label">确认密码</view>
+      <view class="label">确认密码</view>
-      <view class="text-value text-password">
+      <view class="value text-password">
         <input name="verifyPassword" bindinput="handleVerifyPasswordInput" value="{{verifyPassword}}" password="{{showVerify}}" placeholder="请输入确认密码" />
         <image src="../../assets/images/show.png" class="show" wx:if="{{!showVerify}}" bindtap="showPasswordVerify"></image>
         <image src="../../assets/images/none.png" class="show" wx:if="{{showVerify}}" bindtap="showPasswordVerify"></image>

pages/setPassword/setPassword.wxss

@@ -1,32 +1,69 @@
-/* pages/meeting/meeting.wxss */
 page {
-  overflow: hidden;
+  overflow-x: hidden;
   width: 100%;
   color: #333;
 }
+.container-box{
+  overflow-x: hidden;
+}
+
 .form-box{
-  transform: translateY(20%);
+  display: block;
-}
+  box-sizing: border-box;
-.text-value{
+  width: 100%;
-  position: relative;
+  height: auto;
-}
+  background-color: #fff;
-.text-password input{
+  border-top-left-radius: 15px;
-  padding-right: 30px;
+  border-top-right-radius: 15px;
+  padding: 30px 20px;
 }
 .set-password{
-  display: block;
-  font-size: 16px;
-  color: #333;
-  width: 100%;
   text-align: center;
-  margin-bottom: 20px;
+  display: block;
-  letter-spacing: 0.5px;
+  width: 100%;
 }
+.form-box .item {
+  position: relative;
+  display: block !important;
+  width: 100%;
+  margin-bottom: 25px;
+}
+.form-box .label{
+  width: 100%;
+  color: #A4A4A4;
+  font-size: 12px;
+  margin-bottom: 10px;
+}
+.form-box .value{
+  width: 100%;
+}
+.form-box .value input{
+  width: 100%;
+  box-sizing: border-box;
+  background-color: #F2F2F4;
+  border-radius: 8px;
+  color: #333;
+  font-size: 15px;
+  height: 50px;
+  padding: 0 90px 0 20px;
+}
+
+
+.btn-area button{
+  background-color: #069F99 !important;
+  height: 50px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  border-radius: 10px;
+}
+
+
 .show{
   width: 15px;
   height: 15px;
   position: absolute;
   right: 10px;
-  top: 8px;
+  top: 58%;
   z-index: 9;
-}
+}

pages/upDateInfo/upDateInfo.js

@@ -37,11 +37,6 @@ Page({
   },
   clearrepeatvalOld(){
     this.data.valsOld = []
-    wx.showToast({
-      title: '禁止复制粘贴请手动输入',
-      icon: 'none',
-      duration: 2000
-    })
     this.setData({
       oldpassword: ''
     })
@@ -49,11 +44,6 @@ Page({
   },
   clearrepeatval(){
     this.data.valsNew = []
-    wx.showToast({
-      title: '禁止复制粘贴请手动输入',
-      icon: 'none',
-      duration: 2000
-    })
     this.setData({
       password: ''
     })
@@ -61,11 +51,6 @@ Page({
   },
   clearrepeatvalVerify(){
     this.data.valsVerify = []
-    wx.showToast({
-      title: '禁止复制粘贴请手动输入',
-      icon: 'none',
-      duration: 2000
-    })
     this.setData({
       confirmpassword: ''
     })

pages/upDateInfo/upDateInfo.wxml

@@ -1,25 +1,25 @@
 <!--pages/meeting/meeting.wxml-->
 <view>
 	<form bindsubmit="formSubmit" class="form-box">
-    <view class="form-item">
+    <view class="item">
-      <view class="text-label">旧密码</view>
+      <view class="label">旧密码</view>
-      <view class="text-value text-password">
+      <view class="value text-password">
         <input name="oldpassword" value="{{oldpassword}}" bindinput="handleOldPasswordInput" password="{{showOld}}" placeholder="请输入旧密码" />
         <image src="../../assets/images/show.png" class="show" wx:if="{{!showOld}}" bindtap="showPasswordOld"></image>
         <image src="../../assets/images/none.png" class="show" wx:if="{{showOld}}" bindtap="showPasswordOld"></image>
       </view>
     </view>
-    <view class="form-item">
+    <view class="item">
-      <view class="text-label">新密码</view>
+      <view class="label">新密码</view>
-      <view class="text-value text-password">
+      <view class="value text-password">
         <input name="password" value="{{password}}" bindinput="handlePasswordInput" password="{{show}}" placeholder="请输入新密码" />
         <image src="../../assets/images/show.png" class="show" wx:if="{{!show}}" bindtap="showPassword"></image>
         <image src="../../assets/images/none.png" class="show" wx:if="{{show}}" bindtap="showPassword"></image>
       </view>
     </view>
-    <view class="form-item">
+    <view class="item">
-      <view class="text-label">确认新密码</view>
+      <view class="label">确认新密码</view>
-      <view class="text-value text-password">
+      <view class="value text-password">
         <input name="confirmpassword" value="{{confirmpassword}}" bindinput="handleVerifyPasswordInput" password="{{showVerify}}" placeholder="请输入确认新密码" />
         <image src="../../assets/images/show.png" class="show" wx:if="{{!showVerify}}" bindtap="showPasswordVerify"></image>
         <image src="../../assets/images/none.png" class="show" wx:if="{{showVerify}}" bindtap="showPasswordVerify"></image>

pages/upDateInfo/upDateInfo.wxss

@@ -1,21 +1,134 @@
-/* pages/meeting/meeting.wxss */
+page {
+  overflow-x: hidden;
+  width: 100%;
+  color: #333;
+}
+.container-box{
+  overflow-x: hidden;
+}
+
 .form-box{
-  transform: translateY(20%);
+  display: block;
+  box-sizing: border-box;
+  width: 100%;
+  height: auto;
+  background-color: #fff;
+  border-top-left-radius: 15px;
+  border-top-right-radius: 15px;
+  padding: 30px 20px;
 }
-.text-label {
+.form-box .item {
-  width: 80px !important;
-}
-.text-value{
   position: relative;
+  display: block !important;
+  width: 100%;
+  margin-bottom: 25px;
 }
-.text-password input{
+.form-box .label{
-  padding-right: 30px;
+  width: 100%;
+  color: #A4A4A4;
+  font-size: 12px;
+  margin-bottom: 10px;
+}
+.form-box .value{
+  width: 100%;
+}
+.form-box .value input{
+  width: 100%;
+  box-sizing: border-box;
+  background-color: #F2F2F4;
+  border-radius: 8px;
+  color: #333;
+  font-size: 15px;
+  height: 50px;
+  padding: 0 90px 0 20px;
+}
+.form-box .captcha{
+  color: #069F99;
+  position: absolute;
+  right: 10px;
+  font-size: 13px;
+  top: 55%;
+  z-index: 9;
+}
+.form-box .view-flex{
+  width: 100%;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  height: 50px;
+}
+.form .view-flex .value{
+  flex: 1;
+}
+.form-box .captchaImage{
+  width: 140px;
+  height: 50px;
+  flex-shrink: 0;
+  margin-left: 20px;
+}
+.form-box .captchaImage image{
+  width: 100%;
+  height: 50px;
+  border-radius: 10px;
+}
+.form-box .count {
+  color: #999;
+}
+.btn-area button{
+  background-color: #069F99 !important;
+  height: 50px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  border-radius: 10px;
+}
+.other-way{
+  color: #A4A4A4;
+  font-size: 12px;
+  display: block;
+  width: 100%;
+  text-align: center;
+  margin-top: 70px;
+  letter-spacing: 1px;
+}
+.weixin{
+  margin-top: 30px !important;
+  width: 55px !important;
+  height: 55px !important;
+  background-color: #F2F2F4;
+  border-radius: 10px;
+  margin: auto;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.weixin image{
+  width: 32px !important;
+  height: 26px !important;
+}
+.forget{
+  color: #999;
+  font-size: 14px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-top: 20px;
+}
+.weixin{
+  width: 100%;
+  display: flex;
+  justify-content: center;
+  margin-top: 70px;
+}
+.weixin image{
+  width: 50px;
+  height: 50px;
 }
 .show{
   width: 15px;
   height: 15px;
   position: absolute;
   right: 10px;
-  top: 8px;
+  top: 58%;
   z-index: 9;
-}
+}