Merge branch 'liuxin' into develop

src/pages/drawback/drawback-list.vue

@@ -167,7 +167,7 @@ export default {
     top: 0;
   }
   .scrollContent {
-    padding-top: 2.92rem;
+    padding-top: 2.05rem;
     padding-bottom: 20px;
   }
   .tab-style {
@@ -176,18 +176,18 @@ export default {
   }
 }
 .platform-ios {
-  #startList {
+  #reimburse {
     .scrollContent {
-      padding-top: 3.32rem;
+      padding-top: 2.45rem;
     }
   }
 }
 
 @media (device-width: 375px) and (device-height: 812px) and (-webkit-min-device-pixel-ratio: 3) {
   .platform-ios {
-    #startList {
+    #reimburse {
       .scrollContent {
-        padding-top: 3.72rem;
+        padding-top: 3.05rem;
       }
     }
   }
@@ -195,9 +195,9 @@ export default {
 // iPhoneXR适配
 @media (device-width: 414px) and (device-height: 896px) {
   .platform-ios {
-    #startList {
+    #reimburse {
       .scrollContent {
-        padding-top: 3.72rem;
+        padding-top: 3.05rem;
       }
     }
   }

src/pages/messageCenter/reject-detail.vue

+<template>
+  <h-view id="rejectDetail">
+    <h-header :proportion="[5,1,1]" class="bar-custom">
+      <div slot="left" class="h-header-btn">
+        <img src="@/assets/userBind/arrow.png" @click="$routeGo()" >
+        <span>消息详情</span>
+      </div>
+    </h-header>
+    <h-content>
+      <div class="userInfo">审批意见</div>
+      <div class="info-content">
+        <p>XXXXXXXXX。请联系业务员重新提交申请，谢谢！</p>
+      </div>
+    </h-content>
+  </h-view>
+</template>
+<script>
+export default {
+
+}
+</script>
+<style lang="less" >
+#rejectDetail{
+ .userInfo {
+      height: 45px;
+      line-height: 45px;
+      color: @headerColor;
+      margin-top: 5px;
+      font-size: 15px;
+      margin-left: 16px;
+      position: relative;
+    }
+    .userInfo::before {
+      content: "";
+      display: block;
+      width: 4px;
+      height: 20px;
+      background-color: @headerColor;
+      position: absolute;
+      left: -15px;
+      top: 12px;
+    }
+    .info-content{
+        width:90%;
+        margin: 0 auto;
+        line-height: 20px;
+        p{
+            text-indent: 35px;
+        }
+    }
+}
+</style>

src/pages/reimburseMyself/reimburse-myself-list.Vue

@@ -178,7 +178,7 @@ export default {
   }
   }
   .platform-ios {
-  #startList {
+  #reimburse {
     .scrollContent {
       padding-top: 2.2rem;
     }
@@ -187,7 +187,7 @@ export default {
 
 @media (device-width: 375px) and (device-height: 812px) and (-webkit-min-device-pixel-ratio: 3) {
   .platform-ios {
-    #startList {
+    #reimburse {
       .scrollContent {
         padding-top: 2.62rem;
       }
@@ -197,7 +197,7 @@ export default {
 // iPhoneXR适配
 @media (device-width: 414px) and (device-height: 896px) {
   .platform-ios {
-    #startList {
+    #reimburse {
       .scrollContent {
         padding-top: 2.62rem;
       }

src/pages/videoSign/video-list.vue

@@ -520,7 +520,7 @@ export default {
     top: 0;
   }
   .scrollContent {
-    padding-top: 2.72rem;
+    padding-top: 2.52rem;
     padding-bottom: 20px;
   }
   .tab-style {
@@ -529,16 +529,16 @@ export default {
   }
 }
 .platform-ios {
-  #startList {
+  #videoList {
     .scrollContent {
-      padding-top: 3.12rem;
+      padding-top: 2.92rem;
     }
   }
 }
 
 @media (device-width: 375px) and (device-height: 812px) and (-webkit-min-device-pixel-ratio: 3) {
   .platform-ios {
-    #startList {
+    #videoList {
       .scrollContent {
         padding-top: 3.52rem;
       }
@@ -548,7 +548,7 @@ export default {
 // iPhoneXR适配
 @media (device-width: 414px) and (device-height: 896px) {
   .platform-ios {
-    #startList {
+    #videoList {
       .scrollContent {
         padding-top: 3.52rem;
       }

src/router/index.js

@@ -70,6 +70,7 @@ import ProDetailed from '@/pages/productQuery/product-detailed'
 // 消息中心
 import MessageCenter from '@/pages/messageCenter/message-list'
 import ProductList from '@/pages/productQuery/product-list'
+import RejectDetail from '@/pages/messageCenter/reject-detail'
 // 帮助与反馈
 import HelpList from '@/pages/help/help-list'
 
@@ -133,7 +134,7 @@ export default new Router({
       children: [
         {path: '/tab/home-page', component: HomePage, name: 'HomePage', meta: {keepAlive: false}},
         {path: '/tab/my-info', component: MyInfo, name: 'MyInfo', meta: {keepAlive: true}},
-        {path: '/tab/message-center', component: MessageCenter, name: 'MessageCenter', meta: {keepAlive: false}},
+        {path: '/tab/message-center', component: MessageCenter, name: 'MessageCenter', meta: {keepAlive: true}},
       ],
     },
 
@@ -253,6 +254,8 @@ export default new Router({
     {path: '/drawback-detail', component: DrawbackDetail, name: 'DrawbackDetail', meta: {keepAlive: false}},
     // 视屏面签
     {path: '/video-sign', component: VideoSign, name: 'VideoSign', meta: {keepAlive: true}},
+    // 消息中心
+    {path: '/reject-detail', component: RejectDetail, name: 'RejectDetail', meta: {keepAlive: true}},
   ],
   scrollBehavior (to, from, savedPosition) {
     if (to.hash) {