修改bug

src/pages/youxuan/good.vue

@@ -50,17 +50,56 @@
                                         </div>
                                     </div>
                                 </div>
-                                <div class="des">
-                                    <span>说明：</span>
-                                    {{ activity.description }}
+                                <div class="des" v-if="activity.description">
+                                    <span class="key">说明：</span>
+                                    <span
+                                        class="val"
+                                        @click="
+                                            showContent(
+                                                '说明',
+                                                activity.description
+                                            )
+                                        "
+                                        >{{ activity.description }}</span
+                                    >
+                                    <my-image
+                                        class="arrow"
+                                        src="/static/common/arrows_left.png"
+                                    ></my-image>
                                 </div>
-                                <div class="des">
-                                    <span>发货：</span
-                                    >{{ activity.deliveryDesc }}
+                                <div class="des" v-if="activity.deliveryDesc">
+                                    <span class="key">发货：</span
+                                    ><span
+                                        class="val"
+                                        @click="
+                                            showContent(
+                                                '发货',
+                                                activity.deliveryDesc
+                                            )
+                                        "
+                                        >{{ activity.deliveryDesc }}</span
+                                    ><my-image
+                                        class="arrow"
+                                        src="/static/common/arrows_left.png"
+                                    ></my-image>
                                 </div>
-                                <div class="des">
-                                    <span>服务：</span>
-                                    退换无忧，支持7天无理由退换
+                                <div class="des" v-if="activity.service">
+                                    <span class="key">服务：</span>
+                                    <span
+                                        class="val"
+                                        @click="
+                                            showContent(
+                                                '服务',
+                                                activity.service
+                                            )
+                                        "
+                                    >
+                                        {{ activity.service }}</span
+                                    >
+                                    <my-image
+                                        class="arrow"
+                                        src="/static/common/arrows_left.png"
+                                    ></my-image>
                                 </div>
                                 <div class="a-btns">
                                     <span @click="setActivityTop(activity)">
@@ -173,7 +212,10 @@
                                     </div>
 
                                     <div class="btns">
-                                        <div class="btn" @click="sharePoster(item)">
+                                        <div
+                                            class="btn"
+                                            @click="sharePoster(item)"
+                                        >
                                             {{
                                                 item.shareLoading
                                                     ? "生成中"
@@ -226,6 +268,7 @@
             </div>
         </div>
 
+        <!-- 海报 -->
         <div
             class="canvas"
             v-show="canvasShow"
@@ -248,6 +291,14 @@
                 ></canvas>
             </div>
         </div>
+        <!-- 描述 -->
+        <div class="des-modal" v-if="desModalVisible">
+            <div class="bg"></div>
+            <div class="head">
+                <span class="head-tit">{{desModalTitle}}</span>
+                <div class="head-r" >关闭</div>
+            </div>
+        </div>
     </div>
 </template>
 
@@ -274,6 +325,11 @@ export default {
             shareGood: {},
             shareRootLoading: false,
             shareLoadList: [],
+
+            // 文字弹框
+            desModalVisible:false,
+            desModalTitle:'',
+            desModalDes:''
         };
     },
     filters: {
@@ -378,8 +434,8 @@ export default {
             });
             this.api.get("/Yx/GetProductList", sendData).then((res) => {
                 uni.hideLoading();
-                // this.goodList = res.data;
-                this.goodList = res.data.item2;
+                this.goodList = res.data;
+                // this.goodList = res.data.item2;
                 if (!res.data.length) {
                     this.dataEnd = true;
                 }
@@ -720,7 +776,7 @@ export default {
                                 path: "pages/recommend/detail",
                                 paremeters: JSON.stringify({
                                     goodsId: self.shareGood.pid,
-                                    shopId:this.shopId
+                                    shopId: this.shopId,
                                 }),
                             })
                             .then((res) => {
@@ -810,8 +866,7 @@ export default {
                         }
 
                         // 商品描述，第一行
-                        let descName =
-                            self.shareGood.description || "";
+                        let descName = self.shareGood.description || "";
 
                         if (descName.length > 14) {
                             descName = descName.substr(0, 14);
@@ -822,8 +877,7 @@ export default {
                         ctx.stroke();
 
                         // 商品描述，第二行
-                        let descName2 =
-                            self.shareGood.description || "";
+                        let descName2 = self.shareGood.description || "";
                         if (descName2.length > 14) {
                             descName2 = descName2.substr(14, 14) + "...";
 
@@ -935,7 +989,7 @@ export default {
                                 path: "pages/goods/detail",
                                 paremeters: JSON.stringify({
                                     goodsId: self.shareGood.pid,
-                                    shopId:this.shopId
+                                    shopId: this.shopId,
                                 }),
                             })
                             .then((res) => {
@@ -1067,10 +1121,7 @@ export default {
                                         self.shareEnd();
                                         self.fn.openSetting();
                                     } else {
-                                        self.shareLoading(
-                                            good.pid,
-                                            false
-                                        );
+                                        self.shareLoading(good.pid, false);
                                     }
                                 });
                         } else {
@@ -1080,10 +1131,7 @@ export default {
                                 uni.saveImageToPhotosAlbum({
                                     filePath: res,
                                     success: function () {
-                                        self.shareLoading(
-                                            good.pid,
-                                            false
-                                        );
+                                        self.shareLoading(good.pid, false);
                                         self.shareEnd();
                                         self.fn.showToast("海报保存成功");
                                     },
@@ -1165,6 +1213,8 @@ export default {
                 this.sharePoster(val);
             }
         },
+
+        showContent(tit, con) {},
     },
 
     // 数据计算
@@ -1850,9 +1900,35 @@ page {
         margin-top: px(30);
         font-size: px(40);
         line-height: 1.5;
+        color: #888;
+        display: flex;
+        align-items: flex-start;
+        justify-content: space-between;
+        line-height: px(60);
+
         & ~ .des {
             margin-top: px(10);
         }
+        .key {
+            color: #333;
+            width: px(130);
+            flex-shrink: 0;
+        }
+        .val {
+            width: 100%;
+            @include omits(2);
+        }
+        .arrow {
+            width: px(40);
+            height: px(40);
+            margin-left: px(10);
+            flex-shrink: 0;
+            transform: rotate(180deg) translate(0, -3px);
+            /deep/ img {
+                width: px(40);
+                height: px(40);
+            }
+        }
     }
     .tags {
         display: flex;
@@ -1882,4 +1958,17 @@ page {
         font-size: px(40);
     }
 }
+.des-modal {
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    z-index: 100;
+    .bg {
+        width: 100%;
+        height: 100%;
+        background-color: rgba(0,0,0,0.3);
+    }
+}
 </style>