刮刮卡完成

src/app.json

@@ -112,7 +112,8 @@
     {
       "root": "subPackageMarketing/page",
       "pages": [
-        "pages/scratch/scratch"
+        "pages/scratch/scratch",
+        "pages/scratchRule/scratchRule"
       ]
     }
   ],

src/component/adDialog/adDialog.js

+// component/adDialog/adDialog.js
+var app = getApp()
+const wxService = require('../../utils/wxService')
+const utils = require('../../utils/util')
+const envInfo = require('../../config/index').envInfo
+Component({
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    showDialog : {
+      type: Boolean,
+      value: false
+    },
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    //关闭
+    onTapClose(){
+      this.setData({
+        showDialog :false
+      });
+    }
+  }
+})

src/component/adDialog/adDialog.json

+{
+  "component": true,
+  "usingComponents": {}
+}
\ No newline at end of file

src/component/adDialog/adDialog.wxml

+<!--component/adDialog/adDialog.wxml-->
+<view class="ad-modal-bg" wx:if="{{showDialog}}">
+  <view class="ad-modal-body">
+    <image mode="widthFix" src="https://hwimagecdn.ihotwind.cn/hotwind-activity/home_get_coupon.png"></image>
+    <view class="close-dia">
+      <image src="/assets/imgs/close.png" mode="aspectFit" bindtap="onTapClose"></image>
+    </view>
+  </view>
+</view>

src/component/adDialog/adDialog.wxss

+/* component/adDialog/adDialog.wxss */
+
+.ad-modal-bg{
+  position: fixed;
+  z-index: 9999;
+  width: 100vw;
+  height: 100vh;
+  background: rgba(0, 0, 0, 0.5);
+  left: 0;
+  top: 0;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+.ad-modal-bg .ad-modal-body{
+  width: 70vw;
+  height: auto;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+}
+
+.ad-modal-bg .ad-modal-body image{
+  width: 100%;
+}
+
+.ad-modal-bg .ad-modal-body .close-dia{
+  width: 100%;
+  height: auto;
+  padding-top: 10rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.ad-modal-bg .ad-modal-body .close-dia image{
+  width: 80rpx;
+  height: 80rpx;
+}
+
+.ad-modal-bg .ad-modal-body .close-dia image:active{
+  opacity: 0.7;
+}
\ No newline at end of file

src/component/buyImageSwiper/buyImageSwiper.js

@@ -86,7 +86,26 @@ Component({
     swiperChange(e){
       this.setData({
         swiperCurrent: e.detail.current
-      })  
+      });
+
+      this.swiperChangePauseVideo();
+    },
+    //切换的时候
+    swiperChangePauseVideo(){
+      this.videoContext = [];
+      this.data.imageData.forEach((item,index) => {
+        let isVideo = utils.isVideo(item.url || item.videoUrl);
+        if(isVideo){
+          this.videoContext.push(wx.createVideoContext('myVideo' + index, this));
         }
+      });
+      
+      setTimeout(() => {
+        this.videoContext.forEach(item => {
+          item.pause();
+        });
+      });
+    },
+
   }
 })

src/component/buyImageSwiper/buyImageSwiper.wxml

@@ -10,10 +10,25 @@
     class="image-swiper"
     bindchange="swiperChange"
   >
-    <block wx:for="{{imageData}}" wx:key="{{item}}">
+    <block wx:for="{{imageData}}" wx:key="*this" wx:for-index="index">
       <swiper-item class="swiper-item">
-        <image src="{{item.url}}" wx:if="{{!item.videoUrl}}" data-appid="{{item.id}}" data-path="{{item.link.url}}" data-link="{{item.link}}"  data-item="{{item}}" bindtap='preview' class="slide-image" mode="aspectFit"/>
-        <video  class="slide-image" src="{{utils.formateUrl(item.videoUrl,baseImgUrl)}}" wx:if="{{item.videoUrl}}"  controls="true" autoplay="true"></video>
+        <image src="{{item.url}}" 
+        wx:if="{{!item.videoUrl}}" 
+        data-appid="{{item.id}}" 
+        data-path="{{item.link.url}}" 
+        data-link="{{item.link}}"  
+        data-item="{{item}}" 
+        bindtap='preview' 
+        class="slide-image" 
+        mode="aspectFit"/>
+
+        <video object-fit="cover"  
+        id="myVideo{{index}}"
+        class="slide-image" 
+        src="{{utils.formateUrl(item.videoUrl,baseImgUrl)}}"
+        wx:if="{{item.videoUrl}}"  
+        controls="true" 
+        autoplay="true"></video>
       </swiper-item>
     </block>
     

src/component/buyImageSwiper/buyImageSwiper.wxss

 /* component/buyImageSwiper/buyImageSwiper.wxss */
+swiper {
+  width: 100%;
+}
+
 .image-swiper{
-  height: 425.15rpx;
-  top: 20rpx;
+  height: 100%;
+  /* top: 20rpx; */
 }
 .image-wrap{
   position: relative;
   width: 100%;
-  height: 500rpx;
+  height: 750rpx;
+  margin-bottom: 30rpx;
 }
 .swiper-item{
-  height: 374rpx;
+  height: 100%;
 }
 .slide-image {
   width: 100%;
@@ -20,7 +25,7 @@
   position: absolute; 
   left: 0; 
   right: 0; 
-  top: 460rpx; 
+  top: 730rpx; 
   display: flex; 
   justify-content: center; 
 } 

