更新商家银行提现功能

src/utils/httpRequest.js

@@ -45,7 +45,9 @@ http.adornUrl = (actionName) => {
   // 非生产环境 && 开启代理, 接口前缀统一使用[/proxyApi/]前缀做代理拦截!
   // return (process.env.NODE_ENV !== 'production' && process.env.OPEN_PROXY ? '/proxyApi/' : window.SITE_CONFIG.baseUrl) + actionName
 // return 'https://chtech.ncjti.edu.cn/testingServer/waiMaiAdmin/' + actionName}
-	return 'https://mxys.chuanghai-tech.com/sqx_fast/' + actionName}
+	return 'https://mxys.chuanghai-tech.com/sqx_fast/' + actionName
+  // return 'https://www.daweilinli.com/sqx_fast/' + actionName
+}
 
 http.adornUrl2 = (actionName) => {
   // 非生产环境 && 开启代理, 接口前缀统一使用[/tao/]前缀做代理拦截!
@@ -56,7 +58,9 @@ http.adornUrlMsg = (actionName) => {
   // 非生产环境 && 开启代理, 接口前缀统一使用[/proxyApi/]前缀做代理拦截!
   // return (process.env.NODE_ENV !== 'production' && process.env.OPEN_PROXY ? '/proxyApi/' : window.SITE_CONFIG.baseUrl) + actionName
 // return 'https://chtech.ncjti.edu.cn/testingServer/waiMaiAdmin/' + actionName}
-	return 'https://mxys.chuanghai-tech.com/sqx_fast/' + actionName}
+	return 'https://mxys.chuanghai-tech.com/sqx_fast/' + actionName
+  // return 'https://www.daweilinli.com/sqx_fast/' + actionName
+}
 http.adornWss = (actionName) => {
   // 非生产环境 && 开启代理, 接口前缀统一使用[/proxyApi/]前缀做代理拦截!
   // return (process.env.NODE_ENV !== 'production' && process.env.OPEN_PROXY ? '/proxyApi/' : window.SITE_CONFIG.baseUrl) + actionName

src/views/selfShop/shopPublish.vue

@@ -7,6 +7,7 @@
 			</a>
 			<span style="display: inline-block;margin: 0 15px;color: #D9D9D9;">|</span>
 			<span>商品发布</span>
+			<div style="color:red;">新增商品默认库存为1000件，需要修改可点击操作批量修改库存</div>
 		</div>
 		<div v-loading="tableDataLoading">
 			<div style="position: relative;">

src/views/shopsList/merchIncome.vue

@@ -339,11 +339,23 @@ action="https://mxys.chuanghai-tech.com/sqx_fast/alioss/upload"
 				</el-table-column>
 				<el-table-column prop="zhifubao" label="支付宝账号">
 				</el-table-column>
-				<el-table-column prop="zhifubaoName" label="支付宝名称">
+				<el-table-column prop="bankCardNo" label="银行卡号" width="150">
+					<template slot-scope="scope">
+						<span
+							v-if="scope.row.bankCardNo">{{scope.row.bankCardNo!='null' ? scope.row.bankCardNo : '未绑定'}}</span>
+						<span v-else>未绑定</span>
+					</template>
 				</el-table-column>
-				<el-table-column prop="cashQrCode" label="提现二维码">
+				<el-table-column prop="openBank" label="开户行" width="100">
 					<template slot-scope="scope">
-						<img v-if="scope.row.cashQrCode" :src="scope.row.cashQrCode" width="50" height="50" />
+						<span v-if="scope.row.openBank">{{scope.row.openBank!='null' ? scope.row.openBank : '无'}}</span>
+						<span v-else>无</span>
+					</template>
+				</el-table-column>
+				<el-table-column prop="bankRealName" label="开户人姓名" width="100">
+					<template slot-scope="scope">
+						<span v-if="scope.row.bankRealName">{{scope.row.bankRealName!='null' ? scope.row.bankRealName : '无'}}</span>
+						<span v-else>无</span>
 					</template>
 				</el-table-column>
 				<el-table-column prop="money" label="提现金额">
@@ -353,6 +365,13 @@ action="https://mxys.chuanghai-tech.com/sqx_fast/alioss/upload"
 						<span>{{scope.row.refund ? scope.row.refund : '未退款'}}</span>
 					</template>
 				</el-table-column>
+				<el-table-column prop="zhifubaoName" label="支付宝名称">
+				</el-table-column>
+				<el-table-column prop="cashQrCode" label="提现二维码">
+					<template slot-scope="scope">
+						<img v-if="scope.row.cashQrCode" :src="scope.row.cashQrCode" width="50" height="50" />
+					</template>
+				</el-table-column>
 				<el-table-column prop="createAt" label="申请时间" width="170">
 				</el-table-column>
 				<el-table-column prop="outAt" label="转账/退款时间" width="160">
@@ -427,6 +446,33 @@ action="https://mxys.chuanghai-tech.com/sqx_fast/alioss/upload"
 			<el-button style="margin:50px;" type="primary" icon="document" @click="querenBtn">确认
 			</el-button>
 		</el-tab-pane>
+		<!-- 银行卡账号 -->
+		<el-tab-pane label="提现银行账号信息" name="five">
+			<div style="margin:10px 0;">
+			<span>银行卡号：</span>
+			<el-input style="width: 200px;" clearable placeholder="请输入银行卡号"
+				v-model="yinghangData.cardNo">
+			</el-input>&nbsp;&nbsp;&nbsp;&nbsp;
+			</div>
+			<div style="position: relative;margin: 10px 0px;">
+			<span>开户行：</span>
+			<el-input style="width: 200px;" placeholder="请输入开户行名称"
+				v-model="yinghangData.openBank">
+			</el-input>&nbsp;&nbsp
+			</div>
+			<div style="position: relative;margin: 10px 0px;">
+			<span>开户人姓名：</span>
+			<el-input style="width: 200px;" placeholder="请输入开户人姓名"
+				v-model="yinghangData.realName">
+			</el-input>&nbsp;&nbsp
+			</div>
+			<el-button v-if="ifkaihuying" style="margin:50px;" type="primary" icon="document" @click="querenyinghangBtn">确认
+			</el-button>
+			<el-button v-if="ifkaihuying==false" style="margin:50px;" type="primary" icon="document" @click="changeyinghangBtn">确定修改
+			</el-button>
+			<el-button v-if="ifkaihuying==false" style="margin:50px;" type="primary" icon="document" @click="deleteyinghangBtn">删除信息
+			</el-button>
+		</el-tab-pane>
 		<el-tab-pane label="保证金" name="baozhengjin">
 			<el-row v-loading="tableDataLoading">
 				<el-col :span="6" class="cards">
@@ -620,6 +666,8 @@ action="https://mxys.chuanghai-tech.com/sqx_fast/alioss/upload"
 				txtype: '',
 				outMoney: '',
 				indexEr:1,
+				yinghangData:{},//银行卡信息
+        		ifkaihuying:true,
 			}
 		},
 		filters: {
@@ -733,6 +781,9 @@ action="https://mxys.chuanghai-tech.com/sqx_fast/alioss/upload"
 				if (tab._props.label == '提现账号') {
 					this.taskdataSelectZhb()
 				}
+				if (tab._props.label == '提现银行账号信息') {
+					this.taskdataSelectyhk()
+				}
 				if (tab._props.label == '保证金') {
 					this.size = 10
 					this.page = 1
@@ -1075,6 +1126,28 @@ action="https://mxys.chuanghai-tech.com/sqx_fast/alioss/upload"
 
 				})
 			},
