Merge branch 'master' into 'xue'

# Conflicts:
#   .gitignore

.gitignore

@@ -89,5 +89,5 @@ sw.*
 # Vim swap files
 # Vim swap files
 *.swp
 *.swp
 
 
-#test
+# test
 /pages/test.vue
 /pages/test.vue

components/moblie/answerCard.vue

+<template>
+  <yun-slider>
+    <yun-div
+      :width-v="704"
+      :padding-v="[34,0,30]"
+      bg-color-v="#fff"
+      :margin-v="[0,'auto']"
+      :flex-v="['column','flex-start','flex-start']"
+      :border-v="[1,'solid','#EFEFEF','bottom']"
+      slot="card">
+      <yun-div
+        :flex-v="['row','flex-start','center']"
+        :font-style="[30,40,500,'#333','start']"
+        :ske-w="704"
+        :skeH="40"
+      >  <yun-div :no-wrap="true" :extend-style="{maxWidth: commonReturnFlexedLength(620)}">
+                          大家期望咱们的手机版有什么功能哇？
+          </yun-div>
+        <yun-div>
+          <yun-icon
+            :width-v="30"
+            :height-v="30"
+            :border-r="[4]"
+            :margin-v="[0,8,0,16]"
+            :padding-v="[8,8.5]"
+            bg-color-v="#FF7474"
+            name="hot"
+            :size="20"
+            color="#fff">
+          </yun-icon>
+          <yun-icon
+            :width-v="30"
+            :height-v="30"
+            :padding-v="[8,8.5]"
+            :border-r="[4]"
+            bg-color-v="#00AAE6"
+            name="top"
+            :size="20"
+            color="#fff">
+          </yun-icon>
+        </yun-div>
+
+      </yun-div>
+
+      <yun-div
+        :font-style="[20,27,500,'#666','start']"
+        :margin-v="[12,0,0]"
+        :skeW="500"
+        :skeH="40"
+      >
+        26回答
+        <span>·</span>
+        <span style="color:#75D098;">已采纳：</span>
+        <span>卸载重下就好了</span>
+      </yun-div>
+    </yun-div>
+  </yun-slider>
+</template>
+
+<script>
+import commonMixin from "./commonMixin";
+
+export default {
+  mixins: [commonMixin],
+
+}
+</script>
+
+<style scoped>
+
+</style>

dev-schedule__ghj.md

 ##dev-schedule__ghj
 ##dev-schedule__ghj
 
 
-+ 问题卡片(1)
++ 问题卡片(1) √
 + 容器卡片(1)
 + 容器卡片(1)
 + 话题卡片(1)
 + 话题卡片(1)
 + 粉丝卡片(1)
 + 粉丝卡片(1)