合并冲突

app.less

@@ -0,0 +1,881 @@
+<<<<<<< HEAD:src/app.less
+// @import '~taro-ui/dist/style/index.less';
+
+view {
+  box-sizing: border-box;
+}
+
+.tab {
+  display: flex;
+  flex: 1;
+  background-color: #FFFFFF;
+  position: relative;
+  transform: all 1.1s ease;
+
+  .tablist {
+    width: 50%;
+    height: 84px;
+    font-size: 34px;
+    font-family: PingFangSC-Semibold, PingFang SC;
+    font-weight: 400;
+    color: #E03326;
+    line-height: 84px;
+    text-align: center;
+  }
+
+  .tablistfan {
+    width: 50%;
+    height: 84px;
+    font-size: 34px;
+    font-family: PingFangSC-Semibold, PingFang SC;
+    font-weight: 400;
+    color: #333333;
+    line-height: 84px;
+    text-align: center;
+  }
+
+  .tabhua1 {
+    width: 136px;
+    height: 4px;
+    position: absolute;
+    top: 80px;
+    left: 118px;
+    background-color: #E03326;
+  }
+
+  .tabhua2 {
+    width: 136px;
+    height: 4px;
+    position: absolute;
+    top: 80px;
+    left: 500px;
+    background-color: #E03326;
+  }
+}
+
+.recall {
+  background-color: #FFF4EF;
+  height: 72px;
+  padding-top: 20px;
+
+  View {
+    height: 32px;
+    font-size: 28px;
+    font-family: PingFangSC-Regular, PingFang SC;
+    font-weight: 400;
+    color: #111111;
+    display: flex;
+
+    &::before {
+      content: '';
+      display: inline-block;
+      height: 32px;
+      width: 32px;
+      margin-left: 24px;
+      margin-right: 32px;
+      background: url(assets/img/recall.png) no-repeat;
+      background-size: 100% auto;
+    }
+  }
+}
+
+.promessage {
+  width: 100%;
+  border-radius: 16px;
+  margin-top: 24px;
+  background-color: #FFFFFF;
+
+
+  .messtitle {
+    margin-left: 24px;
+    display: inline-block;
+    width: 156px;
+    padding-top: 24px;
+    font-size: 36px;
+    font-weight: 600;
+    color: #333333;
+  }
+
+  .small1 {
+    display: inline-block;
+    margin-left: 8px;
+    font-size: 26px;
+    font-weight: 400;
+    color: #999999;
+  }
+
+  .small2 {
+    display: inline-block;
+    font-size: 26px;
+    font-weight: 400;
+    color: #F24724;
+  }
+
+  .messdiv {
+    height: 95px;
+    border-bottom: solid 1px #ececec;
+    padding-left: 0;
+    position: relative;
+
+    .mess1 {
+      padding-left: 24px;
+      padding-top: 28px;
+      font-size: 30px;
+      font-weight: 400;
+      color: #333333;
+    }
+
+    .mess2 {
+
+      font-size: 30px;
+      font-weight: 400;
+      color: #999999;
+      position: absolute;
+      top: 28px;
+      right: 22px;
+    }
+
+    .iconpic {
+      width: 112px;
+      height: 96px;
+      position: absolute;
+      top: 0px;
+      right: 22px;
+      background: url(./assets/img/iconlogo.png) no-repeat;
+      background-size: 100% auto;
+    }
+
+    .icon2 {
+      width: 50px;
+      height: 50px;
+      position: absolute;
+      top: 20px;
+      right: 20px;
+      background: url(assets/img/right.png) no-repeat;
+      background-size: 100% auto;
+    }
+  }
+}
+
+.videodiv {
+  border-radius: 16px;
+  background-color: #FFFFFF;
+  margin-top: 28px;
+  padding: 28px 24px 32px 24px;
+
+  .title {
+    font-size: 36px;
+    font-weight: 600;
+    color: #333333;
+  }
+
+  .video {
+    height: 368px;
+    background-color: #333333;
+    margin-top: 24px;
+  }
+}
+
+.but {
+  height: 98px;
+  width: 702px;
+  text-align: center;
+  line-height: 98px;
+  background: #E03326;
+  border-radius: 12px;
+  margin: 40px 24px 432px 24px;
+  font-size: 36px;
+  font-weight: 400;
+  color: #FFFFFF;
+}
+
+.advicetitle {
+  font-size: 36px;
+  font-weight: 500;
+  color: #333333;
+  padding: 24px 0 32px 20px;
+}
+
+.thingdiv {
+  width: 343px;
+  background: #FFFFFF;
+  border-radius: 16px;
+  display: inline-block;
+  margin-bottom: 24px;
+
+  .pic {
+    height: 240px;
+    background-color: #ececec;
+    border-radius: 16px 16px 0 0;
+  }
+
+  .title {
+    margin: 16px 24px 14px 24px;
+    width: 295px;
+    height: 84px;
+    font-size: 30px;
+    font-weight: 500;
+    color: #333333;
+    text-overflow: -o-ellipsis-lastline;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
+  }
+
+  .has {
+    font-size: 24px;
+    font-weight: 400;
+    color: #999999;
+    display: inline-block;
+
+    &::before {
+      content: '';
+      display: inline-block;
+      width: 22.32px;
+      height: 23.26px;
+      background: url(./assets/img/renzheng.png) no-repeat;
+      background-size: 100% auto;
+      margin-left: 24px;
+      margin-right: 10px;
+    }
+
+    &::after {
+      content: '';
+      display: inline-block;
+      width: 1px;
+      height: 24px;
+      background: #E5E5E5;
+      margin-left: 12px;
+      margin-right: 12px;
+    }
+  }
+
+  .address {
+    display: inline-block;
+    font-size: 24px;
+    font-weight: 400;
+    color: #999999;
+  }
+
+  .price {
+    font-size: 30px;
+    font-weight: 600;
+    color: #F65200;
+    margin: 28px 0 22px 24px;
+  }
+}
+
+.weather {
+  margin-top: 24px;
+  padding: 24px 0 32px 0;
+  background-color: #FFF;
+  border-radius: 16px;
+
+  .dev {
+    display: flex;
+
+    .title {
+      display: inline-block;
+      font-size: 36px;
+      font-weight: 600;
+      color: #0B0D0E;
+      margin: 0 400px 28px 22px;
+    }
+
+    .address {
+      display: flex;
+      font-size: 24px;
+      font-weight: 500;
+      color: #999999;
+
+      &::before {
+        content: '';
+        display: inline-block;
+        width: 32px;
+        height: 32px;
+        background: url(./assets/img/address.png) no-repeat;
+        background-size: 100% auto;
+      }
+    }
+  }
+
+  .today {
+    padding: 40px 0 38px 40px;
+    border-top: 1px solid #EEEEEE;
+    border-bottom: 1px solid #EEEEEE;
+    display: flex;
+    font-family: PingFangSC-Medium, PingFang SC;
+
+    .temp_curr {
+      display: inline-block;
+      font-size: 120px;
+      font-family: AvenirNext-DemiBold, AvenirNext;
+      font-weight: 600;
+      color: #333333;
+    }
+
+    .todaydate {
+      display: flex;
+      flex-wrap: wrap;
+
+      .du {
+        width: 100%;
+        margin-left: 20px;
+        margin-top: 20px;
+        font-size: 48px;
+        font-family: AvenirNext-Medium, AvenirNext;
+        font-weight: 500;
+        color: #333333;
+      }
+
+      .sun {
+        margin-left: 35px;
+        font-size: 36px;
+        font-weight: 500;
+        color: #333333;
+      }
+
+      .date {
+        margin-top: 8px;
+        margin-left: 22px;
+        font-size: 28px;
+        font-weight: 500;
+        color: #333333;
+      }
+
+      .temparea {
+        margin-top: 8px;
+        margin-left: 12px;
+        font-size: 28px;
+        font-weight: 500;
+        color: #333333;
+        line-height: 40px;
+      }
+    }
+  }
+
+  .futuretitle {
+    width: 526px;
+    height: 60px;
+    background: #F0F1F2;
+    border-radius: 30px;
+    margin: 30px 0 16px 88px;
+    text-align: center;
+    font-size: 26px;
+    font-weight: 600;
+    color: #6C6D71;
+    line-height: 60px;
+  }
+
+  .futurediv {
+    padding: 40px 54px 0 40px;
+    display: flex;
+    position: relative;
+
+    .data {
+      font-size: 26px;
+      font-weight: 500;
+      color: #333333;
+      margin-right: 136px;
+    }
+
+    .wea {
+      font-size: 26px;
+      font-weight: 500;
+      color: #333333;
+    }
+
+    .weabefore {
+      content: '';
+      display: inline-block;
+      width: 36px;
+      height: 36px;
+      margin-right: 20px;
+      background-size: 100% auto;
+    }
+
+    .temp {
+      font-size: 26px;
+      font-weight: 500;
+      color: #333333;
+      position: absolute;
+      top: 40px;
+      right: 54px;
+    }
+  }
+}
+
+.qing {
+  background: url(./assets/img/weather/qing.png) no-repeat;
+}
+
+.duoyun {
+  background: url(./assets/img/weather/duoyun.png) no-repeat;
+}
+
+.yin {
+  background: url(./assets/img/weather/yin.png) no-repeat;
+}
+
+.yu {
+  background: url(./assets/img/weather/yu.png) no-repeat;
+}
+
+.leizhenyu {
+  background: url(./assets/img/weather/leizhenyu.png) no-repeat;
+}
+
+.xue {
+  background: url(./assets/img/weather/xue.png) no-repeat;
+}
+
+.wu {
+  background: url(./assets/img/weather/wu.png) no-repeat;
+}
+
+.shachenbao {
+  background: url(./assets/img/weather/shachenbao.png) no-repeat;
+}
+=======
+// @import '~taro-ui/dist/style/index.less';
+
+view {
+  box-sizing: border-box;
+}
+
+.tab {
+  display: flex;
+  flex: 1;
+  background-color: #FFFFFF;
+  position: relative;
+  transform: all 1.1s ease;
+
+  .tablist {
+    width: 50%;
+    height: 84px;
+    font-size: 34px;
+    font-family: PingFangSC-Semibold, PingFang SC;
+    font-weight: 400;
+    color: #E03326;
+    line-height: 84px;
+    text-align: center;
+  }
+
+  .tablistfan {
+    width: 50%;
+    height: 84px;
+    font-size: 34px;
+    font-family: PingFangSC-Semibold, PingFang SC;
+    font-weight: 400;
+    color: #333333;
+    line-height: 84px;
+    text-align: center;
+  }
+
+  .tabhua1 {
+    width: 136px;
+    height: 4px;
+    position: absolute;
+    top: 80px;
+    left: 118px;
+    background-color: #E03326;
+  }
+
+  .tabhua2 {
+    width: 136px;
+    height: 4px;
+    position: absolute;
+    top: 80px;
+    left: 500px;
+    background-color: #E03326;
+  }
+}
+
+.recall {
+  background-color: #FFF4EF;
+  height: 72px;
+  padding-top: 20px;
+
+  View {
+    height: 32px;
+    font-size: 28px;
+    font-family: PingFangSC-Regular, PingFang SC;
+    font-weight: 400;
+    color: #111111;
+    display: flex;
+
+    &::before {
+      content: '';
+      display: inline-block;
+      height: 32px;
+      width: 32px;
+      margin-left: 24px;
+      margin-right: 32px;
+      background: url(assets/img/recall.png) no-repeat;
+      background-size: 100% auto;
+    }
+  }
+}
+
+.promessage {
+  width: 100%;
+  border-radius: 16px;
+  margin-top: 24px;
+  background-color: #FFFFFF;
+
+
+  .messtitle {
+    margin-left: 24px;
+    display: inline-block;
+    width: 156px;
+    padding-top: 24px;
+    font-size: 36px;
+    font-weight: 600;
+    color: #333333;
+  }
+
+  .small1 {
+    display: inline-block;
+    margin-left: 8px;
+    font-size: 26px;
+    font-weight: 400;
+    color: #999999;
+  }
+
+  .small2 {
+    display: inline-block;
+    font-size: 26px;
+    font-weight: 400;
+    color: #F24724;
+  }
+
+  .messdiv {
+    height: 95px;
+    border-bottom: solid 1px #ececec;
+    padding-left: 0;
+    position: relative;
+
+    .mess1 {
+      padding-left: 24px;
+      padding-top: 28px;
+      font-size: 30px;
+      font-weight: 400;
+      color: #333333;
+    }
+
+    .mess2 {
+
+      font-size: 30px;
+      font-weight: 400;
+      color: #999999;
+      position: absolute;
+      top: 28px;
+      right: 22px;
+    }
+
+    .iconpic {
+      width: 112px;
+      height: 96px;
+      position: absolute;
+      top: 0px;
+      right: 22px;
+      background: url(./assets/img/iconlogo.png) no-repeat;
+      background-size: 100% auto;
+    }
+
+    .icon2 {
+      width: 50px;
+      height: 50px;
+      position: absolute;
+      top: 20px;
+      right: 20px;
+      background: url(assets/img/right.png) no-repeat;
+      background-size: 100% auto;
+    }
+  }
+}
+
+.videodiv {
+  border-radius: 16px;
+  background-color: #FFFFFF;
+  margin-top: 28px;
+  padding: 28px 24px 32px 24px;
+
+  .title {
+    font-size: 36px;
+    font-weight: 600;
+    color: #333333;
+  }
+
+  .video {
+    height: 368px;
+    background-color: #333333;
+    margin-top: 24px;
+  }
+}
+
+.but {
+  height: 98px;
+  width: 702px;
+  text-align: center;
+  line-height: 98px;
+  background: #E03326;
+  border-radius: 12px;
+  margin: 40px 24px 432px 24px;
+  font-size: 36px;
+  font-weight: 400;
+  color: #FFFFFF;
+}
+
+.advicetitle {
+  font-size: 36px;
+  font-weight: 500;
+  color: #333333;
+  padding: 24px 0 32px 20px;
+}
+
+.thingdiv {
+  width: 343px;
+  background: #FFFFFF;
+  border-radius: 16px;
+  display: inline-block;
+  margin-bottom: 24px;
+
+  .pic {
+    height: 240px;
+    background-color: #ececec;
+    border-radius: 16px 16px 0 0;
+  }
+
+  .title {
+    margin: 16px 24px 14px 24px;
+    width: 295px;
+    height: 84px;
+    font-size: 30px;
+    font-weight: 500;
+    color: #333333;
+    text-overflow: -o-ellipsis-lastline;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
+  }
+
+  .has {
+    font-size: 24px;
+    font-weight: 400;
+    color: #999999;
+    display: inline-block;
+
+    &::before {
+      content: '';
+      display: inline-block;
+      width: 22.32px;
+      height: 23.26px;
+      background: url(./assets/img/renzheng.png) no-repeat;
+      background-size: 100% auto;
+      margin-left: 24px;
+      margin-right: 10px;
+    }
+
+    &::after {
+      content: '';
+      display: inline-block;
+      width: 1px;
+      height: 24px;
+      background: #E5E5E5;
+      margin-left: 12px;
+      margin-right: 12px;
+    }
+  }
+
+  .address {
+    display: inline-block;
+    font-size: 24px;
+    font-weight: 400;
+    color: #999999;
+  }
+
+  .price {
+    font-size: 30px;
+    font-weight: 600;
+    color: #F65200;
+    margin: 28px 0 22px 24px;
+  }
+}
+
+.weather {
+  margin-top: 24px;
+  padding: 24px 0 32px 0;
+  background-color: #FFF;
+  border-radius: 16px;
+
+  .dev {
+    display: flex;
+
+    .title {
+      display: inline-block;
+      font-size: 36px;
+      font-weight: 600;
+      color: #0B0D0E;
+      margin: 0 400px 28px 22px;
+    }
+
+    .address {
+      display: flex;
+      font-size: 24px;
+      font-weight: 500;
+      color: #999999;
+
+      &::before {
+        content: '';
+        display: inline-block;
+        width: 32px;
+        height: 32px;
+        background: url(./assets/img/address.png) no-repeat;
+        background-size: 100% auto;
+      }
+    }
+  }
+
+  .today {
+    padding: 40px 0 38px 40px;
+    border-top: 1px solid #EEEEEE;
+    border-bottom: 1px solid #EEEEEE;
+    display: flex;
+    font-family: PingFangSC-Medium, PingFang SC;
+
+    .temp_curr {
+      display: inline-block;
+      font-size: 120px;
+      font-family: AvenirNext-DemiBold, AvenirNext;
+      font-weight: 600;
+      color: #333333;
+    }
+
+    .todaydate {
+      display: flex;
+      flex-wrap: wrap;
+
+      .du {
+        width: 100%;
+        margin-left: 20px;
+        margin-top: 20px;
+        font-size: 48px;
+        font-family: AvenirNext-Medium, AvenirNext;
+        font-weight: 500;
+        color: #333333;
+      }
+
+      .sun {
+        margin-left: 35px;
+        font-size: 36px;
+        font-weight: 500;
+        color: #333333;
+      }
+
+      .date {
+        margin-top: 8px;
+        margin-left: 22px;
+        font-size: 28px;
+        font-weight: 500;
+        color: #333333;
+      }
+
+      .temparea {
+        margin-top: 8px;
+        margin-left: 12px;
+        font-size: 28px;
+        font-weight: 500;
+        color: #333333;
+        line-height: 40px;
+      }
+    }
+  }
+
+  .futuretitle {
+    width: 526px;
+    height: 60px;
+    background: #F0F1F2;
+    border-radius: 30px;
+    margin: 30px 0 16px 88px;
+    text-align: center;
+    font-size: 26px;
+    font-weight: 600;
+    color: #6C6D71;
+    line-height: 60px;
+  }
+
+  .futurediv {
+    padding: 40px 54px 0 40px;
+    display: flex;
+    position: relative;
+
+    .data {
+      font-size: 26px;
+      font-weight: 500;
+      color: #333333;
+      margin-right: 136px;
+    }
+
+    .wea {
+      font-size: 26px;
+      font-weight: 500;
+      color: #333333;
+    }
+
+    .weabefore {
+      content: '';
+      display: inline-block;
+      width: 36px;
+      height: 36px;
+      margin-right: 20px;
+      background-size: 100% auto;
+    }
+
+    .temp {
+      font-size: 26px;
+      font-weight: 500;
+      color: #333333;
+      position: absolute;
+      top: 40px;
+      right: 54px;
+    }
+  }
+}
+
+.qing {
+  background: url(./assets/img/weather/qing.png) no-repeat;
+}
+
+.duoyun {
+  background: url(./assets/img/weather/duoyun.png) no-repeat;
+}
+
+.yin {
+  background: url(./assets/img/weather/yin.png) no-repeat;
+}
+
+.yu {
+  background: url(./assets/img/weather/yu.png) no-repeat;
+}
+
+.leizhenyu {
+  background: url(./assets/img/weather/leizhenyu.png) no-repeat;
+}
+
+.xue {
+  background: url(./assets/img/weather/xue.png) no-repeat;
+}
+
+.wu {
+  background: url(./assets/img/weather/wu.png) no-repeat;
+}
+
+.shachenbao {
+  background: url(./assets/img/weather/shachenbao.png) no-repeat;
+}
+>>>>>>> d491bd1309c23edd3d4728c6f1762c10b7e506f7:app.less

