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 a26b6701 7445500a
Showing 8 changed files with 104 additions and 14 deletions
src/components/swiper/swiper.less
src/components/swiper/swiper.vue
src/pages/healthGoodDetails/healthGoodDetails.vue
src/pages/healthMall/healthMall.less
src/pages/healthMall/healthMall.vue
src/pages/pointsExchangeRecords/pointsExchangeRecords.less
src/pages/pointsExchangeRecords/pointsExchangeRecords.vue
src/pages/pointsMall/pointsMall.vue
@@ -63,6 +63,22 @@
                 }
             }
         }
+        .play-button-box {
+          position: absolute;
+          top: 0;
+          left: 0;
+          z-index: 1;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          width: 100%;
+          height: 100%;
+          .play-button-img {
+              display: block;
+              width: 100px;
+              height: 100px;
+          }
+      }
     }
 }
 // 积分商城样式
@@ -8,6 +8,10 @@
                         <img v-else v-lazy="item.simg + SIGN.BIG" class="img" mode="widthFix" />
                     </div>
                 </div>
+                <!-- 展示播放按钮 -->
+                <div @click="playNow(item.to)" v-if="item.type == 22" class="play-button-box">
+                    <img src="static/img/play_dark.png" class="play-button-img" />
+                </div>
             </swipe-item>
               <template v-if="isPointsMall" #indicator>
                 <div class="custom-indicator">
@@ -44,7 +48,53 @@ export default {
     onChange (index) {
       this.current = index;
       this.$emit("onChange", index);
-    }
+    },
+    /**
+      * 播放视频
+      * @param {String} videoUrl [数据对象]
+      */
+    playNow(videoUrl) {
+        debugger 
+        // 判断App内
+        if (this.isCNLive.value) {
+
+            // 判断通用跳转函数是否存在
+            if (typeof this.$parent.$parent.gotoDetail === 'function') {
+
+                // 设置跳转参数
+                let params = {
+                    type: '22',
+                    to: videoUrl,
+                    shop_type: ''
+                };
+                // 通用跳转
+                this.$parent.$parent.gotoDetail(params);
+            }
+        } else {
+
+            // App外，唤起App
+            this.openApp();
+        }
+    },
+    /**
+     * 唤起App封装
+     */
+    openApp() {
+        this.$nextTick(() => {
+
+            // 唤起App
+            if (typeof this.$parent.$parent.callAppModal === 'function' && typeof this.$parent.$refs.callApp === 'object') {
+
+                // 设置唤起参数
+                let options = {
+                    success: this.$parent.$refs.callApp.callApp
+                }
+
+                // 唤起App
+                this.$parent.$parent.callAppModal(options);
+            }
+        });
+    },
   }
 }
 </script>
