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

pages/index.vue

@@ -292,7 +292,6 @@ export default {
         curIndex > this.color.length ? 0 : curIndex++
         return res
       })
-      console.log('init', data)
       this.detail.legendData = data
       this.setPieData(data, this.detail.taskCompletionRate)
       this.getList()

pages/login.vue

@@ -32,7 +32,6 @@ export default {
     // 初始化应用
     async initApp() {
       await uni.hideTabBar()
-      console.log('initapp')
       uni.hideTabBar({
         animation: false
       })
@@ -63,7 +62,6 @@ export default {
             resolve()
           },
           fail: err => {
-            console.log('getOpenIdFail', err)
             reject()
           }
         })
@@ -90,7 +88,6 @@ export default {
     loginSuccess() {
       this.$store.dispatch('GetInfo').then(res => {
         this.handlerNavigateTo(res.data.user)
-        console.log('user', res.data.user)
       })
     },
     handlerNavigateTo(user) {

sub/enterprise/detail.vue

@@ -93,7 +93,7 @@
           <view class="wd-flex" style="gap: 8px; align-items: center">
             <text class="label">资质时限</text>
             <view>
-              {{ $util.formatDate(prove.expiryDate, 'YYYY/M/D') }}
+              {{ $util.formatDate(prove.expiryDate, 'YYYY年M月D日') }}
             </view>
           </view>
         </view>
@@ -230,7 +230,7 @@ export default {
         lat: position[0],
         lng: position[1],
         name: enterprise.enterprisesName,
-        addree: enterprise.address
+        address: enterprise.address
       })
     },
     postApi() {
@@ -329,9 +329,10 @@ export default {
     flex-flow: row nowrap;
     gap: 12px;
     .image {
-      width: 96px;
-      height: 96px;
+      width: 196rpx;
+      height: 196rpx;
       border-radius: $cs-border-radius;
+      flex-shrink: 0;
     }
   }
 }

sub/invite/enterpriseIntroduce.vue

@@ -90,9 +90,11 @@ export default {
 }
 ::v-deep .u-textarea {
   min-height: 400rpx;
+  height: 400rpx;
   background-color: #f9f9f9 !important;
   border: 1px solid #f9f9f9;
   border-radius: 12px;
+  margin: 0;
   .u-textarea__count {
     background-color: #f9f9f9 !important;
   }

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>
@@ -164,7 +164,12 @@
           ></cs-dict-tag>
         </view>
       </view>
-      <u-loadmore :status="load" marginTop="12" marginBottom="12" />
+      <u-loadmore
+        :status="load"
+        marginTop="12"
+        marginBottom="12"
+        v-if="load != 'nomore'"
+      />
       <view class="btn-box" v-if="isSelect.length > 0">
         <view class="confirm-btn" @tap="replay">
           已选择({{ isSelect.length }})

sub/task/record.vue

@@ -26,8 +26,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>
@@ -291,7 +291,8 @@ export default {
       this.$util.viewPosition({
         lat: position[0],
         lng: position[1],
-        name: enterprise.address
+        name: enterprise.enterprisesName,
+        address: enterprise.address
       })
     },
     locate() {
@@ -386,6 +387,7 @@ export default {
         gap: 4px;
         color: $uni-text-color-grey;
         display: flex;
+        flex-flow: row wrap;
         .tag {
           font-size: 12px;
           display: flex;

utils/permission.js

@@ -33,7 +33,6 @@ export function checkPermi(value) {
 export function checkRole(value) {
 	if (value && value instanceof Array && value.length > 0) {
 		const roles = store.getters && store.getters.roles
-		console.log(roles);
 		const permissionRoles = value
 		const super_admin = "admin"
 		if (!roles) {