feat:“添加收钱吧配置”

src/assets/language/zh.json

@@ -879,6 +879,7 @@
     "merchantInformation": "商户信息",
     "essentialInformation": "基本信息",
     "withdrawalData": "提现资料",
+    "sqbConfig": "收钱吧配置",
     "region": "地区",
     "accountNumber": "账号",
     "relationAdmin": "关联上级",
@@ -927,6 +928,17 @@
     "modificationSucceeded": "修改成功",
     "joinpayMch": "汇聚账号状态",
     "huifuMch": "汇付账号状态",
+    "deviceId": "设备号",
+    "terminalSn": "终端号",
+    "check": "今日签到状态",
+    "checkIn": "已签到",
+    "checkOut": "未签到",
+    "activateCode": "激活码",
+    "activateCodePlaceholder": "请输入激活码",
+    "activate": "激活",
+    "isActivate": "确认激活？",
+    "activateSucceeded": "激活成功",
+    "activateFailed": "激活失败",
     "tips": "提醒",
     "autoLogin": "是否切换登陆？"
   },

src/service/merchantManage/index.js

@@ -42,4 +42,14 @@ export function getHuifuMch(params) {
 // 切换登陆
 export function autoLoginMerchant(params) {
   return axios.get(`/SZWL-SERVER/tAdmin/autoLogin?${stringToUrl(params)}`);
+}
+
+// 获取收钱吧配置
+export function getSqbConfigApi(params) {
+  return axios.get(`/PAY-SERVER/tSqbConfig/getSqbConfig?${stringToUrl(params)}`);
+}
+
+// 激活收钱吧配置
+export function activeSqbConfigApi(params) {
+  return axios.get(`/PAY-SERVER/tSqbConfig/activate?${stringToUrl(params)}`);
 }

src/styles/merchantManage/index.less

@@ -251,787 +251,79 @@
         overflow: auto;
         overflow-x: hidden;
 
-        .Body {
-            width: 100%;
-            margin-bottom: 39px;
-
-            .Body {
-                width: 100%;
-                margin-bottom: 39px;
+        .tab {
+            .info {
+                width: 98px;
+                height: 13px;
+                overflow-wrap: break-word;
+                color: rgba(64, 77, 116, 1);
+                font-size: 14px;
+                text-align: left;
+                white-space: nowrap;
+                line-height: 14px;
+                display: block;
+                margin: 21px 0 0 32px;
+            }
 
-                .wrap1 {
+            .activate {
+                
+                display: flex;
+                justify-content: center;
+
+                .van-cell {
+                    // width: 250px;
+                    // height: 38px;
+                    // margin: 0 45px;
+                    // padding: 20px 30px;
                     background-color: rgba(255, 255, 255, 1);
-                    z-index: 24;
-                    height: 54px;
-                    // width: 100%;
-                    position: relative;
-
-                    .section1 {
-                        // width: 100%;
-                        height: 13px;
-                        padding: 34px 80px;
-
-                        .word3 {
-                            width: 56px;
-                            height: 13px;
-                            overflow-wrap: break-word;
-                            color: rgba(77, 106, 221, 1);
-                            color: rgba(135, 135, 166, 1);
-                            font-size: 14px;
-                            font-family: PingFangSC-Semibold;
-                            text-align: center;
-                            white-space: nowrap;
-                            line-height: 14px;
-                            display: block;
-                        }
-
-                        .info1 {
-                            width: 56px;
-                            height: 13px;
-                            overflow-wrap: break-word;
-                            color: rgba(135, 135, 166, 1);
-                            font-size: 14px;
-                            text-align: center;
-                            white-space: nowrap;
-                            line-height: 14px;
-                            display: block;
-                        }
-
-                        .acttive {
-                            position: relative;
-                            color: #4d6add;
-
-                            &::after {
-                                content: '';
-                                position: absolute;
-                                left: 50%;
-                                margin-left: -20px;
-                                bottom: 0;
-                                width: 40px;
-                                height: 2px;
-                                background-color: #4d6add;
-                                border-radius: 1px;
-                                bottom: -0.5em;
-                            }
-                        }
-                    }
-
-                    .section2 {
-                        background-color: rgba(77, 106, 221, 1);
-                        border-radius: 1px;
-                        z-index: 27;
-                        position: absolute;
-                        left: 88px;
-                        top: 53px;
-                        width: 40px;
-                        height: 2px;
-                    }
-
-                    .img1 {
-                        z-index: 28;
-                        position: absolute;
-                        left: 0;
-                        top: 52px;
-                        width: 100%;
-                        height: 2px;
-                    }
-                }
-
-                .wrap2 {
-                    width: 313px;
-                    height: 28px;
-                    margin: 20px auto;
-
-                    .info2 {
-                        width: 11px;
-                        height: 28px;
-                        overflow-wrap: break-word;
-                        color: rgba(223, 94, 76, 1);
-                        font-size: 20px;
-                        font-family: PingFangSC-Semibold;
-                        text-align: left;
-                        white-space: nowrap;
-                        line-height: 28px;
-                        display: block;
-                    }
-
-                    .info3 {
-                        width: 199px;
-                        height: 13px;
-                        overflow-wrap: break-word;
-                        color: rgba(64, 77, 116, 1);
-                        font-size: 15px;
-                        font-family: PingFangSC-Medium;
-                        text-align: left;
-                        white-space: nowrap;
-                        line-height: 15px;
-                        margin-top: 4px;
-                        display: block;
-                    }
-                }
-
-                .tab2 {
-                    .info3 {
-                        width: 98px;
-                        height: 13px;
-                        overflow-wrap: break-word;
-                        color: rgba(64, 77, 116, 1);
-                        font-size: 14px;
-                        text-align: left;
-                        white-space: nowrap;
-                        line-height: 14px;
-                        display: block;
-                        margin: 21px 0 0 32px;
-                    }
-
-                    .info4 {
-                        width: 126px;
-                        height: 13px;
-                        overflow-wrap: break-word;
-                        color: rgba(64, 77, 116, 1);
-                        font-size: 14px;
-                        text-align: left;
-                        white-space: nowrap;
-                        line-height: 14px;
-                        display: block;
-                        margin: 15px 0 0 32px;
-                    }
-
-                    .word4 {
-                        width: 171px;
-                        height: 13px;
-                        overflow-wrap: break-word;
-                        color: rgba(64, 77, 116, 1);
-                        font-size: 14px;
-                        text-align: left;
-                        white-space: nowrap;
-                        line-height: 14px;
-                        display: block;
-                        margin: 15px 0 0 32px;
-                    }
-
-                    .txt2 {
-                        width: 105px;
-                        height: 13px;
-                        overflow-wrap: break-word;
-                        color: rgba(64, 77, 116, 1);
-                        font-size: 14px;
-                        text-align: left;
-                        white-space: nowrap;
-                        line-height: 14px;
-                        display: block;
-                        margin: 20px 0 0 32px;
-                    }
-
-                    .word5 {
-                        width: 119px;
-                        height: 13px;
-                        overflow-wrap: break-word;
-                        color: rgba(64, 77, 116, 1);
-                        font-size: 14px;
-                        text-align: left;
-                        white-space: nowrap;
-                        line-height: 14px;
-                        display: block;
-                        margin: 15px 0 0 32px;
-                    }
-
-                    .word6 {
-                        width: 133px;
-                        height: 13px;
-                        overflow-wrap: break-word;
-                        color: rgba(64, 77, 116, 1);
-                        font-size: 14px;
-                        text-align: left;
-                        white-space: nowrap;
-                        line-height: 14px;
-                        display: block;
-                        margin: 15px 0 0 32px;
-                    }
-
-                    .txt3 {
-                        width: 98px;
-                        height: 13px;
-                        overflow-wrap: break-word;
-                        color: rgba(64, 77, 116, 1);
-                        font-size: 14px;
-                        text-align: left;
-                        white-space: nowrap;
-                        line-height: 14px;
-                        display: block;
-                        margin: 15px 0 0 32px;
-                    }
-
-                    .txt4 {
-                        width: 98px;
-                        height: 13px;
-                        overflow-wrap: break-word;
-                        color: rgba(64, 77, 116, 1);
-                        font-size: 14px;
-                        text-align: left;
-                        white-space: nowrap;
-                        line-height: 14px;
-                        display: block;
-                        margin: 15px 0 0 32px;
-                    }
-
-                    .word7 {
-                        width: 112px;
-                        height: 13px;
-                        overflow-wrap: break-word;
-                        color: rgba(64, 77, 116, 1);
-                        font-size: 14px;
-                        text-align: left;
-                        white-space: nowrap;
-                        line-height: 14px;
-                        display: block;
-                        margin: 15px 0 0 32px;
-                    }
-
-                    .txt5 {
-                        width: 70px;
-                        height: 13px;
-                        overflow-wrap: break-word;
-                        color: rgba(64, 77, 116, 1);
-                        font-size: 14px;
-                        text-align: left;
-                        white-space: nowrap;
-                        line-height: 14px;
-                        display: block;
-                        margin: 15px 0 0 32px;
-                    }
-
-                    .word8 {
-                        width: 70px;
-                        height: 13px;
-                        overflow-wrap: break-word;
-                        color: rgba(64, 77, 116, 1);
-                        font-size: 14px;
-                        text-align: left;
-                        white-space: nowrap;
-                        line-height: 14px;
-                        display: block;
-                        margin: 15px 0 0 32px;
-                    }
-
-
-                    .block5 {
-                        width: 122px;
-                        height: 13px;
-                        margin: 20px 0 0 32px;
-
-                        .txt6 {
-                            width: 70px;
-                            height: 13px;
-                            overflow-wrap: break-word;
-                            color: rgba(64, 77, 116, 1);
-                            font-size: 14px;
-                            text-align: left;
-                            white-space: nowrap;
-                            line-height: 14px;
-                            display: block;
-                        }
-
-                        .word9 {
-                            width: 42px;
-                            height: 13px;
-                            overflow-wrap: break-word;
-                            color: rgba(64, 77, 116, 1);
-                            font-size: 14px;
-                            text-align: left;
-                            white-space: nowrap;
-                            line-height: 14px;
-                            display: block;
-                        }
-                    }
-
-                    .word10 {
-                        width: 98px;
-                        height: 13px;
-                        overflow-wrap: break-word;
-                        color: rgba(64, 77, 116, 1);
-                        font-size: 14px;
-                        text-align: left;
-                        white-space: nowrap;
-                        line-height: 14px;
-                        display: block;
-                        margin: 15px 0 0 32px;
-                    }
-
-                    .word11 {
-                        width: 70px;
-                        height: 13px;
-                        overflow-wrap: break-word;
-                        color: rgba(64, 77, 116, 1);
-                        font-size: 14px;
-                        text-align: left;
-                        white-space: nowrap;
-                        line-height: 14px;
-                        display: block;
-                        margin: 15px 0 0 32px;
-                    }
-
-                    .word12 {
-                        width: 80%;
-                        height: 13px;
-                        overflow-wrap: break-word;
-                        word-wrap: break-word;
-                        color: rgba(64, 77, 116, 1);
-                        font-size: 14px;
-                        text-align: left;
-                        // white-space: normal;
-                        line-height: 20px;
-                        display: block;
-                        margin: 15px 15px 10px 32px;
-                    }
-                }
-
-                .info4 {
-                    width: 313px;
-                    height: 13px;
-                    overflow-wrap: break-word;
-                    color: rgba(64, 77, 116, 1);
-                    font-size: 14px;
-                    text-align: left;
-                    white-space: nowrap;
-                    line-height: 14px;
-                    display: block;
-                    margin: 20px auto;
-                }
-
-                .info5 {
-                    width: 313px;
-                    height: 13px;
-                    overflow-wrap: break-word;
-                    color: rgba(64, 77, 116, 1);
-                    font-size: 14px;
-                    text-align: left;
-                    white-space: nowrap;
-                    line-height: 14px;
-                    display: block;
-                    margin: 20px auto;
-                }
-
-                .wrap3 {
-                    width: 311px;
-                    height: 38px;
-                    margin: 15px 0 0 32px;
-
-                    .word4 {
-                        width: 39px;
-                        height: 13px;
-                        overflow-wrap: break-word;
-                        color: rgba(64, 77, 116, 1);
-                        font-size: 13px;
-                        text-align: left;
-                        white-space: nowrap;
-                        line-height: 13px;
-                        margin-top: 13px;
-                        display: block;
-                    }
-
-                    .bd1 {
-                        background-color: rgba(255, 255, 255, 1);
-                        border-radius: 2px;
-                        height: 38px;
-                        border: 0.5px solid rgba(185, 186, 208, 1);
-                        width: 247px;
-
-                        .word5 {
-                            width: 39px;
-                            height: 13px;
-                            overflow-wrap: break-word;
-                            color: rgba(168, 168, 197, 1);
-                            font-size: 13px;
-                            text-align: left;
-                            white-space: nowrap;
-                            line-height: 13px;
-                            display: block;
-                            margin: 13px 0 0 6px;
-                        }
-                    }
-                }
-
-                .txt3 {
-                    width: 313px;
-                    height: 13px;
-                    overflow-wrap: break-word;
                     color: rgba(168, 168, 197, 1);
                     font-size: 13px;
-                    text-align: left;
-                    white-space: nowrap;
-                    line-height: 13px;
-                    display: block;
-                    margin: 20px auto;
-                }
-
-                .wrap4 {
-                    width: 311px;
-                    height: 38px;
-                    margin: 15px 0 0 32px;
-
-                    .txt4 {
-                        width: 65px;
-                        height: 13px;
-                        overflow-wrap: break-word;
-                        color: rgba(64, 77, 116, 1);
-                        font-size: 13px;
-                        text-align: left;
-                        white-space: nowrap;
-                        line-height: 13px;
-                        margin-top: 13px;
-                        display: block;
-                    }
-
-                    .main3 {
-                        background-color: rgba(255, 255, 255, 1);
-                        border-radius: 2px;
+                    overflow: visible;
+                    
+    
+                    &::after {
+                        display: none;
+                    }
+    
+                    .van-field__control {
+                        // width: 150px;
                         height: 38px;
-                        border: 0.5px solid rgba(185, 186, 208, 1);
-                        margin-left: -1px;
-                        width: 247px;
-
-                        .txt5 {
-                            width: 39px;
-                            height: 13px;
-                            overflow-wrap: break-word;
-                            color: rgba(168, 168, 197, 1);
-                            font-size: 13px;
-                            text-align: left;
-                            white-space: nowrap;
-                            line-height: 13px;
-                            display: block;
-                            margin: 13px 0 0 6px;
-                        }
-                    }
-                }
-
-                .wrap5 {
-                    width: 311px;
-                    height: 38px;
-                    margin: 15px 0 0 32px;
-
-                    .info6 {
-                        width: 39px;
-                        height: 13px;
-                        overflow-wrap: break-word;
-                        color: rgba(64, 77, 116, 1);
-                        font-size: 13px;
-                        text-align: left;
-                        white-space: nowrap;
-                        line-height: 13px;
-                        margin-top: 13px;
-                        display: block;
-                    }
-
-                    .layer1 {
-                        background-color: rgba(255, 255, 255, 1);
-                        border-radius: 2px;
-                        height: 38px;
-                        border: 0.5px solid rgba(185, 186, 208, 1);
-                        width: 247px;
-
-                        .info7 {
-                            width: 39px;
-                            height: 13px;
-                            overflow-wrap: break-word;
-                            color: rgba(64, 77, 116, 1);
-                            font-size: 13px;
-                            text-align: left;
-                            white-space: nowrap;
-                            line-height: 13px;
-                            display: block;
-                            margin: 13px 0 0 6px;
-                        }
-                    }
-                }
-
-                .wrap6 {
-                    width: 269px;
-                    height: 18px;
-                    margin: 23px 0 0 32px;
-
-                    .txt6 {
-                        width: 65px;
-                        height: 13px;
-                        overflow-wrap: break-word;
-                        color: rgba(64, 77, 116, 1);
-                        font-size: 13px;
-                        text-align: left;
-                        white-space: nowrap;
-                        line-height: 13px;
-                        margin-top: 2px;
-                        display: block;
-                    }
-
-                    .ImageText1 {
-                        height: 13px;
-                        width: 29px;
-                        margin: 3px 0 0 83px;
-
-                        .mod1 {
-                            width: 29px;
-                            height: 13px;
-
-                            .wrap7 {
-                                border-radius: 50%;
-                                width: 12px;
-                                height: 12px;
-                                border: 1px solid rgba(77, 106, 221, 1);
-                                margin-top: 1px;
-                            }
-
-                            .TextGroup1 {
-                                height: 13px;
-                                width: 13px;
-
-                                .txt7 {
-                                    width: 13px;
-                                    height: 13px;
-                                    overflow-wrap: break-word;
-                                    color: rgba(64, 77, 116, 1);
-                                    font-size: 13px;
-                                    text-align: left;
-                                    white-space: nowrap;
-                                    line-height: 13px;
-                                    display: block;
-                                }
-                            }
-                        }
-                    }
-
-                    .ImageText2 {
-                        height: 18px;
-                        margin-left: 62px;
-                        width: 30px;
-
-                        .box1 {
-                            width: 30px;
-                            height: 18px;
-
-                            .group1 {
-                                border-radius: 50%;
-                                width: 12px;
-                                height: 12px;
-                                border: 1px solid rgba(77, 106, 221, 1);
-                                margin-top: 4px;
-                            }
-
-                            .TextGroup2 {
-                                height: 18px;
-                                width: 13px;
-
-                                .info8 {
-                                    width: 13px;
-                                    height: 18px;
-                                    overflow-wrap: break-word;
-                                    color: rgba(64, 77, 116, 1);
-                                    font-size: 13px;
-                                    text-align: left;
-                                    white-space: nowrap;
-                                    line-height: 18px;
-                                    display: block;
-                                }
-                            }
-                        }
-                    }
-                }
-
-                .wrap8 {
-                    width: 269px;
-                    height: 18px;
-                    margin: 15px 0 0 32px;
-
-                    .word6 {
-                        width: 117px;
-                        height: 13px;
-                        overflow-wrap: break-word;
-                        color: rgba(64, 77, 116, 1);
-                        font-size: 13px;
-                        text-align: left;
-                        white-space: nowrap;
-                        line-height: 13px;
-                        margin-top: 3px;
-                        display: block;
-                    }
-
-                    .ImageText3 {
-                        height: 13px;
-                        width: 29px;
-                        margin: 3px 0 0 31px;
-
-                        .group2 {
-                            width: 29px;
-                            height: 13px;
-
-                            .main4 {
-                                border-radius: 50%;
-                                width: 12px;
-                                height: 12px;
-                                border: 1px solid rgba(77, 106, 221, 1);
-                                margin-top: 1px;
-                            }
-
-                            .TextGroup3 {
-                                height: 13px;
-                                width: 13px;
-
-                                .info9 {
-                                    width: 13px;
-                                    height: 13px;
-                                    overflow-wrap: break-word;
-                                    color: rgba(64, 77, 116, 1);
-                                    font-size: 13px;
-                                    text-align: left;
-                                    white-space: nowrap;
-                                    line-height: 13px;
-                                    display: block;
-                                }
-                            }
-                        }
-                    }
-
-                    .ImageText4 {
-                        height: 18px;
-                        margin-left: 62px;
-                        width: 30px;
-
-                        .layer2 {
-                            width: 30px;
-                            height: 18px;
-
-                            .block1 {
-                                border-radius: 50%;
-                                width: 12px;
-                                height: 12px;
-                                border: 1px solid rgba(77, 106, 221, 1);
-                                margin-top: 4px;
-                            }
-
-                            .TextGroup4 {
-                                height: 18px;
-                                width: 13px;
-
-                                .txt8 {
-                                    width: 13px;
-                                    height: 18px;
-                                    overflow-wrap: break-word;
-                                    color: rgba(64, 77, 116, 1);
-                                    font-size: 13px;
-                                    text-align: left;
-                                    white-space: nowrap;
-                                    line-height: 18px;
-                                    display: block;
-                                }
-                            }
-                        }
-                    }
-                }
-
-                .wrap9 {
-                    width: 311px;
-                    height: 38px;
-                    margin: 15px 0 0 32px;
-
-                    .info10 {
-                        width: 39px;
-                        height: 13px;
-                        overflow-wrap: break-word;
-                        color: rgba(64, 77, 116, 1);
-                        font-size: 13px;
-                        text-align: left;
-                        white-space: nowrap;
-                        line-height: 13px;
-                        margin-top: 13px;
-                        display: block;
-                    }
-
-                    .mod2 {
-                        background-color: rgba(255, 255, 255, 1);
+                        line-height: 38px;
+                        padding: 6px;
                         border-radius: 2px;
-                        height: 38px;
                         border: 0.5px solid rgba(185, 186, 208, 1);
-                        width: 247px;
-
-                        .word7 {
-                            width: 39px;
-                            height: 13px;
-                            overflow-wrap: break-word;
-                            color: rgba(168, 168, 197, 1);
-                            font-size: 13px;
-                            text-align: left;
-                            white-space: nowrap;
-                            line-height: 13px;
-                            display: block;
-                            margin: 13px 0 0 6px;
-                        }
+    
                     }
-                }
-
-                .wrap10 {
-                    width: 311px;
-                    height: 38px;
-                    margin: 14px 0 0 32px;
-
-                    .word8 {
-                        width: 39px;
-                        height: 13px;
-                        overflow-wrap: break-word;
-                        color: rgba(64, 77, 116, 1);
-                        font-size: 13px;
-                        text-align: left;
-                        white-space: nowrap;
-                        line-height: 13px;
-                        margin-top: 13px;
-                        display: block;
+    
+                    .van-field__control::-webkit-input-placeholder {
+                        color: rgba(168, 168, 197, 1);
                     }
-
-                    .group3 {
-                        background-color: rgba(255, 255, 255, 1);
-                        border-radius: 2px;
+    
+    
+    
+                    .van-field__label {
                         height: 38px;
-                        border: 0.5px solid rgba(185, 186, 208, 1);
-                        width: 247px;
-
-                        .info11 {
-                            width: 39px;
-                            height: 13px;
-                            overflow-wrap: break-word;
-                            color: rgba(168, 168, 197, 1);
-                            font-size: 13px;
-                            text-align: left;
-                            white-space: nowrap;
-                            line-height: 13px;
-                            display: block;
-                            margin: 13px 0 0 6px;
-                        }
+                        line-height: 38px;
+                        // width: 20px;
                     }
-                }
-
-                .Button1 {
-                    background-color: rgba(77, 106, 221, 1);
-                    border-radius: 17px;
-                    height: 34px;
-                    width: 120px;
-                    margin: 25px 0 0 128px;
 
-                    .word9 {
-                        width: 60px;
-                        height: 13px;
-                        overflow-wrap: break-word;
-                        color: rgba(255, 255, 255, 1);
-                        font-size: 15px;
-                        font-family: PingFangSC-Medium;
-                        text-align: center;
-                        white-space: nowrap;
-                        line-height: 15px;
-                        display: block;
-                        margin: 11px 0 0 30px;
-                    }
                 }
             }
         }
 
+        .txt {
+            width: 313px;
+            height: 13px;
+            overflow-wrap: break-word;
+            color: rgba(168, 168, 197, 1);
+            font-size: 13px;
+            text-align: left;
+            white-space: nowrap;
+            line-height: 13px;
+            display: block;
+            margin: 20px auto;
+        }
+
         .van-form {
 
             .van-cell {

src/views/distributionSet/detail.vue

@@ -103,11 +103,11 @@
             <span class="o-pl-10 c-text-18 c-text-b" style="color: #434D74;">%</span>
           </div>
           <div class="l-flex-RC">
-            <div class="c-text-13"
-              style="padding: var(--van-cell-vertical-padding) var(--van-cell-horizontal-padding);">
+            <div class="c-text-13 c-text-b c-text-color"
+              style="padding: 15px">
               &nbsp;&nbsp;{{ $t('distributionSet.addDist.myDistProport') }}：
             </div>
-            <div class="c-text-13 c-text-b c-text-color">{{ myDistProp }}%</div>
+            <div class="c-text-13 o-pl-2 c-text-b c-text-color">{{ myDistProp }}%</div>
           </div>
           <div v-for="(item, index) in distPropList" :key="index" class="kBordBott">
             <van-field colon :border="false" required v-model="item.name1" clearable label-width="110" name="name1"

src/views/merchantManage/set.vue

@@ -3,159 +3,160 @@
   <div class="merchantSetPage flex-col">
     <s-header :name="$t('merchantManage.merchantInformation')" :noback="false"></s-header>
     <div class="merchantSetBox">
-      <div class="Body flex-col">
-        <div class="Body flex-col">
-          <div class="wrap1 flex-col">
-            <div class="section1 flex-row justify-between">
-              <span class="word3" :class="{ acttive: tabType === '0' }" @click="tabType = '0'">{{
-                $t('merchantManage.essentialInformation') }}</span>
-              <span class="info1" :class="{ acttive: tabType === '1' }" @click="tabType = '1'">{{
-                $t('merchantManage.withdrawalData') }}</span>
+      <van-tabs v-model:active="active">
+        <van-tab :title="$t('merchantManage.essentialInformation')">
+          <van-form @submit="onSubmit">
+            <div class="van-cell van-field">
+              <div class="van-cell__title van-field__label"><span>{{ $t('merchantManage.accountNumber') }}</span>
+              </div>
+              <div class="van-field__value o-pt-8" style="text-align: left;">
+                <span> {{ adminObj.username }}</span>
+              </div>
             </div>
-            <!-- <div class="section2 flex-col"></div> -->
-            <img class="img1" referrerpolicy="no-referrer" src="../../assets/line.png" />
-          </div>
-          <div v-if="tabType === '0'">
-            <!-- <div class="wrap2 l-flex-RC">
-              <span class="info2">*</span>
-              <span class="info3">{{ $t('merchantManage.region') }}：
-              </span>
-            </div> -->
-
-            <!-- <span class="info5">{{ $t('merchantManage.subscriptionAdministrator') }}：</span> -->
-            <van-form @submit="onSubmit">
-              <div class="van-cell van-field">
-                <div class="van-cell__title van-field__label"><span>{{ $t('merchantManage.accountNumber') }}</span>
-                </div>
-                <div class="van-field__value o-pt-8" style="text-align: left;">
-                  <span> {{ adminObj.username }}</span>
-                </div>
+            <van-field v-model="relationObj.relationUsername" name="password"
+              :label="$t('merchantManage.relationAdmin')"
+              :placeholder="$t('merchantManage.relationAdminPlaceholder')" />
+            <van-field v-model="adminObj.name" name="password" :label="$t('merchantManage.fullNameLabel')"
+              :placeholder="$t('merchantManage.fullNamePlaceholder')"
+              :rules="[{ required: true, message: $t('merchantManage.fullNamePlaceholder') }]" />
+            <van-field v-model="adminObj.password" name="password" type="password" clearable
+              :label="$t('merchantManage.passwordLabel')" :placeholder="$t('merchantManage.passwordPlaceholder')" />
+            <span class="txt">{{ $t('merchantManage.leavBlanToIndiNoModi') }}</span>
+            <van-field v-model="adminObj.checkPassword" name="password" type="password" clearable
+              :label="$t('merchantManage.confirmPasswordLabel')"
+              :placeholder="$t('merchantManage.confirmPasswordPlaceholder')" />
+            <van-field v-model="adminObj.email" name="password" :label="$t('merchantManage.mailbox')"
+              :placeholder="$t('merchantManage.mailboxPlaceholder')" />
+            <van-field v-model="adminObj.phone" name="password" :label="$t('merchantManage.telephone')"
+              :placeholder="$t('merchantManage.telephonePlaceholder')" />
+            <van-field v-model="adminObj.tradeMerchantNo" name="password"
+              :label="$t('merchantManage.merchantFilingNumberLabel')"
+              :placeholder="$t('merchantManage.merchantFilingNumberPlaceholder')" />
+            <div class="van-cell van-field">
+              <div class="van-cell__title van-field__label"><span>{{ $t('merchantManage.domesticOrNot') }}:</span>
               </div>
-              <!-- <div class="van-cell van-field">
-                <div class="van-cell__title van-field__label"><span>{{ $t('merchantManage.relationAdmin') }}</span>
-                </div>
-                <div class="van-field__value o-pt-8" style="text-align: left;">
-                  <span> {{ relationObj.username }}</span>
-                </div>
-              </div> -->
-              <van-field v-model="relationObj.relationUsername" name="password"
-                :label="$t('merchantManage.relationAdmin')"
-                :placeholder="$t('merchantManage.relationAdminPlaceholder')" />
-              <van-field v-model="adminObj.name" name="password" :label="$t('merchantManage.fullNameLabel')"
-                :placeholder="$t('merchantManage.fullNamePlaceholder')"
-                :rules="[{ required: true, message: $t('merchantManage.fullNamePlaceholder') }]" />
-              <van-field v-model="adminObj.password" name="password" type="password" clearable
-                :label="$t('merchantManage.passwordLabel')" :placeholder="$t('merchantManage.passwordPlaceholder')" />
-              <span class="txt3">{{ $t('merchantManage.leavBlanToIndiNoModi') }}</span>
-              <van-field v-model="adminObj.checkPassword" name="password" type="password" clearable
-                :label="$t('merchantManage.confirmPasswordLabel')"
-                :placeholder="$t('merchantManage.confirmPasswordPlaceholder')" />
-              <van-field v-model="adminObj.email" name="password" :label="$t('merchantManage.mailbox')"
-                :placeholder="$t('merchantManage.mailboxPlaceholder')" />
-              <van-field v-model="adminObj.phone" name="password" :label="$t('merchantManage.telephone')"
-                :placeholder="$t('merchantManage.telephonePlaceholder')" />
-              <van-field v-model="adminObj.tradeMerchantNo" name="password"
-                :label="$t('merchantManage.merchantFilingNumberLabel')"
-                :placeholder="$t('merchantManage.merchantFilingNumberPlaceholder')" />
+              <div class="van-cell__value van-field__value radioBox">
+                <van-radio-group v-model="adminObj.ifForeign" direction="horizontal">
+                  <van-radio name="0" icon-size="18px">{{ $t('merchantManage.yes') }}</van-radio>
+                  <van-radio name="1" icon-size="18px">{{ $t('merchantManage.no') }}</van-radio>
+                </van-radio-group>
+              </div>
+            </div>
+            <div v-if="adminType === 0 || adminType === 1">
               <div class="van-cell van-field">
-                <div class="van-cell__title van-field__label"><span>{{ $t('merchantManage.domesticOrNot') }}:</span></div>
+                <div class="van-cell__title van-field__label"><span>{{ $t('merchantManage.discountCode') }}</span>
+                </div>
                 <div class="van-cell__value van-field__value radioBox">
-                  <van-radio-group v-model="adminObj.ifForeign" direction="horizontal">
+                  <van-radio-group v-model="adminObj.promoCodeOpen" direction="horizontal">
                     <van-radio name="0" icon-size="18px">{{ $t('merchantManage.yes') }}</van-radio>
                     <van-radio name="1" icon-size="18px">{{ $t('merchantManage.no') }}</van-radio>
                   </van-radio-group>
                 </div>
               </div>
-              <div v-if="adminType === 0 || adminType === 1">
-                <div class="van-cell van-field">
-                  <div class="van-cell__title van-field__label"><span>{{ $t('merchantManage.discountCode') }}</span>
-                  </div>
-                  <div class="van-cell__value van-field__value radioBox">
-                    <van-radio-group v-model="adminObj.promoCodeOpen" direction="horizontal">
-                      <van-radio name="0" icon-size="18px">{{ $t('merchantManage.yes') }}</van-radio>
-                      <van-radio name="1" icon-size="18px">{{ $t('merchantManage.no') }}</van-radio>
-                    </van-radio-group>
-                  </div>
+              <div class="van-cell van-field">
+                <div class="van-cell__title van-field__label"><span>{{ $t('merchantManage.paymentPlatform')
+                    }}</span>
+                </div>
+                <div class="van-cell__value van-field__value radioBox">
+                  <van-radio-group v-model="adminObj.payPlatform" direction="horizontal">
+                    <van-radio name="0" icon-size="18px">{{ $t('merchantManage.convergence') }}</van-radio>
+                    <van-radio name="1" icon-size="18px">{{ $t('merchantManage.huifuPaymnt') }}</van-radio>
+                  </van-radio-group>
                 </div>
-                <div class="van-cell van-field">
-                  <div class="van-cell__title van-field__label"><span>{{ $t('merchantManage.paymentPlatform') }}</span>
-                  </div>
-                  <div class="van-cell__value van-field__value radioBox">
-                    <van-radio-group v-model="adminObj.payPlatform" direction="horizontal">
-                      <van-radio name="0" icon-size="18px">{{ $t('merchantManage.convergence') }}</van-radio>
-                      <van-radio name="1" icon-size="18px">{{ $t('merchantManage.huifuPaymnt') }}</van-radio>
-                    </van-radio-group>
-                  </div>
+              </div>
+              <div class="van-cell van-field">
+                <div class="van-cell__title van-field__label"><span>{{ $t('merchantManage.isDistribution')
+                    }}</span>
                 </div>
-                <div class="van-cell van-field">
-                  <div class="van-cell__title van-field__label"><span>{{ $t('merchantManage.isDistribution') }}</span>
-                  </div>
-                  <div class="van-cell__value van-field__value radioBox">
-                    <van-radio-group v-model="adminObj.isDistribution" direction="horizontal">
-                      <van-radio name="0" icon-size="18px">{{ $t('merchantManage.hidden') }}</van-radio>
-                      <van-radio name="1" icon-size="18px">{{ $t('merchantManage.reveal') }}</van-radio>
-                    </van-radio-group>
-                  </div>
+                <div class="van-cell__value van-field__value radioBox">
+                  <van-radio-group v-model="adminObj.isDistribution" direction="horizontal">
+                    <van-radio name="0" icon-size="18px">{{ $t('merchantManage.hidden') }}</van-radio>
+                    <van-radio name="1" icon-size="18px">{{ $t('merchantManage.reveal') }}</van-radio>
+                  </van-radio-group>
                 </div>
               </div>
-              <van-row justify="space-around" style="padding: 1em;">
-                <van-button span="5" round type="primary" style="height: 2em; padding: 0 2em;" native-type="submit">{{
-                  $t('merchantManage.modificationSubmission') }}
-                </van-button>
-              </van-row>
-            </van-form>
-          </div>
-          <div v-if="tabType === '1'" class="tab2">
-            <div class="kBordBott o-w o-pb-10">
-              <span class="info3">{{ $t('merchantManage.merchantType') }}：{{ adminMchObj.altMerchantType == 10 ? "个人" :
-                (adminMchObj.altMerchantType == 12 ? "企业" : "") }}</span>
-              <span class="info4">{{ $t('merchantManage.contactName') }}：{{ adminMchObj.busiContactName }}</span>
-              <span class="word4">{{ $t('merchantManage.cellPhone') }}：{{ adminMchObj.busiContactMobileNo }}</span>
             </div>
-            <div class="kBordBott o-w o-pb-10">
+            <van-row justify="space-around" style="padding: 10px; margin: 20px 0;">
+              <van-button span="5" round type="primary" style="height: 2em; padding: 0 2em;" native-type="submit">{{
+      $t('merchantManage.modificationSubmission') }}
+              </van-button>
+            </van-row>
+          </van-form>
+        </van-tab>
+        <van-tab :title="$t('merchantManage.withdrawalData')" class="tab">
+          <div class="kBordBott o-w o-pb-10">
+            <span class="info">{{ $t('merchantManage.merchantType') }}：{{ adminMchObj.altMerchantType == 10 ?
+      "个人" :
+      (adminMchObj.altMerchantType == 12 ? "企业" : "") }}</span>
+            <span class="info">{{ $t('merchantManage.contactName') }}：{{ adminMchObj.busiContactName }}</span>
+            <span class="info">{{ $t('merchantManage.cellPhone') }}：{{ adminMchObj.busiContactMobileNo }}</span>
+          </div>
+          <div class="kBordBott o-w o-pb-10">
 
-              <span class="txt2">{{ $t('merchantManage.nameOfLegalPerson/Individual') }}：{{ adminMchObj.legalPerson
+            <span class="info">{{ $t('merchantManage.nameOfLegalPerson/Individual') }}：{{ adminMchObj.legalPerson
               }}</span>
-              <span class="word5">{{ $t('merchantManage.phoneNumberOfLegalPerson/Individual') }}：{{ adminMchObj.phoneNo
+            <span class="info">{{ $t('merchantManage.phoneNumberOfLegalPerson/Individual') }}：{{
+      adminMchObj.phoneNo
+    }}</span>
+            <span class="info">{{ $t('merchantManage.legalPerson/IndividualIDNumber') }}：{{ adminMchObj.idCardNo
               }}</span>
-              <span class="word6">{{ $t('merchantManage.legalPerson/IndividualIDNumber') }}：{{ adminMchObj.idCardNo
+            <span class="info">{{ $t('merchantManage.validityOfIDCard') }}：{{ adminMchObj.idCardExpiry }}</span>
+            <span v-if="adminMchObj.altMerchantType == 12" class="info">{{
+      $t('merchantManage.businessLicenseCode')
+    }}：{{ adminMchObj.licenseNo }}</span>
+            <span v-if="adminMchObj.altMerchantType == 12" class="info">{{
+      $t('merchantManage.validityOfBusinessLicense') }}：{{ adminMchObj.licenseExpiry
               }}</span>
-              <span class="txt3">{{ $t('merchantManage.validityOfIDCard') }}：{{ adminMchObj.idCardExpiry }}</span>
-              <span v-if="adminMchObj.altMerchantType == 12" class="txt4">{{ $t('merchantManage.businessLicenseCode')
-              }}：{{ adminMchObj.licenseNo }}</span>
-              <span v-if="adminMchObj.altMerchantType == 12" class="word7">{{
-                $t('merchantManage.validityOfBusinessLicense') }}：{{ adminMchObj.licenseExpiry
-  }}</span>
-              <span class="txt5">{{ $t('merchantManage.natureOfBusiness') }}：{{ adminMchObj.manageScope }}</span> <span
-                class="word8">{{ $t('merchantManage.businessAddress') }}：{{ adminMchObj.manageAddr }}</span>
-            </div>
+            <span class="info">{{ $t('merchantManage.natureOfBusiness') }}：{{ adminMchObj.manageScope }}</span>
+            <span class="info">{{ $t('merchantManage.businessAddress') }}：{{ adminMchObj.manageAddr }}</span>
+          </div>
 
-            <div class="block5 flex-row justify-between">
-              <span class="txt6">{{ $t('merchantManage.accountType') }}
-                ：{{ adminMchObj.bankAccountType === 1 ? $t('merchantManage.debitCard') : (adminMchObj.bankAccountType ===
-                  4
-                  ? $t('merchantManage.corporateAccount') : "") }}</span>
-              <!-- <span class="word9"></span> -->
-            </div>
-            <span class="word10">{{ $t('merchantManage.bankAccountName') }}：{{ adminMchObj.bankAccountName }}</span>
-            <span class="word11">{{ $t('merchantManage.bankAccount') }}：{{ adminMchObj.bankAccountNo }}</span>
-            <span v-if="adminMchObj.bankAccountType == 4" class="word12">{{ $t('merchantManage.bankNo') }}：{{
-              adminMchObj.bankChannelNo }}</span>
-            <div v-if="adminType < 2">
-              <span class="word12">{{ $t('merchantManage.joinpayMch') }}：{{ joinpayState }}</span>
-              <span class="word12">{{ $t('merchantManage.huifuMch') }}：{{ huifuState }}</span>
+          <div class="kBordBott">
+            <span class="info">{{ $t('merchantManage.accountType') }}
+              ：{{ adminMchObj.bankAccountType === 1 ? $t('merchantManage.debitCard') :
+      (adminMchObj.bankAccountType
+        ===
+        4
+        ? $t('merchantManage.corporateAccount') : "") }}</span>
+            <span class="info">{{ $t('merchantManage.bankAccountName') }}：{{ adminMchObj.bankAccountName }}</span>
+            <span class="info">{{ $t('merchantManage.bankAccount') }}：{{ adminMchObj.bankAccountNo }}</span>
+            <span v-if="adminMchObj.bankAccountType == 4" class="info">{{ $t('merchantManage.bankNo') }}：{{
+      adminMchObj.bankChannelNo }}</span>
+          </div>
+          <div v-if="adminType < 2">
+            <span class="info">{{ $t('merchantManage.joinpayMch') }}：{{ joinpayState }}</span>
+            <span class="info">{{ $t('merchantManage.huifuMch') }}：{{ huifuState }}</span>
+          </div>
+        </van-tab>
+        <van-tab :title="$t('merchantManage.sqbConfig')" class="tab">
+          <div v-if="sqbConfig" class="kBordBott o-w o-pb-10">
+            <span class="info">{{ $t('merchantManage.deviceId') }}：{{ sqbConfig.deviceId }}</span>
+            <span class="info">{{ $t('merchantManage.terminalSn') }}：{{ sqbConfig.terminalSn }}</span>
+            <span class="info">{{ $t('merchantManage.check') }}：{{ sqbConfig.checkin == '1' ?
+      $t('merchantManage.checkIn') : $t('merchantManage.checkOut') }}</span>
+          </div>
+          <div v-else>
+            <div class="activate o-pt-20">
+              <van-cell-group inset>
+                <van-field label-align="center" v-model="activateCode" :label="$t('merchantManage.activateCode')" :placeholder="$t('merchantManage.activateCodePlaceholder')" />
+              </van-cell-group>
             </div>
+            <van-row justify="space-around" style=" margin: 20px 0;">
+              <van-button span="5" round type="primary" style="height: 30px; padding: 0 30px;" @click="activeConfig">{{
+                $t('merchantManage.activate') }}
+              </van-button>
+            </van-row>
           </div>
-        </div>
-      </div>
+        </van-tab>
+      </van-tabs>
     </div>
   </div>
 </template>
 <script>
 import { onMounted, ref } from "vue";
 import sHeader from "@/components/SimpleHeader";
-import { getAdmin, getRelation, getAdminMch, updateAdmin, getHuifuMch, getRelationAdminId } from "@/service/merchantManage";
-import { showFailToast, showSuccessToast } from "vant";
+import { getAdmin, getRelation, getAdminMch, updateAdmin, getHuifuMch, getRelationAdminId, getSqbConfigApi, activeSqbConfigApi } from "@/service/merchantManage";
+import { showConfirmDialog, showFailToast, showSuccessToast, showToast } from "vant";
 import { useRoute } from "vue-router";
 import { getLoginUser, styleUrl } from "@/common/js/utils";
 import { useI18n } from "vue-i18n";
@@ -165,6 +166,7 @@ export default {
   setup() {
     // 引入语言
     const { t } = useI18n();
+    const active = ref(0);
     const tabType = ref('0');
     const user = getLoginUser();
     const adminType = ref(user.type);
@@ -177,6 +179,11 @@ export default {
     const ifForeign = ref('0');
     const huifuState = ref('未入驻');
     const joinpayState = ref('未入驻');
+    // 收钱吧配置
+    const sqbConfig = ref();
+    // 激活码
+    const activateCode = ref('');
+
     onMounted(async () => {
       // 加载样式
       styleUrl('merchantManage');
@@ -185,6 +192,7 @@ export default {
       getRelationFun();
       getAdminMchFun();
       getHuifuMchFun();
+      getSqbConfig();
 
     });
     const getAdminFun = async () => {
@@ -201,8 +209,6 @@ export default {
         }
         ifForeign.value = data.data.ifForeign;
       }
-      // else { showFailToast(data.message); }
-      // console.log('getAdminFun', data);
     };
     const getRelationFun = async () => {
       const { data } = await getRelation({ adminId: merchantId.value });
@@ -217,8 +223,6 @@ export default {
       const { data } = await getAdminMch({ id: merchantId.value });
       if (data.code === "00000") {
         if (data.data != null) {
-          // adminMchObj.signStatus == '签约成功' ?
-          //       adminMchObj.signStatus : '未签约'
           adminMchObj.value = data.data;
           if (adminMchObj.value.approveStatus == '审核通过') {
             if (adminMchObj.value.signStatus == '签约成功') {
@@ -235,8 +239,6 @@ export default {
           }
         }
       }
-      // console.log('getAdminMchFun', data);
-      // console.log('adminMchObj', adminMchObj.value.signStatus);
     }
     const getHuifuMchFun = async () => {
       const { data } = await getHuifuMch({ adminId: merchantId.value });
@@ -253,8 +255,18 @@ export default {
 
         }
       }
-      // console.log('getHuifuMchFun', data);
     }
+
+    // 获取收钱吧配置
+    const getSqbConfig = async () => {
+      const { data } = await getSqbConfigApi({ adminId: merchantId.value });
+      if (data.code === "00000") {
+        if (data.data != null) {
+          sqbConfig.value = data.data;
+          console.log("sqbConfig", sqbConfig.value);
+        }
+      }
+    };
     const onSubmit = async () => {
       try {
         if (relationObj.value.relationUsername != null) {
@@ -296,7 +308,6 @@ export default {
         if (data.code === "00000") {
           showSuccessToast(t('merchantManage.modificationSucceeded'));
           setTimeout(() => {
-            // router.go(0);
             getAdminFun();
           }, 1500);
         } else { showFailToast(data.message); }
@@ -306,6 +317,27 @@ export default {
         console.error('提交管理员信息失败', error);
       }
     }
+
+    // 激活收钱吧配置
+    const activeConfig = () => {
+      if (activateCode.value == null || activateCode.value == '') {
+        showToast(t('merchantManage.activateCodePlaceholder'));
+        return;
+      }
+      showConfirmDialog({
+        title: t('merchantManage.tips'),
+        message: t('merchantManage.isActivate'),
+      }).then(async() => {
+        const { data } = await activeSqbConfigApi({adminId: merchantId.value, code: activateCode.value});
+        if (data.data != null) {
+          showSuccessToast(t('merchantManage.activateSucceeded'));
+        } else {
+          showFailToast(t('merchantManage.activateFailed'));
+        }
+      }).catch((error) => {
+        console.error(error);
+      })
+    }
     return {
       tabType,
       adminType,
@@ -316,6 +348,10 @@ export default {
       onSubmit,
       joinpayState,
       huifuState,
+      active,
+      sqbConfig,
+      activeConfig,
+      activateCode,
     };
   },
 };