Merge branch 'dev' of http://git.izouma.com/xiongzhu/raex_front into dev

src/views/domain/SuperLinkType.vue

@@ -14,6 +14,28 @@
                 <img src="@/assets/png-xiayibu.png" alt="" class="icon" />
             </div>
         </div>
+        <div class="select">
+            <img src="@/assets/link-type-select.png" alt="" class="select-bg" />
+            <div class="select-box">
+                <img src="@/assets/icon_zhuye.png" alt="" class="img" />
+                <div class="select-info">
+                    <div class="text1">个人主页</div>
+                    <div class="text2">增加主页曝光度，获得更多粉丝～</div>
+                </div>
+                <img src="@/assets/png-xiayibu.png" alt="" class="icon" />
+            </div>
+        </div>
+        <div class="select">
+            <img src="@/assets/link-type-select.png" alt="" class="select-bg" />
+            <div class="select-box">
+                <img src="@/assets/icon_zhuye.png" alt="" class="img" />
+                <div class="select-info">
+                    <div class="text1">个人主页</div>
+                    <div class="text2">增加主页曝光度，获得更多粉丝～</div>
+                </div>
+                <img src="@/assets/png-xiayibu.png" alt="" class="icon" />
+            </div>
+        </div>
     </div>
 </template>
 
@@ -23,4 +45,68 @@
     background-color: #23042e;
     color: #fff;
 }
+
+.logo {
+    width: 100px;
+    display: block;
+    margin: auto;
+}
+
+.title {
+    font-size: 24px;
+    font-family: AlimamaShuHeiTi;
+    color: #ffffff;
+    line-height: 34px;
+    text-align: center;
+}
+
+.select {
+    position: relative;
+    padding: 10px 20px;
+
+    .select-bg {
+        width: 100%;
+        position: relative;
+    }
+
+    .select-box {
+        position: absolute;
+        top: 10px;
+        left: 20px;
+        right: 20px;
+        bottom: 10px;
+        .flex();
+        padding: 0 16px;
+
+        .img {
+            width: 44px;
+            height: 44px;
+        }
+
+        .icon {
+            width: 20px;
+            height: 20px;
+        }
+
+        .select-info {
+            flex-grow: 1;
+            padding: 0 10px;
+
+            .text1 {
+                font-size: 16px;
+                font-family: AlimamaShuHeiTi;
+                color: #ffffff;
+                line-height: 24px;
+                text-shadow: 0px 2px 4px rgba(0, 0, 0, 0.3);
+            }
+
+            .text2 {
+                font-size: 12px;
+                color: #e79af0;
+                line-height: 24px;
+                margin-top: 4px;
+            }
+        }
+    }
+}
 </style>

src/views/user/Rice.vue

@@ -13,6 +13,7 @@
             frameborder="0"
             id="game"
         ></iframe>
+        <img v-if="isLoading" src="@assets/riceOpen.jpeg" class="riceOpen" alt="" />
 
         <rice-task @send="send" @share="share" ref="task"></rice-task>
         <rice-share ref="share" @refreashTask="refreashTask"></rice-share>
@@ -37,6 +38,9 @@ export default {
                 if (event.data.message.type === 'task') {
                     this.showTask();
                 }
+                if (event.data.message.type === 'init') {
+                    this.isLoading = false;
+                }
             });
         });
         // this.$http.get('/MonkeyText/test');
@@ -50,7 +54,8 @@ export default {
     data() {
         return {
             info: {},
-            levels: []
+            levels: [],
+            isLoading: true
         };
     },
     computed: {
@@ -183,4 +188,11 @@ export default {
         z-index: 20;
     }
 }
+.riceOpen {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+}
 </style>