个人中心修改

2021-06-29 16:50:19 +08:00 · 2021-06-29 16:50:19 +08:00 · 460a22d9e5
commit 460a22d9e5
parent 5a7a0f3fc8
36 changed files with 2459 additions and 1720 deletions
--- a/index.html
+++ b/index.html
@ -3,9 +3,10 @@
  <head>
    <meta charset="utf-8">
    <meta name="viewport" content="width=device-width,initial-scale=1.0">
-    <title>安全生产三项岗位人员考试服务平台</title>
+    <title>包头市安全生产报名培训考试服务平台</title>
    <script src="./static/jquery-2.1.4.min.js"></script>
    <script src="./static/laydate/laydate.js" type="text/javascript" charset="utf-8"></script>
+    <script type="text/javascript" src="//api.map.baidu.com/api?v=2.0&ak=RrkB6G1UWWnGW2VN3ce9znbpWIfgRG4g"></script>
  </head>
  <body>
    <div id="app"></div>
--- a/package-lock.json
+++ b/package-lock.json
@ -125,7 +125,6 @@
      "version": "1.0.10",
      "resolved": "https://registry.npm.taobao.org/argparse/download/argparse-1.0.10.tgz",
      "integrity": "sha1-vNZ5HqWuCXJeF+WtmIE0zUCz2RE=",
-      "dev": true,
      "requires": {
        "sprintf-js": "~1.0.2"
      }
@ -1245,6 +1244,34 @@
      "integrity": "sha1-nyKcFb4nJFT/qXOs4NvueaGww28=",
      "dev": true
    },
+    "bmaplib.curveline": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npm.taobao.org/bmaplib.curveline/download/bmaplib.curveline-1.0.0.tgz",
+      "integrity": "sha1-gm6wvxxZ+tGyMUK+Zvw2DPAJrqI="
+    },
+    "bmaplib.heatmap": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npm.taobao.org/bmaplib.heatmap/download/bmaplib.heatmap-1.0.4.tgz",
+      "integrity": "sha1-MBYSYncf54rzVwX/kkV3Jd5dmFA="
+    },
+    "bmaplib.lushu": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npm.taobao.org/bmaplib.lushu/download/bmaplib.lushu-1.0.7.tgz",
+      "integrity": "sha1-d8F9z3FI0wxG6EMMf/hrIOQYuLg="
+    },
+    "bmaplib.markerclusterer": {
+      "version": "1.0.13",
+      "resolved": "https://registry.npm.taobao.org/bmaplib.markerclusterer/download/bmaplib.markerclusterer-1.0.13.tgz",
+      "integrity": "sha1-RC1xpsQIRO5H0B9tshZrVFMLW9E=",
+      "requires": {
+        "bmaplib.texticonoverlay": "^1.0.2"
+      }
+    },
+    "bmaplib.texticonoverlay": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npm.taobao.org/bmaplib.texticonoverlay/download/bmaplib.texticonoverlay-1.0.2.tgz",
+      "integrity": "sha1-14VG6g8DbZ/pZJg3ljFbbBEqBb8="
+    },
    "bn.js": {
      "version": "5.2.0",
      "resolved": "https://registry.npm.taobao.org/bn.js/download/bn.js-5.2.0.tgz",
@ -5239,6 +5266,14 @@
        "invert-kv": "^1.0.0"
      }
    },
+    "linkify-it": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npm.taobao.org/linkify-it/download/linkify-it-2.2.0.tgz?cache=0&sync_timestamp=1589972899233&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Flinkify-it%2Fdownload%2Flinkify-it-2.2.0.tgz",
+      "integrity": "sha1-47VGl+eL+RXHCjis14/QngBYsc8=",
+      "requires": {
+        "uc.micro": "^1.0.1"
+      }
+    },
    "load-json-file": {
      "version": "2.0.0",
      "resolved": "https://registry.npm.taobao.org/load-json-file/download/load-json-file-2.0.0.tgz",
@ -5419,6 +5454,25 @@
        "object-visit": "^1.0.0"
      }
    },
