wxd / MShopWeApp

Merged
Merge Request #686 · created by 后端研发-苏明海

Test

From test into qa

Merged by 后端研发-苏明海

1 participants
Inline Side-by-side
Showing 16 changed files
app.wxss
  Edit  View file @a620c3e
... ... @@ -16,6 +16,12 @@
16 16 .pdt20 {
17 17 padding-top: 20rpx;
18 18 }
  19 +.pdt30 {
  20 + padding-top: 30rpx;
  21 +}
  22 +.pdt40 {
  23 + padding-top: 40rpx;
  24 +}
19 25 .pdb0 {
20 26 padding-bottom: 0 !important;
21 27 }
... ... @@ -299,10 +305,18 @@ button {
299 305 .t-c {
300 306 text-align: center;
301 307 }
  308 +.img-block {
  309 + width: 100%;
  310 + height: 100%;
  311 + display: block;
  312 +}
302 313  
303 314 .ai_and{
304 315 align-items: flex-end;
305 316 }
  317 +.ai_end{
  318 + align-items: flex-end;
  319 +}
306 320 .cover-layer {
307 321 position: fixed;
308 322 left: 0;
... ... @@ -613,7 +627,7 @@ background: #ffe3e2;
613 627 font-size: 22rpx;
614 628 }
615 629 .fs24{
616   - font-size: 24rpx;
  630 + font-size: 24rpx !important;
617 631 }
618 632  
619 633 .fs26{
... ... @@ -652,12 +666,12 @@ background: #ffe3e2;
652 666 align-items: flex-end;
653 667 }
654 668 .fs45{
655   - font-size: 45rpx;
  669 + font-size: 45rpx !important;
656 670 }
657 671 .fs50{
658   - font-size: 50rpx;
  672 + font-size: 50rpx !important;
659 673 }
660   -.fs60{ font-size:60rpx;}
  674 +.fs60{ font-size:60rpx !important;}
661 675 .fs80 {font-size: 80rpx;}
662 676 .flex-wrap,
663 677 .wrap {
... ... @@ -689,9 +703,9 @@ background: #ffe3e2;
689 703 /* 图标字体(ty) */
690 704 @font-face {
691 705 font-family: 'iconfont'; /* Project id 2054717 */
692   - src: url('//at.alicdn.com/t/font_2054717_l5nx11noek8.woff2?t=1626055955086') format('woff2'),
693   - url('//at.alicdn.com/t/font_2054717_l5nx11noek8.woff?t=1626055955086') format('woff'),
694   - url('//at.alicdn.com/t/font_2054717_l5nx11noek8.ttf?t=1626055955086') format('truetype');
  706 + src: url('//at.alicdn.com/t/font_2054717_nzwl8grylfi.woff2?t=1627287108388') format('woff2'),
  707 + url('//at.alicdn.com/t/font_2054717_nzwl8grylfi.woff?t=1627287108388') format('woff'),
  708 + url('//at.alicdn.com/t/font_2054717_nzwl8grylfi.ttf?t=1627287108388') format('truetype');
695 709 }
696 710  
697 711 .iconfont {
... ... @@ -702,6 +716,20 @@ background: #ffe3e2;
702 716 -moz-osx-font-smoothing: grayscale;
703 717 }
704 718  
  719 +.icon-guan:before {
  720 + content: "\e612";
  721 +}
  722 +
  723 +.icon-gouwuche:before {
  724 + content: "\e617";
  725 +}
  726 +
  727 +.icon-zhuanfa:before {
  728 + content: "\e611";
  729 +}
  730 +
  731 +
  732 +
705 733 .icon-zhuanpan:before {
706 734 content: "\e642";
707 735 }
... ...
packageB/pages/luckactivity/index/g_filter.wxs
  Edit  View file @a620c3e
... ... @@ -20,10 +20,27 @@ var g_filters = {
20 20 var tnow=getDate();
21 21 if(t1>=tnow) return 1;
22 22 return 0;
23   - }
  23 + },
  24 + btnText: function(userlbtype) {
  25 + switch(userlbtype) {
  26 + case 1: {
  27 + return '去兑换';
  28 + };
  29 + case 2: {
  30 + return '已兑换';
  31 + };
  32 + case 3: {
  33 + return '已到期';
  34 + };
  35 + case 4: {
  36 + return '查看';
  37 + };
  38 + };
  39 + },
24 40 }
25 41 module.exports = {
26 42 has_char: g_filters.has_char,
27 43 beg_time: g_filters.beg_time,
28 44 end_time: g_filters.end_time,
  45 + btnText: g_filters.btnText,
29 46 }
30 47 \ No newline at end of file
... ...
packageB/pages/luckactivity/index/index.js
  Edit  View file @a620c3e
