-
+ > -->
@@ -30,7 +30,7 @@
-
+
-
-
-
+ @validPwd="validPwd"
+ >
@@ -148,14 +139,15 @@ import monthlyHistory from "@/components/selfService/monthlyHistory.vue";
import selfPickOrders from "@/components/selfService/selfPickOrders.vue";
import selfCancleOrder from "@/components/selfService/selfCancleOrder.vue";
import existRealName from "@/components/selfService/existRealName.vue";
-import noticePopup from "@/components/noticePopup.vue";
+import SecondaryPassword from "@/components/secondary-password/index.vue";
+// import noticePopup from "@/components/noticePopup.vue";
import { mapGetters } from "vuex";
-import { checkPwd, checkIfShow } from "@/api/wallet.js";
+import { checkIfShow } from "@/api/wallet.js";
import * as api from "@/api/goods.js";
export default {
components: {
- noticePopup,
+ // noticePopup,
carryGoods,
delar,
activity,
@@ -174,6 +166,7 @@ export default {
monthlyHistory,
selfCancleOrder,
existRealName,
+ SecondaryPassword,
},
computed: {
...mapGetters(["userInfo"]),
@@ -277,13 +270,13 @@ export default {
pkAccountId: "",
pswShow: false,
password: "",
- cango: false,
+ walletVisible: false,
theselfHeader: [],
};
},
watch: {
$route(n, o) {
- this.cango = false;
+ this.walletVisible = false;
this.isMenu = n.query.id;
if (this.isMenu == 0) {
this.password = "";
@@ -476,26 +469,11 @@ export default {
}
});
},
- surePsw() {
- checkPwd({ pwd: this.password }).then((res) => {
- if (res.code == 200) {
- this.cango = true;
- this.password = "";
- this.pswShow = false;
- }
- });
- },
- handleClose() {
- this.pswShow = false;
- },
goMenu(id) {
if (id == 0) {
this.password = "";
this.pswShow = true;
}
- // if (id == 5) {
-
- // }
this.$router.push({
path: "/vipCenter",
query: { id: id },
@@ -512,6 +490,11 @@ export default {
handleLink2(id) {
this.atabActive = id;
},
+ validPwd(valid) {
+ if (valid) {
+ this.walletVisible = true;
+ }
+ },
},
};
@@ -520,31 +503,7 @@ export default {
::v-deep .el-carousel__container {
height: 500px;
}
-::v-deep .pswdialog {
- margin-top: 120px;
-}
-.tit {
- font-size: 16px;
- font-family: PingFang SC-Regular, PingFang SC;
- font-weight: 400;
- color: #666666;
- text-align: center;
- margin: 10px 0;
-}
-.btn {
- line-height: 50px;
- width: 180px;
- // height: 50px;
- background: #d5251d;
- border-radius: 6px 6px 6px 6px;
- text-align: center;
- font-size: 18px;
- font-weight: 500;
- color: #ffffff;
- margin: 0 auto;
- margin-top: 25px;
- cursor: pointer;
-}
+
.bartopbox {
margin-top: 20px;
.flexbox {
@@ -568,7 +527,7 @@ export default {
}
.act {
color: #ffffff;
- background: rgba(192, 31, 31, 1);
+ background: var(--primary-color);
}
.main {
min-height: 100vh;
@@ -599,7 +558,7 @@ export default {
cursor: pointer;
}
.actMenu {
- border-bottom: 5px solid #00417C;
+ border-bottom: 5px solid #00417c;
}
}
.xian {
{{ "请输入二级密码" }}
- {{ "确定" }}
-