洪海涛 před 8 roky
rodič
revize
e5864b1736

+ 4 - 4
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=03182017061604">
+  <link rel="stylesheet" id="app_css" href="http://<?php echo $host ?>/vue/dist/static/css/app.css?v=03182017061605">
   <!--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=03182017061604"></script>
+        src="http://<?php echo $host ?>/vue/dist/static/js/manifest.js?v=03182017061605"></script>
 <script type=text/javascript id="vendor"
-        src="http://<?php echo $host ?>/vue/dist/static/js/vendor.js?v=03182017061604"></script>
+        src="http://<?php echo $host ?>/vue/dist/static/js/vendor.js?v=03182017061605"></script>
 <script type=text/javascript id="appJs"
-        src="http://<?php echo $host ?>/vue/dist/static/js/app.js?v=03182017061604"></script>
+        src="http://<?php echo $host ?>/vue/dist/static/js/app.js?v=03182017061605"></script>
 
 <!--vue-end-->
 <script type="text/javascript" id="wxMain" data-sign="<?php echo @htmlentities(json_encode($signPackage)); ?>"></script>

+ 13 - 0
www/vue/src/components/CompanyProfile/brand.vue

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

+ 13 - 0
www/vue/src/components/CompanyProfile/documents.vue

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

+ 13 - 0
www/vue/src/components/CompanyProfile/housekeeper.vue

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

+ 13 - 0
www/vue/src/components/CompanyProfile/indemnity.vue

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

+ 13 - 0
www/vue/src/components/CompanyProfile/tool.vue

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

+ 2 - 2
www/vue/src/components/home.vue

@@ -3,13 +3,13 @@
       <swiper></swiper>
       <div class='home-img-1'>
         <img :src='homeImg1' alt="">
-        <!-- <div class="home-nav">
+        <div class="home-nav">
           <div class="">品牌</div>
           <div class="">管家</div>
           <div class="">证件</div>
           <div class="">工具</div>
           <div class="">赔退</div>
-        </div> -->
+        </div>
       </div>
       <homeList></homeList>
   </div>

+ 13 - 0
www/vue/src/components/myCoupon.vue

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

+ 1 - 1
www/vue/src/components/order.vue

@@ -1,6 +1,6 @@
 <template lang="html">
 <div class="order">
-  <h2>this is order component</h2>
+  <h2>order</h2>
 </div>
 </template>
 

+ 13 - 0
www/vue/src/components/recharge.vue

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

+ 2 - 2
www/vue/src/components/swiper.vue

@@ -1,8 +1,8 @@
 <template>
   <swiper :options="swiperOption" ref="mySwiper">
     <!-- slides -->
-    <swiper-slide><router-link to="/mine"><img v-bind:src='banner1'></router-link></swiper-slide>
-    <swiper-slide><router-link to="/product"><img v-bind:src='banner2'></router-link></swiper-slide>
+    <swiper-slide><router-link to="/recharge"><img v-bind:src='banner1'></router-link></swiper-slide>
+    <swiper-slide><router-link to="/myCoupon"><img v-bind:src='banner2'></router-link></swiper-slide>
     <!-- Optional controls -->
     <div class="swiper-pagination"  slot="pagination"></div>
     <!-- <div class="swiper-button-prev" slot="button-prev"></div>

+ 23 - 0
www/vue/src/main.js

@@ -18,15 +18,38 @@ Vue.use(VueAwesomeSwiper)
 const router = new VueRouter({
   routes
 })
+
 // 注册全局组件
+// 首页
 Vue.component('home', require('./components/home.vue'))
+// 首页的商品列表
 Vue.component('homeList', require('./components/homeList.vue'))
+// 商品详情
 Vue.component('product', require('./components/product.vue'))
+// 个人中心
 Vue.component('mine', require('./components/mine.vue'))
+// SAP底部导航
 Vue.component('navigation', require('./components/navigation'))
+// 轮播图
 Vue.component('swiper', require('./components/swiper'))
+// SAP顶部标题
 Vue.component('navTitle', require('./components/navTitle'))
+// 我的订单
 Vue.component('order', require('./components/order'))
+// 我的代金券
+Vue.component('myCoupon', require('./components/myCoupon'))
+// 充值
+Vue.component('recharge', require('./components/recharge'))
+// 公司品牌
+Vue.component('brand', require('./components/CompanyProfile/brand'))
+// 公司管家
+Vue.component('housekeeper', require('./components/CompanyProfile/housekeeper'))
+// 公司证件
+Vue.component('documents', require('./components/CompanyProfile/documents'))
+// 公司赔款
+Vue.component('indemnity', require('./components/CompanyProfile/indemnity'))
+// 公司工具
+Vue.component('tool', require('./components/CompanyProfile/tool'))
 
 new Vue({
   el: '#app',

+ 8 - 5
www/vue/src/router/index.js

@@ -1,7 +1,10 @@
 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: '/order', component: require('../components/order.vue')}
+  {path: '/', component: require('../components/home')},
+  {path: '/home', component: require('../components/home')},
+  {path: '/product', component: require('../components/product')},
+  {path: '/mine', component: require('../components/mine')},
+  {path: '/order', component: require('../components/order')},
+  {path: '/myCoupon', component: require('../components/myCoupon')},
+  {path: '/recharge', component: require('../components/recharge')},
+  {path: '/brand', component: require('../components/CompanyProfile/brand')}
 ]