Skip to content

dev / pingan-life-index-pro

Go to a project
Toggle navigation
Toggle navigation pinning
c2557d37 by joe
Options

1

1 parent 8669d8e8
Inline Side-by-side
Showing 7 changed files with 37 additions and 22 deletions
...@@ -25,7 +25,6 @@ ...@@ -25,7 +25,6 @@
25 color: $cOrange; 25 color: $cOrange;
26 } 26 }
27 27
28
29 .modal { 28 .modal {
30 position: relative; 29 position: relative;
31 @extend .bb; 30 @extend .bb;
...@@ -33,7 +32,7 @@ ...@@ -33,7 +32,7 @@
33 // height: 28.5rem; 32 // height: 28.5rem;
34 border-radius: .8333rem; 33 border-radius: .8333rem;
35 background-color: #ffffff; 34 background-color: #ffffff;
36 padding: 4.5rem 3rem 2.5rem; 35 padding: 3.5rem 2rem 2.5rem;
37 border: .083333rem solid $cOrange; 36 border: .083333rem solid $cOrange;
38 37
39 .title { 38 .title {
...@@ -91,7 +90,7 @@ ...@@ -91,7 +90,7 @@
91 } 90 }
92 91
93 .default-mt { 92 .default-mt {
94 margin-top: 3.2rem; 93 margin-top: 2.2rem;
95 } 94 }
96 95
97 .half-mt { 96 .half-mt {
...@@ -113,6 +112,16 @@ ...@@ -113,6 +112,16 @@
113 .btn-margin { 112 .btn-margin {
114 margin-left: 2rem !important; 113 margin-left: 2rem !important;
115 } 114 }
115
116 .close {
117 cursor: pointer;
118 img {
119 width: 1.666667rem ;
120 position: absolute;
121 right: -2.5rem;
122 top: -1.666667rem ;
123 }
124 }
116 } 125 }
117 126
118 .flex-left { 127 .flex-left {
...@@ -213,6 +222,10 @@ ...@@ -213,6 +222,10 @@
213 width: 90%; 222 width: 90%;
214 height: auto; 223 height: auto;
215 224
225 .close {
226 display: none;
227 }
228
216 .content { 229 .content {
217 width: 100%; 230 width: 100%;
218 margin: auto; 231 margin: auto;
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
3 <div class="comp" v-if="policyDetail && showPolicy"> 3 <div class="comp" v-if="policyDetail && showPolicy">
4 <div @click="onOverLayHandler()" class="overlay"></div> 4 <div @click="onOverLayHandler()" class="overlay"></div>
5 <div class="modal"> 5 <div class="modal">
6 <div class="close" @click="onOverLayHandler()"><img src="@/assets/images/vhis/close.png"></div>
6 <div class="title">{{$t('vhis.title')}}</div> 7 <div class="title">{{$t('vhis.title')}}</div>
7 <div class="content default-mt"> 8 <div class="content default-mt">
8 <div class="desc orange">{{$t('vhis.desc1')}}</div> 9 <div class="desc orange">{{$t('vhis.desc1')}}</div>
......
1 import api from '@/api/api'; 1 import api from '@/api/api';
2 import { 2 import {
3 httpPost 3 httpPost,
4 requestDomain
4 } from '@/api/fetch-api.js'; 5 } from '@/api/fetch-api.js';
5 6
6 import { 7 import {
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
41 <policy-change-information></policy-change-information> 41 <policy-change-information></policy-change-information>
42 </div> 42 </div>
43 <div class="panel" v-if="activity == 'm5'"> 43 <div class="panel" v-if="activity == 'm5'">
44 <clarms></clarms> 44 <!-- <clarms></clarms> -->
45 </div> 45 </div>
46 <div class="panel" v-if="activity == 'm6'"> 46 <div class="panel" v-if="activity == 'm6'">
47 <reservation></reservation> 47 <reservation></reservation>
......
...@@ -60,8 +60,8 @@ export default { ...@@ -60,8 +60,8 @@ export default {
60 // gotoVHIS(this.locale); 60 // gotoVHIS(this.locale);
61 this.$router.push({ 61 this.$router.push({
62 path: "/vhis", 62 path: "/vhis",
63 query : { 63 query: {
64 p : "VHIS001" 64 p: "VHIS001"
65 } 65 }
66 }); 66 });
67 }, 67 },
......
...@@ -19,21 +19,21 @@ if (process.env.NODE_ENV === 'development') { ...@@ -19,21 +19,21 @@ if (process.env.NODE_ENV === 'development') {
19 // 生产环境 个沙箱 19 // 生产环境 个沙箱
20 webpack_public_path = process.env.VUE_APP_TITLE; 20 webpack_public_path = process.env.VUE_APP_TITLE;
21 // seo插件 21 // seo插件
22 plugins.push( 22 // plugins.push(
23 new PrerenderSPAPlugin({ 23 // new PrerenderSPAPlugin({
24 staticDir: path.join(__dirname, webpack_public_path || 'dist'), // 如果没配置环境目录(生产),则写到目录dist 24 // staticDir: path.join(__dirname, webpack_public_path || 'dist'), // 如果没配置环境目录(生产),则写到目录dist
25 routes: ['/', '/demo', '/about'], // 需要seo的目录 临时占位，后期再进行配置 25 // routes: ['/', '/demo', '/about'], // 需要seo的目录 临时占位，后期再进行配置
26 renderer: new Renderer({ 26 // renderer: new Renderer({
27 inject: { 27 // inject: {
28 foo: 'bar' 28 // foo: 'bar'
29 }, 29 // },
30 headless: false, 30 // headless: false,
31 renderAfterDocumentEvent: 'render-event', 31 // renderAfterDocumentEvent: 'render-event',
32 //renderAfterTime: 5000, 32 // //renderAfterTime: 5000,
33 //renderAfterElementExists: 'my-app-element' 33 // //renderAfterElementExists: 'my-app-element'
34 }) 34 // })
35 }) 35 // })
36 ) 36 // )
37 } 37 }
38 38
39 function resolve(dir) { 39 function resolve(dir) {
......