Merge branch 'taskManage' into 'dev'

Task manage

See merge request !4

src/common/components/element-ui.js

@@ -24,6 +24,7 @@ import {
   MenuItemGroup,
   MenuItemGroup,
   Tag,
   Tag,
   Checkbox,
   Checkbox,
+  Tree,
 } from 'element-ui'
 } from 'element-ui'
 
 
 const components = [
 const components = [
@@ -47,6 +48,7 @@ const components = [
   MenuItemGroup,
   MenuItemGroup,
   Tag,
   Tag,
   Checkbox,
   Checkbox,
+  Tree,
 ]
 ]
 
 
 export default {
 export default {

src/common/style/index.scss

@@ -63,7 +63,8 @@
 }
 }
 .pagination {
 .pagination {
   text-align: center;
   text-align: center;
-  padding-top: 10px;
+  padding-top: 5px;
+  padding-bottom: 5px;
 }
 }
 .icon-view{
 .icon-view{
   font-size: 18px;
   font-size: 18px;

src/views/saasManage/indexPage.vue

@@ -275,7 +275,9 @@
             @change="onChange"
             @change="onChange"
             placeholder="请输入域名"
             placeholder="请输入域名"
           >
           >
-            <template slot="append">.jomalls.com</template>
+            <template slot="append">{{
+              baseDomain
+            }}</template>
           </el-input>
           </el-input>
         </el-form-item>
         </el-form-item>
         <el-form-item
         <el-form-item
@@ -549,6 +551,7 @@ export default {
       selection: [],
       selection: [],
       cloneEditForm: {},
       cloneEditForm: {},
       loading: false,
       loading: false,
+      baseDomain: '.jomalls.com',
     }
     }
   },
   },
   async created() {
   async created() {
@@ -627,7 +630,7 @@ export default {
       this.editForm.databaseName =
       this.editForm.databaseName =
         'saas_' + this.editForm.databaseName
         'saas_' + this.editForm.databaseName
       this.editForm.domain =
       this.editForm.domain =
-        this.editForm.domain + '.joshine.cn'
+        this.editForm.domain + this.baseDomain
       try {
       try {
         if (this.editId) {
         if (this.editId) {
           const res = await updateManageData(this.editForm)
           const res = await updateManageData(this.editForm)