Merge branch 'master' of coding.yundingshuyuan.com:yunshen/beyond-clouds-frontM

components/moblie/nav.vue

 <template>
   <yun-div
     :height-v="76"
+    :width-v="750"
     bg-color-v="#fff"
     :border-v="[1,'solid','#EFEFEF','bottom']"
-    :extend-style="{overflow: 'visible',position:'relative'}"
+    :extend-style="{overflow: 'visible'}"
   >
     <yun-div
-      :width-v="610"
+      :width-v="showRight ? 610 : 750"
       :height-v="96"
-      :ske-h="76"
-      :ske-w="610"
-      :margin-v="[0,140,0,0]"
-      :flex-v="['row','flex-start','flex-start']"
-      :font-style="[28,36,400,'#999','left']"
+      :show-ske="false"
       :extend-style="{overflowX: 'auto'}"
     >
       <yun-div
-        :no-flex-shrink="true"
-        :padding-v="[20,0,0,40]"
-        v-for="(item, index) in navList"
-        :flex-v="['column','flex-start','center']"
-        :key="item.id"
+        :show-ske="false"
+        :flex-v="['row','flex-start','flex-start']"
+        :font-style="[28,36,400,'#999','left']"
+        :extend-style="{overflowX: 'visible'}"
       >
-        <nuxt-link
-          style="color: #999;"
-          :to="path ? {path: path, query: {type: item.id}} : {path: item.path}"
-        >
-          {{item.label}}
-        </nuxt-link>
         <yun-div
-          :width-v="16"
-          :height-v="4"
-          :border-r="[2,2,0,0]"
-          :margin-v="[16,0,0]"
-          :bg-color-v="(item.id === actived || item.path === actived) ? '#00AAE6' : '#fff'">
+          :no-flex-shrink="true"
+          :padding-v="[20,0,0,40]"
+          v-for="(item, index) in navList"
+          :flex-v="['column','flex-start','center']"
+          :key="item.id"
+        >
+          <nuxt-link
+            style="color: #999;"
+            :to="path ? {path: path, query: {type: item.id}} : {path: item.path}"
+          >
+            {{item.label}}
+          </nuxt-link>
+          <yun-div
+            :width-v="16"
+            :height-v="4"
+            :border-r="[2,2,0,0]"
+            :margin-v="[16,0,0]"
+            :bg-color-v="(item.id === actived || item.path === actived) ? '#00AAE6' : '#fff'">
+          </yun-div>
         </yun-div>
       </yun-div>
     </yun-div>
     <yun-div
+      v-if="showRight"
       :height-v="76"
       :width-v="140"
-      :ske-h="76"
+      :show-ske="false"
       :font-style="[28,76,400,'#666','center']"
       bg-color-v="#fff"
       :extend-style="{position: 'absolute',right:0,top:0,overflow: 'visible'}"
@@ -49,8 +54,8 @@
       <yun-div
         v-else
         :extend-style="{
-        boxShadow: '-28px -0px 40px -22px rgba(0,0,0,.2) inset',
-        position:'relative',overflow: 'visible'}"
+          boxShadow: '-28px -0px 40px -22px rgba(0,0,0,.2) inset',
+          position:'relative',overflow: 'visible'}"
       >
         <yun-div :flex-v="['row','center','center']">
           <span v-tap="handleSort">{{sortWay}}</span>
@@ -69,9 +74,9 @@
           bg-color-v="#F8F9F9"
           :border-r="[0,0,8,8]"
           :extend-style="{
-              position:'absolute',
-              right:0,top:commonReturnFlexedLength(76),
-              zIndex: headerZIndex}"
+                position:'absolute',
+                right:0,top:commonReturnFlexedLength(76),
+                zIndex: headerZIndex}"
         >
           <yun-div v-for="(item,index) in sortList" :key="item">
             <span class="sortLabel" v-tap="() =>handleSortWay(item)">{{item}}</span>
