’合并

git commit -m ’合并

public/index.html

@@ -118,7 +118,7 @@
       top: 0;
       width: 51%;
       height: 100%;
-      background: #197CFE;
+      background: #6D5EF8;
       z-index: 1000;
       -webkit-transform: translateX(0);
       -ms-transform: translateX(0);

src/api/form.js

@@ -11,6 +11,14 @@ import {
  *
  */
 export const common_api = {
+  //查码商可分配通道
+  findChannelListAll: (query) => {
+    return request({
+      url: '/carddealer/carddealerCard/findChannelListAll',
+      method: 'get',
+      params: query,
+    })
+  },
   //查询所有商户
   getMerchantList: (query) => {
     return request({
@@ -75,9 +83,8 @@ export const common_api = {
   // 更新密钥
   upGoogleCaptcha: (data) => {
     return request({
-      url: '/system/user/upGoogleCaptcha',
+      url: '/system/user/upGoogleCaptcha?userId='+data.userId,
       method: 'PUT',
-      data: data,
       headers: {
         Authorization: "Bearer " + getToken(),
       },
@@ -468,6 +475,13 @@ export const payDev = {
  * 收款卡
  */
 export const payShouCard = {
+  // 分配通道
+  allocationChannel: (data) => {
+    return request({
+      url: '/carddealer/carddealerCard/allocationChannel?' + qs.stringify(data),
+      method: 'post',
+    })
+  },
   // 清除码商卡未付
   clearCarddealerCardOutstanding: (data) => {
     return request({

src/views/carddealer/carddealerCard/index.vue

@@ -61,7 +61,16 @@
             </el-switch>
           </template>
         </el-table-column>
-        <el-table-column label="渠道" align="center" prop="platformChannelName" />
+        <!-- <el-table-column label="渠道" align="center" prop="platformChannelName" /> -->
+
+        <el-table-column :label="'渠道'" align="center" prop="platformChannelName" min-width="180">
+          <template slot-scope="scope">
+            <span v-for="item, index in scope.row.channelNames" :key="index">
+              {{ item }}
+            </span>
+          </template>
+        </el-table-column>
+
         <el-table-column label="所属码商" align="center" prop="carddealerName" />
         <el-table-column label="银行名称" align="center" prop="bankName" />
         <el-table-column label="姓名" align="center" prop="cardHolder" />
@@ -140,6 +149,8 @@
 
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" min-width="150">
           <template slot-scope="scope">
+            <el-button size="small" type="text" @click="handleChannel(scope.row)" style="color: #006eff">分配通道</el-button>
+
             <el-button size="small" type="text" @click="handleKill(scope.row)" style="color: #006eff">清除</el-button>
             <el-button size="small" type="text" @click="handleDelete(scope.row)" style="color: #006eff">删除</el-button>
             <el-button size="small" type="text" @click="handleAudit(scope.row, 1)" style="color: #006eff"
@@ -172,6 +183,26 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+    <!-- openChannel -->
+    <el-dialog :title="title" :visible.sync="openChannel" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="110px">
+        <el-form-item label="通道" prop="ids">
+          <el-select v-model="form.ids" multiple placeholder="请选择通道" clearable size="medium" @change="changeChannel">
+            <el-option v-for="(item, i) in findChannelList" :key="i" :label="item.channelName"
+              :value="item.id"></el-option>
+          </el-select>
+        </el-form-item>
+
+
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFormChannel('form')">保 存</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
+
   </div>
 </template>
 
@@ -203,10 +234,12 @@ export default {
       total: 0,
       // 卡商-银行卡表格数据
       infoList: [],
+      findChannelList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
       open: false,
+      openChannel: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -293,7 +326,9 @@ export default {
     this.getList();
   },
   methods: {
-
+    changeChannel(e) {
+      this.$forceUpdate()
+    },
     tableRowClassName({ row, rowIndex }) {
       if (row.dayReceiveMax == row.todayReceived) {
         return "greenOrder";
@@ -347,6 +382,7 @@ export default {
     // 取消按钮
     cancel() {
       this.open = false;
+      this.openChannel = false;
       this.reset();
     },
     // 表单重置
@@ -372,6 +408,23 @@ export default {
       this.single = selection.length !== 1
       this.multiple = !selection.length
     },
+    /** 分配通道操作 */
+    handleChannel(row) {
+      this.reset();
+      if(row.channelIds.length){
+         this.form.ids=row.channelIds
+      }
+      this.form.cardId = row.id
+      common_api.findChannelListAll({
+        channelType: 1,
+        carddealerId: row.carddealerId
+      }).then(response => {
+        this.findChannelList = response.data
+        this.openChannel = true;
+        this.title = "分配通道";
+      });
+
+    },
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
@@ -391,6 +444,28 @@ export default {
       });
     },
     /** 提交按钮 */
+    submitFormChannel() {
+      if (!this.form.ids) {
+        this.$message.error("请选择通道");
+        return;
+      }
+      if (!this.form.ids.length) {
+        this.$message.error("请选择通道");
+        return;
+      }
+      let ids = this.form.ids.join(',')
+      payShouCard.allocationChannel({
+        ids: ids,
+        cardId: this.form.cardId
+      }).then((res) => {
+        if (res.code === 200) {
+          this.$message.success("分配成功");
+          this.openChannel = false
+          this.getList()
+        }
+      });
+    },
+    /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
@@ -461,6 +536,7 @@ export default {
 .greenOrder {
   background: #E9FEEA !important;
 }
+
 .redOrder {
   background: #FDF2F2 !important;
 }

src/views/configuration/daishouConfig.vue

@@ -70,6 +70,12 @@
                             默认禁用，启用后只能提交整数金额
                         </div>
                     </el-form-item>
+
+                    <!-- <el-form-item label="一卡多通道" prop="oneCardWithMultipleChannels" width="140px">
+                        <el-switch v-model="form.oneCardWithMultipleChannels" :active-value="1" :inactive-value="2">
+                        </el-switch>
+                    </el-form-item> -->
+
                     <el-form-item label="风控统计时间" prop="marginTime">
                         <el-input v-model="form.marginTime" placeholder="请输入风控统计时间"
                             style="width: 560px;border-color: #E6F1FF;">
@@ -86,6 +92,12 @@
                             手机app超时时间（秒），如果超过这个时间，判定为断线
                         </div>
                     </el-form-item>
+
+                    <el-form-item label="是否允许同金额" prop="sameAmountLimitStatus">
+                        <el-switch v-model="form.sameAmountLimitStatus" :active-value="1" :inactive-value="2">
+                        </el-switch>
+                    </el-form-item>
+                    
                     <el-form-item label="app限制出卡" prop="appLimitStatus">
                         <el-switch v-model="form.appLimitStatus" :active-value="1" :inactive-value="2">
                         </el-switch>
@@ -186,6 +198,8 @@ export default {
                             cardFloatingAmount: cardFloatingAmount,
                             carddealerMinBalance: carddealerMinBalance,
                             orderAmountUnfreezeTime: this.form.orderAmountUnfreezeTime,
+                            // oneCardWithMultipleChannels:this.form.oneCardWithMultipleChannels,
+                            sameAmountLimitStatus:this.form.sameAmountLimitStatus,
                             // payMax: payMax,
                             // payMin: payMin,
                         })

src/views/payTest/dsTest.vue

@@ -193,7 +193,8 @@
                             {{ detailInfoList.isAutoNotify == 1 ? '自动回调' : '手动回调' }}
                         </el-form-item>
                         <el-form-item label="通道费率">
-                            {{ detailInfoList.merchantRate + '%+' + parseFloat(NumberDiv(detailInfoList.merchantSingleFee, 100)).toFixed(2) }}
+                            {{ detailInfoList.merchantRate + '%+' + parseFloat(NumberDiv(detailInfoList.merchantSingleFee,
+                                100)).toFixed(2) }}
                         </el-form-item>
                         <el-form-item label="操作人">
                             {{ detailInfoList.notifyRemark }}
@@ -548,6 +549,16 @@ export default {
                         channlcode: this.form.channlcode,
                     }).then(response => {
                         this.msgSuccess("操作成功");
+                        this.$confirm('去支付', '提示', {
+                            confirmButtonText: '确定',
+                            cancelButtonText: '取消',
+                            type: 'warning'
+                        }).then(({ value }) => {
+                            window.open(response.data.payUrl);
+                        }).catch(() => {
+
+                        });
+
                         this.open = false;
                         this.getList();
                     });

src/views/system/user/index.vue

@@ -487,7 +487,9 @@ export default {
     // 更新密钥
     updateKey() {
       payAgentUser
-        .upGoogleCaptcha()
+        .upGoogleCaptcha({
+          userId:this.form.userId
+        })
         .then((response) => {
           this.form.googleCaptcha = response.data.googleCaptcha
           this.$forceUpdate()