Merge branch 'master' of http://124.70.211.186:3000/zxh/YXGJ

cloud/businessCard/index.vue

@@ -14,14 +14,7 @@
         </view>
         <view class="head" :style="[{ height: tovw(+CustomBar + 184) }]"
             style="background: linear-gradient( 225deg, #F43A50 0%, #C30D23 100%)">
-            <view class="custom" :style="{ height: tovw(Custom.height), top: tovw(Custom.top - 3) }">
-                <view v-if="userInfo.name">{{ userInfo.name }}的名片</view>
-                <view v-else>暂无信息</view>
-                <view class="back" :style="{ lineHeight: tovw(Custom.height) }" @click="onBack">
-                    <text class=" iconfont icon-a-wodetiaozhuan" />
-                </view>
-            </view>
-            <image class="bg-bottom" mode="widthFix" src="/static/workbench/减去.svg">
+            <image class="bg-bottom" mode="aspectFill" src="/static/workbench/减去.svg">
             </image>
             <view class="card">
                 <view class="header">
@@ -291,9 +284,6 @@ export default {
             .header {
                 display: flex;
                 justify-content: space-between;
-                align-content: center;
-                align-items: center;
-
                 .left {
                     display: flex;
                     flex-direction: column;
@@ -342,7 +332,6 @@ export default {
                     box-shadow: 0px 3px 6px 1px #E0D6D7;
                     border: 2px solid #FFFFFF;
                     border-radius: 50%;
-
                     image {
                         width: 100%;
                         height: 100%;
@@ -354,6 +343,7 @@ export default {
             .bottom {
                 display: flex;
                 justify-content: space-between;
+                align-items: flex-start;
                 font-family: Source Han Sans SC, Source Han Sans SC;
                 font-weight: 400;
                 font-size: 12px;
@@ -386,7 +376,8 @@ export default {
                     flex-direction: column;
                     align-items: center;
                     align-content: center;
-
+                    padding: 3px;
+                    border-radius: 5px;
                     text {
                         font-weight: 400;
                         font-size: 12px;
@@ -431,6 +422,7 @@ export default {
                         margin-right: 5px;
                         width: 24px;
                         height: 24px;
+                        border-radius: 50%;
                     }
 
                     text {
@@ -449,7 +441,9 @@ export default {
                 flex-direction: column;
                 align-content: center;
                 align-items: center;
-
+                width: 35px;
+                height: 40px;
+                border-radius: 3px;
                 i {
                     display: block;
                     color: #666666;
@@ -579,7 +573,6 @@ export default {
 
     .footer {
         display: flex;
-        align-items: center;
         position: fixed;
         bottom: 0;
         left: 0;

pages/index/cloud/workbench.vue

@@ -9,7 +9,7 @@
         <!-- 用户信息 -->
         <UserInfo :userInfoValue="userInfoValue" @selfCardClick="selfCardClick"></UserInfo>
 
-        <view class="work-panel_signin">
+        <view class="work-panel_signin" v-if="isSign">
             <text class="title">你已累计打卡{{ userInfoValue.signdays }}天</text>
             <navigator class="but" @click="toDailyYttendance" url="/packageA/dailyYttendance/index"
                 hover-class="navigator-hover">
@@ -75,7 +75,15 @@ export default {
                 }
             },
             userInfoValue: {},
-            roles: []
+            roles: [],
+            auth:uni.getStorageSync('authList').资料库
+        }
+    },
+    computed: {
+        isSign () {
+            if (!uni.getStorageSync('authList').资料库) return false
+            if (!uni.getStorageSync('authList').资料库.每日一签) return false
+            return true
         }
     },
     methods: {
@@ -98,7 +106,9 @@ export default {
                 "id": "20240510104102",
                 "content": {}
             })
+            if (this.cutoff(res.msg)) return;
             this.userInfoValue = res.data
+            this.userInfoValue.headpic = this.userInfoValue.attinfos.find(v => v.usetype == "headportrait") && this.userInfoValue.attinfos.find(v => v.usetype == "headportrait").url || '';
             console.log(this.userInfoValue, '用户信息')
         },
         toDailyYttendance() {

pages/index/index/videos.vue

@@ -38,7 +38,7 @@ export default {
                     "condition": "",
                     "sat_sharematerial_classids":[],
                     "type": "2",//1:图片，2：视频，3：图文
-                    "status": "",
+                    "status": "发布",
                     "begindate_create": "",//创建时间
                     "enddate_create": "",//创建时间
                     "begindate": "",//发布时间