Showing
4 changed files
with
52 additions
and
23 deletions
@@ -127,7 +127,8 @@ export default { | @@ -127,7 +127,8 @@ export default { | ||
127 | appop: this.appOp().pay, | 127 | appop: this.appOp().pay, |
128 | param: { | 128 | param: { |
129 | ORD_NUM: this.orderCode, | 129 | ORD_NUM: this.orderCode, |
130 | - PAY_TYPE: 1 | 130 | + PAY_TYPE: 1, |
131 | + ORD_TYPE: this.appOp().type | ||
131 | }, | 132 | }, |
132 | }, | 133 | }, |
133 | }); | 134 | }); |
@@ -185,19 +186,29 @@ export default { | @@ -185,19 +186,29 @@ export default { | ||
185 | case 'sell': { | 186 | case 'sell': { |
186 | return { | 187 | return { |
187 | pay: 'XY_UFO_SALE_PAY', | 188 | pay: 'XY_UFO_SALE_PAY', |
188 | - result: 'XY_UFO_SALE_PAY_RES' | 189 | + result: 'XY_UFO_SALE_PAY_RES', |
190 | + type: 1, | ||
189 | }; | 191 | }; |
190 | } | 192 | } |
191 | case 'buy': { | 193 | case 'buy': { |
192 | return { | 194 | return { |
193 | - pay: 'XY_UFO_SC_PAY', | ||
194 | - result: 'XY_UFO_SC_PAY_RES' | 195 | + pay: 'XY_UFO_SALE_PAY', |
196 | + result: 'XY_UFO_SALE_PAY_RES', | ||
197 | + type: 2, | ||
195 | }; | 198 | }; |
196 | } | 199 | } |
197 | case 'qiugou_buy': { | 200 | case 'qiugou_buy': { |
198 | return { | 201 | return { |
199 | - pay: 'XY_UFO_WTBUY_PAY', | ||
200 | - result: 'XY_UFO_WTBUY_PAY_RES' | 202 | + pay: 'XY_UFO_SALE_PAY', |
203 | + result: 'XY_UFO_SALE_PAY_RES', | ||
204 | + type: 3 | ||
205 | + }; | ||
206 | + } | ||
207 | + case 'bianxian': { | ||
208 | + return { | ||
209 | + pay: 'XY_UFO_SALE_PAY', | ||
210 | + result: 'XY_UFO_SALE_PAY_RES', | ||
211 | + type: 4 | ||
201 | }; | 212 | }; |
202 | } | 213 | } |
203 | default: { | 214 | default: { |
@@ -186,19 +186,29 @@ export default { | @@ -186,19 +186,29 @@ export default { | ||
186 | case 'sell': { | 186 | case 'sell': { |
187 | return { | 187 | return { |
188 | pay: 'XY_UFO_SALE_PAY', | 188 | pay: 'XY_UFO_SALE_PAY', |
189 | - result: 'XY_UFO_SALE_PAY_RES' | 189 | + result: 'XY_UFO_SALE_PAY_RES', |
190 | + type: 1, | ||
190 | }; | 191 | }; |
191 | } | 192 | } |
192 | case 'buy': { | 193 | case 'buy': { |
193 | return { | 194 | return { |
194 | - pay: 'XY_UFO_SC_PAY', | ||
195 | - result: 'XY_UFO_SC_PAY_RES' | 195 | + pay: 'XY_UFO_SALE_PAY', |
196 | + result: 'XY_UFO_SALE_PAY_RES', | ||
197 | + type: 2, | ||
196 | }; | 198 | }; |
197 | } | 199 | } |
198 | case 'qiugou_buy': { | 200 | case 'qiugou_buy': { |
199 | return { | 201 | return { |
200 | - pay: 'XY_UFO_WTBUY_PAY', | ||
201 | - result: 'XY_UFO_WTBUY_PAY_RES' | 202 | + pay: 'XY_UFO_SALE_PAY', |
203 | + result: 'XY_UFO_SALE_PAY_RES', | ||
204 | + type: 3 | ||
205 | + }; | ||
206 | + } | ||
207 | + case 'bianxian': { | ||
208 | + return { | ||
209 | + pay: 'XY_UFO_SALE_PAY', | ||
210 | + result: 'XY_UFO_SALE_PAY_RES', | ||
211 | + type: 4 | ||
202 | }; | 212 | }; |
203 | } | 213 | } |
204 | default: { | 214 | default: { |
@@ -220,7 +230,8 @@ export default { | @@ -220,7 +230,8 @@ export default { | ||
220 | ORD_NUM: this.orderCode, | 230 | ORD_NUM: this.orderCode, |
221 | PAY_TYPE: 1, | 231 | PAY_TYPE: 1, |
222 | PAY_RES: 1, | 232 | PAY_RES: 1, |
223 | - ORDER_AMOUNT: this.price | 233 | + ORDER_AMOUNT: this.price, |
234 | + ORD_TYPE: this.appOp().type | ||
224 | }, | 235 | }, |
225 | }, | 236 | }, |
226 | }); | 237 | }); |
@@ -234,7 +245,8 @@ export default { | @@ -234,7 +245,8 @@ export default { | ||
234 | ORD_NUM: this.orderCode, | 245 | ORD_NUM: this.orderCode, |
235 | PAY_TYPE: 1, //1支付宝支付,2微信支付 | 246 | PAY_TYPE: 1, //1支付宝支付,2微信支付 |
236 | PAY_RES: 0, //0支付失败,1支付成功 | 247 | PAY_RES: 0, //0支付失败,1支付成功 |
237 | - ORDER_AMOUNT: this.price | 248 | + ORDER_AMOUNT: this.price, |
249 | + ORD_TYPE: this.appOp().type | ||
238 | }, | 250 | }, |
239 | }, | 251 | }, |
240 | }); | 252 | }); |
@@ -142,7 +142,7 @@ export default { | @@ -142,7 +142,7 @@ export default { | ||
142 | this.sellerPublish({price: this.price, skup: this.skup, address_id: this.addressInfo.address_id}) | 142 | this.sellerPublish({price: this.price, skup: this.skup, address_id: this.addressInfo.address_id}) |
143 | .then((res) => { | 143 | .then((res) => { |
144 | 144 | ||
145 | - if (res && res.code && res.code == 200) { | 145 | + if (res && res.code && res.code === 200) { |
146 | this.$createToast({ | 146 | this.$createToast({ |
147 | time: 1000, | 147 | time: 1000, |
148 | type: 'txt', | 148 | type: 'txt', |
@@ -169,7 +169,7 @@ export default { | @@ -169,7 +169,7 @@ export default { | ||
169 | this.sellerPublish({price: this.price, skup: this.skup, address_id: this.addressInfo.address_id}) | 169 | this.sellerPublish({price: this.price, skup: this.skup, address_id: this.addressInfo.address_id}) |
170 | .then((res) => { | 170 | .then((res) => { |
171 | 171 | ||
172 | - if (res && res.code && res.code == 200) { | 172 | + if (res && res.code && res.code === 200) { |
173 | this.payOrder(); | 173 | this.payOrder(); |
174 | } else { | 174 | } else { |
175 | this.$createToast({ | 175 | this.$createToast({ |
@@ -177,21 +177,21 @@ export default { | @@ -177,21 +177,21 @@ export default { | ||
177 | type: 'txt', | 177 | type: 'txt', |
178 | txt: res.message | 178 | txt: res.message |
179 | }).show(); | 179 | }).show(); |
180 | - | ||
181 | } | 180 | } |
182 | 181 | ||
183 | }); | 182 | }); |
184 | } | 183 | } |
185 | - | ||
186 | }, | 184 | }, |
187 | payOrder() { | 185 | payOrder() { |
188 | let vm = this; | 186 | let vm = this; |
187 | + | ||
189 | this.$createOrderPayType({ | 188 | this.$createOrderPayType({ |
190 | price: get(this.computeTip, 'earnestMoney', 0), | 189 | price: get(this.computeTip, 'earnestMoney', 0), |
191 | desc: '保证金', | 190 | desc: '保证金', |
192 | orderCode: get(this.publishinfo, 'orderCode', ''), | 191 | orderCode: get(this.publishinfo, 'orderCode', ''), |
193 | extra: JSON.stringify({ | 192 | extra: JSON.stringify({ |
194 | type: 'sell', | 193 | type: 'sell', |
194 | + reportType: 'bianxian', | ||
195 | back: { | 195 | back: { |
196 | name: 'ProductDetail', | 196 | name: 'ProductDetail', |
197 | params: { | 197 | params: { |
@@ -209,6 +209,12 @@ export default { | @@ -209,6 +209,12 @@ export default { | ||
209 | vm.onClose(get(this.publishinfo, 'orderCode', '')); | 209 | vm.onClose(get(this.publishinfo, 'orderCode', '')); |
210 | } | 210 | } |
211 | }).show(); | 211 | }).show(); |
212 | + | ||
213 | + this.reportYas('XY_UFO_CASH_ORD', { | ||
214 | + ORD_NUM: get(this.publishinfo, 'orderCode', ''), | ||
215 | + PRD_ID: get(this.originProductData, 'productId', ''), | ||
216 | + PRD_SKU: this.skup | ||
217 | + }); | ||
212 | }, | 218 | }, |
213 | 219 | ||
214 | showToast() { | 220 | showToast() { |
@@ -352,12 +352,6 @@ export default { | @@ -352,12 +352,6 @@ export default { | ||
352 | return; | 352 | return; |
353 | } | 353 | } |
354 | 354 | ||
355 | - this.reportYas('XY_UFO_SALE_ORD', { | ||
356 | - ORD_NUM: orderResult.data.orderCode, | ||
357 | - PRD_ID: this.productDetail.productId, | ||
358 | - PRD_SKU: this.productDetail.skup | ||
359 | - }); | ||
360 | - | ||
361 | // 从定金中走了钱,不用支付宝 | 355 | // 从定金中走了钱,不用支付宝 |
362 | if (orderResult.data.orderCode === 0) { | 356 | if (orderResult.data.orderCode === 0) { |
363 | this.$createToast({ | 357 | this.$createToast({ |
@@ -402,6 +396,12 @@ export default { | @@ -402,6 +396,12 @@ export default { | ||
402 | vm.onClose(orderResult.data.orderCode); | 396 | vm.onClose(orderResult.data.orderCode); |
403 | } | 397 | } |
404 | }).show(); | 398 | }).show(); |
399 | + | ||
400 | + this.reportYas('XY_UFO_SALE_ORD', { | ||
401 | + ORD_NUM: orderResult.data.orderCode, | ||
402 | + PRD_ID: this.productDetail.productId, | ||
403 | + PRD_SKU: this.productDetail.skup | ||
404 | + }); | ||
405 | }, | 405 | }, |
406 | onClose(orderCode) { | 406 | onClose(orderCode) { |
407 | this.$router.replace({ | 407 | this.$router.replace({ |
-
Please register or login to post a comment