优化功能

.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":false,"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-04-19 14:29:17","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":"3a79b40edda7119d645fa105da4c1c88","_loginCode":"2792d9fb27264303a4943fadb2dfOX45","_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":"composeB94517ba5a64a405a8aa98ffc80135X45","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":"d4cc6583d2755134a23395bb0d795199"}},"alipay:alipay-mini:userAuthorization":[],"alipay:alipay-mini:_appId":"2019101168315187","alipay:alipay-mini:_appName":"广东7-Eleven会员俱乐部","alipay:alipay-mini:remoteVersion":"1.0.47","alipay:alipay-mini:currentVersion":"1.0.48","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"},{"title":"消费集点列表","page":"pages/pointList/pointList"}],"compilerIndex":0}
+{"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":false,"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-04-29 19:13:57","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":"d4cc6583d2755134a23395bb0d795199","_loginCode":"fd15f8a9b517440f9f6849e4b91fXX45","_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":"composeB9189df640f71439d950018ad6cd29X45","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":"d4cc6583d2755134a23395bb0d795199"}},"alipay:alipay-mini:userAuthorization":["userInfo"],"alipay:alipay-mini:_appId":"2019101168315187","alipay:alipay-mini:_appName":"广东7-Eleven会员俱乐部","alipay:alipay-mini:remoteVersion":"1.0.49","alipay:alipay-mini:currentVersion":"1.0.50","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"},{"title":"消费集点列表","page":"pages/pointList/pointList"},{"title":"领券中心","page":"subPackage/page/pages/couponCenter/couponCenter"}],"compilerIndex":5}
\ No newline at end of file

.tea/editorTabs.json

-{"tabs":["file:///d%3A/work/711Web/711/7_Eleven_Alipay/config/index.js","file:///d%3A/work/711Web/711/7_Eleven_Alipay/pages/pointDetail/pointDetail.js","file:///d%3A/work/711Web/711/7_Eleven_Alipay/utils/Http.js","file:///d%3A/work/711Web/711/7_Eleven_Alipay/wx2my.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/config/index.js","file:///d%3A/work/711Web/711/7_Eleven_Alipay/subPackage/page/pages/couponCenter/couponCenter.js"],"current":"file:///d%3A/work/711Web/711/7_Eleven_Alipay/subPackage/page/pages/couponCenter/couponCenter.js","storageVersion":"0.70.14"}
\ No newline at end of file

.tea/entryFiles-production/subPackage/page/index$.web.js

@@ -23,5 +23,7 @@ require('../../../../subPackage/page/pages/valueCardInfo/valueCardInfo');
 require('../../../../subPackage/page/pages/valueCardRecords/valueCardRecords');
 require('../../../../subPackage/page/pages/myValueCard/myValueCard');
 require('../../../../subPackage/page/pages/myValueCardInfo/myValueCardInfo');
+require('../../../../subPackage/page/pages/couponCenter/couponCenter');
+require('../../../../subPackage/page/pages/couponCenterInfo/couponCenterInfo');
 }
 self.bootstrapSubPackage('subPackage/page', {success});
\ No newline at end of file

.tea/entryFiles-production/subPackage/page/index$.worker.js

@@ -23,5 +23,7 @@ require('../../../../subPackage/page/pages/valueCardInfo/valueCardInfo');
 require('../../../../subPackage/page/pages/valueCardRecords/valueCardRecords');
 require('../../../../subPackage/page/pages/myValueCard/myValueCard');
 require('../../../../subPackage/page/pages/myValueCardInfo/myValueCardInfo');
+require('../../../../subPackage/page/pages/couponCenter/couponCenter');
+require('../../../../subPackage/page/pages/couponCenterInfo/couponCenterInfo');
 }
 self.bootstrapSubPackage('subPackage/page', {success});
\ No newline at end of file

.tea/entryFiles-production/subPackageA/page/index$.web.js

+function success(){
+require('../../../../component/noMore/noMore');
+require('../../../../component/exchange-coupon-modal/exchange-coupon-modal');
+require('../../../../component/dialogStockEmpty/dialogStockEmpty');
+require('../../../../component/dialogUserLimit/dialogUserLimit');
+require('../../../../subPackageA/page/pages/pointActivityGroup/pointActivityGroup');
+require('../../../../subPackageA/page/pages/pointExchangeCoupon/pointExchangeCoupon');
+require('../../../../subPackageA/page/pages/pointExchangeGoods/pointExchangeGoods');
+}
+self.bootstrapSubPackage('subPackageA/page', {success});
\ No newline at end of file

