Merge branch 'version_2.0.0_optimization_mall_update' of http://bj.gitlab.cnlive…

….com/w-front-end/select_good into version_2.0.0_optimization_mall_update

Merge branch 'version_2.0.0_optimization_mall_update' of http://bj.gitlab.cnlive…
….com/w-front-end/select_good into version_2.0.0_optimization_mall_update
王强
2 parents 9744d74c 8382bce0
Showing 4 changed files with 131 additions and 130 deletions
src/components/addressToast/addressToast.vue
src/pages/goodDetails/goodDetails.less
src/pages/goodDetails/goodDetails.vue
src/pages/pointsMall/pointsMall.vue
@@ -244,7 +244,7 @@ export default {
         window.location.href =
           window.location.href.split("?")[0] +
           "?uid=" +
-          this.getStore("uid")
+          this.getStore("uid") + "&goodsId=" + this.$route.query.goodsId
       }
     },
     /**
 .good-details-box{
   padding-bottom: 130px;
+  .goods-img{
+    display: block;
+    width: 100%;
+    height:750px
+  }
   .main-box{
     .title{
       font-size: 34px;
@@ -50,7 +55,6 @@
     .goods-info{
       margin: 30px;
       width: 690px;
-      height: 1653px;
       background: #FFFFFF;
       box-shadow: 0px 0px 16px 0px rgba(0, 0, 0, 0.06);
       border-radius: 24px;
@@ -18,20 +18,21 @@
         >
         </back-box>
         <!--轮播-->
-        <swiper
+        <!-- <swiper
           :style="
                 'margin-top:' +
                     ($parent.isBack && isCNLive.value ? 62 : 10) +
                     'px'
             "
-            v-if="goodsInfo && goodsInfo.simg"
+            v-if="simgList"
             :swipers="goodsInfo.simg"
             :isPointsMall= 'true'
             :options="{
                 showIndicators: true
             }"
         >
-        </swiper>
+        </swiper> -->
+        <img v-if="goodsInfo && goodsInfo.simg" class="goods-img" :src="goodsInfo.simg" alt=""/>
         <!-- 内容 -->
         <div class="main-box">
             <!-- 标题 -->
@@ -41,7 +42,7 @@
             <!-- 积分 -->
             <div class="title-t">
               <span v-if="goodsInfo && goodsInfo.prices" class="price">¥{{goodsInfo.prices}}</span>
-              <span class="integral">15000</span>
+              <span v-if="goodsInfo && goodsInfo.num" class="integral">{{goodsInfo.num}}</span>
               <span class="integral-in">积分</span>
             </div>
             <!-- 商品信息 -->
@@ -49,23 +50,27 @@
               <div class="good-title">
                 <span class="left"></span>商品详情<span class="right"></span>
               </div>
-              <div class="good-desc">
-                商品详情的文字内容的书写的的位置，商品详情的文字内容的书写的位置，商品详情的文字内容的书写的位置，商品详情的文字内容的书写的位置
+              <div v-if="goodsInfo && goodsInfo.content" :v-html="goodsInfo.content" class="good-desc">
               </div>
               <div class="good-title">
                 <span class="left"></span>兑换规则<span class="right"></span>
               </div>
               <div class="good-desc">
-                <div class="text-left">商品详情的文字内容的书写的的位置，商品详情的文字内容的书写的位置，商品详情的文字内容的书写的位置，商品详情的文字内容的书写的位置</div>
-                <div class="text-left">
-                  <span>· 正版授权</span>
-                  所售商品均已官方授权，请放心购买；
-                </div>
-                <div class="text-left">
-                  <span>· 正品保障</span>
-                  独家正品保障。
+                <div v-if="goodsInfo && goodsInfo.shop_type && goodsInfo.shop_type == 1 || goodsInfo.shop_type == 2">
+                    <div class="text-left">
+                      兑换此积分即可0元购买该商品；<br>
+                      仅限此商品使用，兑换后7天内有效；
+                    </div>
+                    <div class="text-left">
+                      <span>· 正版授权</span>
+                      所售商品均已官方授权，请放心购买；
+                    </div>
+                    <div class="text-left">
+                      <span>· 正品保障</span>
+                      独家正品保障。
+                    </div>
                 </div>
-                <div v-show="goodsInfo && goodsInfo.shop_type == 2" class="text-left">
+                <div v-if="goodsInfo && goodsInfo.shop_type && goodsInfo.shop_type == 2" class="text-left">
                   1､ 您兑换的音频内容，音频上线期间可长期收听；<br>
                   2､ 兑换后暂不支持退款，感谢您的支持；<br>
                   3､ 兑换完成后若显示异常，请10分钟之后尝试；<br>
@@ -82,8 +87,8 @@
               </div>
                <!-- 像是商品推荐 -->
               <!-- 商品样式 7 列表 -->
-              <column-list-box class="column-list-box" v-if="similarGoods && similarGoods.list && similarGoods.list.length" @jump="toDetail" 
-                  :lists="similarGoods"
+              <column-list-box class="column-list-box" v-if="goodsInfo && goodsInfo.list && goodsInfo.list.length" @jump="toDetail" 
+                  :lists="goodsInfo"
                   com="7">
               </column-list-box>
             </div>
@@ -113,8 +118,8 @@ export default {
       banner: null,
       goodsInfo: null,
       backs: null, // 后退按钮组
-      similarGoods: null, // 相似商品
       pointsToast_control: this.$route.query.pointsToast_control,
+      isExchange: false, // 是否已经兑换
     }
   },
   //部件
@@ -154,47 +159,109 @@ export default {
       })
     },
     // 兑换
-    exchange (item) {
-      // 1月3号到1月31号才能领取
-      // if (item.shop_type == 2) {
-      this.pointsToast_control = true;
-      // 礼品兑换弹框派发
-      this.$refs.itemsInfo.getItemInfo(item)
-      // } else {
-      //   // 显示查看地址弹框
-      //   let options = {
-      //     title: "奖励已过领取时间",
-      //     message: "领取时间: 2021-01-03至01-31",
-      //     messageAlign: "center",
-      //     confirmButtonText: "知道了"
-      //   };
-      //   // 调用showModal层参数
-      //   this.$set(this.$parent, "showOptions", options);
-      //   // 显示通用浮层
-      //   this.$parent.$refs.showModal.showLayer();
-
-      // }
+    exchange () {
+      // 提示用积分兑换兑换
+      let options = {
+        title: "",
+        message: "确定使用" + this.goodsInfo.num + "积分兑换?",
+        confirmButtonText: "确定",
+        confirmButtonCallback: this.callAppModalCallback,
+        showCancelButton: true,
+        cancelButtonText: "取消"
+      };
+      // 调用showModal层参数
+      this.$set(this.$parent, "showOptions", options);
+      // 显示通用浮层
+      this.$parent.$refs.showModal.showLayer();
+    },
+    // 确定兑换回调
+    callAppModalCallback () {
+      // isExchange为false才可兑换防止连续点击
+      if (!this.isExchange) {
+        // 兑换
+        this.addIntegralOrder();
+      }
     },
     /**
-     * 积分商品详情页页面接口
+   * 积分商品详情页页面接口
+   */
+    addIntegralOrder () {
+      // 加载中提示
+      Indicator.open("加载中...");
+      // 获取证书请求接口
+      this.http("/Api/" + this.getApiVersion().LuckDraw + "/addIntegralOrder", {
+        uid: this.getStore("uid"),
+        id: this.$route.query.goodsId, // 商品ID
+        num: 1
+      }, this.addIntegralOrderCallback, {
+          method: "POST"
+        });
+    },
+
+    /**
+     * 积分商品详情页页面接口回调
+     * @param {Object} res [服务器返回数据]
+     * @param {Object} ext [扩展参数]
      */
