wxd / MShopWeApp

Commit 2077c3bfc2b9b1e01aaeddc352487740db1cdb74

Authored by 后端研发-苏明海
2 parents fe12de23 3437fe3e

Merge branch 'dev' into 'test' 

Dev

See merge request !704
Inline Side-by-side
Showing 13 changed files with 157 additions and 67 deletions
app.wxss
  View file @2077c3b
... ... @@ -703,9 +703,9 @@ background: #ffe3e2;
703 703 /* 图标字体(ty) */
704 704 @font-face {
705 705 font-family: 'iconfont'; /* Project id 2054717 */
706   - src: url('//at.alicdn.com/t/font_2054717_v0znypg14xq.woff2?t=1627541682562') format('woff2'),
707   - url('//at.alicdn.com/t/font_2054717_v0znypg14xq.woff?t=1627541682562') format('woff'),
708   - url('//at.alicdn.com/t/font_2054717_v0znypg14xq.ttf?t=1627541682562') format('truetype');
  706 + src: url('//at.alicdn.com/t/font_2054717_3fwbtkdbxhl.woff2?t=1627893975776') format('woff2'),
  707 + url('//at.alicdn.com/t/font_2054717_3fwbtkdbxhl.woff?t=1627893975776') format('woff'),
  708 + url('//at.alicdn.com/t/font_2054717_3fwbtkdbxhl.ttf?t=1627893975776') format('truetype');
709 709 }
710 710  
711 711 .iconfont {
... ... @@ -716,6 +716,10 @@ background: #ffe3e2;
716 716 -moz-osx-font-smoothing: grayscale;
717 717 }
718 718  
  719 +.icon-zhuanfa1:before {
  720 + content: "\e614";
  721 +}
  722 +