@@ -94,6 +99,10 @@ export default {
     sort: {
       type: Boolean,
       default: true
+    },
+    showRight: {
+      type: Boolean,
+      default: true
     }
   },
   data() {

pages/personal-center/home/answer.vue

+<template>
+  <yun-div>
+    <answer-card></answer-card>
+  </yun-div>
+
+</template>
+
+<script>
+  import answerCard from '../../../components/moblie/answerCard'
+  export default {
+    name: "answer",
+    components:{
+      answerCard
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

pages/personal-center/home/blog.vue

+<template>
+  <yun-div>
+    <project-card></project-card>
+
+  </yun-div>
+</template>
+
+<script>
+  import projectCard from '../../../components/moblie/projectCard'
+  export default {
+    name: "blog",
+    components:{
+      projectCard
+
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

pages/personal-center/home/project.vue

+<template>
+    <yun-div>
+      <project-card></project-card>
+
+    </yun-div>
+</template>
+
+<script>
+  import projectCard from '../../../components/moblie/projectCard'
+    export default {
+        name: "project",
+      components:{
+          projectCard
+
+      }
+    }
+</script>
+
+<style scoped>
+
+</style>

pages/personal-center/home/question.vue

+<template>
+    <yun-div>
+      <answer-card></answer-card>
+    </yun-div>
+</template>
+
+<script>
+  import answerCard from '../../../components/moblie/answerCard'
+    export default {
+        name: "question",
+      components: {
+          answerCard
+        }
+    }
+</script>
+
+<style scoped>
+
+</style>

pages/personal-center/home/topic.vue

+<template>
+  <yun-div>
+    <topic-card></topic-card>
+  </yun-div>
+    
+</template>
+
+<script>
+  import topicCard from '../../../components/moblie/topicCard'
+    export default {
+        name: "topic",
+      components:{
+          topicCard
+      }
+    }
+</script>
+
+<style scoped>
+
+</style>

pages/personal-center/index.vue

@@ -7,7 +7,7 @@
     ></user-card-big>
     <yun-div
       :margin-v="[15,0,0,0]">
-      <data-card title="我的消息"></data-card>
+      <data-card title="我的消息" right="3"></data-card>
     </yun-div>
     <yun-div
       bg-color-v="white"

pages/personal-center/like.vue

@@ -51,3 +51,4 @@ export default {
 <style lang="scss" scoped>
 
 </style>
+

pages/u/_id/_select.vue

+<template>
+  <yun-div>
+    <yun-div :margin-v="[0,0,20]">
+      <user-card-big></user-card-big>
+    </yun-div>
+    <Nav :show-right="false" :nav-list="navList" :path="path"></Nav>
+    <project-card></project-card>
+    <project-card></project-card>
+    <project-card></project-card>
+    <project-card></project-card>
+  </yun-div>
+</template>
+
+<script>
+import UserCardBig from "../../../components/moblie/userCardBig";
+import commonMixin from "../../../components/moblie/commonMixin";
+import Nav from "../../../components/moblie/nav";
+import ProjectCard from "../../../components/moblie/projectCard";
+export default {
+  mixins: [commonMixin],
+  components: {ProjectCard, Nav, UserCardBig},
+  data() {
+    return {
+      // 获取用户id
+      id: 12,
+      number: 32
+    }
+  },
+  computed: {
+    navList: function () {
+      return [
+        {
+          label: `项目·${this.number}`,
+          id: 'project'
+        },
+        {
+          label: `博客·${this.number}`,
+          id: 'blog'
+        },
+        {
+          label: `提问·${this.number}`,
+          id: 'answer'
+        },
+        {
+          label: `回答·${this.number}`,
+          id: 'myAnswer'
+        },
+        {
+          label: `动态·${this.number}`,
+          id: 'dynamic'
+        },
+        {
+          label: `话题·${this.number}`,
+          id: 'topic'
+        },
+      ]
+    },
+    path: function () {
+      return `/u/${this.id}`
+    }
+  }
+}
+</script>
+
+<style>
+
+</style>