Showing
7 changed files
with
15 additions
and
14 deletions
@@ -56,7 +56,7 @@ const component = { | @@ -56,7 +56,7 @@ const component = { | ||
56 | gender: data.gender === '1' ? 'men' : 'women', | 56 | gender: data.gender === '1' ? 'men' : 'women', |
57 | birthday: data.birthday | 57 | birthday: data.birthday |
58 | }); | 58 | }); |
59 | - }) | 59 | + }); |
60 | }, | 60 | }, |
61 | help: (req, res, next) => { | 61 | help: (req, res, next) => { |
62 | homeModel.getHelpInfo().then(helpList => { | 62 | homeModel.getHelpInfo().then(helpList => { |
@@ -91,7 +91,7 @@ const component = { | @@ -91,7 +91,7 @@ const component = { | ||
91 | page: 'feedback', | 91 | page: 'feedback', |
92 | suggestSub: true, | 92 | suggestSub: true, |
93 | noLocalCSS: true | 93 | noLocalCSS: true |
94 | - }) | 94 | + }); |
95 | }, | 95 | }, |
96 | saveFeedback: (req, res, next) => { | 96 | saveFeedback: (req, res, next) => { |
97 | let saveFeedbackPara = { | 97 | let saveFeedbackPara = { |
@@ -7,7 +7,7 @@ | @@ -7,7 +7,7 @@ | ||
7 | const orderModel = require('../models/order'); | 7 | const orderModel = require('../models/order'); |
8 | const notLoginCode = 400; | 8 | const notLoginCode = 400; |
9 | const notLoginTip = '抱歉,您暂未登录!'; | 9 | const notLoginTip = '抱歉,您暂未登录!'; |
10 | -const testUid = 8041886;//8039836; //8050882;// 测试uid | 10 | +const testUid = 8041886;// 8039836; //8050882;// 测试uid |
11 | const isBLK = 1; | 11 | const isBLK = 1; |
12 | 12 | ||
13 | const order = { | 13 | const order = { |
@@ -125,7 +125,7 @@ const order = { | @@ -125,7 +125,7 @@ const order = { | ||
125 | uid = testUid; | 125 | uid = testUid; |
126 | 126 | ||
127 | orderModel.getCoins(uid).then(result => { | 127 | orderModel.getCoins(uid).then(result => { |
128 | - //console.log(result) | 128 | + // console.log(result) |
129 | res.render('coin', { | 129 | res.render('coin', { |
130 | module: 'home', | 130 | module: 'home', |
131 | page: 'coin', | 131 | page: 'coin', |
This diff could not be displayed because it is too large.
@@ -76,8 +76,8 @@ | @@ -76,8 +76,8 @@ | ||
76 | }).then(result => { | 76 | }).then(result => { |
77 | if (result.code === 200) { | 77 | if (result.code === 200) { |
78 | this.$set('order', result.data); | 78 | this.$set('order', result.data); |
79 | - }else{ | ||
80 | - tip(result.message) | 79 | + } else { |
80 | + tip(result.message); | ||
81 | } | 81 | } |
82 | }).fail(() => { | 82 | }).fail(() => { |
83 | tip('网络错误'); | 83 | tip('网络错误'); |
@@ -94,7 +94,7 @@ | @@ -94,7 +94,7 @@ | ||
94 | } | 94 | } |
95 | }).then(success).fail(fail); | 95 | }).then(success).fail(fail); |
96 | } | 96 | } |
97 | - } | 97 | + }; |
98 | }, | 98 | }, |
99 | autoCancel(code) { | 99 | autoCancel(code) { |
100 | let _that = this; | 100 | let _that = this; |
@@ -105,7 +105,7 @@ | @@ -105,7 +105,7 @@ | ||
105 | location.href = '/home/orders?type=2'; | 105 | location.href = '/home/orders?type=2'; |
106 | } | 106 | } |
107 | }); | 107 | }); |
108 | - } | 108 | + }; |
109 | }, | 109 | }, |
110 | cancelOrder(code) { | 110 | cancelOrder(code) { |
111 | let _that = this; | 111 | let _that = this; |
@@ -119,7 +119,7 @@ | @@ -119,7 +119,7 @@ | ||
119 | } | 119 | } |
120 | }, () => { | 120 | }, () => { |
121 | tip('操作失敗'); | 121 | tip('操作失敗'); |
122 | - }) | 122 | + }); |
123 | }); | 123 | }); |
124 | }, | 124 | }, |
125 | deleteOrder(code) { | 125 | deleteOrder(code) { |
@@ -100,7 +100,7 @@ | @@ -100,7 +100,7 @@ | ||
100 | location.reload(); | 100 | location.reload(); |
101 | } | 101 | } |
102 | }); | 102 | }); |
103 | - } | 103 | + }; |
104 | }, | 104 | }, |
105 | order() { | 105 | order() { |
106 | return { | 106 | return { |
@@ -113,13 +113,13 @@ | @@ -113,13 +113,13 @@ | ||
113 | } | 113 | } |
114 | }).then(success).fail(fail); | 114 | }).then(success).fail(fail); |
115 | } | 115 | } |
116 | - } | 116 | + }; |
117 | }, | 117 | }, |
118 | cancelOrder(code) { | 118 | cancelOrder(code) { |
119 | let _that = this; | 119 | let _that = this; |
120 | 120 | ||
121 | Modal.confirm('订单取消后不能恢复,确认取消订单吗?', '', function() { | 121 | Modal.confirm('订单取消后不能恢复,确认取消订单吗?', '', function() { |
122 | - _that.order().cancel(code,(result) => { | 122 | + _that.order().cancel(code, (result) => { |
123 | if (result.code === 200) { | 123 | if (result.code === 200) { |
124 | location.reload(); | 124 | location.reload(); |
125 | } else { | 125 | } else { |
@@ -127,7 +127,7 @@ | @@ -127,7 +127,7 @@ | ||
127 | } | 127 | } |
128 | }, () => { | 128 | }, () => { |
129 | tip('操作失敗'); | 129 | tip('操作失敗'); |
130 | - }) | 130 | + }); |
131 | }); | 131 | }); |
132 | }, | 132 | }, |
133 | deleteOrder(order, index) { | 133 | deleteOrder(order, index) { |
-
Please register or login to post a comment