修改bug

.tea/configuration/mini-program.json

-{"tinyType":"alipay","tinyCnName":"支付宝","tinyProjectType":"alipay-mini","alipay:alipay-mini:tinyIcon":"https://gw.alipayobjects.com/zos/rmsportal/rcwFIauzePpMqlTzzanK.svg","alipay:alipay-mini:auditLink":null,"alipay:alipay-mini:whiteListLink":null,"alipay:alipay-mini:createLink":null,"alipay:alipay-mini:component2":true,"alipay:alipay-mini:_enableAutoPush":false,"alipay:alipay-mini:_appIdList":[{"appid":"2019101168315187","name":"广东7-Eleven会员俱乐部"},{"appid":"2019092667869080","name":"名称释放00279678"},{"appid":"2019092667878018","name":"名称释放00309560"},{"appid":"2019091967575819","name":"名称释放00286936"}],"alipay:alipay-mini:uploadTime":"2020-05-20 10:26:00","alipay:alipay-mini:packageSize":0,"alipay:alipay-mini:MockStore":{"_showCouponDialog":"true","_userInfo":{"code":"10000","msg":"Success","avatar":"https://tfs.alipayobjects.com/images/partner/T1yVJjXnxgXXXXXXXX","city":"上海市","countryCode":"CN","gender":"m","nickName":"谢中龙","province":"上海"},"reLoginErr":false,"token":"7b904616ad184b23b5e9f78f419abf52","_loginCode":"316aaf42677044da9daba9a368a5UX45","_accreditUserInfo":{"code":"10000","msg":"Success","avatar":"https://tfs.alipayobjects.com/images/partner/T1yVJjXnxgXXXXXXXX","city":"上海市","countryCode":"CN","gender":"m","nickName":"谢中龙","province":"上海"},"_baseUserInfo":{"applyCardUrl":"https%3A%2F%2Fmemberprod.alipay.com%2Faccount%2Fopenform%2Factivecard.htm%3Fapp_id%3D2019101168315187%26template_id%3D20191018000000002120493000300552%26__webview_options__%3DcanPullDown%253dNO%2526transparentTitle%253dauto%26out_string%3Dalipay","authToken":"composeB431dcd83ab4049bbb2266a29d0c5fE45","member":{"activateAlipayCardTime":"2019-11-07 08:20:12","activateWxCardTime":"2019-06-28 09:58:15","address":"上海市-上海市-浦东新区-盛夏路58号天之骄子创业公寓6号楼蜂巢柜","alipayCardOpenDate":"2019-11-07 08:20:12","alipayUserId":"2088702833166455","brandId":"2711","cardNoAlipay":"svneleven0003335945","cardNoWeixin":"305490426989","code":"770084118008766216","createTime":"2019-06-28 09:58:15","email":"xiezl@bigaka.com","exp":0,"id":"594104268563292160","level":0,"lock":false,"memberWeixin":{"nickname":"言夕","sex":"男"},"memberWeixinApps":[{"appid":"wx700028bf32a3be66","openid":"oUOIF0basUF5heHcuZwvPSEJIG3E","unionid":"oV1j3vwp9HNqOhwN2Fl0gIOVHDr4"}],"mobile":"18817382046","name":"谢中龙","openid":"of8NluBTFNqUHHpPogObPN2vb3Qo","registerTime":"2019-06-28 09:58:15","sex":"保密","storeId":"2711","unionid":"oV1j3vwp9HNqOhwN2Fl0gIOVHDr4","updateTime":"2020-04-21 14:16:32"},"memberActivateStatus":true,"memberId":"594104268563292160","outerStr":"{\"activateType\":\"normal\"}","token":"7b904616ad184b23b5e9f78f419abf52"}},"alipay:alipay-mini:userAuthorization":["userInfo"],"alipay:alipay-mini:_appId":"2019101168315187","alipay:alipay-mini:_appName":"广东7-Eleven会员俱乐部","alipay:alipay-mini:remoteVersion":"1.0.51","alipay:alipay-mini:currentVersion":"1.0.52","alipay:alipay-mini:whiteList":["b.bigaka.com"],"alipay:alipay-mini:h5WhiteList":[],"alipay:alipay-mini:appLogo":"https://appstoreisvpic.alipayobjects.com/prod/6ac7a3a5-d755-458e-9da7-1b03a72f61d2.png","isSimulatorOpen":true,"isNotFirstToggleSimulator":true,"alipay:alipay-mini:lastDeviceName":"iPhone 6 Plus","compilerList":[{"title":"普通编译","query":"","page":""},{"title":"超值卡列表","page":"subPackage/page/pages/valueCard/valueCard"},{"title":"领券中心","page":"subPackage/page/pages/couponCenter/couponCenter"},{"title":"领券中心详情","page":"subPackage/page/pages/couponCenterInfo/couponCenterInfo","pageQuery":"id=702214327956017152"},{"title":"消费集点列表","page":"pages/pointList/pointList"},{"title":"领券中心","page":"subPackage/page/pages/couponCenter/couponCenter"},{"title":"首页","page":"pages/userCenter/userCenter"},{"title":"集点活动详情","page":"pages/pointDetail/pointDetail","pageQuery":"id=711939547193294848"}],"compilerIndex":7,"SimulatorMode":"EMBED"}
+{"tinyType":"alipay","tinyCnName":"支付宝","tinyProjectType":"alipay-mini","alipay:alipay-mini:tinyIcon":"https://gw.alipayobjects.com/zos/rmsportal/rcwFIauzePpMqlTzzanK.svg","alipay:alipay-mini:auditLink":null,"alipay:alipay-mini:whiteListLink":null,"alipay:alipay-mini:createLink":null,"alipay:alipay-mini:component2":true,"alipay:alipay-mini:_enableAutoPush":false,"alipay:alipay-mini:_appIdList":[{"appid":"2019101168315187","name":"广东7-Eleven会员俱乐部"},{"appid":"2019092667869080","name":"名称释放00279678"},{"appid":"2019092667878018","name":"名称释放00309560"},{"appid":"2019091967575819","name":"名称释放00286936"}],"alipay:alipay-mini:uploadTime":"2020-05-23 12:12:16","alipay:alipay-mini:packageSize":null,"alipay:alipay-mini:MockStore":{"_showCouponDialog":"true","_userInfo":{"code":"10000","msg":"Success","avatar":"https://tfs.alipayobjects.com/images/partner/T1yVJjXnxgXXXXXXXX","city":"上海市","countryCode":"CN","gender":"m","nickName":"谢中龙","province":"上海"},"reLoginErr":false,"token":"0071a59dfee84ccebe3aec0a7d9819b8","_loginCode":"cb1b4c43158c48db9737e657bfc7XX45","_accreditUserInfo":{"code":"10000","msg":"Success","avatar":"https://tfs.alipayobjects.com/images/partner/T1yVJjXnxgXXXXXXXX","city":"上海市","countryCode":"CN","gender":"m","nickName":"谢中龙","province":"上海"},"_baseUserInfo":{"applyCardUrl":"https%3A%2F%2Fmemberprod.alipay.com%2Faccount%2Fopenform%2Factivecard.htm%3Fapp_id%3D2019101168315187%26template_id%3D20191018000000002120493000300552%26__webview_options__%3DcanPullDown%253dNO%2526transparentTitle%253dauto%26out_string%3Dalipay","authToken":"composeB89c04e63566a40188cd378e2db5caF45","member":{"activateAlipayCardTime":"2019-11-07 08:20:12","activateWxCardTime":"2019-06-28 09:58:15","address":"上海市-上海市-浦东新区-盛夏路58号天之骄子创业公寓6号楼蜂巢柜","alipayCardOpenDate":"2019-11-07 08:20:12","alipayUserId":"2088702833166455","brandId":"2711","cardNoAlipay":"svneleven0003335945","cardNoWeixin":"305490426989","code":"770084118008766216","createTime":"2019-06-28 09:58:15","email":"xiezl@bigaka.com","exp":0,"id":"594104268563292160","level":0,"lock":false,"memberWeixin":{"nickname":"言夕","sex":"男"},"memberWeixinApps":[{"appid":"wx700028bf32a3be66","openid":"oUOIF0basUF5heHcuZwvPSEJIG3E","unionid":"oV1j3vwp9HNqOhwN2Fl0gIOVHDr4"}],"mobile":"18817382046","name":"谢中龙","openid":"of8NluBTFNqUHHpPogObPN2vb3Qo","registerTime":"2019-06-28 09:58:15","sex":"保密","storeId":"2711","unionid":"oV1j3vwp9HNqOhwN2Fl0gIOVHDr4","updateTime":"2020-04-21 14:16:32"},"memberActivateStatus":true,"memberId":"594104268563292160","outerStr":"{\"activateType\":\"normal\"}","token":"0071a59dfee84ccebe3aec0a7d9819b8"}},"alipay:alipay-mini:userAuthorization":["userInfo"],"alipay:alipay-mini:_appId":"2019101168315187","alipay:alipay-mini:_appName":"广东7-Eleven会员俱乐部","alipay:alipay-mini:remoteVersion":"1.0.54","alipay:alipay-mini:currentVersion":"1.0.55","alipay:alipay-mini:whiteList":["b.bigaka.com"],"alipay:alipay-mini:h5WhiteList":[],"alipay:alipay-mini:appLogo":"https://appstoreisvpic.alipayobjects.com/prod/6ac7a3a5-d755-458e-9da7-1b03a72f61d2.png","isSimulatorOpen":true,"isNotFirstToggleSimulator":true,"alipay:alipay-mini:lastDeviceName":"iPhone 6 Plus","compilerList":[{"title":"普通编译","query":"","page":""},{"title":"超值卡列表","page":"subPackage/page/pages/valueCard/valueCard"},{"title":"领券中心","page":"subPackage/page/pages/couponCenter/couponCenter"},{"title":"领券中心详情","page":"subPackage/page/pages/couponCenterInfo/couponCenterInfo","pageQuery":"id=702214327956017152"},{"title":"消费集点列表","page":"pages/pointList/pointList"},{"title":"领券中心","page":"subPackage/page/pages/couponCenter/couponCenter"},{"title":"首页","page":"pages/userCenter/userCenter"},{"title":"集点活动详情","page":"pages/pointDetail/pointDetail","pageQuery":"id=711939547193294848"}],"compilerIndex":7,"SimulatorMode":"EMBED"}
\ No newline at end of file

