71

src/components/mine/address.vue

 <template>
   <div class="address2">
+    <div class="item" v-if="deliverDetail && isShowCurrent">
+      <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_name}}{{deliverDetail.area_name}}{{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>
+    <div class="item" v-if="noDeliverDetail && isShowNext">
+      <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="addressInfo"
+      style="text-align: center;padding-top: 20vh;font-size: 5vw;"
+    >{{addressInfo.msg}}</div>
+  </div>
+   <!-- <div class="address2">
     <div class="content">
       <div class="top">
         <span>{{addressInfo.receive_name}}</span>
@@ -14,7 +90,7 @@
       <p>(最新地址修改时间：{{addressInfo.updated_at}})</p>
       <p>*若要修改收货地址，请联系您的专属班主任老师</p>
     </div>
-  </div>
+  </div> -->
 </template>
 
 <script>
@@ -28,6 +104,8 @@ export default {
   data() {
     return {
       line: line,
+      isShowCurrent: false,
+      isShowNext: false,
       addressInfo: null,
       noDeliverDetail: null, //下期收货地址
       deliverDetail: null //本期收货地址
@@ -47,16 +125,39 @@ export default {
           // };
           if (res) {
             if (res.code == 505) {
-              if (res.data) {
-                this.addressInfo = res.data;
+              if (res.message) {
+                this.addressInfo = res;
               }
             } else {
               if (res.deliver_detail && res.deliver_detail.length > 0) {
                 this.deliverDetail = res.deliver_detail[0];
-                console.log(this.deliverDetail);
+                if (
+                  !this.deliverDetail.receive_name ||
+                  this.deliverDetail.receive_name.length === 0 ||
+                  !this.deliverDetail.receive_mobile ||
+                  this.deliverDetail.receive_mobile.length === 0 ||
+                  !this.deliverDetail.address ||
+                  this.deliverDetail.address.length === 0
+                ) {
+                  this.isShowCurrent = false;
+                } else {
+                  this.isShowCurrent = true;
+                }
               }
               if (res.no_deliver_detail && res.no_deliver_detail.length > 0) {
                 this.noDeliverDetail = res.no_deliver_detail[0];
+                if (
+                  !this.noDeliverDetail.receive_name ||
+                  this.noDeliverDetail.receive_name.length === 0 ||
+                  !this.noDeliverDetail.receive_mobile ||
+                  this.noDeliverDetail.receive_mobile.length === 0 ||
+                  !this.noDeliverDetail.address ||
+                  this.noDeliverDetail.address.length === 0
+                ) {
+                  this.isShowNext = false;
+                } else {
+                  this.isShowNext = true;
+                }
               }
             }
           }

src/components/mine/addressModify.vue

@@ -144,7 +144,7 @@ export default {
         return false;
       }
       let param = {};
-      param.deliver_id = this.deliverId;
+      // param.deliver_id = this.deliverId;
       param.receive_name = this.receiveName;
       param.receive_mobile = this.receiveMobile;
       param.address = this.address;
@@ -155,12 +155,14 @@ export default {
       param.area_id = values[2];
       param.area = labels[2];
       console.log(param);
-      modifyAddressApi(param, this.deliverId)
+      modifyAddressApi(param)
         .then(res => {
           this.closeAdd();
           Toast("修改成功");
-          this.$router.replace({
-            name: "Address"
+          this.$nextTick(() => {
+            this.$router.replace({
+              name: "Address"
+            });
           });
         })
         .catch(error => {

src/components/mine/index.vue

@@ -2,13 +2,13 @@
   <!-- <scroll class="mine" :pullup="true" :bounce="true"> -->
   <div class="mine">
     <div class="head">
-      <img class="bg" :src="image.head_bg">
+      <img class="bg" :src="image.head_bg" />
       <!-- <div class="ref-block" @click="clearBoth()">
           <img :src="image.ref">
       </div>-->
       <div class="contentBox">
         <div class="left">
-          <img class="header-icon" :src="userDetail.avatar">
+          <img class="header-icon" :src="userDetail.avatar" />
           <p class="name">{{userDetail.nickname}}</p>
         </div>
         <div class="right">
@@ -21,14 +21,14 @@
     <div class="outBox">
       <div class="list">
         <van-cell title="我的订单" ref="order" to="/order" @click="toOrder" is-link>
-          <img slot="icon" :src="image.order">
+          <img slot="icon" :src="image.order" />
         </van-cell>
         <van-cell title="我的星星" ref="star" to="/starRank" @click="toStar" is-link>
-          <img slot="icon" :src="image.mine_icon_star">
+          <img slot="icon" :src="image.mine_icon_star" />
           <!-- <div class="starNum" v-if="starNum">{{starNum}}颗</div> -->
         </van-cell>
         <van-cell title="宝宝档案" ref="bbda" to="/bbda" @click="toBbda" is-link>
-          <img slot="icon" :src="image.babyicon">
+          <img slot="icon" :src="image.babyicon" />
         </van-cell>
         <van-cell
           title="子账号"
@@ -38,7 +38,7 @@
           @click="toBbda"
           is-link
         >
-          <img slot="icon" :src="image.mine_son">
+          <img slot="icon" :src="image.mine_son" />
         </van-cell>
         <van-cell
           title="主账号"
@@ -48,28 +48,22 @@
           @click="toBbda"
           is-link
         >
-          <img slot="icon" :src="image.mine_mom">
+          <img slot="icon" :src="image.mine_mom" />
         </van-cell>
-        <van-cell
-          title="收货地址"
-          ref="address"
-          to="/address"
-          is-link
-          v-if="addressInfo&&addressInfo.receive_name"
-        >
-          <img slot="icon" :src="image.mine_address">
+        <van-cell title="收货地址" ref="address" to="/address" is-link v-if="isShowAddress">
+          <img slot="icon" :src="image.mine_address" />
         </van-cell>
       </div>
     </div>
     <div class="outBox addr" style="margin-top:10px;margin-bottom: 50px;">
       <div class="list">
         <van-cell title="清除缓存" is-link @click="clearBoth()">
-          <img slot="icon" :src="image.ref">
+          <img slot="icon" :src="image.ref" />
         </van-cell>
       </div>
     </div>
     <div class="landscape"></div>
-    <bottom-tab/>
+    <bottom-tab />
   </div>
   <!-- </scroll> -->
 </template>
@@ -80,7 +74,8 @@ import { mineImage } from "../../util/imgUrl";
 import { Cell, Toast } from "vant";
 import {
   getStarSumberApi,
-  getUserAdressApi,
+  // getUserAdressApi,
+  getNewestAddressListAPi,
   getUserDetailApi
 } from "../../service/api";
 export default {
@@ -91,6 +86,9 @@ export default {
   },
   data() {
     return {
+      isShowAddress: true,
+      noDeliverDetail: null, //下期收货地址
+      deliverDetail: null, //本期收货地址
       image: mineImage,
       userDetail: {},
       phoneNumber: "",
@@ -108,8 +106,34 @@ export default {
         this.starNum = res.last_value;
         console.log(res);
       });
-      getUserAdressApi().then(res => {
-        this.addressInfo = res;
+      // getUserAdressApi().then(res => {
+      //   this.addressInfo = res;
+      // });
+      getNewestAddressListAPi().then(res => {
+        if (res) {
+          if (res.deliver_detail && res.deliver_detail.length > 0) {
+            this.deliverDetail = res.deliver_detail;
+          }
+          if (res.no_deliver_detail && res.no_deliver_detail.length > 0) {
+            this.noDeliverDetail = res.no_deliver_detail;
+          }
+          if (!this.deliverDetail && !this.noDeliverDetail) {
+            this.isShowAddress = false;
+          }
+          if (this.deliverDetail && this.noDeliverDetail) {
+            if (
+              this.deliverDetail.express_no &&
+              this.deliverDetail.express_no.length === 0
+            ) {
+              if (
+                this.noDeliverDetail.express_no &&
+                this.noDeliverDetail.express_no.length === 0
+              ) {
+                this.isShowAddress = false;
+              }
+            }
+          }
+        }
       });
       if (this.userDetail.mobile) {
         this.phoneNumber = this.userDetail.mobile;