Browse Source

处理冲突

yangc 7 years ago
parent
commit
d2ef3189c5
2 changed files with 378 additions and 383 deletions
  1. 0 3
      .vscode/settings.json
  2. 378 380
      components/applyPurchase/ApplyInfo.vue

+ 0 - 3
.vscode/settings.json

@@ -1,3 +0,0 @@
-{
-  "eslint.autoFixOnSave": true
-}

+ 378 - 380
components/applyPurchase/ApplyInfo.vue

@@ -364,74 +364,38 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.apply-info {
-  width: 1190px;
-  margin: 0 auto;
-  .apply-info-title {
-    border-bottom: 1px solid #3975f4;
-    > p {
-      display: inline-block;
-      width: 156px;
-      height: 33px;
-      line-height: 33px;
-      color: #fff;
-      background: #3975f4;
-      font-size: 18px;
-      text-align: center;
-      border: {
-        top-left-radius: 3px;
-        top-right-radius: 3px;
-      }
-      margin: 0;
-    }
-    > span {
-      color: #999;
-      margin-left: 16px;
-    }
-    > div {
-      float: right;
-      height: 32px;
-      line-height: 32px;
-      > input {
-        width: 241px;
-        height: 32px;
-        line-height: 32px;
-        font-size: 13px;
-        border: {
-          top-right-radius: 0;
-          bottom-right-radius: 0;
-        }
-      }
-      > span {
+  .apply-info {
+    width: 1190px;
+    margin: 0 auto;
+    .apply-info-title {
+      border-bottom: 1px solid #3975f4;
+      > p {
         display: inline-block;
-        width: 69px;
+        width: 156px;
+        height: 33px;
+        line-height: 33px;
         color: #fff;
         background: #3975f4;
+        font-size: 18px;
         text-align: center;
-        margin: 0 6px 0 -1px;
-        /*vertical-align: middle;*/
         border: {
+          top-left-radius: 3px;
           top-right-radius: 3px;
-          bottom-right-radius: 3px;
         }
-        cursor: pointer;
+        margin: 0;
       }
-      > a {
-        background: #ffa200;
-        color: #fff;
-        width: 79px;
-        border-radius: 3px;
-        text-align: center;
-        display: inline-block;
+      > span {
+        color: #999;
+        margin-left: 16px;
       }
       > div {
         float: right;
-        height: 33px;
-        line-height: 33px;
+        height: 32px;
+        line-height: 32px;
         > input {
           width: 241px;
-          height: 33px;
-          line-height: 33px;
+          height: 32px;
+          line-height: 32px;
           font-size: 13px;
           border: {
             top-right-radius: 0;
@@ -445,7 +409,6 @@ export default {
           background: #3975f4;
           text-align: center;
           margin: 0 6px 0 -1px;
-          height: 33px;
           /*vertical-align: middle;*/
           border: {
             top-right-radius: 3px;
@@ -453,385 +416,420 @@ export default {
           }
           cursor: pointer;
         }
-        &:nth-child(2) {
-          width: 106px;
-        }
-        &:nth-child(3) {
-          width: 200px;
-        }
-        &:nth-child(4) {
-          width: 174px;
-        }
-        &:nth-child(5) {
-          width: 152px;
-        }
-        &:nth-child(6) {
-          width: 158px;
+        > a {
+          background: #ffa200;
+          color: #fff;
+          width: 79px;
+          border-radius: 3px;
+          text-align: center;
+          display: inline-block;
         }
-        &:nth-child(7) {
-          width: 180px;
-          margin-left: 30px;
+        > div {
+          float: right;
+          height: 33px;
+          line-height: 33px;
+          > input {
+            width: 241px;
+            height: 33px;
+            line-height: 33px;
+            font-size: 13px;
+            border: {
+              top-right-radius: 0;
+              bottom-right-radius: 0;
+            }
+          }
+          > span {
+            display: inline-block;
+            width: 69px;
+            color: #fff;
+            background: #3975f4;
+            text-align: center;
+            margin: 0 6px 0 -1px;
+            height: 33px;
+            /*vertical-align: middle;*/
+            border: {
+              top-right-radius: 3px;
+              bottom-right-radius: 3px;
+            }
+            cursor: pointer;
+          }
+          &:nth-child(2) {
+            width: 106px;
+          }
+          &:nth-child(3) {
+            width: 200px;
+          }
+          &:nth-child(4) {
+            width: 174px;
+          }
+          &:nth-child(5) {
+            width: 152px;
+          }
+          &:nth-child(6) {
+            width: 158px;
+          }
+          &:nth-child(7) {
+            width: 180px;
+            margin-left: 30px;
+          }
         }
       }
-    }
 
-    .empty {
-      text-align: center;
-      height: 200px;
-      line-height: 200px;
-      border: 1px solid #e8e8e8;
-      margin-bottom: 10px;
-      span {
-        color: #999;
-        margin-left: 10px;
-      }
-    }
-  }
-  .apply-info-list {
-    .list-title {
-      background: #e2ebff;
-      height: 40px;
-      line-height: 40px;
-      margin: 9px 0 0 0;
-      .list-title-item {
-        display: inline-block;
+      .empty {
         text-align: center;
-        .fa {
-          color: #333;
-          &.active {
-            color: #5078cb;
-          }
-        }
-        &:nth-child(1) {
-          margin-left: 76px;
-        }
-        &:nth-child(2) {
-          margin-left: 345px;
-        }
-        &:nth-child(3) {
-          margin-left: 399px;
-        }
-        &:nth-child(4) {
-          margin-left: 71px;
+        height: 200px;
+        line-height: 200px;
+        border: 1px solid #e8e8e8;
+        margin-bottom: 10px;
+        span {
+          color: #999;
+          margin-left: 10px;
         }
       }
     }
-    > ul {
-      margin-bottom: 29px;
-      > li {
-        position: relative;
-        border: 1px solid #ededed;
-        &.active {
-          border: 1px solid #4290f7;
-          box-shadow: 2px 4px 5px 0 rgb(205, 221, 252);
-        }
-        &:hover {
-          border: 1px solid #4290f7;
-          box-shadow: 2px 4px 5px 0 rgb(205, 221, 252);
-          .il-item.il-right .sharecode {
-            display: block;
-          }
-        }
-        .il-item {
-          height: 120px;
+    .apply-info-list {
+      .list-title {
+        background: #e2ebff;
+        height: 40px;
+        line-height: 40px;
+        margin: 9px 0 0 0;
+        .list-title-item {
           display: inline-block;
           text-align: center;
-          color: #3c3c3c;
-          padding-top: 16px;
-          vertical-align: middle;
-          .item {
-            display: inline-block;
-            overflow: hidden;
-            text-overflow: ellipsis;
-            white-space: nowrap;
-            span {
-              color: #999;
+          .fa {
+            color: #333;
+            &.active {
+              color: #5078cb;
             }
           }
-          &.il-left {
-            width: 236px;
-            padding: 16px 10px 0;
-            div {
+          &:nth-child(1) {
+            margin-left: 76px;
+          }
+          &:nth-child(2) {
+            margin-left: 345px;
+          }
+          &:nth-child(3) {
+            margin-left: 399px;
+          }
+          &:nth-child(4) {
+            margin-left: 71px;
+          }
+        }
+      }
+      > ul {
+        margin-bottom: 29px;
+        > li {
+          position: relative;
+          border: 1px solid #ededed;
+          &.active {
+            border: 1px solid #4290f7;
+            box-shadow: 2px 4px 5px 0 rgb(205, 221, 252);
+          }
+          &:hover {
+            border: 1px solid #4290f7;
+            box-shadow: 2px 4px 5px 0 rgb(205, 221, 252);
+            .il-item.il-right .sharecode {
               display: block;
-              &:last-child {
-                margin-top: 37px;
-                color: #666;
-              }
             }
           }
-          &.il-center {
-            text-align: left;
-            width: 654px;
-            .il-box {
+          .il-item {
+            height: 120px;
+            display: inline-block;
+            text-align: center;
+            color: #3c3c3c;
+            padding-top: 16px;
+            vertical-align: middle;
+            .item {
               display: inline-block;
-              float: left;
+              overflow: hidden;
+              text-overflow: ellipsis;
+              white-space: nowrap;
               span {
                 color: #999;
               }
             }
-            .il-box-large {
-              width: 482px;
-              .fl {
-                width: 284px;
-                line-height: 19px;
-                word-break: break-all;
-                white-space: unset;
-                &.bottom {
-                  margin-top: 14px;
-                }
-                .content {
-                  display: inline-block;
-                  width: 220px;
-                  overflow: hidden;
-                  vertical-align: middle;
-                  height: 38px;
+            &.il-left {
+              width: 236px;
+              padding: 16px 10px 0;
+              div {
+                display: block;
+                &:last-child {
+                  margin-top: 37px;
+                  color: #666;
                 }
+              }
+            }
+            &.il-center {
+              text-align: left;
+              width: 654px;
+              .il-box {
+                display: inline-block;
+                float: left;
                 span {
-                  float: left;
+                  color: #999;
                 }
-                &.size-middle {
-                  width: 136px;
-                  margin-right: 37px;
+              }
+              .il-box-large {
+                width: 482px;
+                .fl {
+                  width: 284px;
+                  line-height: 19px;
+                  word-break: break-all;
+                  white-space: unset;
+                  &.bottom {
+                    margin-top: 14px;
+                  }
                   .content {
-                    width: 86px;
+                    display: inline-block;
+                    width: 220px;
+                    overflow: hidden;
+                    vertical-align: middle;
+                    height: 38px;
+                  }
+                  span {
+                    float: left;
+                  }
+                  &.size-middle {
+                    width: 136px;
+                    margin-right: 37px;
+                    .content {
+                      width: 86px;
+                    }
                   }
                 }
               }
-            }
-            .il-box-small {
-              width: 151px;
-              margin-left: 12px;
-              .item {
-                color: #020202;
+              .il-box-small {
                 width: 151px;
-                margin-bottom: 6px;
-              }
-            }
-          }
-          &.il-right {
-            width: 100px;
-            .date-content {
-              margin-top: 14px;
-              margin-bottom: 17px;
-              span {
-                &:first-child {
-                  font-size: 12px;
-                  color: #666;
+                margin-left: 12px;
+                .item {
+                  color: #020202;
+                  width: 151px;
+                  margin-bottom: 6px;
                 }
-                color: #f71026;
-              }
-              i {
-                font-style: normal;
               }
             }
-            .btn-content {
-              > div a {
-                display: inline-block;
-                width: 71px;
-                height: 28px;
-                line-height: 28px;
-                color: #fff;
-                background: #3c7cf5;
-                border-radius: 3px;
-                cursor: pointer;
-                /*  &:first-child {
-                      background: #ffa200;
-                      float: left;
-                      margin-top: 19px;
-                    }*/
+            &.il-right {
+              width: 100px;
+              .date-content {
+                margin-top: 14px;
+                margin-bottom: 17px;
+                span {
+                  &:first-child {
+                    font-size: 12px;
+                    color: #666;
+                  }
+                  color: #f71026;
+                }
+                i {
+                  font-style: normal;
+                }
               }
-              .is-say-price {
-                display: inline-block;
-                color: #39ae05;
-                margin-left: 11px;
-                img {
-                  margin-bottom: 2px;
+              .btn-content {
+                > div a {
+                  display: inline-block;
+                  width: 71px;
+                  height: 28px;
+                  line-height: 28px;
+                  color: #fff;
+                  background: #3c7cf5;
+                  border-radius: 3px;
+                  cursor: pointer;
+                  /*  &:first-child {
+                        background: #ffa200;
+                        float: left;
+                        margin-top: 19px;
+                      }*/
+                }
+                .is-say-price {
+                  display: inline-block;
+                  color: #39ae05;
+                  margin-left: 11px;
+                  img {
+                    margin-bottom: 2px;
+                  }
                 }
               }
-            }
-            .sharescancodekuang {
-              // width: 100%;
-              // height: 220px;
-              // position: absolute;
-              // top: 115px;
-              // left: 0px;
-              // background: rgba(0, 0, 0, 0);
-            }
-            .sharescancode {
-              position: absolute;
-              background: url('/images/mobile/@2x/purChase/codebg.png');
-              width: 248px;
-              height: 207px;
-              top: 115px;
-              right: 0;
-              z-index: 98;
-              display: none;
-              line-height: 14px;
-              canvas {
-                display: block;
-                text-align: center;
-                margin: 0 auto;
-                line-height: 14px;
+              .sharescancodekuang {
+                // width: 100%;
+                // height: 220px;
+                // position: absolute;
+                // top: 115px;
+                // left: 0px;
+                // background: rgba(0, 0, 0, 0);
               }
-              .title {
-                color: #3c7cf5;
-                font-size: 16px;
-                margin: 21px auto;
-                margin-bottom: 0px;
-                text-align: center;
+              .sharescancode {
+                position: absolute;
+                background: url('/images/mobile/@2x/purChase/codebg.png');
+                width: 248px;
+                height: 207px;
+                top: 115px;
+                right: 0;
+                z-index: 98;
+                display: none;
                 line-height: 14px;
+                canvas {
+                  display: block;
+                  text-align: center;
+                  margin: 0 auto;
+                  line-height: 14px;
+                }
+                .title {
+                  color: #3c7cf5;
+                  font-size: 16px;
+                  margin: 21px auto;
+                  margin-bottom: 0px;
+                  text-align: center;
+                  line-height: 14px;
+                }
+                div input {
+                  display: inline-block;
+                  width: 140px;
+                  overflow: hidden;
+                  height: 35px;
+                  vertical-align: middle;
+                  margin-left: 14px;
+                  line-height: 35px;
+                }
+                div span {
+                  display: inline-block;
+                  color: #fff;
+                  background: #4290f7;
+                  height: 36px;
+                  line-height: 36px;
+                  width: 70px;
+                  font-style: normal;
+                  vertical-align: middle;
+                  cursor: pointer;
+                }
               }
-              div input {
-                display: inline-block;
-                width: 140px;
-                overflow: hidden;
-                height: 35px;
-                vertical-align: middle;
-                margin-left: 14px;
-                line-height: 35px;
-              }
-              div span {
-                display: inline-block;
-                color: #fff;
-                background: #4290f7;
-                height: 36px;
-                line-height: 36px;
-                width: 70px;
-                font-style: normal;
-                vertical-align: middle;
-                cursor: pointer;
-              }
-            }
-            .sharecode {
-              position: absolute;
-              right: 0;
-              top: 0;
-              height: 120px;
-              z-index: 99;
-              display: none;
-              .sharecodeR {
-                width: 4px;
+              .sharecode {
+                position: absolute;
+                right: 0;
+                top: 0;
                 height: 120px;
-                background: #4290f7;
-                float: right;
-              }
-              .sharecodeL {
-                float: right;
-                margin-right: 1px;
-              }
-              .sharecodeT {
-                padding-top: 5px;
-                margin-top: 10px;
-                width: 28px;
-                height: 68px;
-                background-color: #3c7cf5;
-                border-radius: 2px;
-                color: #ffffff;
-                font-size: 14px;
-                word-wrap: break-word;
-                white-space: pre-wrap;
-                line-height: 14px;
-              }
-              .sharecodeBtn {
-                width: 28px;
-                height: 28px;
-                margin-top: 4px;
-                &::after {
-                  content: ' ';
-                  clear: both;
-                  display: inline;
-                  visibility: hidden;
+                z-index: 99;
+                display: none;
+                .sharecodeR {
+                  width: 4px;
+                  height: 120px;
+                  background: #4290f7;
+                  float: right;
+                }
+                .sharecodeL {
+                  float: right;
+                  margin-right: 1px;
                 }
-                img {
-                  float: left;
+                .sharecodeT {
+                  padding-top: 5px;
+                  margin-top: 10px;
+                  width: 28px;
+                  height: 68px;
+                  background-color: #3c7cf5;
+                  border-radius: 2px;
+                  color: #ffffff;
+                  font-size: 14px;
+                  word-wrap: break-word;
+                  white-space: pre-wrap;
+                  line-height: 14px;
+                }
+                .sharecodeBtn {
+                  width: 28px;
+                  height: 28px;
+                  margin-top: 4px;
+                  &::after {
+                    content: ' ';
+                    clear: both;
+                    display: inline;
+                    visibility: hidden;
+                  }
+                  img {
+                    float: left;
+                  }
                 }
               }
             }
+            i {
+              color: #e41515;
+              position: relative;
+              top: 2px;
+              right: 3px;
+            }
           }
-          i {
-            color: #e41515;
-            position: relative;
-            top: 2px;
-            right: 3px;
+          .number-content {
+            margin-left: 56px;
+            line-height: 120px;
+            padding-top: 0;
+            width: 77px;
+            margin-right: 34px;
+            span {
+              color: #5392f9;
+              &.active {
+                color: #ff9a00;
+              }
+            }
+            > img {
+              margin-bottom: 5px;
+              margin-right: 2px;
+            }
           }
+          /*.say-price {*/
+          /*display: block;*/
+          /*}*/
         }
-        .number-content {
-          margin-left: 56px;
-          line-height: 120px;
+      }
+    }
+    .page-wrap {
+      text-align: right;
+      float: none;
+    }
+
+    .link-saler-box {
+      width: 289px;
+      height: auto;
+      min-height: auto;
+      border-radius: 2px;
+      .title {
+        background-color: #4290f7;
+        height: 22px;
+        line-height: 22px;
+        margin-bottom: 20px;
+      }
+      .content {
+        p {
+          line-height: 20px;
           padding-top: 0;
-          width: 77px;
-          margin-right: 34px;
+          i {
+            color: #4290f7;
+            margin-right: 4px;
+          }
           span {
-            color: #5392f9;
-            &.active {
-              color: #ff9a00;
-            }
+            color: #f62d37;
           }
-          > img {
-            margin-bottom: 5px;
-            margin-right: 2px;
+        }
+        div {
+          a {
+            width: 78px;
+            background: #4290f7;
+            margin: 18px 0 13px 0;
+            border-radius: 2px;
           }
         }
-        /*.say-price {*/
-        /*display: block;*/
-        /*}*/
       }
     }
   }
+  .empty{
+    text-align: center;
+    height: 200px;
+    line-height: 200px;
+    border: 1px solid #e8e8e8;
+    margin-bottom: 10px;
+    span {
+      color: #999;
+      margin-left: 10px;
+    }
+  }
   .page-wrap {
     text-align: right;
     float: none;
   }
-
-  .link-saler-box {
-    width: 289px;
-    height: auto;
-    min-height: auto;
-    border-radius: 2px;
-    .title {
-      background-color: #4290f7;
-      height: 22px;
-      line-height: 22px;
-      margin-bottom: 20px;
-    }
-    .content {
-      p {
-        line-height: 20px;
-        padding-top: 0;
-        i {
-          color: #4290f7;
-          margin-right: 4px;
-        }
-        span {
-          color: #f62d37;
-        }
-      }
-      div {
-        a {
-          width: 78px;
-          background: #4290f7;
-          margin: 18px 0 13px 0;
-          border-radius: 2px;
-        }
-      }
-    }
-  }
-}
-      .empty{
-        text-align: center;
-        height: 200px;
-        line-height: 200px;
-        border: 1px solid #e8e8e8;
-        margin-bottom: 10px;
-        span {
-          color: #999;
-          margin-left: 10px;
-        }
-      }
-    }
-    .page-wrap {
-      text-align: right;
-      float: none;
-    }
-  }
 </style>