src/app.less

@@ -1,439 +0,0 @@
-// @import '~taro-ui/dist/style/index.less';
-
-view {
-  box-sizing: border-box;
-}
-
-.tab {
-  display: flex;
-  flex: 1;
-  background-color: #FFFFFF;
-  position: relative;
-  transform: all 1.1s ease;
-
-  .tablist {
-    width: 50%;
-    height: 84px;
-    font-size: 34px;
-    font-family: PingFangSC-Semibold, PingFang SC;
-    font-weight: 400;
-    color: #E03326;
-    line-height: 84px;
-    text-align: center;
-  }
-
-  .tablistfan {
-    width: 50%;
-    height: 84px;
-    font-size: 34px;
-    font-family: PingFangSC-Semibold, PingFang SC;
-    font-weight: 400;
-    color: #333333;
-    line-height: 84px;
-    text-align: center;
-  }
-
-  .tabhua1 {
-    width: 136px;
-    height: 4px;
-    position: absolute;
-    top: 80px;
-    left: 118px;
-    background-color: #E03326;
-  }
-
-  .tabhua2 {
-    width: 136px;
-    height: 4px;
-    position: absolute;
-    top: 80px;
-    left: 500px;
-    background-color: #E03326;
-  }
-}
-
-.recall {
-  background-color: #FFF4EF;
-  height: 72px;
-  padding-top: 20px;
-
-  View {
-    height: 32px;
-    font-size: 28px;
-    font-family: PingFangSC-Regular, PingFang SC;
-    font-weight: 400;
-    color: #111111;
-    display: flex;
-
-    &::before {
-      content: '';
-      display: inline-block;
-      height: 32px;
-      width: 32px;
-      margin-left: 24px;
-      margin-right: 32px;
-      background: url(assets/img/recall.png) no-repeat;
-      background-size: 100% auto;
-    }
-  }
-}
-
-.promessage {
-  width: 100%;
-  border-radius: 16px;
-  margin-top: 24px;
-  background-color: #FFFFFF;
-
-
-  .messtitle {
-    margin-left: 24px;
-    display: inline-block;
-    width: 156px;
-    padding-top: 24px;
-    font-size: 36px;
-    font-weight: 600;
-    color: #333333;
-  }
-
-  .small1 {
-    display: inline-block;
-    margin-left: 8px;
-    font-size: 26px;
-    font-weight: 400;
-    color: #999999;
-  }
-
-  .small2 {
-    display: inline-block;
-    font-size: 26px;
-    font-weight: 400;
-    color: #F24724;
-  }
-
-  .messdiv {
-    height: 95px;
-    border-bottom: solid 1px #ececec;
-    padding-left: 0;
-    position: relative;
-
-    .mess1 {
-      padding-left: 24px;
-      padding-top: 28px;
-      font-size: 30px;
-      font-weight: 400;
-      color: #333333;
-    }
-
-    .mess2 {
-
-      font-size: 30px;
-      font-weight: 400;
-      color: #999999;
-      position: absolute;
-      top: 28px;
-      right: 22px;
-    }
-
-    .iconpic {
-      width: 112px;
-      height: 96px;
-      position: absolute;
-      top: 0px;
-      right: 22px;
-      background: url(./assets/img/iconlogo.png) no-repeat;
-      background-size: 100% auto;
-    }
-
-    .icon2 {
-      width: 50px;
-      height: 50px;
-      position: absolute;
-      top: 20px;
-      right: 20px;
-      background: url(assets/img/right.png) no-repeat;
-      background-size: 100% auto;
-    }
-  }
-}
-
-.videodiv {
-  border-radius: 16px;
-  background-color: #FFFFFF;
-  margin-top: 28px;
-  padding: 28px 24px 32px 24px;
-
-  .title {
-    font-size: 36px;
-    font-weight: 600;
-    color: #333333;
-  }
-
-  .video {
-    height: 368px;
-    background-color: #333333;
-    margin-top: 24px;
-  }
-}
-
-.but {
-  height: 98px;
-  width: 702px;
-  text-align: center;
-  line-height: 98px;
-  background: #E03326;
-  border-radius: 12px;
-  margin: 40px 24px 432px 24px;
-  font-size: 36px;
-  font-weight: 400;
-  color: #FFFFFF;
-}
-
-.advicetitle {
-  font-size: 36px;
-  font-weight: 500;
-  color: #333333;
-  padding: 24px 0 32px 20px;
-}
-
-.thingdiv {
-  width: 343px;
-  background: #FFFFFF;
-  border-radius: 16px;
-  display: inline-block;
-  margin-bottom: 24px;
-
-  .pic {
-    height: 240px;
-    background-color: #ececec;
-    border-radius: 16px 16px 0 0;
-  }
-
-  .title {
-    margin: 16px 24px 14px 24px;
-    width: 295px;
-    height: 84px;
-    font-size: 30px;
-    font-weight: 500;
-    color: #333333;
-    text-overflow: -o-ellipsis-lastline;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    display: -webkit-box;
-    -webkit-line-clamp: 2;
-    -webkit-box-orient: vertical;
-  }
-
-  .has {
-    font-size: 24px;
-    font-weight: 400;
-    color: #999999;
-    display: inline-block;
-
-    &::before {
-      content: '';
-      display: inline-block;
-      width: 22.32px;
-      height: 23.26px;
-      background: url(./assets/img/renzheng.png) no-repeat;
-      background-size: 100% auto;
-      margin-left: 24px;
-      margin-right: 10px;
-    }
-
-    &::after {
-      content: '';
-      display: inline-block;
-      width: 1px;
-      height: 24px;
-      background: #E5E5E5;
-      margin-left: 12px;
-      margin-right: 12px;
-    }
-  }
-
-  .address {
-    display: inline-block;
-    font-size: 24px;
-    font-weight: 400;
-    color: #999999;
-  }
-
-  .price {
-    font-size: 30px;
-    font-weight: 600;
-    color: #F65200;
-    margin: 28px 0 22px 24px;
-  }
-}
-
-.weather {
-  margin-top: 24px;
-  padding: 24px 0 32px 0;
-  background-color: #FFF;
-  border-radius: 16px;
-
-  .dev {
-    display: flex;
-
-    .title {
-      display: inline-block;
-      font-size: 36px;
-      font-weight: 600;
-      color: #0B0D0E;
-      margin: 0 400px 28px 22px;
-    }
-
-    .address {
-      display: flex;
-      font-size: 24px;
-      font-weight: 500;
-      color: #999999;
-
-      &::before {
-        content: '';
-        display: inline-block;
-        width: 32px;
-        height: 32px;
-        background: url(./assets/img/address.png) no-repeat;
-        background-size: 100% auto;
-      }
-    }
-  }
-
-  .today {
-    padding: 40px 0 38px 40px;
-    border-top: 1px solid #EEEEEE;
-    border-bottom: 1px solid #EEEEEE;
-    display: flex;
-    font-family: PingFangSC-Medium, PingFang SC;
-
-    .temp_curr {
-      display: inline-block;
-      font-size: 120px;
-      font-family: AvenirNext-DemiBold, AvenirNext;
-      font-weight: 600;
-      color: #333333;
-    }
-
-    .todaydate {
-      display: flex;
-      flex-wrap: wrap;
-
-      .du {
-        width: 100%;
-        margin-left: 20px;
-        margin-top: 20px;
-        font-size: 48px;
-        font-family: AvenirNext-Medium, AvenirNext;
-        font-weight: 500;
-        color: #333333;
-      }
-
-      .sun {
-        margin-left: 35px;
-        font-size: 36px;
-        font-weight: 500;
-        color: #333333;
-      }
-
-      .date {
-        margin-top: 8px;
-        margin-left: 22px;
-        font-size: 28px;
-        font-weight: 500;
-        color: #333333;
-      }
-
-      .temparea {
-        margin-top: 8px;
-        margin-left: 12px;
-        font-size: 28px;
-        font-weight: 500;
-        color: #333333;
-        line-height: 40px;
-      }
-    }
-  }
-
-  .futuretitle {
-    width: 526px;
-    height: 60px;
-    background: #F0F1F2;
-    border-radius: 30px;
-    margin: 30px 0 16px 88px;
-    text-align: center;
-    font-size: 26px;
-    font-weight: 600;
-    color: #6C6D71;
-    line-height: 60px;
-  }
-
-  .futurediv {
-    padding: 40px 54px 0 40px;
-    display: flex;
-    position: relative;
-
-    .data {
-      font-size: 26px;
-      font-weight: 500;
-      color: #333333;
-      margin-right: 136px;
-    }
-
-    .wea {
-      font-size: 26px;
-      font-weight: 500;
-      color: #333333;
-    }
-
-    .weabefore {
-      content: '';
-      display: inline-block;
-      width: 36px;
-      height: 36px;
-      margin-right: 20px;
-      background-size: 100% auto;
-    }
-
-    .temp {
-      font-size: 26px;
-      font-weight: 500;
-      color: #333333;
-      position: absolute;
-      top: 40px;
-      right: 54px;
-    }
-  }
-}
-
-.qing {
-  background: url(./assets/img/weather/qing.png) no-repeat;
-}
-
-.duoyun {
-  background: url(./assets/img/weather/duoyun.png) no-repeat;
-}
-
-.yin {
-  background: url(./assets/img/weather/yin.png) no-repeat;
-}
-
-.yu {
-  background: url(./assets/img/weather/yu.png) no-repeat;
-}
-
-.leizhenyu {
-  background: url(./assets/img/weather/leizhenyu.png) no-repeat;
-}
-
-.xue {
-  background: url(./assets/img/weather/xue.png) no-repeat;
-}
-
-.wu {
-  background: url(./assets/img/weather/wu.png) no-repeat;
-}
-
-.shachenbao {
-  background: url(./assets/img/weather/shachenbao.png) no-repeat;
-}