diff --git a/App.vue b/App.vue
index 4ac58de..398f6af 100644
--- a/App.vue
+++ b/App.vue
@@ -1,46 +1,46 @@
 <script>
-// var jpushModule = uni.requireNativePlugin("JG-JPush");
-var jpushModule = uni.requireNativePlugin("JG-JPush");
+	// var jpushModule = uni.requireNativePlugin("JG-JPush");
+	var jpushModule = uni.requireNativePlugin("JG-JPush");
 
-export default {
-  onLaunch: function () {
-    console.log('App Launch')
-    try {
-      if (!this.$store.state.app.token) uni.redirectTo({
-        url: '/pages/oaLogin/oaLogin'
-      })
-    } catch (e) {
-      uni.redirectTo({
-        url: '/pages/oaLogin/oaLogin'
-      })
-    }
-    
-    // jpushModule.initJPushService()
-    // const audioContext = uni.createInnerAudioContext()
-    // audioContext.src = './static/mp3/order.mp3'
-    // let ida = [0]
-    // jpushModule.addNotificationListener(function (result) {
-    //   if (!ida.includes(result.messageID)) {
-    //     audioContext.play()
-    //   }
-    //   ida.push(result.messageID)
-    // })
-  },
-  onShow: function () {
-    console.log('App Show')
-  },
-  onHide: function () {
-    console.log('App Hide')
-  }
-}
+	export default {
+		onLaunch: function() {
+			console.log('App Launch')
+			try {
+				if (!this.$store.state.app.token) uni.redirectTo({
+					url: '/pages/oaLogin/oaLogin'
+				})
+			} catch (e) {
+				uni.redirectTo({
+					url: '/pages/oaLogin/oaLogin'
+				})
+			}
+
+			// jpushModule.initJPushService()
+			// const audioContext = uni.createInnerAudioContext()
+			// audioContext.src = './static/mp3/order.mp3'
+			// let ida = [0]
+			// jpushModule.addNotificationListener(function (result) {
+			//   if (!ida.includes(result.messageID)) {
+			//     audioContext.play()
+			//   }
+			//   ida.push(result.messageID)
+			// })
+		},
+		onShow: function() {
+			console.log('App Show')
+		},
+		onHide: function() {
+			console.log('App Hide')
+		}
+	}
 </script>
 
 <style>
-/*每个页面公共css */
-@import "static/css/base.css";
-@import "static/css/style.scss";
+	/*每个页面公共css */
+	@import "static/css/base.css";
+	@import "static/css/style.scss";
 
-view {
-  box-sizing: border-box;
-}
+	view {
+		box-sizing: border-box;
+	}
 </style>
\ No newline at end of file
diff --git a/components/company/company.vue b/components/company/company.vue
index 0cce9ae..ad9a987 100644
--- a/components/company/company.vue
+++ b/components/company/company.vue
@@ -1,52 +1,113 @@
 <template>
   <view>
     <view class="item">
-      <u-skeleton :loading="skeleton" :animate="true" title rows="1" rows-width="100%" rowsHeight="56"></u-skeleton>
-      <block v-if="!skeleton">
-        <view class="title">公司基本信息</view>
-        <view class="card">
-          <view class="top">
-            <view class="left">
-              <image src="../../static/img/contract/company.png"></image>
-              <view class="text">
-                <view class="name">{{company.company_name}}</view>
-                <view class="right">{{company.company_type_name||company.company_type}}</view>
-                <view class="code">社会代码：<text @click="copyPhone(company.master_email, '社会代码')">{{company.organization_code}}</text></view>
+      <u-skeleton
+        :loading="skeleton"
+        :animate="true"
+        title
+        rows="1"
+        rows-width="100%"
+        rowsHeight="56"
+      ></u-skeleton>
+      <!-- <block v-if="!skeleton">
+				<view class="title">公司基本信息</view>
+				<view class="card">
+					<view class="top">
+						<view class="left">
+							<image src="../../static/img/contract/company.png"></image>
+							<view class="text">
+								<view class="name">{{company.company_name}}</view>
+								<view class="right">{{company.company_type_name||company.company_type}}</view>
+								<view class="code">社会代码：<text
+										@click="copyPhone(company.master_email, '社会代码')">{{company.organization_code}}</text>
+								</view>
+							</view>
+						</view>
+					</view>
+					<view class="bottom">
+						<view class="left">
+							<uni-icons type="location" color="#666666" size="14"></uni-icons>
+							<view class="location">区域：</view>
+						</view>
+						<view style="flex: 1;">{{c_address}}</view>
+					</view>
+				</view>
+			</block>
+	 -->
+      <view class="personnel_list" v-if="!skeleton">
+        <view class="cards">
+          <view class="cards_head">
+            <text style="font-size: 32rpx">公司基本信息</text>
+          </view>
+          <view class="cards_content">
+            <view class="right">
+              <view class="">
+                <text>公司名称 :</text>
+                <text> {{ company.company_name }}</text>
+              </view>
+              <view
+                class=""
+                @click="copyPhone(company.master_email, '社会代码')"
+              >
+                <text>社会代码 :</text>
+                <text>{{ company.organization_code }}</text>
+              </view>
+              <view class="">
+                <text>公司类型 :</text>
+                <text>{{
+                  company.company_type_name || company.company_type
+                }}</text>
+              </view>
+              <view class="">
+                <text>负责区域 :</text>
+                <text> {{ c_address }} </text>
               </view>
             </view>
           </view>
-          <view class="bottom">
-            <view class="left">
-              <uni-icons type="location" color="#666666" size="14"></uni-icons>
-              <view class="location">负责区域：</view>
-            </view>
-            <view style="flex: 1;">{{c_address}}</view>
-          </view>
         </view>
-      </block>
+      </view>
     </view>
-    <view class="item" v-show="skeleton||contract.status">
-      <u-skeleton :loading="skeleton" :animate="true" title rows="2" rows-width="100%" rowsHeight="56"></u-skeleton>
+
+    <view class="item" v-show="skeleton || contract.status">
+      <u-skeleton
+        :loading="skeleton"
+        :animate="true"
+        title
+        rows="2"
+        rows-width="100%"
+        rowsHeight="56"
+      ></u-skeleton>
       <block v-if="!skeleton">
         <view class="title">电子合同</view>
         <view class="card">
           <view class="one">
             <view class="info">
-              <view class="info_item">甲方：{{contract.party_a_name}}</view>
-              <view class="info_item">乙方：{{contract.party_b_name}}</view>
-              <view class="info_item">合同类型：{{contract.contract_type_name}}</view>
-              <view class="info_item">合同编号：{{contract.contract_no}}</view>
+              <view class="info_item">甲方：{{ contract.party_a_name }}</view>
+              <view class="info_item">乙方：{{ contract.party_b_name }}</view>
+              <view class="info_item"
+                >合同类型：{{ contract.contract_type_name }}</view
+              >
+              <view class="info_item"
+                >合同编号：{{ contract.contract_no }}</view
+              >
             </view>
           </view>
-          <u-line v-if="contract.contract_no" color="#999999FF" style="margin: 31rpx 0;"></u-line>
+          <u-line
+            v-if="contract.contract_no"
+            color="#999999FF"
+            style="margin: 31rpx 0"
+          ></u-line>
           <view class="contract" v-if="contract.contract_no">
             <view class="left">
-              <image class="contract_img" src="../../static/img/contract/pdf.png"></image>
+              <image
+                class="contract_img"
+                src="../../static/img/contract/pdf.png"
+              ></image>
               <view class="text">
                 <view class="name">合同</view>
                 <view>
                   <!-- <text class="nickname">张郭郭</text> -->
-                  <text>{{contract.create_time}}</text>
+                  <text>{{ contract.create_time }}</text>
                 </view>
               </view>
             </view>
@@ -60,7 +121,14 @@
       </block>
     </view>
     <view class="item">
-      <u-skeleton :loading="skeleton" :animate="true" title rows="2" rows-width="100%" rowsHeight="56"></u-skeleton>
+      <u-skeleton
+        :loading="skeleton"
+        :animate="true"
+        title
+        rows="2"
+        rows-width="100%"
+        rowsHeight="56"
+      ></u-skeleton>
       <block v-if="!skeleton">
         <view class="title">
           <text>联系人管理</text>
@@ -69,56 +137,111 @@
         <view class="card">
           <view class="one">
             <view class="linkman">
-              <view style="height: 30rpx;width: 6rpx;background-color: #3175f9;border-radius: 8rpx;margin-right: 8rpx;">
+              <view
+                style="
+                  height: 30rpx;
+                  width: 6rpx;
+                  background-color: #3175f9;
+                  border-radius: 8rpx;
+                  margin-right: 8rpx;
+                "
+              >
               </view>
               主要联系人
             </view>
             <view class="info">
-              <view class="info_item">姓名：{{company.master_name}}</view>
-              <view class="info_item">职位：{{company.master_position}}</view>
-              <view class="info_item" @click="copyPhone(company.master_phone)">联系电话：{{company.master_phone}}</view>
-              <view class="info_item" @click="copyPhone(company.master_email, '邮箱')">邮箱：{{company.master_email}}</view>
+              <view class="info_item">姓名：{{ company.master_name }}</view>
+              <view class="info_item">职位：{{ company.master_position }}</view>
+              <view class="info_item" @click="copyPhone(company.master_phone)">
+                联系电话：{{ company.master_phone }}</view
+              >
+              <view
+                class="info_item"
+                @click="copyPhone(company.master_email, '邮箱')"
+              >
+                邮箱：{{ company.master_email }}</view
+              >
             </view>
           </view>
-          <view class="one" v-for="(other, index) in company.other_contacts" v-if="other.name!=''" :key="index">
+          <view
+            class="one"
+            v-for="(other, index) in company.other_contacts"
+            v-if="other.name != ''"
+            :key="index"
+          >
             <view class="linkman">
               <view
-                style="height: 30rpx;width: 6rpx;background-color: #3175f9;border-radius: 8rpx;margin-right: 8rpx;">
+                style="
+                  height: 30rpx;
+                  width: 6rpx;
+                  background-color: #3175f9;
+                  border-radius: 8rpx;
+                  margin-right: 8rpx;
+                "
+              >
               </view>
               其他联系人
             </view>
             <view class="info">
-              <view class="info_item">姓名：{{other.name}}</view>
-              <view class="info_item">职位：{{other.position}}</view>
-              <view class="info_item" @click="copyPhone(other.phone)">联系电话：{{other.phone}}</view>
-              <view class="info_item" @click="copyPhone(other.email, '邮箱')">邮箱：{{other.email}}</view>
+              <view class="info_item">姓名：{{ other.name }}</view>
+              <view class="info_item">职位：{{ other.position }}</view>
+              <view class="info_item" @click="copyPhone(other.phone)"
+                >联系电话：{{ other.phone }}</view
+              >
+              <view class="info_item" @click="copyPhone(other.email, '邮箱')"
+                >邮箱：{{ other.email }}</view
+              >
             </view>
           </view>
         </view>
       </block>
-
     </view>
     <view class="item">
-      <u-skeleton :loading="skeleton" :animate="true" title rows="2" rows-width="100%" rowsHeight="56"></u-skeleton>
+      <u-skeleton
+        :loading="skeleton"
+        :animate="true"
+        title
+        rows="2"
+        rows-width="100%"
+        rowsHeight="56"
+      ></u-skeleton>
       <block v-if="!skeleton">
         <view class="title">资质信息</view>
-        <view class="image_box" style="background-color: #fff;border-radius: 7px 7px 7px 7px;">
-          <u--image class="image" @click="priview(company.qualification.business_license)"
-            :src="company.qualification.business_license" v-if="company.qualification.business_license"
-            :lazy-load="true">
+        <view
+          class="image_box"
+          style="background-color: #fff; border-radius: 7px 7px 7px 7px"
+        >
+          <u--image
+            class="image"
+            @click="priview(company.qualification.business_license)"
+            :src="company.qualification.business_license"
+            v-if="company.qualification.business_license"
+            :lazy-load="true"
+          >
             <template v-slot:loading>
               <u-loading-icon color="#333"></u-loading-icon>
             </template>
           </u--image>
-          <u--image class="image" @click="priview(company.qualification.business_licenseB)"
-            :src="company.qualification.business_licenseB" v-if="company.qualification.business_licenseB"
-            :lazy-load="true">
+          <u--image
+            class="image"
+            @click="priview(company.qualification.business_licenseB)"
+            :src="company.qualification.business_licenseB"
+            v-if="company.qualification.business_licenseB"
+            :lazy-load="true"
+          >
             <template v-slot:loading>
               <u-loading-icon color="#333"></u-loading-icon>
             </template>
           </u--image>
-          <u--image class="image" v-for="item in company.qualification.other_qualifications" :key="item" @click="priview(item)"
-            :src="item" v-if="company.qualification.other_qualifications" :lazy-load="true">
+          <u--image
+            class="image"
+            v-for="item in company.qualification.other_qualifications"
+            :key="item"
+            @click="priview(item)"
+            :src="item"
+            v-if="company.qualification.other_qualifications"
+            :lazy-load="true"
+          >
             <template v-slot:loading>
               <u-loading-icon color="#333"></u-loading-icon>
             </template>
@@ -142,344 +265,430 @@
 </template>
 
 <script>
-  import { contractView } from "@/api/contract.js"
-  import { companyView } from "@/api/company.js"
-  import { download_file } from "@/api/junziqian.js"
-  import { Toast } from '@/libs/uniApi.js'
+import {
+  contractView
+} from "@/api/contract.js"
+import {
+  companyView
+} from "@/api/company.js"
+import {
+  download_file
+} from "@/api/junziqian.js"
+import {
+  Toast
+} from '@/libs/uniApi.js'
 
