合并ls_tev

src/layout/main-page.vue

 <template>
-  <div class="main-page min-h-screen bg-common-bg">
+  <div class="main-page min-h-screen" :class="mainBg">
     <div class="header-wrapper fixed top-0 left-0 w-screen z-50" :class="headerBg">
       <div class="header relative flex justify-center items-center py-3 h-12">
         <div class="h-action-wrapper absolute left-3 top-1/2 transform -translate-y-1/2 flex justify-center items-center">
@@ -42,6 +42,10 @@ export default Vue.extend({
       type: Boolean,
       default: false
     },
+    mainBg: {
+      type: String,
+      default: 'bg-common-bg'
+    },
     headerBg: {
       type: String,
       default: 'bg-common-bg'

src/router/team.ts

@@ -197,6 +197,22 @@ export const teamRoutes: Array<RouteConfig> = [
         meta:{
           title:'团队头像'
         }
+      },
+      {
+        path: 'my-info',
+        name: 'Myinfo',
+        component: () => import('@/views/team/team-info/my-info.vue'),
+        meta:{
+          title:'我的信息'
+        }
+      },
+      {
+        path: 'join-create',
+        name: 'JoinCreate',
+        component: () => import('@/views/team/join-create.vue'),
+        meta:{
+          title:'加入或创建团队'
+        }
       }
     ]
   }

src/views/client/add-client.vue

 <template>
   <div class="add-client">
     <main-page left-arrow @click-left="handleClickLeft">
-      <div class="px-4 pt-14">
+      <div class="px-4 pt-14 pb-16">
         <input-cell
           v-model="name"
           required
@@ -26,7 +26,7 @@
             slot="prefix"
             type="png"
             :path="require('@/assets/icons/y-add.png')"
-            class-name="w-7 h-7 mr-3"
+            class-name="w-6.5 h-6.5 mr-3"
           />
         </input-cell>
         <input-cell
@@ -37,13 +37,16 @@
           class="mt-4"
         />
         <c-cell dot>
-          <app-icon
-            slot="prefix"
-            type="png"
-            :path="require('@/assets/icons/location.png')"
-            class-name="w-4 h-4 mb-2 mr-2"
-          />
-          <div slot="prefix" class="text-text-secondary">支持地图定位</div>
+          <div slot="prefix" class="flex ">
+            <div class="flex items-center">
+              <app-icon
+                type="png"
+                :path="require('@/assets/icons/location.png')"
+                class-name="w-4 h-5 self-center"
+              />
+            </div> 
+            <div  class="text-text-secondary mx-2">支持地图定位</div>
+          </div>
         </c-cell>
         <input-cell
           v-model="company"
@@ -63,9 +66,11 @@
           placeholder="请输入备注"
           class="mt-4"
         />
-        <c-cell dot title="跟进人" class="mt-4" />
-        <div class="py-10">
-          <c-button round class="" buttonBg="bg-color-primary"> 完成 </c-button>
+        <div class="mb-8">
+          <c-cell dot title="跟进人" class="mt-4" />
+        </div>
+        <div class="fixed px-4 py-1.5 bottom-0 left-0 w-full">
+          <c-button> 完成 </c-button>
         </div>
       </div>
     </main-page>

src/views/client/add-follow.vue

@@ -13,7 +13,13 @@
             multiple
             accept=".doc, .docx, .xml, .xlsx, .pdf, audio/*, image/*, video/*"
             class="mb-2 ml-4"
+          >
+            <app-icon
+            type="png"
+            :path="require('@/assets/icons/addfile.png')"
+            class-name="w-20 h-20 mr-3"
           />
+          </van-uploader>
         </div>
         <c-cell
           dot
@@ -22,45 +28,33 @@
           @click="showPopup"
           :content="content1"
         />
-        <van-popup
+        <van-action-sheet
           v-model="show"
-          round
-          position="bottom"
-          :style="{ height: '30%' }"
-          class="bg-common-bg"
-        >
-          <van-cell-group
-            v-for="(item, index) in items"
-            :key="index"
-            class="text-center"
-          >
-            <van-cell @click="clickHandle(index)">
-              <div class="text-center py-2">
-                {{ item.action }}
-              </div>
-            </van-cell>
-          </van-cell-group>
-        </van-popup>
+          :actions="actions"
+          cancel-text="取消"
+          close-on-click-action
+          @cancel="onCancel"
+          @select="onSelect"
+        />
 
         <div
-          class="flex bg-blue-50 w-full mt-4 rounded-md object-center"
+          class="flex  bg-blue-50 w-full mt-4 rounded-md "
           v-show="isShow"
         >
-          <div class="flex pl-4">
+          <div class="flex items-center pl-4 ">
             <app-icon
               type="png"
               :path="require('@/assets/icons/location.png')"
-              class-name="w-4 h-4 self-center"
+              class-name="w-4 h-4 items-center"
             ></app-icon>
           </div>
           <div>
             <p class="my-3 mx-3 text-base font-normal">
