Merge branch 'localhost'

cloud/businessCard/index.vue

@@ -110,7 +110,7 @@
             </view>
         </view>
 
-        <view class="footer">
+        <view class="footer2">
             <navigator class="but" :url="'/cloud/businessCard/edit?id=' + userid" @click="goEditPage">
                 <text>修改名片</text>
             </navigator>
@@ -623,6 +623,35 @@ export default {
     }
 }
 
+.footer2 {
+    position: fixed;
+    bottom: 0;
+    width: 100vw;
+    height: 65px;
+    background: #FFFFFF;
+    box-shadow: 0px -2px 6px 1px rgba(0, 0, 0, 0.16);
+    box-sizing: border-box;
+    padding: 5px 10px;
+    display: flex;
+
+    .but {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        width: 100%;
+        height: 45px;
+        background: #C30D23;
+        border-radius: 5px;
+        font-family: PingFang SC, PingFang SC;
+        font-size: 14px;
+        color: #FFFFFF;
+    }
+
+    .forbidden {
+        opacity: .6;
+    }
+}
+
 .share-box {
     padding: 30px 0;
     display: flex;

pages/index/cloud/workbench.vue

@@ -74,7 +74,7 @@ export default {
                     "class": ""
                 }
             },
-            userInfoValue: {rolenames:'',name:'',remarks:'',joindays:0},
+            userInfoValue: {rolenames:'',name:'',remarks:'',joindays:0,signdays:''},
             roles: [],
             auth:uni.getStorageSync('authList').资料库
         }

pages/index/index/videos.vue

@@ -47,7 +47,7 @@ export default {
             },
             filtrateList:[],
             updatePage:true,
-            crumbs:[{classname:'视频'}],
+            crumbs:[{classname:'视频'},{classname:'全部',parentid:''}],
             list:[]
         }
     },