Merge branch 'master' of https://gitlab.ezijing.com/ezijing/x-exam

src/components/exam/dialogComponent.vue

 <template>
   <div class="main">
     <p>
+<<<<<<< HEAD
+      {{title}}
+      <!-- <slot name="title"></slot> -->
+    </p>
+    <div class="prompt">
+      {{prompt}}
+      <!-- <slot name="prompt"></slot> -->
+=======
       <slot name="title"></slot>
     </p>
     <div class="prompt">
       <slot name="prompt"></slot>
+>>>>>>> c60e006e1e1205deeae0e8154316d1f71b67de6a
     </div>
     <div class="button">
       <div>
@@ -16,6 +25,7 @@
 </template>
 <script>
 export default {
+  props: ['title', 'prompt']
 }
 </script>
 <style lang="scss" scoped>

src/main.js

@@ -11,12 +11,10 @@ import Element from 'element-ui'
 import modules from './modules'
 
 import createBefore from './components/beforeEnter'
-
 Vue.use(VueRouter)
 const router = createRouter()
 Vue.use(VueI18n)
 const i18n = createI18n()
-
 Vue.use(MetaInfo)
 
 Vue.use(Element, { i18n: (key, value) => i18n.t(key, value) })

src/pages/login/index.vue

@@ -21,12 +21,30 @@
             <div class="time-tips" v-show="false">距离开考还有：3:23:04</div>
           </div>
         </div>
+        <my-dia :title="title" :prompt="prompt">
+            <!-- <template v-slot:title>提示</template> -->
+            <template v-slot:prompt></template>
+            <template v-slot:button>
+              <button>我知道了</button>
+              <button>好的</button>
+            </template>
+        </my-dia>
       </div>
     </div>
   </div>
 </template>
 <script>
+import DialogComponent from '../../components/exam/dialogComponent.vue'
 export default {
+  components: {
+    'my-dia': DialogComponent
+  },
+  data() {
+    return {
+      title: '提示',
+      prompt: '从哪女快递费也琴女是儿是而发大V是阿女大是安抚大V vavgrrad'
+    }
+  }
 }
 </script>
 <style lang="scss" scoped>