Browse Source

相对像素

吕君喜 3 years ago
parent
commit
e6ffc47a56

+ 0 - 34
app.wxss

@@ -74,43 +74,9 @@ page {
   padding: 200rpx 0;
   box-sizing: border-box;
 }
-
-.student-page {
-  background: white;
-}
-
-.student-page button {
-  height: 30px;
-  line-height: 30px;
-  margin-top: 7px;
-}
-
-.gapfilling-span {
-  color: red;
-  padding: 0px 30px;
-  margin: 0px 5px;
-  border-bottom: 3px double red;
-}
-
 .ueditor-p {
   display: inline !important;
 }
-
-.exam-hidden {
-  display: none;
-}
-
-.exam-pick-input{
-  height: 30px;
-}
-.radio-answer {
-  line-height: 60rpx;
-  margin-top:16rpx;
-}
-.checkbox-answer{
-  margin-top:16rpx;
-  line-height: 60rpx;
-}
 .fs30{font-size: 30rpx;}
 .fs40{font-size: 40rpx;}
 .fs50{font-size: 50rpx;}

+ 1 - 1
component/calendar/theme/iconfont.wxss

@@ -7,7 +7,7 @@
 
 .iconfont {
     font-family: "iconfont" !important;
-    font-size: 16px;
+    font-size: 32rpx;
     font-style: normal;
     -webkit-font-smoothing: antialiased;
 }

+ 10 - 10
component/iView/card/index.wxss

