Commit 68b01da91442fafce48d822c0dfb677120b7fab5
1 parent
d29e7e00
购物车修改使用优惠券, 修改秒杀的分享
Showing
4 changed files
with
39 additions
and
16 deletions
images/share/miao_share.png
0 → 100644
14 KB
pages/cart/cart2/cart2.js
@@ -940,15 +940,19 @@ Page({ | @@ -940,15 +940,19 @@ Page({ | ||
940 | a.post("/api/weshop/order/pay/createOrder", { | 940 | a.post("/api/weshop/order/pay/createOrder", { |
941 | data: dd, | 941 | data: dd, |
942 | success: function (t) { | 942 | success: function (t) { |
943 | - console.log(t); | ||
944 | - //app.showWarning("支付成功"); | ||
945 | - app.my_warnning("支付成功",1,th); | ||
946 | - setTimeout(function () { | ||
947 | - th.setData({ isclose: 0 }); | ||
948 | - wx.navigateTo({ | ||
949 | - url: "/pages/user/order_list/order_list" | ||
950 | - }) | ||
951 | - }, 1000) | 943 | + //console.log(t); |
944 | + if(t.data.code==0){ | ||
945 | + app.my_warnning("支付成功",1,th); | ||
946 | + setTimeout(function () { | ||
947 | + th.setData({ isclose: 0 }); | ||
948 | + wx.navigateTo({ | ||
949 | + url: "/pages/user/order_list/order_list" | ||
950 | + }) | ||
951 | + }, 1000) | ||
952 | + } | ||
953 | + }, | ||
954 | + fail:function () { | ||
955 | + | ||
952 | } | 956 | } |
953 | }); | 957 | }); |
954 | } | 958 | } |
pages/cart/cart2/cart2.wxss
@@ -279,7 +279,7 @@ | @@ -279,7 +279,7 @@ | ||
279 | border-bottom:1px solid #ddd; | 279 | border-bottom:1px solid #ddd; |
280 | } | 280 | } |
281 | .xc-coupon-frame .work-frame{ | 281 | .xc-coupon-frame .work-frame{ |
282 | - width: 92%; | 282 | + width: 94%; |
283 | height: 100%; | 283 | height: 100%; |
284 | 284 | ||
285 | } | 285 | } |
@@ -294,7 +294,7 @@ | @@ -294,7 +294,7 @@ | ||
294 | } | 294 | } |
295 | 295 | ||
296 | .xc-coupon-frame .work-frame .work{ font-size: 30rpx; line-height: 92rpx; color: #d81e06;} | 296 | .xc-coupon-frame .work-frame .work{ font-size: 30rpx; line-height: 92rpx; color: #d81e06;} |
297 | -.xc-right-frame{font-size: 30rpx;line-height: 92rpx; } | 297 | +.xc-right-frame{font-size: 30rpx;line-height: 92rpx; margin-right: 10rpx } |
298 | 298 | ||
299 | /* 自定义弹出窗口 */ | 299 | /* 自定义弹出窗口 */ |
300 | .cx-popup{ | 300 | .cx-popup{ |
@@ -345,7 +345,6 @@ | @@ -345,7 +345,6 @@ | ||
345 | .xc-close-frame{ | 345 | .xc-close-frame{ |
346 | margin-top:10rpx; | 346 | margin-top:10rpx; |
347 | width:1%; | 347 | width:1%; |
348 | - display:flex; | ||
349 | } | 348 | } |
350 | 349 | ||
351 | .xc-close{ | 350 | .xc-close{ |
@@ -354,8 +353,9 @@ height: 46rpx; | @@ -354,8 +353,9 @@ height: 46rpx; | ||
354 | border-radius: 50%; | 353 | border-radius: 50%; |
355 | border: 5rpx solid #a5a5a7; | 354 | border: 5rpx solid #a5a5a7; |
356 | text-align: center; | 355 | text-align: center; |
357 | -line-height: 33rpx; | ||
358 | -font-size: 64rpx; | 356 | +line-height: 46rpx; |
357 | +font-size: 34rpx; | ||
358 | +font-weight: bolder; | ||
359 | color: #a5a5a7; | 359 | color: #a5a5a7; |
360 | margin-top: 5rpx; | 360 | margin-top: 5rpx; |
361 | 361 |
pages/goods/goodsInfo/goodsInfo.js
@@ -144,7 +144,7 @@ Page({ | @@ -144,7 +144,7 @@ Page({ | ||
144 | pd_xx: 0, | 144 | pd_xx: 0, |
145 | is_normal: 0, //是否普通购买 | 145 | is_normal: 0, //是否普通购买 |
146 | teamgroup:null, //有多少人开团 | 146 | teamgroup:null, //有多少人开团 |
147 | - grounp_tatal:0, //有几个人开团 | 147 | + grounp_tatal:0, //有几个人开团 |
148 | timer:[], | 148 | timer:[], |
149 | 149 | ||
150 | //商品的购买次数 | 150 | //商品的购买次数 |
@@ -2282,7 +2282,6 @@ Page({ | @@ -2282,7 +2282,6 @@ Page({ | ||
2282 | //-------大图后面就不一样了----------- | 2282 | //-------大图后面就不一样了----------- |
2283 | switch (type) { | 2283 | switch (type) { |
2284 | case 0: //普通商品的展示 | 2284 | case 0: //普通商品的展示 |
2285 | - case 1: //秒杀商品的展示 | ||
2286 | //中间的几个字 | 2285 | //中间的几个字 |
2287 | var g_path = "../../../images/share/s_gou.png"; | 2286 | var g_path = "../../../images/share/s_gou.png"; |
2288 | context.drawImage(g_path, 56 * unit, 670 * unit, 22 * unit, 22 * unit); | 2287 | context.drawImage(g_path, 56 * unit, 670 * unit, 22 * unit, 22 * unit); |
@@ -2312,6 +2311,26 @@ Page({ | @@ -2312,6 +2311,26 @@ Page({ | ||
2312 | //---二维吗图--- | 2311 | //---二维吗图--- |
2313 | context.drawImage(vpath, 380 * unit, 736 * unit, 120 * unit, 120 * unit); | 2312 | context.drawImage(vpath, 380 * unit, 736 * unit, 120 * unit, 120 * unit); |
2314 | break; | 2313 | break; |
2314 | + case 1: //秒杀商品的展示 | ||
2315 | + //---画线--- | ||
2316 | + context.setLineWidth(1 * unit) | ||
2317 | + context.moveTo(32 * unit, 670 * unit) | ||
2318 | + context.lineTo(520 * unit, 670 * unit) | ||
2319 | + context.stroke(); | ||
2320 | + | ||
2321 | + //画秒杀的图片 | ||
2322 | + var miaos_path='../../../images/share/miao_share.png'; | ||
2323 | + context.drawImage(miaos_path, 43 * unit, 700 * unit, 222 * unit, 40 * unit); | ||
2324 | + | ||
2325 | + //---文字--- | ||
2326 | + context.setFontSize(22 * unit) | ||
2327 | + context.setFillStyle("black") | ||
2328 | + context.fillText("特惠好物,限时秒杀", 40 * unit, 806 * unit); | ||
2329 | + context.fillText("长按识别二维码,立即开始抢购", 40 * unit, 846 * unit); | ||
2330 | + //---二维吗图--- | ||
2331 | + context.drawImage(vpath, 380 * unit, 736 * unit, 120 * unit, 120 * unit); | ||
2332 | + break; | ||
2333 | + | ||
2315 | case 2://会员团和商家团的展示 | 2334 | case 2://会员团和商家团的展示 |
2316 | //---画线--- | 2335 | //---画线--- |
2317 | context.setLineWidth(1 * unit) | 2336 | context.setLineWidth(1 * unit) |