Skip to content

dev / zhiliang-light-mp

Go to a project
Toggle navigation
Toggle navigation pinning
d0eec946 by simon
Options

默认提交

1 parent bcdd8130
Inline Side-by-side
Showing 33 changed files with 113 additions and 190 deletions
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
50 "pagePath": "pages/index/index", 50 "pagePath": "pages/index/index",
51 "iconPath": "image/tabbar/scan-bar.png", 51 "iconPath": "image/tabbar/scan-bar.png",
52 "selectedIconPath": "image/tabbar/scan-bar-selected.png", 52 "selectedIconPath": "image/tabbar/scan-bar-selected.png",
53 "text": "扫码积分" 53 "text": "扫码得奖金"
54 }, 54 },
55 { 55 {
56 "pagePath": "pages/gift-shop/gift-shop", 56 "pagePath": "pages/gift-shop/gift-shop",
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
6 </view> --> 6 </view> -->
7 <view class="tit">深士照明</view> 7 <view class="tit">深士照明</view>
8 <view class="tips"> 8 <view class="tips">
9 <text>需要获取您的微信昵称等信息才可以获取积分和兑换奖品哦</text> 9 <text>需要获取您的微信昵称等信息才可以获取奖金和兑换奖品哦</text>
10 </view> 10 </view>
11 </view> 11 </view>
12 <view class="btn-wrap"> 12 <view class="btn-wrap">
......
...@@ -10,11 +10,11 @@ ...@@ -10,11 +10,11 @@
10 <view></view> 10 <view></view>
11 <text class="tips">经后台审核通过后，红包将通过公众号消息或微信服务消息发放，届时请及时领取！</text> 11 <text class="tips">经后台审核通过后，红包将通过公众号消息或微信服务消息发放，届时请及时领取！</text>
12 </block> 12 </block>
13 <!-- 积分 --> 13 <!-- 奖金 -->
14 <block wx:else> 14 <block wx:else>
15 <image class="prize" mode="aspectFit" src="../../image/prize/prize-integral.png" /> 15 <image class="prize" mode="aspectFit" src="../../image/prize/prize-integral.png" />
16 <view></view> 16 <view></view>
17 <text class="tips">后台审核通过后，积分将会直接派送到您的账户上，可在积分明细中查看！</text> 17 <text class="tips">后台审核通过后，奖金将会直接派送到您的账户上，可在奖金明细中查看！</text>
18 </block> 18 </block>
19 </view> 19 </view>
20 <button class="btn" bindtap="hideMask">我知道了</button> 20 <button class="btn" bindtap="hideMask">我知道了</button>
......
...@@ -8,11 +8,11 @@ ...@@ -8,11 +8,11 @@
8 <view></view> 8 <view></view>
9 <text class="tips">现金红包已经快马加鞭给您派送\n请注意通知消息，并在24小时内领取哦~</text> 9 <text class="tips">现金红包已经快马加鞭给您派送\n请注意通知消息，并在24小时内领取哦~</text>
10 </block> 10 </block>
11 <!-- 积分 --> 11 <!-- 奖金 -->
12 <block wx:else> 12 <block wx:else>
13 <image class="prize" mode="aspectFit" src="../../image/prize/prize-integral.png" /> 13 <image class="prize" mode="aspectFit" src="../../image/prize/prize-integral.png" />
14 <view></view> 14 <view></view>
15 <text class="tips">积分已派送到您的账户\n可在“积分明细”里查看</text> 15 <text class="tips">奖金已派送到您的账户\n可在“奖金明细”里查看</text>
16 </block> 16 </block>
17 </view> 17 </view>
18 <button class="btn" bindtap="hideMask">我知道了</button> 18 <button class="btn" bindtap="hideMask">我知道了</button>
......
...@@ -2,7 +2,7 @@ let ENV_CONFIG = require('./env/index'); ...@@ -2,7 +2,7 @@ let ENV_CONFIG = require('./env/index');
2 2
3 const APPID = '' 3 const APPID = ''
4 /** ====每次发布版本记得修改此环境配置==== */ 4 /** ====每次发布版本记得修改此环境配置==== */
5 const ENV = 'Prod'; // Dev Prod 5 const ENV = 'Dev'; // Dev Prod
6 const NET_CONFIG = ENV_CONFIG[ENV]; 6 const NET_CONFIG = ENV_CONFIG[ENV];
7 const MOCKAPI = ENV_CONFIG.mockApi; 7 const MOCKAPI = ENV_CONFIG.mockApi;
8 8
......
...@@ -3,9 +3,9 @@ module.exports = { ...@@ -3,9 +3,9 @@ module.exports = {
3 register: '/register', // post 注册（用户授权） 3 register: '/register', // post 注册（用户授权）
4 product: '/product', // post 首页商品概览 4 product: '/product', // post 首页商品概览
5 bannerList: '/banner/list', // post 轮播图列表 5 bannerList: '/banner/list', // post 轮播图列表
6 pointsOverview: '/points/overview', // post 查看积分概览 6 pointsOverview: '/points/overview', // post 查看奖金概览
7 points: '/points', // post 类型积分值 7 points: '/points', // post 类型奖金值
8 commodityList: '/commodity/list', // post 积分商城浏览 商品列表 8 commodityList: '/commodity/list', // post 奖金商城浏览 商品列表
9 commodityVeridcation: '/commodity/veridcation', // post 兑换礼物 红包和实物兑换礼物接口 ， 实物会返回地址信息，红包校验通过会直接兑换 9 commodityVeridcation: '/commodity/veridcation', // post 兑换礼物 红包和实物兑换礼物接口 ， 实物会返回地址信息，红包校验通过会直接兑换
10 commodityExchange: '/commodity/exchange', // post 兑换礼物2 实物兑换，需要带上地址的唯一标识uuid 10 commodityExchange: '/commodity/exchange', // post 兑换礼物2 实物兑换，需要带上地址的唯一标识uuid
11 receiver: '/receiver', // post 地址 地址列表接口 11 receiver: '/receiver', // post 地址 地址列表接口
...@@ -25,12 +25,12 @@ module.exports = { ...@@ -25,12 +25,12 @@ module.exports = {
25 messageSave: '/message/save', // post 用户留言 25 messageSave: '/message/save', // post 用户留言
26 contact: '/contact', // post 联系方式 26 contact: '/contact', // post 联系方式
27 order: '/order', // post 订单状态 订单列表 27 order: '/order', // post 订单状态 订单列表
28 activity: '/activity', // post 推广积分排行 28 activity: '/activity', // post 推广奖金排行
29 activityHistory: '/activity/history', // post 历史推广排行 29 activityHistory: '/activity/history', // post 历史推广排行
30 activityAll: '/activity/all', // post 总排行--忽略 30 activityAll: '/activity/all', // post 总排行--忽略
31 activityPrize: '/activity/prize', // post 排行奖励明细 31 activityPrize: '/activity/prize', // post 排行奖励明细
32 activityPrizeGet: '/activity/prize/get', // post 领取奖励 活动奖励获取 32 activityPrizeGet: '/activity/prize/get', // post 领取奖励 活动奖励获取
33 scanIntegralQrcode: '/scan/integral/qrcode', // post 扫积分码功能 扫积分码 33 scanIntegralQrcode: '/scan/integral/qrcode', // post 扫奖金码功能 扫奖金码
34 scanPersonQrcode: '/scan/person/qrcode', // post 扫个人二维码 34 scanPersonQrcode: '/scan/person/qrcode', // post 扫个人二维码
35 signInfo: '/sign/info', // post 签到信息 用户注册接口 35 signInfo: '/sign/info', // post 签到信息 用户注册接口
36 sign: '/sign', // post 签到动作 用户注册接口 36 sign: '/sign', // post 签到动作 用户注册接口
......
1 import { 1 import {
2 getBindtapData, 2 getBindtapData,
3 getObjByListKeyValue 3 getObjByListKeyValue,
4 Fen2Yuan
4 } from '../../utils/util'; 5 } from '../../utils/util';
5 6
6 let app = getApp(); 7 let app = getApp();
...@@ -9,7 +10,7 @@ Page({ ...@@ -9,7 +10,7 @@ Page({
9 authorizeVisible: false, 10 authorizeVisible: false,
10 commonTipsCompVisible: false, 11 commonTipsCompVisible: false,
11 orderSubmitSuccessCompVisible: false, 12 orderSubmitSuccessCompVisible: false,
12 cid: "1", // 1积分不足 2.账号未审核 13 cid: "1", // 1奖金不足 2.账号未审核
13 innerTitle: "", 14 innerTitle: "",
14 innerText: "", 15 innerText: "",
15 innerButton: "", 16 innerButton: "",
...@@ -70,12 +71,12 @@ Page({ ...@@ -70,12 +71,12 @@ Page({
70 indexInfo 71 indexInfo
71 } = this.data; 72 } = this.data;
72 if (indexInfo.memberPoints < item.commodityPrice) { 73 if (indexInfo.memberPoints < item.commodityPrice) {
73 // 积分不足 74 // 奖金不足
74 this.setData({ 75 this.setData({
75 commonTipsCompVisible: true, 76 commonTipsCompVisible: true,
76 cid: "1", 77 cid: "1",
77 innerTitle: "积分不足", 78 innerTitle: "奖金不足",
78 innerText: "使用推广、签到功能\n可获取更多积分！", 79 innerText: "使用推广、签到功能\n可获取更多奖金！",
79 innerButton: "我知道了", 80 innerButton: "我知道了",
80 }); 81 });
81 reject(); 82 reject();
...@@ -119,7 +120,7 @@ Page({ ...@@ -119,7 +120,7 @@ Page({
119 120
120 wx.showModal({ 121 wx.showModal({
121 title: '兑换确认', 122 title: '兑换确认',
122 content: `将花费${item.commodityPrice}积分兑换${item.commodityTitle}一份`, 123 content: `将花费${Fen2Yuan(item.commodityPrice)}元兑换${item.commodityTitle}一份`,
123 success(res) { 124 success(res) {
124 if (res.confirm) { 125 if (res.confirm) {
125 app.post({ 126 app.post({
...@@ -191,7 +192,7 @@ Page({ ...@@ -191,7 +192,7 @@ Page({
191 this.hideMask(); 192 this.hideMask();
192 console.log("data.cid:", data.cid); 193 console.log("data.cid:", data.cid);
193 switch (data.cid) { 194 switch (data.cid) {
194 // 积分不足 195 // 奖金不足
195 case "1": 196 case "1":
196 this.hideMask(); 197 this.hideMask();
197 break; 198 break;
......
1 <wxs module="filter" src="../../utils/utilswxs.wxs"></wxs>
1 <view class="page"> 2 <view class="page">
2 <view class="app__bgc bgc"></view> 3 <view class="app__bgc bgc"></view>
3 <view class="app__bg bg"></view> 4 <view class="app__bg bg"></view>
...@@ -11,7 +12,7 @@ ...@@ -11,7 +12,7 @@
11 </view> 12 </view>
12 <view class="cont"> 13 <view class="cont">
13 <view class="name">{{item.commodityTitle || '-'}}</view> 14 <view class="name">{{item.commodityTitle || '-'}}</view>
14 <view class="integral">消耗积分：{{item.commodityPrice}}分</view> 15 <view class="integral">消耗奖金：{{filter.Fen2Yuan(item.commodityPrice)}}元</view>
15 </view> 16 </view>
16 </view> 17 </view>
17 </view> 18 </view>
...@@ -51,9 +52,9 @@ ...@@ -51,9 +52,9 @@
51 <view class="bottom"> 52 <view class="bottom">
52 <view class="submit-bar"> 53 <view class="submit-bar">
53 <view class="submit-bar-cont"> 54 <view class="submit-bar-cont">
54 现有积分 55 现有奖金
55 <span class="integral">{{indexInfo.memberPoints}}</span> 56 <span class="integral">{{filter.Fen2Yuan(indexInfo.memberPoints)}}</span>
56 分 57 元
57 </view> 58 </view>
58 <view bindtap="onSubmitHandler" class="submit-bar-btn">确认兑换</view> 59 <view bindtap="onSubmitHandler" class="submit-bar-btn">确认兑换</view>
59 </view> 60 </view>
......
1 <wxs module="filter" src="../../utils/utilswxs.wxs"></wxs>
1 <view class="page"> 2 <view class="page">
2 <view class="app__bgc bgc"></view> 3 <view class="app__bgc bgc"></view>
3 <view class="app__bg bg"></view> 4 <view class="app__bg bg"></view>
...@@ -9,7 +10,7 @@ ...@@ -9,7 +10,7 @@
9 <image class="icon" mode="aspectFit" src="../../image/icon/icon-search.png" /> 10 <image class="icon" mode="aspectFit" src="../../image/icon/icon-search.png" />
10 </view> 11 </view>
11 <view class="filter" bindtap="onChangeFitterHandler"> 12 <view class="filter" bindtap="onChangeFitterHandler">
12 积分排序 13 奖金排序
13 <view wx:if="{{orderSort == 0}}" class="icon-wrap"> 14 <view wx:if="{{orderSort == 0}}" class="icon-wrap">
14 <image class="icon up" src="../../image/icon/icon-filter-up-on.png" mode="widthFix" /> 15 <image class="icon up" src="../../image/icon/icon-filter-up-on.png" mode="widthFix" />
15 <image class="icon down" src="../../image/icon/icon-filter-down.png" mode="widthFix" /> 16 <image class="icon down" src="../../image/icon/icon-filter-down.png" mode="widthFix" />
...@@ -64,7 +65,7 @@ ...@@ -64,7 +65,7 @@
64 <view class="cont"> 65 <view class="cont">
65 <view class="name">{{item.commodityTitle}}</view> 66 <view class="name">{{item.commodityTitle}}</view>
66 <view class="desc">{{item.commodityBrief}}</view> 67 <view class="desc">{{item.commodityBrief}}</view>
67 <view class="integral">消耗积分：{{item.commodityPrice}}分</view> 68 <view class="integral">消耗奖金：{{filter.Fen2Yuan(item.commodityPrice)}}元</view>
68 <view bindtap="onShowGiftDetailHandler" data-data="{{item}}" class="btn">查看</view> 69 <view bindtap="onShowGiftDetailHandler" data-data="{{item}}" class="btn">查看</view>
69 </view> 70 </view>
70 </view> 71 </view>
......
...@@ -16,7 +16,7 @@ Page({ ...@@ -16,7 +16,7 @@ Page({
16 curProductDetail: {}, // 选中的产品详情 16 curProductDetail: {}, // 选中的产品详情
17 qrCodeCode: "", 17 qrCodeCode: "",
18 userInfo: {}, //用户信息 18 userInfo: {}, //用户信息
19 code: "", // 手输入码 / 扫出的积分码 19 code: "", // 手输入码 / 扫出的奖金码
20 memberCode: "", // 扫出的用户码 20 memberCode: "", // 扫出的用户码
21 }, 21 },
22 onShareAppMessage() {}, 22 onShareAppMessage() {},
...@@ -29,7 +29,7 @@ Page({ ...@@ -29,7 +29,7 @@ Page({
29 let q = decodeURIComponent(options.q); 29 let q = decodeURIComponent(options.q);
30 // 获取会员码 30 // 获取会员码
31 let m = getQueryByUrl("m", q); 31 let m = getQueryByUrl("m", q);
32 // 获取积分码 32 // 获取奖金码
33 let c = getQueryByUrl("c", q); 33 let c = getQueryByUrl("c", q);
34 34
35 if (q) { 35 if (q) {
...@@ -39,7 +39,7 @@ Page({ ...@@ -39,7 +39,7 @@ Page({
39 memberCode: m 39 memberCode: m
40 }) 40 })
41 } 41 }
42 // 设置积分码 42 // 设置奖金码
43 if (c) { 43 if (c) {
44 this.setData({ 44 this.setData({
45 code: c 45 code: c
...@@ -69,7 +69,7 @@ Page({ ...@@ -69,7 +69,7 @@ Page({
69 this.queryMember().then((result) => { 69 this.queryMember().then((result) => {
70 // 扫用户码 70 // 扫用户码
71 this.queryScanPersonQrcode().then((result2) => { 71 this.queryScanPersonQrcode().then((result2) => {
72 // 查询积分码 72 // 查询奖金码
73 if (code) { 73 if (code) {
74 this.querySearchIntegralQrcode(); 74 this.querySearchIntegralQrcode();
75 } 75 }
...@@ -187,7 +187,7 @@ Page({ ...@@ -187,7 +187,7 @@ Page({
187 187
188 188
189 /** 189 /**
190 * 请求积分码 190 * 请求奖金码
191 * 通过搜索查询 191 * 通过搜索查询
192 */ 192 */
193 querySearchIntegralQrcode() { 193 querySearchIntegralQrcode() {
...@@ -197,7 +197,7 @@ Page({ ...@@ -197,7 +197,7 @@ Page({
197 }) 197 })
198 if (code.length != 16) { 198 if (code.length != 16) {
199 wx.showModal({ 199 wx.showModal({
200 content: '请输入16位积分码', 200 content: '请输入16位奖金码',
201 showCancel: false, 201 showCancel: false,
202 success(res) {} 202 success(res) {}
203 }) 203 })
...@@ -212,7 +212,7 @@ Page({ ...@@ -212,7 +212,7 @@ Page({
212 }, 212 },
213 213
214 /** 214 /**
215 * 请求积分码 215 * 请求奖金码
216 * 通过扫码 216 * 通过扫码
217 */ 217 */
218 queryScanIntegralQrcode() { 218 queryScanIntegralQrcode() {
...@@ -234,7 +234,7 @@ Page({ ...@@ -234,7 +234,7 @@ Page({
234 _this.queryScanPersonQrcode(); 234 _this.queryScanPersonQrcode();
235 } 235 }
236 236
237 // 获取积分码 237 // 获取奖金码
238 let c = getQueryByUrl("c", q); 238 let c = getQueryByUrl("c", q);
239 if (c) { 239 if (c) {
240 app.router.push({ 240 app.router.push({
...@@ -245,7 +245,7 @@ Page({ ...@@ -245,7 +245,7 @@ Page({
245 }) 245 })
246 } else { 246 } else {
247 wx.showModal({ 247 wx.showModal({
248 content: '未发现积分码，换一个二维码试试', 248 content: '未发现奖金码，换一个二维码试试',
249 showCancel: false, 249 showCancel: false,
250 success(res) {} 250 success(res) {}
251 }) 251 })
...@@ -255,7 +255,7 @@ Page({ ...@@ -255,7 +255,7 @@ Page({
255 let isCancel = err.errMsg.indexOf("cancel") != -1; 255 let isCancel = err.errMsg.indexOf("cancel") != -1;
256 if (!isCancel) { 256 if (!isCancel) {
257 wx.showModal({ 257 wx.showModal({
258 content: '未发现积分码，换一个二维码试试', 258 content: '未发现奖金码，换一个二维码试试',
259 showCancel: false, 259 showCancel: false,
260 success(res) {} 260 success(res) {}
261 }) 261 })
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
16 <view class="search-line"></view> 16 <view class="search-line"></view>
17 <!-- 隐藏扫描二维码 --> 17 <!-- 隐藏扫描二维码 -->
18 <view bindtap="onScanHandler" class="search-scan search-scan2"> 18 <view bindtap="onScanHandler" class="search-scan search-scan2">
19 <text class="t1">扫码得积分</text> 19 <text class="t1">扫码得奖金</text>
20 <image class="icon icon2" mode="aspectFit" src="../../image/icon/icon-scan.png" /> 20 <image class="icon icon2" mode="aspectFit" src="../../image/icon/icon-scan.png" />
21 </view> 21 </view>
22 </view> 22 </view>
......
...@@ -28,35 +28,35 @@ Page({ ...@@ -28,35 +28,35 @@ Page({
28 }, 28 },
29 { 29 {
30 t1: "", 30 t1: "",
31 t2: "购买积分", 31 t2: "购买奖金",
32 index: "1", 32 index: "1",
33 pointsType: "buy", 33 pointsType: "buy",
34 type: "buyNum", 34 type: "buyNum",
35 }, 35 },
36 { 36 {
37 t1: "", 37 t1: "",
38 t2: "推广积分", 38 t2: "推广奖金",
39 index: "2", 39 index: "2",
40 pointsType: "promotion", 40 pointsType: "promotion",
41 type: "promotionNum", 41 type: "promotionNum",
42 }, 42 },
43 { 43 {
44 t1: "", 44 t1: "",
45 t2: "签到积分", 45 t2: "签到奖金",
46 index: "3", 46 index: "3",
47 pointsType: "sign", 47 pointsType: "sign",
48 type: "signNum", 48 type: "signNum",
49 }, 49 },
50 { 50 {
51 t1: "", 51 t1: "",
52 t2: "奖励积分", 52 t2: "奖励奖金",
53 index: "4", 53 index: "4",
54 pointsType: "award", 54 pointsType: "award",
55 type: "awardNum", 55 type: "awardNum",
56 }, 56 },
57 { 57 {
58 t1: "", 58 t1: "",
59 t2: "兑换积分", 59 t2: "兑换奖金",
60 index: "5", 60 index: "5",
61 pointsType: "exchange", 61 pointsType: "exchange",
62 type: "exchangeNum", 62 type: "exchangeNum",
...@@ -125,7 +125,7 @@ Page({ ...@@ -125,7 +125,7 @@ Page({
125 }, 125 },
126 126
127 /** 127 /**
128 * 积分值类型 128 * 奖金值类型
129 */ 129 */
130 queryPoints() { 130 queryPoints() {
131 return new Promise((resolve, reject) => { 131 return new Promise((resolve, reject) => {
...@@ -153,7 +153,7 @@ Page({ ...@@ -153,7 +153,7 @@ Page({
153 }, 153 },
154 154
155 /** 155 /**
156 * 积分概览 156 * 奖金概览
157 */ 157 */
158 queryPointsOverview(isAll = false) { 158 queryPointsOverview(isAll = false) {
159 this.setData({ 159 this.setData({
...@@ -232,27 +232,27 @@ Page({ ...@@ -232,27 +232,27 @@ Page({
232 status = ""; 232 status = "";
233 break; 233 break;
234 234
235 // 购买积分 235 // 购买奖金
236 case "1": 236 case "1":
237 status = "buy"; 237 status = "buy";
238 break; 238 break;
239 239
240 // 推广积分 240 // 推广奖金
241 case "2": 241 case "2":
242 status = "promotion"; 242 status = "promotion";
243 break; 243 break;
244 244
245 // 签到积分 245 // 签到奖金
246 case "3": 246 case "3":
247 status = "sign"; 247 status = "sign";
248 break; 248 break;
249 249
250 // 奖励积分 250 // 奖励奖金
251 case "4": 251 case "4":
252 status = "award"; 252 status = "award";
253 break; 253 break;
254 254
255 // 兑换积分 255 // 兑换奖金
256 case "5": 256 case "5":
257 status = "exchange"; 257 status = "exchange";
258 break; 258 break;
......
1 { 1 {
2 "navigationBarTitleText": "积分明细" 2 "navigationBarTitleText": "奖金明细"
3 } 3 }
......
...@@ -207,7 +207,7 @@ $contentWidth:690px; ...@@ -207,7 +207,7 @@ $contentWidth:690px;
207 } 207 }
208 } 208 }
209 209
210 // 积分 210 // 奖金
211 .integral { 211 .integral {
212 212
213 // display: flex; 213 // display: flex;
......
1 <wxs module="filter" src="../../utils/utilswxs.wxs"></wxs>
1 <view class="page"> 2 <view class="page">
2 <view class="app__bgc bgc"></view> 3 <view class="app__bgc bgc"></view>
3 <view class="app__bg bg"></view> 4 <view class="app__bg bg"></view>
...@@ -6,9 +7,9 @@ ...@@ -6,9 +7,9 @@
6 <view class="content"> 7 <view class="content">
7 <view class="header"> 8 <view class="header">
8 <view class="info"> 9 <view class="info">
9 现有积分 10 现有奖金
10 <span class="t1">{{userInfo.memberPoints}}</span> 11 <span class="t1">{{filter.Fen2Yuan(userInfo.memberPoints)}}</span>
11 分 12 元
12 </view> 13 </view>
13 <view class="sel-wrap"> 14 <view class="sel-wrap">
14 <view class="sel sel2 {{isShowAll ? 'show-all':''}}" bindtap="onShowAllHandler"> 15 <view class="sel sel2 {{isShowAll ? 'show-all':''}}" bindtap="onShowAllHandler">
...@@ -23,38 +24,12 @@ ...@@ -23,38 +24,12 @@
23 </picker> 24 </picker>
24 </view> 25 </view>
25 </view> 26 </view>
26 <!-- 时间 -->
27 <!-- <view class="time">
28 <view class="sel">
29 <image class="icon" mode="aspectFit" src="../../image/icon/icon-calendar.png" />
30 起始时间
31 </view>
32 </view> -->
33 <!-- 时间选择器 -->
34 <!-- <view class="func-wrap">
35 <picker mode="date" value="{{dateStart}}" bindchange="bindDateStartChange">
36 <view class="func">
37 <image class="icon" mode="aspectFit" src="../../image/icon/icon-sign-record.png" />
38 起始时间
39 <image class="arrow" mode="aspectFit" src="../../image/icon/icon-filter-down-on.png" />
40 {{dateStart}}
41 </view>
42 </picker>
43 <picker mode="date" value="{{dateEnd}}" bindchange="bindDateEndChange">
44 <view class="func">
45 <image class="icon" mode="aspectFit" src="../../image/icon/icon-sign-record.png" />
46 结束时间
47 <image class="arrow" mode="aspectFit" src="../../image/icon/icon-filter-down-on.png" />
48 {{dateEnd}}
49 </view>
50 </picker>
51 </view> -->
52 <!-- 标签 --> 27 <!-- 标签 -->
53 <view class="tag"> 28 <view class="tag">
54 <view bindtap="onNavSelectHandler" data-data="{{item}}" data-index="{{index}}" wx:for="{{navList}}" wx:key="{{index}}" class="tag-item"> 29 <view bindtap="onNavSelectHandler" data-data="{{item}}" data-index="{{index}}" wx:for="{{navList}}" wx:key="{{index}}" class="tag-item">
55 <image wx:if="{{navIndex==index}}" class="ebg" mode="aspectFit" src="../../image/icon/icon-integral-tag.png" /> 30 <image wx:if="{{navIndex==index}}" class="ebg" mode="aspectFit" src="../../image/icon/icon-integral-tag.png" />
56 <view class="desc {{navIndex == index ? 'act' : ''}}"> 31 <view class="desc {{navIndex == index ? 'act' : ''}}">
57 <view class="t1">{{item.t1}}</view> 32 <view class="t1">{{index == 5 ? '-' : ''}}{{ index == 0 ? item.t1 : filter.Fen2Yuan(item.t1) }}</view>
58 <view class="t2">{{item.t2}}</view> 33 <view class="t2">{{item.t2}}</view>
59 </view> 34 </view>
60 </view> 35 </view>
...@@ -62,18 +37,19 @@ ...@@ -62,18 +37,19 @@
62 <!-- 标题 --> 37 <!-- 标题 -->
63 <view class="tit"> 38 <view class="tit">
64 <view class="tt t1">时间</view> 39 <view class="tt t1">时间</view>
65 <view class="tt t2">积分类型</view> 40 <view class="tt t2">奖金类型</view>
66 <view class="tt t3">名称</view> 41 <view class="tt t3">名称</view>
67 <view class="tt t4 minus">积分</view> 42 <view class="tt t4 minus">奖金</view>
68 </view> 43 </view>
69 <!-- 积分 --> 44 <!-- 奖金 -->
70 <view class="integral"> 45 <view class="integral">
71 <view wx:for="{{dataList}}" wx:key="{{item}}" class="integral-item"> 46 <view wx:for="{{dataList}}" wx:key="{{item}}" class="integral-item">
72 <view class="tt t1">{{item.time}}</view> 47 <view class="tt t1">{{item.time}}</view>
73 <view class="tt t2">{{item.words}}</view> 48 <view class="tt t2">{{item.words}}</view>
74 <view class="tt t3">{{item.subTitle}}</view> 49 <view class="tt t3">{{item.subTitle}}</view>
75 <view class="tt t4 {{item.pointsIp == 0 ? 'minus':''}}"> 50 <view class="tt t4 {{item.pointsIp == 0 ? 'minus':''}}">
76 {{item.pointsIp == 1 ? '+':'-'}} {{item.pointsNum}} 51 <!-- {{item.pointsIp == 1 ? '+':'-'}} {{item.pointsNum}} -->
52 {{item.pointsIp == 1 ? '+':'-'}}{{filter.Fen2Yuan(item.pointsNum) }}
77 </view> 53 </view>
78 </view> 54 </view>
79 </view> 55 </view>
......
1 <wxs module="filter" src="../../utils/utilswxs.wxs"></wxs>
1 <view class="page"> 2 <view class="page">
2 <view class="app__bgc bgc"></view> 3 <view class="app__bgc bgc"></view>
3 <view class="app__bg bg"></view> 4 <view class="app__bg bg"></view>
...@@ -38,7 +39,7 @@ ...@@ -38,7 +39,7 @@
38 </view> 39 </view>
39 <view class="detail"> 40 <view class="detail">
40 <view class="t1">{{item.orderCommodityTitle}}</view> 41 <view class="t1">{{item.orderCommodityTitle}}</view>
41 <view class="t1 t2">{{item.orderCommodityPoints}}积分</view> 42 <view class="t1 t2">{{filter.Fen2Yuan(item.orderCommodityPoints)}}元</view>
42 <view class="t1 t3"> 43 <view class="t1 t3">
43 <span wx:if="{{item.orderStatus == 'unaudited'}}">待审核</span> 44 <span wx:if="{{item.orderStatus == 'unaudited'}}">待审核</span>
44 <span wx:if="{{item.orderStatus == 'pass'}}">已通过</span> 45 <span wx:if="{{item.orderStatus == 'pass'}}">已通过</span>
...@@ -63,35 +64,6 @@ ...@@ -63,35 +64,6 @@
63 </view> 64 </view>
64 </view> 65 </view>
65 </view> 66 </view>
66 <!-- <view class="border card-item">
67 <view class="no">订单编号：2357123413491</view>
68 <view class="line"></view>
69 <view class="cont">
70 <view class="prize">
71 <image class="image" mode="aspectFit" />
72 </view>
73 <view class="detail">
74 <view class="t1">某东购物卡200元</view>
75 <view class="t1 t2">消耗积分：1000分</view>
76 <view class="t1 t3">处理中</view>
77 </view>
78 </view>
79 <view class="line"></view>
80 <view class="logistics">
81 <view class="logistics-item">
82 <view class="label">收货地址</view>
83 <view class="val">深圳市龙岗区XXX路</view>
84 </view>
85 <view class="logistics-item">
86 <view class="label">物流公司</view>
87 <view class="val">待定</view>
88 </view>
89 <view class="logistics-item">
90 <view class="label">物流单号</view>
91 <view class="val">暂定</view>
92 </view>
93 </view>
94 </view> -->
95 </view> 67 </view>
96 </view> 68 </view>
97 <empty-tips wx:if="{{dataList.length <= 0}}"></empty-tips> 69 <empty-tips wx:if="{{dataList.length <= 0}}"></empty-tips>
......
...@@ -127,7 +127,7 @@ Page({ ...@@ -127,7 +127,7 @@ Page({
127 color: "#666666", 127 color: "#666666",
128 textAlign: "center", 128 textAlign: "center",
129 zIndex: 11, 129 zIndex: 11,
130 text: "扫码即获专属积分，兑换超值奖品", 130 text: "扫码即获专属奖金，兑换超值奖品",
131 } 131 }
132 ]; 132 ];
133 133
......
...@@ -7,13 +7,8 @@ ...@@ -7,13 +7,8 @@
7 <view class="content"> 7 <view class="content">
8 <view class="card"> 8 <view class="card">
9 <image bindtap="onPreviewImageHandler" 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}}" />
11 <view class="nickname">{{userInfo.nickname}}</view>
12 <image class="qrcode" mode="widthFix" src="{{qrImagePath}}" />
13 <view class="t1">深士照明</view>
14 <view class="t1 t2">扫码即获专属积分，兑换超值奖品</view> -->
15 </view> 10 </view>
16 <view class="tips">分享邀请好友加入，赢取推广积分</view> 11 <view class="tips">分享邀请好友加入，赢取推广奖金</view>
17 <view class="btn-wrap"> 12 <view class="btn-wrap">
18 <view bindtap="saveImageToPhotosAlbum" class="btn">保存图片</view> 13 <view bindtap="saveImageToPhotosAlbum" class="btn">保存图片</view>
19 </view> 14 </view>
......
...@@ -7,14 +7,9 @@ ...@@ -7,14 +7,9 @@
7 <view class="content"> 7 <view class="content">
8 <view class="card"> 8 <view class="card">
9 <image bindtap="onPreviewImageHandler" 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}}" />
11 <view class="nickname">{{userInfo.nickname}}</view>
12 <image class="qrcode" mode="widthFix" src="{{qrImagePath}}" />
13 <view class="t1">深士照明</view>
14 <view class="t1 t2">扫码即获专属积分，兑换超值奖品</view> -->
15 </view> 10 </view>
16 <view class="tips"> 11 <view class="tips">
17 <text>保存分享朋友圈，邀请好友赢积分\n好友购买产品，再获10%积分</text> 12 <text>保存分享朋友圈，邀请好友赢奖金\n好友购买产品，再获10%奖金</text>
18 </view> 13 </view>
19 <view class="btn-wrap"> 14 <view class="btn-wrap">
20 <view bindtap="saveImageToPhotosAlbum" class="btn">保存图片</view> 15 <view bindtap="saveImageToPhotosAlbum" class="btn">保存图片</view>
......
...@@ -13,33 +13,11 @@ ...@@ -13,33 +13,11 @@
13 <view class="cont"> 13 <view class="cont">
14 <view class="t1">{{item.prizeName}}</view> 14 <view class="t1">{{item.prizeName}}</view>
15 <view class="t1 t2">{{item.activityName}}</view> 15 <view class="t1 t2">{{item.activityName}}</view>
16 <view class="t1 t3">推广积分第一名</view> 16 <view class="t1 t3">推广奖金第一名</view>
17 </view> 17 </view>
18 <view bindtap="onReceiveHandler" wx:if="{{item.acceptType == 0}}" data-data="{{item}}" data-index="{{index}}" class="btn">领取</view> 18 <view bindtap="onReceiveHandler" wx:if="{{item.acceptType == 0}}" data-data="{{item}}" data-index="{{index}}" class="btn">领取</view>
19 <view wx:if="{{item.acceptType == 1}}" class="btn">已领取</view> 19 <view wx:if="{{item.acceptType == 1}}" class="btn">已领取</view>
20 </view> 20 </view>
21 <!-- <view class="border gift-item">
22 <view class="prize">
23 <image class="image" mode="aspectFit" src="../../image/icon/icon-gift-red-package.png" />
24 </view>
25 <view class="cont">
26 <view class="t1">88元微信红包 1 个</view>
27 <view class="t1 t2">190701-190714</view>
28 <view class="t1 t3">推广积分排行第一名</view>
29 </view>
30 <view class="btn">领取</view>
31 </view>
32 <view class="border gift-item">
33 <view class="prize">
34 <image class="image" mode="aspectFit" src="../../image/icon/icon-gift-integral.png" />
35 </view>
36 <view class="cont">
37 <view class="t1">88元微信红包 1 个</view>
38 <view class="t1 t2">190701-190714</view>
39 <view class="t1 t3">推广积分排行第一名</view>
40 </view>
41 <view class="btn disable">已领取</view>
42 </view> -->
43 </view> 21 </view>
44 </view> 22 </view>
45 <empty-tips inner-text="还没活动奖励哦~" wx:if="{{dataList.length <= 0}}"></empty-tips> 23 <empty-tips inner-text="还没活动奖励哦~" wx:if="{{dataList.length <= 0}}"></empty-tips>
......
...@@ -29,7 +29,7 @@ Page({ ...@@ -29,7 +29,7 @@ Page({
29 }, 29 },
30 30
31 /** 31 /**
32 * 推广积分排行 32 * 推广奖金排行
33 */ 33 */
34 queryActivity() { 34 queryActivity() {
35 this.setData({ 35 this.setData({
...@@ -55,7 +55,7 @@ Page({ ...@@ -55,7 +55,7 @@ Page({
55 }, 55 },
56 56
57 /** 57 /**
58 * 历史积分排行 58 * 历史奖金排行
59 */ 59 */
60 queryActivityHistory() { 60 queryActivityHistory() {
61 this.setData({ 61 this.setData({
...@@ -180,7 +180,7 @@ Page({ ...@@ -180,7 +180,7 @@ Page({
180 status = "promotion"; 180 status = "promotion";
181 break; 181 break;
182 182
183 // 购买积分 183 // 购买奖金
184 case "1": 184 case "1":
185 status = "rank"; 185 status = "rank";
186 break; 186 break;
......
1 { 1 {
2 "navigationBarTitleText": "积分排行" 2 "navigationBarTitleText": "奖金排行"
3 } 3 }
......
1 <wxs module="filter" src="../../utils/utilswxs.wxs"></wxs>
1 <view class="page"> 2 <view class="page">
2 <view class="app__bgc bgc"></view> 3 <view class="app__bgc bgc"></view>
3 <image class="bg" mode="widthFix" src="../../image/rank/rank-c1.png" /> 4 <image class="bg" mode="widthFix" src="../../image/rank/rank-c1.png" />
...@@ -7,11 +8,11 @@ ...@@ -7,11 +8,11 @@
7 <!-- 导航 --> 8 <!-- 导航 -->
8 <view class="nav"> 9 <view class="nav">
9 <view bindtap="onNavSelectHandler" data-index="0" class="nav-item {{navIndex == 0 ? 'nav-item-act':''}}"> 10 <view bindtap="onNavSelectHandler" data-index="0" class="nav-item {{navIndex == 0 ? 'nav-item-act':''}}">
10 <view class="tit">推广积分排行</view> 11 <view class="tit">推广奖金排行</view>
11 <view class="line"></view> 12 <view class="line"></view>
12 </view> 13 </view>
13 <view bindtap="onNavSelectHandler" data-index="1" class="nav-item {{navIndex == 1 ? 'nav-item-act':''}}"> 14 <view bindtap="onNavSelectHandler" data-index="1" class="nav-item {{navIndex == 1 ? 'nav-item-act':''}}">
14 <view class="tit">总积分排行</view> 15 <view class="tit">总奖金排行</view>
15 <view class="line"></view> 16 <view class="line"></view>
16 </view> 17 </view>
17 </view> 18 </view>
...@@ -63,7 +64,7 @@ ...@@ -63,7 +64,7 @@
63 <view class="tit"> 64 <view class="tit">
64 <view class="tt t1">名次</view> 65 <view class="tt t1">名次</view>
65 <view class="tt t2">名称</view> 66 <view class="tt t2">名称</view>
66 <view class="tt t3">积分</view> 67 <view class="tt t3">奖金</view>
67 </view> 68 </view>
68 <!-- 排行item --> 69 <!-- 排行item -->
69 <scroll-view bindscrolltolower="onRankScrolltolower" scroll-y="{{true}}" class="item-wrap"> 70 <scroll-view bindscrolltolower="onRankScrolltolower" scroll-y="{{true}}" class="item-wrap">
...@@ -76,7 +77,7 @@ ...@@ -76,7 +77,7 @@
76 <image class="avatar" mode="widthFix" src="{{item.avatar}}" /> 77 <image class="avatar" mode="widthFix" src="{{item.avatar}}" />
77 {{item.nickname}} 78 {{item.nickname}}
78 </view> 79 </view>
79 <view class="integral">{{item.points}}</view> 80 <view class="integral">{{filter.Fen2Yuan(item.points)}}</view>
80 </view> 81 </view>
81 </scroll-view> 82 </scroll-view>
82 <!-- 省略号 --> 83 <!-- 省略号 -->
...@@ -92,13 +93,13 @@ ...@@ -92,13 +93,13 @@
92 <image class="avatar" mode="widthFix" src="{{rankInfo.myMember.avatar}}" /> 93 <image class="avatar" mode="widthFix" src="{{rankInfo.myMember.avatar}}" />
93 {{rankInfo.myMember.nickname}} 94 {{rankInfo.myMember.nickname}}
94 </view> 95 </view>
95 <view class="integral">{{rankInfo.myMember.points}}</view> 96 <view class="integral">{{filter.Fen2Yuan(rankInfo.myMember.points)}}</view>
96 </view> 97 </view>
97 </view> 98 </view>
98 </block> 99 </block>
99 <block wx:else> 100 <block wx:else>
100 <view class="empty-tips" wx:if="{{isInit}}"> 101 <view class="empty-tips" wx:if="{{isInit}}">
101 <view class="tips">暂未开启积分排行，敬请期待</view> 102 <view class="tips">暂未开启奖金排行，敬请期待</view>
102 </view> 103 </view>
103 </block> 104 </block>
104 </view> 105 </view>
......
...@@ -20,7 +20,7 @@ Page({ ...@@ -20,7 +20,7 @@ Page({
20 }, 20 },
21 onShow() { 21 onShow() {
22 wx.setNavigationBarTitle({ 22 wx.setNavigationBarTitle({
23 title: '积分获取' 23 title: '奖金获取'
24 }) 24 })
25 }, 25 },
26 onLoad(options) { 26 onLoad(options) {
...@@ -59,7 +59,7 @@ Page({ ...@@ -59,7 +59,7 @@ Page({
59 }, 59 },
60 60
61 /** 61 /**
62 * 扫积分码功能 扫积分码 62 * 扫奖金码功能 扫奖金码
63 */ 63 */
64 queryScanIntegralQrcode(c) { 64 queryScanIntegralQrcode(c) {
65 return new Promise((resolve, reject) => { 65 return new Promise((resolve, reject) => {
...@@ -76,7 +76,7 @@ Page({ ...@@ -76,7 +76,7 @@ Page({
76 scaning: true, 76 scaning: true,
77 }) 77 })
78 wx.setNavigationBarTitle({ 78 wx.setNavigationBarTitle({
79 title: '积分获取' 79 title: '奖金获取'
80 }) 80 })
81 app.post({ 81 app.post({
82 url: app.api.scanIntegralQrcode, 82 url: app.api.scanIntegralQrcode,
...@@ -91,11 +91,11 @@ Page({ ...@@ -91,11 +91,11 @@ Page({
91 }) 91 })
92 if (result.qrCodeStatus != 1) { 92 if (result.qrCodeStatus != 1) {
93 wx.setNavigationBarTitle({ 93 wx.setNavigationBarTitle({
94 title: '积分获取失败' 94 title: '奖金获取失败'
95 }) 95 })
96 } else { 96 } else {
97 wx.setNavigationBarTitle({ 97 wx.setNavigationBarTitle({
98 title: '积分获取成功' 98 title: '奖金获取成功'
99 }) 99 })
100 } 100 }
101 }).catch((err) => { 101 }).catch((err) => {
...@@ -105,7 +105,7 @@ Page({ ...@@ -105,7 +105,7 @@ Page({
105 scaning: false 105 scaning: false
106 }) 106 })
107 wx.setNavigationBarTitle({ 107 wx.setNavigationBarTitle({
108 title: '积分获取失败' 108 title: '奖金获取失败'
109 }) 109 })
110 }); 110 });
111 } else { 111 } else {
...@@ -113,7 +113,7 @@ Page({ ...@@ -113,7 +113,7 @@ Page({
113 prizeInfo: {} 113 prizeInfo: {}
114 }) 114 })
115 wx.setNavigationBarTitle({ 115 wx.setNavigationBarTitle({
116 title: '积分获取失败' 116 title: '奖金获取失败'
117 }) 117 })
118 } 118 }
119 }); 119 });
...@@ -130,13 +130,13 @@ Page({ ...@@ -130,13 +130,13 @@ Page({
130 success(res) { 130 success(res) {
131 // 扫码结果 131 // 扫码结果
132 let q = res.result; 132 let q = res.result;
133 // 获取积分码 133 // 获取奖金码
134 let c = getQueryByUrl("c", q); 134 let c = getQueryByUrl("c", q);
135 if (c) { 135 if (c) {
136 _this.queryScanIntegralQrcode(c); 136 _this.queryScanIntegralQrcode(c);
137 } else { 137 } else {
138 wx.showModal({ 138 wx.showModal({
139 content: '未发现积分码，换一个二维码试试', 139 content: '未发现奖金码，换一个二维码试试',
140 showCancel: false, 140 showCancel: false,
141 success(res) {} 141 success(res) {}
142 }) 142 })
...@@ -149,7 +149,7 @@ Page({ ...@@ -149,7 +149,7 @@ Page({
149 }, 149 },
150 150
151 /** 151 /**
152 * 查看我的积分 152 * 查看我的奖金
153 */ 153 */
154 onMyIntegralHandler(evt) { 154 onMyIntegralHandler(evt) {
155 app.router.push({ 155 app.router.push({
......
1 { 1 {
2 "navigationBarTitleText": "获得积分" 2 "navigationBarTitleText": "获得奖金"
3 } 3 }
......
...@@ -6,15 +6,15 @@ ...@@ -6,15 +6,15 @@
6 <view class="content" wx:if="{{!scaning}}"> 6 <view class="content" wx:if="{{!scaning}}">
7 <view wx:if="{{prizeInfo}}" class="border scan"> 7 <view wx:if="{{prizeInfo}}" class="border scan">
8 <view wx:if="{{prizeInfo.qrCodeStatus == 1}}" class="result success"> 8 <view wx:if="{{prizeInfo.qrCodeStatus == 1}}" class="result success">
9 <text class="tips tips1">恭喜获得{{prizeInfo.pointNum}}积分!</text> 9 <text class="tips tips1">恭喜获得{{prizeInfo.pointNum}}奖金!</text>
10 <view class="tips tips2"> 10 <view class="tips tips2">
11 账户共有 11 账户共有
12 <span class="t1">{{prizeInfo.memberPoints}}</span> 12 <span class="t1">{{prizeInfo.memberPoints}}</span>
13 积分 13 奖金
14 </view> 14 </view>
15 <view class="btn-wrap"> 15 <view class="btn-wrap">
16 <view bindtap="onScanHandler" class="btn">再扫一次</view> 16 <view bindtap="onScanHandler" class="btn">再扫一次</view>
17 <view bindtap="onMyIntegralHandler" class="btn btn2">查看我的积分</view> 17 <view bindtap="onMyIntegralHandler" class="btn btn2">查看我的奖金</view>
18 </view> 18 </view>
19 </view> 19 </view>
20 <view wx:else class="result fail"> 20 <view wx:else class="result fail">
...@@ -24,18 +24,18 @@ ...@@ -24,18 +24,18 @@
24 </text> 24 </text>
25 <!-- 码已经被使用 --> 25 <!-- 码已经被使用 -->
26 <text wx:elif="{{prizeInfo.qrCodeStatus == 3}}" class="tips tips1"> 26 <text wx:elif="{{prizeInfo.qrCodeStatus == 3}}" class="tips tips1">
27 积分获取失败!\n产品积分码获取对象为：\n电工及终端消费者。 27 奖金获取失败!\n产品奖金码获取对象为：\n电工及终端消费者。
28 </text> 28 </text>
29 <!-- 其他异常 --> 29 <!-- 其他异常 -->
30 <text wx:else class="tips tips1">此产品码已被扫过！\n若有异常，请联系客服</text> 30 <text wx:else class="tips tips1">此产品码已被扫过！\n若有异常，请联系客服</text>
31 <view class="btn-wrap"> 31 <view class="btn-wrap">
32 <!-- 非 产品积分码获取对象为：电工及终端消费者。 --> 32 <!-- 非 产品奖金码获取对象为：电工及终端消费者。 -->
33 <block wx:if="{{prizeInfo.qrCodeStatus == 3}}"> 33 <block wx:if="{{prizeInfo.qrCodeStatus == 3}}">
34 <view bindtap="onSureHandler" class="btn">我知道了</view> 34 <view bindtap="onSureHandler" class="btn">我知道了</view>
35 </block> 35 </block>
36 <block wx:else> 36 <block wx:else>
37 <view bindtap="onScanHandler" class="btn">再扫一次</view> 37 <view bindtap="onScanHandler" class="btn">再扫一次</view>
38 <view bindtap="onMyIntegralHandler" class="btn btn2">查看我的积分</view> 38 <view bindtap="onMyIntegralHandler" class="btn btn2">查看我的奖金</view>
39 </block> 39 </block>
40 </view> 40 </view>
41 </view> 41 </view>
......
1 <wxs module="filter" src="../../utils/utilswxs.wxs"></wxs>
1 <view class="page"> 2 <view class="page">
2 <view class="app__bgc bgc"></view> 3 <view class="app__bgc bgc"></view>
3 <view class="app__bg bg"></view> 4 <view class="app__bg bg"></view>
...@@ -28,8 +29,8 @@ ...@@ -28,8 +29,8 @@
28 <view class="date">{{item.signTime}}</view> 29 <view class="date">{{item.signTime}}</view>
29 <view class="desc"> 30 <view class="desc">
30 签到成功，获得 31 签到成功，获得
31 <span class="green {{item.prizeType == 'packet' ? 'red':''}}">{{item.prizeSize}}</span> 32 <span class="green {{item.prizeType == 'packet' ? 'red':''}}">{{ item.prizeType == 'packet' ? item.prizeSize : filter.Fen2Yuan(item.prizeSize)}}</span>
32 {{item.prizeType == 'packet' ? '元红包' : '积分' }} 33 {{item.prizeType == 'packet' ? '元红包' : '元奖金' }}
33 </view> 34 </view>
34 </view> 35 </view>
35 </view> 36 </view>
......
...@@ -124,7 +124,7 @@ Page({ ...@@ -124,7 +124,7 @@ Page({
124 }, 124 },
125 125
126 /** 126 /**
127 * 积分详情 127 * 奖金详情
128 */ 128 */
129 onIntegralDetailHandler(evt) { 129 onIntegralDetailHandler(evt) {
130 app.router.push({ 130 app.router.push({
......
...@@ -73,14 +73,13 @@ $contentWidth: 690px; ...@@ -73,14 +73,13 @@ $contentWidth: 690px;
73 display: flex; 73 display: flex;
74 align-items: center; 74 align-items: center;
75 75
76
77 .wrap { 76 .wrap {
78 // width: 120px; 77 // width: 120px;
79 padding: 0 40px; 78 padding: 0 24px;
80 text-align: center; 79 text-align: center;
81 80
82 .t1 { 81 .t1 {
83 font-size: 40px; 82 font-size: 36px;
84 } 83 }
85 84
86 .t2 { 85 .t2 {
......
1 <wxs module="filter" src="../../utils/utilswxs.wxs"></wxs>
1 <view class="page"> 2 <view class="page">
2 <view class="app__bgc bgc"></view> 3 <view class="app__bgc bgc"></view>
3 <view class="app__bg bg"></view> 4 <view class="app__bg bg"></view>
...@@ -12,7 +13,7 @@ ...@@ -12,7 +13,7 @@
12 <view class="wrap1"> 13 <view class="wrap1">
13 <view class="name">{{userInfo.realName ? userInfo.realName : userInfo.nickname}}</view> 14 <view class="name">{{userInfo.realName ? userInfo.realName : userInfo.nickname}}</view>
14 <view wx:if="{{userInfo.auditStatus == 'authorization'}}" class="vip vip-check"> 15 <view wx:if="{{userInfo.auditStatus == 'authorization'}}" class="vip vip-check">
15 积分会员 16 奖金会员
16 </view> 17 </view>
17 <view wx:elif="{{userInfo.auditStatus == 'unauthorized'}}" class="vip">审核中 ></view> 18 <view wx:elif="{{userInfo.auditStatus == 'unauthorized'}}" class="vip">审核中 ></view>
18 <view wx:else class="vip">未验证 ></view> 19 <view wx:else class="vip">未验证 ></view>
...@@ -21,8 +22,8 @@ ...@@ -21,8 +22,8 @@
21 <!-- 右边栏 --> 22 <!-- 右边栏 -->
22 <view class="user-data"> 23 <view class="user-data">
23 <view bindtap="onIntegralDetailHandler" class="wrap"> 24 <view bindtap="onIntegralDetailHandler" class="wrap">
24 <view class="t1">{{userInfo.memberPoints}}</view> 25 <view class="t1">{{filter.Fen2Yuan(userInfo.memberPoints)}}元</view>
25 <view class="t2">我的积分</view> 26 <view class="t2">我的奖金</view>
26 </view> 27 </view>
27 <view class="line"></view> 28 <view class="line"></view>
28 <view bindtap="onIntegralDetailHandler" class="wrap"> 29 <view bindtap="onIntegralDetailHandler" class="wrap">
...@@ -73,7 +74,7 @@ ...@@ -73,7 +74,7 @@
73 <view class="icon-wrap"> 74 <view class="icon-wrap">
74 <image class="icon" mode="aspectFit" src="../../image/icon/icon-integral-rank.png" /> 75 <image class="icon" mode="aspectFit" src="../../image/icon/icon-integral-rank.png" />
75 </view> 76 </view>
76 <view class="txt">积分排行</view> 77 <view class="txt">奖金排行</view>
77 </view> 78 </view>
78 <view bindtap="onAddressHandler" class="func-wrap-item"> 79 <view bindtap="onAddressHandler" class="func-wrap-item">
79 <view class="icon-wrap"> 80 <view class="icon-wrap">
......
...@@ -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'}}" />
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
64 </view> 64 </view>
65 </view> 65 </view>
66 <view class="submit-tips"> 66 <view class="submit-tips">
67 <text class="text">五金分销商请填写店名，提交营业执照或名片\n其他用户请上传电工证或身份证\n认证后可参与签到及兑换积分</text> 67 <text class="text">五金分销商请填写店名，提交营业执照或名片\n其他用户请上传电工证或身份证\n认证后可参与签到及兑换奖金</text>
68 </view> 68 </view>
69 </view> 69 </view>
70 <!-- 提交按钮 --> 70 <!-- 提交按钮 -->
......
...@@ -3,7 +3,7 @@ const routerPath = { ...@@ -3,7 +3,7 @@ const routerPath = {
3 authorize: '/pages/authorize/authorize', // 授权 3 authorize: '/pages/authorize/authorize', // 授权
4 register: '/pages/register/register', // 注册 4 register: '/pages/register/register', // 注册
5 scanResult: '/pages/scan-result/scan-result', // 扫码结果 (含扫码成功和扫码失败) 5 scanResult: '/pages/scan-result/scan-result', // 扫码结果 (含扫码成功和扫码失败)
6 integralDetail: '/pages/integral-detail/integral-detail', // 积分明细 6 integralDetail: '/pages/integral-detail/integral-detail', // 奖金明细
7 giftShop: '/pages/gift-shop/gift-shop', // 礼品商场 7 giftShop: '/pages/gift-shop/gift-shop', // 礼品商场
8 giftDetail: '/pages/gift-detail/gift-detail', // 礼品详情 (含购物卡和实物) 8 giftDetail: '/pages/gift-detail/gift-detail', // 礼品详情 (含购物卡和实物)
9 addressManagement: '/pages/address-management/address-management', // 地址管理 9 addressManagement: '/pages/address-management/address-management', // 地址管理
......
...@@ -4,6 +4,8 @@ var filter = { ...@@ -4,6 +4,8 @@ var filter = {
4 var result = val * 0.01; //分到元 4 var result = val * 0.01; //分到元
5 // result += ''; //转成字符串 5 // result += ''; //转成字符串
6 // result = result.toFixed(2); //留两位小数 6 // result = result.toFixed(2); //留两位小数
7 console.log("val:",val);
8 console.log("result:",result);
7 return result.toFixed(2); 9 return result.toFixed(2);
8 }, 10 },
9 // 毫秒转格式 11 // 毫秒转格式
......