From 030c77a73bf7bb0592c1b407eff8538ff5db8cae Mon Sep 17 00:00:00 2001
From: cheng.xu <cheng.xu@meidd.com>
Date: Tue, 29 Oct 2019 15:44:43 +0800
Subject: [PATCH] 添加公共样式

---
 app.wxss                          | 69 ++++++++++++++++++++++++++++++++++++++++-----------------------------
 pages/user/userinfo/userinfo.wxml | 27 +++++++++++++++++++++++----
 2 files changed, 63 insertions(+), 33 deletions(-)

diff --git a/app.wxss b/app.wxss
index 5677590..7fd4123 100644
--- a/app.wxss
+++ b/app.wxss
@@ -145,6 +145,12 @@ justify-content:flex-start;
 align-items:center;
 }
 .flex{display: flex}
+.ai-center{
+  align-items: center;
+}
+.jc-center{
+  justify-content: center;
+}
 /* 水平左对齐 */
 .flex-level-left{
  display:flex;
@@ -262,29 +268,7 @@ justify-content:space-around;
     font-style: normal;
 }
 
-.fs22{
-    font-size: 22rpx;
-}
 
-.fs26{
-    font-size: 26rpx;
-}
-
-
-.fs30{
-    font-size:30rpx;
-}
-
-
-.fs35{
-    font-size:35rpx;
-}
-.fs45{
-    font-size: 45rpx;
-}
-.fs50{
-    font-size: 50rpx;
-}
 
 
 /* 7.26 */
@@ -339,25 +323,52 @@ position: fixed;
 background: #ffe3e2;
 
 }
-.fs32{
-    font-size:32rpx;
-}
-.fs60{ font-size:60rpx;}
-.fs28{
-    font-size: 28rpx;
-}
 .fs20{
     font-size: 20rpx;
 }
+.fs22{
+    font-size: 22rpx;
+}
 .fs24{
     font-size: 24rpx;
 }
+
+.fs26{
+    font-size: 26rpx;
+}
+.fs28{
+    font-size: 28rpx;
+}
+
+.fs30{
+    font-size:30rpx;
+}
+.fs32{
+    font-size:32rpx;
+}
+
+.fs35{
+    font-size:35rpx;
+}
 .fs36 {
   font-size: 36rpx; 
 }
 .fs40 {
   font-size: 40rpx;
 }
+.fs45{
+    font-size: 45rpx;
+}
+.fs50{
+    font-size: 50rpx;
+}
+
+.fs60{ font-size:60rpx;}
+
+
+
+
+
 .ai_and{
  align-items:flex-end;
 }
diff --git a/pages/user/userinfo/userinfo.wxml b/pages/user/userinfo/userinfo.wxml
index 69adb7d..8689b6b 100644
--- a/pages/user/userinfo/userinfo.wxml
+++ b/pages/user/userinfo/userinfo.wxml
@@ -47,8 +47,8 @@
         </view>
       </view>
       <view bindtap="editUserInfo1" class="user-name flex-vertical-between" data-type="nickname">
-        <view class="flex-center" bindtap="isstcsp">
-          <view>消费密码</view>
+        <view>是否启用消费密码</view>
+        <view class="flex-center" bindtap="isstcsp" >
           <view class="flex-center cmleft">
             <block wx:if="{{isstcsp}}">
               <icon size="20" type="success" color="rgb(212,2,31)"></icon>
@@ -59,7 +59,13 @@
             <view class="Mleft">启动密码消费</view>
           </view>
         </view>
-        <!-- 是否显示密码 -->
+
+      </view>
+         <!-- 是否显示密码 -->
+        <view class="flex-vertical-between user-name" wx:if="{{isstcsp==1}}">
+        <view class="user-txt">
+            消费密码
+        </view>
         <view class="flex">
           <block wx:if="{{ispwhid}}">
             <input class="fs28 hion user-txt-right" maxlength="6" value="{{user.paypwd.length>0?user.paypwd:'******'}}" type="number" password="true"/>
@@ -73,8 +79,21 @@
           <block wx:else>
             <image class="eye" src="../../../images/open_eye.png" bindtap="ispwhid"></image>
           </block>
+
+          </view>
         </view>
-      </view>
+
+
+
+
+
+
+
+
+
+
+
+
       <view bindtap="editUserInfo1" class="user-name flex-vertical-between" data-type="sex">
         <view>性别</view>
         <view class="flex" wx:if="{{isGender!=0}}">
--
libgit2 0.21.4