소스 검색

Merge branch 'talksec' of 121.43.114.153:/home/git/repositories/shopnc into talksec

huangdong 6 년 전
부모
커밋
92725d5d0c
3개의 변경된 파일42개의 추가작업 그리고 21개의 파일을 삭제
  1. 16 11
      data/resource/mobile/talk/css/room_apply.css
  2. 1 1
      data/resource/mobile/talk/css/weui.css
  3. 25 9
      mobile/templates/default/member/index.php

+ 16 - 11
data/resource/mobile/talk/css/room_apply.css

@@ -4,16 +4,16 @@
 
 .weui-cell_state .weui-cell {
     position: relative;
-    padding: 10px 27px;
+    padding: 12px 27px 17px 27px;
 }
 
 .weui-cell_box,.weui-cell_state {
     background: #F2F2F2;
-    margin: 15px;
+    margin: 0 15px;
 }
 
 .weui-cell_box .weui-cell {
-    padding: 12px 27px 24px 27px;
+    padding: 12px 27px 23px 27px;
 }
 
 .weui-cell__hd img {
@@ -44,13 +44,13 @@
 
 .state {
     position: absolute;
-    right: 16px;
+    right: 23px;
     top: 10px;
     font-size: 12px;
     color: #9B9B9B;
     border-radius: 14px;
-    border: 1px solid #979797;
-    padding: 2px 10px;
+    border: 0.5px solid #979797;
+    padding: 2px 9px;
     float: right;
 }
 
@@ -59,18 +59,23 @@
 }
 
 .handle {
-    padding: 0 27px 24px 27px;
+    padding: 0 27px 14px 27px;
     font-size: 12px;
     color: #ffffff;
+    overflow: hidden;
 }
 
 .refusal_btn, .agree_btn {
-    padding: 5px 10px;
+    padding: 3px 11px;
     border-radius: 14px;
     cursor: pointer;
     font-size: 12px;
 }
 
+.agree_btn {
+    float: left;
+}
+
 .refusal_btn {
     background: #ffffff;
     color: #9B9B9B;
@@ -82,10 +87,10 @@
 }
 
 .title {
-    height: 35px;
-    line-height: 20px;
+    height: 44px;
+    line-height: 44px;
     font-size: 15px;
-    font-weight: 550;
+    font-weight: 500;
     text-align: center;
     color: #333333;
     background: #ffffff;

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 1
data/resource/mobile/talk/css/weui.css


+ 25 - 9
mobile/templates/default/member/index.php

@@ -19,7 +19,7 @@
         }
         .name {
             font-size: 18px;
-            font-weight: 600;
+            font-weight: 500;
         }
         .weui-cells {
             font-size: 15px;
@@ -31,18 +31,34 @@
             font-weight: 400;
         }
         .live_message {
-            padding: 10px 15px;
+            padding: 10px 19px;
+            margin-top: 20px;
             background: #F9F9F9;
             color: #999999;
         }
+        .friend-btn-area {
+            margin-top: 40px;
+        }
+        .member_avatar {
+            width: 91px;
+        }
+        .detail_cell {
+            align-items: normal;
+        }
+        .member_info {
+            margin-top: 10px;
+        }
+        .apply_info {
+            margin-top: 20px;
+        }
     </style>
 </head>
 <body>
 
-<div class="weui-cells">
-    <div class="weui-cell">
+<div class="weui-cells member_info">
+    <div class="weui-cell detail_cell">
         <div class="weui-cell__hd">
-            <div class="weui-label">
+            <div class="weui-label member_avatar">
                 <img class="avatar" src="<?php echo $output['member_info']['avatar']; ?>" alt="">
             </div>
         </div>
@@ -55,7 +71,7 @@
 <?php if($output['scene'] == 'stranger'){ ?>
 <!-- 非好友  -->
     <div>
-        <div class="weui-cells">
+        <div class="weui-cells apply_info">
             <div class="weui-cell">
                 <div class="weui-cell__bd">
                     <p>熊猫美妆已累计帮TA省了</p>
@@ -90,7 +106,7 @@
                 </p>
             </div>
         </div>
-        <div class="weui-cells">
+        <div class="weui-cells apply_info">
             <div class="weui-cell">
                 <div class="weui-cell__bd">
                     <p>熊猫美妆已累计帮TA省了</p>
@@ -117,7 +133,7 @@
 <?php }elseif($output['scene'] == 'friends'){ ?>
 <!-- 好友详情  -->
     <div>
-        <div class="weui-cells">
+        <div class="weui-cells apply_info">
             <div class="weui-cell">
                 <div class="weui-cell__bd">
                     <p>熊猫美妆已累计帮TA省了</p>
@@ -145,7 +161,7 @@
         </div>
 
         <?php if(!$output['is_self']) { ?>
-        <div class="weui-btn-area">
+        <div class="weui-btn-area friend-btn-area">
             <a class="weui-btn weui-btn_primary submit" href="javascript:" id="send">发消息</a>
             <a class="weui-btn weui-btn_primary submit" href="javascript:" id="thief_bonus">偷红包</a>
         </div>