0722

src/App.vue

 <template>
-<<<<<<< HEAD
-  <div id="app" class=" ">
-      <router-view/>
-=======
   <div id="app">
     <router-view />
->>>>>>> origin/20210719_sxf
   </div>
 </template>
 
@@ -14,11 +9,8 @@ import Vue from 'vue'
 
 export default Vue.extend({
   components:{ 
-<<<<<<< HEAD
-=======
     // 'app-icon':()=>import('./components/common/Icon.vue'),
     // 'main-page': () => import('@/layout/main-page.vue')
->>>>>>> origin/20210719_sxf
   },
   name: 'App'
 })

src/components/Team/Input.vue → src/components/Team/team-create.vue

 <template>
-    <div class="wrapper w-80 bg-white rounded-md px-4 ">
+    <div class="wrapper bg-white rounded-md px-4">
         <div class="title text-mygray h-7 border-b border-line text-sm relative p-0">
-            <span class="leading-7">企业/组织/团队名称</span>
+            <span class="leading-7">{{title}}</span>
             <span class=" absolute right-0 leading-7">{{getSize}}/{{limitation}}</span>
         </div>
         <div class="content h-12 text-base flex content-center">
@@ -15,20 +15,24 @@ import Vue from 'vue';
 
 
 export default Vue.extend({
-  name: 'Input',
+  name: 'team-create',
   props:{
+      title:{
+          type:String,
+          default:'导航'
+      },
       hint:{
           type:String,
           default:''
       },
       limitation:{
           type:Number,
-          default:20
-      } 
+          default:5
+      },
   },
   data(){
       return{
-          text:''
+          text:'',
       }
   },
   methods:{

src/router/index.ts

 import Vue from 'vue'
 import VueRouter, { RouteConfig } from 'vue-router'
 import App from '../App.vue'
-import createTeam from '../views/createTeam.vue'
 
 Vue.use(VueRouter)
 
@@ -12,9 +11,12 @@ const routes: Array<RouteConfig> = [
     component: App,
     children:[
       {
-        path: '/createTeam',
-        name: 'createTeam',
-        component: createTeam
+        path: '/createteam',
+        name: 'createteam',
+        component: () => import('@/views/createteam.vue'),
+        meta:{
+          title:'创建团队'
+        }
       }
     ]
   },

src/views/createTeam.vue

 <template>
-  <div>
-      <Input/>
+  <div class="createteam">
+    <main-page
+      left-arrow
+      @click-left="handleClickLeft"
+    >
+         <teamcreate class=" mb-4 mt-2.5 mx-4" :limitation="20" :title="'企业/组织/团队名称'" />
+         <teamcreate class=" mx-4" :limitation="10"  :title="'企负责人真实姓名'" :hint="'请填写真实姓名'" />
+
+      <p class="note text-darkgray text-base mt-36 ml-7">
+        默认创建团队的人为团队负责人
+      </p>
+      <teambtn class=" mt-20 mx-4 "/>
+    </main-page>
+     
   </div>
 </template>
 
 <script lang="ts">
 import Vue from 'vue';
-import Input from '../components/Team/Input.vue';
 
 export default Vue.extend({
-  name:'createTeam',
+  name:'createteam',
   components:{
-    Input
+    'main-page': () => import('@/layout/main-page.vue'), 
+    'teamcreate': () => import('@/components/Team/team-create.vue'), 
+    'teambtn': () => import('@/components/Team/teambtn.vue'), 
   },
+  methods: {
+  handleClickLeft() {
+    console.log('click left')
+  }
+}
 });
 </script>
 

vue.config.js

-
-const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
-const os=require('os');
-
 module.exports = {
     // ...other vue-cli plugin options...