.tea/entryFiles-production/subPackageA/page/index$.worker.js

+function success(){
+require('../../../../component/noMore/noMore');
+require('../../../../component/exchange-coupon-modal/exchange-coupon-modal');
+require('../../../../component/dialogStockEmpty/dialogStockEmpty');
+require('../../../../component/dialogUserLimit/dialogUserLimit');
+require('../../../../subPackageA/page/pages/pointActivityGroup/pointActivityGroup');
+require('../../../../subPackageA/page/pages/pointExchangeCoupon/pointExchangeCoupon');
+require('../../../../subPackageA/page/pages/pointExchangeGoods/pointExchangeGoods');
+}
+self.bootstrapSubPackage('subPackageA/page', {success});
\ No newline at end of file

.tea/recentlyTouched.json

-{"files":["d:\\work\\711Web\\711\\7_Eleven_Alipay\\wx2my.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\utils\\Http.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\couponCenter\\couponCenter.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\valueCardInfo\\valueCardInfo.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\valueCard\\valueCard.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\valueCardInfo\\valueCardInfo.axml","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\couponCenter\\couponCenter.acss","d:\\work\\711Web\\711\\7_Eleven_Alipay\\app.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\valueCard\\valueCard.acss","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\valueCard\\valueCard.json","d:\\work\\711Web\\711\\7_Eleven_Alipay\\project.config.json","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\myValueCardInfo\\myValueCardInfo.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\myValueCardInfo\\myValueCardInfo.json","d:\\work\\711Web\\711\\7_Eleven_Alipay\\pages\\userCenter\\userCenter.axml","d:\\work\\711Web\\711\\7_Eleven_Alipay\\Behavior.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\debug.log","d:\\work\\711Web\\711\\7_Eleven_Alipay\\package-lock.json","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\IntegralMallGoods\\IntegralMallGoods.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\IntegralMallGoods\\IntegralMallGoods.axml","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\IntegralMallGoods\\IntegralMallGoods.json","d:\\work\\711Web\\711\\7_Eleven_Alipay\\component\\citySelection\\citySelection.axml","d:\\work\\711Web\\711\\7_Eleven_Alipay\\pages\\pointList\\pointList.acss","d:\\work\\711Web\\711\\7_Eleven_Alipay\\utils\\wxService.js","d:\\work\\projects\\7_Eleven_Alipay\\config\\index.js","d:\\work\\projects\\7_Eleven_Alipay\\subPackage\\page\\pages\\IntegralMallGoods\\IntegralMallGoods.axml","d:\\work\\projects\\7_Eleven_Alipay\\subPackage\\page\\pages\\IntegrateGoodsExchangeInfo\\IntegrateGoodsExchangeInfo.js","d:\\work\\projects\\7_Eleven_Alipay\\subPackage\\page\\pages\\IntegrateGoodsExchangeInfo\\IntegrateGoodsExchangeInfo.axml","d:\\work\\projects\\7_Eleven_Alipay\\subPackage\\page\\pages\\exchangeAddress\\exchangeAddress.axml","d:\\work\\projects\\7_Eleven_Alipay\\project.config.json","d:\\work\\projects\\7_Eleven_Alipay\\Behavior.js","d:\\work\\projects\\7_Eleven_Alipay\\app.json","d:\\work\\projects\\7_Eleven_Alipay\\app.js","d:\\work\\projects\\7_Eleven_Alipay\\utils\\Http.js","d:\\work\\projects\\7_Eleven_Alipay\\package-lock.json","d:\\work\\projects\\7_Eleven_Alipay\\debug.log","d:\\work\\projects\\7_Eleven_Alipay\\pages\\consumptionDetails\\consumptionDetails.axml","d:\\work\\projects\\7_Eleven_Alipay\\pages\\integralWater\\integralWater.axml","d:\\work\\projects\\7_Eleven_Alipay\\pages\\userCenter\\userCenter.axml","d:\\work\\projects\\7_Eleven_Alipay\\pages\\integralMallDetail\\integralMallDetail.js","d:\\work\\projects\\7_Eleven_Alipay\\pages\\integralMallDetail\\integralMallDetail.axml","d:\\work\\projects\\7_Eleven_Alipay\\component\\exchange-coupon-modal\\exchange-coupon-modal.axml","d:\\work\\projects\\7_Eleven_Alipay\\component\\authorization-modal\\authorization-modal.js","d:\\work\\projects\\7_Eleven_Alipay\\wx2my.js","d:\\work\\projects\\7_Eleven_Alipay\\component\\picNav\\picNav.axml","d:\\work\\projects\\7_Eleven_Alipay\\component\\citySelection\\citySelection.js","d:\\work\\projects\\7_Eleven_Alipay\\pages\\pointDetail\\pointDetail.js"],"storageVersion":"0.70.14"}
+{"files":["d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\couponCenter\\couponCenter.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\couponCenterInfo\\couponCenterInfo.axml","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\valueCardInfo\\valueCardInfo.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\\subPackageA\\page\\pages\\pointActivityGroup\\pointActivityGroup.axml","d:\\work\\711Web\\711\\7_Eleven_Alipay\\package-lock.json","d:\\work\\711Web\\711\\7_Eleven_Alipay\\debug.log","d:\\work\\711Web\\711\\7_Eleven_Alipay\\Behavior.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\wx2my.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\utils\\Http.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\valueCardInfo\\valueCardInfo.axml","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\couponCenter\\couponCenter.acss","d:\\work\\711Web\\711\\7_Eleven_Alipay\\app.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\myValueCardInfo\\myValueCardInfo.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\myValueCardInfo\\myValueCardInfo.json","d:\\work\\711Web\\711\\7_Eleven_Alipay\\pages\\userCenter\\userCenter.axml","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\IntegralMallGoods\\IntegralMallGoods.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\IntegralMallGoods\\IntegralMallGoods.axml","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\IntegralMallGoods\\IntegralMallGoods.json","d:\\work\\711Web\\711\\7_Eleven_Alipay\\component\\citySelection\\citySelection.axml","d:\\work\\711Web\\711\\7_Eleven_Alipay\\pages\\pointList\\pointList.acss","d:\\work\\711Web\\711\\7_Eleven_Alipay\\utils\\wxService.js","d:\\work\\projects\\7_Eleven_Alipay\\config\\index.js","d:\\work\\projects\\7_Eleven_Alipay\\subPackage\\page\\pages\\IntegralMallGoods\\IntegralMallGoods.axml","d:\\work\\projects\\7_Eleven_Alipay\\subPackage\\page\\pages\\IntegrateGoodsExchangeInfo\\IntegrateGoodsExchangeInfo.js","d:\\work\\projects\\7_Eleven_Alipay\\subPackage\\page\\pages\\IntegrateGoodsExchangeInfo\\IntegrateGoodsExchangeInfo.axml","d:\\work\\projects\\7_Eleven_Alipay\\subPackage\\page\\pages\\exchangeAddress\\exchangeAddress.axml","d:\\work\\projects\\7_Eleven_Alipay\\project.config.json","d:\\work\\projects\\7_Eleven_Alipay\\Behavior.js","d:\\work\\projects\\7_Eleven_Alipay\\app.json","d:\\work\\projects\\7_Eleven_Alipay\\app.js","d:\\work\\projects\\7_Eleven_Alipay\\utils\\Http.js","d:\\work\\projects\\7_Eleven_Alipay\\package-lock.json","d:\\work\\projects\\7_Eleven_Alipay\\debug.log","d:\\work\\projects\\7_Eleven_Alipay\\pages\\consumptionDetails\\consumptionDetails.axml","d:\\work\\projects\\7_Eleven_Alipay\\pages\\integralWater\\integralWater.axml","d:\\work\\projects\\7_Eleven_Alipay\\pages\\userCenter\\userCenter.axml","d:\\work\\projects\\7_Eleven_Alipay\\pages\\integralMallDetail\\integralMallDetail.js","d:\\work\\projects\\7_Eleven_Alipay\\pages\\integralMallDetail\\integralMallDetail.axml","d:\\work\\projects\\7_Eleven_Alipay\\component\\exchange-coupon-modal\\exchange-coupon-modal.axml","d:\\work\\projects\\7_Eleven_Alipay\\component\\authorization-modal\\authorization-modal.js","d:\\work\\projects\\7_Eleven_Alipay\\wx2my.js","d:\\work\\projects\\7_Eleven_Alipay\\component\\picNav\\picNav.axml","d:\\work\\projects\\7_Eleven_Alipay\\component\\citySelection\\citySelection.js","d:\\work\\projects\\7_Eleven_Alipay\\pages\\pointDetail\\pointDetail.js"],"storageVersion":"0.70.14"}
\ No newline at end of file