@@ -1,11 +1,11 @@
 .i-card {
   margin: 0 32rpx;
-  font-size: 14px;
+  font-size: 28rpx;
   overflow: hidden;
   position: relative;
   background: #fff;
   border: 1rpx solid #dddee1;
-  border-radius: 5px
+  border-radius: 10rpx
 }
 
 .i-card-full {
@@ -17,7 +17,7 @@
 
 .i-card-header {
   display: flex;
-  padding: 6px 16px;
+  padding: 12rpx 32rpx;
   align-items: center
 }
 
@@ -30,8 +30,8 @@
 
 .i-card-header-thumb {
   display: inline-block;
-  width: 64px;
-  height: 64px;
+  width: 128rpx;
+  height: 128rpx;
   position: relative;
   margin-left: auto;
   margin-right: auto;
@@ -56,9 +56,9 @@
 
 .i-card-body {
   position: relative;
-  padding: 6px 16px;
+  padding: 12rpx 32rpx;
   color: #495060;
-  font-size: 14px
+  font-size: 28rpx
 }
 
 .i-card-body::before {
@@ -73,12 +73,12 @@
   pointer-events: none;
   box-sizing: border-box;
   border: 0 solid #e9eaec;
-  border-top-width: 1px
+  border-top-width: 2rpx
 }
 
 .i-card-footer {
   position: relative;
-  padding: 6px 16px;
+  padding: 12rpx 32rpx;
   color: #80848f;
-  font-size: 12px
+  font-size: 24rpx
 }

+ 3 - 0
component/iView/cell/index.js

@@ -29,6 +29,9 @@ Component({
         value: {
             type: String
         },
+        text: {
+            type: String
+        },
         // 只有点击 footer 区域才触发 tab 事件
         onlyTapFooter: {
             type: Boolean

+ 28 - 11
component/iView/cell/index.wxml

@@ -2,15 +2,32 @@
     <view class="i-cell-icon">
         <slot name="icon"></slot>
     </view>
-    <view class="i-cell-bd">
-        <view wx:if="{{ title }}" class="i-cell-text">{{ title }}</view>
-        <view wx:if="{{ label }}" class="i-cell-desc">{{ label }}</view>
-        <slot></slot>
-    </view>
-    <view catchtap="navigateTo" class="i-cell-ft">
-        <block wx:if="{{value}}">{{ value }}</block>
-        <block wx:else>
-            <slot name="footer"></slot>
-        </block>
-    </view>
+    <block wx:if="{{text}}">
+        <view class="i-cell-bd">
+            <view wx:if="{{ title }}" class="i-cell-text">{{ title }}</view>
+            <view wx:if="{{ text.length>18 }}" class="i-cell-desc">{{ text }}</view>
+            <slot></slot>
+        </view>
+        <view catchtap="navigateTo" class="i-cell-ft">
+            <block wx:if="{{text.length<=18}}">{{ text }}</block>
+            <block wx:else>
+                <slot name="footer"></slot>
+            </block>
+        </view>
+    </block>
+
+    <block wx:else>
+        <view class="i-cell-bd">
+            <view wx:if="{{ title }}" class="i-cell-text">{{ title }}</view>
+            <view wx:if="{{ label }}" class="i-cell-desc">{{ label }}</view>
+            <slot></slot>
+        </view>
+        <view catchtap="navigateTo" class="i-cell-ft">
+            <block wx:if="{{value}}">{{ value }}</block>
+            <block wx:else>
+                <slot name="footer"></slot>
+            </block>
+        </view>
+    </block>
+    
 </view>

+ 6 - 5
component/iView/cell/index.wxss

@@ -23,7 +23,7 @@
   pointer-events: none;
   box-sizing: border-box;
   border: 0 solid #e9eaec;
-  border-bottom-width: 1px;
+  border-bottom-width: 2rpx;
   left: 30rpx;
   right: 0
 }
@@ -48,6 +48,7 @@
   line-height: 48rpx;
   font-size: 36rpx;
   font-family:'FangSong';
+  word-break: keep-all;
   font-weight: 600;
 }
 
@@ -71,12 +72,12 @@
 .i-cell-access .i-cell-ft::after {
   content: " ";
   display: inline-block;
-  width: 6px;
-  height: 6px;
+  width: 12rpx;
+  height: 12rpx;
   position: absolute;
   top: 50%;
-  right: 2px;
-  border-width: 2px 2px 0 0;
+  right: 4rpx;
+  border-width: 4rpx 4rpx 0 0;
   border-color: #dddee1;
   border-style: solid;
   transform: translateY(-50%) matrix(.71, .71, -.71, .71, 0, 0)

+ 1 - 1
component/v2/theme/iconfont.wxss

@@ -7,7 +7,7 @@
 
 .iconfont {
     font-family: "iconfont" !important;
-    font-size: 16px;
+    font-size: 32rpx;
     font-style: normal;
     -webkit-font-smoothing: antialiased;
 }

+ 3 - 3
pages/detail/out/index.wxml

@@ -1,10 +1,10 @@
 
 <view>
 
-<i-cell-group i-class="my-group-margin" style="width:400rpx">  
+<i-cell-group i-class="my-group-margin" style="width:750rpx">  
   <i-cell title="姓名"  value="{{info.username}}"></i-cell>
-  <i-cell title="职务"  value="{{info.post}}"></i-cell>
-  <i-cell title="外出事由"  label="{{info.reasons}}"></i-cell>
+  <i-cell title="职务"  text="{{info.post}}"></i-cell>
+  <i-cell title="外出事由"  text="{{info.reasons}}"></i-cell>
   <i-cell title="时间"  value="{{info.fromDate}} 到 {{info.toDate}}"></i-cell>
   <i-cell title="签批人1"  value="{{info.signName}}"></i-cell>
   <i-cell title="签批人2"  value="{{info.signConfirm}}"></i-cell>

+ 3 - 3
pages/detail/outList/index.wxml

@@ -1,9 +1,9 @@
 <view style="overflow:hidden;margin: 10rpx 32rpx;">
   <view class="card-wrapper" wx:for="{{tableData}}" wx:key="index" style="margin-top:20rpx">
-    <i-cell-group i-class="my-group-margin" style="width:400rpx">
+    <i-cell-group i-class="my-group-margin">
       <i-cell title="姓名" value="{{item.username}}"></i-cell>
-      <i-cell title="职务" value="{{item.post}}"></i-cell>
-      <i-cell title="外出事由" label="{{item.reasons}}"></i-cell>
+      <i-cell title="职务" text="{{item.post}}"></i-cell>
+      <i-cell title="外出事由" text="{{item.reasons}}"></i-cell>
       <i-cell title="时间" value="{{item.fromDate}} 到 {{info.toDate}}"></i-cell>
       <i-cell title="签批人1" value="{{item.signName}}"></i-cell>
       <i-cell title="签批人2" value="{{item.signConfirm}}"></i-cell>

+ 4 - 4
pages/detail/visit/index.wxml

@@ -1,13 +1,13 @@
 
 <view>
-  <i-cell-group i-class="my-group-margin" style="width:400rpx;font-size:20rpx">  
+  <i-cell-group i-class="my-group-margin" style="font-size:20rpx">  
     <i-cell title="姓名"  value="{{info.username}}"></i-cell>
-    <i-cell title="职务"  value="{{info.post}}"></i-cell>
+    <i-cell title="职务"  text="{{info.post}}"></i-cell>
     <i-cell title="行程概要"  label="{{info.tripSummary}}"></i-cell>
     <i-cell title="行程周期"  value="{{info.fromDate}} 到 {{info.toDate}}"></i-cell>
-    <i-cell title="陪同情况"  value="{{info.accompany}}"></i-cell>
+    <i-cell title="陪同情况"  text="{{info.accompany}}"></i-cell>
     <i-cell title="来文日期"  value="{{info.recvDate}}"></i-cell>
-    <i-cell title="拟办意见"  value="{{info.marks||'-'}}"></i-cell>
+    <i-cell title="拟办意见"  text="{{info.marks||'-'}}"></i-cell>
     <i-cell title="导入时间"  value="{{info.createAt}}"></i-cell>
   </i-cell-group>
 </view>

+ 8 - 2
pages/detail/visit/index.wxss

@@ -1,3 +1,9 @@
-.title{
-  min-width: 150rpx;
+@import '/component/iView/card/index.wxss';
+.i-card-radus{
+   border-radius: 10rpx;
+   margin-top: 10rpx;
+   background-color: #fff;
+}
+page{
+  background-color: #fafafa;
 }

+ 3 - 3
pages/detail/visitList/index.wxml

@@ -2,12 +2,12 @@
   <view class="card-wrapper" wx:for="{{tableData}}" wx:key="index" style="margin-top:20rpx" >
     <i-cell-group i-class="my-group-margin">  
       <i-cell title="姓名"  value="{{item.username}}"></i-cell>
-      <i-cell title="职务"  value="{{item.post}}"></i-cell>
+      <i-cell title="职务"  text="{{item.post}}"></i-cell>
       <i-cell title="行程概要"  label="{{item.tripSummary}}"></i-cell>
       <i-cell title="行程周期"  value="{{item.fromDate}} 到 {{item.toDate}}"></i-cell>
-      <i-cell title="陪同情况"  value="{{item.accompany}}"></i-cell>
+      <i-cell title="陪同情况"  text="{{item.accompany}}"></i-cell>
       <i-cell title="来文日期"  value="{{item.recvDate}}"></i-cell>
-      <i-cell title="拟办意见"  value="{{item.marks||'-'}}"></i-cell>
+      <i-cell title="拟办意见"  text="{{item.marks||'-'}}"></i-cell>
       <i-cell title="导入时间"  value="{{item.createAt}}"></i-cell>
     </i-cell-group>
   </view>

+ 1 - 1
pages/rili/index.wxml

@@ -1,4 +1,4 @@
-<view style="overflow:hidden;margin: 12px 32rpx;">
+<view style="overflow:hidden;margin: 24rpx 32rpx;">
   <calendar
     id="calendar"
     config="{{calendarConfig}}"

+ 1 - 1
pages/rili/index.wxss

@@ -11,5 +11,5 @@ page{
 }
 
 .card-wrapper{
-  margin-bottom: 12px;
+  margin-bottom: 24rpx;
 }

+ 1 - 1
wxs/util-fun.wxs

@@ -6,7 +6,7 @@ var filter = {
   getDate: function( item ){
     var strItem  = item.toString()
     return strItem.substring(0, 10);
-  },
+  }
 }
 module.exports = {
   getDatetime: filter.getDatetime,