+    "markdown-it": {
+      "version": "8.4.2",
+      "resolved": "https://registry.npm.taobao.org/markdown-it/download/markdown-it-8.4.2.tgz?cache=0&sync_timestamp=1618575234575&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmarkdown-it%2Fdownload%2Fmarkdown-it-8.4.2.tgz",
+      "integrity": "sha1-OG+YmY3BWjdyKqdyIIT0Agvdm1Q=",
+      "requires": {
+        "argparse": "^1.0.7",
+        "entities": "~1.1.1",
+        "linkify-it": "^2.0.0",
+        "mdurl": "^1.0.1",
+        "uc.micro": "^1.0.5"
+      },
+      "dependencies": {
+        "entities": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npm.taobao.org/entities/download/entities-1.1.2.tgz?cache=0&sync_timestamp=1611535322406&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fentities%2Fdownload%2Fentities-1.1.2.tgz",
+          "integrity": "sha1-vfpzUplmTfr9NFKe1PhSKidf6lY="
+        }
+      }
+    },
    "math-expression-evaluator": {
      "version": "1.3.7",
      "resolved": "https://registry.npm.taobao.org/math-expression-evaluator/download/math-expression-evaluator-1.3.7.tgz?cache=0&sync_timestamp=1608424633663&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmath-expression-evaluator%2Fdownload%2Fmath-expression-evaluator-1.3.7.tgz",
@ -5442,6 +5496,11 @@
      "integrity": "sha1-aZs8OKxvHXKAkaZGULZdOIUC/Vs=",
      "dev": true
    },
+    "mdurl": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npm.taobao.org/mdurl/download/mdurl-1.0.1.tgz",
+      "integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4="
+    },
    "media-typer": {
      "version": "0.3.0",
      "resolved": "https://registry.npm.taobao.org/media-typer/download/media-typer-0.3.0.tgz",
@ -9952,8 +10011,7 @@
    "sprintf-js": {
      "version": "1.0.3",
      "resolved": "https://registry.npm.taobao.org/sprintf-js/download/sprintf-js-1.0.3.tgz",
-      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
-      "dev": true
+      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
    },
    "ssri": {
      "version": "5.3.0",
@ -10409,6 +10467,11 @@
      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
      "dev": true
    },
+    "uc.micro": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npm.taobao.org/uc.micro/download/uc.micro-1.0.6.tgz",
+      "integrity": "sha1-nEEagCpAmpH8bPdAgbq6NLJEmaw="
+    },
    "uglify-js": {
      "version": "3.4.10",
      "resolved": "https://registry.npm.taobao.org/uglify-js/download/uglify-js-3.4.10.tgz",
@ -10772,6 +10835,18 @@
      "resolved": "https://registry.npm.taobao.org/vue/download/vue-2.6.12.tgz?cache=0&sync_timestamp=1617321643721&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue%2Fdownload%2Fvue-2.6.12.tgz",
      "integrity": "sha1-9evU+mvShpQD4pqJau1JBEVskSM="
    },
