Commit 359986f1 by 谢中龙

优化界面和更换开卡弹框

parent f63ebe5b
{"undefined::component2":false,"undefined::_enableAutoPush":false,"undefined::_appIdList":[],"undefined::uploadTime":"","undefined::packageSize":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":true,"alipay:alipay-mini:_enableAutoPush":true,"alipay:alipay-mini:_appIdList":[{"appid":"2019101168315187","name":"广东7-Eleven会员俱乐部"},{"appid":"2019092667869080","name":"名称释放00279678"},{"appid":"2019092667878018","name":"大禹qa"},{"appid":"2019091967575819","name":"名称释放00286936"},{"appid":"2019071665833747","name":"名称释放00250632"}],"alipay:alipay-mini:uploadTime":"2019-11-27 10:40:15","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":"d4cc6583d2755134a23395bb0d795199","_loginCode":"7012ec7f8df14ec1862e74613445RB45","_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":"composeB9386dbf09cac4932b6260f5e43fc7F45","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","birthday":"1991-11-19 00:00:00","brandId":"2711","cardNoAlipay":"svneleven0003335945","cardNoWeixin":"305490426989","code":"770084118008766216","createTime":"2019-06-28 09:58:15","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":"2019-11-14 08:22:58"},"memberActivateStatus":true,"memberId":"594104268563292160","outerStr":"{\"activateType\":\"normal\"}","token":"d4cc6583d2755134a23395bb0d795199"}},"alipay:alipay-mini:_appId":"2019101168315187","alipay:alipay-mini:_appName":"广东7-Eleven会员俱乐部","alipay:alipay-mini:remoteVersion":"1.0.26","alipay:alipay-mini:currentVersion":"1.0.27","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","alipay:alipay-mini:userAuthorization":[],"isSimulatorOpen":true,"isNotFirstToggleSimulator":true,"compilerList":[{"title":"普通编译","query":"","page":""},{"title":"积分商城","page":"pages/IntegralMall/IntegralMall"},{"title":"我的消费","page":"pages/mySpend/mySpend"},{"title":"动态子页面_pageId","page":"subPackage/page/pages/subPage/subPage"},{"title":"积分流水","page":"pages/integralWater/integralWater"},{"title":"优惠券","page":"pages/coupons/coupons"},{"title":"我的会员","page":"pages/memberOfOwn/memberOfOwn"},{"title":"发券组件","page":"subPackage/page/pages/aliPayCoupon/aliPayCoupon"},{"title":"积分商城(新)","page":"subPackage/page/pages/IntegralMallGoods/IntegralMallGoods"}],"compilerIndex":0,"alipay:alipay-mini:preAuditLimit":5,"alipay:alipay-mini:preAuditUsed":1,"alipay:alipay-mini:stopRefresh":false,"SimulatorMode":"EMBED","alipay:alipay-mini:lastDeviceName":"iPhone X","storageVersion":"0.70.14"} {"undefined::component2":false,"undefined::_enableAutoPush":false,"undefined::_appIdList":[],"undefined::uploadTime":"","undefined::packageSize":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":true,"alipay:alipay-mini:_enableAutoPush":true,"alipay:alipay-mini:_appIdList":[{"appid":"2019101168315187","name":"广东7-Eleven会员俱乐部"},{"appid":"2019092667869080","name":"名称释放00279678"},{"appid":"2019092667878018","name":"大禹qa"},{"appid":"2019091967575819","name":"名称释放00286936"},{"appid":"2019071665833747","name":"名称释放00250632"}],"alipay:alipay-mini:uploadTime":"2019-11-28 14:20:27","alipay:alipay-mini:packageSize":0,"alipay:alipay-mini:MockStore":{"_showCouponDialog":"false","_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":"4995ab2153844d07aff1fbff700eVC45","_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":"composeBa796a5662d094525ad207006413f5B45","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","birthday":"1991-11-19 00:00:00","brandId":"2711","cardNoAlipay":"svneleven0003335945","cardNoWeixin":"305490426989","code":"770084118008766216","createTime":"2019-06-28 09:58:15","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":"2019-11-14 08:22:58"},"memberActivateStatus":true,"memberId":"594104268563292160","outerStr":"{\"activateType\":\"normal\"}","token":"d4cc6583d2755134a23395bb0d795199"}},"alipay:alipay-mini:_appId":"2019101168315187","alipay:alipay-mini:_appName":"广东7-Eleven会员俱乐部","alipay:alipay-mini:remoteVersion":"1.0.27","alipay:alipay-mini:currentVersion":"1.0.28","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","alipay:alipay-mini:userAuthorization":[],"isSimulatorOpen":true,"isNotFirstToggleSimulator":true,"compilerList":[{"title":"普通编译","query":"","page":""},{"title":"积分商城","page":"pages/IntegralMall/IntegralMall"},{"title":"我的消费","page":"pages/mySpend/mySpend"},{"title":"动态子页面_pageId","page":"subPackage/page/pages/subPage/subPage"},{"title":"积分流水","page":"pages/integralWater/integralWater"},{"title":"优惠券","page":"pages/coupons/coupons"},{"title":"我的会员","page":"pages/memberOfOwn/memberOfOwn"},{"title":"发券组件","page":"subPackage/page/pages/aliPayCoupon/aliPayCoupon"},{"title":"积分商城(新)","page":"subPackage/page/pages/IntegralMallGoods/IntegralMallGoods"}],"compilerIndex":0,"alipay:alipay-mini:preAuditLimit":5,"alipay:alipay-mini:preAuditUsed":1,"alipay:alipay-mini:stopRefresh":false,"SimulatorMode":"EMBED","alipay:alipay-mini:lastDeviceName":"iPhone 6 Plus","storageVersion":"0.70.14"}
\ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
{"tabs":["file:///d%3A/work/projects/7_Eleven_Alipay/pages/coupons/coupons.js","file:///d%3A/work/projects/7_Eleven_Alipay/pages/coupons/coupons.acss","file:///d%3A/work/projects/7_Eleven_Alipay/pages/coupons/coupons.axml","file:///d%3A/work/projects/7_Eleven_Alipay/config/index.js"],"current":"file:///d%3A/work/projects/7_Eleven_Alipay/pages/coupons/coupons.js","storageVersion":"0.70.14"} {"tabs":["file:///d%3A/work/projects/7_Eleven_Alipay/pages/coupons/coupons.js","file:///d%3A/work/projects/7_Eleven_Alipay/pages/coupons/coupons.acss","file:///d%3A/work/projects/7_Eleven_Alipay/pages/coupons/coupons.axml","file:///d%3A/work/projects/7_Eleven_Alipay/config/index.js","file:///d%3A/work/projects/7_Eleven_Alipay/component/picNav/picNav.axml","file:///d%3A/work/projects/7_Eleven_Alipay/component/picNav/picNav.js","file:///d%3A/work/projects/7_Eleven_Alipay/utils/util.js","file:///d%3A/work/projects/7_Eleven_Alipay/app.js","file:///d%3A/work/projects/7_Eleven_Alipay/pages/userCenter/userCenter.js","file:///d%3A/work/projects/7_Eleven_Alipay/component/authorization-modal/authorization-modal.js"],"current":"file:///d%3A/work/projects/7_Eleven_Alipay/config/index.js","storageVersion":"0.70.14"}
\ No newline at end of file
if(!self.__appxInited) { if(!self.__appxInited) {
self.__appxInited = 1; self.__appxInited = 1;
require('@alipay/appx-compiler/lib/sjsEnvInit');
require('./config$'); require('./config$');
...@@ -15,7 +15,7 @@ self.abridge = self.my; ...@@ -15,7 +15,7 @@ self.abridge = self.my;
self.Component = AFAppX.WorkerComponent || function(){}; self.Component = AFAppX.WorkerComponent || function(){};
self.$global = AFAppX.$global; self.$global = AFAppX.$global;
if(AFAppX.compilerConfig){ AFAppX.compilerConfig.component2 = true; }
function success() { function success() {
require('../../app'); require('../../app');
require('../../component/authorization-modal/authorization-modal'); require('../../component/authorization-modal/authorization-modal');
......
{"files":["d:\\work\\projects\\7_Eleven_Alipay\\config\\index.js","d:\\work\\projects\\7_Eleven_Alipay\\subPackage\\page\\pages\\IntegralMallGoods\\IntegralMallGoods.js","d:\\work\\projects\\7_Eleven_Alipay\\subPackage\\page\\pages\\exchangeAddress\\exchangeAddress.axml","d:\\work\\projects\\7_Eleven_Alipay\\subPackage\\page\\pages\\IntegrateGoodsExchangeInfo\\IntegrateGoodsExchangeInfo.axml","d:\\work\\projects\\7_Eleven_Alipay\\component\\citySelection\\citySelection.js","d:\\work\\projects\\7_Eleven_Alipay\\component\\dialogUserLimit\\dialogUserLimit.js","d:\\work\\projects\\7_Eleven_Alipay\\component\\authorization-modal\\authorization-modal.js","d:\\work\\projects\\7_Eleven_Alipay\\component\\dialogStockEmpty\\dialogStockEmpty.axml","d:\\work\\projects\\7_Eleven_Alipay\\pages\\pointDetail\\pointDetail.js","d:\\work\\projects\\7_Eleven_Alipay\\utils\\Http.js","d:\\work\\projects\\7_Eleven_Alipay\\pages\\userCenter\\userCenter.axml","d:\\work\\projects\\7_Eleven_Alipay\\pages\\userCenter\\userCenter.json","d:\\work\\projects\\7_Eleven_Alipay\\pages\\userCenter\\userCenter.js","d:\\work\\projects\\7_Eleven_Alipay\\pages\\couponCodeDetail\\couponCodeDetail.js","d:\\work\\projects\\7_Eleven_Alipay\\component\\citySelection\\citySelection.axml","d:\\work\\projects\\7_Eleven_Alipay\\pages\\integralMallDetail\\integralMallDetail.js","d:\\work\\projects\\7_Eleven_Alipay\\subPackage\\page\\pages\\subPage\\subPage.json","d:\\work\\projects\\7_Eleven_Alipay\\subPackage\\page\\pages\\subPage\\subPage.js","d:\\work\\projects\\7_Eleven_Alipay\\subPackage\\page\\pages\\subPage\\subPage.axml","d:\\work\\projects\\7_Eleven_Alipay\\subPackage\\page\\pages\\pointGoodsList\\pointGoodsList.axml","d:\\work\\projects\\7_Eleven_Alipay\\subPackage\\page\\pages\\goToHome\\goToHome.js","d:\\work\\projects\\7_Eleven_Alipay\\subPackage\\page\\pages\\pointGoodsList\\pointGoodsList.js","d:\\work\\projects\\7_Eleven_Alipay\\subPackage\\page\\pages\\subPage\\subPage.acss","d:\\work\\projects\\7_Eleven_Alipay\\subPackage\\page\\pages\\aliPayCoupon\\aliPayCoupon.acss","d:\\work\\projects\\7_Eleven_Alipay\\subPackage\\page\\pages\\aliPayCoupon\\aliPayCoupon.js","d:\\work\\projects\\7_Eleven_Alipay\\subPackage\\page\\pages\\aliPayCoupon\\aliPayCoupon.json","d:\\work\\projects\\7_Eleven_Alipay\\utils\\common.js","d:\\work\\projects\\7_Eleven_Alipay\\Behavior.js","f:\\code\\7_Eleven_Alipay\\utils\\util.js","f:\\code\\7_Eleven_Alipay\\pages\\memberOfOwn\\memberOfOwn.js","f:\\code\\7_Eleven_Alipay\\pages\\consumptionDetails\\consumptionDetails.js","f:\\code\\7_Eleven_Alipay\\component\\authorization-modal\\authorization-modal.js","f:\\code\\7_Eleven_Alipay\\component\\exchange-coupon-modal\\exchange-coupon-modal.js","f:\\code\\7_Eleven_Alipay\\utils\\integerDigitalConvertion.js","f:\\code\\7_Eleven_Alipay\\utils\\common.js","f:\\code\\7_Eleven_Alipay\\app.js","f:\\code\\7_Eleven_Alipay\\pages\\userCenter\\userCenter.js","f:\\code\\7_Eleven_Alipay\\subPackage\\page\\pages\\aliPayCoupon\\aliPayCoupon.axml","f:\\code\\7_Eleven_Alipay\\subPackage\\page\\pages\\aliPayCoupon\\aliPayCoupon.js","f:\\code\\7_Eleven_Alipay\\utils\\wxService.js","f:\\code\\7_Eleven_Alipay\\component\\personCenter\\personCenter.js","f:\\code\\7_Eleven_Alipay\\pages\\activateCard\\activateCardCallback.js","f:\\code\\7_Eleven_Alipay\\pages\\memberOfOwn\\memberOfOwn.axml","f:\\code\\7_Eleven_Alipay\\config\\index.js","f:\\code\\7_Eleven_Alipay\\pages\\pointDetail\\pointDetail.js","f:\\code\\7_Eleven_Alipay\\subPackage\\page\\pages\\subPage\\subPage.js","f:\\code\\7_Eleven_Alipay\\subPackage\\page\\pages\\subPage\\subPage.axml"],"storageVersion":"0.70.14"} {"files":["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\\pages\\integralWater\\integralWater.js","d:\\work\\projects\\7_Eleven_Alipay\\subPackage\\page\\pages\\IntegralMallGoods\\IntegralMallGoods.js","d:\\work\\projects\\7_Eleven_Alipay\\component\\picNav\\picNav.axml","d:\\work\\projects\\7_Eleven_Alipay\\subPackage\\page\\pages\\exchangeAddress\\exchangeAddress.axml","d:\\work\\projects\\7_Eleven_Alipay\\subPackage\\page\\pages\\IntegrateGoodsExchangeInfo\\IntegrateGoodsExchangeInfo.axml","d:\\work\\projects\\7_Eleven_Alipay\\component\\citySelection\\citySelection.js","d:\\work\\projects\\7_Eleven_Alipay\\component\\dialogUserLimit\\dialogUserLimit.js","d:\\work\\projects\\7_Eleven_Alipay\\component\\dialogStockEmpty\\dialogStockEmpty.axml","d:\\work\\projects\\7_Eleven_Alipay\\pages\\pointDetail\\pointDetail.js","d:\\work\\projects\\7_Eleven_Alipay\\utils\\Http.js","d:\\work\\projects\\7_Eleven_Alipay\\pages\\userCenter\\userCenter.axml","d:\\work\\projects\\7_Eleven_Alipay\\pages\\couponCodeDetail\\couponCodeDetail.js","d:\\work\\projects\\7_Eleven_Alipay\\component\\citySelection\\citySelection.axml","d:\\work\\projects\\7_Eleven_Alipay\\pages\\integralMallDetail\\integralMallDetail.js","d:\\work\\projects\\7_Eleven_Alipay\\subPackage\\page\\pages\\subPage\\subPage.json","d:\\work\\projects\\7_Eleven_Alipay\\subPackage\\page\\pages\\subPage\\subPage.js","d:\\work\\projects\\7_Eleven_Alipay\\subPackage\\page\\pages\\subPage\\subPage.axml","d:\\work\\projects\\7_Eleven_Alipay\\subPackage\\page\\pages\\pointGoodsList\\pointGoodsList.axml","d:\\work\\projects\\7_Eleven_Alipay\\subPackage\\page\\pages\\goToHome\\goToHome.js","d:\\work\\projects\\7_Eleven_Alipay\\subPackage\\page\\pages\\pointGoodsList\\pointGoodsList.js","d:\\work\\projects\\7_Eleven_Alipay\\subPackage\\page\\pages\\subPage\\subPage.acss","d:\\work\\projects\\7_Eleven_Alipay\\subPackage\\page\\pages\\aliPayCoupon\\aliPayCoupon.acss","d:\\work\\projects\\7_Eleven_Alipay\\subPackage\\page\\pages\\aliPayCoupon\\aliPayCoupon.js","d:\\work\\projects\\7_Eleven_Alipay\\subPackage\\page\\pages\\aliPayCoupon\\aliPayCoupon.json","d:\\work\\projects\\7_Eleven_Alipay\\utils\\common.js","d:\\work\\projects\\7_Eleven_Alipay\\Behavior.js","f:\\code\\7_Eleven_Alipay\\utils\\util.js","f:\\code\\7_Eleven_Alipay\\pages\\memberOfOwn\\memberOfOwn.js","f:\\code\\7_Eleven_Alipay\\pages\\consumptionDetails\\consumptionDetails.js","f:\\code\\7_Eleven_Alipay\\component\\authorization-modal\\authorization-modal.js","f:\\code\\7_Eleven_Alipay\\component\\exchange-coupon-modal\\exchange-coupon-modal.js","f:\\code\\7_Eleven_Alipay\\utils\\integerDigitalConvertion.js","f:\\code\\7_Eleven_Alipay\\utils\\common.js","f:\\code\\7_Eleven_Alipay\\app.js","f:\\code\\7_Eleven_Alipay\\pages\\userCenter\\userCenter.js","f:\\code\\7_Eleven_Alipay\\subPackage\\page\\pages\\aliPayCoupon\\aliPayCoupon.axml","f:\\code\\7_Eleven_Alipay\\subPackage\\page\\pages\\aliPayCoupon\\aliPayCoupon.js","f:\\code\\7_Eleven_Alipay\\utils\\wxService.js","f:\\code\\7_Eleven_Alipay\\component\\personCenter\\personCenter.js","f:\\code\\7_Eleven_Alipay\\pages\\activateCard\\activateCardCallback.js","f:\\code\\7_Eleven_Alipay\\pages\\memberOfOwn\\memberOfOwn.axml","f:\\code\\7_Eleven_Alipay\\config\\index.js","f:\\code\\7_Eleven_Alipay\\pages\\pointDetail\\pointDetail.js","f:\\code\\7_Eleven_Alipay\\subPackage\\page\\pages\\subPage\\subPage.js","f:\\code\\7_Eleven_Alipay\\subPackage\\page\\pages\\subPage\\subPage.axml"],"storageVersion":"0.70.14"}
\ No newline at end of file
assets/imgs/aliPay_coupon.png

32.9 KB | W: | H:

assets/imgs/aliPay_coupon.png

82.8 KB | W: | H:

assets/imgs/aliPay_coupon.png
assets/imgs/aliPay_coupon.png
assets/imgs/aliPay_coupon.png
assets/imgs/aliPay_coupon.png
  • 2-up
  • Swipe
  • Onion skin
...@@ -37,7 +37,7 @@ Component({ ...@@ -37,7 +37,7 @@ Component({
*/ */
methods: { methods: {
imageLoad(e) { imageLoad(e) {
let imageSize = utils.imageUtil(e); let imageSize = utils.imageUtil(e,true);
this.setData({ this.setData({
},()=> { },()=> {
this.setData({ this.setData({
......
...@@ -56,11 +56,14 @@ page{ ...@@ -56,11 +56,14 @@ page{
.new-container .new-container-rg .new-integral-vip-rules{ .new-container .new-container-rg .new-integral-vip-rules{
width: 133rpx; width: 133rpx;
height: 42rpx; height: 42rpx;
line-height: 42rpx; /* line-height: 42rpx; */
border-radius: 34rpx; border-radius: 34rpx;
font-size: 23rpx; font-size: 23rpx;
text-align: center; /* text-align: center; */
border: 1px solid rgba(204, 204, 204, 1); border: 1px solid rgba(204, 204, 204, 1);
display: flex;
align-items: center;
justify-content: center;
} }
.title-time-point { .title-time-point {
......
...@@ -93,8 +93,8 @@ wxService.page({ ...@@ -93,8 +93,8 @@ wxService.page({
baseUserInfo, baseUserInfo,
cardMember, cardMember,
isAuthorization: false, isAuthorization: false,
// showHome: flag showHome: flag
showHome: false // showHome: true
}, () => { }, () => {
// 积分数量 // 积分数量
this.getMemberPointInfo(); // 优惠券数量 this.getMemberPointInfo(); // 优惠券数量
......
...@@ -57,11 +57,14 @@ page { ...@@ -57,11 +57,14 @@ page {
.new-container .new-container-rg .new-integral-vip-rules{ .new-container .new-container-rg .new-integral-vip-rules{
width: 133rpx; width: 133rpx;
height: 42rpx; height: 42rpx;
line-height: 42rpx; /* line-height: 42rpx; */
border-radius: 34rpx; border-radius: 34rpx;
font-size: 23rpx; font-size: 23rpx;
text-align: center; /* text-align: center; */
border: 1px solid rgba(204, 204, 204, 1); border: 1px solid rgba(204, 204, 204, 1);
display: flex;
align-items: center;
justify-content: center;
} }
.title-time-point { .title-time-point {
...@@ -109,10 +112,13 @@ page { ...@@ -109,10 +112,13 @@ page {
border-radius: 33rpx; border-radius: 33rpx;
background-color: rgba(5, 195, 91, 1); background-color: rgba(5, 195, 91, 1);
box-shadow: 0rpx 3rpx 10rpx 0rpx rgba(5, 195, 91, 0.3); box-shadow: 0rpx 3rpx 10rpx 0rpx rgba(5, 195, 91, 0.3);
line-height: 48rpx; /* line-height: 48rpx; */
color: rgba(255, 255, 255, 1); color: rgba(255, 255, 255, 1);
font-size: 24rpx; font-size: 24rpx;
text-align: center; /* text-align: center; */
display: flex;
align-items: center;
justify-content: center;
} }
.coupon-btn-num { .coupon-btn-num {
width: 153.8rpx; width: 153.8rpx;
......
...@@ -77,33 +77,57 @@ function getAccountInfo() { ...@@ -77,33 +77,57 @@ function getAccountInfo() {
*/ */
function imageUtil(e) { function imageUtil(e,async) {
var imageSize = {}; var imageSize = {};
var originalWidth = e.detail.width; //图片原始宽 var originalWidth = e.detail.width; //图片原始宽
var originalHeight = e.detail.height; //图片原始高 var originalHeight = e.detail.height; //图片原始高
var originalScale = originalHeight / originalWidth; //图片高宽比 var originalScale = originalHeight / originalWidth; //图片高宽比
//获取屏幕宽高 if(!async){
wx2my.getSystemInfo({ //获取屏幕宽高
success: function(res) { wx2my.getSystemInfo({
// var windowWidth = res.windowWidth/2; success: function(res) {
var windowWidth = (res.windowWidth - 15) / 2; // var windowWidth = res.windowWidth/2;
var windowHeight = res.windowHeight / 2; var windowWidth = (res.windowWidth - 15) / 2;
var windowscale = windowHeight / windowWidth; //屏幕高宽比 var windowHeight = res.windowHeight / 2;
var windowscale = windowHeight / windowWidth; //屏幕高宽比
if (originalScale < windowscale) {
//图片高宽比小于屏幕高宽比 if (originalScale < windowscale) {
//图片缩放后的宽为屏幕宽 //图片高宽比小于屏幕高宽比
imageSize.imageWidth = windowWidth; //图片缩放后的宽为屏幕宽
imageSize.imageHeight = windowWidth * originalHeight / originalWidth; imageSize.imageWidth = windowWidth;
} else { imageSize.imageHeight = windowWidth * originalHeight / originalWidth;
//图片高宽比大于屏幕高宽比 } else {
//图片缩放后的高为屏幕高 //图片高宽比大于屏幕高宽比
imageSize.imageHeight = originalHeight * windowWidth / originalWidth; //图片缩放后的高为屏幕高
imageSize.imageWidth = windowWidth; imageSize.imageHeight = originalHeight * windowWidth / originalWidth;
imageSize.imageWidth = windowWidth;
}
} }
} });
}); return imageSize;
}
//同步的话
let res = wx2my.getSystemInfoSync();
// var windowWidth = res.windowWidth/2;
var windowWidth = (res.windowWidth - 15) / 2;
var windowHeight = res.windowHeight / 2;
var windowscale = windowHeight / windowWidth; //屏幕高宽比
if (originalScale < windowscale) {
//图片高宽比小于屏幕高宽比
//图片缩放后的宽为屏幕宽
imageSize.imageWidth = windowWidth;
imageSize.imageHeight = windowWidth * originalHeight / originalWidth;
} else {
//图片高宽比大于屏幕高宽比
//图片缩放后的高为屏幕高
imageSize.imageHeight = originalHeight * windowWidth / originalWidth;
imageSize.imageWidth = windowWidth;
}
return imageSize; return imageSize;
} }
/** /**
* 判断用户滑动 * 判断用户滑动
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment