| @@ -21,6 +21,7 @@ Page({ | |||||
| }) | }) | ||||
| } | } | ||||
| }, | }, | ||||
| // pages/index/searchbar/index | |||||
| signIn(id){ | signIn(id){ | ||||
| let that = this; | let that = this; | ||||
| Http.post({ | Http.post({ | ||||
| @@ -1,3 +1,3 @@ | |||||
| { | { | ||||
| "navigationBarTitleText": "编辑资料" | |||||
| "navigationBarTitleText": "我的资料" | |||||
| } | } | ||||
| @@ -15,9 +15,21 @@ | |||||
| height: 100rpx; | height: 100rpx; | ||||
| line-height: 100rpx; | line-height: 100rpx; | ||||
| text-align: center; | text-align: center; | ||||
| font-size: 34rpx; | |||||
| font-size: 30rpx; | |||||
| font-family: PingFangSC-Semibold; | font-family: PingFangSC-Semibold; | ||||
| color: rgba(51, 51, 51, 1); | |||||
| color: #3C3C3C; | |||||
| background: #FFFFFF; | |||||
| font-weight:500; | |||||
| } | |||||
| .text-styleHover{ | |||||
| position: relative; | |||||
| width: 139rpx; | |||||
| height: 100rpx; | |||||
| line-height: 100rpx; | |||||
| text-align: center; | |||||
| font-size: 26rpx; | |||||
| font-family: PingFangSC-Semibold; | |||||
| color: #A6A6A6; | |||||
| } | } | ||||
| .text-style text{ | .text-style text{ | ||||
| font-size: 26rpx; | font-size: 26rpx; | ||||
| @@ -25,14 +37,12 @@ | |||||
| .active1 { | .active1 { | ||||
| font-size: 30rpx!important; | font-size: 30rpx!important; | ||||
| } | } | ||||
| .active { | .active { | ||||
| position: absolute; | position: absolute; | ||||
| left: 20rpx; | left: 20rpx; | ||||
| bottom: 0rpx; | bottom: 0rpx; | ||||
| top:0; | top:0; | ||||
| margin: auto; | margin: auto; | ||||
| width:12rpx; | width:12rpx; | ||||
| height:24rpx; | height:24rpx; | ||||
| background:linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%); | background:linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%); | ||||
| @@ -78,8 +88,8 @@ | |||||
| top: 0; | top: 0; | ||||
| bottom: 0; | bottom: 0; | ||||
| margin: auto; | margin: auto; | ||||
| width: 50rpx; | |||||
| height: 50rpx; | |||||
| width: 60rpx; | |||||
| height: 60rpx; | |||||
| } | } | ||||
| .merchants{ | .merchants{ | ||||
| width: 90%; | width: 90%; | ||||
| @@ -103,7 +113,6 @@ | |||||
| width: 120rpx; | width: 120rpx; | ||||
| height: 120rpx; | height: 120rpx; | ||||
| border-radius: 16rpx; | border-radius: 16rpx; | ||||
| border: 1rpx solid #e5e5e5; | |||||
| } | } | ||||
| .merchants view:nth-child(2) { | .merchants view:nth-child(2) { | ||||
| @@ -112,6 +121,7 @@ | |||||
| .shopVo{ | .shopVo{ | ||||
| display: flex; | display: flex; | ||||
| padding-left: 0!important; | padding-left: 0!important; | ||||
| } | } | ||||
| .merchants view:nth-child(2) text:nth-child(1) { | .merchants view:nth-child(2) text:nth-child(1) { | ||||
| display: block; | display: block; | ||||
| @@ -24,6 +24,7 @@ Page({ | |||||
| content: '数据正在加载中', | content: '数据正在加载中', | ||||
| reloadIf: false, | reloadIf: false, | ||||
| creditAmount: 0, | creditAmount: 0, | ||||
| score: '0', | |||||
| }, | }, | ||||
| goback: function () { | goback: function () { | ||||
| wx.switchTab({ | wx.switchTab({ | ||||
| @@ -58,7 +59,39 @@ Page({ | |||||
| that.setData({ | that.setData({ | ||||
| lists: null | lists: null | ||||
| }) | }) | ||||
| } | |||||
| }; | |||||
| Http.get({ | |||||
| url: config.api.getScore, | |||||
| data: {} | |||||
| }).then(res => { | |||||
| if (res.data.address && res.data.name && res.data.sex && res.data.birthdate) { | |||||
| that.setData({ | |||||
| showEdit: true | |||||
| }) | |||||
| } | |||||
| that.setData({ | |||||
| score: res.data.score, | |||||
| levelName: res.data.levelName, | |||||
| }) | |||||
| if (res.data.nickName) { | |||||
| that.setData({ | |||||
| ismember: true, | |||||
| memberId: res.data.id | |||||
| }) | |||||
| var size = this.setCanvasSize(); | |||||
| var initUrl = JSON.stringify({ | |||||
| flagid: res.data.id | |||||
| }); | |||||
| that.createQrCode(initUrl, "mycanvas1", size.w, size.h); | |||||
| } | |||||
| }) | |||||
| .catch(err => { | |||||
| wx.showModal({ | |||||
| title: '提示', | |||||
| content: err.errMsg, | |||||
| showCancel: false | |||||
| }) | |||||
| }) | |||||
| }, | }, | ||||
| // 获得积分,渲染页面 | // 获得积分,渲染页面 | ||||
| getPoints(){ | getPoints(){ | ||||
| @@ -1,28 +1,37 @@ | |||||
| <button class='goback' bindtap='goback'><image src='{{wmhome}}' mode="widthFix"></image></button> | <button class='goback' bindtap='goback'><image src='{{wmhome}}' mode="widthFix"></image></button> | ||||
| <view class='content-box'> | <view class='content-box'> | ||||
| <view class='topbg'> | <view class='topbg'> | ||||
| <view class="user-avatar" bindtap='gotograde'> | |||||
| <open-data class="open" type="userAvatarUrl"></open-data> | |||||
| </view> | |||||
| <view class='myName'> | |||||
| <open-data class="name" type="userNickName"></open-data> | |||||
| <view class=' usre_level'> | |||||
| <text class='chengzhang '>{{levelName}}</text> | |||||
| <view class='topbg-top'> | |||||
| <view class="user-avatar" bindtap='gotograde'> | |||||
| <view class='user-box'> | |||||
| <open-data class="open" type="userAvatarUrl"></open-data> | |||||
| </view> | |||||
| </view> | </view> | ||||
| <view class='myName'> | |||||
| <open-data class="name" type="userNickName"></open-data> | |||||
| <view class=' usre_level'> | |||||
| <text class='chengzhang '>{{levelName}}</text> | |||||
| </view> | |||||
| <view class="view"> | |||||
| <!-- 成长值<text class="score">{{score}}</text> --> | |||||
| <progress percent="{{upgradePercent}}" stroke-width="6" activeColor="#FFB287" /> | |||||
| </view> | |||||
| </view> | |||||
| <view class='msg'>还需{{upgradeScore}}成长值升级</view> | |||||
| </view> | </view> | ||||
| <view class="view"> | |||||
| <!-- 成长值<text class="score">{{score}}</text> --> | |||||
| <progress percent="50" stroke-width="6" activeColor="#FFB287" /> | |||||
| </view> | |||||
| <view class='msg'>还需1成长值升级</view> | |||||
| <view class='score'>{{creditAmount}}</view> | |||||
| <view class='jifen'> | |||||
| <text>可用积分</text>> | |||||
| </view> | |||||
| <!-- 二维码 --> | |||||
| <view class='qrcode' bindtap='qrcode'> | |||||
| <image src="{{barcode}}" class='qrcodeimg' mode='widthFix'></image> | |||||
| <view class='topbg-btom'> | |||||
| <view class='btoml'> | |||||
| <view class='score'>{{creditAmount}}</view> | |||||
| <view class='jifen'> | |||||
| <text>可用积分</text>> | |||||
| </view> | |||||
| </view> | |||||
| <!-- 二维码 --> | |||||
| <view class='qrcode' bindtap='qrcode'> | |||||
| <image src="{{barcode}}" class='qrcodeimg' mode='widthFix'></image> | |||||
| </view> | |||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| <view class='no-data01' wx:if='{{lists.length==0}}'> | <view class='no-data01' wx:if='{{lists.length==0}}'> | ||||
| @@ -47,13 +56,13 @@ | |||||
| </view> | </view> | ||||
| <view class='spell-right'> | <view class='spell-right'> | ||||
| <view class='right-button' wx:if="{{item.remainInventory!=0}}">立即换购</view> | <view class='right-button' wx:if="{{item.remainInventory!=0}}">立即换购</view> | ||||
| <view class='right-button remainInventory' wx:if="{{item.remainInventory==0}}">已兑完</view> | |||||
| <view class='right-button remainInventory' wx:if="{{item.remainInventory==0}}">立即换购</view> | |||||
| <!-- <view class='right-text'>剩余{{item.remainInventory}}</view> --> | <!-- <view class='right-text'>剩余{{item.remainInventory}}</view> --> | ||||
| </view> | </view> | ||||
| <view class='line'></view> | <view class='line'></view> | ||||
| <view class='spell-bot'> | <view class='spell-bot'> | ||||
| <view class='botMsg'>可用于店内套餐消费</view> | |||||
| <view class='botNum'>剩余222张</view> | |||||
| <view class='botMsg'>{{item.subTitle}}</view> | |||||
| <view class='botNum'>剩余{{item.remainInventory}}张</view> | |||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| @@ -2,19 +2,30 @@ | |||||
| .topbg { | .topbg { | ||||
| margin-bottom: 30rpx; | margin-bottom: 30rpx; | ||||
| position: relative; | |||||
| width:100%; | width:100%; | ||||
| height:234rpx; | height:234rpx; | ||||
| background:linear-gradient(180deg,rgba(253,131,45,1) 0%,rgba(254,74,22,1) 100%); | background:linear-gradient(180deg,rgba(253,131,45,1) 0%,rgba(254,74,22,1) 100%); | ||||
| } | } | ||||
| .topbg-top{ | |||||
| width:100%; | |||||
| height: 50%; | |||||
| display: inline-block | |||||
| } | |||||
| .topbg-btom{ | |||||
| width:100%; | |||||
| height: 50%; | |||||
| } | |||||
| .user-avatar { | .user-avatar { | ||||
| position: absolute; | |||||
| width: 20%; | |||||
| height: 100%; | |||||
| float: left; | |||||
| } | |||||
| .user-box { | |||||
| width: 82rpx; | width: 82rpx; | ||||
| height: 82rpx; | height: 82rpx; | ||||
| border-radius: 50%; | border-radius: 50%; | ||||
| overflow: hidden; | overflow: hidden; | ||||
| top:26rpx; | |||||
| left:60rpx; | |||||
| margin: 26rpx 0 0 60rpx; | |||||
| } | } | ||||
| .user-avatar open-data { | .user-avatar open-data { | ||||
| display: block; | display: block; | ||||
| @@ -30,11 +41,12 @@ | |||||
| margin:0 20rpx; | margin:0 20rpx; | ||||
| } | } | ||||
| .usre_level{ | .usre_level{ | ||||
| width:70rpx; | |||||
| /* width:70rpx; */ | |||||
| height:32rpx; | height:32rpx; | ||||
| background:linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%); | background:linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%); | ||||
| border-radius:9px 9px 9px 0px; | border-radius:9px 9px 9px 0px; | ||||
| font-family:PingFangSC-Regular; | font-family:PingFangSC-Regular; | ||||
| font-size: 22rpx; | |||||
| font-weight:400; | font-weight:400; | ||||
| color:rgba(255,255,255,1); | color:rgba(255,255,255,1); | ||||
| line-height:32rpx; | line-height:32rpx; | ||||
| @@ -48,36 +60,38 @@ | |||||
| margin-left: 10rpx; | margin-left: 10rpx; | ||||
| } | } | ||||
| .myName{ | .myName{ | ||||
| position: absolute; | |||||
| left: 152rpx; | |||||
| top:26rpx; | |||||
| float: left; | |||||
| font-size: 32rpx; | font-size: 32rpx; | ||||
| height: 82rpx; | |||||
| height: 100%; | |||||
| width:35%; | |||||
| margin-top:36rpx; | |||||
| } | } | ||||
| .view { | |||||
| position: absolute; | |||||
| top: 45rpx; | |||||
| left: 170rpx; | |||||
| .view{ | |||||
| /* margin-top:25rpx; */ | |||||
| display: block; | |||||
| margin: 60rpx 0 0 20rpx; | |||||
| } | } | ||||
| progress{ | progress{ | ||||
| width:214rpx; | width:214rpx; | ||||
| height: 6rpx; | height: 6rpx; | ||||
| display:inline-block; | |||||
| border-radius:60rpx; | border-radius:60rpx; | ||||
| overflow:hidden; | overflow:hidden; | ||||
| } | } | ||||
| .msg{ | .msg{ | ||||
| position: absolute; | |||||
| top: 68rpx; | |||||
| left:400rpx; | |||||
| float: left; | |||||
| font-size:10px!important; | font-size:10px!important; | ||||
| font-family:PingFangSC-Regular; | font-family:PingFangSC-Regular; | ||||
| font-weight:400; | font-weight:400; | ||||
| color:rgba(255,255,255,1); | color:rgba(255,255,255,1); | ||||
| width: 200rpx; | |||||
| width: 30%; | |||||
| height: 100%; | |||||
| margin-top:80rpx; | |||||
| } | |||||
| .btoml{ | |||||
| float: left; | |||||
| height: 100%; | |||||
| width: 60%; | |||||
| } | } | ||||
| .jifen{ | .jifen{ | ||||
| font-size: 20rpx; | font-size: 20rpx; | ||||
| font-weight: 500; | font-weight: 500; | ||||
| @@ -96,18 +110,17 @@ progress{ | |||||
| left:70rpx; | left:70rpx; | ||||
| color: #FFFFFF; | color: #FFFFFF; | ||||
| } | } | ||||
| .qrcode{ | .qrcode{ | ||||
| width: 84rpx; | width: 84rpx; | ||||
| height: 84rpx; | height: 84rpx; | ||||
| position: absolute; | |||||
| bottom: 38rpx; | |||||
| right: 48rpx; | |||||
| float: right; | |||||
| margin-right: 48rpx; | |||||
| } | } | ||||
| .qrcode image { | .qrcode image { | ||||
| margin: auto; | margin: auto; | ||||
| width: 84rpx; | width: 84rpx; | ||||
| } | } | ||||
| page { | page { | ||||
| height: auto; | height: auto; | ||||
| overflow: auto; | overflow: auto; | ||||
| @@ -194,6 +207,9 @@ image{ | |||||
| float: left; | float: left; | ||||
| margin-left: 20rpx; | margin-left: 20rpx; | ||||
| color: #A6A6A6; | color: #A6A6A6; | ||||
| overflow: hidden; | |||||
| text-overflow:ellipsis; | |||||
| white-space: nowrap; | |||||
| } | } | ||||
| .spell-bot .botNum{ | .spell-bot .botNum{ | ||||
| width: 40%; | width: 40%; | ||||
| @@ -216,7 +232,7 @@ image{ | |||||
| } | } | ||||
| .content .spell-center{ | .content .spell-center{ | ||||
| float: left; | float: left; | ||||
| width: 304rpx; | |||||
| width: 380rpx; | |||||
| height: 170rpx; | height: 170rpx; | ||||
| } | } | ||||
| .content .tilte{ | .content .tilte{ | ||||
| @@ -1,5 +1,5 @@ | |||||
| { | { | ||||
| "navigationBarTitleText": "我的特权", | "navigationBarTitleText": "我的特权", | ||||
| "navigationBarBackgroundColor": "#fc5b24", | |||||
| "navigationBarBackgroundColor": "#FD832D", | |||||
| "navigationBarTextStyle": "white" | "navigationBarTextStyle": "white" | ||||
| } | } | ||||
| @@ -4,10 +4,10 @@ | |||||
| <canvas canvas-id="mycanvas2" style="width: 1200rpx; height: 800rpx;" /> | <canvas canvas-id="mycanvas2" style="width: 1200rpx; height: 800rpx;" /> | ||||
| </view> | </view> | ||||
| <image src="{{tempFilePath}}" mode="aspectFit" /> | <image src="{{tempFilePath}}" mode="aspectFit" /> | ||||
| <text>会员码:{{memberId}}</text> | |||||
| </view> | |||||
| <view class='con'> | |||||
| <view class="title">会员等级为<text class='level'>[{{level}}]</text>对应门店的优惠折扣</view> | |||||
| <text class='memCode'>会员码:{{memberId}}</text> | |||||
| <view class='con'> | |||||
| <view class="title">会员等级为<text class='level'>[{{level}}]</text>对应门店的优惠折扣</view> | |||||
| </view> | |||||
| </view> | </view> | ||||
| <view class='cards clearfix'> | <view class='cards clearfix'> | ||||
| <view class='card' wx:for="{{discountMerchantList}}" wx:key="{{index}}" wx:if="{{discountMerchantList.length>0}}"> | <view class='card' wx:for="{{discountMerchantList}}" wx:key="{{index}}" wx:if="{{discountMerchantList.length>0}}"> | ||||
| @@ -1,7 +1,7 @@ | |||||
| @import "../../app.wxss"; | @import "../../app.wxss"; | ||||
| Page { | Page { | ||||
| background: #fc5b24; | |||||
| background:linear-gradient(180deg,#FD832D 0%,#FE4A16 100%); | |||||
| } | } | ||||
| .none { | .none { | ||||
| @@ -27,7 +27,7 @@ Page { | |||||
| .title { | .title { | ||||
| padding: 20rpx 40rpx 30rpx; | padding: 20rpx 40rpx 30rpx; | ||||
| color: #fff; | |||||
| color: #3C3C3C; | |||||
| text-align: center; | text-align: center; | ||||
| font-size: 26rpx; | font-size: 26rpx; | ||||
| } | } | ||||
| @@ -156,20 +156,14 @@ Page { | |||||
| } | } | ||||
| .code { | .code { | ||||
| width: 684rpx; | |||||
| width: 714rpx; | |||||
| height: 794rpx; | |||||
| background: #fff; | background: #fff; | ||||
| margin: 0 auto; | margin: 0 auto; | ||||
| border-radius: 10rpx; | border-radius: 10rpx; | ||||
| padding: 20rpx 0 40rpx; | padding: 20rpx 0 40rpx; | ||||
| } | } | ||||
| .code text { | |||||
| color: #666; | |||||
| display: block; | |||||
| text-align: center; | |||||
| font-size: 28rpx; | |||||
| } | |||||
| #barcode { | #barcode { | ||||
| width: 600rpx; | width: 600rpx; | ||||
| height: 150rpx; | height: 150rpx; | ||||
| @@ -178,8 +172,21 @@ Page { | |||||
| .code image { | .code image { | ||||
| display: block; | display: block; | ||||
| width: 500rpx; | |||||
| width: 358rpx; | |||||
| height: 358rpx; | |||||
| margin: 142rpx 178rpx 72rpx; | |||||
| } | |||||
| .memCode{ | |||||
| width: 562rpx; | |||||
| height: 88rpx; | |||||
| line-height: 88rpx; | |||||
| border-radius:16rpx; | |||||
| border:1px solid rgba(225,225,225,1); | |||||
| margin: 0 auto; | margin: 0 auto; | ||||
| color: #666; | |||||
| display: block; | |||||
| font-size: 28rpx; | |||||
| text-align: center; | |||||
| } | } | ||||
| .building{ | .building{ | ||||
| display: inline-block; | display: inline-block; | ||||
| @@ -1,11 +1,11 @@ | |||||
| <view class="user"> | <view class="user"> | ||||
| <view class="top" ></view> | <view class="top" ></view> | ||||
| <view class='user_title '> | <view class='user_title '> | ||||
| <view class="user-avatar" bindtap='gotograde'> | |||||
| <view class="user-avatar" bindtap='gotoedit'> | |||||
| <open-data class="open" type="userAvatarUrl"></open-data> | <open-data class="open" type="userAvatarUrl"></open-data> | ||||
| </view> | </view> | ||||
| <view class="user-name"> | |||||
| <open-data class="name" type="userNickName"></open-data> | |||||
| <view class="user-name" bindtap='gotoedit'> | |||||
| <open-data class="name" type="userNickName" ></open-data> | |||||
| <view class=' usre_level'> | <view class=' usre_level'> | ||||
| <text class='chengzhang '>{{levelName}}</text> | <text class='chengzhang '>{{levelName}}</text> | ||||
| </view> | </view> | ||||