Commit 11b86901 authored by chenwei's avatar chenwei

Merge branch 'feature' into 'dev'

member system status control

See merge request !8
parents 52644366 2c8aedf6
...@@ -208,3 +208,11 @@ export function getTradeCountryList(query) { ...@@ -208,3 +208,11 @@ export function getTradeCountryList(query) {
params: query, params: query,
}); });
} }
export function memberSystemStatus() {
return request({
url: "/admin-api/member/score-rule/switch/get",
method: "get"
});
}
...@@ -370,6 +370,7 @@ ...@@ -370,6 +370,7 @@
margin-top: 16px; margin-top: 16px;
cursor: pointer; cursor: pointer;
" "
v-if ="switchState"
class="hover" class="hover"
:class="{ active: action === 'Integral' }" :class="{ active: action === 'Integral' }"
@click="myIntegral" @click="myIntegral"
...@@ -1014,7 +1015,7 @@ ...@@ -1014,7 +1015,7 @@
<script> <script>
import JdButton from "@/components/JdButton"; import JdButton from "@/components/JdButton";
import { getMark, getInfo, getIdCard } from "@/api/user"; import { getMark, getInfo, getIdCard,memberSystemStatus } from "@/api/user";
import { mapGetters } from "vuex"; import { mapGetters } from "vuex";
import DictTag from "@/components/DictTag"; import DictTag from "@/components/DictTag";
import md5 from "js-md5"; import md5 from "js-md5";
...@@ -1030,6 +1031,7 @@ export default { ...@@ -1030,6 +1031,7 @@ export default {
showMyOrder: true, showMyOrder: true,
showCustom: true, showCustom: true,
mark: {}, mark: {},
switchState: false,
userInfo: {}, userInfo: {},
noticeVisble: false, noticeVisble: false,
idcardVisble: false, idcardVisble: false,
...@@ -1041,6 +1043,7 @@ export default { ...@@ -1041,6 +1043,7 @@ export default {
...mapGetters(["loginUser"]), ...mapGetters(["loginUser"]),
}, },
created() { created() {
this.getMemberSystemStatus();
this.action = this.$route.name; this.action = this.$route.name;
this.userInfo = this.loginUser; this.userInfo = this.loginUser;
getMark().then((r) => { getMark().then((r) => {
...@@ -1054,6 +1057,11 @@ export default { ...@@ -1054,6 +1057,11 @@ export default {
}); });
}, },
methods: { methods: {
getMemberSystemStatus(){
memberSystemStatus().then(res=>{
this.switchState = res.data
})
},
getDictDatas, getDictDatas,
handleService() { handleService() {
const online_talk = document.getElementsByClassName("online_talk "); const online_talk = document.getElementsByClassName("online_talk ");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment