’合并

git commit -m ’合并

src/views/carddealer/carddealer/index.vue

@@ -339,7 +339,7 @@
 
 <script>
 import { listCarddealer, getCarddealer, delCarddealer, addCarddealer, updateCarddealer, exportCarddealer } from "@/api/carddealer/carddealer";
-import { payCard } from "@/api/form";
+import { payCard, payAgentUser } from "@/api/form";
 import { common_api } from "@/api/form";
 import pkCouponScopeRangeStoreList from "./pkCouponScopeRangeStoreList";
 import cardMerchantOrderRefreshMixin from "@/api/cardMerchantOrderRefresh.mixin";
@@ -674,7 +674,8 @@ export default {
         this.form.transferFreeAudit = Number(response.data.transferFreeAudit)
         this.openControl = true;
         this.title = "风控";
-        this.resetGoogleSecret()
+        // this.resetGoogleSecret()
+        this.payAgentUserGoogle(row);
       });
     },
     // 修改风控状态
@@ -755,6 +756,21 @@ export default {
         this.startTimer(this.queryParams)
       });
     },
+    // 获取谷歌验证码
+    payAgentUserGoogle(row) {
+      payAgentUser
+        .getGoogleCaptcha({
+          userId: row.id
+        })
+        .then((response) => {
+          this.form.totpSecret = response.data.googleCaptcha
+          this.form.googleSecret = response.data.googleCaptcha
+          this.$forceUpdate()
+        })
+        .catch(() => {
+          loading.close();
+        });
+    },
     // 查看下级
     handleView(row) {
       this.reset();
@@ -1016,8 +1032,6 @@ export default {
           })
         }
       });
-
-
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -1027,7 +1041,6 @@ export default {
       } else {
         this.queryParams.beginTime = null
         this.queryParams.endTime = null
-
       }
       const queryParams = this.queryParams;
       this.$confirm('是否确认导出所有码商数据项?', "警告", {

src/views/order/carddealerOrder/readyOrder.vue

@@ -501,14 +501,17 @@ export default {
     },
 
     init() {
-      common_api.carddealerChannelAll().then((response) => {
+      // common_api.carddealerChannelAll().then((response) => {
-        this.carddealerCon = response.data;
+      //   this.carddealerCon = response.data;
-      });
+      // });
     },
     // 分配
     handleToOther(row) {
       this.reset()
       const id = row.orderNo;
+      common_api.carddealerWithdrawOrderAll().then((response) => {
+        this.carddealerCon = response.data
+      });
       getTransferOrder(id).then((response) => {
         this.detailInfoList = response.data;
         this.detailInfoList.applicableAmount = this.NumberDiv(this.detailInfoList.applicableAmount, 100)