.tea/editorTabs.json

-{"tabs":["file:///d%3A/work/711Web/711/7_Eleven_Alipay/pages/pointDetail/pointDetail.js"],"current":"file:///d%3A/work/711Web/711/7_Eleven_Alipay/pages/pointDetail/pointDetail.js","storageVersion":"0.70.14"}
+{"tabs":["file:///d%3A/work/711Web/711/7_Eleven_Alipay/pages/pointDetail/pointDetail.js","file:///d%3A/work/711Web/711/7_Eleven_Alipay/pages/pointDetail/pointDetail.axml","file:///d%3A/work/711Web/711/7_Eleven_Alipay/config/index.js","file:///d%3A/work/711Web/711/7_Eleven_Alipay/pages/coupons/coupons.axml","file:///d%3A/work/711Web/711/7_Eleven_Alipay/pages/coupons/coupons.js"],"current":"file:///d%3A/work/711Web/711/7_Eleven_Alipay/pages/pointDetail/pointDetail.js","storageVersion":"0.70.14"}
\ No newline at end of file

.tea/recentlyTouched.json

-{"files":["d:\\work\\711Web\\711\\7_Eleven_Alipay\\pages\\pointDetail\\tools.wxs","d:\\work\\711Web\\711\\7_Eleven_Alipay\\component\\progressImage\\progressImage.acss","d:\\work\\711Web\\711\\7_Eleven_Alipay\\component\\dialogStockEmpty\\dialogStockEmpty.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\component\\authorization-modal\\authorization-modal.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\wx2my.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\utils\\router.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\project.config.json","d:\\work\\711Web\\711\\7_Eleven_Alipay\\app.json","d:\\work\\711Web\\711\\7_Eleven_Alipay\\pages\\pointList\\pointList.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\goToHome\\goToHome.axml","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\goToHome\\goToHome.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\goToHome\\goToHome.acss","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\valueCardInfo\\valueCardInfo.json","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\valueCardInfo\\valueCardInfo.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\pages\\userCenter\\userCenter.json","d:\\work\\711Web\\711\\7_Eleven_Alipay\\pages\\userCenter\\userCenter.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\pages\\userCenter\\userCenter.axml","d:\\work\\711Web\\711\\7_Eleven_Alipay\\component\\authorization-modal\\authorization-modal.axml","d:\\work\\711Web\\711\\7_Eleven_Alipay\\component\\authorization-modal-point\\authorization-modal-point.axml","d:\\work\\711Web\\711\\7_Eleven_Alipay\\component\\statusPoint\\statusPoint.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\utils\\wxService.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\wxs\\utils.sjs","d:\\work\\711Web\\711\\7_Eleven_Alipay\\component\\authorization-modal-point\\authorization-modal-point.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\component\\authorization-modal-point\\authorization-modal-point.json","d:\\work\\711Web\\711\\7_Eleven_Alipay\\component\\authorization-modal-point\\authorization-modal-point.acss","d:\\work\\711Web\\711\\7_Eleven_Alipay\\pages\\integralMallDetail\\integralMallDetail.axml","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\exchangeAddress\\exchangeAddress.axml","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\exchangeAddress\\exchangeAddress.acss","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\couponCenterInfo\\couponCenterInfo.json","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\couponCenterInfo\\couponCenterInfo.axml","d:\\work\\711Web\\711\\7_Eleven_Alipay\\component\\imageDialog\\imageDialog.axml","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\IntegrateGoodsExchangeInfo\\IntegrateGoodsExchangeInfo.axml","d:\\work\\711Web\\711\\7_Eleven_Alipay\\component\\imageSwiper\\imageSwiper.acss","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\IntegrateGoodsExchangeInfo\\IntegrateGoodsExchangeInfo.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\component\\dialog\\dialog.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\component\\imageSwiper\\imageSwiper.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\component\\home-modal\\home-modal.acss","d:\\work\\711Web\\711\\7_Eleven_Alipay\\utils\\common.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\utils\\currentLinkRouter.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\configScreen\\configScreen.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\app.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\component\\picNav\\picNav.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\component\\picNav\\picNav.axml","d:\\work\\711Web\\711\\7_Eleven_Alipay\\Behavior.js"],"storageVersion":"0.70.14"}
+{"files":["d:\\work\\711Web\\711\\7_Eleven_Alipay\\pages\\pointDetail\\pointDetail.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\pages\\coupons\\coupons.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\config\\index.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\component\\dialog\\dialog.acss","d:\\work\\711Web\\711\\7_Eleven_Alipay\\component\\dialog\\dialog.axml","d:\\work\\711Web\\711\\7_Eleven_Alipay\\component\\dialogStockEmpty\\dialogStockEmpty.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\utils\\wxService.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\utils\\Http.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\component\\authorization-modal\\authorization-modal.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\pages\\pointDetail\\tools.wxs","d:\\work\\711Web\\711\\7_Eleven_Alipay\\component\\progressImage\\progressImage.acss","d:\\work\\711Web\\711\\7_Eleven_Alipay\\wx2my.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\utils\\router.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\project.config.json","d:\\work\\711Web\\711\\7_Eleven_Alipay\\app.json","d:\\work\\711Web\\711\\7_Eleven_Alipay\\pages\\pointList\\pointList.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\goToHome\\goToHome.axml","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\goToHome\\goToHome.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\goToHome\\goToHome.acss","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\valueCardInfo\\valueCardInfo.json","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\valueCardInfo\\valueCardInfo.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\pages\\userCenter\\userCenter.json","d:\\work\\711Web\\711\\7_Eleven_Alipay\\pages\\userCenter\\userCenter.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\pages\\userCenter\\userCenter.axml","d:\\work\\711Web\\711\\7_Eleven_Alipay\\component\\authorization-modal\\authorization-modal.axml","d:\\work\\711Web\\711\\7_Eleven_Alipay\\component\\authorization-modal-point\\authorization-modal-point.axml","d:\\work\\711Web\\711\\7_Eleven_Alipay\\component\\statusPoint\\statusPoint.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\wxs\\utils.sjs","d:\\work\\711Web\\711\\7_Eleven_Alipay\\component\\authorization-modal-point\\authorization-modal-point.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\component\\authorization-modal-point\\authorization-modal-point.json","d:\\work\\711Web\\711\\7_Eleven_Alipay\\component\\authorization-modal-point\\authorization-modal-point.acss","d:\\work\\711Web\\711\\7_Eleven_Alipay\\pages\\integralMallDetail\\integralMallDetail.axml","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\exchangeAddress\\exchangeAddress.axml","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\exchangeAddress\\exchangeAddress.acss","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\couponCenterInfo\\couponCenterInfo.json","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\couponCenterInfo\\couponCenterInfo.axml","d:\\work\\711Web\\711\\7_Eleven_Alipay\\component\\imageDialog\\imageDialog.axml","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\IntegrateGoodsExchangeInfo\\IntegrateGoodsExchangeInfo.axml","d:\\work\\711Web\\711\\7_Eleven_Alipay\\component\\imageSwiper\\imageSwiper.acss","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\IntegrateGoodsExchangeInfo\\IntegrateGoodsExchangeInfo.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\component\\imageSwiper\\imageSwiper.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\component\\home-modal\\home-modal.acss","d:\\work\\711Web\\711\\7_Eleven_Alipay\\utils\\common.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\utils\\currentLinkRouter.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\configScreen\\configScreen.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\app.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\component\\picNav\\picNav.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\component\\picNav\\picNav.axml","d:\\work\\711Web\\711\\7_Eleven_Alipay\\Behavior.js"],"storageVersion":"0.70.14"}
\ No newline at end of file

