Skip to content

修正了取消订单接口 #256

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 16, 2019
Merged

修正了取消订单接口 #256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
205b5b3
Update index.vue
1037621594 Aug 12, 2019
5d9cd8a
Update index.vue
1037621594 Aug 14, 2019
c310c68
Update api.js
1037621594 Aug 15, 2019
0b98276
Update index.vue
1037621594 Aug 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions litemall-vue/src/api/api.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ export function cartFastAdd(data) {
const CartUpdate='wx/cart/update'; // 更新购物车的商品
export function cartUpdate(data) {
return request({
url: cartUpdate,
url: CartUpdate,
method: 'post',
data
})
Expand Down Expand Up @@ -437,4 +437,4 @@ export function getList(api, query) {
})
}

export const REFUND_LIST = '';
export const REFUND_LIST = '';
2 changes: 1 addition & 1 deletion litemall-vue/src/views/items/category/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ export default {
handleTabClick(index) {
this.categoryId = this.navList[index].id;
this.$router.replace({
name: 'list',
name: 'category',
query: { itemClass: this.categoryId }
});
this.init();
Expand Down
14 changes: 7 additions & 7 deletions litemall-vue/src/views/user/order-list/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,25 +38,25 @@
class="footer_btn">
<van-button size="small"
v-if="el.handleOption.cancel"
@click="cancelOrder(el.id)">取消订单</van-button>
@click.stop="cancelOrder(el.id)">取消订单</van-button>
<van-button size="small"
v-if="el.handleOption.pay"
type="danger"
@click="toPay(el.id)">去支付</van-button>
@click.stop="toPay(el.id)">去支付</van-button>
<van-button size="small"
v-if="el.handleOption.refund"
type="danger"
@click="refundOrder(el.id)">退款</van-button>
@click.stop="refundOrder(el.id)">退款</van-button>
<van-button size="small"
v-if="el.handleOption.confirm"
type="danger"
@click="confirmOrder(el.id)">确认收货</van-button>
@click.stop="confirmOrder(el.id)">确认收货</van-button>
<van-button size="small"
v-if="el.handleOption.delete"
@click="delOrder(el.id)">删除订单</van-button>
@click.stop="delOrder(el.id)">删除订单</van-button>
<van-button size="small"
v-if="el.handleOption.comment"
@click="commentOrder(el.id)">去评价</van-button>
@click.stop="commentOrder(el.id)">去评价</van-button>
</div>

</van-panel>
Expand Down Expand Up @@ -131,7 +131,7 @@ export default {
this.$dialog
.confirm({ message: '确定要取消该订单吗?' })
.then(() => {
orderDelete({ orderId: id }).then(() => {
orderCancel({ orderId: id }).then(() => {
this.init();
this.$toast('已取消该订单');
});
Expand Down