Skip to content

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

1、更换logo；2、商品图片上传优化；3、提现申请，去支付宝

上级 40739631
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 248 行增加 和 217 行删除
src/layout/components/Sidebar/Logo.vue
浏览文件 @ dbf9dd1b
...@@ -14,7 +14,8 @@ ...@@ -14,7 +14,8 @@
</template> </template>
<script> <script>
import logoImg from '@/assets/logo/logo.png' // import logoImg from '@/assets/logo/logo.png';
import logoImg from '@/assets/logo/logo_white.png';
export default { export default {
name: 'SidebarLogo', name: 'SidebarLogo',
...@@ -33,7 +34,7 @@ export default { ...@@ -33,7 +34,7 @@ export default {
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped >
.sidebarLogoFade-enter-active { .sidebarLogoFade-enter-active {
transition: opacity 1.5s; transition: opacity 1.5s;
} }
......
src/utils/request.js
浏览文件 @ dbf9dd1b
...@@ -15,11 +15,11 @@ const service = axios.create({ ...@@ -15,11 +15,11 @@ const service = axios.create({
// request拦截器 // request拦截器
service.interceptors.request.use(config => { service.interceptors.request.use(config => {
// 是否需要设置 token // 是否需要设置 token
const isToken = (config.headers || {}).isToken === false const isToken = (config.headers || {}).isToken === false;
if (getToken() && !isToken) { if (getToken() && !isToken) {
config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改 config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
} }
//config.headers['Authorization'] = 'Bearer ' + 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJsb2dpbk5hbWUiOiIxNTcxMTEzOTg5NSIsInVpZCI6NTI4MjgsImNoYW5uZWxJZCI6MCwiZXhwIjoxNjE5NTEyMzI0LCJpc3MiOiJnaW4tYmxvZyJ9.1I74xBUHyu_XIc7BggNMpxRUGGZnGJEEvElD85xxIPY' //config.headers['Authorization'] = 'Bearer ' + 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJsb2dpbk5hbWUiOiIxNTcxMTEzOTg5NSIsInVpZCI6NTI4MjgsImNoYW5uZWxJZCI6MCwiZXhwIjoxNjE5Njc2MDMzLCJpc3MiOiJnaW4tYmxvZyJ9.ccnrAoIMRLQV1MAAII6J3F7ATnFDjcgUnMw6VoKuRA0'
return config return config
}, error => { }, error => {
console.log("25reject"); console.log("25reject");
...@@ -49,8 +49,7 @@ service.interceptors.response.use(res => { ...@@ -49,8 +49,7 @@ service.interceptors.response.use(res => {
}) })
} else if (code === 500) { } else if (code === 500) {
Message({ Message({
message: "状态吗500", message: message,
// message: message,
type: 'error' type: 'error'
}) })
return Promise.reject(new Error(message)) return Promise.reject(new Error(message))
...@@ -75,31 +74,31 @@ service.interceptors.response.use(res => { ...@@ -75,31 +74,31 @@ service.interceptors.response.use(res => {
} }
}, error => { }, error => {
// --- start ---- 开发时候用这段，把错误彻底抛出来 --- start --- // --- start ---- 开发时候用这段，把错误彻底抛出来 --- start ---
// let {message} = error; let {message} = error;
// if (message == 'Network Error') { if (message == 'Network Error') {
// message = "后端接口连接异常"; message = "后端接口连接异常";
// } else if (message.includes('timeout')) { } else if (message.includes('timeout')) {
// message = '系统接口请求超时'; message = '系统接口请求超时';
// } else if (message.includes("Request failed with status code")) { } else if (message.includes("Request failed with status code")) {
// message = "系统接口" + message.substr(message.length - 3) + "异常"; message = "系统接口" + message.substr(message.length - 3) + "异常";
// } }
// Message({ Message({
// message: message, message: message,
// type: "error" type: "error"
// }); });
// console.log(message); // console.log(message);
// --- end ---- 开发时候用这段，把错误彻底抛出来 --- end --- // --- end ---- 开发时候用这段，把错误彻底抛出来 --- end ---
// --- start --- 正式上线，隐藏报错信息 ----- start ---- // --- start --- 正式上线，隐藏报错信息 ----- start ----
let ssa = window.location.host; // let ssa = window.location.host;
setTimeout(function () { // setTimeout(function () {
if (ssa == 'localhost:1024') { // if (ssa == 'localhost:1024') {
window.location.href = 'http://sso.jxhh.com/logout?redirect=http://' + ssa // window.location.href = 'http://sso.jxhh.com/logout?redirect=http://' + ssa
} else { // } else {
window.location.href = 'http://sso.jxhh.com/logout?redirect=http://' + ssa // window.location.href = 'http://sso.jxhh.com/logout?redirect=http://' + ssa
} // }
}, 1000); // }, 1000);
// --- end --- 正式上线，隐藏报错信息 ----- end ---- // --- end --- 正式上线，隐藏报错信息 ----- end ----
return Promise.reject(error) return Promise.reject(error)
......
src/views/login.vue
浏览文件 @ dbf9dd1b
...@@ -38,7 +38,6 @@ export default { ...@@ -38,7 +38,6 @@ export default {
this.tiaozuan(); this.tiaozuan();
// this.getCookie(); // this.getCookie();
// this.getCode(); // this.getCode();
}, },
methods: { methods: {
tiaozuan(){ tiaozuan(){
......
src/views/system/asset/bankcard/index.vue
浏览文件 @ dbf9dd1b
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div class="app-container"> <div class="app-container">
<el-card class="box-card"> <el-card class="box-card">
<div slot="header" class="clearfix"> <div slot="header" class="clearfix">
<span>绑定银行卡</span> <span>账户管理</span>
<el-button <el-button
style='float:right' style='float:right'
:disabled="!addbank" :disabled="!addbank"
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
@click="handleAdd" @click="handleAdd"
>新增 >新增
</el-button> </el-button>
</div> </div>
<el-table v-loading="loading" :height="tableHeight" :data="bankcardList" <el-table v-loading="loading" :height="tableHeight" :data="bankcardList"
...@@ -47,56 +46,66 @@ ...@@ -47,56 +46,66 @@
@pagination="getList" @pagination="getList"
/> />
<!-- 添加或修改商户银行卡对话框 --> <!-- 添加或修改商户银行卡对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <!-- <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>-->
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <!-- <el-form ref="form" :model="form" :rules="rules" label-width="80px">-->
<el-form-item label="类型"> <!-- <el-form-item label="类型">-->
<el-select @change="selectChanged" v-model="form.txType" placeholder="类型"> <!-- <el-select @change="selectChanged" v-model="form.txType" placeholder="类型">-->
<el-option v-for="item in state" :key="item.value" :label="item.label" <!-- <el-option v-for="item in state" :key="item.value" :label="item.label"-->
:value="item.value"></el-option> <!-- :value="item.value"></el-option>-->
</el-select> <!-- </el-select>-->
</el-form-item> <!-- </el-form-item>-->
</el-form> <!-- </el-form>-->
<div slot="footer" class="dialog-footer"> <!-- <div slot="footer" class="dialog-footer">-->
<el-button type="primary" @click="submitForm">确 定</el-button> <!-- <el-button type="primary" @click="submitForm">确 定</el-button>-->
<el-button @click="cancel">取 消</el-button> <!-- <el-button @click="cancel">取 消</el-button>-->
</div> <!-- </div>-->
</el-dialog> <!-- </el-dialog>-->
<el-dialog :visible.sync="bank" :title="banktitle"> <el-dialog :visible.sync="bank" :title="banktitle">
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="90px">
<el-form-item label="开户城市" prop="ProvinceCity"> <el-row>
<el-input v-model="form.ProvinceCity" placeholder="请输入城市名和商户提交时一致"/> <el-col :span="16" :offset="3">
</el-form-item> <el-form-item label="开户城市" prop="ProvinceCity">
<el-form-item label="银行名称"> <el-input v-model="form.ProvinceCity" placeholder="请输入城市名和商户提交时一致"/>
<el-select v-model="form.BankName" placeholder="状态"> </el-form-item>
<el-option v-for="item in bankList" :key="item.value" :label="item.value" </el-col>
:value="item.value"></el-option> </el-row>
</el-select>
</el-form-item> <el-row>
<el-form-item label="开户行" prop="kaihuhang"> <el-col :span="16" :offset="3">
<el-input v-model="form.kaihuhang" placeholder="请输入开户行"/> <el-form-item label="银行名称">
</el-form-item> <el-select v-model="form.BankName" placeholder="状态" style="width: 100%">
<el-form-item label="持卡人姓名" prop="BankAccountName"> <el-option v-for="item in bankList" :key="item.value" :label="item.value"
<el-input v-model="form.BankAccountName" placeholder="请输入持卡人姓名"/> :value="item.value"></el-option>
</el-form-item> </el-select>
<el-form-item label="卡号" prop="BankAccountNo"> </el-form-item>
<el-input v-model="form.BankAccountNo" placeholder="请输入卡号"/> </el-col>
</el-form-item> </el-row>
</el-form>
<div slot="footer" class="dialog-footer"> <el-row>
<el-button type="primary" @click="submitForm">确 定</el-button> <el-col :span="16" :offset="3">
<el-button @click="cancel">取 消</el-button> <el-form-item label="开户行" prop="kaihuhang">
</div> <el-input v-model="form.kaihuhang" placeholder="请输入开户行"/>
</el-dialog> </el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="16" :offset="3">
<el-form-item label="持卡人姓名" prop="BankAccountName">
<el-input v-model="form.BankAccountName" placeholder="请输入持卡人姓名"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="16" :offset="3">
<el-form-item label="卡号" prop="BankAccountNo">
<el-input v-model="form.BankAccountNo" placeholder="请输入卡号"/>
</el-form-item>
</el-col>
</el-row>
<el-dialog :visible.sync="zfb" :title="banktitle">
<el-form ref="form" :model="form" :rules="rules2" label-width="80px">
<el-form-item label="支付宝账户名称" prop="ZfbAccountName">
<el-input v-model="form.ZfbAccountName" placeholder="请输入支付宝账户名称"/>
</el-form-item>
<el-form-item label="支付宝账户" prop="ZfbAccount">
<el-input v-model="form.ZfbAccount" placeholder="请输入支付宝账户"/>
</el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button> <el-button type="primary" @click="submitForm">确 定</el-button>
...@@ -104,6 +113,21 @@ ...@@ -104,6 +113,21 @@
</div> </div>
</el-dialog> </el-dialog>
<!-- <el-dialog :visible.sync="zfb" :title="banktitle">-->
<!-- <el-form ref="form" :model="form" :rules="rules2" label-width="80px">-->
<!-- <el-form-item label="支付宝账户名称" prop="ZfbAccountName">-->
<!-- <el-input v-model="form.ZfbAccountName" placeholder="请输入支付宝账户名称"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="支付宝账户" prop="ZfbAccount">-->
<!-- <el-input v-model="form.ZfbAccount" placeholder="请输入支付宝账户"/>-->
<!-- </el-form-item>-->
<!-- </el-form>-->
<!-- <div slot="footer" class="dialog-footer">-->
<!-- <el-button type="primary" @click="submitForm">确 定</el-button>-->
<!-- <el-button @click="cancel">取 消</el-button>-->
<!-- </div>-->
<!-- </el-dialog>-->
</el-card> </el-card>
</div> </div>
</template> </template>
...@@ -119,7 +143,6 @@ ...@@ -119,7 +143,6 @@
state: [ state: [
// {label: "支付宝", value: 2}, // {label: "支付宝", value: 2},
{label: "银行卡", value: 1}, {label: "银行卡", value: 1},
], ],
//银行 //银行
bankList: [], bankList: [],
...@@ -139,7 +162,7 @@ ...@@ -139,7 +162,7 @@
bankcardList: [], bankcardList: [],
// 弹出层标题 // 弹出层标题
title: "", title: "",
banktitle: "银行卡/支付宝数量最大为3个", banktitle: "对公账户（数量最多为3个）",
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
addbank: false, addbank: false,
...@@ -152,7 +175,9 @@ ...@@ -152,7 +175,9 @@
sellerId: 0, sellerId: 0,
}, },
// 表单参数 // 表单参数
form: {}, form: {
},
// 表单校验 // 表单校验
rules: {}, rules: {},
rules2: { rules2: {
...@@ -191,19 +216,18 @@ ...@@ -191,19 +216,18 @@
}); });
}, },
//类型改变 //类型改变
selectChanged(v) { // selectChanged(v) {
if (v == 1) { // if (v == 1) {
this.bank = true // this.bank = true
this.zfb = false // this.zfb = false
} else if (v == 2) { // } else if (v == 2) {
this.bank = false // this.bank = false
this.zfb = true // this.zfb = true
} else { // } else {
this.bank = false // this.bank = false
this.zfb = true // this.zfb = true
} // }
// },
},
//根据银行类别判断 //根据银行类别判断
btypa(row) { btypa(row) {
var lx = "" var lx = ""
...@@ -258,7 +282,7 @@ ...@@ -258,7 +282,7 @@
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd() { handleAdd() {
this.reset(); this.reset();
this.open = true; this.bank = true;
this.title = "添加商户银行卡"; this.title = "添加商户银行卡";
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
...@@ -275,7 +299,8 @@ ...@@ -275,7 +299,8 @@
submitForm() { submitForm() {
this.$refs["form"].validate(valid => { this.$refs["form"].validate(valid => {
if (valid) { if (valid) {
this.form.sellerId = this.queryParams.sellerId this.form.sellerId = this.queryParams.sellerId;
this.form.TxType = 1;
addBankcard(this.form).then(response => { addBankcard(this.form).then(response => {
if (response.code === 0) { if (response.code === 0) {
this.msgSuccess("新增成功"); this.msgSuccess("新增成功");
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论