瀏覽代碼

完成云中心页面相关交互

wangcz 7 年之前
父節點
當前提交
7027044ce8

+ 21 - 0
assets/scss/common.scss

@@ -657,3 +657,24 @@ form .questions .el-form-item__content span.question {
   font-size: 14px;
   color: #000;
 }
+
+// 模态框样式处理
+.el-dialog__wrapper{
+  z-index:10000;
+}
+.el-dialog__body{
+  text-align: center!important;
+  border-top:1px solid #d2d2d2!important;
+}
+.el-dialog__footer{
+  text-align: center!important;
+  padding: 60px 15px 40px;
+}
+.el-dialog__footer .el-button{
+  width:180px;
+  height:30px;
+  line-height: 30px;
+  text-align: center;
+  padding:0;
+  border-radius:15px;
+}

+ 8 - 2
components/default/CloudHeader.vue

@@ -115,14 +115,20 @@
   $nav-height: 60px;
   $nav-boxshadow: 2px 2px 5px rgba(0,0,0,.12);
   $nav-color: #3c3c3c;
+  .navbar-slogan{
+    font-size: 14px;
+  }
   .f-nav{
     display:inline-block;
     margin-left:30px;
     padding-top:15px;
+    li{
+      margin-right:25px;
+    }
   }
   .menu-item{
-    font-size: 14px;
-    color:#999!important;
+    font-size: 14px!important;
+    color:#666!important;
   }
   .menu-item.nuxt-link-active, .menu-item:hover{
     color:#333!important;

+ 0 - 17
layouts/cloud.vue

@@ -15,20 +15,3 @@
     }
   }
 </script>
-<style>
-html {
-  font-family: "Source Sans Pro", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
-  font-size: 16px;
-  word-spacing: 1px;
-  -ms-text-size-adjust: 100%;
-  -webkit-text-size-adjust: 100%;
-  -moz-osx-font-smoothing: grayscale;
-  -webkit-font-smoothing: antialiased;
-  box-sizing: border-box;
-}
-
-*, *:before, *:after {
-  box-sizing: border-box;
-  margin: 0;
-}
-</style>

+ 0 - 46
layouts/default.vue

@@ -15,49 +15,3 @@
     }
   }
 </script>
-<style>
-html {
-  font-family: "Source Sans Pro", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
-  font-size: 16px;
-  word-spacing: 1px;
-  -ms-text-size-adjust: 100%;
-  -webkit-text-size-adjust: 100%;
-  -moz-osx-font-smoothing: grayscale;
-  -webkit-font-smoothing: antialiased;
-  box-sizing: border-box;
-}
-
-*, *:before, *:after {
-  box-sizing: border-box;
-  margin: 0;
-}
-
-.button--green {
-  display: inline-block;
-  border-radius: 4px;
-  border: 1px solid #3b8070;
-  color: #3b8070;
-  text-decoration: none;
-  padding: 10px 30px;
-}
-
-.button--green:hover {
-  color: #fff;
-  background-color: #3b8070;
-}
-
-.button--grey {
-  display: inline-block;
-  border-radius: 4px;
-  border: 1px solid #35495e;
-  color: #35495e;
-  text-decoration: none;
-  padding: 10px 30px;
-  margin-left: 15px;
-}
-
-.button--grey:hover {
-  color: #fff;
-  background-color: #35495e;
-}
-</style>

+ 0 - 46
layouts/loginDefault.vue

@@ -15,49 +15,3 @@
     }
   }
 </script>
-<style>
-html {
-  font-family: "Source Sans Pro", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
-  font-size: 16px;
-  word-spacing: 1px;
-  -ms-text-size-adjust: 100%;
-  -webkit-text-size-adjust: 100%;
-  -moz-osx-font-smoothing: grayscale;
-  -webkit-font-smoothing: antialiased;
-  box-sizing: border-box;
-}
-
-*, *:before, *:after {
-  box-sizing: border-box;
-  margin: 0;
-}
-
-.button--green {
-  display: inline-block;
-  border-radius: 4px;
-  border: 1px solid #3b8070;
-  color: #3b8070;
-  text-decoration: none;
-  padding: 10px 30px;
-}
-
-.button--green:hover {
-  color: #fff;
-  background-color: #3b8070;
-}
-
-.button--grey {
-  display: inline-block;
-  border-radius: 4px;
-  border: 1px solid #35495e;
-  color: #35495e;
-  text-decoration: none;
-  padding: 10px 30px;
-  margin-left: 15px;
-}
-
-.button--grey:hover {
-  color: #fff;
-  background-color: #35495e;
-}
-</style>

