Merge branch 'xue' into 'master'

完成个人资料组件

See merge request !7

components/moblie/dataCard.vue

+<template>
+  <yun-slider>
+    <yun-div
+      :width-v="704"
+      :padding-v="[34,0,40]"
+      :margin-v="[0,'auto']"
+      :flex-v="['row','space-between','center']"
+      slot="card"
+    >
+      <yun-div
+        :ske-w="50"
+        :font-style="[30,36,400,'black','left']"
+      >
+        签名
+      </yun-div>
+      <yun-div
+        :ske-w="100"
+        :font-style="[30,36,400,'#999999','left']"
+        :flex-v="['row','flex-start','center']"
+      >
+        <yun-div
+          v-if="cardType===1"
+          :no-wrap="true"
+          :extend-style="{maxWidth: commonReturnFlexedLength(450)}"
+        >
+          放什么
+        </yun-div>
+        <yun-img
+          v-if="cardType===2"
+          :width-v="66"
+          :height-v="66"
+          :ske-h="66"
+          :ske-w="66"
+          :border-r="[50,50,50,50]"
+        >
+
+        </yun-img>
+        <yun-icon
+          :style="{marginLeft:commonReturnFlexedLength(15)}"
+          name="left_arrow"
+        ></yun-icon>
+      </yun-div>
+
+    </yun-div>
+
+
+  </yun-slider>
+
+
+
+</template>
+
+<script>
+  import commonMixin from "./commonMixin";
+  export default {
+    mixins:[commonMixin],
+    name: "dataCard",
+    props:{
+      cardType:{
+        default:1,
+        type:Number
+      }
+    }
+
+  }
+</script>
+
+<style scoped>
+</style>

components/moblie/emptyCard.vue

+<template>
+  <yun-slider>
+    <yun-div
+      :style="{height: height, lineHeight: height}"
+      :flex-v="['row','center','center']"
+      slot="card"
+    >
+      <yun-img
+        :src="this.null"
+      >
+      </yun-img>
+    </yun-div>
+  </yun-slider>
+</template>
+
+<script>
+  import commonMixin from "./commonMixin";
+  import Null from '../../assets/svg/null.svg'
+
+  export default {
+
+    mixins: [commonMixin],
+    created(){
+      this.null = Null;
+    },
+    name: "emptyCard",
+    props: {
+      height: String
+    }
+  }
+</script>
+
+<style>
+  img {
+    display: block;
+  }
+
+</style>

components/moblie/newsCard.vue

@@ -18,7 +18,7 @@
       :border-r="[50,50,50,50]"
       :border-r="[50,50,50,50]"
       ></yun-img>
       ></yun-img>
       <yun-div
       <yun-div
-        :margin-v="[0,25]"
+        :style="{marginLeft: commonReturnFlexedLength(25)}"
       >
       >
         <yun-div :font-style="[24]" :ske-w="400" :ske-h="35">系统<span style="color:#999999" :style="{marginLeft: commonReturnFlexedLength(20)}">2020-2-19  11:11:21</span></yun-div>
         <yun-div :font-style="[24]" :ske-w="400" :ske-h="35">系统<span style="color:#999999" :style="{marginLeft: commonReturnFlexedLength(20)}">2020-2-19  11:11:21</span></yun-div>
         <yun-div :font-style="[30]" :ske-w="300" :ske-h="40" :margin-v="[5,0,0,0]">用户关注了你！</yun-div>
         <yun-div :font-style="[30]" :ske-w="300" :ske-h="40" :margin-v="[5,0,0,0]">用户关注了你！</yun-div>

components/moblie/userCardBig.vue

@@ -24,22 +24,22 @@
           src=""
           src=""
           ></yun-img>
           ></yun-img>
           <yun-div
           <yun-div
-          :margin-v="[0,25]"
+          :style="{marginLeft: commonReturnFlexedLength(25)}"
           :height-v="102"
           :height-v="102"
           :flex-v="['column','space-between','flex-start']"
           :flex-v="['column','space-between','flex-start']"
           >
           >
             <yun-div :font-style="[36,36]" :ske-w="150" :ske-h="50">激动啊</yun-div>
             <yun-div :font-style="[36,36]" :ske-w="150" :ske-h="50">激动啊</yun-div>
-            <yun-div :font-style="[24,36,500,'#999999']" :ske-h="40">设计的力量</yun-div>
+            <yun-div :font-style="[24,36,400,'#999999']" :width-v="400" :no-wrap="true" :ske-h="40">设计设计的力量设计的力量的力量设计的力量</yun-div>
           </yun-div>
           </yun-div>
         </yun-div>
         </yun-div>
         <yun-div
         <yun-div
           :height-v="102"
           :height-v="102"
-          :font-style="[24,36,500,'#999999','left']"
+          :font-style="[24,36,400,'#999999','left']"
           :flex-v="['row','flex-start','center']"
           :flex-v="['row','flex-start','center']"
         >
         >
           账号资料
           账号资料
           <yun-icon
           <yun-icon
-            :margin-v="[0,0,0,15]"
+            :style="{marginLeft:commonReturnFlexedLength(15)}"
             name="left_arrow"
             name="left_arrow"
           ></yun-icon>
           ></yun-icon>
         </yun-div>
         </yun-div>
@@ -53,7 +53,7 @@
         >
         >
           <yun-div
           <yun-div
             :ske-h="60"
             :ske-h="60"
-            :font-style="[24,36,500,'#999999','center']"
+            :font-style="[24,36,400,'#999999','center']"
           >
           >
             关注
             关注
           </yun-div>
           </yun-div>
@@ -66,7 +66,7 @@
         >
         >
           <yun-div
           <yun-div
             :ske-h="60"
             :ske-h="60"
-            :font-style="[24,36,500,'#999999','center']"
+            :font-style="[24,36,400,'#999999','center']"
           >
           >
             人气
             人气
           </yun-div>
           </yun-div>
@@ -79,7 +79,7 @@
         >
         >
           <yun-div
           <yun-div
             :ske-h="60"
             :ske-h="60"
-            :font-style="[24,36,500,'#999999','center']"
+            :font-style="[24,36,400,'#999999','center']"
           >
           >
             粉丝
             粉丝
           </yun-div>
           </yun-div>
@@ -100,7 +100,7 @@
   import commonMixin from "./commonMixin";
   import commonMixin from "./commonMixin";
   export default {
   export default {
     mixins:[commonMixin],
     mixins:[commonMixin],
-        name: "userCardBig"
+    name: "userCardBig"
     }
     }
 </script>
 </script>
 
 

dev-schedule__xb.md

@@ -2,5 +2,5 @@
 
 
 + 消息卡片(1)✅
 + 消息卡片(1)✅
 + 用户卡片大(1)✅
 + 用户卡片大(1)✅
-+ 个人资料项目卡片(1)
-+ 空卡片(1)
++ 个人资料项目卡片(1)✅
++ 空卡片(1)✅