Merge branch 'mall_dev_7.11.0' into 'hotwind_dev_7.12.0'

优化刮刮卡

See merge request !193

src/subPackageMarketing/page/components/scratch/scratch.js

@@ -180,10 +180,10 @@ class Scratch {
     //清除
     areaIsOk(){
       const { canvasWidth, canvasHeight, minX, minY, maxX, maxY } = this
-      if (maxX - minX > .2 * canvasWidth && maxY - minY > .2 * canvasHeight) {
+      if (maxX - minX > .3 * canvasWidth && maxY - minY > .3 * canvasHeight) {
+        this.isStart = false
         this.ctx.draw()
         this.endCallBack && this.endCallBack()
-        this.isStart = false
         this.page.setData({
           'isScroll': true
         })

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

@@ -221,7 +221,7 @@ wxService.page({
             this.scratch.setAwardText(this.data.activityInfo.notWinning);
             wx.showModal({
               title: '刮奖结果提示',
-              content: this.data.activityInfo.notWinning,
+              content: this.data.activityInfo.notWinning ? this.data.activityInfo.notWinning : '很遗憾，您未中奖',
               showCancel: true,
               cancelText: '关闭',
               confirmText: '再刮一次',