合并zxj

src/views/components/request.vue

@@ -3,7 +3,6 @@
     <!-- 头像 -->
     <div class=" mr-2 mt-5">
       <img src="../../assets/icons/avator.png" alt="" srcset="" class="w-9 ">
-      <img :src="detail.path" alt="" srcset="" class="w-9 ">
     </div>
     <!-- 申请详情 -->
     <div class=" bg-white rounded-xl w-full">

src/views/request-managemant.vue

 <template>
   <div class=" ">
-    <main-page left-arrow @click-left="$router.go(-1)" class="">
+    <main-page left-arrow @click-left="$router.go(-1)" class=" relative">
       <template slot="right">
         <app-icon
           type="png"
@@ -18,7 +18,6 @@
           <div v-for="(detail,index) in item.children.info" :key="index">
             <request :detail="detail" class=" pb-4" />
           </div>
-          
         </div>
       </div>
     </main-page>
@@ -28,15 +27,6 @@
 <script lang="ts">
 import Vue from 'vue';
 
-// export interface info{
-//     path:string
-//     name:string,
-//     request:string,
-//     reason?:string,
-//     current:string,
-//     time:string
-// }
-
 export interface list{
     id:number,
     time:string,

src/views/team-QRcode.vue

@@ -13,9 +13,9 @@
         <img src="../assets/qrcode.png" alt="" srcset="" class=" absolute w-32 top-44 left-0 right-0 mx-auto ">
         <p class=" text-white absolute top-82 left-0 right-0 mx-auto text-center text-sm"> 扫描二维码加入我们Chat33的团队</p>
       </div>
-      <div class="mx-4">
-        <c-button round buttonBg="bg-color-primary" class="">点击生成图片去分享</c-button>
-        <c-button round buttonBg="bg-white" class=" text-text-primary">进入团队工作台</c-button>  
+      <div class="mx-4 pb-6">
+        <c-button round class="">点击生成图片去分享</c-button>
+        <c-button round type="secondary" class=" mt-3">进入团队工作台</c-button>  
       </div>
     </div>
          

src/views/team-create.vue

@@ -5,19 +5,26 @@
       @click-left="handleClickLeft"
     >
       <div class="mx-4 pt-14">
-        <teamcreate class=" mb-4 mt-2.5" >
-          <template v-slot:title>企业/组织/团队名称</template>
-          <template v-slot:limit>20</template>
-        </teamcreate>
-        <teamcreate class="" hint="请填写真实姓名">
-          <template v-slot:title>负责人真实姓名</template>
-          <template v-slot:limit>20</template>
-        </teamcreate>
-
+        <input-cell
+        v-model="team_name"
+        required
+        :limit="20"
+        label="企业/组织/团队名称"
+        placeholder="请输入团队名称"
+        error-msg="团队名称不能为空"
+      />
+        <input-cell
+        v-model="name"
+        required
+        :limit="20"
+        label="负责人真实姓名"
+        placeholder="请输入真实姓名"
+        error-msg="姓名不能为空"
+      />
         <p class="note text-text-primary text-base mt-36 ml-3">
         默认创建团队的人为团队负责人
         </p>
-        <c-button round buttonBg="bg-color-primary" class="text-white mt-16" @click="$router.push('/team-QRcode')">确定</c-button>
+        <c-button round buttonBg="bg-color-primary" class="text-white mt-16" @click="toConfirm">确定</c-button>
 
       </div>     
     </main-page>
@@ -27,19 +34,50 @@
 
 <script lang="ts">
 import Vue from 'vue';
+import { Dialog } from 'vant';
 
 export default Vue.extend({
   name:'createteam',
   components:{
     'main-page': () => import('@/layout/main-page.vue'), 
-    'teamcreate': () => import('@/components/Team/c-input.vue'), 
+    'input-cell': () => import('./components/input-cell.vue'),
     'c-button': () => import('./components/c-button.vue')
   },
+  data(){
+    return{
+      team_name:'杭州复杂美科技有限公司',
+      name:''
+    }
+  },
+  props:{
+    isValid:{
+      type:Boolean,
+      default:true
+    }
+  },
   methods: {
     handleClickLeft() {
       console.log('click left')
+    },
+    toConfirm(){
+      // 团队名是否同名判断
+      if(!this.isValid) {
+        this.$router.push('/team-QRcode')
+      }else{
+        Dialog.confirm({
+          title: '提示',
+          message: '已存在同名团队，如果你是该团队成员，请申请加入团队，或者更换团队名称后再试',
+          confirmButtonText:'申请加入'
+        })
+        .then(() => {
+          this.$router.push('/team-QRcode')
+        })
+        .catch(() => {
+          Dialog.close()
+        });
+      }
+    }
   }
-}
 });
 </script>