From 0402506b46ac8fab52737682a2700b32ec4d506f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=88=B1=7E=E6=B5=B7=7E=E7=88=B1=E6=B5=B7=E7=88=B1?=
 =?UTF-8?q?=E6=B5=B7=7E=E5=8F=B3?= <1828712314@qq.com>
Date: Thu, 27 Feb 2025 15:12:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=81=E4=B8=9A=E8=B5=84?=
 =?UTF-8?q?=E8=B4=A8=E5=90=8D=E7=A7=B0=E5=9B=9E=E6=98=BE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                       |  22 +-
 pages.json                                    |   1 +
 pages/login.vue                               |  13 +-
 sub/enterprise/detail.vue                     |   9 +-
 sub/invite/addEnterprise.vue                  |  44 +--
 sub/invite/enterpriseIntroduce.vue            |  35 +-
 sub/invite/index.vue                          |  28 +-
 sub/task/detail.vue                           |   1 +
 .../components/u-textarea/u-textarea.vue      | 363 +++++++++---------
 utils/ruoyi.js                                |   4 +-
 10 files changed, 274 insertions(+), 246 deletions(-)

diff --git a/App.vue b/App.vue
index 95ccbe9..64ed1b8 100644
--- a/App.vue
+++ b/App.vue
@@ -6,6 +6,26 @@ export default {
     return {}
   },
   async onLaunch(options) {
+    // const updateManager = uni.getUpdateManager()
+    // updateManager.onCheckForUpdate(function (res) {
+    //   // 请求完新版本信息的回调
+    //   console.log(res.hasUpdate)
+    // })
+    // updateManager.onUpdateReady(function (res) {
+    //   uni.showModal({
+    //     title: '更新提示',
+    //     content: '新版本已发布，重新启动应用',
+    //     showCancel: false,
+    //     confirmText: '立即更新',
+    //     confirmColor: '#1890FF',
+    //     success(res) {
+    //       if (res.confirm) {
+    //         // 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
+    //         updateManager.applyUpdate()
+    //       }
+    //     }
+    //   })
+    // })
     await this.initApp()
   },
   methods: {
@@ -35,4 +55,4 @@ export default {
 <style lang="scss">
 @import '@/uni_modules/windi-css-uniapp/index.scss';
 @import '@/static/scss/index.scss';
-</style>
+</style>
\ No newline at end of file
diff --git a/pages.json b/pages.json
index d6741eb..bb3db05 100644
--- a/pages.json
+++ b/pages.json
@@ -194,6 +194,7 @@
 				"path": "invite/index",
 				"style": {
 					"navigationBarTitleText": "我的企业",
+					"enablePullDownRefresh": true,
 					"componentPlaceholder": {
 						"u-modal": "view",
 						"uni-easyinput": "view"
diff --git a/pages/login.vue b/pages/login.vue
index 32021a8..613b237 100644
--- a/pages/login.vue
+++ b/pages/login.vue
@@ -102,16 +102,13 @@ export default {
         return
       }
 
-      if (user.userType) {
-        switch (user.userType) {
-          case 2:
-            uni.reLaunch({
-              url: `/sub/invite/index`
-            })
-            break
-        }
+      if (user.userType == 2) {
+        uni.reLaunch({
+          url: `/sub/invite/index`
+        })
         return
       }
+
       // 局内用户首次登录
       if (user.audit == null || user.audit == 1) {
         // 局内用户首次登录
diff --git a/sub/enterprise/detail.vue b/sub/enterprise/detail.vue
index 4d53aec..afb1e89 100644
--- a/sub/enterprise/detail.vue
+++ b/sub/enterprise/detail.vue
@@ -93,7 +93,6 @@
           <view class="wd-flex" style="gap: 8px; align-items: center">
             <text class="label">资质时限</text>
             <view>
-              {{ $util.formatDate(prove.handleDate, 'YYYY/M/D') }} ~
               {{ $util.formatDate(prove.expiryDate, 'YYYY/M/D') }}
             </view>
           </view>
@@ -200,7 +199,8 @@ export default {
           'enterprises_type',
           'enterprises_area',
           'enterprises_status',
-          'enterprise_qualification_status'
+          'enterprise_qualification_status',
+          'enterprise_qua'
         ].join(',')
       })
       this.dictMap = {
@@ -229,7 +229,8 @@ export default {
       this.$util.viewPosition({
         lat: position[0],
         lng: position[1],
-        name: enterprise.enterprisesName
+        name: enterprise.enterprisesName,
+        addree: enterprise.address
       })
     },
     postApi() {
@@ -369,4 +370,4 @@ export default {
     color: #99a1b7;
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/sub/invite/addEnterprise.vue b/sub/invite/addEnterprise.vue
index 0f0ad27..ca22e10 100644
--- a/sub/invite/addEnterprise.vue
+++ b/sub/invite/addEnterprise.vue
@@ -265,31 +265,29 @@ export default {
       this.form.id = res.id
       this.init()
     }
-     // 移除可能存在的旧监听器
-  uni.$off('enterpriseIntroduce')
-  uni.$off('enterpriseTag')
-  uni.$off('prove')
-  
-  // 添加事件监听
-  uni.$on('enterpriseIntroduce', data => {
-    this.form.introduction = data.introduce
-  })
-  uni.$on('enterpriseTag', data => {
-    this.form.tags = data
-  })
-  uni.$on('prove', data => {
-    console.log('资质', this.prove)
-    console.log('资质返回', data)
-    if (this.form.id != '') {
-      this.getProve()
-    } else {
-      this.prove.push(data)
-    }
-  })
-  },
-  onShow() {
+    // 移除可能存在的旧监听器
+    uni.$off('enterpriseIntroduce')
+    uni.$off('enterpriseTag')
+    uni.$off('prove')
 
+    // 添加事件监听
+    uni.$on('enterpriseIntroduce', data => {
+      this.form.introduction = data.introduce
+    })
+    uni.$on('enterpriseTag', data => {
+      this.form.tags = data
+    })
+    uni.$on('prove', data => {
+      console.log('资质', this.prove)
+      console.log('资质返回', data)
+      if (this.form.id != '') {
+        this.getProve()
+      } else {
+        this.prove.push(data)
+      }
+    })
   },
+  onShow() {},
   methods: {
     proofName(v) {
       if (v.detail.value == '') return
diff --git a/sub/invite/enterpriseIntroduce.vue b/sub/invite/enterpriseIntroduce.vue
index e4504ad..69149ed 100644
--- a/sub/invite/enterpriseIntroduce.vue
+++ b/sub/invite/enterpriseIntroduce.vue
@@ -1,12 +1,33 @@
 <template>
   <view class="view">
-    <u--textarea
-      v-model="introduce"
-      placeholder="请输入..."
-      maxlength="500"
-      count
-      :autoHeight="true"
-    ></u--textarea>
+    <view
+      class=""
+      style="
+        background-color: #f9f9f9;
+        border: 1px solid #f1f1f4;
+        border-radius: 24rpx;
+        padding: 16rpx;
+      "
+    >
+      <uni-easyinput
+        type="textarea"
+        v-model="introduce"
+        placeholder="请输入..."
+        placeholderStyle="font-size:28rpx"
+        :maxlength="500"
+        :input-border="false"
+        :adjust-position="true"
+        :autoHeight="true"
+        cursorSpacing="32"
+        :styles="{
+          backgroundColor: 'transparent',
+          borderColor: 'none'
+        }"
+      ></uni-easyinput>
+      <view style="color: #78829d; text-align: right">
+        {{ introduce.length }}/500
+      </view>
+    </view>
     <cs-bottom-wrapper>
       <view class="operation">
         <button class="btn green" @tap="submit">保存</button>
diff --git a/sub/invite/index.vue b/sub/invite/index.vue
index fb56bc9..f22e017 100644
--- a/sub/invite/index.vue
+++ b/sub/invite/index.vue
@@ -1,12 +1,5 @@
 <template>
-  <scroll-view
-    class="view-container"
-    direction="vertical"
-    :show-scrollbar="false"
-    @refresherrefresh="onRefresh"
-    :refresher-enabled="true"
-    :refresher-triggered="isRefreshing"
-  >
+  <scroll-view class="view-container">
     <view class="emty" v-if="list.length == 0">
       <image
         src="/static/images/emty.png"
@@ -15,7 +8,6 @@
       ></image>
       <text>暂无数据</text>
     </view>
-
     <view
       class="enterprise"
       v-for="enterprise in list"
@@ -95,7 +87,7 @@
       </view>
     </view>
 
-    <cs-bottom-wrapper>
+    <cs-bottom-wrapper v-if="inviteId">
       <view class="operation">
         <button class="btn green" @tap="addEnterprise">新增企业</button>
       </view>
@@ -112,7 +104,6 @@ export default {
       inviteId: '',
       list: [],
       dictMap: {},
-      isRefreshing: false,
       share: {
         title: '企业变更管理', // 标题
         path: `/sub/invite/index?inviteId=${this.$store.getters.userId}`,
@@ -133,14 +124,10 @@ export default {
   onShareAppMessage() {
     return this.share
   },
+  onPullDownRefresh() {
+    this.getList()
+  },
   methods: {
-    onRefresh(e) {
-      this.isRefreshing = true
-      this.getList()
-      setTimeout(() => {
-        this.isRefreshing = false
-      }, 1000)
-    },
     getList() {
       uni.showLoading({
         title: '加载中...'
@@ -148,6 +135,7 @@ export default {
       vertifyName({ enterpriseUserId: this.$store.getters.userId }).then(
         res => {
           this.list = res.data.list
+          uni.stopPullDownRefresh()
           uni.hideLoading()
         }
       )
@@ -197,12 +185,14 @@ export default {
   padding: 0 24rpx;
   display: flex;
   flex-flow: column nowrap;
-  height: calc(100vh - env(safe-area-inset-bottom));
+  position: relative;
+  padding-bottom: 13vh;
   &::-webkit-scrollbar {
     display: none;
   }
 }
 .emty {
+  margin-top: 24rpx;
   border-radius: 8px;
   height: 550rpx;
   display: flex;
diff --git a/sub/task/detail.vue b/sub/task/detail.vue
index 412ae69..3888a51 100644
--- a/sub/task/detail.vue
+++ b/sub/task/detail.vue
@@ -376,6 +376,7 @@ export default {
         taskId: this.detail.id
       })
       this.list.push(...data.list)
+      uni.stopPullDownRefresh()
       this.load = 'loadmore'
       if (this.list.length == data.total) {
         this.load = 'nomore'
diff --git a/uni_modules/uview-ui/components/u-textarea/u-textarea.vue b/uni_modules/uview-ui/components/u-textarea/u-textarea.vue
index 2cd5fdc..badda00 100644
--- a/uni_modules/uview-ui/components/u-textarea/u-textarea.vue
+++ b/uni_modules/uview-ui/components/u-textarea/u-textarea.vue
@@ -1,47 +1,47 @@
 <template>
-    <view class="u-textarea" :class="textareaClass" :style="[textareaStyle]">
-        <textarea
-            class="u-textarea__field"
-            :value="innerValue"
-            :style="{ height: $u.addUnit(height) }"
-            :placeholder="placeholder"
-            :placeholder-style="$u.addStyle(placeholderStyle, 'string')"
-            :placeholder-class="placeholderClass"
-            :disabled="disabled"
-            :focus="focus"
-            :autoHeight="autoHeight"
-            :fixed="fixed"
-            :cursorSpacing="cursorSpacing"
-            :cursor="cursor"
-            :showConfirmBar="showConfirmBar"
-            :selectionStart="selectionStart"
-            :selectionEnd="selectionEnd"
-            :adjustPosition="adjustPosition"
-            :disableDefaultPadding="disableDefaultPadding"
-            :holdKeyboard="holdKeyboard"
-            :maxlength="maxlength"
-            :confirmType="confirmType"
-            :ignoreCompositionEvent="ignoreCompositionEvent"
-            @focus="onFocus"
-            @blur="onBlur"
-            @linechange="onLinechange"
-            @input="onInput"
-            @confirm="onConfirm"
-            @keyboardheightchange="onKeyboardheightchange"
-        ></textarea>
-        <text
-            class="u-textarea__count"
-            :style="{
-                'background-color': disabled ? 'transparent' : '#fff',
-            }"
-            v-if="count"
-            >{{ innerValue.length }}/{{ maxlength }}</text
-        >
-    </view>
+  <view class="u-textarea" :class="textareaClass" :style="[textareaStyle]">
+    <textarea
+      class="u-textarea__field"
+      :value="innerValue"
+      :placeholder="placeholder"
+      :placeholder-style="$u.addStyle(placeholderStyle, 'string')"
+      :placeholder-class="placeholderClass"
+      :disabled="disabled"
+      :focus="focus"
+      :autoHeight="autoHeight"
+      :fixed="fixed"
+      :cursorSpacing="cursorSpacing"
+      :cursor="cursor"
+      :showConfirmBar="showConfirmBar"
+      :selectionStart="selectionStart"
+      :selectionEnd="selectionEnd"
+      :adjustPosition="adjustPosition"
+      :disableDefaultPadding="disableDefaultPadding"
+      :holdKeyboard="holdKeyboard"
+      :maxlength="maxlength"
+      :confirmType="confirmType"
+      :ignoreCompositionEvent="ignoreCompositionEvent"
+      @focus="onFocus"
+      @blur="onBlur"
+      @linechange="onLinechange"
+      @input="onInput"
+      @confirm="onConfirm"
+      @keyboardheightchange="onKeyboardheightchange"
+    ></textarea>
+    <text
+      class="u-textarea__count"
+      :style="{
+        'background-color': disabled ? 'transparent' : '#fff'
+      }"
+      v-if="count"
+    >
+      {{ innerValue.length }}/{{ maxlength }}
+    </text>
+  </view>
 </template>
 
 <script>
-import props from "./props.js";
+import props from './props.js'
 /**
  * Textarea 文本域
  * @description 文本域此组件满足了可能出现的表单信息补充，编辑等实际逻辑的功能，内置了字数校验等
@@ -80,160 +80,157 @@ import props from "./props.js";
  * @example <u--textarea v-model="value1" placeholder="请输入内容" ></u--textarea>
  */
 export default {
-    name: "u-textarea",
-    mixins: [uni.$u.mpMixin, uni.$u.mixin, props],
-	data() {
-		return {
-			// 输入框的值
-			innerValue: "",
-			// 是否处于获得焦点状态
-			focused: false,
-			// value是否第一次变化，在watch中，由于加入immediate属性，会在第一次触发，此时不应该认为value发生了变化
-			firstChange: true,
-			// value绑定值的变化是由内部还是外部引起的
-			changeFromInner: false,
-			// 过滤处理方法
-			innerFormatter: value => value
-		}
-	},
-	watch: {
-	    value: {
-	        immediate: true,
-	        handler(newVal, oldVal) {
-	            this.innerValue = newVal;
-	            /* #ifdef H5 */
-	            // 在H5中，外部value变化后，修改input中的值，不会触发@input事件，此时手动调用值变化方法
-	            if (
-	                this.firstChange === false &&
-	                this.changeFromInner === false
-	            ) {
-	                this.valueChange();
-	            }
-	            /* #endif */
-	            this.firstChange = false;
-	            // 重置changeFromInner的值为false，标识下一次引起默认为外部引起的
-	            this.changeFromInner = false;
-	        },
-	    },
-	},
-    computed: {
-        // 组件的类名
-        textareaClass() {
-            let classes = [],
-                { border, disabled, shape } = this;
-            border === "surround" &&
-                (classes = classes.concat(["u-border", "u-textarea--radius"]));
-            border === "bottom" &&
-                (classes = classes.concat([
-                    "u-border-bottom",
-                    "u-textarea--no-radius",
-                ]));
-            disabled && classes.push("u-textarea--disabled");
-            return classes.join(" ");
-        },
-        // 组件的样式
-        textareaStyle() {
-            const style = {};
-            // #ifdef APP-NVUE
-            // 由于textarea在安卓nvue上的差异性，需要额外再调整其内边距
-            if (uni.$u.os() === "android") {
-                style.paddingTop = "6px";
-                style.paddingLeft = "9px";
-                style.paddingBottom = "3px";
-                style.paddingRight = "6px";
-            }
-            // #endif
-            return uni.$u.deepMerge(style, uni.$u.addStyle(this.customStyle));
-        },
+  name: 'u-textarea',
+  mixins: [uni.$u.mpMixin, uni.$u.mixin, props],
+  data() {
+    return {
+      // 输入框的值
+      innerValue: '',
+      // 是否处于获得焦点状态
+      focused: false,
+      // value是否第一次变化，在watch中，由于加入immediate属性，会在第一次触发，此时不应该认为value发生了变化
+      firstChange: true,
+      // value绑定值的变化是由内部还是外部引起的
+      changeFromInner: false,
+      // 过滤处理方法
+      innerFormatter: value => value
+    }
+  },
+  watch: {
+    value: {
+      immediate: true,
+      handler(newVal, oldVal) {
+        this.innerValue = newVal
+        /* #ifdef H5 */
+        // 在H5中，外部value变化后，修改input中的值，不会触发@input事件，此时手动调用值变化方法
+        if (this.firstChange === false && this.changeFromInner === false) {
+          this.valueChange()
+        }
+        /* #endif */
+        this.firstChange = false
+        // 重置changeFromInner的值为false，标识下一次引起默认为外部引起的
+        this.changeFromInner = false
+      }
+    }
+  },
+  computed: {
+    // 组件的类名
+    textareaClass() {
+      let classes = [],
+        { border, disabled, shape } = this
+      border === 'surround' &&
+        (classes = classes.concat(['u-border', 'u-textarea--radius']))
+      border === 'bottom' &&
+        (classes = classes.concat([
+          'u-border-bottom',
+          'u-textarea--no-radius'
+        ]))
+      disabled && classes.push('u-textarea--disabled')
+      return classes.join(' ')
+    },
+    // 组件的样式
+    textareaStyle() {
+      const style = {}
+      // #ifdef APP-NVUE
+      // 由于textarea在安卓nvue上的差异性，需要额外再调整其内边距
+      if (uni.$u.os() === 'android') {
+        style.paddingTop = '6px'
+        style.paddingLeft = '9px'
+        style.paddingBottom = '3px'
+        style.paddingRight = '6px'
+      }
+      // #endif
+      return uni.$u.deepMerge(style, uni.$u.addStyle(this.customStyle))
+    }
+  },
+  methods: {
+    // 在微信小程序中，不支持将函数当做props参数，故只能通过ref形式调用
+    setFormatter(e) {
+      this.innerFormatter = e
+    },
+    onFocus(e) {
+      this.$emit('focus', e)
     },
-    methods: {
-		// 在微信小程序中，不支持将函数当做props参数，故只能通过ref形式调用
-		setFormatter(e) {
-			this.innerFormatter = e
-		},
-        onFocus(e) {
-            this.$emit("focus", e);
-        },
-        onBlur(e) {
-            this.$emit("blur", e);
-            // 尝试调用u-form的验证方法
-            uni.$u.formValidate(this, "blur");
-        },
-        onLinechange(e) {
-            this.$emit("linechange", e);
-        },
-        onInput(e) {
-			let { value = "" } = e.detail || {};
-			// 格式化过滤方法
-			const formatter = this.formatter || this.innerFormatter
-			const formatValue = formatter(value)
-			// 为了避免props的单向数据流特性，需要先将innerValue值设置为当前值，再在$nextTick中重新赋予设置后的值才有效
-			this.innerValue = value
-			this.$nextTick(() => {
-				this.innerValue = formatValue;
-				this.valueChange();
-			})
-        },
-		// 内容发生变化，进行处理
-		valueChange() {
-		    const value = this.innerValue;
-		    this.$nextTick(() => {
-		        this.$emit("input", value);
-		        // 标识value值的变化是由内部引起的
-		        this.changeFromInner = true;
-		        this.$emit("change", value);
-		        // 尝试调用u-form的验证方法
-		        uni.$u.formValidate(this, "change");
-		    });
-		},
-        onConfirm(e) {
-            this.$emit("confirm", e);
-        },
-        onKeyboardheightchange(e) {
-            this.$emit("keyboardheightchange", e);
-        },
+    onBlur(e) {
+      this.$emit('blur', e)
+      // 尝试调用u-form的验证方法
+      uni.$u.formValidate(this, 'blur')
     },
-};
+    onLinechange(e) {
+      this.$emit('linechange', e)
+    },
+    onInput(e) {
+      let { value = '' } = e.detail || {}
+      // 格式化过滤方法
+      const formatter = this.formatter || this.innerFormatter
+      const formatValue = formatter(value)
+      // 为了避免props的单向数据流特性，需要先将innerValue值设置为当前值，再在$nextTick中重新赋予设置后的值才有效
+      this.innerValue = value
+      this.$nextTick(() => {
+        this.innerValue = formatValue
+        this.valueChange()
+      })
+    },
+    // 内容发生变化，进行处理
+    valueChange() {
+      const value = this.innerValue
+      this.$nextTick(() => {
+        this.$emit('input', value)
+        // 标识value值的变化是由内部引起的
+        this.changeFromInner = true
+        this.$emit('change', value)
+        // 尝试调用u-form的验证方法
+        uni.$u.formValidate(this, 'change')
+      })
+    },
+    onConfirm(e) {
+      this.$emit('confirm', e)
+    },
+    onKeyboardheightchange(e) {
+      this.$emit('keyboardheightchange', e)
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>
-@import "../../libs/css/components.scss";
+@import '../../libs/css/components.scss';
 
 .u-textarea {
-    border-radius: 4px;
-    background-color: #fff;
-    position: relative;
-    @include flex;
-    flex: 1;
-	padding: 9px;
+  border-radius: 4px;
+  background-color: #fff;
+  position: relative;
+  @include flex;
+  flex: 1;
+  padding: 9px;
 
-    &--radius {
-        border-radius: 4px;
-    }
+  &--radius {
+    border-radius: 4px;
+  }
 
-    &--no-radius {
-        border-radius: 0;
-    }
+  &--no-radius {
+    border-radius: 0;
+  }
 
-    &--disabled {
-        background-color: #f5f7fa;
-    }
+  &--disabled {
+    background-color: #f5f7fa;
+  }
 
-    &__field {
-        flex: 1;
-        font-size: 15px;
-        color: $u-content-color;
-		width: 100%;
-    }
+  &__field {
+    flex: 1;
+    font-size: 15px;
+    color: $u-content-color;
+    width: 100%;
+  }
 
-    &__count {
-        position: absolute;
-        right: 5px;
-        bottom: 2px;
-        font-size: 12px;
-        color: $u-tips-color;
-        background-color: #ffffff;
-        padding: 1px 4px;
-    }
+  &__count {
+    position: absolute;
+    right: 5px;
+    bottom: 2px;
+    font-size: 12px;
+    color: $u-tips-color;
+    background-color: #ffffff;
+    padding: 1px 4px;
+  }
 }
 </style>
diff --git a/utils/ruoyi.js b/utils/ruoyi.js
index 8b055e7..70ea7ba 100644
--- a/utils/ruoyi.js
+++ b/utils/ruoyi.js
@@ -80,12 +80,14 @@ export function formatDate(date, format = 'YYYY-MM-DD HH:mm:ss') {
 export function viewPosition({
 	lat,
 	lng,
-	name = ''
+	name = '',
+	address = ''
 }) {
 	uni.openLocation({
 		latitude: Number(lat),
 		longitude: Number(lng),
 		name,
+		address,
 		fail: (err) => {
 			console.log(err);
 		}