vux

www/vue/config/index.js

@@ -24,7 +24,7 @@ module.exports = {
   dev: {
     env: require('./dev.env'),
     port: 8080,
-    autoOpenBrowser: false,
+    autoOpenBrowser: true,
     assetsSubDirectory: 'static',
     assetsPublicPath: '/',
     proxyTable: {

www/vue/src/App.vue

@@ -2,7 +2,6 @@
   <div id="app">
     <div class="router-view">
       <router-view></router-view>
-      <navigation></navigation>
     </div>
   </div>
 </template>

www/vue/src/components/home.vue

@@ -1,32 +1,31 @@
 <template>
   <div class="home">
-    <scroller lock-x scrollbar-y>
-      <div>
-        <swiper></swiper>
-        <div class='home-img-1'>
-          <img :src='homeImg1' alt="">
-          <div class="home-nav">
-            <!--品牌-->
-            <div class=""></div>
-            <!--管家-->
-            <div class=""></div>
-            <!--证件-->
-            <div class=""></div>
-            <!--工具-->
-            <div class=""></div>
-            <!--赔退-->
-            <div class=""><a href="http://commontest.yiguanjia.me/webapp/o2o/module/pay/"></a></div>
-          </div>
+    <div>
+      <swiper></swiper>
+      <div class='home-img-1'>
+        <img :src='homeImg1' alt="">
+        <div class="home-nav">
+          <!--品牌-->
+          <div class=""></div>
+          <!--管家-->
+          <div class=""></div>
+          <!--证件-->
+          <div class=""></div>
+          <!--工具-->
+          <div class=""></div>
+          <!--赔退-->
+          <div class=""><a href="http://commontest.yiguanjia.me/webapp/o2o/module/pay/"></a></div>
         </div>
-        <homeList></homeList>
       </div>
-    </scroller>
+      <homeList></homeList>
+    </div>
+    <navigation></navigation>
   </div>
 </template>
 
 <script>
   import {mapState, mapActions} from 'vuex'
-  import {XSwitch, Scroller} from 'vux'
+  import {XSwitch} from 'vux'
   export default {
     name: 'home',
     data () {
@@ -35,8 +34,7 @@
       }
     },
     components: {
-      XSwitch,
-      Scroller
+      XSwitch
     },
     ready () {
       this.$nextTick(() => {

www/vue/src/components/mine.vue

@@ -7,34 +7,30 @@
 			</li>
 		</ul>
 		<button v-on:click="btn(usid)" :data-value="usid">点击</button>
-	</div>
+    <navigation></navigation>
+  </div>
 </template>
 <script type="text/javascript">
-  import { mapState, mapActions } from 'vuex'
+  import { mapActions } from 'vuex'
   export default({
     data () {
       return {
-        usid: this.$store.state.user.userInfo.id
+        usid: this.$store.state.user.userInfo.id,
+        products: this.$store.state.product.products
       }
     },
-    computed: mapState({
-      products: state => state.product.products
-    }),
-    created () {
-      this.PRODUCTLIST()
-    },
+    created () {},
     methods: {
-      ...mapActions([
-        'PRODUCTLIST'
-      ]),
+      ...mapActions([]),
       btn: function (a) {
+        console.log(this.$store.state.product.products)
       }
     }
   })
 </script>
 <style type="text/css" scoped>
 	button{
-		font-size: 3rem;
+		font-size: 2rem;
 		border:1px solid darkseagreen;
 	}
 </style>

www/vue/src/components/order.vue

@@ -5,6 +5,7 @@
       <cell title="title" value="value"></cell>
     </group>
   <h2>{{userId}}</h2>
+  <navigation></navigation>
 </div>
 </template>
 

www/vue/src/config/selectTime.js

@@ -19,6 +19,7 @@ startDate = startDateNewdt.getFullYear() + '-' + (startDateNewdt.getMonth() + 1)
 // endDate
 let endDateNewdt = new Date(Number(endArr[0]), Number(endArr[1]) - 1, Number(endArr[2]) + 14)
 endDate = endDateNewdt.getFullYear() + '-' + (endDateNewdt.getMonth() + 1) + '-' + endDateNewdt.getDate()
+
 export default {
   startDate: startDate,
   endDate: endDate,