faiz
/
offline_mer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

折扣,定制产品

This commit is contained in:
faiz 2024-08-26 10:29:07 +08:00
parent 17fb1b551c
commit 91d0e0b49c
9 changed files with 3722 additions and 2179 deletions

8
.env.development
View File

@ -2,12 +2,12 @@
ENV = 'development' ENV = 'development'
# base api # base api
# VUE_APP_BASE_API = 'http://192.168.1.12:8080' VUE_APP_BASE_API = 'http://test.tropjoin.com'
VUE_APP_BASE_API = 'https://api.tropjoin.com' # VUE_APP_BASE_API = 'https://api.tropjoin.com'
# socket 连接地址 # socket 连接地址
# VUE_APP_WS_URL = 'ws://192.168.1.12:8080' VUE_APP_WS_URL = 'wss://test.tropjoin.com'
VUE_APP_WS_URL = 'ws://api.tropjoin.com' # VUE_APP_WS_URL = 'ws://api.tropjoin.com'
# vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable, # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,
# to control whether the babel-plugin-dynamic-import-node plugin is enabled. # to control whether the babel-plugin-dynamic-import-node plugin is enabled.

5
.env.production
View File

@ -2,7 +2,8 @@
ENV = 'production' ENV = 'production'
# base api # base api
VUE_APP_BASE_API = VUE_APP_BASE_API ='https://api.tropjoin.com'
# socket 连接地址 # socket 连接地址
VUE_APP_WS_URL = VUE_APP_WS_URL ='wss://api.tropjoin.com'

2
src/filters/commFilter.js
View File

