|
|
@@ -2,10 +2,32 @@
|
|
|
<div class="app-main app-content">
|
|
|
<div class="list-wrap">
|
|
|
<block v-if="!$util.isEmpty(list.data)">
|
|
|
- <div class="list" v-for="(item, index) in list.data" :key="index">
|
|
|
- <div v-if="!$util.isEmpty(item.orderInfo)">
|
|
|
- <orderItem :info="item.orderInfo"></orderItem>
|
|
|
- </div>
|
|
|
+ <div class="list" v-for="(item, index) in list.data" :key="index" @click="pageTo({ url: '/admin/order/detail?id='+item.orderInfo.id})">
|
|
|
+ <block v-if="!$util.isEmpty(item.orderInfo)">
|
|
|
+ <view class="list-top flex-center-between" style="border-bottom:1upx solid #EEEEEE;">
|
|
|
+ <view class="app-color-3" style="font-size:28upx;font-weight:bold;color:#333333;">编号 {{ item.orderInfo.sendNum }}<text v-if="item.orderInfo.bookName!=''" style="margin-left:12upx;">| {{item.orderInfo.bookName}}</text></view>
|
|
|
+ <view style="border:1upx solid red;border-radius:18upx;font-size:19upx;padding:5upx 10upx;background-color: red;color:white;" v-if="item.orderInfo.debt == 1">赊账</view>
|
|
|
+ <view style="border:1upx solid #0e7ed8;border-radius:18upx;font-size:19upx;color:white;padding:5upx 10upx;background-color: #0e7ed8;" v-if="item.orderInfo.refund == 1">有售后</view>
|
|
|
+ <view style="font-size:28upx;" class='app-price app-green'>{{ item.orderInfo.status | constantfilter('ORDER_STATUS') }}</view>
|
|
|
+ </view>
|
|
|
+
|
|
|
+ <view>
|
|
|
+ <orderItem :info="item.orderInfo"></orderItem>
|
|
|
+ </view>
|
|
|
+
|
|
|
+ <view class="list-bottom" style="padding-top:0upx;">
|
|
|
+ <view style="border-bottom:1upx solid #EEEEEE;padding-bottom:8upx;">
|
|
|
+ <span v-if="item.orderInfo.sendCost > 0" class="freight-text">运费 ¥{{ item.orderInfo.sendCost ? parseFloat(item.orderInfo.sendCost) : 0 }}</span>
|
|
|
+ <span class="app-size-30 app-bold">¥{{ item.orderInfo.orderPrice ? parseFloat(item.orderInfo.orderPrice) :0 }}</span>
|
|
|
+ </view>
|
|
|
+ <view class="list-button">
|
|
|
+ <view class="admin-button-com middle" v-if="item.orderInfo.status == 2" @click.stop="sendOrderFn(item.orderInfo)">发货</view>
|
|
|
+ <view class="admin-button-com default" v-else>发货</view>
|
|
|
+ <view class="admin-button-com middle" v-if="item.orderInfo.payStatus == 1" @click.stop="printOrder(item.orderInfo)">打印</view>
|
|
|
+ <view class="admin-button-com default" v-else>打印</view>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ </block>
|
|
|
</div>
|
|
|
</block>
|
|
|
<block v-else>
|
|
|
@@ -13,10 +35,10 @@
|
|
|
</block>
|
|
|
</div>
|
|
|
|
|
|
- <div class="app-footer">
|
|
|
- <div class="admin-button-com big blue" @click="batchFh()">全部发货</div>
|
|
|
- <div class="admin-button-com big blue" style="margin-left:50upx;" @click="batchPrint()">合并打印</div>
|
|
|
- </div>
|
|
|
+ <div class="app-footer">
|
|
|
+ <div class="admin-button-com big blue" @click="batchFh()">全部发货</div>
|
|
|
+ <div class="admin-button-com big blue" style="margin-left:50upx;" @click="batchPrint()">合并打印</div>
|
|
|
+ </div>
|
|
|
|
|
|
</div>
|
|
|
</template>
|
|
|
@@ -50,10 +72,10 @@ export default {
|
|
|
onReachBottom() {
|
|
|
if (!this.list.finished) {
|
|
|
this.getOrderList().then((res) => {
|
|
|
- uni.stopPullDownRefresh();
|
|
|
+ uni.stopPullDownRefresh()
|
|
|
});
|
|
|
} else {
|
|
|
- uni.stopPullDownRefresh();
|
|
|
+ uni.stopPullDownRefresh()
|
|
|
}
|
|
|
},
|
|
|
onLoad() {
|
|
|
@@ -120,29 +142,18 @@ export default {
|
|
|
})
|
|
|
},
|
|
|
getOrderList() {
|
|
|
- if(this.option.productId){
|
|
|
- return getOrderInfoList({ productId:this.option.productId, page: this.list.page }).then((res) => {
|
|
|
- this.completes(res)
|
|
|
- })
|
|
|
- }
|
|
|
- if(this.option.customId){
|
|
|
- return getListB({ page: this.list.page,customId:this.option.customId }).then((res) => {
|
|
|
+ let productId = this.option.productId ? this.option.productId : 0
|
|
|
+ return getOrderInfoList({ productId:productId, page: this.list.page }).then((res) => {
|
|
|
this.completes(res)
|
|
|
})
|
|
|
- }
|
|
|
- if(this.option.ids){
|
|
|
- return getListB({ page: this.list.page,ids:this.option.ids }).then((res) => {
|
|
|
- this.completes(res)
|
|
|
- })
|
|
|
- }
|
|
|
}
|
|
|
},
|
|
|
};
|
|
|
</script>
|
|
|
<style lang="scss" scoped>
|
|
|
.app-content {
|
|
|
- padding-top: 120upx;
|
|
|
- padding-bottom: 1px;
|
|
|
+ padding-top:20upx;
|
|
|
+ padding-bottom:100upx;
|
|
|
.list-wrap {
|
|
|
.list {
|
|
|
padding: 0 30upx;
|