panhui 4 лет назад
Родитель
Сommit
87ee3c5eec

BIN
src/main/nine-space/src/assets/9th/png-kapian.png


BIN
src/main/nine-space/src/assets/raex/bg-01.png


BIN
src/main/nine-space/src/assets/raex/png-kapian.png


BIN
src/main/nine-space/src/assets/raex/png-xiangzi.png


+ 3 - 3
src/main/nine-space/src/assets/raex/svgs/login_icon_code.svg

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <title>login_icon_mima</title>
-    <g id="第九空间" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
-        <g id="验证码登陆" transform="translate(-46.000000, -265.000000)" stroke="#FDFB60" stroke-width="1.2">
-            <g id="编组-11备份-11" transform="translate(46.000000, 253.000000)">
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
+        <g id="用户注册" transform="translate(-46.000000, -246.000000)" stroke="#00FFCB" stroke-width="1.2">
+            <g id="编组-11备份-11" transform="translate(46.000000, 234.000000)">
                 <g id="编组-7" transform="translate(0.000000, 12.000000)">
                     <path d="M6.2121614,5.48050226 L12,3 L12,3 L17.7878386,5.48050226 C18.5232063,5.79565984 19,6.5187361 19,7.31879232 L19,12 C19,15.6399494 16.8307712,18.9296695 13.4851298,20.3635158 L12,21 L12,21 L10.5148702,20.3635158 C7.16922878,18.9296695 5,15.6399494 5,12 L5,7.31879232 C5,6.5187361 5.47679371,5.79565984 6.2121614,5.48050226 Z" id="矩形"></path>
                     <polyline id="直线" points="9.21869985 10.9921433 10.7186999 13.2421433 15.2186999 10.2421433"></polyline>

+ 3 - 3
src/main/nine-space/src/assets/raex/svgs/login_icon_mima.svg

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <title>login_icon_mima</title>
-    <g id="第九空间" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
-        <g id="账号密码登录" transform="translate(-46.000000, -265.000000)" stroke="#FDFB60" stroke-width="1.2">
-            <g id="编组-11备份-11" transform="translate(46.000000, 253.000000)">
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
+        <g id="用户注册" transform="translate(-46.000000, -310.000000)" stroke="#00FFCB" stroke-width="1.2">
+            <g id="编组-11备份-11" transform="translate(46.000000, 298.000000)">
                 <g id="编组-7" transform="translate(0.000000, 12.000000)">
                     <g id="编组-4" transform="translate(4.500000, 3.000000)">
                         <path d="M2,8 L13,8 C14.1045695,8 15,8.8954305 15,10 L15,16 C15,17.1045695 14.1045695,18 13,18 L2,18 C0.8954305,18 1.3527075e-16,17.1045695 0,16 L0,10 C-1.3527075e-16,8.8954305 0.8954305,8 2,8 Z" id="矩形"></path>

+ 3 - 3
src/main/nine-space/src/assets/raex/svgs/login_icon_zhanghao.svg

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <title>login_icon_zhanghao</title>
-    <g id="第九空间" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
-        <g id="账号密码登录" transform="translate(-46.000000, -201.000000)" stroke="#FDFB60" stroke-width="1.2">
-            <g id="编组-11备份-11" transform="translate(46.000000, 189.000000)">
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
+        <g id="用户注册" transform="translate(-46.000000, -182.000000)" stroke="#00FFCB" stroke-width="1.2">
+            <g id="编组-11备份-11" transform="translate(46.000000, 170.000000)">
                 <g id="编组-6" transform="translate(0.000000, 12.000000)">
                     <g id="编组-2" transform="translate(4.500000, 3.000000)">
                         <path d="M2.5,0 L12.5,0 C13.6045695,-2.02906125e-16 14.5,0.8954305 14.5,2 L14.5,16 C14.5,17.1045695 13.6045695,18 12.5,18 L2.5,18 C1.3954305,18 0.5,17.1045695 0.5,16 L0.5,2 C0.5,0.8954305 1.3954305,2.02906125e-16 2.5,0 Z" id="矩形"></path>

