提交 da74537e authored 作者: 龙菲's avatar 龙菲

增加登录注册的密码加密

上级 19646cfa
...@@ -133,3 +133,14 @@ export function getViewList(data) { ...@@ -133,3 +133,14 @@ export function getViewList(data) {
}) })
} }
// 查看平台内累计数据
export function getAllCount(params) {
return request({
url: '/statistics/allCount',
method: 'get',
params
})
}
...@@ -198,6 +198,9 @@ ...@@ -198,6 +198,9 @@
>登 陆</el-button >登 陆</el-button
> >
<div class="register" @click="handleToRegister">注册</div> <div class="register" @click="handleToRegister">注册</div>
<div v-if="!isLoginByUsername">
提示:若您已经登录过“黔云展”小程序,请直接登录,账号及密码皆为您的手机号
</div>
</div> </div>
</div> </div>
</el-dialog> </el-dialog>
...@@ -208,7 +211,7 @@ ...@@ -208,7 +211,7 @@
import { mapGetters } from "vuex"; import { mapGetters } from "vuex";
import { getVerify } from "@/api/user"; import { getVerify } from "@/api/user";
import { getDisplayExistDict } from "@/api/display"; import { getDisplayExistDict } from "@/api/display";
import md5 from 'js-md5' import md5 from "js-md5";
export default { export default {
name: "NavBar", name: "NavBar",
computed: { computed: {
...@@ -233,18 +236,15 @@ export default { ...@@ -233,18 +236,15 @@ export default {
name: value.name, name: value.name,
path: value.path, path: value.path,
}; };
if ( if (value.name.indexOf("display") != -1) {
value.name.indexOf("display") != -1 ||
value.name.indexOf("boutique") != -1
) {
this.currentTab = { this.currentTab = {
name: "展览", name: "展览展示",
path: "/display", path: "/display",
}; };
} }
if (value.name.indexOf("culturalRelic") != -1) { if (value.name.indexOf("culturalRelic") != -1) {
this.currentTab = { this.currentTab = {
name: "文物展", name: "文物展",
path: "/culturalRelic", path: "/culturalRelic",
}; };
} }
...@@ -260,6 +260,12 @@ export default { ...@@ -260,6 +260,12 @@ export default {
path: "/ccProduct", path: "/ccProduct",
}; };
} }
if (value.name=='home') {
this.currentTab = {
name: "首页",
path: "/",
};
}
if (value.params.themeType) { if (value.params.themeType) {
this.$store.commit("app/CHANGE_NAV_COLOR", value.params.themeType); this.$store.commit("app/CHANGE_NAV_COLOR", value.params.themeType);
} else { } else {
...@@ -407,7 +413,6 @@ export default { ...@@ -407,7 +413,6 @@ export default {
methods: { methods: {
getAbsolute(path) { getAbsolute(path) {
let arr = path.split("/"); let arr = path.split("/");
console.log("path", path);
if (path.indexOf("/display") === 0 && arr.length === 4) { if (path.indexOf("/display") === 0 && arr.length === 4) {
this.isAbsolute = false; this.isAbsolute = false;
} else { } else {
...@@ -476,7 +481,7 @@ export default { ...@@ -476,7 +481,7 @@ export default {
captcha, captcha,
password, password,
}; };
params.password = md5(params.password) params.password = md5(params.password);
if (this.isLoginByUsername) { if (this.isLoginByUsername) {
params.username = account; params.username = account;
} else { } else {
...@@ -858,7 +863,7 @@ export default { ...@@ -858,7 +863,7 @@ export default {
.register { .register {
display: flex; display: flex;
justify-content: center; justify-content: center;
margin-top: 20px; margin: 20px 0;
font-size: 14px; font-size: 14px;
cursor: pointer; cursor: pointer;
......
...@@ -176,6 +176,7 @@ export default { ...@@ -176,6 +176,7 @@ export default {
color: #fff; color: #fff;
font-size: 22px; font-size: 22px;
margin-bottom: 50px; margin-bottom: 50px;
cursor: pointer;
} }
.wrapper { .wrapper {
......
...@@ -47,17 +47,15 @@ ...@@ -47,17 +47,15 @@
<div class="title"> <div class="title">
<img src="@/assets/imgs/home-new/map-right-title.png" alt="" /> <img src="@/assets/imgs/home-new/map-right-title.png" alt="" />
</div> </div>
<p> <p
<span class="label"> 博物馆<span class="num">61</span></span> v-for="(item, index) in countData"
</p> :key="index"
<p> @click="handleClickItem(item)"
<span class="label"> 展览<span class="num">14</span></span> >
</p> <span class="label">
<p> {{ item.label }}<span class="num">{{ item.num }}</span
<span class="label"> 文物<span class="num">738</span></span> >{{ item.unit }}</span
</p> >
<p>
<span class="label"> 文创产品<span class="num">16</span></span>
</p> </p>
</div> </div>
</div> </div>
...@@ -69,6 +67,7 @@ import * as echarts from "echarts"; ...@@ -69,6 +67,7 @@ import * as echarts from "echarts";
import guizhou from "../../../../public/geoData/guizhou.json"; import guizhou from "../../../../public/geoData/guizhou.json";
import gzInfo from "../../../../public/geoData/gzInfo.json"; import gzInfo from "../../../../public/geoData/gzInfo.json";
import { getMuseumListPage } from "@/api/org"; import { getMuseumListPage } from "@/api/org";
import { getAllCount } from "@/api/user";
import EntranceIcon from "@/components/EntranceIcon"; import EntranceIcon from "@/components/EntranceIcon";
export default { export default {
name: "MuseumMap", name: "MuseumMap",
...@@ -81,6 +80,36 @@ export default { ...@@ -81,6 +80,36 @@ export default {
museumList: [], museumList: [],
curMuseum: {}, curMuseum: {},
regionName: "", regionName: "",
countData: [
{
label: "博物馆",
key: "deptCount",
num: "",
path: "/museum",
unit: "家",
},
{
label: "展览",
key: "exCount",
num: "",
path: "/display",
unit: "个",
},
{
label: "文物",
key: "crCount",
num: "",
path: "/culturalRelic",
unit: "件/套",
},
{
label: "文创产品",
key: "ccpCount",
num: "",
path: "/ccProduct",
unit: "件/套",
},
],
}; };
}, },
mounted() { mounted() {
...@@ -91,11 +120,29 @@ export default { ...@@ -91,11 +120,29 @@ export default {
}); */ }); */
this.init(); this.init();
this.getAllCount();
this.setRegisterMap(); this.setRegisterMap();
// this.initAnimate(); // this.initAnimate();
}, },
methods: { methods: {
async getAllCount() {
let res = await getAllCount();
let result = res.data;
this.countData.map((item) => {
for (const key in result) {
if (item.key == key) {
item.num = item.key == "exCount" ? result[key] + 7 : result[key];
}
}
});
},
handleClickItem(item) {
const newPage = this.$router.resolve({
path: item.path,
});
window.open(newPage.href, "_blank");
},
async getMuseumData() { async getMuseumData() {
const params = { const params = {
page: 1, page: 1,
...@@ -266,7 +313,7 @@ export default { ...@@ -266,7 +313,7 @@ export default {
normal: { normal: {
borderColor: "#fff", // 边框颜色 borderColor: "#fff", // 边框颜色
areaColor: "#a5c3e7", areaColor: "#a5c3e7",
color: "#fff", color: "#fff",
}, },
emphasis: { emphasis: {
// areaColor: "#2759af", // areaColor: "#2759af",
...@@ -345,7 +392,7 @@ export default { ...@@ -345,7 +392,7 @@ export default {
}, },
}, },
}, },
{ {
name: "黔西南布依族苗族自治州", name: "黔西南布依族苗族自治州",
itemStyle: { itemStyle: {
normal: { normal: {
...@@ -367,7 +414,7 @@ export default { ...@@ -367,7 +414,7 @@ export default {
}, },
}, },
}, },
{ {
name: "黔东南苗族侗族自治州", name: "黔东南苗族侗族自治州",
itemStyle: { itemStyle: {
normal: { normal: {
...@@ -378,7 +425,6 @@ export default { ...@@ -378,7 +425,6 @@ export default {
}, },
}, },
}, },
], ],
}, },
}; };
...@@ -637,6 +683,7 @@ export default { ...@@ -637,6 +683,7 @@ export default {
font-family: $puHuiTi; font-family: $puHuiTi;
font-size: 60px; font-size: 60px;
margin: 0 4px; margin: 0 4px;
cursor: pointer;
} }
} }
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论