Skip to content

dev / zhiliang-light-mp

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

默认提交

1 parent 79e0d49a
Inline Side-by-side
Showing 11 changed files with 48 additions and 15 deletions
...@@ -45,7 +45,7 @@ Component({ ...@@ -45,7 +45,7 @@ Component({
45 // 点击自定义按钮 45 // 点击自定义按钮
46 onInnerButtonHandler() { 46 onInnerButtonHandler() {
47 this.triggerEvent('evtcomp', { 47 this.triggerEvent('evtcomp', {
48 name: "_evt_common_comp_button", 48 name: "_evt_order_submit_success",
49 data: { 49 data: {
50 cid: this.properties.cid, 50 cid: this.properties.cid,
51 innerTitle: this.properties.innerTitle, 51 innerTitle: this.properties.innerTitle,
......
...@@ -56,7 +56,10 @@ Component({ ...@@ -56,7 +56,10 @@ Component({
56 }) 56 })
57 }, 57 },
58 onStepperChange(e) { 58 onStepperChange(e) {
59 this.setNum(e.detail); 59 let val = e.detail;
60 if(val > this.properties.productInfo.maxNum) val = this.properties.productInfo.maxNum;
61 if(val < this.properties.productInfo.minNum) val = this.properties.productInfo.minNum;
62 this.setNum(val);
60 }, 63 },
61 bindRemarkInput(e) { 64 bindRemarkInput(e) {
62 this.setData({ 65 this.setData({
......
...@@ -243,23 +243,29 @@ $contentWidth:690px; ...@@ -243,23 +243,29 @@ $contentWidth:690px;
243 margin-top: 32px; 243 margin-top: 32px;
244 } 244 }
245 245
246 .empty-tips{ 246 .empty-tips {
247 text-align: center; 247 text-align: center;
248 padding: 60px 0; 248 padding: 60px 0;
249 color: #666666; 249 color: #666666;
250 } 250 }
251 } 251 }
252 } 252 }
253 }
253 254
254 255 // 我的出价
256 .my-price {
257 margin: 72px auto 12px;
258 text-align: center;
259 font-size: 24px;
255 } 260 }
256 261
257 // 提交按钮 262 // 提交按钮
258 .submit-btn { 263 .submit-btn {
259 @include cb(560px, 84px); 264 @include cb(560px, 84px);
260 @extend .linear; 265 @extend .linear;
261 margin: 72px auto 0; 266 margin: 0 auto 0;
262 } 267 }
268
263 } 269 }
264 } 270 }
265 271
......
...@@ -77,6 +77,7 @@ ...@@ -77,6 +77,7 @@
77 </view> 77 </view>
78 </view> 78 </view>
79 </view> 79 </view>
80 <view class="price my-price">我的出价：￥{{filter.Fen2Yuan(productInfo.personLastPrice)}}</view>
80 <!-- 按钮 --> 81 <!-- 按钮 -->
81 <view bindtap="onSubmitHandler" class="submit-btn {{productInfo.status != 1 || isTimeEnd ? 'disable' : ''}}"> 82 <view bindtap="onSubmitHandler" class="submit-btn {{productInfo.status != 1 || isTimeEnd ? 'disable' : ''}}">
82 我要出价 83 我要出价
......
...@@ -60,16 +60,16 @@ $contentWidth:690px; ...@@ -60,16 +60,16 @@ $contentWidth:690px;
60 position: relative; 60 position: relative;
61 height: 100%; 61 height: 100%;
62 flex: 1; 62 flex: 1;
63 // padding-right: 8px; 63 padding-right: 12px;
64 @extend .bb; 64 @extend .bb;
65 align-self: flex-start; 65 align-self: flex-start;
66 height: 160px; 66 // height: 160px;
67 67
68 .up {} 68 .up {}
69 69
70 .down { 70 .down {
71 position: absolute; 71 // position: absolute;
72 bottom: 0; 72 // bottom: 0;
73 } 73 }
74 74
75 .tt { 75 .tt {
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
19 <view class="tt t1">{{item.auctionName}}</view> 19 <view class="tt t1">{{item.auctionName}}</view>
20 </view> 20 </view>
21 <view class="down"> 21 <view class="down">
22 <view class="tt t2 t3">适用群体：{{item.memberTypeLimitStr}}</view>
22 <view class="tt t2 t3">活动区域：{{item.district}}</view> 23 <view class="tt t2 t3">活动区域：{{item.district}}</view>
23 <view class="tt t3">{{item.dateStr}}</view> 24 <view class="tt t3">{{item.dateStr}}</view>
24 </view> 25 </view>
......
...@@ -206,6 +206,14 @@ Page({ ...@@ -206,6 +206,14 @@ Page({
206 break; 206 break;
207 } 207 }
208 208
209 // 兑换成功
210 case "_evt_order_submit_success":
211 app.router.push({
212 path:"giftShop",
213 openType:"switchTab"
214 })
215 break;
216
209 break; 217 break;
210 218
211 default: 219 default:
......
...@@ -51,11 +51,13 @@ $contentWidth:690px; ...@@ -51,11 +51,13 @@ $contentWidth:690px;
51 background: #F8F8F8; 51 background: #F8F8F8;
52 border-radius: 8px; 52 border-radius: 8px;
53 color: #3680EB; 53 color: #3680EB;
54 font-size: 30px;
54 } 55 }
55 56
56 // 删除 57 // 删除
57 .t2 { 58 .t2 {
58 color: #E62435; 59 color: #E62435;
60 font-size: 30px;
59 } 61 }
60 62
61 .no { 63 .no {
......
...@@ -18,8 +18,12 @@ Page({ ...@@ -18,8 +18,12 @@ Page({
18 authorizeVisible: true 18 authorizeVisible: true
19 }) 19 })
20 }, 20 },
21 onShow() {
22 wx.setNavigationBarTitle({
23 title: '积分获取'
24 })
25 },
21 onLoad(options) { 26 onLoad(options) {
22
23 // 手输码 27 // 手输码
24 let code = options.code || ""; 28 let code = options.code || "";
25 if (code) { 29 if (code) {
...@@ -27,7 +31,6 @@ Page({ ...@@ -27,7 +31,6 @@ Page({
27 code: code 31 code: code
28 }) 32 })
29 } 33 }
30
31 this.initData(); 34 this.initData();
32 }, 35 },
33 36
...@@ -72,6 +75,9 @@ Page({ ...@@ -72,6 +75,9 @@ Page({
72 this.setData({ 75 this.setData({
73 scaning: true, 76 scaning: true,
74 }) 77 })
78 wx.setNavigationBarTitle({
79 title: '积分获取'
80 })
75 app.post({ 81 app.post({
76 url: app.api.scanIntegralQrcode, 82 url: app.api.scanIntegralQrcode,
77 data: { 83 data: {
...@@ -87,6 +93,10 @@ Page({ ...@@ -87,6 +93,10 @@ Page({
87 wx.setNavigationBarTitle({ 93 wx.setNavigationBarTitle({
88 title: '积分获取失败' 94 title: '积分获取失败'
89 }) 95 })
96 } else {
97 wx.setNavigationBarTitle({
98 title: '积分获取成功'
99 })
90 } 100 }
91 }).catch((err) => { 101 }).catch((err) => {
92 wx.hideLoading(); 102 wx.hideLoading();
......
...@@ -60,16 +60,17 @@ $contentWidth:690px; ...@@ -60,16 +60,17 @@ $contentWidth:690px;
60 position: relative; 60 position: relative;
61 height: 100%; 61 height: 100%;
62 flex: 1; 62 flex: 1;
63 // padding-right: 8px; 63 padding-right: 12px;
64 @extend .bb; 64 @extend .bb;
65 align-self: flex-start; 65 align-self: flex-start;
66 height: 160px; 66 // height: 160px;
67
67 68
68 .up {} 69 .up {}
69 70
70 .down { 71 .down {
71 position: absolute; 72 // position: absolute;
72 bottom: 0; 73 // bottom: 0;
73 } 74 }
74 75
75 .tt { 76 .tt {
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
19 <view class="tt t1">{{item.seckillName}}</view> 19 <view class="tt t1">{{item.seckillName}}</view>
20 </view> 20 </view>
21 <view class="down"> 21 <view class="down">
22 <view class="tt t2 t3">适用群体：{{item.memberTypeLimitStr}}</view>
22 <view class="tt t2 t3">活动区域：{{item.district}}</view> 23 <view class="tt t2 t3">活动区域：{{item.district}}</view>
23 <view class="tt t3">{{item.dateStr}}</view> 24 <view class="tt t3">{{item.dateStr}}</view>
24 </view> 25 </view>
......