+    "vue-baidu-map": {
+      "version": "0.21.22",
+      "resolved": "https://registry.npm.taobao.org/vue-baidu-map/download/vue-baidu-map-0.21.22.tgz",
+      "integrity": "sha1-a3apHvNPGKeC1zKrD1QaGjqgaeA=",
+      "requires": {
+        "bmaplib.curveline": "^1.0.0",
+        "bmaplib.heatmap": "^1.0.4",
+        "bmaplib.lushu": "^1.0.7",
+        "bmaplib.markerclusterer": "^1.0.13",
+        "markdown-it": "^8.4.0"
+      }
+    },
    "vue-hot-reload-api": {
      "version": "2.3.4",
      "resolved": "https://registry.npm.taobao.org/vue-hot-reload-api/download/vue-hot-reload-api-2.3.4.tgz",
--- a/package.json
+++ b/package.json
@ -17,6 +17,7 @@
    "stylus": "^0.54.8",
    "stylus-loader": "^3.0.2",
    "vue": "^2.5.2",
+    "vue-baidu-map": "^0.21.22",
    "vue-layer": "^1.2.0",
    "vue-lazyload": "^1.2.6",
    "vue-router": "^3.0.1"
--- a/src/assets/Components/Header.vue
+++ b/src/assets/Components/Header.vue
@ -3,8 +3,8 @@
      <div class="header-box">
        <div class="head-container">
          <router-link to="/" tag="div" class="title">
-            <h1>安全生产三项岗位人员考试服务平台</h1>
-            <p>The Examination Service Platform For The Three Posts Of Safety Production</p>
+            <h1>包头市安全生产报名培训考试服务平台</h1>
+            <p>Baotou Workplace Safety Registration Training And Examination Service Platform</p>
          </router-link>
          <div class="nav">
            <ul>
@ -124,7 +124,7 @@ export default {
            clear both
          li
            float left
-            padding 0 34px
+            padding 0 30px
            font-size 18px
            color #fff
            border-right 2px solid #fff
--- a/src/assets/images/center-tab1-on.png
+++ b/src/assets/images/center-tab1-on.png
--- a/src/assets/images/center-tab1.png
+++ b/src/assets/images/center-tab1.png
--- a/src/assets/images/center-tab2-on.png
+++ b/src/assets/images/center-tab2-on.png
--- a/src/assets/images/center-tab2.png
+++ b/src/assets/images/center-tab2.png
--- a/src/assets/images/center-tab8-on.png
+++ b/src/assets/images/center-tab8-on.png
--- a/src/assets/images/center-tab8.png
+++ b/src/assets/images/center-tab8.png
--- a/src/assets/images/center-tab9-on.png
+++ b/src/assets/images/center-tab9-on.png
--- a/src/assets/images/center-tab9.png
+++ b/src/assets/images/center-tab9.png
--- a/src/assets/images/default-avatar.jpg
+++ b/src/assets/images/default-avatar.jpg
--- a/src/assets/images/default-avatar.png
+++ b/src/assets/images/default-avatar.png
--- a/src/assets/images/head-bg-bk.jpg
+++ b/src/assets/images/head-bg-bk.jpg
--- a/src/assets/images/head-bg.jpg
+++ b/src/assets/images/head-bg.jpg
--- a/src/assets/images/link1.png
+++ b/src/assets/images/link1.png
--- a/src/assets/images/link2.png
+++ b/src/assets/images/link2.png
--- a/src/assets/images/map.png
+++ b/src/assets/images/map.png
--- a/src/assets/images/no-data.png
+++ b/src/assets/images/no-data.png
--- a/src/assets/images/online1-on.png
+++ b/src/assets/images/online1-on.png
--- a/src/assets/images/online1.png
+++ b/src/assets/images/online1.png
--- a/src/assets/images/online2-on.png
+++ b/src/assets/images/online2-on.png
--- a/src/assets/images/online2.png
+++ b/src/assets/images/online2.png
--- a/src/assets/images/star-on.png
+++ b/src/assets/images/star-on.png
--- a/src/assets/images/star.png
+++ b/src/assets/images/star.png
--- a/src/assets/public/url.js
+++ b/src/assets/public/url.js
@ -1,11 +1,11 @@
-const registerUrl = 'http://124.67.110.246:9999/signup/'
-const loginUrl = 'http://124.67.110.246:9999/signup/'
-const signUrl = 'http://124.67.110.246:9999/signup/'
-const personInfoUrl = 'http://124.67.110.246:9999/signup/'
-// const registerUrl = 'http://192.168.0.109:8070/signup/'
-// const loginUrl = 'http://192.168.0.109:8070/signup/'
-// const signUrl = 'http://192.168.0.109:8070/signup/'
-// const personInfoUrl = 'http://192.168.0.109:8070/signup/'
+// const registerUrl = 'http://124.67.110.246:9999/signup/'
+// const loginUrl = 'http://124.67.110.246:9999/signup/'
+// const signUrl = 'http://124.67.110.246:9999/signup/'
+// const personInfoUrl = 'http://124.67.110.246:9999/signup/'
+const registerUrl = 'http://192.168.0.109:8070/signup/'
+const loginUrl = 'http://192.168.0.109:8070/signup/'
+const signUrl = 'http://192.168.0.109:8070/signup/'
+const personInfoUrl = 'http://192.168.0.109:8070/signup/'
 export default {
  registerUrl,
  loginUrl,
--- a/src/assets/styles/reset.css
+++ b/src/assets/styles/reset.css
@ -1,2 +1,8 @@
@charset "utf-8";a,body,dd,div,dl,dt,em,form,h1,h2,h3,h4,h5,h6,img,input,li,ol,option,p,select,span,strong,table,td,textarea,th,ul,var{margin:0;padding:0}body,html{font:400 100% "微软雅黑",Arail,Tabhoma;text-align:left;color:#535353;-webkit-font-smoothing:antialiased;line-height:normal}ol,ul{list-style:none}img{border:0;vertical-align:top}input,select,textarea{outline:0}textarea{resize:none}table{border-collapse:collapse;border-spacing:0}em,strong,th,var{font-weight:400;font-style:normal}a{text-decoration:none;color:#555}a,input{-webkit-tap-highlight-color:transparent}[v-cloak]{display: none}
 body{ overflow-x: scroll;}
+.BMap_cpyCtrl {
+  display: none;
+}
+.anchorBL {
+  display: none;
+}
--- a/src/main.js
+++ b/src/main.js
@ -3,13 +3,16 @@
 import Vue from 'vue'
 import App from './App'
 import router from './router'
+import BaiduMap from 'vue-baidu-map'
 import '@/assets/styles/reset.css'
 import '@/assets/styles/font.css'
 import layer from 'vue-layer'
 import 'vue-layer/lib/vue-layer.css'
-import VueLazyComponent from '@xunlei/vue-lazy-component'

-Vue.use(VueLazyComponent)
+Vue.use(BaiduMap, {
+  ak: 'OMpRxEIx1s7uMebZM9R09V4bv5zapeIm'
+})
+
 Vue.prototype.$layer = layer(Vue);
 /* eslint-disable no-new */
 new Vue({
--- a/src/pages/Index/Components/Notice.vue
+++ b/src/pages/Index/Components/Notice.vue
@ -28,7 +28,7 @@
        <router-link to="/login">
          <img src="@/assets/images/login-box1.png" alt="">
        </router-link>
-        <a href="http://124.67.110.246:8081/signup" target="_blank">
+        <a href="http://124.67.110.246:9999/signup" target="_blank">
          <img src="@/assets/images/login-box2.png" alt="">
        </a>
      </div>
--- a/src/pages/Index/Components/Policy.vue
+++ b/src/pages/Index/Components/Policy.vue
@ -1,6 +1,6 @@
 <template>
    <div class="policy">
-      <h3>考试政策<em>/Information release</em></h3>
+      <h3>考试政策<em>/Examination policy</em></h3>
      <div class="row">
        <router-link :to="{path: '/detail', query: {contentId: firstPolicy.contentId}}" tag="div" class="first" :title="firstPolicy.title">
          <img :src="newsUrl + 'route/file/download/true/' + firstPolicy.coverPhotos" alt="">
--- a/src/pages/Index/Index.vue
+++ b/src/pages/Index/Index.vue
@ -72,7 +72,6 @@ export default {
          self.firstPolicy.coverPhotos = self.firstPolicy.coverPhotos.split(',')[0]
          res.data.rows.splice(0,1)
          for (let i = 0; i < res.data.rows.length; i++) {
-            console.log(res.data.rows.publishDate)
            var year = res.data.rows[i].publishDate.split('-')[0]
            var date = res.data.rows[i].publishDate.split('-')[1] + '-' + res.data.rows[i].publishDate.split('-')[2]
            res.data.rows[i].publishDate = date
--- a/src/pages/Login/Login.vue
+++ b/src/pages/Login/Login.vue
@ -2,7 +2,7 @@
    <div>
      <div class="login">
        <div class="login-box">
-          <h3>安全生产三项岗位人员考试服务平台</h3>
+          <h3>包头市安全生产三项岗位人员培训考试服务平台</h3>
 <!--          <p>Baotou Unified Identity Verification Platform</p>-->
          <input type="text" v-model="loginInfo.username" placeholder="请输入账号">
          <input type="password" v-model="loginInfo.password" placeholder="请输入密码" @keyup.enter="submitLogin">
@ -56,7 +56,7 @@ export default {
            self.isLoading = false
            setTimeout(function () {
              self.$router.push('/')
-            }, 1500)
+            }, 1000)
          }).catch(function (error) {
            self.$layer.msg(error.response.data.msg)
            self.isLoading = false
--- a/src/pages/Notice/Notice.vue
+++ b/src/pages/Notice/Notice.vue
@ -66,7 +66,7 @@ export default {
        return {
          page: {
            page: 1,
-            rows: 10,
+            rows: 1,
            totalPage: 10,
            categoryId: '87a51bb1-451b-4b49-903b-4d847ba9c730'
          },
--- a/src/pages/PersonCenter/PersonCenter.vue
+++ b/src/pages/PersonCenter/PersonCenter.vue
--- a/src/pages/Register/Register.vue
+++ b/src/pages/Register/Register.vue
@ -4,7 +4,7 @@
        <div class="login-box">
          <h3>注册新用户</h3>
 <!--          <p>Baotou Unified Identity Verification Platform</p>-->
-          <input type="text" v-model="registerInfo.username" placeholder="请输入账号">
+          <input type="text" v-model="registerInfo.username" placeholder="请输入手机号">
          <input type="password" v-model="registerInfo.password" placeholder="请输入密码">
          <input type="password" v-model="registerInfo.passwordSame" placeholder="请再次输入密码">
          <button @click="submitRegister">注册</button>
@ -42,6 +42,32 @@ export default {
    methods: {
      submitRegister: function () {
        var self = this
+        var reg=/^[1][3,4,5,6,7,8,9][0-9]{9}$/;
+        var pwdReg = /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]*$/;
+        if (!self.registerInfo.username) {
+          self.$layer.msg('用户名不能为空')
+          return
+        }
+        if (!self.registerInfo.password) {
+          self.$layer.msg('密码不能为空')
+          return
+        }
+        if (!self.registerInfo.passwordSame) {
+          self.$layer.msg('请再次输入密码')
+          return
+        }
+        if (!reg.test(self.registerInfo.username)) {
+          self.$layer.msg('用户名应为有效手机号码')
+          return
+        }
+        if (self.registerInfo.password != self.registerInfo.passwordSame) {
+          self.$layer.msg('两次输入的密码不一致')
+          return
+        }
+        if (!pwdReg.test(self.registerInfo.password)) {
+          self.$layer.msg('密码应由字母和数字组成')
+          return
+        }
        if (self.registerInfo.username && self.registerInfo.password && self.registerInfo.passwordSame) {
          self.isLoading = true
          axios.post(self.url + 'app/register/default', self.registerInfo).then(function (res) {