-              这里是定位地址么什么什么什么什么什么什么什么v什么什么什么什么什么什么v么v的
+              这里是定位地址么什么什么什么什么什么的
             </p>
           </div>
         </div>
-
-        <c-button round class="mt-20" buttonBg="bg-color-primary">
+        <c-button class="mt-20">
           完成
         </c-button>
       </div>
@@ -70,14 +64,16 @@
 
 <script lang="ts">
 import Vue from "vue";
-import { Popup } from "vant";
 import { Uploader } from "vant";
 import { Cell, CellGroup } from "vant";
+import { ActionSheet } from 'vant';
+import { Icon } from 'vant';
 
+Vue.use(Icon);
+Vue.use(ActionSheet);
 Vue.use(Cell);
 Vue.use(CellGroup);
 Vue.use(Uploader);
-Vue.use(Popup);
 export default Vue.extend({
   name: "Add-follow",
   components: {
@@ -93,21 +89,16 @@ export default Vue.extend({
     return {
       show: false,
       isShow: false,
-      content1: "",
+      content1: "远程沟通",
       content2:
         "这里是定位地址么什么什么什么什么什么什么什么v什么什么什么什么什么什么v么v的",
-
+      actions: [{ name: '远程沟通' }, { name: '外勤拜访' }],
       fileList: [
         // { url: 'https://img01.yzcdn.cn/vant/leaf.jpg' },
         // // Uploader 根据文件后缀来判断是否为图片文件
         // // 如果图片 URL 中不包含类型信息，可以添加 isImage 标记来声明
         // { url: 'https://cloud-image', isImage: true },
       ],
-      items: [
-        { action: "远程沟通" },
-        { action: "外勤拜访" },
-        { action: "取消" },
-      ],
     };
   },
   methods: {
@@ -118,21 +109,21 @@ export default Vue.extend({
       // 此时可以自行将文件上传至服务器
       console.log(file);
     },
-    showPopup() {
-      this.show = true;
+    showPopup(){
+      this.show=true
     },
-    clickHandle(index: number) {
-      this.content1 = this.items[index].action;
-      this.show = !this.show;
-      if (index == 0) {
-        this.isShow = false;
-      } else if (index == 1) {
-        this.isShow = true;
-      } else {
-        this.content1 = "";
-        this.isShow = false;
+    onSelect(item: { name: string; }) {
+      this.show = false;
+      this.content1=item.name;
+      if(item.name=='外勤拜访'){
+        this.isShow=true;
+      }else{
+        this.isShow=false;
       }
     },
+    onCancel() {
+      this.show=false
+    },
   },
   computed: {},
 });

src/views/team/join-create.vue

+<template>
+  <!-- 加入团队 -->
+  <div class="team-frame">
+    <main-page
+      main-bg="bg-white"
+      header-bg="bg-white"
+      left-arrow
+      @click-left="$router.go(-1)"
+    >
+      <div class="px-4 pt-14 ">
+        <img src="@/assets/images/join-create.png" alt="">
+        <div class="shadow-lg px-4 py-6 mt-8">
+          <div class="flex font-semibold">
+            <div class=" text-tag-yellow">加入</div>
+            团队
+          </div>
+          <div class="flex pt-2">
+            <div class="w-60 text-sm font-medium">如果你的团队或企业已经在使用chat，可通过搜索团队号或二维码加入团队，与成员一起沟通协作，高效作业。</div>
+            <div class="flex items-center justify-end pl-10">
+              <app-icon
+                type="png"
+                :path="require('@/assets/icons/right-arrow.png')"
+                class-name="w-3 h-5"
+              />
+            </div>
+          </div>
+        </div>
+        <div class="shadow-lg px-4 py-6 mt-4">
+          <div class="flex font-semibold">
+            <div class="text-tag-red">创建</div>
+            团队
+          </div>
+          <div class="flex pt-2">
+            <div class="w-60 text-sm font-medium">通过创建团队，你将直接称为团队或企业负责人，可添加成员，让整个团队一起享受高效的去中心化沟通协</div>
+            <div class="flex items-center justify-end pl-10">
+              <app-icon
+                type="png"
+                :path="require('@/assets/icons/right-arrow.png')"
+                class-name="w-3 h-5"
+              />
+            </div>
+          </div>
+        </div>
+      </div>
+    
+    </main-page>
+  </div>
+</template>
+<script lang="ts">
+import Vue from 'vue'
+
+export default Vue.extend({
+  name: 'JoinCreate',
+  components: {
+    'main-page': () => import('@/layout/main-page.vue'),
+    "app-icon": () => import("@/components/common/Icon.vue"),
+  },
+  created() {
+    // console.log(Mock, 'mock')
+  },
+  data() {
+    return {
+      
+    }
+  },
+  methods: {
+  }
+})
+</script>
+
+<style lang="less">
+
+</style>
\ No newline at end of file

src/views/team/team-info/my-info.vue

@@ -8,7 +8,7 @@
     >
     <app-icon
       slot="right"
-      icon-name="code"
+      icon-name="QRcode"
       class-name="w-4 h-4"
       @click="$router.push('/tag')"
     />