component/dialog/dialog.axml

-<!--component/noMore.axml-->
-<view class="detail-list-bottom">-已经到底啦-</view>
+<!--component/dialog/dialog.wxml-->
+
\ No newline at end of file
+<view class='wxy-dialog fade {{show ? "in":""}}'>
+  <view a:if="{{show}}">
+    <view data-id="mask" class="dialog-mask" capture-catch:touchstart='_close'></view>
+    <view class='dialog-body' a:if="{{showDefalut && dialog.state !== 'success'}}">
+      <view class='main' onTap='_handleGo'>
+        <view class='content' style="background-image: url('{{dialog.image}}');">
+        </view>
+      </view>
+      <view class="close" onTap='_close'></view>
+    </view>
+    <view class='dialog-body' onTap='_close' a:if="{{showDefalut && dialog.state === 'success'}}">
+      <view a:if="{{dialog.image}}">
+        <image class="image" mode="widthFix" src='{{dialog.image}}'></image>
+      </view>
+    </view>
+    <slot name="after"></slot>
+  </view>
+</view>
+

component/dialog/dialog.js

 const wx2my = require('../../wx2my');
 const Behavior = require('../../Behavior');
+const wxService = require('../../utils/wxService')
 // component/noMore.js
 Component({
   /**
    * 页面的初始数据
    */
-  data: {},
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {},
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {},
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {},
-
   /**
-   * 生命周期函数--监听页面隐藏
+   * 组件的属性列表
    */
-  onHide: function () {},
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {},
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {},
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {},
+  properties: {
+    type: {
+      type: String,
+      value: 'alert'
+    },
+    stopMask: {
+      type: Boolean,
+      value: false
+    },
+    show: {
+      type: Boolean,
+      value: false,
+      observer: '_showChange'
+    },
+    dialog: {
+      type: Object,
+      value: null,
+      observer: '_configChange'
+    },
+    showDefalut: {
+      type: Boolean,
+      value: true,
+      observer: '_showDefalutChange'
+    }
+  },
+  data: {},
 
   /**
-   * 用户点击右上角分享
+   * 组件的方法列表
    */
-  onShareAppMessage: function () {}
+  methods: {
+    _handleGo() {
+      this.props.onHandleGo();
+    },
+    _updateData(data) {
+      if (data) {
+        this.setData(data)
+      }
+    },
+    _showChange(newV, oldV) {
+      if (newV !== oldV) {
+        this._updateData({
+          show: newV
+        })
+      }
+    },
+    _showDefalutChange(newV, oldV) {
+      if (newV !== oldV) {
+        this._updateData({
+          showDefalut: newV
+        })
+      }
+    },
+    _configChange(newV, oldV) {
+      if (newV !== oldV) {
+        this._updateData({
+          config: newV
+        })
+      }
+    },
+    _close(e) {
+      let o = e.currentTarget.dataset
+      if (this.data.stopMask && o.id === 'mask') {
+        return false
+      }
+      this._updateData({
+        show: false
+      })
+      // 触发父级事件
+      wxService.nextTick(() => {
+        this.props.onCloseDialog();
+      })
+    }
+  }
 });
