Merge branch 'XK_USER_INDEX_UPDATE20190613' into Development

src/views/common/Navigator.vue

 <template>
 <template>
     <div class="navigator">
     <div class="navigator">
         <ul class="boxsiz">
         <ul class="boxsiz">
-            <li class="curr">
+            <li :class="{'curr':(typeVal==1)}">
                 <a href="/v3?ptag=index-bottomnav">
                 <a href="/v3?ptag=index-bottomnav">
                     <i class="iconfont icon-shouye-1"></i>
                     <i class="iconfont icon-shouye-1"></i>
                     <p>首页</p>
                     <p>首页</p>
                 </a>
                 </a>
             </li>
             </li>
-            <li>
+            <li :class="{'curr':(typeVal==2)}">
                 <a href="/h5/view/#/xianhuo?ptag=selfshop-bottomnav">
                 <a href="/h5/view/#/xianhuo?ptag=selfshop-bottomnav">
                     <i class="iconfont icon-ziying"></i>
                     <i class="iconfont icon-ziying"></i>
                     <p>自营商城</p>
                     <p>自营商城</p>
                 </a>
                 </a>
             </li>
             </li>
-            <li>
+            <li :class="{'curr':(typeVal==3)}">
                 <a href="/h5/view/#/lxshop?ptag=lxshop-bottomnav">
                 <a href="/h5/view/#/lxshop?ptag=lxshop-bottomnav">
                     <i class="iconfont icon-lianying"></i>
                     <i class="iconfont icon-lianying"></i>
                     <p>联营商城</p>
                     <p>联营商城</p>
                 </a>
                 </a>
             </li>
             </li>
-            <li>
+            <li :class="{'curr':(typeVal==4)}">
                 <a href="/h5/view/#/joincart?ptag=shopcar-bottomnav">
                 <a href="/h5/view/#/joincart?ptag=shopcar-bottomnav">
                     <i class="iconfont icon-gouwuche2"></i>
                     <i class="iconfont icon-gouwuche2"></i>
                     <p>购物车</p>
                     <p>购物车</p>
                     <span class="cart boxsiz">{{cartCount>99 ?'99+': cartCount}}</span>
                     <span class="cart boxsiz">{{cartCount>99 ?'99+': cartCount}}</span>
                 </a>
                 </a>
             </li>
             </li>
-            <li>
+            <li :class="{'curr':(typeVal==5)}">
                 <a href="/v3/user?ptag=index-bottomnav">
                 <a href="/v3/user?ptag=index-bottomnav">
                     <i class="iconfont icon-huiyuanzhongxin1"></i>
                     <i class="iconfont icon-huiyuanzhongxin1"></i>
                     <p>会员中心</p>
                     <p>会员中心</p>
@@ -41,6 +41,12 @@
 
 
   export default {
   export default {
     name: 'navigator',
     name: 'navigator',
+    props: {
+          typeVal: {
+              type: Number,
+              default: 1
+          },
+    },
     computed: mapState({
     computed: mapState({
       cartCount: state => state.common.cartCount
       cartCount: state => state.common.cartCount
     }),
     }),

src/views/user/index.vue

@@ -54,7 +54,7 @@
 
 
         </ul>
         </ul>
         <a href="javascript:void('0')" class="loginLayoutx" v-if="ismini"  @click="goOut">退出登录</a>
         <a href="javascript:void('0')" class="loginLayoutx" v-if="ismini"  @click="goOut">退出登录</a>
-        <Navigator></Navigator>
+        <Navigator :typeVal="typeVal"></Navigator>
         <van-loading type="spinner" color="#000" class="loading-background" v-if="loading"/>
         <van-loading type="spinner" color="#000" class="loading-background" v-if="loading"/>
     </section>
     </section>
 </template>
 </template>
@@ -71,6 +71,7 @@
         data() {
         data() {
             return {
             return {
                 qqurl_:productionUrlApi+'login/qq',
                 qqurl_:productionUrlApi+'login/qq',
+                typeVal:5,
                 ismini:true
                 ismini:true
             }
             }
         },
         },