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 accfd722 53022cbf
Showing 2 changed files with 52 additions and 20 deletions
src/pages/healthGoodDetails/healthGoodDetails.less
src/pages/healthGoodDetails/healthGoodDetails.vue
@@ -142,8 +142,17 @@
     display:flex;
     justify-content: center;
     align-items: center;
+    .desc{
+      height: 130px;
+      font-size: 30px;
+      font-weight: 400;
+      color: #333333;
+      line-height: 130px;
+      margin: 0 30px;     
+    }
     .btn{
-      width: 690px;
+      flex: 1;
+      margin: 20px 30px;
       height: 90px;
       line-height: 90px;
       background: #F5A623;
@@ -41,7 +41,7 @@
             <!-- 标题 -->
             <div v-if="goodsInfo && goodsInfo.title" class="title">
              {{goodsInfo.title}}
-            </div>
+            </div> 
             <!-- 积分 -->
             <div class="title-t">
               <span v-if="goodsInfo && goodsInfo.prices" class="price">¥{{goodsInfo.prices}}</span>
@@ -96,11 +96,18 @@
               </column-list-box>
             </div>
         </div>
-        <!-- 页脚 -->
-        <div class="footer">
+        <!-- 有积分页脚显示 -->
+        <!-- <div class="footer">
           <div class="btn" @click="exchange">
             立即兑换
           </div>
+        </div> -->
+         <!-- 积分不足页脚显示 -->
+        <div class="footer">
+          <div class="desc">还差1000积分</div>
+          <div class="btn" @click="jumpClientIntegralList">
+              获取积分
+          </div>
         </div>
         <!-- 地址信息组件 -->
         <app-address-toast ref="itemsInfo" @toUpdate="toLinkPointsMall" v-show="pointsToast_control"></app-address-toast>
@@ -164,6 +171,18 @@ export default {
       }
     },
     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();
       // 调用back返回上一页
       // this.back();
       // this.$router.push({
@@ -239,11 +258,19 @@ export default {
     },
     // 确定兑换回调
     addIntegralOrderconfirm () {
-      // isExchange为false才可兑换防止连续点击
-      if (!this.isExchange) {
-        // 兑换
-        this.addIntegralOrder();
-      }
+      /**
+       * 判断shop_type是否等于1等于1为实物弹出填写地址,其他商品直接走兑换接口
+       */
+      if(this.goodsInfo.shop_type){
+         // 实物弹出填写地址
+         this.addAddressCallback()
+      }else{
+         // isExchange为false才可兑换防止连续点击
+        if (!this.isExchange) {
+          // 兑换
+          this.addIntegralOrder();
+        }
+      }     
     },
     /**
      * 分享
@@ -255,7 +282,7 @@ export default {
       }
     },
     /**
-   * 积分商品详情页页面接口
+   * 积分兑换接口
    */
     addIntegralOrder () {
       // 加载中提示
@@ -271,7 +298,7 @@ export default {
     },
     /**
-     * 积分商品详情页页面接口回调
+     * 积分兑换接口回调
      * @param {Object} res [服务器返回数据]
      * @param {Object} ext [扩展参数]
      */
@@ -293,9 +320,7 @@ export default {
         }, 1500);
         // 提示语判断
         let tipMessage;
-        if (datas.shop_type == 1) {
-          tipMessage = "兑换成功"
-        } else if (datas.shop_type == 2) {
+        if (datas.shop_type == 2) {
           tipMessage = "红包已存入您的账户，可前往“我的”—“我的卡券查看”"
         } else if (datas.shop_type == 3) {
           tipMessage = "付费音频已存入您的账户，可前往“我的”—“我的付费内容”—“已购内容收听”"
@@ -305,8 +330,9 @@ export default {
           message: tipMessage,
           messageAlign: "center",
           confirmButtonText: "我知道了",
-          confirmButtonCallback: this.addAddressCallback,
-          params: { shopType: datas.shop_type, id: datas.id }
+          confirmButtonCallback:""
+          // confirmButtonCallback: this.addAddressCallback,
+          // params: { shopType: datas.shop_type, id: datas.id }
         };
         this.$set(this.$parent, "showOptions", options);
         // 显示通用浮层
@@ -332,13 +358,10 @@ export default {
       }
     },
     // 填写地址
-    addAddressCallback (params) {
-      // 如果是实物弹起填写地址弹窗
-      if (params.shopType == 1) {
+    addAddressCallback () {
         this.pointsToast_control = true;
         // 礼品兑换弹框派发
         this.$refs.itemsInfo.getItemInfo(this.goodsInfo, params.id)
-      }
     },
     /**
     * 跳转赚取积分页面