Skip to content

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

Merge branch 'dev_hxz' into test

上级 d8699191 04c47c27
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 355 行增加 和 289 行删除
.env.development
浏览文件 @ 617dc63d
......@@ -3,7 +3,7 @@ ENV = 'development'
# 正式环境
#VUE_APP_BASE_API = 'http://sjapi.jxhh.com'
#VUE_APP_BASE_SYS_API = 'http://sysapi.jxhh.com'
VUE_APP_BASE_SYS_API = 'http://sysapi.jxhh.com'
# 开发环境
#VUE_APP_BASE_API = 'http://192.168.111.34:8200'
VUE_APP_BASE_API = 'http://192.168.26.179:8200'
......
src/api/module/bankcard.js
浏览文件 @ 617dc63d
......@@ -171,10 +171,17 @@ export function addInvoiceData (data) {
}
// 获取验证码
// export function getCheckCodeData(data) {
// return request({
// url: '/system/withdrawlog/getCheckCode',
// method: 'post',
// data: data
// })
// }
export function getCheckCodeData(data) {
return request({
url: '/system/withdrawlog/getCheckCode',
method: 'post',
url: '/local/seller/sendMobile',
method: 'get',
data: data
})
}
......
src/api/module/operation/index.js
浏览文件 @ 617dc63d
// import request from '@/utils/request';
import request from '@/utils/request';
import axios from 'axios'
// 获取分类列表
//
// // 获取分类列表
// export function getDocList (docType) {
// return request({
// url: '/api/v1/document/externalTypeListALL?docType='+docType,
// url: '//sysapi.jxhh.com/api/v1/document/externalTypeListALL?docType='+docType,
// method: 'get'
// })
// }
//
// // 查询文档
// //
// // // 查询文档
// export function getDoc (query) {
// return request({
// url: '/api/v1/document/externalShow',
......
src/views/system/asset/myAsset/index.vue
浏览文件 @ 617dc63d
......@@ -4,7 +4,7 @@
<!-- 商品信息 -->
<div class="card-header-custom">
<div class="card-header-title">
<span class="blue-block blue-block-goods-title"></span>账号资产
<span class="blue-block blue-block-goods-title"></span>账户资产
</div>
<div class="card-header-handle">
<el-button plain type="primary" size="small" @click="explainWithdrawal">提现说明</el-button>
......@@ -111,7 +111,7 @@
</el-form-item>
<el-form-item label="对公银行账号：" prop="bank_account_sn">
<el-input v-model="bankcardForm.bank_account_sn" placeholder="请输入快递单号" style="width: 70%"></el-input>
<el-input v-model="bankcardForm.bank_account_sn" placeholder="请输入对公银行账号" style="width: 70%"></el-input>
</el-form-item>
<el-form-item>
......
src/views/system/asset/withdraw/index.vue
浏览文件 @ 617dc63d
......@@ -20,7 +20,7 @@
<el-form-item label="提现至：" prop="bank_id">
<el-select v-model="assetForm.bank_id" placeholder="选择到账银行卡" style="width:420px;">
<el-option v-for="item in bankList" :key="item.id" :label="item.bank_name" :value="item.id"></el-option>
<el-option v-for="item in bankList" :key="item.id" :label="formatBankName(item.bank_name,item.bank_account_sn)" :value="item.id"></el-option>
</el-select>
<span class="withdraw-tip">
您还没有账户，<span class="spe-span-a" @click="goToAddBank">去添加</span>
......@@ -30,7 +30,8 @@
<el-form-item label="提现金额：">
<el-input v-model="withdrawalBalance" disabled placeholder="全部提现金额" style="width:420px;"/>
<span class="withdraw-tip">
提现金额为全部的可提现余额，手续费将从您的提现金额中扣除，以实际到账为准（开票以实际到账金额开具）
不允许手动输入，提现金额为全部的可提现余额，手续费将从您的提现金额中扣除，以实际到账为准（开票以实际到账金额开具）。
提现金额至少为100元才可以操作提现
</span>
<p class="withdraw-tip-spe">当前提现手续费为：{{ chargeCount }} 元</p>
</el-form-item>
......@@ -55,7 +56,7 @@
<div class="footer-btn">
<el-button type="primary" @click="submitForm" :disabled="inSureCashOut" style="margin-right:20px;">确 定</el-button>
<el-button @click="resetAssetForm">取 消</el-button>
<!-- <el-button @click="resetAssetForm">取 消</el-button>-->
</div>
</el-card>
</div>
......@@ -182,9 +183,12 @@
// 倒计时效果
this.getCode()
getCheckCodeData({seller_id: this.seller_id}).then(response => {
if (response.code == 0) {
this.msgSuccess(response.msg);
// 获取验证码接口
getCheckCodeData().then(res => {
if (res.code == 1) {
this.$message({type:'success',message: '验证码发送成功'});
}else {
this.$message({type:'error',message: res.message ? res.message : '发送失败'});
}
});
},
......@@ -233,6 +237,11 @@
/** 提交按钮 */
submitForm() {
if( Number(this.withdrawalBalance) < 100) {
this.$message({type: 'warning',message: '提现金额至少为100才可操作提现'});
return;
}
this.$refs["assetForm"].validate(valid => {
if (valid) {
applyWithdraw(this.assetForm).then(res => {
......@@ -247,6 +256,22 @@
}
});
},
/** 提现 银行卡名称 + ***后四位卡号 */
formatBankName(name,num) {
let newBnakName = '';
let newNum = '';
// 为了以防万一，先将num转为字符串
let numStr = num + '';
if(numStr && numStr.length > 4) {
newNum = '****' + numStr.substring(numStr.length-4)
}else {
newNum = numStr
}
newBnakName = name + ' (' + newNum + ')'
return newBnakName
}
} //methods结束
};
</script>
......
src/views/system/freight/freight_list/index.vue
浏览文件 @ 617dc63d
......@@ -34,13 +34,13 @@
<el-table v-loading="loading" :data="freightList" :height="tableHeight" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column label="ID" align="center" prop="Id"/>
<el-table-column label="模板名称" align="center" prop="Name"/>
<el-table-column label="排序" align="center" prop="Sort"/>
<el-table-column label="是否是默认模板" align="center" :formatter="formatDefault" prop="IsDefault"/>
<el-table-column label="ID" align="center" prop="id"/>
<el-table-column label="模板名称" align="center" prop="name"/>
<el-table-column label="排序" align="center" prop="sort"/>
<el-table-column label="是否是默认模板" align="center" :formatter="formatDefault" prop="is_default"/>
<!-- <el-table-column label="类型" align="center" :formatter="formatType" prop="ChargeType"/> -->
<el-table-column label="启用状态" align="center" :formatter="formaStatus" prop="Publish"/>
<el-table-column label="创建时间" align="center" :formatter="formatTime" prop="Created"/>
<el-table-column label="启用状态" align="center" :formatter="formaStatus" prop="publish"/>
<el-table-column label="创建时间" align="center" :formatter="formatTime" prop="created"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
......@@ -148,9 +148,9 @@
this.isOpen = val;
this.getList();
},
// 模板是否启用状态
/** 启用状态 格式化*/
formaStatus(row) {
let isPublish = row.Publish;
let isPublish = row.publish;
let publish = '';
if(isPublish === 1) {
publish = '启用';
......@@ -172,7 +172,7 @@
},
//格式化状态
formatDefault(row) {
var types = row.IsDefault
var types = row.is_default
var optDes = ''
if (types == 1) {
optDes = "是"
......@@ -183,7 +183,7 @@
},
//格式化时间
formatTime(row) {
var Time = row.Created
var Time = row.created
var newtime = ""
if (Time > 0) {
newtime = dateFormat(Time * 1000, "Y-m-d H:i:s");
......@@ -194,7 +194,7 @@
getList() {
listFreight(this.queryParams).then(res => {
if(res.data) {
debugger
//
this.freightList = res.data.list;
this.total = res.data.count;
}
......@@ -234,7 +234,7 @@
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.Id)
this.ids = selection.map(item => item.id)
this.single = selection.length !== 1
this.multiple = !selection.length
},
......@@ -269,10 +269,10 @@
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.Id
const id = row.id
getFreight(id).then(response => {
let formdate = response.data
debugger
//
response.data.Dispatching = JSON.parse(formdate.Dispatching)
console.log("点击修改获取的数据：",formdate.Dispatching);
this.form = response.data
......@@ -283,7 +283,7 @@
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
debugger
if (valid) {
if (this.form.id != null) {
......@@ -311,8 +311,7 @@
* */
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.Id || this.ids;
debugger
const ids = row.id || this.ids;
this.$confirm('是否确认删除运费模板编号为“' + ids + '"的数据？','警告',{
confirmButtonText: '确定',
cancelButtonText: '取消',
......@@ -321,13 +320,11 @@
this.loading = true;
let delResult = await delFreight(ids);
if(delResult.code === 1) {
this.$message({type: 'success',message: delResult.msg});
this.$message({type: 'success',message: '删除成功'});
this.getList();
} else {
this.$message({type: 'error',message: delResult.msg ? delResult.msg : '删除失败'});
}
if(delResult.code === 0) {
this.$message({type: 'error',message: delResult.msg});
}
this.loading = false;
}).catch(()=> {});
},
} //methods结束
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论