APP
/
ox_zhiNengZhuShou
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

add mall order

account
刘嘉炜 4 years ago
parent
853ce527b2
commit
aec2f93988
10 changed files with 374 additions and 100 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 46
      src/components/order_list/mall/mall.vue
  2. 2
      src/js/api.js
  3. 6
      src/pages/order_list/order_list.vue
  4. BIN
      src/static/images/icon/selected_987.png
  5. 5
      src/subpackage/order/js/api.js
  6. 98
      src/subpackage/order/pages/mall/detail/detail.vue
  7. 291
      src/subpackage/order/pages/mall/send_out/send_out.vue
  8. 2
      src/subpackage/order/pages/order_manage/order_manage.vue
  9. BIN
      src/subpackage/order/static/images/down_arrow.png
  10. BIN
      src/subpackage/order/static/images/selected.png

46
src/components/order_list/mall/mall.vue
View File

@ -1,33 +1,50 @@
<template> <template>
<view class="mall-order">
<view class="mall-order" @click="toOrderInfo">
<view class="mo-num"> <view class="mo-num">
<view class="mn-view">订单号：sh20201111152456789</view>
<view class="mn-view">待发货</view>
<view class="mn-view">订单号：{{ orderInfo.order_no || '-' }}</view>
<view class="mn-view">{{ orderInfo.status_text || '-' }}</view>
</view> </view>
<view class="mo-goods-ls"> <view class="mo-goods-ls">
<view class="rgi-list" v-if="false">
<view class="rl-item" v-for="i in 3" :key="i">
<image class="ri-img"></image>
<view class="ri-view">克洛羽毛球…</view>
<view class="rgi-single" v-if="orderInfo.goods_nums == 1">
<image class="rs-img" mode="aspectFill" :src="orderInfo.goods[0].product_imgs"></image>
<view class="rs-view">{{ orderInfo.goods[0].product_name || '-' }}</view>
</view> </view>
<view class="rgi-list" v-else>
<block v-for="(e, i) in orderInfo.goods" :key="i">
<view class="rl-item" v-if="i<3">
<image class="ri-img" mode="aspectFill" :src="e.product_imgs"></image>
<view class="ri-view">{{ e.product_name || '-' }}</view>
</view> </view>
<view class="rgi-single">
<image class="rs-img"></image>
<view class="rs-view">克洛斯威羽毛球拍2支装C8正品碳素成人进攻型羽毛球比赛用</view>
</block>
</view> </view>
<view class="rgi-total"><text>共3件</text><image class="rt-img"></image></view>
<view class="rgi-total"><text>共{{ orderInfo.goods_nums || 0 }}件</text><image class="rt-img" mode="aspectFit" src="/static/images/icon/arrow_b2.png"></image></view>
</view> </view>
<view class="mo-total"><text class="mt-txt">商品金额合计：</text>¥239.6</view>
<view class="mo-total"><text class="mt-txt">商品金额合计：</text>¥{{ orderInfo.pay_amount || 0 }}</view>
<view class="mo-bot"> <view class="mo-bot">
<view class="mb-express">配送方式：快递</view>
<view class="mb-express">配送方式：{{ orderInfo.product_order_self_pickup == 1 ? '自提' : '快递' }}</view>
<view class="mb-btn">发货</view> <view class="mb-btn">发货</view>
</view> </view>
</view> </view>
</template> </template>
<script> <script>
import util from '../../../utils/util';
export default { export default {
props: {
orderInfo: {
default: {
extension: {}
},
type: Object,
},
},
methods: {
toOrderInfo(){
let { orderInfo } = this;
util.routeTo(`/subpackage/order/pages/mall/detail/detail?order_no=${orderInfo.order_no}`, 'nT');
}
}
} }
</script> </script>
@ -114,7 +131,6 @@ export default {
vertical-align: middle; vertical-align: middle;
width: 30upx; width: 30upx;
height: 30upx; height: 30upx;
background-color: skyblue;
} }
} }
} }

2
src/js/api.js
View File

