Merge branch 'develop' of git.yoho.cn:fe/yohoblk-wap into develop

@@ -133,7 +133,6 @@
     .exchange-details {
     .exchange-details {
         margin-top: 20px;
         margin-top: 20px;
         border-top: 1px solid #eee;
         border-top: 1px solid #eee;
-        border-bottom: 1px solid #eee;
 
 
         h2 {
         h2 {
             height: 88px;
             height: 88px;
@@ -151,7 +150,6 @@
     }
     }
 
 
     .exchange-product {
     .exchange-product {
-        border-top: 1px solid #eee;
         border-bottom: 1px solid #eee;
         border-bottom: 1px solid #eee;
 
 
         .goods-info {
         .goods-info {
@@ -260,7 +258,6 @@
         position: relative;
         position: relative;
         padding-top: 20px;
         padding-top: 20px;
         margin-bottom: 20px;
         margin-bottom: 20px;
-        border-top: 1px solid #eee;
         word-wrap: break-word;
         word-wrap: break-word;
 
 
         p:first-of-type {
         p:first-of-type {
@@ -289,7 +286,6 @@
         line-height: 88px;
         line-height: 88px;
         font-size: 34px;
         font-size: 34px;
         border-top: 1px solid #eee;
         border-top: 1px solid #eee;
-        border-bottom: 1px solid #eee;
 
 
         .amount-modeinfo {
         .amount-modeinfo {
             span {
             span {
@@ -302,10 +298,15 @@
             background: #f6f6f6;
             background: #f6f6f6;
             display: block;
             display: block;
             font-size: 26px;
             font-size: 26px;
+            margin: 0 -30px;
+            padding-left: 30px;
+            height: 44px;
+            line-height: 44px;
         }
         }
 
 
         .primary {
         .primary {
             display: block;
             display: block;
+            border-bottom: 1px solid #eee;
 
 
             .right {
             .right {
                 float: right;
                 float: right;

@@ -120,6 +120,8 @@
                         }
                         }
                     } else if (result.code !== 500) {
                     } else if (result.code !== 500) {
                         tip(result.message);
                         tip(result.message);
+                    } else {
+                        tip('数据获取失败');
                     }
                     }
                 }).fail(() => {
                 }).fail(() => {
                     tip('网络错误');
                     tip('网络错误');

 <template>
 <template>
+    <template v-if="show">
         <div class="status-desc">
         <div class="status-desc">
             <p>{{detail.statusName}}</p>
             <p>{{detail.statusName}}</p>
             <p>申请时间: {{detail.createTime}}</p>
             <p>申请时间: {{detail.createTime}}</p>
@@ -102,6 +103,7 @@
         <div v-if="detail.canCancel ==='Y'" class="exchange-options">
         <div v-if="detail.canCancel ==='Y'" class="exchange-options">
             <button @click="cancel">取消申请</button>
             <button @click="cancel">取消申请</button>
         </div>
         </div>
+    </template>
 </template>
 </template>
 
 
 <script>
 <script>
@@ -117,6 +119,7 @@
         data() {
         data() {
             return {
             return {
                 id: '',
                 id: '',
+                show: false,
                 sourceOrderCode: '',
                 sourceOrderCode: '',
                 detail: {}
                 detail: {}
             };
             };
@@ -161,7 +164,8 @@
                     type: this.type
                     type: this.type
                 }
                 }
             }).then(res => {
             }).then(res => {
-                if (res.data) {
+                if (res.code === 200) {
+                    this.show = true;
                     this.detail = res.data;
                     this.detail = res.data;
                     if (!this.detail.goodsList) {
                     if (!this.detail.goodsList) {
                         return;
                         return;
@@ -174,8 +178,14 @@
                         //     return util.getImgHost(p) + '?imageView2/2/w/154/h/154';
                         //     return util.getImgHost(p) + '?imageView2/2/w/154/h/154';
                         // })
                         // })
                     });
                     });
+                } else if (result.code !== 500) {
+                    tip(result.message);
+                } else {
+                    tip('数据获取失败');
                 }
                 }
-            });
+            }).fail(() => {
+                tip('网络错误');
+            });;
         }
         }
     };
     };
 </script>
 </script>