liwei

src/components/mine/address.vue

@@ -100,32 +100,23 @@
       <p>(最新地址修改时间：{{addressInfo.updated_at}})</p>
       <p>*若要修改收货地址，请联系您的专属班主任老师</p>
     </div>
-  </div>
+  </div>-->
 </template>
 
 <script>
 import line from "../../assets/activity/img_line@2x.png";
-<<<<<<< HEAD
 import { shopSuccess } from "../../util/imgUrl";
 import { getNewestAddressListAPi } from "../../service/api";
 import { Toast } from "vant";
-=======
-import {shopSuccess} from "../../util/imgUrl";
-import { getUserAdressApi } from "../../service/api";
->>>>>>> 7ab9cb1cc6438a4fca30e9893ff5ce827035e230
 export default {
   name: "Address",
   components: {},
   data() {
     return {
       line: line,
-<<<<<<< HEAD
       addressInfo: null,
       noDeliverDetail: null, //下期收货地址
       deliverDetail: null //本期收货地址
-=======
-      addressInfo: {}
->>>>>>> 7ab9cb1cc6438a4fca30e9893ff5ce827035e230
     };
   },
   mounted() {
@@ -133,7 +124,6 @@ export default {
   },
   methods: {
     initPage() {
-<<<<<<< HEAD
       getNewestAddressListAPi()
         .then(res => {
           // this.starNum = res.last_value
@@ -165,12 +155,14 @@ export default {
       this.$router.push({
         name: "addressModify",
         params: { data: JSON.stringify(this.noDeliverDetail) }
-=======
-      getUserAdressApi().then(res => {
-        // this.starNum = res.last_value
-        this.addressInfo = res;
->>>>>>> 7ab9cb1cc6438a4fca30e9893ff5ce827035e230
       });
+    },
+    search(index) {
+      let express_no =
+        index == 1
+          ? this.deliverDetail.express_no
+          : this.noDeliverDetail.express_no;
+      window.location = `https://m.baidu.com/from=1013755s/s?word=${express_no}&sa=tb&ts=2790568&t_kt=0&ie=utf-8&rsv_t=cbe2F%252FT5T3MIzkRl%252Fg8ZUw%252FEPHZmn2wHIrB8cLvgNlEKyyDqUNPrTyDEEDjkAb8&rsv_pq=11793168499026332712&ss=110000000001&tj=1&rqlang=zh&rsv_sug4=4111&inputT=3178&oq=快递单号查询`;
     }
   }
 };
@@ -178,11 +170,44 @@ export default {
 
 <style scoped lang="less">
 @import "../../util/public";
+@import "../../util/public";
 .address2 {
   background: #f5f5f9;
+  .van-button {
+    margin-left: 20 * @toVw;
+  }
+  .head {
+    i {
+      display: inline-block;
+      border-radius: 50%;
+      width: 11 * @toVw;
+      height: 11 * @toVw;
+    }
+    padding: 13 * @toVw;
+    background: white;
+    border-bottom: 1px solid #e2e2e2;
+    color: #666666;
+    font-size: 14 * @toVw;
+  }
+  .Invalid {
+    color: #cccccc;
+  }
+  .now {
+    i {
+      background: #60adf0;
+    }
+  }
+  .item {
+    margin-top: 10px;
+  }
+  .next {
+    i {
+      background: #ffd454;
+    }
+  }
   .content {
     background: white;
-    padding: 10 * @toVw 20 * @toVw;
+    padding: 13 * @toVw 0 13 * @toVw 26 * @toVw;
     .top {
       line-height: 28 * @toVw;
       color: #333333;
@@ -194,13 +219,34 @@ export default {
       font-size: 14 * @toVw;
       line-height: 20 * @toVw;
     }
+    .timeInfo {
+      display: flex;
+      .text {
+        color: #999999;
+        font-size: 12 * @toVw;
+        margin-left: 0;
+        line-height: 26 * @toVw;
+      }
+      .right {
+        margin-top: 43 * @toVw;
+      }
+      .van-button--info {
+        background: white;
+        width: 74 * @toVw;
+        color: #60adf0;
+        border-color: #60adf0;
+      }
+    }
   }
-  .linebox{
+  .linebox {
     background: white;
   }
   .line {
     width: 100%;
     display: block;
+    border-bottom: 1px solid #e2e2e2;
+    margin: 12 * @toVw 0;
+    -webkit-transform: scale(1, 0.5);
   }
   .tip {
     padding: 10 * @toVw 20 * @toVw;