Merge branch 'master' of http://60.23.29.213:3060/HB/ruoyi-miniapp

components/cs-text-more/index.vue

@@ -51,7 +51,7 @@ export default {
     },
     splitLength: {
       type: Number,
-      default: 60
+      default: 100
     }
   }
 }

pages/enterprise.vue

@@ -79,14 +79,6 @@
               </text>
             </view>
             <view class="tagList">
-              <view class="tag">
-                {{
-                  $dict.echoDicValue(
-                    dictMap.enterprises_type,
-                    enterprise.type
-                  )
-                }}
-              </view>
               <view class="tag">
                 {{
                   $dict.echoDicValue(

sub/enterprise/detail.vue

@@ -13,9 +13,6 @@
         </text>
       </view>
       <view class="tagList">
-        <view class="tag">
-          {{ $dict.echoDicValue(dictMap.enterprises_type, detail.type) }}
-        </view>
         <view class="tag">
           {{ $dict.echoDicValue(dictMap.enterprises_area, detail.region) }}
         </view>
@@ -33,7 +30,7 @@
           {{ detail.contactName }}
         </text>
         <text class="address" style="margin-right: 12rpx">联系方式</text>
-        <text style="text-decoration: underline">
+        <text style="text-decoration: underline" @click="callPhone(detail.environmentalContactPhone)">
           {{ detail.environmentalContactPhone }}
         </text>
       </view>
@@ -206,6 +203,11 @@ export default {
         ...dict.data
       }
     },
+	callPhone(number) {
+	  uni.makePhoneCall({
+	    phoneNumber: number
+	  })
+	},
     async init() {
       const res = await getEnterPrise(this.detail.id)
       this.detail = res.data

sub/task/detail.vue

@@ -29,8 +29,8 @@
               {{
                 `${$util.formatDate(
                   detail.startDate,
-                  'YYYY年M月D日'
-                )} 至 ${$util.formatDate(detail.endDate, 'YYYY年M月D日')}`
+                  'YYYY/M/D'
+                )}~${$util.formatDate(detail.endDate, 'YYYY/M/D')}`
               }}
             </text>
           </view>
@@ -59,7 +59,7 @@
           {{
             isShowAllText
               ? detail.description
-              : `${detail.description.slice(1, 20)}...`
+              : `${detail.description.slice(1, 100)}...`
           }}
           <text style="color: #17c653; padding-left: 4px">
             {{ isShowAllText ? '收起' : '展开' }}
@@ -164,14 +164,7 @@
           ></cs-dict-tag>
         </view>
       </view>
-      <u-loadmore
-        :status="load"
-        marginTop="12"
-        marginBottom="12"
-        v-if="load != 'nomore'"
-      />
-      <cs-emty v-if="list.length == 0"></cs-emty>
-
+      <u-loadmore :status="load" marginTop="12" marginBottom="12" />
       <view class="btn-box" v-if="isSelect.length > 0">
         <view class="confirm-btn" @tap="replay">
           已选择({{ isSelect.length }})
@@ -383,7 +376,6 @@ 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'

sub/task/record.vue

@@ -56,7 +56,7 @@
         {{
           isShowAllText
             ? detail.description
-            : `${detail.description.slice(1, 20)}...`
+            : `${detail.description.slice(1, 100)}...`
         }}
         <text style="color: #17c653; padding-left: 8rpx">
           {{ isShowAllText ? '收起' : '展开' }}
@@ -76,9 +76,9 @@
           <text class="wd-font-800 wd-text-15">
             {{ detail.enterprise.enterprisesName }}
           </text>
+		  <!-- @tap.native.stop="viewPosition(detail.enterprise)" -->
           <view
             class="wd-flex wd-pb-8px"
-            @tap.native.stop="viewPosition(detail.enterprise)"
           >
             <u-icon name="map" size="14" color="#17C653"></u-icon>
             <text class="address wd-text-12" style="margin-left: 4px">