Commit 18c11a24 by songwenlu

gx

parents e23387c0 58cfdeb4
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
"postcss-url": "^10.1.1", "postcss-url": "^10.1.1",
"qrcode": "^1.5.1", "qrcode": "^1.5.1",
"vant": "^2.12.26", "vant": "^2.12.26",
"vconsole": "^3.15.0",
"vue": "^2.6.11", "vue": "^2.6.11",
"vue-baidu-map": "^0.21.22", "vue-baidu-map": "^0.21.22",
"vue-qr": "^2.3.0", "vue-qr": "^2.3.0",
......
...@@ -31,10 +31,10 @@ export default { ...@@ -31,10 +31,10 @@ export default {
mobileNo: 13900000000, mobileNo: 13900000000,
userId: 37393, userId: 37393,
name: "124晚6565", name: "124晚6565",
realName: "梁中全", realName: "张媛媛",
idCardNo: "342601199503121817", // idCardNo: "342601199503121817",
// idCardNo: "321111198502254219", // idCardNo: "321111198502254219",
// idCardNo: "321183199610151344", idCardNo: "32068219980926002X",
// idCardNo: "DDfCYHcrBMRhvRt4AQKt+WfGq6l2uT5G", // idCardNo: "DDfCYHcrBMRhvRt4AQKt+WfGq6l2uT5G",
// mobileNo: 13776475181, // mobileNo: 13776475181,
// userId: 3182743, // userId: 3182743,
......
import { // import {
request, // request,
config // config
} from '@/utils/request' // } from '@/utils/request'
import { request2, config2 } from '@/utils/axios'
/** /**
* 获取网点列表 * 获取网点列表
*/ */
export function queryListNetwork(data) { export function queryListNetwork(data) {
return request({ return request2({
url: `${config.baseUrl}admin/queryListNetwork`, url: `${config2.baseUrl}app-api/general/queryListNetwork`,
method: 'post', method: 'post',
data: data data: data
}) })
......
...@@ -155,8 +155,8 @@ export function addTracing(data) { ...@@ -155,8 +155,8 @@ export function addTracing(data) {
* 获取公共服务电话 * 获取公共服务电话
*/ */
export function getPhone(data) { export function getPhone(data) {
return request({ return request2({
url: `${config.baseUrl}cold/getPhone`, url: `${config2.baseUrl}app-api/general/getPhone`,
method: 'get', method: 'get',
params: data params: data
}) })
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// request, // request,
// config // config
// } from '@/utils/request' // } from '@/utils/request'
import { request2, config2 } from '@/utils/axios' import { request2 } from '@/utils/axios'
// import { // import {
// Toast // Toast
...@@ -13,7 +13,7 @@ import { request2, config2 } from '@/utils/axios' ...@@ -13,7 +13,7 @@ import { request2, config2 } from '@/utils/axios'
export function social(data) { export function social(data) {
// Toast(data.aae135) // Toast(data.aae135)
return request2({ return request2({
url: `${config2.baseSocUrl}app-api/social/getYangLao`, url: `https://smart-zj.cn:55901/third-party/app-api/social/getYangLao`,
method: 'post', method: 'post',
data: data data: data
}) })
...@@ -24,7 +24,7 @@ export function social(data) { ...@@ -24,7 +24,7 @@ export function social(data) {
*/ */
export function doServerMedical(data) { export function doServerMedical(data) {
return request2({ return request2({
url: `${config2.baseSocUrl}app-api/social/getYiLiao`, url: `https://smart-zj.cn:55901/third-party/app-api/social/getYiLiao`,
method: 'post', method: 'post',
data: data data: data
}) })
......
import { request, config, formatUrl } from '@/utils/request' // import { request, config, formatUrl } from '@/utils/request'
import { request3, config2 } from '@/utils/axios' import { request3, config2, formatUrl } from '@/utils/axios'
// /** // /**
// * 通过ticket查询用户实名信息 // * 通过ticket查询用户实名信息
// */ // */
export function querySfbUserInfo(data) { export function querySfbUserInfo(data) {
return request({ return request3({
url: `${config.baseUrl}dock/querySfbUserInfo${formatUrl(data)}`, url: `${config2.baseUrl}app-api/user/querySfbUserInfo${formatUrl(data)}`,
method: 'post', method: 'post',
data: data data: data
}) })
...@@ -58,7 +58,7 @@ export function getCategory(data) { ...@@ -58,7 +58,7 @@ export function getCategory(data) {
*/ */
export function addBehavior(data) { export function addBehavior(data) {
return request3({ return request3({
url: `${config2.baseUrl}/app-api/talent/addBehavior`, url: `${config2.baseUrl}app-api/talent/addBehavior`,
method: 'post', method: 'post',
data: data data: data
}) })
...@@ -69,8 +69,8 @@ export function getCategory(data) { ...@@ -69,8 +69,8 @@ export function getCategory(data) {
* @param {Object} data * @param {Object} data
*/ */
export function addAccumulationFundScan(data) { export function addAccumulationFundScan(data) {
return request({ return request3({
url: `${config.baseUrl}scattered/addAccumulationFundScan`, url: `${config2.baseUrl}app-api/talent/addAccumulationFundScan`,
method: 'post', method: 'post',
data: data data: data
}) })
...@@ -190,8 +190,8 @@ export function getPersonnel(data) { ...@@ -190,8 +190,8 @@ export function getPersonnel(data) {
* 查询权限 * 查询权限
*/ */
export function userScanPermission(data) { export function userScanPermission(data) {
return request({ return request3({
url: `${config.baseUrl}scattered/userScanPermission${formatUrl(data)}`, url: `${config2.baseUrl}app-api/admin/userScanPermission${formatUrl(data)}`,
method: 'post', method: 'post',
data: data data: data
}) })
......
...@@ -9,6 +9,9 @@ import BMapGL from 'BMapGL' ...@@ -9,6 +9,9 @@ import BMapGL from 'BMapGL'
import Dayjs from 'dayjs' import Dayjs from 'dayjs'
import VConsole from 'vconsole';
process.env.NODE_ENV === 'development' && new VConsole();
// import eventBus from '@/eventBus/index' // import eventBus from '@/eventBus/index'
Vue.prototype.$eventBus = new Vue() Vue.prototype.$eventBus = new Vue()
Vue.prototype.$dayjs = Dayjs Vue.prototype.$dayjs = Dayjs
......
...@@ -1132,11 +1132,31 @@ const routes = [ ...@@ -1132,11 +1132,31 @@ const routes = [
meta: { meta: {
title: "预约维修", title: "预约维修",
}, },
<<<<<<< HEAD
}, },
{ {
path: "check", path: "check",
name: "Check1", name: "Check1",
component: () => import("@/views/rqfy/check.vue"), component: () => import("@/views/rqfy/check.vue"),
=======
},
// 镇江政策措施
{
path: "/measure",
name: "Measure",
component: () =>
import ("@/views/measure/index"),
meta: {
title: "镇江政策措施",
},
},
// 身份码
{
path: "/identity",
name: "identity",
component: () =>
import ("@/views/identity/index"),
>>>>>>> 58cfdeb4637fa6b487e27135cc591438f516bfe0
meta: { meta: {
title: "预约安检", title: "预约安检",
}, },
......
...@@ -7,8 +7,8 @@ Vue.use(Toast); ...@@ -7,8 +7,8 @@ Vue.use(Toast);
const env = process.env.NODE_ENV === "development" ? "dev" : "prod"; const env = process.env.NODE_ENV === "development" ? "dev" : "prod";
const baseUrl = { const baseUrl = {
// dev: "http://192.168.3.144:10010/", dev: "http://192.168.3.144:10010/",
dev: "http://81.69.231.72:10010/", // dev: "http://81.69.231.72:10010/",
// dev: "https://www.smart-zj.cn:55901/smartApp/", // dev: "https://www.smart-zj.cn:55901/smartApp/",
// prod: 'http://81.69.231.72:9090/', // prod: 'http://81.69.231.72:9090/',
...@@ -44,8 +44,8 @@ request2.interceptors.request.use( ...@@ -44,8 +44,8 @@ request2.interceptors.request.use(
(config) => { (config) => {
config.headers = { config.headers = {
"Content-Type": "application/json;multipart/form-data;", "Content-Type": "application/json;multipart/form-data;",
// "Authorization": "Bearer " + sessionStorage.getItem("token") "Authorization": "Bearer " + sessionStorage.getItem("token")
"Authorization":"Bearer "+'00JcqsZfWIT3nfMR9fL2pfgsbraInluMinxgSWxmnm916AG92mTkUzs5ML6dQIl4' // "Authorization": "Bearer lkT98D62spmAUVpkZv5TwTlZKSYncn1Tww7NNPe7jHtxV0Yjj7zyjIxBYizEAxMZ" //测试token
}; };
// alert(JSON.stringify(config.headers)) // alert(JSON.stringify(config.headers))
// if (config.method === 'post') { // if (config.method === 'post') {
...@@ -111,6 +111,7 @@ request3.interceptors.request.use( ...@@ -111,6 +111,7 @@ request3.interceptors.request.use(
config.headers = { config.headers = {
"Content-Type": "application/json;multipart/form-data;", "Content-Type": "application/json;multipart/form-data;",
"Authorization": "Bearer " + sessionStorage.getItem("token") "Authorization": "Bearer " + sessionStorage.getItem("token")
// "Authorization": "Bearer lkT98D62spmAUVpkZv5TwTlZKSYncn1Tww7NNPe7jHtxV0Yjj7zyjIxBYizEAxMZ" //测试token
}; };
// if (config.method === 'post') { // if (config.method === 'post') {
// config.data = { ...config.data } // config.data = { ...config.data }
...@@ -151,7 +152,7 @@ request3.interceptors.response.use( ...@@ -151,7 +152,7 @@ request3.interceptors.response.use(
if (parseInt(res.code) === 200) { if (parseInt(res.code) === 200) {
return res.data || res.message; return res.data || res.message;
} else { } else {
Toast(res.message || "网络错误"); Toast(res.message || res.msg || "网络错误");
return Promise.reject(new Error(res.message || "网络错误")); return Promise.reject(new Error(res.message || "网络错误"));
} }
} }
......
...@@ -2,73 +2,37 @@ ...@@ -2,73 +2,37 @@
<div> <div>
<div class="info"> <div class="info">
<BaiDuMap ref="baidu" v-show="false"> </BaiDuMap> <BaiDuMap ref="baidu" v-show="false"> </BaiDuMap>
<baidu-map <baidu-map :center="center" :min-zoom="3" :max-zoom="19" :zoom="zoom" @ready="handler" class="map"
:center="center" scroll-wheel-zoom>
:min-zoom="3"
:max-zoom="19"
:zoom="zoom"
@ready="handler"
class="map"
scroll-wheel-zoom
>
<bm-map-type :map-types="mapTypes"></bm-map-type> <bm-map-type :map-types="mapTypes"></bm-map-type>
<div v-for="(item, index) in queryMapList" :key="index"> <div v-for="(item, index) in queryMapList" :key="index">
<bm-marker <bm-marker class="tb" v-if="item.icon" :position="{ lng: item.longitude, lat: item.latitude }"
class="tb" :icon="{ url: item.url, size: { width: 33, height: 33 } }"></bm-marker>
v-if="item.icon" <bm-marker :position="{ lng: item.longitude, lat: item.latitude }" animation="BMAP_ANIMATION_BOUNCE" v-else>
:position="{ lng: item.longitude, lat: item.latitude }" <bm-label v-if="item.content" :content="item.name" :labelStyle="{
:icon="{ url: item.url, size: { width: 33, height: 33 } }" color: '#000',
></bm-marker> fontSize: '0.8rem',
<bm-marker border: 0,
:position="{ lng: item.longitude, lat: item.latitude }" padding: '10px',
animation="BMAP_ANIMATION_BOUNCE" opacity: 0.8,
v-else }" :offset="{ width: -35, height: 30 }" />
>
<bm-label
v-if="item.content"
:content="item.name"
:labelStyle="{
color: '#000',
fontSize: '0.8rem',
border: 0,
padding: '10px',
opacity: 0.8,
}"
:offset="{ width: -35, height: 30 }"
/>
</bm-marker> </bm-marker>
</div> </div>
</baidu-map> </baidu-map>
<div class="text"> <div class="text">
<van-popover <van-popover v-model="showPopover" theme="dark" trigger="click" size="small" :actions="actions" @select="onPover"
v-model="showPopover" placement="bottom-start">
theme="dark"
trigger="click"
size="small"
:actions="actions"
@select="onPover"
placement="bottom-start"
>
<template #reference> <template #reference>
<van-button plain type="danger" size="small">附近网点</van-button> <van-button plain type="danger" size="small">附近网点</van-button>
</template> </template>
</van-popover> </van-popover>
<van-button plain type="danger" @click="jumpIntroduce" size="small" <van-button plain type="danger" @click="jumpIntroduce" size="small">AED介绍</van-button>
>AED介绍</van-button <van-button plain type="danger" @click="jumpExplain" size="small">免责说明</van-button>
>
<van-button plain type="danger" @click="jumpExplain" size="small"
>免责说明</van-button
>
</div> </div>
<div class="map_content"> <div class="map_content">
<div <div class="group" v-for="(item, index) in queryMapListtwo
class="group" .slice(1, queryMapListtwo.length)
v-for="(item, index) in queryMapListtwo .filter((item) => item.spacing * 1 <= beishu)" :key="index" @click="goPoints(item)">
.slice(1, queryMapListtwo.length)
.filter((item) => item.spacing * 1 <= beishu)"
:key="index"
@click="goPoints(item)"
>
<div class="group_left"> <div class="group_left">
<div class="title"> <div class="title">
{{ item.name }} {{ item.name }}
...@@ -98,6 +62,8 @@ import { Button, Popover } from "vant"; ...@@ -98,6 +62,8 @@ import { Button, Popover } from "vant";
import { queryListNetwork } from "@/api/aedmap"; import { queryListNetwork } from "@/api/aedmap";
import BaiDuMap from "@/components/baidumap/Main.vue"; import BaiDuMap from "@/components/baidumap/Main.vue";
import { config } from '@/utils/request' import { config } from '@/utils/request'
import { jsBridge } from '../../utils/jsbridge'
Vue.use(Button).use(Popover); Vue.use(Button).use(Popover);
export default { export default {
components: { components: {
...@@ -124,27 +90,72 @@ export default { ...@@ -124,27 +90,72 @@ export default {
beishu: 10000, beishu: 10000,
}; };
}, },
// mounted() { mounted() {
// this.$nextTick(() => { window.getUserInfo = this.getUserInfo;
// this.getDistance(); window.receiveLocation(
// }); JSON.stringify({ code: 0, data: { lat: 39.983744, lng: 116.276063 } })
// }, );
async created() { this.initPoint()
this.center = this.$route.query; // this.$nextTick(() => {
console.log("this.center", this.$route.query.lng, this.$route.query.lat); // this.getDistance();
await queryListNetwork({}).then((res) => { // });
this.queryMapList = res; },
this.queryMapList.unshift({ created() {
longitude: this.center.lng, this.JSBgetUserInfo();
latitude: this.center.lat, // this.center = this.$route.query;
icon: true, // console.log("this.center", this.$route.query.lng, this.$route.query.lat);
url: require("../../assets/common/localdw.png"),
name: "我的位置",
});
this.position(10000);
});
}, },
methods: { methods: {
initPoint() {
const _that = this
jsBridge.getPoint().then((res) => {
_that.center.lat = res.lat
_that.center.lng = res.lng
// _that.center.lat = 32.203272
// _that.center.lng = 119.43897
_that.queryMapList.unshift({
longitude: _that.center.lng,
latitude: _that.center.lat,
icon: true,
url: require("../../assets/common/localdw.png"),
name: "我的位置",
});
queryListNetwork({}).then((res) => {
_that.queryMapList = res.data;
// this.queryMapList.unshift({
// longitude: this.center.lng,
// latitude: this.center.lat,
// icon: true,
// url: require("../../assets/common/localdw.png"),
// name: "我的位置",
// });
_that.position(10000);
});
})
// if (!this.map) {
// this.map = _that.$refs.TengXunMap.map
// }
},
JSBgetUserInfo() {
if (window.android !== undefined) {
const res = window.android.getUserInfo(); // 这是一个json字符串
// sessionStorage.setItem("ZJCD-UserInfo", res);
this.userInfo = JSON.parse(res);
} else if (window.webkit) {
window.webkit &&
window.webkit.messageHandlers.getUserInfo.postMessage("getUserInfo");
}
},
getUserInfo(res) {
this.verify(res);
},
verify(res) {
let userInfo = JSON.parse(res);
sessionStorage.setItem("ZJCD-UserInfo", res);
sessionStorage.setItem('token', JSON.parse(res).token);
this.userInfo = userInfo;
console.log('123', 111);
},
position(distance) { position(distance) {
let obj = this.getMaxMinLongitudeLatitude( let obj = this.getMaxMinLongitudeLatitude(
this.center.lng, this.center.lng,
...@@ -227,14 +238,14 @@ export default { ...@@ -227,14 +238,14 @@ export default {
jumpIntroduce() { jumpIntroduce() {
window.location.href = window.location.href =
`${config.baseH5}aedmap/introduce?showType=1&noTitle=1` `${config.baseH5}aedmap/introduce?showType=1&noTitle=1`
// "http://81.69.44.115/zjh/html/pages/#/aedmap/introduce?showType=1&noTitle=1"; // "http://81.69.44.115/zjh/html/pages/#/aedmap/introduce?showType=1&noTitle=1";
// "http://www.smart-zj.cn:55902/zjh/html/pages/#/aedmap/introduce?showType=1&noTitle=1" // "http://www.smart-zj.cn:55902/zjh/html/pages/#/aedmap/introduce?showType=1&noTitle=1"
}, },
jumpExplain() { jumpExplain() {
window.location.href = window.location.href =
`${config.baseH5}aedmap/explain?showType=1&noTitle=1` `${config.baseH5}aedmap/explain?showType=1&noTitle=1`
// "http://81.69.44.115/zjh/html/pages/#/aedmap/explain?showType=1&noTitle=1"; // "http://81.69.44.115/zjh/html/pages/#/aedmap/explain?showType=1&noTitle=1";
// "http://www.smart-zj.cn:55902/zjh/html/pages/#/aedmap/explain?showType=1&noTitle=1" // "http://www.smart-zj.cn:55902/zjh/html/pages/#/aedmap/explain?showType=1&noTitle=1"
}, },
onShowMarker() { onShowMarker() {
this.show = true; this.show = true;
......
...@@ -40,7 +40,7 @@ export default { ...@@ -40,7 +40,7 @@ export default {
methods: { methods: {
initAddress() { initAddress() {
getAddress({ appId: 1234 }).then((res) => { getAddress({ appId: 1234 }).then((res) => {
alert(JSON.stringify(res)) // alert(JSON.stringify(res))
this.addressList = res.data; this.addressList = res.data;
}); });
}, },
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
@click="jump(item)"> @click="jump(item)">
<div class="consultContent">{{ item.TITLE }}</div> <div class="consultContent">{{ item.TITLE }}</div>
<div class="consultBottom"> <div class="consultBottom">
<div class="consultTag">{{ titleName ? titleName : '图片新闻' }}</div> <div class="consultTag">{{ titleName? titleName: '图片新闻' }}</div>
<div class="consultTime">{{ item.PUBLISHED_TIME_FORMATED }}</div> <div class="consultTime">{{ item.PUBLISHED_TIME_FORMATED }}</div>
</div> </div>
</div> </div>
...@@ -176,10 +176,33 @@ export default { ...@@ -176,10 +176,33 @@ export default {
const url = val.URL_COMP; const url = val.URL_COMP;
window.location.assign(url) window.location.assign(url)
} }
} },
JSBgetUserInfo() {
if (window.android !== undefined) {
const res = window.android.getUserInfo(); // 这是一个json字符串
sessionStorage.setItem("ZJCD-UserInfo", res);
this.userInfo = JSON.parse(res);
} else if (window.webkit) {
window.webkit &&
window.webkit.messageHandlers.getUserInfo.postMessage("getUserInfo");
}
},
getUserInfo(res) {
this.verify(res);
},
verify(res) {
let userInfo = JSON.parse(res);
sessionStorage.setItem("ZJCD-UserInfo", res);
sessionStorage.setItem('token', JSON.parse(res).token);
this.userInfo = userInfo;
this.init()
},
},
mounted() {
window.getUserInfo = this.getUserInfo;
}, },
created() { created() {
this.init() this.JSBgetUserInfo();
}, },
} }
</script> </script>
......
...@@ -88,6 +88,7 @@ export default { ...@@ -88,6 +88,7 @@ export default {
} }
}) })
.catch((err) => { .catch((err) => {
// alert(JSON.stringify(err))
console.log(err); console.log(err);
this.nodata = true; this.nodata = true;
}); });
......
...@@ -59,6 +59,7 @@ export default { ...@@ -59,6 +59,7 @@ export default {
}, },
verify(res) { verify(res) {
sessionStorage.setItem("ZJCD-UserInfo", res); sessionStorage.setItem("ZJCD-UserInfo", res);
sessionStorage.setItem('token', JSON.parse(res).token);
let userInfo = JSON.parse(res); let userInfo = JSON.parse(res);
if (!userInfo.idCardNo) { if (!userInfo.idCardNo) {
this.$dialog this.$dialog
......
...@@ -83,7 +83,7 @@ export default { ...@@ -83,7 +83,7 @@ export default {
}; };
updateFace(parmas).then((res) => { updateFace(parmas).then((res) => {
console.log(res); console.log(res);
alert(JSON.stringify(res)); // alert(JSON.stringify(res));
this.init(); this.init();
}); });
} else { } else {
......
...@@ -141,6 +141,7 @@ export default { ...@@ -141,6 +141,7 @@ export default {
rows: 8, rows: 8,
aae036s: this.formatter(this.beginDate), aae036s: this.formatter(this.beginDate),
aae036e: this.formatter(this.endDate), aae036e: this.formatter(this.endDate),
encryptIdCard: this.userInfo.idCardNo
}; };
this.$toast.loading({ this.$toast.loading({
duration: 0, // 持续展示 toast duration: 0, // 持续展示 toast
...@@ -151,14 +152,14 @@ export default { ...@@ -151,14 +152,14 @@ export default {
this.$toast.clear(); this.$toast.clear();
this.loading = false; this.loading = false;
this.refreshing = false; this.refreshing = false;
if (res.data.head.rst.busiCode !== "0000") { if (res.data.tradeMsg.data.busiId !== "0000") {
this.$toast("未查询到相关养老收支信息"); this.$toast("未查询到相关养老收支信息");
this.nodata = true; this.nodata = true;
return; return;
} }
const current = parseInt(res.data.data.dataSet.pageNum); const current = parseInt(res.data.tradeMsg.data.dataSet.pageNum);
const totalPage = parseInt(res.data.data.dataSet.pageCount); const totalPage = parseInt(res.data.tradeMsg.data.dataSet.pageCount);
const records = res.data.data.dataSet.rowSet.row; const records = res.data.tradeMsg.data.dataSet.rowSet.row;
if (current === 1 && !records.length) { if (current === 1 && !records.length) {
this.cpage = 1; this.cpage = 1;
this.list = []; this.list = [];
...@@ -196,6 +197,7 @@ export default { ...@@ -196,6 +197,7 @@ export default {
}, },
verify(res) { verify(res) {
sessionStorage.setItem("ZJCD-UserInfo", res); sessionStorage.setItem("ZJCD-UserInfo", res);
sessionStorage.setItem('token', JSON.parse(res).token);
let userInfo = JSON.parse(res); let userInfo = JSON.parse(res);
if (!userInfo.idCardNo) { if (!userInfo.idCardNo) {
this.$dialog this.$dialog
...@@ -224,6 +226,7 @@ export default { ...@@ -224,6 +226,7 @@ export default {
created() { created() {
let res = sessionStorage.getItem("ZJCD-UserInfo"); let res = sessionStorage.getItem("ZJCD-UserInfo");
let userInfo = JSON.parse(res); let userInfo = JSON.parse(res);
sessionStorage.setItem('token', JSON.parse(res).token);
if (userInfo) { if (userInfo) {
if (!userInfo.idCardNo) { if (!userInfo.idCardNo) {
this.$dialog this.$dialog
......
...@@ -53,12 +53,12 @@ export default { ...@@ -53,12 +53,12 @@ export default {
message: "加载中...", message: "加载中...",
}); });
Promise.all([ Promise.all([
social({ aae135: this.idCard, busCode: "WS-S0001" }), social({ aae135: this.idCard, busCode: "WS-S0001", encryptIdCard: this.idCard }),
social({ aae135: this.idCard, busCode: "WS-A0001" }), social({ aae135: this.idCard, busCode: "WS-A0001", encryptIdCard: this.idCard }),
]).then((res) => { ]).then((res) => {
this.$toast.clear(); this.$toast.clear();
this.detail = res[0].data.data; this.detail = res[0].data.tradeMsg.data;
this.extra = res[1].data.data; this.extra = res[1].data.tradeMsg.data;
}); });
}, },
}, },
......
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
<script> <script>
import Vue from "vue"; import Vue from "vue";
import { Tab, Tabs, Icon } from "vant"; import { Tab, Tabs, Icon } from "vant";
import { social } from "@/api/insurance"; import { social,doServerMedical } from "@/api/insurance";
Vue.use(Tab) Vue.use(Tab)
.use(Tabs) .use(Tabs)
...@@ -76,14 +76,18 @@ export default { ...@@ -76,14 +76,18 @@ export default {
idCard: null, idCard: null,
payData: [], payData: [],
payNoData: false, payNoData: false,
userInfo: {}
}; };
}, },
methods: { methods: {
JSBgetUserInfo() { JSBgetUserInfo() {
// alert(111)
if (window.android !== undefined) { if (window.android !== undefined) {
const res = window.android.getUserInfo(); const res = window.android.getUserInfo();
sessionStorage.setItem("ZJCD-UserInfo", res); sessionStorage.setItem("ZJCD-UserInfo", res);
this.userInfo = JSON.parse(res);
this.idCard = JSON.parse(res).idCardNo; this.idCard = JSON.parse(res).idCardNo;
sessionStorage.setItem('token', this.userInfo.token),
this.init(); this.init();
} else if (window.webkit) { } else if (window.webkit) {
window.webkit && window.webkit &&
...@@ -93,10 +97,11 @@ export default { ...@@ -93,10 +97,11 @@ export default {
} }
}, },
init() { init() {
// alert(this.userInfo.idCardNo)
let params = { let params = {
aae140: this.aae140, aae140: this.aae140,
busCode: "WS-B0003", busCode: "WS-B0003",
aae135: this.idCard, encryptIdCard: this.userInfo.idCardNo,
cpage: 1, cpage: 1,
rows: 10000, rows: 10000,
}; };
...@@ -105,63 +110,127 @@ export default { ...@@ -105,63 +110,127 @@ export default {
forbidClick: true, forbidClick: true,
message: "加载中...", message: "加载中...",
}); });
social(params).then((res) => { // alert(JSON.stringify(params))
this.$toast.clear(); if (this.aae140 != "310") {
if (res.data.head.rst.busiCode !== "0000") { social(params).then((res) => {
this.$toast("未查询到相关社保信息"); // alert(JSON.stringify(res))
this.payNoData = true; // alert(res.data.tradeMsg.head.rst.busiCode)
return; this.$toast.clear();
} if (res.data.tradeMsg.data.busiId !== "0000") {
const initData = res.data.data.dataSet; this.$toast("未查询到相关社保信息");
if (!initData) { this.payNoData = true;
this.payNoData = true; return;
return; }
} const initData = res.data.tradeMsg.data;
let listData; if (!initData) {
if (initData.rowSet.row.__proto__.constructor !== Array) { this.payNoData = true;
let a = []; return;
a.push(initData.rowSet.row); }
listData = a; // alert(JSON.stringify(initData))
} else { let listData;
listData = initData.rowSet.row; if (initData.dataSet.rowSet.row.__proto__.constructor !== Array) {
} let a = [];
listData.forEach((item) => { a.push(initData.dataSet.rowSet.row);
item.year = item.aae003.slice(0, 5); listData = a;
item.show = false; } else {
item.date = item.aae003.slice(5); listData = initData.dataSet.rowSet.row;
item.totalMoneny = ( }
parseFloat(item.aae020) + parseFloat(item.aae022) listData.forEach((item) => {
).toFixed(2); item.year = item.aae003.slice(0, 5);
}); item.show = false;
let newData = []; item.date = item.aae003.slice(5);
listData.forEach((list) => { item.totalMoneny = (
let flag = false; parseFloat(item.aae020) + parseFloat(item.aae022)
newData.forEach((item) => { ).toFixed(2);
if (item.year === list.year) flag = true;
else flag = false;
}); });
if (flag) { let newData = [];
listData.forEach((list) => {
let flag = false;
newData.forEach((item) => { newData.forEach((item) => {
if (item.year === list.year) { if (item.year === list.year) flag = true;
item.arr.push(list); else flag = false;
}
}); });
if (flag) {
newData.forEach((item) => {
if (item.year === list.year) {
item.arr.push(list);
}
});
} else {
let newArr = [];
newArr.push(list);
const newObj = {
year: list.year,
arr: newArr,
};
newData.push(newObj);
}
});
this.payData = newData;
});
} else {
doServerMedical(params).then((res) => {
this.$toast.clear();
if (res.data.tradeMsg.data.busiId !== "0000") {
this.$toast("未查询到相关社保信息");
this.payNoData = true;
return;
}
const initData = res.data.tradeMsg.data;
if (!initData) {
this.payNoData = true;
return;
}
// alert(JSON.stringify(initData))
let listData;
if (initData.dataSet.rowSet.row.__proto__.constructor !== Array) {
let a = [];
a.push(initData.dataSet.rowSet.row);
listData = a;
} else { } else {
let newArr = []; listData = initData.dataSet.rowSet.row;
newArr.push(list);
const newObj = {
year: list.year,
arr: newArr,
};
newData.push(newObj);
} }
}); listData.forEach((item) => {
this.payData = newData; item.year = item.aae003.slice(0, 5);
}); item.show = false;
item.date = item.aae003.slice(5);
item.totalMoneny = (
parseFloat(item.aae020) + parseFloat(item.aae022)
).toFixed(2);
});
let newData = [];
listData.forEach((list) => {
let flag = false;
newData.forEach((item) => {
if (item.year === list.year) flag = true;
else flag = false;
});
if (flag) {
newData.forEach((item) => {
if (item.year === list.year) {
item.arr.push(list);
}
});
} else {
let newArr = [];
newArr.push(list);
const newObj = {
year: list.year,
arr: newArr,
};
newData.push(newObj);
}
});
this.payData = newData;
})
}
}, },
getUserInfo(res) { getUserInfo(res) {
sessionStorage.setItem("ZJCD-UserInfo", res); sessionStorage.setItem("ZJCD-UserInfo", res);
this.userInfo = JSON.parse(res);
this.idCard = JSON.parse(res).idCardNo; this.idCard = JSON.parse(res).idCardNo;
sessionStorage.setItem('token', this.userInfo.token),
this.init(); this.init();
}, },
}, },
...@@ -181,15 +250,7 @@ export default { ...@@ -181,15 +250,7 @@ export default {
} else if (this.aae140 === "510") { } else if (this.aae140 === "510") {
document.title = "生育保险"; document.title = "生育保险";
} }
let res = sessionStorage.getItem("ZJCD-UserInfo");
let userInfo = JSON.parse(res);
if (!userInfo) {
this.JSBgetUserInfo(); this.JSBgetUserInfo();
} else {
this.idCard = userInfo.idCardNo;
console.log("养老详情details---", this.idCard);
this.init();
}
}, },
}; };
</script> </script>
......
...@@ -63,6 +63,7 @@ export default { ...@@ -63,6 +63,7 @@ export default {
aae135: this.idCard, aae135: this.idCard,
cpage: 1, cpage: 1,
rows: 1000, rows: 1000,
encryptIdCard: this.idCard
}; };
this.$toast.loading({ this.$toast.loading({
duration: 0, // 持续展示 toast duration: 0, // 持续展示 toast
...@@ -71,12 +72,12 @@ export default { ...@@ -71,12 +72,12 @@ export default {
}); });
social(params).then((res) => { social(params).then((res) => {
this.$toast.clear(); this.$toast.clear();
if (res.data.head.rst.busiCode !== "0000") { if (res.data.tradeMsg.data.busiId !== "0000") {
this.$toast("未查询到相关社保信息"); this.$toast("未查询到相关社保信息");
this.payNoData = true; this.payNoData = true;
return; return;
} }
const list = res.data.data.dataSet.rowSet.row; const list = res.data.tradeMsg.data.dataSet.rowSet.row;
if (list.__proto__.constructor !== Array) { if (list.__proto__.constructor !== Array) {
let a = []; let a = [];
a.push(list); a.push(list);
......
...@@ -45,6 +45,7 @@ export default { ...@@ -45,6 +45,7 @@ export default {
let params = { let params = {
aae135: this.userInfo.idCardNo, aae135: this.userInfo.idCardNo,
busCode: "WS-D0003", busCode: "WS-D0003",
encryptIdCard: this.userInfo.idCardNo
}; };
this.$toast.loading({ this.$toast.loading({
duration: 0, // 持续展示 toast duration: 0, // 持续展示 toast
...@@ -54,11 +55,11 @@ export default { ...@@ -54,11 +55,11 @@ export default {
social(params).then((res) => { social(params).then((res) => {
this.$toast.clear(); this.$toast.clear();
console.log(res); console.log(res);
if (res.data.head.rst.busiCode !== "0000") { if (res.data.tradeMsg.data.busiId !== "0000") {
this.$toast("未查询到相关个人档案信息"); this.$toast("未查询到相关个人档案信息");
return; return;
} }
this.detail = res.data.data; this.detail = res.data.tradeMsg.data;
}); });
}, },
JSBgetUserInfo() { JSBgetUserInfo() {
...@@ -85,6 +86,7 @@ export default { ...@@ -85,6 +86,7 @@ export default {
}, },
verify(res) { verify(res) {
sessionStorage.setItem("ZJCD-UserInfo", res); sessionStorage.setItem("ZJCD-UserInfo", res);
sessionStorage.setItem('token', JSON.parse(res).token);
let userInfo = JSON.parse(res); let userInfo = JSON.parse(res);
if (!userInfo.idCardNo) { if (!userInfo.idCardNo) {
this.$dialog this.$dialog
...@@ -114,6 +116,7 @@ export default { ...@@ -114,6 +116,7 @@ export default {
created() { created() {
let res = sessionStorage.getItem("ZJCD-UserInfo"); let res = sessionStorage.getItem("ZJCD-UserInfo");
let userInfo = JSON.parse(res); let userInfo = JSON.parse(res);
sessionStorage.setItem('token', JSON.parse(res).token);
if (userInfo) { if (userInfo) {
if (!userInfo.idCardNo) { if (!userInfo.idCardNo) {
this.$dialog this.$dialog
......
<template>
<div class="measure">
<img src="./img/measure1.png" alt="">
<img src="./img/measure2.png" alt="">
<img src="./img/measure3.png" alt="">
</div>
</template>
<script>
export default {
}
</script>
<style lang="stylus" scoped>
.measure{
width 100%;
height 100%;
display: flex;
flex-direction: column;
overflow: scroll;
img{
width 100%;
}
}
</style>
\ No newline at end of file
...@@ -32,6 +32,7 @@ export default { ...@@ -32,6 +32,7 @@ export default {
finished: true, finished: true,
pageNum: 1, pageNum: 1,
list: [], list: [],
userInfo: {},
}; };
}, },
methods: { methods: {
...@@ -74,10 +75,33 @@ export default { ...@@ -74,10 +75,33 @@ export default {
jump(item) { jump(item) {
this.$router.push({ name: "NoticeDetail", query: { id: item.id } }); this.$router.push({ name: "NoticeDetail", query: { id: item.id } });
}, },
JSBgetUserInfo() {
if (window.android !== undefined) {
const res = window.android.getUserInfo();
sessionStorage.setItem("ZJCD-UserInfo", res);
this.userInfo = JSON.parse(res);
sessionStorage.setItem('token', this.userInfo.token),
this.init(1, "refresh");
} else if (window.webkit) {
window.webkit &&
window.webkit.messageHandlers.getUserInfo.postMessage("getUserInfo");
} else {
this.$toast("请先登录!");
}
},
getUserInfo(res) {
sessionStorage.setItem("ZJCD-UserInfo", res);
this.userInfo = JSON.parse(res);
sessionStorage.setItem('token', this.userInfo.token),
this.init(1, "refresh");
},
}, },
created() { mounted() {
this.init(1, "refresh"); window.getUserInfo = this.getUserInfo;
}, },
created() {
this.JSBgetUserInfo();
}
}; };
</script> </script>
......
...@@ -124,10 +124,13 @@ export default { ...@@ -124,10 +124,13 @@ export default {
// return; // return;
// } // }
sessionStorage.setItem("ZJCD-UserInfo", res); sessionStorage.setItem("ZJCD-UserInfo", res);
sessionStorage.setItem('token', JSON.parse(res).token);
this.userInfo = userInfo; this.userInfo = userInfo;
}, },
}, },
mounted() {
window.getUserInfo = this.getUserInfo;
},
created() { created() {
let res = sessionStorage.getItem("ZJCD-UserInfo"); let res = sessionStorage.getItem("ZJCD-UserInfo");
this.userInfo = JSON.parse(res) || {}; this.userInfo = JSON.parse(res) || {};
......
<template> <template>
<div class="phone"> <div class="phone">
<van-cell <van-cell center clickable v-for="item in list" :key="item.phone" :title="item.name" :label="item.phone"
center @click="callPhone(item)">
clickable
v-for="item in list"
:key="item.phone"
:title="item.name"
:label="item.phone"
@click="callPhone(item)"
>
<template #right-icon> <template #right-icon>
<van-icon name="phone" class="icon" /> <van-icon name="phone" class="icon" />
</template> </template>
...@@ -26,10 +19,20 @@ Vue.use(Cell).use(Icon); ...@@ -26,10 +19,20 @@ Vue.use(Cell).use(Icon);
export default { export default {
data() { data() {
return { return {
list: [] list: [],
userInfo: {}
}; };
}, },
methods: { methods: {
init() {
getPhone().then(res => {
if (res.code == 200) {
this.list = res.data;
} else {
this.list = []
}
});
},
callPhone(item) { callPhone(item) {
if (window.android !== undefined) { if (window.android !== undefined) {
window.android.callPhone(item.phone); window.android.callPhone(item.phone);
...@@ -37,12 +40,33 @@ export default { ...@@ -37,12 +40,33 @@ export default {
window.webkit && window.webkit &&
window.webkit.messageHandlers.callPhone.postMessage(item.phone); window.webkit.messageHandlers.callPhone.postMessage(item.phone);
} }
} },
JSBgetUserInfo() {
if (window.android !== undefined) {
const res = window.android.getUserInfo();
sessionStorage.setItem("ZJCD-UserInfo", res);
this.userInfo = JSON.parse(res);
sessionStorage.setItem('token', this.userInfo.token),
this.init();
} else if (window.webkit) {
window.webkit &&
window.webkit.messageHandlers.getUserInfo.postMessage("getUserInfo");
} else {
this.$toast("请先登录!");
}
},
getUserInfo(res) {
sessionStorage.setItem("ZJCD-UserInfo", res);
this.userInfo = JSON.parse(res);
sessionStorage.setItem('token', this.userInfo.token),
this.init();
},
},
mounted() {
window.getUserInfo = this.getUserInfo;
}, },
created() { created() {
getPhone().then(res => { this.JSBgetUserInfo();
this.list = res;
});
} }
}; };
</script> </script>
......
...@@ -84,6 +84,7 @@ export default { ...@@ -84,6 +84,7 @@ export default {
mattersByUserId({ mattersByUserId({
appId: 1234, appId: 1234,
guideId: this.detail.id, guideId: this.detail.id,
// idCard: this.userInfo.idCardNo ? decryptByDES(this.userInfo.idCardNo, "MnuYbhGv") : null
// userId: this.userInfo.userId // userId: this.userInfo.userId
}).then(res => { }).then(res => {
console.log("人才吗的code----", res); console.log("人才吗的code----", res);
......
...@@ -767,7 +767,7 @@ export default { ...@@ -767,7 +767,7 @@ export default {
staffCode: item.code, staffCode: item.code,
}; };
mattersHouseRejectStaffInfo(params).then((res) => { mattersHouseRejectStaffInfo(params).then((res) => {
alert(JSON.stringify(res)) // alert(JSON.stringify(res))
console.log(res); console.log(res);
this.form.rejectReason = res.data.rejectReason; // 拒绝原因 this.form.rejectReason = res.data.rejectReason; // 拒绝原因
this.form.name = res.data.name; // 申请人姓名 this.form.name = res.data.name; // 申请人姓名
...@@ -968,7 +968,7 @@ export default { ...@@ -968,7 +968,7 @@ export default {
guideId: this.guideId, guideId: this.guideId,
// userId: this.userInfo.userId, // userId: this.userInfo.userId,
}; };
alert(JSON.stringify(params)) // alert(JSON.stringify(params))
mattersHouseRejectStaffUpdate(params).then((res) => { mattersHouseRejectStaffUpdate(params).then((res) => {
console.log(res); console.log(res);
Dialog.alert({ Dialog.alert({
......
...@@ -101,9 +101,9 @@ export default { ...@@ -101,9 +101,9 @@ export default {
guideId: this.guideId, guideId: this.guideId,
// userId: this.userInfo.userId, // userId: this.userInfo.userId,
}; };
alert(JSON.stringify(params)) // alert(JSON.stringify(params))
addMattersHouse(params).then((res) => { addMattersHouse(params).then((res) => {
alert(JSON.stringify(res)) // alert(JSON.stringify(res))
console.log(res); console.log(res);
this.$router.push({ this.$router.push({
name: "PolicyPurchaseSubmit", name: "PolicyPurchaseSubmit",
......
...@@ -112,7 +112,7 @@ export default { ...@@ -112,7 +112,7 @@ export default {
houseCode: this.houseCode, houseCode: this.houseCode,
// userId: this.userInfo.userId // userId: this.userInfo.userId
} }
alert(JSON.stringify(params)) // alert(JSON.stringify(params))
mattersHouseUpdate(params).then((res) => { mattersHouseUpdate(params).then((res) => {
console.log(res); console.log(res);
this.$router.push({ this.$router.push({
......
<template> <template>
<div class="wrapper"> <div class="wrapper">
<div class="box"> <!-- <div class="box">
<img src="https://www.smart-zj.cn:55901/imagems/43697fbf-73b5-4bc8-a751-5c7a08b58452.jpg" class="icon" <img src="https://www.smart-zj.cn:55901/imagems/43697fbf-73b5-4bc8-a751-5c7a08b58452.jpg" class="icon"
@click="jump('1')" /> @click="jump('1')" />
<p class="title">办电镇合意</p> <p class="title">办电镇合意</p>
</div> </div> -->
<div class="box"> <div class="box">
<img src="https://www.smart-zj.cn:55901/image/wangshangguowang.png" class="icon" @click="jump('2')" /> <img src="https://www.smart-zj.cn:55901/image/wangshangguowang.png" class="icon" @click="jump('2')" />
<p class="title">供电服务</p> <p class="title">供电服务</p>
...@@ -47,8 +47,8 @@ export default { ...@@ -47,8 +47,8 @@ export default {
}) })
}) })
} else if (type === "2") { } else if (type === "2") {
window.location.href = window.location.href = `https://wsgwzw.jsnyyw.cn/sgcc/zhenjiang/#/`
`https://wsgwzw.jsnyyw.cn:18443/sgcc/zhenjiang/#/` // `https://wsgwzw.jsnyyw.cn:18443/sgcc/zhenjiang/#/`
} }
}, },
}, },
......
...@@ -220,12 +220,12 @@ export default { ...@@ -220,12 +220,12 @@ export default {
if (this.active == 0) { if (this.active == 0) {
if (this.num3 != 0 || this.num3 != '') { if (this.num3 != 0 || this.num3 != '') {
payWeb(params).then((res) => { payWeb(params).then((res) => {
alert(res); // alert(res);
let a = res; // let a = res;
// let a = // let a =
// res + "&redirectUrl=http%3A%2F%2F192.168.3.113%3A8080%2F%23%2Frqfy"; // 本地 // res + "&redirectUrl=http%3A%2F%2F192.168.3.113%3A8080%2F%23%2Frqfy"; // 本地
// let a = res + '&redirectUrl=http%3A%2F%2F81.69.44.115%2Fzjh%2Fhtml%2Fpages%2F%23%2Frqfy' //测试 // let a = res + '&redirectUrl=http%3A%2F%2F81.69.44.115%2Fzjh%2Fhtml%2Fpages%2F%23%2Frqfy' //测试
alert(JSON.stringify(a)); // alert(JSON.stringify(a));
if (window.android !== undefined) { if (window.android !== undefined) {
window.android.payByWechat("https://mbhuatapp.crcgas.com/pay-web"); window.android.payByWechat("https://mbhuatapp.crcgas.com/pay-web");
window.location.href = res; window.location.href = res;
......
...@@ -190,7 +190,7 @@ import { ...@@ -190,7 +190,7 @@ import {
Icon, Icon,
} from "vant"; } from "vant";
import { get, getList, del, querySfbUserInfo } from "@/api/talents"; import { get, getList, del, querySfbUserInfo } from "@/api/talents";
import { config } from "@/utils/request"; import { config2 } from "@/utils/axios";
// import { encryptByDES,decryptByDES } from "@/utils/utils"; // import { encryptByDES,decryptByDES } from "@/utils/utils";
import { decryptByDES } from "@/utils/utils"; import { decryptByDES } from "@/utils/utils";
...@@ -292,7 +292,7 @@ export default { ...@@ -292,7 +292,7 @@ export default {
break; break;
} }
let now = new Date().getTime(); let now = new Date().getTime();
this.downloadData.url = `${config.baseH5}talents/showinfo?talentCode=${res.talentCode}&time=${now}`; this.downloadData.url = `${config2.baseH5}talents/showinfo?talentCode=${res.talentCode}&time=${now}`;
} }
// if (this.state === 2) { // if (this.state === 2) {
// let endTime = new Date().getTime() // let endTime = new Date().getTime()
...@@ -305,7 +305,7 @@ export default { ...@@ -305,7 +305,7 @@ export default {
}, },
reload() { reload() {
let now = new Date().getTime(); let now = new Date().getTime();
this.downloadData.url = `${config.baseH5}talents/showinfo?talentCode=${this.talentCode}&time=${now}`; this.downloadData.url = `${config2.baseH5}talents/showinfo?talentCode=${this.talentCode}&time=${now}`;
console.log(this.downloadData.url); console.log(this.downloadData.url);
}, },
onRefresh() { onRefresh() {
......
...@@ -190,7 +190,7 @@ ...@@ -190,7 +190,7 @@
<br /> <br />
(3)专技处:0511—85340321(认定内容:江苏省“留学回国人员创新创业计划项目”入选者、取得高级专业技术资格、) (3)专技处:0511—85340321(认定内容:江苏省“留学回国人员创新创业计划项目”入选者、取得高级专业技术资格、)
<br /> <br />
(4)人才中心:0511—84421426(认定内容:取得博士研究生学历且获得相应学位) (4)人才中心:0511—84411692(认定内容:取得博士研究生学历且获得相应学位)
</div> </div>
</div> </div>
<p class="title">F类人才</p> <p class="title">F类人才</p>
...@@ -210,7 +210,7 @@ ...@@ -210,7 +210,7 @@
<br /> <br />
7.市人社局 7.市人社局
<br /> <br />
(1)人才中心:0511—84421426(认定内容:取得全日制大学本科、硕士学历且获得相应学位) (1)人才中心:0511—84411692(认定内容:取得全日制大学本科、硕士学历且获得相应学位)
<br /> <br />
(2)职建处:0511—85340286(认定内容:取得技师及二级职业技能等级、高级工及三级职业技能等级证书) (2)职建处:0511—85340286(认定内容:取得技师及二级职业技能等级、高级工及三级职业技能等级证书)
<br /> <br />
...@@ -222,7 +222,7 @@ ...@@ -222,7 +222,7 @@
<div> <div>
1.市人社局 1.市人社局
<br /> <br />
(1)人才中心:0511—84421426(认定内容:取得全日制大学专科学历) (1)人才中心:0511—84411692(认定内容:取得全日制大学专科学历)
<br /> <br />
(2)专技处:0511—85340321(认定内容:取得初级专业技术资格) (2)专技处:0511—85340321(认定内容:取得初级专业技术资格)
<br /> <br />
......
...@@ -209,6 +209,7 @@ export default { ...@@ -209,6 +209,7 @@ export default {
}, },
verify(res) { verify(res) {
sessionStorage.setItem("ZJCD-UserInfo", res); sessionStorage.setItem("ZJCD-UserInfo", res);
sessionStorage.setItem('token', JSON.parse(res).token);
let userInfo = JSON.parse(res); let userInfo = JSON.parse(res);
if (!userInfo.userId) { if (!userInfo.userId) {
this.$dialog this.$dialog
......
...@@ -13,7 +13,7 @@ export default { ...@@ -13,7 +13,7 @@ export default {
methods: { methods: {
// 比较版本 // 比较版本
check() { check() {
alert(this.version); // alert(this.version);
let arr = this.version.split("."); let arr = this.version.split(".");
if ( if (
...@@ -21,9 +21,9 @@ export default { ...@@ -21,9 +21,9 @@ export default {
(arr[0] * 1 == 5 && arr[1] * 1 > 2) || (arr[0] * 1 == 5 && arr[1] * 1 > 2) ||
(arr[0] * 1 == 5 && arr[1] * 1 == 2 && arr[2] * 1 >= 8) (arr[0] * 1 == 5 && arr[1] * 1 == 2 && arr[2] * 1 >= 8)
) { ) {
alert(123) // alert(123)
} else { } else {
alert(456) // alert(456)
} }
}, },
getVersion(res) { getVersion(res) {
...@@ -32,7 +32,7 @@ export default { ...@@ -32,7 +32,7 @@ export default {
}, },
}, },
created() { created() {
alert(this.$route.query.name) // alert(this.$route.query.name)
//获取当前版本号 //获取当前版本号
if (window.android !== undefined) { if (window.android !== undefined) {
this.version = window.android.getVersion(); this.version = window.android.getVersion();
......
...@@ -871,6 +871,13 @@ ...@@ -871,6 +871,13 @@
dependencies: dependencies:
regenerator-runtime "^0.13.4" regenerator-runtime "^0.13.4"
"@babel/runtime@^7.17.2":
version "7.20.13"
resolved "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.20.13.tgz#7055ab8a7cff2b8f6058bf6ae45ff84ad2aded4b"
integrity sha512-gt3PKXs0DBoL9xCvOIIZ2NEqAGZqHjAnmVbfQtB620V0uReIQutpel14KcneZuer7UioY8ALKZ7iocavvzTNFA==
dependencies:
regenerator-runtime "^0.13.11"
"@babel/template@^7.0.0", "@babel/template@^7.15.4": "@babel/template@^7.0.0", "@babel/template@^7.15.4":
version "7.15.4" version "7.15.4"
resolved "https://registry.nlark.com/@babel/template/download/@babel/template-7.15.4.tgz?cache=0&sync_timestamp=1630618922172&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40babel%2Ftemplate%2Fdownload%2F%40babel%2Ftemplate-7.15.4.tgz" resolved "https://registry.nlark.com/@babel/template/download/@babel/template-7.15.4.tgz?cache=0&sync_timestamp=1630618922172&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40babel%2Ftemplate%2Fdownload%2F%40babel%2Ftemplate-7.15.4.tgz"
...@@ -3097,6 +3104,11 @@ copy-descriptor@^0.1.0: ...@@ -3097,6 +3104,11 @@ copy-descriptor@^0.1.0:
resolved "https://registry.npm.taobao.org/copy-descriptor/download/copy-descriptor-0.1.1.tgz" resolved "https://registry.npm.taobao.org/copy-descriptor/download/copy-descriptor-0.1.1.tgz"
integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40= integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
copy-text-to-clipboard@^3.0.1:
version "3.0.1"
resolved "https://registry.npmmirror.com/copy-text-to-clipboard/-/copy-text-to-clipboard-3.0.1.tgz#8cbf8f90e0a47f12e4a24743736265d157bce69c"
integrity sha512-rvVsHrpFcL4F2P8ihsoLdFHmd404+CMg71S756oRSeQgqk51U3kicGdnvfkrxva0xXH92SjGS62B0XIJsbh+9Q==
copy-webpack-plugin@^5.1.1: copy-webpack-plugin@^5.1.1:
version "5.1.2" version "5.1.2"
resolved "https://registry.nlark.com/copy-webpack-plugin/download/copy-webpack-plugin-5.1.2.tgz?cache=0&sync_timestamp=1624628567065&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcopy-webpack-plugin%2Fdownload%2Fcopy-webpack-plugin-5.1.2.tgz" resolved "https://registry.nlark.com/copy-webpack-plugin/download/copy-webpack-plugin-5.1.2.tgz?cache=0&sync_timestamp=1624628567065&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcopy-webpack-plugin%2Fdownload%2Fcopy-webpack-plugin-5.1.2.tgz"
...@@ -3123,6 +3135,11 @@ core-js-compat@^3.14.0, core-js-compat@^3.16.0, core-js-compat@^3.6.5: ...@@ -3123,6 +3135,11 @@ core-js-compat@^3.14.0, core-js-compat@^3.16.0, core-js-compat@^3.6.5:
browserslist "^4.17.0" browserslist "^4.17.0"
semver "7.0.0" semver "7.0.0"
core-js@^3.11.0:
version "3.28.0"
resolved "https://registry.npmmirror.com/core-js/-/core-js-3.28.0.tgz#ed8b9e99c273879fdfff0edfc77ee709a5800e4a"
integrity sha512-GiZn9D4Z/rSYvTeg1ljAIsEqFm0LaN9gVtwDCrKL80zHtS31p9BAjmTxVqTQDMpwlMolJZOFntUG2uwyj7DAqw==
core-js@^3.6.5: core-js@^3.6.5:
version "3.17.3" version "3.17.3"
resolved "https://registry.nlark.com/core-js/download/core-js-3.17.3.tgz?cache=0&sync_timestamp=1631176914291&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcore-js%2Fdownload%2Fcore-js-3.17.3.tgz" resolved "https://registry.nlark.com/core-js/download/core-js-3.17.3.tgz?cache=0&sync_timestamp=1631176914291&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcore-js%2Fdownload%2Fcore-js-3.17.3.tgz"
...@@ -6593,6 +6610,11 @@ multicast-dns@^6.0.1: ...@@ -6593,6 +6610,11 @@ multicast-dns@^6.0.1:
dns-packet "^1.3.1" dns-packet "^1.3.1"
thunky "^1.0.2" thunky "^1.0.2"
mutation-observer@^1.0.3:
version "1.0.3"
resolved "https://registry.npmmirror.com/mutation-observer/-/mutation-observer-1.0.3.tgz#42e9222b101bca82e5ba9d5a7acf4a14c0f263d0"
integrity sha512-M/O/4rF2h776hV7qGMZUH3utZLO/jK7p8rnNgGkjKUw8zCGjRQPxB8z6+5l8+VjRUQ3dNYu4vjqXYLr+U8ZVNA==
mute-stream@0.0.8, mute-stream@~0.0.4: mute-stream@0.0.8, mute-stream@~0.0.4:
version "0.0.8" version "0.0.8"
resolved "https://registry.npm.taobao.org/mute-stream/download/mute-stream-0.0.8.tgz" resolved "https://registry.npm.taobao.org/mute-stream/download/mute-stream-0.0.8.tgz"
...@@ -8262,6 +8284,11 @@ regenerate@^1.4.2: ...@@ -8262,6 +8284,11 @@ regenerate@^1.4.2:
resolved "https://registry.npm.taobao.org/regenerate/download/regenerate-1.4.2.tgz?cache=0&sync_timestamp=1604218439731&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fregenerate%2Fdownload%2Fregenerate-1.4.2.tgz" resolved "https://registry.npm.taobao.org/regenerate/download/regenerate-1.4.2.tgz?cache=0&sync_timestamp=1604218439731&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fregenerate%2Fdownload%2Fregenerate-1.4.2.tgz"
integrity sha1-uTRtiCfo9aMve6KWN9OYtpAUhIo= integrity sha1-uTRtiCfo9aMve6KWN9OYtpAUhIo=
regenerator-runtime@^0.13.11:
version "0.13.11"
resolved "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9"
integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==
regenerator-runtime@^0.13.4: regenerator-runtime@^0.13.4:
version "0.13.9" version "0.13.9"
resolved "https://registry.nlark.com/regenerator-runtime/download/regenerator-runtime-0.13.9.tgz?cache=0&sync_timestamp=1626993001371&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fregenerator-runtime%2Fdownload%2Fregenerator-runtime-0.13.9.tgz" resolved "https://registry.nlark.com/regenerator-runtime/download/regenerator-runtime-0.13.9.tgz?cache=0&sync_timestamp=1626993001371&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fregenerator-runtime%2Fdownload%2Fregenerator-runtime-0.13.9.tgz"
...@@ -9756,6 +9783,16 @@ vary@~1.1.2: ...@@ -9756,6 +9783,16 @@ vary@~1.1.2:
resolved "https://registry.npm.taobao.org/vary/download/vary-1.1.2.tgz" resolved "https://registry.npm.taobao.org/vary/download/vary-1.1.2.tgz"
integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw= integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
vconsole@^3.15.0:
version "3.15.0"
resolved "https://registry.npmmirror.com/vconsole/-/vconsole-3.15.0.tgz#2383482b0a4106204090046ec128071284e04a90"
integrity sha512-8hq7wabPcRucSWQyN7/1tthMawP9JPvM95zgtMHpPknMMMCKj+abpoK7P7oKK4B0qw58C24Mdvo9+raUdpHyVQ==
dependencies:
"@babel/runtime" "^7.17.2"
copy-text-to-clipboard "^3.0.1"
core-js "^3.11.0"
mutation-observer "^1.0.3"
vendors@^1.0.0: vendors@^1.0.0:
version "1.0.4" version "1.0.4"
resolved "https://registry.npm.taobao.org/vendors/download/vendors-1.0.4.tgz?cache=0&sync_timestamp=1615203425696&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvendors%2Fdownload%2Fvendors-1.0.4.tgz" resolved "https://registry.npm.taobao.org/vendors/download/vendors-1.0.4.tgz?cache=0&sync_timestamp=1615203425696&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvendors%2Fdownload%2Fvendors-1.0.4.tgz"
......
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