Merge branch 'dev' of http://git.izouma.com/licailing/zhirongip into dev

src/main/zhi-rong-web/src/components/popup/Agreement.vue

@@ -117,14 +117,10 @@
 
 <script>
 export default {
-    props: {
-        flag: {
-            type: Boolean,
-            default: false
-        }
-    },
     data() {
-        return {};
+        return {
+            flag: false
+        };
     }
 };
 </script>

src/main/zhi-rong-web/src/views/Register.vue

@@ -72,7 +72,11 @@
                 </el-form-item>
             </el-form>
             <template v-if="this.$route.query.identification != 1">
-                <el-checkbox v-model="checked">点击同意注册协议</el-checkbox>
+                <el-checkbox v-model="checked">
+                    <el-link style="margin-bottom: 2px" @click.prevent="$refs.argeement.flag = true"
+                        >点击同意注册协议</el-link
+                    >
+                </el-checkbox>
             </template>
             <div class="sub-btn" style="width: 300px" v-if="this.$route.query.identification == 1">
                 <el-button type="primary" class="btn-block" @click="password">确定</el-button>
@@ -96,7 +100,7 @@
                 >
             </div>
         </div>
-        <agreement :flag="checked"></agreement>
+        <agreement ref="argeement"></agreement>
     </div>
 </template>