Authored by 陈峰

commit

@@ -171,6 +171,7 @@ export default { @@ -171,6 +171,7 @@ export default {
171 font-size: 22px; 171 font-size: 22px;
172 color: #b0b0b0; 172 color: #b0b0b0;
173 position: relative; 173 position: relative;
  174 + white-space: initial;
174 175
175 .type-shop, 176 .type-shop,
176 .type-activity, 177 .type-activity,
1 import Vue from 'vue'; 1 import Vue from 'vue';
2 import Components from './components'; 2 import Components from './components';
3 -import Ufo from './ufo'; 3 +import Order from './order';
4 import Coupon from './coupon'; 4 import Coupon from './coupon';
5 5
6 Components.forEach(component => Vue.component(component.name, component)); 6 Components.forEach(component => Vue.component(component.name, component));
7 7
8 -  
9 -export default [...Ufo, ...Coupon]; 8 +export default [...Order, ...Coupon];
  1 +import UfoOrder from './ufo';
  2 +
  3 +export default [...UfoOrder];
1 export default [{ 1 export default [{
2 - path: '/ufo/order/:orderId(\\d+)', 2 + path: '/order/ufo/:orderId(\\d+)',
3 name: 'order', 3 name: 'order',
4 component: () => import(/* webpackChunkName: "order" */ './order') 4 component: () => import(/* webpackChunkName: "order" */ './order')
5 }]; 5 }];
1 -import Order from './order';  
2 -  
3 -export default [...Order];  
1 -<template>  
2 - <LayoutApp>  
3 - <div class="order-page">  
4 - <div class="title">优惠券</div>  
5 - </div>  
6 - </div>  
7 - </LayoutApp>  
8 -</template>  
9 -  
10 -<script>  
11 -export default {  
12 - name: 'OrderPage',  
13 -};  
14 -</script>  
15 -  
16 -<style lang="scss" scoped>  
17 -  
18 -</style>  
1 -export default [{  
2 - path: '/yoho/coupon',  
3 - name: 'coupon',  
4 - component: () => import(/* webpackChunkName: "coupon" */ './coupon')  
5 -}];  
1 -import Coupon from './coupon';  
2 -  
3 -export default [...Coupon];  
@@ -11,9 +11,9 @@ const isTest = process.env.NODE_ENV === 'test3'; @@ -11,9 +11,9 @@ const isTest = process.env.NODE_ENV === 'test3';
11 11
12 const domains = { 12 const domains = {
13 13
14 - // api: 'http://api.yoho.cn/',  
15 - // service: 'http://service.yoho.cn/',  
16 - // ufo: 'http://java-yohoufo-fore.test3.ingress.dev.yohocorp.com/ufo-gateway/', 14 + api: 'http://api.yoho.cn/',
  15 + service: 'http://service.yoho.cn/',
  16 + ufo: 'http://java-yohoufo-fore.test3.ingress.dev.yohocorp.com/ufo-gateway/',
17 17
18 // liveApi: 'http://testapi.live.yohops.com:9999/', 18 // liveApi: 'http://testapi.live.yohops.com:9999/',
19 // singleApi: 'http://api-test3.yohops.com:9999/', 19 // singleApi: 'http://api-test3.yohops.com:9999/',
@@ -24,16 +24,16 @@ const domains = { @@ -24,16 +24,16 @@ const domains = {
24 24
25 // platformApi: 'http://172.16.6.210:8088/', 25 // platformApi: 'http://172.16.6.210:8088/',
26 26
27 - api: 'http://api-test3.dev.yohocorp.com/',  
28 - service: 'http://api-test3.dev.yohocorp.com/',  
29 - ufo: 'http://java-yohoufo-fore.test3.ingress.dev.yohocorp.com/ufo-gateway/', 27 + // api: 'http://api-test3.dev.yohocorp.com/',
  28 + // service: 'http://api-test3.dev.yohocorp.com/',
  29 + // ufo: 'http://java-yohoufo-fore.test3.ingress.dev.yohocorp.com/ufo-gateway/',
30 }; 30 };
31 31
32 module.exports = { 32 module.exports = {
33 app: 'h5', 33 app: 'h5',
34 appVersion: '6.6.0', // 调用api的版本 34 appVersion: '6.6.0', // 调用api的版本
35 appName: 'yohoapp-node', 35 appName: 'yohoapp-node',
36 - port: 6003, 36 + port: 6001,
37 siteUrl: '//m.yohobuy.com', 37 siteUrl: '//m.yohobuy.com',
38 assetUrl: '//localhost:5001/yohoapp-node/', 38 assetUrl: '//localhost:5001/yohoapp-node/',
39 testCode: 'yoho4946abcdef#$%&!@', 39 testCode: 'yoho4946abcdef#$%&!@',
@@ -4,7 +4,7 @@ module.exports = [ @@ -4,7 +4,7 @@ module.exports = [
4 cache: true 4 cache: true
5 }, 5 },
6 { 6 {
7 - route: /ufo\/order/, 7 + route: /order\/ufo/,
8 cache: true, 8 cache: true,
9 cackeKey: '$url$params', 9 cackeKey: '$url$params',
10 cacheTime: 10 10 cacheTime: 10