-  export default {
-    name: "company",
-    data() {
-      return {
-        skeleton: true,
-        company: {
-          qualification: {
-            bank_account: "",
-            bank_accountB: "",
-            business_license: "",
-            business_licenseB: "",
-          },
+export default {
+  name: "company",
+  data () {
+    return {
+      skeleton: true,
+      company: {
+        qualification: {
+          bank_account: "",
+          bank_accountB: "",
+          business_license: "",
+          business_licenseB: "",
         },
-        contract: {},
-        users: [],
-        current: 1
-      }
-    },
-    props: ['id', 'type'],
-    mounted() {
-      this.initContract(this.$props.id, this.$props.type || null);
-    },
-    computed:{
-      c_address(){
-        let str = '';
-        if(this.company.company_type==16){
-          this.company?.province_name?str+=this.company?.province_name:null;
-          this.company?.city_name?str+=this.company?.city_name:null;
-          this.company?.area_name?str+=this.company?.area_name:null;
-          this.company?.street_name?str+=this.company?.street_name:null;
-        }else {
-          this.company?.street_name?str+=this.company?.street_name:null;
-          this.company?.village_name?str+=this.company?.village_name:null;
-          this.company?.brigade_name?str+=this.company?.brigade_name:null;
-          
-        }
-        return str;
-      }
-    },
-    methods: {
-      navTo(contract_no) {
-        download_file({ applyNo: contract_no }).then(res => {
-          if (res.code != 1) {
-            Toast(res.msg)
-          }
-          uni.navigateTo({
-            url: `/subpkg/pdfView/pdfView?url=${res.data.url}`
-          })
-        })
       },
-      naviBack() {
-        uni.navigateBack()
-      },
-      async initContract(id, type = "contract") {
-        let res;
-        //判断是合同还是公司
-        if (id && (type == "contract" || type == null)) {
-          res = await contractView({ id });
-        } else {
-          if (id > 0) {
-            res = await companyView({ id });
-          } else {
-            res = await companyView();
-          }
+      contract: {},
+      users: [],
+      current: 1
+    }
+  },
+  props: ['id', 'type'],
+  mounted () {
+    this.initContract(this.$props.id, this.$props.type || null);
+  },
+  computed: {
+    c_address () {
+      let str = '';
+      if (this.company.company_type == 16) {
+        this.company?.province_name ? str += this.company?.province_name : null;
+        this.company?.city_name ? str += this.company?.city_name : null;
+        this.company?.area_name ? str += this.company?.area_name : null;
+        this.company?.street_name ? str += this.company?.street_name : null;
+      } else {
+        this.company?.street_name ? str += this.company?.street_name : null;
+        this.company?.village_name ? str += this.company?.village_name : null;
+        this.company?.brigade_name ? str += this.company?.brigade_name : null;
 
+      }
+      return str;
+    }
+  },
+  methods: {
+    navTo (contract_no) {
+      download_file({
+        applyNo: contract_no
+      }).then(res => {
+        if (res.code != 1) {
+          Toast(res.msg)
         }
-        this.company = res.data.company;
-        uni.$emit('companyInfo', this.company); //发送全局事件
-        this.user = res.data.user;
-        this.contract = res.data.contract;
-        this.skeleton = false;
-        // console.log(res.data);
-      },
-      //查看图片
-      priview(url) {
-        uni.previewImage({
-          urls: [url],
-          longPressActions: {
-            itemList: ['保存图片'],
-            success: function(data) {
-              if (data.tapIndex === 0) {
-                uni.saveImageToPhotosAlbum({
-                  filePath: url,
-                  success: function() {
-                    uni.showToast({
-                      title: '保存成功',
-                      icon: 'success'
-                    })
-                  },
-                  fail: function() {
-                    uni.showToast({
-                      title: '保存失败',
-                      icon: 'none'
-                    })
-                  }
-                })
-              }
+        uni.navigateTo({
+          url: `/subpkg/pdfView/pdfView?url=${res.data.url}`
+        })
+      })
+    },
+    naviBack () {
+      uni.navigateBack()
+    },
+    async initContract (id, type = "contract") {
+      let res;
+      //判断是合同还是公司
+      if (id && (type == "contract" || type == null)) {
+        res = await contractView({
+          id
+        });
+      } else {
+        if (id > 0) {
+          res = await companyView({
+            id
+          });
+        } else {
+          res = await companyView();
+        }
+
+      }
+      this.company = res.data.company;
+      uni.$emit('companyInfo', this.company); //发送全局事件
+      this.user = res.data.user;
+      this.contract = res.data.contract;
+      this.skeleton = false;
+      // console.log(res.data);
+    },
+    //查看图片
+    priview (url) {
+      uni.previewImage({
+        urls: [url],
+        longPressActions: {
+          itemList: ['保存图片'],
+          success: function (data) {
+            if (data.tapIndex === 0) {
+              uni.saveImageToPhotosAlbum({
+                filePath: url,
+                success: function () {
+                  uni.showToast({
+                    title: '保存成功',
+                    icon: 'success'
+                  })
+                },
+                fail: function () {
+                  uni.showToast({
+                    title: '保存失败',
+                    icon: 'none'
+                  })
+                }
+              })
             }
           }
-        })
-      },
-      copyPhone(str = "", type = "号码") {
-        if (str) uni.setClipboardData({
-          data: str + "",
-          success: (e) => {
-            Toast(type + '已复制')
-          },
-          fail: (e) => {
-            Toast('复制失败')
-          }
-        })
-      }
+        }
+      })
     },
-  }
+    copyPhone (str = "", type = "号码") {
+      if (str) uni.setClipboardData({
+        data: str + "",
+        success: (e) => {
+          Toast(type + '已复制')
+        },
+        fail: (e) => {
+          Toast('复制失败')
+        }
+      })
+    }
+  },
+}
 </script>
 
 <style lang="scss" scoped>
-  .item {
-    padding: 32rpx 28rpx;
-    padding-top: 0;
-    &:nth-child(1){
-      padding-top: 32rpx;
-    }
+.personnel_list {
+  padding: 28rpx 0;
+  margin-bottom: 130rpx;
 
-    .title {
-      margin-bottom: 21rpx;
-      font-size: 35rpx;
-      font-weight: 500;
-      color: #333333;
-      display: flex;
-      justify-content: space-between;
-    }
+  .cards {
+    margin: 0 auto;
+    margin-bottom: 28rpx;
+    width: 694rpx;
+    background: #ffffff;
+    border-radius: 30rpx;
+    opacity: 1;
+    overflow: hidden;
+    box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.6);
 
-    .card {
-      width: 694rpx;
-      // height: 231rpx;
+    .cards_head {
+      padding: 28rpx;
+      background-color: $theme-oa-color;
+      color: white;
+      height: 100rpx;
+      display: flex;
+      justify-content: space-between;
+    }
+
+    .cards_content {
       padding: 28rpx;
-      background: #FFFFFF;
-      border-radius: 14rpx 14rpx 14rpx 14rpx;
       display: flex;
-      flex-direction: column;
       justify-content: space-between;
 
-      .top {
-        display: flex;
-        justify-content: space-between;
+      .left {
+        text-align: center;
+        // padding: 15rpx 25rpx;
+        padding-top: 20rpx;
 
-        .left {
-          display: flex;
-          align-items: center;
+        width: 160rpx;
+        background-color: $theme-oa-color;
+        color: white;
+        border-radius: 40rpx;
 
-          image {
-            flex-shrink: 0;
-            width: 142rpx;
-            height: 142rpx;
-            margin-right: 28rpx;
-            background: #CCCCCC;
-            border-radius: 14rpx 14rpx 14rpx 14rpx;
-            opacity: 1;
-          }
-
-          .text {
-            display: flex;
-            flex-direction: column;
-            justify-content: space-between;
-
-            .name {
-              font-size: 32rpx;
-              font-weight: 500;
-              color: rgba(0, 0, 0, 0.8);
-            }
-
-            .code {
-              font-size: 28rpx;
-              font-weight: 400;
-              color: #666666;
-            }
-          }
-        }
-
-        .right {
-          font-size: 28rpx;
-          font-weight: 500;
-          color: $theme-oa-color;
+        .cir {
+          width: 120rpx;
+          height: 120rpx;
+          background-color: #ffffff;
+          margin-left: 25rpx;
+          border-radius: 120rpx;
+          position: relative;
         }
       }
 
-      .bottom {
+      .right {
+        display: flex;
+        flex-direction: column;
+        justify-content: space-between;
+
+        view {
+          text:nth-child(2) {
+            margin-left: 20rpx;
+          }
+        }
+      }
+    }
+
+    .u_avatar {
+      position: absolute;
+      top: 50%;
+      left: 50%;
+
+      transform: translate(-50%, -50%);
+    }
+  }
+}
+
+.item {
+  padding: 32rpx 28rpx;
+  padding-top: 0;
+
+  &:nth-child(1) {
+    padding-top: 32rpx;
+  }
+
+  .title {
+    margin-bottom: 21rpx;
+    font-size: 35rpx;
+    font-weight: 500;
+    color: #333333;
+    display: flex;
+    justify-content: space-between;
+  }
+
+  .card {
+    width: 694rpx;
+    // height: 231rpx;
+    padding: 28rpx;
+    background: #ffffff;
+    border-radius: 14rpx 14rpx 14rpx 14rpx;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+
+    .top {
+      display: flex;
+      justify-content: space-between;
+
+      .left {
         display: flex;
         align-items: center;
-        color: #666666FF;
-        margin-top: 32rpx;
-
-        .left {
-          display: flex;
-          align-items: center;
-          flex-shrink: 0;
-
-          .location {
-            margin-left: 5rpx;
-            margin-right: 5rpx;
-          }
-        }
-
-      }
-
-      .one {
-        margin-top: 32rpx;
-        &:nth-child(1){
-          margin-top: 0;
-        }
-        .linkman {
-          // height: 44rpx;
-          font-size: 32rpx;
-          font-weight: 500;
-          color: #333333;
-          margin-bottom: 28rpx;
-          display: flex;
-          align-items: center;
-        }
-
-        .info {
-          font-size: 28rpx;
-          font-weight: 400;
-          color: #666666;
-          line-height: 45rpx;
-        }
-      }
-
-      .contract {
-        display: flex;
-        justify-content: space-between;
-
-        .left {
-          display: flex;
-
-          .contract_img {
-            width: 102rpx;
-            height: 102rpx;
-            background: #F5F5F5;
-            border-radius: 14rpx 14rpx 14rpx 14rpx;
-            margin-right: 21rpx;
-          }
-
-          .text {
-            display: flex;
-            flex-direction: column;
-            justify-content: space-between;
-
-            .name {
-              font-size: 32rpx;
-              ;
-              font-weight: 500;
-              color: rgba(0, 0, 0, 0.8);
-              line-height: 35rpx;
-            }
-
-            .nickname {
-              margin-right: 35rpx;
-            }
-
-            text {
-              height: 39rpx;
-              font-size: 28rpx;
-              font-weight: 400;
-              color: #666666;
-              line-height: 35rpx;
-            }
-          }
-        }
-
-        .right {
-          font-size: 28rpx;
-          font-weight: 500;
-          color: $theme-oa-color;
-          line-height: 35rpx;
-          display: flex;
-          justify-content: center;
-          align-items: center;
-
-          .icon {
-            width: 35rpx;
-            height: 39rpx;
-            background-color: $theme-oa-color;
-            opacity: 1;
-            margin-right: 10rpx
-          }
-        }
-      }
-    }
-
-    .image_box {
-      display: flex;
-      justify-content: space-between;
-      flex-direction: column;
-      align-items: center;
-      padding: 28rpx;
-
-      .image {
-        border-radius: 20rpx;
-        overflow: hidden;
-        margin-bottom: 28rpx;
 
         image {
-          width: 650rpx;
-          height: 455rpx;
-          background-color: #7f7f7f;
+          flex-shrink: 0;
+          width: 142rpx;
+          height: 142rpx;
+          margin-right: 28rpx;
+          background: #cccccc;
+          border-radius: 14rpx 14rpx 14rpx 14rpx;
+          opacity: 1;
+        }
+
+        .text {
+          display: flex;
+          flex-direction: column;
+          justify-content: space-between;
+
+          .name {
+            font-size: 32rpx;
+            font-weight: 500;
+            color: rgba(0, 0, 0, 0.8);
+          }
+
+          .code {
+            font-size: 28rpx;
+            font-weight: 400;
+            color: #666666;
+          }
+        }
+      }
+
+      .right {
+        font-size: 28rpx;
+        font-weight: 500;
+        color: $theme-oa-color;
+      }
+    }
+
+    .bottom {
+      display: flex;
+      align-items: center;
+      color: #666666ff;
+      margin-top: 32rpx;
+
+      .left {
+        display: flex;
+        align-items: center;
+        flex-shrink: 0;
+
+        .location {
+          margin-left: 5rpx;
+          margin-right: 5rpx;
+        }
+      }
+    }
+
+    .one {
+      margin-top: 32rpx;
+
+      &:nth-child(1) {
+        margin-top: 0;
+      }
+
+      .linkman {
+        // height: 44rpx;
+        font-size: 32rpx;
+        font-weight: 500;
+        color: #333333;
+        margin-bottom: 28rpx;
+        display: flex;
+        align-items: center;
+      }
+
+      .info {
+        font-size: 28rpx;
+        font-weight: 400;
+        color: #666666;
+        line-height: 45rpx;
+      }
+    }
+
+    .contract {
+      display: flex;
+      justify-content: space-between;
+
+      .left {
+        display: flex;
+
+        .contract_img {
+          width: 102rpx;
+          height: 102rpx;
+          background: #f5f5f5;
+          border-radius: 14rpx 14rpx 14rpx 14rpx;
+          margin-right: 21rpx;
+        }
+
+        .text {
+          display: flex;
+          flex-direction: column;
+          justify-content: space-between;
+
+          .name {
+            font-size: 32rpx;
+            font-weight: 500;
+            color: rgba(0, 0, 0, 0.8);
+            line-height: 35rpx;
+          }
+
+          .nickname {
+            margin-right: 35rpx;
+          }
+
+          text {
+            height: 39rpx;
+            font-size: 28rpx;
+            font-weight: 400;
+            color: #666666;
+            line-height: 35rpx;
+          }
+        }
+      }
+
+      .right {
+        font-size: 28rpx;
+        font-weight: 500;
+        color: $theme-oa-color;
+        line-height: 35rpx;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+
+        .icon {
+          width: 35rpx;
+          height: 39rpx;
+          background-color: $theme-oa-color;
+          opacity: 1;
+          margin-right: 10rpx;
         }
       }
     }
   }
 
-  .back_btn {
-    width: 694rpx;
-    height: 84rpx;
-    background: $theme-oa-color;
-    border-radius: 42rpx 42rpx 42rpx 42rpx;
+  .image_box {
     display: flex;
-    justify-content: center;
+    justify-content: space-between;
+    flex-direction: column;
     align-items: center;
-    color: #fff;
-    margin: 30rpx auto;
-  }
+    padding: 28rpx;
 
-  .stop_btn {
-    width: 694rpx;
-    height: 84rpx;
-    border-radius: 42rpx 42rpx 42rpx 42rpx;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    color: $theme-oa-color;
-    background-color: transparent;
-    margin: 30rpx auto;
+    .image {
+      border-radius: 20rpx;
+      overflow: hidden;
+      margin-bottom: 28rpx;
+
+      image {
+        width: 650rpx;
+        height: 455rpx;
+        background-color: #7f7f7f;
+      }
+    }
   }
+}
+
+.back_btn {
+  width: 694rpx;
+  height: 84rpx;
+  background: $theme-oa-color;
+  border-radius: 42rpx 42rpx 42rpx 42rpx;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  color: #fff;
+  margin: 30rpx auto;
+}
+
+.stop_btn {
+  width: 694rpx;
+  height: 84rpx;
+  border-radius: 42rpx 42rpx 42rpx 42rpx;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  color: $theme-oa-color;
+  background-color: transparent;
+  margin: 30rpx auto;
+}
 </style>
\ No newline at end of file
diff --git a/main.js b/main.js
index 9c8e157..ffca151 100644
--- a/main.js
+++ b/main.js
@@ -7,6 +7,7 @@ import uView from '@/uni_modules/uview-ui'
 import taskCard from "@/components/taskCard/taskCard.vue"
 import mybtn from "@/components/mybtn/mybtn.vue"
 import company from "@/components/company/company.vue"
+
 Vue.use(uView)
 Vue.use(taskCard)
 Vue.use(mybtn)
@@ -19,18 +20,20 @@ import Vue from 'vue'
 Vue.config.productionTip = false
 App.mpType = 'app'
 const app = new Vue({
-  ...App,
-  store
+	...App,
+	store
 })
 app.$mount()
 // #endif
 
 // #ifdef VUE3
-import { createSSRApp } from 'vue'
+import {
+	createSSRApp
+} from 'vue'
 export function createApp() {
-  const app = createSSRApp(App)
-  return {
-    app
-  }
+	const app = createSSRApp(App)
+	return {
+		app
+	}
 }
-// #endif
+// #endif
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 51a135c..90bd8d6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2,5 +2,3161 @@
   "name": "OfficeApp",
   "lockfileVersion": 3,
   "requires": true,
-  "packages": {}
+  "packages": {
+    "": {
+      "devDependencies": {
+        "node-sass": "^9.0.0",
+        "sass-loader": "^13.3.2"
+      }
+    },
+    "node_modules/@babel/code-frame": {
+      "version": "7.22.10",
+      "resolved": "https://registry.npmmirror.com/@babel/code-frame/-/code-frame-7.22.10.tgz",
+      "integrity": "sha512-/KKIMG4UEL35WmI9OlvMhurwtytjvXoFcGNrOvyG9zIzA8YmPjVtIZUf7b05+TPO7G7/GEmLHDaoCgACHl9hhA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/highlight": "^7.22.10",
+        "chalk": "^2.4.2"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/code-frame/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/code-frame/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmmirror.com/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/code-frame/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/@babel/code-frame/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+      "dev": true
+    },
+    "node_modules/@babel/code-frame/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/code-frame/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/helper-validator-identifier": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz",
+      "integrity": "sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/highlight": {
+      "version": "7.22.10",
+      "resolved": "https://registry.npmmirror.com/@babel/highlight/-/highlight-7.22.10.tgz",
+      "integrity": "sha512-78aUtVcT7MUscr0K5mIEnkwxPE0MaxkR5RxRwuHaQ+JuU5AmTPhY+do2mdzVTnIJJpyBglql2pehuBIWHug+WQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-validator-identifier": "^7.22.5",
+        "chalk": "^2.4.2",
+        "js-tokens": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmmirror.com/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+      "dev": true
+    },
+    "node_modules/@babel/highlight/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@gar/promisify": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmmirror.com/@gar/promisify/-/promisify-1.1.3.tgz",
+      "integrity": "sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==",
+      "dev": true
+    },
+    "node_modules/@jridgewell/gen-mapping": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmmirror.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
+      "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "@jridgewell/set-array": "^1.0.1",
+        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/trace-mapping": "^0.3.9"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/resolve-uri": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmmirror.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz",
+      "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==",
+      "dev": true,
+      "peer": true,
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/set-array": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmmirror.com/@jridgewell/set-array/-/set-array-1.1.2.tgz",
+      "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
+      "dev": true,
+      "peer": true,
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/source-map": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmmirror.com/@jridgewell/source-map/-/source-map-0.3.5.tgz",
+      "integrity": "sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "@jridgewell/gen-mapping": "^0.3.0",
+        "@jridgewell/trace-mapping": "^0.3.9"
+      }
+    },
+    "node_modules/@jridgewell/sourcemap-codec": {
+      "version": "1.4.15",
+      "resolved": "https://registry.npmmirror.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
+      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/@jridgewell/trace-mapping": {
+      "version": "0.3.19",
+      "resolved": "https://registry.npmmirror.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.19.tgz",
+      "integrity": "sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "@jridgewell/resolve-uri": "^3.1.0",
+        "@jridgewell/sourcemap-codec": "^1.4.14"
+      }
+    },
+    "node_modules/@npmcli/fs": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmmirror.com/@npmcli/fs/-/fs-2.1.2.tgz",
+      "integrity": "sha512-yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ==",
+      "dev": true,
+      "dependencies": {
+        "@gar/promisify": "^1.1.3",
+        "semver": "^7.3.5"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+      }
+    },
+    "node_modules/@npmcli/move-file": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmmirror.com/@npmcli/move-file/-/move-file-2.0.1.tgz",
+      "integrity": "sha512-mJd2Z5TjYWq/ttPLLGqArdtnC74J6bOzg4rMDnN+p1xTacZ2yPRCk2y0oSWQtygLR9YVQXgOcONrwtnk3JupxQ==",
+      "deprecated": "This functionality has been moved to @npmcli/fs",
+      "dev": true,
+      "dependencies": {
+        "mkdirp": "^1.0.4",
+        "rimraf": "^3.0.2"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+      }
+    },
+    "node_modules/@tootallnate/once": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmmirror.com/@tootallnate/once/-/once-2.0.0.tgz",
+      "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@types/eslint": {
+      "version": "8.44.2",
+      "resolved": "https://registry.npmmirror.com/@types/eslint/-/eslint-8.44.2.tgz",
+      "integrity": "sha512-sdPRb9K6iL5XZOmBubg8yiFp5yS/JdUDQsq5e6h95km91MCYMuvp7mh1fjPEYUhvHepKpZOjnEaMBR4PxjWDzg==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "@types/estree": "*",
+        "@types/json-schema": "*"
+      }
+    },
+    "node_modules/@types/eslint-scope": {
+      "version": "3.7.4",
+      "resolved": "https://registry.npmmirror.com/@types/eslint-scope/-/eslint-scope-3.7.4.tgz",
+      "integrity": "sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "@types/eslint": "*",
+        "@types/estree": "*"
+      }
+    },
+    "node_modules/@types/estree": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmmirror.com/@types/estree/-/estree-1.0.1.tgz",
+      "integrity": "sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA==",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/@types/json-schema": {
+      "version": "7.0.12",
+      "resolved": "https://registry.npmmirror.com/@types/json-schema/-/json-schema-7.0.12.tgz",
+      "integrity": "sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/@types/minimist": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmmirror.com/@types/minimist/-/minimist-1.2.2.tgz",
+      "integrity": "sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==",
+      "dev": true
+    },
+    "node_modules/@types/node": {
+      "version": "20.5.0",
+      "resolved": "https://registry.npmmirror.com/@types/node/-/node-20.5.0.tgz",
+      "integrity": "sha512-Mgq7eCtoTjT89FqNoTzzXg2XvCi5VMhRV6+I2aYanc6kQCBImeNaAYRs/DyoVqk1YEUJK5gN9VO7HRIdz4Wo3Q==",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/@types/normalize-package-data": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmmirror.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz",
+      "integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==",
+      "dev": true
+    },
+    "node_modules/@webassemblyjs/ast": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmmirror.com/@webassemblyjs/ast/-/ast-1.11.6.tgz",
+      "integrity": "sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "@webassemblyjs/helper-numbers": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6"
+      }
+    },
+    "node_modules/@webassemblyjs/floating-point-hex-parser": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmmirror.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz",
+      "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/@webassemblyjs/helper-api-error": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmmirror.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz",
+      "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/@webassemblyjs/helper-buffer": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmmirror.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz",
+      "integrity": "sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA==",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/@webassemblyjs/helper-numbers": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmmirror.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz",
+      "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "@webassemblyjs/floating-point-hex-parser": "1.11.6",
+        "@webassemblyjs/helper-api-error": "1.11.6",
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "node_modules/@webassemblyjs/helper-wasm-bytecode": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmmirror.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz",
+      "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/@webassemblyjs/helper-wasm-section": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmmirror.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz",
+      "integrity": "sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.11.6",
+        "@webassemblyjs/helper-buffer": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/wasm-gen": "1.11.6"
+      }
+    },
+    "node_modules/@webassemblyjs/ieee754": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmmirror.com/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz",
+      "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "@xtuc/ieee754": "^1.2.0"
+      }
+    },
+    "node_modules/@webassemblyjs/leb128": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmmirror.com/@webassemblyjs/leb128/-/leb128-1.11.6.tgz",
+      "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "node_modules/@webassemblyjs/utf8": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmmirror.com/@webassemblyjs/utf8/-/utf8-1.11.6.tgz",
+      "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/@webassemblyjs/wasm-edit": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmmirror.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz",
+      "integrity": "sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.11.6",
+        "@webassemblyjs/helper-buffer": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/helper-wasm-section": "1.11.6",
+        "@webassemblyjs/wasm-gen": "1.11.6",
+        "@webassemblyjs/wasm-opt": "1.11.6",
+        "@webassemblyjs/wasm-parser": "1.11.6",
+        "@webassemblyjs/wast-printer": "1.11.6"
+      }
+    },
+    "node_modules/@webassemblyjs/wasm-gen": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmmirror.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz",
+      "integrity": "sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/ieee754": "1.11.6",
+        "@webassemblyjs/leb128": "1.11.6",
+        "@webassemblyjs/utf8": "1.11.6"
+      }
+    },
+    "node_modules/@webassemblyjs/wasm-opt": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmmirror.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz",
+      "integrity": "sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.11.6",
+        "@webassemblyjs/helper-buffer": "1.11.6",
+        "@webassemblyjs/wasm-gen": "1.11.6",
+        "@webassemblyjs/wasm-parser": "1.11.6"
+      }
+    },
+    "node_modules/@webassemblyjs/wasm-parser": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmmirror.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz",
+      "integrity": "sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.11.6",
+        "@webassemblyjs/helper-api-error": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/ieee754": "1.11.6",
+        "@webassemblyjs/leb128": "1.11.6",
+        "@webassemblyjs/utf8": "1.11.6"
+      }
+    },
+    "node_modules/@webassemblyjs/wast-printer": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmmirror.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz",
+      "integrity": "sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.11.6",
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "node_modules/@xtuc/ieee754": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmmirror.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
+      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/@xtuc/long": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmmirror.com/@xtuc/long/-/long-4.2.2.tgz",
+      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/abbrev": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmmirror.com/abbrev/-/abbrev-1.1.1.tgz",
+      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
+      "dev": true
+    },
+    "node_modules/acorn": {
+      "version": "8.10.0",
+      "resolved": "https://registry.npmmirror.com/acorn/-/acorn-8.10.0.tgz",
+      "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==",
+      "dev": true,
+      "peer": true,
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/acorn-import-assertions": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmmirror.com/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz",
+      "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==",
+      "dev": true,
+      "peer": true,
+      "peerDependencies": {
+        "acorn": "^8"
+      }
+    },
+    "node_modules/agent-base": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmmirror.com/agent-base/-/agent-base-6.0.2.tgz",
+      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+      "dev": true,
+      "dependencies": {
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6.0.0"
+      }
+    },
+    "node_modules/agentkeepalive": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmmirror.com/agentkeepalive/-/agentkeepalive-4.5.0.tgz",
+      "integrity": "sha512-5GG/5IbQQpC9FpkRGsSvZI5QYeSCzlJHdpBQntCsuTOxhKD8lqKhrleg2Yi7yvMIf82Ycmmqln9U8V9qwEiJew==",
+      "dev": true,
+      "dependencies": {
+        "humanize-ms": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 8.0.0"
+      }
+    },
+    "node_modules/aggregate-error": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmmirror.com/aggregate-error/-/aggregate-error-3.1.0.tgz",
+      "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
+      "dev": true,
+      "dependencies": {
+        "clean-stack": "^2.0.0",
+        "indent-string": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmmirror.com/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      }
+    },
+    "node_modules/ajv-keywords": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmmirror.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+      "dev": true,
+      "peer": true,
+      "peerDependencies": {
+        "ajv": "^6.9.1"
+      }
+    },
+    "node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmmirror.com/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/aproba": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmmirror.com/aproba/-/aproba-2.0.0.tgz",
+      "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==",
+      "dev": true
+    },
+    "node_modules/are-we-there-yet": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmmirror.com/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz",
+      "integrity": "sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==",
+      "dev": true,
+      "dependencies": {
+        "delegates": "^1.0.0",
+        "readable-stream": "^3.6.0"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+      }
+    },
+    "node_modules/arrify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmmirror.com/arrify/-/arrify-1.0.1.tgz",
+      "integrity": "sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/async-foreach": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmmirror.com/async-foreach/-/async-foreach-0.1.3.tgz",
+      "integrity": "sha512-VUeSMD8nEGBWaZK4lizI1sf3yEC7pnAQ/mrI7pC2fBz2s/tq5jWWEngTwaf0Gruu/OoXRGLGg1XFqpYBiGTYJA==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmmirror.com/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "dev": true
+    },
+    "node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/browserslist": {
+      "version": "4.21.10",
+      "resolved": "https://registry.npmmirror.com/browserslist/-/browserslist-4.21.10.tgz",
+      "integrity": "sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "caniuse-lite": "^1.0.30001517",
+        "electron-to-chromium": "^1.4.477",
+        "node-releases": "^2.0.13",
+        "update-browserslist-db": "^1.0.11"
+      },
+      "bin": {
+        "browserslist": "cli.js"
+      },
+      "engines": {
+        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
+      }
+    },
+    "node_modules/buffer-from": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmmirror.com/buffer-from/-/buffer-from-1.1.2.tgz",
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/cacache": {
+      "version": "16.1.3",
+      "resolved": "https://registry.npmmirror.com/cacache/-/cacache-16.1.3.tgz",
+      "integrity": "sha512-/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ==",
+      "dev": true,
+      "dependencies": {
+        "@npmcli/fs": "^2.1.0",
+        "@npmcli/move-file": "^2.0.0",
+        "chownr": "^2.0.0",
+        "fs-minipass": "^2.1.0",
+        "glob": "^8.0.1",
+        "infer-owner": "^1.0.4",
+        "lru-cache": "^7.7.1",
+        "minipass": "^3.1.6",
+        "minipass-collect": "^1.0.2",
+        "minipass-flush": "^1.0.5",
+        "minipass-pipeline": "^1.2.4",
+        "mkdirp": "^1.0.4",
+        "p-map": "^4.0.0",
+        "promise-inflight": "^1.0.1",
+        "rimraf": "^3.0.2",
+        "ssri": "^9.0.0",
+        "tar": "^6.1.11",
+        "unique-filename": "^2.0.0"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+      }
+    },
+    "node_modules/cacache/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/cacache/node_modules/glob": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmmirror.com/glob/-/glob-8.1.0.tgz",
+      "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^5.0.1",
+        "once": "^1.3.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/cacache/node_modules/minimatch": {
+      "version": "5.1.6",
+      "resolved": "https://registry.npmmirror.com/minimatch/-/minimatch-5.1.6.tgz",
+      "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/camelcase": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmmirror.com/camelcase/-/camelcase-5.3.1.tgz",
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/camelcase-keys": {
+      "version": "6.2.2",
+      "resolved": "https://registry.npmmirror.com/camelcase-keys/-/camelcase-keys-6.2.2.tgz",
+      "integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==",
+      "dev": true,
+      "dependencies": {
+        "camelcase": "^5.3.1",
+        "map-obj": "^4.0.0",
+        "quick-lru": "^4.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/caniuse-lite": {
+      "version": "1.0.30001521",
+      "resolved": "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001521.tgz",
+      "integrity": "sha512-fnx1grfpEOvDGH+V17eccmNjucGUnCbP6KL+l5KqBIerp26WK/+RQ7CIDE37KGJjaPyqWXXlFUyKiWmvdNNKmQ==",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/chownr": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmmirror.com/chownr/-/chownr-2.0.0.tgz",
+      "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/chrome-trace-event": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmmirror.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
+      "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
+      "dev": true,
+      "peer": true,
+      "engines": {
+        "node": ">=6.0"
+      }
+    },
+    "node_modules/clean-stack": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmmirror.com/clean-stack/-/clean-stack-2.2.0.tgz",
+      "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/cliui": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmmirror.com/cliui/-/cliui-8.0.1.tgz",
+      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.1",
+        "wrap-ansi": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/color-support": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmmirror.com/color-support/-/color-support-1.1.3.tgz",
+      "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
+      "dev": true,
+      "bin": {
+        "color-support": "bin.js"
+      }
+    },
+    "node_modules/commander": {
+      "version": "2.20.3",
+      "resolved": "https://registry.npmmirror.com/commander/-/commander-2.20.3.tgz",
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmmirror.com/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+      "dev": true
+    },
+    "node_modules/console-control-strings": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmmirror.com/console-control-strings/-/console-control-strings-1.1.0.tgz",
+      "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==",
+      "dev": true
+    },
+    "node_modules/core-util-is": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmmirror.com/core-util-is/-/core-util-is-1.0.3.tgz",
+      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
+      "dev": true
+    },
+    "node_modules/cross-spawn": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmmirror.com/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "dev": true,
+      "dependencies": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmmirror.com/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmmirror.com/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/decamelize-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmmirror.com/decamelize-keys/-/decamelize-keys-1.1.1.tgz",
+      "integrity": "sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==",
+      "dev": true,
+      "dependencies": {
+        "decamelize": "^1.1.0",
+        "map-obj": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/decamelize-keys/node_modules/map-obj": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmmirror.com/map-obj/-/map-obj-1.0.1.tgz",
+      "integrity": "sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/delegates": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmmirror.com/delegates/-/delegates-1.0.0.tgz",
+      "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==",
+      "dev": true
+    },
+    "node_modules/electron-to-chromium": {
+      "version": "1.4.495",
+      "resolved": "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.4.495.tgz",
+      "integrity": "sha512-mwknuemBZnoOCths4GtpU/SDuVMp3uQHKa2UNJT9/aVD6WVRjGpXOxRGX7lm6ILIenTdGXPSTCTDaWos5tEU8Q==",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmmirror.com/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "node_modules/encoding": {
+      "version": "0.1.13",
+      "resolved": "https://registry.npmmirror.com/encoding/-/encoding-0.1.13.tgz",
+      "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "iconv-lite": "^0.6.2"
+      }
+    },
+    "node_modules/enhanced-resolve": {
+      "version": "5.15.0",
+      "resolved": "https://registry.npmmirror.com/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz",
+      "integrity": "sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "graceful-fs": "^4.2.4",
+        "tapable": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/env-paths": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmmirror.com/env-paths/-/env-paths-2.2.1.tgz",
+      "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/err-code": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmmirror.com/err-code/-/err-code-2.0.3.tgz",
+      "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==",
+      "dev": true
+    },
+    "node_modules/error-ex": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmmirror.com/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "dev": true,
+      "dependencies": {
+        "is-arrayish": "^0.2.1"
+      }
+    },
+    "node_modules/es-module-lexer": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmmirror.com/es-module-lexer/-/es-module-lexer-1.3.0.tgz",
+      "integrity": "sha512-vZK7T0N2CBmBOixhmjdqx2gWVbFZ4DXZ/NyRMZVlJXPa7CyFS+/a4QQsDGDQy9ZfEzxFuNEsMLeQJnKP2p5/JA==",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/escalade": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmmirror.com/escalade/-/escalade-3.1.1.tgz",
+      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmmirror.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/eslint-scope": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmmirror.com/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/esrecurse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmmirror.com/esrecurse/-/esrecurse-4.3.0.tgz",
+      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "estraverse": "^5.2.0"
+      },
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/esrecurse/node_modules/estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmmirror.com/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+      "dev": true,
+      "peer": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/estraverse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmmirror.com/estraverse/-/estraverse-4.3.0.tgz",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+      "dev": true,
+      "peer": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/events": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmmirror.com/events/-/events-3.3.0.tgz",
+      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
+      "dev": true,
+      "peer": true,
+      "engines": {
+        "node": ">=0.8.x"
+      }
+    },
+    "node_modules/fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmmirror.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmmirror.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmmirror.com/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/fs-minipass": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmmirror.com/fs-minipass/-/fs-minipass-2.1.0.tgz",
+      "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
+      "dev": true,
+      "dependencies": {
+        "minipass": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmmirror.com/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
+      "dev": true
+    },
+    "node_modules/function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmmirror.com/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+      "dev": true
+    },
+    "node_modules/gauge": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmmirror.com/gauge/-/gauge-4.0.4.tgz",
+      "integrity": "sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==",
+      "dev": true,
+      "dependencies": {
+        "aproba": "^1.0.3 || ^2.0.0",
+        "color-support": "^1.1.3",
+        "console-control-strings": "^1.1.0",
+        "has-unicode": "^2.0.1",
+        "signal-exit": "^3.0.7",
+        "string-width": "^4.2.3",
+        "strip-ansi": "^6.0.1",
+        "wide-align": "^1.1.5"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+      }
+    },
+    "node_modules/gaze": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmmirror.com/gaze/-/gaze-1.1.3.tgz",
+      "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==",
+      "dev": true,
+      "dependencies": {
+        "globule": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
+    "node_modules/get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmmirror.com/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "dev": true,
+      "engines": {
+        "node": "6.* || 8.* || >= 10.*"
+      }
+    },
+    "node_modules/get-stdin": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmmirror.com/get-stdin/-/get-stdin-4.0.1.tgz",
+      "integrity": "sha512-F5aQMywwJ2n85s4hJPTT9RPxGmubonuB10MNYo17/xph174n2MIR33HRguhzVag10O/npM7SPk73LMZNP+FaWw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmmirror.com/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/glob-to-regexp": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmmirror.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
+      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/globule": {
+      "version": "1.3.4",
+      "resolved": "https://registry.npmmirror.com/globule/-/globule-1.3.4.tgz",
+      "integrity": "sha512-OPTIfhMBh7JbBYDpa5b+Q5ptmMWKwcNcFSR/0c6t8V4f3ZAVBEsKNY37QdVqmLRYSMhOUGYrY0QhSoEpzGr/Eg==",
+      "dev": true,
+      "dependencies": {
+        "glob": "~7.1.1",
+        "lodash": "^4.17.21",
+        "minimatch": "~3.0.2"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/globule/node_modules/glob": {
+      "version": "7.1.7",
+      "resolved": "https://registry.npmmirror.com/glob/-/glob-7.1.7.tgz",
+      "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/globule/node_modules/minimatch": {
+      "version": "3.0.8",
+      "resolved": "https://registry.npmmirror.com/minimatch/-/minimatch-3.0.8.tgz",
+      "integrity": "sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/graceful-fs": {
+      "version": "4.2.11",
+      "resolved": "https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.11.tgz",
+      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
+      "dev": true
+    },
+    "node_modules/hard-rejection": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmmirror.com/hard-rejection/-/hard-rejection-2.1.0.tgz",
+      "integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmmirror.com/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/has-unicode": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmmirror.com/has-unicode/-/has-unicode-2.0.1.tgz",
+      "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==",
+      "dev": true
+    },
+    "node_modules/hosted-git-info": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmmirror.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
+      "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/hosted-git-info/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmmirror.com/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/http-cache-semantics": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmmirror.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz",
+      "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==",
+      "dev": true
+    },
+    "node_modules/http-proxy-agent": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmmirror.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
+      "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
+      "dev": true,
+      "dependencies": {
+        "@tootallnate/once": "2",
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/https-proxy-agent": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmmirror.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
+      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
+      "dev": true,
+      "dependencies": {
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/humanize-ms": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmmirror.com/humanize-ms/-/humanize-ms-1.2.1.tgz",
+      "integrity": "sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.0.0"
+      }
+    },
+    "node_modules/iconv-lite": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmmirror.com/iconv-lite/-/iconv-lite-0.6.3.tgz",
+      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmmirror.com/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.19"
+      }
+    },
+    "node_modules/indent-string": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmmirror.com/indent-string/-/indent-string-4.0.0.tgz",
+      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/infer-owner": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmmirror.com/infer-owner/-/infer-owner-1.0.4.tgz",
+      "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==",
+      "dev": true
+    },
+    "node_modules/inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmmirror.com/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+      "dev": true,
+      "dependencies": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmmirror.com/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "dev": true
+    },
+    "node_modules/ip": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmmirror.com/ip/-/ip-2.0.0.tgz",
+      "integrity": "sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==",
+      "dev": true
+    },
+    "node_modules/is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmmirror.com/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
+      "dev": true
+    },
+    "node_modules/is-core-module": {
+      "version": "2.13.0",
+      "resolved": "https://registry.npmmirror.com/is-core-module/-/is-core-module-2.13.0.tgz",
+      "integrity": "sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==",
+      "dev": true,
+      "dependencies": {
+        "has": "^1.0.3"
+      }
+    },
+    "node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmmirror.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-lambda": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmmirror.com/is-lambda/-/is-lambda-1.0.1.tgz",
+      "integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==",
+      "dev": true
+    },
+    "node_modules/is-plain-obj": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmmirror.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
+      "integrity": "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmmirror.com/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+      "dev": true
+    },
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmmirror.com/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+      "dev": true
+    },
+    "node_modules/jest-worker": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmmirror.com/jest-worker/-/jest-worker-27.5.1.tgz",
+      "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "@types/node": "*",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^8.0.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      }
+    },
+    "node_modules/jest-worker/node_modules/supports-color": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/js-base64": {
+      "version": "2.6.4",
+      "resolved": "https://registry.npmmirror.com/js-base64/-/js-base64-2.6.4.tgz",
+      "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==",
+      "dev": true
+    },
+    "node_modules/js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmmirror.com/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "dev": true
+    },
+    "node_modules/json-parse-even-better-errors": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmmirror.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+      "dev": true
+    },
+    "node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmmirror.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmmirror.com/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/lines-and-columns": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmmirror.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
+      "dev": true
+    },
+    "node_modules/loader-runner": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmmirror.com/loader-runner/-/loader-runner-4.3.0.tgz",
+      "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",
+      "dev": true,
+      "peer": true,
+      "engines": {
+        "node": ">=6.11.5"
+      }
+    },
+    "node_modules/locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmmirror.com/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmmirror.com/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "dev": true
+    },
+    "node_modules/lru-cache": {
+      "version": "7.18.3",
+      "resolved": "https://registry.npmmirror.com/lru-cache/-/lru-cache-7.18.3.tgz",
+      "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/make-fetch-happen": {
+      "version": "10.2.1",
+      "resolved": "https://registry.npmmirror.com/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz",
+      "integrity": "sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w==",
+      "dev": true,
+      "dependencies": {
+        "agentkeepalive": "^4.2.1",
+        "cacache": "^16.1.0",
+        "http-cache-semantics": "^4.1.0",
+        "http-proxy-agent": "^5.0.0",
+        "https-proxy-agent": "^5.0.0",
+        "is-lambda": "^1.0.1",
+        "lru-cache": "^7.7.1",
+        "minipass": "^3.1.6",
+        "minipass-collect": "^1.0.2",
+        "minipass-fetch": "^2.0.3",
+        "minipass-flush": "^1.0.5",
+        "minipass-pipeline": "^1.2.4",
+        "negotiator": "^0.6.3",
+        "promise-retry": "^2.0.1",
+        "socks-proxy-agent": "^7.0.0",
+        "ssri": "^9.0.0"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+      }
+    },
+    "node_modules/map-obj": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmmirror.com/map-obj/-/map-obj-4.3.0.tgz",
+      "integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/meow": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmmirror.com/meow/-/meow-9.0.0.tgz",
+      "integrity": "sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/minimist": "^1.2.0",
+        "camelcase-keys": "^6.2.2",
+        "decamelize": "^1.2.0",
+        "decamelize-keys": "^1.1.0",
+        "hard-rejection": "^2.1.0",
+        "minimist-options": "4.1.0",
+        "normalize-package-data": "^3.0.0",
+        "read-pkg-up": "^7.0.1",
+        "redent": "^3.0.0",
+        "trim-newlines": "^3.0.0",
+        "type-fest": "^0.18.0",
+        "yargs-parser": "^20.2.3"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/merge-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmmirror.com/merge-stream/-/merge-stream-2.0.0.tgz",
+      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/mime-db": {
+      "version": "1.52.0",
+      "resolved": "https://registry.npmmirror.com/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+      "dev": true,
+      "peer": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mime-types": {
+      "version": "2.1.35",
+      "resolved": "https://registry.npmmirror.com/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "mime-db": "1.52.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/min-indent": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmmirror.com/min-indent/-/min-indent-1.0.1.tgz",
+      "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmmirror.com/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/minimist-options": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmmirror.com/minimist-options/-/minimist-options-4.1.0.tgz",
+      "integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==",
+      "dev": true,
+      "dependencies": {
+        "arrify": "^1.0.1",
+        "is-plain-obj": "^1.1.0",
+        "kind-of": "^6.0.3"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/minipass": {
+      "version": "3.3.6",
+      "resolved": "https://registry.npmmirror.com/minipass/-/minipass-3.3.6.tgz",
+      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/minipass-collect": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmmirror.com/minipass-collect/-/minipass-collect-1.0.2.tgz",
+      "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==",
+      "dev": true,
+      "dependencies": {
+        "minipass": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/minipass-fetch": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmmirror.com/minipass-fetch/-/minipass-fetch-2.1.2.tgz",
+      "integrity": "sha512-LT49Zi2/WMROHYoqGgdlQIZh8mLPZmOrN2NdJjMXxYe4nkN6FUyuPuOAOedNJDrx0IRGg9+4guZewtp8hE6TxA==",
+      "dev": true,
+      "dependencies": {
+        "minipass": "^3.1.6",
+        "minipass-sized": "^1.0.3",
+        "minizlib": "^2.1.2"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+      },
+      "optionalDependencies": {
+        "encoding": "^0.1.13"
+      }
+    },
+    "node_modules/minipass-flush": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmmirror.com/minipass-flush/-/minipass-flush-1.0.5.tgz",
+      "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==",
+      "dev": true,
+      "dependencies": {
+        "minipass": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/minipass-pipeline": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmmirror.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz",
+      "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==",
+      "dev": true,
+      "dependencies": {
+        "minipass": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/minipass-sized": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmmirror.com/minipass-sized/-/minipass-sized-1.0.3.tgz",
+      "integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==",
+      "dev": true,
+      "dependencies": {
+        "minipass": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/minizlib": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmmirror.com/minizlib/-/minizlib-2.1.2.tgz",
+      "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
+      "dev": true,
+      "dependencies": {
+        "minipass": "^3.0.0",
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/mkdirp": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmmirror.com/mkdirp/-/mkdirp-1.0.4.tgz",
+      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+      "dev": true,
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmmirror.com/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/nan": {
+      "version": "2.17.0",
+      "resolved": "https://registry.npmmirror.com/nan/-/nan-2.17.0.tgz",
+      "integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==",
+      "dev": true
+    },
+    "node_modules/negotiator": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmmirror.com/negotiator/-/negotiator-0.6.3.tgz",
+      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/neo-async": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmmirror.com/neo-async/-/neo-async-2.6.2.tgz",
+      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
+      "dev": true
+    },
+    "node_modules/node-gyp": {
+      "version": "8.4.1",
+      "resolved": "https://registry.npmmirror.com/node-gyp/-/node-gyp-8.4.1.tgz",
+      "integrity": "sha512-olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w==",
+      "dev": true,
+      "dependencies": {
+        "env-paths": "^2.2.0",
+        "glob": "^7.1.4",
+        "graceful-fs": "^4.2.6",
+        "make-fetch-happen": "^9.1.0",
+        "nopt": "^5.0.0",
+        "npmlog": "^6.0.0",
+        "rimraf": "^3.0.2",
+        "semver": "^7.3.5",
+        "tar": "^6.1.2",
+        "which": "^2.0.2"
+      },
+      "bin": {
+        "node-gyp": "bin/node-gyp.js"
+      },
+      "engines": {
+        "node": ">= 10.12.0"
+      }
+    },
+    "node_modules/node-gyp/node_modules/@npmcli/fs": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmmirror.com/@npmcli/fs/-/fs-1.1.1.tgz",
+      "integrity": "sha512-8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ==",
+      "dev": true,
+      "dependencies": {
+        "@gar/promisify": "^1.0.1",
+        "semver": "^7.3.5"
+      }
+    },
+    "node_modules/node-gyp/node_modules/@npmcli/move-file": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmmirror.com/@npmcli/move-file/-/move-file-1.1.2.tgz",
+      "integrity": "sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==",
+      "deprecated": "This functionality has been moved to @npmcli/fs",
+      "dev": true,
+      "dependencies": {
+        "mkdirp": "^1.0.4",
+        "rimraf": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/node-gyp/node_modules/@tootallnate/once": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmmirror.com/@tootallnate/once/-/once-1.1.2.tgz",
+      "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/node-gyp/node_modules/cacache": {
+      "version": "15.3.0",
+      "resolved": "https://registry.npmmirror.com/cacache/-/cacache-15.3.0.tgz",
+      "integrity": "sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==",
+      "dev": true,
+      "dependencies": {
+        "@npmcli/fs": "^1.0.0",
+        "@npmcli/move-file": "^1.0.1",
+        "chownr": "^2.0.0",
+        "fs-minipass": "^2.0.0",
+        "glob": "^7.1.4",
+        "infer-owner": "^1.0.4",
+        "lru-cache": "^6.0.0",
+        "minipass": "^3.1.1",
+        "minipass-collect": "^1.0.2",
+        "minipass-flush": "^1.0.5",
+        "minipass-pipeline": "^1.2.2",
+        "mkdirp": "^1.0.3",
+        "p-map": "^4.0.0",
+        "promise-inflight": "^1.0.1",
+        "rimraf": "^3.0.2",
+        "ssri": "^8.0.1",
+        "tar": "^6.0.2",
+        "unique-filename": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/node-gyp/node_modules/http-proxy-agent": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmmirror.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
+      "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
+      "dev": true,
+      "dependencies": {
+        "@tootallnate/once": "1",
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/node-gyp/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmmirror.com/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/node-gyp/node_modules/make-fetch-happen": {
+      "version": "9.1.0",
+      "resolved": "https://registry.npmmirror.com/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz",
+      "integrity": "sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg==",
+      "dev": true,
+      "dependencies": {
+        "agentkeepalive": "^4.1.3",
+        "cacache": "^15.2.0",
+        "http-cache-semantics": "^4.1.0",
+        "http-proxy-agent": "^4.0.1",
+        "https-proxy-agent": "^5.0.0",
+        "is-lambda": "^1.0.1",
+        "lru-cache": "^6.0.0",
+        "minipass": "^3.1.3",
+        "minipass-collect": "^1.0.2",
+        "minipass-fetch": "^1.3.2",
+        "minipass-flush": "^1.0.5",
+        "minipass-pipeline": "^1.2.4",
+        "negotiator": "^0.6.2",
+        "promise-retry": "^2.0.1",
+        "socks-proxy-agent": "^6.0.0",
+        "ssri": "^8.0.0"
+      },
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/node-gyp/node_modules/minipass-fetch": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmmirror.com/minipass-fetch/-/minipass-fetch-1.4.1.tgz",
+      "integrity": "sha512-CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw==",
+      "dev": true,
+      "dependencies": {
+        "minipass": "^3.1.0",
+        "minipass-sized": "^1.0.3",
+        "minizlib": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "optionalDependencies": {
+        "encoding": "^0.1.12"
+      }
+    },
+    "node_modules/node-gyp/node_modules/socks-proxy-agent": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmmirror.com/socks-proxy-agent/-/socks-proxy-agent-6.2.1.tgz",
+      "integrity": "sha512-a6KW9G+6B3nWZ1yB8G7pJwL3ggLy1uTzKAgCb7ttblwqdz9fMGJUuTy3uFzEP48FAs9FLILlmzDlE2JJhVQaXQ==",
+      "dev": true,
+      "dependencies": {
+        "agent-base": "^6.0.2",
+        "debug": "^4.3.3",
+        "socks": "^2.6.2"
+      },
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/node-gyp/node_modules/ssri": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmmirror.com/ssri/-/ssri-8.0.1.tgz",
+      "integrity": "sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==",
+      "dev": true,
+      "dependencies": {
+        "minipass": "^3.1.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/node-gyp/node_modules/unique-filename": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmmirror.com/unique-filename/-/unique-filename-1.1.1.tgz",
+      "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
+      "dev": true,
+      "dependencies": {
+        "unique-slug": "^2.0.0"
+      }
+    },
+    "node_modules/node-gyp/node_modules/unique-slug": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmmirror.com/unique-slug/-/unique-slug-2.0.2.tgz",
+      "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==",
+      "dev": true,
+      "dependencies": {
+        "imurmurhash": "^0.1.4"
+      }
+    },
+    "node_modules/node-releases": {
+      "version": "2.0.13",
+      "resolved": "https://registry.npmmirror.com/node-releases/-/node-releases-2.0.13.tgz",
+      "integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/node-sass": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmmirror.com/node-sass/-/node-sass-9.0.0.tgz",
+      "integrity": "sha512-yltEuuLrfH6M7Pq2gAj5B6Zm7m+gdZoG66wTqG6mIZV/zijq3M2OO2HswtT6oBspPyFhHDcaxWpsBm0fRNDHPg==",
+      "dev": true,
+      "hasInstallScript": true,
+      "dependencies": {
+        "async-foreach": "^0.1.3",
+        "chalk": "^4.1.2",
+        "cross-spawn": "^7.0.3",
+        "gaze": "^1.0.0",
+        "get-stdin": "^4.0.1",
+        "glob": "^7.0.3",
+        "lodash": "^4.17.15",
+        "make-fetch-happen": "^10.0.4",
+        "meow": "^9.0.0",
+        "nan": "^2.17.0",
+        "node-gyp": "^8.4.1",
+        "sass-graph": "^4.0.1",
+        "stdout-stream": "^1.4.0",
+        "true-case-path": "^2.2.1"
+      },
+      "bin": {
+        "node-sass": "bin/node-sass"
+      },
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/nopt": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmmirror.com/nopt/-/nopt-5.0.0.tgz",
+      "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
+      "dev": true,
+      "dependencies": {
+        "abbrev": "1"
+      },
+      "bin": {
+        "nopt": "bin/nopt.js"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/normalize-package-data": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmmirror.com/normalize-package-data/-/normalize-package-data-3.0.3.tgz",
+      "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==",
+      "dev": true,
+      "dependencies": {
+        "hosted-git-info": "^4.0.1",
+        "is-core-module": "^2.5.0",
+        "semver": "^7.3.4",
+        "validate-npm-package-license": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/npmlog": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmmirror.com/npmlog/-/npmlog-6.0.2.tgz",
+      "integrity": "sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==",
+      "dev": true,
+      "dependencies": {
+        "are-we-there-yet": "^3.0.0",
+        "console-control-strings": "^1.1.0",
+        "gauge": "^4.0.3",
+        "set-blocking": "^2.0.0"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+      }
+    },
+    "node_modules/once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmmirror.com/once/-/once-1.4.0.tgz",
+      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "dev": true,
+      "dependencies": {
+        "wrappy": "1"
+      }
+    },
+    "node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmmirror.com/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmmirror.com/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/p-map": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmmirror.com/p-map/-/p-map-4.0.0.tgz",
+      "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
+      "dev": true,
+      "dependencies": {
+        "aggregate-error": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/p-try": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmmirror.com/p-try/-/p-try-2.2.0.tgz",
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/parse-json": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmmirror.com/parse-json/-/parse-json-5.2.0.tgz",
+      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.0.0",
+        "error-ex": "^1.3.1",
+        "json-parse-even-better-errors": "^2.3.0",
+        "lines-and-columns": "^1.1.6"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmmirror.com/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmmirror.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmmirror.com/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-parse": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmmirror.com/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+      "dev": true
+    },
+    "node_modules/picocolors": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmmirror.com/picocolors/-/picocolors-1.0.0.tgz",
+      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/process-nextick-args": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmmirror.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
+      "dev": true
+    },
+    "node_modules/promise-inflight": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmmirror.com/promise-inflight/-/promise-inflight-1.0.1.tgz",
+      "integrity": "sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==",
+      "dev": true
+    },
+    "node_modules/promise-retry": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmmirror.com/promise-retry/-/promise-retry-2.0.1.tgz",
+      "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==",
+      "dev": true,
+      "dependencies": {
+        "err-code": "^2.0.2",
+        "retry": "^0.12.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/punycode": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmmirror.com/punycode/-/punycode-2.3.0.tgz",
+      "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==",
+      "dev": true,
+      "peer": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/quick-lru": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmmirror.com/quick-lru/-/quick-lru-4.0.1.tgz",
+      "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/randombytes": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmmirror.com/randombytes/-/randombytes-2.1.0.tgz",
+      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "node_modules/read-pkg": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmmirror.com/read-pkg/-/read-pkg-5.2.0.tgz",
+      "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
+      "dev": true,
+      "dependencies": {
+        "@types/normalize-package-data": "^2.4.0",
+        "normalize-package-data": "^2.5.0",
+        "parse-json": "^5.0.0",
+        "type-fest": "^0.6.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/read-pkg-up": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmmirror.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
+      "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
+      "dev": true,
+      "dependencies": {
+        "find-up": "^4.1.0",
+        "read-pkg": "^5.2.0",
+        "type-fest": "^0.8.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/read-pkg-up/node_modules/type-fest": {
+      "version": "0.8.1",
+      "resolved": "https://registry.npmmirror.com/type-fest/-/type-fest-0.8.1.tgz",
+      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/read-pkg/node_modules/hosted-git-info": {
+      "version": "2.8.9",
+      "resolved": "https://registry.npmmirror.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
+      "dev": true
+    },
+    "node_modules/read-pkg/node_modules/normalize-package-data": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmmirror.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+      "dev": true,
+      "dependencies": {
+        "hosted-git-info": "^2.1.4",
+        "resolve": "^1.10.0",
+        "semver": "2 || 3 || 4 || 5",
+        "validate-npm-package-license": "^3.0.1"
+      }
+    },
+    "node_modules/read-pkg/node_modules/semver": {
+      "version": "5.7.2",
+      "resolved": "https://registry.npmmirror.com/semver/-/semver-5.7.2.tgz",
+      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/read-pkg/node_modules/type-fest": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmmirror.com/type-fest/-/type-fest-0.6.0.tgz",
+      "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/readable-stream": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-3.6.2.tgz",
+      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/redent": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmmirror.com/redent/-/redent-3.0.0.tgz",
+      "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",
+      "dev": true,
+      "dependencies": {
+        "indent-string": "^4.0.0",
+        "strip-indent": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmmirror.com/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/resolve": {
+      "version": "1.22.4",
+      "resolved": "https://registry.npmmirror.com/resolve/-/resolve-1.22.4.tgz",
+      "integrity": "sha512-PXNdCiPqDqeUou+w1C2eTQbNfxKSuMxqTCuvlmmMsk1NWHL5fRrhY6Pl0qEYYc6+QqGClco1Qj8XnjPego4wfg==",
+      "dev": true,
+      "dependencies": {
+        "is-core-module": "^2.13.0",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
+      },
+      "bin": {
+        "resolve": "bin/resolve"
+      }
+    },
+    "node_modules/retry": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmmirror.com/retry/-/retry-0.12.0.tgz",
+      "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/rimraf": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmmirror.com/rimraf/-/rimraf-3.0.2.tgz",
+      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "dev": true,
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      }
+    },
+    "node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmmirror.com/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "dev": true
+    },
+    "node_modules/safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmmirror.com/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/sass-graph": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmmirror.com/sass-graph/-/sass-graph-4.0.1.tgz",
+      "integrity": "sha512-5YCfmGBmxoIRYHnKK2AKzrAkCoQ8ozO+iumT8K4tXJXRVCPf+7s1/9KxTSW3Rbvf+7Y7b4FR3mWyLnQr3PHocA==",
+      "dev": true,
+      "dependencies": {
+        "glob": "^7.0.0",
+        "lodash": "^4.17.11",
+        "scss-tokenizer": "^0.4.3",
+        "yargs": "^17.2.1"
+      },
+      "bin": {
+        "sassgraph": "bin/sassgraph"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/sass-loader": {
+      "version": "13.3.2",
+      "resolved": "https://registry.npmmirror.com/sass-loader/-/sass-loader-13.3.2.tgz",
+      "integrity": "sha512-CQbKl57kdEv+KDLquhC+gE3pXt74LEAzm+tzywcA0/aHZuub8wTErbjAoNI57rPUWRYRNC5WUnNl8eGJNbDdwg==",
+      "dev": true,
+      "dependencies": {
+        "neo-async": "^2.6.2"
+      },
+      "engines": {
+        "node": ">= 14.15.0"
+      },
+      "peerDependencies": {
+        "fibers": ">= 3.1.0",
+        "node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0",
+        "sass": "^1.3.0",
+        "sass-embedded": "*",
+        "webpack": "^5.0.0"
+      },
+      "peerDependenciesMeta": {
+        "fibers": {
+          "optional": true
+        },
+        "node-sass": {
+          "optional": true
+        },
+        "sass": {
+          "optional": true
+        },
+        "sass-embedded": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/schema-utils": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmmirror.com/schema-utils/-/schema-utils-3.3.0.tgz",
+      "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "@types/json-schema": "^7.0.8",
+        "ajv": "^6.12.5",
+        "ajv-keywords": "^3.5.2"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      }
+    },
+    "node_modules/scss-tokenizer": {
+      "version": "0.4.3",
+      "resolved": "https://registry.npmmirror.com/scss-tokenizer/-/scss-tokenizer-0.4.3.tgz",
+      "integrity": "sha512-raKLgf1LI5QMQnG+RxHz6oK0sL3x3I4FN2UDLqgLOGO8hodECNnNh5BXn7fAyBxrA8zVzdQizQ6XjNJQ+uBwMw==",
+      "dev": true,
+      "dependencies": {
+        "js-base64": "^2.4.9",
+        "source-map": "^0.7.3"
+      }
+    },
+    "node_modules/semver": {
+      "version": "7.5.4",
+      "resolved": "https://registry.npmmirror.com/semver/-/semver-7.5.4.tgz",
+      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/semver/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmmirror.com/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/serialize-javascript": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmmirror.com/serialize-javascript/-/serialize-javascript-6.0.1.tgz",
+      "integrity": "sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "randombytes": "^2.1.0"
+      }
+    },
+    "node_modules/set-blocking": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmmirror.com/set-blocking/-/set-blocking-2.0.0.tgz",
+      "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==",
+      "dev": true
+    },
+    "node_modules/shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmmirror.com/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dev": true,
+      "dependencies": {
+        "shebang-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmmirror.com/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/signal-exit": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmmirror.com/signal-exit/-/signal-exit-3.0.7.tgz",
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
+      "dev": true
+    },
+    "node_modules/smart-buffer": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmmirror.com/smart-buffer/-/smart-buffer-4.2.0.tgz",
+      "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 6.0.0",
+        "npm": ">= 3.0.0"
+      }
+    },
+    "node_modules/socks": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmmirror.com/socks/-/socks-2.7.1.tgz",
+      "integrity": "sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==",
+      "dev": true,
+      "dependencies": {
+        "ip": "^2.0.0",
+        "smart-buffer": "^4.2.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0",
+        "npm": ">= 3.0.0"
+      }
+    },
+    "node_modules/socks-proxy-agent": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmmirror.com/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz",
+      "integrity": "sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==",
+      "dev": true,
+      "dependencies": {
+        "agent-base": "^6.0.2",
+        "debug": "^4.3.3",
+        "socks": "^2.6.2"
+      },
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/source-map": {
+      "version": "0.7.4",
+      "resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.7.4.tgz",
+      "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/source-map-support": {
+      "version": "0.5.21",
+      "resolved": "https://registry.npmmirror.com/source-map-support/-/source-map-support-0.5.21.tgz",
+      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      }
+    },
+    "node_modules/source-map-support/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "peer": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/spdx-correct": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmmirror.com/spdx-correct/-/spdx-correct-3.2.0.tgz",
+      "integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==",
+      "dev": true,
+      "dependencies": {
+        "spdx-expression-parse": "^3.0.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "node_modules/spdx-exceptions": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmmirror.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
+      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
+      "dev": true
+    },
+    "node_modules/spdx-expression-parse": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmmirror.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
+      "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
+      "dev": true,
+      "dependencies": {
+        "spdx-exceptions": "^2.1.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "node_modules/spdx-license-ids": {
+      "version": "3.0.13",
+      "resolved": "https://registry.npmmirror.com/spdx-license-ids/-/spdx-license-ids-3.0.13.tgz",
+      "integrity": "sha512-XkD+zwiqXHikFZm4AX/7JSCXA98U5Db4AFd5XUg/+9UNtnH75+Z9KxtpYiJZx36mUDVOwH83pl7yvCer6ewM3w==",
+      "dev": true
+    },
+    "node_modules/ssri": {
+      "version": "9.0.1",
+      "resolved": "https://registry.npmmirror.com/ssri/-/ssri-9.0.1.tgz",
+      "integrity": "sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q==",
+      "dev": true,
+      "dependencies": {
+        "minipass": "^3.1.1"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+      }
+    },
+    "node_modules/stdout-stream": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmmirror.com/stdout-stream/-/stdout-stream-1.4.1.tgz",
+      "integrity": "sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "^2.0.1"
+      }
+    },
+    "node_modules/stdout-stream/node_modules/readable-stream": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-2.3.8.tgz",
+      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/stdout-stream/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmmirror.com/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true
+    },
+    "node_modules/stdout-stream/node_modules/string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmmirror.com/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "node_modules/string_decoder": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmmirror.com/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "~5.2.0"
+      }
+    },
+    "node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmmirror.com/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-indent": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmmirror.com/strip-indent/-/strip-indent-3.0.0.tgz",
+      "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
+      "dev": true,
+      "dependencies": {
+        "min-indent": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/supports-preserve-symlinks-flag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmmirror.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/tapable": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmmirror.com/tapable/-/tapable-2.2.1.tgz",
+      "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
+      "dev": true,
+      "peer": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/tar": {
+      "version": "6.1.15",
+      "resolved": "https://registry.npmmirror.com/tar/-/tar-6.1.15.tgz",
+      "integrity": "sha512-/zKt9UyngnxIT/EAGYuxaMYgOIJiP81ab9ZfkILq4oNLPFX50qyYmu7jRj9qeXoxmJHjGlbH0+cm2uy1WCs10A==",
+      "dev": true,
+      "dependencies": {
+        "chownr": "^2.0.0",
+        "fs-minipass": "^2.0.0",
+        "minipass": "^5.0.0",
+        "minizlib": "^2.1.1",
+        "mkdirp": "^1.0.3",
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/tar/node_modules/minipass": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmmirror.com/minipass/-/minipass-5.0.0.tgz",
+      "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/terser": {
+      "version": "5.19.2",
+      "resolved": "https://registry.npmmirror.com/terser/-/terser-5.19.2.tgz",
+      "integrity": "sha512-qC5+dmecKJA4cpYxRa5aVkKehYsQKc+AHeKl0Oe62aYjBL8ZA33tTljktDHJSaxxMnbI5ZYw+o/S2DxxLu8OfA==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "@jridgewell/source-map": "^0.3.3",
+        "acorn": "^8.8.2",
+        "commander": "^2.20.0",
+        "source-map-support": "~0.5.20"
+      },
+      "bin": {
+        "terser": "bin/terser"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/terser-webpack-plugin": {
+      "version": "5.3.9",
+      "resolved": "https://registry.npmmirror.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.9.tgz",
+      "integrity": "sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "@jridgewell/trace-mapping": "^0.3.17",
+        "jest-worker": "^27.4.5",
+        "schema-utils": "^3.1.1",
+        "serialize-javascript": "^6.0.1",
+        "terser": "^5.16.8"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "peerDependencies": {
+        "webpack": "^5.1.0"
+      },
+      "peerDependenciesMeta": {
+        "@swc/core": {
+          "optional": true
+        },
+        "esbuild": {
+          "optional": true
+        },
+        "uglify-js": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/trim-newlines": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmmirror.com/trim-newlines/-/trim-newlines-3.0.1.tgz",
+      "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/true-case-path": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmmirror.com/true-case-path/-/true-case-path-2.2.1.tgz",
+      "integrity": "sha512-0z3j8R7MCjy10kc/g+qg7Ln3alJTodw9aDuVWZa3uiWqfuBMKeAeP2ocWcxoyM3D73yz3Jt/Pu4qPr4wHSdB/Q==",
+      "dev": true
+    },
+    "node_modules/type-fest": {
+      "version": "0.18.1",
+      "resolved": "https://registry.npmmirror.com/type-fest/-/type-fest-0.18.1.tgz",
+      "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/unique-filename": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmmirror.com/unique-filename/-/unique-filename-2.0.1.tgz",
+      "integrity": "sha512-ODWHtkkdx3IAR+veKxFV+VBkUMcN+FaqzUUd7IZzt+0zhDZFPFxhlqwPF3YQvMHx1TD0tdgYl+kuPnJ8E6ql7A==",
+      "dev": true,
+      "dependencies": {
+        "unique-slug": "^3.0.0"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+      }
+    },
+    "node_modules/unique-slug": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmmirror.com/unique-slug/-/unique-slug-3.0.0.tgz",
+      "integrity": "sha512-8EyMynh679x/0gqE9fT9oilG+qEt+ibFyqjuVTsZn1+CMxH+XLlpvr2UZx4nVcCwTpx81nICr2JQFkM+HPLq4w==",
+      "dev": true,
+      "dependencies": {
+        "imurmurhash": "^0.1.4"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+      }
+    },
+    "node_modules/update-browserslist-db": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmmirror.com/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz",
+      "integrity": "sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "escalade": "^3.1.1",
+        "picocolors": "^1.0.0"
+      },
+      "bin": {
+        "update-browserslist-db": "cli.js"
+      },
+      "peerDependencies": {
+        "browserslist": ">= 4.21.0"
+      }
+    },
+    "node_modules/uri-js": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmmirror.com/uri-js/-/uri-js-4.4.1.tgz",
+      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "punycode": "^2.1.0"
+      }
+    },
+    "node_modules/util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmmirror.com/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
+      "dev": true
+    },
+    "node_modules/validate-npm-package-license": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmmirror.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+      "dev": true,
+      "dependencies": {
+        "spdx-correct": "^3.0.0",
+        "spdx-expression-parse": "^3.0.0"
+      }
+    },
+    "node_modules/watchpack": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmmirror.com/watchpack/-/watchpack-2.4.0.tgz",
+      "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "glob-to-regexp": "^0.4.1",
+        "graceful-fs": "^4.1.2"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/webpack": {
+      "version": "5.88.2",
+      "resolved": "https://registry.npmmirror.com/webpack/-/webpack-5.88.2.tgz",
+      "integrity": "sha512-JmcgNZ1iKj+aiR0OvTYtWQqJwq37Pf683dY9bVORwVbUrDhLhdn/PlO2sHsFHPkj7sHNQF3JwaAkp49V+Sq1tQ==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "@types/eslint-scope": "^3.7.3",
+        "@types/estree": "^1.0.0",
+        "@webassemblyjs/ast": "^1.11.5",
+        "@webassemblyjs/wasm-edit": "^1.11.5",
+        "@webassemblyjs/wasm-parser": "^1.11.5",
+        "acorn": "^8.7.1",
+        "acorn-import-assertions": "^1.9.0",
+        "browserslist": "^4.14.5",
+        "chrome-trace-event": "^1.0.2",
+        "enhanced-resolve": "^5.15.0",
+        "es-module-lexer": "^1.2.1",
+        "eslint-scope": "5.1.1",
+        "events": "^3.2.0",
+        "glob-to-regexp": "^0.4.1",
+        "graceful-fs": "^4.2.9",
+        "json-parse-even-better-errors": "^2.3.1",
+        "loader-runner": "^4.2.0",
+        "mime-types": "^2.1.27",
+        "neo-async": "^2.6.2",
+        "schema-utils": "^3.2.0",
+        "tapable": "^2.1.1",
+        "terser-webpack-plugin": "^5.3.7",
+        "watchpack": "^2.4.0",
+        "webpack-sources": "^3.2.3"
+      },
+      "bin": {
+        "webpack": "bin/webpack.js"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      },
+      "peerDependenciesMeta": {
+        "webpack-cli": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/webpack-sources": {
+      "version": "3.2.3",
+      "resolved": "https://registry.npmmirror.com/webpack-sources/-/webpack-sources-3.2.3.tgz",
+      "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
+      "dev": true,
+      "peer": true,
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmmirror.com/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/wide-align": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmmirror.com/wide-align/-/wide-align-1.1.5.tgz",
+      "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^1.0.2 || 2 || 3 || 4"
+      }
+    },
+    "node_modules/wrap-ansi": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmmirror.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmmirror.com/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
+      "dev": true
+    },
+    "node_modules/y18n": {
+      "version": "5.0.8",
+      "resolved": "https://registry.npmmirror.com/y18n/-/y18n-5.0.8.tgz",
+      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmmirror.com/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    },
+    "node_modules/yargs": {
+      "version": "17.7.2",
+      "resolved": "https://registry.npmmirror.com/yargs/-/yargs-17.7.2.tgz",
+      "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
+      "dev": true,
+      "dependencies": {
+        "cliui": "^8.0.1",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.3",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^21.1.1"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/yargs-parser": {
+      "version": "20.2.9",
+      "resolved": "https://registry.npmmirror.com/yargs-parser/-/yargs-parser-20.2.9.tgz",
+      "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/yargs/node_modules/yargs-parser": {
+      "version": "21.1.1",
+      "resolved": "https://registry.npmmirror.com/yargs-parser/-/yargs-parser-21.1.1.tgz",
+      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      }
+    }
+  }
 }