config/index.js

 const wx2my = require('../wx2my');
 const Behavior = require('../Behavior');
-const PROJECT_ENV = 'test'; // 生产 prod, 开发 dev, 测试 test, 预生产 pre
-const brandId = 1002; //2711 生产 1002 测试
+const PROJECT_ENV = 'prod'; // 生产 prod, 开发 dev, 测试 test, 预生产 pre
+const brandId = 2711; //2711 生产 1002 测试
 
 const needMock = ''; //
 // appid_dev_wx   wxc3b64b09b1d3dfc2

subPackage/page/pages/couponCenter/couponCenter.js

@@ -56,9 +56,30 @@ wxService.page({
   },
   //立即兑换优惠券
   exchange(e) {
+
+    const { member } = wx2my.getStorageSync('_baseUserInfo') ? wx2my.getStorageSync('_baseUserInfo').data : {};
+    if(!member){
+      wx2my.showToast({
+        title: '请先去登录',
+        icon : 'none'
+      })
+      return ;
+    }
+
+    if(!member.cardNoAlipay){
+      wx2my.showToast({
+        title: '请先开卡后购买',
+        icon : 'none',
+      });
+      
+      wxService.openCard()
+      return ;
+    }
+
     wx2my.showLoading({
       title: '领取中..',
     });
+    
     const { id } = e.currentTarget.dataset;
     wxService.post(`/coupon/couponCenterActivity/buyer/coupon/draw?id=${id}`).then(res => {
       wx2my.hideLoading();

subPackage/page/pages/couponCenterInfo/couponCenterInfo.acss

@@ -104,6 +104,10 @@ view{
   display: inline-block;
 }
 
+.btn-disabled{
+  opacity: 0.7;
+}
+
 .get-btn{
   width: 100%;
   height: 90rpx;

subPackage/page/pages/couponCenterInfo/couponCenterInfo.axml

@@ -28,14 +28,14 @@
   </view>
 
   <!-- 按钮 -->
-  <view class="get-btn positionRe">
+  <view class="get-btn positionRe {{isLoading ? 'btn-disabled' : ''}}">
     <button a:if="{{!userHasBaseInfo}}" 
     open-type="getAuthorize" 
     onGetAuthorize="onGetAuthorize" 
     onError="onAuthError" 
     scope='userInfo'
-    class="clear-btn positionAbs"></button>
-    <view a:else class="view-btn" onTap="onTapGetCoupon">立即领取</view>
+    class="clear-btn positionAbs">{{isLoading ? '数据加载中...'  : '立即领取'}}</button>
+    <view a:else class="view-btn" onTap="onTapGetCoupon">{{isLoading ? '数据加载中...'  : '立即领取'}}</view>
   </view>
 </view>
 

subPackage/page/pages/couponCenterInfo/couponCenterInfo.js

@@ -12,6 +12,7 @@ wxService.page({
     activityId : null,
     activityInfo : {},
     userHasBaseInfo : false,
+    isLoading : true,
   },
 
   /**
@@ -44,6 +45,13 @@ wxService.page({
           this.setData({
             activityInfo: this.data.activityInfo
           });
+
+          // 定时器为了防止触点那边没有正常返回用户就点击了
+          setTimeout(() => {
+            this.setData({
+              isLoading : false,
+            })
+          },1000);
         }
       }
     })
@@ -51,9 +59,34 @@ wxService.page({
 
   //领取优惠券
   onTapGetCoupon(){
+    if(this.data.isLoading){
+      return ;
+    }
+
+    const { member } = wx2my.getStorageSync('_baseUserInfo') ? wx2my.getStorageSync('_baseUserInfo').data : {};
+    if(!member){
+      wx2my.showToast({
+        title: '请先去登录',
+        icon : 'none'
+      })
+      return ;
+    }
+
+    if(!member.cardNoAlipay){
+      wx2my.showToast({
+        title: '请先开卡后购买',
+        icon : 'none',
+      });
+      
+      wxService.openCard()
+      return ;
+    }
+
+
     wx2my.showLoading({
       title: '领取中..',
     });
+
     let id = this.data.activityId;
     wxService.post(`/coupon/couponCenterActivity/buyer/coupon/draw?id=${id}`).then(res => {
       wx2my.hideLoading();

subPackage/page/pages/valueCard/valueCard.acss

@@ -3,6 +3,22 @@ page{
   background: #ffffff;
   box-sizing: border-box;
   -webkit-box-sizing: border-box;
+  padding-bottom: 80rpx;
+}
+
+.float-bottom{
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  width: 100%;
+  height: 75rpx;
+  background: rgba(51, 64 , 80, 0.8);
+  color: #ffffff;
+  font-size: 24rpx;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  z-index: 9;
 }
 
 view{

subPackage/page/pages/valueCard/valueCard.axml

@@ -16,5 +16,16 @@
   <image src='https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/empty.png' mode='aspectFit'></image>
   <view>暂无超值卡活动哦~</view>
 </view>
+<!-- 进入我的超值卡 -->
+<view class="float-bottom positionRe" a:if="{{!userHasBaseInfo}}">
+  <button open-type="getAuthorize" 
+  onGetAuthorize="onGetAuthorize" 
+  onError="onAuthError" 
+  scope='userInfo'
+  class="clear-btn positionAbs"></button>
+  我的超值卡
+</view>
 
-<!-- <view class='no-more'>-- 我也是有底线滴 --</view> -->
+<view class="float-bottom" a:if="{{userHasBaseInfo}}" onTap="onTapToMyValueCard">
\ No newline at end of file
+  我的超值卡
+</view>
\ No newline at end of file

subPackage/page/pages/valueCard/valueCard.js

@@ -9,7 +9,8 @@ wxService.page({
    * 页面的初始数据
    */
   data: {
-    cardList: []
+    cardList: [],
+    userHasBaseInfo : false,
   },
 
   /**
@@ -24,8 +25,80 @@ wxService.page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
+    this.userHasLogin();
+  },
+
+  //获取当前用户是否登录
+  userHasLogin(){
+    const baseUserInfo = wx2my.getStorageSync('_baseUserInfo').data;
+    if(baseUserInfo){
+      this.setData({
+        userHasBaseInfo : true
+      })
+    }
+    else{
+      this.setData({
+        userHasBaseInfo: false
+      })
+    }
+  },
+
+  //授权
+  onGetAuthorize(){
+    // 获取会员基础信息
+      my.getOpenUserInfo({
+        fail: (res) => {
+          console.log("refails", res)
+        },
+        success: (res) => {
+          let userInfo = JSON.parse(res.response).response // 以下方的报文格式解析两层 response
+          if (userInfo) {
+            utils.getUserInfoByBtn(userInfo).then((data = {}) => {
+              const {
+                token
+              } = data;
+              wx2my.setStorageSync('_accreditUserInfo', userInfo);
+              if (token) {
+                wx2my.setStorageSync('token', token);
+              } else {
+                wx2my.setStorageSync('token', '');
+              }
+
+              wx2my.setStorageSync('_baseUserInfo', data); // 存储用户开卡状态
+              this.setUserInfo();
+            }).catch(err => {
+              if (err) {
+                wx2my.showToast({
+                  title: `会员系统异常请稍后重试!`,
+                  icon: 'none'
+                });
+              }
+            });
 
+          } else {
+            this.setData({
+              userHasBaseInfo: false
+            });
+          }
+        }
+      });
   },
+
+  setUserInfo() {
+    // 判断有无开卡
+    const userInfo = wx2my.getStorageSync('_baseUserInfo') && wx2my.getStorageSync('_baseUserInfo').data; // 新用户去激活领卡 
+    if (userInfo && userInfo.member && !userInfo.member.mobile && !userInfo.member.cardNoAlipay) {
+      wxService.openCard();
+      return false;
+    } 
+
+    const urls = getCurrentPages();
+    setTimeout(() => {
+      this.onShow();
+      this.onLoad();
+    }, 200);
+  },
+
   //跳转卡详情
   onTapToCardInfo(e){
     let item = e.currentTarget.dataset.item;
@@ -60,6 +133,10 @@ wxService.page({
     });
   },
 
+  //我的超值卡
+  onTapToMyValueCard(){
+    wxService.router(`/subPackage/page/pages/myValueCard/myValueCard`);
+  },
   
   /**
    * 页面相关事件处理函数--监听用户下拉动作