Merge remote-tracking branch 'origin/develop' into develop

 <template>
-  <layout-app class="address-wrapper" title="商品回寄地址">
-    <SellOrderAddress :isOnlyShowBack="true" />
+  <layout-app title="商品回寄地址">
+    <div class="address-wrapper">
+      <SellOrderAddress :isOnlyShowBack="true" />
+    </div>
   </layout-app>
 </template>
 

@@ -18,7 +18,6 @@ const routers = [
       };
     },
     beforeEnter: (to, from, next) => {
-      // ...
       next();
     },
   },

@@ -14,7 +14,7 @@ export default {
       return this.productDetail.goods_list[0].image_list;
     },
     resource() {
-      return this.productDetail.resource;
+      return this.productDetail.resource || {};
     },
     activity() {
       return this.productDetail.activity;

 <template>
   <div class="layout">
-    <LayoutHeader class="layout-header" :show-back="true" :title="'\u200E'"></LayoutHeader>
+    <LayoutHeader class="layout-header" :show-back="true" title="商品详情"></LayoutHeader>
     <div class="layout-context fixscroll">
       <LayoutScroll
         ref="pageScroll"
@@ -30,7 +30,7 @@
           </div>
           <div class="info-name"><div>{{productDetail.product_name}}</div></div>
         </div>
-        <a class="banner" v-show="resource" @click.prevent="gotoNewPage">
+        <a class="banner" v-if="resource.src" @click.prevent="gotoNewPage">
           <img-size ref="resourceImg" :src="sizeImg(resource.src)"/>
         </a>
         <div class="info">

@@ -27,7 +27,7 @@ export default {
 
     let [detail, resource, activity, recommend] = await Promise.all(queryTasks);
 
-    resource = get(resource, '[0].data[0]', null);
+    resource = get(resource, '[0].data[0]', {});
 
     commit(Types.UPDATE_PRODUCT_DETAIL, Object.assign(detail.product_info, {
       resource,