Merge branch 'nativehome_tst' of http://code.mayi888.com/chengmo/mayi-mp-shop into nativehome_tst

src/api/coupon.js

+import { requestPOST } from "@/utils/request.js";
+
+export default {
+  // 组件查询优惠券列表
+  queryCouponIdsList(data) {
+    return requestPOST(`${process.env.OLSHOP_URL}/promotion/query_coupon_detail_by_ids`, data)
+  },
+  // 领取优惠券
+  receive_coupon(params) {
+    return requestPOST(`${process.env.OLSHOP_URL}/promotion/receive_coupon/?couponCode=`+params+``)
+  },
+};

src/components/activity/integralTurntable.vue

+<!-- 积分大转盘 -->
+<template>
+  <div class="IntegralTurntable" v-if="isShow == true">
+    <div class="img" @click="toPrizePage">
+      <img v-if="datas.componentData.imgUrl" mode="widthFix" :src="datas.componentData.imgUrl"  lazy-load alt />
+      <img
+        v-else
+        src="http://test-bucket-ant.oss-cn-shanghai.aliyuncs.com/product/png/2a61b201-4fe3-406b-9d76-9ec606ed08c0.png"
+        alt
+      />
+    </div>
+  </div>
+</template>
+
+<script type="text/ecmascript-6">
+import coupon  from '@/api/coupon'
+const app = getApp()
+export default {
+  name: "integral-turntable",
+  props: {
+    datas: {
+      type: Object,
+      default: function() {
+        return {
+          id: "",
+          pageCode: 0,
+          pageType: 0,
+          queueNumber: 0,
+          componentName: "积分大转盘",
+          componentCode: "Integral-turntable",
+          code: 3,
+          componentData: {
+            imgUrl:
+              "http://test-bucket-ant.oss-cn-shanghai.aliyuncs.com/product/png/2a61b201-4fe3-406b-9d76-9ec606ed08c0.png",
+            turntableCode: ""
+          }
+        };
+      }
+    }
+  },
+  data() {
+    return {
+      isShow: false,
+    };
+  },
+  components: {},
+  watch : {
+    // "datas.componentData._tempData" : function(newVal){
+    //   this.isShow = newVal
+    // }
+  },
+  mounted() {
+
+
+    if (this.render) {
+        try {
+          this.$on('getEnvInfo',([val])=>{
+            console.log(val,'ggggggggggggg',typeof val)
+            this.api=val;
+            this.init();
+          })
+        } catch (error) {}
+      } else {
+        this.isShow=true;
+      }
+  },
+  methods: {
+    // 初始化--查询列表看活动是否可用
+    // init() {
+    //   let activityId=this.datas.componentData.turntableCode;
+    //   coupon.queryPrizeFlag({activityId}).then(res=>{
+    //     if(res.data.code==200){
+    //       this.isShow=res.data=='true'?true:false;
+    //     }else{
+    //       this.isShow=true;
+    //     }
+    //   })
+    // },
+    // 跳转到大转盘页
+    toPrizePage() {
+      let link = `/turntable?turntableCode=${this.datas.componentData.turntableCode}`
+      app.$themeToLink(link);
+    },
+    // toEnvPage() {
+    //   let query = {
+    //     back: this.$route.path,
+    //   };
+    //   this.$router.push({ name: "login-accountLogin", query });
+    // }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.IntegralTurntable {
+  .img {
+    overflow: hidden;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    max-height: 200px;
+    img {
+      width: 100%;
+      object-fit: cover;
+    }
+  }
+}
+</style>

src/pages/home/index.vue

@@ -54,11 +54,17 @@
           <div v-if="item.componentCode == 'pop-up'">
             <pop-up :datas="item"></pop-up>
           </div>
+          <div v-if="item.componentCode == 'coupon'">
+            <coupon :datas="item"></coupon>
+          </div>
+          <div v-if="item.componentCode == 'integral-turntable'">
+            <integralTurntable :datas="item"></integralTurntable>
+          </div>
           <div v-if="item.componentCode == 'speedy-nav'">
             <speedy-nav :datas="item"></speedy-nav>
           </div>
-
         </div>
+
       <bottomCont></bottomCont>
     <!-- </scroll-view> -->
     <!-- <image
@@ -89,6 +95,8 @@ import shopPopup from '@/components/basicTool/shop-popup/index.vue'
 import text from '@/components/content/text'
 import imgText from '@/components/content/imgText'
 import videoPlayer from '@/components/content/videoPlayer'
+import coupon from '@/components/activity/coupon'
+import integralTurntable from '@/components/activity/integralTurntable'
 import { setTabBarActive, checkTabbarPage,themeColor } from "../../utils/mayi.js";
 const app = getApp();
 
@@ -112,7 +120,9 @@ export default {
     ThemeDataPlant,
     'text-text':text,
     'img-text':imgText,
-    videoPlayer
+    videoPlayer,
+    coupon,
+    integralTurntable
   },
   onShareAppMessage(res) {
     let shareVal={};