+ 10 - 10
src/main/nine-space/src/components/order/OrderOpen.vue

@@ -145,11 +145,11 @@ export default {
         z-index: 1;
     }
     .img3 {
-        width: 20px;
-        height: 20px;
+        width: 66px;
+        height: 130px;
         position: absolute;
-        left: calc(50% - 10px);
-        top: calc(50% - 10px);
+        left: calc(50% - 33px);
+        top: calc(40% - 65px);
         z-index: 2;
         opacity: 0;
     }
@@ -197,19 +197,19 @@ export default {
 
 @keyframes bounceOutUp {
     20% {
-        -webkit-transform: translate3d(0, -10px, 0) scale(1.1);
-        transform: translate3d(0, -10px, 0) scale(1.1);
+        -webkit-transform: translate3d(0, -10px, 0) scaleY(0.585);
+        transform: translate3d(0, -10px, 0) scaleY(0.585);
     }
     40%,
     45% {
         opacity: 1;
-        -webkit-transform: translate3d(0, 20px, 0) scale(1.2);
-        transform: translate3d(0, 20px, 0) scale(1.2);
+        -webkit-transform: translate3d(0, 20px, 0) scaleY(0.5);
+        transform: translate3d(0, 20px, 0) scaleY(0.5);
     }
     to {
         opacity: 0;
-        -webkit-transform: translate3d(0, -2000px, 0) scale(3);
-        transform: translate3d(0, -2000px, 0) scale(3);
+        -webkit-transform: translate3d(0, -2000px, 0) scaleY(3);
+        transform: translate3d(0, -2000px, 0) scaleY(3);
     }
 }
 

+ 2 - 6
src/main/nine-space/src/views/account/Login.vue

@@ -115,14 +115,14 @@
             </div>
         </van-form>
 
-        <div class="xieyi">
+        <!-- <div class="xieyi">
             <van-checkbox v-model="checked">
                 已阅读并同意
                 <span @click.stop="$router.push('/agreement?page=service')"> &lt;&lt;用户服务协议>></span>
                 <span @click.stop="$router.push('/agreement')"> &lt;&lt;平台隐私协议>></span>
             </van-checkbox>
-        </div>
+        </div> -->
     </div>
 </template>
 
@@ -148,10 +148,6 @@ export default {
             });
         },
         submit() {
-            if (!this.checked) {
-                this.$toast('请先阅读并同意隐私政策');
-                return;
-            }
             this.$toast.loading({
                 message: '加载中...',
                 forbidClick: true

+ 30 - 1
src/main/nine-space/src/views/account/Register.vue

@@ -99,6 +99,15 @@
                 >
             </div>
         </van-form>
+
+        <div class="xieyi">
+            <van-checkbox v-model="checked">
+                已阅读并同意
+                <span @click.stop="$router.push('/agreement?page=service')"> 《用户服务协议》</span>
+                和
+                <span @click.stop="$router.push('/agreement')"> 《平台隐私协议》</span>
+            </van-checkbox>
+        </div>
     </div>
 </template>
 
@@ -114,7 +123,8 @@ export default {
                 password: '',
                 password2: '',
                 code: ''
-            }
+            },
+            checked: false
         };
     },
     methods: {
@@ -124,6 +134,10 @@ export default {
             });
         },
         submit() {
+            if (!this.checked) {
+                this.$toast('请先阅读并同意隐私政策');
+                return;
+            }
             this.$toast.loading({
                 message: '加载中...',
                 forbidClick: true
@@ -220,4 +234,19 @@ export default {
     padding-right: 0;
     border-width: 0;
 }
+.xieyi {
+    .flex();
+    justify-content: center;
+    margin-top: 50px;
+    font-size: @font1;
+
+    span {
+        color: @prim;
+    }
+}
+
+/deep/.van-checkbox__icon--checked .van-icon {
+    background: linear-gradient(135deg, @prim 0%, @warn 100%);
+    border-width: 0;
+}
 </style>