cxc/yshopb2c-uniapp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

合并冲突

Browse Source
This commit is contained in:
gaoxs
2020-06-09 09:40:35 +08:00
parent 391055e68a b23f9a2272
commit 3903a7f31b
14 changed files with 134 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
pages/orderAdmin/OrderIndex/index.vue
View File

@ -1,5 +1,6 @@
<template>
<view class="order-index" ref="container">
<image src="@/static/images/orderIndex.png" mode="widthFix" class="image" />
<view class="header acea-row">
<view class="item" @click="goAdminOrderList(0)">
<view class="num">{{ census.orderCount.unpaidCount }}</view>
@ -130,10 +131,11 @@ export default {
},
err => {
uni.showToast({
title: err.msg || err.response.data.msg|| err.response.data.message,
icon: 'none',
duration: 2000
});
title:
err.msg || err.response.data.msg || err.response.data.message,
icon: "none",
duration: 2000
});
}
);
},
@ -150,10 +152,11 @@ export default {
},
err => {
uni.showToast({
title: err.msg || err.response.data.msg|| err.response.data.message,
icon: 'none',
duration: 2000
});
title:
err.msg || err.response.data.msg || err.response.data.message,
icon: "none",
duration: 2000
});
},
300
);