fe / yohoblk-wap · Commits

Go to a project

Authored by 沈志敏
Commit 6a2cd53a49de26654e592a9efb852b4d96f90275 1 parent 3e6bac92

修改订单列表页面

Inline Side-by-side
Showing 5 changed files with 39 additions and 35 deletions
... ... @@ -7,7 +7,6 @@
const orderModel = require('../models/order');
const notLoginCode = 400;
const notLoginTip = '抱歉，您暂未登录！';
const isBLK = 1;
const order = {
orders: (req, res) => {
... ... @@ -52,8 +51,7 @@ const order = {
uid: uid,
page: page,
type: type,
limit: limit,
app_type: isBLK
limit: limit
};
orderModel.getOrders(param).then(result => {
... ... @@ -80,11 +78,9 @@ const order = {
let reasonId = req.body.reasonId;
let reason = req.body.reason;
console.log(orderCode + '------' + reasonId);
orderModel.cancelOrder(orderCode, reasonId, reason, isBLK).then(result => {
orderModel.cancelOrder(orderCode, reasonId, reason).then(result => {
return res.json(result);
});
},
confirmOrder: (req, res) => {
let orderode = req.body.orderCode;
... ...
... ... @@ -22,7 +22,9 @@ const _ = require('lodash');
* @returns {Promise.<T>|*}
*/
exports.getOrders = (param) => {
param = Object.assign({method: 'app.SpaceOrders.get'}, param);
param = Object.assign({
method: 'app.SpaceOrders.get'
}, param);
return api.get('', param).then(camelCase);
};
... ... @@ -46,19 +48,14 @@ exports.getOrderDetail = (uid, orderCode) => {
* @param orderCode 订单号
* @param reasonId 原因id
* @param reason 原因描述
* @param appType 0:yohobuy 1:blk(blk必传)
* @returns {Promise.<T>|*}
*/
exports.cancelOrder = (orderCode, reasonId, reason, appType) => {
exports.cancelOrder = (orderCode, reasonId, reason) => {
return api.post('', {
method: 'app.SpaceOrders.close',
order_code: orderCode,
reason_id: reasonId,
reason: reason,
app_type: appType
}).then(result => {
return result;
reason: reason
});
};
... ...
... ... @@ -137,6 +137,18 @@ $white: #fff;
}
.options {
a {
padding: 0 20px;
height: 68px;
line-height: 68px;
color: $black;
text-align: center;
-webkit-appearance: none;
border: 0 none;
background: $white;
font-size: 28px;
}
button {
padding: 0 20px;
height: 68px;
... ... @@ -242,4 +254,4 @@ $white: #fff;
height: 0;
overflow: hidden;
opacity: 0;
}
\ No newline at end of file
}
... ...
... ... @@ -8,8 +8,8 @@
<p>{{order.area}} <br>{{order.address}}</p>
</div>
<div class="order-code">
<p>订单号:{{order.orderCode}}</p>
<p>下单时间:{{order.createTime | convertTime}}</p>
<p>订单号: {{order.orderCode}}</p>
<p>下单时间: {{order.createTime | convertTime}}</p>
</div>
<div class="order-goods">
<ul>
... ...
... ... @@ -4,7 +4,7 @@
<div class="order-detail">
<div class="order-code">
<p>订单号:{{order.orderCode}}</p>
<p>{{order.status | convertOrderState}}</p>
<p>{{order.statusStr}}</p>
</div>
<div class="order-goods" >
<div class="goods-info" v-for="goods in order.orderGoods">
... ... @@ -28,13 +28,17 @@
<div class="order-option">
<div class="goods-total">合计: <b>&yen;{{order.amount}}</b></div>
<div class="options">
<button v-if="order.status === 0" @click="cancelOrder(order.orderCode)">取消订单</button>
<button v-if="order.status === 0 " class="countdown" @click="goBuy(order.orderCode)">去支付
<span v-count-down v-bind:left-time="order.payLefttime" v-bind:callback="autoCancel(order.orderCode)"></span>
</button>
<button v-if="order.status === 4 || order.status === 5 " @click="seeExpress(order.orderCode)">查看物流</button>
<button v-if="order.status === 4 || order.status === 5 " class="black" @click="confirmGoods(order.orderCode)">确认收货</button>
<button v-if="order.status === 6" @click="deleteOrder(order,index)" class="normal">删除订单</button>
<button v-if="order.isCancel === 'Y'" @click="deleteOrder(order,index)" class="normal">删除订单</button>
<template v-else>
<button v-if="order.status === 0" @click="cancelOrder(order.orderCode)">取消订单</button>
<button v-if="order.status === 0 " class="countdown" @click="goBuy(order.orderCode)">去支付
<span v-count-down v-bind:left-time="order.payLefttime" v-bind:callback="autoCancel(order.orderCode)"></span>
</button>
<a v-if="order.status === 4 || order.status === 5 "
href="/me/logistic?order_code={{order.orderCode}}">查看物流</a>
<button v-if="order.status === 4 || order.status === 5 " class="black" @click="confirmGoods(order.orderCode)">确认收货</button>
<button v-if="order.status === 6" @click="deleteOrder(order,index)" class="normal">删除订单</button>
</template>
</div>
</div>
</div>
... ... @@ -111,13 +115,12 @@
});
},
reasonChange(){
console.log(this.currentCode)
this.order().cancel({
orderCode: this.currentCode,
reasonId: this.selected.id
}, (result) => {
if (result.code === 200) {
location.href = '/me/order?type=2';
location.reload();
} else {
tip(result.message);
}
... ... @@ -163,7 +166,7 @@
cancelOrder(code) {
let _that = this;
Modal.confirm('订单取消后不能恢复,确认取消订单吗？', '', function() {
Modal.confirm('', '取消后不能恢复,确认取消吗？', function() {
this.hide();
_that.currentCode = code;
_that.dropDown('cancel-reason');
... ... @@ -172,7 +175,7 @@
deleteOrder(order, index) {
let that = this;
Modal.confirm('确认删除订单？', '', function() {
Modal.confirm('', '确认删除订单？', function() {
this.hide();
$.ajax({
url: '/me/deleteOrder',
... ... @@ -211,11 +214,9 @@
goBuy(code) {
yohoAPI.goPay({orderid: code});
},
seeExpress(code) {
location.href = '/me/logistic?order_code='+code;
},
dropDown(elementId){
let dropdown = document.getElementById(elementId);
try {
this.showDropdown(dropdown);
} catch(e) {
... ... @@ -223,9 +224,9 @@
}
return false;
},
showDropdown(element) {
let event;
event = document.createEvent('MouseEvents');
event.initMouseEvent('mousedown', true, true, window);
element.dispatchEvent(event);
... ... @@ -242,6 +243,4 @@ body {
}
@import "../../scss/me/_order.css";
</style>
... ...