@ -39,7 +39,7 @@ export const API = {
// hardwareOrderList: `${ORIGIN}/admin/stadium/hardware/order/list`, // 硬件管理-订单列表_copy // hardwareOrderList: `${ORIGIN}/admin/stadium/hardware/order/list`, // 硬件管理-订单列表_copy
hardwareOrderList: `${ORIGIN}/admin/assistant/hardware/order/list`, // 硬件管理-订单列表_copy hardwareOrderList: `${ORIGIN}/admin/assistant/hardware/order/list`, // 硬件管理-订单列表_copy
appointmentOrderList: `${ORIGIN}/admin/gameAppointment/orderList`, // 赛事订单列表_copy appointmentOrderList: `${ORIGIN}/admin/gameAppointment/orderList`, // 赛事订单列表_copy
shop2OrderList: `${ORIGIN}/admin/shop2/orderList`, // 商城订单 - 列表_copy
// 营业额统计 // 营业额统计
turnoverBrand: `${ORIGIN}/admin/assistant/turnover/brand/calc`, // 营业额记录-品牌 turnoverBrand: `${ORIGIN}/admin/assistant/turnover/brand/calc`, // 营业额记录-品牌

6
src/pages/order_list/order_list.vue
View File

@ -60,6 +60,7 @@
<device :order-info="e" v-if="isDevice()&&!isNotDeviceTemp()" :order-type="orderType"></device> <device :order-info="e" v-if="isDevice()&&!isNotDeviceTemp()" :order-type="orderType"></device>
<locker :order-info="e" v-if="orderType == 7"></locker> <locker :order-info="e" v-if="orderType == 7"></locker>
<competition :order-info="e" v-if="orderType == 14"></competition> <competition :order-info="e" v-if="orderType == 14"></competition>
<mall v-if="orderType == 2" :order-info="e"></mall>
</view> </view>
<!-- <view class="ool-item"> <!-- <view class="ool-item">
@ -399,6 +400,7 @@
if(type == 15)return API.momentOrderList; // 高光时刻 if(type == 15)return API.momentOrderList; // 高光时刻
if(this.isDevice())return API.hardwareOrderList; // 硬件管理 if(this.isDevice())return API.hardwareOrderList; // 硬件管理
if(type == 14)return API.appointmentOrderList; // 高光时刻 if(type == 14)return API.appointmentOrderList; // 高光时刻
if(type == 2)return API.shop2OrderList; // 商城订单
}, },
// 是否为设备，统一接口 // 是否为设备，统一接口
isDevice(){ isDevice(){
@ -513,6 +515,8 @@
return '储物柜订单列表'; return '储物柜订单列表';
case 14: case 14:
return '赛事订单列表'; return '赛事订单列表';
case 2:
return '商城订单列表';
default: default:
return '订单' return '订单'
} }
@ -548,6 +552,8 @@
return [ {id: '1,2,4', name: '全部'}, {id: 1, name: '寄存中'}, {id: 2, name: '已完成'}, {id: 4, name: '退款完成 '}]; return [ {id: '1,2,4', name: '全部'}, {id: 1, name: '寄存中'}, {id: 2, name: '已完成'}, {id: 4, name: '退款完成 '}];
case 14: // 赛事订单列表 订单状态 全部1,2,4 1=进行中 4=已退款 2=已完成 case 14: // 赛事订单列表 订单状态 全部1,2,4 1=进行中 4=已退款 2=已完成
return [ {id: '1,2,4', name: '全部'}, {id: 1, name: '进行中'}, {id: 2, name: '已完成'}, {id: 4, name: '已退款 '}]; return [ {id: '1,2,4', name: '全部'}, {id: 1, name: '进行中'}, {id: 2, name: '已完成'}, {id: 4, name: '已退款 '}];
case 2: // 商城订单 0/1/2/3/4/5/6 - 待支付/待发货/已发货/已完成/已关闭/退款中/已退款 商家助手全部1,2,3,6
return [ {id: '1,2,3,6', name: '全部'}, {id: 0, name: '待支付'}, {id: 1, name: '待发货'}, {id: 2, name: '已发货'}, {id: 3, name: '已完成 '}, {id: 4, name: '已关闭 '}, {id: 5, name: '退款中 '}, {id: 6, name: '已退款 '}];
default: default:
return [] return []
} }

BIN
src/static/images/icon/selected_987.png
View File

Side by Side

Before

Width: 40  |  Height: 36  |  Size: 381 B

5
src/subpackage/order/js/api.js
View File