+			//银行卡信息
+			taskdataSelectyhk(){
+				this.tableDataLoading = true
+				this.shopId = this.$cookie.get('shopId')
+				this.$http({
+				url: this.$http.adornUrl(`admin/shop/bank/getByShopId/${this.shopId}`),
+				method: 'get',
+				}).then(({
+				data
+				}) => {
+				if(data.msg=='success'){
+					this.tableDataLoading = false
+					let returnData = data.data
+					this.yinghangData = returnData
+					this.yingId=returnData.id
+					this.ifkaihuying=false
+				}else if(data.msg=='shopId对应的银行卡记录不存在'){
+					this.ifkaihuying=true
+				}
+
+				})
+			},
 			querenBtn() {
 				if (this.tixianData.zhiFuBaoName == ''||!this.tixianData.zhiFuBaoName) {
 					this.$notify({
@@ -1141,6 +1214,158 @@ action="https://mxys.chuanghai-tech.com/sqx_fast/alioss/upload"
 
 				})
 			},
+			// 银行卡提现信息新增
+			querenyinghangBtn(){
+				this.shopId = this.$cookie.get('shopId')
+				if (this.yinghangData.cardNo == '') {
+				this.$notify({
+					title: '提示',
+					duration: 1800,
+					message: '请输入银行卡号',
+					type: 'warning'
+				})
+				return
+				}
+				if (this.yinghangData.openBank == '') {
+				this.$notify({
+					title: '提示',
+					duration: 1800,
+					message: '请输入开户行名称',
+					type: 'warning'
+				})
+				return
+				}
+				if (this.yinghangData.realName == '') {
+				this.$notify({
+					title: '提示',
+					duration: 1800,
+					message: '请输入开户人姓名',
+					type: 'warning'
+				})
+				return
+				}
+
+				this.$http({
+				url: this.$http.adornUrl('admin/shop/bank'),
+				method: 'post',
+				data: this.$http.adornData({
+					"bankName": this.yinghangData.openBank,
+					"cardNo": this.yinghangData.cardNo,
+					"openBank": this.yinghangData.openBank,
+					"realName": this.yinghangData.realName,
+					"shopId": this.shopId
+				})
+				}).then(({
+				data
+				}) => {
+				if(data.msg=='success'){
+					this.$message({
+					message: '操作成功',
+					type: 'success',
+					duration: 1500,
+					onClose: () => {
+						this.ifkaihuying=false
+						this.taskdataSelectyhk()
+					}
+				})
+				}else {
+					this.$message({
+					message: data.msg,
+					type: 'warn',
+					duration: 1500,
+					})
+				}
+				
+				})
+			},
+			// 修改银行信息
+			changeyinghangBtn(){
+				if (this.yinghangData.cardNo == '') {
+				this.$notify({
+					title: '提示',
+					duration: 1800,
+					message: '请输入银行卡号',
+					type: 'warning'
+				})
+				return
+				}
+				if (this.yinghangData.openBank == '') {
+				this.$notify({
+					title: '提示',
+					duration: 1800,
+					message: '请输入开户行名称',
+					type: 'warning'
+				})
+				return
+				}
+				if (this.yinghangData.realName == '') {
+				this.$notify({
+					title: '提示',
+					duration: 1800,
+					message: '请输入开户人姓名',
+					type: 'warning'
+				})
+				return
+				}
+
+				this.$http({
+				url: this.$http.adornUrl('admin/shop/bank'),
+				method: 'put',
+				data: this.$http.adornData({
+					"bankName": this.yinghangData.openBank,
+					"cardNo": this.yinghangData.cardNo,
+					"id": this.yingId,
+					"openBank": this.yinghangData.openBank,
+					"realName": this.yinghangData.realName,
+					"shopId": this.shopId
+				})
+				}).then(({
+				data
+				}) => {
+				if(data.msg=='success'){
+					this.$message({
+					message: '修改成功',
+					type: 'success',
+					duration: 1500,
+					onClose: () => {
+						this.ifkaihuying=false
+						this.taskdataSelectyhk()
+					}
+				})
+				}else {
+					this.$message({
+					message: data.msg,
+					type: 'warn',
+					duration: 1500,
+					})
+				}
+				
+				})
+			},
+			// 删除银行信息
+			deleteyinghangBtn(){
+				this.$http({
+				url: this.$http.adornUrl(`admin/shop/bank/delete-by-shop-id/${this.shopId}`),
+				method: 'delete',
+				}).then(({
+				data
+				}) => {
+				if(data.msg=='success'){
+					this.yinghangData.openBank=''
+					this.yinghangData.cardNo=''
+					this.yinghangData.realName=''
+					this.$message({
+					message: '删除成功',
+					type: 'success',
+					duration: 1500,
+					onClose: () => {
+						this.ifkaihuying=true
+						this.taskdataSelectyhk()
+					}
+					})
+				}
+				})
+			},
 			// 保证金
 			dataSelectBzj() {
 				this.tableDataLoading = true