合并冲突代码

2021102501
解润东

src/main.js

@@ -15,12 +15,12 @@ import store from './store'
 import './permission'
 import Cookies from 'js-cookie'
 import { prefix } from '@/common/js/utils'
-import { Divider, Popup, Overlay, Loading, Dialog, ContactCard, Form, AddressEdit, AddressList, Field, CellGroup, Cell, SwipeCell, Icon, Stepper, Card, Checkbox, CheckboxGroup, Button, Swipe, SwipeItem, PullRefresh, List, Tab, Tabs, GoodsAction, GoodsActionIcon, GoodsActionButton, SubmitBar, Toast ,Search,Picker,Uploader,Notify ,ContactList,Calendar,Radio,RadioGroup,Tag,Tabbar,TabbarItem,Sticky, Grid, GridItem,Skeleton,Col,Row,  Image as VanImage, Badge,} from 'vant'
+import { Divider, Popup, Overlay, Loading, Dialog, ContactCard, Form, AddressEdit, AddressList, Field, CellGroup, Cell, SwipeCell, Icon, Stepper, Card, Checkbox, CheckboxGroup, Button, Swipe, SwipeItem, PullRefresh, List, Tab, Tabs, GoodsAction, GoodsActionIcon, GoodsActionButton, SubmitBar, Toast ,Search,Picker,Uploader,Notify ,ContactList,Calendar,Radio,RadioGroup,Tag,Tabbar,TabbarItem,Sticky, Grid, GridItem,Skeleton,Col,Row,  Image as VanImage, Badge,NoticeBar } from 'vant'
 import 'lib-flexible/flexible'
 
 Vue.use(Divider).use(Popup).use(Overlay).use(Loading).use(Dialog).use(Toast).use(ContactCard).use(Form).use(AddressEdit).use(AddressList).use(Field).use(CellGroup).use(Cell).use(SwipeCell).use(Icon).use(Stepper).use(Card).use(Button).use(Swipe).use(SwipeItem).use(PullRefresh).use(List).use(Tab).use(Tabs).use(GoodsAction).use(GoodsActionIcon).use(GoodsActionButton).use(SubmitBar).use(Checkbox).use(CheckboxGroup).use(Search).use(Picker).use(Uploader).use(Notify)
 .use(ContactList).use(Calendar).use(Radio).use(RadioGroup).use(Tag).use(Tabbar).use(TabbarItem).use(Sticky)
-.use(Grid).use(GridItem).use(Skeleton).use(Col).use(Row).use(VanImage)
+.use(Grid).use(GridItem).use(Skeleton).use(Col).use(Row).use(VanImage).use(Badge).use(NoticeBar)
 Vue.config.productionTip = false
 new Vue({
   router,

src/utils/axios.js

@@ -27,7 +27,6 @@ service.interceptors.request.use(config => {
 	}
     return config
 },error => {
-    console.log(error)
     return Promise.reject(error)
 })
 service.interceptors.response.use(response => {

src/views/Login2.vue

@@ -63,8 +63,7 @@ export default {
       password: ""
     };
   },
-  mounted() {
-  },
+  mounted() {},
   methods: {
      onSubmit(values) {
         getFun('check/token',values).then((Response)=>{
@@ -146,11 +145,11 @@ export default {
           padding-left: 20px;
           box-sizing: border-box;
         }
-        /deep/ .van-field__error-message{
+        /deep/ .van-field__error-message {
           padding-left: 20px;
         }
       }
-       .passworld-wrap {
+      .passworld-wrap {
         position: relative;
         border-bottom: 1px solid #d2dcf5;
         .passworld-icon {
@@ -164,13 +163,11 @@ export default {
           padding-left: 20px;
           box-sizing: border-box;
         }
-        /deep/ .van-field__error-message{
+        /deep/ .van-field__error-message {
           padding-left: 20px;
         }
       }
-
     }
   }
 }
-
-</style>
+</style>
\ No newline at end of file

src/views/messageCenter/index.vue

@@ -15,7 +15,7 @@
         title-inactive-colo="#d0d1d1"
         title-active-color="#000000"
         sticky
-        offset-top="50"
+        offset-top="1.333333rem"
       >
         <van-tab title="消息信息" name="消息信息" :badge="messageNewsNum>0?messageNewsNum : ''">
           <message-news @messageLength="getMessageLength"></message-news>

src/views/saveWorkbench/index.vue

@@ -7,10 +7,28 @@
       </header>
     </van-sticky>
 
+    <!-- 搜索 -->
+    <!-- <div class="search-wrap">
+      <van-search v-model="searchVal" placeholder="搜索" @search="onSearch" />
+    </div> -->
+
+    <!-- 滚动通知 -->
+    <van-notice-bar left-icon="volume-o" :scrollable="false" mode="link">
+      <van-swipe
+        vertical
+        class="notice-swipe"
+        :autoplay="3000"
+        :show-indicators="false"
+      >
+        <van-swipe-item>提示：您有1条待办事项需要处理</van-swipe-item>
+        <van-swipe-item>提示：您有2条待办事项需要处理</van-swipe-item>
+      </van-swipe>
+    </van-notice-bar>
+
     <!-- 内容 -->
     <div class="con">
       <!-- 消息中心 -->
-      <van-cell-group inset v-if="finalNewsCenterList.length > 0">
+      <!-- <van-cell-group inset v-if="finalNewsCenterList.length > 0">
         <van-cell value="消息中心" />
         <van-grid :column-num="5">
           <van-grid-item
@@ -21,7 +39,7 @@
             @click="myClick(item.text)"
           />
         </van-grid>
-      </van-cell-group>
+      </van-cell-group> -->
 
       <!-- 风控分级管控 -->
       <van-cell-group inset v-if="finalRiskList.length > 0">
@@ -78,6 +96,7 @@ export default {
   },
   data() {
     return {
+      searchVal: "",
       newsCenterList: [
         // 消息中心的图标
         {
@@ -215,6 +234,10 @@ export default {
         this.$router.push(path);
       }
     },
+    // 搜索事件
+    onSearch(val) {
+      console.log(val);
+    },
     // 请求工作台列表
     getWorkList() {
       postWork("/mobile/menu").then(res => {
@@ -272,8 +295,13 @@ export default {
   padding: 10px 0 50px 0;
   background-color: #f0f1f5;
   /deep/ .van-grid-item__content--center {
-    padding-left: 0px;
-    padding-right: 0px;
+    // padding-left: 0px;
+    // padding-right: 0px;
+    padding: 0.22667rem 0px;
+  }
+  /deep/ .van-icon__image {
+    width: auto;
+    height: 1rem;
   }
 }
 .van-cell-group--inset {
@@ -285,4 +313,8 @@ export default {
 /deep/ [class*="van-hairline"]::after {
   border: none;
 }
+.notice-swipe {
+  height: 40px;
+  line-height: 40px;
+}
 </style>