@ -16,6 +16,11 @@ export const ORDER_API = {
appointmentOrderInfo:`${ORIGIN}/admin/gameAppointment/orderInfo`, // 赛事订单详情 appointmentOrderInfo:`${ORIGIN}/admin/gameAppointment/orderInfo`, // 赛事订单详情
matchOrderSonList:`${ORIGIN}/gameAppointment/match/orderSonList`, // 赛事订单-参赛成员列表 matchOrderSonList:`${ORIGIN}/gameAppointment/match/orderSonList`, // 赛事订单-参赛成员列表
matchGetOrderSon:`${ORIGIN}/gameAppointment/match/getOrderSon`, // 赛事订单_参赛成员详情 matchGetOrderSon:`${ORIGIN}/gameAppointment/match/getOrderSon`, // 赛事订单_参赛成员详情
shop2OrderInfo:`${ORIGIN}/admin/shop2/orderInfo`, // 商城订单 - 详情
erpshList:`${ORIGIN}/stadium/erpsh/newList`, // 商城订单管理-统一的仓库列表
shop2OrderLogistics:`${ORIGIN}/admin/shop2/orderLogistics`, // 商城订单管理 - 发货_
logisticsCompanyLs:`${ORIGIN}/shop2/logisticsCompany/List`, // 商城订单管理 - 快递公司列表
} }
export default ORDER_API; export default ORDER_API;