@ -40,7 +40,7 @@ export function paidFilter(status) {
*/ */
export function payTypeFilter(status) { export function payTypeFilter(status) {
const statusMap = { const statusMap = {
'0': '抵扣券', '0': '折扣',
'1': '微信', '1': '微信',
'2': '微信', '2': '微信',
'3': '微信', '3': '微信',

539
src/views/order/orderDetails.vue
View File

@ -12,21 +12,32 @@
<div class="full"> <div class="full">
<img class="order_icon" :src="orderImg" alt="" /> <img class="order_icon" :src="orderImg" alt="" />
<div class="text"> <div class="text">
<div class="title">{{ orderDetailList.order_type == 0 ? '普通订单' : '核销订单' }}</div> <div class="title">
{{ orderDetailList.order_type == 0 ? "普通订单" : "核销订单" }}
</div>
<div> <div>
<span class="mr20">订单编号：{{ orderDetailList.order_sn }}</span> <span class="mr20"
>订单编号：{{ orderDetailList.order_sn }}</span
>
</div> </div>
</div> </div>
<div> <div>
<el-button <el-button
v-if="orderDetailList.order_type != 0 && orderDetailList.status == 0" v-if="
orderDetailList.order_type != 0 && orderDetailList.status == 0
"
type="primary" type="primary"
size="small" size="small"
@click="orderCancellation" @click="orderCancellation"
>订单核销</el-button >订单核销</el-button
> >
<el-button <el-button
v-if="(orderDetailList.order_type == 0 || orderDetailList.order_type == 2) && orderDetailList.status === 0 && orderDetailList.paid === 1" v-if="
(orderDetailList.order_type == 0 ||
orderDetailList.order_type == 2) &&
orderDetailList.status === 0 &&
orderDetailList.paid === 1
"
type="primary" type="primary"
size="small" size="small"
@click="send" @click="send"
@ -43,7 +54,15 @@
<el-button icon="el-icon-more" size="small"></el-button> <el-button icon="el-icon-more" size="small"></el-button>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<el-dropdown-item command="mark">订单备注</el-dropdown-item> <el-dropdown-item command="mark">订单备注</el-dropdown-item>
<el-dropdown-item v-if="orderDetailList.order_type == 0 && orderDetailList.status === 1 && orderDetailList.paid === 1" command="modify">修改发货信息</el-dropdown-item> <el-dropdown-item
v-if="
orderDetailList.order_type == 0 &&
orderDetailList.status === 1 &&
orderDetailList.paid === 1
"
command="modify"
>修改发货信息</el-dropdown-item
>
<!-- <el-dropdown-item v-if="orderDetailList.status!=-1&&orderDetailList.paid==1&&orderDetailList.status<9" command="refund">退款</el-dropdown-item> --> <!-- <el-dropdown-item v-if="orderDetailList.status!=-1&&orderDetailList.paid==1&&orderDetailList.status<9" command="refund">退款</el-dropdown-item> -->
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
@ -53,12 +72,42 @@
<li class="item"> <li class="item">
<div class="title">订单状态</div> <div class="title">订单状态</div>
<div> <div>
<div v-if="!orderDetailList.pay_time" class="value1">待付款<span v-if="orderDetailList.is_del>0" style="color:rgb(237,64,20);font-size:12px;">（用户已删除）</span></div> <div v-if="!orderDetailList.pay_time" class="value1">
<div v-if="orderDetailList.order_type === 0 && orderDetailList.pay_time" class="value1"> 待付款<span
<span>{{ orderDetailList.status | orderStatusFilter }}<span v-if="orderDetailList.is_del>0" style="color:rgb(237,64,20);font-size:12px;">（用户已删除）</span></span> v-if="orderDetailList.is_del > 0"
style="color:rgb(237,64,20);font-size:12px;"
>（用户已删除）</span
>
</div> </div>
<div v-if="orderDetailList.order_type === 1 && orderDetailList.pay_time" class="value1"> <div
<span>{{ orderDetailList.status | cancelOrderStatusFilter }}<span v-if="orderDetailList.is_del>0" style="color:rgb(237,64,20);font-size:12px;">（用户已删除）</span></span> v-if="
orderDetailList.order_type === 0 && orderDetailList.pay_time
"
class="value1"
>
<span
>{{ orderDetailList.status | orderStatusFilter
}}<span
v-if="orderDetailList.is_del > 0"
style="color:rgb(237,64,20);font-size:12px;"
>（用户已删除）</span
></span
>
</div>
<div
v-if="
orderDetailList.order_type === 1 && orderDetailList.pay_time
"
class="value1"
>
<span
>{{ orderDetailList.status | cancelOrderStatusFilter
}}<span
v-if="orderDetailList.is_del > 0"
style="color:rgb(237,64,20);font-size:12px;"
>（用户已删除）</span
></span
>
</div> </div>
</div> </div>
</li> </li>
@ -66,7 +115,14 @@
<div class="title">实际支付</div> <div class="title">实际支付</div>
<div> <div>
¥{{ orderDetailList.pay_price }} ¥{{ orderDetailList.pay_price }}
<span v-if="orderDetailList.finalOrder&&orderDetailList.finalOrder.pay_price&&orderDetailList.finalOrder.paid==1">尾款¥{{orderDetailList.finalOrder.pay_price}}</span> <span
v-if="
orderDetailList.finalOrder &&
orderDetailList.finalOrder.pay_price &&
orderDetailList.finalOrder.paid == 1
"
>尾款¥{{ orderDetailList.finalOrder.pay_price }}</span
>
</div> </div>
</li> </li>
<li class="item"> <li class="item">
@ -74,7 +130,9 @@
<div>{{ orderDetailList.pay_type | payTypeFilter }}</div> <div>{{ orderDetailList.pay_type | payTypeFilter }}</div>
</li> </li>
<li class="item"> <li class="item">
<div class="title">{{ orderDetailList.pay_time ? '支付时间' : '下单时间'}}</div> <div class="title">
{{ orderDetailList.pay_time ? "支付时间" : "下单时间" }}
</div>
<div>{{ orderDetailList.create_time }}</div> <div>{{ orderDetailList.create_time }}</div>
</li> </li>
</ul> </ul>
@ -88,7 +146,9 @@
<div>用户昵称：</div> <div>用户昵称：</div>
<div class="value"> <div class="value">
{{ {{
orderDetailList.user.real_name ? orderDetailList.user.real_name : orderDetailList.user.nickname orderDetailList.user.real_name
? orderDetailList.user.real_name
: orderDetailList.user.nickname
}} }}
</div> </div>
</li> </li>
@ -98,9 +158,14 @@
</li> --> </li> -->
<li class="item"> <li class="item">
<div>绑定电话：</div> <div>绑定电话：</div>
<div class="value">{{ orderDetailList.user.phone ? orderDetailList.user.phone : '-' }}</div> <div class="value">
{{
orderDetailList.user.phone
? orderDetailList.user.phone
: "-"
}}
</div>
</li> </li>
</ul> </ul>
</div> </div>
<div class="section"> <div class="section">
@ -108,52 +173,113 @@
<ul class="list"> <ul class="list">
<li class="item"> <li class="item">
<div>收货人：</div> <div>收货人：</div>
<div class="value">{{ orderDetailList.real_name ? orderDetailList.real_name : '-' }}</div> <div class="value">
{{
orderDetailList.real_name
? orderDetailList.real_name
: "-"
}}
</div>
</li> </li>
<li class="item"> <li class="item">
<div>收货电话：</div> <div>收货电话：</div>
<div class="value">{{ orderDetailList.user_phone ? orderDetailList.user_phone : '-' }}</div> <div class="value">
{{
orderDetailList.user_phone
? orderDetailList.user_phone
: "-"
}}
</div>
</li> </li>
<li class="item"> <li class="item">
<div>收货地址：</div> <div>收货地址：</div>
<div class="value">{{ orderDetailList.user_address ? orderDetailList.user_address : '-' }}</div> <div class="value">
{{
orderDetailList.user_address
? orderDetailList.user_address
: "-"
}}
</div>
</li> </li>
</ul> </ul>
</div> </div>
<div class="section"> <div class="section">
<div class="title">订单信息</div> <div class="title">订单信息</div>
<ul class="list"> <ul class="list">
<li class="item"> <li class="item">
<div>创建时间：</div> <div>创建时间：</div>
<div class="value">{{ orderDetailList.create_time ? orderDetailList.create_time : '-' }}</div> <div class="value">
{{
orderDetailList.create_time
? orderDetailList.create_time
: "-"
}}
</div>
</li> </li>
<li class="item"> <li class="item">
<div>商品总数：</div> <div>商品总数：</div>
<div class="value">{{ orderDetailList.total_num ? orderDetailList.total_num : '-' }}</div> <div class="value">
{{
orderDetailList.total_num
? orderDetailList.total_num
: "-"
}}
</div>
</li> </li>
<li v-if="orderDetailList.pay_time" class="item"> <li v-if="orderDetailList.pay_time" class="item">
<div>实际支付：</div> <div>实际支付：</div>
<div class="value"> <div class="value">
{{ orderDetailList.pay_price }} {{ orderDetailList.pay_price }}
<span v-if="orderDetailList.finalOrder&&orderDetailList.finalOrder.pay_price&&orderDetailList.finalOrder.paid==1">尾款¥{{orderDetailList.finalOrder.pay_price}}</span> <span
v-if="
orderDetailList.finalOrder &&
orderDetailList.finalOrder.pay_price &&
orderDetailList.finalOrder.paid == 1
"
>尾款¥{{ orderDetailList.finalOrder.pay_price }}</span
>
</div> </div>
</li> </li>
<!-- <li class="item"> <!-- <li class="item">
<div>优惠券金额：</div> <div>优惠券金额：</div>
<div class="value">{{ orderDetailList.coupon_price ? orderDetailList.coupon_price : '-' }}</div> <div class="value">{{ orderDetailList.coupon_price ? orderDetailList.coupon_price : '-' }}</div>
</li> --> </li> -->
<li v-if="orderDetailList.integral" class="item"> <li v-if="orderDetailList.integral" class="item">
<div>铸源星抵扣：</div> <div>铸源星抵扣：</div>
<div v-if="orderDetailList.integral && orderDetailList.integral != 0" class="value">使用了{{ orderDetailList.integral }}个铸源星，抵扣了{{ orderDetailList.integral_price }}元</div> <div
v-if="
orderDetailList.integral && orderDetailList.integral != 0
"
class="value"
>
使用了{{ orderDetailList.integral }}个铸源星，抵扣了{{
orderDetailList.integral_price
}}元
</div>
</li> </li>
<li v-if="orderDetailList.amount_price>0" class="item"> <li v-if="orderDetailList.amount_price > 0" class="item">
<div>抵扣券抵扣：</div> <div>折扣：</div>
<div v-if="orderDetailList.amount_price && orderDetailList.amount_price != 0" class="value">使用了{{ orderDetailList.amount_price }}个抵扣券，抵扣了{{ orderDetailList.amount_price }}元</div> <!-- <div v-if="orderDetailList.amount_price && orderDetailList.amount_price != 0" class="value">使用了{{ orderDetailList.amount_price }}个折扣，抵扣了{{ orderDetailList.amount_price }}元</div> -->
<div
v-if="
orderDetailList.amount_price &&
orderDetailList.amount_price != 0
"
class="value"
>
-{{ orderDetailList.amount_price }}元
</div>
</li> </li>
<li class="item"> <li class="item">
<div>商品总价：</div> <div>商品总价：</div>
<div class="value">{{ orderDetailList.total_price ? orderDetailList.total_price : '-' }}</div> <div class="value">
{{
orderDetailList.total_price
? orderDetailList.total_price
: "-"
}}
</div>
</li> </li>
<!-- <li class="item" v-if="orderDetailList.svip_discount"> <!-- <li class="item" v-if="orderDetailList.svip_discount">
<div>会员商品优惠：</div> <div>会员商品优惠：</div>
@ -169,7 +295,9 @@
</li> </li>
<li v-if="orderDetailList.TopSpread" class="item"> <li v-if="orderDetailList.TopSpread" class="item">
<div>上级推广人：</div> <div>上级推广人：</div>
<div class="value">{{ orderDetailList.TopSpread.nickname }}</div> <div class="value">
{{ orderDetailList.TopSpread.nickname }}
</div>
</li> </li>
<!-- <li v-if="!orderDetailList.activity_type" class="item"> <!-- <li v-if="!orderDetailList.activity_type" class="item">
<div>一级佣金：</div> <div>一级佣金：</div>
@ -185,35 +313,68 @@
<em v-if="orderDetailList.refund_extension_two > 0" style="color: red;font-style: normal;">(-{{ orderDetailList.refund_extension_two }})</em> <em v-if="orderDetailList.refund_extension_two > 0" style="color: red;font-style: normal;">(-{{ orderDetailList.refund_extension_two }})</em>
</div> </div>
</li> --> </li> -->
<!-- <li class="item"> <!-- <li class="item">
<div>赠送积分：</div> <div>赠送积分：</div>
<div class="value">{{orderDetailList.give_integral || '-'}}</div> <div class="value">{{orderDetailList.give_integral || '-'}}</div>
</li> --> </li> -->
<li class="item"> <li class="item">
<div>发货方式：</div> <div>发货方式：</div>
<div v-if="orderDetailList.order_type == 1" class="value">核销</div> <div v-if="orderDetailList.order_type == 1" class="value">
<div v-else class="value">{{ orderDetailList.delivery_type | sendWay }}</div> 核销
</div>
<div v-else class="value">
{{ orderDetailList.delivery_type | sendWay }}
</div>
</li> </li>
<li class="item"> <li class="item">
<div>商品类型：</div> <div>商品类型：</div>
<div class="value">{{ orderDetailList.is_virtual==1 ? '虚拟商品' : orderDetailList.is_virtual==2 ? '卡密商品' : '普通商品' }}</div> <div class="value">
{{
orderDetailList.is_virtual == 1
? "虚拟商品"
: orderDetailList.is_virtual == 2
? "卡密商品"
: "普通商品"
}}
</div>
</li> </li>
<li class="item"> <li class="item">
<div>活动类型：</div> <div>活动类型：</div>
<div class="value">{{ orderDetailList.activity_type == 1 ? '秒杀' : orderDetailList.activity_type == 2 ? '预售' : orderDetailList.activity_type == 3 ? '助力' : orderDetailList.activity_type == 4 ? '拼团' : '普通' }}</div> <div class="value">
{{
orderDetailList.activity_type == 1
? "秒杀"
: orderDetailList.activity_type == 2
? "预售"
: orderDetailList.activity_type == 3
? "助力"
: orderDetailList.activity_type == 4
? "拼团"
: "普通"
}}
</div>
</li> </li>
</ul> </ul>
</div> </div>
<div class="section" v-if="orderDetailList.order_extend"> <div class="section" v-if="orderDetailList.order_extend">
<div class="title">自定义留言</div> <div class="title">自定义留言</div>
<ul class="list"> <ul class="list">
<li class="item" v-for="(item,i) in orderDetailList.order_extend" :key="i"> <li
class="item"
v-for="(item, i) in orderDetailList.order_extend"
:key="i"
>
<div>{{ i }}：</div> <div>{{ i }}：</div>
<template v-if="!Array.isArray(item)"> <template v-if="!Array.isArray(item)">
<div class="value">{{ item }}</div> <div class="value">{{ item }}</div>
</template> </template>
<template v-else> <template v-else>
<img v-for="(pic,idx) in item" :key="idx" :src="pic" style="width:40px;height:40px;margin-right:12px;"/> <img
v-for="(pic, idx) in item"
:key="idx"
:src="pic"
style="width:40px;height:40px;margin-right:12px;"
/>
</template> </template>
</li> </li>
</ul> </ul>
@ -222,7 +383,9 @@
<div class="title">买家留言</div> <div class="title">买家留言</div>
<ul class="list"> <ul class="list">
<li class="item"> <li class="item">
<div>{{ orderDetailList.mark ? orderDetailList.mark : '-' }}</div> <div>
{{ orderDetailList.mark ? orderDetailList.mark : "-" }}
</div>
</li> </li>
</ul> </ul>
</div> </div>
@ -230,7 +393,9 @@
<div class="title">商家备注</div> <div class="title">商家备注</div>
<ul class="list"> <ul class="list">
<li class="item"> <li class="item">
<div>{{ orderDetailList.remark ? orderDetailList.remark : '-' }}</div> <div>
{{ orderDetailList.remark ? orderDetailList.remark : "-" }}
</div>
</li> </li>
</ul> </ul>
</div> </div>
@ -239,16 +404,33 @@
<ul class="list"> <ul class="list">
<li class="item"> <li class="item">
<div>快递公司：</div> <div>快递公司：</div>
<div class="value">{{ orderDetailList.delivery_name ? orderDetailList.delivery_name : '-' }}</div> <div class="value">
{{
orderDetailList.delivery_name
? orderDetailList.delivery_name
: "-"
}}
</div>
</li> </li>
<li class="item"> <li class="item">
<div>快递单号：</div> <div>快递单号：</div>
<div class="value">{{ orderDetailList.delivery_id ? orderDetailList.delivery_id : '-' }}</div> <div class="value">
<el-button type="text" size="mini" style="margin-left: 5px" @click="openLogistics">物流查询</el-button> {{
orderDetailList.delivery_id
? orderDetailList.delivery_id
: "-"
}}
</div>
<el-button
type="text"
size="mini"
style="margin-left: 5px"
@click="openLogistics"
>物流查询</el-button
>
</li> </li>
</ul> </ul>
</div> </div>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="商品信息" name="goods"> <el-tab-pane label="商品信息" name="goods">
<el-table :data="orderDetailList.orderProduct" size="small"> <el-table :data="orderDetailList.orderProduct" size="small">
@ -262,10 +444,14 @@
/> />
</div> </div>
<div> <div>
<div class="line1">{{ scope.row.cart_info.product.store_name }}</div> <div class="line1">
{{ scope.row.cart_info.product.store_name }}
</div>
<div class="line1 gary"> <div class="line1 gary">
规格：{{ 规格：{{
scope.row.cart_info.productAttr.sku ? scope.row.cart_info.productAttr.sku : '默认' scope.row.cart_info.productAttr.sku
? scope.row.cart_info.productAttr.sku
: "默认"
}} }}
</div> </div>
</div> </div>
@ -276,7 +462,11 @@
<template slot-scope="scope"> <template slot-scope="scope">
<div class="tab"> <div class="tab">
<div class="line1"> <div class="line1">
{{ scope.row.cart_info.productAttr.price ? scope.row.cart_info.productAttr.price : '-' }} {{
scope.row.cart_info.productAttr.price
? scope.row.cart_info.productAttr.price
: "-"
}}
</div> </div>
</div> </div>
</template> </template>
@ -285,16 +475,22 @@
<template slot-scope="scope"> <template slot-scope="scope">
<div class="tab"> <div class="tab">
<div class="line1"> <div class="line1">
{{ scope.row.cart_info.productAttr.cost ? scope.row.cart_info.productAttr.cost : '-' }} {{
scope.row.cart_info.productAttr.cost
? scope.row.cart_info.productAttr.cost
: "-"
}}
</div> </div>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="实付金额" min-width="90"> <el-table-column label="实付金额" min-width="90">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="tab"> <div class="tab">
<div class="line1"> <div class="line1">
{{ scope.row.product_price ? scope.row.product_price : '-' }} {{
scope.row.product_price ? scope.row.product_price : "-"
}}
</div> </div>
</div> </div>
</template> </template>
@ -382,13 +578,24 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="block"> <div class="block">
<el-pagination :page-size="tableFromLog.limit" :current-page="tableFromLog.page" layout="prev, pager, next, jumper" :total="tableDataLog.total" @size-change="handleSizeChangeLog" @current-change="pageChangeLog" /> <el-pagination
:page-size="tableFromLog.limit"
:current-page="tableFromLog.page"
layout="prev, pager, next, jumper"
:total="tableDataLog.total"
@size-change="handleSizeChangeLog"
@current-change="pageChangeLog"
/>
</div> </div>
</el-tab-pane> </el-tab-pane>
<el-tab-pane v-if="childOrder.length>0" label="关联订单" name="subOrder"> <el-tab-pane
v-if="childOrder.length > 0"
label="关联订单"
name="subOrder"
>
<el-table :data="childOrder"> <el-table :data="childOrder">
<el-table-column label="订单编号" prop="order_sn" min-width="150"> <el-table-column label="订单编号" prop="order_sn" min-width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<div>{{ scope.row.order_sn }}</div> <div>{{ scope.row.order_sn }}</div>
</template> </template>
</el-table-column> </el-table-column>
@ -405,28 +612,46 @@
:preview-src-list="[val.cart_info.product.image]" :preview-src-list="[val.cart_info.product.image]"
/> />
</div> </div>
<span <span class="tabBox_tit"
class="tabBox_tit" >{{ val.cart_info.product.store_name + " | "
>{{ val.cart_info.product.store_name + ' | ' }}{{ val.cart_info.productAttr.sku }}</span> }}{{ val.cart_info.productAttr.sku }}</span
>
<span class="tabBox_pice"> <span class="tabBox_pice">
{{ '￥'+ val.cart_info.productAttr.price + ' x '+ val.product_num }} {{
"￥" +
val.cart_info.productAttr.price +
" x " +
val.product_num
}}
<em <em
v-if="val.refund_num < val.product_num && val.refund_num > 0" v-if="
val.refund_num < val.product_num && val.refund_num > 0
"
style="color: red;font-style: normal;" style="color: red;font-style: normal;"
>(-{{ val.product_num - val.refund_num }})</em> >(-{{ val.product_num - val.refund_num }})</em
>
</span> </span>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="实际支付" min-width="80" align="center"> <el-table-column label="实际支付" min-width="80" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.pay_price }}</span> <span>{{ scope.row.pay_price }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="订单生成时间" prop="create_time" min-width="120" /> <el-table-column
label="订单生成时间"
prop="create_time"
min-width="120"
/>
<el-table-column label="操作" min-width="50" fixed="right"> <el-table-column label="操作" min-width="50" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" size="small" @click="getChildOrderDetail(scope.row.order_id)">详情</el-button> <el-button
type="text"
size="small"
@click="getChildOrderDetail(scope.row.order_id)"
>详情</el-button
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -441,7 +666,9 @@
v-if="dialogLogistics" v-if="dialogLogistics"
> >
<div class="logistics acea-row row-top"> <div class="logistics acea-row row-top">
<div class="logistics_img"><img src="@/assets/images/expressi.jpg"></div> <div class="logistics_img">
<img src="@/assets/images/expressi.jpg" />
</div>
<div class="logistics_cent"> <div class="logistics_cent">
<span>物流公司：{{ orderDetailList.delivery_name }}</span> <span>物流公司：{{ orderDetailList.delivery_name }}</span>
<span>物流单号：{{ orderDetailList.delivery_id }}</span> <span>物流单号：{{ orderDetailList.delivery_id }}</span>
@ -449,8 +676,8 @@
</div> </div>
<div class="acea-row row-column-around trees-coadd"> <div class="acea-row row-column-around trees-coadd">
<div class="scollhide"> <div class="scollhide">
<el-timeline v-if="result.length>0"> <el-timeline v-if="result.length > 0">
<el-timeline-item v-for="(item,i) in result" :key="i"> <el-timeline-item v-for="(item, i) in result" :key="i">
<p class="time" v-text="item.time" /> <p class="time" v-text="item.time" />
<p class="content" v-text="item.status" /> <p class="content" v-text="item.status" />
</el-timeline-item> </el-timeline-item>
@ -463,7 +690,6 @@
</div> </div>
</template> </template>
<script> <script>
import { import {
getExpress, getExpress,
orderDeliveryApi, orderDeliveryApi,
@ -472,31 +698,31 @@ import {
orderPrintApi, orderPrintApi,
orderRemarkApi, orderRemarkApi,
getChildrenOrderApi getChildrenOrderApi
} from '@/api/order'; } from "@/api/order";
import orderCancellate from './orderCancellate' import orderCancellate from "./orderCancellate";
export default { export default {
components: { components: {
orderCancellate orderCancellate
}, },
props: { props: {
drawer: { drawer: {
type: Boolean, type: Boolean,
default: false, default: false
}, }
}, },
data() { data() {
return { return {
loading: true, loading: true,
orderId: '', orderId: "",
direction: 'rtl', direction: "rtl",
activeName: 'detail', activeName: "detail",
goodsList: [], goodsList: [],
timeVal: [], timeVal: [],
orderConfirm: false, orderConfirm: false,
sendGoods: false, sendGoods: false,
dialogLogistics: false, dialogLogistics: false,
confirmReceiptForm: { confirmReceiptForm: {
id: '', id: ""
}, },
tableDataLog: { tableDataLog: {
data: [], data: [],
@ -507,15 +733,15 @@ export default {
result: [], result: [],
orderDetailList: { orderDetailList: {
user: { user: {
real_name: '', real_name: ""
}, },
groupOrder: { groupOrder: {
group_order_sn: '', group_order_sn: ""
}, }
}, },
orderImg: require('@/assets/images/order_icon.png'), orderImg: require("@/assets/images/order_icon.png"),
tableFromLog: { tableFromLog: {
user_type: '', user_type: "",
date: [], date: [],
page: 1, page: 1,
limit: 10 limit: 10
@ -523,94 +749,99 @@ export default {
childOrder: [] childOrder: []
}; };
}, },
filters: { filters: {},
},
methods: { methods: {
// 具体日期 // 具体日期
onchangeTime(e) { onchangeTime(e) {
this.timeVal = e this.timeVal = e;
this.tableFromLog.date = e ? this.timeVal.join('-') : '' this.tableFromLog.date = e ? this.timeVal.join("-") : "";
this.onOrderLog(this.orderId) this.onOrderLog(this.orderId);
}, },
handleClose() { handleClose() {
this.activeName = 'detail'; this.activeName = "detail";
this.$emit('closeDrawer'); this.$emit("closeDrawer");
this.sendGoods = false; this.sendGoods = false;
this.orderRemark = false; this.orderRemark = false;
}, },
openLogistics() { openLogistics() {
this.getOrderData() this.getOrderData();
this.dialogLogistics = true this.dialogLogistics = true;
}, },
// 订单核销 // 订单核销
orderCancellation() { orderCancellation() {
const that = this const that = this;
that.$refs.orderCancellate.dialogVisible = true; that.$refs.orderCancellate.dialogVisible = true;
that.$refs.orderCancellate.productDetails(that.orderDetailList.verify_code) that.$refs.orderCancellate.productDetails(
that.orderDetailList.verify_code
);
that.$refs.orderCancellate.isColum = true; that.$refs.orderCancellate.isColum = true;
}, },
// 发送货 // 发送货
send(){ send() {
this.$emit('send',this.orderDetailList,this.orderId); this.$emit("send", this.orderDetailList, this.orderId);
}, },
// 小票打印 // 小票打印
printOrder() { printOrder() {
orderPrintApi(this.orderId) orderPrintApi(this.orderId)
.then((res) => { .then(res => {
this.$message.success(res.message) this.$message.success(res.message);
})
.catch((res) => {
this.$message.error(res.message)
}) })
.catch(res => {
this.$message.error(res.message);
});
}, },
// 备注 // 备注
onOrderMark() { onOrderMark() {
this.$modalForm(orderRemarkApi(this.orderId)).then(() => this.getInfo(this.orderId)) this.$modalForm(orderRemarkApi(this.orderId)).then(() =>
this.getInfo(this.orderId)
);
}, },
//下拉 //下拉
handleCommand(command) { handleCommand(command) {
if (command == 'mark') { if (command == "mark") {
this.onOrderMark(); this.onOrderMark();
} else if(command == 'modify') { } else if (command == "modify") {
this.reSend(this.orderId); this.reSend(this.orderId);
}else{ } else {
this.refund(this.orderId) this.refund(this.orderId);
} }
}, },
// 退款 // 退款
refund(id){ refund(id) {
this.$emit('onOrderRefund',id); this.$emit("onOrderRefund", id);
}, },
// 修改发货信息 // 修改发货信息
reSend(id){ reSend(id) {
this.$emit('reSend',id); this.$emit("reSend", id);
}, },
// 修改订单信息 // 修改订单信息
getList() { getList() {
this.$emit('getList',''); this.$emit("getList", "");
}, },
// 获取子订单信息 // 获取子订单信息
getChildOrder() { getChildOrder() {
this.loading = true; this.loading = true;
getChildrenOrderApi(this.orderId) getChildrenOrderApi(this.orderId)
.then((res) => { .then(res => {
this.activeName = 'detail' this.activeName = "detail";
this.childOrder = res.data this.childOrder = res.data;
setTimeout(()=>{ setTimeout(() => {
this.loading = false; this.loading = false;
},500) }, 500);
})
.catch((res) => {
this.$message.error(res.message)
}) })
.catch(res => {
this.$message.error(res.message);
});
}, },
// 获取订单物流信息 // 获取订单物流信息
getOrderData() { getOrderData() {
getExpress(this.orderId).then(async res => { getExpress(this.orderId)
this.result = res.data .then(async res => {
}).catch(res => { this.result = res.data;
this.$message.error(res.message) })
}) .catch(res => {
this.$message.error(res.message);
});
}, },
//发送货 //发送货
toSendGoods() { toSendGoods() {
@ -618,66 +849,66 @@ export default {
}, },
getDelivery() { getDelivery() {
orderDeliveryApi(this.orderId) orderDeliveryApi(this.orderId)
.then((res) => { .then(res => {
this.$message.success(res.message); this.$message.success(res.message);
this.sendGoods = false; this.sendGoods = false;
}) })
.catch((res) => { .catch(res => {
this.$message.error(res.message); this.$message.error(res.message);
}); });
}, },
getChildOrderDetail(id){ getChildOrderDetail(id) {
this.getInfo(id); this.getInfo(id);
}, },
getInfo(id) { getInfo(id) {
this.loading = true; this.loading = true;
this.orderId = id; this.orderId = id;
orderDetailApi(id) orderDetailApi(id)
.then((res) => { .then(res => {
this.drawer = true; this.drawer = true;
this.orderDetailList = res.data; this.orderDetailList = res.data;
this.getChildOrder() this.getChildOrder();
}) })
.catch((res) => { .catch(res => {
this.$message.error(res.message); this.$message.error(res.message);
}); });
}, },
tabClick(tab) { tabClick(tab) {
if (tab.name === 'orderList') { if (tab.name === "orderList") {
this.onOrderLog(this.orderId) this.onOrderLog(this.orderId);
} }
}, },
onOrderLog(id){ onOrderLog(id) {
orderLogApi(id, this.tableFromLog).then((res) => { orderLogApi(id, this.tableFromLog).then(res => {
this.tableDataLog.data = res.data.list this.tableDataLog.data = res.data.list;
this.tableDataLog.total = res.data.count this.tableDataLog.total = res.data.count;
}); });
}, },
pageChangeLog(page) { pageChangeLog(page) {
this.tableFromLog.page = page this.tableFromLog.page = page;
this.onOrderLog(this.orderId) this.onOrderLog(this.orderId);
}, },
handleSizeChangeLog(val) { handleSizeChangeLog(val) {
this.tableFromLog.limit = val this.tableFromLog.limit = val;
this.onOrderLog(this.orderId) this.onOrderLog(this.orderId);
}, },
operationType(type) { operationType(type) {
if (type == 0) { if (type == 0) {
return '系统'; return "系统";
} else if (type == 1) { } else if (type == 1) {
return '用户'; return "用户";
} else if (type == 2) { } else if (type == 2) {
return '平台'; return "平台";
} else if (type == 3) { } else if (type == 3) {
return '商户'; return "商户";
} else if (type == 4) { } else if (type == 4) {
return '商家客服'; return "商家客服";
} else { } else {
return '未知'; return "未知";
} }
}, }
}, }
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@ -743,7 +974,7 @@ export default {
} }
.value3 { .value3 {
color: #437FFD; color: #437ffd;
} }
.value4 { .value4 {
@ -822,20 +1053,20 @@ export default {
.gary { .gary {
color: #aaa; color: #aaa;
} }
.logistics{ .logistics {
align-items: center; align-items: center;
padding: 10px 0px; padding: 10px 0px;
.logistics_img{ .logistics_img {
width: 45px; width: 45px;
height: 45px; height: 45px;
margin-right: 12px; margin-right: 12px;
img{ img {
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
} }
.logistics_cent{ .logistics_cent {
span{ span {
display: block; display: block;
font-size: 12px; font-size: 12px;
} }

2
src/views/order/orderRefund/refundDetail.vue
View File

@ -34,7 +34,7 @@
<div v-if="orderDatalist.delivery_id" class="description-term">退货快递单号：{{ orderDatalist.delivery_id }}</div> <div v-if="orderDatalist.delivery_id" class="description-term">退货快递单号：{{ orderDatalist.delivery_id }}</div>
<div class="description-term">创建时间：{{ orderDatalist.create_time }}</div> <div class="description-term">创建时间：{{ orderDatalist.create_time }}</div>
<div class="description-term">退货金额：{{ orderDatalist.refund_price-orderDatalist.refund_postage }}</div> <div class="description-term">退货金额：{{ orderDatalist.refund_price-orderDatalist.refund_postage }}</div>
<div class="description-term">退抵扣券：{{ orderDatalist.amount }}</div> <div class="description-term">退折扣：{{ orderDatalist.amount }}</div>
<div class="description-term">退运费金额：{{ orderDatalist.refund_postage }}</div> <div class="description-term">退运费金额：{{ orderDatalist.refund_postage }}</div>
<div class="description-term">商家备注：{{ orderDatalist.mer_mark }}</div> <div class="description-term">商家备注：{{ orderDatalist.mer_mark }}</div>
<div class="description-term100">退款凭证： <div class="description-term100">退款凭证：

2739
src/views/product/addProduct/index.vue
View File

File diff suppressed because it is too large Load Diff

1220
src/views/product/productList/index.vue
View File

File diff suppressed because it is too large Load Diff

1381
src/views/product/productList/proDetails.vue
View File

File diff suppressed because it is too large Load Diff

5
vue.config.js
View File

@ -28,7 +28,8 @@ module.exports = {
outputDir: 'dist', outputDir: 'dist',
assetsDir: 'mer', assetsDir: 'mer',
indexPath: process.env.NODE_ENV === 'development' ? 'index.html' : 'mer.html', indexPath: process.env.NODE_ENV === 'development' ? 'index.html' : 'mer.html',
lintOnSave: process.env.NODE_ENV === 'development', // lintOnSave: process.env.NODE_ENV === 'development',
lintOnSave: false,
productionSourceMap: false, productionSourceMap: false,
devServer: { devServer: {
port: port, port: port,
@ -94,7 +95,7 @@ module.exports = {
.plugin('ScriptExtHtmlWebpackPlugin') .plugin('ScriptExtHtmlWebpackPlugin')
.after('html') .after('html')
.use('script-ext-html-webpack-plugin', [{ .use('script-ext-html-webpack-plugin', [{
// `runtime` must same as runtimeChunk name. default is `runtime` // `runtime` must same as runtimeChunk name. default is `runtime`
inline: /runtime\..*\.js$/ inline: /runtime\..*\.js$/
}]) }])
.end() .end()