+ 0 - 46
layouts/main.vue

@@ -15,49 +15,3 @@
     }
   }
 </script>
-<style>
-  html {
-    font-family: "Source Sans Pro", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
-    font-size: 16px;
-    word-spacing: 1px;
-    -ms-text-size-adjust: 100%;
-    -webkit-text-size-adjust: 100%;
-    -moz-osx-font-smoothing: grayscale;
-    -webkit-font-smoothing: antialiased;
-    box-sizing: border-box;
-  }
-
-  *, *:before, *:after {
-    box-sizing: border-box;
-    margin: 0;
-  }
-
-  .button--green {
-    display: inline-block;
-    border-radius: 4px;
-    border: 1px solid #3b8070;
-    color: #3b8070;
-    text-decoration: none;
-    padding: 10px 30px;
-  }
-
-  .button--green:hover {
-    color: #fff;
-    background-color: #3b8070;
-  }
-
-  .button--grey {
-    display: inline-block;
-    border-radius: 4px;
-    border: 1px solid #35495e;
-    color: #35495e;
-    text-decoration: none;
-    padding: 10px 30px;
-    margin-left: 15px;
-  }
-
-  .button--grey:hover {
-    color: #fff;
-    background-color: #35495e;
-  }
-</style>

+ 26 - 16
pages/cloudcenter/enterprise/index.vue

@@ -81,16 +81,19 @@
         </div>
       </div>
     </template>
-    <el-dialog
-      title="温馨提示"
-      :visible.sync="centerDialogVisible"
-      width="30%">
-      <span style="font-size: 14px;">您目前是个人账户登录,请 <strong>绑定企业</strong> </span>
-      <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="centerDialogVisible = false">立即绑定</el-button>
-        <el-button @click="centerDialogVisible = false">暂不绑定</el-button>
+    <template>
+      <el-dialog
+        title="温馨提示"
+        :visible.sync="centerDialogVisible"
+        width="30%"
+        @close="noBingClick">
+        <span style="font-size: 14px;">您目前是个人账户登录,请 <strong>绑定企业</strong>。 </span>
+        <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="bingEnterpriseClick">立即绑定</el-button>
+        <el-button @click="noBingClick">暂不绑定</el-button>
       </span>
-    </el-dialog>
+      </el-dialog>
+    </template>
   </div>
 </template>
 
@@ -117,7 +120,7 @@
       }
     },
     created: function () {
-      this.user.userspace ? this.centerDialogVisible = false : this.centerDialogVisible = true
+      // this.user.userspace ? this.centerDialogVisible = false : this.centerDialogVisible = true
     },
     computed: {
       user () {
@@ -131,6 +134,13 @@
       }
     },
     methods: {
+      bingEnterpriseClick: function () {
+        window.location.href = '/bingEnterPrise'
+      },
+      noBingClick: function () {
+        window.location.href = '/cloudcenter'
+        this.centerDialogVisible = false
+      },
       handleApplyChange: function (page) {
         this.$store.dispatch('loadApplyList', {page: page, size: 20})
       },
@@ -179,14 +189,14 @@
 </script>
 
 <style scoped type="text/scss" lang="scss">
-  .el-dialog__wrapper{
-    z-index:10000;
+  .w-over-box table tbody tr:hover {
+    background: #d0e5f5!important;
   }
-  .el-dialog__body{
-    text-align: center;
+  .table-striped>tbody>tr:nth-of-type(even){
+    background: #f4f4f4!important;
   }
-  .el-dialog__footer{
-    text-align: center;
+  .table-striped>tbody>tr:nth-of-type(odd){
+    background: #fff!important;
   }
   .manager{
     background: #eee;

+ 1 - 1
pages/cloudcenter/index.vue

@@ -26,7 +26,7 @@
           <hr/>
           <div class="row">
             <div class="col-xs-3"><p>管理员</p></div>
-            <div class="col-xs-9"><span v-text="user.userspace.admin.vipName ? user.userspace.admin.vipName : '管理员'"></span>  <a href="/changeAdmin/changeAdmin">更换</a></div>
+            <div class="col-xs-9"><span v-text="user.userspace.admin.vipName ? user.userspace.admin.vipName : '管理员'"></span>  <a href="/appeals/changeManagerAppeal">更换</a></div>
           </div>
           <div class="row">
             <div class="col-xs-3"><p>企业法人</p></div>