\ No newline at end of file

pages/coupons/coupons.axml

@@ -45,7 +45,8 @@
               </view>
               <view class="coupon-info">
                 <view class="coupon-name fs-28">{{item.title}}</view>
-                <view class="coupon-time fs-24">{{item.startTime}} 至 {{item.endTime}}</view>
+                <view class="coupon-time fs-24">开始：{{item.startTime}}</view>
+                <view class="coupon-time fs-24">过期：{{item.endTime}}</view>
                 <!-- <view class='coupon-desc fs-24'>{{item.notice}}</view> -->
               </view>
               <view

pages/coupons/coupons.js

@@ -160,8 +160,8 @@ wxService.page({
 
         if (!data.content) return false;
         data.content.forEach(item => {
-          item.startTime = item.startTime.substring(0, 10);
-          item.endTime = item.endTime.substring(0, 10);
+          item.startTime = item.startTime;
+          item.endTime = item.endTime;
         }); // 可使用 or 已失效
 
         if (statusNum == 1) {

pages/pointDetail/pointDetail.acss

@@ -103,3 +103,107 @@
   display: block;
   clear: both; 
 }
+
+
+/* 弹出框 */
+/* component/dialog/dialog.wxss */
+.dialog-mask {
+  display: block;
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  opacity: 1;
+  z-index: 99;
+  background: rgba(0, 0, 0, 0.5);
+  tap-highlight-color: rgba(0, 0, 0, 0);
+  transition: opacity .4s; }
+
+.dialog-body {
+  width: 570rpx;
+  position: fixed;
+  top: 36%;
+  left: 50%;
+  transform: translate(-50%,-50%);
+  z-index: 100;
+  text-align: center;
+  opacity: 1;
+  transition: all .3s ease-out;
+  }
+
+.dialog-body .main {
+  outline: 0;
+  background-clip: padding-box;
+  margin-top: 0; }
+
+.dialog-body .content {
+  height: 680rpx;
+  position: relative;
+  background-size: 100% 100%;
+  background-repeat: no-repeat;
+  box-sizing: border-box;
+  padding-top: 180px;}
+
+.dialog-body .image {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%; }
+
+.dialog-body .p {
+  padding: 20rpx 60rpx;
+  box-sizing: border-box;
+  margin: 0;
+  text-align: center;
+  line-height: 37rpx; 
+  height: 37rpx; 
+  text-align: center;
+  color: rgba(120, 120, 120, 1);
+  font-size: 26rpx; 
+  font-family: PingFangSC-Regular;}
+
+.dialog-body .footer {
+  height: 200rpx;
+  background: #fff;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  text-align: center;
+  padding: 0;
+  border-radius: 0 0 20rpx 20rpx; }
+
+.dialog-body .tip-text {
+  padding: 102rpx;
+  color: rgba(255, 255, 255, 1);
+  box-sizing: border-box;
+  font-size: 36rpx;
+  font-family: SourceHanSansCN-Medium; 
+  cursor: pointer; }
+
+.dialog-body .close {
+  cursor: pointer;
+  position: absolute;
+  width: 84rpx;
+  height: 84rpx;
+  border-radius: 50%;
+  overflow: hidden;
+  -webkit-transform: translate(-50%, -50%);
+  -ms-transform: translate(-50%, -50%);
+  transform: translate(-50%, -50%);
+  left: 50%;
+  bottom: -160rpx;
+  background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEsAAABLCAYAAAA4TnrqAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA3FpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTM4IDc5LjE1OTgyNCwgMjAxNi8wOS8xNC0wMTowOTowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDpmNGMyM2YzYi01MDVjLTM5NDAtYmMzOC0xNmEyZDBhOWI0MzMiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6OTFCQzdFQTQwQTQ5MTFFODk2QUI5MTFDNzM4ODNENTUiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6OTFCQzdFQTMwQTQ5MTFFODk2QUI5MTFDNzM4ODNENTUiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIChXaW5kb3dzKSI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOjJmMjkzOGE1LTVlZmItZDc0NS1hNGM4LTUyZTlmYWYwZmE5YSIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDpmNGMyM2YzYi01MDVjLTM5NDAtYmMzOC0xNmEyZDBhOWI0MzMiLz4gPC9y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);
+  background-repeat: no-repeat;
+  background-size: cover; }
+
+.fade.in {
+  opacity: 1;
+  transition: opacity .3s linear;
+}
+
+.fade {
+    opacity: 0;
+    transition: opacity .3s linear;
+}
\ No newline at end of file

pages/pointDetail/pointDetail.axml

@@ -46,10 +46,10 @@
     </view>
 
 	</view>
-	<button a:if="{{showGetBtn}}" onTap="handleToGet" class="info-status-btn border_box available breathe-btn" disabled="{{isDisabled}}">可领取奖励
+	<button a:if="{{getBtnStatus}}" onTap="handleToGet" class="info-status-btn border_box available breathe-btn" disabled="{{isDisabled}}">可领取奖励
 		<text class="total-points"> {{countObj.surplusExchangeCount}} </text>次
 	</button>
-	<view a:if="{{!showGetBtn}}" class="info-status-btn unacommpolished border_box">
+	<view a:if="{{!getBtnStatus}}" class="info-status-btn unacommpolished border_box">
 		还未达成，继续加油呀
 	</view>
 
@@ -64,12 +64,32 @@
 
 <x-dialog
  dialog="{{dialog}}"
- bind:handleGo="handleGo"
- bind:_closeDialog="_closeDialog"
+ onHandleGo="handleGo"
+ onCloseDialog="_closeDialog"
  show="{{dialog.show}}"
 />
 
 <authorization-modal isAuthorization="{{isAuthorization}}"/>
-
 <image-dialog showDialog="{{showDonateImgUrl}}" imageUrl="{{donateImgUrl}}" onDialogTap="onDialogTap"/>
 
+
+<view class='wxy-dialog fade {{dialog.show ? "in":""}}'>
+  <view a:if="{{dialog.show}}">
+    <view data-id="mask" class="dialog-mask" onTap='_closeDialog'></view>
+    <view class='dialog-body' a:if="{{dialog.state !== 'success'}}">
+      <view class='main' onTap='handleGo'>
+        <view class='content' style="background-image: url('{{dialog.image}}');">
+        </view>
+      </view>
+      <view class="close" onTap='_closeDialog'></view>
+    </view>
+    <view class='dialog-body' onTap='_closeDialog' a:if="{{dialog.state === 'success'}}">
+      <view a:if="{{dialog.image}}">
+        <image class="image" mode="widthFix" src='{{dialog.image}}'></image>
+      </view>
+    </view>
+    <slot name="after"></slot>
+  </view>
+</view>
+
+

pages/pointDetail/pointDetail.js

@@ -40,6 +40,7 @@ wxService.page({
     isDisabled: false,
     hideGetBtn: true, // 默认隐藏 可领取按钮
     showGetBtn: false, // 默认展示 未达成按钮
+    getBtnStatus : false,//默认是还未达成，继续加油呀
     currentStatus: 2, // 活动状态  1 未生效 2 生效中 3 已失效 0 已删除
     currentTimeStatus: 1, // 1 进行中 2 已结束 3 未开始
     isAuthorization: false,
@@ -58,11 +59,7 @@ wxService.page({
    */
   onLoad: function(options) { 
     let id = options.id ? options.id : null;
-    if(id){
-      this.data.id = id;
-      this.getUserIsLogin();
-    }
-
+    this.data.id = options.id;
   },
 
   //用户是否登录
@@ -213,6 +210,7 @@ wxService.page({
             surplusExchangeCount: data.surplusExchangeCount,
             hideGetBtn: hasNum ? false : true,
             showGetBtn: hasNum ? true : false,
+            getBtnStatus : hasNum ? true : false,
           }, () => {
             wx2my.hideLoading();
             this.generatePointInfo();
@@ -387,6 +385,13 @@ wxService.page({
    * 生命周期函数--监听页面显示
    */
   onShow: function() {
+    if(this.options){
+      if(this.options.id){
+         this.data.id = this.options.id;
+      }
+    }
+    
+    this.getUserIsLogin();
   },
 
   onPullDownRefresh(){