71

src/components/mine/address.vue

 <template>
   <div class="address2">
-    <div class="item" v-if="deliverDetail||addressInfo">
-      <div class="head next">
-        <i style="background:#60ADF0"></i>
-        本期收货地址
-        <!-- <span class="fl-r" @click="goEdit" v-if="deliverDetail.flag">
-          <span class="iconfont icon-icon_edit"></span> 修改
-        </span>
-        <span class="fl-r Invalid" v-if="!deliverDetail.flag">
-          <span class="iconfont icon-icon_edit"></span> 修改
-        </span>-->
-      </div>
-      <div class="content" v-if="deliverDetail">
-        <div class="top">
-          <span>{{deliverDetail.receive_name}}</span>
-          <span>{{deliverDetail.receive_mobile}}</span>
-        </div>
-        <div
-          class="bottom"
-        >{{deliverDetail.province_name}} {{deliverDetail.city}}{{deliverDetail.area}}{{deliverDetail.address}}</div>
-        <div class="line"></div>
-        <div class="timeInfo">
-          <div class="text">
-            <p>地址修改时间：{{deliverDetail.updated_at}}</p>
-            <p v-if="deliverDetail.express_no">发货时间：{{deliverDetail.deliver_at}}</p>
-            <div v-if="deliverDetail.express_no">
-              物流信息：{{deliverDetail.express_name}} {{deliverDetail.express_no}}
-              <van-button round size="small" @click="search(1)" type="info">查看物流</van-button>
-            </div>
-            <div v-if="!deliverDetail.express_no">物流信息：- -</div>
-          </div>
-        </div>
-      </div>
-      <div class="content" v-if="addressInfo">
-        <div class="top">
-          <span>{{addressInfo.receive_name}}</span>
-          <span>{{addressInfo.receive_mobile}}</span>
-        </div>
-        <div
-          class="bottom"
-        >{{addressInfo.province_name}} {{addressInfo.city_name}}{{addressInfo.area_name}}{{addressInfo.address}}</div>
-        <div class="line"></div>
-      </div>
-    </div>
-    <div class="item" v-if="noDeliverDetail">
-      <div class="head next">
-        <i style="background:#FFD454"></i>
-        下期收货地址
-        <span class="fl-r" @click="goEdit" v-if="noDeliverDetail.flag">
-          <span class="iconfont icon-icon_edit"></span> 修改
-        </span>
-        <span class="fl-r Invalid" v-if="!noDeliverDetail.flag">
-          <span class="iconfont icon-icon_edit"></span> 修改
-        </span>
-      </div>
-      <div class="content">
-        <div class="top">
-          <span>{{noDeliverDetail.receive_name}}</span>
-          <span>{{noDeliverDetail.receive_mobile}}</span>
-        </div>
-        <div
-          class="bottom"
-        >{{noDeliverDetail.province_name}} {{noDeliverDetail.city_name}}{{noDeliverDetail.area_name}}{{noDeliverDetail.address}}</div>
-        <div class="line"></div>
-        <div class="timeInfo">
-          <div class="text">
-            <p>地址修改时间：{{noDeliverDetail.updated_at}}</p>
-            <p v-if="!noDeliverDetail.express_no">预计发货时间：{{noDeliverDetail.deliver_start_at}}</p>
-            <div v-if="noDeliverDetail.express_no">
-              物流信息：{{noDeliverDetail.express_name}} {{noDeliverDetail.express_no}}
-              <van-button round size="small" @click="search(2)" type="info">查看物流</van-button>
-            </div>
-            <div v-if="!noDeliverDetail.express_no">物流信息：- -</div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div class="tip" v-if="deliverDetail || noDeliverDetail">
-      <p>*预计发货前24小时不可修改地址，若有需要请联系您的专属班主任老师</p>
-    </div>
-    <div
-      class
-      v-if="!deliverDetail && !noDeliverDetail"
-      style="text-align: center;padding-top: 20vh;font-size: 5vw;"
-    >暂无数据</div>
-  </div>
-  <!-- <div class="address2">
     <div class="content">
       <div class="top">
         <span>{{addressInfo.receive_name}}</span>
@@ -105,27 +19,15 @@
 
 <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,43 +35,9 @@ export default {
   },
   methods: {
     initPage() {
-<<<<<<< HEAD
-      getNewestAddressListAPi()
-        .then(res => {
-          // this.starNum = res.last_value
-          // res = {
-          //   code: 505,
-          //   msg: "该用户没有物流信息"
-          // };
-          if (res) {
-            if (res.code == 505) {
-              if (res.data) {
-                this.addressInfo = res.data;
-              }
-            } else {
-              if (res.deliver_detail && res.deliver_detail.length > 0) {
-                this.deliverDetail = res.deliver_detail[0];
-                console.log(this.deliverDetail);
-              }
-              if (res.no_deliver_detail && res.no_deliver_detail.length > 0) {
-                this.noDeliverDetail = res.no_deliver_detail[0];
-              }
-            }
-          }
-        })
-        .catch(error => {
-          console.log(error);
-        });
-    },
-    goEdit() {
-      this.$router.push({
-        name: "addressModify",
-        params: { data: JSON.stringify(this.noDeliverDetail) }
-=======
       getUserAdressApi().then(res => {
         // this.starNum = res.last_value
         this.addressInfo = res;
->>>>>>> 7ab9cb1cc6438a4fca30e9893ff5ce827035e230
       });
     }
   }