@@ -471,7 +471,7 @@ export default {
       // 加载中提示
       Indicator.open("加载中...");
       // 获取证书请求接口
-      this.http("/Api/" + this.getApiVersion().LuckDraw + "/integralGoodsInfo", {
+      this.http("/Api/" + this.getApiVersion().LuckDraw + "/luckGoodsInfo", {
         id: goodsId, // 商品ID
         uid: this.getStore("uid") // 用户ID
       }, this.getGoodsInfoCallback, {
@@ -21,4 +21,7 @@
     margin-top:10px;
     // margin-bottom: 60px;
   }
+  .not_yet{
+    margin-top:200px;
+  }
 }
 \ No newline at end of file
@@ -28,9 +28,13 @@
       </column-list-box>
     </div>  
     <!-- 没有更多了 -->
-    <div v-if="isNoMore" class="no_more">
+    <div v-if="isNoMore && page>1" class="no_more">
         — 没有更多了 —
     </div>
+    <!-- 暂无商品 -->
+    <div v-else-if="phyicalGoods.list.length == 0 && page==1" class="no_more not_yet">
+        — 暂无商品 —
+    </div>
 </div>
 </template>
@@ -43,7 +47,7 @@ export default {
   name: 'morePoints',
   data () {
     return {
-      title: "",              // 标题
+      title: "健康商城",              // 标题
       backs: null, // 后退按钮组
       loading: true,
       distance: 50,
@@ -108,9 +112,8 @@ export default {
         Indicator.open("加载中...");
         // 请求接口
-        this.http("/Api/" + (this.getApiVersion().LuckDraw) + "/integralNewGoodsList", {
-          type: this.$route.query.type,
-          // uid: this.getStore("uid"),
+        this.http("/Api/" + (this.getApiVersion().LuckDraw) + "/integralMallGoods", {
+          type: 7,
           page: page || 1
         }, this.getIntegralNewGoodsListCallback, {
             method: "POST"
@@ -175,7 +178,7 @@ export default {
           // 设置跳转参数
           let params = {
             type: '5',
-            to: window.location.origin + '/html/select_good/1/#/goodDetails?goodsId=' + item.id,
+            to: window.location.origin + '/html/select_good/1/#/healthGoodDetails?goodsId=' + item.id,
             shop_type: ''
           };
@@ -241,7 +244,6 @@ export default {
       });
     }
     /*设置标题 */
-    this.$set(this, "title", "健康商城");
     this.$set(this.backs, 'title', "健康商城");
   },
   mounted () {
@@ -6,10 +6,10 @@
     background: #FFFFFF;
     border-radius: 24px;
     .item_box{
-      padding: 30px;
+      margin: 0 30px;
       border-bottom: solid 2px #EAEAEA;
       display: flex;
-      padding-bottom: 28px;
+      padding: 30px 0;
       img{
         display: flex;
         width: 190px;
@@ -80,6 +80,17 @@
             align-items: center;
             justify-content: center;
           }
+          .look_logistics{
+            width: 160px;
+            height: 60px;
+            border: 1px solid #3EB781;
+            border-radius: 30px;
+            font-size: 30px;
+            font-weight: 400;
+            color: #3EB781;
+            line-height: 60px;
+            text-align: center;
+          }
           img{
             display: block;
             width: 22px;
@@ -26,17 +26,24 @@
             收货人: {{item.address_name}}{{item.address_phone}}{{item.address_address}}
           </div>
-          <div class="exchange_type">
-            <!-- 500积分+9.9元             -->
+          <div v-show="item.price || item.total" class="exchange_type">
+            <span v-show="item.total && $route.query.type==3">{{item.total}}积分</span>
+            <span class="灰色" v-show="item.total && $route.query.type==7">{{item.total}}健康值</span>
+            <span v-show="parseInt(item.price)>0">+{{item.price}}元</span>          
           </div>
           <div class="exchange_time">
             兑换时间 {{item.create_time*1000 | datetime('yyyy-MM-dd hh:mm:ss')}}
           </div>
           <div v-show="item.shop_type == 1 && !item.address_name && !item.address_address && !item.address_phone" class="btn-box">
+            <!-- 需要填写地址状态 -->
             <div @click.stop="addAddressInfo(item)" class="btn">
               填写地址 
               <img src="static/img/red_right_icon.png" alt=""/>
             </div>
+            <!-- 已填写地址等待发货状态 -->
+            <div v-show="item.sendtime && item.sendtime>0" class="look_logistics">
+              查看物流
+            </div>
           </div>
         </div>
       </div>
@@ -167,7 +174,7 @@ export default {
           {
             uid: this.getStore("uid"),
             page: page,
-            type: "3" // 1亲子嘉年华 2 康疫健步 3 积分商城
+            type: this.$route.query.type // 1亲子嘉年华 2 康疫健步 3 积分商城 4 脐橙 7 健康商城
           },
           this.myLuckDrawCallback,
           {
@@ -193,6 +193,7 @@ export default {
           path: '/pointsExchangeRecords',
           query: {
             uid: this.getStore("uid"),
+            type: 3 // 1亲子嘉年华 2 康疫健步 3 积分商城 4 脐橙 7 健康商城
           }
         })
       } else {