健康商城需要用到填写地址，积分加现金兑换不用到地址填写

zhiyangdu
1 parent 17549cb4
Showing 3 changed files with 50 additions and 65 deletions
src/components/appAddressToast/appAddressToast.vue
src/pages/goodDetails/goodDetails.vue
src/pages/healthGoodDetails/healthGoodDetails.vue
@@ -132,7 +132,8 @@ export default {
     confirm () {
       // 最新地址信息回传给父组件
       // this.$parent.addressInfo = this.addressInfo;
-      this.addLuckDrawAddress();
+      // this.addLuckDrawAddress();
+      this.$emit("toUpdate", this.addressInfo.id);
       // 隐藏弹框
       this.$parent.pointsToast_control = false;
     },
@@ -150,42 +151,42 @@ export default {
      * *@param {string} id [商品id]
      * *@param {string} id_card [身份证id]
      */
-    addLuckDrawAddress () {
-      // 加载中提示
-      Indicator.open("加载中...");
-      // 请求接口
-      this.http(
-        "/Api/" + this.getApiVersion().LuckDraw + "/addLuckIntegralAddress",
-        {
-          uid: this.getStore("uid"),
-          addressId: this.addressInfo.id,
-          id: this.itemInfo.id // 商品ID
-        },
-        this.addLuckDrawAddressCallback,
-        {
-          method: "POST"
-          // ext: this.itemInfo
-        }
-      );
-    },
+    // addLuckDrawAddress () {
+    //   // 加载中提示
+    //   Indicator.open("加载中...");
+    //   // 请求接口
+    //   this.http(
+    //     "/Api/" + this.getApiVersion().LuckDraw + "/addLuckIntegralAddress",
+    //     {
+    //       uid: this.getStore("uid"),
+    //       addressId: this.addressInfo.id,
+    //       id: this.itemInfo.id // 商品ID
+    //     },
+    //     this.addLuckDrawAddressCallback,
+    //     {
+    //       method: "POST"
+    //       // ext: this.itemInfo
+    //     }
+    //   );
+    // },
     /**
      * 提交中奖的商品信息
      * @param {object} res [服务器返回数据]
      * @param {object} ext [扩展参数]
      */
-    addLuckDrawAddressCallback (res, ext) {
-      // 加载完成
-      Indicator.close();
-      // 返回处理
-      if (res.code == 200) {
-        Toast("提交成功等待发货");
-        this.$emit("toUpdate", this.itemInfo, this.addressInfo);
-      } else {
-        // 兑换礼品失败
-        Toast(res.message);
-      }
-    }
+    // addLuckDrawAddressCallback (res, ext) {
+    //   // 加载完成
+    //   Indicator.close();
+    //   // 返回处理
+    //   if (res.code == 200) {
+    //     Toast("提交成功等待发货");
+    //     this.$emit("toUpdate", this.itemInfo, this.addressInfo);
+    //   } else {
+    //     // 兑换礼品失败
+    //     Toast(res.message);
+    //   }
+    // }
   }
 };
 </script>
@@ -180,7 +180,7 @@ import callAppBox from &quot;@/components/callAppBox/callAppBox&quot;;
 import swiper from "@/components/swiper/swiper";
 import backBox from "@/components/backBox/backBox";
 import columnListBox from "@/components/columnListBox/columnListBox";
