panhui 4 лет назад
Родитель
Сommit
34c53bf7b8

+ 1 - 1
src/main/nine-space/.env.development

@@ -1,4 +1,4 @@
-VUE_APP_BASE_URL=https://nfttest.9space.vip/
+VUE_APP_BASE_URL=http://localhost:8080/
 NODE_ENV=development
 PUBLIC_PATH=/
 ASSETS_PATH=9th

+ 42 - 0
src/main/nine-space/src/components/Agreement.vue

@@ -0,0 +1,42 @@
+<template>
+    <van-overlay :show="show" @click="show = false" z-index="99">
+        <div class="content" @click.stop="">
+            <div class="title">用户隐私协议</div>
+            <iframe src="/privacy.html"></iframe>
+        </div>
+    </van-overlay>
+</template>
+
+<script>
+export default {
+    data() {
+        return {
+            show: true
+        };
+    }
+};
+</script>
+
+<style lang="less" scoped>
+.content {
+    background: #fff;
+    width: 90vw;
+    height: 80vh;
+    position: absolute;
+    left: calc(5vw);
+    top: calc(10vh);
+    border-radius: 6px;
+    overflow-x: hidden;
+    overflow-y: auto;
+    color: #000;
+    box-sizing: border-box;
+    padding: 16px;
+}
+
+.title {
+    font-size: @font4;
+    font-weight: bold;
+    text-align: center;
+    padding-bottom: 20px;
+}
+</style>

+ 19 - 1
src/main/nine-space/src/views/account/Login.vue

@@ -51,6 +51,14 @@
                 <van-button class="del" round block plain @click="$router.replace('/register')"
                     >暂无账号,立即注册</van-button
                 >
+
+                <div class="xieyi">
+                    <van-checkbox v-model="checked"
+                        >已阅读并同意<span @click.stop="$refs.agreement.show = true">
+                            &lt;&lt;用户隐私协议>></span
+                        ></van-checkbox
+                    >
+                </div>
             </div>
         </van-form>
 
@@ -114,12 +122,16 @@
                 >
             </div>
         </van-form>
+
+        <agreement ref="agreement" />
     </div>
 </template>
 
 <script>
+import Agreement from '../../components/Agreement.vue';
 import phone from '../../mixins/phone';
 export default {
+    components: { Agreement },
     mixins: [phone],
     data() {
         return {
@@ -128,7 +140,8 @@ export default {
                 phone: '',
                 password: '',
                 code: ''
-            }
+            },
+            checked: false
         };
     },
     methods: {
@@ -248,4 +261,9 @@ export default {
     right: 0;
     top: -65px;
 }
+.xieyi {
+    .flex();
+    justify-content: center;
+    margin-top: 50px;
+}
 </style>

+ 2 - 1
src/main/vue/src/views/SysConfigList.vue

@@ -164,7 +164,8 @@ export default {
                     label: '文件',
                     value: 'FILE'
                 }
-            ]
+            ],
+            htmlContents:['']
         };
     },
     computed: {