liuqiwen 5 anos atrás
pai
commit
d6c6792478

+ 3 - 3
src/components/menu.vue

@@ -94,8 +94,8 @@ export default {
     background: #fff;
     position: relative;
     li.menuli {
-      height: 4.8rem;
-      line-height: 4.8rem;
+      height: 5.6rem;
+      line-height: 5.6rem;
       font-size: 1.4rem;
       color: #333;
       border-bottom: 0.1rem solid #e5e5e5;
@@ -125,7 +125,7 @@ export default {
       }
       i {
         float: right;
-        margin-top: 1.8rem;
+        margin-top: 2rem;
       }
     }
   }

+ 2 - 2
src/layout/components/header.vue

@@ -95,10 +95,10 @@ export default class extends Vue {
     z-index: 999;
     height: 4rem;
     line-height: 4rem;
-    font-size: 1.2rem;
     background: #f5f5f5;
     border: 0.1rem solid #e5e5e5;
     .container {
+      font-size: 1.2rem;
       .login {
         a {
           color: #fd5522;
@@ -194,7 +194,7 @@ export default class extends Vue {
       }
     }
     .navs {
-      padding: 1rem 0;
+      padding-top: 1rem;
       .nav {
         height: 5rem;
         line-height: 5rem;

+ 58 - 20
src/views/home/index.vue

@@ -30,7 +30,9 @@
           <div class="noticeDiv">
             <div class="noticeTitle">
               通知公告
-              <span class="more">more&gt;&gt;</span>
+              <span class="more"
+                >more<i class="el-icon-d-arrow-right"></i
+              ></span>
             </div>
             <div class="notice" v-for="item in 5" :key="item">
               通知公告通知公告通知公告
@@ -86,22 +88,30 @@
         </div>
       </div>
       <!-- 广告位 -->
-      <div class="ggzw bg-84">办公系列广告占位</div>
-      <div class="partTitle"><span class="orangeLine"></span>热门商品</div>
+      <div class="ggzw bg-84 mt2rem">办公系列广告占位</div>
+      <div class="partTitle">
+        <span class="orangeLine"></span>热门商品<span class="more"
+          >more<i class="el-icon-d-arrow-right"></i
+        ></span>
+      </div>
       <div class="rmsp">
         <div class="rmspItem" v-for="item in 5" :key="item">
           <div class="imgDiv">
             <img src="@assets/shangpin.png" alt />
           </div>
-          <div class="name">文件柜B20-J</div>
+          <div class="name">钢制家具柜文件柜B20-J</div>
           <div class="money">
             ¥
             <span>1833</span>
           </div>
-          <div class="company">洛阳花都家具集团有限公司</div>
+          <div class="company mt15px">洛阳花都家具集团有限公司</div>
         </div>
       </div>
-      <div class="partTitle"><span class="orangeLine"></span>品牌商家</div>
+      <div class="partTitle">
+        <span class="orangeLine"></span>品牌商家<span class="more"
+          >more<i class="el-icon-d-arrow-right"></i
+        ></span>
+      </div>
       <div class="rmsp">
         <div class="ppsjItem" v-for="item in 5" :key="item">
           <div class="imgDiv2">
@@ -120,7 +130,9 @@
           <div class="xqDiv">
             <div class="xqTitle">
               <img src="@assets/xuqiu.png" alt />需求
-              <span class="more">more&gt;&gt;</span>
+              <span class="more"
+                >more<i class="el-icon-d-arrow-right"></i
+              ></span>
             </div>
             <div class="xq" v-for="item in 10" :key="item">
               <div class="con">【求购】通知公告通知公告通知公告</div>
@@ -132,7 +144,9 @@
           <div class="xqDiv">
             <div class="xqTitle">
               <img src="@assets/gongyingshang.png" alt />供应商
-              <span class="more">more&gt;&gt;</span>
+              <span class="more"
+                >more<i class="el-icon-d-arrow-right"></i
+              ></span>
             </div>
             <div class="xq" v-for="item in 10" :key="item">
               <div class="con">【供应】通知公告通知公告通知公告</div>
@@ -145,7 +159,11 @@
       <div class="ggzw bg-88 mt2rem">智能家具保险柜广告占位</div>
       <el-row :gutter="20">
         <el-col :span="12">
-          <div class="partTitle"><span class="orangeLine"></span>行业资讯</div>
+          <div class="partTitle">
+            <span class="orangeLine"></span>行业资讯<i
+              class="el-icon-d-arrow-right"
+            ></i>
+          </div>
           <div class="hyzxDiv">
             <div class="topDiv">
               <div class="leftDiv">
@@ -170,7 +188,11 @@
           </div>
         </el-col>
         <el-col :span="12">
-          <div class="partTitle"><span class="orangeLine"></span>家具保养</div>
+          <div class="partTitle">
+            <span class="orangeLine"></span>家具保养<i
+              class="el-icon-d-arrow-right"
+            ></i>
+          </div>
           <div class="hyzxDiv">
             <div class="topDiv">
               <div class="leftDiv">
@@ -326,6 +348,12 @@ export default {
     border-radius: 0.15rem;
     margin-right: 1rem;
   }
+  .more {
+    line-height: 3rem;
+    font-size: 1.4rem;
+    color: #999;
+    float: right;
+  }
 }
 .fwnl {
   width: 100%;
@@ -341,13 +369,15 @@ export default {
     .numDiv {
       margin-bottom: 1rem;
       img {
-        height: 3rem;
+        height: 3.6rem;
         vertical-align: bottom;
       }
       span {
         font-size: 1.8rem;
         color: #fd5522;
+        font-weight: bold;
         vertical-align: bottom;
+        margin-left: 1rem;
       }
     }
     .titleDiv {
@@ -392,11 +422,12 @@ export default {
       line-height: 2rem;
       font-size: 1.4rem;
       color: #333;
-      margin-top: 1rem;
+      font-weight: bold;
+      margin-top: 2rem;
       overflow: hidden;
     }
     .company {
-      height: 4rem;
+      height: 2rem;
       line-height: 2rem;
       font-size: 1.2rem;
       color: #666;
@@ -404,10 +435,11 @@ export default {
     }
   }
   .rmspItem {
-    padding: 1.6rem;
+    padding: 2rem;
     .imgDiv {
       border: 0.1rem solid #e5e5e5;
       text-align: center;
+      line-height: 0;
       img {
         width: 100%;
       }
@@ -415,8 +447,9 @@ export default {
     .money {
       height: 2rem;
       line-height: 2rem;
-      font-size: 1.2rem;
+      font-size: 1.8rem;
       color: #fd5522;
+      margin-top: 1.5rem;
     }
   }
   .ppsjItem {
@@ -427,11 +460,11 @@ export default {
       }
     }
     .name {
-      padding: 0 1.6rem;
+      padding: 0 2rem;
       box-sizing: border-box;
     }
     .company {
-      padding: 0 1.6rem;
+      padding: 0 2rem;
       box-sizing: border-box;
     }
   }
@@ -449,7 +482,7 @@ export default {
       img {
         height: 1.6rem;
         vertical-align: middle;
-        margin-right: 0.4rem;
+        margin-right: 1rem;
       }
       .more {
         line-height: 3rem;
@@ -459,8 +492,8 @@ export default {
       }
     }
     .xq {
-      height: 3rem;
-      line-height: 3rem;
+      height: 3.6rem;
+      line-height: 3.6rem;
       overflow: hidden;
       .con {
         width: 80%;
@@ -488,6 +521,7 @@ export default {
   border-radius: 0.4rem;
   padding: 1.6rem;
   box-sizing: border-box;
+  margin-bottom: 4rem;
   .topDiv {
     width: 100%;
     display: table;
@@ -501,6 +535,7 @@ export default {
         width: 80%;
         display: inline-block;
         border: 0.1rem solid #e5e5e5;
+        line-height: 0;
         img {
           width: 100%;
         }
@@ -551,6 +586,9 @@ export default {
 .bg-84 {
   background: #84ccc9;
 }
+.mt15px {
+  margin-top: 1.5rem;
+}
 .mt2rem {
   margin-top: 2rem;
 }

+ 13 - 4
src/views/info/details/buy.vue

@@ -72,6 +72,7 @@ export default {
   background: #fff;
   text-align: center;
   padding: 4rem 0 3rem 0;
+  border-radius: 0.4rem;
   .form {
     width: 70%;
     box-sizing: border-box;
@@ -84,13 +85,21 @@ export default {
       margin-top: 4rem;
       margin-bottom: 3rem;
     }
-    .submitBtn {
-      background: #fd5522;
-      color: #fff;
-    }
+  }
+  .submitBtn {
+    background: #fd5522;
+    color: #fff;
+    border: 0;
   }
 }
 .tc {
   text-align: center;
 }
 </style>
+<style lang="scss">
+.formDiv {
+  .el-form-item__label {
+    color: #666;
+  }
+}
+</style>

+ 2 - 0
src/views/info/details/buyDetail.vue

@@ -44,6 +44,8 @@ export default class extends Vue {}
   margin-bottom: 4rem;
   padding: 3rem 4rem 2rem 4rem;
   position: relative;
+  box-sizing: border-box;
+  border-radius: 0.4rem;
   .leftLine {
     position: absolute;
     top: 0;

+ 2 - 0
src/views/info/details/supplyDetail.vue

@@ -64,6 +64,7 @@ export default class extends Vue {}
   background: #fff;
   margin-top: 2rem;
   margin-bottom: 4rem;
+  border-radius: 0.4rem;
   .xqDiv {
     border-bottom: 0.1rem solid #e5e5e5;
     padding: 3rem 3rem 2rem 2rem;
@@ -75,6 +76,7 @@ export default class extends Vue {}
       }
     }
     .imgDetailDiv {
+      margin-top: 2rem;
       .imgDetail {
         width: 100%;
         overflow: hidden;

+ 1 - 0
src/views/info/index.vue

@@ -81,6 +81,7 @@ export default {
 .infoTabDiv {
   position: relative;
   background: #fff;
+  border-radius: 0.4rem;
   .btnDiv {
     height: 5rem;
     line-height: 5rem;

+ 10 - 7
src/views/shops/enter/add.vue

@@ -5,7 +5,7 @@
       <el-form class="formPanel" ref="form" :model="form" label-width="280px">
         <div class="formTitle">
           账户信息
-          <span class="subTitle">账号用于登录商户平台</span>
+          <span class="subTitle">账号用于登录商户平台</span>
         </div>
         <el-form-item class="formItem" label="用户名">
           <el-input v-model="form.name"></el-input>
@@ -118,9 +118,7 @@
         </el-form-item>
         <div class="line"></div>
         <el-form-item class="formItem tc">
-          <el-button class="submitBtn" @click="onSubmit"
-            >提交注册信息</el-button
-          >
+          <el-button class="submitBtn" @click="onSubmit">提交</el-button>
         </el-form-item>
       </el-form>
       <div id="mapDiv">
@@ -273,6 +271,8 @@ export default {
   padding: 2rem;
   box-sizing: border-box;
   z-index: 1;
+  border-radius: 0.4rem;
+  margin-bottom: 4rem;
   .formItem {
     width: 80%;
     .quyuSel {
@@ -283,10 +283,10 @@ export default {
       }
     }
     .info {
-      height: 3rem;
-      line-height: 3rem;
+      height: 2.4rem;
+      line-height: 2.4rem;
       font-size: 1.2rem;
-      color: #666;
+      color: #999;
     }
   }
   .formTitle {
@@ -368,6 +368,9 @@ export default {
 </style>
 <style lang="scss">
 .formPanel {
+  .el-form-item__label {
+    color: #666;
+  }
   .avatar-uploader .el-upload {
     border: 1px dashed #d9d9d9;
     border-radius: 6px;

+ 12 - 4
src/views/shops/enter/index.vue

@@ -128,8 +128,8 @@ export default {
 </script>
 <style scoped lang="scss">
 .bannerDiv {
-  height: 21rem;
-  line-height: 21rem;
+  height: 24rem;
+  line-height: 24rem;
   text-align: center;
 }
 .partTitle {
@@ -156,6 +156,7 @@ export default {
     margin-right: 1rem;
   }
   .searchBtn {
+    font-size: 1.4rem;
     margin-left: 1rem;
     background: #fd5522;
     color: #fff;
@@ -169,7 +170,7 @@ export default {
 .pageDiv {
   text-align: right;
   margin-top: 0.5rem;
-  padding: 2rem 0;
+  padding: 3rem 0;
 }
 .ml2rem {
   margin-left: 2rem;
@@ -180,8 +181,15 @@ export default {
   background: #fd5522;
   color: #fff;
   padding: 0.6rem 0;
+  text-align: center;
+}
+.qyrzgs .cell {
+  text-align: center;
+}
+.qyrzgs.el-table--striped .el-table__body tr.el-table__row--striped td {
+  background: #fff6f4;
 }
-.qyrzg tr.el-table__row--striped td {
+.qyrzgs.el-table--enable-row-hover .el-table__body tr:hover > td {
   background: #fff6f4;
 }
 .pageDiv.el-pagination.is-background .el-pager li:not(.disabled).active {