Skip to content

dev / zhiliang-light-mp

Go to a project
Toggle navigation
Toggle navigation pinning
8fa3e323 by simon
Options

默认提交

1 parent 844a810d
Inline Side-by-side
Showing 24 changed files with 164 additions and 73 deletions
...@@ -57,6 +57,10 @@ ...@@ -57,6 +57,10 @@
57 justify-content: flex-start; 57 justify-content: flex-start;
58 flex-wrap: wrap; 58 flex-wrap: wrap;
59 59
60 .num {
61 font-size: 32px;
62 }
63
60 .tt { 64 .tt {
61 font-size: 24px; 65 font-size: 24px;
62 width: 100%; 66 width: 100%;
......
...@@ -13,21 +13,23 @@ ...@@ -13,21 +13,23 @@
13 <view class="tt t1">{{productInfo.seckillName}}</view> 13 <view class="tt t1">{{productInfo.seckillName}}</view>
14 <block wx:if="{{productInfo.minNum == productInfo.maxNum}}"> 14 <block wx:if="{{productInfo.minNum == productInfo.maxNum}}">
15 <!-- 固定个数 --> 15 <!-- 固定个数 -->
16 <view class="tt t2"> 16 <view class="tt t2" wx:if="{{orderStatus != 1}}">
17 <view class="t2-1">{{productInfo.minNum}}个</view> 17 <view class="t2-1">{{productInfo.minNum}}个</view>
18 <view class="t2-2">数量不可修改</view> 18 <view class="t2-2">数量不可修改</view>
19 </view> 19 </view>
20 <view class="num" wx:else>{{num}}个</view>
20 </block> 21 </block>
21 <block wx:else> 22 <block wx:else>
22 <!-- 不定个数 --> 23 <!-- 不定个数 -->
23 <view class="tt t2"> 24 <view class="tt t2" wx:if="{{orderStatus != 1}}">
24 <view class="t2-1"> 25 <view class="t2-1">
25 <van-stepper bind:change="onStepperChange" value="{{ num }}" min="{{productInfo.minNum}}" max="{{productInfo.maxNum}}" integer /> 26 <van-stepper bind:change="onStepperChange" value="{{ num }}" min="{{productInfo.minNum}}" max="{{productInfo.maxNum}}" integer />
26 </view> 27 </view>
27 <view class="t2-2">可选填{{productInfo.minNum}}-{{productInfo.maxNum}}个</view> 28 <view class="t2-2">可选填{{productInfo.minNum}}-{{productInfo.maxNum}}个</view>
28 </view> 29 </view>
30 <view class="num" wx:else>{{num}}个</view>
29 </block> 31 </block>
30 <view class="tt t3 price">￥{{filter.Fen2Yuan(productInfo.originalPrice*num)}}</view> 32 <view class="tt t3 price">￥{{filter.Fen2Yuan(productInfo.specialPrice*num)}}</view>
31 </view> 33 </view>
32 </view> 34 </view>
33 <!-- 无存库 --> 35 <!-- 无存库 -->
......

38.6 KB | W: | H:

38.6 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
...@@ -64,7 +64,7 @@ Page({ ...@@ -64,7 +64,7 @@ Page({
64 }).then((result) => { 64 }).then((result) => {
65 let dataList = result.list; 65 let dataList = result.list;
66 dataList.forEach(element => { 66 dataList.forEach(element => {
67 element.recordTime = new Date(element.recordTime).toString("yyyy.MM.dd hh:mm:ss"); 67 element.recordTime = new Date(element.recordTime).toString("yyyy.MM.dd HH:mm:ss");
68 element.memberPhone = element.memberPhone.substr(0, 3) + '****' + element.memberPhone.substr(7); 68 element.memberPhone = element.memberPhone.substr(0, 3) + '****' + element.memberPhone.substr(7);
69 }); 69 });
70 dataList = this.data.dataList.concat(dataList); 70 dataList = this.data.dataList.concat(dataList);
......
...@@ -199,7 +199,7 @@ Page({ ...@@ -199,7 +199,7 @@ Page({
199 }).then((result) => { 199 }).then((result) => {
200 let priceInfo = result.list || []; 200 let priceInfo = result.list || [];
201 priceInfo.forEach(element => { 201 priceInfo.forEach(element => {
202 element.recordTime = new Date(element.recordTime).toString("yyyy.MM.dd hh:mm:ss"); 202 element.recordTime = new Date(element.recordTime).toString("yyyy.MM.dd HH:mm:ss");
203 element.memberPhone = element.memberPhone.substr(0, 3) + '****' + element.memberPhone.substr(7); 203 element.memberPhone = element.memberPhone.substr(0, 3) + '****' + element.memberPhone.substr(7);
204 }); 204 });
205 this.setData({ 205 this.setData({
...@@ -332,7 +332,7 @@ Page({ ...@@ -332,7 +332,7 @@ Page({
332 if (!result) return; 332 if (!result) return;
333 let priceInfo = result.list || []; 333 let priceInfo = result.list || [];
334 priceInfo.forEach(element => { 334 priceInfo.forEach(element => {
335 element.recordTime = new Date(element.recordTime).toString("yyyy.MM.dd hh:mm:ss"); 335 element.recordTime = new Date(element.recordTime).toString("yyyy.MM.dd HH:mm:ss");
336 element.memberPhone = element.memberPhone.substr(0, 3) + '****' + element.memberPhone.substr(7); 336 element.memberPhone = element.memberPhone.substr(0, 3) + '****' + element.memberPhone.substr(7);
337 }); 337 });
338 this.setData({ 338 this.setData({
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
11 <swiper class="swiper" indicator-color="rgba(0,0,0,.3)" indicator-active-color="rgba(255,255,255,1)" indicator-dots="{{true}}" autoplay="{{true}}" interval="{{5000}}" duration="{{500}}"> 11 <swiper class="swiper" indicator-color="rgba(0,0,0,.3)" indicator-active-color="rgba(255,255,255,1)" indicator-dots="{{true}}" autoplay="{{true}}" interval="{{5000}}" duration="{{500}}">
12 <block wx:for="{{productInfo.auctionImages}}" wx:key="{{index}}"> 12 <block wx:for="{{productInfo.auctionImages}}" wx:key="{{index}}">
13 <swiper-item> 13 <swiper-item>
14 <image class="swiper-image" src="{{item}}" mode="aspectFill" /> 14 <image class="swiper-image" src="{{item}}" mode="aspectFit" />
15 </swiper-item> 15 </swiper-item>
16 </block> 16 </block>
17 </swiper> 17 </swiper>
......
...@@ -98,7 +98,7 @@ Page({ ...@@ -98,7 +98,7 @@ Page({
98 }).then((result) => { 98 }).then((result) => {
99 let dataList = result.list; 99 let dataList = result.list;
100 dataList.forEach(element => { 100 dataList.forEach(element => {
101 element.dateStr = new Date(element.startTime).toString("yyyy.MM.dd hh:mm") + " - " + new Date(element.endTime).toString("yyyy.MM.dd hh:mm"); 101 element.dateStr = new Date(element.startTime).toString("yyyy.MM.dd HH:mm") + " - " + new Date(element.endTime).toString("yyyy.MM.dd HH:mm");
102 }); 102 });
103 dataList = this.data.dataList.concat(dataList); 103 dataList = this.data.dataList.concat(dataList);
104 this.setData({ 104 this.setData({
......
...@@ -64,7 +64,7 @@ Page({ ...@@ -64,7 +64,7 @@ Page({
64 let dataList = result.list; 64 let dataList = result.list;
65 dataList = this.data.dataList.concat(dataList); 65 dataList = this.data.dataList.concat(dataList);
66 dataList.forEach(element => { 66 dataList.forEach(element => {
67 element.dateStr = new Date(element.auctionTime).toString("yyyy.MM.dd hh:mm"); 67 element.dateStr = new Date(element.auctionTime).toString("yyyy.MM.dd HH:mm");
68 }); 68 });
69 console.log("dataList:", dataList); 69 console.log("dataList:", dataList);
70 this.setData({ 70 this.setData({
......
...@@ -82,7 +82,7 @@ $contentWidth:670px; ...@@ -82,7 +82,7 @@ $contentWidth:670px;
82 .t1{ 82 .t1{
83 font-size: 22px; 83 font-size: 22px;
84 margin: 0 12px 0; 84 margin: 0 12px 0;
85 color: #333333; 85 color: #808080;
86 text-align: center; 86 text-align: center;
87 } 87 }
88 } 88 }
......
...@@ -15,6 +15,7 @@ Page({ ...@@ -15,6 +15,7 @@ Page({
15 total: 0, 15 total: 0,
16 page: 1, 16 page: 1,
17 size: 10, 17 size: 10,
18 isShowAll: false,
18 status: "", 19 status: "",
19 dataList: [], 20 dataList: [],
20 navIndex: 0, 21 navIndex: 0,
...@@ -154,10 +155,13 @@ Page({ ...@@ -154,10 +155,13 @@ Page({
154 /** 155 /**
155 * 积分概览 156 * 积分概览
156 */ 157 */
157 queryPointsOverview() { 158 queryPointsOverview(isAll = false) {
159 this.setData({
160 isShowAll: isAll
161 })
158 return new Promise((resolve, reject) => { 162 return new Promise((resolve, reject) => {
159 let year = this.data.dateStr.slice(0, 4); 163 let year = isAll ? "" : this.data.dateStr.slice(0, 4);
160 let month = this.data.dateStr.slice(5, 7); 164 let month = isAll ? "" : this.data.dateStr.slice(5, 7);
161 app.post({ 165 app.post({
162 url: app.api.pointsOverview, 166 url: app.api.pointsOverview,
163 data: { 167 data: {
...@@ -184,7 +188,16 @@ Page({ ...@@ -184,7 +188,16 @@ Page({
184 }); 188 });
185 }, 189 },
186 190
191 /**
192 * 请求所有数据
193 */
194 onShowAllHandler() {
195 this.resetPage();
196 this.queryPointsOverview(true);
197 },
198
187 bindDateChange(e) { 199 bindDateChange(e) {
200 console.log("bindDateChange:", e)
188 this.setData({ 201 this.setData({
189 dateStr: e.detail.value 202 dateStr: e.detail.value
190 }) 203 })
......
...@@ -29,7 +29,7 @@ $contentWidth:690px; ...@@ -29,7 +29,7 @@ $contentWidth:690px;
29 .header { 29 .header {
30 display: flex; 30 display: flex;
31 justify-content: space-between; 31 justify-content: space-between;
32 align-items: flex-end; 32 align-items: flex-start;
33 33
34 .info { 34 .info {
35 font-size: 32px; 35 font-size: 32px;
...@@ -41,6 +41,13 @@ $contentWidth:690px; ...@@ -41,6 +41,13 @@ $contentWidth:690px;
41 } 41 }
42 } 42 }
43 43
44 .sel-wrap {
45 display: flex;
46 flex-wrap: wrap;
47 justify-content: flex-end;
48
49 }
50
44 .sel { 51 .sel {
45 font-size: 28px; 52 font-size: 28px;
46 color: #3680EB; 53 color: #3680EB;
...@@ -60,6 +67,15 @@ $contentWidth:690px; ...@@ -60,6 +67,15 @@ $contentWidth:690px;
60 margin-left: 8px; 67 margin-left: 8px;
61 } 68 }
62 } 69 }
70
71 .sel2 {
72 display: inline-block;
73 width: auto;
74 }
75
76 .show-all{
77 opacity: .5;
78 }
63 } 79 }
64 80
65 .func-wrap { 81 .func-wrap {
......
...@@ -10,13 +10,18 @@ ...@@ -10,13 +10,18 @@
10 <span class="t1">{{userInfo.memberPoints}}</span> 10 <span class="t1">{{userInfo.memberPoints}}</span>
11 分 11 分
12 </view> 12 </view>
13 <picker mode="date" fields="month" value="{{date}}" bindchange="bindDateChange"> 13 <view class="sel-wrap">
14 <view class="sel"> 14 <view class="sel sel2 {{isShowAll ? 'show-all':''}}" bindtap="onShowAllHandler">
15 <image class="icon" mode="aspectFit" src="../../image/icon/icon-calendar.png" /> 15 显示全部月份
16 时间筛选
17 <span class="d1">{{dateStr}}</span>
18 </view> 16 </view>
19 </picker> 17 <picker mode="date" fields="month" value="{{date}}" bindchange="bindDateChange">
18 <view class="sel">
19 <image class="icon" mode="aspectFit" src="../../image/icon/icon-calendar.png" />
20 时间筛选
21 <span class="d1">{{dateStr}}</span>
22 </view>
23 </picker>
24 </view>
20 </view> 25 </view>
21 <!-- 时间 --> 26 <!-- 时间 -->
22 <!-- <view class="time"> 27 <!-- <view class="time">
......
1 import { 1 import {
2 getBindtapData 2 getBindtapData
3 } from '../../utils/util'; 3 } from '../../utils/util';
4 let Date = require('../../utils/date.js');
4 5
5 let app = getApp(); 6 let app = getApp();
6 Page({ 7 Page({
...@@ -51,6 +52,9 @@ Page({ ...@@ -51,6 +52,9 @@ Page({
51 }).then((result) => { 52 }).then((result) => {
52 let dataList = result.announcementItems; 53 let dataList = result.announcementItems;
53 dataList = this.data.dataList.concat(dataList); 54 dataList = this.data.dataList.concat(dataList);
55 dataList.forEach(element => {
56 element.dateStr = new Date(element.announcementTime).toString("yyyy.MM.dd HH:mm:ss")
57 });
54 this.setData({ 58 this.setData({
55 dataList: dataList, 59 dataList: dataList,
56 total: result.total 60 total: result.total
......
...@@ -57,6 +57,11 @@ $contentWidth:690px; ...@@ -57,6 +57,11 @@ $contentWidth:690px;
57 .t2 { 57 .t2 {
58 color: #E62435; 58 color: #E62435;
59 } 59 }
60
61 .no {
62 color: #666666;
63 // padding-left: 12px;
64 }
60 } 65 }
61 } 66 }
62 67
...@@ -64,6 +69,10 @@ $contentWidth:690px; ...@@ -64,6 +69,10 @@ $contentWidth:690px;
64 margin: 16px auto 0; 69 margin: 16px auto 0;
65 color: #666666; 70 color: #666666;
66 } 71 }
72
73 .code{
74 font-size: 20px;
75 }
67 } 76 }
68 } 77 }
69 } 78 }
......
...@@ -11,7 +11,10 @@ ...@@ -11,7 +11,10 @@
11 <view class="news"> 11 <view class="news">
12 <view wx:for="{{dataList}}" wx:key="{{index}}" class="border news-item"> 12 <view wx:for="{{dataList}}" wx:key="{{index}}" class="border news-item">
13 <view class="tit"> 13 <view class="tit">
14 <view class="tit-item">{{item.announcementTitle}}</view> 14 <view class="tit-item">
15 {{item.announcementTitle}}
16 <span class="no">{{item.dateStr}}</span>
17 </view>
15 <view class="tit-item"> 18 <view class="tit-item">
16 <span bindtap="tagReadItem" data-data="{{item}}" data-index="{{index}}" wx:if="{{item.read == 0}}" class="t1"> 19 <span bindtap="tagReadItem" data-data="{{item}}" data-index="{{index}}" wx:if="{{item.read == 0}}" class="t1">
17 标记已读 20 标记已读
...@@ -22,6 +25,7 @@ ...@@ -22,6 +25,7 @@
22 </view> 25 </view>
23 </view> 26 </view>
24 <view class="desc">{{item.announcementContent}}</view> 27 <view class="desc">{{item.announcementContent}}</view>
28 <view class="desc code">订单编号: {{item.announcementCode}}</view>
25 </view> 29 </view>
26 <!-- 11wx:if="{{dataList.length <= 0}}" --> 30 <!-- 11wx:if="{{dataList.length <= 0}}" -->
27 </view> 31 </view>
......
...@@ -91,33 +91,45 @@ Page({ ...@@ -91,33 +91,45 @@ Page({
91 }]; 91 }];
92 let lines = []; 92 let lines = [];
93 let texts = [{ 93 let texts = [{
94 x: 690 / 2, 94 x: 690 / 2,
95 y: 192, 95 y: 192,
96 width: 690, 96 width: 690,
97 fontSize: 36, 97 fontSize: 36,
98 color: "#3680EB", 98 color: "#3680EB",
99 textAlign: "center", 99 textAlign: "center",
100 zIndex: 11, 100 zIndex: 11,
101 text: userInfo.nickname, 101 text: userInfo.nickname,
102 }, { 102 },
103 x: 690 / 2, 103 {
104 y: 720, 104 x: 690 / 2,
105 width: 690, 105 y: 640,
106 fontSize: 28, 106 width: 690,
107 color: "#666666", 107 fontSize: 28,
108 textAlign: "center", 108 color: "#666666",
109 zIndex: 11, 109 textAlign: "center",
110 text: "深士照明", 110 zIndex: 11,
111 }, { 111 text: userInfo.memberCode,
112 x: 690 / 2, 112 },
113 y: 800, 113 {
114 width: 690, 114 x: 690 / 2,
115 fontSize: 28, 115 y: 740,
116 color: "#666666", 116 width: 690,
117 textAlign: "center", 117 fontSize: 28,
118 zIndex: 11, 118 color: "#666666",
119 text: "扫码即获专属积分，兑换超值奖品", 119 textAlign: "center",
120 }]; 120 zIndex: 11,
121 text: "深士照明",
122 }, {
123 x: 690 / 2,
124 y: 800,
125 width: 690,
126 fontSize: 28,
127 color: "#666666",
128 textAlign: "center",
129 zIndex: 11,
130 text: "扫码即获专属积分，兑换超值奖品",
131 }
132 ];
121 133
122 let posterData = { 134 let posterData = {
123 width: 690, 135 width: 690,
......
...@@ -13,6 +13,7 @@ Page({ ...@@ -13,6 +13,7 @@ Page({
13 13
14 historyRankInfoList: [], 14 historyRankInfoList: [],
15 historyIndex: 0, 15 historyIndex: 0,
16 isInit: false
16 }, 17 },
17 onShareAppMessage() {}, 18 onShareAppMessage() {},
18 showAuth() { 19 showAuth() {
...@@ -31,6 +32,9 @@ Page({ ...@@ -31,6 +32,9 @@ Page({
31 * 推广积分排行 32 * 推广积分排行
32 */ 33 */
33 queryActivity() { 34 queryActivity() {
35 this.setData({
36 isInit: false
37 })
34 return new Promise((resolve, reject) => { 38 return new Promise((resolve, reject) => {
35 this.setData({ 39 this.setData({
36 rankInfo: {} 40 rankInfo: {}
...@@ -42,7 +46,12 @@ Page({ ...@@ -42,7 +46,12 @@ Page({
42 key: status 46 key: status
43 } 47 }
44 }).then((result) => { 48 }).then((result) => {
49 // console.log("result:", result)
45 let rankInfo = this.formatRankInfo(result, status); 50 let rankInfo = this.formatRankInfo(result, status);
51 // console.log("rankInfo:", rankInfo)
52 this.setData({
53 isInit: true
54 })
46 if (rankInfo) { 55 if (rankInfo) {
47 this.setData({ 56 this.setData({
48 rankInfo: rankInfo 57 rankInfo: rankInfo
...@@ -58,6 +67,9 @@ Page({ ...@@ -58,6 +67,9 @@ Page({
58 * 推广积分排行 67 * 推广积分排行
59 */ 68 */
60 queryActivityHistory() { 69 queryActivityHistory() {
70 this.setData({
71 isInit: false
72 })
61 return new Promise((resolve, reject) => { 73 return new Promise((resolve, reject) => {
62 this.setData({ 74 this.setData({
63 rankInfo: {} 75 rankInfo: {}
...@@ -73,6 +85,7 @@ Page({ ...@@ -73,6 +85,7 @@ Page({
73 }).then((result) => { 85 }).then((result) => {
74 let historyRankInfoList = result.list; 86 let historyRankInfoList = result.list;
75 this.setData({ 87 this.setData({
88 isInit: true,
76 historyRankInfoList: historyRankInfoList 89 historyRankInfoList: historyRankInfoList
77 }) 90 })
78 console.log("rankInfo 2:", historyRankInfoList); 91 console.log("rankInfo 2:", historyRankInfoList);
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
17 </view> 17 </view>
18 <!-- 排行 --> 18 <!-- 排行 -->
19 <view class="border rank"> 19 <view class="border rank">
20 <block wx:if="{{rankInfo && rankInfo.memberList > 0}}"> 20 <block wx:if="{{rankInfo && rankInfo.memberList.length > 0}}">
21 <!-- 功能区 --> 21 <!-- 功能区 -->
22 <view class="rank-func"> 22 <view class="rank-func">
23 <view class="rank-func-item"> 23 <view class="rank-func-item">
...@@ -93,10 +93,12 @@ ...@@ -93,10 +93,12 @@
93 </view> 93 </view>
94 </view> 94 </view>
95 </block> 95 </block>
96 <view class="empty-tips"> 96 <block wx:else>
97 <!-- <span class="iconfont iconempty"></span> --> 97 <view class="empty-tips" wx:if="{{isInit}}">
98 <view class="tips">暂未开启积分排行，敬请期待</view> 98 <!-- <span class="iconfont iconempty"></span> -->
99 </view> 99 <view class="tips">暂未开启积分排行，敬请期待</view>
100 </view>
101 </block>
100 </view> 102 </view>
101 <!-- 我的奖励按钮 --> 103 <!-- 我的奖励按钮 -->
102 <view wx:if="{{status == 'promotion'}}" class="btn-wrap"> 104 <view wx:if="{{status == 'promotion'}}" class="btn-wrap">
......
...@@ -10,6 +10,7 @@ Page({ ...@@ -10,6 +10,7 @@ Page({
10 qrCodeCode: "", 10 qrCodeCode: "",
11 prizeInfo: null, //扫码结果 11 prizeInfo: null, //扫码结果
12 userInfo: {}, //用户信息 12 userInfo: {}, //用户信息
13 scaning: false,
13 }, 14 },
14 onShareAppMessage() {}, 15 onShareAppMessage() {},
15 showAuth() { 16 showAuth() {
...@@ -57,20 +58,30 @@ Page({ ...@@ -57,20 +58,30 @@ Page({
57 /** 58 /**
58 * 扫积分码功能 扫积分码 59 * 扫积分码功能 扫积分码
59 */ 60 */
60 queryScanIntegralQrcode() { 61 queryScanIntegralQrcode(c) {
61 return new Promise((resolve, reject) => { 62 return new Promise((resolve, reject) => {
62 let { 63 let {
63 code 64 code
64 } = this.data; 65 } = this.data;
66 if (c) code = c;
65 if (code) { 67 if (code) {
68 wx.showLoading({
69 title: "扫码中",
70 mask: true,
71 })
72 this.setData({
73 scaning: true,
74 })
66 app.post({ 75 app.post({
67 url: app.api.scanIntegralQrcode, 76 url: app.api.scanIntegralQrcode,
68 data: { 77 data: {
69 qrCodeCode: code 78 qrCodeCode: code
70 } 79 }
71 }).then((result) => { 80 }).then((result) => {
81 wx.hideLoading();
72 this.setData({ 82 this.setData({
73 prizeInfo: result 83 prizeInfo: result,
84 scaning: false
74 }) 85 })
75 if (result.qrCodeStatus != 1) { 86 if (result.qrCodeStatus != 1) {
76 wx.setNavigationBarTitle({ 87 wx.setNavigationBarTitle({
...@@ -78,8 +89,10 @@ Page({ ...@@ -78,8 +89,10 @@ Page({
78 }) 89 })
79 } 90 }
80 }).catch((err) => { 91 }).catch((err) => {
92 wx.hideLoading();
81 this.setData({ 93 this.setData({
82 prizeInfo: {} 94 prizeInfo: {},
95 scaning: false
83 }) 96 })
84 wx.setNavigationBarTitle({ 97 wx.setNavigationBarTitle({
85 title: '积分获取失败' 98 title: '积分获取失败'
...@@ -107,17 +120,10 @@ Page({ ...@@ -107,17 +120,10 @@ Page({
107 success(res) { 120 success(res) {
108 // 扫码结果 121 // 扫码结果
109 let q = res.result; 122 let q = res.result;
110
111 // 获取积分码 123 // 获取积分码
112 let c = getQueryByUrl("c", q); 124 let c = getQueryByUrl("c", q);
113 if (c) { 125 if (c) {
114 // app.router.push({ 126 _this.queryScanIntegralQrcode(c);
115 // path: "scanResult",
116 // query: {
117 // code: c
118 // }
119 // })
120 _this.queryScanIntegralQrcode();
121 } else { 127 } else {
122 wx.showModal({ 128 wx.showModal({
123 content: '未发现积分码，换一个二维码试试', 129 content: '未发现积分码，换一个二维码试试',
...@@ -137,8 +143,8 @@ Page({ ...@@ -137,8 +143,8 @@ Page({
137 */ 143 */
138 onMyIntegralHandler(evt) { 144 onMyIntegralHandler(evt) {
139 app.router.push({ 145 app.router.push({
140 openType: "reLaunch", 146 openType: "redirect",
141 path: "userCenter" 147 path: "integralDetail"
142 }) 148 })
143 }, 149 },
144 150
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
3 <view class="app__bg bg"></view> 3 <view class="app__bg bg"></view>
4 <view class="app__content main"> 4 <view class="app__content main">
5 <view class="top-space"></view> 5 <view class="top-space"></view>
6 <view class="content"> 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>
......
...@@ -173,7 +173,8 @@ Page({ ...@@ -173,7 +173,8 @@ Page({
173 orderStatus: 1, 173 orderStatus: 1,
174 }) 174 })
175 wx.showModal({ 175 wx.showModal({
176 content: '下单成功', 176 title: "恭喜您",
177 content: '秒杀成功',
177 showCancel: false, 178 showCancel: false,
178 success(res) {} 179 success(res) {}
179 }) 180 })
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
11 <swiper class="swiper" indicator-color="rgba(0,0,0,.3)" indicator-active-color="rgba(255,255,255,1)" indicator-dots="{{true}}" autoplay="{{true}}" interval="{{5000}}" duration="{{500}}"> 11 <swiper class="swiper" indicator-color="rgba(0,0,0,.3)" indicator-active-color="rgba(255,255,255,1)" indicator-dots="{{true}}" autoplay="{{true}}" interval="{{5000}}" duration="{{500}}">
12 <block wx:for="{{productInfo.seckillImages}}" wx:key="{{index}}"> 12 <block wx:for="{{productInfo.seckillImages}}" wx:key="{{index}}">
13 <swiper-item> 13 <swiper-item>
14 <image class="swiper-image" src="{{item}}" mode="aspectFill" /> 14 <image class="swiper-image" src="{{item}}" mode="aspectFit" />
15 </swiper-item> 15 </swiper-item>
16 </block> 16 </block>
17 </swiper> 17 </swiper>
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
20 <view class="func"> 20 <view class="func">
21 <view class="arrow"></view> 21 <view class="arrow"></view>
22 <view class="func-ele func-left"> 22 <view class="func-ele func-left">
23 <text class="price">￥{{filter.Fen2Yuan(productInfo.originalPrice)}}</text> 23 <text class="price">￥{{filter.Fen2Yuan(productInfo.specialPrice)}}</text>
24 <text class="t1 line-th">￥{{filter.Fen2Yuan(productInfo.specialPrice)}}</text> 24 <text class="t1 line-th">￥{{filter.Fen2Yuan(productInfo.originalPrice)}}</text>
25 <text class="t1">仅剩{{productInfo.stock}}个</text> 25 <text class="t1">仅剩{{productInfo.stock}}个</text>
26 </view> 26 </view>
27 <view class="func-ele func-right {{productInfo.status != 1 || isTimeEnd ? 'disable' : ''}}"> 27 <view class="func-ele func-right {{productInfo.status != 1 || isTimeEnd ? 'disable' : ''}}">
......
...@@ -93,7 +93,7 @@ Page({ ...@@ -93,7 +93,7 @@ Page({
93 }).then((result) => { 93 }).then((result) => {
94 let dataList = result.list; 94 let dataList = result.list;
95 dataList.forEach(element => { 95 dataList.forEach(element => {
96 element.dateStr = new Date(element.startTime).toString("yyyy.MM.dd hh:mm") + " - " + new Date(element.endTime).toString("yyyy.MM.dd hh:mm"); 96 element.dateStr = new Date(element.startTime).toString("yyyy.MM.dd HH:mm") + " - " + new Date(element.endTime).toString("yyyy.MM.dd HH:mm");
97 }); 97 });
98 dataList = this.data.dataList.concat(dataList); 98 dataList = this.data.dataList.concat(dataList);
99 this.setData({ 99 this.setData({
......
...@@ -65,7 +65,7 @@ Page({ ...@@ -65,7 +65,7 @@ Page({
65 let dataList = result.list; 65 let dataList = result.list;
66 dataList = this.data.dataList.concat(dataList); 66 dataList = this.data.dataList.concat(dataList);
67 dataList.forEach(element => { 67 dataList.forEach(element => {
68 element.dateStr = new Date(element.seckillOrderTime).toString("yyyy.MM.dd hh:mm"); 68 element.dateStr = new Date(element.seckillOrderTime).toString("yyyy.MM.dd HH:mm");
69 }); 69 });
70 console.log("dataList:", dataList); 70 console.log("dataList:", dataList);
71 this.setData({ 71 this.setData({
......