diff --git a/package.json b/package.json
new file mode 100644
index 0000000..da7b90e
--- /dev/null
+++ b/package.json
@@ -0,0 +1,6 @@
+{
+  "devDependencies": {
+    "node-sass": "^9.0.0",
+    "sass-loader": "^13.3.2"
+  }
+}
diff --git a/pages.json b/pages.json
index 786ce15..a74893e 100644
--- a/pages.json
+++ b/pages.json
@@ -1,86 +1,86 @@
 {
-  "pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
+	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
 
-    {
-      "path": "pages/oaHome/oaHome",
-      "style": {
-        "navigationBarTitleText": "首页",
-        "enablePullDownRefresh": true,
-        "app-plus": {
-          "titleNView": false
-        }
-      }
-    },
-    {
-      "path": "pages/oaLogin/oaLogin",
-      "style": {
-        "navigationBarTitleText": "登录",
-        "app-plus": {
-          "titleNView": false
-        }
-      }
+		{
+			"path": "pages/oaHome/oaHome",
+			"style": {
+				"navigationBarTitleText": "首页",
+				"enablePullDownRefresh": true,
+				"app-plus": {
+					"titleNView": false
+				}
+			}
+		},
+		{
+			"path": "pages/oaLogin/oaLogin",
+			"style": {
+				"navigationBarTitleText": "登录",
+				"app-plus": {
+					"titleNView": false
+				}
+			}
 
-    },
-    {
-      "path": "pages/business/business",
-      "style": {
-        "navigationBarTitleText": "商机信息",
-        "enablePullDownRefresh": true,
-        "navigationBarBackgroundColor": "#3175f9",
-        "navigationBarTextStyle": "white"
-      }
+		},
+		{
+			"path": "pages/business/business",
+			"style": {
+				"navigationBarTitleText": "商机信息",
+				"enablePullDownRefresh": true,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
 
-    },
-    {
-      "path": "pages/index/index",
-      "style": {
-        "navigationBarTitleText": "uni-app",
-        "navigationBarBackgroundColor": "#3175f9",
-        "navigationBarTextStyle": "white"
-      }
-    },
-    {
-      "path": "pages/oaExamine/oaExamine",
-      "style": {
-        "navigationBarTitleText": "审批",
-        "enablePullDownRefresh": true,
-        "navigationBarBackgroundColor": "#3175f9",
-        "navigationBarTextStyle": "white"
-      }
-    },
-    {
-      "path": "pages/oaTask/oaTask",
-      "style": {
-        "navigationBarTitleText": "今日任务",
-        "enablePullDownRefresh": true,
-        "navigationBarBackgroundColor": "#3175f9",
-        "navigationBarTextStyle": "white"
-      }
-    },
-    {
-      "path": "pages/oaMy/oaMy",
-      "style": {
-        "navigationBarTitleText": "我的",
-        "app-plus": {
-          "titleNView": false
-        }
-      }
-    }, {
-      "path": "pages/oaManager/oaManager",
-      "style": {
-        "navigationBarTitleText": "片区经理",
-        "navigationBarBackgroundColor": "#3175f9",
-        "navigationBarTextStyle": "white"
-      }
+		},
+		{
+			"path": "pages/index/index",
+			"style": {
+				"navigationBarTitleText": "uni-app",
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/oaExamine/oaExamine",
+			"style": {
+				"navigationBarTitleText": "审批",
+				"enablePullDownRefresh": true,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/oaTask/oaTask",
+			"style": {
+				"navigationBarTitleText": "今日任务",
+				"enablePullDownRefresh": true,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/oaMy/oaMy",
+			"style": {
+				"navigationBarTitleText": "我的",
+				"app-plus": {
+					"titleNView": false
+				}
+			}
+		}, {
+			"path": "pages/oaManager/oaManager",
+			"style": {
+				"navigationBarTitleText": "片区经理",
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "pages/oaNews/oaNews",
-      "style": {
-        "navigationBarTitleText": "公告详情",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#3175f9",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "pages/oaNews/oaNews",
+			"style": {
+				"navigationBarTitleText": "公告详情",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
 
 		}, {
 			"path": "pages/logistics/index",
@@ -118,414 +118,414 @@
 				"navigationBarTextStyle": "white"
 			}
 
-    }, {
-      "path": "pages/updatePasswprd/updatePasswprd",
-      "style": {
-        "navigationBarTitleText": "修改密码",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#3175f9",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "pages/updatePasswprd/updatePasswprd",
+			"style": {
+				"navigationBarTitleText": "修改密码",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
 
-    }
-  ],
-  "subPackages": [{
-    "root": "pages/views",
-    "name": "views",
-    "pages": [{
-        "path": "application",
-        "style": {
-          "navigationBarTitleText": "地图首页",
-          "enablePullDownRefresh": false
-        }
-      },
-      {
-        "path": "new_task",
-        "style": {
-          "navigationBarTitleText": "新建任务",
-          "enablePullDownRefresh": false
-        }
-      },
-      {
-        "path": "com_approve",
-        "style": {
-          "navigationBarTitleText": "通用审批",
-          "enablePullDownRefresh": false
-        }
-      }, {
-        "path": "personal_center",
-        "style": {
-          "navigationBarTitleText": "个人中心1",
-          "enablePullDownRefresh": false
-        }
+		}
+	],
+	"subPackages": [{
+		"root": "pages/views",
+		"name": "views",
+		"pages": [{
+				"path": "application",
+				"style": {
+					"navigationBarTitleText": "地图首页",
+					"enablePullDownRefresh": false
+				}
+			},
+			{
+				"path": "new_task",
+				"style": {
+					"navigationBarTitleText": "新建任务",
+					"enablePullDownRefresh": false
+				}
+			},
+			{
+				"path": "com_approve",
+				"style": {
+					"navigationBarTitleText": "通用审批",
+					"enablePullDownRefresh": false
+				}
+			}, {
+				"path": "personal_center",
+				"style": {
+					"navigationBarTitleText": "个人中心1",
+					"enablePullDownRefresh": false
+				}
 
-      }, {
-        "path": "task_details",
-        "style": {
-          "navigationBarTitleText": "",
-          "enablePullDownRefresh": false
-        }
+			}, {
+				"path": "task_details",
+				"style": {
+					"navigationBarTitleText": "",
+					"enablePullDownRefresh": false
+				}
 
-      }, {
-        "path": "personal_center_two",
-        "style": {
-          "navigationBarTitleText": "个人中心2",
-          "enablePullDownRefresh": false
-        }
+			}, {
+				"path": "personal_center_two",
+				"style": {
+					"navigationBarTitleText": "个人中心2",
+					"enablePullDownRefresh": false
+				}
 
-      }, {
-        "path": "public_document",
-        "style": {
-          "navigationBarTitleText": "公司公示文档",
-          "enablePullDownRefresh": false,
-          "navigationBarBackgroundColor": "#3175f9",
-          "navigationBarTextStyle": "white"
-        }
+			}, {
+				"path": "public_document",
+				"style": {
+					"navigationBarTitleText": "公司公示文档",
+					"enablePullDownRefresh": false,
+					"navigationBarBackgroundColor": "#0122C7",
+					"navigationBarTextStyle": "white"
+				}
 
-      }, {
-        "path": "leave_request",
-        "style": {
-          "navigationBarTitleText": "请假申请",
-          "enablePullDownRefresh": false,
-          "navigationBarBackgroundColor": "#3175f9",
-          "navigationBarTextStyle": "white"
-        }
+			}, {
+				"path": "leave_request",
+				"style": {
+					"navigationBarTitleText": "请假申请",
+					"enablePullDownRefresh": false,
+					"navigationBarBackgroundColor": "#0122C7",
+					"navigationBarTextStyle": "white"
+				}
 
-      }
-    ]
-  }, {
-    "root": "subpkg",
-    "name": "subpkg",
-    "pages": [{
-      "path": "personnel/personnel",
-      "style": {
-        "navigationBarTitleText": "人员管理",
-        "enablePullDownRefresh": true,
-        "navigationBarBackgroundColor": "#3175f9",
-        "navigationBarTextStyle": "white"
-      }
+			}
+		]
+	}, {
+		"root": "subpkg",
+		"name": "subpkg",
+		"pages": [{
+			"path": "personnel/personnel",
+			"style": {
+				"navigationBarTitleText": "人员管理",
+				"enablePullDownRefresh": true,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "finance/finance",
-      "style": {
-        "navigationBarTitleText": "财务管理",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#3175f9",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "finance/finance",
+			"style": {
+				"navigationBarTitleText": "财务管理",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "topUp/topUp",
-      "style": {
-        "navigationBarTitleText": "账户充值",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#3175f9",
-        "navigationBarTextStyle": "white",
-        "app-plus": {
-          "titleNView": {
-            "buttons": [{
-              "color": "#fff",
-              "text": "充值记录",
-              "fontSize": "15",
-              "width": "90"
-            }]
-          }
-        }
-      }
+		}, {
+			"path": "topUp/topUp",
+			"style": {
+				"navigationBarTitleText": "账户充值",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white",
+				"app-plus": {
+					"titleNView": {
+						"buttons": [{
+							"color": "#fff",
+							"text": "充值记录",
+							"fontSize": "15",
+							"width": "90"
+						}]
+					}
+				}
+			}
 
-    }, {
-      "path": "contract/contract",
-      "style": {
-        "navigationBarTitleText": "合同管理",
-        "enablePullDownRefresh": true,
-        "navigationBarBackgroundColor": "#3175f9",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "contract/contract",
+			"style": {
+				"navigationBarTitleText": "合同管理",
+				"enablePullDownRefresh": true,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "contractDetail/contractDetail",
-      "style": {
-        "navigationBarTitleText": "合同详情",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#3175f9",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "contractDetail/contractDetail",
+			"style": {
+				"navigationBarTitleText": "合同详情",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "pdfView/pdfView",
-      "style": {
-        "navigationBarTitleText": "合同内容",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#3175f9",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "pdfView/pdfView",
+			"style": {
+				"navigationBarTitleText": "合同内容",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "companyInfo/companyInfo",
-      "style": {
-        "navigationBarTitleText": "公司信息",
-        "enablePullDownRefresh": true,
-        "navigationBarBackgroundColor": "#3175f9",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "companyInfo/companyInfo",
+			"style": {
+				"navigationBarTitleText": "公司信息",
+				"enablePullDownRefresh": true,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "companySign/companySign",
-      "style": {
-        "navigationBarTitleText": "签约公司详情",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#3175f9",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "companySign/companySign",
+			"style": {
+				"navigationBarTitleText": "签约公司详情",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "personnelDetails/personnelDetails",
-      "style": {
-        "navigationBarTitleText": "人员详细信息",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#3175f9",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "personnelDetails/personnelDetails",
+			"style": {
+				"navigationBarTitleText": "人员详细信息",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "orderDetail/orderDetail",
-      "style": {
-        "navigationBarTitleText": "流水详情",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#3175f9",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "orderDetail/orderDetail",
+			"style": {
+				"navigationBarTitleText": "流水详情",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "withdrawDeposit/withdrawDeposit",
-      "style": {
-        "navigationBarTitleText": "提现余额",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#3175f9",
-        "navigationBarTextStyle": "white",
-        "app-plus": {
-          "titleNView": {
-            "buttons": [{
-              "color": "#fff",
-              "text": "提现记录",
-              "fontSize": "15",
-              "width": "90"
-            }]
-          }
-        }
-      }
-    }, {
-      "path": "withdrawList/withdrawList",
-      "style": {
-        "navigationBarTitleText": "提现记录",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#3175f9",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "withdrawDeposit/withdrawDeposit",
+			"style": {
+				"navigationBarTitleText": "提现余额",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white",
+				"app-plus": {
+					"titleNView": {
+						"buttons": [{
+							"color": "#fff",
+							"text": "提现记录",
+							"fontSize": "15",
+							"width": "90"
+						}]
+					}
+				}
+			}
+		}, {
+			"path": "withdrawList/withdrawList",
+			"style": {
+				"navigationBarTitleText": "提现记录",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "noticeList/noticeList",
-      "style": {
-        "navigationBarTitleText": "公告列表",
-        "enablePullDownRefresh": true,
-        "navigationBarBackgroundColor": "#3175f9",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "noticeList/noticeList",
+			"style": {
+				"navigationBarTitleText": "公告列表",
+				"enablePullDownRefresh": true,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "topUpList/topUpList",
-      "style": {
-        "navigationBarTitleText": "充值记录",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#3175f9",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "topUpList/topUpList",
+			"style": {
+				"navigationBarTitleText": "充值记录",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "companyAdmin/companyAdmin",
-      "style": {
-        "navigationBarTitleText": "公司管理",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#3175f9",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "companyAdmin/companyAdmin",
+			"style": {
+				"navigationBarTitleText": "公司管理",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "newPersonnel/newPersonnel",
-      "style": {
-        "navigationBarTitleText": "新增人员",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#3175f9",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "newPersonnel/newPersonnel",
+			"style": {
+				"navigationBarTitleText": "新增人员",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "archives/archives",
-      "style": {
-        "navigationBarTitleText": "档案管理",
-        "enablePullDownRefresh": true,
-        "navigationBarBackgroundColor": "#3175f9",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "archives/archives",
+			"style": {
+				"navigationBarTitleText": "档案管理",
+				"enablePullDownRefresh": true,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "newArchives/newArchives",
-      "style": {
-        "navigationBarTitleText": "信息登记",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#3175f9",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "newArchives/newArchives",
+			"style": {
+				"navigationBarTitleText": "信息登记",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "updateArchives/updateArchives",
-      "style": {
-        "navigationBarTitleText": "信息更新",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#3175f9",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "updateArchives/updateArchives",
+			"style": {
+				"navigationBarTitleText": "信息更新",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "fixedAssets/fixedAssets",
-      "style": {
-        "navigationBarTitleText": "固定资产",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#3175f9",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "fixedAssets/fixedAssets",
+			"style": {
+				"navigationBarTitleText": "固定资产",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "taskAdmin/taskAdmin",
-      "style": {
-        "navigationBarTitleText": "任务管理",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#3175f9",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "taskAdmin/taskAdmin",
+			"style": {
+				"navigationBarTitleText": "任务管理",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "archivesDetail/archivesDetail",
-      "style": {
-        "navigationBarTitleText": "档案详情",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#3175f9",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "archivesDetail/archivesDetail",
+			"style": {
+				"navigationBarTitleText": "档案详情",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "captain/captain",
-      "style": {
-        "navigationBarTitleText": "队长列表",
-        "enablePullDownRefresh": true,
-        "navigationBarBackgroundColor": "#3175f9",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "captain/captain",
+			"style": {
+				"navigationBarTitleText": "队长列表",
+				"enablePullDownRefresh": true,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "companyFinance/companyFinance",
-      "style": {
-        "navigationBarTitleText": "公司财务",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#3175f9",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "companyFinance/companyFinance",
+			"style": {
+				"navigationBarTitleText": "公司财务",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "companyUnsign/companyUnsign",
-      "style": {
-        "navigationBarTitleText": "未签约公司列表",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#3175f9",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "companyUnsign/companyUnsign",
+			"style": {
+				"navigationBarTitleText": "未签约公司列表",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "submit/submit",
-      "style": {
-        "navigationBarTitleText": "提交审核",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#3175f9",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "submit/submit",
+			"style": {
+				"navigationBarTitleText": "提交审核",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "dispatching/dispatching",
-      "style": {
-        "navigationBarTitleText": "任务:宣传配送",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#3175f9",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "dispatching/dispatching",
+			"style": {
+				"navigationBarTitleText": "任务:宣传配送",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "blockTransaction/blockTransaction",
-      "style": {
-        "navigationBarTitleText": "任务:片区交易",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#3175f9",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "blockTransaction/blockTransaction",
+			"style": {
+				"navigationBarTitleText": "任务:片区交易",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "fileTask/fileTask",
-      "style": {
-        "navigationBarTitleText": "已更新商机",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#3175f9",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "fileTask/fileTask",
+			"style": {
+				"navigationBarTitleText": "已更新商机",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
 
-    }]
-  }],
-  "globalStyle": {
-    "navigationBarTextStyle": "black",
-    "navigationBarTitleText": "uni-app",
-    "navigationBarBackgroundColor": "#F8F8F8",
-    "backgroundColor": "#F8F8F8"
-  },
-  "tabBar": {
-    "color": "#282828",
-    "selectedColor": "#3175f9",
-    "borderStyle": "white",
-    "backgroundColor": "#ffffff",
-    "list": [{
-        "pagePath": "pages/oaHome/oaHome",
-        "text": "首页",
-        "iconPath": "/static/tabs-icon/home.png",
-        "selectedIconPath": "/static/tabs-icon/home-a.png"
-      },
-      {
-        "pagePath": "pages/oaExamine/oaExamine",
-        "text": "审批",
-        "iconPath": "/static/tabs-icon/Task.png",
-        "selectedIconPath": "/static/tabs-icon/Task-a.png"
-      },
-      {
-        "pagePath": "pages/oaTask/oaTask",
-        "text": "任务",
-        "iconPath": "/static/tabs-icon/approval.png",
-        "selectedIconPath": "/static/tabs-icon/approval-a.png"
-      },
-      // {
-      //   "pagePath": "pages/oaManager/oaManager",
-      //   "text": "片区经理",
-      //   "iconPath": "/static/tabs-icon/manager.png",
-      //   "selectedIconPath": "/static/tabs-icon/manager-a.png"
-      // },
-      {
-        "pagePath": "pages/business/business",
-        "text": "商机",
-        "iconPath": "/static/tabs-icon/manager.png",
-        "selectedIconPath": "/static/tabs-icon/manager-a.png"
-      },
-      {
-        "pagePath": "pages/oaMy/oaMy",
-        "text": "我的",
-        "iconPath": "/static/tabs-icon/my.png",
-        "selectedIconPath": "/static/tabs-icon/my-a.png"
-      }
-    ]
-  },
-  "uniIdRouter": {}
+		}]
+	}],
+	"globalStyle": {
+		"navigationBarTextStyle": "black",
+		"navigationBarTitleText": "uni-app",
+		"navigationBarBackgroundColor": "#F8F8F8",
+		"backgroundColor": "#F8F8F8"
+	},
+	"tabBar": {
+		"color": "#282828",
+		"selectedColor": "#0122C7",
+		"borderStyle": "white",
+		"backgroundColor": "#ffffff",
+		"list": [{
+				"pagePath": "pages/oaHome/oaHome",
+				"text": "首页",
+				"iconPath": "/static/tabs-icon/home.png",
+				"selectedIconPath": "/static/tabs-icon/home-a.png"
+			},
+			{
+				"pagePath": "pages/oaExamine/oaExamine",
+				"text": "审批",
+				"iconPath": "/static/tabs-icon/Task.png",
+				"selectedIconPath": "/static/tabs-icon/Task-a.png"
+			},
+			{
+				"pagePath": "pages/oaTask/oaTask",
+				"text": "任务",
+				"iconPath": "/static/tabs-icon/approval.png",
+				"selectedIconPath": "/static/tabs-icon/approval-a.png"
+			},
+			// {
+			//   "pagePath": "pages/oaManager/oaManager",
+			//   "text": "片区经理",
+			//   "iconPath": "/static/tabs-icon/manager.png",
+			//   "selectedIconPath": "/static/tabs-icon/manager-a.png"
+			// },
+			{
+				"pagePath": "pages/business/business",
+				"text": "商机",
+				"iconPath": "/static/tabs-icon/manager.png",
+				"selectedIconPath": "/static/tabs-icon/manager-a.png"
+			},
+			{
+				"pagePath": "pages/oaMy/oaMy",
+				"text": "我的",
+				"iconPath": "/static/tabs-icon/my.png",
+				"selectedIconPath": "/static/tabs-icon/my-a.png"
+			}
+		]
+	},
+	"uniIdRouter": {}
 }
\ No newline at end of file
diff --git a/pages/logistics/index.vue b/pages/logistics/index.vue
index c4f4fdc..43949d7 100644
--- a/pages/logistics/index.vue
+++ b/pages/logistics/index.vue
@@ -1,114 +1,132 @@
 <template>
-  <view>
-    <u-sticky bgColor="#0122C7" style="width: 100vw">
-      <u-tabs
-        :list="tabLists"
-        @change="sectionChange"
-        lineColor="#fff"
-        :scrollable="false"
-        lineWidth="40"
-        inactiveStyle="color:#fff"
-        activeStyle="color:#fff"
-      ></u-tabs>
-    </u-sticky>
-    <view class="content">
-      <u-search
-        placeholder="搜索你的订单"
-        @search="getOrderList"
-        :show-action="false"
-        bg-color="white"
-        v-model="keywords"
-      ></u-search>
-      <view v-if="!orderlist.length">
-        <u-empty mode="data" icon="../../static/img/empty/data.png"> </u-empty>
-      </view>
-      <view v-else>
-        <logistiCard
-          ref="logistiCards"
-          v-for="(item, index) in orderlist"
-          @getlist="getOrderList"
-          @showTost="showToast"
-          @showToast2="showToast2"
-          :goodsInfo="item"
-          :key="index"
-        >
-        </logistiCard>
-      </view>
-      <!--  -->
-      <u-toast ref="uToast"></u-toast>
-    </view>
-  </view>
+	<view>
+		<!-- <globalPopup ref="globalPopup"></globalPopup> -->
+		<u-sticky bgColor="#0122C7" style="width: 100vw;">
+			<u-tabs :list="tabLists" @change="sectionChange" lineColor='#fff' :scrollable="false" lineWidth='40'
+				inactiveStyle='color:#fff' activeStyle="color:#fff"></u-tabs>
+		</u-sticky>
+		<view class="content">
+			<u-search placeholder="搜索你的订单" @search="getOrderList" :show-action='false' bg-color='white'
+				v-model="keywords"></u-search>
+			<view v-if="!orderlist.length">
+				<u-empty mode="data" icon="../../static/img/empty/data.png">
+				</u-empty>
+			</view>
+			<view v-else>
+				<logistiCard ref="logistiCards" v-for='(item,index) in orderlist' @getlist="getOrderList"
+					@showTost='showToast' @showToast2="showToast2" :goodsInfo="item" :key="index">
+				</logistiCard>
+			</view>
+			<!--  -->
+			<u-toast ref="uToast"></u-toast>
+		</view>
+
+
+	</view>
+
 </template>
 
 <script>
-import {
-  getList
-} from "@/api/logistics.js"
-import {
-  informationAdd
-} from "@/api/logistics.js"
-import logistiCard from "@/components/logistiComptent/logistiCard/logistiCard.vue"
-export default {
-  components: {
-    logistiCard
-  },
-  data () {
-    return {
-      keywords: "",
-      list: ['待取货', '已取货', '已送达'],
-      curNow: 0,
-      orderlist: []
-    }
-  },
-  methods: {
-    sectionChange (index) {
-      this.curNow = index;
-      this.getOrderList()
-    },
+	import {
+		getList
+	} from "@/api/logistics.js"
+	// import globalPopup from "@/components/GlobalPopup/GlobalPopup.vue"
+	import {
+		informationAdd
+	} from "@/api/logistics.js"
+	import logistiCard from "@/components/logistiComptent/logistiCard/logistiCard.vue"
+	//#ifdef APP-PLUS
+	var jpushModule = uni.requireNativePlugin("JG-JPush");
+	// #endif	
+	export default {
+		components: {
+			logistiCard,
+			// globalPopup
+		},
+		data() {
+			return {
+				notArr: [],
+				keywords: "",
+				tabLists: [{
+					name: '待配送',
+				}, {
+					name: '待送达'
+				}, {
+					name: '已送达'
+				}],
+				curNow: 0,
+				orderlist: []
+			}
+		},
+		methods: {
+			go() {
+				uni.navigateTo({
+					url: "/pages/logistics/te"
+				})
+			},
+			sectionChange(index) {
 
-    showToast () {
-      // 6
-      this.$refs.uToast.show({
-        type: 'success',
-        title: '成功主题(带图标)',
-        message: "操作成功",
-        iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/success.png'
-      })
-    },
-    showToast2 () {
-      // 6
+				this.curNow = index.index;
+				this.getOrderList()
+			},
 
-      this.$refs.uToast.show({
-        type: 'error',
-        message: "取件码不能为空",
-        iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/error.png'
-      },)
-    },
-    getOrderList () {
-      console.log("列表更新")
-      let id = JSON.parse(uni.getStorageSync('USER_INFO')).id
-      getList({
-        status: this.curNow,
-        courier_id: id,
-        keywords: this.keywords
-      }).then(res => {
-        this.orderlist = []
-        this.orderlist = res.data.data
-      })
-    }
+			showToast() {
+				// 6
+				this.$refs.uToast.show({
+					type: 'success',
+					title: '成功主题(带图标)',
+					message: "操作成功",
+					iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/success.png'
+				})
+			},
+			showToast2() {
+				// 6
 
-  },
-  onLoad () { },
-  onShow () {
-    this.getOrderList()
-  }
+				this.$refs.uToast.show({
+					type: 'error',
+					message: "取件码不能为空",
+					iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/error.png'
+				}, )
+			},
+			getOrderList() {
+				console.log("列表更新")
+				let id = JSON.parse(uni.getStorageSync('USER_INFO')).id
+				getList({
+					status: this.curNow,
+					courier_id: id,
+					keywords: this.keywords
+				}).then(res => {
+					this.orderlist = []
+					this.orderlist = res.data.data
+				})
+			}
 
-}
+		},
+		onLoad() {
+			let that = this
+			//#ifdef APP-PLUS
+			jpushModule.addNotificationListener(function(result) {
+				if (!that.notArr.includes(result.messageID)) {
+					that.$refs.globalPopup.showPopu();
+					that.getOrderList()
+
+				}
+				that.notArr.push(result.messageID)
+			})
+			// #endif	
+		},
+		onShow() {
+			this.getOrderList()
+
+		}
+
+	}
 </script>
 
 <style lang='scss'>
-.content {
-  background-color: #f5f5f5;
-  padding: 1vh 2vw;
-}
+	.content {
+		margin-top: 2vh;
+		background-color: #F5F5F5;
+		padding: 0vh 2vw;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/logistics/te.vue b/pages/logistics/te.vue
index 95a9419..967a0ce 100644
--- a/pages/logistics/te.vue
+++ b/pages/logistics/te.vue
@@ -1,3 +1,5 @@
+<!--  -->
+
 <template>
 	<view>
 		<button @click="test2">按钮</button>
diff --git a/pages/oaHome/oaHome.vue b/pages/oaHome/oaHome.vue
index 1f5c819..2a82232 100644
--- a/pages/oaHome/oaHome.vue
+++ b/pages/oaHome/oaHome.vue
@@ -1,55 +1,49 @@
 <template>
-  <view class="oa_home" style="oaColor">
-    <!-- <image class="header_bg" src="../../static/img/home/head-bg.png"></image> -->
+	<view class="oa_home" style="oaColor">
+		<!-- <image class="header_bg" src="../../static/img/home/head-bg.png"></image> -->
 
-    <view
-      class="home_header"
-      :class="!ApproveList.length > 0 ? 'home_header_no_data' : ''"
-    >
-      <!-- #ifdef APP-PLUS||H5 -->
-      <view style="height: var(--status-bar-height)"></view>
-      <view style="height: 100rpx"></view>
-      <!-- #endif -->
-      <view class="my_info flex_a_c">
-        <view class="">
-          <u--image
-            :showLoading="true"
-            :src="myOaInfo.avatar || '../../static/img/public/avatar.png'"
-            width="130.28rpx"
-            height="130.28rpx"
-            shape="circle"
-          ></u--image>
-        </view>
-        <view v-if="!$store.state.app.token" @click="login" class="mesg_box">
-          <view class="name">
-            <text class="nickname">立即登录</text>
-          </view>
-          <view class="duty"> 登录后可查看更多 </view>
-        </view>
-        <view v-else class="mesg_box">
-          <view class="name">
-            <text class="nickname">姓名:{{ myOaInfo.nickname }}</text>
-            <text>（{{ myOaInfo.admin_id ? "超级管理员" : "普通用户" }}）</text>
-          </view>
-          <view class="duty">
-            <!-- ({{ myOaInfo.did_name }}){{myOaInfo.label_name}} -->
-            电话:{{ myOaInfo.account }}<br />
-            公司:<text v-if="myOaInfo.company">{{
+		<view class="home_header" :class="!ApproveList.length > 0 ? 'home_header_no_data' : ''">
+			<!-- #ifdef APP-PLUS||H5 -->
+			<view style="height: var(--status-bar-height)"></view>
+			<view style="height: 100rpx"></view>
+			<!-- #endif -->
+			<view class="my_info ">
+				<view class="head_img">
+					<u--image :showLoading="true" style="translate:0 -10rpx ;"
+						:src="myOaInfo.avatar || '../../static/img/public/avatar.png'" width="150.28rpx"
+						height="150.28rpx" shape="circle"></u--image>
+
+					<text class="nickname">工作证: {{ myOaInfo.nickname }}</text>
+					<text>身份: {{ myOaInfo.admin_id ? "超级管理员" : "普通用户" }}</text>
+				</view>
+				<view v-if="!$store.state.app.token" @click="login" class="mesg_box">
+					<view class="name">
+						<text class="nickname">立即登录</text>
+					</view>
+					<view class="duty"> 登录后可查看更多 </view>
+				</view>
+				<!-- <view v-else class="mesg_box">
+					<view class="name">
+						<text class="nickname">姓名:{{ myOaInfo.nickname }}</text>
+						<text>（{{ myOaInfo.admin_id ? "超级管理员" : "普通用户" }}）</text>
+					</view>
+					<view class="duty">
+
+						电话:{{ myOaInfo.account }}<br />
+						公司:<text v-if="myOaInfo.company">{{
               myOaInfo.company.company_name
-            }}</text
-            ><br />
-            公司类型:<text v-if="myOaInfo.company">{{
+            }}</text><br />
+						公司类型:<text v-if="myOaInfo.company">{{
               myOaInfo.company.company_type_name
-            }}</text
-            ><br />
-          </view>
-        </view>
-      </view>
+            }}</text><br />
+					</view>
+				</view> -->
+			</view>
 
-      <!-- 占位 -->
-      <view style="height: 130rpx"></view>
-      <!-- 任务状态 -->
-      <!-- <view class="task_panel">
+			<!-- 占位 -->
+			<view style="height: 130rpx"></view>
+			<!-- 任务状态 -->
+			<!-- <view class="task_panel">
         <block v-for="(item,index) in assessData" :key="index">
           <view class="task_item">
             <view class="plan">{{ item.num }}</view>
@@ -58,85 +52,77 @@
         </block>
       </view> -->
 
-      <view
-        class="backlog"
-        :class="!ApproveList.length > 0 ? 'backlog_no_data' : ''"
-      >
-        <view class="head_title flex_a_c_j_sb">
-          <view class="title">公告列表</view>
-          <view class="flex_a_c" @click="navTo('/subpkg/noticeList/noticeList')"
-            >更多
-            <view class="iconfont icon-you">
-              <uni-icons type="forward"></uni-icons>
-            </view>
-          </view>
-        </view>
-        <block v-if="ApproveList.length > 0">
-          <view
-            class="backlog_item flex_a_c_j_sb"
-            v-for="(item, index) in ApproveList.slice(0, 2)"
-            :key="index"
-            @click="clickNotice(item.id)"
-          >
-            <view class="text">{{ item.title }}</view>
-            <i class="iconfont icon-you"
-              ><uni-icons type="forward"></uni-icons
-            ></i>
-          </view>
-        </block>
-        <view v-else class="backlog_no flex_a_c_j_sb">
-          <view class="text">暂无更多消息</view>
-          <i class="iconfont icon-you"
-            ><uni-icons type="forward"></uni-icons
-          ></i>
-        </view>
-      </view>
-    </view>
+			<view class="backlog" :class="!ApproveList.length > 0 ? 'backlog_no_data' : ''">
+				<view class="head_title flex_a_c_j_sb">
+					<view class="title">公告列表</view>
+					<view class="flex_a_c" @click="navTo('/subpkg/noticeList/noticeList')">更多
+						<view class="iconfont icon-you">
+							<uni-icons type="forward"></uni-icons>
+						</view>
+					</view>
+				</view>
+				<block v-if="ApproveList.length > 0">
 
-    <view class="fast_track">
-      <block v-for="(item, index) in oaHomeData" :key="index">
-        <view class="track_item" @click="navTwo(item.url, index)">
-          <u--image
-            :showLoading="true"
-            :src="item.icon"
-            width="77.19rpx"
-            height="77.19rpx"
-          ></u--image>
-          <view class="title">{{ item.text }}</view>
-        </view>
-      </block>
-    </view>
+					<view class="backlog_item flex_a_c_j_sb" v-for="(item, index) in ApproveList.slice(0, 2)"
+						:key="index" @click="clickNotice(item.id)">
 
-    <view class="my_task">
-      <view class="task_title flex_a_c_j_sb">
-        <view class="title">配送信息</view>
-        <view class="flex_a_c" @click="goOrderList"
-          >更多
-          <view class="iconfont icon-you">
-            <uni-icons type="forward"></uni-icons>
-          </view>
-        </view>
-      </view>
+						<view class="text"> <text class="text_time">{{item.create_time.substring(0, 10)}}</text>
+							{{ item.title }}
+						</view>
 
-      <!-- <block v-if="myTaskList.length>0">
+						<i class="iconfont icon-you"><uni-icons type="forward"></uni-icons></i>
+					</view>
+				</block>
+				<view v-else class="backlog_no flex_a_c_j_sb">
+					<view class="text">暂无更多消息</view>
+					<i class="iconfont icon-you"><uni-icons type="forward"></uni-icons></i>
+				</view>
+			</view>
+		</view>
+		<view class="my_task">
+			<view class="task_title flex_a_c_j_sb">
+				<view class="title">工作管理</view>
+				<view class="flex_a_c">更多
+					<view class="iconfont icon-you">
+						<uni-icons type="forward"></uni-icons>
+					</view>
+				</view>
+			</view>
+		</view>
+
+
+		<view class="fast_track">
+			<block v-for="(item, index) in oaHomeData" :key="index">
+				<view class="track_item" @click="navTwo(item.url, index)">
+					<u--image :showLoading="true" :src="item.icon" width="77.19rpx" height="77.19rpx"></u--image>
+					<view class="title">{{ item.text }}</view>
+				</view>
+			</block>
+		</view>
+
+		<view class="my_task">
+			<view class="task_title flex_a_c_j_sb">
+				<view class="title">配送信息</view>
+				<view class="flex_a_c" @click="goOrderList">更多
+					<view class="iconfont icon-you">
+						<uni-icons type="forward"></uni-icons>
+					</view>
+				</view>
+			</view>
+
+			<!-- <block v-if="myTaskList.length>0">
    		<taskCard></taskCard>
    	</block> -->
-      <view v-if="orderList.length > 0">
-        <logistiBriefCard
-          v-for="(item, index) in orderList"
-          :key="index"
-          :goodsInfo="item"
-        >
-        </logistiBriefCard>
-      </view>
+			<view v-if="orderList.length > 0">
+				<logistiBriefCard v-for="(item, index) in orderList" :key="index" :goodsInfo="item">
+				</logistiBriefCard>
+			</view>
 
-      <view v-else class="no_task">
-        <view class="title">暂无配送信息</view>
-        <view class="tips" v-if="!$store.state.app.token"
-          >登录后查看配送信息详情</view
-        >
-      </view>
-      <!-- <view class="head_title flex_a_c_j_sb">
+			<view v-else class="no_task">
+				<view class="title">暂无配送信息</view>
+				<view class="tips" v-if="!$store.state.app.token">登录后查看配送信息详情</view>
+			</view>
+			<!-- <view class="head_title flex_a_c_j_sb">
         <view class="">我的任务</view>
         <view class="flex_a_c" @click="test">更多 <view class="iconfont icon-you"></view>
         </view>
@@ -160,565 +146,587 @@
           </view>
         </view>
       </block> -->
-    </view>
+		</view>
 
-    <view class="no_login" @click="login" v-if="!$store.state.app.token">
-      <view class="view">
-        <view class="text">登录里海OA,开启线上便捷办公</view>
-        <button class="btn">立即登录</button>
-      </view>
-    </view>
-    <!-- <tabbar></tabbar> -->
-  </view>
+		<view class="no_login" @click="login" v-if="!$store.state.app.token">
+			<view class="view">
+				<view class="text">登录里海OA,开启线上便捷办公</view>
+				<button class="btn">立即登录</button>
+			</view>
+		</view>
+		<!-- <tabbar></tabbar> -->
+	</view>
 </template>
 
 <script>
-import logistiBriefCard from "@/components/logistiComptent/logistiCard/logistiBriefCard.vue"
-import {
-  getList
-} from "@/api/logistics.js"
-import {
-  Toast
-} from '@/libs/uniApi.js'
-import {
-  oaHomeData
-} from '@/static/server/server.js'
-import {
-  noticeList
-} from "@/api/notice.js"
-// import tabbar from '../components/tabbar'
-import {
-  getIndexListAPI,
-  getTaskListAPI,
-  getMyTaskListAPI,
-  getApproveListAPI,
-  getUserIndexAPI
-} from '@/api/oaApi.js'
-export default {
-  components: {
-    // tabbar
-    logistiBriefCard
-  },
-  data () {
-    return {
-      orderList: [],
-      oaHomeData: [],
-      src: 'https://cdn.uviewui.com/uview/album/1.jpg',
-      assessData: [{
-        num: '0',
-        name: '任务'
-      },
-      {
-        num: '0',
-        name: '已完成'
-      },
-      {
-        num: '0',
-        name: '未完成'
-      },
-      {
-        num: '0%',
-        name: '完成率'
-      },
-      ],
-      project: {},
-      task: {},
-      page: 1,
-      myTaskList: [],
-      flowState: '#47B347', // 任务状态
-      priority: '', // 任务紧急度
-      myOaInfo: {
-        avatar: '',
-        nickname: '',
-        mobile: '',
-        did_name: '',
-        label_name: '',
-      },
-      ApproveList: []
-    }
-  },
-  onReady () {
-    uni.setNavigationBarColor({
-      frontColor: '#ffffff',
-      backgroundColor: '#3175f9'
-    })
-  },
-  onLoad () { },
-  onShow () {
-    // this.getUserIndex()
-    // this.getIndexList()
-    this.getApproveList()
-    this.initUserInfo()
-    this.showToask()
-    this.initOaHomeDada()
-    this.getOrderList()
-  },
-  computed: {},
-  methods: {
-    // test() {
-    //   wx.chooseMessageFile({
-    //     count: 1, //限制选择的文件数量
-    //     type: 'all', //非图片和视频的文件,不选默认为all
-    //     //type:'video',//视频
-    //     //type:'image',//图片
-    //     success(res) {
-    //       const tempFilePaths = res.tempFiles
-    //       console.log(res);
-    //     }
-    //   })
-    // },
-    async getOrderList () {
-      let id = JSON.parse(uni.getStorageSync('USER_INFO')).id || ""
-      let res = await getList({
-        courier_id: id
-        // courier_id: 167
-      })
-      this.orderList = res.data.data
+	import logistiBriefCard from "@/components/logistiComptent/logistiCard/logistiBriefCard.vue"
+	import {
+		getList
+	} from "@/api/logistics.js"
+	import {
+		Toast
+	} from '@/libs/uniApi.js'
+	import {
+		oaHomeData
+	} from '@/static/server/server.js'
+	import {
+		noticeList
+	} from "@/api/notice.js"
+	// import tabbar from '../components/tabbar'
+	import {
+		getIndexListAPI,
+		getTaskListAPI,
+		getMyTaskListAPI,
+		getApproveListAPI,
+		getUserIndexAPI
+	} from '@/api/oaApi.js'
+	export default {
+		components: {
+			// tabbar
+			logistiBriefCard
+		},
+		data() {
+			return {
+				orderList: [],
+				oaHomeData: [],
+				src: 'https://cdn.uviewui.com/uview/album/1.jpg',
+				assessData: [{
+						num: '0',
+						name: '任务'
+					},
+					{
+						num: '0',
+						name: '已完成'
+					},
+					{
+						num: '0',
+						name: '未完成'
+					},
+					{
+						num: '0%',
+						name: '完成率'
+					},
+				],
+				project: {},
+				task: {},
+				page: 1,
+				myTaskList: [],
+				flowState: '#47B347', // 任务状态
+				priority: '', // 任务紧急度
+				myOaInfo: {
+					avatar: '',
+					nickname: '',
+					mobile: '',
+					did_name: '',
+					label_name: '',
+				},
+				ApproveList: []
+			}
+		},
+		onReady() {
+			uni.setNavigationBarColor({
+				frontColor: '#ffffff',
+				backgroundColor: '#3175f9'
+			})
+		},
+		onLoad() {},
+		onShow() {
+			// this.getUserIndex()
+			// this.getIndexList()
+			this.getApproveList()
+			this.initUserInfo()
+			this.showToask()
+			this.initOaHomeDada()
+			this.getOrderList()
+		},
+		computed: {},
+		methods: {
+			// test() {
+			//   wx.chooseMessageFile({
+			//     count: 1, //限制选择的文件数量
+			//     type: 'all', //非图片和视频的文件,不选默认为all
+			//     //type:'video',//视频
+			//     //type:'image',//图片
+			//     success(res) {
+			//       const tempFilePaths = res.tempFiles
+			//       console.log(res);
+			//     }
+			//   })
+			// },
+			async getOrderList() {
+				let id = JSON.parse(uni.getStorageSync('USER_INFO')).id || ""
+				let res = await getList({
+					courier_id: id
+					// courier_id: 167
+				})
+				this.orderList = res.data.data
 
-    },
-    goOrderList () {
-      uni.navigateTo({
-        url: "/pages/logistics/index"
-      })
-    },
-    initUserInfo () {
-      this.$store.state.app.userInfo ? this.myOaInfo = this.$store.state.app.userInfo : this.myOaInfo.avatar =
-        '';
-    },
-    initOaHomeDada () {
-      if (this.$store.state.app.userInfo.admin_id == 0) { // 如果用户不是管理员
-        let arr = oaHomeData.filter(item => !item.admin); //过滤掉管理员专属页面
-        this.oaHomeData = arr;
-      } else {
-        // this.oaHomeData = oaHomeData;
-        let arr = oaHomeData.filter(item => !item.captain); //过滤掉普通用户专属页面
-        this.oaHomeData = arr;
-      }
-      if (this.$store.state.app.userInfo?.company?.company_type_name == '平台公司') {
-        this.oaHomeData = this.oaHomeData.filter(item => {
-          return item.text == '人员管理' ? false : true;
-        })
-      }
-      // 判断是否需要显示更多按钮
-      if (this.oaHomeData >= 8) {
-        this.oaHomeData[7] = this.oaHomeData[this.oaHomeData.length - 1];
-      } else {
-        this.oaHomeData.splice(this.oaHomeData.length - 1, 1)
-      }
-    },
-    async getApproveList () {
-      const res = await noticeList({
-        keyword: '',
-        page_no: 1,
-        page_size: 2
-      })
-      this.ApproveList = res.data.lists
-    },
-    async getIndexList () {
-      const {
-        project,
-        task
-      } = await getIndexListAPI()
-      console.log(task, '222');
-      this.assessData[0].num = project.count
-      this.assessData[1].num = project.count_ok
-      this.assessData[2].num = project.count_no
-      this.assessData[3].num = project.count_lv + '%'
-      this.assessData[4].num = task.count
-      this.assessData[5].num = task.count_ok
-      this.assessData[6].num = task.count_no
-      this.assessData[7].num = task.count_lv + '%'
-      this.myTaskList = task.list
-    },
-    async getMyTask () {
-      let data = {
-        page: this.page,
-        limit: 10
-      }
-      const res = getMyTaskListAPI(data)
-    },
-    naviTaskDetails (id) {
-      uni.navigateTo({
-        url: `/pages/views/task_details?id=${id}`
-      })
-    },
-    navTo (url) {
-      url ?
-        uni.navigateTo({
-          url: url,
-          fail () {
-            uni.switchTab({
-              url: url
-            })
-          }
-        }) : Toast('暂未开放')
-    },
-    navTwo (url, key) {
-      let role_id = this.$store.state.app?.userInfo?.admin?.role_id || null;
-      var arr = [3, 6];
+			},
+			goOrderList() {
+				uni.navigateTo({
+					url: "/pages/logistics/index"
+				})
+			},
+			initUserInfo() {
+				this.$store.state.app.userInfo ? this.myOaInfo = this.$store.state.app.userInfo : this.myOaInfo.avatar =
+					'';
+			},
+			initOaHomeDada() {
+				if (this.$store.state.app.userInfo.admin_id == 0) { // 如果用户不是管理员
+					let arr = oaHomeData.filter(item => !item.admin); //过滤掉管理员专属页面
+					this.oaHomeData = arr;
+				} else {
+					// this.oaHomeData = oaHomeData;
+					let arr = oaHomeData.filter(item => !item.captain); //过滤掉普通用户专属页面
+					this.oaHomeData = arr;
+				}
+				if (this.$store.state.app.userInfo?.company?.company_type_name == '平台公司') {
+					this.oaHomeData = this.oaHomeData.filter(item => {
+						return item.text == '人员管理' ? false : true;
+					})
+				}
+				// 判断是否需要显示更多按钮
+				if (this.oaHomeData >= 8) {
+					this.oaHomeData[7] = this.oaHomeData[this.oaHomeData.length - 1];
+				} else {
+					this.oaHomeData.splice(this.oaHomeData.length - 1, 1)
+				}
+			},
+			async getApproveList() {
+				const res = await noticeList({
+					keyword: '',
+					page_no: 1,
+					page_size: 2
+				})
+				this.ApproveList = res.data.lists
+			},
+			async getIndexList() {
+				const {
+					project,
+					task
+				} = await getIndexListAPI()
+				console.log(task, '222');
+				this.assessData[0].num = project.count
+				this.assessData[1].num = project.count_ok
+				this.assessData[2].num = project.count_no
+				this.assessData[3].num = project.count_lv + '%'
+				this.assessData[4].num = task.count
+				this.assessData[5].num = task.count_ok
+				this.assessData[6].num = task.count_no
+				this.assessData[7].num = task.count_lv + '%'
+				this.myTaskList = task.list
+			},
+			async getMyTask() {
+				let data = {
+					page: this.page,
+					limit: 10
+				}
+				const res = getMyTaskListAPI(data)
+			},
+			naviTaskDetails(id) {
+				uni.navigateTo({
+					url: `/pages/views/task_details?id=${id}`
+				})
+			},
+			navTo(url) {
+				url ?
+					uni.navigateTo({
+						url: url,
+						fail() {
+							uni.switchTab({
+								url: url
+							})
+						}
+					}) : Toast('暂未开放')
+			},
+			navTwo(url, key) {
+				let role_id = this.$store.state.app?.userInfo?.admin?.role_id || null;
+				var arr = [3, 6];
 
-      if (role_id && role_id[0] == 9) {
-        if (arr.indexOf(key) == -1) {
-          Toast('请先成立公司后开放')
-          return false
-        }
-      }
-      this.navTo(url);
-    },
-    // 点击公告
-    clickNotice (e) {
-      uni.navigateTo({
-        url: `/pages/oaNews/oaNews?id=${e}`
-      })
-    },
-    // 判断当前是否登录,显示任务及完成率
-    showToask () {
-      if (!this.$store.state.app.token) {
-        this.assessData = this.assessData.map(item => {
-          item.num = '*';
-          return item;
-        })
-      } else {
-        // 新增接口后要替换为接口
-        this.assessData = this.assessData.map(item => {
-          item.num = '0';
-          return item;
-        })
-      }
-    },
-    login () {
-      uni.navigateTo({
-        url: '/pages/oaLogin/oaLogin'
-      })
-    },
-    async getUserIndex () {
-      const res = await getUserIndexAPI()
-      this.myOaInfo = res
-    }
-  },
-  onPullDownRefresh () {
-    // this.getIndexList()
-    uni.stopPullDownRefresh()
-  }
-}
+				if (role_id && role_id[0] == 9) {
+					if (arr.indexOf(key) == -1) {
+						Toast('请先成立公司后开放')
+						return false
+					}
+				}
+				this.navTo(url);
+			},
+			// 点击公告
+			clickNotice(e) {
+				uni.navigateTo({
+					url: `/pages/oaNews/oaNews?id=${e}`
+				})
+			},
+			// 判断当前是否登录,显示任务及完成率
+			showToask() {
+				if (!this.$store.state.app.token) {
+					this.assessData = this.assessData.map(item => {
+						item.num = '*';
+						return item;
+					})
+				} else {
+					// 新增接口后要替换为接口
+					this.assessData = this.assessData.map(item => {
+						item.num = '0';
+						return item;
+					})
+				}
+			},
+			login() {
+				uni.navigateTo({
+					url: '/pages/oaLogin/oaLogin'
+				})
+			},
+			async getUserIndex() {
+				const res = await getUserIndexAPI()
+				this.myOaInfo = res
+			}
+		},
+		onPullDownRefresh() {
+			// this.getIndexList()
+			uni.stopPullDownRefresh()
+		}
+	}
 </script>
 
 <style lang="scss">
-.oa_home {
-  padding-bottom: 120rpx;
-}
+	.oa_home {
+		padding-bottom: 120rpx;
+	}
 
-.header_bg {
-  position: absolute;
-  width: 100%;
-  // z-index: -1;
-}
+	.header_bg {
+		position: absolute;
+		width: 100%;
+		// z-index: -1;
+	}
 
-.home_header {
-  position: relative;
-  padding: 28rpx;
-  // height: 607.02rpx;
-  // height: 480.02rpx;
-  width: 100%;
-  // background-color: $theme-oa-color;
-  margin-bottom: 133.33rpx;
-  background-image: url("../../static/img/home/home_bg.png");
-  background-repeat: no-repeat;
-  background-size: 100% 100%;
+	.home_header {
+		position: relative;
+		padding: 28rpx;
+		// height: 607.02rpx;
+		// height: 480.02rpx;
+		width: 100%;
+		// background-color: $theme-oa-color;
+		margin-bottom: 133.33rpx;
+		background-color: $theme-oa-color;
+		border-radius: 0 0 30rpx 30rpx;
 
-  .my_info {
-    .mesg_box {
-      color: #fff;
-      margin-left: 31.58rpx;
+		.head_img {
+			background-color: #FF7C32;
+			width: 100%;
+			border-radius: 70rpx 50rpx 50rpx 70rpx;
+			height: 130.28rpx;
+			display: flex;
+			justify-content: space-between;
+			padding-right: 50rpx;
+			line-height: 130rpx;
+			color: white;
+			font-size: 30rpx;
+			// font-we
+		}
 
-      .nickname {
-        font-size: 32rpx;
-        font-weight: 500;
-        margin-right: 30rpx;
-      }
+		.my_info {
+			.mesg_box {
+				color: #fff;
+				margin-left: 31.58rpx;
 
-      .duty {
-        margin-top: 10.53rpx;
-      }
-    }
-  }
+				.nickname {
+					font-size: 32rpx;
+					font-weight: 500;
+					margin-right: 30rpx;
+				}
 
-  .task_panel {
-    color: #fff;
-    display: flex;
-    justify-content: space-between;
-    flex-wrap: wrap;
-    align-content: space-between;
-    text-align: center;
-    padding-bottom: 110rpx;
+				.duty {
+					margin-top: 10.53rpx;
+				}
+			}
+		}
 
-    .task_item {
-      margin-top: 42.11rpx;
+		.task_panel {
+			color: #fff;
+			display: flex;
+			justify-content: space-between;
+			flex-wrap: wrap;
+			align-content: space-between;
+			text-align: center;
+			padding-bottom: 110rpx;
 
-      .plan {
-        width: 173.68rpx;
-        font-size: 38.6rpx;
-        margin-bottom: 21.05rpx;
-      }
-    }
-  }
+			.task_item {
+				margin-top: 42.11rpx;
 
-  .backlog {
-    position: absolute;
-    left: 50%;
-    bottom: -101.75rpx;
-    transform: translate(-50%);
-    width: 694.74rpx;
-    background: #ffffff;
-    border-radius: 12px;
-    padding: 28.07rpx;
-    display: flex;
-    flex-direction: column;
-    justify-content: space-between;
-    font-size: 25rpx;
-    font-weight: 400;
+				.plan {
+					width: 173.68rpx;
+					font-size: 38.6rpx;
+					margin-bottom: 21.05rpx;
+				}
+			}
+		}
 
-    .title {
-      font-size: 32rpx;
-      font-weight: 500;
-    }
+		.backlog {
+			position: absolute;
+			left: 50%;
+			bottom: -101.75rpx;
+			transform: translate(-50%);
+			width: 694.74rpx;
+			background: #ffffff;
+			border-radius: 12px;
+			padding: 28.07rpx;
+			display: flex;
+			flex-direction: column;
+			justify-content: space-between;
+			font-size: 25rpx;
+			font-weight: 400;
 
-    &_item {
-      margin-top: 19.3rpx;
-      color: #666666;
+			.title {
+				font-size: 32rpx;
+				font-weight: 500;
+			}
 
-      .text {
-        font-size: 28.04rpx;
-        white-space: nowrap;
-        /* 禁止换行 */
-        overflow: hidden;
-        /* 溢出隐藏 */
-        text-overflow: ellipsis;
-        /* 使用省略号代表被截断的文本 */
-        width: 580rpx;
-        /* 设置元素宽度，根据需要进行调整 */
+			&_item {
+				margin-top: 19.3rpx;
+				color: #666666;
 
-        &::before {
-          content: "公告";
-          display: inline-block;
-          color: #ff8c1a;
-          padding: 2px 8px;
-          border-radius: 4px;
-          border: 1px solid #ff8c1a;
-          margin-right: 14.04rpx;
-        }
-      }
-    }
+				.text {
+					font-size: 28.04rpx;
+					white-space: nowrap;
+					/* 禁止换行 */
+					overflow: hidden;
+					/* 溢出隐藏 */
+					text-overflow: ellipsis;
+					/* 使用省略号代表被截断的文本 */
+					width: 580rpx;
 
-    &_no {
-      margin-top: 19.3rpx;
-      color: #666666;
+					/* 设置元素宽度，根据需要进行调整 */
+					.text_time {
+						display: inline-block;
+						background-color: #ff8c1a;
+						color: white;
+						padding: 5rpx 10rpx;
+						margin-right: 10rpx;
+						border-radius: 15rpx;
+					}
 
-      .text {
-        font-size: 28.04rpx;
-        white-space: nowrap;
-        /* 禁止换行 */
-        overflow: hidden;
-        /* 溢出隐藏 */
-        text-overflow: ellipsis;
-        /* 使用省略号代表被截断的文本 */
-        width: 580rpx;
-        /* 设置元素宽度，根据需要进行调整 */
+					// &::before {
+					// 	content: "公告";
+					// 	display: inline-block;
+					// 	color: #ff8c1a;
+					// 	padding: 2px 8px;
+					// 	border-radius: 4px;
+					// 	border: 1px solid #ff8c1a;
+					// 	margin-right: 14.04rpx;
+					// }
+				}
+			}
 
-        &::before {
-          content: none;
-        }
-      }
-    }
-  }
+			&_no {
+				margin-top: 19.3rpx;
+				color: #666666;
 
-  .backlog_no_data {
-    bottom: -70rpx;
-  }
-}
+				.text {
+					font-size: 28.04rpx;
+					white-space: nowrap;
+					/* 禁止换行 */
+					overflow: hidden;
+					/* 溢出隐藏 */
+					text-overflow: ellipsis;
+					/* 使用省略号代表被截断的文本 */
+					width: 580rpx;
+					/* 设置元素宽度，根据需要进行调整 */
 
-.home_header_no_data {
-  margin-bottom: 93.33rpx;
-}
+					&::before {
+						content: none;
+					}
+				}
+			}
+		}
 
-.fast_track {
-  width: 694rpx;
-  // height: 331rpx;
-  display: flex;
-  flex-wrap: wrap;
-  justify-content: left;
-  align-content: space-between;
-  margin: 0 auto;
-  padding: 15rpx 38.6rpx;
-  background-color: #fff;
-  border-radius: 12px;
+		.backlog_no_data {
+			bottom: -70rpx;
+		}
+	}
 
-  .track_item {
-    width: 154.39rpx;
-    font-size: 24.56rpx;
-    margin: 25rpx 0;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
+	.home_header_no_data {
+		margin-bottom: 93.33rpx;
+	}
 
-    .title {
-      margin-top: 14.04rpx;
-    }
-  }
-}
+	.fast_track {
+		width: 694rpx;
+		// height: 331rpx;
+		display: flex;
+		flex-wrap: wrap;
+		justify-content: left;
+		align-content: space-between;
+		margin: 0 auto;
+		padding: 15rpx 38.6rpx;
+		background-color: #fff;
+		border-radius: 12px;
 
-.my_task {
-  width: 694.74rpx;
-  margin: 0 auto;
-  // margin-top: 31.58rpx;
-  // background-color: #fff;
-  border-radius: 12px;
-  // padding: 28.07rpx;
+		.track_item {
+			width: 154.39rpx;
+			font-size: 24.56rpx;
+			margin: 25rpx 0;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
 
-  .no_task {
-    width: 694rpx;
-    height: 140rpx;
-    padding: 28rpx;
-    background: #ffffff;
-    border-radius: 21rpx 21rpx 21rpx 21rpx;
-    display: flex;
-    flex-direction: column;
-    justify-content: space-evenly;
+			.title {
+				margin-top: 14.04rpx;
+			}
+		}
+	}
 
-    .title {
-      font-size: 28rpx;
-      font-weight: 500;
-      color: #000000cc;
-      line-height: 35rpx;
-    }
+	.my_task {
+		width: 694.74rpx;
+		margin: 0 auto;
+		// margin-top: 31.58rpx;
+		// background-color: #fff;
+		border-radius: 12px;
+		// padding: 28.07rpx;
 
-    .tips {
-      font-size: 25rpx;
-      font-weight: 400;
-      color: #333333ff;
-      line-height: 35rpx;
-    }
-  }
+		.no_task {
+			width: 694rpx;
+			height: 140rpx;
+			padding: 28rpx;
+			background: #ffffff;
+			border-radius: 21rpx 21rpx 21rpx 21rpx;
+			display: flex;
+			flex-direction: column;
+			justify-content: space-evenly;
 
-  .task_title {
-    font-size: 25rpx;
-    font-weight: 400;
-    padding: 28rpx;
+			.title {
+				font-size: 28rpx;
+				font-weight: 500;
+				color: #000000cc;
+				line-height: 35rpx;
+			}
 
-    .title {
-      font-size: 32rpx;
-      font-weight: 500;
-    }
-  }
+			.tips {
+				font-size: 25rpx;
+				font-weight: 400;
+				color: #333333ff;
+				line-height: 35rpx;
+			}
+		}
 
-  .task_list {
-    height: 196.49rpx;
-    border-bottom: 1px solid #cccccc;
-    padding: 21.05rpx 0;
-    display: flex;
-    flex-direction: column;
-    justify-content: space-between;
+		.task_title {
+			font-size: 25rpx;
+			font-weight: 400;
+			padding: 28rpx;
 
-    .title {
-      .tag {
-        color: #f24848;
-        font-size: 24.56rpx;
-        padding: 0 7.02rpx;
-        margin-right: 14.04rpx;
-        background: #ffe4e4;
-        border-radius: 4px;
-      }
+			.title {
+				font-size: 32rpx;
+				font-weight: 500;
+			}
+		}
 
-      .tag1 {
-        color: #3274f9;
-        font-size: 24.56rpx;
-        padding: 0 7.02rpx;
-        margin-right: 14.04rpx;
-        background: #e4edff;
-        border-radius: 4px;
-      }
+		.task_list {
+			height: 196.49rpx;
+			border-bottom: 1px solid #cccccc;
+			padding: 21.05rpx 0;
+			display: flex;
+			flex-direction: column;
+			justify-content: space-between;
 
-      .text {
-        font-size: 28.07rpx;
-        width: 403.51rpx;
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
-      }
+			.title {
+				.tag {
+					color: #f24848;
+					font-size: 24.56rpx;
+					padding: 0 7.02rpx;
+					margin-right: 14.04rpx;
+					background: #ffe4e4;
+					border-radius: 4px;
+				}
 
-      .if_take {
-        font-size: 28.07rpx;
-        text-align: center;
-        line-height: 49.12rpx;
-        width: 115.79rpx;
-        height: 49.12rpx;
-        border-radius: 100px;
-      }
+				.tag1 {
+					color: #3274f9;
+					font-size: 24.56rpx;
+					padding: 0 7.02rpx;
+					margin-right: 14.04rpx;
+					background: #e4edff;
+					border-radius: 4px;
+				}
 
-      .take1 {
-        color: #47b347;
-        background: #dffcdf;
-      }
+				.text {
+					font-size: 28.07rpx;
+					width: 403.51rpx;
+					white-space: nowrap;
+					overflow: hidden;
+					text-overflow: ellipsis;
+				}
 
-      .take2 {
-        color: #3274f9;
-        background: #e4edff;
-      }
+				.if_take {
+					font-size: 28.07rpx;
+					text-align: center;
+					line-height: 49.12rpx;
+					width: 115.79rpx;
+					height: 49.12rpx;
+					border-radius: 100px;
+				}
 
-      .take3 {
-        color: #999999;
-        background: #f5f5f5;
-      }
-    }
+				.take1 {
+					color: #47b347;
+					background: #dffcdf;
+				}
 
-    .describe {
-      font-size: 24.56rpx;
-    }
+				.take2 {
+					color: #3274f9;
+					background: #e4edff;
+				}
 
-    .task_deta {
-      color: #999;
-      font-size: 24.56rpx;
-    }
-  }
-}
+				.take3 {
+					color: #999999;
+					background: #f5f5f5;
+				}
+			}
 
-.no_login {
-  position: fixed;
-  left: 0;
-  bottom: 0;
-  width: 100vw;
-  height: 112rpx;
-  /* #ifdef H5 */
-  height: 212rpx;
-  /* #endif */
-  background: rgba(#333333, 0.4);
-  border-radius: 14rpx 14rpx 0rpx 0rpx;
-  padding: 28rpx 28rpx;
+			.describe {
+				font-size: 24.56rpx;
+			}
 
-  .view {
-    width: 100%;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
+			.task_deta {
+				color: #999;
+				font-size: 24.56rpx;
+			}
+		}
+	}
 
-    .text {
-      font-size: 28rpx;
-      font-weight: 500;
-      color: #ffffff;
-    }
+	.no_login {
+		position: fixed;
+		left: 0;
+		bottom: 0;
+		width: 100vw;
+		height: 112rpx;
+		/* #ifdef H5 */
+		height: 212rpx;
+		/* #endif */
+		background: rgba(#333333, 0.4);
+		border-radius: 14rpx 14rpx 0rpx 0rpx;
+		padding: 28rpx 28rpx;
 
-    .btn {
-      width: 158rpx;
-      height: 60rpx;
-      background: #3274f9;
-      border-radius: 30rpx 30rpx 30rpx 30rpx;
-      font-size: 28rpx;
-      font-weight: 500;
-      color: #ffffff;
-      display: flex;
-      justify-content: center;
-      align-items: center;
-    }
-  }
-}
+		.view {
+			width: 100%;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+
+			.text {
+				font-size: 28rpx;
+				font-weight: 500;
+				color: #ffffff;
+			}
+
+			.btn {
+				width: 158rpx;
+				height: 60rpx;
+				background: #3274f9;
+				border-radius: 30rpx 30rpx 30rpx 30rpx;
+				font-size: 28rpx;
+				font-weight: 500;
+				color: #ffffff;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+			}
+		}
+	}
 </style>
\ No newline at end of file
diff --git a/static/css/global.scss b/static/css/global.scss
new file mode 100644
index 0000000..3d84be3
--- /dev/null
+++ b/static/css/global.scss
@@ -0,0 +1 @@
+$base-color: #0122c7;
diff --git a/subpkg/archives/archives.vue b/subpkg/archives/archives.vue
index 55779e3..90a6ddc 100644
--- a/subpkg/archives/archives.vue
+++ b/subpkg/archives/archives.vue
@@ -1,233 +1,463 @@
 <template>
-  <view class="">
-    <view class="personnel_list">
-      <view class="item" v-for="(item, index) in list" :key="item.id">
-        <view class="top">
-          <image class="avatar" src="../../static/img/public/record.png"></image>
-          <view class="body">
-            <view>姓名:<text class="name">{{item.name}}</text></view>
-            <view>
-              片区:<text class="name">{{(item.village_name||'')+(item.brigade_name||'')}}</text>
-            </view>
-            <view>电话:<text class="name">{{item.phone}}</text></view>
+	<view class="">
+		<!-- <view class="personnel_list">
+			<view class="item" v-for="(item, index) in list" :key="item.id">
+				<view class="top">
+					<image class="avatar" src="../../static/img/public/record.png"></image>
+					<view class="body">
+						<view>姓名:<text class="name">{{item.name}}</text></view>
+						<view>
+							片区:<text class="name">{{(item.village_name||'')+(item.brigade_name||'')}}</text>
+						</view>
+						<view>电话:<text class="name">{{item.phone}}</text></view>
+					</view>
+				</view>
+				<u-line color="#cccccc"></u-line>
+				<view class="bottom">
+					<view>更新时间: {{item.update_time}}</view>
+					<view class="right" v-if="showView">
+						<view class="update"
+							@click="navTo(`/subpkg/updateArchives/updateArchives?id=${item.id}&task_id=${task_id}`)">
+							更新
+						</view>
+						<view class="look" @click="navTo('/subpkg/archivesDetail/archivesDetail?id='+item.id)">
+							查看
+						</view>
+					</view>
+				</view>
+			</view>
+			<u-empty v-if="loadConfig.status=='nomore'&& list.length==0" text="没有档案" icon="/static/img/empty/list.png">
+			</u-empty>
+			<u-loadmore v-else :status="loadConfig.status" :loading-text="loadConfig.loadingText"
+				:loadmore-text="loadConfig.loadmoreText" :nomore-text="loadConfig.nomoreText" />
+		</view>
+	 -->
+
+		<view class="personnel_list">
+			<view class="card" v-for="(item, index) in list" :key="item.id">
+				<view class="card_head">
+					<text style="font-size: 32rpx">最后更新: {{item.update_time.substring(0, 10)}}</text>
+					<text v-if="showView"
+						@click="navTo(`/subpkg/updateArchives/updateArchives?id=${item.id}&task_id=${task_id}`)">更新档案</text>
+					<text v-if="showView"
+						@click="navTo('/subpkg/archivesDetail/archivesDetail?id='+item.id)">查看档案</text>
+				</view>
+				<view class="card_content">
+
+					<view class="right">
+						<view class="">
+							<text>人员姓名 :</text>
+							<text> {{item.name}}</text>
+						</view>
+						<view class="">
+							<text>联系电话 :</text>
+							<text>{{item.phone}}</text>
+						</view>
+						<view class="">
+							<text>所属片区 :</text>
+							<text>{{(item.village_name||'')+(item.brigade_name||'')}}</text>
+						</view>
+
+					</view>
+
+					<view class="left">
+						<view class="cir">
+							<u--image class="u_avatar" :showLoading="true" :src=" '../../static/img/public/man.png'"
+								width="112.28rpx" height="112.28rpx" shape="circle"></u--image>
+						</view>
+					</view>
+
+				</view>
+			</view>
+			<!--  <block v-for="(item, index) in list" :key="item.id">
+        <view class="personnel_item" @click="navTo('/subpkg/archives/archives?id='+item.id)">
+          <view class="type" :class="item.is_contract?'type_blue':''">
+            <image v-if="item.is_contract" src="../../static/icons/ok_w.png"></image>
+            <image v-else src="../../static/icons/err_w.png"></image>
           </view>
-        </view>
-        <u-line color="#cccccc"></u-line>
-        <view class="bottom">
-          <view>更新时间: {{item.update_time}}</view>
-          <view class="right" v-if="showView">
-            <view class="update" @click="navTo(`/subpkg/updateArchives/updateArchives?id=${item.id}&task_id=${task_id}`)">
-              更新
+          <view class="top" style="margin-bottom: 28rpx;">
+            <view class="left">
+              <u--image class="u_avatar" :showLoading="true" :src="item.avatar||'../../static/img/public/man.png'"
+                width="112.28rpx" height="112.28rpx" shape="circle"></u--image>
             </view>
-            <view class="look" @click="navTo('/subpkg/archivesDetail/archivesDetail?id='+item.id)">
-              查看
+            <view class="right">
+              <view class="info_top">
+                <view class="info_name">{{item.nickname}}</view>
+                <text class="phone">电话:</text>
+                <text class="tel">{{item.phone||item.account}}</text>
+              </view>
+              <view class="info_bottom">
+                <text class="item phone">
+                  分管片区:
+                </text>
+                <view class="item">
+                  <view class="location">
+                    <text>{{ (item.street_name||'')+(item.village_name||'')+(item.brigade_name||'') }}</text>
+                  </view>
+                </view>
+              </view>
+              <view class="info_bottom">
+                <text class="item phone">
+                  所属公司:
+                </text>
+                <view class="item" v-if="item.company">
+                  <view class="location">
+                    {{item.company.company_name}}
+                  </view>
+                </view>
+              </view>
             </view>
           </view>
+          <u-line color="#999999FF"></u-line>
+          <view class="bottom" style="margin-top: 28rpx;float: right;">
+            <view class="look">{{'管理户数: '+item.informationg_count+" 户"}}</view>
+          </view>
         </view>
-      </view>
-      <u-empty v-if="loadConfig.status=='nomore'&& list.length==0" text="没有档案" icon="/static/img/empty/list.png">
-      </u-empty>
-      <u-loadmore v-else :status="loadConfig.status" :loading-text="loadConfig.loadingText"
-        :loadmore-text="loadConfig.loadmoreText" :nomore-text="loadConfig.nomoreText" />
-    </view>
-    <mybtn text="信息登记" v-if="showView" @click="navTo('/subpkg/newArchives/newArchives')"></mybtn>
-  </view>
+      </block> -->
+			<u-empty v-if="loadConfig.status == 'nomore' && list.length == 0"
+				icon="/static/img/empty/data.png"></u-empty>
+			<u-loadmore v-else :status="loadConfig.status" :loading-text="loadConfig.loadingText"
+				:loadmore-text="loadConfig.loadmoreText" :nomore-text="loadConfig.nomoreText" />
+		</view>
+
+
+		<mybtn text="信息登记" v-if="showView" @click="navTo('/subpkg/newArchives/newArchives')"></mybtn>
+	</view>
 </template>
 
 <script>
-  import {
-    informationList
-  } from "@/api/information.js";
-  import {
-    taskInformationgist
-  } from "@/api/task.js";
-  import {
-    Toast
-  } from "../../libs/uniApi";
-  export default {
-    data() {
-      return {
-        user_id: -1,
-        task_id: -1,
-        is_admin: false,
-        list: [],
-        loadConfig: {
-          page: 1,
-          limit: 15,
-          loadingText: '努力加载中',
-          loadmoreText: '轻轻上拉',
-          nomoreText: '我也是有底线的~~',
-          status: 'loadmore'
-        },
-      }
-    },
-    onLoad(options) {
-      // 判断是否包含小队长id
-      if (options.id) this.user_id = options.id;
-      else if (this.$store.state.app.userInfo.admin_id == 0) { //如果用户是小队长,将带上自己的id
-        this.user_id = this.$store.state.app.userInfo.id;
-      }else { // 判断是否为管理员
-        this.is_admin = true;
-      }
-      // 判断是否为任务
-      if(options.task_id) {
-        this.task_id = options.task_id;
-        uni.setNavigationBarTitle({
-          title: '任务:信息更新'
-        })
-      }
-      this.loadInformationList();
-      uni.$on('loadArchives', this.initLoad);
-    },
-    onShow() {
+	import {
+		informationList
+	} from "@/api/information.js";
+	import {
+		taskInformationgist
+	} from "@/api/task.js";
+	import {
+		Toast
+	} from "../../libs/uniApi";
+	export default {
+		data() {
+			return {
+				user_id: -1,
+				task_id: -1,
+				is_admin: false,
+				list: [],
+				loadConfig: {
+					page: 1,
+					limit: 15,
+					loadingText: '努力加载中',
+					loadmoreText: '轻轻上拉',
+					nomoreText: '我也是有底线的~~',
+					status: 'loadmore'
+				},
+			}
+		},
+		onLoad(options) {
+			// 判断是否包含小队长id
+			if (options.id) this.user_id = options.id;
+			else if (this.$store.state.app.userInfo.admin_id == 0) { //如果用户是小队长,将带上自己的id
+				this.user_id = this.$store.state.app.userInfo.id;
+			} else { // 判断是否为管理员
+				this.is_admin = true;
+			}
+			// 判断是否为任务
+			if (options.task_id) {
+				this.task_id = options.task_id;
+				uni.setNavigationBarTitle({
+					title: '任务:信息更新'
+				})
+			}
+			this.loadInformationList();
+			uni.$on('loadArchives', this.initLoad);
+		},
+		onShow() {
 
-    },
-    computed: {
-      // 是否显示查看和更新按钮
-      showView() {
-        return !this.$store.state.app.userInfo.admin_id && this.$store.state.app.userInfo.is_captain;
-      }
-    },
-    onReachBottom() {
-      this.loadInformationList();
-    },
-    methods: {
-      navTo(url) {
-        if (url) {
-          uni.showLoading({
-            title: '加载中',
-            mask: true
-          })
-          uni.navigateTo({
-            url: url,
-            success() {
-              uni.hideLoading()
-            }
-          })
-        } else Toast('暂未开放');
-      },
-      async initLoad() {
-        this.loadConfig.page = 1;
-        this.loadConfig.status = "loadmore";
-        this.list = [];
-        this.is_admin?null:await this.loadInformationList();
-        uni.stopPullDownRefresh();
-      },
-      async loadInformationList() {
-        let that = this;
-        if (this.loadConfig.status == "nomore") return;
-        this.loadConfig.status = "loading"
-        let res = {};
-        if(this.is_admin) res = await taskInformationgist({
-          id: this.task_id
-        });
-        else res = await informationList({
-          page: this.loadConfig.page,
-          limit: this.loadConfig.limit,
-          user_id: that.user_id
-        })
-        this.loadConfig.status = "loadmore"
-        if (res.data.length < this.loadConfig.limit) {
-          this.loadConfig.status = "nomore"
-        } else {
-          this.loadConfig.page++;
-        }
-        this.list = [...this.list, ...res.data];
-      }
-    },
-    onPullDownRefresh() {
-      this.initLoad();
-    }
-  }
+		},
+		computed: {
+			// 是否显示查看和更新按钮
+			showView() {
+				return !this.$store.state.app.userInfo.admin_id && this.$store.state.app.userInfo.is_captain;
+			}
+		},
+		onReachBottom() {
+			this.loadInformationList();
+		},
+		methods: {
+			navTo(url) {
+				if (url) {
+					uni.showLoading({
+						title: '加载中',
+						mask: true
+					})
+					uni.navigateTo({
+						url: url,
+						success() {
+							uni.hideLoading()
+						}
+					})
+				} else Toast('暂未开放');
+			},
+			async initLoad() {
+				this.loadConfig.page = 1;
+				this.loadConfig.status = "loadmore";
+				this.list = [];
+				this.is_admin ? null : await this.loadInformationList();
+				uni.stopPullDownRefresh();
+			},
+			async loadInformationList() {
+				let that = this;
+				if (this.loadConfig.status == "nomore") return;
+				this.loadConfig.status = "loading"
+				let res = {};
+				if (this.is_admin) res = await taskInformationgist({
+					id: this.task_id
+				});
+				else res = await informationList({
+					page: this.loadConfig.page,
+					limit: this.loadConfig.limit,
+					user_id: that.user_id
+				})
+				this.loadConfig.status = "loadmore"
+				if (res.data.length < this.loadConfig.limit) {
+					this.loadConfig.status = "nomore"
+				} else {
+					this.loadConfig.page++;
+				}
+				this.list = [...this.list, ...res.data];
+			}
+		},
+		onPullDownRefresh() {
+			this.initLoad();
+		}
+	}
 </script>
 
 <style lang="scss">
-  .new_btn {
-    position: fixed;
-    bottom: 28rpx;
-    left: 50%;
-    transform: translate(-50%);
-    margin-top: 32rpx;
-    // margin-bottom: 40rpx;
-    width: 694rpx;
-    height: 84rpx;
-    background: $theme-oa-color;
-    border-radius: 42rpx 42rpx 42rpx 42rpx;
-    color: #fff;
-    line-height: 80rpx;
-    text-align: center;
-  }
+	.new_btn {
+		position: fixed;
+		bottom: 28rpx;
+		left: 50%;
+		transform: translate(-50%);
+		margin-top: 32rpx;
+		// margin-bottom: 40rpx;
+		width: 694rpx;
+		height: 84rpx;
+		background: $theme-oa-color;
+		border-radius: 42rpx 42rpx 42rpx 42rpx;
+		color: #fff;
+		line-height: 80rpx;
+		text-align: center;
+	}
 
-  .personnel_list {
-    padding: 28rpx 0;
-    margin-bottom: 130rpx;
+	.personnel_list {
+		padding: 28rpx 0;
+		margin-bottom: 130rpx;
 
-    .item {
-      margin: 0 auto;
-      width: 694rpx;
-      // height: 201rpx;
-      background: #FFFFFF;
-      border-radius: 14rpx 14rpx 14rpx 14rpx;
-      opacity: 1;
-      margin-bottom: 21rpx;
-      box-sizing: border-box;
-      padding: 28rpx;
-      font-size: 24.53rpx;
-      color: #999999FF;
+		.card {
+			margin: 0 auto;
+			margin-bottom: 28rpx;
+			width: 694rpx;
+			background: #ffffff;
+			border-radius: 30rpx;
+			opacity: 1;
+			overflow: hidden;
+			box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.6);
 
-      .top {
-        display: flex;
-        align-items: center;
-        width: 100%;
+			.card_head {
+				padding: 28rpx;
+				background-color: $theme-oa-color;
+				color: white;
+				height: 100rpx;
+				display: flex;
+				justify-content: space-between;
+			}
 
-        .avatar {
-          width: 120rpx;
-          height: 120rpx;
-          margin-right: 18rpx;
-          margin-bottom: 12rpx;
-        }
+			.card_content {
+				padding: 28rpx;
+				display: flex;
+				justify-content: space-between;
 
-        .body {
-          flex: 1;
-          font-size: 28rpx;
-          color: #333;
-          font-weight: bold;
-
-          .name {
-            font-size: 28rpx;
-            color: #333;
-            font-weight: 500;
-            display: inline-block;
-            margin-left: 18rpx;
-          }
-        }
-      }
-
-      .bottom {
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-        margin-top: 20rpx;
-        font-size: 25rpx;
-
-        .right {
-          font-size: 28rpx;
-          display: flex;
-
-          .look {
-            color: $theme-oa-color;
-          }
-
-          .update {
-            color: #34A853;
-            margin-right: 38rpx;
-          }
-        }
-
-      }
+				.left {
+					text-align: center;
+					// padding: 15rpx 25rpx;
+					padding-top: 20rpx;
 
 
-    }
+					width: 160rpx;
+					background-color: $theme-oa-color;
+					color: white;
+					border-radius: 40rpx;
 
-  }
+					.cir {
+						width: 120rpx;
+						height: 120rpx;
+						background-color: #ffffff;
+						margin-left: 25rpx;
+						border-radius: 120rpx;
+						position: relative;
+					}
+				}
+
+				.right {
+					display: flex;
+					flex-direction: column;
+					justify-content: space-between;
+
+					view {
+						text:nth-child(2) {
+							margin-left: 20rpx;
+						}
+					}
+				}
+			}
+
+			// .top {
+			// 	display: flex;
+			// 	justify-content: left;
+			// 	// align-items: center;
+
+			// 	.avatar {
+			// 		width: 88rpx;
+			// 		height: 88rpx;
+			// 		border-radius: 50%;
+			// 		margin-right: 18rpx;
+			// 	}
+
+			.u_avatar {
+				position: absolute;
+				top: 50%;
+				left: 50%;
+
+				transform: translate(-50%, -50%);
+			}
+
+			// 	.text {
+			// 		display: flex;
+			// 		justify-content: space-around;
+			// 		flex-direction: column;
+
+			// 		.name {
+			// 			font-size: 32rpx;
+			// 			font-weight: 500;
+			// 			color: #333333;
+			// 		}
+
+			// 		.mobile {
+			// 			color: #999999;
+			// 		}
+			// 	}
+			// }
+
+			// .bottom {
+			// 	display: flex;
+			// 	justify-content: space-between;
+			// 	font-size: 25rpx;
+			// 	font-weight: 400;
+
+			// 	.left {
+			// 		display: flex;
+			// 		justify-content: left;
+			// 		align-items: center;
+			// 		margin-top: 20rpx;
+
+			// 		.circle {
+			// 			width: 11rpx;
+			// 			height: 11rpx;
+			// 			opacity: 1;
+			// 			border: 2rpx solid #34A853;
+			// 			margin-right: 10rpx;
+			// 			border-radius: 50%;
+			// 		}
+
+			// 		.green {
+			// 			font-weight: 400;
+			// 			color: #34A853;
+			// 			line-height: 0rpx;
+			// 			margin-right: 18rpx;
+			// 			-webkit-background-clip: text;
+			// 		}
+
+			// 		.b_l_text {
+			// 			width: 360rpx;
+			// 			overflow: hidden;
+			// 			text-overflow: ellipsis;
+			// 			white-space: nowrap;
+			// 		}
+			// 	}
+
+			// 	.right {
+			// 		color: #3274F9;
+			// 		margin-top: 20rpx;
+			// 	}
+			// }
+		}
+
+		// .item {
+		// 	margin: 0 auto;
+		// 	width: 694rpx;
+		// 	// height: 201rpx;
+		// 	background: #FFFFFF;
+		// 	border-radius: 14rpx 14rpx 14rpx 14rpx;
+		// 	opacity: 1;
+		// 	margin-bottom: 21rpx;
+		// 	box-sizing: border-box;
+		// 	padding: 28rpx;
+		// 	font-size: 24.53rpx;
+		// 	color: #999999FF;
+
+		// 	.top {
+		// 		display: flex;
+		// 		align-items: center;
+		// 		width: 100%;
+
+		// 		.avatar {
+		// 			width: 120rpx;
+		// 			height: 120rpx;
+		// 			margin-right: 18rpx;
+		// 			margin-bottom: 12rpx;
+		// 		}
+
+		// 		.body {
+		// 			flex: 1;
+		// 			font-size: 28rpx;
+		// 			color: #333;
+		// 			font-weight: bold;
+
+		// 			.name {
+		// 				font-size: 28rpx;
+		// 				color: #333;
+		// 				font-weight: 500;
+		// 				display: inline-block;
+		// 				margin-left: 18rpx;
+		// 			}
+		// 		}
+		// 	}
+
+		// 	.bottom {
+		// 		display: flex;
+		// 		justify-content: space-between;
+		// 		align-items: center;
+		// 		margin-top: 20rpx;
+		// 		font-size: 25rpx;
+
+		// 		.right {
+		// 			font-size: 28rpx;
+		// 			display: flex;
+
+		// 			.look {
+		// 				color: $theme-oa-color;
+		// 			}
+
+		// 			.update {
+		// 				color: #34A853;
+		// 				margin-right: 38rpx;
+		// 			}
+		// 		}
+
+		// 	}
+
+
+		// }
+
+	}
 </style>
\ No newline at end of file
diff --git a/subpkg/archivesDetail/archivesDetail.vue b/subpkg/archivesDetail/archivesDetail.vue
index b01f877..61ac8e7 100644
--- a/subpkg/archivesDetail/archivesDetail.vue
+++ b/subpkg/archivesDetail/archivesDetail.vue
@@ -1,349 +1,377 @@
 <template>
-  <view class="">
-    <!-- <view class="top_box">
+	<view class="">
+		<!-- <view class="top_box">
       <view class="item" :class="current==0?'active':''" @click="current=0">基本信息</view>
       <view class="item" :class="current==1?'active':''" @click="current=1">商机信息</view>
     </view> -->
-    <u-sticky bgColor="#fff">
-      <u-tabs :list="tabLists" @click="changeCurrent" lineColor='#3274F9' :scrollable="false" lineWidth='40'
-        inactiveStyle='color:#666' activeStyle="color:#3274F9"></u-tabs>
-    </u-sticky>
-    <u-skeleton :style="{'margin': skeleton?28+'rpx':0}" :loading="skeleton" :animate="true" title rows="6"
-      rows-width="100%" rowsHeight="56">
-      <u--form v-show="current==0" labelPosition="left" :model="formData" ref="archives">
-        <view class="card">
-          <view class="item">
-            <view class="title">基本信息</view>
-            <u-form-item labelWidth="auto" label="姓名" required prop="name" borderBottom>
-              <u--input v-model="formData.name" :readonly="readonly" placeholder="请输入姓名"></u--input>
-            </u-form-item>
-            <u-form-item label="性别" required prop="sex" borderBottom>
-              <u-radio-group v-model="formData.sex" :disabled="readonly" style="margin: 16rpx;">
-                <u-radio :customStyle="{marginRight: '16px'}"
-                  v-for="(item, index) in [{value:1,label:'男'},{value:2,label:'女'}]" :key="index" :label="item.label"
-                  :name="item.value">
-                </u-radio>
-              </u-radio-group>
-            </u-form-item>
-            <u-form-item label="年龄" required prop="age" borderBottom>
-              <u--input v-model="formData.age" :readonly="readonly" placeholder="请输入年龄"></u--input>
-            </u-form-item>
-            <u-form-item labelWidth="auto" label="身份证号" required prop="id_card" borderBottom>
-              <u--input v-model="formData.id_card" :readonly="readonly" placeholder="请输入身份证号" type="idcard"></u--input>
-            </u-form-item>
-            <u-form-item labelWidth="auto" label="联系方式" required prop="phone" borderBottom>
-              <u--input v-model="formData.phone" :readonly="readonly" placeholder="请输入手机号" type="number"></u--input>
-            </u-form-item>
-          </view>
-        </view>
-        <view class="card" style="margin-bottom: 0;">
-          <view class="item">
-            <view class="title">地区信息</view>
-            <!-- <districtSelector ref="districtSelectorRef" :datas="formData" :readonly="true"></districtSelector> -->
-            <u-form-item labelWidth="auto" label="地址" borderBottom>
-              <u--textarea :value="nowAddress" autoHeight readonly></u--textarea>
-            </u-form-item>
-            <u-form-item labelWidth="auto" label="小队" required prop="address" borderBottom>
-              <!-- <u--input v-model="formData.brigade_name&&formData.brigade_name[0].brigade_name" :readonly="readonly" placeholder="请选择小队"></u--input> -->
-              <u--input v-model="formData.brigade_name" :readonly="readonly" placeholder="请选择小队"></u--input>
-            </u-form-item>
-            <u-form-item labelWidth="auto" label="详细地址" required prop="address" borderBottom>
-              <u--input v-model="formData.address" :readonly="readonly" placeholder="请输入详细地址"></u--input>
-            </u-form-item>
-            <u-form-item labelWidth="auto" label="汽车是否能到家" required prop="highway" borderBottom>
-              <u-radio-group v-model="formData.highway" :disabled="readonly" style="margin: 16rpx;">
-                <u-radio :customStyle="{marginRight: '16px'}"
-                  v-for="(item, index) in [{value:1,label:'是'},{value:0,label:'否'}]" :key="index" :label="item.label"
-                  :name="item.value">
-                </u-radio>
-              </u-radio-group>
-            </u-form-item>
-            <block value="智能手机">
-              <u-form-item labelWidth="auto" label="是否使用智能手机" required prop="smart_phone" borderBottom>
-                <u-radio-group v-model="formData.smart_phone" :disabled="readonly" style="margin: 16rpx;">
-                  <u-radio :customStyle="{marginRight: '16px'}"
-                    v-for="(item, index) in [{value:1,label:'是'},{value:0,label:'否'}]" :key="index" :label="item.label"
-                    :name="item.value">
-                  </u-radio>
-                </u-radio-group>
-              </u-form-item>
-              <block v-if="formData.smart_phone>0">
-                <u-form-item labelWidth="auto" label="微信号" required borderBottom>
-                  <u--input v-model="formData.wechat" :readonly="readonly" placeholder="请输入微信号"></u--input>
-                </u-form-item>
-              </block>
-            </block>
-          </view>
-        </view>
-      </u--form>
-      <residents v-show="current==0" ref="residentsRef" :readonly="true" :datas="formData"></residents>
-      <view v-show="current==1">
-        <block v-for="(item, index) in formData.datas" :key="'demand'+index+item.id">
-          <view class="update_time">
-            <view>更新时间:{{item.update_time}}</view>
-            <view class="right">{{updateTo(item.update_time)}}</view>
-          </view>
-          <block>
-            <breeding v-if="item.id==32" ref="demandRef32" :datas="item.datas" :readonly="true"></breeding>
-            <plant v-if="item.id==7" ref="demandRef7" :datas="item.datas" :readonly="true"></plant>
-            <store v-if="item.id==8" ref="demandRef8" :datas="item.datas" :readonly="true"></store>
-            <deepProcessing v-if="item.id==9" ref="demandRef9" :datas="item.datas" :readonly="true"></deepProcessing>
-            <thickProcessing v-if="item.id==10" ref="demandRef10" :datas="item.datas" :readonly="true"></thickProcessing>
-          </block>
-          <block>
-            <houseRepair v-if="item.id==12" ref="demandRef12" :datas="item.datas" :readonly="true"></houseRepair>
-            <houseDecoration v-if="item.id==13" ref="demandRef13" :datas="item.datas" :readonly="true"></houseDecoration>
-            <houseRenovate v-if="item.id==14" ref="demandRef14" :datas="item.datas" :readonly="true"></houseRenovate>
-            <houseTransaction v-if="item.id==15" ref="demandRef15" :datas="item.datas" :readonly="true"></houseTransaction>
-          </block>
-          <block>
-            <banquetMarry v-if="item.id==17" ref="demandRef17" :datas="item.datas" :readonly="true"></banquetMarry>
-            <banquetBirthday v-if="item.id==18" ref="demandRef18" :datas="item.datas" :readonly="true"></banquetBirthday>
-            <banquetFullMoon v-if="item.id==19" ref="demandRef19" :datas="item.datas" :readonly="true"></banquetFullMoon>
-            <banquetOther v-if="item.id==20" ref="demandRef20" :datas="item.datas" :readonly="true"></banquetOther>
-            <banquetFuneral v-if="item.id==21" ref="demandRef21" :datas="item.datas" :readonly="true"></banquetFuneral>
-          </block>
-        </block>
-        <u-empty v-if="formData.datas.length==0" icon="/static/img/empty/data.png" text="没有数据"></u-empty>
-      </view>
-    </u-skeleton>
-  </view>
+		<u-sticky bgColor="#fff">
+			<u-tabs :list="tabLists" @click="changeCurrent" lineColor='#3274F9' :scrollable="false" lineWidth='40'
+				inactiveStyle='color:#666' activeStyle="color:#3274F9"></u-tabs>
+		</u-sticky>
+		<u-skeleton :style="{'margin': skeleton?28+'rpx':0}" :loading="skeleton" :animate="true" title rows="6"
+			rows-width="100%" rowsHeight="56">
+			<u--form v-show="current==0" labelPosition="left" :model="formData" ref="archives">
+				<view class="card">
+					<view class="item">
+						<view class="title">基本信息</view>
+						<u-form-item labelWidth="auto" label="姓名" required prop="name" borderBottom>
+							<u--input v-model="formData.name" :readonly="readonly" placeholder="请输入姓名"></u--input>
+						</u-form-item>
+						<u-form-item label="性别" required prop="sex" borderBottom>
+							<u-radio-group v-model="formData.sex" :disabled="readonly" style="margin: 16rpx;">
+								<u-radio :customStyle="{marginRight: '16px'}"
+									v-for="(item, index) in [{value:1,label:'男'},{value:2,label:'女'}]" :key="index"
+									:label="item.label" :name="item.value">
+								</u-radio>
+							</u-radio-group>
+						</u-form-item>
+						<u-form-item label="年龄" required prop="age" borderBottom>
+							<u--input v-model="formData.age" :readonly="readonly" placeholder="请输入年龄"></u--input>
+						</u-form-item>
+						<u-form-item labelWidth="auto" label="身份证号" required prop="id_card" borderBottom>
+							<u--input v-model="formData.id_card" :readonly="readonly" placeholder="请输入身份证号"
+								type="idcard"></u--input>
+						</u-form-item>
+						<u-form-item labelWidth="auto" label="联系方式" required prop="phone" borderBottom>
+							<u--input v-model="formData.phone" :readonly="readonly" placeholder="请输入手机号"
+								type="number"></u--input>
+						</u-form-item>
+					</view>
+				</view>
+				<view class="card" style="margin-bottom: 0;">
+					<view class="item">
+						<view class="title">地区信息</view>
+						<!-- <districtSelector ref="districtSelectorRef" :datas="formData" :readonly="true"></districtSelector> -->
+						<u-form-item labelWidth="auto" label="地址" borderBottom>
+							<u--textarea :value="nowAddress" autoHeight readonly></u--textarea>
+						</u-form-item>
+						<u-form-item labelWidth="auto" label="小队" required prop="address" borderBottom>
+							<!-- <u--input v-model="formData.brigade_name&&formData.brigade_name[0].brigade_name" :readonly="readonly" placeholder="请选择小队"></u--input> -->
+							<u--input v-model="formData.brigade_name" :readonly="readonly"
+								placeholder="请选择小队"></u--input>
+						</u-form-item>
+						<u-form-item labelWidth="auto" label="详细地址" required prop="address" borderBottom>
+							<u--input v-model="formData.address" :readonly="readonly" placeholder="请输入详细地址"></u--input>
+						</u-form-item>
+						<u-form-item labelWidth="auto" label="汽车是否能到家" required prop="highway" borderBottom>
+							<u-radio-group v-model="formData.highway" :disabled="readonly" style="margin: 16rpx;">
+								<u-radio :customStyle="{marginRight: '16px'}"
+									v-for="(item, index) in [{value:1,label:'是'},{value:0,label:'否'}]" :key="index"
+									:label="item.label" :name="item.value">
+								</u-radio>
+							</u-radio-group>
+						</u-form-item>
+						<block value="智能手机">
+							<u-form-item labelWidth="auto" label="是否使用智能手机" required prop="smart_phone" borderBottom>
+								<u-radio-group v-model="formData.smart_phone" :disabled="readonly"
+									style="margin: 16rpx;">
+									<u-radio :customStyle="{marginRight: '16px'}"
+										v-for="(item, index) in [{value:1,label:'是'},{value:0,label:'否'}]" :key="index"
+										:label="item.label" :name="item.value">
+									</u-radio>
+								</u-radio-group>
+							</u-form-item>
+							<block v-if="formData.smart_phone>0">
+								<u-form-item labelWidth="auto" label="微信号" required borderBottom>
+									<u--input v-model="formData.wechat" :readonly="readonly"
+										placeholder="请输入微信号"></u--input>
+								</u-form-item>
+							</block>
+						</block>
+					</view>
+				</view>
+			</u--form>
+			<residents v-show="current==0" ref="residentsRef" :readonly="true" :datas="formData"></residents>
+			<view v-show="current==1">
+				<block v-for="(item, index) in formData.datas" :key="'demand'+index+item.id">
+					<view class="update_time">
+						<view>更新时间:{{item.update_time}}</view>
+						<view class="right">{{updateTo(item.update_time)}}</view>
+					</view>
+					<block>
+						<breeding v-if="item.id==32" ref="demandRef32" :datas="item.datas" :readonly="true"></breeding>
+						<plant v-if="item.id==7" ref="demandRef7" :datas="item.datas" :readonly="true"></plant>
+						<store v-if="item.id==8" ref="demandRef8" :datas="item.datas" :readonly="true"></store>
+						<deepProcessing v-if="item.id==9" ref="demandRef9" :datas="item.datas" :readonly="true">
+						</deepProcessing>
+						<thickProcessing v-if="item.id==10" ref="demandRef10" :datas="item.datas" :readonly="true">
+						</thickProcessing>
+					</block>
+					<block>
+						<houseRepair v-if="item.id==12" ref="demandRef12" :datas="item.datas" :readonly="true">
+						</houseRepair>
+						<houseDecoration v-if="item.id==13" ref="demandRef13" :datas="item.datas" :readonly="true">
+						</houseDecoration>
+						<houseRenovate v-if="item.id==14" ref="demandRef14" :datas="item.datas" :readonly="true">
+						</houseRenovate>
+						<houseTransaction v-if="item.id==15" ref="demandRef15" :datas="item.datas" :readonly="true">
+						</houseTransaction>
+					</block>
+					<block>
+						<banquetMarry v-if="item.id==17" ref="demandRef17" :datas="item.datas" :readonly="true">
+						</banquetMarry>
+						<banquetBirthday v-if="item.id==18" ref="demandRef18" :datas="item.datas" :readonly="true">
+						</banquetBirthday>
+						<banquetFullMoon v-if="item.id==19" ref="demandRef19" :datas="item.datas" :readonly="true">
+						</banquetFullMoon>
+						<banquetOther v-if="item.id==20" ref="demandRef20" :datas="item.datas" :readonly="true">
+						</banquetOther>
+						<banquetFuneral v-if="item.id==21" ref="demandRef21" :datas="item.datas" :readonly="true">
+						</banquetFuneral>
+					</block>
+				</block>
+				<u-empty v-if="formData.datas.length==0" icon="/static/img/empty/data.png" text="没有数据"></u-empty>
+			</view>
+		</u-skeleton>
+	</view>
 </template>
 
 <script>
-  import { Toast } from "../../libs/uniApi"
-  import { informationAdd, informationDetails } from "@/api/information.js"
-  import { comonentList } from '@/static/server/archives.js'
-  import { getTimeAgo } from "@/utils/time.js"
-  import districtSelector from "@/components/districtSelector/districtSelector.vue" //地区选择器
-  import residents from "@/components/newArchives/residents.vue" // 常住人口
-  import breeding from "@/components/newArchives/breeding.vue" // 种养殖
-  import plant from "@/components/newArchives/plant.vue" // 种养殖
-  import store from "@/components/newArchives/store.vue" // 开设店铺
-  import deepProcessing from "@/components/newArchives/deepProcessing.vue" // 深加工
-  import thickProcessing from "@/components/newArchives/thickProcessing.vue" // 粗加工
-  import houseRepair from "@/components/newArchives/houseRepair.vue" // 修房
-  import houseDecoration from "@/components/newArchives/houseDecoration.vue" // 装房
-  import houseRenovate from "@/components/newArchives/houseRenovate.vue" // 翻新
-  import houseTransaction from "@/components/newArchives/houseTransaction.vue" // 买卖房子
-  import banquetMarry from "@/components/newArchives/banquetMarry.vue" // 婚宴
-  import banquetBirthday from "@/components/newArchives/banquetBirthday.vue" // 寿宴
-  import banquetFullMoon from "@/components/newArchives/banquetFullMoon.vue" // 满月酒
-  import banquetOther from "@/components/newArchives/banquetOther.vue" // 其他庆祝宴
-  import banquetFuneral from "@/components/newArchives/banquetFuneral.vue" // 白事
-  export default {
-    components: {
-      districtSelector,
-      residents,
-      breeding,
-      plant,
-      store,
-      deepProcessing,
-      thickProcessing,
-      houseRepair,
-      houseDecoration,
-      houseRenovate,
-      houseTransaction,
-      banquetMarry,
-      banquetBirthday,
-      banquetFullMoon,
-      banquetOther,
-      banquetFuneral
-    },
-    data() {
-      return {
-        listMap: new Map(),
-        tabLists: [{
-          name: '基本信息',
-        }, {
-          name: '商机信息'
-        }],
-        skeleton: true,
-        readonly: true,
-        current: 0,
-        showDemandList: [],
-        formData: {
-          id_card: '',
-          sex: '',
-          name: '',
-          phone: '', //电话
-          highway: '', //汽车是否能到家
-          smart_phone: '', //是否使用智能手机
-          wechat: '', //微信号
-          address: '', //家庭地址
-          age: '', //年龄
-          category_id: 1,
-          category_child: 1,
-          data_type: '1',
-          datas: []
-        },
+	import {
+		Toast
+	} from "../../libs/uniApi"
+	import {
+		informationAdd,
+		informationDetails
+	} from "@/api/information.js"
+	import {
+		comonentList
+	} from '@/static/server/archives.js'
+	import {
+		getTimeAgo
+	} from "@/utils/time.js"
+	import districtSelector from "@/components/districtSelector/districtSelector.vue" //地区选择器
+	import residents from "@/components/newArchives/residents.vue" // 常住人口
+	import breeding from "@/components/newArchives/breeding.vue" // 种养殖
+	import plant from "@/components/newArchives/plant.vue" // 种养殖
+	import store from "@/components/newArchives/store.vue" // 开设店铺
+	import deepProcessing from "@/components/newArchives/deepProcessing.vue" // 深加工
+	import thickProcessing from "@/components/newArchives/thickProcessing.vue" // 粗加工
+	import houseRepair from "@/components/newArchives/houseRepair.vue" // 修房
+	import houseDecoration from "@/components/newArchives/houseDecoration.vue" // 装房
+	import houseRenovate from "@/components/newArchives/houseRenovate.vue" // 翻新
+	import houseTransaction from "@/components/newArchives/houseTransaction.vue" // 买卖房子
+	import banquetMarry from "@/components/newArchives/banquetMarry.vue" // 婚宴
+	import banquetBirthday from "@/components/newArchives/banquetBirthday.vue" // 寿宴
+	import banquetFullMoon from "@/components/newArchives/banquetFullMoon.vue" // 满月酒
+	import banquetOther from "@/components/newArchives/banquetOther.vue" // 其他庆祝宴
+	import banquetFuneral from "@/components/newArchives/banquetFuneral.vue" // 白事
+	export default {
+		components: {
+			districtSelector,
+			residents,
+			breeding,
+			plant,
+			store,
+			deepProcessing,
+			thickProcessing,
+			houseRepair,
+			houseDecoration,
+			houseRenovate,
+			houseTransaction,
+			banquetMarry,
+			banquetBirthday,
+			banquetFullMoon,
+			banquetOther,
+			banquetFuneral
+		},
+		data() {
+			return {
+				listMap: new Map(),
+				tabLists: [{
+					name: '基本信息',
+				}, {
+					name: '商机信息'
+				}],
+				skeleton: true,
+				readonly: true,
+				current: 0,
+				showDemandList: [],
+				formData: {
+					id_card: '',
+					sex: '',
+					name: '',
+					phone: '', //电话
+					highway: '', //汽车是否能到家
+					smart_phone: '', //是否使用智能手机
+					wechat: '', //微信号
+					address: '', //家庭地址
+					age: '', //年龄
+					category_id: 1,
+					category_child: 1,
+					data_type: '1',
+					datas: []
+				},
 
-      }
-    },
-    onLoad(options) {
-      this.initInformationDetails({ id: options.id });
-      this.initMap();
-    },
-    onShow() {},
-    computed: {
-      nowAddress() {
-        let address = this.$store.state.app.userInfo;
-        let str = '';
-        address.province_name?str+=address.province_name:null;
-        address.city_name?str+=address.city_name:null;
-        address.area_name?str+=address.area_name:null;
-        address.street_name?str+=address.street_name:null;
-        address.village_name?str+=address.village_name:null;
-        return str;
-      }
-    },
-    methods: {
-      initMap() {
-        comonentList.forEach(item => {
-          this.listMap.set(item.id, item.name);
-        })
-      },
-      async initInformationDetails(id) {
-        let res = await informationDetails(id);
-        this.$u.sleep(100).then(()=>{
-          this.skeleton = false;
-          Object.keys(res.data).forEach(key => {
-            this.formData[key] = res.data[key];
-          })
-        })
-      },
-      toastShow() {
-        Toast('不可修改')
-      },
-      changeCurrent(e) {
-        this.current = e.index;
-      },
-      updateTo(time){
-        return getTimeAgo(time)
-      }
-    },
-    onPullDownRefresh() {
-      uni.stopPullDownRefresh()
-    }
-  }
+			}
+		},
+		onLoad(options) {
+			this.initInformationDetails({
+				id: options.id
+			});
+			this.initMap();
+		},
+		onShow() {},
+		computed: {
+			nowAddress() {
+				let address = this.$store.state.app.userInfo;
+				let str = '';
+				address.province_name ? str += address.province_name : null;
+				address.city_name ? str += address.city_name : null;
+				address.area_name ? str += address.area_name : null;
+				address.street_name ? str += address.street_name : null;
+				address.village_name ? str += address.village_name : null;
+				return str;
+			}
+		},
+		methods: {
+			initMap() {
+				comonentList.forEach(item => {
+					this.listMap.set(item.id, item.name);
+				})
+			},
+			async initInformationDetails(id) {
+				let res = await informationDetails(id);
+				this.$u.sleep(100).then(() => {
+					this.skeleton = false;
+					Object.keys(res.data).forEach(key => {
+						this.formData[key] = res.data[key];
+					})
+				})
+			},
+			toastShow() {
+				Toast('不可修改')
+			},
+			changeCurrent(e) {
+				this.current = e.index;
+			},
+			updateTo(time) {
+				return getTimeAgo(time)
+			}
+		},
+		onPullDownRefresh() {
+			uni.stopPullDownRefresh()
+		}
+	}
 </script>
 
 <style lang="scss">
-  .top_box {
-    background-color: #fff;
-    display: flex;
+	.top_box {
+		background-color: #fff;
+		display: flex;
 
-    .item {
-      width: 175rpx;
-      height: 53rpx;
-      background: #F5F5F5FF;
-      color: #999999FF;
-      border-radius: 35rpx 35rpx 35rpx 35rpx;
-      opacity: 1;
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      margin: 28rpx;
-    }
+		.item {
+			width: 175rpx;
+			height: 53rpx;
+			background: #F5F5F5FF;
+			color: #999999FF;
+			border-radius: 35rpx 35rpx 35rpx 35rpx;
+			opacity: 1;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			margin: 28rpx;
+		}
 
-    .active {
-      background: $theme-oa-color;
-      color: #fff;
-    }
-  }
+		.active {
+			background: $theme-oa-color;
+			color: #fff;
+		}
+	}
 
-  .update_time {
-    padding: 32rpx 28rpx 0 28rpx;
-    display: flex;
-    justify-content: space-between;
-    .right{
-      color: $theme-oa-color;
-    }
-  }
-  
-  
-  
-  .card {
-    background-color: #fff;
-    margin: 28rpx;
-    padding: 28rpx;
-    border-radius: 14rpx;
+	.update_time {
+		padding: 32rpx 28rpx 0 28rpx;
+		display: flex;
+		justify-content: space-between;
 
-    .item {
-      margin-top: 30rpx;
+		.right {
+			color: $theme-oa-color;
+		}
+	}
 
-      &:nth-child(1) {
-        margin-top: 0;
-      }
 
-      .title {
-        font-weight: 500;
-        font-size: 34rpx;
 
-        &::before {
-          width: 8rpx;
-          height: 26rpx;
-          border-radius: 4rpx;
-          background-color: #3175f9;
-          content: "";
-          display: inline-block;
-          margin-right: 8rpx;
-        }
-      }
-    }
+	.card {
+		background-color: #fff;
+		margin: 28rpx;
+		padding: 28rpx;
+		border-radius: 14rpx;
 
-    .btn {
-      margin-top: 32rpx;
-      // margin-bottom: 40rpx;
-      width: 100%;
-      height: 84rpx;
-      background: $theme-oa-color;
-      border-radius: 42rpx 42rpx 42rpx 42rpx;
-      color: #fff;
-      line-height: 80rpx;
-      text-align: center;
-    }
-  }
+		.item {
+			margin-top: 30rpx;
 
-  .delete {
+			&:nth-child(1) {
+				margin-top: 0;
+			}
 
-    margin: 22rpx 0;
+			.title {
+				font-weight: 500;
+				font-size: 34rpx;
 
-    // margin-bottom: 40rpx;
+				&::before {
+					width: 8rpx;
+					height: 26rpx;
+					border-radius: 4rpx;
+					background-color: #3175f9;
+					content: "";
+					display: inline-block;
+					margin-right: 8rpx;
+				}
+			}
+		}
 
-    width: 100%;
+		.btn {
+			margin-top: 32rpx;
+			// margin-bottom: 40rpx;
+			width: 100%;
+			height: 84rpx;
+			background: $theme-oa-color;
+			border-radius: 42rpx 42rpx 42rpx 42rpx;
+			color: #fff;
+			line-height: 80rpx;
+			text-align: center;
+		}
+	}
 
-    height: 64rpx;
+	.delete {
 
-    line-height: 64rpx;
+		margin: 22rpx 0;
 
-    background: #f56c6c;
+		// margin-bottom: 40rpx;
 
-    border-radius: 14rpx;
+		width: 100%;
 
-    font-size: 28rpx;
+		height: 64rpx;
 
-    color: #fff;
+		line-height: 64rpx;
 
-    text-align: center;
+		background: #f56c6c;
 
-  }
+		border-radius: 14rpx;
 
-  .plus {
-    margin: 22rpx 0;
-    // margin-bottom: 40rpx;
-    width: 100%;
-    height: 64rpx;
-    line-height: 64rpx;
-    background: $theme-oa-color;
-    border-radius: 14rpx;
-    font-size: 28rpx;
-    color: #fff;
-    text-align: center;
-  }
+		font-size: 28rpx;
 
-  .demand {
-    margin-top: 40rpx;
-    margin-bottom: 50rpx;
-  }
+		color: #fff;
+
+		text-align: center;
+
+	}
+
+	.plus {
+		margin: 22rpx 0;
+		// margin-bottom: 40rpx;
+		width: 100%;
+		height: 64rpx;
+		line-height: 64rpx;
+		background: $theme-oa-color;
+		border-radius: 14rpx;
+		font-size: 28rpx;
+		color: #fff;
+		text-align: center;
+	}
+
+	.demand {
+		margin-top: 40rpx;
+		margin-bottom: 50rpx;
+	}
 </style>
\ No newline at end of file
diff --git a/subpkg/captain/captain.vue b/subpkg/captain/captain.vue
index 153deba..412dd09 100644
--- a/subpkg/captain/captain.vue
+++ b/subpkg/captain/captain.vue
@@ -1,6 +1,6 @@
 <template>
-  <view class="page">
-    <!-- <view class="card" v-for="item in list" :key="item.id" @click="navTo('/subpkg/archives/archives?id='+item.id)">
+	<view class="page">
+		<!-- <view class="card" v-for="item in list" :key="item.id" @click="navTo('/subpkg/archives/archives?id='+item.id)">
       <view class="top">
         <u--image class="u_avatar" :showLoading="true" :src="item.avatar||'../../static/img/public/man.png'"
           width="112.28rpx" height="112.28rpx" shape="circle">
@@ -23,8 +23,49 @@
     </view>
     <u-loadmore :status="loadConfig.status" :loading-text="loadConfig.loadingText"
       :loadmore-text="loadConfig.loadmoreText" :nomore-text="loadConfig.nomoreText" /> -->
-    <view class="personnel_list">
-      <block v-for="(item, index) in list" :key="item.id">
+		<view class="personnel_list">
+			<view class="card" v-for="(item, index) in list" :key="item.id"
+				@click="navTo('/subpkg/archives/archives?id='+item.id)">
+				<view class="card_head">
+					<text style="font-size: 34rpx;">最后更新: 2023-8-1</text>
+					<text>{{'管理户数: '+item.informationg_count+" 户"}}<u-icon
+							style="display: inline-block;margin-left: 10rpx;" color="white"
+							name="arrow-right"></u-icon></text>
+				</view>
+				<view class="card_content">
+					<view class="left">
+						<view class="cir">
+							<u--image class="u_avatar" :showLoading="true"
+								:src="item.avatar||'../../static/img/public/man.png'" width="112.28rpx"
+								height="112.28rpx" shape="circle"></u--image>
+						</view>
+
+						<view style="margin-top: 40rpx;">
+							<u-icon style="display: inline-block;margin-left: 10rpx;" color="white"
+								name="edit-pen-fill"></u-icon> {{item.is_contract?"已签约":"未签约"}}
+						</view>
+					</view>
+					<view class="right">
+						<view class="">
+							<text>公司名称 :</text>
+							<text> {{item.company.company_name}}</text>
+						</view>
+						<view class="">
+							<text>人员姓名 :</text>
+							<text>{{item.nickname}}</text>
+						</view>
+						<view class="">
+							<text>联系电话 :</text>
+							<text>{{item.phone||item.account}}</text>
+						</view>
+						<view class="">
+							<text>负责区域 :</text>
+							<text>{{ (item.street_name||'')+(item.village_name||'')+(item.brigade_name||'') }}</text>
+						</view>
+					</view>
+				</view>
+			</view>
+			<!--  <block v-for="(item, index) in list" :key="item.id">
         <view class="personnel_item" @click="navTo('/subpkg/archives/archives?id='+item.id)">
           <view class="type" :class="item.is_contract?'type_blue':''">
             <image v-if="item.is_contract" src="../../static/icons/ok_w.png"></image>
@@ -68,361 +109,423 @@
             <view class="look">{{'管理户数: '+item.informationg_count+" 户"}}</view>
           </view>
         </view>
-      </block>
-      <u-empty v-if="loadConfig.status=='nomore'&& list.length==0" icon="/static/img/empty/data.png"></u-empty>
-      <u-loadmore v-else :status="loadConfig.status" :loading-text="loadConfig.loadingText"
-        :loadmore-text="loadConfig.loadmoreText" :nomore-text="loadConfig.nomoreText" />
-    </view>
+      </block> -->
+			<u-empty v-if="loadConfig.status=='nomore'&& list.length==0" icon="/static/img/empty/data.png"></u-empty>
+			<u-loadmore v-else :status="loadConfig.status" :loading-text="loadConfig.loadingText"
+				:loadmore-text="loadConfig.loadmoreText" :nomore-text="loadConfig.nomoreText" />
+		</view>
 
-  </view>
+	</view>
 </template>
 
 <script>
-  import { companyUser } from "@/api/company.js"
-  import { Toast } from '@/libs/uniApi.js'
-  export default {
-    data() {
-      return {
-        list: [],
-        loadConfig: {
-          page: 1,
-          limit: 15,
-          lastpage: '',
-          loadingText: '努力加载中',
-          loadmoreText: '轻轻上拉',
-          nomoreText: '我也是有底线的~~',
-          status: 'loadmore'
-        },
-      }
-    },
-    onLoad() {
-      this.initLoad()
-    },
-    onShow() {},
-    onReachBottom() {
-      this.loadList();
-    },
-    methods: {
-      navTo(url) {
-        url ?
-          uni.navigateTo({
-            url: url,
-          }) : Toast('暂未开放')
-      },
-      initLoad() {
-        this.loadConfig.page = 1;
-        this.loadConfig.status = "loadmore";
-        this.list = [];
-        this.loadList();
-        uni.stopPullDownRefresh();
-      },
-      async loadList() {
-        if (this.loadConfig.status == "nomore") return;
-        this.loadConfig.status = "loading";
-        let res = await companyUser({
-          page: this.loadConfig.page,
-          limit: this.loadConfig.limit,
-          company_id: this.$store.state.app.userInfo.company_id,
-          is_captain: 1
-        })
-        this.loadConfig.status = "loadmore"
-        if (res.data.data.length < this.loadConfig.limit) {
-          this.loadConfig.status = "nomore"
-        } else {
-          this.loadConfig.page++;
-        }
-        this.list = [...this.list, ...res.data.data];
-      },
-    },
-    onPullDownRefresh() {
-      this.initLoad();
-    }
-  }
+	import {
+		companyUser
+	} from "@/api/company.js"
+	import {
+		Toast
+	} from '@/libs/uniApi.js'
+	export default {
+		data() {
+			return {
+				list: [],
+				loadConfig: {
+					page: 1,
+					limit: 15,
+					lastpage: '',
+					loadingText: '努力加载中',
+					loadmoreText: '轻轻上拉',
+					nomoreText: '我也是有底线的~~',
+					status: 'loadmore'
+				},
+			}
+		},
+		onLoad() {
+			this.initLoad()
+		},
+		onShow() {},
+		onReachBottom() {
+			this.loadList();
+		},
+		methods: {
+			navTo(url) {
+				url ?
+					uni.navigateTo({
+						url: url,
+					}) : Toast('暂未开放')
+			},
+			initLoad() {
+				this.loadConfig.page = 1;
+				this.loadConfig.status = "loadmore";
+				this.list = [];
+				this.loadList();
+				uni.stopPullDownRefresh();
+			},
+			async loadList() {
+				if (this.loadConfig.status == "nomore") return;
+				this.loadConfig.status = "loading";
+				let res = await companyUser({
+					page: this.loadConfig.page,
+					limit: this.loadConfig.limit,
+					company_id: this.$store.state.app.userInfo.company_id,
+					is_captain: 1
+				})
+				this.loadConfig.status = "loadmore"
+				if (res.data.data.length < this.loadConfig.limit) {
+					this.loadConfig.status = "nomore"
+				} else {
+					this.loadConfig.page++;
+				}
+				this.list = [...this.list, ...res.data.data];
+			},
+		},
+		onPullDownRefresh() {
+			this.initLoad();
+		}
+	}
 </script>
 
-<style lang="scss">
-  .page {
-    padding-top: 28rpx;
-  }
+<style lang="scss" scoped>
+	.page {
+		padding-top: 28rpx;
+	}
 
-  .card {
-    margin: 0 auto;
-    margin-bottom: 28rpx;
-    padding: 28rpx;
-    width: 694rpx;
-    height: 221rpx;
-    background: #FFFFFF;
-    border-radius: 14rpx 14rpx 14rpx 14rpx;
-    opacity: 1;
+	.card {
+		margin: 0 auto;
+		margin-bottom: 28rpx;
+		width: 694rpx;
+		background: #FFFFFF;
+		border-radius: 30rpx;
+		opacity: 1;
+		overflow: hidden;
+		box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.6);
 
-    .top {
-      display: flex;
-      justify-content: left;
-      // align-items: center;
+		.card_head {
+			padding: 28rpx;
+			background-color: $theme-oa-color;
+			color: white;
+			height: 100rpx;
+			display: flex;
+			justify-content: space-between;
 
-      .avatar {
-        width: 88rpx;
-        height: 88rpx;
-        border-radius: 50%;
-        margin-right: 18rpx;
-      }
+		}
 
-      .u_avatar {
-        margin-right: 18rpx;
-      }
+		.card_content {
+			padding: 28rpx;
+			display: flex;
 
-      .text {
-        display: flex;
-        justify-content: space-around;
-        flex-direction: column;
+			.left {
+				text-align: center;
+				// padding: 15rpx 25rpx;
+				padding-top: 20rpx;
 
-        .name {
-          font-size: 32rpx;
-          font-weight: 500;
-          color: #333333;
-        }
+				margin-right: 50rpx;
+				width: 160rpx;
+				background-color: $theme-oa-color;
+				color: white;
+				border-radius: 40rpx;
 
-        .mobile {
-          color: #999999;
-        }
-      }
-    }
+				.cir {
+					width: 120rpx;
+					height: 120rpx;
+					background-color: #FFFFFF;
+					margin-left: 25rpx;
+					border-radius: 120rpx;
+					position: relative;
 
-    .bottom {
-      display: flex;
-      justify-content: space-between;
-      font-size: 25rpx;
-      font-weight: 400;
 
-      .left {
-        display: flex;
-        justify-content: left;
-        align-items: center;
-        margin-top: 20rpx;
+				}
 
-        .circle {
-          width: 11rpx;
-          height: 11rpx;
-          opacity: 1;
-          border: 2rpx solid #34A853;
-          margin-right: 10rpx;
-          border-radius: 50%;
-        }
+			}
 
-        .green {
-          font-weight: 400;
-          color: #34A853;
-          line-height: 0rpx;
-          margin-right: 18rpx;
-          -webkit-background-clip: text;
-        }
 
-        .b_l_text {
-          width: 360rpx;
-          overflow: hidden;
-          text-overflow: ellipsis;
-          white-space: nowrap;
-        }
-      }
+			.right {
+				display: flex;
+				flex-direction: column;
+				justify-content: space-between;
 
-      .right {
-        color: #3274F9;
-        margin-top: 20rpx;
-      }
-    }
-  }
+				view {
+					text:nth-child(2) {
+						margin-left: 20rpx;
+					}
+				}
+			}
+		}
 
-  .personnel_list {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    padding-bottom: 130rpx;
+		// .top {
+		// 	display: flex;
+		// 	justify-content: left;
+		// 	// align-items: center;
 
-    .personnel_item {
-      width: 694rpx;
-      // height: 407rpx;
-      background: #FFFFFF;
-      border-radius: 14rpx 14rpx 14rpx 14rpx;
-      margin-bottom: 32rpx;
-      overflow: hidden;
-      position: relative;
-      padding: 28rpx;
+		// 	.avatar {
+		// 		width: 88rpx;
+		// 		height: 88rpx;
+		// 		border-radius: 50%;
+		// 		margin-right: 18rpx;
+		// 	}
 
-      .type {
-        width: 50rpx;
-        height: 50rpx;
-        background-color: #F02828;
-        border-radius: 50%;
-        font-size: 25rpx;
-        font-weight: 400;
-        color: #FFFFFF;
-        line-height: 35rpx;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        position: absolute;
-        top: 28rpx;
-        right: 28rpx;
+		.u_avatar {
+			position: absolute;
+			top: 50%;
+			left: 50%;
 
-        image {
-          width: 18rpx;
-          height: 18rpx;
-          margin-right: 1rpx;
-        }
-      }
+			transform: translate(-50%, -50%);
+		}
 
-      .type_blue {
-        background-color: #34A853;
-      }
+		// 	.text {
+		// 		display: flex;
+		// 		justify-content: space-around;
+		// 		flex-direction: column;
 
-      .top {
-        // background-color: #3274F9;
-        display: flex;
+		// 		.name {
+		// 			font-size: 32rpx;
+		// 			font-weight: 500;
+		// 			color: #333333;
+		// 		}
 
-        .right {
-          display: flex;
-          flex-direction: column;
-          justify-content: space-around;
-          margin-left: 28rpx;
-          font-size: 25rpx;
-          font-weight: 400;
-          overflow: hidden;
-          color: #999999;
+		// 		.mobile {
+		// 			color: #999999;
+		// 		}
+		// 	}
+		// }
 
-          .info_top {
-            display: flex;
-            align-items: flex-end;
-            font-size: 25rpx;
-            font-weight: 400;
-            color: $theme-oa-color;
-            margin-bottom: 10rpx;
+		// .bottom {
+		// 	display: flex;
+		// 	justify-content: space-between;
+		// 	font-size: 25rpx;
+		// 	font-weight: 400;
 
-            .info_name {
-              font-size: 32rpx;
-              font-weight: 400;
-              color: #333333;
-              margin-right: 18rpx;
-            }
+		// 	.left {
+		// 		display: flex;
+		// 		justify-content: left;
+		// 		align-items: center;
+		// 		margin-top: 20rpx;
 
-            .phone {
-              margin-left: 30rpx;
-              color: #999999;
-            }
+		// 		.circle {
+		// 			width: 11rpx;
+		// 			height: 11rpx;
+		// 			opacity: 1;
+		// 			border: 2rpx solid #34A853;
+		// 			margin-right: 10rpx;
+		// 			border-radius: 50%;
+		// 		}
 
-            .tel {
-              color: #000;
-            }
-          }
+		// 		.green {
+		// 			font-weight: 400;
+		// 			color: #34A853;
+		// 			line-height: 0rpx;
+		// 			margin-right: 18rpx;
+		// 			-webkit-background-clip: text;
+		// 		}
 
-          .info_bottom {
-            display: flex;
-            margin-bottom: 8rpx;
+		// 		.b_l_text {
+		// 			width: 360rpx;
+		// 			overflow: hidden;
+		// 			text-overflow: ellipsis;
+		// 			white-space: nowrap;
+		// 		}
+		// 	}
 
-            .item {
-              display: flex;
-              align-items: flex-start;
-            }
+		// 	.right {
+		// 		color: #3274F9;
+		// 		margin-top: 20rpx;
+		// 	}
+		// }
 
-            .phone {
-              margin-right: 28rpx;
-            }
+	}
 
-            .location {
-              width: 320rpx;
-              // white-space: nowrap;
-              // /* 不换行 */
-              // overflow: hidden;
-              // /* 将超出文本隐藏 */
-              // text-overflow: ellipsis;
-              // /* 使用省略号表示被隐藏的文本 */
-              color: #000;
-            }
-          }
 
-          .company {
-            display: flex;
+	// .personnel_list {
+	// 	display: flex;
+	// 	flex-direction: column;
+	// 	align-items: center;
+	// 	padding-bottom: 130rpx;
 
-            text {
-              margin-right: 30rpx;
-              flex-shrink: 0;
-            }
+	// 	.personnel_item {
+	// 		width: 694rpx;
+	// 		// height: 407rpx;
+	// 		background: #FFFFFF;
+	// 		border-radius: 14rpx 14rpx 14rpx 14rpx;
+	// 		margin-bottom: 32rpx;
+	// 		overflow: hidden;
+	// 		position: relative;
+	// 		padding: 28rpx;
 
-            .itm {
-              width: 320rpx;
-              // white-space: nowrap;
-              // /* 不换行 */
-              // overflow: hidden;
-              // /* 将超出文本隐藏 */
-              // text-overflow: ellipsis;
-              // /* 使用省略号表示被隐藏的文本 */
-              color: #000;
-            }
-          }
-        }
-      }
+	// 		.type {
+	// 			width: 50rpx;
+	// 			height: 50rpx;
+	// 			background-color: #F02828;
+	// 			border-radius: 50%;
+	// 			font-size: 25rpx;
+	// 			font-weight: 400;
+	// 			color: #FFFFFF;
+	// 			line-height: 35rpx;
+	// 			display: flex;
+	// 			justify-content: center;
+	// 			align-items: center;
+	// 			position: absolute;
+	// 			top: 28rpx;
+	// 			right: 28rpx;
 
-      .center {
-        padding: 28rpx 0;
+	// 			image {
+	// 				width: 18rpx;
+	// 				height: 18rpx;
+	// 				margin-right: 1rpx;
+	// 			}
+	// 		}
 
-        .top {
-          font-size: 28rpx;
-          font-weight: 400;
-          color: #666666FF;
-          margin-bottom: 20rpx;
+	// 		.type_blue {
+	// 			background-color: #34A853;
+	// 		}
 
-          .green {
-            color: #34A853FF;
-          }
+	// 		.top {
+	// 			// background-color: #3274F9;
+	// 			display: flex;
 
-          .yellow {
-            color: #F9AA32FF;
-          }
-        }
+	// 			.right {
+	// 				display: flex;
+	// 				flex-direction: column;
+	// 				justify-content: space-around;
+	// 				margin-left: 28rpx;
+	// 				font-size: 25rpx;
+	// 				font-weight: 400;
+	// 				overflow: hidden;
+	// 				color: #999999;
 
-        .bottom {
-          display: flex;
-          justify-content: space-around;
-          font-size: 25rpx;
-          font-weight: 400;
-          color: #999999;
+	// 				.info_top {
+	// 					display: flex;
+	// 					align-items: flex-end;
+	// 					font-size: 25rpx;
+	// 					font-weight: 400;
+	// 					color: $theme-oa-color;
+	// 					margin-bottom: 10rpx;
 
-          image {
-            width: 18rpx;
-            height: 18rpx;
-            margin-right: 9rpx;
-          }
-        }
-      }
+	// 					.info_name {
+	// 						font-size: 32rpx;
+	// 						font-weight: 400;
+	// 						color: #333333;
+	// 						margin-right: 18rpx;
+	// 					}
 
-      .bottom {
-        display: flex;
-        justify-content: center;
+	// 					.phone {
+	// 						margin-left: 30rpx;
+	// 						color: #999999;
+	// 					}
 
-        .look {
-          height: 43rpx;
-          background: #FFFFFF;
-          border-radius: 26rpx 26rpx 26rpx 26rpx;
-          opacity: 1;
-          // border: 2rpx solid $theme-oa-color;
-          font-size: 28rpx;
-          font-weight: 400;
-          margin-left: 28rpx;
-          color: $theme-oa-color;
-          display: flex;
-          justify-content: center;
-          align-items: center;
-        }
+	// 					.tel {
+	// 						color: #000;
+	// 					}
+	// 				}
 
-        .sign {
-          color: #34A853;
-          // border: 2rpx solid #34A853;		
-        }
+	// 				.info_bottom {
+	// 					display: flex;
+	// 					margin-bottom: 8rpx;
 
-        .red {
-          color: #F02828;
-          // border: 2rpx solid #F02828;		
-        }
-      }
-    }
-  }
+	// 					.item {
+	// 						display: flex;
+	// 						align-items: flex-start;
+	// 					}
+
+	// 					.phone {
+	// 						margin-right: 28rpx;
+	// 					}
+
+	// 					.location {
+	// 						width: 320rpx;
+	// 						// white-space: nowrap;
+	// 						// /* 不换行 */
+	// 						// overflow: hidden;
+	// 						// /* 将超出文本隐藏 */
+	// 						// text-overflow: ellipsis;
+	// 						// /* 使用省略号表示被隐藏的文本 */
+	// 						color: #000;
+	// 					}
+	// 				}
+
+	// 				.company {
+	// 					display: flex;
+
+	// 					text {
+	// 						margin-right: 30rpx;
+	// 						flex-shrink: 0;
+	// 					}
+
+	// 					.itm {
+	// 						width: 320rpx;
+	// 						// white-space: nowrap;
+	// 						// /* 不换行 */
+	// 						// overflow: hidden;
+	// 						// /* 将超出文本隐藏 */
+	// 						// text-overflow: ellipsis;
+	// 						// /* 使用省略号表示被隐藏的文本 */
+	// 						color: #000;
+	// 					}
+	// 				}
+	// 			}
+	// 		}
+
+	// 		.center {
+	// 			padding: 28rpx 0;
+
+	// 			.top {
+	// 				font-size: 28rpx;
+	// 				font-weight: 400;
+	// 				color: #666666FF;
+	// 				margin-bottom: 20rpx;
+
+	// 				.green {
+	// 					color: #34A853FF;
+	// 				}
+
+	// 				.yellow {
+	// 					color: #F9AA32FF;
+	// 				}
+	// 			}
+
+	// 			.bottom {
+	// 				display: flex;
+	// 				justify-content: space-around;
+	// 				font-size: 25rpx;
+	// 				font-weight: 400;
+	// 				color: #999999;
+
+	// 				image {
+	// 					width: 18rpx;
+	// 					height: 18rpx;
+	// 					margin-right: 9rpx;
+	// 				}
+	// 			}
+	// 		}
+
+	// 		.bottom {
+	// 			display: flex;
+	// 			justify-content: center;
+
+	// 			.look {
+	// 				height: 43rpx;
+	// 				background: #FFFFFF;
+	// 				border-radius: 26rpx 26rpx 26rpx 26rpx;
+	// 				opacity: 1;
+	// 				// border: 2rpx solid $theme-oa-color;
+	// 				font-size: 28rpx;
+	// 				font-weight: 400;
+	// 				margin-left: 28rpx;
+	// 				color: $theme-oa-color;
+	// 				display: flex;
+	// 				justify-content: center;
+	// 				align-items: center;
+	// 			}
+
+	// 			.sign {
+	// 				color: #34A853;
+	// 				// border: 2rpx solid #34A853;		
+	// 			}
+
+	// 			.red {
+	// 				color: #F02828;
+	// 				// border: 2rpx solid #F02828;		
+	// 			}
+	// 		}
+	// 	}
+	// }
 </style>
\ No newline at end of file
diff --git a/subpkg/companyInfo/companyInfo.vue b/subpkg/companyInfo/companyInfo.vue
index 21340c2..1fa1124 100644
--- a/subpkg/companyInfo/companyInfo.vue
+++ b/subpkg/companyInfo/companyInfo.vue
@@ -1,304 +1,314 @@
 <template>
-  <view class="">
-    <u-sticky bgColor="#fff">
-      <u-tabs :list="tabLists" @click="changeCurrent" lineColor='#3274F9' :scrollable="false" lineWidth='40'
-        inactiveStyle='color:#666' activeStyle="color:#3274F9"></u-tabs>
-    </u-sticky>
-    <view v-if="loadType">
-      <view class="company_info" v-show="current==0">
-        <company></company>
-      </view>
-      <view class="company_list" v-show="current==1">
-        <view class="info_card" v-for="item in companyList" :key="item.id">
-          <view class="top" @click="navTo('/subpkg/companySign/companySign?id='+item.id)">
-            <view>
-              <view class="info_name" :class="item.is_contract?'have':'no'">{{item.company_name}}</view>
-              <view class="info_type">{{item.company_type_name}}</view>
-            </view>
-            <view class="btn">详情<uni-icons type="forward" color="#666666"></uni-icons></view>
-          </view>
-          <u-line></u-line>
-          <view class="bottom">
-            <image src="../../static/img/contract/company.png"></image>
-            <view class="text">
-              <view class="text_item">
-                <view class="left_text">主要联系人：</view>
-                <view>{{item.master_name}}</view>
-              </view>
-              <view class="text_item" @click="copyPhone(item.master_phone)">
-                <view class="left_text">联系方式：</view>
-                <view>{{item.master_phone}}</view>
-              </view>
-              <view class="text_item">
-                <view class="left_text">区县乡镇：</view>
-                <view>{{item.city_name+'/'+item.area_name+'/'+item.street_name}}</view>
-              </view>
-              <!-- <view>片区经理：</view> -->
-            </view>
-          </view>
-        </view>
-        <u-loadmore :status="loadConfig.status" :loading-text="loadConfig.loadingText"
-          :loadmore-text="loadConfig.loadmoreText" :nomore-text="loadConfig.nomoreText" />
-        <mybtn text="新建签约" @click="navTo('/subpkg/companyUnsign/companyUnsign')"></mybtn>
-      </view>
-      <view class="company_info" v-show="current==2">
-        <companyFinance></companyFinance>
-      </view>
-      <view v-show="current==3">
-        <task ref="taskRef" style="width: 100vw;"></task>
-      </view>
-    </view>
-    <u-empty v-else icon="/static/img/empty/data.png" text="没有数据"></u-empty>
-  </view>
+	<view class="">
+		<u-sticky bgColor="#0022C7">
+			<u-tabs :list="tabLists" @click="changeCurrent" lineColor='white' :scrollable="false" lineWidth='40'
+				inactiveStyle='color:white' activeStyle="color:white"></u-tabs>
+		</u-sticky>
+		<view v-if="loadType">
+			<view class="company_info" v-show="current==0">
+				<company></company>
+			</view>
+			<view class="company_list" v-show="current==1">
+				<view class="info_card" v-for="item in companyList" :key="item.id">
+					<view class="top" @click="navTo('/subpkg/companySign/companySign?id='+item.id)">
+						<view>
+							<view class="info_name" :class="item.is_contract?'have':'no'">{{item.company_name}}</view>
+							<view class="info_type">{{item.company_type_name}}</view>
+						</view>
+						<view class="btn">详情<uni-icons type="forward" color="#666666"></uni-icons></view>
+					</view>
+					<u-line></u-line>
+					<view class="bottom">
+						<image src="../../static/img/contract/company.png"></image>
+						<view class="text">
+							<view class="text_item">
+								<view class="left_text">主要联系人：</view>
+								<view>{{item.master_name}}</view>
+							</view>
+							<view class="text_item" @click="copyPhone(item.master_phone)">
+								<view class="left_text">联系方式：</view>
+								<view>{{item.master_phone}}</view>
+							</view>
+							<view class="text_item">
+								<view class="left_text">区县乡镇：</view>
+								<view>{{item.city_name+'/'+item.area_name+'/'+item.street_name}}</view>
+							</view>
+							<!-- <view>片区经理：</view> -->
+						</view>
+					</view>
+				</view>
+				<u-loadmore :status="loadConfig.status" :loading-text="loadConfig.loadingText"
+					:loadmore-text="loadConfig.loadmoreText" :nomore-text="loadConfig.nomoreText" />
+				<mybtn text="新建签约" @click="navTo('/subpkg/companyUnsign/companyUnsign')"></mybtn>
+			</view>
+			<view class="company_info" v-show="current==2">
+				<companyFinance></companyFinance>
+			</view>
+			<view v-show="current==3">
+				<task ref="taskRef" style="width: 100vw;"></task>
+			</view>
+		</view>
+		<u-empty v-else icon="/static/img/empty/data.png" text="没有数据"></u-empty>
+	</view>
 </template>
 
 <script>
-  import { companyIndex } from "@/api/company.js"
-  import { Toast } from '@/libs/uniApi.js'
-  import companyFinance from "@/components/companyFinance/companyFinance.vue"
-  import task from "@/components/task/index.vue"
-  export default {
-    components: { companyFinance, task },
-    data() {
-      return {
-        current: 0,
-        currentChild: 0,
-        loadType: true,// 当公司不存在时显示
-        tabLists: [{
-          name: '我的公司',
-        }, {
-          name: '签约公司'
-        }, {
-          name: '公司财务'
-        }, {
-          name: '任务情况'
-        }],
-        loadConfig: {
-          page: 1,
-          limit: 15,
-          lastpage: '',
-          loadingText: '努力加载中',
-          loadmoreText: '轻轻上拉',
-          nomoreText: '我也是有底线的~~',
-          status: 'loadmore'
-        },
-        companyList: []
-      }
-    },
-    onLoad() {},
-    onShow() {
-      if(this.$store.state.app.userInfo.company_id){
-        this.loadCompanyList();
-      }else {
-        this.loadType = false;
-      }
-    },
-    onReachBottom() {
-      if(this.current==1) this.loadCompanyList();
-      else if(this.current==3) this.$refs.taskRef.loadList();
-    },
-    methods: {
-      async initLoad() {
-        this.loadConfig.page = 1;
-        this.loadConfig.status = "loadmore";
-        this.companyList = [];
-        await this.loadCompanyList();
-      },
-      // 加载公司列表
-      async loadCompanyList() {
-        if (this.loadConfig.status == "nomore") return;
-        this.loadConfig.status = "loading";
-        let res = await companyIndex({
-          page: this.loadConfig.page,
-          limit: this.loadConfig.limit
-        })
-        this.loadConfig.status = "loadmore"
-        if (res.data.data.length < this.loadConfig.limit) {
-          this.loadConfig.status = "nomore"
-        } else {
-          this.loadConfig.page++;
-        }
-        this.companyList = [...this.companyList, ...res.data?.data]
-      },
-      navTo(url) {
-        url ?
-          uni.navigateTo({
-            url: url
-          }) : Toast('暂未开放')
-      },
-      naviBack() {
-        uni.navigateBack()
-      },
-      copyPhone(str = "", type = "号码") {
-        if (str) uni.setClipboardData({
-          data: str + "",
-          success: (e) => {
-            Toast(type + '已复制')
-          },
-          fail: (e) => {
-            Toast('复制失败')
-          }
-        })
-      },
-      changeCurrent(e){
-        this.current = e.index;
-      }
-    },
-    onPullDownRefresh() {
-      if(this.current==1) this.initLoad();
-      else if(this.current==3) this.$refs.taskRef.initLoadConfig();
-      this.$u.sleep(500).then(()=>{uni.stopPullDownRefresh()})
-    }
-  }
+	import {
+		companyIndex
+	} from "@/api/company.js"
+	import {
+		Toast
+	} from '@/libs/uniApi.js'
+	import companyFinance from "@/components/companyFinance/companyFinance.vue"
+	import task from "@/components/task/index.vue"
+	export default {
+		components: {
+			companyFinance,
+			task
+		},
+		data() {
+			return {
+				current: 0,
+				currentChild: 0,
+				loadType: true, // 当公司不存在时显示
+				tabLists: [{
+					name: '我的公司',
+				}, {
+					name: '签约公司'
+				}, {
+					name: '公司财务'
+				}, {
+					name: '任务情况'
+				}],
+				loadConfig: {
+					page: 1,
+					limit: 15,
+					lastpage: '',
+					loadingText: '努力加载中',
+					loadmoreText: '轻轻上拉',
+					nomoreText: '我也是有底线的~~',
+					status: 'loadmore'
+				},
+				companyList: []
+			}
+		},
+		onLoad() {},
+		onShow() {
+			if (this.$store.state.app.userInfo.company_id) {
+				this.loadCompanyList();
+			} else {
+				this.loadType = false;
+			}
+		},
+		onReachBottom() {
+			if (this.current == 1) this.loadCompanyList();
+			else if (this.current == 3) this.$refs.taskRef.loadList();
+		},
+		methods: {
+			async initLoad() {
+				this.loadConfig.page = 1;
+				this.loadConfig.status = "loadmore";
+				this.companyList = [];
+				await this.loadCompanyList();
+			},
+			// 加载公司列表
+			async loadCompanyList() {
+				if (this.loadConfig.status == "nomore") return;
+				this.loadConfig.status = "loading";
+				let res = await companyIndex({
+					page: this.loadConfig.page,
+					limit: this.loadConfig.limit
+				})
+				this.loadConfig.status = "loadmore"
+				if (res.data.data.length < this.loadConfig.limit) {
+					this.loadConfig.status = "nomore"
+				} else {
+					this.loadConfig.page++;
+				}
+				this.companyList = [...this.companyList, ...res.data?.data]
+			},
+			navTo(url) {
+				url ?
+					uni.navigateTo({
+						url: url
+					}) : Toast('暂未开放')
+			},
+			naviBack() {
+				uni.navigateBack()
+			},
+			copyPhone(str = "", type = "号码") {
+				if (str) uni.setClipboardData({
+					data: str + "",
+					success: (e) => {
+						Toast(type + '已复制')
+					},
+					fail: (e) => {
+						Toast('复制失败')
+					}
+				})
+			},
+			changeCurrent(e) {
+				this.current = e.index;
+			}
+		},
+		onPullDownRefresh() {
+			if (this.current == 1) this.initLoad();
+			else if (this.current == 3) this.$refs.taskRef.initLoadConfig();
+			this.$u.sleep(500).then(() => {
+				uni.stopPullDownRefresh()
+			})
+		}
+	}
 </script>
 
 <style lang="scss">
-  page{
-    
-  }
-  .fixed_box {
-    width: 100%;
-    position: fixed;
-    /* #ifdef APP-PLUS */
-    top: 0;
-    /* #endif */
-    /* #ifdef H5 */
-    top: 44px;
-    /* #endif */
-    left: 0;
-    z-index: 999;
-  }
+	page {}
 
-  .top_box {
-    background-color: #fff;
-    display: flex;
+	.fixed_box {
+		width: 100%;
+		position: fixed;
+		/* #ifdef APP-PLUS */
+		top: 0;
+		/* #endif */
+		/* #ifdef H5 */
+		top: 44px;
+		/* #endif */
+		left: 0;
+		z-index: 999;
+	}
 
-    .item {
-      flex-shrink: 0;
-      /* 禁止缩小 */
-      width: 155rpx;
-      height: 53rpx;
-      background: #F5F5F5FF;
-      color: #999999FF;
-      border-radius: 35rpx 35rpx 35rpx 35rpx;
-      opacity: 1;
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      margin: 28rpx 0;
-      margin-left: 28rpx;
-    }
+	.top_box {
+		background-color: #fff;
+		display: flex;
 
-    .active {
-      background: $theme-oa-color;
-      color: #fff;
-    }
-  }
+		.item {
+			flex-shrink: 0;
+			/* 禁止缩小 */
+			width: 155rpx;
+			height: 53rpx;
+			background: #F5F5F5FF;
+			color: #999999FF;
+			border-radius: 35rpx 35rpx 35rpx 35rpx;
+			opacity: 1;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			margin: 28rpx 0;
+			margin-left: 28rpx;
+		}
 
-  .top_box2 {
-    .item {
-      margin-top: 0;
-      width: 120rpx;
-    }
-  }
+		.active {
+			background: $theme-oa-color;
+			color: #fff;
+		}
+	}
 
-  .company_info {
-    // margin-top: 110rpx;
-  }
+	.top_box2 {
+		.item {
+			margin-top: 0;
+			width: 120rpx;
+		}
+	}
 
-  .company_list {
-    padding-bottom: 32rpx;
-    // margin-top: 190rpx;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
+	.company_info {
+		// margin-top: 110rpx;
+	}
 
-    .info_card {
-      width: 694rpx;
-      // height: 300rpx;
-      background: #FFFFFF;
-      border-radius: 21rpx 21rpx 21rpx 21rpx;
-      margin-top: 28rpx;
-      padding: 24rpx;
+	.company_list {
+		padding-bottom: 32rpx;
+		// margin-top: 190rpx;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
 
-      .top {
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-        margin-bottom: 28rpx;
+		.info_card {
+			width: 694rpx;
+			// height: 300rpx;
+			background: #FFFFFF;
+			border-radius: 21rpx 21rpx 21rpx 21rpx;
+			margin-top: 28rpx;
+			padding: 24rpx;
 
-        .info_name {
-          font-size: 32rpx;
-          font-weight: 500;
-          color: #333333;
-        }
+			.top {
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				margin-bottom: 28rpx;
 
-        .have {
-          &::before {
-            content: "已签约";
-            border-radius: 14rpx;
-            border: 5rpx solid #5ac725;
-            color: #5ac725;
-            padding: 3rpx 6rpx;
-            font-size: 28rpx;
-            margin-right: 10rpx;
-          }
-        }
+				.info_name {
+					font-size: 32rpx;
+					font-weight: 500;
+					color: #333333;
+				}
 
-        .no {
-          &::before {
-            content: "未签约";
-            border-radius: 14rpx;
-            border: 5rpx solid #f56c6c;
-            color: #f56c6c;
-            padding: 3rpx 6rpx;
-            font-size: 28rpx;
-            margin-right: 10rpx;
-          }
-        }
+				.have {
+					&::before {
+						content: "已签约";
+						border-radius: 14rpx;
+						border: 5rpx solid #5ac725;
+						color: #5ac725;
+						padding: 3rpx 6rpx;
+						font-size: 28rpx;
+						margin-right: 10rpx;
+					}
+				}
 
-        .info_type {
-          font-size: 25rpx;
-          font-weight: 500;
-          color: $theme-oa-color;
-          margin-top: 10rpx;
-        }
+				.no {
+					&::before {
+						content: "未签约";
+						border-radius: 14rpx;
+						border: 5rpx solid #f56c6c;
+						color: #f56c6c;
+						padding: 3rpx 6rpx;
+						font-size: 28rpx;
+						margin-right: 10rpx;
+					}
+				}
 
-        .btn {
-          flex-shrink: 0;
-          font-size: 25rpx;
-          font-weight: 400;
-          color: #666666;
-          display: flex;
-          align-items: center;
-          justify-content: right;
-        }
-      }
+				.info_type {
+					font-size: 25rpx;
+					font-weight: 500;
+					color: $theme-oa-color;
+					margin-top: 10rpx;
+				}
 
-      .bottom {
-        display: flex;
-        margin-top: 28rpx;
+				.btn {
+					flex-shrink: 0;
+					font-size: 25rpx;
+					font-weight: 400;
+					color: #666666;
+					display: flex;
+					align-items: center;
+					justify-content: right;
+				}
+			}
 
-        image {
-          height: 140rpx;
-          width: 140rpx;
-          margin-right: 28rpx;
-        }
+			.bottom {
+				display: flex;
+				margin-top: 28rpx;
 
-        .text {
-          display: flex;
-          flex-direction: column;
-          justify-content: space-between;
-          .text_item{
-            display: flex;
-            .left_text{
-              flex-shrink: 0;
-            }
-          }
-        }
-      }
-    }
-    
-    
-  }
+				image {
+					height: 140rpx;
+					width: 140rpx;
+					margin-right: 28rpx;
+				}
+
+				.text {
+					display: flex;
+					flex-direction: column;
+					justify-content: space-between;
+
+					.text_item {
+						display: flex;
+
+						.left_text {
+							flex-shrink: 0;
+						}
+					}
+				}
+			}
+		}
+
+
+	}
 </style>
\ No newline at end of file
diff --git a/subpkg/personnel/personnel.vue b/subpkg/personnel/personnel.vue
index 3f2acdc..7305e4d 100644
--- a/subpkg/personnel/personnel.vue
+++ b/subpkg/personnel/personnel.vue
@@ -1,348 +1,489 @@
 <template>
-  <view class="personnel">
-    <view class="personnel_list">
-      <block v-for="(item, index) in userList" :key="item.id">
-        <view class="personnel_item">
-          <view class="type" :class="item.is_contract?'type_blue':''">
-            <image v-if="item.is_contract" src="../../static/icons/ok_w.png"></image>
-            <image v-else src="../../static/icons/err_w.png"></image>
-          </view>
-          <view class="top" style="margin-bottom: 28rpx;">
-            <view class="left">
-              <u--image class="u_avatar" :showLoading="true" :src="item.avatar||'../../static/img/public/man.png'"
-                width="112.28rpx" height="112.28rpx" shape="circle"></u--image>
-            </view>
-            <view class="right">
-              <view class="info_top">
-                <view class="info_name">{{item.nickname}}</view>
-                <text class="phone">电话:</text>
-                <text class="tel">{{item.phone||item.account}}</text>
-              </view>
-              <view class="info_bottom">
-                <text class="item phone">
-                  分管片区:
-                </text>
-                <view class="item">
-                  <view class="location">{{ (item.street_name||'')+(item.village_name||'')+(item.brigade_name||'') }}</view>
-                </view>
-              </view>
-              <view class="info_bottom">
-                <text class="item phone">
-                  所属公司:
-                </text>
-                <view class="item" v-if="item.company">
-                  <view class="location">
-                    {{item.company.company_name}}
-                  </view>
-                </view>
-              </view>
-            </view>
-          </view>
-         <!-- <view class="center">
-            <view class="top" v-for="(role, roleIndex) in item.roles" :key="roleIndex">
-              {{role}}
-            </view>
-          </view> -->
-          <u-line color="#999999FF"></u-line>
-          <view class="bottom" style="margin-top: 28rpx;float: right;">
-            <button class="look sign" v-if="item.is_contract==1" @click="changeSign(item)">已签约</button>
-            <button class="look red" v-else @click="changeSign(item)">未签约</button>
-            <button class="look" @click="navTo('/subpkg/finance/finance?id='+item.id)">财务查看</button>
-            <button class="look" @click="navTo('/subpkg/personnelDetails/personnelDetails?id='+item.id)">信息查看</button>
-          </view>
-        </view>
-      </block>
-      <u-empty v-if="loadConfig.status=='nomore'&& userList.length==0" icon="/static/img/empty/data.png"></u-empty>
-      <u-loadmore v-else :status="loadConfig.status" :loading-text="loadConfig.loadingText"
-        :loadmore-text="loadConfig.loadmoreText" :nomore-text="loadConfig.nomoreText" />
-    </view>
-    <!-- <button class="new_btn" @click.stop="navTo('/subpkg/newPersonnel/newPersonnel')">创建账号</button> -->
-    <mybtn text="创建账号" @click="navTo('/subpkg/newPersonnel/newPersonnel')"></mybtn>
-  </view>
+	<view class="personnel">
+		<view class="personnel_list">
+
+			<!-- 
+			<block v-for="(item, index) in userList" :key="item.id">
+				<view class="personnel_item">
+					<view class="type" :class="item.is_contract?'type_blue':''">
+						<image v-if="item.is_contract" src="../../static/icons/ok_w.png"></image>
+						<image v-else src="../../static/icons/err_w.png"></image>
+					</view>
+					<view class="top" style="margin-bottom: 28rpx;">
+						<view class="left">
+							<u--image class="u_avatar" :showLoading="true"
+								:src="item.avatar||'../../static/img/public/man.png'" width="112.28rpx"
+								height="112.28rpx" shape="circle"></u--image>
+						</view>
+						<view class="right">
+							<view class="info_top">
+								<view class="info_name">{{item.nickname}}</view>
+								<text class="phone">电话:</text>
+								<text class="tel">{{item.phone||item.account}}</text>
+							</view>
+							<view class="info_bottom">
+								<text class="item phone">
+									分管片区:
+								</text>
+								<view class="item">
+									<view class="location">
+										{{ (item.street_name||'')+(item.village_name||'')+(item.brigade_name||'') }}
+									</view>
+								</view>
+							</view>
+							<view class="info_bottom">
+								<text class="item phone">
+									所属公司:
+								</text>
+								<view class="item" v-if="item.company">
+									<view class="location">
+										{{item.company.company_name}}
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+
+					<u-line color="#999999FF"></u-line>
+					<view class="bottom" style="margin-top: 28rpx;float: right;">
+						<button class="look sign" v-if="item.is_contract==1" @click="changeSign(item)">已签约</button>
+						<button class="look red" v-else @click="changeSign(item)">未签约</button>
+						<button class="look" @click="navTo('/subpkg/finance/finance?id='+item.id)">财务查看</button>
+						<button class="look"
+							@click="navTo('/subpkg/personnelDetails/personnelDetails?id='+item.id)">信息查看</button>
+					</view>
+				</view>
+			</block>
+ -->
+			<view class="personnel_list">
+				<view class="card" v-for="(item, index) in userList" :key="item.id">
+					<view class="card_head">
+						<text style="font-size: 32rpx">创建时间: 2020-25-2</text>
+						<text @click="navTo('/subpkg/finance/finance?id='+item.id)">财务查看</text>
+						<text @click="navTo('/subpkg/personnelDetails/personnelDetails?id='+item.id)">信息查看</text>
+					</view>
+					<view class="card_content">
+						<view class="left">
+							<view class="cir">
+								<u--image class="u_avatar" :showLoading="true"
+									:src="item.avatar||'../../static/img/public/man.png'" width="112.28rpx"
+									height="112.28rpx" shape="circle"></u--image>
+							</view>
+
+							<view style="margin-top: 40rpx;" @click="changeSign(item)">
+								<u-icon style="display: inline-block;margin-left: 10rpx;" color="white"
+									name="edit-pen-fill"></u-icon> {{item.is_contract?'已签约':'未签约'}}
+							</view>
+						</view>
+						<view class="right">
+							<view class="">
+								<text>公司名称 :</text>
+								<text> {{item.company.company_name}}</text>
+							</view>
+							<view class="">
+								<text>人员姓名 :</text>
+								<text>{{item.nickname}}</text>
+							</view>
+							<view class="">
+								<text>联系电话 :</text>
+								<text>{{item.phone}}</text>
+							</view>
+							<view class="">
+								<text>负责区域 :</text>
+								<text> {{ (item.street_name||'')+(item.village_name||'')+(item.brigade_name||'') }}
+								</text>
+							</view>
+						</view>
+
+
+
+					</view>
+				</view>
+			</view>
+
+
+			<u-empty v-if="loadConfig.status=='nomore'&& userList.length==0"
+				icon="/static/img/empty/data.png"></u-empty>
+			<u-loadmore v-else :status="loadConfig.status" :loading-text="loadConfig.loadingText"
+				:loadmore-text="loadConfig.loadmoreText" :nomore-text="loadConfig.nomoreText" />
+		</view>
+		<!-- <button class="new_btn" @click.stop="navTo('/subpkg/newPersonnel/newPersonnel')">创建账号</button> -->
+		<mybtn text="创建账号" @click="navTo('/subpkg/newPersonnel/newPersonnel')"></mybtn>
+	</view>
 </template>
 
 <script>
-  import { Toast } from '@/libs/uniApi.js'
-  import { companyUser } from "@/api/company.js"
-  export default {
-    data() {
-      return {
-        loadConfig: {
-          page: 1,
-          limit: 15,
-          loadingText: '努力加载中',
-          loadmoreText: '轻轻上拉',
-          nomoreText: '我也是有底线的~~',
-          status: 'loadmore'
-        },
-        userList: []
-      }
-    },
-    onLoad() {
-      this.loadUserList();
-      uni.$on('initPersonnel', this.initLoad);
-    },
-    methods: {
-      navTo(url) {
-        url ?
-          uni.navigateTo({
-            url: url,
-          }) : Toast('暂未开放')
-      },
-      async initLoad() {
-        this.loadConfig.page = 1;
-        this.loadConfig.status = "loadmore";
-        this.userList = [];
-        await this.loadUserList();
-        uni.stopPullDownRefresh();  
-      },
-      async loadUserList() {
-        let that = this;
-        if (this.loadConfig.status == "nomore") return;
-        this.loadConfig.status = "loading"
-        let res = await companyUser({
-          page: this.loadConfig.page,
-          limit: this.loadConfig.limit,
-          company_id: this.$store.state.app.userInfo.company_id
-        })
-        this.loadConfig.status = "loadmore"
-        if (res.data.data.length < this.loadConfig.limit) {
-          this.loadConfig.status = "nomore"
-        } else {
-          this.loadConfig.page++;
-        }
-        this.userList = [...this.userList, ...res.data?.data]
-      },
-      // 点击已签约或未签约按钮
-      changeSign(data){
-        if(data.is_contract)Toast('已完成签约');
-        else uni.showModal({
-          content:'该人员还未签约,是否立即签约?',
-          success: (e) => {
-            if(e.confirm)this.navTo('/subpkg/personnelDetails/personnelDetails?id='+data.id);
-          }
-        })
-      }
-    },
-    onPullDownRefresh() {
-		this.initLoad();
-    }
-  }
+	import {
+		Toast
+	} from '@/libs/uniApi.js'
+	import {
+		companyUser
+	} from "@/api/company.js"
+	export default {
+		data() {
+			return {
+				loadConfig: {
+					page: 1,
+					limit: 15,
+					loadingText: '努力加载中',
+					loadmoreText: '轻轻上拉',
+					nomoreText: '我也是有底线的~~',
+					status: 'loadmore'
+				},
+				userList: []
+			}
+		},
+		onLoad() {
+			this.loadUserList();
+			uni.$on('initPersonnel', this.initLoad);
+		},
+		methods: {
+			navTo(url) {
+				url ?
+					uni.navigateTo({
+						url: url,
+					}) : Toast('暂未开放')
+			},
+			async initLoad() {
+				this.loadConfig.page = 1;
+				this.loadConfig.status = "loadmore";
+				this.userList = [];
+				await this.loadUserList();
+				uni.stopPullDownRefresh();
+			},
+			async loadUserList() {
+				let that = this;
+				if (this.loadConfig.status == "nomore") return;
+				this.loadConfig.status = "loading"
+				let res = await companyUser({
+					page: this.loadConfig.page,
+					limit: this.loadConfig.limit,
+					company_id: this.$store.state.app.userInfo.company_id
+				})
+				this.loadConfig.status = "loadmore"
+				if (res.data.data.length < this.loadConfig.limit) {
+					this.loadConfig.status = "nomore"
+				} else {
+					this.loadConfig.page++;
+				}
+				this.userList = [...this.userList, ...res.data?.data]
+			},
+			// 点击已签约或未签约按钮
+			changeSign(data) {
+				if (data.is_contract) Toast('已完成签约');
+				else uni.showModal({
+					content: '该人员还未签约,是否立即签约?',
+					success: (e) => {
+						if (e.confirm) this.navTo('/subpkg/personnelDetails/personnelDetails?id=' + data.id);
+					}
+				})
+			}
+		},
+		onPullDownRefresh() {
+			this.initLoad();
+		}
+	}
 </script>
 
 <style lang="scss">
-  .personnel {
-    .new_btn {
-      position: fixed;
-      bottom: 30rpx;
-      // margin-top: 32rpx;
-      // margin-bottom: 40rpx;
-      left: 50%;
-      transform: translate(-50%);
-      z-index: 999;
-      width: 694rpx;
-      height: 84rpx;
-      background: $theme-oa-color;
-      border-radius: 42rpx 42rpx 42rpx 42rpx;
-      color: #fff;
-      line-height: 80rpx;
-      text-align: center;
-    }
+	.personnel {
+		.new_btn {
+			position: fixed;
+			bottom: 30rpx;
+			// margin-top: 32rpx;
+			// margin-bottom: 40rpx;
+			left: 50%;
+			transform: translate(-50%);
+			z-index: 999;
+			width: 694rpx;
+			height: 84rpx;
+			background: $theme-oa-color;
+			border-radius: 42rpx 42rpx 42rpx 42rpx;
+			color: #fff;
+			line-height: 80rpx;
+			text-align: center;
+		}
 
-    .personnel_list {
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-      padding-top: 32rpx;
-      padding-bottom: 130rpx;
+		.personnel_list {
+			padding: 28rpx 0;
+			margin-bottom: 130rpx;
 
-      .personnel_item {
-        width: 694rpx;
-        // height: 407rpx;
-        background: #FFFFFF;
-        border-radius: 14rpx 14rpx 14rpx 14rpx;
-        margin-bottom: 32rpx;
-        overflow: hidden;
-        position: relative;
-        padding: 28rpx;
+			.card {
+				margin: 0 auto;
+				margin-bottom: 28rpx;
+				width: 694rpx;
+				background: #FFFFFF;
+				border-radius: 30rpx;
+				opacity: 1;
+				overflow: hidden;
+				box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.6);
 
-        .type {
-          width: 50rpx;
-          height: 50rpx;
-          background-color: #F02828;
-          border-radius: 50%;
-          font-size: 25rpx;
-          font-weight: 400;
-          color: #FFFFFF;
-          line-height: 35rpx;
-          display: flex;
-          justify-content: center;
-          align-items: center;
-          position: absolute;
-          top: 28rpx;
-          right: 28rpx;
+				.card_head {
+					padding: 28rpx;
+					background-color: $theme-oa-color;
+					color: white;
+					height: 100rpx;
+					display: flex;
+					justify-content: space-between;
 
-          image {
-            width: 18rpx;
-            height: 18rpx;
-            margin-right: 1rpx;
-          }
-        }
+				}
 
-        .type_blue {
-          background-color: #34A853;
-        }
+				.card_content {
+					padding: 28rpx;
+					display: flex;
 
-        .top {
-          // background-color: #3274F9;
-          display: flex;
+					.left {
+						text-align: center;
+						// padding: 15rpx 25rpx;
+						padding-top: 20rpx;
 
-          .right {
-            display: flex;
-            flex-direction: column;
-            justify-content: space-around;
-            margin-left: 28rpx;
-            font-size: 25rpx;
-            font-weight: 400;
-            overflow: hidden;
-            color: #999999;
+						margin-right: 50rpx;
+						width: 160rpx;
+						background-color: $theme-oa-color;
+						color: white;
+						border-radius: 40rpx;
 
-            .info_top {
-              display: flex;
-              align-items: flex-end;
-              font-size: 25rpx;
-              font-weight: 400;
-              color: $theme-oa-color;
-              margin-bottom: 10rpx;
+						.cir {
+							width: 120rpx;
+							height: 120rpx;
+							background-color: #FFFFFF;
+							margin-left: 25rpx;
+							border-radius: 120rpx;
+							position: relative;
 
-              .info_name {
-                font-size: 32rpx;
-                font-weight: 400;
-                color: #333333;
-                margin-right: 18rpx;
-              }
 
-              .phone {
-                margin-left: 30rpx;
-                color: #999999;
-              }
+						}
 
-              .tel {
-                color: #000;
-              }
-            }
+					}
 
-            .info_bottom {
-              display: flex;
-              margin-bottom: 8rpx;
 
-              .item {
-                display: flex;
-                align-items: flex-start;
-              }
+					.right {
+						display: flex;
+						flex-direction: column;
+						justify-content: space-between;
 
-              .phone {
-                margin-right: 28rpx;
-              }
+						view {
+							text:nth-child(2) {
+								margin-left: 20rpx;
+							}
+						}
+					}
+				}
 
-              .location {
-                width: 350rpx;
-                // white-space: nowrap;
-                // /* 不换行 */
-                // overflow: hidden;
-                // /* 将超出文本隐藏 */
-                // text-overflow: ellipsis;
-                // /* 使用省略号表示被隐藏的文本 */
-                color: #000;
-              }
-            }
 
-            .company {
-              display: flex;
+				.u_avatar {
+					position: absolute;
+					top: 50%;
+					left: 50%;
 
-              text {
-                margin-right: 30rpx;
-              }
+					transform: translate(-50%, -50%);
+				}
 
-              .itm {
-                width: 350rpx;
-                white-space: nowrap;
-                /* 不换行 */
-                overflow: hidden;
-                /* 将超出文本隐藏 */
-                text-overflow: ellipsis;
-                /* 使用省略号表示被隐藏的文本 */
-                color: #000;
-              }
-            }
-          }
-        }
 
-        .center {
-          padding: 28rpx 0;
 
-          .top {
-            font-size: 28rpx;
-            font-weight: 400;
-            color: #666666FF;
-            margin-bottom: 20rpx;
+			}
 
-            .green {
-              color: #34A853FF;
-            }
 
-            .yellow {
-              color: #F9AA32FF;
-            }
-          }
 
-          .bottom {
-            display: flex;
-            justify-content: space-around;
-            font-size: 25rpx;
-            font-weight: 400;
-            color: #999999;
 
-            image {
-              width: 18rpx;
-              height: 18rpx;
-              margin-right: 9rpx;
-            }
-          }
-        }
+		}
 
-        .bottom {
-          display: flex;
-          justify-content: center;
+		// .personnel_list {
+		// 	display: flex;
+		// 	flex-direction: column;
+		// 	align-items: center;
+		// 	padding-top: 32rpx;
+		// 	padding-bottom: 130rpx;
 
-          .look {
-            width: 128rpx;
-            height: 43rpx;
-            background: #FFFFFF;
-            border-radius: 26rpx 26rpx 26rpx 26rpx;
-            opacity: 1;
-            // border: 2rpx solid $theme-oa-color;
-            font-size: 28rpx;
-            font-weight: 400;
-            margin-left: 28rpx;
-            color: $theme-oa-color;
-            display: flex;
-            justify-content: center;
-            align-items: center;
-          }
+		// 	.personnel_item {
+		// 		width: 694rpx;
+		// 		// height: 407rpx;
+		// 		background: #FFFFFF;
+		// 		border-radius: 14rpx 14rpx 14rpx 14rpx;
+		// 		margin-bottom: 32rpx;
+		// 		overflow: hidden;
+		// 		position: relative;
+		// 		padding: 28rpx;
 
-          .sign {
-            color: #34A853;
-            // border: 2rpx solid #34A853;		
-          }
+		// 		.type {
+		// 			width: 50rpx;
+		// 			height: 50rpx;
+		// 			background-color: #F02828;
+		// 			border-radius: 50%;
+		// 			font-size: 25rpx;
+		// 			font-weight: 400;
+		// 			color: #FFFFFF;
+		// 			line-height: 35rpx;
+		// 			display: flex;
+		// 			justify-content: center;
+		// 			align-items: center;
+		// 			position: absolute;
+		// 			top: 28rpx;
+		// 			right: 28rpx;
 
-          .red {
-            color: #F02828;
-            // border: 2rpx solid #F02828;		
-          }
-        }
-      }
-    }
+		// 			image {
+		// 				width: 18rpx;
+		// 				height: 18rpx;
+		// 				margin-right: 1rpx;
+		// 			}
+		// 		}
 
-  }
+		// 		.type_blue {
+		// 			background-color: #34A853;
+		// 		}
+
+		// 		.top {
+		// 			// background-color: #3274F9;
+		// 			display: flex;
+
+		// 			.right {
+		// 				display: flex;
+		// 				flex-direction: column;
+		// 				justify-content: space-around;
+		// 				margin-left: 28rpx;
+		// 				font-size: 25rpx;
+		// 				font-weight: 400;
+		// 				overflow: hidden;
+		// 				color: #999999;
+
+		// 				.info_top {
+		// 					display: flex;
+		// 					align-items: flex-end;
+		// 					font-size: 25rpx;
+		// 					font-weight: 400;
+		// 					color: $theme-oa-color;
+		// 					margin-bottom: 10rpx;
+
+		// 					.info_name {
+		// 						font-size: 32rpx;
+		// 						font-weight: 400;
+		// 						color: #333333;
+		// 						margin-right: 18rpx;
+		// 					}
+
+		// 					.phone {
+		// 						margin-left: 30rpx;
+		// 						color: #999999;
+		// 					}
+
+		// 					.tel {
+		// 						color: #000;
+		// 					}
+		// 				}
+
+		// 				.info_bottom {
+		// 					display: flex;
+		// 					margin-bottom: 8rpx;
+
+		// 					.item {
+		// 						display: flex;
+		// 						align-items: flex-start;
+		// 					}
+
+		// 					.phone {
+		// 						margin-right: 28rpx;
+		// 					}
+
+		// 					.location {
+		// 						width: 350rpx;
+		// 						// white-space: nowrap;
+		// 						// /* 不换行 */
+		// 						// overflow: hidden;
+		// 						// /* 将超出文本隐藏 */
+		// 						// text-overflow: ellipsis;
+		// 						// /* 使用省略号表示被隐藏的文本 */
+		// 						color: #000;
+		// 					}
+		// 				}
+
+		// 				.company {
+		// 					display: flex;
+
+		// 					text {
+		// 						margin-right: 30rpx;
+		// 					}
+
+		// 					.itm {
+		// 						width: 350rpx;
+		// 						white-space: nowrap;
+		// 						/* 不换行 */
+		// 						overflow: hidden;
+		// 						/* 将超出文本隐藏 */
+		// 						text-overflow: ellipsis;
+		// 						/* 使用省略号表示被隐藏的文本 */
+		// 						color: #000;
+		// 					}
+		// 				}
+		// 			}
+		// 		}
+
+		// 		.center {
+		// 			padding: 28rpx 0;
+
+		// 			.top {
+		// 				font-size: 28rpx;
+		// 				font-weight: 400;
+		// 				color: #666666FF;
+		// 				margin-bottom: 20rpx;
+
+		// 				.green {
+		// 					color: #34A853FF;
+		// 				}
+
+		// 				.yellow {
+		// 					color: #F9AA32FF;
+		// 				}
+		// 			}
+
+		// 			.bottom {
+		// 				display: flex;
+		// 				justify-content: space-around;
+		// 				font-size: 25rpx;
+		// 				font-weight: 400;
+		// 				color: #999999;
+
+		// 				image {
+		// 					width: 18rpx;
+		// 					height: 18rpx;
+		// 					margin-right: 9rpx;
+		// 				}
+		// 			}
+		// 		}
+
+		// 		.bottom {
+		// 			display: flex;
+		// 			justify-content: center;
+
+		// 			.look {
+		// 				width: 128rpx;
+		// 				height: 43rpx;
+		// 				background: #FFFFFF;
+		// 				border-radius: 26rpx 26rpx 26rpx 26rpx;
+		// 				opacity: 1;
+		// 				// border: 2rpx solid $theme-oa-color;
+		// 				font-size: 28rpx;
+		// 				font-weight: 400;
+		// 				margin-left: 28rpx;
+		// 				color: $theme-oa-color;
+		// 				display: flex;
+		// 				justify-content: center;
+		// 				align-items: center;
+		// 			}
+
+		// 			.sign {
+		// 				color: #34A853;
+		// 				// border: 2rpx solid #34A853;		
+		// 			}
+
+		// 			.red {
+		// 				color: #F02828;
+		// 				// border: 2rpx solid #F02828;		
+		// 			}
+		// 		}
+		// 	}
+		// }
+
+
+
+	}
 </style>
\ No newline at end of file
diff --git a/test.vue b/test.vue
new file mode 100644
index 0000000..830376e
--- /dev/null
+++ b/test.vue
@@ -0,0 +1,119 @@
+<template>
+
+
+  <view class="personnel_list">
+    <view class="cards">
+      <view class="cards_head">
+        <text style="font-size: 32rpx">最后更新:2020-25-2</text>
+        <text>更新档案</text>
+        <text>查看档案</text>
+      </view>
+      <view class="cards_content">
+        <view class="right">
+          <view class="">
+            <text>人员姓名 :</text>
+            <text> { item.name }</text>
+          </view>
+          <view class="">
+            <text>联系电话 :</text>
+            <text>{ item.phone }</text>
+          </view>
+          <view class="">
+            <text>所属片区 :</text>
+            <text> 所属片区 </text>
+          </view>
+        </view>
+
+        <view class="left">
+          <view class="cir">
+            <u--image
+              class="u_avatar"
+              :showLoading="true"
+              :src="'../../static/img/public/man.png'"
+              width="112.28rpx"
+              height="112.28rpx"
+              shape="circle"
+            ></u--image>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+
+
+</template>
+
+<style lang="scss">
+
+.personnel_list {
+  padding: 28rpx 0;
+  margin-bottom: 130rpx;
+
+  .cards {
+    margin: 0 auto;
+    margin-bottom: 28rpx;
+    width: 694rpx;
+    background: #ffffff;
+    border-radius: 30rpx;
+    opacity: 1;
+    overflow: hidden;
+    box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.6);
+
+    .cards_head {
+      padding: 28rpx;
+      background-color: $theme-oa-color;
+      color: white;
+      height: 100rpx;
+      display: flex;
+      justify-content: space-between;
+    }
+
+    .cards_content {
+      padding: 28rpx;
+      display: flex;
+      justify-content: space-between;
+
+      .left {
+        text-align: center;
+        // padding: 15rpx 25rpx;
+        padding-top: 20rpx;
+
+        width: 160rpx;
+        background-color: $theme-oa-color;
+        color: white;
+        border-radius: 40rpx;
+
+        .cir {
+          width: 120rpx;
+          height: 120rpx;
+          background-color: #ffffff;
+          margin-left: 25rpx;
+          border-radius: 120rpx;
+          position: relative;
+        }
+      }
+
+      .right {
+        display: flex;
+        flex-direction: column;
+        justify-content: space-between;
+
+        view {
+          text:nth-child(2) {
+            margin-left: 20rpx;
+          }
+        }
+      }
+    }
+
+    .u_avatar {
+      position: absolute;
+      top: 50%;
+      left: 50%;
+
+      transform: translate(-50%, -50%);
+    }
+  }
+}
+
+</style>
diff --git a/uni.scss b/uni.scss
index 5a8a58f..de3b0ca 100644
--- a/uni.scss
+++ b/uni.scss
@@ -15,7 +15,7 @@
 /* 颜色变量 */
 
 @import '@/uni_modules/uview-ui/theme.scss';
-$theme-oa-color: #3175f9;
+$theme-oa-color: #0122c7;
 /* 行为相关颜色 */
 $uni-color-primary: #007aff;
 $uni-color-success: #4cd964;
@@ -23,32 +23,32 @@ $uni-color-warning: #f0ad4e;
 $uni-color-error: #dd524d;
 
 /* 文字基本颜色 */
-$uni-text-color:#333;//基本色
-$uni-text-color-inverse:#fff;//反色
-$uni-text-color-grey:#999;//辅助灰色，如加载更多的提示信息
+$uni-text-color: #333; //基本色
+$uni-text-color-inverse: #fff; //反色
+$uni-text-color-grey: #999; //辅助灰色，如加载更多的提示信息
 $uni-text-color-placeholder: #808080;
-$uni-text-color-disable:#c0c0c0;
+$uni-text-color-disable: #c0c0c0;
 
 /* 背景颜色 */
-$uni-bg-color:#ffffff;
-$uni-bg-color-grey:#f8f8f8;
-$uni-bg-color-hover:#f1f1f1;//点击状态颜色
-$uni-bg-color-mask:rgba(0, 0, 0, 0.4);//遮罩颜色
+$uni-bg-color: #ffffff;
+$uni-bg-color-grey: #f8f8f8;
+$uni-bg-color-hover: #f1f1f1; //点击状态颜色
+$uni-bg-color-mask: rgba(0, 0, 0, 0.4); //遮罩颜色
 
 /* 边框颜色 */
-$uni-border-color:#c8c7cc;
+$uni-border-color: #c8c7cc;
 
 /* 尺寸变量 */
 
 /* 文字尺寸 */
-$uni-font-size-sm:12px;
-$uni-font-size-base:14px;
-$uni-font-size-lg:16;
+$uni-font-size-sm: 12px;
+$uni-font-size-base: 14px;
+$uni-font-size-lg: 16;
 
 /* 图片尺寸 */
-$uni-img-size-sm:20px;
-$uni-img-size-base:26px;
-$uni-img-size-lg:40px;
+$uni-img-size-sm: 20px;
+$uni-img-size-base: 26px;
+$uni-img-size-lg: 40px;
 
 /* Border Radius */
 $uni-border-radius-sm: 2px;
@@ -70,9 +70,9 @@ $uni-spacing-col-lg: 12px;
 $uni-opacity-disabled: 0.3; // 组件禁用态的透明度
 
 /* 文章场景相关 */
-$uni-color-title: #2C405A; // 文章标题颜色
-$uni-font-size-title:20px;
+$uni-color-title: #2c405a; // 文章标题颜色
+$uni-font-size-title: 20px;
 $uni-color-subtitle: #555555; // 二级标题颜色
-$uni-font-size-subtitle:26px;
-$uni-color-paragraph: #3F536E; // 文章段落颜色
-$uni-font-size-paragraph:15px;
+$uni-font-size-subtitle: 26px;
+$uni-color-paragraph: #3f536e; // 文章段落颜色
+$uni-font-size-paragraph: 15px;