-import appAddressToast from "@/components/appAddressToast/appAddressToast";
+// import appAddressToast from "@/components/appAddressToast/appAddressToast";
 import { Toast, Indicator } from "mint-ui";
 export default {
   name: 'goodDetails',
@@ -202,7 +202,7 @@ export default {
     swiper,
     backBox,
     columnListBox,
-    appAddressToast
+    // appAddressToast
   },
   //静态
   props: [
@@ -375,6 +375,7 @@ export default {
       if (this.goodsInfo.shop_type == 1) {
         // 实物弹出底部数量填写弹窗
         this.opintsPopup();
+        // 弹出填写地址
         //  this.addAddressCallback()
       } else {
         // isExchange为false才可兑换防止连续点击
@@ -161,7 +161,7 @@
         </div>
         <!-- 有健康值商品售罄 -->
         <div v-else-if="goodsInfo && goodsInfo.stock == 0" class="footer">
-          <div class="btn grey" @click="exchange">
+          <div class="btn grey">
             补货中
           </div>
         </div>
@@ -242,19 +242,9 @@ export default {
         this.$parent.callApp();
       }
     },
-    toLinkPointsMall () {
-      // 显示查看地址弹框
-      let options = {
-        message: "兑换成功",
-        messageAlign: "center",
-        confirmButtonText: "我知道了",
-        confirmButtonCallback: ""
-        // confirmButtonCallback: this.addAddressCallback,
-        // params: { shopType: datas.shop_type, id: datas.id }
-      };
-      this.$set(this.$parent, "showOptions", options);
-      // 显示通用浮层
-      this.$parent.$refs.showModal.showLayer();
+    toLinkPointsMall (addressId) {
+      // 实物商品兑换
+      this.addLuckHealthOrder(addressId);
       // 调用back返回上一页
       // this.back();
       // this.$router.push({
@@ -315,7 +305,7 @@ export default {
             title: "",
             message: "确定使用" + this.goodsInfo.num + "健康值兑换?",
             confirmButtonText: "确定",
-            confirmButtonCallback: this.addIntegralOrderconfirm,
+            confirmButtonCallback: this.addLuckHealthOrderconfirm,
             showCancelButton: true,
             cancelButtonText: "取消"
           };
@@ -329,7 +319,7 @@ export default {
       }
     },
     // 确定兑换回调
-    addIntegralOrderconfirm () {
+    addLuckHealthOrderconfirm () {
       /**
        * 判断shop_type是否等于1等于1为实物弹出填写地址,其他商品直接走兑换接口
        */
@@ -340,7 +330,7 @@ export default {
         // isExchange为false才可兑换防止连续点击
         if (!this.isExchange) {
           // 兑换
-          this.addIntegralOrder();
+          this.addLuckHealthOrder();
         }
       }
     },
@@ -356,15 +346,16 @@ export default {
     /**
    * 健康值兑换接口
    */
-    addIntegralOrder () {
+    addLuckHealthOrder (addressId) {
       // 加载中提示
       Indicator.open("加载中...");
       // 获取证书请求接口
-      this.http("/Api/" + this.getApiVersion().LuckDraw + "/addIntegralOrder", {
+      this.http("/Api/" + this.getApiVersion().LuckDraw + "/addLuckHealthOrder", {
         uid: this.getStore("uid"),
         id: this.$route.query.goodsId, // 商品ID
-        num: 1
-      }, this.addIntegralOrderCallback, {
+        num: 1, // 数量
+        addressId: addressId || "" // 实物商品ID
+      }, this.addLuckHealthOrderCallback, {
           method: "POST"
         });
     },
@@ -374,7 +365,7 @@ export default {
      * @param {Object} res [服务器返回数据]
      * @param {Object} ext [扩展参数]
      */
-    addIntegralOrderCallback (res, ext) {
+    addLuckHealthOrderCallback (res, ext) {
       // 加载完成
       Indicator.close();
@@ -390,16 +381,9 @@ export default {
         setTimeout(function () {
           _this.isExchange = false;
         }, 1500);
-        // 提示语判断
-        let tipMessage;
-        if (datas.shop_type == 2) {
-          tipMessage = "红包已存入您的账户，可前往“我的”—“我的卡券查看”"
-        } else if (datas.shop_type == 3) {
-          tipMessage = "付费音频已存入您的账户，可前往“我的”—“我的付费内容”—“已购内容收听”"
-        }
         // 显示查看地址弹框
         let options = {
-          message: tipMessage,
+          message: "兑换成功",
           messageAlign: "center",
           confirmButtonText: "我知道了",
           confirmButtonCallback: ""
@@ -411,7 +395,6 @@ export default {
         this.$parent.$refs.showModal.showLayer();
       } else if (res.code == 401) {
         // 获取健康值商品详情页失败
-        // 
         // 显示查看地址弹框
         let options = {
           title: "",
@@ -433,7 +416,7 @@ export default {
     addAddressCallback () {
       this.pointsToast_control = true;
       // 礼品兑换弹框派发
-      this.$refs.itemsInfo.getItemInfo(this.goodsInfo, params.id)
+      this.$refs.itemsInfo.getItemInfo(this.goodsInfo,this.$route.query.id)
     },
     /**
     * 跳转赚取健康值页面