Merge branch 'master' of http://git.izouma.com/xiongzhu/9th

src/main/nine-space/src/assets/svgs/icon-fenxiang.svg

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon-fenxiang</title>
+    <g id="第九空间" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="详情-版2" transform="translate(-197.000000, -408.000000)" stroke="#939599" stroke-width="1.6">
+            <g id="编组" transform="translate(197.000000, 408.000000)">
+                <path d="M11.9719409,4.89014077 L22.1187207,11.5584606 L12.0887755,18.3731464 L11.9450872,14.5805159 C9.32761521,14.2528417 7.04144359,14.5778695 5.08106691,15.5294288 C3.35722809,16.3661736 2.51803521,17.8704694 2.01210154,19.0883893 L1.997,19.125 L1.98426161,19.0690006 C1.85809832,18.4810815 1.77894816,17.77307 1.80479927,17.0172918 L1.82247603,16.6906733 C1.91693439,15.4188329 2.3223801,14.0363028 3.33994496,12.8978399 C5.47999923,10.5035234 8.36231491,9.28894943 11.9719409,9.22479499 L11.9719409,9.22479499 L11.9719409,4.89014077 Z" id="形状结合"></path>
+            </g>
+        </g>
+    </g>
+</svg>

src/main/nine-space/src/components/Post.vue

@@ -37,7 +37,7 @@
                 <div class="tips">长按图片保存</div>
             </div>
         </van-overlay>
-        <div class="share" @click="init">
+        <div class="share" v-if="!noButton" @click="init">
             <img src="../assets/svgs/icon-share.svg" alt="" />
             <span>分享</span>
         </div>
@@ -63,6 +63,10 @@ export default {
         pageUrl: {
             type: String,
             default: 'productDetail'
+        },
+        noButton: {
+            type: Boolean,
+            default: false
         }
     },
     data() {
@@ -86,7 +90,7 @@ export default {
             }
         },
         banners() {
-            return this.getImg(this.changeImgs(this.info.pic || []));
+            return this.getImg(this.changeImgs(this.info.pic || []), '', 1500);
         }
     },
     components: {

src/main/nine-space/src/views/product/Detail.vue

@@ -25,7 +25,7 @@
         </swiper>
 
         <div class="info">
-            <div class="name" v-if="info.salable">
+            <div class="name" v-if="info.salable && startTime">
                 <div class="name1">首发抢购倒计时</div>
                 <div class="name2">{{ startTime }}</div>
             </div>
@@ -200,6 +200,9 @@ export default {
             });
         },
         appointment() {
+            if (this.info.appointment) {
+                return;
+            }
             this.$http
                 .post('/collection/appointment?id=' + this.info.id)
                 .then(res => {

src/main/nine-space/src/views/product/DetailMode.vue

@@ -49,8 +49,8 @@
                     {{ info.likes }}
                 </like-button>
 
-                <div class="share-icon">
-                    <img src="../../assets/icon-fenxiang.png" alt="" />
+                <div class="share-icon" @click="share">
+                    <img src="../../assets/svgs/icon-fenxiang.svg" alt="" />
                     <span>分享</span>
                 </div>
             </div>
@@ -117,7 +117,7 @@
                 <div class="page-text page-detail" v-html="info.detail"></div
             ></template>
         </div>
-        <div class="btn van-safe-area-bottom" v-if="info.isAppointment">
+        <!-- <div class="btn van-safe-area-bottom" v-if="info.isAppointment">
             <div class="btns">
                 <van-button @click="appointment" type="primary" block round>
                     {{ info.appointment ? '已预约' : '一键预约' }}
@@ -129,7 +129,7 @@
             <div class="btns">
                 <van-button type="primary" block round @click="buy">立即购买</van-button>
             </div>
-        </div>
+        </div> -->
 
         <!-- <driver /> -->
 
@@ -141,7 +141,7 @@
 
         <driver />
 
-        <post :info="info" />
+        <post ref="post" :info="info" noButton />
     </div>
 </template>
 
@@ -276,6 +276,9 @@ export default {
                     }
                 });
             });
+        },
+        share() {
+            this.$refs.post.init();
         }
     }
 };
@@ -555,7 +558,7 @@ export default {
     height: 100vw;
 }
 .detail {
-    padding-top: 80px;
+    padding-top: 50px;
 }
 /deep/.banner-frame {
     body {
@@ -573,7 +576,7 @@ export default {
 
 .info {
     position: relative;
-    padding-top: 60px;
+    padding: 100px 16px 10px;
     z-index: 2;
     display: flex;
     flex-direction: column;
@@ -582,7 +585,7 @@ export default {
     .share-content {
         display: flex;
         position: absolute;
-        top: -50px;
+        top: -30px;
         left: 50%;
         transform: translate(-50%, 0);
     }
@@ -629,12 +632,12 @@ export default {
                 left: 0;
             }
             &:nth-child(3) {
-                top: -1px;
-                left: -1px;
+                top: -0.8px;
+                left: 5px;
             }
             &:nth-child(4) {
                 bottom: 0.5px;
-                right: -1px;
+                right: 5px;
             }
             &:nth-child(5) {
                 bottom: 0;