src/component/personCenter/personCenter.js

@@ -110,8 +110,8 @@ Component({
     //获取等级列表
     getLevelList(){
       // /member/memberLevel/get
-      // wxService.get('/member/memberLevel/get').then(res => {
-        wxService.post('/merchant/settingLevel/get').then(res => {
+      wxService.get('/member/memberLevelSet/get').then(res => {
+        // wxService.post('/merchant/settingLevel/get').then(res => {
         if(res){
           let levelList = res.data.data ? res.data.data  : [];
           if (levelList.length == 0){

src/component/waterFlowLayout/waterFlowLayout.js

@@ -102,19 +102,10 @@ Component({
       wxService.nextTick(() => {
         this.triggerEvent('getAuth', res);
       })
-    }
+    },
     //获取图片高度
-    // imageLoad(e) {
-    //   console.log('height', utils.imageUtil(e))
-    //   let imageSize = utils.imageUtil(e)
-    //   this.data.imageData.forEach((item)=>{
-    //     item.imageheight = imageSize.imageHeight
-    //   })
-    //   // this.setData({
-    //   //   // imagewidth: imageSize.imageWidth,
-    //   //   imageheight: imageSize.imageHeight
-    //   // })
-    //   console.log('imageData',this.data.imageData)
-    // }
+    imageLoad(e) {
+      
+    }
   }
 })

src/component/waterFlowLayout/waterFlowLayout.wxml

@@ -3,12 +3,12 @@
 
 <view class="water-wrap {{type == 2 ? 'release-water' : ''}}">
 	<view class="left">
-		<block wx:for="{{imageData}}" wx:key="">
+		<block wx:for="{{imageData}}" wx:key="*this">
 			<template is="water-list" data="{{...item,urlBase}}" wx:if="{{index%2==0}}" />
 		</block>
 	</view>
 	<view class="right">
-		<block wx:for="{{imageData}}" wx:key="">
+		<block wx:for="{{imageData}}" wx:key="*this">
 			<template is="water-list" data="{{...item, urlBase}}" wx:if="{{index%2==1}}" />
 		</block>
 	</view>
@@ -28,33 +28,13 @@
 		 src="{{utils.formateUrl(url,urlBase)}}"
 		 data-id="{{id}}"
 		 mode="widthFix"
+		 lazy-load
 		 bindload="imageLoad"
 		/>
 		<view class="item-title-box">
 			<view class="item-title">{{headline}}</view>
 		</view>
 		<view/>
-		<!-- 未登錄時 -->
-		<!-- <view class="share-wrap" wx:if="{{!userIsLogin}}">
-      <button wx:if="{{!userIsLogin}}"
-        bindgetuserinfo="_getUserInfo"
-        open-type='getUserInfo' class="clear-btn">
-        <view class="share-oprate" catchtap="onTapLike">
-          <image class="share-img" src="{{contentInfo.type ? '/assets/imgs/heart-primary.png'  : '/assets/imgs/heart-default.png'}}" />
-          <text class="share-number">{{enjoySum || 0}}</text>
-        </view>
-      </button>
-
-      <button wx:if="{{!userIsLogin}}"
-        bindgetuserinfo="_getUserInfo" 
-        open-type='getUserInfo' class="clear-btn">
-        <view class="share-oprate" catchtap="onTapShare">
-          <image class="share-img" src="/assets/imgs/share.png" />
-          <text class="share-number">{{transmitSum || 0}}</text>
-        </view>
-      </button>
-    </view> -->
-
 		<view class="share-wrap">
 			<view
 			 class="share-oprate"

src/config/index.js

@@ -6,7 +6,7 @@
 // 修改 BRANCH_ID 为对应的商户id
 // app.js 中brandId 修改为对应
 
-const PROJECT_ENV = 'prod' // 生产 prod, 开发 dev, 测试 test , 测试门户 test_store, 预生产 pre
+const PROJECT_ENV = 'dev' // 生产 prod, 开发 dev, 测试 test , 测试门户 test_store, 预生产 pre
 //仅生产环境时 配置 ： 
 //3001 3001 ,  wx313ec36b710125d4 有直播
 //2006 泰华 , wx40fec8944623c8b3 有直播
@@ -25,7 +25,7 @@ const PROJECT_ENV = 'prod' // 生产 prod, 开发 dev, 测试 test , 测试门
 //2992 山东盛联微商城 wx53dedc202ae0d0c2
 //2002 巴黎贝甜 wx21968cb3a486d4ab
 
-const BRANCH_ID = 2010
+const BRANCH_ID = 1001
 const isMall = true
 
 // const needMock = '' //

src/pages/activateCard/activateCardCallback.js

@@ -111,7 +111,10 @@ wxService.page({
     })
   },
   goUserCenter() {
-    wxService.router(`/pages/userCenter/userCenter`).replace()
+    // wxService.router(`/pages/userCenter/userCenter`).replace()
+    wx.reLaunch({
+      url: '/pages/userCenter/userCenter',
+    });
   },
   /**
    * 生命周期函数--监听页面隐藏

src/pages/confirmOrder/confirmOrder.wxml

@@ -143,6 +143,13 @@
             <text class="total-price">￥{{utils.numberFormat(currentOrderList.promotionDiscount)}}</text>
           </view>
         </view>
+        <!-- 积分抵扣 -->
+        <view class="coupon">
+          <view>
+            <text class="price-label">积分抵扣</text>
+            <text class="total-price">￥{{0}}</text>
+          </view>
+        </view>
         <view class="coupon">
           <!-- class='coupon-items' -->
           <view bindtap="selectCoupon">

src/pages/myShare/myShare.wxml

@@ -17,6 +17,7 @@
 			 type="1"
 			 image-data="{{contentList}}"
 			 bind:updataLike="gotoLike"
+			 url-base="{{baseImgUrl}}"
 			 bind:_onTapShare="_onTapShare"
 			 bind:getAuth="_getUserInfo"
 			 currentHasUserInfo="{{currentHasUserInfo}}"

src/pages/order/order.js

@@ -82,6 +82,16 @@ wxService.page({
     wx.hideShareMenu()
   },
 
+  //跳转商品详情
+  onTapToProductInfo(e){
+    let sku = e.currentTarget.dataset.item;
+    let productId  = sku.productId;
+
+    wx.navigateTo({
+      url: '/pages/productDetail/productDetail?id=' + productId,
+    });
+  },
+
   //复制
   onTapCopy(e){
     wx.setClipboardData({

src/pages/order/order.wxml

@@ -40,10 +40,12 @@
 					<view class="{{packageInfo.statusClass}}">{{packageInfo.statusText}}</view>
 				</view>
 				<!-- 商品数据 -->
-				<view class="package-products clear-box" data-id="{{item.id}}" bindtap="handelDetail">
+				<view class="package-products clear-box" >
 					<view class="product-item" 
 					wx:for="{{packageInfo.sendOutList}}"
 					wx:for-item="sku" 
+					data-item="{{sku}}"
+					bindtap="onTapToProductInfo"
 					wx:for-index="sIndex" 
 					wx:key="*this">
 						<image src="{{sku.skuImgUrl ? sku.skuImgUrl : sku.mainImgUrl}}" class="lf-product-img" mode="aspectFit"></image>

src/pages/orderDetail/orderDetail.js

@@ -44,6 +44,16 @@ wxService.page({
     }
   },
 
+   //跳转商品详情
+   onTapToProductInfo(e){
+    let sku = e.currentTarget.dataset.item;
+    let productId  = sku.productId;
+
+    wx.navigateTo({
+      url: '/pages/productDetail/productDetail?id=' + productId,
+    });
+  },
+
   /**
    * 页面相关事件处理函数--监听用户下拉动作
    */

src/pages/orderDetail/orderDetail.wxml

@@ -73,6 +73,8 @@
 					<view class="product-item" 
 					wx:for="{{item.sendOutList}}" 
 					wx:for-item="skuInfo" 
+					data-item="{{skuInfo}}"
+					bindtap="onTapToProductInfo"
 					wx:for-index="cIndex" 
 					wx:key="*this">
 						<image src="{{skuInfo.skuImgUrl ? skuInfo.skuImgUrl : skuInfo.mainImgUrl}}" class="lf-product-img" mode="aspectFit"></image>

src/pages/userCenter/userCenter.js

@@ -40,6 +40,8 @@ wxService.page({
     y : 0,
     contactUsModal : false,
     apiIsOk : true,
+    //显示广告
+    showDialog : true,
   },
   /**
    * 生命周期函数--监听页面加载

src/pages/userCenter/userCenter.json

@@ -17,6 +17,7 @@
     "plus": "/component/plus/plus",
     "go-guid": "/component/goGuid/goGuid",
     "share-benefit-modal": "/component/shareBenefitModal/shareBenefitModal",
+    "ad-dialog": "/component/adDialog/adDialog",
     "cell": "plugin://contactPlugin/cell"
   }
 }
\ No newline at end of file

src/pages/userCenter/userCenter.wxml

@@ -79,3 +79,6 @@
 
 <!-- 异常 -->
 <exception wx:if="{{!apiIsOk}}" bind:reCall="onTapReCall"/>
+
+<!-- 广告 -->
+<!-- <ad-dialog showDialog="{{showDialog}}"/> -->

src/pages/wantToBuyDetail/wantToBuyDetail.js

@@ -5,6 +5,7 @@ const utils = require('../../utils/util')
 const envInfo = require('../../config/index').envInfo
 import { Integer } from '../../utils/integerDigitalConvertion'
 const { memberId, member } = wx.getStorageSync('_baseUserInfo')
+const defaultGoodsImg = 'https://img3.bigaka.com/prd/3001/202003/20200331/30019aa78220-546f-41e0-8075-c2feb69e10b8.jpg';
 
 wxService.page({
   /**
@@ -12,6 +13,7 @@ wxService.page({
    */
   data: {
     contentInfo:[],
+    baseImgUrl: app.globalData.imageUrl,
     id:'',
     pageNo:1,
     pageSize:100,
@@ -204,6 +206,15 @@ wxService.page({
       if (!res) return false
       const { result, data } = res.data
       if (result == 0) {
+        let shareShowPictureRESDTOList = data.shareShowPictureRESDTOList ?  data.shareShowPictureRESDTOList : [];
+        shareShowPictureRESDTOList.forEach(item => {
+          if(item.url){
+            item.url = item.url.indexOf('http') > -1 ? item.url : this.data.baseImgUrl + item.url;
+          }
+          if(item.videoUrl){
+            item.videoUrl = item.videoUrl.indexOf('http') > -1 ? item.videoUrl : this.data.baseImgUrl + item.videoUrl;
+          }
+        })
         this.setData({
           contentInfo: data
         });
@@ -227,7 +238,8 @@ wxService.page({
   //获取内容下商品列表
   getProList(){
     var params = {
-      productIds: this.data.contentInfo.productIds
+      productIds: this.data.contentInfo.productIds,
+      showListUrls : true,
     }
     if (this.data.contentInfo.productIds && this.data.contentInfo.productIds.length > 0){
       wxService.post(`/sale/product/buyer/listPage?pageNo=${this.data.pageNo}&pageSize=${this.data.pageSize}`, 
@@ -235,8 +247,14 @@ wxService.page({
         if (!res) return false
         const { result, data } = res.data
         if (result == 0 && data.content) {
+          let list = data.content ? data.content : [];
+          list.forEach(item => {
+              item.indexUrl = utils.getFirstImgUrl(item.listUrls);
+              item.productImgUrl = item.indexUrl ? item.indexUrl :defaultGoodsImg;
+          });
+          
           this.setData({
-            proList: data.content
+            proList: list
           })
         }
       }).finally(() => {

src/pages/wantToBuyDetail/wantToBuyDetail.wxss

@@ -34,15 +34,7 @@ scroll-view{
   color: #C09A74;
   border-bottom: 5rpx solid #C09A74;
 }
-swiper {
-  width: 100%;
-  flex: 1;
-  height:100vh;
-  /* padding-bottom:20rpx; */
-  position: absolute;
-  overflow: scroll;
-  top: 46rpx;
-}
+
 .buy-desc{
   padding: 0 30rpx;
 }

src/project.config.json

@@ -13,7 +13,7 @@
 	},
 	"compileType": "miniprogram",
 	"libVersion": "2.8.2",
-	"appid": "wxe6d270a3e399ade9",
+	"appid": "wxc3b64b09b1d3dfc2",
 	"projectname": "%E5%BE%AE%E5%95%86%E5%9F%8E",
 	"debugOptions": {
 		"hidedInDevtools": []
@@ -593,7 +593,7 @@
 					"id": 81,
 					"name": "导购发布种草内容",
 					"pathName": "shoppingGuid/page/pages/releaseContent/releaseContent",
-					"query": "id=690150609835417600",
+					"query": "",
 					"scene": null
 				},
 				{
@@ -632,10 +632,10 @@
 					"scene": null
 				},
 				{
-					"id": -1,
+					"id": 87,
 					"name": "刮刮卡",
 					"pathName": "subPackageMarketing/page/pages/scratch/scratch",
-					"query": "",
+					"query": "id=700043642982764548",
 					"scene": null
 				}
 			]

src/shoppingGuid/page/pages/home/home.js

@@ -530,8 +530,6 @@ wxService.page({
    * 用户点击右上角分享
    */
   onShareAppMessage: function (res) {
-    console.log(res)
-    console.log(this.data.shareModel)
     if (res.from == 'button') {
       return {
         title: this.data.shareModel.title,

src/shoppingGuid/page/pages/releaseContent/releaseContent.js

@@ -310,7 +310,7 @@ wxService.page({
     if(this.data.videoUrl){
       sspList.push({
         cover: 0,
-        videoUrl: item
+        videoUrl: this.data.videoUrl
       });
     }
 

src/subPackage/page/pages/myRelease/myRelease.js

@@ -15,7 +15,7 @@ wxService.page({
     categoryList: [], //分类
     baseImgUrl: app.globalData.imageUrl,
     pageNum: 1,
-    pageSize: 3,
+    pageSize: 10,
     totalPages: 0,
     totalElements: 0,
     currentTab: 0,

src/subPackage/page/pages/myReleaseDetail/myReleaseDetail.js

@@ -5,7 +5,7 @@ const utils = require('../../../../utils/util')
 const { memberId } = wx.getStorageSync('_baseUserInfo')
 import { Integer } from '../../../../utils/integerDigitalConvertion'
 const envInfo = require('../../../../config/index').envInfo
-
+const defaultGoodsImg = 'https://img3.bigaka.com/prd/3001/202003/20200331/30019aa78220-546f-41e0-8075-c2feb69e10b8.jpg';
 wxService.page({
 
   /**
@@ -13,6 +13,7 @@ wxService.page({
    */
   data: {
     id: '',
+    baseImgUrl: app.globalData.imageUrl,
     showDialig: false,
     showCardModal: false,
     currentShareContent: null,
@@ -136,7 +137,6 @@ wxService.page({
 
   //跳转商品详情
   onTapToGoodsInfo(e) {
-    console.log('0000',e)
     let item = e.currentTarget.dataset.item;
     let productId = e.currentTarget.dataset.productid;
     //组装一个临时触点信息对象到本地
@@ -161,15 +161,21 @@ wxService.page({
   //获取内容下商品列表
   getProList() {
     var params = {
-      productIds: this.data.contentInfo.productIds
+      productIds: this.data.contentInfo.productIds,
+      showListUrls : true,
     }
     if (this.data.contentInfo.productIds && this.data.contentInfo.productIds.length > 0) {
       wxService.post(`/sale/product/buyer/listPage?pageNo=${this.data.pageNo}&pageSize=${this.data.pageSize}`, params).then(res => {
         if (!res) return false
         const { result, data } = res.data
         if (result == 0 && data.content) {
+          let list = data.content ? data.content : [];
+          list.forEach(item => {
+              item.indexUrl = utils.getFirstImgUrl(item.listUrls);
+              item.productImgUrl = item.indexUrl ? item.indexUrl :defaultGoodsImg;
+          });
           this.setData({
-            proList: data.content
+            proList: list
           })
         }
       }).finally(() => {
@@ -185,13 +191,22 @@ wxService.page({
       userId: memberId
     }).then(res => {
       if (!res) return false
-      const { result, data } = res.data
-      console.log('content info ----------------------------------')
-      console.log(data)
+      const { result, data } = res.data;
       if (result == 0) {
+        let shareShowPictureRESDTOList = data.sspList ?  data.sspList : [];
+        shareShowPictureRESDTOList.forEach(item => {
+          if(item.url){
+            item.url = item.url.indexOf('http') > -1 ? item.url : this.data.baseImgUrl + item.url;
+          }
+          if(item.videoUrl){
+            item.videoUrl = item.videoUrl.indexOf('http') > -1 ? item.videoUrl : this.data.baseImgUrl + item.videoUrl;
+          }
+        });
+
         this.setData({
           contentInfo: data
-        })
+        });
+
         this.getProList()
       }
 
@@ -346,7 +361,6 @@ wxService.page({
       //修改为参数memberId
       var path = `pages/wantToBuyDetail/wantToBuyDetail`;
       const { memberId, member } = wx.getStorageSync('_baseUserInfo')
-      console.log('--------------------memberId-=---', memberId)
       if (memberId) {
         let m = Integer.digit(memberId, 10, 64);
         let contentId = Integer.digit(this.data.contentInfo.id,10,64);

src/subPackage/page/pages/myReleaseDetail/myReleaseDetail.wxss

@@ -20,7 +20,7 @@ page{
   margin-bottom: 30rpx;
 }
 .detail-desc {
-  min-height: 486rpx;
+  /* min-height: 486rpx; */
   line-height: 23px;
   color: rgba(0, 0, 0, 1);
   font-size: 30rpx;

src/subPackageMarketing/page/pages/scratch/scratch.js

@@ -2,7 +2,10 @@
 const wxService = require('../../../../utils/wxService')
 const utils = require('../../../../utils/util')
 import Scratch from '../../components/scratch/scratch.js'
+import { Integer } from '../../../../utils/integerDigitalConvertion'
 const app = getApp();
+const defaultWelcomeImage = 'https://img3.bigaka.com/test/1002/202004/20200413/10021096c17c-fbc6-49a8-a53c-8bbf0502df44.jpg';
+const defaultScratchCover = 'https://img3.bigaka.com/test/1002/202004/20200413/100208b0fbce-b73d-4af9-bd74-47d1ea5311d5.png';
 wxService.page({
 
   /**
@@ -11,14 +14,118 @@ wxService.page({
   data: {
     loading : true,
     btnName : '开始刮奖',
-    leftNum : 2,
+    leftNum : 0,
+    activityId : null,
+    activityInfo : {},
+    hasNoActivity : true,
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+    this.data.activityId = options.id;
+    if(this.data.activityId){
+      this.getActivityInfo();
+    }
+
+    this.handleShare(options);
+  },
+
+  //处理分享数据信息
+  handleShare(options){
+    //有触点切是用户分享的才调用接口
+    if(options.t && options.s == 'share'){
+      let t = Integer.digit(options.t, 64, 10);
+      wxService.post('/marketing/tentacleContent/queryTentacleContentById', { id: t }).then((res) => {
+        if(res){
+          let data = res.data.data ? res.data.data : null;
+          if(data){
+            if(data.type == 3){
+              let memberId = data.tentacleId;
+              this.markShareRecords(memberId,this.data.activityId);
+            }
+          }
+        }
+      });
+    }
+  },
+
+  //记录分享数据
+  markShareRecords(memberId,activityId){
+    wxService.post(`/marketing/lotteryMobile/shareRecord`,{
+      activityId : activityId,
+      memberId : memberId
+    }).then(res => {});
+  },
+
+  //查看规则
+  onTapToRule(){
+    let ruleImg = this.data.activityInfo.desc;
+    if(!ruleImg){
+      wx.showToast({
+        title: '商家暂未设置规则说明',
+        icon : 'none'
+      });
+      return ;
+    }
+
+    wx.navigateTo({
+      url: '/subPackageMarketing/page/pages/scratchRule/scratchRule?rule=' + encodeURIComponent(ruleImg),
+    });
+  },
+
+  //获取活动详情
+  getActivityInfo(){
+    wxService.get(`/marketing/lottery/findById?id=${this.data.activityId}`).then(res => {
+      let {result , data} = res.data;
+      if(result == 0 && data){
+          this.data.activityInfo = data;
+          this.data.activityInfo.path = 'subPackageMarketing/page/pages/scratch/scratch?id=' + this.data.activityInfo.id + '&s=share';
+          this.data.activityInfo.welcomeImage = this.data.activityInfo.welcomeImage ? this.data.activityInfo.welcomeImage : defaultWelcomeImage;
+          this.setData({
+            activityInfo : this.data.activityInfo,
+            hasNoActivity : false,
+          });
+
+          //生成触点
+          this.shareGenerateContent();
+          this.getUserCanScratchCount();
+          //初始化刮刮卡信息
           this.initScratch();
+      }
+      else{
+        wx.showToast({
+          title: '未获取到活动信息',
+          icon : 'none'
+        });
+        this.setData({
+          loading : false,
+          hasNoActivity : true,
+        })
+      }
+    })
+  },
+
+  //获取当前用户可刮刮卡次数
+  getUserCanScratchCount(){
+    if(!this.data.currentHasUserInfo) {
+      //初始化刮刮卡信息
+      return;
+    } ;
+    const { memberId } = wx.getStorageSync('_baseUserInfo');
+    let activityId = this.data.activityInfo.id;
+    wxService.post(`/marketing/lotteryMobile/getLotteryNumber?activityId=${activityId}&memberId=${memberId}`).then(res => {
+      if(res){
+        let count = res.data.data ? res.data.data : 0;
+        this.data.leftNum = count;
+        this.setData({
+          leftNum : this.data.leftNum,
+        });
+        //这里不判断数量是否没有了，都初始化挂版
+        this.scratch.start();
+      }
+    })
   },
 
   //开始刮奖或重新刮奖
@@ -34,7 +141,7 @@ wxService.page({
     if(this.data.btnName == '开始刮奖'){
       this.scratch.start();
       this.setData({
-        btnName : '重新刮奖'
+        btnName : '再刮一次'
       });
     }
     else{
@@ -49,19 +156,37 @@ wxService.page({
     this.scratch = new Scratch(this, {
         canvasWidth: width*0.9 - 30,
         canvasHeight: 130,
-        imageResource: 'https://img3.bigaka.com/test/1002/202004/20200413/100208b0fbce-b73d-4af9-bd74-47d1ea5311d5.png',
-        // maskColor: 'red',
-        r: 10,
-        awardTxt: '开奖中...',
+        imageResource: self.data.activityInfo.backColor ?  self.data.activityInfo.backColor : defaultScratchCover,
+        r: 15,
+        awardTxt: '多刮一点，再多刮一点😊😜',
         awardTxtColor: '#333333',
         awardTxtFontSize: '22px',
         callback: () => {
-            console.log('提示语')
-            this.scratch.setAwardText('恭喜您,中了100积分')
-            this.data.leftNum --;
-            this.setData({
-              leftNum : this.data.leftNum
+            if(self.data.leftNum > 0){
+              wx.showLoading({
+                title: '开奖中..',
+              });
+              self.getAwardInfo();
+            }
+            else{
+              //对不起，你的刮奖次数已用完,您可以去商城逛逛~
+              self.scratch.setAwardText('对不起，您的刮奖次数不足啦😭!');
+              wx.showModal({
+                title: '刮奖数不足提示',
+                content: '对不起，您的刮奖次数已用完,您可以去商城逛逛~',
+                showCancel: true,
+                cancelText: '取消',
+                confirmText: '去逛逛',
+                confirmColor: '#cb3c3c',
+                success: function (modalRes) {
+                  if(modalRes.confirm){
+                    wx.reLaunch({
+                      url: '/pages/userCenter/userCenter',
+                    });
+                  }
+                }
               });
+            }
         },
         initOkCallBack(){
           self.setData({
@@ -69,8 +194,74 @@ wxService.page({
           })
         },
     });
-    // this.scratch.start()
-    //this.scratch.restart()
+  },
+
+  //抽奖
+  getAwardInfo(){
+    const { memberId } = wx.getStorageSync('_baseUserInfo');
+    let activityId = this.data.activityInfo.id;
+    let self = this;
+    wxService.get(`/marketing/lotteryMobile/lottery?activityId=${activityId}&memberId=${memberId}`).then(res => {
+      if(res){
+        if(res.data.result == 0){
+          if(!res.data.data){
+            this.scratch.setAwardText(this.data.activityInfo.notWinning);
+            wx.showModal({
+              title: '刮奖结果提示',
+              content: this.data.activityInfo.notWinning,
+              showCancel: true,
+              cancelText: '关闭',
+              confirmText: '再刮一次',
+              confirmColor: '#cb3c3c',
+              success: function (modalRes) {
+                self.scratch.restart();
+              }
+            });
+          }
+          else{
+            let data = res.data.data;
+            if(data.thePrizeType == 1){
+              //中的积分
+              let integral = data.integral;
+              this.scratch.setAwardText(`恭喜您中了${integral}积分`);
+              wx.showModal({
+                title: '刮奖结果提示',
+                content: `恭喜您中了${integral}积分`,
+                showCancel: true,
+                cancelText: '关闭',
+                confirmText: '再刮一次',
+                confirmColor: '#cb3c3c',
+                success: function (modalRes) {
+                  self.scratch.restart();
+                }
+              });
+            }
+            else if(data.thePrizeType == 2){
+              //中的是优惠券
+              let couponList = data.couponList ;
+              let names = couponList.map(item => {
+                return item.couponName;
+              });
+              this.scratch.setAwardText(`恭喜您中了优惠券：“${names.join(',')}”`);
+              wx.showModal({
+                title: '刮奖结果提示',
+                content: `恭喜您中了优惠券：“${names.join(',')}”`,
+                showCancel: true,
+                cancelText: '关闭',
+                confirmText: '再刮一次',
+                confirmColor: '#cb3c3c',
+                success: function (modalRes) {
+                  self.scratch.restart();
+                }
+              });
+            }
+          }
+        }
+      }
+
+      this.getUserCanScratchCount();
+      wx.hideLoading();
+    });
   },
 
   /**
@@ -80,10 +271,48 @@ wxService.page({
 
   },
 
+  //分享生成触点
+  shareGenerateContent(){
+    //判断是否登录了
+    if(!this.data.currentHasUserInfo){
+      return ;
+    }
+
+    let content = {
+      title: this.data.activityInfo.name,
+      id: this.data.activityInfo.id,
+      url: this.data.activityInfo.sharePhotos
+    }
+    let tentacleInfo = {
+      content: JSON.stringify(content),
+      contentId: this.data.activityInfo.id,
+      contentType: app.globalData.contants.SHARE_TYPE.TRANSMIT, //内容类型 
+      title: this.data.activityInfo.name, //标题
+      type: 3// 1:门店,2:员工(暂时不做),3:会员,4:第三方外部渠道,5:智能营销
+    }
+
+    wxService.getTentacleContent(tentacleInfo).then(res => {
+      if (res && res.id) {
+        let tentacleId = res.id;
+        let inner_id = Integer.digit(this.data.activityInfo.id, 10, 64);
+        let inner_tentacleId = Integer.digit(tentacleId, 10, 64);
+        var path = 'subPackageMarketing/page/pages/scratch/scratch' + '?i=' + inner_id + '&t=' + inner_tentacleId + '&s=share';
+        this.data.activityInfo.path = path;
+      }
+    });
+
+  },
+
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
-
+  onShareAppMessage: function (res) {
+    if (res.from == 'menu') {
+      return {
+        title: this.data.activityInfo.shareTitle,
+        path: this.data.activityInfo.path,
+        imageUrl: this.data.activityInfo.sharePhotos
+      }
+    }
   }
-})
+});
\ No newline at end of file

src/subPackageMarketing/page/pages/scratch/scratch.wxml

@@ -2,7 +2,9 @@
 <import src="../../components/scratch/scratch.wxml" />
 <!--  布局 -->
 <!-- style="background-image:url(https://img3.bigaka.com/test/1002/202004/20200413/10021096c17c-fbc6-49a8-a53c-8bbf0502df44.jpg)" -->
-<view class="acticity-bg" style="background-image:url(https://img3.bigaka.com/test/1002/202004/20200413/10021096c17c-fbc6-49a8-a53c-8bbf0502df44.jpg)">
+
+<block wx:if="{{!hasNoActivity}}">
+  <view class="acticity-bg" style="background-image:url({{activityInfo.welcomeImage}})">
     <!-- 展示还有几次 -->
     <view class="scratch-count">您还有{{leftNum}}次刮奖机会</view>
     <view class="scratch-area" style="background-image:url(https://img3.bigaka.com/test/1002/202004/20200413/1002cc8ea3b2-7697-48e7-85e5-76e937f611e8.png)">
@@ -10,15 +12,23 @@
           <template is = "scratch" data = "{{scratch, isScroll}}"></template> 
         </view>
     </view>
-  
-  <view class="scratch-btn" bindtap="onClickStartScratch">{{btnName}}</view>
-</view>
-<!-- 查看规则 -->
-<view class="view-rule">查看规则</view>
+    <!-- 未登录 -->
+    <button wx:if="{{!currentHasUserInfo}}"
+      bindgetuserinfo="_getUserInfo"
+      class="scratch-btn"
+      open-type='getUserInfo'>登录刮奖</button>
+    <!-- <view wx:if="{{currentHasUserInfo && btnName == '再刮一次'}}" class="scratch-btn" bindtap="onClickStartScratch">{{btnName}}</view> -->
+  </view>
+  <!-- 查看规则 -->
+  <view class="view-rule" bindtap="onTapToRule">查看规则</view>
+</block>
 
 <!-- loading -->
 <loading wx:if="{{loading}}"/>
 
+<!-- 未获取活动信息时 -->
+<view wx:if="{{hasNoActivity}}"></view>
+
 
 
 

src/subPackageMarketing/page/pages/scratch/scratch.wxss

@@ -69,7 +69,10 @@ view{
 .scratch-btn{
   width: 35vw;
   height: 70rpx;
-  background: #ffffff;
+  background: #ffe88e;
+  /* background: transparent; */
+  /* border: solid 1rpx #ffffff; */
+  color: #ffffff;
   font-size: 28rpx;
   display: flex;
   align-items: center;

src/subPackageMarketing/page/pages/scratchRule/app.wxss

+/**app.wxss**/
+.container {
+	height: 100%;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: space-between;
+	padding: 200rpx 0;
+	box-sizing: border-box;
+}
+.wpl {
+  white-space:pre-line;
+}
+/* 主题色 */
+
+.theme-color {
+	background-color: #cb3c3c;
+}
+
+.theme-text-color {
+	color: #cb3c3c;
+}
+
+.empty{
+  width: 100%;
+  height: 200rpx;
+  display: flex;
+  color: #999999;
+  justify-content: center;
+  align-items: center;
+  font-size: 24rpx;
+}
+
+.no-more-data{
+  width: 100%;
+  height: auto;
+  padding: 20rpx 0;
+  display: flex;
+  color: #999999;
+  justify-content: center;
+  align-items: center;
+  font-size: 24rpx;
+}
+
+/* 按钮样式 */
+.btn {
+	width: 100%;
+	margin-left: 0;
+	margin-right: 0;
+	padding-left: 0;
+	padding-right: 0;
+	border-radius: 0;
+}
+.btn:active {
+	opacity: 0.5;
+}
+.btn-default {
+	background: none;
+	color: #808080;
+	border: 1px solid #808080;
+}
+
+.btn-primary {
+	background-color: #cb3c3c;
+	color: #ffffff;
+	border: 1px solid #cb3c3c;
+	font-size: 25rpx;
+}
+.btn-gray {
+	background-color: #959595;
+	color: #ffffff;
+	border: 1px solid #959595;
+	font-size: 25rpx;
+}
+.btn-outline {
+	background: none;
+	color: #cb3c3c;
+}
+
+.clear-btn{
+  appearance: none;
+  border: none;
+  background: transparent;
+  margin: 0;
+}
+
+.positionRe{
+  position: relative;
+}
+
+.positionAbs{
+  position: absolute;
+  z-index: 2;
+  width: 100%;
+  height: 100%;
+  left: 0;
+  top: 0;
+}
+
+/* 按钮大小 */
+.btn-xs {
+	height: 39rpx;
+	line-height: 39rpx;
+}
+.btn-sm {
+	height: 46rpx;
+	line-height: 46rpx;
+}
+.btn-lg {
+	height: 88rpx;
+	line-height: 88rpx;
+}
+.fixed-bottom0 {
+	position: fixed;
+	bottom: 0;
+	width: 100%;
+	z-index: 9999;
+}
+
+.pr {
+	float: right;
+}
+
+.df {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+/*文字居中*/
+.tc {
+	text-align: center;
+}
+.df-1 {
+	flex: 1;
+}

src/subPackageMarketing/page/pages/scratchRule/scratchRule.js

+// subPackageMarketing/page/pages/scratchRule/scratchRule.js
+const wxService = require('../../../../utils/wxService')
+const utils = require('../../../../utils/util')
+wxService.page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    ruleSrc : ''
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    let rule = options.rule ? decodeURIComponent(options.rule) : null;
+    this.data.ruleSrc = rule;
+    this.setData({
+      ruleSrc : this.data.ruleSrc
+    });
+    wx.hideShareMenu();
+  },
+})
\ No newline at end of file

src/subPackageMarketing/page/pages/scratchRule/scratchRule.json

+{
+  "disableScroll": true,
+  "navigationBarTitleText": "刮刮卡",
+  "usingComponents": {}
+}
\ No newline at end of file

src/subPackageMarketing/page/pages/scratchRule/scratchRule.wxml

+<!--subPackageMarketing/page/pages/scratchRule/scratchRule.wxml-->
+<image mode="widthFix" src="{{ruleSrc}}"></image>

src/subPackageMarketing/page/pages/scratchRule/scratchRule.wxss

+/* subPackageMarketing/page/pages/scratchRule/scratchRule.wxss */
+
+page{
+   box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+}
+
+view{
+  box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+}
+
+image{
+  display: block;
+  width: 100%;
+}
\ No newline at end of file

src/wxParser/index.wxss

@@ -12,7 +12,8 @@
 .wxParser-inline {
   display: inline;
   margin: 0;
-  padding: 0; }
+  padding: 0; 
+}
 
 .wxParser-div {
   margin: 0;