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