Merge branch 'xue' of coding.yundingshuyuan.com:yunshen/beyond-clouds-frontM into yoona

components/moblie/containerCard.vue

@@ -9,7 +9,7 @@
       :flex-v="['row','space-between','center']">
       <yun-div :flex-v="['row','flex-start','baseline']" :font-style="[30,40,500,'#2F2F2F','left']">
         <yun-div :width-v="4" :height-v="16" bg-color-v="#00AAE6" :border-r="[0,2,2,0]" :margin-v="[0,13,0,0]"></yun-div>
-        <p>社区精英</p>
+        <p>{{title}}</p>
       </yun-div>
       <yun-div :font-style="[24,32,500,'#999','left']">换一换</yun-div>
     </yun-div>
@@ -29,6 +29,9 @@ export default {
     handleMore() {
       console.log(2);
     }
+  },
+  props:{
+    title:String,
   }
 
 }

layouts/blank.vue

+<template>
+    <nuxt/>
+</template>
+
+<script>
+    export default {
+        name: "blank"
+    }
+</script>
+
+<style scoped>
+
+</style>

layouts/error.vue

+<template>
+  <yun-slider>
+    <yun-div
+      style="position: fixed;
+      top: 0;
+      left:0;
+      right:0;
+      bottom:0;"
+      width-v="100%"
+      :padding-v="[34,0,40]"
+      :flex-v="['row','center','center']"
+      slot="card"
+    >
+      <yun-div
+        v-if="true"
+        :flex-v="['column','flex-start','center']"
+      >
+        <yun-img
+          :width-v="350"
+          :src="this.error404"
+        >
+        </yun-img>
+        <yun-div
+          :font-style="[16,30,400,'black','center']"
+        :margin-v="[20,0,40,0]"
+        >加载失败，请重新尝试</yun-div>
+        <yun-button
+          :size="[148,48]"
+          :border-r="[4]"
+          :font-size="16"
+          bg-color="#75D098"
+          @click="reload"
+        >返回首页</yun-button>
+      </yun-div>
+      <yun-div
+        v-if="false"
+        :flex-v="['column','flex-start','center']"
+      >
+        <yun-img
+          :width-v="250"
+          :src="this.error500"
+        >
+        </yun-img>
+        <yun-div
+          :font-style="[16,30,400,'black','center']"
+          :margin-v="[37,0,47,0]"
+        >服务器连接异常，请稍后重试</yun-div>
+        <yun-button
+          :size="[148,48]"
+          :border-r="[4]"
+          :font-size="16"
+          bg-color="#75D098"
+          @click="close"
+        >关闭页面</yun-button>
+      </yun-div>
+
+    </yun-div>
+  </yun-slider>
+
+
+</template>
+
+<script>
+  import commonMixin from "../components/moblie/commonMixin";
+  import error404 from '../assets/svg/404.png';
+  import error500 from '../assets/svg/500.svg'
+    export default {
+      name: "error",
+      layout:'blank',
+      mixins: [commonMixin],
+      created(){
+        this.error404 = error404;
+        this.error500= error500
+      },
+      methods:{
+        close(){
+          window.opener = null;
+          window.open("http://www.baidu.com", "_self");
+          window.close();
+        },
+        reload(){
+          this.$router.replace('/')
+        }
+      }
+    }
+</script>
+
+<style scoped>
+  img {
+    display: block;
+  }
+</style>

pages/index.vue

 <template>
+  <yun-slider>
     <yun-div
       height-v="auto"
+      slot="card"
     >
+      <banner></banner>
+      <container-card
+        title="项目推荐"
+      >
+        <project-card v-for="val in 1" key="val.projectId"></project-card>
+      </container-card>
+      <container-card
+        title="最新资讯"
+      >
+        <project-card v-for="val in 1" key="val.projectId"></project-card>
+      </container-card>
+      <container-card
+        title="社区精英"
+      >
+        <project-card v-for="val in 1" key="val.projectId"></project-card>
+      </container-card>
+      <container-card
+        title="精选博文"
+      >
+        <project-card v-for="val in 1" key="val.projectId"></project-card>
+      </container-card>
+      <container-card
+        title="推荐问答"
+      >
+        <project-card v-for="val in 1" key="val.projectId"></project-card>
+      </container-card>
 
-    <project-card v-for="val in 5" key="val.projectId"></project-card>
 
 
     </yun-div>
+  </yun-slider>
 </template>
 
 <script>
 import YunButton from '../components/common/button/src/main';
 import projectCard from '../components/moblie/projectCard';
 import {getLineHeight} from "../action/utils/get-lineheight";
-
+import banner from '../components/moblie/banner';
+import containerCard from '../components/moblie/containerCard'
 export default {
   components: {
-    projectCard,YunButton
+    projectCard,YunButton,banner,containerCard
   },
   mounted() {
   },