... ... @@ -23,6 +23,7 @@ Page({
23 23 let url = '/api/weshop/marketing/marketingLuckForm/page';
24 24 let data = {
25 25 store_id: app.globalData.setting.stoid,
  26 + user_id: app.globalData.userInfo.user_id,
26 27 };
27 28  
28 29 this.setData({
... ... @@ -79,6 +80,7 @@ Page({
79 80 let url = '/api/weshop/marketing/marketingLuckForm/page';
80 81 let data = {
81 82 store_id: app.globalData.setting.stoid,
  83 + user_id: app.globalData.userInfo.user_id,
82 84 is_end: 0,
83 85 };
84 86  
... ...
packageB/pages/luckactivity/index/index.wxml
  Edit  View file @a620c3e
... ... @@ -19,11 +19,14 @@
19 19  
20 20 <block wx:for="{{list.pageData}}">
21 21 <view class="tab-item" bindtap="goto" data-id="{{item.id}}" data-title="{{item.act_name}}">
22   - <text class="iconfont icon-zhuanpan"></text>
  22 + <view class="img-container">
  23 + <image wx:if="{{item.imageurl}}" src="{{item.imageurl}}" class="img"></image>
  24 + <text class="iconfont icon-zhuanpan" wx:else></text>
  25 + </view>
23 26 <view class="desc-container">
24 27 <view class="">
25 28 <!-- 标题 -->
26   - <view class="ellipsis-1x taj">{{item.act_name}}</view>
  29 + <view class="ellipsis-1x taj fs28">{{item.act_name}}</view>
27 30 <!-- 时间 -->
28 31 <view class="date pdt10 pdb20" wx:if="{{currentIndex == 0}}">活动时间：{{filter.format_time(item.begindate) + ' 至 ' + filter.format_time(item.enddate)}}</view>
29 32 <view class="date pdt10 pdb20" wx:else>兑换时间：{{filter.format_time(item.begindate) + ' 至 ' + filter.format_time(item.enddate)}}</view>
... ... @@ -31,7 +34,7 @@
31 34 <!-- 按钮 -->
32 35 <view class="btn-container">
33 36 <view class="btn red" wx:if="{{currentIndex == 0}}">立即参与</view>
34   - <view class="btn red" wx:else>去兑换</view>
  37 + <view class="btn {{item.userlbtype == 1 ? 'red':'gray'}}" wx:else>{{g_filter.btnText(item.userlbtype)}}</view>
35 38 </view>
36 39 </view>
37 40 </view>
... ...
packageB/pages/luckactivity/index/index.wxss
  Edit  View file @a620c3e
... ... @@ -104,25 +104,28 @@ page {
104 104 .img-container {
105 105 /* background-color: #dedede; */
106 106 /* height: 300rpx; */
107   - width: 100%;
108   - height: 200rpx;
  107 + width: 160rpx;
  108 + height: 160rpx;
  109 + line-height: 160rpx;
  110 + text-align: center;
109 111 }
110 112  
111 113 .img-container2 {
112   - width: 200rpx;
  114 + /* width: 200rpx;
113 115 height: 200rpx;
114 116 background-color: #dedede;
115 117 margin-right: 20rpx;
116 118 flex-shrink: 0;
117 119 display: flex;
118 120 align-items: center;
119   - position: relative;
  121 + justify-content: center;
  122 + position: relative; */
120 123 }
121 124  
122 125 .img-container2.error::before {
123   - font-family: iconfont;
  126 + /* font-family: iconfont;
124 127 position: absolute;
125   - content: '\e8c1';
  128 + content: '\e8c1'; */
126 129 }
127 130  
128 131 .img {
... ... @@ -178,4 +181,9 @@ page {
178 181 color: #bbb;
179 182 text-align: center;
180 183 font-size: 22rpx;
  184 +}
  185 +
  186 +.btn.gray {
  187 + background-color: #aaa;
  188 + color: white;
181 189 }
182 190 \ No newline at end of file
... ...
packageB/pages/luckactivity/luckinfo/luckinfo.js
  Edit  View file @a620c3e
  1 +var WxParse = require('../../../../utils/wxParse/wxParse.js');
1 2 const app = getApp();
2 3 let imghost = app.globalData.setting.imghost;
3 4 let self = null;
... ... @@ -10,6 +11,7 @@ Page({
10 11 noMore: false, // 检测是否有更多数据,true为没有更多数据,false为还有数据
11 12 pageNum: 1, // 当前页数
12 13 imghost: imghost,
  14 + num: 3,
13 15  
14 16 prizes: [],
15 17 defaultConfig: {
... ... @@ -55,14 +57,14 @@ Page({
55 57 },
56 58  
57 59 onLoad(options) {
58   - console.log('imghost+++++', imghost);
  60 + // console.log('imghost+++++', imghost);
59 61 self = this;
60 62 this.data.options = options;
61 63 // this.setData({
62 64 // options,
63 65 // imghost,
64 66 // });
65   - console.log('this data', this.data.imghost);
  67 + // console.log('this data', this.data.imghost);
66 68 wx.setNavigationBarTitle({
67 69 title: options.title,
68 70 });
... ... @@ -96,6 +98,7 @@ Page({
96 98 self.setData({
97 99 luckInfo: res.data.data,
98 100 });
  101 + WxParse.wxParse('content', 'html', self.data.luckInfo.remark, self);
99 102 } else {
100 103 wx.showToast({
101 104 title: res.data.msg,
... ... @@ -195,7 +198,17 @@ Page({
195 198 // 设置转盘奖品布局
196 199 prizeLayout(award) {
197 200 let prizes = [];
198   - let length = award.length;
  201 + // let length = award.length;
  202 + if(award) {
  203 + var length = award.length;
  204 + } else {
  205 + wx.showToast({
  206 + title: '请设置奖品',
  207 + icon: 'none',
  208 + });
  209 + return;
  210 + };
  211 +
199 212 let thx = {fonts: [{ text: '谢谢\n参与', top: '18%', wordWrap:false, fontColor: 'rgba(255,255,255,.6)'}]};
200 213  
201 214 if(length == 1) {
... ... @@ -441,7 +454,7 @@ Page({
441 454 results.push(pos);//找到就存储索引
442 455  
443 456 };
444   - pos+=1;//并从下个位置开始搜索
  457 + pos += 1;//并从下个位置开始搜索
445 458 // if(pos === -1){//未找到就退出循环完成搜索
446 459 // break;
447 460 // };
... ... @@ -462,7 +475,15 @@ Page({
462 475 return;
463 476 };
464 477  
465   - if(this.data.luckInfo.user_LuckNumDay != 0) {
  478 + if(this.data.luckInfo.msgInfo) {
  479 + wx.showToast({
  480 + title: this.data.luckInfo.msgInfo,
  481 + icon: 'none',
  482 + });
  483 + return;
  484 + };
  485 +
  486 + if(this.data.luckInfo.user_LuckNumDay > 0 || this.data.luckInfo.vip_act_num == 0) {
466 487 // console.log('start choujiang');
467 488 // let start = false;
468 489 if(!this.data.start) {
... ... @@ -484,8 +505,16 @@ Page({
484 505  
485 506 if(res.data.code == 0) {
486 507 console.log('开始摇奖', res.data.data);
  508 + if(self.data.luckInfo.vip_act_num != 0) {
  509 + self.setData({
  510 + 'luckInfo.user_LuckNumDay': self.data.luckInfo.user_LuckNumDay - 1,
  511 + // isActive: true,
  512 + });
  513 + };
  514 +
487 515 self.setData({
488   - 'luckInfo.user_LuckNumDay': self.data.luckInfo.user_LuckNumDay - 1
  516 + // 'luckInfo.user_LuckNumDay': self.data.luckInfo.user_LuckNumDay - 1,
  517 + isActive: true,
489 518 });
490 519 // console.log('请求成功', res.data.data);
491 520 let luckyId = res.data.data.id;
... ... @@ -502,8 +531,34 @@ Page({
502 531 }, 3000);
503 532  
504 533  
  534 + //获取兑奖记录
  535 + // app.request.get('/api/weshop/marketing/marketingLuckRecord/page', {
  536 + // isShowLoading: false,
  537 + // data: {
  538 + // store_id: app.globalData.setting.stoid,
  539 + // user_id: app.globalData.userInfo.user_id,
  540 + // luck_formid: self.data.options.id,
  541 + // luck_state: 1
  542 + // },
  543 + // success: function(res) {
  544 + // if(res.data.code == 0) {
  545 + // // console.log('res===>', res.data.data.pageData);
  546 + // self.setData({
  547 + // record: res.data.data.pageData,
  548 + // });
  549 + // };
  550 + // },
  551 + // });
  552 +
  553 +
505 554 } else {
506 555 // console.log('请求出错');
  556 + if(self.data.luckInfo.vip_act_num != 0) {
  557 + self.setData({
  558 + 'luckInfo.user_LuckNumDay': self.data.luckInfo.user_LuckNumDay - 1,
  559 + });
  560 + };
  561 +
507 562 let thxIndexArr = self.data.thxIndexArr;
508 563 const random = Math.random() * thxIndexArr.length >> 0;
509 564 const index = thxIndexArr[random];
... ... @@ -516,8 +571,12 @@ Page({
516 571 };
517 572 },
518 573  
519   - fail: function() {
  574 + fail: function(res) {
520 575 // console.log('出错');
  576 + wx.showToast({
  577 + title: '数据请求失败',
  578 + icon: 'error',
  579 + });
521 580 let thxIndexArr = self.data.thxIndexArr;
522 581 const random = Math.random() * thxIndexArr.length >> 0;
523 582 const index = thxIndexArr[random];
... ... @@ -543,6 +602,7 @@ Page({
543 602 end (event) {
544 603 // 中奖奖品详情
545 604 // console.log('zjiangla~~',event.detail.lbtype);
  605 + let no_luck_urltype = this.data.luckInfo.no_luck_urltype;
546 606 let lbtype;
547 607 let resultTitle = event.detail.fonts[0].text.replace('\n','');
548 608 if(event.detail.lbtype == 5) {
... ... @@ -551,12 +611,45 @@ Page({
551 611 lbtype = -1;
552 612 };
553 613 this.setData({
  614 + num: 3,
554 615 hiddenCanvas: true,
555 616 showResult: true,
556 617 showMask: true,
557 618 resultTitle,
558 619 currentLbtype: lbtype,
559 620 });
  621 +
  622 + let num = this.data.num;
  623 + let timer = setInterval(function() {
  624 + if(num == 0) {
  625 + clearInterval();
  626 + } else {
  627 + self.setData({
  628 + num: --num,
  629 + });
  630 + }
  631 + }, 1000);
  632 +
  633 +
  634 + if(no_luck_urltype == 1) {
  635 + if(this.data.luckInfo.no_luck_weappurl) {
  636 + // console.log('dfjsoafjoasfjds======>',this.data.luckInfo.no_luck_weappurl);
  637 + let num = this.data.num;
  638 + let url = this.data.luckInfo.no_luck_weappurl;
  639 + self.timer = setInterval(function() {
  640 + if(num == 0) {
  641 + clearInterval();
  642 + app.goto(url);
  643 + } else {
  644 + self.setData({
  645 + num: --num,
  646 + });
  647 + }
  648 + }, 1000);
  649 +
  650 + };
  651 + };
  652 +
560 653 },
561 654  
562 655 showPopup() {
... ... @@ -570,39 +663,23 @@ Page({
570 663 user_id: app.globalData.userInfo.user_id,
571 664 luck_formid: this.data.options.id,
572 665 luck_state: 1,
573   - pageSize: 50,
574 666 }).then(function(res) {
575 667 self.setData({
576 668 showPopup: true,
577 669 showMask: true,
578 670 hiddenCanvas: true,
579   - // record: self.data.list.pageData,
580 671 });
581 672 });
582   - // app.request.get('/api/weshop/marketing/marketingLuckRecord/page', {
583   - // // isShowLoading: false,
584   - // data: {
585   - // store_id: app.globalData.setting.stoid,
586   - // user_id: app.globalData.userInfo.user_id,
587   - // luck_formid: this.data.options.id,
588   - // luck_state: 1
589   - // },
590   - // success: function(res) {
591   - // // console.log('中奖记录', res.data.data);
592   - // if(res.data.code == 0) {
593   - // self.setData({
594   - // showPopup: true,
595   - // showMask: true,
596   - // hiddenCanvas: true,
597   - // record: self.data.list.pageData,
598   - // });
599   -
600   -
601   - // };
602   - // },
603   -
  673 +
  674 + // this.setData({
  675 + // showPopup: true,
  676 + // showMask: true,
  677 + // hiddenCanvas: true,
  678 + // 'list.pageData': this.data.record,
  679 + // // record: self.data.list.pageData,
604 680 // });
605 681  
  682 +
606 683 },
607 684  
608 685 closePopup() {
... ... @@ -613,8 +690,13 @@ Page({
613 690 });
614 691 },
615 692  
  693 + /**
  694 + * 关闭中奖结果
  695 + */
616 696 closeResult() {
  697 + clearInterval(this.timer);
617 698 this.setData({
  699 + num: 3,
618 700 showResult: false,
619 701 showMask: false,
620 702 hiddenCanvas: false,
... ... @@ -627,7 +709,6 @@ Page({
627 709 user_id: app.globalData.userInfo.user_id,
628 710 luck_formid: this.data.options.id,
629 711 luck_state: 1,
630   - pageSize: 50,
631 712 });
632 713 },
633 714  
... ...
packageB/pages/luckactivity/luckinfo/luckinfo.wxml
  Edit  View file @a620c3e
... ... @@ -36,27 +36,27 @@
36 36 hiddenCanvas="{{hiddenCanvas}}"
37 37 />
38 38 </view>
39   -
40   - <view class="fs28 white t-c pdt10">今天你还有 <text class="fs50 c-yellow">{{filter.show_default(luckInfo.user_LuckNumDay, '0')}}</text> 次抽奖机会</view>
  39 + <view class="fs28 white t-c pdt10" wx:if="{{luckInfo.vip_act_num == 0}}">今天你有 <text class="fs50 c-yellow">不限次</text> 抽奖机会</view>
  40 + <view class="fs28 white t-c pdt10" wx:else>今天你还有 <text class="fs50 c-yellow">{{filter.show_default(luckInfo.user_LuckNumDay, '0')}}</text> 次抽奖机会</view>
41 41 <view class="tip-to-down expand-transition">
42 42 <text></text>
43 43 <text></text>
44 44 </view>
45 45 </view>
46 46 <!-- 奖品展示 -->
47   - <view>
  47 + <view wx:if="{{award}}">
48 48 <view class="badge-container"><image src="{{imghost + 'miniapp/images/luckDraw/badge.png'}}" class="badge prizes" lazy-load></image></view>
49 49 <view class="list br12 bg-white">
50 50 <view class="list-item" wx:for="{{award}}">
51 51 <view class="img-container">
52   - <image wx:if="{{item.luck_goods_img}}" src="{{item.luck_goods_img}}" class="img" mode="aspectFit"></image>
  52 + <image wx:if="{{item.luck_goods_img}}" src="{{imghost + item.luck_goods_img}}" class="img" mode="aspectFit"></image>
53 53 <image src="{{imghost + tool.showDefaultImg(item.lbtype)}}" class="img" mode="aspectFit" wx:else></image>
54 54 </view>
55 55 <view class="item-r">
56 56 <view class="fs28">{{item.luck_goods_name}}</view>
57 57 <view class="flex jc_sb fs26 c9">
58 58 <view>价值：<text class="rmb">{{item.luck_goods_price}}</text></view>
59   - <view>数量：{{item.luck_goods_qty}}</view>
  59 + <view>数量：{{item.num}}</view>
60 60 </view>
61 61 </view>
62 62 </view>
... ... @@ -65,8 +65,10 @@
65 65 <!-- 活动展示 -->
66 66 <view wx:if="{{luckInfo.remark}}">
67 67 <view class="badge-container"><image src="{{imghost + 'miniapp/images/luckDraw/badge.png'}}" class="badge activity" lazy-load></image></view>
68   - <view class="bg-white br12 pd20">
69   - {{luckInfo.remark}}
  68 + <view class="bg-white br12 pd20 fs28">
  69 + <!-- {{luckInfo.remark}} -->
  70 + <import src="../../../../utils/wxParse/wxParse.wxml"/>
  71 + <template is="wxParse" data="{{wxParseData:content.nodes}}"/>
70 72 <!-- 时间 -->
71 73 <!-- <view class="bdb">
72 74 <view class="">
... ... @@ -126,23 +128,24 @@
126 128 </view>
127 129  
128 130 <!-- 悬浮按钮 -->
129   -<view class="gift-container {{record && record.length != 0 ? 'active':''}}" bindtap="showPopup"><text class="iconfont icon-liwu"></text></view>
  131 +<view class="gift-container {{((record && record.length != 0) || isActive) ? 'active':''}}" bindtap="showPopup"><text class="iconfont icon-liwu"></text></view>
130 132  
131 133 <!-- 弹窗 -->
132 134 <view class="popup-container" wx:if="{{showPopup}}">
133 135 <scroll-view class="popup-list" scroll-y bindscrolltolower="loadmore">
134 136 <view class="popup-item" wx:for="{{list.pageData}}">
135 137 <view class="img-container">
136   - <image wx:if="{{item.luck_goods_img}}" src="{{item.luck_goods_img}}" class="img" mode="aspectFit"></image>
  138 + <image wx:if="{{item.luck_goods_img}}" src="{{imghost + item.luck_goods_img}}" class="img" mode="aspectFit"></image>
137 139 <image wx:else src="{{imghost + tool.showDefaultImg(item.luck_type)}}" class="img" mode="aspectFit"></image>
138 140 </view>
139 141 <view class="flex fdc f1">
140   - <view class="ellipsis-2">{{item.luck_name}}</view>
  142 + <view class="ellipsis-2 fs28">{{item.luck_name}}</view>
141 143 <view class="pdt20">
142 144 <view class="fs26 xc-black3">价值：<text class="rmb">{{item.luck_goods_price}}</text></view>
143   - <view class="flex ai_c jc_sb fs26 xc-black3 ">
144   - <view style="visibility: {{item.luck_type == 5 ? 'visible':'hidden'}};">兑换状态：{{item.state == 0 ? '未兑换':'已兑换'}}</view>
145   - <view class="btn" bindtap="{{item.luck_type == 5 ? (item.state == 0 ? 'showQr':''):'goto'}}" data-type="{{item.luck_type}}" data-id="{{item.id}}">{{((item.luck_type == 5)&&(item.state == 1)) ? '已兑换':'兑换'}}</view>
  145 + <view class="flex ai_c jc_fe fs26 xc-black3 ">
  146 + <!-- <view style="visibility: {{item.luck_type == 5 ? 'visible':'hidden'}};">兑换状态：{{item.state == 0 ? '未兑换':'已兑换'}}</view> -->
  147 + <!-- <view style="">兑换状态：{{item.state == 0 ? '未兑换':'已兑换'}}</view> -->
  148 + <view class="btn" bindtap="{{item.luck_type == 5 ? (item.state == 0 ? 'showQr':''):'goto'}}" data-type="{{item.luck_type}}" data-id="{{item.id}}">{{item.luck_type == 5 ? (item.state == 1 ? '已兑换':'兑换'):'查看'}}</view>
146 149 </view>
147 150 </view>
148 151 </view>
... ... @@ -159,15 +162,18 @@
159 162 <view class="popup">
160 163 <view class="t-c">
161 164 <block wx:if="{{resultTitle == '谢谢参与'}}">
162   - <view class="bold c-tb fs40">{{resultTitle}}</view>
163   - <view class="pdt10">继续加油噢~</view>
  165 + <view class="bold c-tb fs40">{{luckInfo.no_luck_name}}</view>
  166 + <view class="pdt10">{{luckInfo.no_luck_remark}}</view>
  167 + <view class="img-container2"><image src="{{imghost + (luckInfo.no_luck_img ? luckInfo.no_luck_img:'miniapp/images/luckDraw/gift.png')}}" class="img" mode="aspectFit"></image></view>
  168 + <view class="pdt40 fs26 c9">{{num}}s后自动跳转...</view>
164 169 </block>
165 170 <block wx:else>
166 171 <view class="bold c-tb fs40">恭喜你获得</view>
167 172 <view class="pdt10">{{resultTitle}} </view>
  173 + <view class="img-container2"><image src="{{imghost + 'miniapp/images/luckDraw/gift.png'}}" class="img" mode="aspectFit"></image></view>
168 174 </block>
169 175 </view>
170   - <view class="img-container2"><image src="{{imghost + 'miniapp/images/luckDraw/gift.png'}}" class="img"></image></view>
  176 +
171 177 <view class="pdt40" wx:if="{{currentLbtype == 5}}">
172 178 <view class="btn btn2" bindtap="clickReceive">立即领取</view>
173 179 </view>
... ...
packageB/pages/luckactivity/luckinfo/luckinfo.wxss
  Edit  View file @a620c3e
... ... @@ -68,7 +68,7 @@ page,
68 68 width: 140rpx;
69 69 height: 140rpx;
70 70 margin-right: 20rpx;
71   - /* background-color: gray; */
  71 + background-color: #f5f5f5;
72 72 }
73 73  
74 74 .img {
... ...
packageB/pages/user/collect_list/collect_list.wxml
  Edit  View file @a620c3e
... ... @@ -5,7 +5,7 @@
5 5 </view>
6 6 <view class="flex-level fs30 xc-ash">当前暂无收藏</view>
7 7 <view class="flex-level">
8   - <navigator url="/pages/index/index/index" bindtap="goto">
  8 + <navigator bindtap="go_to" data-url="/pages/index/index/index" bindtap="goto">
9 9 <view class="flex-center fs28 white">去首页逛逛</view>
10 10 </navigator>
11 11 </view>
... ...
packageB/pages/user/comment/comment.js
  Edit  View file @a620c3e
... ... @@ -154,5 +154,9 @@ Page({
154 154 url: '/pages/index/index/index',
155 155 })
156 156 },
  157 + go_url(e){
  158 + var url=e.currentTarget.dataset.url;
  159 + getApp().goto(url);
  160 + }
157 161  
158 162 });
159 163 \ No newline at end of file
... ...
packageB/pages/user/comment/comment.wxml
  Edit  View file @a620c3e
... ... @@ -14,7 +14,7 @@
14 14 </view>
15 15 <view class="flex-level fs30 xc-ash">当前暂无评价</view>
16 16 <view class="flex-level">
17   - <navigator url="/pages/index/index/index" bindtap="goto">
  17 + <navigator bindtap="go_url" data-url="/pages/index/index/index">
18 18 <view class="flex-center fs28 white">去首页逛逛</view>
19 19 </navigator>
20 20 </view>
... ...
pages/cart/cart/cart.js
  Edit  View file @a620c3e
... ... @@ -2066,5 +2066,10 @@ Page({
2066 2066 if (hei< viewHeight) {
2067 2067 this.setData({ max_sw_height: viewHeight });
2068 2068 }
2069   - }
  2069 + },
  2070 +
  2071 + go_url(e){
  2072 + var url=e.currentTarget.dataset.url;
  2073 + getApp().goto(url);
  2074 + }
2070 2075 });
2071 2076 \ No newline at end of file
... ...
pages/cart/cart/cart.wxml
  Edit  View file @a620c3e
... ... @@ -252,7 +252,7 @@
252 252 </view>
253 253 <view class="flex-level fs32 xc-ash">购物车竟然是空的</view>
254 254 <view class="flex-level">
255   - <navigator url="/pages/index/index/index" bindtap="goto">
  255 + <navigator bindtap="go_url" data-url="/pages/index/index/index" bindtap="goto">
256 256 <view class="flex-center fs30 white">去首页逛逛</view>
257 257 </navigator>
258 258 </view>
... ...
pages/user/order_list/order_list.js
  Edit  View file @a620c3e
... ... @@ -1575,7 +1575,12 @@ Page({
1575 1575 icon: 'none',
1576 1576 duration: 3000
1577 1577 })
1578   - }
  1578 + },
  1579 +
  1580 + go_url(e){
  1581 + var url=e.currentTarget.dataset.url;
  1582 + getApp().goto(url);
  1583 + }
1579 1584  
1580 1585  
1581 1586 });
1582 1587 \ No newline at end of file
... ...
pages/user/order_list/order_list.wxml
  Edit  View file @a620c3e
... ... @@ -249,7 +249,7 @@
249 249 </view>
250 250 <view class="flex-level fs30 xc-ash">当前暂无订单</view>
251 251 <view class="flex-level">
252   - <navigator url="/pages/index/index/index" bindtap="goto">
  252 + <navigator bindtap="go_url" data-url="/pages/index/index/index" >
253 253 <view class="flex-center fs28 white">去首页逛逛</view>
254 254 </navigator>
255 255 </view>
... ...
utils/weapp-icon.wxss
  Edit  View file @a620c3e
1   -
2 1 .t-icon {
3 2 display: inline-block;
4 3 width: 16px;
... ... @@ -10,6 +9,18 @@
10 9  
11 10  
12 11  
  12 +.t-icon-gowudai {
  13 + background: url(data:image/svg+xml,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22utf-8%22%3F%3E%3Csvg%20version%3D%221.1%22%20width%3D%27100%25%27%20height%3D%27100%25%27%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20id%3D%22t-icon-gowudai%22%20viewBox%3D%220%200%201024%201024%22%3E%3Cpath%20d%3D%22M150.72-1.06666667l-5.86666667%20169.49333334%20738.13333334%2016.53333333L870.4-1.06666667z%22%20fill%3D%22%23cdcdcd%22%20%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M150.72-1.06666667l72.64%2049.38666667-78.50666667%20106.56z%22%20fill%3D%22%23A2A2A2%22%20%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M120.64%201025.70666667L69.33333333%20969.49333333h884.37333334l-54.29333334%2056.21333334z%22%20fill%3D%22%23bfbfbf%22%20%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M223.36%2047.36l-20.37333333%20113.38666667-103.57333334-8.74666667z%22%20fill%3D%22%23AEADAD%22%20%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M870.4-1.06666667l-71.68%2049.38666667%2084.26666667%20108.48z%22%20fill%3D%22%23A2A2A2%22%20%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M798.72%2048.32l20.37333333%20112.42666667%20105.49333334-8.74666667z%22%20fill%3D%22%23AEADAD%22%20%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M99.41333333%20152h825.17333334L954.66666667%20969.49333333H69.33333333z%22%20fill%3D%22%23dbdbdb%22%20%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M718.82666667%20256.10666667H770.13333333v255.68c0%20141.22666667-114.45333333%20255.68-255.68%20255.68S258.66666667%20653.01333333%20258.66666667%20511.78666667V256.10666667h51.30666666v255.68c0%20112.85333333%2091.52%20204.37333333%20204.37333334%20204.37333333s204.37333333-91.52%20204.37333333-204.37333333V256.10666667z%22%20fill%3D%22%23A5A5A5%22%20%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M718.82666667%20312.32H770.13333333v149.12c0%20141.22666667-114.45333333%20255.68-255.68%20255.68S258.66666667%20602.66666667%20258.66666667%20461.44V312.32h51.30666666v149.12c0%20112.85333333%2091.52%20204.37333333%20204.37333334%20204.37333333s204.37333333-91.52%20204.37333333-204.37333333V312.32z%22%20fill%3D%22%23FFFFFF%22%20%3E%3C%2Fpath%3E%3C%2Fsvg%3E);
  14 +}
  15 +
  16 +/* .t-icon-liwu {
  17 + background: url(data:image/svg+xml,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22utf-8%22%3F%3E%3Csvg%20version%3D%221.1%22%20width%3D%27100%25%27%20height%3D%27100%25%27%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20id%3D%22t-icon-liwu%22%20viewBox%3D%220%200%201024%201024%22%3E%3Cpath%20d%3D%22M85.93%20950.016c0%2024.576%207.126%2031.317%2029.44%2031.317h353.366V511.744H85.931v438.272z%20m469.334%2031.317h353.365c22.358%200%2029.44-6.698%2029.44-31.317V511.744H555.221v469.59zM938.667%20256H725.333c51.499-11.733%20105.899-49.707%20112.598-94.293%207.85-50.859-52.566-127.958-125.654-118.187-87.424%2012.117-151.509%2089.259-196.736%20149.077C470.656%20133.931%20412.16%2065.408%20328.363%2045.483c-81.152-19.2-136.747%2064.938-135.254%20116.992%201.451%2044.245%2052.608%2081.834%20105.558%2093.525H85.333c-26.368%200-42.666%2014.848-42.666%2042.667v170.581l426.666%200.085V256h85.334v213.333l426.666-0.085V298.667c0-27.819-16.341-42.667-42.666-42.667z%20m-687.019-77.824c-14.763-16.427-4.779-38.741%204.48-55.595%2017.024-29.696%2040.747-47.744%2081.152-30.933%2056.32%2023.51%2097.792%2073.216%20131.584%20117.803-71.552%207.893-178.304%2010.965-217.216-31.275z%20m311.296%2030.507c34.816-44.63%2075.221-89.942%20131.157-117.803%2058.582-28.97%20113.024%2049.323%2085.206%2086.912-21.419%2028.544-89.259%2031.232-125.91%2032.853-30.08%201.536-60.501%200.811-90.453-1.962z%22%20fill%3D%22%22%20%3E%3C%2Fpath%3E%3C%2Fsvg%3E);
  18 +}
  19 +
  20 +.t-icon-echarts {
  21 + background: url(data:image/svg+xml,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22utf-8%22%3F%3E%3Csvg%20version%3D%221.1%22%20width%3D%27100%25%27%20height%3D%27100%25%27%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20id%3D%22t-icon-echarts%22%20viewBox%3D%220%200%201024%201024%22%3E%3Cpath%20d%3D%22M436.59925293%20533.33333333c0-65.04312613%2035.34952507-123.72333775%2088.37381267-153.41693881l-206.44122641-353.49525068c-282.79620057%20159.07286282-376.82593725%20518.22403753-217.75307443%20801.02023808l359.15117471-206.44122642c-11.31184801-22.62369604-23.33068654-52.31729711-23.33068654-87.66682217z%22%20fill%3D%22%23DADADA%22%20%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M613.34687829%20356.58570799c65.04312613%200%20123.72333775%2035.34952507%20153.41693879%2088.37381266l253.1025995-147.05402428C890.48715482%2073.78950741%20602.03503025-2.56546674%20377.91904132%20126.81379502l147.05402428%20253.1025995c24.03767705-11.31184801%2059.38720211-23.33068654%2088.37381269-23.33068653z%22%20fill%3D%22%23EBEBEB%22%20%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M701.72069095%20686.75027214c-23.33068654%2017.67476253-58.68021163%2023.33068654-88.37381266%2023.33068653-65.04312613%200-123.72333775-35.34952507-153.41693882-88.37381266L201.17141596%20775.12408481c41.00544908%2070.69905013%20100.3926512%20129.37926176%20171.09170135%20171.09170134%20153.41693881%2088.37381268%20335.82048816%2082.71788866%20477.21858844-5.65592402l-147.7610148-253.80958999z%22%20fill%3D%22%23B8B8B8%22%20%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M920.18075589%20356.58570799L766.76381708%20444.95952065c12.01883853%2029.69360106%2023.33068654%2058.68021163%2023.33068654%2088.37381268%200%2065.04312613-35.34952507%20123.72333775-88.37381267%20153.41693881l88.37381267%20153.41693881c171.09170134-100.3926512%20229.77191295-312.48980161%20130.08625227-483.58150296z%22%20fill%3D%22%23C7C7C7%22%20%3E%3C%2Fpath%3E%3C%2Fsvg%3E);
  22 +} */
  23 +
13 24 .t-icon-sort-up {
14 25 background: url(data:image/svg+xml,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22utf-8%22%3F%3E%3Csvg%20version%3D%221.1%22%20width%3D%27100%25%27%20height%3D%27100%25%27%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20id%3D%22t-icon-sort-up%22%20viewBox%3D%220%200%201024%201024%22%3E%3Cpath%20d%3D%22M-109.37837037-109.37837037h1242.75674074v1242.75674074H-109.37837037z%22%20fill%3D%22%23FFFFFF%22%20fill-opacity%3D%220%22%20%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M242.7360391%20615.56306132h538.5279218a20.71261275%2020.71261275%200%200%201%2016.57008947%2033.14018016l-269.2639609%20359.05313542a20.71261275%2020.71261275%200%200%201-33.14017894%200L226.16594963%20648.70324148A20.71261275%2020.71261275%200%200%201%20242.7360391%20615.56306132z%22%20fill%3D%22%23C7C7C7%22%20%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M528.57008947%2016.2436231l269.2639609%20359.05313542A20.71261275%2020.71261275%200%200%201%20781.2639609%20408.43693868H242.7360391a20.71261275%2020.71261275%200%200%201-16.57008947-33.14018016l269.2639609-359.05313542a20.71261275%2020.71261275%200%200%201%2033.14017894%200z%22%20fill%3D%22%235A5A5A%22%20%3E%3C%2Fpath%3E%3C%2Fsvg%3E);
15 26 }
... ...