Merge branch 'master' of http://114.67.93.201/xulili/ybf

wx_application/src/api/active.js

@@ -17,13 +17,61 @@ export function createActive(params) {
 /**
  * 获取活动列表
  */
-export function getActiveList(inData) {
-  let getData = {
-    args: inData
-  }
-  return requestB({
-    url: '',
+export function getActiveList(params) {
+  return request({
+    url: `activity/list`,
+    method: 'post',
+    data: params
+  })
+}
+
+/**
+ * 判断是否会员
+ */
+export function isMember(params) {
+  return request({
+    url: `activity/isMember`,
     method: 'get',
-    getData
+    data: params
+  })
+}
+
+/**
+ * 获取活动详情
+ * @param {*} id 
+ */
+export function getActiveDetailById(id) {
+  return request({
+    url: `activity/getById?id=${id}`,
+    method: 'get'
+  })
+}
+
+/**
+ * 抽奖
+ */
+export function play(params) {
+  return request({
+    url: `activity/play`,
+    method: 'post',
+    data: params
+  })
+}
+
+/**
+ * 获取优惠券
+ * @param {*} id 
+ */
+export function getAllCouponsByOyStallCode(id) {
+  return request({
+    url: `admin/auth/coupon/getAllCouponsByOyStallCode?deptId=${id}`,
+    method: 'get'
+  })
+}
+
+export function getUserBaseInfo(code) {
+  return request({
+    url: `activity/getUserInfo?code=${code}`,
+    method: 'get'
   })
 }
\ No newline at end of file

wx_application/src/views/active/activeList.vue

 <template>
   <div class="container">
     <div class="title">
-      <span>会员分裂</span>
+      <span>大转盘抽奖</span>
       <span class="fr">查看更多<span class="icon">></span></span>
     </div>
     <div class="active">
-      <div class="list" v-for="item in activeList" :key="item.id" @click="toDetail(item.id, item.type)">
+      <div class="list" v-for="item in activeList" :key="item.id" @click="toDetail(item.id, item.activityType)">
           <div class="left"></div>
           <div class="right">
-            <h3>{{ item.activeName }}</h3>
-            <p>{{ item.description }}</p>
+            <h3>{{ item.activityName }}</h3>
+            <p>{{ item.des }}</p>
           </div>
       </div>
     </div>
-    <div class="fg">复购</div>
+    <div v-if="couponList.length > 0" class="fg">送券活动</div>
     <div class="active">
-      <div class="list">
+      <div class="list" v-for="item in couponList" :key="item.id" @click="toDetail(item.id, item.activityType)">
           <div class="left"></div>
           <div class="right">
-            <h3>大转盘抽奖</h3>
-            <p>由各种物质组成的巨型球状天体，叫做星球。星球有一定的形状。</p>
-          </div>
-      </div>
-      <div class="list list3">
-          <div class="left"></div>
-          <div class="right">
-            <h3>砸金蛋抽奖</h3>
-            <p>由各种物质组成的巨型球状天体，叫做星球。星球有一定的形状。</p>
+            <h3>{{ item.activityName }}</h3>
+            <p>{{ item.des }}</p>
           </div>
       </div>
     </div>
@@ -34,30 +27,54 @@
 </template>
 
 <script>
-import * as API from '@/api/active';
+import * as API_Active from '@/api/active';
 export default {
   data() {
     return {
       activeList: [
         {
           id: 1,
-          type: 'coupon',
-          activeName: '砍价',
-          description: '由各种物质组成的巨型球状天体，叫做星球。星球有一定的形状。'
+          activityType: 'coupon',
+          activityName: '砍价',
+          des: '由各种物质组成的巨型球状天体，叫做星球。星球有一定的形状。'
+        },
+        {
+          id: 2,
+          activityType: 'wheel',
+          activityName: '集赞',
+          des: '由各种物质组成的巨型球状天体，叫做星球。星球有一定的形状。'
+        }
+      ],
+      couponList: [
+        {
+          id: 1,
+          activityType: 'coupon',
+          activityName: '砍价',
+          des: '由各种物质组成的巨型球状天体，叫做星球。星球有一定的形状。'
         },
         {
           id: 2,
-          type: 'wheel',
-          activeName: '集赞',
-          description: '由各种物质组成的巨型球状天体，叫做星球。星球有一定的形状。'
+          activityType: 'wheel',
+          activityName: '集赞',
+          des: '由各种物质组成的巨型球状天体，叫做星球。星球有一定的形状。'
+        }
+      ],
+      params: {
+        pageNo: 1,
+        pageSize: 10
       }
-      ]
     }
   },
+  mounted() {
+    this.getActiveList(this.params);
+  },
   methods: {
-    // 获取 欧亚 活动列表
-    getOYActiveList() {
-
+    // 获取 活动列表
+    getActiveList(params) {
+      API_Active.getActiveList(params).then(res => {
+        console.log('获取到数据');
+        this.activeList = res.data.list;
+      })
     },
     // 跳转到 活动详情
     toDetail(active_id, type) {

wx_application/src/views/active/couponDetail.vue

@@ -4,10 +4,10 @@
       <div class="topb">
     </div>
     <div class="title">
-      <span class="bt">服装店幸运抽奖</span>
+      <span class="bt">送券活动</span>
       <div class="tb">
         <img src="../../../public/img/zp.png" alt="" />
-        大转盘抽奖
+        送券活动
       </div>
     </div>
     <div class="wtitle">

wx_application/src/views/active/turntableDetail.vue

@@ -5,7 +5,7 @@
         <!-- <img src="../../../public/img/zpbg.png" alt="" /> -->
       </div>
       <div class="title">
-        <span class="bt">服装店幸运抽奖</span>
+        <span class="bt">大转盘活动</span>
         <div class="tb">
           <img src="../../../public/img/zp.png" alt="" />
           大转盘抽奖

wx_application/src/views/mainSale/active/main/index.vue

@@ -237,7 +237,7 @@ export default {
         this.flag = sessionStorage.getItem('role')
       }
     }else  {
-      // this.zReadyUserId()
+      this.zReadyUserId()
       this.zTestGetNowUrlInfo()
     }
   },