-    getGoodsInfo () {
+    addIntegralOrderCallback (res, ext) {
+
+      // 加载完成
+      Indicator.close();
-      // 校验登录
-      if (this.$parent.checkLogin()) {
+      // 返回处理
+      if (res.code == 200) {
+        // 解构数据
+        let { data: datas } = res;
+        // 方式连续点击兑换
+        this.isExchange = true;
+        // 两秒后可继续兑换
+        let _this = this
+        setTimeout(function () {
+          this.isExchange = false;
+        }, 1500);
+        // 显示查看地址弹框
+        let options = {
+          message: "兑换成功",
+          messageAlign: "center",
+          confirmButtonText: "我知道了",
+          // confirmButtonCallback: (datas.shop_type == 1) ? this.addAddressCallback(datas.shop_type) : ""
+        };
+        this.$set(this.$parent, "showOptions", options);
+        // 显示通用浮层
+        this.$parent.$refs.showModal.showLayer();
+      } else if (res.code == 400) {
-        // 加载中提示
-        Indicator.open("加载中...");
+        // 获取积分商品详情页失败
+        Toast(res.message);
+      } else {
-        // 获取证书请求接口
-        this.http("/Api/" + this.getApiVersion().LuckDraw + "/integralGoodsInfo", {
-          uid: this.getStore("uid"),
-          id: this.$route.query.goodsId // 商品ID
-        }, this.getGoodsInfoCallback, {
-            method: "POST"
-          });
+        // 获取积分商品详情页失败
+        Toast("获取积分商品详情页失败");
       }
     },
+    // 填写地址
+    addAddressCallback (shopType) {
+      debugger
+      // 如果是实物弹起填写地址弹窗
+      if (shopType == 1) {
+        this.pointsToast_control = true;
+        // 礼品兑换弹框派发
+        this.$refs.itemsInfo.getItemInfo(this.goodsInfo)
+      }
+    },
+    /**
+     * 积分商品详情页页面接口
+     */
+    getGoodsInfo () {
+      // 加载中提示
+      Indicator.open("加载中...");
+      // 获取证书请求接口
+      this.http("/Api/" + this.getApiVersion().LuckDraw + "/integralGoodsInfo", {
+        id: this.$route.query.goodsId // 商品ID
+      }, this.getGoodsInfoCallback, {
+          method: "POST"
+        });
+    },
     /**
      * 积分商品详情页页面接口回调
@@ -211,13 +278,9 @@ export default {
         // 解构数据
         let { data: datas } = res;
-
-        /* 获取banner */
-        this.goodsInfo = datas
         /* 获取详细信息 */
-
+        this.goodsInfo = datas
         /* 相似商品 */
-
       } else if (res.code == 400) {
         // 获取积分商品详情页失败
@@ -266,77 +329,6 @@ export default {
       // 设置标题
       this.$set(this.backs, 'title', '积分商品详情页');
-      // 临时，实物商品列表
-      this.$set(this, 'similarGoods', {
-        list: [
-          {
-            activity: "0",
-            activity_desc: "",
-            addtime: "1604544867",
-            ads: "23123",
-            code: "160454486791776561000",
-            id: "9525539",
-            price: "0.01",
-            prices: "0.00",
-            shop_type: "1",
-            simg: "https://wjjtest.ys2.cnliveimg.com/802/shop/img/2020/11/05/5fa3695e39ae6.png",
-            stock: "0",
-            stoptime: "0",
-            title: "aabbsdf350ml",
-            grade: 1500, // 积分
-            time_state: 2,
-            stock: 0
-          },
-          {
-            activity: "0",
-            activity_desc: "",
-            addtime: "1604544867",
-            ads: "23123",
-            code: "160454486791776561000",
-            id: "9525539",
-            price: "0.01",
-            prices: "0.00",
-            shop_type: "1",
-            simg: "https://wjjtest.ys2.cnliveimg.com/802/shop/img/2020/11/05/5fa3695e39ae6.png",
-            stock: "0",
-            stoptime: "0",
-            title: "aabbsdf350ml",
-            grade: 1500 // 积分
-          },
-          {
-            activity: "0",
-            activity_desc: "",
-            addtime: "1604544867",
-            ads: "23123",
-            code: "160454486791776561000",
-            id: "9525539",
-            price: "0.01",
-            prices: "0.00",
-            shop_type: "1",
-            simg: "https://wjjtest.ys2.cnliveimg.com/802/shop/img/2020/11/05/5fa3695e39ae6.png",
-            stock: "0",
-            stoptime: "0",
-            title: "aabbsdf350ml",
-            grade: 1500 // 积分
-          },
-          {
-            activity: "0",
-            activity_desc: "",
-            addtime: "1604544867",
-            ads: "23123",
-            code: "160454486791776561000",
-            id: "9525539",
-            price: "0.01",
-            prices: "0.00",
-            shop_type: "1",
-            simg: "https://wjjtest.ys2.cnliveimg.com/802/shop/img/2020/11/05/5fa3695e39ae6.png",
-            stock: "0",
-            stoptime: "0",
-            title: "aabbsdf350ml",
-            grade: 1500 // 积分
-          }
-        ]
-      });
     }
   },
@@ -111,6 +111,8 @@
 <script>
 import { Toast, Indicator } from "mint-ui";
+import callAppBox from "@/components/callAppBox/callAppBox";
+import backBox from "@/components/backBox/backBox";
 import goodsItem2 from "@/components/goodsItem_2/goodsItem_2";
 import columnListBox from "@/components/columnListBox/columnListBox";
 export default {
@@ -128,6 +130,8 @@ export default {
   },
   //部件
   components: {
+    callAppBox,
+    backBox,
     goodsItem2,
     columnListBox
   },
@@ -150,7 +154,7 @@ export default {
       this.$router.push({
         path: '/pointsExchangeRecords',
         query: {
-          uid: this.$route.query.uid || 0,
+          uid: this.getStore("uid"),
         }
       })
     },
@@ -181,6 +185,7 @@ export default {
         path: '/goodDetails',
         query: {
           goodsId: item.id,
+          uid: this.getStore("uid")
         }
       })
     },