更新商家银行提现功能

src/utils/httpRequest.js

@@ -44,8 +44,8 @@ http.interceptors.response.use(response => {
 http.adornUrl = (actionName) => {
   // 非生产环境 && 开启代理, 接口前缀统一使用[/proxyApi/]前缀做代理拦截!
   // return (process.env.NODE_ENV !== 'production' && process.env.OPEN_PROXY ? '/proxyApi/' : window.SITE_CONFIG.baseUrl) + actionName
-	// return 'https://mxys.chuanghai-tech.com/sqx_fast/' + actionName
-  return 'https://www.daweilinli.com/sqx_fast/' + actionName
+	return 'https://mxys.chuanghai-tech.com/sqx_fast/' + actionName
+  // return 'https://www.daweilinli.com/sqx_fast/' + actionName
 	// return 'http://192.168.0.131:8171/sqx_fast/' + actionName
 }
 

src/views/finance/financeList.vue

@@ -77,6 +77,7 @@
 					<template slot-scope="scope">
 						<span v-if="scope.row.classify==1">支付宝提现</span>
 						<span v-if="scope.row.classify==2">微信提现</span>
+						<span v-if="scope.row.classify==5">银行卡提现</span>
 					</template>
 				</el-table-column>
 				<el-table-column prop="orderNumber" label="转账订单号" width="150">
@@ -87,6 +88,38 @@
 						<span v-else>无</span>
 					</template>
 				</el-table-column>
+				<el-table-column prop="bankCardNo" label="银行卡号" width="150">
+					<template slot-scope="scope">
+						<span style="color: #4f9dec;cursor: pointer;"
+							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="openBank" label="开户行" width="100">
+					<template slot-scope="scope">
+						<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="提现金额" width="100">
+				</el-table-column>
+				<el-table-column prop="rate" label="手续费" width="100">
+				</el-table-column>
+				<el-table-column prop="currentBalance" label="当前余额" width="100">
+				</el-table-column>
+				<el-table-column prop="state" label="状态" width="100">
+					<template slot-scope="scope">
+						<span style="color: #4f9dec;cursor: pointer;" v-if="scope.row.state == 0">待转账</span>
+						<span v-if="scope.row.state == 1">已转账</span>
+						<span v-if="scope.row.state == -1">已拒绝</span>
+					</template>
+				</el-table-column>
 				<el-table-column prop="zhifubao" label="支付宝账号" width="150">
 					<template slot-scope="scope">
 						<span style="color: #4f9dec;cursor: pointer;" @click="updates(scope.row)"
@@ -113,19 +146,6 @@
 						</div>
 					</template>
 				</el-table-column>
-				<el-table-column prop="money" label="提现金额" width="100">
-				</el-table-column>
-				<el-table-column prop="rate" label="手续费" width="100">
-				</el-table-column>
-				<el-table-column prop="currentBalance" label="当前余额" width="100">
-				</el-table-column>
-				<el-table-column prop="state" label="状态" width="100">
-					<template slot-scope="scope">
-						<span style="color: #4f9dec;cursor: pointer;" v-if="scope.row.state == 0">待转账</span>
-						<span v-if="scope.row.state == 1">已转账</span>
-						<span v-if="scope.row.state == -1">已拒绝</span>
-					</template>
-				</el-table-column>
 				<el-table-column prop="refund" label="拒绝原因" width="220">
 				</el-table-column>
 				<el-table-column prop="createAt" label="申请时间" width="170">
@@ -1089,6 +1109,9 @@
 						'zhifubaoName': this.zhifubaoName,
 						'shopName':this.shopName,
 						'zhifubao': this.zhifubao,
+						'bankCardNo':"",
+						'bankRealName':"",
+						'openBank':"",
 						'type': 2,
 						'state': this.indentState,
 						'phone': this.phone,
@@ -1311,6 +1334,10 @@
 						'zhifubaoName': this.zhifubaoName,
 						'shopName':this.shopName,
 						'zhifubao': this.zhifubao,
+						// 'bankCardNo':,
+						// 'bankRealName':,
+						// 'openBank':,
+						// 'classify':,
 						'type': 2,
 						'state': this.indentState,
 						'phone': this.phone,

src/views/mission/mission.vue

@@ -92,9 +92,9 @@
 						<div>店铺地址：{{scope.row.detailedAddress}}</div>
 					</template>
 				</el-table-column>
-				<el-table-column prop="orderType" label="订单类型">
+				<el-table-column prop="orderTypeExtra" label="订单类型">
 					<template slot-scope="scope">
-						<div>{{scope.row.orderType==1?'到店取餐':'外卖配送'}}</div>
+						<div>{{scope.row.orderTypeExtra==1?'到店取餐':scope.row.orderTypeExtra==2?'骑手配送':scope.row.orderTypeExtra==3?'商家配送':''}}</div>
 					</template>
 				</el-table-column>
 				<el-table-column prop="address" label="配送信息" width="300">
@@ -478,15 +478,18 @@
 				orderTypes: [{
 						label: '全部',
 						value: ''
-					},
-					{
+					},{
 						label: '到店取餐',
 						value: 1
 					},
 					{
-						label: '外卖配送',
+						label: '骑手配送',
 						value: 2
 					},
+					{
+						label: '商家配送',
+						value: 3
+					},
 				],
 				shopId: '',
 				shopName: '',

src/views/riderScheduling/riderScheduling.vue

@@ -161,7 +161,8 @@
 									console.log('nnnnnnnn',latlngs[n].styleId)
 									var that = this
                   console.log("window.location.href",window.location.href)
-                  if(window.location.href=='https://mxys.chuanghai-tech.com/wm-admin/'){
+                //   if(window.location.href=='https://www.daweilinli.com/wm-admin/'){
+				  if(window.location.href=='https://mxys.chuanghai-tech.com/wm-admin/'){
                     window.location.href="/wm-admin/#/userDetail?userId="+latlngs[n].styleId;
                   }else{
                     window.location.href="/userDetail?userId="+latlngs[n].styleId;

src/views/runErrands/duanxinlist.vue

@@ -12,6 +12,11 @@
 				</el-input>&nbsp;&nbsp;
 			</div>
 			<div style="position: relative;display: inline-block;">
+				<span>发送骑手：</span>
+				<el-input style="width: 200px;" @keydown.enter.native="select" placeholder="请输入发送骑手姓名" v-model="fromTo">
+				</el-input>&nbsp;&nbsp;
+			</div>
+			<div style="position: relative;display: inline-block;">
 				<span>接收人：</span>
 				<el-input style="width: 200px;" @keydown.enter.native="select" placeholder="请输入接收人姓名" v-model="sendTo">
 				</el-input>&nbsp;&nbsp;
@@ -43,6 +48,17 @@
 		  </el-table-column>
 		  <el-table-column prop="orderId" label="订单id" width="200" align="center">
 		  </el-table-column>
+		  <el-table-column prop="goodsCover" label="图片" width="150">
+            <template slot-scope="scope">
+              <div v-for="(item,index) in scope.row.imgs" :key="index"
+                style="display: inline-block; margin: 3px;">
+                <el-popover placement="top-start" title="" trigger="hover">
+                  <img style="width: 50px; height: 50px" :src="item" alt="" slot="reference">
+                  <img style="width: 300px; height: auto" :src="item" alt="">
+                </el-popover>
+              </div>
+            </template>
+          </el-table-column>
 		  <el-table-column prop="successFlag" label="发送状态" width="150">
 			<template slot-scope="scope">
 					  <div v-if="scope.row.successFlag==0">发送失败</div>
@@ -53,6 +69,7 @@
 		  <el-table-column prop="sendResult" label="发送结果" width="120" align="center">
 		  </el-table-column>
 		  <el-table-column prop="sendTo" label="接受人" width="180"></el-table-column>
+		  <el-table-column prop="sendFromPhone" label="发送骑手" width="180"></el-table-column>
 		  <el-table-column prop="sendTime" label="发送时间" width="100"></el-table-column>
 		</el-table>
 		<div style="text-align: center;margin-top: 10px;">
@@ -89,6 +106,7 @@
 				endTime: '',
 				orderId:'',
 				sendTo:'',
+				fromTo:'',
 				statesnum2: [{
 					label: '全部',
 					value: ''
@@ -176,6 +194,7 @@
 				this.orderId = ''
 				this.successFlag = ''
 				this.sendTo = ''
+				this.fromTo= ''
 				this.startTime = ''
 				this.endTime = ''
 				this.page = 1
@@ -199,6 +218,7 @@
 					'orderId': this.orderId,//订单id
 					'successFlag': this.successFlag,//是否发送成功
 					'sendTo': this.sendTo,//接受人
+					'fromTo': this.fromTo,//发送骑手
 					'startTime': this.startTime,//开始时间
 					'endTime': this.endTime,//结束时间
 					})
@@ -207,6 +227,12 @@
 				}) => {
 					if (data && data.code === 0) {
 					this.tableDataLoading = false
+					for (var i in data.data.list) {
+						if (data.data.list[i].imgs) {
+						data.data.list[i].imgs = data.data.list[i].imgs.split(',')
+						}
+
+					}
 					let returnData = data.data
 					this.duanxinData = returnData
 					}

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/shopWallet.vue

@@ -139,6 +139,33 @@
         <el-button style="margin:50px;" type="primary" icon="document" @click="querenBtn">确认
         </el-button>
       </el-tab-pane>
+      <!-- 银行卡账号 -->
+      <el-tab-pane label="提现银行账号信息" name="fourth">
+        <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-tabs>
 
@@ -299,6 +326,8 @@
           label: '按年查询'
         }],
         tixianData: {},
+        yinghangData:{},//银行卡信息
+        ifkaihuying:true,
       }
     },
     methods: {
@@ -446,6 +475,9 @@
         if (tab._props.label == '提现账号') {
           this.taskdataSelectZhb()
         }
+        if (tab._props.label == '提现银行账号信息') {
+          this.taskdataSelectyhk()
+        }
 
       },
       // 下架
@@ -842,6 +874,28 @@
 
         })
       },
+      //银行卡信息
+      taskdataSelectyhk(){
+        this.tableDataLoading = true
+        this.shopId = this.$route.query.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.$notify({
@@ -884,7 +938,158 @@
             }
           })
         })
-      }
+      },
+      // 银行卡提现信息新增
+      querenyinghangBtn(){
+        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()
+              }
+            })
+          }
+        })
+      },
     },
     mounted() {
       this.shopId = this.$route.query.shopId