719 723  
720 724 .icon-zhiwen:before {
721 725 content: "\e6aa";
... ...
components/my_confirm/my_confirm.wxss
  View file @2077c3b
1   -
  1 +@import '../../app.wxss';
2 2 /* 弹窗样式 */
3 3 .xc-pop-up{
4 4 width: 100%;
... ... @@ -23,19 +23,19 @@
23 23  
24 24 .shut{
25 25 display: block;
26   - width: 54rpx;
27   - height: 54rpx;
28   - font-size: 50rpx;
29   - line-height:47rpx;
  26 + width: 45rpx;
  27 + height: 45rpx;
  28 + line-height:36rpx;
30 29 border-radius: 50%;
31 30 -moz-border-radius: 50%;
32 31 -webkit-border-radius: 50%;
  32 + font-size: 40rpx;
33 33 color: #fff;
34 34 text-align: center;
35 35 position: fixed;
36   - margin-top: -25rpx;
37 36 z-index: 66666;
38   - right: 65rpx;
  37 + right: 75rpx;
  38 + top: 465rpx;
39 39 background: #c8162c;
40 40 }
41 41 .xc-qr-frame{
... ... @@ -50,7 +50,7 @@
50 50 margin-left: -280rpx; border-radius:10rpx
51 51 }
52 52  
53   -.ck_btn{width:44%;height:52rpx;line-height:60rpx;background:#f35e73;border-radius:10rpx;}
  53 +.ck_btn{color: #000; width:44%;height:52rpx;line-height:60rpx;background:#f35e73;border-radius:10rpx;}
54 54  
55 55 .fs36{ font-size: 36rpx; }
56 56 .fs30{ font-size: 30rpx; }
... ...
components/qr_code/qr_code.wxml
  View file @2077c3b
... ... @@ -24,7 +24,7 @@
24 24 </view>
25 25  
26 26 </view>
27   - <view class="shut" bindtap="close">ⅹ</view>
  27 + <view class="shut" bindtap="close"><text class="iconfont icon-close"></text></view>
28 28 </view>
29 29 <!-- </scroll-view> -->
30 30 </view>
31 31 \ No newline at end of file
... ...
components/qr_code/qr_code.wxss
  View file @2077c3b
  1 +@import '../../app.wxss';
  2 +
1 3 .xc-pop-up{
2 4 width: 100%;
3 5 height: 100%;
... ... @@ -102,17 +104,17 @@ top: 5rpx;
102 104 }
103 105  
104 106 .shut{
105   - display: block;
  107 + /* display: block;
106 108 width: 54rpx;
107 109 height: 54rpx;
108 110 border: 2rpx solid #fff;
109 111 font-size: 50rpx;
110   - z-index:55;
111   - line-height:47rpx;
  112 + line-height:54rpx;
112 113 margin-top: 45rpx;
113 114 border-radius: 50%;
114 115 -moz-border-radius: 50%;
115   - -webkit-border-radius: 50%;
  116 + -webkit-border-radius: 50%; */
  117 + z-index:55;
116 118 color: #fff;
117 119 text-align: center;
118 120 position: fixed;
... ... @@ -120,6 +122,10 @@ top: 5rpx;
120 122 left:50%;
121 123 transform: translateX(-50%);
122 124 }
  125 +.icon-close:before {
  126 + content: "\e62e";
  127 + font-size: 50rpx;
  128 +}
123 129  
124 130 .mt{ margin-top:130rpx}
125 131 .mts{ margin-top:70rpx}
... ...
packageA/pages/myGift/myGift.js
  View file @2077c3b
... ... @@ -144,7 +144,7 @@ Page({
144 144 isShowLoading: true,
145 145 })
146 146 .then(function(res) {
147   -
  147 + console.log(res);
148 148 if(res.data.code == 0) {
149 149  
150 150 self.setData({
... ...
packageA/pages/myGift/myGift.wxml
  View file @2077c3b
... ... @@ -36,7 +36,7 @@
36 36 <view class="fs24 c-a4">已售{{item.salenum}}件</view>
37 37 </view>
38 38 <!-- 时间 -->
39   - <view class="date">活动截止日期 {{filter.format_time(item.endtime)}}</view>
  39 + <view class="date">活动结束日期 {{filter.format_time(item.endtime)}}</view>
40 40 <!-- 按钮 -->
41 41 </view>
42 42 </view>
... ... @@ -55,7 +55,7 @@
55 55 <!-- 标题 -->
56 56 <view class="mgb10 ellipsis-2 lh taj">{{item.lbtitle}}</view>
57 57 <!-- 时间 -->
58   - <view class="date pdb20">兑换截止日期 {{filter.format_time(item.endtime)}}</view>
  58 + <view class="date pdb20" wx:if="{{item.lbtype==1}}">兑换截止日期 {{filter.format_time(item.expdate,1)}}</view>
59 59 <view catchtap="show_remark" data-index="{{index}}" wx:if="{{item.lbintro}}" class="date pdb20">活动说明</view>
60 60 </view>
61 61 <!-- 说明 -->
... ...
packageA/pages/myGiftDetails/myGiftDetails.wxml
  View file @2077c3b
... ... @@ -3,7 +3,17 @@
3 3 <!-- 图片 -->
4 4 <view><image src="{{imghost + (details.lburl ? details.lburl:'miniapp/images/default_g_img.gif')}}" class="img" mode="widthFix"/></view>
5 5  
6   - <view wx:if="{{index==1}}" class="fs26 exp_title">兑换结束时间：{{filter.format_time(details.endtime,1)}}</view>
  6 + <!-- 未买 -->
  7 + <block wx:if="{{index==0}}">
  8 + <view class="fs26 exp_title">活动结束时间：{{filter.format_time(details.endtime,1)}}</view>
  9 + </block>
  10 + <!-- 已买 -->
  11 + <block wx:else>
  12 + <view wx:if="{{details.lbtype==1}}"class="fs26 exp_title">兑换结束时间：{{filter.format_time(details.expdate,1)}}</view>
  13 + </block>
  14 +
  15 +
  16 +
7 17 <!-- 描述-->
8 18 <view class="desc-container">
9 19 <!-- 标题 -->
... ... @@ -30,7 +40,7 @@
30 40 <view class="fs24 c-a4">已售{{details.salenum}}件</view>
31 41 </view>
32 42 <!-- 时间 -->
33   - <view class="date">活动截止日期 {{details.expdate ? filter.format_time(details.expdate):filter.format_time(details.endtime)}}</view>
  43 + <!-- <view class="date">活动结束日期 {{filter.format_time(details.endtime)}}</view> -->
34 44 </view>
35 45  
36 46  
... ...
packageB/pages/luckactivity/index/index.wxml
  View file @2077c3b
... ... @@ -20,7 +20,7 @@
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 22 <view class="img-container">
23   - <image wx:if="{{item.imageurl}}" src="{{imghost + item.imageurl}}" class="img"></image>
  23 + <image wx:if="{{item.imageurl}}" src="{{imghost + item.imageurl}}" class="img" mode="aspectFit"></image>
24 24 <text class="iconfont icon-zhuanpan" wx:else></text>
25 25 </view>
26 26 <view class="desc-container">
... ...
packageB/pages/luckactivity/luckinfo/luckinfo.js
  View file @2077c3b
... ... @@ -57,6 +57,10 @@ Page({
57 57 },
58 58  
59 59 onLoad(options) {
  60 + // wx.showLoading();
  61 + // this.setData({
  62 + // showMask2: true,
  63 + // });
60 64 // console.log('imghost+++++', imghost);
61 65 self = this;
62 66 this.data.options = options;
... ... @@ -118,18 +122,24 @@ Page({
118 122 // console.log('prizes//////', res.data.data);
119 123 self.setData({
120 124 template: res.data.data,
121   - bannerUrl: imghost + ((res.data.data&&res.data.data.bannerUrl) ? res.data.data.bannerUrl:'miniapp/images/luckDraw/bg.png'), //背景图
122   - 'blocks[0].imgs[0].src': imghost + ((res.data.data&&res.data.data.wheelBaseUrl) ? res.data.data.wheelBaseUrl:'miniapp/images/luckDraw/weel.png'), //转盘
123   - 'buttons[0].imgs[0].src': imghost + ((res.data.data&&res.data.data.wheelPointerUrl) ? res.data.data.wheelPointerUrl:'miniapp/images/luckDraw/pointer.png'), //指针
  125 + bannerUrl: imghost + ((res.data.data&&res.data.data.bannerUrl) ? res.data.data.bannerUrl:'miniapp/images/luckDraw/bg.png?v=2'), //背景图
  126 + 'blocks[0].imgs[0].src': imghost + ((res.data.data&&res.data.data.wheelBaseUrl) ? res.data.data.wheelBaseUrl:'miniapp/images/luckDraw/weel.png?v=2'), //转盘
  127 + 'buttons[0].imgs[0].src': imghost + ((res.data.data&&res.data.data.wheelPointerUrl) ? res.data.data.wheelPointerUrl:'miniapp/images/luckDraw/pointer.png?v=2'), //指针
124 128 });
125 129 },
126 130 });
127 131 } else {
  132 + // wx.hideLoading();
128 133 if(luckInfo && luckInfo.store_bannerUrl) {
129 134 self.setData({
130 135 bannerUrl: imghost + luckInfo.store_bannerUrl,
131 136 });
132 137 };
  138 +
  139 + // self.setData({
  140 + // showMask2: false,
  141 + // hiddenCanvas: false,
  142 + // });
133 143  
134 144 };
135 145  
... ... @@ -178,8 +188,8 @@ Page({
178 188 self.setData({
179 189 record: res.data.data.pageData,
180 190 });
181   - };
182   - },
  191 + }
  192 + },
183 193 });
184 194  
185 195  
... ... @@ -575,6 +585,8 @@ Page({
575 585 }, 3000);
576 586  
577 587  
  588 +
  589 +
578 590 if(res.data.code == -1) {
579 591 wx.showToast({
580 592 title: res.data.msg,
... ... @@ -585,13 +597,15 @@ Page({
585 597 // self.data.start = true;
586 598 };
587 599 // console.log('请求出错');
588   - if(self.data.luckInfo.vip_act_num != 0) {
  600 + if(res.data.code == -2 && self.data.luckInfo.vip_act_num != 0) {
589 601 self.setData({
590 602 'luckInfo.user_LuckNumDay': self.data.luckInfo.user_LuckNumDay - 1,
591 603 });
592 604 };
593 605  
594 606  
  607 +
  608 +
595 609 };
596 610 },
597 611  
... ... @@ -640,13 +654,14 @@ Page({
640 654 showResult: true,
641 655 showMask: true,
642 656 resultTitle,
  657 + showPopup: false,
643 658 currentLbtype: lbtype,
644 659 });
645 660  
646 661  
647 662  
648 663  
649   - if(no_luck_urltype == 1 && (resultTitle == '谢谢参与')) {
  664 + if(no_luck_urltype == 1 && resultTitle == '谢谢参与') {
650 665 if(this.data.luckInfo.no_luck_weappurl) {
651 666 let num = this.data.num;
652 667 let url = this.data.luckInfo.no_luck_weappurl;
... ... @@ -662,8 +677,47 @@ Page({
662 677 }, 1000);
663 678  
664 679 };
  680 +
665 681 };
666 682  
  683 +
  684 + if(self.data.luckInfo.give_user) {
  685 + if(resultTitle == '谢谢参与') {
  686 + if(self.data.luckInfo.give_type == 1) {
  687 + if(self.data.luckInfo.give_integral > 0) {
  688 + wx.showToast({
  689 + title: `获得游戏奖励积分${self.data.luckInfo.give_integral}`,
  690 + icon: 'none',
  691 + });
  692 + };
  693 + } else if((self.data.luckInfo.give_type == 2)) {
  694 + if(self.data.luckInfo.give_integral > 0) {
  695 + wx.showToast({
  696 + title: `获得游戏奖励成长值${self.data.luckInfo.give_growth}`,
  697 + icon: 'none',
  698 + });
  699 + };
  700 + };
  701 + };
  702 + } else {
  703 + if(self.data.luckInfo.give_type == 1) {
  704 + if(self.data.luckInfo.give_integral > 0) {
  705 + wx.showToast({
  706 + title: `获得游戏奖励积分${self.data.luckInfo.give_integral}`,
  707 + icon: 'none',
  708 + });
  709 + };
  710 + } else if((self.data.luckInfo.give_type == 2)) {
  711 + if(self.data.luckInfo.give_integral > 0) {
  712 + wx.showToast({
  713 + title: `获得游戏奖励成长值${self.data.luckInfo.give_growth}`,
  714 + icon: 'none',
  715 + });
  716 + };
  717 + };
  718 + };
  719 +
  720 +
667 721 },
668 722  
669 723 showPopup() {
... ... @@ -799,6 +853,14 @@ Page({
799 853 goto(e) {
800 854 let url = '';
801 855 let type = e.currentTarget.dataset.type;
  856 + let ordersn = null;
  857 + let buyreceive_id = null;
  858 + if(e.currentTarget.dataset.ordersn) {
  859 + ordersn = e.currentTarget.dataset.ordersn;
  860 + };
  861 + if(e.currentTarget.dataset.buyreceiveid) {
  862 + buyreceive_id = e.currentTarget.dataset.buyreceiveid;
  863 + };
802 864 switch(type) {
803 865 case 1: {
804 866 url = '/pages/user/integral/integral';
... ... @@ -817,7 +879,7 @@ Page({
817 879 break;
818 880 };
819 881 case 6: {
820   - url = '/packageA/pages/myGift/myGift';
  882 + url = `/pages/giftpack/giftpacklist/giftpacklist?isBuy=0&orderSn=${ordersn}&lbId=${buyreceive_id}`;
821 883 break;
822 884 };
823 885 };
... ...
packageB/pages/luckactivity/luckinfo/luckinfo.wxml
  View file @2077c3b
1 1 <wxs module="filter" src="../../../../utils/filter.wxs"></wxs>
2 2 <wxs module="tool" src="./tool.wxs"></wxs>
3   -<view class="luck-container" style="background: {{template.colorCode ? template.colorCode:'#8102FD'}} url({{bannerUrl ? bannerUrl:(imghost + 'miniapp/images/luckDraw/bg.png')}}) no-repeat;">
4   -<!-- <view class="luck-container" style="background: url({{ bannerUrl}}) no-repeat;"> -->
  3 +<view class="luck-container" style="background: {{template.colorCode ? template.colorCode:'#da104b'}} url({{bannerUrl ? bannerUrl:(imghost + 'miniapp/images/luckDraw/bg.png?v=2')}}) no-repeat;">
5 4 <!-- 中奖人员 -->
6 5 <view class="swiper-container" wx:if="{{nameList && nameList.length != 0}}">
7 6 <swiper class="swiper" autoplay="true" circular="true" vertical="true" interval="3000">
... ... @@ -63,28 +62,24 @@
63 62 </view>
64 63 </view>
65 64 <!-- 活动展示 -->
66   - <view wx:if="{{luckInfo.remark}}">
  65 + <view>
67 66 <view class="badge-container"><image src="{{imghost + 'miniapp/images/luckDraw/badge.png'}}" class="badge activity" lazy-load></image></view>
68 67 <view class="bg-white br12 pd20 fs28">
69 68 <!-- {{luckInfo.remark}} -->
70 69 <import src="../../../../utils/wxParse/wxParse.wxml"/>
71   - <template is="wxParse" data="{{wxParseData:content.nodes}}"/>
  70 + <!-- <template is="wxParse" data="{{wxParseData:content.nodes}}"/> -->
72 71 <!-- 时间 -->
73   - <!-- <view class="bdb">
74   - <view class="">
  72 + <view class="bdb">
  73 + <!-- <view class=""> -->
75 74 <view class="txt-red">活动时间：</view>
76   - <view class="fs28 pdv20">187606546456</view>
77   - </view>
78   - <view>
79   - <view class="txt-red">兑换时间：</view>
80   - <view class="fs28 pdv20">-</view>
81   - </view>
82   - </view> -->
  75 + <view class="fs28 pdv20">{{filter.format_time(luckInfo.begindate, 1) + ' 至 ' + filter.format_time(luckInfo.enddate, 1)}}</view>
  76 + <!-- </view> -->
  77 + </view>
83 78 <!-- 规则 -->
84   - <!-- <view class="bdb">
85   - <view class="txt-red pdt20">活动规则：</view>
86   - <view class="fs28 pdv20">-</view>
87   - </view> -->
  79 + <view class="bdb" wx:if="{{luckInfo.remark}}">
  80 + <view class="txt-red pdt20">活动说明：</view>
  81 + <view class="fs28 pdv20"><template is="wxParse" data="{{wxParseData:content.nodes}}"/></view>
  82 + </view>
88 83 <!-- 电话 -->
89 84 <!-- <view class="bdb">
90 85 <view class="txt-red pdt20">联系电话：</view>
... ... @@ -127,8 +122,11 @@
127 122 </view>
128 123 </view>
129 124  
  125 +<!-- 分享按钮 -->
  126 +<!-- <view class="circle-container zhuanfa" bindtap=""><text class="iconfont icon-zhuanfa1"></text></view> -->
  127 +
130 128 <!-- 悬浮按钮 -->
131   -<view class="gift-container {{((record && record.length != 0) || isActive) ? 'active':''}}" bindtap="showPopup"><text class="iconfont icon-liwu"></text></view>
  129 +<view class="circle-container gift {{((record && record.length != 0) || isActive) ? 'active':''}}" bindtap="showPopup"><text class="iconfont icon-liwu"></text></view>
132 130  
133 131 <!-- 弹窗 -->
134 132 <view class="popup-container" wx:if="{{showPopup}}">
... ... @@ -145,7 +143,8 @@
145 143 <view class="flex ai_c jc_fe fs26 xc-black3 ">
146 144 <!-- <view style="visibility: {{item.luck_type == 5 ? 'visible':'hidden'}};">兑换状态：{{item.state == 0 ? '未兑换':'已兑换'}}</view> -->
147 145 <!-- <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 + <!-- <view class="fs24 c-a">中奖时间：{{filter.format_time(item.luck_time, 1)}}</view> -->
  147 + <view class="btn" bindtap="{{item.luck_type == 5 ? (item.state == 0 ? 'showQr':''):'goto'}}" data-type="{{item.luck_type}}" data-id="{{item.id}}" data-ordersn="{{item.order_sn}}" data-buyreceiveid="{{item.buyreceive_id}}">{{item.luck_type == 5 ? (item.state == 1 ? '已兑换':'兑换'):'查看'}}</view>
149 148 </view>
150 149 </view>
151 150 </view>
... ... @@ -179,7 +178,7 @@
179 178 </view>
180 179  
181 180 <view class="pdt40" wx:if="{{currentLbtype == 5}}">
182   - <view class="btn btn2" bindtap="clickReceive">立即领取</view>
  181 + <view class="btn btn2" bindtap="clickReceive">立即兑换</view>
183 182 </view>
184 183  
185 184  
... ... @@ -190,5 +189,7 @@
190 189  
191 190 <!-- 遮罩层 -->
192 191 <view class="mask" wx:if="{{showMask}}"></view>
  192 +<!-- 进场遮罩层 -->
  193 +<view class="mask2" wx:if="{{showMask2}}"></view>
193 194  
194 195 <qrcode id="qrcode" bind:close="closeQr"></qrcode>
195 196 \ No newline at end of file
... ...
packageB/pages/luckactivity/luckinfo/luckinfo.wxss
  View file @2077c3b
... ... @@ -68,7 +68,7 @@ page,
68 68 width: 140rpx;
69 69 height: 140rpx;
70 70 margin-right: 20rpx;
71   - background-color: #f5f5f5;
  71 + /* background-color: #f5f5f5; */
72 72 }
73 73  
74 74 .img {
... ... @@ -118,7 +118,7 @@ page,
118 118 margin-right: 10rpx;
119 119 }
120 120  
121   -.gift-container {
  121 +.circle-container {
122 122 background-color: rgba(44, 44, 44, 0.2);
123 123 width: 100rpx;
124 124 height: 100rpx;
... ... @@ -126,14 +126,21 @@ page,
126 126 color: white;
127 127 position: fixed;
128 128 right: 20rpx;
129   - bottom: 20rpx;
130 129 display: flex;
131 130 justify-content: center;
132 131 align-items: center;
133 132 z-index: 1;
134 133 }
135 134  
136   -.gift-container.active::after {
  135 +.circle-container.gift {
  136 + bottom: 20rpx;
  137 +}
  138 +
  139 +.circle-container.zhuanfa {
  140 + bottom: 160rpx;
  141 +}
  142 +
  143 +.circle-container.active::after {
137 144 content: '';
138 145 position: absolute;
139 146 width: 14rpx;
... ... @@ -145,7 +152,8 @@ page,
145 152 right: 10rpx;
146 153 }
147 154  
148   -.icon-liwu {
  155 +.icon-liwu,
  156 +.icon-zhuanfa1 {
149 157 font-size: 40rpx;
150 158 }
151 159  
... ... @@ -161,7 +169,7 @@ page,
161 169 width: 6rem;
162 170 z-index: 2;
163 171 -webkit-transform: translate(0, -50%); */
164   - transform: translate(0, -50%);
  172 + /* transform: translate(0, -50%); */
165 173 /* color: #fff;
166 174 font: normal 400 20px/1 'Josefin Sans', sans-serif;
167 175 letter-spacing: .1em;
... ... @@ -175,9 +183,10 @@ page,
175 183 left: 50%;
176 184 width: 1rem;
177 185 height: 1rem;
178   - margin-left: -12px;
179   - border-left: 1px solid #fff;
180   - border-bottom: 1px solid #fff;
  186 + /* transform: translateX(-50%); */
  187 + margin-left: -13rpx;
  188 + border-left: 2rpx solid #fff;
  189 + border-bottom: 2rpx solid #fff;
181 190 -webkit-transform: rotate(-45deg);
182 191 transform: rotate(-45deg);
183 192 -webkit-animation: sdb07 2s infinite;
... ... @@ -190,7 +199,7 @@ page,
190 199 animation-delay: 0s;
191 200 }
192 201 .tip-to-down text:nth-of-type(2) {
193   - top: 16px;
  202 + top: 32rpx;
194 203 -webkit-animation-delay: .15s;
195 204 animation-delay: .15s;
196 205 }
... ...
packageB/pages/zuhegou/index/index.js
  View file @2077c3b
... ... @@ -23,14 +23,14 @@ let imgDraw = {
23 23 },
24 24 { //昵称
25 25 "type": "text",
26   - "text": "我是店铺名称名称名称名称名称名称名称名称名称名称名称名称名称名称",
  26 + "text": "我是店铺",
27 27 "css": {
28   - "width": "400px",
  28 + "width": "650px",
29 29 "color": "#fff",
30 30 "top": "136px",
31   - "left": "137px",
32 31 "fontSize": "26px",
33 32 "maxLines": "1",
  33 + "textAlign": "center",
34 34 }
35 35 },
36 36 { //10元任选3件
... ...
pages/index/index/index.js
  View file @2077c3b
... ... @@ -992,13 +992,11 @@ Page({
992 992  
993 993 for(var i in swiperimage){
994 994 var item=swiperimage[i];
995   - if(item.id ==img.id && type==img.type){
  995 + if(item.id ==img.id && item.type==img.type){
996 996 return false;
997 997 }
998 998 }
999   -
1000   -
1001   -
  999 +
1002 1000 swiperimage.unshift(img);
1003 1001 th.setData({
1004 1002 swiperimage: swiperimage,
... ...