98
src/subpackage/order/pages/mall/detail/detail.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<view class="mall-detail"> <view class="mall-detail">
<view class="md-send"> <view class="md-send">
<view class="ms-status-bar">已退款</view>
<view class="ms-status-bar">{{ orderInfo.status_text || '-' }}</view>
<view class="ms-send-info"> <view class="ms-send-info">
<view class="msi-txt"> <view class="msi-txt">
<view>快递：顺丰速递 SF1090317923085</view> <view>快递：顺丰速递 SF1090317923085</view>
@ -12,29 +12,31 @@
<view class="ms-main"> <view class="ms-main">
<view class="md-box ms-consignee"> <view class="md-box ms-consignee">
<view class="md-tit">收货人信息</view> <view class="md-tit">收货人信息</view>
<view class="mc-mode">配送方式：快递</view>
<view class="mc-name">李晓娜 <text>18087690993</text></view>
<view class="mc-addr">广东省广州市白云区丛云路万事达广场A302</view>
<view class="mc-mode">配送方式：{{ orderInfo.product_order_self_pickup == 1 ? '自提' : '快递' }}</view>
<view class="mc-name">{{ order_custom.name || '-' }} <text>{{ order_custom.phone || '-' }}</text></view>
<view class="mc-addr">{{ order_custom.address || '-' }}</view>
<block v-if="orderInfo.product_order_self_pickup == 1&&orderInfo.product_order_self_pickup_info">
<view class="mc-code">取货码：{{ orderInfo.product_order_self_pickup_info.gcode || '-' }}</view>
<view class="mc-time">取货时间： {{ orderInfo.product_order_self_pickup_info.gtime || '-' }}</view>
</block>
<view class="mc-code">取货码：2009 1808 8956</view>
<view class="mc-time">取货时间： 2020-08-22 08:12:25</view>
</view> </view>
<view class="md-box ms-goods-info"> <view class="md-box ms-goods-info">
<view class="md-tit">商品信息</view> <view class="md-tit">商品信息</view>
<view class="mgi-goods-ls"> <view class="mgi-goods-ls">
<view class="mgl-item">
<image></image>
<view class="mgl-item" v-for="(e, i) in orderInfo.product_order_goods" :key="i">
<image mode="aspectFill" :src="e.product_imgs"></image>
<view> <view>
<view class="mi-name"> <view class="mi-name">
<view>克洛斯威羽毛球拍2支装正品碳素成人进攻型羽毛球</view>
<view>¥59.9</view>
<view>{{ e.product_name || '-' }}</view>
<view>¥{{ e.product_price || '0' }}</view>
</view> </view>
<view class="mi-spec"> <view class="mi-spec">
<view>比赛专用；黑色</view> <view>比赛专用；黑色</view>
<view>×1</view>
<view>×{{ e.product_nums || 0 }}</view>
</view> </view>
<view class="mi-amount"> <view class="mi-amount">
<view>实付：¥<text>59.9</text></view>
<view>实付：¥<text>{{ e.product_price_pay || 0 }}</text></view>
<view>已退款</view> <view>已退款</view>
</view> </view>
</view> </view>
@ -42,38 +44,41 @@
</view> </view>
<view class="mgi-price-info"> <view class="mgi-price-info">
<view class="mpi-line"> <view class="mpi-line">
<view>金额小计</view><view>¥179.7</view>
<view>金额小计</view><view>¥{{ orderInfo.amount || 0 }}</view>
</view> </view>
<view class="mpi-line"> <view class="mpi-line">
<view>积分抵扣</view><view>¥179.7</view>
<view>积分抵扣</view><view>¥{{ orderInfo.deduction_amount || 0 }}</view>
</view> </view>
<view class="mpi-line"> <view class="mpi-line">
<view>折扣金额</view><view>¥179.7</view>
<view>折扣金额</view><view>¥{{ orderInfo.discount_amount || 0 }}</view>
</view> </view>
<view class="mpi-line"> <view class="mpi-line">
<view>优惠券优惠</view><view>¥179.7</view>
<view>优惠券优惠</view><view>¥{{ orderInfo.coupons_amount || 0 }}</view>
</view> </view>
<view class="mpi-line"> <view class="mpi-line">
<view>运费</view><view>¥179.7</view>
<view>运费</view><view>¥{{ orderInfo.product_logistics_price || 0 }}</view>
</view> </view>
<view class="mpi-total"><text>合计支付：</text>￥179.7</view>
<view class="mpi-total"><text>合计支付：</text>￥{{ orderInfo.pay_amount || 0 }}</view>
</view> </view>
</view> </view>
<view class="md-box"> <view class="md-box">
<p-line :keyname="'下单时间'" :value="'2020-08-22 10:30:40'" ></p-line>
<p-line :keyname="'订单编号'" :value="'sc20 0822 0815 6894'" isbtn></p-line>
<p-line :keyname="'支付方式'" :value="'微信卡支付'" ></p-line>
<p-line :keyname="'交易流水号'" :value="'202009181255364564612622'"></p-line>
<p-line :keyname="'退款编号'" :value="'tk20201230181914997632'"></p-line>
<p-line :keyname="'退款时间'" :value="'2020-12-30 18:19:14'"></p-line>
<p-line :keyname="'退款金额'" :value="'￥240'" ></p-line>
<p-line :keyname="'下单时间'" :value="orderInfo.created_at || '-'" ></p-line>
<p-line :keyname="'订单编号'" :value="orderInfo.order_no || '-'" isbtn></p-line>
<p-line :keyname="'支付方式'" :value="payTypeTxt(orderInfo.pay_type) || '-'" ></p-line>
<p-line :keyname="'交易流水号'" :value="orderInfo.trade_no || '-'"></p-line>
<block v-if="orderInfo.status == 7">
<p-line :keyname="'退款编号'" :value="orderInfo.refund_no || '-'"></p-line>
<p-line :keyname="'退款时间'" :value="orderInfo.refund_time || '-'"></p-line>
<p-line :keyname="'退款金额'" :value="orderInfo.refund_amount || '0'" ></p-line>
</block>
</view> </view>
</view> </view>
<view class="ms-fixed-bar"> <view class="ms-fixed-bar">
<view class="mfb-btns"> <view class="mfb-btns">
<view>主动退款</view>
<view>查看退款</view>
<view class="red">主动退款</view> <view class="red">主动退款</view>
<view class="green">主动退款</view>
<view class="green" @click="toSendOut">发货</view>
</view> </view>
</view> </view>
</view> </view>
@ -83,10 +88,48 @@
<script> <script>
import p_line from '../../../components/p_line/p_line.vue'; import p_line from '../../../components/p_line/p_line.vue';
import { ORDER_API } from '../../../js/api';
import server from '../../../js/server';
import util from '../../../../../utils/util';
export default { export default {
computed: {
order_custom(){
let { orderInfo } = this;
if(orderInfo&&orderInfo.product_order_custom)return (orderInfo.product_order_custom || {})
return {};
}
},
components: { components: {
'p-line': p_line, 'p-line': p_line,
}, },
data(){
return {
orderInfo: {}
}
},
onLoad(options){
this.getInfo(options.order_no);
},
methods: {
toSendOut(){
let { orderInfo } = this;
util.routeTo(`/subpackage/order/pages/mall/send_out/send_out?order_no=${orderInfo.order_no}`, 'nT');
},
payTypeTxt: util.order_pay_type_txt,
getInfo(order_no){
util.showLoad();
server.get({
url: ORDER_API.shop2OrderInfo,
data: { order_no },
failMsg: '加载失败！'
})
.then(res=>{
util.hideLoad();
let _order = res.order || {};
this.orderInfo = _order;
})
},
}
} }
</script> </script>
@ -194,7 +237,6 @@ export default {
width: 180upx; width: 180upx;
height: 180upx; height: 180upx;
border-radius: 6upx; border-radius: 6upx;
background-color: skyblue;
} }
>view{ >view{
flex-grow: 1; flex-grow: 1;

291
src/subpackage/order/pages/mall/send_out/send_out.vue
View File

@ -2,79 +2,90 @@
<view class="order-send-out"> <view class="order-send-out">
<view class="oso-header"> <view class="oso-header">
<view class="oh-tit">收货人信息</view> <view class="oh-tit">收货人信息</view>
<view class="oh-mode">配送方式：快递</view>
<view class="oh-name">李晓娜<text>18087690993</text></view>
<view class="oh-addr">广东省广州市白云区丛云路万事达广场A302</view>
<view class="oh-mode">配送方式：{{ orderInfo.product_order_self_pickup == 1 ? '自提' : '快递' }}</view>
<view class="oh-name">{{ order_custom.name || '-' }}<text>{{ order_custom.phone || '-' }}</text></view>
<view class="oh-addr">{{ order_custom.address || '-' }}</view>
</view> </view>
<view class="oh-tab"> <view class="oh-tab">
<view class="ot-item">
<view class="active">
<view class="ot-item" @click="tabChange(0)">
<view :class="[curTab == 0? 'active' : '']">
<view class="oi-txt">待发货</view> <view class="oi-txt">待发货</view>
<view class="oi-num">999</view>
<view class="oi-num" v-if="waitdeliverLs.length">{{ waitdeliverLs.length || 0 }}</view>
</view> </view>
</view> </view>
<view class="ot-item">
<view>
<view class="oi-txt">待发货</view>
<view class="ot-item" @click="tabChange(1)">
<view :class="[curTab == 1? 'active' : '']">
<view class="oi-txt">已发货</view>
<view class="oi-num" v-if="shippedLs.length">{{ shippedLs.length || 0 }}</view>
</view> </view>
</view> </view>
</view> </view>
<view class="oh-section"> <view class="oh-section">
<!-- 待发货 --> <!-- 待发货 -->
<view class="os-wait" v-if="false">
<view class="oh-box ow-goods">
<view class="os-wait" v-if="curTab == 0">
<!-- 没数据 -->
<view class="os-null" v-if="!waitdeliverLs.length">
<image></image>
<view>无已发货</view>
</view>
<view class="oh-box ow-goods" v-else>
<view class="og-header"> <view class="og-header">
<view class="oh-tit"><text>*</text>请选择商品发货</view> <view class="oh-tit"><text>*</text>请选择商品发货</view>
<view class="oh-select"> <view class="oh-select">
<view>全选</view>
<view></view>
<view @click="sendOutSelectAll">全选</view>
<view>
<image v-if="isSelectedAllSendOut" mode="aspectFit" src="/subpackage/order/static/images/selected.png"></image>
</view>
</view> </view>
</view> </view>
<view class="og-list"> <view class="og-list">
<view class="ol-item">
<view class="oi-select"></view>
<image></image>
<view class="ol-item" v-for="(e, i) in waitdeliverLs" :key="i" @click="goodsItemClick(e)">
<view class="oi-select">
<image v-if="selectedSendOutIds.includes(e.product_id)" mode="aspectFit" src="/subpackage/order/static/images/selected.png"></image>
</view>
<image mode="aspecfFill" :src="e.product_imgs"></image>
<view class="oi-info"> <view class="oi-info">
<view class="oi-tit">克洛斯威羽毛球拍2支装C8正品碳素成人进攻型羽毛球比赛用</view>
<view class="oi-tit">{{ e.product_name || '-' }}</view>
<view class="oi-spec">比赛专用；黑色</view> <view class="oi-spec">比赛专用；黑色</view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<view class="oh-box ow-warehouse">
<view class="oh-box ow-warehouse" >
<view class="oh-tit"><text>*</text>发货仓库</view> <view class="oh-tit"><text>*</text>发货仓库</view>
<picker>
<picker :range="warehouseList" range-key="esh_name" @change="warehouseChange">
<view class="ow-picker"> <view class="ow-picker">
<input disabled placeholder="请选择发货仓库" />
<image></image>
<input disabled placeholder="请选择发货仓库" :value="selectedWarehouse.esh_name" />
<image mode="aspectFit" src="/subpackage/order/static/images/down_arrow.png"></image>
</view> </view>
</picker> </picker>
<view class="ow-tip">商品如果不在同一仓库，请分开发货</view> <view class="ow-tip">商品如果不在同一仓库，请分开发货</view>
</view> </view>
<view class="oh-box ow-logistics"> <view class="oh-box ow-logistics">
<view class="oh-tit">发货仓库</view>
<view class="oh-tit">发货物流</view>
<view class="ol-line"> <view class="ol-line">
<view class="ol-name"><text>* </text>发货方式</view> <view class="ol-name"><text>* </text>发货方式</view>
<view class="ol-mode"> <view class="ol-mode">
<view class="om-item"> <view class="om-item">
<view class="active"></view>
<view>快递</view>
<view :class="[ sendOutMethod == 0 ? 'active' : '' ]" @click="sendOutMethod = 0"></view>
<view @click="sendOutMethod = 0">快递</view>
</view> </view>
<view class="om-item"> <view class="om-item">
<view></view>
<view>无需快递</view>
<view :class="[ sendOutMethod == 1 ? 'active' : '' ]" @click="sendOutMethod = 1"></view>
<view @click="sendOutMethod = 1">无需快递</view>
</view> </view>
</view> </view>
</view> </view>
<block v-if="sendOutMethod == 0">
<view class="ol-line"> <view class="ol-line">
<view class="ol-name"><text>* </text>物流公司</view> <view class="ol-name"><text>* </text>物流公司</view>
<view class="ol-company"> <view class="ol-company">
<picker>
<picker :range="logisticsCompanyLs" @change="logisticsChange">
<view class="oc-ipt-frame"> <view class="oc-ipt-frame">
<input disabled placeholder="请选择物流公司" />
<image></image>
<input disabled placeholder="请选择物流公司" :value="curlogisticsName" />
<image mode="aspectFit" src="/subpackage/order/static/images/down_arrow.png"></image>
</view> </view>
</picker> </picker>
</view> </view>
@ -83,27 +94,35 @@
<view class="ol-name"><text>* </text>物流单号</view> <view class="ol-name"><text>* </text>物流单号</view>
<view class="ol-company"> <view class="ol-company">
<view class="oc-ipt-frame"> <view class="oc-ipt-frame">
<input placeholder="请输入物流单号" />
<input placeholder="请输入物流单号" v-model="logisticsOrderNum" />
</view> </view>
</view> </view>
</view> </view>
<view class="ol-line">
</block>
<view class="ol-line" v-if="sendOutMethod == 1">
<view class="ol-name"><text>* </text>备注</view> <view class="ol-name"><text>* </text>备注</view>
<view class="ol-company"> <view class="ol-company">
<view class="oc-ipt-frame"> <view class="oc-ipt-frame">
<input placeholder="备注" />
<input placeholder="备注" v-model="sendOutRemark" />
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<cover-view class="ow-btn"> <cover-view class="ow-btn">
<cover-view class="ob-btn">确认发货</cover-view>
<cover-view class="ob-btn" @click="confirmSendOutBtn">确认发货</cover-view>
</cover-view> </cover-view>
</view> </view>
<!-- 已发货 --> <!-- 已发货 -->
<view class="os-yet" v-if="false">
<view class="package-list">
<view class="os-yet" v-if="curTab == 1">
<!-- 没数据 -->
<view class="os-null" v-if="!shippedLs.length">
<image></image>
<view>无已发货</view>
</view>
<view class="package-list" v-else>
<view class="pl-item" v-for="i in 2" :key="i"> <view class="pl-item" v-for="i in 2" :key="i">
<view class="pi-tit">包裹1</view> <view class="pi-tit">包裹1</view>
<view class="pi-express"><view>快递：顺丰速递 SF1090317923085</view><view>复制</view></view> <view class="pi-express"><view>快递：顺丰速递 SF1090317923085</view><view>复制</view></view>
@ -116,19 +135,197 @@
<view class="pi-total">共10件商品</view> <view class="pi-total">共10件商品</view>
</view> </view>
</view> </view>
</view> </view>
<!-- 没数据 -->
<view class="os-null">
<image></image>
<view>无已发货</view>
</view>
</view> </view>
</view> </view>
</template> </template>
<script> <script>
import { ORDER_API } from '../../../js/api';
import server from '../../../js/server';
import util from '../../../../../utils/util';
export default { export default {
computed: {
order_custom(){
let { orderInfo } = this;
if(orderInfo&&orderInfo.product_order_custom)return (orderInfo.product_order_custom || {})
return {};
},
// 待发货列表
waitdeliverLs(){
let { orderInfo } = this;
let _list = orderInfo.product_order_goods || [];
return _list.filter(e=>e.product_logistics_end == 0) || [];
},
// 已发货列表
shippedLs(){
let { orderInfo } = this;
let _list = orderInfo.product_order_goods || [];
return _list.filter(e=>e.product_logistics_end == 1) || [];
},
// 选中发货 id列表
selectedSendOutIds(){
let { selectedSendOutLs } = this;
return selectedSendOutLs.map(e=>e.product_id);
},
// 待发货列表全选
isSelectedAllSendOut(){
let { selectedSendOutIds, waitdeliverLs } = this;
let _unLs = []; // 未被选中列表
if(!waitdeliverLs.length)return false;
_unLs = waitdeliverLs.filter(ele => !selectedSendOutIds.includes(ele.product_id));
return _unLs.length == 0;
}
},
data(){
return {
order_no: '',
orderInfo: {},
curTab: 0, // 待发货 -> 0 , 已发货 -> 1
selectedSendOutLs: [], // 选中发货列表
warehouseList: [], // 仓库列表
selectedWarehouse: {}, // 选中仓库
sendOutMethod: 0, // 发货方式 ， 快递 -> 0, 无需快递 -> 1
logisticsCompanyLs: [], // 快递公司列表
curlogisticsName: '',
logisticsOrderNum: '',
sendOutRemark: '',
}
},
onLoad(options){
this.order_no = options.order_no || '';
this.getInfo(options.order_no);
this.getWarehouse({});
this.getLogisticsCompanyLs({});
},
methods: {
logisticsChange(e){
let { logisticsCompanyLs } = this;
this.curlogisticsName = logisticsCompanyLs[e.detail.value] || '';
},
refreshPage(){
let { order_no } = this;
if(!order_no)return;
this.orderInfo = {};
this.selectedSendOutLs = [];
this.selectedWarehouse = [];
this.sendOutMethod = 0;
this.curlogisticsName = '';
this.sendOutRemark = '';
this.getInfo(order_no);
},
confirmSendOutBtn: util.debounce(function(){
let { order_no, selectedSendOutIds, selectedWarehouse, sendOutMethod, curlogisticsName, logisticsOrderNum, sendOutRemark } = this;
let _query = {
order_no,
ids: selectedSendOutIds,
esh_type: selectedWarehouse.esh_type,
esh_id: selectedWarehouse.esh_id,
logistics_type: sendOutMethod,
}
if(sendOutMethod == 0){
_query['logistics_name'] = curlogisticsName;
_query['logistics_no'] = logisticsOrderNum;
}
if(sendOutMethod == 1)_query['mark'] = sendOutRemark;
this.shop2OrderLogistics(_query);
}, 300,true),
shop2OrderLogistics({
order_no = '',
ids = [],
esh_type = '',
esh_id = '',
logistics_type = '',
logistics_name = '',
logistics_no = '',
}){
server.post({
url: ORDER_API.shop2OrderLogistics,
data: {
order_no, // 订单编号
ids, // 发货商品购物车ID数组
esh_type, // 类型 0/1 - 仓库/店铺
esh_id, // 发货仓库/店铺 ID
logistics_type, // 发货方式 0/1 - 快递/无需发货
logistics_name, // 物流公司
logistics_no, // 物流单号
},
isDefaultGet: false
})
.then(res=>{
if(res.data.code == 0){
util.showNone(res.data.message || '操作成功！');
setTimeout(this.refreshPage, 1200);
}else{
util.showNone(res.data.message || '操作失败！');
}
console.warn(res.list)
})
},
warehouseChange(e){
console.warn(e);
let { warehouseList } = this;
if(!warehouseList || !warehouseList.length)this.selectedWarehouse = {};
this.selectedWarehouse = warehouseList[e.detail.value] || {};
},
sendOutSelectAll(){
let { isSelectedAllSendOut, waitdeliverLs } = this;
this.selectedSendOutLs = isSelectedAllSendOut ? [] : [ ...waitdeliverLs ];
},
goodsItemClick(e){
let { selectedSendOutIds, selectedSendOutLs } = this;
if(selectedSendOutIds.includes(e.product_id))return this.selectedSendOutLs = selectedSendOutLs.filter(ele=>ele.product_id !=e.product_id);
this.selectedSendOutLs = [ ...selectedSendOutLs, e];
},
tabChange(idx){
this.curTab = idx;
},
// 仓库列表
getWarehouse({
page_size = 9999,
page = 1,
}){
server.get({
url: ORDER_API.erpshList,
data: { page_size, page },
failMsg: '加载仓库列表失败！'
})
.then(res=>{
this.warehouseList = res.list || [];
})
},
// 快递公司列表
getLogisticsCompanyLs({
page_size = 9999,
page = 1,
}){
server.get({
url: ORDER_API.logisticsCompanyLs,
data: { page_size, page },
failMsg: '加载快递公司列表失败！'
})
.then(res=>{
this.logisticsCompanyLs = res.list || [];
})
},
getInfo(order_no){
util.showLoad();
server.get({
url: ORDER_API.shop2OrderInfo,
data: { order_no },
failMsg: '加载数据失败！'
})
.then(res=>{
util.hideLoad();
let _order = res.order || {};
this.orderInfo = _order;
})
},
}
} }
</script> </script>
@ -255,6 +452,11 @@ export default {
margin-left: 20upx; margin-left: 20upx;
border: 2upx solid #9a9a9d; border: 2upx solid #9a9a9d;
border-radius: 50%; border-radius: 50%;
>image{
display: block;
width: 100%;
height: 100%;
}
} }
} }
} }
@ -269,6 +471,12 @@ export default {
height: 32upx; height: 32upx;
border-radius: 50%; border-radius: 50%;
box-shadow: 0 0 0 2upx #9A9A9D; box-shadow: 0 0 0 2upx #9A9A9D;
@include centerFlex(center);
>image{
display: block;
width: 100%;
height: 100%;
}
} }
>image{ >image{
flex-shrink: 0; flex-shrink: 0;
@ -276,7 +484,6 @@ export default {
width: 180upx; width: 180upx;
height: 180upx; height: 180upx;
border-radius: 10upx; border-radius: 10upx;
background-color: skyblue;
} }
.oi-info{ .oi-info{
align-self: flex-start; align-self: flex-start;
@ -318,7 +525,6 @@ export default {
margin-left: 20upx; margin-left: 20upx;
width: 30upx; width: 30upx;
height: 30upx; height: 30upx;
background-color: skyblue;
} }
} }
.ow-tip{ .ow-tip{
@ -404,7 +610,6 @@ export default {
margin-left: 20upx; margin-left: 20upx;
width: 30upx; width: 30upx;
height: 30upx; height: 30upx;
background-color: skyblue;
} }
} }

2
src/subpackage/order/pages/order_manage/order_manage.vue
View File

@ -38,7 +38,7 @@ export default {
util.routeTo(getTabRoutePath() + `?order_type=${ele.orderType}`,'nT'); util.routeTo(getTabRoutePath() + `?order_type=${ele.orderType}`,'nT');
}, },
isFinish(key){ isFinish(key){
let _endKeyArr = [ 1, 2, 3, 4, 5, 7, 9, 10, 14, 16, 15, 13, 6 ];
let _endKeyArr = [ 1, 2, 3, 4, 5, 7, 9, 10, 14, 16, 15, 13, 6, 8 ];
return _endKeyArr.includes(key); return _endKeyArr.includes(key);
} }
} }

BIN
src/subpackage/order/static/images/down_arrow.png
View File

Side by Side

After

Width: 30  |  Height: 30  |  Size: 328 B

BIN
src/subpackage/order/static/images/selected.png
View File

Side by Side

After

Width: 32  |  Height: 32  |  Size: 470 B

Write Preview
Loading…
Cancel
Save