Skip to content

S
shop-new
提交 0c155fe8 authored 作者: huaxinzhu's avatar huaxinzhu
浏览文件
操作

云仓-订单-bug修复；我的资产1-3

上级 156fe93e
显示空白字符变更
内嵌 并排
正在显示 包含 420 行增加 和 62 行删除
src/api/module/newasset.js 0 → 100644
浏览文件 @ 0c155fe8
import request from '@/utils/request'
/** 我的资产 */
// 获取 银行卡 信息
export function getBankcardListData(query) {
return request({
url: '/system/asset/list11',
method: 'get',
params: query
})
}
src/views/system/asset/myAsset/index.vue
浏览文件 @ 0c155fe8
<template>
<div class="app-container">
<el-card>
<p class="card-header-title ">
<span class="blue-block-goods blue-block-goods-title"></span>商品信息
<el-button type="primary" size="small">提现说明</el-button>
<el-button type="primary" size="small">提现说明</el-button>
</p>
<!-- 商品信息 -->
<div class="card-header-custom">
<div class="card-header-title">
<span class="blue-block blue-block-goods-title"></span>账号资产
</div>
<div class="card-header-handle">
<el-button plain type="primary" size="small">提现说明</el-button>
<el-button plain type="primary" size="small">提现记录</el-button>
</div>
</div>
<div class="row-flex-center">
<div class="current-balance">
<dl class="balance-dl">
<dt>当前余额（元）</dt>
<dd>￥{{ currentBalance }}</dd>
</dl>
<p class="in-details-balance">收支明细</p>
</div>
<div class="withdrawal-balance">
<dl class=" balance-dl dl-border">
<dt>可提现余额（元）</dt>
<dd>￥{{ withdrawalBalance }}</dd>
</dl>
</div>
<div class="withdrawal-progress">
<dl class=" balance-dl">
<dt>提现中的金额（元）</dt>
<dd>￥{{ withdrawalProgress }}</dd>
</dl>
</div>
</div>
<div class="row-flex-center">
<el-button type="primary" size="small" style="padding: 10px 30px; margin: 20px 0 40px;">提 现</el-button>
</div>
<!-- 账号管理 -->
<div class="card-header-custom">
<div class="card-header-title">
<span class="blue-block blue-block-goods-title"></span>账户管理
</div>
</div>
<div class="row-flex-space-around">
<div class="card-con" v-for="(item,index) in bankcardList" :key="index">
<div class="card-info-con">
<div class="card-name">{{ item.bank_name }}</div>
<div class="bank-detail">
<p>对公账户名称：{{ item.bank_name }}</p>
<p>银行名称：{{ item.bankAccountName }}</p>
<p>对公银行账号：{{ item.BankAccountSn }}</p>
<p>开户行（支行）：{{ item.bank_branch_name }}</p>
</div>
</div>
<div class="card-info-handle">
<el-button type="primary" size="mini" style="padding: 10px 30px; margin: 20px 40px 40px 0;">编 辑</el-button>
<el-button type="primary" size="mini" style="padding: 10px 30px; margin: 20px 0 40px;">删 除</el-button>
</div>
</div>
<div v-if="bankcardList.length < 3" class="hh-card-con" :class="{ 'only-add-con' : bankcardList.length == 0 ? true: false }">
<div class="add-card-con">
<div class="add-card-btn" @click="addBankcard">+</div>
</div>
</div>
</div>
<!-- <div class="row-flex-center">-->
<!-- <el-button type="primary" size="small" style="padding: 10px 30px; margin: 20px 40px 40px 0;">编 辑</el-button>-->
<!-- <el-button type="primary" size="small" style="padding: 10px 30px; margin: 20px 0 40px;">删 除</el-button>-->
<!-- </div>-->
</el-card>
<!-- 添加 银行卡 信息 -->
<el-dialog
:title="bankcardTitle"
:visible.sync="addBankcardInfoDialog"
center
>
<el-form ref="bankcardForm" label-width="180px">
<el-form-item label="账号类型：">
<el-input type="text" placeholder="银行对公账户" :disabled="true" style="width: 70%;"></el-input>
</el-form-item>
<el-form-item label="银行名称：" prop="bank_name" >
<el-select v-model="bankcardForm.bank_name" placeholder="请选择" style="width: 70%;">
<el-option
v-for="item in bankOptions"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="对公账户名称：" prop="bankAccountName" style="width:100%">
<el-input v-model="bankcardForm.bankAccountName" placeholder="请输入快递单号" style="width: 70%"></el-input>
</el-form-item>
<el-form-item label="开户行（支行）：" prop="bank_branch_name">
<el-input v-model="bankcardForm.bank_branch_name" placeholder="请输入开户行" style="width: 70%"></el-input>
</el-form-item>
<el-form-item label="对公银行账号：" prop="BankAccountSn">
<el-input v-model="bankcardForm.BankAccountSn" placeholder="请输入快递单号" style="width: 70%"></el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button size="small" @click="cancelSubmitBankcard">取 消</el-button>
<el-button size="small" type="primary" @click="submitBankcard">确 定</el-button>
</span>
</el-dialog>
</div>
</template>
<script>
import { getBankcardListData, } from '@/api/module/bankcard'
export default {
name: "Index",
data() {
return {
currentBalance: 123,
withdrawalBalance: 123,
withdrawalProgress: 123,
bankcardList: [
// { bank_name:'111',bankAccountName: '222', BankAccountSn: '333', bank_branch_name: '444'},
// { bank_name:'111',bankAccountName: '222', BankAccountSn: '333', bank_branch_name: '444'},
],
addBankcardInfoDialog: false,
bankcardTitle: '',
bankcardForm: {
bank_name: '',
bankAccountName: '',
BankAccountSn: '',
bank_branch_name: '',
},
bankOptions: [], // 银行卡列表
} // return end
}// data end
},// data end
created() {
//this.getBankcardList()
},
methods: {
/** 获取 账户银行卡列表 */
getBankcardList() {
getBankcardListData().then(res=> {
let msg = ''
if(res.code == 1) {
this.bankcardList = res.data;
}else {
msg = res.message ? res.message : '获取用户列表失败'
this.$message({type:'error',message: msg});
}
});
},
/** 添加 银行卡信息 */
addBankcard() {
this.bankcardTitle = '添加账户'
this.addBankcardInfoDialog = true;
},
/** 编辑 银行卡信息 */
editBankcard() {
this.bankcardTitle = '编辑账户'
this.addBankcardInfoDialog = true;
},
/** 提交 添加银行卡信息 */
submitBankcard() {
this.addBankcardInfoDialog = false;
},
/** 取消 提交 添加银行卡信息*/
cancelSubmitBankcard() {
this.addBankcardInfoDialog = false;
}
}
}
</script>
<style scoped>
/* el-card title hxz 样式统一 start */
.blue-block-goods-title {
margin: 0 20px 0 0;
.app-container {
overflow: auto;
}
.card-header-title {
/* el-card title hxz 样式统一 start */
.card-header-custom {
display: flex;
flex-direction: row;
justify-content: start;
justify-content: space-between;
align-items: center;
border-bottom: 1px solid #F6F6F8;
padding-bottom: 15px;
}
.card-header-title {
line-height: 24px;
font-size: 18px;
color: #000;
font-weight: bold;
height: 24px;
}
.blue-block-goods {
.blue-block {
display: inline-block;
width: 5px;
height: 24px;
background: #3A84FF;
margin: 0 9px 0 0;
border-radius: 2px;
vertical-align: bottom;
}
.current-balance,.withdrawal-balance,.withdrawal-progress {
flex: 1;
margin: 30px 0;
background-color: #F8FBFD;
}
.current-balance {
position: relative;
}
.balance-dl {
padding: 20px 0;
margin: 20px 0;
}
.dl-border {
border-right: 2px solid #E8E7E7;
border-left: 2px solid #E8E7E7;
}
.balance-dl > dt,.balance-dl > dd {
text-align: center;
margin: 20px 0;
padding: 0;
}
.balance-dl > dt {
height: 36px;
font-size: 16px;
font-weight: bold;
color: #333333;
line-height: 36px;
padding-left: 16px;
}
.balance-dl > dd {
height: 36px;
font-size: 34px;
font-weight: bold;
color: #40A3FC;
line-height: 36px;
}
.in-details-balance {
position: absolute;
height: 20px;
line-height: 20px;
font-size: 14px;
font-weight: 400;
color: #40A3FC;
cursor: pointer;
bottom: 6px;
left: calc(50% - 26px);
}
/* el-card title hxz 样式统一 end */
.row-flex-center {
display: flex;
flex-direction: row;
justify-content: center;
align-items: center;
}
.row-flex-space-around {
display: flex;
flex-direction: row;
justify-content: start;
align-items: center;
flex-wrap: wrap;
}
.mp20 {
margin: 30px;
padding: 10px 20px;
}
.card-con {
}
.card-info-con {
width: 468px;
height: 274px;
margin: 20px;
box-shadow :0 2px 10px 0 rgba(0,0,0,0.05);
}
.hh-card-con {
width: 468px;
height: 366px;
}
.only-add-con {
margin: 20px 0;
}
.add-card-con {
width: 468px;
height: 274px;
box-shadow :0 2px 10px 0 rgba(0,0,0,0.05);
}
/*.card-con:hover {*/
/* box-shadow :0 2px 10px 0 rgba(0,0,0,0.1);*/
/*}*/
/* 点击效果 */
.checked-bankcard {
}
.card-name {
height: 60px;
line-height: 60px;
text-align: center;
color: #fff;
border-radius: 5px 5px 0px 0px;
background: #40A3FC;
}
.bank-detail {
padding: 10px 20px;
font-size: 14px;
font-weight: 400;
color: #333333;
line-height: 30px;
}
.add-card-con {
background: #F8FBFD;
border: 1px dashed #D7D7D8;
border-radius: 5px;
display: flex;
flex-direction: row;
align-items: center;
justify-content: center;
}
.add-card-btn {
padding: 50px;
line-height: 30px;
text-align: center;
font-size: 24px;
cursor: pointer;
color: #666;
}
.card-info-handle {
display: flex;
flex-direction: row;
align-items: center;
justify-content: center;
}
</style>
src/views/system/order/components/orderDetail.vue
浏览文件 @ 0c155fe8
......@@ -32,8 +32,8 @@
<el-table-column label="规格/数量/单价" align="center">
<template slot-scope="scope">
{{ scope.row.goods_option_title }}<br/>
{{scope.row.total}}<br/>
{{scope.row.goods_price / 100}}
{{scope.row.goods_price / 100}} 元<br/>
x {{scope.row.total }}
</template>
</el-table-column>
<el-table-column label="商品订单状态" align="center">
......@@ -56,7 +56,7 @@
{{ scope.row.send_time ? formatter(scope.row.send_time) : '—' }}
</template>
</el-table-column>
<el-table-column label="操作" class-name="small-padding fixed-width" align="center">
<el-table-column label="操作" class-name="small-padding fixed-width" align="center" width="180">
<template slot-scope="scope">
<span style="font-size:12px;padding: 0 15px 0 0;" v-if="deliveryTypeText(scope.row.goods_status,scope.row.is_reissue) == '已补单'">已补单</span>
<el-button size="mini" type="text" v-if="deliveryTypeText(scope.row.goods_status,scope.row.is_reissue) == '去补单'" @click="goShipping(4,scope.row.id)">去补单</el-button>
......@@ -205,7 +205,7 @@
<div style="margin: 0 10%">
<el-form ref="form" label-width="100px">
<el-form-item label="快递公司：">
<el-select size="mini" v-model="expressNum" placeholder="请选择快递公司" style="width: 100%;">
<el-select size="mini" v-model="expressNum" filterable placeholder="请选择快递公司" style="width: 100%;">
<el-option
v-for="item in expressLists"
:key="item.value"
......@@ -260,7 +260,7 @@
:type="activity.type"
color="#0bbd87"
:size="activity.size"
:timestamp="formatter(activity.msgTime)">
:timestamp="activity.msg_time">
{{activity.content}}
</el-timeline-item>
</el-timeline>
......
src/views/system/order/index.vue
浏览文件 @ 0c155fe8
......@@ -25,8 +25,8 @@
<el-form class="form-params" ref="form" :model="form" label-width="85px">
<el-row type="flex" class="row-bg" justify="space-around">
<el-col :span="6">
<el-form-item label="订单号：">
<el-input size="mini" v-model="form.order_sn" placeholder="请输入订单号"/>
<el-form-item label="总订单号：">
<el-input size="mini" v-model="form.order_sn" placeholder="请输入总订单号"/>
</el-form-item>
</el-col>
......@@ -37,7 +37,7 @@
</el-col>
<el-col :span="6">
<el-form-item label="收货人：">
<el-input size="mini" v-model="form.shipname" placeholder="请输入收货人"/>
<el-input size="mini" v-model="form.real_name" placeholder="请输入收货人"/>
</el-form-item>
</el-col>
</el-row>
......@@ -65,7 +65,7 @@
<el-form-item label="发货时间：">
<el-date-picker
size="mini"
v-model="form.dateTime"
v-model="form.sendTime"
type="daterange"
align="left"
unaLink-panels
......@@ -79,7 +79,7 @@
<el-form-item label="完成时间：">
<el-date-picker
size="mini"
v-model="form.dateTime"
v-model="form.finishTime"
type="daterange"
align="left"
unaLink-panels
......@@ -106,22 +106,22 @@
<el-checkbox v-model="allTablesChecked" ></el-checkbox>
</template>
</el-table-column>
<el-table-column label="订单号" align="center" width="180" ></el-table-column>
<el-table-column label="商品名称" align="center" ></el-table-column>
<el-table-column label="订单号" align="center" width="220" ></el-table-column>
<el-table-column label="商品名称" align="center"></el-table-column>
<el-table-column label="规格/数量/金额" align="center" width="180" ></el-table-column>
<el-table-column label="下单时间" align="center" width="180" ></el-table-column>
<el-table-column label="发货时间" align="center" width="180" ></el-table-column>
<el-table-column label="完成时间" align="center" width="180" ></el-table-column>
<el-table-column label="下单/发货/完成时间" align="center" width="180" ></el-table-column>
<!-- <el-table-column label="发货时间" align="center" width="180" ></el-table-column>-->
<!-- <el-table-column label="完成时间" align="center" width="180" ></el-table-column>-->
<el-table-column label="收货人" align="center" width="180" ></el-table-column>
<el-table-column label="联系电话" align="center" width="180"></el-table-column>
<el-table-column label="操作" align="center" width="140"></el-table-column>
<el-table-column label="操作" align="center" width="120"></el-table-column>
</el-table>
</div>
<div class="table-all-con box-card">
<el-card v-for="(item, index) in tableDataList" :key="index" class="card1 text item">
<div slot="header" class="el-card-header-spe">
<div><span>订单状态：</span><span>{{ orderStatusFormatter(item.order.status) }}</span></div>
<div><span>订单状态：</span><span>{{ orderStatusFormatter(item.order.status) }}</span><span style="margin: 0 0 0 30px;">总订单号：</span><span>{{ item.order.order_sn }}</span></div>
</div>
<div class="item-table">
<el-table
......@@ -130,14 +130,13 @@
:span-method="arraySpanMethod"
:data="item.order_goods">
<el-table-column type="selection" width="55" align="center" v-if="activeName == 'fourth' "></el-table-column>
<el-table-column prop="goods_order_sn" label="订单号" width="180" align="center"></el-table-column>
<el-table-column prop="goods_order_sn" label="订单号" width="220" align="center"></el-table-column>
<el-table-column prop="goods_option_title" label="商品名称" align="center">
<template slot-scope="scope">
<div class="img-title-table">
<img style="width:60px;height:60px;" :src="scope.row.thumb"/>
<div class="ml10">{{ scope.row.goods_option_title }}</div>
</div>
</template>
</el-table-column>
<el-table-column label="规格/数量/金额" width="180" align="center">
......@@ -149,22 +148,24 @@
</el-table-column>
<el-table-column prop="created_time" label="下单时间" width="180" align="center">
<template slot-scope="scope">
{{ formatter(scope.row.created_time) }}
</template>
</el-table-column>
<el-table-column prop="send_time" label="发货时间" width="180" align="center">
<template slot-scope="scope">
{{ formatter(scope.row.send_time) }}
</template>
</el-table-column>
<el-table-column prop="updated_time" label="完成时间" width="180" align="center">
<template slot-scope="scope">
{{ formatter(scope.row.updated_time) }}
{{ speTiemFormatter(scope.row.created_time) }}<br/>
{{ speTiemFormatter(scope.row.send_time) }}<br/>
{{ speTiemFormatter(scope.row.updated_time) }}
</template>
</el-table-column>
<!-- <el-table-column prop="send_time" label="发货时间" width="180" align="center">-->
<!-- <template slot-scope="scope">-->
<!-- {{ formatter(scope.row.send_time) }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column prop="updated_time" label="完成时间" width="180" align="center">-->
<!-- <template slot-scope="scope">-->
<!-- {{ formatter(scope.row.updated_time) }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column prop="phone" width="180" label="收货人" align="center"></el-table-column>
<el-table-column prop="real_name" label="联系电话" width="180" align="center"></el-table-column>
<el-table-column label="操作" width="140" align="center">
<el-table-column label="操作" width="120" align="center" fixed="right">
<template slot-scope="scope">
<el-button type="text" @click="handleInfo(scope.row)">详情</el-button>
</template>
......@@ -268,7 +269,7 @@
form: {
order_sn: '',
GoodsName: '',
shipname: '',
real_name: '',
Tel: '',
dateTime: [],
finishTime: [],
......@@ -327,7 +328,7 @@
},
// 表格合并 列单元格
arraySpanMethod({ row, column, rowIndex, columnIndex }) {
if (columnIndex > 5) { // 用于设置要合并开始的列号
if (columnIndex > 4) { // 用于设置要合并开始的列号
if (rowIndex === 0) { // 用于设置合并开始的行号
return {
rowspan: 100,　　　　　// 合并的行数
......@@ -344,6 +345,13 @@
formatter(time) {
return dateFormat(time *1000, 'Y-m-d H:i:s')
},
speTiemFormatter(time) {
if (time) {
return dateFormat(time *1000, 'Y-m-d H:i:s')
}else {
return '--'
}
},
/** 订单状态 */
orderStatusFormatter(status) {
if(status === -1) {
......@@ -367,7 +375,7 @@
this.form = {
order_sn: '',
GoodsName: '',
shipname: '',
real_name: '',
Tel: '',
dateTime: [],
finishTime: [],
......@@ -431,16 +439,38 @@
limit: this.pageSize,
seller_id: this.sellerId,
status: this.goodsStatus,
start_time: new Date(this.form.dateTime[0]).getTime() / 1000 || '',
end_time: new Date(this.form.dateTime[1]).getTime() / 1000 || '',
order_sn: this.form.order_sn,
goods_name: this.form.GoodsName,
real_name: this.form.shipname,
mobile: this.form.Tel,
// start_time: new Date(this.form.dateTime[0]).getTime() / 1000 || '',
// end_time: new Date(this.form.dateTime[1]).getTime() / 1000 || '',
}
if(this.form.order_sn != '') {
params['order_sn'] = this.form.order_sn
}
if(this.form.GoodsName != '') {
params['goods_name'] = this.form.GoodsName
}
if(this.form.real_name != '') {
params['real_name'] = this.form.real_name
}
if(this.form.Tel != '') {
params['mobile'] = this.form.Tel
}
if(this.form.dateTime.length == 2) {
params['created_start_time'] = new Date(this.form.dateTime[0]).getTime() / 1000;
params['created_end_time'] = new Date(this.form.dateTime[0]).getTime() / 1000;
}
if(this.form.finishTime.length == 2) {
params['finish_start_time'] = new Date(this.form.dateTime[0]).getTime() / 1000;
params['finish_end_time'] = new Date(this.form.dateTime[0]).getTime() / 1000;
}
if(this.form.sendTime.length == 2) {
params['send_start_time'] = new Date(this.form.dateTime[0]).getTime() / 1000;
params['send_end_time'] = new Date(this.form.dateTime[0]).getTime() / 1000;
}
console.log(444,this.goodsStatus);
//return
listOrder(params).then(res => {
if (res.code == 1) {
// 每次订单 查询成功，保存查询参数，供商品导出接口使用（入参）
......@@ -454,12 +484,11 @@
this.total = res.data.count || 0
this.tableDataList = res.data.data
if(this.goodsStatus == 1) {
this.taotal1 = res.data.count;
}else if(this.goodsStatus == 2) {
this.taotal2 = res.data.count;
}
// if(this.goodsStatus == 1) {
// this.taotal1 = res.data.count;
// }else if(this.goodsStatus == 2) {
// this.taotal2 = res.data.count;
// }
}
})
},
......@@ -579,7 +608,7 @@
let remarkList = []
// res.data.order.remark 返回数据格式比较多，不判断了
try {
remarkList = JSON.parse(res.data.order.remark)
remarkList = JSON.parse(res.data.order.seller_remark)
} catch (e) {
remarkList = []
}
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论