Merge branch 'main' of http://git.excellentkk.cn/mkm/OfficeApp

# Conflicts:
#	subpkg/personnelDetails/personnelDetails.vue

components/company/company.vue

@@ -20,7 +20,7 @@
               <uni-icons type="location"></uni-icons>
               <view class="location">区域:</view>
             </view>
-            <view style="flex: 1;">{{company.province_name+company.city_name+company.area_name+company.street_name+company.address}}</view>
+            <view style="flex: 1;">{{company.address}}</view>
           </view>
         </view>
       </block>

subpkg/archives/archives.vue

@@ -47,6 +47,7 @@
   export default {
     data() {
       return {
+        user_id: 0,
         list: [],
         loadConfig: {
           page: 1,
@@ -59,6 +60,7 @@
       }
     },
     onLoad(options) {
+      this.user_id = options.id
       console.log(options);
     },
     onShow() {
@@ -92,7 +94,8 @@
         this.loadConfig.status = "loading"
         let res = await informationList({
           page: this.loadConfig.page,
-          limit: this.loadConfig.limit
+          limit: this.loadConfig.limit,
+          user_id: that.user_id
         })
         this.loadConfig.status = "loadmore"
         if (res.data.length < this.loadConfig.limit) {

subpkg/personnelDetails/personnelDetails.vue

@@ -11,7 +11,7 @@
               <view class="basic_name">
                 <view class="name">{{userInfo.name}}</view>
                 <image class="icon" :src="userInfo.sex==1?'../../static/icons/man.png':'../../static/icons/woman.png'"></image>
-                <view class="role" v-if="userInfo.roles">{{userInfo.roles[0]}}</view>
+                <!-- <view class="role" v-if="userInfo.roles">{{userInfo.roles[0]}}</view> -->
               </view>
               <view class="id_card">
                 身份证号:{{userInfo.id_card}}