Merge branch 'test' of git.oschina.net:yiguanjia/php into test

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

@@ -227,7 +227,7 @@
       if (!empty($userId) && !empty($appToken)) {
         echo '
             var xyhwxUserID = localStorage.setItem("xyhwxUserID",  "' . $userId . '");
-            var xyhwxUserID = localStorage.setItem("xyhwxUserID", "' . $appToken . '");
+            var xyhwxAppToken = localStorage.setItem("xyhwxAppToken", "' . $appToken . '");
           ';
       } /*else {
           echo 'localStorage.clear();';
@@ -235,7 +235,7 @@
       ?>
 
       var userID = localStorage.getItem('xyhwxUserID');
-      var appToken = localStorage.getItem('xyhwxUserID');
+      var appToken = localStorage.getItem('xyhwxAppToken');
       if (!userID || !appToken) {
         localStorage.clear();
         location.href = '<?php echo Yii::app()->request->baseUrl . '/index.php?r=/moonclub/web/wxIndex'; ?>';

www/vue/src/components/navigation.vue

@@ -16,6 +16,11 @@
         <img slot="icon-active" :src='iconMineActive'>
         <span slot="label">我的</span>
       </tabbar-item>
+      <tabbar-item link="/userCoupon">
+        <img slot="icon" :src='iconMine'>
+        <img slot="icon-active" :src='iconMineActive'>
+        <span slot="label">优惠券</span>
+      </tabbar-item>
     </tabbar>
     <!--<div class="r_l">-->
       <!--<router-link to="/" :style="{color:'#b08639'}"><img :src='iconHomeActive'>首页</router-link>-->

www/vue/src/config/config.js

@@ -43,10 +43,10 @@ if (test) {
 // 判断是否为dev开发
 if (uri.indexOf('http://localhost:8080/') > -1) {
   apiPath = ''
-  userId = '57e238929f5160d6048b456d'
+  userId = '57e38f1b9f5160ac048b457d'
 } else if (uri.indexOf('common.yiguanjiadev.me') > -1) {
   apiPath = 'http://common.yiguanjiadev.me/index.php?r='
-  userId = '57e238929f5160d6048b456d'
+  userId = '57e38f1b9f5160ac048b457d'
 }
 
 axios.defaults.baseURL = apiPath

www/vue/src/router/index.js

@@ -8,6 +8,7 @@ export default[
   {path: '/order', name: 'order', component: require('../components/order')},
   {path: '/orderInfo', component: require('../components/orderInfo')},
   {path: '/completeOrder', component: require('../components/completeOrder')},
+  {path: '/userCoupon', component: require('../components/userCoupon')},
   {path: '/myCoupon', name: 'myCoupon', component: require('../components/myCoupon')},
   {path: '/recharge', name: 'recharge', component: require('../components/recharge')},
   {path: '/brand', name: 'brand', component: require('../components/CompanyProfile/brand')},

www/webapp/moonclub/views/index/index.php

@@ -51,7 +51,7 @@
     var ua = navigator.userAgent.toLowerCase();
 
     if (ua.match(/MicroMessenger/i) == 'micromessenger') {
-      var userID = getCookie("wxUserID");
+      var userID = getCookie("xyhwxUserID");
       if (!userID) {
         location.href = '<?php echo Yii::app()->request->baseUrl."/login/wxOpen&redirect_uri=".$current_uri; ?>';
       }