Merge branch 'dev'

src/components/logistics.vue

 <template>
   <div>
 
-    <h1 class="logistics-title">我的快递</h1>
-
-    <ol class="logistics-list">
-      <li class="item" v-for="item in list">
-        <div class="item-header">
-          <h2>{{item.goods_title}}</h2>
-        </div>
-        <div class="item-content">
-          <div class="dl">
-            <div class="dt">收件地址：</div>
-            <div class="dd">{{item.receive_address}}</div>
+    <div class="no-result" v-if="!list.length">
+      <p>
+        暂无物流信息
+        <br>
+        <span class="link" @click="goIndex">返回首页</span>
+      </p>
+    </div>
+
+    <div v-else-if="list.length && list[0] != 0">
+      <h1 class="logistics-title">我的快递</h1>
+
+      <ol class="logistics-list">
+
+        <li class="item" v-for="item in list">
+          <div class="item-header">
+            <h2>{{item.goods_title}}</h2>
           </div>
-          <div class="dl">
-            <div class="dt">物流信息：</div>
-            <div class="dd" style="color: #666666">
-              <template v-if="item.status == 0">
-                待发货
-              </template>
-              <template v-if="item.status == 1">
-                {{item.express_name}} <span class="link" @click="search(item.express_no)">{{item.express_no}}</span>
-              </template>
+          <div class="item-content">
+            <div class="dl">
+              <div class="dt">收件地址：</div>
+              <div class="dd">{{item.receive_address}}</div>
+            </div>
+            <div class="dl">
+              <div class="dt">物流信息：</div>
+              <div class="dd" style="color: #666666">
+                <template v-if="item.status == 0">
+                  待发货
+                </template>
+                <template v-if="item.status == 1">
+                  {{item.express_name}} <span class="link" @click="search(item.express_no)">{{item.express_no}}</span>
+                </template>
+              </div>
             </div>
           </div>
-        </div>
-      </li>
+        </li>
 
-    </ol>
+      </ol>
+    </div>
 
   </div>
 </template>
@@ -41,7 +52,7 @@
     name: "order",
     data() {
       return {
-        list: [],
+        list: [0],
       }
     },
     filters: {
@@ -56,6 +67,10 @@
         // window.location='https://m.baidu.com/from=1013755s/s?word=806454448534420146&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=快递单号查询'
       },
 
+      goIndex() {
+        window.location = window.location.origin
+      },
+
       initPage() {
         Toast.loading({
           mask: false,
@@ -73,6 +88,24 @@
 <style lang="less">
   @import "../util/public";
 
+  .no-result {
+    height: 95vh;
+    line-height: 40px;
+    color: #999;
+    font-size: 16*@toVw;
+    text-align: center;
+    display: flex;
+    p {
+      align-items: center;
+      justify-content: center;
+    }
+    .link {
+      font-size: 14*@toVw;
+      color: #40A9FF;
+      text-decoration: underline;
+    }
+  }
+
   .logistics-title {
     padding: 14*@toVw 15*@toVw 10*@toVw;
     height:21*@toVw;
@@ -85,12 +118,14 @@
 
   .logistics-list {
     padding: 0 15*@toVw;
+
     .item {
       margin-bottom: 10*@toVw;
       padding: 15*@toVw;
       background:rgba(255,255,255,1);
       box-shadow:0*@toVw 2*@toVw 6*@toVw 0*@toVw rgba(0,0,0,0.15);
       border-radius:18*@toVw;
+
       .item-header {
         padding-bottom: 10*@toVw;
         //border-bottom: solid 1*@toVw #E2E2E2;