Merge branch 'master' of http://git.cc-lotus.info/smart-jobs/web-portal

src/router.js

@@ -125,6 +125,11 @@ const router = new Router({
       name: 'masterdetails',
       component: () => import('@/views/master/notice/detail.vue'),
     },
+    {
+      path: '/style',
+      name: 'masterdetails',
+      component: () => import('@/views/master/style.vue'),
+    },
   ],
 });
 router.afterEach((to, from, next) => {

src/views/master/style.vue

@@ -2,17 +2,33 @@
   <div id="style">
     <el-row>
       <el-col :span="24" class="main">
-        <el-col :span="4">
-          <p>&nbsp;</p>
+        <el-col :span="24">
+          <el-col :span="4">
+            <p>&nbsp;</p>
+          </el-col>
+          <el-col :span="16" style="position: relative;">
+            <p class="text">
+              做说游戏自言自语中和你摸婆婆二二磨破Toronto破热热热特服富二嘟嘟嘟读的特特特肚饿嘟嘟嘟肚饿的Tel读的咳咳的特特特fuel额度二二嘚瑟了特特复读的特特特肚饿
+            </p>
+            <span class="jian"></span>
+          </el-col>
+          <el-col :span="4" class="right-image">
+            <el-image style="width:50px;height:50px;" :src="url"></el-image>
+          </el-col>
         </el-col>
-        <el-col :span="16">
-          <p class="text">
-            做说游戏自言自语中和你摸婆婆二二磨破Toronto破热热热特服富二嘟嘟嘟读的特特特肚饿嘟嘟嘟肚饿的Tel读的咳咳的特特特fuel额度二二嘚瑟了特特复读的特特特肚饿
-          </p>
-          <span class="jian"></span>
-        </el-col>
-        <el-col :span="4" class="right-image">
-          <el-image style="width:50px;height:50px;" :src="url"></el-image>
+        <el-col :span="24">
+          <el-col :span="4">
+            <p>&nbsp;</p>
+          </el-col>
+          <el-col :span="16" style="position: relative;">
+            <p class="text">
+              做说游戏自言自语中和你摸婆婆二二磨破Toronto破热热热特服富二嘟嘟嘟读的特特特肚饿嘟嘟嘟肚饿的Tel读的咳咳的特特特fuel额度二二嘚瑟了特特复读的特特特肚饿
+            </p>
+            <span class="jian"></span>
+          </el-col>
+          <el-col :span="4" class="right-image">
+            <el-image style="width:50px;height:50px;" :src="url"></el-image>
+          </el-col>
         </el-col>
       </el-col>
     </el-row>
@@ -25,9 +41,9 @@ export default {
   props: {},
   components: {},
   data: () => ({
-    url: require('@/assets/logo.jpg'),
+    url: require('@/assets/master/logo.jpg'),
   }),
-  created() { },
+  created() {},
   computed: {},
   methods: {},
 };
@@ -77,8 +93,8 @@ export default {
   display: inline-block;
   position: absolute;
   top: 15px;
-  right: 43px;
-  width: 0;
+  right: -20px;
+  width: 0px;
   height: 0;
   border-width: 10px;
   border-style: solid;