Merge branch 'stag' into dev

src/assets/css/index.scss

@@ -258,4 +258,8 @@ li {
     margin: 16px 12px;
     background: #fff;
 
+}
+
+.van-tabbar--fixed,.van-tabbar{
+    z-index: 10!important;
 }

src/views/main.vue

@@ -165,12 +165,21 @@ watch(router.currentRoute, (to, from) => {
 </script>
 <style lang="scss">
 .main {
-	position: fixed;
-	top: 0;
-	left: 0;
-	right: 0;
-	bottom: 50px;
+	// position: fixed;
+	// top: 0;
+	// left: 0;
+	// right: 0;
+	// bottom: 50px;
+	padding-bottom:50px;
 	overflow-y: auto;
+	z-index: 1000;
+}
+.footer-icon{
+	font-size: 20px;
+	color: #BBBBBB;
+}
+.footer-icon-active{
+	color: #3E7BFA;
 }
 .footer-icon{
 	font-size: 20px;

src/views/message/index.vue

@@ -101,7 +101,7 @@ function timesFun (timesData) {
     var timesString = '';
 
     if (dayDiff != 0) {
-        timesString = dayDiff + proxy.$t('common.daysAgo');
+        timesString = dayDiff + proxy.$t('common.daysAgo'); 
     } else if (dayDiff == 0 && hours != 0) {
         timesString = hours + proxy.$t('common.hoursAgo');
     } else if (dayDiff == 0 && hours == 0) {

src/views/processApproval/processDtl.vue

@@ -30,7 +30,7 @@
 								: index < stepsNum
 									? 'cl-blue'
 									: ''
-								">
+								"> 
 								{{ i.nodeName }}
 							</span>
 						</div>
@@ -47,7 +47,7 @@
 				<div class="load-btn-box">
 					<van-button size="small" type="primary" plain round v-for="i in approvalRecordData.buttonInfoList"
 						:key="i.type" v-show="i.type != 1" @click="handleSubmit(i.type)">{{ i.name }}
-					</van-button>
+					</van-button>                                                                                                                      
 				</div>
 				<div class="content">
 					<div class="foot-btn-warp">
@@ -318,8 +318,7 @@ onMounted(async () => {
 		left: 0;
 		right: 0;
 		margin: 0;
-		z-index: 2;
-
+		z-index: 10002;
 		button {
 			width: 48%;
 		}