home

www/protected/modules/o2o/views/web/index.php

@@ -20,7 +20,7 @@
   </style>
 
   <!--vue-->
-  <link rel="stylesheet" id="app_css" href="http://<?php echo $host ?>/vue/dist/static/css/app.css?v=03182017061602">
+  <link rel="stylesheet" id="app_css" href="http://<?php echo $host ?>/vue/dist/static/css/app.css?v=03182017061603">
   <!--vue_end-->
   <script type="text/javascript" src="https://code.jquery.com/jquery-2.2.0.min.js"></script>
   <script type="text/javascript" src="https://dn-bughd-web.qbox.me/bughd.min.js" crossOrigin="anonymous"></script>
@@ -34,11 +34,11 @@
 <!--vue-->
 <div id=app></div>
 <script type=text/javascript id="manifest"
-        src="http://<?php echo $host ?>/vue/dist/static/js/manifest.js?v=03182017061602"></script>
+        src="http://<?php echo $host ?>/vue/dist/static/js/manifest.js?v=03182017061603"></script>
 <script type=text/javascript id="vendor"
-        src="http://<?php echo $host ?>/vue/dist/static/js/vendor.js?v=03182017061602"></script>
+        src="http://<?php echo $host ?>/vue/dist/static/js/vendor.js?v=03182017061603"></script>
 <script type=text/javascript id="appJs"
-        src="http://<?php echo $host ?>/vue/dist/static/js/app.js?v=03182017061602"></script>
+        src="http://<?php echo $host ?>/vue/dist/static/js/app.js?v=03182017061603"></script>
 
 <!--vue-end-->
 <script type="text/javascript" id="wxMain" data-sign="<?php echo @htmlentities(json_encode($signPackage)); ?>"></script>

www/vue/src/components/homeList.vue

@@ -20,7 +20,7 @@ export default {
     return {
       productIcon: [
         {
-          name: '母婴房除螨杀菌',
+          name: '母婴房',
           url: 'http://oduj3utzz.bkt.clouddn.com/home-mother-child.png',
           color: '#a6dc48'
         },
@@ -51,7 +51,7 @@ export default {
         },
         {
           name: '擦玻璃',
-          url: 'http://oduj3utzz.bkt.clouddn.com/home-glass.png',
+          url: 'http://oduj3utzz.bkt.clouddn.com/home-ca-bo-li.png',
           color: '#70df68'
         },
         {
@@ -77,19 +77,21 @@ export default {
     padding: 5%;
   }
   .home-list ul li{
-    width: 21%;
-    margin: 5px;
+    width: 25%;
     font-size: 13px;
     list-style: none;
+    margin: 10px 0;
+    color: #212121;
   }
   .product-icon{
-    width: 100%;
+    width: 85%;
+    margin: 0 auto;
     border-radius: 15px;
     padding: 15px 0;
   }
   .product-icon img{
     display: block;
-    width: 50%;
+    width:65%;
     margin: 0 auto;
   }
 </style>

www/vue/src/components/mine.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="mine">
-		<h1>mine</h1>
+		<h1>this is mine component</h1>
 	  <ul>
 			<li v-for="item in products" >
 				{{item.name}}

www/vue/src/components/navigation.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="navigation">
-    <div class="r_l"><router-link to="/"><img :src='iconHome'>首页</router-link></div>
-    <div class="r_l"><router-link to="/product"><img :src='iconOrder'>订单</router-link></div>
+    <div class="r_l"><router-link to="/" :style="{color:'#b08639'}"><img :src='iconHomeActive'>首页</router-link></div>
+    <div class="r_l"><router-link to="/order"><img :src='iconOrder'>订单</router-link></div>
     <div class="r_l"><router-link to="/mine"><img :src='iconMine'>我的</router-link></div>
     <div class="clear"></div>
   </div>

www/vue/src/components/order.vue

@@ -0,0 +1,13 @@
+<template lang="html">
+<div class="order">
+  <h2>this is order component</h2>
+</div>
+</template>
+
+<script>
+export default {
+}
+</script>
+
+<style lang="css">
+</style>

www/vue/src/main.js

@@ -26,6 +26,7 @@ Vue.component('mine', require('./components/mine.vue'))
 Vue.component('navigation', require('./components/navigation'))
 Vue.component('swiper', require('./components/swiper'))
 Vue.component('navTitle', require('./components/navTitle'))
+Vue.component('order', require('./components/order'))
 
 new Vue({
   el: '#app',

www/vue/src/router/index.js

@@ -2,5 +2,6 @@ export default[
   {path: '/', component: require('../components/home.vue')},
   {path: '/home', component: require('../components/home.vue')},
   {path: '/product', component: require('../components/product.vue')},
-  {path: '/mine', component: require('../components/mine.vue')}
+  {path: '/mine', component: require('../components/mine.vue')},
+  {path: '/order', component: require('../components/order.vue')}
 ]