Skip to content

dev / zhiliang-light-mp

Go to a project
Toggle navigation
Toggle navigation pinning
7d0792fc by simon
Options

默认提交

1 parent 5e7fefff
Inline Side-by-side
Showing 13 changed files with 177 additions and 111 deletions
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
4 $contentWidth:690px; 4 $contentWidth:690px;
5 5
6 .page { 6 .page {
7 border-bottom: $pageBottom; 7 padding-bottom: $pageBottom;
8 8
9 .bgc {} 9 .bgc {}
10 10
...@@ -91,8 +91,6 @@ $contentWidth:690px; ...@@ -91,8 +91,6 @@ $contentWidth:690px;
91 } 91 }
92 } 92 }
93 93
94
95
96 .border { 94 .border {
97 width: $contentWidth; 95 width: $contentWidth;
98 @extend .shadow; 96 @extend .shadow;
...@@ -101,3 +99,10 @@ $contentWidth:690px; ...@@ -101,3 +99,10 @@ $contentWidth:690px;
101 padding: 24px 30px; 99 padding: 24px 30px;
102 margin: 0 auto 20px; 100 margin: 0 auto 20px;
103 } 101 }
102
103 .official-account-wrap {
104 width: $contentWidth;
105 margin: 24px auto;
106
107 .official-account {}
108 }
......
...@@ -41,14 +41,17 @@ ...@@ -41,14 +41,17 @@
41 </view> 41 </view>
42 <!-- 关注 --> 42 <!-- 关注 -->
43 <view class="border focus"> 43 <view class="border focus">
44 <image bindtap="onPreviewImageHandler" class="qrcode" mode="widthFix" src="{{qrcodeUrl}}" /> 44 <image bindtap="onPreviewImageHandler" class="qrcode" mode="widthFix" src="{{qrcodeUrl}}" />
45 <view class="tips">更多讯息，欢迎关注我们的公众号</view> 45 <view class="tips">更多讯息，欢迎关注我们的公众号</view>
46 <!-- <view bindtap="onPreviewImageHandler" class="btn">一键关注</view> --> 46 <!-- <view bindtap="onPreviewImageHandler" class="btn">一键关注</view> -->
47 </view> 47 </view>
48 <!-- 一键关注 -->
49 <view class="official-account-wrap">
50 <official-account class="official-account" bindload="officialAccountLoadFuc" binderror="officialAccountErrorFuc"></official-account>
51 </view>
48 </view> 52 </view>
49 </view> 53 </view>
50 </view> 54 </view>
51 <van-popup show="{{ authorizeVisible }}"> 55 <van-popup show="{{ authorizeVisible }}">
52 <authorize-comp bind:evtcomp="evtcomp"></authorize-comp> 56 <authorize-comp bind:evtcomp="evtcomp"></authorize-comp>
53 </van-popup> 57 </van-popup>
54
......
...@@ -93,6 +93,14 @@ Page({ ...@@ -93,6 +93,14 @@ Page({
93 productList: [] 93 productList: []
94 }) 94 })
95 }, 95 },
96
97 officialAccountLoadFuc(evt) {
98 console.log("officialAccountLoadFuc:", evt)
99 },
100 officialAccountErrorFuc(evt) {
101 console.log("officialAccountErrorFuc:", evt)
102 },
103
96 /** 104 /**
97 * 请求产品 105 * 请求产品
98 */ 106 */
......
...@@ -24,7 +24,7 @@ $contentWidth:670px; ...@@ -24,7 +24,7 @@ $contentWidth:670px;
24 height: 300px; 24 height: 300px;
25 } 25 }
26 26
27 .space1{ 27 .space1 {
28 height: 222px; 28 height: 222px;
29 } 29 }
30 30
...@@ -43,8 +43,7 @@ $contentWidth:670px; ...@@ -43,8 +43,7 @@ $contentWidth:670px;
43 &-ipt-wrap { 43 &-ipt-wrap {
44 @extend .bb; 44 @extend .bb;
45 padding-left: 30px; 45 padding-left: 30px;
46 width: 568px; 46 width: 320px;
47 flex: 1;
48 47
49 .ipt { 48 .ipt {
50 font-size: 28px; 49 font-size: 28px;
...@@ -61,12 +60,38 @@ $contentWidth:670px; ...@@ -61,12 +60,38 @@ $contentWidth:670px;
61 &-scan { 60 &-scan {
62 @extend .fcc; 61 @extend .fcc;
63 width: 100px; 62 width: 100px;
63 height: 100px;
64 64
65 .icon { 65 .icon {
66 width: 40px; 66 width: 40px;
67 height: 40px; 67 height: 40px;
68 } 68 }
69
70 .icon-search{
71 width: 36px;
72 height: 36px;
73 opacity: .6;
74 }
75
76 .icon2 {
77 width: 60px;
78 height: 60px;
79 margin-left: 4px;
80 }
81
82 .t1{
83 font-size: 22px;
84 margin: 0 12px 0;
85 color: #333333;
86 text-align: center;
87 }
88 }
89
90 &-scan2 {
91 flex-wrap: wrap;
92 flex: 1;
69 } 93 }
94
70 } 95 }
71 } 96 }
72 97
......
...@@ -11,12 +11,13 @@ ...@@ -11,12 +11,13 @@
11 <input value="{{code}}" bindinput="bindCodeInput" class="ipt" placeholder="请输入串码" /> 11 <input value="{{code}}" bindinput="bindCodeInput" class="ipt" placeholder="请输入串码" />
12 </view> 12 </view>
13 <view bindtap="onSearchHandler" class="search-scan"> 13 <view bindtap="onSearchHandler" class="search-scan">
14 <image class="icon" mode="aspectFit" src="../../image/icon/icon-search.png" /> 14 <image class="icon icon-search" mode="aspectFit" src="../../image/icon/icon-search.png" />
15 </view> 15 </view>
16 <!-- 隐藏扫描二维码 -->
17 <view class="search-line"></view> 16 <view class="search-line"></view>
18 <view bindtap="onScanHandler" class="search-scan"> 17 <!-- 隐藏扫描二维码 -->
19 <image class="icon" mode="aspectFit" src="../../image/icon/icon-scan.png" /> 18 <view bindtap="onScanHandler" class="search-scan search-scan2">
19 <text class="t1">扫码得积分</text>
20 <image class="icon icon2" mode="aspectFit" src="../../image/icon/icon-scan.png" />
20 </view> 21 </view>
21 </view> 22 </view>
22 </view> 23 </view>
......
...@@ -152,6 +152,22 @@ Page({ ...@@ -152,6 +152,22 @@ Page({
152 }, 152 },
153 153
154 /** 154 /**
155 * 图片查看
156 */
157 onPreviewImageHandler(evt) {
158 // let curItem = getBindtapData(evt);
159 // let index = getBindtapData(evt, "index");
160 // let current = curItem[index] || '';
161 console.log("onPreviewImageHandler")
162 let current = this.data.imageUrl;
163 let urls = [current];
164 wx.previewImage({
165 current: current,
166 urls: urls
167 })
168 },
169
170 /**
155 * 保存图片到本地 171 * 保存图片到本地
156 */ 172 */
157 saveImageToPhotosAlbum() { 173 saveImageToPhotosAlbum() {
...@@ -196,11 +212,6 @@ Page({ ...@@ -196,11 +212,6 @@ Page({
196 }, 212 },
197 213
198 214
199
200
201
202
203
204 // 创建二维码 215 // 创建二维码
205 createQrCode(content, canvasId, cavW, cavH) { 216 createQrCode(content, canvasId, cavW, cavH) {
206 //调用插件中的draw方法，绘制二维码图片 217 //调用插件中的draw方法，绘制二维码图片
...@@ -241,28 +252,28 @@ Page({ ...@@ -241,28 +252,28 @@ Page({
241 return size; 252 return size;
242 }, 253 },
243 254
244 // 隐藏蒙层 255 // 隐藏蒙层
245 hideMask() { 256 hideMask() {
246 this.setData({ 257 this.setData({
247 authorizeVisible: false, 258 authorizeVisible: false,
248 }) 259 })
249 }, 260 },
250 // 子组件事件 261 // 子组件事件
251 evtcomp(evt) { 262 evtcomp(evt) {
252 let { 263 let {
253 name, 264 name,
254 data 265 data
255 } = evt.detail; 266 } = evt.detail;
256 switch (name) { 267 switch (name) {
257 268
258 // 隐藏弹窗 269 // 隐藏弹窗
259 case "_evt_hide_mask": 270 case "_evt_hide_mask":
260 this.hideMask(); 271 this.hideMask();
261 break; 272 break;
262 273
263 default: 274 default:
264 break; 275 break;
265 } 276 }
266 }, 277 },
267 278
268 }) 279 })
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
6 <view class="top-space"></view> 6 <view class="top-space"></view>
7 <view class="content"> 7 <view class="content">
8 <view class="card"> 8 <view class="card">
9 <image class="my-card" mode="widthFix" src="{{imageUrl}}" /> 9 <image bindtap="onPreviewImageHandler" class="my-card" mode="widthFix" src="{{imageUrl}}" />
10 <!-- <image class="avatar" mode="widthFix" src="{{userInfo.avatar}}" /> 10 <!-- <image class="avatar" mode="widthFix" src="{{userInfo.avatar}}" />
11 <view class="nickname">{{userInfo.nickname}}</view> 11 <view class="nickname">{{userInfo.nickname}}</view>
12 <image class="qrcode" mode="widthFix" src="{{qrImagePath}}" /> 12 <image class="qrcode" mode="widthFix" src="{{qrImagePath}}" />
......
...@@ -88,6 +88,7 @@ Page({ ...@@ -88,6 +88,7 @@ Page({
88 formatRankInfo(val, status) { 88 formatRankInfo(val, status) {
89 let rankInfo = val; 89 let rankInfo = val;
90 if (!rankInfo) return; 90 if (!rankInfo) return;
91
91 if (status == "promotion") { 92 if (status == "promotion") {
92 rankInfo.myMember.rank = rankInfo.myMember.promotionNo; 93 rankInfo.myMember.rank = rankInfo.myMember.promotionNo;
93 rankInfo.myMember.points = rankInfo.myMember.promotionPoints; 94 rankInfo.myMember.points = rankInfo.myMember.promotionPoints;
......
...@@ -284,3 +284,9 @@ $contentWidth:690px; ...@@ -284,3 +284,9 @@ $contentWidth:690px;
284 } 284 }
285 } 285 }
286 } 286 }
287
288 .empty-tips {
289 text-align: center;
290 padding-top: 400px;
291 font-size: 28px;
292 }
......
...@@ -17,79 +17,85 @@ ...@@ -17,79 +17,85 @@
17 </view> 17 </view>
18 <!-- 排行 --> 18 <!-- 排行 -->
19 <view class="border rank"> 19 <view class="border rank">
20 <!-- 功能区 --> 20 <block wx:if="{{rankInfo && rankInfo.memberList > 0}}">
21 <view class="rank-func"> 21 <!-- 功能区 -->
22 <view class="rank-func-item"> 22 <view class="rank-func">
23 <view wx:if="{{turnsIndex == 0}}" class="pubish"> 23 <view class="rank-func-item">
24 <view class="t1"> 24 <view wx:if="{{turnsIndex == 0}}" class="pubish">
25 本轮周期： 25 <view class="t1">
26 <span>{{rankInfo.activityName}}</span> 26 本轮周期：
27 </view> 27 <span>{{rankInfo.activityName}}</span>
28 <view wx:if="{{status == 'promotion'}}" class="t1 t2"> 28 </view>
29 本轮奖品： 29 <view wx:if="{{status == 'promotion'}}" class="t1 t2">
30 <span class="c1">{{rankInfo.prizeName}}</span> 30 本轮奖品：
31 <span class="c1">{{rankInfo.prizeName}}</span>
32 </view>
33 <view wx:if="{{status == 'rank'}}" class="t1 t2">
34 我的名次：
35 <span class="c2">{{rankInfo.myMember.rank || '-'}}</span>
36 名
37 </view>
31 </view> 38 </view>
32 <view wx:if="{{status == 'rank'}}" class="t1 t2"> 39 <view wx:else class="pubish">
33 我的名次： 40 <picker value="{{historyIndex}}" range="{{historyRankInfoList}}" range-key="activityName" bindchange="bindHistoryChange">
34 <span class="c2">{{rankInfo.myMember.rank || '-'}}</span> 41 <view class="func">
35 名 42 <image class="icon" mode="aspectFit" src="../../image/icon/icon-sign-record.png" />
43 {{rankInfo.activityName}}
44 <image class="arrow" mode="aspectFit" src="../../image/icon/icon-filter-down-on.png" />
45 {{dateStart}}
46 </view>
47 </picker>
36 </view> 48 </view>
37 </view> 49 </view>
38 <view wx:else class="pubish"> 50 <view class="rank-func-item rank-func-item2 pubish fje">
39 <picker value="{{historyIndex}}" range="{{historyRankInfoList}}" range-key="activityName" bindchange="bindHistoryChange"> 51 <view wx:if="{{turnsIndex == 0}}" data-index="1" bindtap="onChangeTurnsHandler" class="mode">
40 <view class="func"> 52 查看历史排行
41 <image class="icon" mode="aspectFit" src="../../image/icon/icon-sign-record.png" /> 53 </view>
42 {{rankInfo.activityName}} 54 <view wx:if="{{turnsIndex == 1}}" data-index="0" bindtap="onChangeTurnsHandler" class="mode">
43 <image class="arrow" mode="aspectFit" src="../../image/icon/icon-filter-down-on.png" /> 55 返回本轮排行
44 {{dateStart}} 56 </view>
45 </view>
46 </picker>
47 </view>
48 </view>
49 <view class="rank-func-item rank-func-item2 pubish fje">
50 <view wx:if="{{turnsIndex == 0}}" data-index="1" bindtap="onChangeTurnsHandler" class="mode">
51 查看历史排行
52 </view>
53 <view wx:if="{{turnsIndex == 1}}" data-index="0" bindtap="onChangeTurnsHandler" class="mode">
54 返回本轮排行
55 </view> 57 </view>
56 </view> 58 </view>
57 </view> 59 <!-- 标题 -->
58 <!-- 标题 --> 60 <view class="tit">
59 <view class="tit"> 61 <view class="tt t1">名次</view>
60 <view class="tt t1">名次</view> 62 <view class="tt t2">名称</view>
61 <view class="tt t2">名称</view> 63 <view class="tt t3">积分</view>
62 <view class="tt t3">积分</view>
63 </view>
64 <!-- 排行item -->
65 <scroll-view bindscrolltolower="onRankScrolltolower" scroll-y="{{true}}" class="item-wrap">
66 <view wx:for="{{rankInfo.memberList}}" wx:key="{{index}}" class="rank-item {{item.rank == '1' ? 'rank-item-first':''}}">
67 <view class="no">
68 <image wx:if="{{item.rank == '1'}}" class="medal" mode="aspectFit" src="../../image/icon/icon-medal.png" />
69 <span wx:else>{{item.rank}}</span>
70 </view>
71 <view class="user">
72 <image class="avatar" mode="widthFix" src="{{item.avatar}}" />
73 {{item.nickname}}
74 </view>
75 <view class="integral">{{item.points}}</view>
76 </view> 64 </view>
77 </scroll-view> 65 <!-- 排行item -->
78 <!-- 省略号 --> 66 <scroll-view bindscrolltolower="onRankScrolltolower" scroll-y="{{true}}" class="item-wrap">
79 <view class="etc">...</view> 67 <view wx:for="{{rankInfo.memberList}}" wx:key="{{index}}" class="rank-item {{item.rank == '1' ? 'rank-item-first':''}}">
80 <!-- 我的排名 --> 68 <view class="no">
81 <view class="my-rank" wx:if="{{rankInfo.myMember}}"> 69 <image wx:if="{{item.rank == '1'}}" class="medal" mode="aspectFit" src="../../image/icon/icon-medal.png" />
82 <view class="rank-item"> 70 <span wx:else>{{item.rank}}</span>
83 <view class="no"> 71 </view>
84 <image wx:if="{{rankInfo.myMember.rank == 1}}" class="medal" mode="aspectFit" src="../../image/icon/icon-medal.png" /> 72 <view class="user">
85 <span wx:else>{{rankInfo.myMember.rank || '-'}}</span> 73 <image class="avatar" mode="widthFix" src="{{item.avatar}}" />
74 {{item.nickname}}
75 </view>
76 <view class="integral">{{item.points}}</view>
86 </view> 77 </view>
87 <view class="user"> 78 </scroll-view>
88 <image class="avatar" mode="widthFix" src="{{rankInfo.myMember.avatar}}" /> 79 <!-- 省略号 -->
89 {{rankInfo.myMember.nickname}} 80 <view class="etc">...</view>
81 <!-- 我的排名 -->
82 <view class="my-rank" wx:if="{{rankInfo.myMember}}">
83 <view class="rank-item">
84 <view class="no">
85 <image wx:if="{{rankInfo.myMember.rank == 1}}" class="medal" mode="aspectFit" src="../../image/icon/icon-medal.png" />
86 <span wx:else>{{rankInfo.myMember.rank || '-'}}</span>
87 </view>
88 <view class="user">
89 <image class="avatar" mode="widthFix" src="{{rankInfo.myMember.avatar}}" />
90 {{rankInfo.myMember.nickname}}
91 </view>
92 <view class="integral">{{rankInfo.myMember.points}}</view>
90 </view> 93 </view>
91 <view class="integral">{{rankInfo.myMember.points}}</view>
92 </view> 94 </view>
95 </block>
96 <view class="empty-tips">
97 <!-- <span class="iconfont iconempty"></span> -->
98 <view class="tips">暂未开启积分排行，敬请期待</view>
93 </view> 99 </view>
94 </view> 100 </view>
95 <!-- 我的奖励按钮 --> 101 <!-- 我的奖励按钮 -->
......
...@@ -7,14 +7,14 @@ ...@@ -7,14 +7,14 @@
7 <!-- 用户信息 --> 7 <!-- 用户信息 -->
8 <view class="user"> 8 <view class="user">
9 <!-- 左边栏 --> 9 <!-- 左边栏 -->
10 <view class="user-info"> 10 <view class="user-info" bindtap="toVipVerifyHandler">
11 <image class="avatar" mode="aspectFill" src="{{userInfo.avatar}}" /> 11 <image class="avatar" mode="aspectFill" src="{{userInfo.avatar}}" />
12 <view class="wrap1"> 12 <view class="wrap1">
13 <view class="name">{{userInfo.realName ? userInfo.realName : userInfo.nickname}}</view> 13 <view class="name">{{userInfo.realName ? userInfo.realName : userInfo.nickname}}</view>
14 <view wx:if="{{userInfo.auditStatus == 'authorization'}}" class="vip vip-check"> 14 <view wx:if="{{userInfo.auditStatus == 'authorization'}}" class="vip vip-check">
15 积分会员 15 积分会员
16 </view> 16 </view>
17 <view wx:elif="{{userInfo.auditStatus == 'unauthorized'}}" class="vip" bindtap="toVipVerifyHandler"> 17 <view wx:elif="{{userInfo.auditStatus == 'unauthorized'}}" class="vip" >
18 审核中 > 18 审核中 >
19 </view> 19 </view>
20 <view wx:else class="vip" bindtap="toVipLoginHandler">未验证 ></view> 20 <view wx:else class="vip" bindtap="toVipLoginHandler">未验证 ></view>
......
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
100 display: flex; 100 display: flex;
101 justify-content: space-between; 101 justify-content: space-between;
102 @extend .bb; 102 @extend .bb;
103 padding: 32px 66px 66px; 103 padding: 48px 66px 24px;
104 104
105 &-item { 105 &-item {
106 text-align: center; 106 text-align: center;
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
127 } 127 }
128 128
129 .submit-tips { 129 .submit-tips {
130 margin: 12px 0; 130 padding: 24px 0;
131 width: 100%; 131 width: 100%;
132 color: #333333; 132 color: #333333;
133 text-align: center; 133 text-align: center;
......
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
52 </view> 52 </view>
53 <!-- 上传 --> 53 <!-- 上传 -->
54 <view class="upload"> 54 <view class="upload">
55 <view class="upload-tit">请上传身份证或电工证，审核后，可签到及兑换积分</view> 55 <!-- <view class="upload-tit">请上传身份证或电工证，审核后，可签到及兑换积分</view> -->
56 <view class="upload-wrap"> 56 <view class="upload-wrap">
57 <view class="upload-wrap-item"> 57 <view class="upload-wrap-item">
58 <image class="image" bindtap="onUploadHandler" mode="aspectFit" src="{{files[0] && files[0].path?files[0].path:'../../image/icon/icon-plus.png'}}" /> 58 <image class="image" bindtap="onUploadHandler" mode="aspectFit" src="{{files[0] && files[0].path?files[0].path:'../../image/icon/icon-plus.png'}}" />
...@@ -63,12 +63,12 @@ ...@@ -63,12 +63,12 @@
63 <view class="tips">示例</view> 63 <view class="tips">示例</view>
64 </view> 64 </view>
65 </view> 65 </view>
66 <view class="submit-tips">
67 <text class="text">五金分销商请上传营业执照，其他用户上传身份证或电工证\n审核后可参与签到及兑换积分</text>
68 </view>
66 </view> 69 </view>
67 <!-- 提交按钮 --> 70 <!-- 提交按钮 -->
68 <view class="submit-btn" bindtap="onSubmitHandler">确认提交</view> 71 <view class="submit-btn" bindtap="onSubmitHandler">确认提交</view>
69 <view class="submit-tips">
70 <text class="text">五金分销商请上传营业执照，其他用户上传身份证或电工证\n审核后可参与签到及兑换积分</text>
71 </view>
72 </view> 72 </view>
73 </view> 73 </view>
74 </view> 74 </view>
......