feat 代码优化；bugfix

src/components/accountCompoents/consumption.vue

@@ -258,6 +258,13 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+/deep/ .el-pagination.is-background .el-pager li:not(.disabled).active {
+  background-color: #fc7200;
+  color: #fff !important;
+}
+/deep/ .el-pagination.is-background .el-pager li:hover:not(.disabled) {
+  color: #fc7200;
+}
 /deep/ .el-table td.el-table__cell {
   text-align: center !important;
 }

src/components/accountCompoents/recharge.vue

@@ -112,6 +112,13 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+/deep/ .el-pagination.is-background .el-pager li:not(.disabled).active {
+  background-color: #fc7200;
+  color: #fff !important;
+}
+/deep/ .el-pagination.is-background .el-pager li:hover:not(.disabled) {
+  color: #fc7200;
+}
 /deep/ .el-table td.el-table__cell {
   text-align: center !important;
 }

src/components/accountCompoents/wallet.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="wallet">
     <el-col :span="24">
       <div class="head-account">
         <div class="balance">
@@ -244,278 +244,288 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.head-account {
-  display: flex;
-  .balance {
-    border-radius: 5px;
-    background-image: url(../../../static/image/wallet1.png);
-    background-size: 100% 100%;
-    width: 618px;
-    height: 168px;
-    padding-left: 25px;
-    box-sizing: border-box;
-    margin-bottom: 42px;
-    cursor: pointer;
-    .balance_name {
-      font-size: 14px;
-      line-height: 22px;
-      font-weight: 400;
-      color: #ffffff;
-      padding-top: 24px;
-    }
-    .balance_price {
-      font-size: 42px;
-      line-height: 59px;
-      font-weight: bold;
-      color: #ffffff;
-      margin: 8px 0;
-    }
-    .balance_sign {
-      font-size: 12px;
-      font-weight: 400;
-      color: #ffffff;
-      opacity: 0.8;
-      line-height: 17px;
-      display: flex;
-      align-items: center;
-      img {
-        width: 12px;
-        height: 12px;
-        margin-right: 4px;
+.wallet {
+  width: 100%;
+  height: 100%;
+  background: #ffffff;
+  .head-account {
+    display: flex;
+    .balance {
+      border-radius: 5px;
+      background-image: url(../../../static/image/wallet1.png);
+      background-size: 100% 100%;
+      width: 618px;
+      height: 168px;
+      padding-left: 25px;
+      box-sizing: border-box;
+      margin-bottom: 42px;
+      cursor: pointer;
+      .balance_name {
+        font-size: 14px;
+        line-height: 22px;
+        font-weight: 400;
+        color: #ffffff;
+        padding-top: 24px;
+      }
+      .balance_price {
+        font-size: 42px;
+        line-height: 59px;
+        font-weight: bold;
+        color: #ffffff;
+        margin: 8px 0;
+      }
+      .balance_sign {
+        font-size: 12px;
+        font-weight: 400;
+        color: #ffffff;
+        opacity: 0.8;
+        line-height: 17px;
+        display: flex;
+        align-items: center;
+        img {
+          width: 12px;
+          height: 12px;
+          margin-right: 4px;
+        }
       }
     }
+    .coupon {
+      width: 298px;
+      height: 168px;
+      background-image: url(../../../static/image/wallet2.png);
+    }
   }
-  .coupon {
-    width: 298px;
-    height: 168px;
-    background-image: url(../../../static/image/wallet2.png);
-  }
-}
-.wallet-content {
-  padding-left: 15px;
-}
-.recharge_title {
-  font-size: 16px;
-  font-weight: 500;
-  color: #333333;
-}
-.recharge_color {
-  width: 160px;
-  background: #fc7200;
-  color: #fff;
-}
-.agreement {
-  font-size: 12px;
-  font-weight: 400;
-  color: #fc7200;
-  margin-top: 10px;
-  span {
-    color: #3662a1;
-    cursor: pointer;
+  .wallet-content {
+    padding-left: 15px;
   }
-}
-.recharge_list /deep/ .el-input__inner {
-  padding: 0 15px;
-  height: 36px;
-  border: none !important;
-  text-align: center;
-}
-.recharge_list {
-  width: 100%;
-  display: flex;
-  flex-wrap: wrap;
-  margin-top: 24px;
-  margin-bottom: 10px;
-  .item {
-    position: relative;
-    width: 200px;
-    height: 40px;
-    border: 1px solid #e6e6e6;
-    color: #333333;
+  .recharge_title {
     font-size: 16px;
     font-weight: 500;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    border-radius: 3px;
-    margin: 0 15px 15px 0;
-    cursor: pointer;
-    .img {
-      width: 24px;
-      height: 24px;
-      margin-right: 6px;
-    }
-    .choose {
-      position: absolute;
-      top: 0;
-      right: 0;
-      width: 16px;
-      height: 16px;
-    }
+    color: #333333;
   }
-  .item_ac {
-    border-color: #fc7200;
+  .recharge_color {
+    width: 160px;
+    background: #fc7200;
+    color: #fff;
+  }
+  .agreement {
+    font-size: 12px;
+    font-weight: 400;
     color: #fc7200;
+    margin-top: 10px;
+    span {
+      color: #3662a1;
+      cursor: pointer;
+    }
   }
-}
-.recharge_list_m {
-  .item {
-    width: 90px;
+  .recharge_list /deep/ .el-input__inner {
+    padding: 0 15px;
     height: 36px;
-    margin: 0 24px 15px 0;
-    position: relative;
-    .item_tips {
-      height: 19px;
-      position: absolute;
-      right: -22px;
-      top: -28px;
-      padding: 5px;
-      background-image: url("../../../static/image/recharge.png");
-      background-position: center;
-      background-repeat: no-repeat;
-      background-size: contain;
-      font-size: 12px;
-      font-weight: 100;
-      color: #ffffff;
-    }
+    border: none !important;
+    text-align: center;
   }
-}
-.recharge_coupon {
-  width: 100%;
-  background: #fef2e9;
-  border-radius: 8px;
-  padding: 3px 10px;
-  margin-bottom: 42px;
-  .recharge_coupon_top {
+  .recharge_list /deep/ input::placeholder {
+    font-size: 14px !important;
+  }
+  .recharge_list {
+    width: 100%;
     display: flex;
     flex-wrap: wrap;
-    align-items: center;
-    img {
-      width: 28px;
-      height: 30px;
-    }
-    .recharge_coupon_top_left {
-      padding: 0 10px 0 8px;
+    margin-top: 24px;
+    margin-bottom: 10px;
+
+    .item {
+      position: relative;
+      width: 200px;
+      height: 40px;
+      border: 1px solid #e6e6e6;
+      color: #333333;
+      font-size: 16px;
+      font-weight: 500;
       display: flex;
       align-items: center;
-      font-size: 16px;
-      font-family: PingFang SC;
-      font-weight: bold;
-      color: #fc7200;
+      justify-content: center;
+      border-radius: 3px;
+      margin: 0 15px 15px 0;
+      cursor: pointer;
+      .img {
+        width: 24px;
+        height: 24px;
+        margin-right: 6px;
+      }
+      .choose {
+        position: absolute;
+        top: 0;
+        right: 0;
+        width: 16px;
+        height: 16px;
+      }
     }
-    .recharge_coupon_top_right {
-      display: flex;
-      flex-wrap: wrap;
-      align-items: flex-end;
-      font-size: 12px;
-      font-weight: 400;
+    .item_ac {
+      border-color: #fc7200;
       color: #fc7200;
-      padding-top: 2px;
-      div {
-        margin-right: 10px;
+    }
+  }
+  .recharge_list_m {
+    .item {
+      width: 90px;
+      height: 36px;
+      margin: 0 24px 15px 0;
+      position: relative;
+      .item_tips {
+        height: 19px;
+        position: absolute;
+        right: -22px;
+        top: -28px;
+        padding: 5px;
+        background-image: url("../../../static/image/recharge.png");
+        background-position: center;
+        background-repeat: no-repeat;
+        background-size: contain;
+        font-size: 12px;
+        font-weight: 100;
+        color: #ffffff;
       }
     }
   }
-  .recharge_coupon_bottom {
-    margin: 15px 17px;
-    display: flex;
-    flex-wrap: wrap;
-    .recharge_coupon_bottom_item {
-      width: 410px;
-      height: 72px;
+  .recharge_coupon {
+    width: 880px;
+    background: #fef2e9;
+    border-radius: 8px;
+    padding: 3px 10px;
+    margin-bottom: 42px;
+    .recharge_coupon_top {
       display: flex;
-      justify-content: flex-start;
-      margin-bottom: 10px;
-      margin-right: 24px;
-      .recharge_coupon_bottom_left {
+      flex-wrap: wrap;
+      align-items: center;
+      img {
+        width: 28px;
+        height: 30px;
+      }
+      .recharge_coupon_top_left {
+        padding: 0 10px 0 8px;
         display: flex;
-        flex-direction: column;
-        justify-content: center;
         align-items: center;
-        width: 110px;
-        margin-top: 10px auto;
-        text-align: center;
-        border-radius: 8px;
-        background-color: #fff;
-        padding: 10px 0;
-        .recharge_coupon_bottom_left_num {
-          span {
-            font-size: 14px;
-            font-family: PingFang SC;
-            font-weight: 400;
-            line-height: 20px;
-            margin-left: 2px;
-            color: #ec1414;
-          }
-          .num {
-            font-size: 26px;
-            font-family: PingFang SC;
-            font-weight: bold;
-            color: #ec1414;
-          }
-        }
-
-        .recharge_coupon_bottom_sub {
-          font-size: 14px;
-          font-family: PingFang SC;
-          font-weight: 400;
-          line-height: 20px;
-          color: #666666;
-        }
+        font-size: 16px;
+        font-family: PingFang SC;
+        font-weight: bold;
+        color: #fc7200;
       }
-      .recharge_coupon_bottom_middle {
+      .recharge_coupon_top_right {
         display: flex;
-        align-items: center;
+        flex-wrap: wrap;
+        align-items: flex-end;
+        font-size: 12px;
+        font-weight: 400;
+        color: #fc7200;
+        padding-top: 2px;
         div {
-          height: 100%;
-          padding: 10px 0;
-          height: 55px;
-          border-right: 1px dashed #ec1414;
-          box-sizing: border-box;
+          margin-right: 10px;
         }
       }
-      .recharge_coupon_bottom_right {
-        border-radius: 8px;
-        background-color: #fff;
-        flex: 1;
-        position: relative;
-        padding: 10px;
+    }
+    .recharge_coupon_bottom {
+      margin: 15px 10px;
+      display: flex;
+      justify-content: space-between;
+      flex-wrap: wrap;
+      .recharge_coupon_bottom_item {
+        width: 410px;
+        height: 72px;
         display: flex;
-        justify-content: space-between;
-        align-items: center;
-        .recharge_coupon_bottom_date {
-          font-size: 18px;
-          font-family: PingFang SC;
-          font-weight: bold;
-          line-height: 25px;
-          color: #333333;
-          div:last-child {
-            height: 20px;
+        justify-content: flex-start;
+        margin-bottom: 10px;
+        // margin-right: 24px;
+        .recharge_coupon_bottom_left {
+          display: flex;
+          flex-direction: column;
+          justify-content: center;
+          align-items: center;
+          width: 110px;
+          margin-top: 10px auto;
+          text-align: center;
+          border-radius: 8px;
+          background-color: #fff;
+          padding: 10px 0;
+          .recharge_coupon_bottom_left_num {
+            span {
+              font-size: 14px;
+              font-family: PingFang SC;
+              font-weight: 400;
+              line-height: 20px;
+              margin-left: 2px;
+              color: #ec1414;
+            }
+            .num {
+              font-size: 26px;
+              font-family: PingFang SC;
+              font-weight: bold;
+              color: #ec1414;
+            }
+          }
+
+          .recharge_coupon_bottom_sub {
             font-size: 14px;
             font-family: PingFang SC;
             font-weight: 400;
             line-height: 20px;
-            color: #999999;
+            color: #666666;
+          }
+        }
+        .recharge_coupon_bottom_middle {
+          display: flex;
+          align-items: center;
+          div {
+            height: 100%;
+            padding: 10px 0;
+            height: 55px;
+            border-right: 1px dashed #ec1414;
+            box-sizing: border-box;
           }
         }
-        .recharge_coupon_bottom_number {
+        .recharge_coupon_bottom_right {
+          border-radius: 8px;
+          background-color: #fff;
+          flex: 1;
+          position: relative;
+          padding: 10px;
           display: flex;
+          justify-content: space-between;
           align-items: center;
-          span {
-            width: 63px;
-            height: 22px;
-            line-height: 22px;
-            border: 1px solid #ec1414;
-            border-radius: 18px;
-            text-align: center;
-            font-size: 12px;
+          .recharge_coupon_bottom_date {
+            font-size: 18px;
             font-family: PingFang SC;
-            font-weight: 500;
-            color: #ec1414;
-            cursor: pointer;
-            &:hover {
-              background-color: #ec1414;
-              color: #ffffff;
+            font-weight: bold;
+            line-height: 25px;
+            color: #333333;
+            div:last-child {
+              height: 20px;
+              font-size: 14px;
+              font-family: PingFang SC;
+              font-weight: 400;
+              line-height: 20px;
+              color: #999999;
+            }
+          }
+          .recharge_coupon_bottom_number {
+            display: flex;
+            align-items: center;
+            span {
+              width: 63px;
+              height: 22px;
+              line-height: 22px;
+              border: 1px solid #ec1414;
+              border-radius: 18px;
+              text-align: center;
+              font-size: 12px;
+              font-family: PingFang SC;
+              font-weight: 500;
+              color: #ec1414;
+              cursor: pointer;
+              &:hover {
+                background-color: #ec1414;
+                color: #ffffff;
+              }
             }
           }
         }

src/components/manualCreate.vue

@@ -11,7 +11,6 @@
               个人地址发单
             </div>
           </div>
-
           <el-form-item :label="sendType ? '发件门店' : '发件人姓名'" required>
             <el-input v-show="!sendType" size="small" class="input" v-model="form.sendAddress.contact" placeholder="请填写发件人姓名" clearable></el-input>
             <el-input v-show="sendType" disabled size="small" class="input" v-model="name" placeholder="请填写发件门店"></el-input>

src/components/orderComponents/orderList.vue

@@ -923,6 +923,15 @@ export default {
 };
 </script>
 <style lang="scss" scoped="scoped">
+/deep/ .el-button--default:hover {
+  background-color: rgba(252, 114, 0, 0.2);
+  border-color: rgba(252, 114, 0, 0.2);
+  color: #fc7200;
+}
+/deep/ .el-button--primary {
+  background-color: #fc7200;
+  border-color: #fc7200;
+}
 .el-row {
   position: absolute !important;
   width: 100%;
@@ -934,7 +943,6 @@ export default {
   justify-content: flex-end;
   height: calc(100vh - 210px);
   /deep/ .el-col {
-    // margin-right: 15px;
     height: 100%;
     z-index: 2;
   }
@@ -1121,7 +1129,9 @@ export default {
   border-radius: 5px;
   overflow: hidden;
   cursor: pointer;
-
+  &:hover {
+    background: rgba(254, 241, 233, 0.39) !important;
+  }
   .order_item_header {
     width: 100%;
     height: 49px;
@@ -1182,7 +1192,6 @@ export default {
     }
 
     .sign_txt {
-      // width: 64px;
       height: 20px;
       border: 1px solid #009cff;
       background: #f2faff;
@@ -1227,7 +1236,6 @@ export default {
       font-size: 14px;
       font-weight: 400;
       color: #333333;
-      // margin-right: 22px;
     }
 
     .btn {
@@ -1235,8 +1243,6 @@ export default {
       border-color: #fc7200;
       color: #fff;
       margin-left: 20px;
-      //  position: absolute;
-      //  right: 10px;
     }
   }
   .active_order_item_cont {
@@ -1248,7 +1254,8 @@ export default {
     justify-content: space-evenly;
     padding: 0 20px;
     height: calc(100% - 52px);
-    border-bottom: 2px solid #ffffff;
+    border-bottom: 3px solid #ffffff;
+
     .address {
       display: flex;
       align-items: center;

src/components/orderSearch.vue

@@ -299,6 +299,13 @@ export default {
 </script>
 
 <style lang="scss" scoped="scoped">
+/deep/ .el-pagination.is-background .el-pager li:not(.disabled).active {
+  background-color: #fc7200;
+  color: #fff !important;
+}
+/deep/ .el-pagination.is-background .el-pager li:hover:not(.disabled) {
+  color: #fc7200;
+}
 /deep/ .el-input__inner {
   padding-right: 30px;
 }

src/components/platformAccount/index.vue

@@ -1,9 +1,8 @@
 <template>
   <div class="platform-account">
     <div class="address-list">
-      <div class="item" v-for="(v,i) in accountList" :key="i">
+      <div class="item" v-for="(v,i) in accountList" :key="i" @click.stop="showAccount(1,v)">
         <div class="name">{{v.name}} {{v.mobile}}</div>
-        <!-- <div class="name">{{v.mobile}}</div> -->
         <div class="shop-name">{{v.shopName}}</div>
         <div class="btns">
           <img @click.stop="showAccount(1,v)" src="../../../static/image/edit-icon.png" alt="">
@@ -194,11 +193,14 @@ export default {
     width: 280px;
     height: 120px;
     background: #ffffff;
-    box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.1);
     border-radius: 8px;
     margin: 10px 20px 0 0;
     padding: 35px 20px 0;
     cursor: pointer;
+    &:hover {
+      background: rgba(255, 255, 255, 0.39);
+      box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.1);
+    }
     .img {
       width: 80px;
       height: 80px;

src/components/shopCompoents/bindDelivery.vue

@@ -612,9 +612,6 @@ export default {
 }
 .store-list::-webkit-scrollbar-track {
   background-color: #eee;
-  /*border-radius: 5px;
-    -webkit-border-radius: 5px;
-    -moz-border-radius: 5px;*/
 }
 .store-list::-webkit-scrollbar-thumb {
   background-color: #999;
@@ -631,21 +628,24 @@ export default {
     flex-direction: column;
     background: #fefefe;
     height: 100%;
-    padding: 0 10px;
 
     .active {
       background: #ffffff;
       color: #fc7200;
       font-weight: bold;
       box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.12);
-      border-radius: 40px 2px 4px 40px;
     }
     .list {
       display: flex;
       align-items: center;
-      margin: 10px;
       cursor: pointer;
-      padding: 0 10px 0 10px;
+      padding: 10px 20px;
+      &:hover {
+        background: #ffffff;
+        color: #fc7200;
+        font-weight: bold;
+        box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.12);
+      }
       img {
         width: 30px;
         height: 30px;
@@ -670,10 +670,14 @@ export default {
       width: 305px;
       height: 170px;
       background: #ffffff;
-      box-shadow: 0px 2px 6px rgba(0, 0, 0, 0.1);
       border-radius: 8px;
       margin: 0 20px 20px 0;
+      cursor: pointer;
       overflow: hidden;
+      &:hover {
+        background: rgba(255, 255, 255, 0.39);
+        box-shadow: 0px 2px 6px rgba(0, 0, 0, 0.1);
+      }
       .status {
         position: absolute;
         top: 60px;

src/components/shopCompoents/bindTakeOut.vue

@@ -389,21 +389,24 @@ export default {
       flex-direction: column;
       background: #fefefe;
       height: 100%;
-      padding: 0 10px;
 
       .active {
         background: #ffffff;
         color: #fc7200;
         font-weight: bold;
         box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.12);
-        border-radius: 40px 2px 4px 40px;
       }
       .list {
         display: flex;
         align-items: center;
-        margin: 10px;
         cursor: pointer;
-        padding: 0 10px 0 10px;
+        padding: 10px 20px;
+        &:hover {
+          background: #ffffff;
+          color: #fc7200;
+          font-weight: bold;
+          box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.12);
+        }
         img {
           width: 30px;
           height: 30px;
@@ -448,10 +451,14 @@ export default {
         width: 305px;
         height: 170px;
         background: #ffffff;
-        box-shadow: 0px 2px 6px rgba(0, 0, 0, 0.1);
         border-radius: 8px;
         margin: 0 20px 20px 0;
         overflow: hidden;
+        cursor: pointer;
+        &:hover {
+          box-shadow: 0px 2px 6px rgba(0, 0, 0, 0.1);
+          background: rgba(255, 255, 255, 0.39);
+        }
         .status {
           position: absolute;
           top: 60px;

src/components/shopCompoents/shopList.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="shopList" v-loading="loading" element-loading-text="数据加载中">
-   <div class="shop-list">
-      <div class="item" v-for="(v,i) in shopList" :key=i>
+    <div class="shop-list">
+      <div class="item" v-for="(v,i) in shopList" :key="i" @click.stop="addShop(2, v)">
         <div class="shop-top">
           <div class="code">门店编号：{{v.code}}</div>
           <div class="edit" @click.stop="addShop(2, v)">编辑</div>
@@ -149,13 +149,16 @@ export default {
       flex-direction: column;
       width: 290px;
       height: 150px;
-      background: rgba(255, 255, 255, 0.39);
-      box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.1);
+      background: #ffffff;
       margin: 10px 20px 0 0;
       padding: 16px;
       border-radius: 8px;
       overflow: hidden;
       cursor: pointer;
+      &:hover {
+        background: rgba(255, 255, 255, 0.39);
+        box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.1);
+      }
       .shop-top {
         display: flex;
         align-items: center;

src/components/waimaiComponents/addressManagement.vue

@@ -263,11 +263,14 @@ export default {
       width: 280px;
       height: 120px;
       background: #ffffff;
-      box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.1);
       border-radius: 8px;
       margin: 10px 20px 0 0;
       padding: 35px 20px 0;
       cursor: pointer;
+      &:hover {
+        box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.1);
+        background: rgba(255, 255, 255, 0.39);
+      }
       .img {
         width: 80px;
         height: 80px;

src/views/home.vue

@@ -5,11 +5,11 @@
       <el-header>
         <span @click="showMerchant" v-if="$store.state.userInfo.memberType === 1" class="header-button">成为商户</span>
         <div class="account" @click="goAccount">
-          <img src="../../static/image/head-account.png" alt="">
+          <img src="../../static/image/head-account2.png" alt="">
           <div class="num">￥{{$store.state.userInfo.amount}}</div>
         </div>
         <div class="print" @click="goPrinter">
-          <img src="../../static/image/head-print.png" alt="">
+          <img src="../../static/image/head-print2.png" alt="">
           <div class="num con">打印设置</div>
         </div>
         <el-dropdown trigger="click">
@@ -131,7 +131,6 @@ export default {
   right: 0;
   top: 80px;
   bottom: 0;
-  // overflow-y: hidden;
   background-color: #f1f2f5;
   padding: 10px;
   min-width: 550px;
@@ -164,6 +163,7 @@ export default {
     color: #fc7200;
   }
   .con {
+    font-size: 15px;
     color: #333333;
   }
 }