Skip to content

dev / zhiliang-light-mp

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

默认提交

1 parent 35d4749d
Inline Side-by-side
Showing 32 changed files with 406 additions and 101 deletions
...@@ -95,8 +95,7 @@ $contentWidth:690px; ...@@ -95,8 +95,7 @@ $contentWidth:690px;
95 95
96 @font-face { 96 @font-face {
97 font-family: "iconfont"; 97 font-family: "iconfont";
98 // src: url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAAScAAsAAAAACWAAAARQAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHEIGVgCDSAqFVIRuATYCJAMYCw4ABCAFhG0HVRshCMgOJSGRwABgYAPDUEoeHvd7PTfJSwFAEah6VmX1dTtS08QKyKgZO6MrzNCI9/9/p93MlJPWQetZqTCDwumbgGcyBbEQPyFlu+svwP9zP59X1mB57dlcIpO6qHBnQOMBDSiiLVJ4Axl/1g9uMj9DgoHJYeziMrYT6LVoIdZxQpoAzBRav0A8lEvLwSymU0oooVtZc6YW8R2MdacP2GUA39zvx3/wCTOSJtOGXj2Ir4SoXzYvA/HW/62KaoC2/ixgZpGxBRTiRa7tEdwPbsH1Sn/ByAnQr1tSftk84z7b8oJ5Gfi/BTGR5gr9eipF0vT4z4sKyfoh7izU8MvGRCj84iIkfm1BaPjDIGT+BgpOS1VRlz7cAsQOaPgtstj5d4Rm2sJiwdWa42RrY6ulpEvbeDlLtnAqJzlZk8u4aPEAP3fpSuXt24I7d4R374oNhiJLRB4nmnP7duGSfo5AlMO3tXKFgsnW7QN8sXDxwM42nki8tK3mqIFow/X54sSBO+ECS/w5TujcY2N92Rz53GqTg2ASsDfb2bYDO1l46xNX5PVv4qy63W9wW7KFIH7scBavZFt/chQu3zazYAlvehIBR+Uu3swXr1AmWrKJw5lczhUu3srnL10hZneQz3q7g0dMbgPo8EzXZ6VkJQlEttQOBNR5QVncISGLWroG2VIHRSxo/2/IU1P4BrHLsYrCmEN92IEDGOK+5UARjuM+XO64nNbYV6Wv1xw+6P43+saNYsePY6Nil50laln7B910+c7pbYU5oEojI9iIVbBZ1r9w7vTe3vnzwe/ml+vG+g0bjh3LOf5Fq1W+Hs8G/7d39kaNdr0PNHe39rU+aJrdzQN/k9GLbIudBavigso8bNUCD8vnXpHt2SvHuBru2I2kPb0Ez2yxxi1na+LP1TdyvBG18WcVp2bVxJ3d0jBLpchzG7aoZmJpcMV7ix+w9nlq8tTH3dTXBhoB2tNpCl8EQH6DA7B0MANWH8+SRKFwixEr3/mhfmPufaG81Drsa3dfAbcRm2ZBQT0Z/BVytfm/T0EB2v9GwQqxvhaxvNlBoLpmjPwJvbqLFrpGPe5LNfEewqHbRAhJlwXIui2hCm4LGn12oeq2B702Jc7uM4aGi9KDDV0AwrC9kAz6CdmwK6iCewSNSW+hGg4cenXCfsk+KyEnYmlUzqBKsqKOlEu0GspGhvAyc5C0SlVOR4UuVYRovdxDent4JSOJSIPoPkboq6U+DEORFK1VkwlgN6RSaUkdrVUgCeMhYxhdiKcnlXcjD4lWDYQjNKQcA6lEqlCHJCehpUHZtRlE6vM5EKkqKuXokrISqwhC05M3TvLmwasGKlGmqVV2Lq31qkn5YDAo3ItC01IjJUALotKDWiRdficFRILhQdbCrxPCE1Wi6so8xleor3Id9NLWqZEiR4kmanTpuVMuUe5/U28TiUqrR96mNKI8Ti8zkmnVyBipdUwdAA==') format('woff2'), 98 src: url('data:application/x-font-woff2;charset=utf-8;base64,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') format('woff2');
99 src: url('data:application/x-font-woff2;charset=utf-8;base64,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') format('woff2');
100 } 99 }
101 100
102 .iconfont { 101 .iconfont {
...@@ -116,6 +115,10 @@ $contentWidth:690px; ...@@ -116,6 +115,10 @@ $contentWidth:690px;
116 content: "\e615"; 115 content: "\e615";
117 } 116 }
118 117
118 .iconSeckill:before {
119 content: "\e8cd";
120 }
121
119 .iconrefresh:before { 122 .iconrefresh:before {
120 content: "\e874"; 123 content: "\e874";
121 } 124 }
...@@ -124,6 +127,10 @@ $contentWidth:690px; ...@@ -124,6 +127,10 @@ $contentWidth:690px;
124 content: "\e610"; 127 content: "\e610";
125 } 128 }
126 129
130 .iconpaimai:before {
131 content: "\e63b";
132 }
133
127 .iconxinzeng:before { 134 .iconxinzeng:before {
128 content: "\e606"; 135 content: "\e606";
129 } 136 }
...@@ -136,6 +143,10 @@ $contentWidth:690px; ...@@ -136,6 +143,10 @@ $contentWidth:690px;
136 content: "\e6dc"; 143 content: "\e6dc";
137 } 144 }
138 145
146 .iconmiaosha:before {
147 content: "\e61d";
148 }
149
139 .iconbaseline-close-px:before { 150 .iconbaseline-close-px:before {
140 content: "\e600"; 151 content: "\e600";
141 } 152 }
...@@ -146,7 +157,6 @@ $contentWidth:690px; ...@@ -146,7 +157,6 @@ $contentWidth:690px;
146 157
147 158
148 159
149
150 .drop-down-item :last-child { 160 .drop-down-item :last-child {
151 border-bottom: none; 161 border-bottom: none;
152 } 162 }
......
...@@ -35,7 +35,7 @@ Component({ ...@@ -35,7 +35,7 @@ Component({
35 }, 35 },
36 getUserInfo(e) { 36 getUserInfo(e) {
37 let _this = this; 37 let _this = this;
38 app.globalData.userInfo = e.userInfo; 38 // app.globalData.userInfo = e.userInfo;
39 app.post({ 39 app.post({
40 url: app.api.register, 40 url: app.api.register,
41 sid: false, 41 sid: false,
...@@ -52,7 +52,27 @@ Component({ ...@@ -52,7 +52,27 @@ Component({
52 } 52 }
53 _this.hideMask(); 53 _this.hideMask();
54 _this.authComplete(); 54 _this.authComplete();
55 _this.initPage();
55 }).catch((err) => {}) 56 }).catch((err) => {})
56 }, 57 },
58
59 /**
60 * 尝试重拉信息
61 */
62 initPage() {
63 let pages = getCurrentPages();
64 let view = pages[pages.length - 1];
65 console.log("@authorize-comp view:", view);
66 if (view) {
67 try {
68 view.hideMask();
69 console.log("@authorize-comp || hideMask");
70 } catch (error) {}
71 try {
72 view.initData();
73 console.log("@authorize-comp || initData");
74 } catch (error) {}
75 }
76 }
57 } 77 }
58 }) 78 })
......
...@@ -54,7 +54,11 @@ ...@@ -54,7 +54,11 @@
54 .btn { 54 .btn {
55 @include cb(240px, 80px); 55 @include cb(240px, 80px);
56 margin: 0 24px; 56 margin: 0 24px;
57 }
58
57 59
60 .btn2 {
61 @include cb2(240px, 80px);
58 } 62 }
59 63
60 } 64 }
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
11 </view> 11 </view>
12 <view class="btn-wrap"> 12 <view class="btn-wrap">
13 <!-- <button class="btn gray" open-type="getUserInfo" bindgetuserinfo="bindGetUserInfo">确认授权</button> --> 13 <!-- <button class="btn gray" open-type="getUserInfo" bindgetuserinfo="bindGetUserInfo">确认授权</button> -->
14 <button class="btn gray" bindtap="hideMask">暂不授权</button> 14 <button class="btn btn2" bindtap="hideMask">暂不授权</button>
15 <button class="btn" open-type="getUserInfo" bindgetuserinfo="bindGetUserInfo">确认授权</button> 15 <button class="btn" open-type="getUserInfo" bindgetuserinfo="bindGetUserInfo">确认授权</button>
16 </view> 16 </view>
17 </view> 17 </view>
......
...@@ -50,7 +50,7 @@ module.exports = { ...@@ -50,7 +50,7 @@ module.exports = {
50 seckillDetail: '/seckill/detail', // post 秒杀详情 50 seckillDetail: '/seckill/detail', // post 秒杀详情
51 member: '/member', // post 秒杀收件人信息获取 51 member: '/member', // post 秒杀收件人信息获取
52 seckillSubmit: '/seckill/submit', // post 提交秒杀订单 52 seckillSubmit: '/seckill/submit', // post 提交秒杀订单
53 seckillMine: '/seckill/member', // post 我的秒杀产品 53 seckillMine: '/seckill/order', // post 我的秒杀产品
54 54
55 areaQuery: 'https://api.k.wxpai.cn/bizproxy/kdapi/area', // post 区域查询 55 areaQuery: 'https://api.k.wxpai.cn/bizproxy/kdapi/area', // post 区域查询
56 56
......
...@@ -146,8 +146,30 @@ Page({ ...@@ -146,8 +146,30 @@ Page({
146 this.setData({ 146 this.setData({
147 checked: event.detail, 147 checked: event.detail,
148 }); 148 });
149 } 149 },
150
151 // 隐藏蒙层
152 hideMask() {
153 this.setData({
154 authorizeVisible: false,
155 })
156 },
157 // 子组件事件
158 evtcomp(evt) {
159 let {
160 name,
161 data
162 } = evt.detail;
163 switch (name) {
150 164
165 // 隐藏弹窗
166 case "_evt_hide_mask":
167 this.hideMask();
168 break;
151 169
170 default:
171 break;
172 }
173 },
152 174
153 }) 175 })
......
...@@ -85,8 +85,28 @@ Page({ ...@@ -85,8 +85,28 @@ Page({
85 } 85 }
86 } 86 }
87 }) 87 })
88 },
89 // 隐藏蒙层
90 hideMask() {
91 this.setData({
92 authorizeVisible: false,
93 })
94 },
95 // 子组件事件
96 evtcomp(evt) {
97 let {
98 name,
99 data
100 } = evt.detail;
101 switch (name) {
102
103 // 隐藏弹窗
104 case "_evt_hide_mask":
105 this.hideMask();
106 break;
88 107
89 // app.globalData.addressEditInfo = curData; 108 default:
90 // console.log("def:", curData); 109 break;
91 } 110 }
111 },
92 }) 112 })
......
...@@ -84,14 +84,11 @@ $contentWidth:690px; ...@@ -84,14 +84,11 @@ $contentWidth:690px;
84 84
85 .t2 { 85 .t2 {
86 margin-top: 8px; 86 margin-top: 8px;
87 // font-size: 24px;
88 // color: #999999;
89 } 87 }
90 88
91 .t3 { 89 .t3 {
92 font-size: 20px; 90 font-size: 20px;
93 color: #999999; 91 color: #999999;
94 // color: #3680EB;
95 } 92 }
96 } 93 }
97 94
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
10 <view bindtap="onShowAuctionMineHandler" class="btn">我的拍卖</view> 10 <view bindtap="onShowAuctionMineHandler" class="btn">我的拍卖</view>
11 </view> 11 </view>
12 <view class="list"> 12 <view class="list">
13 <view wx:for="{{dataList}}" wx:key="{{index}}" class="border list-item"> 13 <view bindtap="onDetailHandler" data-data="{{item}}" data-index="{{index}}" wx:for="{{dataList}}" wx:key="{{index}}" class="border list-item">
14 <view class="prize"> 14 <view class="prize">
15 <image class="image" mode="aspectFill" src="{{item.auctionImages && item.auctionImages[0] || ''}}" /> 15 <image class="image" mode="aspectFill" src="{{item.auctionImages && item.auctionImages[0] || ''}}" />
16 </view> 16 </view>
...@@ -23,15 +23,9 @@ ...@@ -23,15 +23,9 @@
23 <view class="tt t3">{{item.dateStr}}</view> 23 <view class="tt t3">{{item.dateStr}}</view>
24 </view> 24 </view>
25 </view> 25 </view>
26 <view bindtap="onDetailHandler" wx:if="{{item.status == 0}}" data-data="{{item}}" data-index="{{index}}" class="btn btn0"> 26 <view wx:if="{{item.status == 0}}" class="btn btn0">未开始</view>
27 未开始 27 <view wx:if="{{item.status == 1}}" class="btn btn1">进行中</view>
28 </view> 28 <view wx:if="{{item.status == 2}}" class="btn btn2">已结束</view>
29 <view bindtap="onDetailHandler" wx:if="{{item.status == 1}}" data-data="{{item}}" data-index="{{index}}" class="btn btn1">
30 进行中
31 </view>
32 <view bindtap="onDetailHandler" wx:if="{{item.status == 2}}" data-data="{{item}}" data-index="{{index}}" class="btn btn2">
33 已结束
34 </view>
35 </view> 29 </view>
36 </view> 30 </view>
37 </view> 31 </view>
......
...@@ -4,6 +4,8 @@ ...@@ -4,6 +4,8 @@
4 $contentWidth:690px; 4 $contentWidth:690px;
5 5
6 .page { 6 .page {
7 padding-bottom: $pageBottom;
8
7 .bgc { 9 .bgc {
8 background-color: #f8f8f8; 10 background-color: #f8f8f8;
9 } 11 }
...@@ -50,13 +52,13 @@ $contentWidth:690px; ...@@ -50,13 +52,13 @@ $contentWidth:690px;
50 flex: 1; 52 flex: 1;
51 // padding: 0 0 0 16px; 53 // padding: 0 0 0 16px;
52 @extend .bb; 54 @extend .bb;
53 height: 220px; 55 // height: 220px;
54 56
55 .up {} 57 .up {}
56 58
57 .down { 59 .down {
58 position: absolute; 60 // position: absolute;
59 bottom: 0; 61 // bottom: 0;
60 } 62 }
61 63
62 64
...@@ -68,13 +70,13 @@ $contentWidth:690px; ...@@ -68,13 +70,13 @@ $contentWidth:690px;
68 70
69 .t2 { 71 .t2 {
70 font-size: 26px; 72 font-size: 26px;
71 margin-top: 4px; 73 // margin-top: 4px;
72 } 74 }
73 75
74 .t3 { 76 .t3 {
75 font-size: 26px; 77 font-size: 26px;
76 font-weight: bold; 78 font-weight: bold;
77 margin-top: 0px; 79 // margin-top: 0px;
78 } 80 }
79 81
80 .t4 { 82 .t4 {
...@@ -82,9 +84,13 @@ $contentWidth:690px; ...@@ -82,9 +84,13 @@ $contentWidth:690px;
82 margin-top: 2px; 84 margin-top: 2px;
83 color: #666666; 85 color: #666666;
84 } 86 }
87 .sp2{
88 margin-top: 8px;
89 }
90
85 91
86 .sp4 { 92 .sp4 {
87 margin-top: 24px; 93 margin-top: 12px;
88 } 94 }
89 } 95 }
90 96
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
14 <view class="cont"> 14 <view class="cont">
15 <view class="up"> 15 <view class="up">
16 <view class="tt t1">{{item.auctionName}}</view> 16 <view class="tt t1">{{item.auctionName}}</view>
17 <view class="tt t2">原价：{{filter.Fen2Yuan(item.originalPrice)}}元</view> 17 <view class="tt t2 sp2">原价：{{filter.Fen2Yuan(item.originalPrice)}}元</view>
18 <view class="tt t3 price">竞拍价格：{{filter.Fen2Yuan(item.auctionPrice)}}元</view> 18 <view class="tt t3 price">竞拍价格：{{filter.Fen2Yuan(item.auctionPrice)}}元</view>
19 </view> 19 </view>
20 <view class="down"> 20 <view class="down">
......
...@@ -28,7 +28,7 @@ Page({ ...@@ -28,7 +28,7 @@ Page({
28 }, 28 },
29 getUserInfo(e) { 29 getUserInfo(e) {
30 let _this = this; 30 let _this = this;
31 app.globalData.userInfo = e.userInfo; 31 // app.globalData.userInfo = e.userInfo;
32 // console.log("loginData:",_this.data.loginData); 32 // console.log("loginData:",_this.data.loginData);
33 app.post({ 33 app.post({
34 url: app.api.register, 34 url: app.api.register,
......
...@@ -252,6 +252,7 @@ Page({ ...@@ -252,6 +252,7 @@ Page({
252 // 隐藏蒙层 252 // 隐藏蒙层
253 hideMask() { 253 hideMask() {
254 this.setData({ 254 this.setData({
255 authorizeVisible: false,
255 commonTipsCompVisible: false 256 commonTipsCompVisible: false
256 }) 257 })
257 }, 258 },
...@@ -263,6 +264,10 @@ Page({ ...@@ -263,6 +264,10 @@ Page({
263 } = evt.detail; 264 } = evt.detail;
264 switch (name) { 265 switch (name) {
265 266
267 case "_evt_hide_mask":
268 this.hideMask();
269 break;
270
266 case "_evt_common_comp_button": 271 case "_evt_common_comp_button":
267 this.hideMask(); 272 this.hideMask();
268 wx.navigateBack({ 273 wx.navigateBack({
......
...@@ -62,5 +62,29 @@ Page({ ...@@ -62,5 +62,29 @@ Page({
62 }) 62 })
63 resolve(); 63 resolve();
64 }); 64 });
65 },
66
67 // 隐藏蒙层
68 hideMask() {
69 this.setData({
70 authorizeVisible: false,
71 })
72 },
73 // 子组件事件
74 evtcomp(evt) {
75 let {
76 name,
77 data
78 } = evt.detail;
79 switch (name) {
80
81 // 隐藏弹窗
82 case "_evt_hide_mask":
83 this.hideMask();
84 break;
85
86 default:
87 break;
65 } 88 }
89 },
66 }) 90 })
......
...@@ -182,6 +182,10 @@ Page({ ...@@ -182,6 +182,10 @@ Page({
182 } = evt.detail; 182 } = evt.detail;
183 switch (name) { 183 switch (name) {
184 184
185 case "_evt_hide_mask":
186 this.hideMask();
187 break;
188
185 // 隐藏弹窗 189 // 隐藏弹窗
186 case "_evt_common_comp_button": 190 case "_evt_common_comp_button":
187 this.hideMask(); 191 this.hideMask();
......
...@@ -20,6 +20,15 @@ Page({ ...@@ -20,6 +20,15 @@ Page({
20 }) 20 })
21 }, 21 },
22 onLoad(options) { 22 onLoad(options) {
23
24 },
25 onShow() {
26 console.log("@gift-shop || onShow")
27 this.hideMask();
28 this.initData();
29 },
30 initData() {
31 this.resetPage();
23 this.queryProduct(); 32 this.queryProduct();
24 }, 33 },
25 // 到达底部 34 // 到达底部
...@@ -42,6 +51,7 @@ Page({ ...@@ -42,6 +51,7 @@ Page({
42 * 请求产品 51 * 请求产品
43 */ 52 */
44 queryProduct() { 53 queryProduct() {
54 console.log("queryProduct");
45 return new Promise((resolve, reject) => { 55 return new Promise((resolve, reject) => {
46 app.post({ 56 app.post({
47 sid: false, 57 sid: false,
...@@ -137,6 +147,10 @@ Page({ ...@@ -137,6 +147,10 @@ Page({
137 } = evt.detail; 147 } = evt.detail;
138 switch (name) { 148 switch (name) {
139 149
150 case "_evt_hide_mask":
151 this.hideMask();
152 break;
153
140 // 隐藏弹窗 154 // 隐藏弹窗
141 case "_evt_common_comp_button": 155 case "_evt_common_comp_button":
142 this.hideMask(); 156 this.hideMask();
...@@ -144,8 +158,9 @@ Page({ ...@@ -144,8 +158,9 @@ Page({
144 158
145 // 授权完毕 159 // 授权完毕
146 case "_evt_auth_complete": 160 case "_evt_auth_complete":
147 this.resetPage(); 161 // this.resetPage();
148 this.queryProduct(); 162 // this.queryProduct();
163 // this.initData();
149 break; 164 break;
150 165
151 default: 166 default:
......
...@@ -55,8 +55,9 @@ Page({ ...@@ -55,8 +55,9 @@ Page({
55 }, 55 },
56 56
57 onShow() { 57 onShow() {
58 console.log("onShow memberCode:", this.data.memberCode); 58 this.hideMask();
59 console.log("onShow code:", this.data.code); 59 // console.log("onShow memberCode:", this.data.memberCode);
60 // console.log("onShow code:", this.data.code);
60 }, 61 },
61 62
62 initData() { 63 initData() {
...@@ -307,8 +308,8 @@ Page({ ...@@ -307,8 +308,8 @@ Page({
307 308
308 hideMask() { 309 hideMask() {
309 this.setData({ 310 this.setData({
310 productDetailVisible: false,
311 authorizeVisible: false, 311 authorizeVisible: false,
312 productDetailVisible: false,
312 }) 313 })
313 }, 314 },
314 // 子组件事件 315 // 子组件事件
...@@ -319,6 +320,10 @@ Page({ ...@@ -319,6 +320,10 @@ Page({
319 } = evt.detail; 320 } = evt.detail;
320 switch (name) { 321 switch (name) {
321 322
323 case "_evt_hide_mask":
324 this.hideMask();
325 break;
326
322 case "_evt_hide_product_detail_mask": 327 case "_evt_hide_product_detail_mask":
323 this.hideMask(); 328 this.hideMask();
324 break; 329 break;
......
...@@ -252,5 +252,29 @@ Page({ ...@@ -252,5 +252,29 @@ Page({
252 }) 252 })
253 this.resetPage(); 253 this.resetPage();
254 this.queryPointsOverview(); 254 this.queryPointsOverview();
255 },
256
257 // 隐藏蒙层
258 hideMask() {
259 this.setData({
260 authorizeVisible: false,
261 })
262 },
263 // 子组件事件
264 evtcomp(evt) {
265 let {
266 name,
267 data
268 } = evt.detail;
269 switch (name) {
270
271 // 隐藏弹窗
272 case "_evt_hide_mask":
273 this.hideMask();
274 break;
275
276 default:
277 break;
255 } 278 }
279 },
256 }) 280 })
......
...@@ -148,5 +148,29 @@ Page({ ...@@ -148,5 +148,29 @@ Page({
148 }) 148 })
149 }) 149 })
150 }); 150 });
151 },
152
153 // 隐藏蒙层
154 hideMask() {
155 this.setData({
156 authorizeVisible: false,
157 })
158 },
159 // 子组件事件
160 evtcomp(evt) {
161 let {
162 name,
163 data
164 } = evt.detail;
165 switch (name) {
166
167 // 隐藏弹窗
168 case "_evt_hide_mask":
169 this.hideMask();
170 break;
171
172 default:
173 break;
151 } 174 }
175 },
152 }) 176 })
......
...@@ -132,6 +132,30 @@ Page({ ...@@ -132,6 +132,30 @@ Page({
132 }) 132 })
133 this.resetPage(); 133 this.resetPage();
134 this.queryOrder(); 134 this.queryOrder();
135 },
136
137 // 隐藏蒙层
138 hideMask() {
139 this.setData({
140 authorizeVisible: false,
141 })
142 },
143 // 子组件事件
144 evtcomp(evt) {
145 let {
146 name,
147 data
148 } = evt.detail;
149 switch (name) {
150
151 // 隐藏弹窗
152 case "_evt_hide_mask":
153 this.hideMask();
154 break;
155
156 default:
157 break;
135 } 158 }
159 },
136 160
137 }) 161 })
......
...@@ -241,5 +241,28 @@ Page({ ...@@ -241,5 +241,28 @@ Page({
241 return size; 241 return size;
242 }, 242 },
243 243
244 // 隐藏蒙层
245 hideMask() {
246 this.setData({
247 authorizeVisible: false,
248 })
249 },
250 // 子组件事件
251 evtcomp(evt) {
252 let {
253 name,
254 data
255 } = evt.detail;
256 switch (name) {
257
258 // 隐藏弹窗
259 case "_evt_hide_mask":
260 this.hideMask();
261 break;
262
263 default:
264 break;
265 }
266 },
244 267
245 }) 268 })
......
...@@ -43,7 +43,7 @@ Page({ ...@@ -43,7 +43,7 @@ Page({
43 } 43 }
44 }).then((result) => { 44 }).then((result) => {
45 let rankInfo = this.formatRankInfo(result, status); 45 let rankInfo = this.formatRankInfo(result, status);
46 if(rankInfo){ 46 if (rankInfo) {
47 this.setData({ 47 this.setData({
48 rankInfo: rankInfo 48 rankInfo: rankInfo
49 }) 49 })
...@@ -87,7 +87,7 @@ Page({ ...@@ -87,7 +87,7 @@ Page({
87 */ 87 */
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 if (status == "promotion") { 91 if (status == "promotion") {
92 rankInfo.myMember.rank = rankInfo.myMember.promotionNo; 92 rankInfo.myMember.rank = rankInfo.myMember.promotionNo;
93 rankInfo.myMember.points = rankInfo.myMember.promotionPoints; 93 rankInfo.myMember.points = rankInfo.myMember.promotionPoints;
...@@ -207,5 +207,29 @@ Page({ ...@@ -207,5 +207,29 @@ Page({
207 // 滚动到底部 分页加载 207 // 滚动到底部 分页加载
208 onRankScrolltolower(e) { 208 onRankScrolltolower(e) {
209 209
210 },
211
212 // 隐藏蒙层
213 hideMask() {
214 this.setData({
215 authorizeVisible: false,
216 })
217 },
218 // 子组件事件
219 evtcomp(evt) {
220 let {
221 name,
222 data
223 } = evt.detail;
224 switch (name) {
225
226 // 隐藏弹窗
227 case "_evt_hide_mask":
228 this.hideMask();
229 break;
230
231 default:
232 break;
210 } 233 }
234 },
211 }) 235 })
......
...@@ -156,6 +156,10 @@ Page({ ...@@ -156,6 +156,10 @@ Page({
156 } = evt.detail; 156 } = evt.detail;
157 switch (name) { 157 switch (name) {
158 158
159 case "_evt_hide_mask":
160 this.hideMask();
161 break;
162
159 // 授权完毕 163 // 授权完毕
160 case "_evt_auth_complete": 164 case "_evt_auth_complete":
161 this.initData(); 165 this.initData();
......
...@@ -5,12 +5,12 @@ ...@@ -5,12 +5,12 @@
5 <view class="app__content main"> 5 <view class="app__content main">
6 <view class="top-space"></view> 6 <view class="top-space"></view>
7 <view class="content"> 7 <view class="content">
8 <!-- 我的拍卖按钮 --> 8 <!-- 我的秒杀按钮 -->
9 <view class="my-btn"> 9 <view class="my-btn">
10 <view bindtap="onShowSeckillMineHandler" class="btn">我的秒杀</view> 10 <view bindtap="onShowSeckillMineHandler" class="btn">我的秒杀</view>
11 </view> 11 </view>
12 <view class="list"> 12 <view class="list">
13 <view wx:for="{{dataList}}" wx:key="{{index}}" class="border list-item"> 13 <view bindtap="onDetailHandler" data-data="{{item}}" data-index="{{index}}" wx:for="{{dataList}}" wx:key="{{index}}" class="border list-item">
14 <view class="prize"> 14 <view class="prize">
15 <image class="image" mode="aspectFill" src="{{item.seckillImages && item.seckillImages[0] || ''}}" /> 15 <image class="image" mode="aspectFill" src="{{item.seckillImages && item.seckillImages[0] || ''}}" />
16 </view> 16 </view>
...@@ -23,15 +23,9 @@ ...@@ -23,15 +23,9 @@
23 <view class="tt t3">{{item.dateStr}}</view> 23 <view class="tt t3">{{item.dateStr}}</view>
24 </view> 24 </view>
25 </view> 25 </view>
26 <view bindtap="onDetailHandler" wx:if="{{item.status == 0}}" data-data="{{item}}" data-index="{{index}}" class="btn btn0"> 26 <view wx:if="{{item.status == 0}}" class="btn btn0">未开始</view>
27 未开始 27 <view wx:if="{{item.status == 1}}" class="btn btn1">进行中</view>
28 </view> 28 <view wx:if="{{item.status == 2}}" class="btn btn2">已结束</view>
29 <view bindtap="onDetailHandler" wx:if="{{item.status == 1}}" data-data="{{item}}" data-index="{{index}}" class="btn btn1">
30 进行中
31 </view>
32 <view bindtap="onDetailHandler" wx:if="{{item.status == 2}}" data-data="{{item}}" data-index="{{index}}" class="btn btn2">
33 已结束
34 </view>
35 </view> 29 </view>
36 </view> 30 </view>
37 </view> 31 </view>
......
...@@ -28,7 +28,7 @@ Page({ ...@@ -28,7 +28,7 @@ Page({
28 this.initData(); 28 this.initData();
29 }, 29 },
30 initData() { 30 initData() {
31 this.queryAuctionList(); 31 this.querySeckillList();
32 }, 32 },
33 33
34 // 到达底部 34 // 到达底部
...@@ -37,7 +37,7 @@ Page({ ...@@ -37,7 +37,7 @@ Page({
37 this.setData({ 37 this.setData({
38 page: this.data.page + 1 38 page: this.data.page + 1
39 }); 39 });
40 this.queryAuctionList(); 40 this.querySeckillList();
41 } 41 }
42 }, 42 },
43 43
...@@ -50,10 +50,11 @@ Page({ ...@@ -50,10 +50,11 @@ Page({
50 }, 50 },
51 51
52 // 拍卖列表 52 // 拍卖列表
53 queryAuctionList() { 53 querySeckillList() {
54 console.log("app.api.seckillMine:",app.api.seckillMine)
54 return new Promise((resolve, reject) => { 55 return new Promise((resolve, reject) => {
55 app.post({ 56 app.post({
56 url: app.api.auctionMine, 57 url: app.api.seckillMine,
57 data: { 58 data: {
58 page: this.data.page, 59 page: this.data.page,
59 size: this.data.size, 60 size: this.data.size,
...@@ -62,12 +63,9 @@ Page({ ...@@ -62,12 +63,9 @@ Page({
62 if (!result) return; 63 if (!result) return;
63 if (!result.list) return; 64 if (!result.list) return;
64 let dataList = result.list; 65 let dataList = result.list;
65 dataList.forEach(element => {
66 element.dateStr = new Date(element.startTime).toString("yyyy.MM.dd hh:mm") + " - " + new Date(element.endTime).toString("yyyy.MM.dd hh:mm");
67 });
68 dataList = this.data.dataList.concat(dataList); 66 dataList = this.data.dataList.concat(dataList);
69 dataList.forEach(element => { 67 dataList.forEach(element => {
70 element.recordTime = new Date(element.recordTime).toString("yyyy.MM.dd hh:mm:ss"); 68 element.dateStr = new Date(element.seckillOrderTime).toString("yyyy.MM.dd hh:mm");
71 }); 69 });
72 console.log("dataList:", dataList); 70 console.log("dataList:", dataList);
73 this.setData({ 71 this.setData({
......
1 { 1 {
2 "navigationBarTitleText": "我的竞拍订单" 2 "navigationBarTitleText": "我的秒杀订单"
3 } 3 }
......
...@@ -4,6 +4,8 @@ ...@@ -4,6 +4,8 @@
4 $contentWidth:690px; 4 $contentWidth:690px;
5 5
6 .page { 6 .page {
7 padding-bottom: $pageBottom;
8
7 .bgc { 9 .bgc {
8 background-color: #f8f8f8; 10 background-color: #f8f8f8;
9 } 11 }
...@@ -12,7 +14,7 @@ $contentWidth:690px; ...@@ -12,7 +14,7 @@ $contentWidth:690px;
12 14
13 .main { 15 .main {
14 .top-space { 16 .top-space {
15 height: 0px; 17 height: 24px;
16 } 18 }
17 19
18 .content { 20 .content {
...@@ -21,7 +23,7 @@ $contentWidth:690px; ...@@ -21,7 +23,7 @@ $contentWidth:690px;
21 // list 23 // list
22 .list { 24 .list {
23 width: $contentWidth; 25 width: $contentWidth;
24 margin: 24px auto 0; 26 margin: 0 auto 0;
25 font-size: 22px; 27 font-size: 22px;
26 28
27 &-item { 29 &-item {
...@@ -34,7 +36,7 @@ $contentWidth:690px; ...@@ -34,7 +36,7 @@ $contentWidth:690px;
34 .prize { 36 .prize {
35 margin: 0 32px; 37 margin: 0 32px;
36 38
37 border:solid 1PX #F0F0F0; 39 border: solid 1PX #F0F0F0;
38 border-radius: 8px; 40 border-radius: 8px;
39 padding: 16px; 41 padding: 16px;
40 42
...@@ -50,6 +52,15 @@ $contentWidth:690px; ...@@ -50,6 +52,15 @@ $contentWidth:690px;
50 flex: 1; 52 flex: 1;
51 // padding: 0 0 0 16px; 53 // padding: 0 0 0 16px;
52 @extend .bb; 54 @extend .bb;
55 // height: 220px;
56
57 .up {}
58
59 .down {
60 // position: absolute;
61 // bottom: 0;
62 }
63
53 64
54 .tt {} 65 .tt {}
55 66
...@@ -59,23 +70,25 @@ $contentWidth:690px; ...@@ -59,23 +70,25 @@ $contentWidth:690px;
59 70
60 .t2 { 71 .t2 {
61 font-size: 26px; 72 font-size: 26px;
62 margin-top: 8px;
63 } 73 }
64 74
65 .t3 { 75 .t3 {
66 font-size: 26px; 76 font-size: 26px;
67 font-weight: bold; 77 font-weight: bold;
68 margin-top: 4px;
69 } 78 }
70 79
71 .t4 { 80 .t4 {
72 font-size: 22px; 81 font-size: 22px;
73 margin-top: 4px; 82 margin-top: 2px;
74 color: #666666; 83 color: #666666;
75 } 84 }
76 85
77 .sp4{ 86 .sp2{
78 margin-top: 24px; 87 margin-top: 8px;
88 }
89
90 .sp4 {
91 margin-top: 12px;
79 } 92 }
80 } 93 }
81 94
......
...@@ -9,14 +9,19 @@ ...@@ -9,14 +9,19 @@
9 <view class="list"> 9 <view class="list">
10 <view wx:for="{{dataList}}" wx:key="{{index}}" class="border list-item"> 10 <view wx:for="{{dataList}}" wx:key="{{index}}" class="border list-item">
11 <view class="prize"> 11 <view class="prize">
12 <image class="image" mode="aspectFill" src="{{item.auctionImage && item.auctionImage[0] || ''}}" /> 12 <image class="image" mode="aspectFill" src="{{item.seckillImages && item.seckillImages[0] || ''}}" />
13 </view> 13 </view>
14 <view class="cont"> 14 <view class="cont">
15 <view class="tt t1">{{item.auctionName}}</view> 15 <view class="up">
16 <view class="tt t2">原价：{{filter.Fen2Yuan(item.originalPrice)}}元</view> 16 <view class="tt t1">{{item.seckillName}}</view>
17 <view class="tt t3 price">竞拍价格：{{filter.Fen2Yuan(item.auctionPrice)}}元</view> 17 <view class="tt t2 sp2">数量：{{item.num}}</view>
18 <view class="tt t4 sp4">订单编号：A20191008103818293X</view> 18 <view class="tt t3 price">总价格：{{filter.Fen2Yuan(item.totalAmount)}}元</view>
19 <view class="tt t4">竞拍时间：{{item.auctionTime}}</view> 19 </view>
20 <view class="down">
21 <view class="tt t4 sp4">订单编号：{{item.seckillOrderCode}}</view>
22 <view class="tt t4">竞拍时间：{{item.dateStr}}</view>
23 <view class="tt t4">备注：{{item.remark}}</view>
24 </view>
20 </view> 25 </view>
21 </view> 26 </view>
22 </view> 27 </view>
......
...@@ -24,8 +24,8 @@ Page({ ...@@ -24,8 +24,8 @@ Page({
24 }) 24 })
25 }, 25 },
26 onShow() { 26 onShow() {
27 this.hideMask();
27 this.initData(); 28 this.initData();
28
29 }, 29 },
30 onLoad(options) { 30 onLoad(options) {
31 // app.router.push({ 31 // app.router.push({
...@@ -191,6 +191,24 @@ Page({ ...@@ -191,6 +191,24 @@ Page({
191 }, 191 },
192 192
193 /** 193 /**
194 * 点击拍卖
195 */
196 onAuctionHandler(evt) {
197 app.router.push({
198 path: "auctionList"
199 })
200 },
201
202 /**
203 * 点击秒杀
204 */
205 onSeckillHandler(evt) {
206 app.router.push({
207 path: "seckillList"
208 })
209 },
210
211 /**
194 * 获取会员信息 212 * 获取会员信息
195 */ 213 */
196 queryMember() { 214 queryMember() {
...@@ -202,6 +220,7 @@ Page({ ...@@ -202,6 +220,7 @@ Page({
202 this.setData({ 220 this.setData({
203 userInfo: result 221 userInfo: result
204 }) 222 })
223 app.globalData.userInfo = result;
205 resolve(result); 224 resolve(result);
206 }) 225 })
207 }); 226 });
......
...@@ -257,31 +257,7 @@ $contentWidth: 690px; ...@@ -257,31 +257,7 @@ $contentWidth: 690px;
257 } 257 }
258 } 258 }
259 259
260 // 订单区域
261 .order {
262 display: flex;
263 justify-content: space-between;
264 font-size: 24px;
265 color: #131415;
266 text-align: center;
267
268 &-item {
269 width: 110px;
270
271 .icon-wrap {
272 @extend .fcc;
273 height: 100px;
274 height: 100px;
275
276 .icon {
277 height: 64px;
278 height: 64px;
279 }
280 }
281 260
282 .txt {}
283 }
284 }
285 261
286 // 功能区 262 // 功能区
287 .func { 263 .func {
...@@ -315,8 +291,6 @@ $contentWidth: 690px; ...@@ -315,8 +291,6 @@ $contentWidth: 690px;
315 width: 132px; 291 width: 132px;
316 position: relative; 292 position: relative;
317 293
318
319
320 .icon-wrap { 294 .icon-wrap {
321 position: relative; 295 position: relative;
322 @extend .fcc; 296 @extend .fcc;
...@@ -347,6 +321,36 @@ $contentWidth: 690px; ...@@ -347,6 +321,36 @@ $contentWidth: 690px;
347 } 321 }
348 322
349 323
324 // 活动区域
325 .active {
326 font-size: 24px;
327 color: #333333;
328 text-align: center;
329
330 margin: 40px 0 4px;
331 display: flex;
332 justify-content: space-between;
333 // justify-content: flex-start;
334
335 &-item {
336 width: 132px;
337 position: relative;
338
339 .icon-wrap {
340 @extend .fcc;
341 height: 100px;
342
343 .icon {
344 color: #333333;
345 font-size: 64px;
346 }
347 }
348
349 .txt {}
350 }
351 }
352
353
350 } 354 }
351 } 355 }
352 } 356 }
......
...@@ -97,6 +97,28 @@ ...@@ -97,6 +97,28 @@
97 </view> 97 </view>
98 </view> 98 </view>
99 </view> 99 </view>
100 <view class="border active ">
101 <view bindtap="onAuctionHandler" data-index="0" class="active-item">
102 <view class="icon-wrap">
103 <span class="iconfont iconpaimai icon"></span>
104 </view>
105 <view class="txt">拍卖</view>
106 </view>
107 <view bindtap="onSeckillHandler" data-index="1" class="active-item">
108 <view class="icon-wrap">
109 <span class="iconfont iconmiaosha icon"></span>
110 </view>
111 <view class="txt">秒杀</view>
112 </view>
113 <view data-index="2" class="active-item">
114 <view class="icon-wrap"></view>
115 <view class="txt"></view>
116 </view>
117 <view data-index="3" class="active-item">
118 <view class="icon-wrap"></view>
119 <view class="txt"></view>
120 </view>
121 </view>
100 </view> 122 </view>
101 </view> 123 </view>
102 </view> 124 </view>
......
...@@ -428,9 +428,9 @@ Page({ ...@@ -428,9 +428,9 @@ Page({
428 428
429 429
430 hideMask() { 430 hideMask() {
431 // this.setData({ 431 this.setData({
432 // productDetailVisible: false 432 authorizeVisible: false
433 // }) 433 })
434 }, 434 },
435 // 子组件事件 435 // 子组件事件
436 evtcomp(evt) { 436 evtcomp(evt) {
...@@ -441,6 +441,7 @@ Page({ ...@@ -441,6 +441,7 @@ Page({
441 switch (name) { 441 switch (name) {
442 442
443 case "_evt_hide_mask": 443 case "_evt_hide_mask":
444 this.hideMask();
444 break; 445 break;
445 446
446 default: 447 default:
......