north 8 years ago
parent
commit
475fbc6b58

+ 5 - 0
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>-->

File diff suppressed because it is too large
+ 216 - 0
www/vue/src/components/userCoupon.vue


+ 2 - 2
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

+ 1 - 0
www/vue/src/router/index.js

@@ -7,6 +7,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')},

Some files were not shown because too many files changed in this diff