Commit ff61af95b471942802e93d47c6391130ffc15e4a
1 parent
ec6a6217
预售删除includen连接页面
Showing
2 changed files
with
987 additions
and
972 deletions
packageC/pages/presell/goodsInfo/goodsInfo.wxml
@@ -731,18 +731,7 @@ | @@ -731,18 +731,7 @@ | ||
731 | </view> | 731 | </view> |
732 | </view> | 732 | </view> |
733 | </view> | 733 | </view> |
734 | -<!-- 弹起来,购买积分购 --> | ||
735 | -<view hidden="{{!openSpecModal_inte}}"> | ||
736 | - <include src="buy_integral.wxml" /> | ||
737 | -</view> | ||
738 | -<!-- 弹起来,购买积分购的普通购买 --> | ||
739 | -<view hidden="{{!openSpecModal_inte_normal}}"> | ||
740 | - <include src="buy_integral_normal.wxml" /> | ||
741 | -</view> | ||
742 | -<!-- --弹起来,选择规格数量,拼单商品购买---- --> | ||
743 | -<view hidden="{{!openSpecModal_pt}}"> | ||
744 | - <include src="buy_pt.wxml" /> | ||
745 | -</view> | 734 | + |
746 | <!-- --弹起来优惠信息---- --> | 735 | <!-- --弹起来优惠信息---- --> |
747 | <view hidden="{{!openPromModal}}"> | 736 | <view hidden="{{!openPromModal}}"> |
748 | <view bindtap="closePromModal" class="cover-layer"></view> | 737 | <view bindtap="closePromModal" class="cover-layer"></view> |
pages/goods/goodsInfo/goodsInfo.wxml
@@ -2,28 +2,24 @@ | @@ -2,28 +2,24 @@ | ||
2 | <wxs module="filters" src="../../../utils/filter.wxs"></wxs> | 2 | <wxs module="filters" src="../../../utils/filter.wxs"></wxs> |
3 | <wxs module="g_filters" src="g_filter.wxs"></wxs> | 3 | <wxs module="g_filters" src="g_filter.wxs"></wxs> |
4 | <wxs module="tool" src="filter.wxs"></wxs> | 4 | <wxs module="tool" src="filter.wxs"></wxs> |
5 | - | ||
6 | <!-- 商品内容区域,普通商品,秒杀,拼团 --> | 5 | <!-- 商品内容区域,普通商品,秒杀,拼团 --> |
7 | -<block wx:if="{{isshow}}"> | 6 | +<block wx:if="{{isshow}}"> |
8 | <view class="container"> | 7 | <view class="container"> |
9 | <view class="type-navbar"> | 8 | <view class="type-navbar"> |
10 | <view class="type-box" wx:for="{{categories}}" wx:key="categories"> | 9 | <view class="type-box" wx:for="{{categories}}" wx:key="categories"> |
11 | <view bindtap="tabClick" class="type-navbar-item {{activeCategoryId==item.id?'type-item-on':''}}" id="{{item.id}}"> | 10 | <view bindtap="tabClick" class="type-navbar-item {{activeCategoryId==item.id?'type-item-on':''}}" id="{{item.id}}"> |
12 | {{item.name}} | 11 | {{item.name}} |
13 | - </view> | 12 | + </view> |
14 | </view> | 13 | </view> |
15 | </view> | 14 | </view> |
16 | - | ||
17 | <view class="goods-detail"> | 15 | <view class="goods-detail"> |
18 | <view class="goods-info" hidden="{{activeCategoryId==0?false:true}}"> | 16 | <view class="goods-info" hidden="{{activeCategoryId==0?false:true}}"> |
19 | - <!-- 视频 --> | 17 | + <!-- 视频 --> |
20 | <!-- <swiper bindchange="swiperChange"class="xc-pictures swiperContainer rel" current="{{swiperCurrent}}" | 18 | <!-- <swiper bindchange="swiperChange"class="xc-pictures swiperContainer rel" current="{{swiperCurrent}}" |
21 | indicator-dots="{{indicatorDots}}" autoplay="{{autoplay}}" interval="{{interval}}" duration="{{duration}}"> --> | 19 | indicator-dots="{{indicatorDots}}" autoplay="{{autoplay}}" interval="{{interval}}" duration="{{duration}}"> --> |
22 | <view id="id" bindtouchstart="handletouchtart" bindtouchmove="handletouchmove"> | 20 | <view id="id" bindtouchstart="handletouchtart" bindtouchmove="handletouchmove"> |
23 | - | ||
24 | <view class="xc-videos-picture rel"> | 21 | <view class="xc-videos-picture rel"> |
25 | <swiper autoplay="{{false}}" current="{{swiperCurrent}}" class="swiper_box swiperContainer rel" duration="{{1000}}" indicatorDots="{{mapurl?false:true}}" interval="{{3000}}" vertical="{{false}}" bindchange="swiperChange"> | 22 | <swiper autoplay="{{false}}" current="{{swiperCurrent}}" class="swiper_box swiperContainer rel" duration="{{1000}}" indicatorDots="{{mapurl?false:true}}" interval="{{3000}}" vertical="{{false}}" bindchange="swiperChange"> |
26 | - | ||
27 | <swiper-item wx:if="{{mapurl}}"> | 23 | <swiper-item wx:if="{{mapurl}}"> |
28 | <view wx:if="{{noon == 0}}"> | 24 | <view wx:if="{{noon == 0}}"> |
29 | <image class="xc-picturess" src="{{iurl+mapurl_f_img}}" mode="aspectFit"> | 25 | <image class="xc-picturess" src="{{iurl+mapurl_f_img}}" mode="aspectFit"> |
@@ -31,13 +27,12 @@ | @@ -31,13 +27,12 @@ | ||
31 | </image> | 27 | </image> |
32 | </view> | 28 | </view> |
33 | <view wx:else> | 29 | <view wx:else> |
34 | - <video class="xc-videos" src="{{iurl+mapurl}}" id="{{index}}" wx:if="{{_index == index}}"> </video> | 30 | + <video class="xc-videos" src="{{iurl+mapurl}}" id="{{index}}" wx:if="{{_index == index}}"></video> |
35 | </view> | 31 | </view> |
36 | </swiper-item> | 32 | </swiper-item> |
37 | - | ||
38 | <swiper-item wx:for="{{gallery}}" wx:key="gallery"> | 33 | <swiper-item wx:for="{{gallery}}" wx:key="gallery"> |
39 | - <!-- <image class="wh100" src="{{item.image_url}}" mode="aspectFit" binderror="bind_bnerr" lazy-load="true" data-errorimg="gallery[{{index}}].image_url"></image> --> | ||
40 | - <view class="wh100 g_img_box" style="background-image:url({{item.image_url}});"></view> | 34 | + <!-- <image class="wh100" src="{{item.image_url}}" mode="aspectFit" binderror="bind_bnerr" lazy-load="true" data-errorimg="gallery[{{index}}].image_url"></image> --> |
35 | + <view class="wh100 g_img_box" style="background-image:url({{item.image_url}});"></view> | ||
41 | </swiper-item> | 36 | </swiper-item> |
42 | </swiper> | 37 | </swiper> |
43 | <block wx:if="{{mapurl}}"> | 38 | <block wx:if="{{mapurl}}"> |
@@ -51,49 +46,52 @@ | @@ -51,49 +46,52 @@ | ||
51 | </view> | 46 | </view> |
52 | </view> | 47 | </view> |
53 | <view class="xc-picture {{videopicture==1 ? 'xc-sn':''}}" data-vipi="1" bindtap="videopicture"> | 48 | <view class="xc-picture {{videopicture==1 ? 'xc-sn':''}}" data-vipi="1" bindtap="videopicture"> |
54 | - <view> | ||
55 | - 图片 | ||
56 | - </view> | 49 | + <view>图片</view> |
57 | </view> | 50 | </view> |
58 | </view> | 51 | </view> |
59 | </block> | 52 | </block> |
60 | </view> | 53 | </view> |
61 | </view> | 54 | </view> |
62 | - | ||
63 | - | ||
64 | - <!----显示秒杀价,团购,积分购----> | 55 | + <!-- --显示秒杀价,团购,积分购-- --> |
65 | <view class="prom_show rel" wx:if="{{prom_type==1}}"> | 56 | <view class="prom_show rel" wx:if="{{prom_type==1}}"> |
66 | - | ||
67 | <image class="secondkill-img" src='{{prom_st==1? iurl+"/miniapp/images/red_jx.png":iurl+"/miniapp/images/blue_ks.png"}}'></image> | 57 | <image class="secondkill-img" src='{{prom_st==1? iurl+"/miniapp/images/red_jx.png":iurl+"/miniapp/images/blue_ks.png"}}'></image> |
68 | <image class="abs spike-img" src="{{iurl}}/miniapp/images/xsmiaosha.png"></image> | 58 | <image class="abs spike-img" src="{{iurl}}/miniapp/images/xsmiaosha.png"></image> |
69 | - | ||
70 | <view class="stop fs26 abs" wx:if="{{prom_st==1}}">距活动结束还有</view> | 59 | <view class="stop fs26 abs" wx:if="{{prom_st==1}}">距活动结束还有</view> |
71 | <view class="start fs26 abs" wx:if="{{prom_st==2}}">距活动开始还有</view> | 60 | <view class="start fs26 abs" wx:if="{{prom_st==2}}">距活动开始还有</view> |
72 | <view class="secview flex abs fs24 xc-miaosha-time"> | 61 | <view class="secview flex abs fs24 xc-miaosha-time"> |
73 | <block wx:if="djs.day"> | 62 | <block wx:if="djs.day"> |
74 | - <view class='day-val' style="color:{{prom_st==1?'#d40022':'#0097e0'}}">{{djs.day}}</view> | 63 | + <view class='day-val' style="color:{{prom_st==1?'#d40022':'#0097e0'}}"> |
64 | + {{djs.day}} | ||
65 | + </view> | ||
75 | <view class="day white" style="color: {{prom_st==1?'#d40022':'#0097e0'}}">天</view> | 66 | <view class="day white" style="color: {{prom_st==1?'#d40022':'#0097e0'}}">天</view> |
76 | </block> | 67 | </block> |
77 | - <view class='time-val white t-c' style=" background:{{prom_st==1?'#d40022':'#0097e0'}}">{{djs.hou}}</view> | 68 | + <view class='time-val white t-c' style=" background:{{prom_st==1?'#d40022':'#0097e0'}}"> |
69 | + {{djs.hou}} | ||
70 | + </view> | ||
78 | <view class="time" style="color: {{prom_st==1?'#d40022':'#0097e0'}}">时</view> | 71 | <view class="time" style="color: {{prom_st==1?'#d40022':'#0097e0'}}">时</view> |
79 | - <view class='time-val white t-c' style=" background:{{prom_st==1?'#d40022':'#0097e0'}}">{{djs.min}}</view> | ||
80 | - <view class="time" style="color: {{prom_st==1?'#d40022':'#0097e0'}}"> 分</view> | ||
81 | - <view class='time-val white t-c' style=";background:{{prom_st==1?'#d40022':'#0097e0'}}">{{djs.sec}}</view> | 72 | + <view class='time-val white t-c' style=" background:{{prom_st==1?'#d40022':'#0097e0'}}"> |
73 | + {{djs.min}} | ||
74 | + </view> | ||
75 | + <view class="time" style="color: {{prom_st==1?'#d40022':'#0097e0'}}">分</view> | ||
76 | + <view class='time-val white t-c' style=";background:{{prom_st==1?'#d40022':'#0097e0'}}"> | ||
77 | + {{djs.sec}} | ||
78 | + </view> | ||
82 | <view class="time" style="color: {{prom_st==1?'#d40022':'#0097e0'}}">秒</view> | 79 | <view class="time" style="color: {{prom_st==1?'#d40022':'#0097e0'}}">秒</view> |
83 | </view> | 80 | </view> |
84 | </view> | 81 | </view> |
85 | - | ||
86 | - <!----拼单----> | 82 | + <!-- --拼单-- --> |
87 | <view class="pt_show " wx:if="{{prom_type==6}}"> | 83 | <view class="pt_show " wx:if="{{prom_type==6}}"> |
88 | <view class="pt_view rel"> | 84 | <view class="pt_view rel"> |
89 | - <!--许程 7. 24 --> | 85 | + <!-- 许程 7. 24 --> |
90 | <image class="secondkill-img" src="{{prom_st==1? iurl+'/miniapp/images/red_jx.png':iurl+'/miniapp/images/blue_ks.png'}}"></image> | 86 | <image class="secondkill-img" src="{{prom_st==1? iurl+'/miniapp/images/red_jx.png':iurl+'/miniapp/images/blue_ks.png'}}"></image> |
91 | <view class="abs xc-qt-price"> | 87 | <view class="abs xc-qt-price"> |
92 | <view class="flex" style='height:40rpx; margin-top:5rpx'> | 88 | <view class="flex" style='height:40rpx; margin-top:5rpx'> |
93 | <view class="flex fs35 xc-qtsign">¥</view> | 89 | <view class="flex fs35 xc-qtsign">¥</view> |
94 | <view class="fs50 val">{{prom_price}}</view> | 90 | <view class="fs50 val">{{prom_price}}</view> |
95 | </view> | 91 | </view> |
96 | - <view class="word-line fs20 xc-qtunit-price">零售价¥{{filters.toFix(data.market_price,2)}}</view> | 92 | + <view class="word-line fs20 xc-qtunit-price"> |
93 | + 零售价¥{{filters.toFix(data.market_price,2)}} | ||
94 | + </view> | ||
97 | </view> | 95 | </view> |
98 | <view class="abs white xc-nanber"> | 96 | <view class="abs white xc-nanber"> |
99 | <text class="fs22">已拼{{prom_act.buy_num}}件</text> | 97 | <text class="fs22">已拼{{prom_act.buy_num}}件</text> |
@@ -101,251 +99,267 @@ | @@ -101,251 +99,267 @@ | ||
101 | <view class="xc-people-img"> | 99 | <view class="xc-people-img"> |
102 | <image class="imgs" src="{{prom_st==1? iurl+'/miniapp/images/r_logo_red.png':iurl+'/miniapp/images/r_logo.png'}}"></image> | 100 | <image class="imgs" src="{{prom_st==1? iurl+'/miniapp/images/r_logo_red.png':iurl+'/miniapp/images/r_logo.png'}}"></image> |
103 | </view> | 101 | </view> |
104 | - <view class="t-s fs20 xc-people-val"> | ||
105 | - {{prom_act.ct_num}}人拼 | ||
106 | - </view> | 102 | + <view class="t-s fs20 xc-people-val">{{prom_act.ct_num}}人拼</view> |
107 | </view> | 103 | </view> |
108 | </view> | 104 | </view> |
109 | <view class="hy-stop word-color fs26 abs" wx:if="{{prom_st==1}}">距活动结束还有</view> | 105 | <view class="hy-stop word-color fs26 abs" wx:if="{{prom_st==1}}">距活动结束还有</view> |
110 | <view class="hy-stop word-color-lan fs26 abs" wx:if="{{prom_st==0}}">距活动开始还有</view> | 106 | <view class="hy-stop word-color-lan fs26 abs" wx:if="{{prom_st==0}}">距活动开始还有</view> |
111 | <view class="secview flex abs fs24 " style="color: black;right: 3px; top:46rpx;"> | 107 | <view class="secview flex abs fs24 " style="color: black;right: 3px; top:46rpx;"> |
112 | <block wx:if="djs.day"> | 108 | <block wx:if="djs.day"> |
113 | - <view class='day-val' style="color:{{prom_st==1?'#d40022':'#0097e0'}};margin-top:-34rpx;">{{djs.day}}</view> | ||
114 | - <view class="day white" style="margin-top:-34rpx;margin-right:10rpx;color: {{prom_st==1?'#d40022':'#0097e0'}}">天</view> | 109 | + <view class='day-val' style="color:{{prom_st==1?'#d40022':'#0097e0'}};margin-top:-34rpx;"> |
110 | + {{djs.day}} | ||
111 | + </view> | ||
112 | + <view class="day white" style="margin-top:-34rpx;margin-right:10rpx;color: {{prom_st==1?'#d40022':'#0097e0'}}"> | ||
113 | + 天 | ||
114 | + </view> | ||
115 | </block> | 115 | </block> |
116 | - <view class='xc-time-val white t-c' style=" background:{{prom_st==1?'#d40022':'#0097e0'}}">{{djs.hou}}</view> | 116 | + <view class='xc-time-val white t-c' style=" background:{{prom_st==1?'#d40022':'#0097e0'}}"> |
117 | + {{djs.hou}} | ||
118 | + </view> | ||
117 | <view class="xc-time" style="color: {{prom_st==1?'#d40022':'#0097e0'}}">时</view> | 119 | <view class="xc-time" style="color: {{prom_st==1?'#d40022':'#0097e0'}}">时</view> |
118 | - <view class='xc-time-val white t-c' style=" background:{{prom_st==1?'#d40022':'#0097e0'}}">{{djs.min}}</view> | ||
119 | - <view class="xc-time" style="color: {{prom_st==1?'#d40022':'#0097e0'}}"> 分</view> | ||
120 | - <view class='xc-time-val white t-c' style=";background:{{prom_st==1?'#d40022':'#0097e0'}}">{{djs.sec}}</view> | 120 | + <view class='xc-time-val white t-c' style=" background:{{prom_st==1?'#d40022':'#0097e0'}}"> |
121 | + {{djs.min}} | ||
122 | + </view> | ||
123 | + <view class="xc-time" style="color: {{prom_st==1?'#d40022':'#0097e0'}}">分</view> | ||
124 | + <view class='xc-time-val white t-c' style=";background:{{prom_st==1?'#d40022':'#0097e0'}}"> | ||
125 | + {{djs.sec}} | ||
126 | + </view> | ||
121 | <view class="xc-time" style="color: {{prom_st==1?'#d40022':'#0097e0'}}">秒</view> | 127 | <view class="xc-time" style="color: {{prom_st==1?'#d40022':'#0097e0'}}">秒</view> |
122 | </view> | 128 | </view> |
123 | </view> | 129 | </view> |
124 | - | ||
125 | <view class="pt_fir pd20"> | 130 | <view class="pt_fir pd20"> |
126 | - <!----显示团类型和团价格----> | 131 | + <!-- --显示团类型和团价格-- --> |
127 | <view class="pt_fir_title "> | 132 | <view class="pt_fir_title "> |
128 | <!-- 许程 商家团主页 --> | 133 | <!-- 许程 商家团主页 --> |
129 | <view class="xc-goods-explain flex-vertical-between"> | 134 | <view class="xc-goods-explain flex-vertical-between"> |
130 | - <view class="xc-explain fs32 ellipsis-2" wx:if="{{prom_type!=0 }}"> | 135 | + <view class="xc-explain fs32 ellipsis-2" wx:if="{{prom_type!=0 }}"> |
131 | {{data.goods_name}} | 136 | {{data.goods_name}} |
132 | </view> | 137 | </view> |
133 | - | ||
134 | <!-- 这个是分享按钮 --> | 138 | <!-- 这个是分享按钮 --> |
135 | - <view class="xc-share-frame t-c" bindtap="clickShare"> | ||
136 | - <view class="iconfont icon-share fs60"></view> | ||
137 | - <view class="fs22 c-7b">分享</view> | 139 | + <view class="xc-share-frame t-c" bindtap="clickShare"> |
140 | + <view class="iconfont icon-share fs60"></view> | ||
141 | + <view class="fs22 c-7b">分享</view> | ||
138 | </view> | 142 | </view> |
139 | </view> | 143 | </view> |
140 | </view> | 144 | </view> |
141 | - | ||
142 | - <!----显示价格,阶梯团----> | 145 | + <!-- --显示价格,阶梯团-- --> |
143 | <block wx:if="{{prom_act.kttype==3}}"> | 146 | <block wx:if="{{prom_act.kttype==3}}"> |
144 | <view class="jie_price flex"> | 147 | <view class="jie_price flex"> |
145 | <view style='margin-right:26rpx' wx:for="{{prom_act.ct_rylist}}"> | 148 | <view style='margin-right:26rpx' wx:for="{{prom_act.ct_rylist}}"> |
146 | <view class="fs35 word-color"> | 149 | <view class="fs35 word-color"> |
147 | - <text class="fs24">¥</text>{{item.price}}</view> | 150 | + <text class="fs24">¥</text> |
151 | + {{item.price}} | ||
152 | + </view> | ||
148 | <view class="fs24 t-c xc-person-number ">满{{item.rynum}}人</view> | 153 | <view class="fs24 t-c xc-person-number ">满{{item.rynum}}人</view> |
149 | </view> | 154 | </view> |
150 | </view> | 155 | </view> |
151 | </block> | 156 | </block> |
152 | </view> | 157 | </view> |
153 | - | ||
154 | - <view class="t_gz" wx:if="{{is_show_gz==1}}"> | ||
155 | - {{prom_act.remark}} | ||
156 | - </view> | ||
157 | - | ||
158 | - <!----------正有多少人在开团----------> | 158 | + <view class="t_gz" wx:if="{{is_show_gz==1}}">{{prom_act.remark}}</view> |
159 | + <!-- --------正有多少人在开团-------- --> | ||
159 | <view class="pt_fir se2 bdt16" wx:if="{{teamgroup}}"> | 160 | <view class="pt_fir se2 bdt16" wx:if="{{teamgroup}}"> |
160 | <view class="xc-partner-frame"> | 161 | <view class="xc-partner-frame"> |
161 | <view class="zzk-1 flex jc_sb" bindtap="go_t_more"> | 162 | <view class="zzk-1 flex jc_sb" bindtap="go_t_more"> |
162 | - <view class="pdl10">以下小伙伴正在拼单,可直接参与</view> | ||
163 | - <view class="ckgd flex ai_c">查看详细 | 163 | + <view class="pdl10">以下小伙伴正在拼单,可直接参与</view> |
164 | + <view class="ckgd flex ai_c"> | ||
165 | + 查看详细 | ||
164 | <view class="bg_right arrow-one"></view> | 166 | <view class="bg_right arrow-one"></view> |
165 | </view> | 167 | </view> |
166 | </view> | 168 | </view> |
167 | </view> | 169 | </view> |
168 | <view class='group' wx:for="{{teamgroup}}" wx:for-index="t_ind" wx:key="teamgroup"> | 170 | <view class='group' wx:for="{{teamgroup}}" wx:for-index="t_ind" wx:key="teamgroup"> |
169 | <view class='group-list' bindtap="go_cj_team" data-ind="{{t_ind}}"> | 171 | <view class='group-list' bindtap="go_cj_team" data-ind="{{t_ind}}"> |
170 | - <!-- <view class="flex ai_c"> --> | ||
171 | - <!--//选项框头像--> | ||
172 | - <view class='gtou'> | ||
173 | - <image src='{{item.user.head_pic}}'></image> | ||
174 | - </view> | ||
175 | - <!--//等你来拼--> | ||
176 | - <view class='gdn ellipsis-1'>{{item.user.nickname}}</view> | ||
177 | - <!-- </view> --> | ||
178 | - | ||
179 | - <!--//还差几人,剩余时间--> | 172 | + <!-- <view class="flex ai_c"> --> |
173 | + <!-- //选项框头像 --> | ||
174 | + <view class='gtou'> | ||
175 | + <image src='{{item.user.head_pic}}'></image> | ||
176 | + </view> | ||
177 | + <!-- //等你来拼 --> | ||
178 | + <view class='gdn ellipsis-1'>{{item.user.nickname}}</view> | ||
179 | + <!-- </view> --> | ||
180 | + <!-- //还差几人,剩余时间 --> | ||
180 | <view class="rel"> | 181 | <view class="rel"> |
181 | <view class='ghaicha ellipsis-2'> | 182 | <view class='ghaicha ellipsis-2'> |
182 | - <text class='gred' wx:if="{{prom_act.max_ct_num >0}}"><text class="flex" wx:if="{{prom_act.max_ct_num - item.open_num>0}}">还差<text class="word-color">{{prom_act.max_ct_num - item.open_num}}</text>人享最低优惠</text><text wx:else>您已经享最低优惠</text></text> | ||
183 | - <text class='gred' wx:else>还差<text style='color:#ff2753'>{{prom_act.ct_num - item.open_num}}</text>人成团 </text> | 183 | + <text class='gred' wx:if="{{prom_act.max_ct_num >0}}"> |
184 | + <text class="flex" wx:if="{{prom_act.max_ct_num - item.open_num>0}}"> | ||
185 | + 还差 | ||
186 | + <text class="word-color">{{prom_act.max_ct_num - item.open_num}}</text> | ||
187 | + 人享最低优惠 | ||
188 | + </text> | ||
189 | + <text wx:else>您已经享最低优惠</text> | ||
190 | + </text> | ||
191 | + <text class='gred' wx:else> | ||
192 | + 还差 | ||
193 | + <text style='color:#ff2753'>{{prom_act.ct_num - item.open_num}}</text> | ||
194 | + 人成团 | ||
195 | + </text> | ||
184 | <view class="t_show"> | 196 | <view class="t_show"> |
185 | 剩余 | 197 | 剩余 |
186 | - <text wx:if="{{timer[t_ind].day}}">{{timer[t_ind].day}}天:</text> | ||
187 | - <text>{{timer[t_ind].hou}}</text>: | ||
188 | - <text>{{timer[t_ind].min}}</text>: | 198 | + <text wx:if="{{timer[t_ind].day}}">{{timer[t_ind].day}}天:</text> |
199 | + <text>{{timer[t_ind].hou}}</text> | ||
200 | + : | ||
201 | + <text>{{timer[t_ind].min}}</text> | ||
202 | + : | ||
189 | <text>{{timer[t_ind].sec}}</text> | 203 | <text>{{timer[t_ind].sec}}</text> |
190 | </view> | 204 | </view> |
191 | </view> | 205 | </view> |
192 | </view> | 206 | </view> |
193 | - <!--//参加团--> | ||
194 | - <view class='cjt t-c'> | ||
195 | - 去参团 | ||
196 | - </view> | 207 | + <!-- //参加团 --> |
208 | + <view class='cjt t-c'>去参团</view> | ||
197 | <!-- <view class="clear"></view> --> | 209 | <!-- <view class="clear"></view> --> |
198 | </view> | 210 | </view> |
199 | </view> | 211 | </view> |
200 | </view> | 212 | </view> |
201 | - | ||
202 | - | ||
203 | </view> | 213 | </view> |
204 | - | ||
205 | <!-- 积分购 --> | 214 | <!-- 积分购 --> |
206 | - <view wx:if="{{prom_type==4}}"> | ||
207 | - <view class="goods-price"> | ||
208 | - <!-- 价格显示 --> | ||
209 | - <view class="co-red flex jc_sb ai-center"> | ||
210 | - <view class="market-price" style="overflow: hidden; height: 66rpx;display: flex; align-items: flex-end;"> | ||
211 | - <image class="rel_img" src="{{iurl}}/miniapp/images/integral/integral_red.png"></image> | ||
212 | - <block wx:if="{{prom_integral}}"><text style="position: relative;top:10rpx">{{prom_integral}}</text><text class="rel_txt">积分</text></block> | ||
213 | - <text class="rel_txt" wx:if="{{prom_integral && prom_price}}">+</text> | ||
214 | - <text class="rel_txt" wx:if="{{prom_price}}" >{{filters.toFix(prom_price,2)}}元</text> | ||
215 | - <text class="rel_txt" wx:if="{{!prom_integral && !prom_price}}">0积分</text> | ||
216 | - <text class="rel_txt fs22" decode="{{true}}" space="{{true}}" style="color: #999; text-decoration: line-through;"> 零售价:¥{{filters.toFix(data.market_price,2)}}</text> | ||
217 | - </view> | ||
218 | - | ||
219 | - <!-- 这个是分享按钮 --> | ||
220 | - <!-- <view class="xc-share-frame {{prom_type==1?'s_ms_bth':''}} t-c" bindtap="saveImageToPhotosAlbum"> --> | ||
221 | - <view class="xc-share-frame t-c" bindtap="clickShare"> | ||
222 | - <!-- <image class="share-frame" src="{{iurl}}/miniapp/images/share.png"></image> --> | ||
223 | - <view class="iconfont icon-share fs60"></view> | ||
224 | - <!-- <view class="share-font">1分享</view> --> | ||
225 | - <view class="fs22 c-7b">分享</view> | ||
226 | - </view> | ||
227 | - </view> | ||
228 | - | ||
229 | - | ||
230 | - | ||
231 | - <view class="goods-title"> | ||
232 | - <view class="goods-name elli">{{data.goods_name}}</view> | ||
233 | - </view> | ||
234 | - | ||
235 | - <view class="goods-num"> | ||
236 | - <view class="sales">销量:{{prom_act.buy_num}}件</view> | ||
237 | - <view class="stock">折扣:{{g_filters.num((prom_price?prom_price:0)*10/data.shop_price)}}折</view> | ||
238 | - <view class="stock">{{categories3[0].num}}人评价</view> | ||
239 | - </view> | ||
240 | - </view> | ||
241 | - </view> | ||
242 | - | ||
243 | - <!-- 不是拼团,不是积分购 --> | 215 | + <view wx:if="{{prom_type==4}}"> |
216 | + <view class="goods-price"> | ||
217 | + <!-- 价格显示 --> | ||
218 | + <view class="co-red flex jc_sb ai-center"> | ||
219 | + <view class="market-price" style="overflow: hidden; height: 66rpx;display: flex; align-items: flex-end;"> | ||
220 | + <image class="rel_img" src="{{iurl}}/miniapp/images/integral/integral_red.png"></image> | ||
221 | + <block wx:if="{{prom_integral}}"> | ||
222 | + <text style="position: relative;top:10rpx">{{prom_integral}}</text> | ||
223 | + <text class="rel_txt">积分</text> | ||
224 | + </block> | ||
225 | + <text class="rel_txt" wx:if="{{prom_integral && prom_price}}">+</text> | ||
226 | + <text class="rel_txt" wx:if="{{prom_price}}">{{filters.toFix(prom_price,2)}}元</text> | ||
227 | + <text class="rel_txt" wx:if="{{!prom_integral && !prom_price}}">0积分</text> | ||
228 | + <text class="rel_txt fs22" decode="{{true}}" space="{{true}}" style="color: #999; text-decoration: line-through;"> | ||
229 | + 零售价:¥{{filters.toFix(data.market_price,2)}} | ||
230 | + </text> | ||
231 | + </view> | ||
232 | + <!-- 这个是分享按钮 --> | ||
233 | + <!-- <view class="xc-share-frame {{prom_type==1?'s_ms_bth':''}} t-c" bindtap="saveImageToPhotosAlbum"> --> | ||
234 | + <view class="xc-share-frame t-c" bindtap="clickShare"> | ||
235 | + <!-- <image class="share-frame" src="{{iurl}}/miniapp/images/share.png"></image> --> | ||
236 | + <view class="iconfont icon-share fs60"></view> | ||
237 | + <!-- <view class="share-font">1分享</view> --> | ||
238 | + <view class="fs22 c-7b">分享</view> | ||
239 | + </view> | ||
240 | + </view> | ||
241 | + <view class="goods-title"> | ||
242 | + <view class="goods-name elli">{{data.goods_name}}</view> | ||
243 | + </view> | ||
244 | + <view class="goods-num"> | ||
245 | + <view class="sales">销量:{{prom_act.buy_num}}件</view> | ||
246 | + <view class="stock"> | ||
247 | + 折扣:{{g_filters.num((prom_price?prom_price:0)*10/data.shop_price)}}折 | ||
248 | + </view> | ||
249 | + <view class="stock">{{categories3[0].num}}人评价</view> | ||
250 | + </view> | ||
251 | + </view> | ||
252 | + </view> | ||
253 | + <!-- 不是拼团,不是积分购 --> | ||
244 | <block wx:if="{{prom_type!=6 && prom_type!=4}}"> | 254 | <block wx:if="{{prom_type!=6 && prom_type!=4}}"> |
245 | <view class="goods-price"> | 255 | <view class="goods-price"> |
246 | - | ||
247 | - <view class="flex jc_sb"> | ||
248 | - <view class="co-red" style="" wx:if="{{prom_type==0 || prom_type==3}}"> | ||
249 | - <view class="market-price flex" style="align-items: baseline;"> | ||
250 | - <block wx:if="{{card_field && data[card_field]>0}}"> | ||
251 | - <view class="flex ai-center grade-card-frame"> | ||
252 | - <image class="img" src="{{iurl}}/miniapp/images/userinfo/userinfo/privilege_t.png"></image> | ||
253 | - <view class="fs24 white view card-name ellipsis-1">{{card_name}}</view> | ||
254 | - </view> | ||
255 | - <text class="rel yuan">¥</text>{{filters.toFix(data[card_field],2)}} | ||
256 | - <view class='yj' style="top:35rpx"> | ||
257 | - <text>零售价:¥{{filters.toFix(data.market_price,2)}}</text> | ||
258 | - </view> | ||
259 | - </block> | ||
260 | - <block wx:else> | ||
261 | - <text class="yuan">¥</text>{{filters.toFix(data.shop_price,2)}} | ||
262 | - <view class='yj'><text>零售价:¥{{filters.toFix(data.market_price,2)}}</text></view> | ||
263 | - </block> | ||
264 | - </view> | ||
265 | - | ||
266 | - </view> | ||
267 | - | ||
268 | - <!-- 这个是分享按钮 --> | ||
269 | - <!-- <view class="xc-share-frame {{prom_type==1?'s_ms_bth':''}} t-c" bindtap="saveImageToPhotosAlbum"> --> | ||
270 | - <view class="xc-share-frame t-c" bindtap="clickShare" wx:if="{{prom_type != 1}}"> | ||
271 | - <!-- <image class="share-frame" src="{{iurl}}/miniapp/images/share.png"></image> --> | ||
272 | - <view class="iconfont icon-share fs60"></view> | ||
273 | - <!-- <view class="share-font">1分享</view> --> | ||
274 | - <view class="fs22 c-7b">分享</view> | ||
275 | - </view> | ||
276 | - </view> | ||
277 | - | ||
278 | - | ||
279 | - | 256 | + <view class="flex jc_sb"> |
257 | + <view class="co-red" style="" wx:if="{{prom_type==0 || prom_type==3}}"> | ||
258 | + <view class="market-price flex" style="align-items: baseline;"> | ||
259 | + <block wx:if="{{card_field && data[card_field]>0}}"> | ||
260 | + <view class="flex ai-center grade-card-frame"> | ||
261 | + <image class="img" src="{{iurl}}/miniapp/images/userinfo/userinfo/privilege_t.png"></image> | ||
262 | + <view class="fs24 white view card-name ellipsis-1">{{card_name}}</view> | ||
263 | + </view> | ||
264 | + <text class="rel yuan">¥</text> | ||
265 | + {{filters.toFix(data[card_field],2)}} | ||
266 | + <view class='yj' style="top:35rpx"> | ||
267 | + <text>零售价:¥{{filters.toFix(data.market_price,2)}}</text> | ||
268 | + </view> | ||
269 | + </block> | ||
270 | + <block wx:else> | ||
271 | + <text class="yuan">¥</text> | ||
272 | + {{filters.toFix(data.shop_price,2)}} | ||
273 | + <view class='yj'> | ||
274 | + <text>零售价:¥{{filters.toFix(data.market_price,2)}}</text> | ||
275 | + </view> | ||
276 | + </block> | ||
277 | + </view> | ||
278 | + </view> | ||
279 | + <!-- 这个是分享按钮 --> | ||
280 | + <!-- <view class="xc-share-frame {{prom_type==1?'s_ms_bth':''}} t-c" bindtap="saveImageToPhotosAlbum"> --> | ||
281 | + <view class="xc-share-frame t-c" bindtap="clickShare" wx:if="{{prom_type != 1}}"> | ||
282 | + <!-- <image class="share-frame" src="{{iurl}}/miniapp/images/share.png"></image> --> | ||
283 | + <view class="iconfont icon-share fs60"></view> | ||
284 | + <!-- <view class="share-font">1分享</view> --> | ||
285 | + <view class="fs22 c-7b">分享</view> | ||
286 | + </view> | ||
287 | + </view> | ||
280 | <!-- 不是秒杀 --> | 288 | <!-- 不是秒杀 --> |
281 | - <!-- 等级卡的价格,不是等级卡会员,且商品又有设置等级级价,商家后台有开通升级卡同能 --> | 289 | + <!-- 等级卡的价格,不是等级卡会员,且商品又有设置等级级价,商家后台有开通升级卡同能 --> |
282 | <view class="flex ai_and" wx:if="{{!card_field && g_filters.is_has_rank(rank_switch,data) && prom_type!=1 && card_list && card_list.length>0}}"> | 290 | <view class="flex ai_and" wx:if="{{!card_field && g_filters.is_has_rank(rank_switch,data) && prom_type!=1 && card_list && card_list.length>0}}"> |
283 | - | ||
284 | - <view class="flex ai-center grade-card-frame card-frame" > | ||
285 | - <image class="img" src="{{iurl}}/miniapp/images/userinfo/userinfo/privilege_t.png"></image> | ||
286 | - <view class="fs24 white view card-name ellipsis-1">{{g_filters.get_card_price(data,card_list,1)}}</view> | 291 | + <view class="flex ai-center grade-card-frame card-frame"> |
292 | + <image class="img" src="{{iurl}}/miniapp/images/userinfo/userinfo/privilege_t.png"></image> | ||
293 | + <view class="fs24 white view card-name ellipsis-1"> | ||
294 | + {{g_filters.get_card_price(data,card_list,1)}} | ||
295 | + </view> | ||
296 | + </view> | ||
297 | + <view class="fs32 xc-black3 ai_and carde_frame"> | ||
298 | + <text class="fs26">¥</text> | ||
299 | + {{g_filters.get_card_price(data,card_list,0)}} | ||
300 | + </view> | ||
301 | + </view> | ||
302 | + <!-- 等级卡的显示,购买, 等级卡近30天要显示续费 --> | ||
303 | + <block wx:if="{{g_filters.is_has_rank(rank_switch,data)}}"> | ||
304 | + <!-- 不是秒杀,且会员不是等级会员 --> | ||
305 | + <view wx:if="{{!card_field && prom_type!=1 && card_list && card_list.length>0}}"> | ||
306 | + <view class="beauty-makeup-frame flex ai-center"> | ||
307 | + <view class="left flex ai-center jc_sa"> | ||
308 | + <view class="flex ai-center grade-card-frame card-frame advert-card"> | ||
309 | + <image class="img" src="{{iurl}}/miniapp/images/userinfo/userinfo/privilege_t.png"></image> | ||
310 | + <view class="fs24 white view card-name ellipsis-1"> | ||
311 | + {{g_filters.get_card_price(data,card_list,1)}} | ||
312 | + </view> | ||
313 | + </view> | ||
314 | + <view class="card-effect"> | ||
315 | + <view class="fs24 xc-black3"> | ||
316 | + 成为{{g_filters.get_card_price(data,card_list,1)}}立 | ||
317 | + <text class="co-red"> | ||
318 | + 省{{filters.toFix(data.shop_price-g_filters.get_card_price(data,card_list,0),2)}} | ||
319 | + </text> | ||
320 | + 元 | ||
321 | + </view> | ||
322 | + <view class="fs22 xc-ash">开通会员 尽享更多优惠</view> | ||
323 | + </view> | ||
287 | </view> | 324 | </view> |
288 | - <view class="fs32 xc-black3 ai_and carde_frame"> | ||
289 | - <text class="fs26"> | ||
290 | - ¥</text>{{g_filters.get_card_price(data,card_list,0)}} | 325 | + <view class="right flex jc-center ai-center" bindtap="go_plus"> |
326 | + <view class="at_once_carde xc-black3 fs28">立即开卡</view> | ||
327 | + <view class="bg_right"></view> | ||
291 | </view> | 328 | </view> |
292 | - </view> | ||
293 | - | ||
294 | - <!-- 等级卡的显示,购买, 等级卡近30天要显示续费--> | ||
295 | - | ||
296 | - <block wx:if="{{g_filters.is_has_rank(rank_switch,data)}}"> | ||
297 | - | ||
298 | - <!-- 不是秒杀,且会员不是等级会员 --> | ||
299 | - <view wx:if="{{!card_field && prom_type!=1 && card_list && card_list.length>0}}"> | ||
300 | - <view class="beauty-makeup-frame flex ai-center"> | ||
301 | - <view class="left flex ai-center jc_sa"> | ||
302 | - <view class="flex ai-center grade-card-frame card-frame advert-card"> | ||
303 | - <image class="img" src="{{iurl}}/miniapp/images/userinfo/userinfo/privilege_t.png"></image> | ||
304 | - <view class="fs24 white view card-name ellipsis-1">{{g_filters.get_card_price(data,card_list,1)}}</view> | ||
305 | - </view> | ||
306 | - <view class="card-effect"> | ||
307 | - <view class="fs24 xc-black3">成为{{g_filters.get_card_price(data,card_list,1)}}立<text class="co-red">省{{filters.toFix(data.shop_price-g_filters.get_card_price(data,card_list,0),2)}}</text>元</view> | ||
308 | - <view class="fs22 xc-ash"> 开通会员 尽享更多优惠 </view> | ||
309 | - </view> | ||
310 | - </view> | ||
311 | - <view class="right flex jc-center ai-center" bindtap="go_plus"> | ||
312 | - <view class="at_once_carde xc-black3 fs28">立即开卡</view> | ||
313 | - <view class="bg_right"></view> | ||
314 | - </view> | ||
315 | - | ||
316 | - </view> | ||
317 | - </view> | ||
318 | - <!-- 立即续费的显示 --> | ||
319 | - <view wx:elif="{{is_near_date && data[card_field]>0 && prom_type!=1}}"> | ||
320 | - <view class="beauty-makeup-frame flex ai-center"> | ||
321 | - <view class="left flex ai-center jc_sa"> | ||
322 | - <view class="flex ai-center grade-card-frame card-frame advert-card"> | ||
323 | - <image class="img" src="{{iurl}}/miniapp/images/userinfo/userinfo/privilege_t.png"></image> | ||
324 | - <view class="fs24 white view card-name ellipsis-1">{{card_name}}</view> | ||
325 | - </view> | ||
326 | - <view class="card-effect"> | ||
327 | - <view class="fs24 xc-black3">成为{{card_name}}立<text class="co-red">省{{filters.toFix(data.shop_price[card_field],2)}}</text>元</view> | ||
328 | - <view class="fs22 xc-ash"> 开通会员 尽享更多优惠 </view> | ||
329 | - </view> | ||
330 | - </view> | ||
331 | - <view class="right flex jc-center ai-center" bindtap="go_card_info"> | ||
332 | - <view class="at_once_carde xc-black3 fs28">立即续费</view> | ||
333 | - <view class="bg_right"></view> | ||
334 | - </view> | ||
335 | - | ||
336 | - </view> | ||
337 | - | ||
338 | - </view> | ||
339 | - | ||
340 | - </block> | ||
341 | - <!--许程商品名字--> | ||
342 | - | 329 | + </view> |
330 | + </view> | ||
331 | + <!-- 立即续费的显示 --> | ||
332 | + <view wx:elif="{{is_near_date && data[card_field]>0 && prom_type!=1}}"> | ||
333 | + <view class="beauty-makeup-frame flex ai-center"> | ||
334 | + <view class="left flex ai-center jc_sa"> | ||
335 | + <view class="flex ai-center grade-card-frame card-frame advert-card"> | ||
336 | + <image class="img" src="{{iurl}}/miniapp/images/userinfo/userinfo/privilege_t.png"></image> | ||
337 | + <view class="fs24 white view card-name ellipsis-1">{{card_name}}</view> | ||
338 | + </view> | ||
339 | + <view class="card-effect"> | ||
340 | + <view class="fs24 xc-black3"> | ||
341 | + 成为{{card_name}}立 | ||
342 | + <text class="co-red"> | ||
343 | + 省{{filters.toFix(data.shop_price[card_field],2)}} | ||
344 | + </text> | ||
345 | + 元 | ||
346 | + </view> | ||
347 | + <view class="fs22 xc-ash">开通会员 尽享更多优惠</view> | ||
348 | + </view> | ||
349 | + </view> | ||
350 | + <view class="right flex jc-center ai-center" bindtap="go_card_info"> | ||
351 | + <view class="at_once_carde xc-black3 fs28">立即续费</view> | ||
352 | + <view class="bg_right"></view> | ||
353 | + </view> | ||
354 | + </view> | ||
355 | + </view> | ||
356 | + </block> | ||
357 | + <!-- 许程商品名字 --> | ||
343 | <view wx:if="{{prom_type!=1}}"> | 358 | <view wx:if="{{prom_type!=1}}"> |
344 | <view class="goods-title"> | 359 | <view class="goods-title"> |
345 | <view class="goods-name elli">{{data.goods_name}}</view> | 360 | <view class="goods-name elli">{{data.goods_name}}</view> |
346 | </view> | 361 | </view> |
347 | </view> | 362 | </view> |
348 | - | ||
349 | <view class="goods-num" wx:if="{{prom_type!=1}}"> | 363 | <view class="goods-num" wx:if="{{prom_type!=1}}"> |
350 | <view class="sales">销量:{{data.sales_sum}}件</view> | 364 | <view class="sales">销量:{{data.sales_sum}}件</view> |
351 | <view class="stock">折扣:{{data.disc}}折</view> | 365 | <view class="stock">折扣:{{data.disc}}折</view> |
@@ -354,18 +368,20 @@ | @@ -354,18 +368,20 @@ | ||
354 | <view wx:if="{{prom_type==1}}"> | 368 | <view wx:if="{{prom_type==1}}"> |
355 | <view class="flex jc_sb"> | 369 | <view class="flex jc_sb"> |
356 | <view class="flex" style="align-items: baseline;"> | 370 | <view class="flex" style="align-items: baseline;"> |
357 | - <view class="flex xc-price-frame"><text class="fs30">¥</text>{{prom_price}}</view> | 371 | + <view class="flex xc-price-frame"> |
372 | + <text class="fs30">¥</text> | ||
373 | + {{prom_price}} | ||
374 | + </view> | ||
358 | <view class="word-line fs24">零售价¥{{filters.toFix(data.market_price,2)}}</view> | 375 | <view class="word-line fs24">零售价¥{{filters.toFix(data.market_price,2)}}</view> |
359 | </view> | 376 | </view> |
360 | - | ||
361 | - <!-- 这个是分享按钮 --> | ||
362 | - <!-- <view class="xc-share-frame {{prom_type==1?'s_ms_bth':''}} t-c" bindtap="saveImageToPhotosAlbum"> --> | ||
363 | - <view class="xc-share-frame t-c" bindtap="clickShare"> | ||
364 | - <!-- <image class="share-frame" src="{{iurl}}/miniapp/images/share.png"></image> --> | ||
365 | - <view class="iconfont icon-share fs60"></view> | ||
366 | - <!-- <view class="share-font">1分享</view> --> | ||
367 | - <view class="fs22 c-7b">分享</view> | ||
368 | - </view> | 377 | + <!-- 这个是分享按钮 --> |
378 | + <!-- <view class="xc-share-frame {{prom_type==1?'s_ms_bth':''}} t-c" bindtap="saveImageToPhotosAlbum"> --> | ||
379 | + <view class="xc-share-frame t-c" bindtap="clickShare"> | ||
380 | + <!-- <image class="share-frame" src="{{iurl}}/miniapp/images/share.png"></image> --> | ||
381 | + <view class="iconfont icon-share fs60"></view> | ||
382 | + <!-- <view class="share-font">1分享</view> --> | ||
383 | + <view class="fs22 c-7b">分享</view> | ||
384 | + </view> | ||
369 | <!-- <view class="xc-val-price"> | 385 | <!-- <view class="xc-val-price"> |
370 | <view class="fs30" style='padding-left:13rpx;' wx:if="{{prom_st==1}}" >已抢:{{prom_act.buy_num+prom_act.virtual}}件</view> | 386 | <view class="fs30" style='padding-left:13rpx;' wx:if="{{prom_st==1}}" >已抢:{{prom_act.buy_num+prom_act.virtual}}件</view> |
371 | <view class="fs30" style='padding-left:13rpx;' wx:else >已抢:0件</view> | 387 | <view class="fs30" style='padding-left:13rpx;' wx:else >已抢:0件</view> |
@@ -373,246 +389,244 @@ | @@ -373,246 +389,244 @@ | ||
373 | </view> --> | 389 | </view> --> |
374 | </view> | 390 | </view> |
375 | </view> | 391 | </view> |
376 | - | ||
377 | <view class="xc-explain fs32 ellipsis-2" wx:if="{{prom_type!=0 && prom_type!=4}}"> | 392 | <view class="xc-explain fs32 ellipsis-2" wx:if="{{prom_type!=0 && prom_type!=4}}"> |
378 | {{data.goods_name}} | 393 | {{data.goods_name}} |
379 | </view> | 394 | </view> |
380 | - | ||
381 | <!-- <view wx:if="{{prom_type==1}}" style='height:58rpx'></view> --> | 395 | <!-- <view wx:if="{{prom_type==1}}" style='height:58rpx'></view> --> |
382 | <!-- 许程 7.24 暂时注释 --> | 396 | <!-- 许程 7.24 暂时注释 --> |
383 | <view wx:if="{{prom_type==1}}"> | 397 | <view wx:if="{{prom_type==1}}"> |
384 | <view class="goods-num" wx:if="{{prom_type==1}}"> | 398 | <view class="goods-num" wx:if="{{prom_type==1}}"> |
385 | - | ||
386 | - <block wx:if="prom_st>0" > | 399 | + <block wx:if="prom_st>0"> |
387 | <view class="stock">总数量:{{prom_act.goods_num+prom_act.virtual}}件</view> | 400 | <view class="stock">总数量:{{prom_act.goods_num+prom_act.virtual}}件</view> |
388 | <view class="stock">限购:{{prom_act.buy_limit}}件</view> | 401 | <view class="stock">限购:{{prom_act.buy_limit}}件</view> |
389 | <block wx:if="{{prom_st==0}}"> | 402 | <block wx:if="{{prom_st==0}}"> |
390 | - <view class="sales">已购:0件</view> | ||
391 | - </block> | ||
392 | - <block wx:else> | ||
393 | - <view class="sales">已购:{{prom_act.buy_num+prom_act.virtual}}件</view> | ||
394 | - </block> | 403 | + <view class="sales">已购:0件</view> |
404 | + </block> | ||
405 | + <block wx:else> | ||
406 | + <view class="sales">已购:{{prom_act.buy_num+prom_act.virtual}}件</view> | ||
407 | + </block> | ||
395 | </block> | 408 | </block> |
396 | - | ||
397 | <block wx:else> | 409 | <block wx:else> |
398 | - <view class="stock">总数量:{{prom_act.goods_num}}件</view> | ||
399 | - <view class="stock">限购:{{prom_act.buy_limit}}件</view> | ||
400 | - <view class="sales">已购:{{prom_act.buy_num}}件</view> | 410 | + <view class="stock">总数量:{{prom_act.goods_num}}件</view> |
411 | + <view class="stock">限购:{{prom_act.buy_limit}}件</view> | ||
412 | + <view class="sales">已购:{{prom_act.buy_num}}件</view> | ||
401 | </block> | 413 | </block> |
402 | - | ||
403 | </view> | 414 | </view> |
404 | </view> | 415 | </view> |
405 | - | ||
406 | </view> | 416 | </view> |
407 | </block> | 417 | </block> |
408 | - | ||
409 | - <!-- 门店收货地址 --> | ||
410 | - <view class="xc-address_frame bdt16 flex-vertical xc-ash {{def_pick_store!=null?'sn_height':'on_height'}}" > | ||
411 | - <view class="address_frame" bindtap="choice_store" data-ind="0"> | ||
412 | - <view class="flex-vertical-between "> | ||
413 | - <view class="flex-vertical select_store_height"> | ||
414 | - <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image> | ||
415 | - <view class="fs30" style="color:black;">选择门店</view> | ||
416 | - </view> | ||
417 | - <view class="red_bb fs26"> | ||
418 | - 更多门店 | ||
419 | - <text class="bg_jj"></text> | ||
420 | - </view> | 418 | + <!-- 门店收货地址 --> |
419 | + <view class="xc-address_frame bdt16 flex-vertical xc-ash {{def_pick_store!=null?'sn_height':'on_height'}}"> | ||
420 | + <view class="address_frame" bindtap="choice_store" data-ind="0"> | ||
421 | + <view class="flex-vertical-between "> | ||
422 | + <view class="flex-vertical select_store_height"> | ||
423 | + <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image> | ||
424 | + <view class="fs30" style="color:black;">选择门店</view> | ||
425 | + </view> | ||
426 | + <view class="red_bb fs26"> | ||
427 | + 更多门店 | ||
428 | + <text class="bg_jj"></text> | ||
429 | + </view> | ||
430 | + </view> | ||
431 | + <view wx:if="{{def_pick_store && def_pick_store.pickup_name}}"> | ||
432 | + <view class="flex-space-between address ai_end pdv10"> | ||
433 | + <view> | ||
434 | + <text class="fs30 xc-black3 shop_name bold">{{def_pick_store.pickup_name}}</text> | ||
435 | + </view> | ||
436 | + <view class="distance fs24" wx:if="{{def_pick_store.distance!=null}}"> | ||
437 | + 距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}} | ||
438 | + </view> | ||
439 | + </view> | ||
440 | + <view class="no_store" wx:if="{{only_pk && !only_pk.length}}">(库存不足)</view> | ||
441 | + <block wx:else> | ||
442 | + <view class="no_store" wx:if="{{def_pickpu_list && !def_pickpu_list.length}}"> | ||
443 | + (库存不足) | ||
444 | + </view> | ||
445 | + <block wx:else> | ||
446 | + <view class="no_store" wx:if="{{def_pick_store && def_pick_store.is_no_dis}}"> | ||
447 | + (配送不匹配) | ||
421 | </view> | 448 | </view> |
422 | - | ||
423 | - <view wx:if="{{def_pick_store && def_pick_store.pickup_name}}"> | ||
424 | - <view class="flex-space-between address ai_end pdv10"> | ||
425 | - <view> | ||
426 | - <text class="fs30 xc-black3 shop_name bold">{{def_pick_store.pickup_name}}</text> | ||
427 | - </view> | ||
428 | - <view class="distance fs24"wx:if="{{def_pick_store.distance!=null}}"> | ||
429 | - 距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}} | ||
430 | - | ||
431 | - </view> | ||
432 | - </view> | ||
433 | - | ||
434 | - | ||
435 | - <view class="no_store" wx:if="{{only_pk && !only_pk.length}}">(库存不足)</view> | ||
436 | - <block wx:else> | ||
437 | - <view class="no_store" wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">(库存不足)</view> | ||
438 | - <block wx:else> | ||
439 | - <view class="no_store" wx:if="{{def_pick_store && def_pick_store.is_no_dis}}">(配送不匹配)</view> | ||
440 | - <view class="no_store" wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && sales_rules==2 && prom_type==0}}">(库存不足)</view> | ||
441 | - </block> | ||
442 | - </block> | ||
443 | - | ||
444 | - <view class="fs24 xc-ash-9f">地址:{{def_pick_store.fulladdress}}</view> | 449 | + <view class="no_store" wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && sales_rules==2 && prom_type==0}}"> |
450 | + (库存不足) | ||
445 | </view> | 451 | </view> |
446 | - </view> | ||
447 | - | 452 | + </block> |
453 | + </block> | ||
454 | + <view class="fs24 xc-ash-9f">地址:{{def_pick_store.fulladdress}}</view> | ||
448 | </view> | 455 | </view> |
449 | - | ||
450 | - <!--许程 7.24暂时注释 --> | 456 | + </view> |
457 | + </view> | ||
458 | + <!-- 许程 7.24暂时注释 --> | ||
451 | <view class="bdt16" wx:if="{{prom_type!=1&&prom_act.kttype!=3&&prom_act.kttype!=2&&prom_act.kttype!=1 && is_closecoupon!=1}}"> | 459 | <view class="bdt16" wx:if="{{prom_type!=1&&prom_act.kttype!=3&&prom_act.kttype!=2&&prom_act.kttype!=1 && is_closecoupon!=1}}"> |
452 | <view class="cx-frame flex" style="position: relative" wx:if="{{fir_quan.length>0}}"> | 460 | <view class="cx-frame flex" style="position: relative" wx:if="{{fir_quan.length>0}}"> |
453 | <view class="cx-sizs fs30">领券</view> | 461 | <view class="cx-sizs fs30">领券</view> |
454 | - <view class="flex ai_c f1 pdh20"> | ||
455 | - <view class="xc-coupon-fram" wx:for="{{fir_quan}}" wx:key="{{index}}"> | ||
456 | - <view class="circle xc-circular xc-one"></view> | ||
457 | - <view class="xc-coupon t-c four-level-word">满{{item.condition}}减{{item.money}}</view> | ||
458 | - <view class="circle xc-circular xc-two"></view> | ||
459 | - </view> | ||
460 | - </view> | ||
461 | - | 462 | + <view class="flex ai_c f1 pdh20"> |
463 | + <view class="xc-coupon-fram" wx:for="{{fir_quan}}" wx:key="{{index}}"> | ||
464 | + <view class="circle xc-circular xc-one"></view> | ||
465 | + <view class="xc-coupon t-c four-level-word"> | ||
466 | + 满{{item.condition}}减{{item.money}} | ||
467 | + </view> | ||
468 | + <view class="circle xc-circular xc-two"></view> | ||
469 | + </view> | ||
470 | + </view> | ||
462 | <view data-coupon="1" bindtap="switchCoupon" class="cx-obtain-coupon wsize"> | 471 | <view data-coupon="1" bindtap="switchCoupon" class="cx-obtain-coupon wsize"> |
463 | <text class="bg_jj"></text> | 472 | <text class="bg_jj"></text> |
464 | </view> | 473 | </view> |
465 | </view> | 474 | </view> |
466 | </view> | 475 | </view> |
467 | - | ||
468 | - | ||
469 | - | ||
470 | - | ||
471 | <!-- 要判断是不是有促销活动 --> | 476 | <!-- 要判断是不是有促销活动 --> |
472 | <block wx:if="{{prom_goods}}"> | 477 | <block wx:if="{{prom_goods}}"> |
473 | - <view class="cx-frame flex" style="position: relative; height: auto" > | 478 | + <view class="cx-frame flex" style="position: relative; height: auto"> |
474 | <view class="cx-sizs fs30">促销</view> | 479 | <view class="cx-sizs fs30">促销</view> |
475 | <!-- 中间显示层 --> | 480 | <!-- 中间显示层 --> |
476 | <view class="f1 pdh20"> | 481 | <view class="f1 pdh20"> |
477 | - | ||
478 | - <view class="cx_show_view flex fs28" wx:for="{{prom_goods}}"> | ||
479 | - <view class="prom_condition">消费满{{item.condition}}<text wx:if="{{item.prom_type==1}}">件</text><text wx:else>元</text></view> | ||
480 | - <view class="word {{is_more_cx?'':'ellipsis-1'}}"> | ||
481 | - <text wx:if="{{item.money>0}}">减价{{item.money}}元;</text> | ||
482 | - <text wx:if="{{item.sale>0}}">打{{item.sale}}折;</text> | ||
483 | - <text wx:if="{{item.past==1}}">包邮;</text> | ||
484 | - <text wx:if="{{item.intValue>0}}">送{{tem.intValue}}积分;</text> | ||
485 | - <text wx:if="{{item.couponId>0}}">送{{item.couponMoney}}元优惠券;</text> | ||
486 | - <text wx:if="{{item.gift_id>0}}">送商品{{item.goods_name}};</text> | ||
487 | - <text wx:if="{{item.lb_id>0}}">送{{item.lbtitle}};</text> | ||
488 | - </view> | ||
489 | - </view> | 482 | + <view class="cx_show_view flex fs28" wx:for="{{prom_goods}}"> |
483 | + <view class="prom_condition"> | ||
484 | + 消费满{{item.condition}} | ||
485 | + <text wx:if="{{item.prom_type==1}}">件</text> | ||
486 | + <text wx:else>元</text> | ||
487 | + </view> | ||
488 | + <view class="word {{is_more_cx?'':'ellipsis-1'}}"> | ||
489 | + <text wx:if="{{item.money>0}}">减价{{item.money}}元;</text> | ||
490 | + <text wx:if="{{item.sale>0}}">打{{item.sale}}折;</text> | ||
491 | + <text wx:if="{{item.past==1}}">包邮;</text> | ||
492 | + <text wx:if="{{item.intValue>0}}">送{{tem.intValue}}积分;</text> | ||
493 | + <text wx:if="{{item.couponId>0}}">送{{item.couponMoney}}元优惠券;</text> | ||
494 | + <text wx:if="{{item.gift_id>0}}">送商品{{item.goods_name}};</text> | ||
495 | + <text wx:if="{{item.lb_id>0}}">送{{item.lbtitle}};</text> | ||
496 | + </view> | ||
497 | + </view> | ||
490 | </view> | 498 | </view> |
491 | <view data-coupon="1" bindtap="show_more_cx" class="cx-obtain-coupon wsize"> | 499 | <view data-coupon="1" bindtap="show_more_cx" class="cx-obtain-coupon wsize"> |
492 | <text class="bg_jj {{is_more_cx?'down1':''}}"></text> | 500 | <text class="bg_jj {{is_more_cx?'down1':''}}"></text> |
493 | </view> | 501 | </view> |
494 | </view> | 502 | </view> |
495 | </block> | 503 | </block> |
496 | - | ||
497 | <!-- 要判断是不是有订单优惠 --> | 504 | <!-- 要判断是不是有订单优惠 --> |
498 | <block wx:if="{{order_prom}}"> | 505 | <block wx:if="{{order_prom}}"> |
499 | - <view class="cx-frame flex" style="position: relative; height: auto" > | 506 | + <view class="cx-frame flex" style="position: relative; height: auto"> |
500 | <view class="cx-sizs wsize" style="width: 144rpx">订单优惠</view> | 507 | <view class="cx-sizs wsize" style="width: 144rpx">订单优惠</view> |
501 | <!-- 中间显示层 --> | 508 | <!-- 中间显示层 --> |
502 | <view class="flex ai-center"> | 509 | <view class="flex ai-center"> |
503 | - <image class="hui_img" src="{{iurl}}/miniapp//images/hui.png"></image> | ||
504 | - <view class="order_hui"> | ||
505 | - <view class="fs28 ellipsis-1">{{order_prom.name}}</view> | ||
506 | - <view class="fs26" >(活动时间:{{tool.format_tt(order_prom.start_time)}} - {{tool.format_tt(order_prom.end_time)}})</view> | ||
507 | - </view> | 510 | + <image class="hui_img" src="{{iurl}}/miniapp//images/hui.png"></image> |
511 | + <view class="order_hui"> | ||
512 | + <view class="fs28 ellipsis-1">{{order_prom.name}}</view> | ||
513 | + <view class="fs26"> | ||
514 | + (活动时间:{{tool.format_tt(order_prom.start_time)}} - {{tool.format_tt(order_prom.end_time)}}) | ||
515 | + </view> | ||
516 | + </view> | ||
508 | </view> | 517 | </view> |
509 | </view> | 518 | </view> |
510 | </block> | 519 | </block> |
511 | - | ||
512 | - | ||
513 | <!-- 要判断是不是有组合优惠 --> | 520 | <!-- 要判断是不是有组合优惠 --> |
514 | <block wx:if="{{zh_act}}"> | 521 | <block wx:if="{{zh_act}}"> |
515 | - <view class="cx-frame flex" style="position: relative; height: auto" > | ||
516 | - <view class="cx-sizs wsize" style="width: 144rpx">组合购</view> | ||
517 | - <!-- 中间显示层 --> | ||
518 | - <view class="flex ai-center jc_sb" style="width: 570rpx" bindtap="go_zh" data-id="{{zh_act.id}}" > | ||
519 | - <view class="flex"> | ||
520 | - <image class="hui_img" src="{{iurl}}/miniapp//images/hui.png"></image> | ||
521 | - <view class="order_hui"> | ||
522 | - <view class="fs28 ellipsis-1">{{zh_act.name}}</view> | ||
523 | - <view class="fs26" >(活动时间:{{tool.format_tt(zh_act.start_time)}} - {{tool.format_tt(zh_act.end_time)}})</view> | ||
524 | - </view> | ||
525 | - </view> | ||
526 | - <view><text class="bg_jj is_more_cx" style="position: relative;top:-10rpx"></text></view> | 522 | + <view class="cx-frame flex" style="position: relative; height: auto"> |
523 | + <view class="cx-sizs wsize" style="width: 144rpx">组合购</view> | ||
524 | + <!-- 中间显示层 --> | ||
525 | + <view class="flex ai-center jc_sb" style="width: 570rpx" bindtap="go_zh" data-id="{{zh_act.id}}"> | ||
526 | + <view class="flex"> | ||
527 | + <image class="hui_img" src="{{iurl}}/miniapp//images/hui.png"></image> | ||
528 | + <view class="order_hui"> | ||
529 | + <view class="fs28 ellipsis-1">{{zh_act.name}}</view> | ||
530 | + <view class="fs26"> | ||
531 | + (活动时间:{{tool.format_tt(zh_act.start_time)}} - {{tool.format_tt(zh_act.end_time)}}) | ||
527 | </view> | 532 | </view> |
533 | + </view> | ||
528 | </view> | 534 | </view> |
529 | - </block> | ||
530 | - | ||
531 | - | 535 | + <view> |
536 | + <text class="bg_jj is_more_cx" style="position: relative;top:-10rpx"></text> | ||
537 | + </view> | ||
538 | + </view> | ||
539 | + </view> | ||
540 | + </block> | ||
532 | <view class="bz_view flex bdt16" wx:if="{{bconfig}}" style=""> | 541 | <view class="bz_view flex bdt16" wx:if="{{bconfig}}" style=""> |
533 | <image class="bzfu_img" src="{{iurl}}/miniapp/images/bzfu_w.png"></image> | 542 | <image class="bzfu_img" src="{{iurl}}/miniapp/images/bzfu_w.png"></image> |
534 | - <view class="flex f1 ai_c rel"> | ||
535 | - <view class="bz-content {{flag ? '':'ellipsis-1'}} f1">{{bconfig.service_bz}}</view> | ||
536 | - <view bindtap="clickCollapse" class="cx-obtain-coupon wsize arrow"> | ||
537 | - <text class="bg_jj {{flag?'down1':''}}"></text> | ||
538 | - </view> | ||
539 | - <!-- <text class="bg_jj" bindtap="clickCollapse"></text> --> | ||
540 | - <!-- <text class="iconfont icon-shuangjiantouxia c-db"></text> --> | ||
541 | - </view> | ||
542 | - | 543 | + <view class="flex f1 ai_c rel"> |
544 | + <view class="bz-content {{flag ? '':'ellipsis-1'}} f1">{{bconfig.service_bz}}</view> | ||
545 | + <view bindtap="clickCollapse" class="cx-obtain-coupon wsize arrow"> | ||
546 | + <text class="bg_jj {{flag?'down1':''}}"></text> | ||
547 | + </view> | ||
548 | + <!-- <text class="bg_jj" bindtap="clickCollapse"></text> --> | ||
549 | + <!-- <text class="iconfont icon-shuangjiantouxia c-db"></text> --> | ||
550 | + </view> | ||
543 | </view> | 551 | </view> |
544 | - | ||
545 | - | ||
546 | - <!--- 搭配促销 ----> | 552 | + <!-- - 搭配促销 -- --> |
547 | <view class="dp_cx_view" wx:if="{{collocationGoods}}"> | 553 | <view class="dp_cx_view" wx:if="{{collocationGoods}}"> |
548 | <view class="bb_view"> | 554 | <view class="bb_view"> |
549 | <view>优惠热配</view> | 555 | <view>优惠热配</view> |
550 | - <view class="red_bb" bindtap="go_prom_list">查看全部 | 556 | + <view class="red_bb" bindtap="go_prom_list"> |
557 | + 查看全部 | ||
551 | <text class="bg_jj"></text> | 558 | <text class="bg_jj"></text> |
552 | </view> | 559 | </view> |
553 | </view> | 560 | </view> |
554 | - | ||
555 | <!-- 搭配的显示 --> | 561 | <!-- 搭配的显示 --> |
556 | <view class="flex" bindtap="go_prom_list"> | 562 | <view class="flex" bindtap="go_prom_list"> |
557 | - <image class="dp_img" src="{{iurl+collocationGoods.img_url}}"></image> | ||
558 | - <view class="act_content"> | ||
559 | - <view class="fs32">{{collocationGoods.title}}</view> | ||
560 | - <view class="fs30 color_b" wx:if="{{collocationGoods.max!=collocationGoods.min}}">搭配价¥{{collocationGoods.min}}-{{collocationGoods.max}}</view> | ||
561 | - <view class="fs30 color_b" wx:else>搭配价¥{{collocationGoods.min}}</view> | ||
562 | - <view class="fs30 color-gray">活动至{{filters.format_time(collocationGoods.end_time,1)}}</view> | ||
563 | - </view> | 563 | + <image class="dp_img" src="{{iurl+collocationGoods.img_url}}"></image> |
564 | + <view class="act_content"> | ||
565 | + <view class="fs32">{{collocationGoods.title}}</view> | ||
566 | + <view class="fs30 color_b" wx:if="{{collocationGoods.max!=collocationGoods.min}}"> | ||
567 | + 搭配价¥{{collocationGoods.min}}-{{collocationGoods.max}} | ||
568 | + </view> | ||
569 | + <view class="fs30 color_b" wx:else>搭配价¥{{collocationGoods.min}}</view> | ||
570 | + <view class="fs30 color-gray"> | ||
571 | + 活动至{{filters.format_time(collocationGoods.end_time,1)}} | ||
572 | + </view> | ||
573 | + </view> | ||
564 | </view> | 574 | </view> |
565 | </view> | 575 | </view> |
566 | - | ||
567 | - | ||
568 | - <!--- 宝贝评价 ----> | 576 | + <!-- - 宝贝评价 -- --> |
569 | <view class="bdt16"> | 577 | <view class="bdt16"> |
570 | <view class="bb_view"> | 578 | <view class="bb_view"> |
571 | <view class="bold">宝贝评价({{categories3[0].num}})</view> | 579 | <view class="bold">宝贝评价({{categories3[0].num}})</view> |
572 | - <view class="red_bb fs26" bindtap="look_pj">查看全部 | 580 | + <view class="red_bb fs26" bindtap="look_pj"> |
581 | + 查看全部 | ||
573 | <text class="bg_jj"></text> | 582 | <text class="bg_jj"></text> |
574 | </view> | 583 | </view> |
575 | </view> | 584 | </view> |
576 | - | ||
577 | <view class="xc_comment"> | 585 | <view class="xc_comment"> |
578 | - <view class="xc_comment-have-pictures" data-val="5" bindtap="clik_evaluate">有图({{categories3[1].num}}) </view> | ||
579 | - <view class="xc_comment-discuss" data-val="2" bindtap="clik_evaluate">好评({{categories3[2].num}}) </view> | ||
580 | - <view class="xc_comment-discuss" data-val="3" bindtap="clik_evaluate">中评({{categories3[3].num}}) </view> | ||
581 | - <view class="xc_comment-discuss" data-val="4"bindtap="clik_evaluate">差评({{categories3[4].num}}) </view> | 586 | + <view class="xc_comment-have-pictures" data-val="5" bindtap="clik_evaluate"> |
587 | + 有图({{categories3[1].num}}) | ||
588 | + </view> | ||
589 | + <view class="xc_comment-discuss" data-val="2" bindtap="clik_evaluate"> | ||
590 | + 好评({{categories3[2].num}}) | ||
591 | + </view> | ||
592 | + <view class="xc_comment-discuss" data-val="3" bindtap="clik_evaluate"> | ||
593 | + 中评({{categories3[3].num}}) | ||
594 | + </view> | ||
595 | + <view class="xc_comment-discuss" data-val="4" bindtap="clik_evaluate"> | ||
596 | + 差评({{categories3[4].num}}) | ||
597 | + </view> | ||
582 | </view> | 598 | </view> |
583 | - | ||
584 | <scroll-view scroll-x="true" class="pj_scroll"> | 599 | <scroll-view scroll-x="true" class="pj_scroll"> |
585 | - <view class="flex"> | ||
586 | - <view class="xc_comment-detail" style="" wx:for="{{fir_comments}}" wx:key="fir_comments"> | ||
587 | - <view class="xc_comment-left"> | ||
588 | - <view class="xc_comment-user"> | ||
589 | - <view class="xc_user-img"> | ||
590 | - <image class="xc_imgs" src='{{item.is_anonymous!=1?item.head_pic:iurl+"/miniapp/images/hui_hear_pic.png"}}' binderror="bind_bnerr2" data-errorimg="fir_comments[{{index}}].head_pic"></image> | ||
591 | - </view> | ||
592 | - | ||
593 | - <view class="xc_user"> | ||
594 | - <view class="xc_user-name five-level-word">{{item.is_anonymous!=1?item.username:'匿名'}}</view> | ||
595 | - <image class="xc_comment-img" src="{{iurl}}/miniapp/images/star-red.png" wx:for="{{item.sum_rank}}" wx:key="{{index}}"></image> | ||
596 | - </view> | ||
597 | - </view> | ||
598 | - <view class="xc_comment-font pj_word_size ellipsis-1 pdt12"> | ||
599 | - <text class="ellipsis-1">{{item.content?item.content:'此用户没有填写评价。'}} </text> | ||
600 | - </view> | ||
601 | - <view class="xc_comment-val"> | ||
602 | - <view class="xc_comment-time">{{item.add_time}}</view> | ||
603 | - | ||
604 | - </view> | ||
605 | - </view> | ||
606 | - <view class="xc_goods-img-frame"> | ||
607 | - <image wx:if="{{item.img[0]!=undefined && item.img[0]!=null}}" class="xc_goods-img" src='{{iurl+item.img[0]}}'></image> | ||
608 | - <image wx:elif="{{item.weapp_img[0]!=undefined && item.weapp_img[0]!=null}}" class="xc_goods-img" src='{{item.weapp_img[0]}}'></image> | ||
609 | - <image wx:else class="xc_goods-img" src='{{gallery[0].image_url}}'></image> | ||
610 | - </view> | ||
611 | - </view> | ||
612 | - </view> | 600 | + <view class="flex"> |
601 | + <view class="xc_comment-detail" style="" wx:for="{{fir_comments}}" wx:key="fir_comments"> | ||
602 | + <view class="xc_comment-left"> | ||
603 | + <view class="xc_comment-user"> | ||
604 | + <view class="xc_user-img"> | ||
605 | + <image class="xc_imgs" src='{{item.is_anonymous!=1?item.head_pic:iurl+"/miniapp/images/hui_hear_pic.png"}}' binderror="bind_bnerr2" data-errorimg="fir_comments[{{index}}].head_pic"></image> | ||
606 | + </view> | ||
607 | + <view class="xc_user"> | ||
608 | + <view class="xc_user-name five-level-word"> | ||
609 | + {{item.is_anonymous!=1?item.username:'匿名'}} | ||
610 | + </view> | ||
611 | + <image class="xc_comment-img" src="{{iurl}}/miniapp/images/star-red.png" wx:for="{{item.sum_rank}}" wx:key="{{index}}"></image> | ||
612 | + </view> | ||
613 | + </view> | ||
614 | + <view class="xc_comment-font pj_word_size ellipsis-1 pdt12"> | ||
615 | + <text class="ellipsis-1">{{item.content?item.content:'此用户没有填写评价。'}}</text> | ||
616 | + </view> | ||
617 | + <view class="xc_comment-val"> | ||
618 | + <view class="xc_comment-time">{{item.add_time}}</view> | ||
619 | + </view> | ||
620 | + </view> | ||
621 | + <view class="xc_goods-img-frame"> | ||
622 | + <image wx:if="{{item.img[0]!=undefined && item.img[0]!=null}}" class="xc_goods-img" src='{{iurl+item.img[0]}}'></image> | ||
623 | + <image wx:elif="{{item.weapp_img[0]!=undefined && item.weapp_img[0]!=null}}" class="xc_goods-img" src='{{item.weapp_img[0]}}'></image> | ||
624 | + <image wx:else class="xc_goods-img" src='{{gallery[0].image_url}}'></image> | ||
625 | + </view> | ||
626 | + </view> | ||
627 | + </view> | ||
613 | </scroll-view> | 628 | </scroll-view> |
614 | </view> | 629 | </view> |
615 | - | ||
616 | <!-- 图文详情 --> | 630 | <!-- 图文详情 --> |
617 | <view class="bdt16"> | 631 | <view class="bdt16"> |
618 | <!-- <view class="tuwen_title"> | 632 | <!-- <view class="tuwen_title"> |
@@ -626,96 +640,90 @@ | @@ -626,96 +640,90 @@ | ||
626 | <view class="red_shu"></view> | 640 | <view class="red_shu"></view> |
627 | <view class="fs30 bold">商品详情</view> | 641 | <view class="fs30 bold">商品详情</view> |
628 | </view> | 642 | </view> |
629 | - <view class="pd20"> | ||
630 | - <view class="table_s"> | ||
631 | - <view class="tb_item tb-l"> | ||
632 | - <view class="item_left"> | ||
633 | - <text>商品名称</text> | ||
634 | - </view> | ||
635 | - <view class="item_right"> | ||
636 | - <text>{{data.goods_name}}</text> | ||
637 | - </view> | ||
638 | - </view> | ||
639 | - <view class="tb_item tb-l"> | ||
640 | - <view class="item_left"> | ||
641 | - <text>商品编号</text> | ||
642 | - </view> | ||
643 | - <view class="item_right"> | ||
644 | - <text>{{data.goods_sn}}</text> | ||
645 | - </view> | ||
646 | - </view> | ||
647 | - <view class="tb_item tb-l"> | ||
648 | - <view class="item_left"> | ||
649 | - <text>商品条码</text> | ||
650 | - </view> | ||
651 | - <view class="item_right"> | ||
652 | - <text>{{data.sku}}</text> | ||
653 | - </view> | ||
654 | - </view> | ||
655 | - <view class="tb_item tb-l" wx:if="{{cat_name && is_show_pl}}"> | ||
656 | - <view class="item_left"> | ||
657 | - <text>品类</text> | ||
658 | - </view> | ||
659 | - <view class="item_right"> | ||
660 | - <text>{{cat_name}}</text> | ||
661 | - </view> | ||
662 | - </view> | ||
663 | - <view class="tb_item tb-l" wx:if="{{brand_name && is_show_pp}}"> | ||
664 | - <view class="item_left"> | ||
665 | - <text>品牌</text> | ||
666 | - </view> | ||
667 | - <view class="item_right"> | ||
668 | - <text>{{brand_name}}</text> | ||
669 | - </view> | ||
670 | - </view> | ||
671 | - <view class="tb_item tb-l" wx:if="{{nation_name && is_show_gb}}"> | ||
672 | - <view class="item_left"> | ||
673 | - <text>国别</text> | ||
674 | - </view> | ||
675 | - <view class="item_right"> | ||
676 | - <text>{{nation_name}}</text> | ||
677 | - </view> | ||
678 | - </view> | ||
679 | - <view class="tb_item tb-l"> | ||
680 | - <view class="item_left"> | ||
681 | - <text>规格</text> | ||
682 | - </view> | ||
683 | - <view class="item_right"> | ||
684 | - <text>{{filters.show_gui_ge(data.goods_spec,data.goods_color)}}</text> | ||
685 | - </view> | ||
686 | - </view> | ||
687 | - <view class="tb_item tb-l"> | ||
688 | - <view class="item_left"> | ||
689 | - <text>上架时间</text> | ||
690 | - </view> | ||
691 | - <view class="item_right"> | ||
692 | - <text>{{data.on_time}}</text> | ||
693 | - </view> | ||
694 | - </view> | ||
695 | - </view> | ||
696 | - </view> | ||
697 | - | ||
698 | - <!--详情图片--> | 643 | + <view class="pd20"> |
644 | + <view class="table_s"> | ||
645 | + <view class="tb_item tb-l"> | ||
646 | + <view class="item_left"> | ||
647 | + <text>商品名称</text> | ||
648 | + </view> | ||
649 | + <view class="item_right"> | ||
650 | + <text>{{data.goods_name}}</text> | ||
651 | + </view> | ||
652 | + </view> | ||
653 | + <view class="tb_item tb-l"> | ||
654 | + <view class="item_left"> | ||
655 | + <text>商品编号</text> | ||
656 | + </view> | ||
657 | + <view class="item_right"> | ||
658 | + <text>{{data.goods_sn}}</text> | ||
659 | + </view> | ||
660 | + </view> | ||
661 | + <view class="tb_item tb-l"> | ||
662 | + <view class="item_left"> | ||
663 | + <text>商品条码</text> | ||
664 | + </view> | ||
665 | + <view class="item_right"> | ||
666 | + <text>{{data.sku}}</text> | ||
667 | + </view> | ||
668 | + </view> | ||
669 | + <view class="tb_item tb-l" wx:if="{{cat_name && is_show_pl}}"> | ||
670 | + <view class="item_left"> | ||
671 | + <text>品类</text> | ||
672 | + </view> | ||
673 | + <view class="item_right"> | ||
674 | + <text>{{cat_name}}</text> | ||
675 | + </view> | ||
676 | + </view> | ||
677 | + <view class="tb_item tb-l" wx:if="{{brand_name && is_show_pp}}"> | ||
678 | + <view class="item_left"> | ||
679 | + <text>品牌</text> | ||
680 | + </view> | ||
681 | + <view class="item_right"> | ||
682 | + <text>{{brand_name}}</text> | ||
683 | + </view> | ||
684 | + </view> | ||
685 | + <view class="tb_item tb-l" wx:if="{{nation_name && is_show_gb}}"> | ||
686 | + <view class="item_left"> | ||
687 | + <text>国别</text> | ||
688 | + </view> | ||
689 | + <view class="item_right"> | ||
690 | + <text>{{nation_name}}</text> | ||
691 | + </view> | ||
692 | + </view> | ||
693 | + <view class="tb_item tb-l"> | ||
694 | + <view class="item_left"> | ||
695 | + <text>规格</text> | ||
696 | + </view> | ||
697 | + <view class="item_right"> | ||
698 | + <text>{{filters.show_gui_ge(data.goods_spec,data.goods_color)}}</text> | ||
699 | + </view> | ||
700 | + </view> | ||
701 | + <view class="tb_item tb-l"> | ||
702 | + <view class="item_left"> | ||
703 | + <text>上架时间</text> | ||
704 | + </view> | ||
705 | + <view class="item_right"> | ||
706 | + <text>{{data.on_time}}</text> | ||
707 | + </view> | ||
708 | + </view> | ||
709 | + </view> | ||
710 | + </view> | ||
711 | + <!-- 详情图片 --> | ||
699 | <view class="wxParse"> | 712 | <view class="wxParse"> |
700 | <template is="wxParse" data="{{wxParseData:content.nodes}}"></template> | 713 | <template is="wxParse" data="{{wxParseData:content.nodes}}"></template> |
701 | </view> | 714 | </view> |
702 | </view> | 715 | </view> |
703 | - | ||
704 | <!-- 推荐商品 --> | 716 | <!-- 推荐商品 --> |
705 | <view class="flex-center rel xc-linellae-frame"> | 717 | <view class="flex-center rel xc-linellae-frame"> |
706 | <view class="xc-linellae"></view> | 718 | <view class="xc-linellae"></view> |
707 | <view class="abs flex-center xc-recommend-frame "> | 719 | <view class="abs flex-center xc-recommend-frame "> |
708 | - <image class=" xc-recommend" src="{{iurl}}/miniapp/images/diamond.png"> | ||
709 | - </image> | 720 | + <image class=" xc-recommend" src="{{iurl}}/miniapp/images/diamond.png"></image> |
710 | <view class="xc-recommend-word">推荐</view> | 721 | <view class="xc-recommend-word">推荐</view> |
711 | </view> | 722 | </view> |
712 | </view> | 723 | </view> |
713 | - | ||
714 | - <goods_recommend id="goods_list"></goods_recommend> | ||
715 | - | 724 | + <goods_recommend id="goods_list"></goods_recommend> |
716 | </view> | 725 | </view> |
717 | - | ||
718 | - <!------------商品详情图片页面----------------> | 726 | + <!-- ----------商品详情图片页面-------------- --> |
719 | <view class="goods-norms" hidden="{{activeCategoryId==1?false:true}}"> | 727 | <view class="goods-norms" hidden="{{activeCategoryId==1?false:true}}"> |
720 | <view class="table_s"> | 728 | <view class="table_s"> |
721 | <view class="tb_item tb-l"> | 729 | <view class="tb_item tb-l"> |
@@ -783,12 +791,11 @@ | @@ -783,12 +791,11 @@ | ||
783 | </view> | 791 | </view> |
784 | </view> | 792 | </view> |
785 | </view> | 793 | </view> |
786 | - | ||
787 | <view class="wxParse"> | 794 | <view class="wxParse"> |
788 | <template is="wxParse" data="{{wxParseData:content.nodes}}"></template> | 795 | <template is="wxParse" data="{{wxParseData:content.nodes}}"></template> |
789 | </view> | 796 | </view> |
790 | </view> | 797 | </view> |
791 | - <!---------------评价页面--------------> | 798 | + <!-- -------------评价页面------------ --> |
792 | <view class="goods-comment" hidden="{{activeCategoryId==2?false:true}}"> | 799 | <view class="goods-comment" hidden="{{activeCategoryId==2?false:true}}"> |
793 | <view class="topframe"> | 800 | <view class="topframe"> |
794 | <view class="topframe-top"> | 801 | <view class="topframe-top"> |
@@ -796,98 +803,103 @@ | @@ -796,98 +803,103 @@ | ||
796 | <view>宝贝评价</view> | 803 | <view>宝贝评价</view> |
797 | <view class="topframe-top-val">({{categories3[0].num}})</view> | 804 | <view class="topframe-top-val">({{categories3[0].num}})</view> |
798 | </view> | 805 | </view> |
799 | - <view class="topframe-praise" wx:if="{{categories3[0].num}}">好评{{ filters.toFix(categories3[2].num/categories3[0].num*100,2) }}%</view> | 806 | + <view class="topframe-praise" wx:if="{{categories3[0].num}}"> |
807 | + 好评{{ filters.toFix(categories3[2].num/categories3[0].num*100,2) }}% | ||
808 | + </view> | ||
800 | <view wx:else>好评 0%</view> | 809 | <view wx:else>好评 0%</view> |
801 | </view> | 810 | </view> |
802 | <view class="buttem-list"> | 811 | <view class="buttem-list"> |
803 | - <view bindtap="tabClick3" id="{{item.id}}" wx:for="{{categories3}}" wx:key="categories3" class="item {{activeCategoryId3==item.id?'red':''}}">{{item.name}}({{item.num}})</view> | 812 | + <view bindtap="tabClick3" id="{{item.id}}" wx:for="{{categories3}}" wx:key="categories3" class="item {{activeCategoryId3==item.id?'red':''}}"> |
813 | + {{item.name}}({{item.num}}) | ||
814 | + </view> | ||
804 | </view> | 815 | </view> |
805 | </view> | 816 | </view> |
806 | - | ||
807 | <block wx:for="{{comments}}" wx:for-index="cIdx" wx:key="{{cIdx}}"> | 817 | <block wx:for="{{comments}}" wx:for-index="cIdx" wx:key="{{cIdx}}"> |
808 | - <view style='border-bottom:4rpx solid #eee;'> | ||
809 | - <view class="middle"> | ||
810 | - <view class="middle-img-frame"> | ||
811 | - <image class="middle-img" src="{{item.is_anonymous!=1?item.head_pic:iurl+'/miniapp/images/hui_hear_pic.png'}}" binderror="bind_bnerr2" data-errorimg="comments[{{cIdx}}].head_pic"></image> | ||
812 | - <view class="middle-user-frame"> | ||
813 | - <view class="middle-user">{{item.username==''||item.is_anonymous==1 ?'匿名用户':item.username}}</view> | ||
814 | - <image class="star" src="{{iurl}}/miniapp/images/star-red.png" wx:for="{{item.sum_rank}}" wx:key="{{index}}"></image> | 818 | + <view style='border-bottom:4rpx solid #eee;'> |
819 | + <view class="middle"> | ||
820 | + <view class="middle-img-frame"> | ||
821 | + <image class="middle-img" src="{{item.is_anonymous!=1?item.head_pic:iurl+'/miniapp/images/hui_hear_pic.png'}}" binderror="bind_bnerr2" data-errorimg="comments[{{cIdx}}].head_pic"></image> | ||
822 | + <view class="middle-user-frame"> | ||
823 | + <view class="middle-user"> | ||
824 | + {{item.username==''||item.is_anonymous==1 ?'匿名用户':item.username}} | ||
825 | + </view> | ||
826 | + <image class="star" src="{{iurl}}/miniapp/images/star-red.png" wx:for="{{item.sum_rank}}" wx:key="{{index}}"></image> | ||
827 | + </view> | ||
815 | </view> | 828 | </view> |
816 | - </view> | ||
817 | - <view class="xc-pirces"> | ||
818 | - <view class="middle-font {{item.seeMore==true?'ellipsis-3':''}}" > | ||
819 | - {{item.content?item.content:'此用户没有填写评价。'}} | ||
820 | - </view> | ||
821 | - </view> | ||
822 | - <view wx:if='{{item.seeMore}}' data-index='{{cIdx}}' class="s_btn fs30 red-co" catchtap='toggleHandler'>全部显示</view> | ||
823 | - <view wx:if='{{!item.seeMore && item.auto}}' data-index='{{cIdx}}' class="s_btn fs30 red-co" catchtap='toggleContent'>收起</view> | ||
824 | - <view class="img-ul"> | ||
825 | - | ||
826 | - <block wx:if="{{item.source_type==0}}"> | ||
827 | - <view class="img-li" wx:for="{{item.img}}" wx:key="{{index}}"> | ||
828 | - <image bindtap="previewCommentImgs" class="wh100" data-cidx="{{cIdx}}" data-img="{{iurl}}{{item}}" | ||
829 | - data-id="{{index}}" src="{{iurl}}{{item}}"></image> | 829 | + <view class="xc-pirces"> |
830 | + <view class="middle-font {{item.seeMore==true?'ellipsis-3':''}}"> | ||
831 | + {{item.content?item.content:'此用户没有填写评价。'}} | ||
832 | + </view> | ||
833 | + </view> | ||
834 | + <view wx:if='{{item.seeMore}}' data-index='{{cIdx}}' class="s_btn fs30 red-co" catchtap='toggleHandler'> | ||
835 | + 全部显示 | ||
836 | + </view> | ||
837 | + <view wx:if='{{!item.seeMore && item.auto}}' data-index='{{cIdx}}' class="s_btn fs30 red-co" catchtap='toggleContent'> | ||
838 | + 收起 | ||
839 | + </view> | ||
840 | + <view class="img-ul"> | ||
841 | + <block wx:if="{{item.source_type==0}}"> | ||
842 | + <view class="img-li" wx:for="{{item.img}}" wx:key="{{index}}"> | ||
843 | + <image bindtap="previewCommentImgs" class="wh100" data-cidx="{{cIdx}}" data-img="{{iurl}}{{item}}" data-id="{{index}}" src="{{iurl}}{{item}}"></image> | ||
830 | </view> | 844 | </view> |
831 | - </block> | ||
832 | - <block wx:if="{{item.source_type==1}}"> | 845 | + </block> |
846 | + <block wx:if="{{item.source_type==1}}"> | ||
833 | <view class="img-li" wx:for="{{item.weapp_img}}" wx:if="{{aitem.length>10}}" wx:key="{{index}}" wx:for-item="aitem"> | 847 | <view class="img-li" wx:for="{{item.weapp_img}}" wx:if="{{aitem.length>10}}" wx:key="{{index}}" wx:for-item="aitem"> |
834 | - <image bindtap="previewCommentImgs_w" class="wh100" data-cidx="{{cIdx}}" data-img="{{aitem}}" | ||
835 | - data-id="{{index}}" src="{{aitem}}"></image> | 848 | + <image bindtap="previewCommentImgs_w" class="wh100" data-cidx="{{cIdx}}" data-img="{{aitem}}" data-id="{{index}}" src="{{aitem}}"></image> |
836 | </view> | 849 | </view> |
837 | - </block> | ||
838 | - </view> | ||
839 | - | ||
840 | - <view class="z_parameter"> | ||
841 | - <view class="parameter-font">{{item.add_time}}</view> | ||
842 | - <view class="parameter-dian" bindtap="click_zan" data-com_id="{{item.comment_id}}" data-item_id="{{cIdx}}"> | ||
843 | - <image wx:if="{{item.userZanNum==1}}" class="parameter-img" src="{{iurl}}/miniapp/images/zan_red.png"></image> | ||
844 | - <image wx:else class="parameter-img" src="{{iurl}}/miniapp/images/dianzan.png"></image> | ||
845 | - <view class="parameter-val" style='color:{{item.userZanNum==1? "#d60022":"#999" }}' >{{item.zan_num}}</view> | 850 | + </block> |
851 | + </view> | ||
852 | + <view class="z_parameter"> | ||
853 | + <view class="parameter-font">{{item.add_time}}</view> | ||
854 | + <view class="parameter-dian" bindtap="click_zan" data-com_id="{{item.comment_id}}" data-item_id="{{cIdx}}"> | ||
855 | + <image wx:if="{{item.userZanNum==1}}" class="parameter-img" src="{{iurl}}/miniapp/images/zan_red.png"></image> | ||
856 | + <image wx:else class="parameter-img" src="{{iurl}}/miniapp/images/dianzan.png"></image> | ||
857 | + <view class="parameter-val" style='color:{{item.userZanNum==1? "#d60022":"#999" }}'> | ||
858 | + {{item.zan_num}} | ||
859 | + </view> | ||
860 | + </view> | ||
846 | </view> | 861 | </view> |
847 | </view> | 862 | </view> |
848 | - | ||
849 | - </view> | ||
850 | - <view class="reply rel" wx:if="{{item.replay_list}}"> | ||
851 | - <view class="line_bulge"></view> | ||
852 | - <view class="shop-reply">店家回复: </view> | ||
853 | - <view class="shop-font" wx:for="{{item.replay_list}}" wx:for-item="r_item" wx:key="{{index}}"> | ||
854 | - {{r_item.content}} | 863 | + <view class="reply rel" wx:if="{{item.replay_list}}"> |
864 | + <view class="line_bulge"></view> | ||
865 | + <view class="shop-reply">店家回复:</view> | ||
866 | + <view class="shop-font" wx:for="{{item.replay_list}}" wx:for-item="r_item" wx:key="{{index}}"> | ||
867 | + {{r_item.content}} | ||
868 | + </view> | ||
855 | </view> | 869 | </view> |
856 | </view> | 870 | </view> |
857 | - </view> | ||
858 | </block> | 871 | </block> |
859 | <block wx:if="{{(!comments || comments.length==0) && get_c }}"> | 872 | <block wx:if="{{(!comments || comments.length==0) && get_c }}"> |
860 | - <text class="no_pj_list">暂无评价</text> | 873 | + <text class="no_pj_list">暂无评价</text> |
861 | </block> | 874 | </block> |
862 | <block wx:if="{{comments.length>10 && comments_no_more}}"> | 875 | <block wx:if="{{comments.length>10 && comments_no_more}}"> |
863 | <text class="no_pj_list">已经加载到底部</text> | 876 | <text class="no_pj_list">已经加载到底部</text> |
864 | </block> | 877 | </block> |
865 | </view> | 878 | </view> |
866 | </view> | 879 | </view> |
867 | - | ||
868 | - <!-- 技术支持 --> | ||
869 | - <view class="logo-container t-c"> | ||
870 | - <view class="flex ai_c fs24 jc-center pdv30 white"><image src="{{iurl + 'miniapp/images/luckDraw/logo.png?v=3'}}" class="logo" lazy-load></image>提供技术支持</view> | ||
871 | - </view> | ||
872 | - | 880 | + <!-- 技术支持 --> |
881 | + <view class="logo-container t-c"> | ||
882 | + <view class="flex ai_c fs24 jc-center pdv30 white"> | ||
883 | + <image src="{{iurl + 'miniapp/images/luckDraw/logo.png?v=3'}}" class="logo" lazy-load></image> | ||
884 | + 提供技术支持 | ||
885 | + </view> | ||
886 | + </view> | ||
873 | </view> | 887 | </view> |
874 | - <!---滚动到顶部----> | 888 | + <!-- -滚动到顶部-- --> |
875 | <view bindtap="doScrollTop" class="toTop" wx:if="{{supportPageScroll}}"> | 889 | <view bindtap="doScrollTop" class="toTop" wx:if="{{supportPageScroll}}"> |
876 | <image class="wh100" src="{{iurl}}/miniapp/images/topup.png"></image> | 890 | <image class="wh100" src="{{iurl}}/miniapp/images/topup.png"></image> |
877 | </view> | 891 | </view> |
878 | - | ||
879 | - <!-------------------底部按钮--------------------> | 892 | + <!-- -----------------底部按钮------------------ --> |
880 | <view class="join-cart"> | 893 | <view class="join-cart"> |
881 | - <!-- bindtap="contactService" --> | ||
882 | - <button wx:if="{{sys_switch.weapp_customertype}}" class="custom-service cart-ico new_split" open-type="contact" session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}"> | 894 | + <!-- bindtap="contactService" --> |
895 | + <button wx:if="{{sys_switch.weapp_customertype}}" class="custom-service cart-ico new_split" open-type="contact" session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}"> | ||
883 | <image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image> | 896 | <image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image> |
884 | <view>客服</view> | 897 | <view>客服</view> |
885 | </button> | 898 | </button> |
886 | - <view wx:else class="custom-service cart-ico new_split" bindtap="contactService"> | ||
887 | - <image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image> | ||
888 | - <view>客服</view> | ||
889 | - </view> | ||
890 | - | 899 | + <view wx:else class="custom-service cart-ico new_split" bindtap="contactService"> |
900 | + <image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image> | ||
901 | + <view>客服</view> | ||
902 | + </view> | ||
891 | <view bindtap="collectGoods" class="custom-service cart-ico new_split"> | 903 | <view bindtap="collectGoods" class="custom-service cart-ico new_split"> |
892 | <image hidden="{{is_collect}}" class="cs-img" src="{{iurl}}/miniapp/images/heart.png"></image> | 904 | <image hidden="{{is_collect}}" class="cs-img" src="{{iurl}}/miniapp/images/heart.png"></image> |
893 | <image hidden="{{!is_collect}}" class="cs-img" src="{{iurl}}/miniapp/images/heart-h.png"></image> | 905 | <image hidden="{{!is_collect}}" class="cs-img" src="{{iurl}}/miniapp/images/heart-h.png"></image> |
@@ -896,27 +908,25 @@ | @@ -896,27 +908,25 @@ | ||
896 | <view class="shopping-cart cart-ico new_split"> | 908 | <view class="shopping-cart cart-ico new_split"> |
897 | <navigator open-type="switchTab" url="/pages/cart/cart/cart"> | 909 | <navigator open-type="switchTab" url="/pages/cart/cart/cart"> |
898 | <image class="sc-img" src="{{iurl}}/miniapp/images/shopping-cart.png"></image> | 910 | <image class="sc-img" src="{{iurl}}/miniapp/images/shopping-cart.png"></image> |
899 | - <view class="cart-num ellipsis-1"> {{cartGoodsNum}} </view> | 911 | + <view class="cart-num ellipsis-1">{{cartGoodsNum}}</view> |
900 | <view>购物车</view> | 912 | <view>购物车</view> |
901 | </navigator> | 913 | </navigator> |
902 | </view> | 914 | </view> |
903 | - <view bindtap="openSpecModel" class="buy-btn cart-btn cart-btn-lg" wx:if="{{data.goods.is_virtual}}">立即购买</view> | ||
904 | - | 915 | + <view bindtap="openSpecModel" class="buy-btn cart-btn cart-btn-lg" wx:if="{{data.goods.is_virtual}}"> |
916 | + 立即购买 | ||
917 | + </view> | ||
905 | <!-- 普通商品购买 --> | 918 | <!-- 普通商品购买 --> |
906 | <block wx:if="{{prom_type==0 || prom_type==2 || prom_type==3}}"> | 919 | <block wx:if="{{prom_type==0 || prom_type==2 || prom_type==3}}"> |
907 | - | ||
908 | - <!-- 线上销售的时候,要判断库存量, 线下库存的时候不用判断 --> | ||
909 | - <block wx:if="{{(sele_g.store_count>0 && sales_rules==1) || sales_rules==2 }}"> | ||
910 | - <view bindtap="openSpecModel" data-ind="1" class="join-btn cart-btn">加入购物车</view> | ||
911 | - <view bindtap="openSpecModel" data-ind="2" class="buy-btn cart-btn">立即购买</view> | 920 | + <!-- 线上销售的时候,要判断库存量, 线下库存的时候不用判断 --> |
921 | + <block wx:if="{{(sele_g.store_count>0 && sales_rules==1) || sales_rules==2 }}"> | ||
922 | + <view bindtap="openSpecModel" data-ind="1" class="join-btn cart-btn">加入购物车</view> | ||
923 | + <view bindtap="openSpecModel" data-ind="2" class="buy-btn cart-btn">立即购买</view> | ||
924 | + </block> | ||
925 | + <block wx:else> | ||
926 | + <view class="is_stock cart-btn is_stock xc-ash-b " style="width:55.5%">库存不足</view> | ||
912 | </block> | 927 | </block> |
913 | - <block wx:else> | ||
914 | - <view class="is_stock cart-btn is_stock xc-ash-b " style="width:55.5%">库存不足</view> | ||
915 | - </block> | ||
916 | - | ||
917 | </block> | 928 | </block> |
918 | - | ||
919 | - <!-------秒杀--------> | 929 | + <!-- -----秒杀------ --> |
920 | <block wx:if="{{prom_type==1}}"> | 930 | <block wx:if="{{prom_type==1}}"> |
921 | <block wx:if="{{prom_st==1 && !prom_r_null}}"> | 931 | <block wx:if="{{prom_st==1 && !prom_r_null}}"> |
922 | <view bindtap="openSpecModel" data-ind="1" class="join-btn cart-btn">加入购物车</view> | 932 | <view bindtap="openSpecModel" data-ind="1" class="join-btn cart-btn">加入购物车</view> |
@@ -932,307 +942,321 @@ | @@ -932,307 +942,321 @@ | ||
932 | <view class="buy-btn cart-btn cart-btn-lg lanse set_width">活动已经结束</view> | 942 | <view class="buy-btn cart-btn cart-btn-lg lanse set_width">活动已经结束</view> |
933 | </block> | 943 | </block> |
934 | </block> | 944 | </block> |
935 | - | ||
936 | - <!-------拼单--------> | 945 | + <!-- -----拼单------ --> |
937 | <block wx:if="{{prom_type==6}}"> | 946 | <block wx:if="{{prom_type==6}}"> |
938 | <view bindtap="openSpecModel_pt" data-it="1" data-ind="1" class="join-btn cart-btn line-h"> | 947 | <view bindtap="openSpecModel_pt" data-it="1" data-ind="1" class="join-btn cart-btn line-h"> |
939 | <view class="fir-v"> | 948 | <view class="fir-v"> |
940 | - <!-- ¥{{data.shop_price,2)}} --> | ||
941 | - <block wx:if="{{card_field && sele_g[card_field]>0}}"> | ||
942 | - {{filters.toFix(sele_g[card_field],2)}} | ||
943 | - </block> | ||
944 | - <block wx:else> | ||
945 | - {{filters.toFix(sele_g.shop_price,2)}} | ||
946 | - </block> | ||
947 | - </view> | 949 | + <!-- ¥{{data.shop_price,2)}} --> |
950 | + <block wx:if="{{card_field && sele_g[card_field]>0}}"> | ||
951 | + {{filters.toFix(sele_g[card_field],2)}} | ||
952 | + </block> | ||
953 | + <block wx:else>{{filters.toFix(sele_g.shop_price,2)}}</block> | ||
954 | + </view> | ||
948 | <view>单独购买</view> | 955 | <view>单独购买</view> |
949 | </view> | 956 | </view> |
950 | - | ||
951 | <block wx:if="{{user_order_pt_state==0}}"> | 957 | <block wx:if="{{user_order_pt_state==0}}"> |
952 | - <!----商家团----> | 958 | + <!-- --商家团-- --> |
953 | <view bindtap="openSpecModel_pt" data-it="0" wx:if="{{prom_st==1 && !prom_r_null && prom_act.kttype==1}}" class="buy-btn cart-btn line-h"> | 959 | <view bindtap="openSpecModel_pt" data-it="0" wx:if="{{prom_st==1 && !prom_r_null && prom_act.kttype==1}}" class="buy-btn cart-btn line-h"> |
954 | <view class="fir-v">¥{{prom_act.price}}</view> | 960 | <view class="fir-v">¥{{prom_act.price}}</view> |
955 | <view>去参团</view> | 961 | <view>去参团</view> |
956 | </view> | 962 | </view> |
957 | - <!----会员团----> | 963 | + <!-- --会员团-- --> |
958 | <view bindtap="openSpecModel_pt" data-it="0" wx:if="{{prom_st==1 && !prom_r_null && prom_act.kttype==2}}" class="buy-btn cart-btn line-h"> | 964 | <view bindtap="openSpecModel_pt" data-it="0" wx:if="{{prom_st==1 && !prom_r_null && prom_act.kttype==2}}" class="buy-btn cart-btn line-h"> |
959 | - <!--<view class="fir-v">¥{{prom_act.price}}</view>--> | ||
960 | - <view class="pd_top1" wx:if="{{prom_act.tz_yhjgtype>1}}"> | ||
961 | - <view>一键开团</view> | ||
962 | - <view wx:if="{{prom_act.tz_yhjgtype==3}}">佣金<text style="font-size: 23rpx">¥</text>{{filters.toFix(prom_act.tz_yyhjg,2)}}</view> | ||
963 | - <view wx:if="{{prom_act.tz_yhjgtype==2}}">团长免单</view> | ||
964 | - </view> | ||
965 | - <view wx:else> | ||
966 | - <view class="fir-v">¥{{ filters.toFix(prom_act.price,2)}}</view> | ||
967 | - <view>一键开团</view> | 965 | + <!-- <view class="fir-v">¥{{prom_act.price}}</view> --> |
966 | + <view class="pd_top1" wx:if="{{prom_act.tz_yhjgtype>1}}"> | ||
967 | + <view>一键开团</view> | ||
968 | + <view wx:if="{{prom_act.tz_yhjgtype==3}}"> | ||
969 | + 佣金 | ||
970 | + <text style="font-size: 23rpx">¥</text> | ||
971 | + {{filters.toFix(prom_act.tz_yyhjg,2)}} | ||
972 | + </view> | ||
973 | + <view wx:if="{{prom_act.tz_yhjgtype==2}}">团长免单</view> | ||
974 | + </view> | ||
975 | + <view wx:else> | ||
976 | + <view class="fir-v">¥{{ filters.toFix(prom_act.price,2)}}</view> | ||
977 | + <view>一键开团</view> | ||
968 | </view> | 978 | </view> |
969 | - | ||
970 | </view> | 979 | </view> |
971 | - <!---阶梯团----> | 980 | + <!-- -阶梯团-- --> |
972 | <view bindtap="openSpecModel_pt" data-it="0" wx:if="{{prom_st==1 && !prom_r_null && prom_act.kttype==3 && user_order_pt_state!=3 }}" class="buy-btn cart-btn line-h"> | 981 | <view bindtap="openSpecModel_pt" data-it="0" wx:if="{{prom_st==1 && !prom_r_null && prom_act.kttype==3 && user_order_pt_state!=3 }}" class="buy-btn cart-btn line-h"> |
973 | <view class="fir-v">¥{{filters.toFix(prom_act.yf_price,2)}}</view> | 982 | <view class="fir-v">¥{{filters.toFix(prom_act.yf_price,2)}}</view> |
974 | <view>支付定金</view> | 983 | <view>支付定金</view> |
975 | </view> | 984 | </view> |
976 | - | ||
977 | <view wx:if="{{prom_st==0}}" class="buy-btn cart-btn lanse">即将开始</view> | 985 | <view wx:if="{{prom_st==0}}" class="buy-btn cart-btn lanse">即将开始</view> |
978 | <view wx:if="{{prom_r_null}}" class="buy-btn cart-btn huise">已抢光</view> | 986 | <view wx:if="{{prom_r_null}}" class="buy-btn cart-btn huise">已抢光</view> |
979 | <view wx:if="{{prom_st==3 && !prom_r_null}}" class="buy-btn cart-btn lanse">活动已经结束</view> | 987 | <view wx:if="{{prom_st==3 && !prom_r_null}}" class="buy-btn cart-btn lanse">活动已经结束</view> |
980 | </block> | 988 | </block> |
981 | <block wx:else> | 989 | <block wx:else> |
982 | - <view bindtap="go_to_nopay" wx:if="{{user_order_pt_state==1}}" class="buy-btn cart-btn huise">您还未支付</view> | ||
983 | - <view bindtap="go_to_team_show" wx:if="{{user_order_pt_state==2}}" class="buy-btn cart-btn">查看支付详情</view> | ||
984 | - <view wx:if="{{user_order_pt_state==3}}" bindtap="go_pay_wk" class="buy-btn cart-btn">支付尾款</view> | 990 | + <view bindtap="go_to_nopay" wx:if="{{user_order_pt_state==1}}" class="buy-btn cart-btn huise"> |
991 | + 您还未支付 | ||
992 | + </view> | ||
993 | + <view bindtap="go_to_team_show" wx:if="{{user_order_pt_state==2}}" class="buy-btn cart-btn"> | ||
994 | + 查看支付详情 | ||
995 | + </view> | ||
996 | + <view wx:if="{{user_order_pt_state==3}}" bindtap="go_pay_wk" class="buy-btn cart-btn"> | ||
997 | + 支付尾款 | ||
998 | + </view> | ||
985 | </block> | 999 | </block> |
986 | </block> | 1000 | </block> |
987 | - | ||
988 | - | ||
989 | - <!-------积分购--------> | ||
990 | - <block wx:if="{{prom_type==4}}"> | ||
991 | - | ||
992 | - <block wx:if="{{is_shopbuy}}"> | ||
993 | - <view bindtap="go_pay_integral_normal" class="join-btn cart-btn line-h"> | ||
994 | - <view class="fir-v"> | ||
995 | - <block wx:if="{{card_field && sele_g[card_field]>0}}"> | ||
996 | - {{filters.toFix(sele_g[card_field],2)}} | ||
997 | - </block> | ||
998 | - <block wx:else> | ||
999 | - {{filters.toFix(sele_g.shop_price,2)}} | ||
1000 | - </block> | ||
1001 | - </view> | ||
1002 | - <view>单独购买</view> | ||
1003 | - </view> | ||
1004 | - <view bindtap="go_pay_integral" class="buy-btn cart-btn" wx:if="{{can_integral}}" >立即兑换</view> | ||
1005 | - <view class="buy-btn cart-btn" style="background-color: #aaa;" wx:else >积分不足</view> | ||
1006 | - </block> | ||
1007 | - | ||
1008 | - <block wx:else> | ||
1009 | - <view bindtap="go_pay_integral" class="buy-btn-all cart-btn" style="width: 58%; margin-left:1%;" wx:if="{{can_integral}}" >立即兑换</view> | ||
1010 | - <view class="buy-btn-all cart-btn" style="background-color: #aaa; width: 58%;margin-left:1%" wx:else >积分不足</view> | ||
1011 | - </block> | ||
1012 | - | ||
1013 | - </block> | ||
1014 | - | ||
1015 | - <!---<view bindtap="openSpecModel" class="buy-btn cart-btn cart-btn-lg" wx:else>立即兑换</view>--> | 1001 | + <!-- -----积分购------ --> |
1002 | + <block wx:if="{{prom_type==4}}"> | ||
1003 | + <block wx:if="{{is_shopbuy}}"> | ||
1004 | + <view bindtap="go_pay_integral_normal" class="join-btn cart-btn line-h"> | ||
1005 | + <view class="fir-v"> | ||
1006 | + <block wx:if="{{card_field && sele_g[card_field]>0}}"> | ||
1007 | + {{filters.toFix(sele_g[card_field],2)}} | ||
1008 | + </block> | ||
1009 | + <block wx:else>{{filters.toFix(sele_g.shop_price,2)}}</block> | ||
1010 | + </view> | ||
1011 | + <view>单独购买</view> | ||
1012 | + </view> | ||
1013 | + <view bindtap="go_pay_integral" class="buy-btn cart-btn" wx:if="{{can_integral}}"> | ||
1014 | + 立即兑换 | ||
1015 | + </view> | ||
1016 | + <view class="buy-btn cart-btn" style="background-color: #aaa;" wx:else>积分不足</view> | ||
1017 | + </block> | ||
1018 | + <block wx:else> | ||
1019 | + <view bindtap="go_pay_integral" class="buy-btn-all cart-btn" style="width: 58%; margin-left:1%;" wx:if="{{can_integral}}"> | ||
1020 | + 立即兑换 | ||
1021 | + </view> | ||
1022 | + <view class="buy-btn-all cart-btn" style="background-color: #aaa; width: 58%;margin-left:1%" wx:else> | ||
1023 | + 积分不足 | ||
1024 | + </view> | ||
1025 | + </block> | ||
1026 | + </block> | ||
1027 | + <!-- -<view bindtap="openSpecModel" class="buy-btn cart-btn cart-btn-lg" wx:else>立即兑换</view> --> | ||
1016 | </view> | 1028 | </view> |
1017 | - | ||
1018 | - <!-- 制作一个圆球导航 --> | 1029 | + <!-- 制作一个圆球导航 --> |
1019 | <nav_box></nav_box> | 1030 | <nav_box></nav_box> |
1020 | - | ||
1021 | </block> | 1031 | </block> |
1022 | - | ||
1023 | -<!----弹起来,选择规格数量,普通商品购买和秒杀------> | 1032 | +<!-- --弹起来,选择规格数量,普通商品购买和秒杀---- --> |
1024 | <view hidden="{{!openSpecModal}}"> | 1033 | <view hidden="{{!openSpecModal}}"> |
1025 | - <view bindtap="closeSpecModal" class="cover-layer"></view> | 1034 | + <view bindtap="closeSpecModal" class="cover-layer"></view> |
1026 | <view class="spec-model"> | 1035 | <view class="spec-model"> |
1027 | - <view class="pding"> | 1036 | + <view class="pding"> |
1028 | <icon bindtap="closeSpecModal" class="modal-close" color="black" size="22" type="cancel"></icon> | 1037 | <icon bindtap="closeSpecModal" class="modal-close" color="black" size="22" type="cancel"></icon> |
1029 | <view class="spec-goods"> | 1038 | <view class="spec-goods"> |
1030 | <image class="wh100 spec-img xc-distance-bottom" src="{{sele_g.original_img}}" binderror="pop_err_img" data-errorimg="sele_g.original_img"></image> | 1039 | <image class="wh100 spec-img xc-distance-bottom" src="{{sele_g.original_img}}" binderror="pop_err_img" data-errorimg="sele_g.original_img"></image> |
1031 | <view class="spec-goods-info"> | 1040 | <view class="spec-goods-info"> |
1032 | <view class="spec-goods-name ellipsis-2">{{sele_g.goods_name}}</view> | 1041 | <view class="spec-goods-name ellipsis-2">{{sele_g.goods_name}}</view> |
1033 | - <view class="flex ai_end xc-val-money" > | ||
1034 | - <view class="spec-goods-price" wx:if="{{prom_price==null}}" > | ||
1035 | - <text class="fs20">¥</text> | ||
1036 | - <!-- 如果是等级会员,且有等级价 --> | ||
1037 | - <block wx:if="{{card_field && sele_g[card_field]>0}}">{{sele_g[card_field]}} </block> | ||
1038 | - <block wx:else>{{sele_g.shop_price}}</block> | ||
1039 | - </view> | ||
1040 | - <view class="spec-goods-price" wx:else><text class="fs20">¥</text>{{prom_price}}</view> | ||
1041 | - <!-- 显示线下价格 --> | ||
1042 | - <view wx:if="{{sele_g.offline_price}}" class="quan_price flex ai-center jc-center"> | ||
1043 | - 券后¥<text class="fs32">{{sele_g.offline_price}}</text> | ||
1044 | - </view> | ||
1045 | - </view> | ||
1046 | - | 1042 | + <view class="flex ai_end xc-val-money"> |
1043 | + <view class="spec-goods-price" wx:if="{{prom_price==null}}"> | ||
1044 | + <text class="fs20">¥</text> | ||
1045 | + <!-- 如果是等级会员,且有等级价 --> | ||
1046 | + <block wx:if="{{card_field && sele_g[card_field]>0}}">{{sele_g[card_field]}}</block> | ||
1047 | + <block wx:else>{{sele_g.shop_price}}</block> | ||
1048 | + </view> | ||
1049 | + <view class="spec-goods-price" wx:else> | ||
1050 | + <text class="fs20">¥</text> | ||
1051 | + {{prom_price}} | ||
1052 | + </view> | ||
1053 | + <!-- 显示线下价格 --> | ||
1054 | + <view wx:if="{{sele_g.offline_price}}" class="quan_price flex ai-center jc-center"> | ||
1055 | + 券后¥ | ||
1056 | + <text class="fs32">{{sele_g.offline_price}}</text> | ||
1057 | + </view> | ||
1058 | + </view> | ||
1047 | <block wx:if="{{prom_type==0}}"> | 1059 | <block wx:if="{{prom_type==0}}"> |
1048 | - <view class="flex"> | ||
1049 | - <view class="spec-goods-stock">已售:{{sele_g.sales_sum}}</view> | ||
1050 | - <block wx:if="{{sales_rules==2}}"> | ||
1051 | - <view class="spec-goods-stock" wx:if="{{def_pick_store && def_pick_store.CanOutQty}}">可售:{{def_pick_store.CanOutQty}}</view> | ||
1052 | - <view class="spec-goods-stock" wx:else>可售:0</view> | ||
1053 | - </block> | ||
1054 | - <block wx:else><view class="spec-goods-stock">可售:{{sele_g.store_count}}</view></block> | ||
1055 | - </view> | 1060 | + <view class="flex"> |
1061 | + <view class="spec-goods-stock">已售:{{sele_g.sales_sum}}</view> | ||
1062 | + <block wx:if="{{sales_rules==2}}"> | ||
1063 | + <view class="spec-goods-stock" wx:if="{{def_pick_store && def_pick_store.CanOutQty}}"> | ||
1064 | + 可售:{{def_pick_store.CanOutQty}} | ||
1065 | + </view> | ||
1066 | + <view class="spec-goods-stock" wx:else>可售:0</view> | ||
1067 | + </block> | ||
1068 | + <block wx:else> | ||
1069 | + <view class="spec-goods-stock">可售:{{sele_g.store_count}}</view> | ||
1070 | + </block> | ||
1071 | + </view> | ||
1056 | </block> | 1072 | </block> |
1057 | <block wx:if="{{prom_type==1}}"> | 1073 | <block wx:if="{{prom_type==1}}"> |
1058 | - <view class="flex"> | ||
1059 | - <view class="spec-goods-stock" wx:if="{{prom_st>0}}">已售:{{prom_act.buy_num+prom_act.virtual}}</view> | ||
1060 | - <view class="spec-goods-stock" wx:else >已售:{{prom_act.buy_num}}</view> | ||
1061 | - <view class="spec-goods-stock">可售:{{prom_act.goods_num-prom_act.buy_num}}</view> | ||
1062 | - </view> | 1074 | + <view class="flex"> |
1075 | + <view class="spec-goods-stock" wx:if="{{prom_st>0}}"> | ||
1076 | + 已售:{{prom_act.buy_num+prom_act.virtual}} | ||
1077 | + </view> | ||
1078 | + <view class="spec-goods-stock" wx:else>已售:{{prom_act.buy_num}}</view> | ||
1079 | + <view class="spec-goods-stock">可售:{{prom_act.goods_num-prom_act.buy_num}}</view> | ||
1080 | + </view> | ||
1063 | </block> | 1081 | </block> |
1064 | </view> | 1082 | </view> |
1065 | - | ||
1066 | <!-- 选择门店模块 --> | 1083 | <!-- 选择门店模块 --> |
1067 | - <view class="flex-space-between address ai_end xc-width "> | ||
1068 | - | ||
1069 | - <view class="flex ai_end" wx:if="{{def_pick_store && def_pick_store.pickup_name}}"> | ||
1070 | - <text class="fs30 xc-black3 shop_name bold">{{def_pick_store.pickup_name}}</text> | ||
1071 | - <view class="distance fs24 xc-ash"wx:if="{{def_pick_store.distance!=null}}"> | ||
1072 | - 距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}} | ||
1073 | - | ||
1074 | - </view> | ||
1075 | - </view> | ||
1076 | - | ||
1077 | - <!-- 没有门店的时候 --> | ||
1078 | - <view class="flex" bindtap="choice_store" wx:else> | ||
1079 | - <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image> | ||
1080 | - <view class="fs30" style="color:black;">选择门店</view> | ||
1081 | - </view> | ||
1082 | - | ||
1083 | - <view class="red-co fs28" bindtap="choice_store" > | ||
1084 | - 更多门店 | ||
1085 | - <text class="right-arrow"></text> | ||
1086 | - </view> | ||
1087 | - </view> | ||
1088 | - <view wx:if="{{only_pk && !only_pk.length}}">(库存不足)</view> | ||
1089 | - <block wx:else> | ||
1090 | - <view wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">(库存不足)</view> | ||
1091 | - <block wx:else> | ||
1092 | - <view class="no_store" wx:if="{{def_pick_store.is_no_dis}}">(配送不匹配)</view> | ||
1093 | - <view wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && sales_rules==2 && prom_type==0}}">(库存不足)</view> | ||
1094 | - </block> | ||
1095 | - </block> | ||
1096 | - | ||
1097 | - <view class="fs24 xc-ash-9f xc-distance-top "wx:if="{{def_pick_store && def_pick_store.fulladdress}}">地址:{{def_pick_store.fulladdress}}</view> | ||
1098 | - </view> | ||
1099 | - | ||
1100 | - <!--商品的属性项目--> | ||
1101 | - <view class="xc-goods-attribute"> | ||
1102 | - <view hidden="{{ismend==1}}" class="spec-name">商品规格</view> | ||
1103 | - <view hidden="{{ismend==1}}" style="max-height: 120rpx;overflow-y: auto;"> | ||
1104 | - <view class="spec_bt {{gid==item.goods_id?'act':''}}" bindtap="sele_spec" data-gid='{{item.goods_id}}' wx:for="{{sku_g}}" wx:key="sku_g"> | ||
1105 | - {{item.gg}} | ||
1106 | - </view> | ||
1107 | - </view> | 1084 | + <view class="flex-space-between address ai_end xc-width "> |
1085 | + <view class="flex ai_end" wx:if="{{def_pick_store && def_pick_store.pickup_name}}"> | ||
1086 | + <text class="fs30 xc-black3 shop_name bold">{{def_pick_store.pickup_name}}</text> | ||
1087 | + <view class="distance fs24 xc-ash" wx:if="{{def_pick_store.distance!=null}}"> | ||
1088 | + 距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}} | ||
1089 | + </view> | ||
1090 | + </view> | ||
1091 | + <!-- 没有门店的时候 --> | ||
1092 | + <view class="flex" bindtap="choice_store" wx:else> | ||
1093 | + <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image> | ||
1094 | + <view class="fs30" style="color:black;">选择门店</view> | ||
1095 | + </view> | ||
1096 | + <view class="red-co fs28" bindtap="choice_store"> | ||
1097 | + 更多门店 | ||
1098 | + <text class="right-arrow"></text> | ||
1099 | + </view> | ||
1100 | + </view> | ||
1101 | + <view wx:if="{{only_pk && !only_pk.length}}">(库存不足)</view> | ||
1102 | + <block wx:else> | ||
1103 | + <view wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">(库存不足)</view> | ||
1104 | + <block wx:else> | ||
1105 | + <view class="no_store" wx:if="{{def_pick_store.is_no_dis}}">(配送不匹配)</view> | ||
1106 | + <view wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && sales_rules==2 && prom_type==0}}"> | ||
1107 | + (库存不足) | ||
1108 | + </view> | ||
1109 | + </block> | ||
1110 | + </block> | ||
1111 | + <view class="fs24 xc-ash-9f xc-distance-top " wx:if="{{def_pick_store && def_pick_store.fulladdress}}"> | ||
1112 | + 地址:{{def_pick_store.fulladdress}} | ||
1108 | </view> | 1113 | </view> |
1109 | - | ||
1110 | - | ||
1111 | - <view class="b_num"> | ||
1112 | - <view>购买数量</view> | ||
1113 | - <view class="count"> | ||
1114 | - <view bindtap="{{goodsInputNum <= 1 ? '':'subCartNum'}}" class="sub {{goodsInputNum <= 1 ? 'active':''}}">-</view> | ||
1115 | - <input bindblur="inputCartNum" type="number" value="{{goodsInputNum}}"></input> | ||
1116 | - <view bindtap="addCartNum" class="add">+</view> | 1114 | + </view> |
1115 | + <!-- 商品的属性项目 --> | ||
1116 | + <view class="xc-goods-attribute"> | ||
1117 | + <view hidden="{{ismend==1}}" class="spec-name">商品规格</view> | ||
1118 | + <view hidden="{{ismend==1}}" style="max-height: 120rpx;overflow-y: auto;"> | ||
1119 | + <view class="spec_bt {{gid==item.goods_id?'act':''}}" bindtap="sele_spec" data-gid='{{item.goods_id}}' wx:for="{{sku_g}}" wx:key="sku_g"> | ||
1120 | + {{item.gg}} | ||
1117 | </view> | 1121 | </view> |
1118 | </view> | 1122 | </view> |
1119 | - | ||
1120 | - <!-- 提示再买多少优惠 --> | ||
1121 | - <view style="margin-top: 35rpx;color:#333;font-size:28rpx;" wx:if="{{hui_condition && openSpecModal_ind==2}}"> | ||
1122 | - 再买{{hui_condition.need}} | ||
1123 | - <text wx:if="{{hui_condition.money}}">,免{{hui_condition.money}}元</text> | ||
1124 | - <text wx:if="{{hui_condition.sale}}">,打{{hui_condition.sale}}折</text> | ||
1125 | - <text wx:if="{{hui_condition.past==1}}">,包邮</text> | ||
1126 | - <text wx:if="{{hui_condition.intValue>0}}">,送{{hui_condition.intValue}}积分</text> | ||
1127 | - <text wx:if="{{hui_condition.couponId>0}}">,送优惠券</text> | ||
1128 | - <text wx:if="{{hui_condition.gift_id>0}}">,送赠品</text> | ||
1129 | - <text wx:if="{{hui_condition.lb_id>0}}">,送礼包</text> | ||
1130 | - </view> | ||
1131 | - | ||
1132 | - | ||
1133 | </view> | 1123 | </view> |
1134 | - | ||
1135 | - <view class="spec-cart-btns"> | ||
1136 | - <view wx:if="{{def_pick_store && def_pick_store.is_no_dis}}" class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">配送不匹配</view> | ||
1137 | - <block wx:else> | ||
1138 | - | ||
1139 | - <!-- 根本就找不到门店 --> | ||
1140 | - <block wx:if="{{!only_pk && !def_pickpu_list}}"> | ||
1141 | - <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">库存不足</view> | ||
1142 | - </block> | ||
1143 | - <block wx:else> | ||
1144 | - | ||
1145 | - | ||
1146 | - <block wx:if="{{only_pk.length && !only_pk.length}}"> | ||
1147 | - <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">库存不足</view> | ||
1148 | - </block> | ||
1149 | - <block wx:else> | ||
1150 | - <block wx:if="{{def_pickpu_list && !def_pickpu_list.length}}"> | ||
1151 | - <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">库存不足</view> | ||
1152 | - </block> | ||
1153 | - <block wx:else> | ||
1154 | - <block wx:if="{{!def_pick_store}}"> | ||
1155 | - <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">请先选择门店</view> | ||
1156 | - </block> | ||
1157 | - <block wx:else> | ||
1158 | - <!-- 如果是线下库存购买的时候,且是普通商品购买的时候 --> | ||
1159 | - <block wx:if="{{sales_rules==2 && prom_type==0}}"> | ||
1160 | - <block wx:if="{{!def_pick_store.CanOutQty}}"> | ||
1161 | - <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">库存不足</view> | ||
1162 | - </block> | ||
1163 | - <block wx:else> | ||
1164 | - <view wx:if="{{openSpecModal_ind==1}}" bindtap="addCart"data-openSpecModal_ind="{{openSpecModal_ind}}" | ||
1165 | - class="spec-cart-btn yellow fs32" data-action="add">加入购物车</view> | ||
1166 | - <view wx:if="{{openSpecModal_ind==2}}" bindtap="addCart"data-openSpecModal_ind="{{openSpecModal_ind}}" | ||
1167 | - class="spec-cart-btn spec-buy" data-action="buy"> | ||
1168 | - {{sele_g.offline_price?"券后购买":"立即购买"}} | ||
1169 | - </view> | ||
1170 | - </block> | ||
1171 | - </block> | ||
1172 | - <!-- 线上销售 --> | ||
1173 | - <block wx:else> | ||
1174 | - <block wx:if="{{sele_g.store_count<=0}}"> | ||
1175 | - <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">库存不足</view> | ||
1176 | - </block> | ||
1177 | - <block wx:else> | ||
1178 | - <view wx:if="{{openSpecModal_ind==1}}" bindtap="addCart"data-openSpecModal_ind="{{openSpecModal_ind}}" | ||
1179 | - class="spec-cart-btn yellow fs32" data-action="add">加入购物车</view> | ||
1180 | - <view wx:if="{{openSpecModal_ind==2}}" bindtap="addCart"data-openSpecModal_ind="{{openSpecModal_ind}}" | ||
1181 | - class="spec-cart-btn spec-buy" data-action="buy"> | ||
1182 | - {{sele_g.offline_price?"券后购买":"立即购买"}} | ||
1183 | - </view> | ||
1184 | - </block> | ||
1185 | - </block> | ||
1186 | - </block> | ||
1187 | - </block> | ||
1188 | - </block> | ||
1189 | - </block> | ||
1190 | - | ||
1191 | - </block> | ||
1192 | - </view> | ||
1193 | - | ||
1194 | - <view class="clear"></view> | ||
1195 | - <!-- 选择门店的列表 --> | ||
1196 | - <view hidden="{{ismend==0}}" class="sto_v"> | ||
1197 | - <view class="title" hidden="{{is_sec_mend==1}}" bindtap="hidemend"> | ||
1198 | - <image class="tubiao" src="{{iurl}}/miniapp/images/icon-left.png"></image>选择门店 | 1124 | + <view class="b_num"> |
1125 | + <view>购买数量</view> | ||
1126 | + <view class="count"> | ||
1127 | + <view bindtap="{{goodsInputNum <= 1 ? '':'subCartNum'}}" class="sub {{goodsInputNum <= 1 ? 'active':''}}"> | ||
1128 | + - | ||
1129 | + </view> | ||
1130 | + <input bindblur="inputCartNum" type="number" value="{{goodsInputNum}}"></input> | ||
1131 | + <view bindtap="addCartNum" class="add">+</view> | ||
1199 | </view> | 1132 | </view> |
1200 | - <!-----第一级显示------> | ||
1201 | - <view class="itemlists" hidden="{{is_sec_mend==1}}"> | ||
1202 | - <block wx:if="{{is_show_sto_cat}}"> | ||
1203 | - <view wx:for="{{all_sto}}" wx:key="all_sto" class="item" bindtap="show_sec" data-index="{{index}}">{{item.name}}</view> | 1133 | + </view> |
1134 | + <!-- 提示再买多少优惠 --> | ||
1135 | + <view style="margin-top: 35rpx;color:#333;font-size:28rpx;" wx:if="{{hui_condition && openSpecModal_ind==2}}"> | ||
1136 | + 再买{{hui_condition.need}} | ||
1137 | + <text wx:if="{{hui_condition.money}}">,免{{hui_condition.money}}元</text> | ||
1138 | + <text wx:if="{{hui_condition.sale}}">,打{{hui_condition.sale}}折</text> | ||
1139 | + <text wx:if="{{hui_condition.past==1}}">,包邮</text> | ||
1140 | + <text wx:if="{{hui_condition.intValue>0}}">,送{{hui_condition.intValue}}积分</text> | ||
1141 | + <text wx:if="{{hui_condition.couponId>0}}">,送优惠券</text> | ||
1142 | + <text wx:if="{{hui_condition.gift_id>0}}">,送赠品</text> | ||
1143 | + <text wx:if="{{hui_condition.lb_id>0}}">,送礼包</text> | ||
1144 | + </view> | ||
1145 | + </view> | ||
1146 | + <view class="spec-cart-btns"> | ||
1147 | + <view wx:if="{{def_pick_store && def_pick_store.is_no_dis}}" class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;"> | ||
1148 | + 配送不匹配 | ||
1149 | + </view> | ||
1150 | + <block wx:else> | ||
1151 | + <!-- 根本就找不到门店 --> | ||
1152 | + <block wx:if="{{!only_pk && !def_pickpu_list}}"> | ||
1153 | + <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;"> | ||
1154 | + 库存不足 | ||
1155 | + </view> | ||
1156 | + </block> | ||
1157 | + <block wx:else> | ||
1158 | + <block wx:if="{{only_pk.length && !only_pk.length}}"> | ||
1159 | + <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;"> | ||
1160 | + 库存不足 | ||
1161 | + </view> | ||
1204 | </block> | 1162 | </block> |
1205 | <block wx:else> | 1163 | <block wx:else> |
1206 | - <view wx:for="{{only_pk}}" wx:key="only_pk" class="item" bindtap="hidemend" data-p_id="{{item.pickup_id}}" data-p_name="{{item.pickup_name}}" data-p_dis="{{item.distr_type}}">{{item.pickup_name}}</view> | 1164 | + <block wx:if="{{def_pickpu_list && !def_pickpu_list.length}}"> |
1165 | + <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999"> | ||
1166 | + 库存不足 | ||
1167 | + </view> | ||
1168 | + </block> | ||
1169 | + <block wx:else> | ||
1170 | + <block wx:if="{{!def_pick_store}}"> | ||
1171 | + <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999"> | ||
1172 | + 请先选择门店 | ||
1173 | + </view> | ||
1174 | + </block> | ||
1175 | + <block wx:else> | ||
1176 | + <!-- 如果是线下库存购买的时候,且是普通商品购买的时候 --> | ||
1177 | + <block wx:if="{{sales_rules==2 && prom_type==0}}"> | ||
1178 | + <block wx:if="{{!def_pick_store.CanOutQty}}"> | ||
1179 | + <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999"> | ||
1180 | + 库存不足 | ||
1181 | + </view> | ||
1182 | + </block> | ||
1183 | + <block wx:else> | ||
1184 | + <view wx:if="{{openSpecModal_ind==1}}" bindtap="addCart" data-openSpecModal_ind="{{openSpecModal_ind}}" class="spec-cart-btn yellow fs32" data-action="add"> | ||
1185 | + 加入购物车 | ||
1186 | + </view> | ||
1187 | + <view wx:if="{{openSpecModal_ind==2}}" bindtap="addCart" data-openSpecModal_ind="{{openSpecModal_ind}}" class="spec-cart-btn spec-buy" data-action="buy"> | ||
1188 | + {{sele_g.offline_price?"券后购买":"立即购买"}} | ||
1189 | + </view> | ||
1190 | + </block> | ||
1191 | + </block> | ||
1192 | + <!-- 线上销售 --> | ||
1193 | + <block wx:else> | ||
1194 | + <block wx:if="{{sele_g.store_count<=0}}"> | ||
1195 | + <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999"> | ||
1196 | + 库存不足 | ||
1197 | + </view> | ||
1198 | + </block> | ||
1199 | + <block wx:else> | ||
1200 | + <view wx:if="{{openSpecModal_ind==1}}" bindtap="addCart" data-openSpecModal_ind="{{openSpecModal_ind}}" class="spec-cart-btn yellow fs32" data-action="add"> | ||
1201 | + 加入购物车 | ||
1202 | + </view> | ||
1203 | + <view wx:if="{{openSpecModal_ind==2}}" bindtap="addCart" data-openSpecModal_ind="{{openSpecModal_ind}}" class="spec-cart-btn spec-buy" data-action="buy"> | ||
1204 | + {{sele_g.offline_price?"券后购买":"立即购买"}} | ||
1205 | + </view> | ||
1206 | + </block> | ||
1207 | + </block> | ||
1208 | + </block> | ||
1209 | + </block> | ||
1207 | </block> | 1210 | </block> |
1208 | - </view> | ||
1209 | - <!-----第二级显示------> | ||
1210 | - <view class="stitle" hidden="{{is_sec_mend==0}}" bindtap="hide_sec_mend"> | ||
1211 | - <image class="tubiao" src="{{iurl}}/miniapp/images/icon-left.png"></image>{{sec_sto.name}} | ||
1212 | - </view> | ||
1213 | - <view class="itemlists" hidden="{{is_sec_mend==0}}"> | ||
1214 | - <view wx:for="{{sec_sto.s_arr}}" wx:key="{{index}}" class="item" bindtap="hidemend" data-p_id="{{item.pickup_id}}" data-p_name="{{item.pickup_name}}" data-p_dis="{{item.distr_type}}">{{item.pickup_name}} | 1211 | + </block> |
1212 | + </block> | ||
1213 | + </view> | ||
1214 | + <view class="clear"></view> | ||
1215 | + <!-- 选择门店的列表 --> | ||
1216 | + <view hidden="{{ismend==0}}" class="sto_v"> | ||
1217 | + <view class="title" hidden="{{is_sec_mend==1}}" bindtap="hidemend"> | ||
1218 | + <image class="tubiao" src="{{iurl}}/miniapp/images/icon-left.png"></image> | ||
1219 | + 选择门店 | ||
1220 | + </view> | ||
1221 | + <!-- ---第一级显示---- --> | ||
1222 | + <view class="itemlists" hidden="{{is_sec_mend==1}}"> | ||
1223 | + <block wx:if="{{is_show_sto_cat}}"> | ||
1224 | + <view wx:for="{{all_sto}}" wx:key="all_sto" class="item" bindtap="show_sec" data-index="{{index}}"> | ||
1225 | + {{item.name}} | ||
1215 | </view> | 1226 | </view> |
1227 | + </block> | ||
1228 | + <block wx:else> | ||
1229 | + <view wx:for="{{only_pk}}" wx:key="only_pk" class="item" bindtap="hidemend" data-p_id="{{item.pickup_id}}" data-p_name="{{item.pickup_name}}" data-p_dis="{{item.distr_type}}"> | ||
1230 | + {{item.pickup_name}} | ||
1231 | + </view> | ||
1232 | + </block> | ||
1233 | + </view> | ||
1234 | + <!-- ---第二级显示---- --> | ||
1235 | + <view class="stitle" hidden="{{is_sec_mend==0}}" bindtap="hide_sec_mend"> | ||
1236 | + <image class="tubiao" src="{{iurl}}/miniapp/images/icon-left.png"></image> | ||
1237 | + {{sec_sto.name}} | ||
1238 | + </view> | ||
1239 | + <view class="itemlists" hidden="{{is_sec_mend==0}}"> | ||
1240 | + <view wx:for="{{sec_sto.s_arr}}" wx:key="{{index}}" class="item" bindtap="hidemend" data-p_id="{{item.pickup_id}}" data-p_name="{{item.pickup_name}}" data-p_dis="{{item.distr_type}}"> | ||
1241 | + {{item.pickup_name}} | ||
1216 | </view> | 1242 | </view> |
1217 | </view> | 1243 | </view> |
1218 | - </view> | 1244 | + </view> |
1245 | + </view> | ||
1219 | </view> | 1246 | </view> |
1220 | - | ||
1221 | -<!-- 弹起来,购买积分购 --> | 1247 | +<!-- 弹起来,购买积分购 --> |
1222 | <view hidden="{{!openSpecModal_inte}}"> | 1248 | <view hidden="{{!openSpecModal_inte}}"> |
1223 | - <include src="buy_integral.wxml" /> | ||
1224 | -</view> | ||
1225 | -<!-- 弹起来,购买积分购的普通购买 --> | 1249 | + <include src="buy_integral.wxml" /> |
1250 | +</view> | ||
1251 | +<!-- 弹起来,购买积分购的普通购买 --> | ||
1226 | <view hidden="{{!openSpecModal_inte_normal}}"> | 1252 | <view hidden="{{!openSpecModal_inte_normal}}"> |
1227 | - <include src="buy_integral_normal.wxml" /> | ||
1228 | -</view> | ||
1229 | - | ||
1230 | -<!----弹起来,选择规格数量,拼单商品购买------> | 1253 | + <include src="buy_integral_normal.wxml" /> |
1254 | +</view> | ||
1255 | +<!-- --弹起来,选择规格数量,拼单商品购买---- --> | ||
1231 | <view hidden="{{!openSpecModal_pt}}"> | 1256 | <view hidden="{{!openSpecModal_pt}}"> |
1232 | - <include src="buy_pt.wxml" /> | 1257 | + <include src="buy_pt.wxml" /> |
1233 | </view> | 1258 | </view> |
1234 | - | ||
1235 | -<!----弹起来优惠信息------> | 1259 | +<!-- --弹起来优惠信息---- --> |
1236 | <view hidden="{{!openPromModal}}"> | 1260 | <view hidden="{{!openPromModal}}"> |
1237 | <view bindtap="closePromModal" class="cover-layer"></view> | 1261 | <view bindtap="closePromModal" class="cover-layer"></view> |
1238 | <view class="prom-model"> | 1262 | <view class="prom-model"> |
@@ -1246,38 +1270,44 @@ | @@ -1246,38 +1270,44 @@ | ||
1246 | </view> | 1270 | </view> |
1247 | </view> | 1271 | </view> |
1248 | </view> | 1272 | </view> |
1249 | -<!----弹起的----> | 1273 | +<!-- --弹起的-- --> |
1250 | <block wx:if="{{pd_xx==1}}"> | 1274 | <block wx:if="{{pd_xx==1}}"> |
1251 | <view class="bview"></view> | 1275 | <view class="bview"></view> |
1252 | <view class="juzhong"> | 1276 | <view class="juzhong"> |
1253 | <view class="xq"> | 1277 | <view class="xq"> |
1254 | - <view class="title" bindtap="close_pt_xx">拼团玩法介绍 | 1278 | + <view class="title" bindtap="close_pt_xx"> |
1279 | + 拼团玩法介绍 | ||
1255 | <image src="{{iurl}}/miniapp/images/gbi.png" class="close"></image> | 1280 | <image src="{{iurl}}/miniapp/images/gbi.png" class="close"></image> |
1256 | </view> | 1281 | </view> |
1257 | - <view>1.开团: | 1282 | + <view> |
1283 | + 1.开团: | ||
1258 | <text class="hs1">选择心仪商品,点击“发起X人团”按钮,付款后即为开团成功;</text> | 1284 | <text class="hs1">选择心仪商品,点击“发起X人团”按钮,付款后即为开团成功;</text> |
1259 | </view> | 1285 | </view> |
1260 | - <view>2.参团: | 1286 | + <view> |
1287 | + 2.参团: | ||
1261 | <text class="hs1">进入朋友分享的页面,点击“立即参团”按钮,付款后即为参团成功,若多人同时支付,支付成功时间较早的人获得参团资格;</text> | 1288 | <text class="hs1">进入朋友分享的页面,点击“立即参团”按钮,付款后即为参团成功,若多人同时支付,支付成功时间较早的人获得参团资格;</text> |
1262 | </view> | 1289 | </view> |
1263 | - <view>3.成团: | 1290 | + <view> |
1291 | + 3.成团: | ||
1264 | <text class="hs1">在开团或参团成功后,点击“邀请小伙伴参团”将页面分享给好友,在有效时间内凑齐人数即为成团,此时商家会开始发货;</text> | 1292 | <text class="hs1">在开团或参团成功后,点击“邀请小伙伴参团”将页面分享给好友,在有效时间内凑齐人数即为成团,此时商家会开始发货;</text> |
1265 | </view> | 1293 | </view> |
1266 | - <view>4.组团失败: | 1294 | + <view> |
1295 | + 4.组团失败: | ||
1267 | <text class="hs1">在有效时间内未凑齐人数,即为组团失败,此时付款项会原路退回到支付账户;</text> | 1296 | <text class="hs1">在有效时间内未凑齐人数,即为组团失败,此时付款项会原路退回到支付账户;</text> |
1268 | </view> | 1297 | </view> |
1269 | - <view>5. | ||
1270 | - <text class="hs1">组团有效期间内,拼购商品订单不允许取消。 </text> | 1298 | + <view> |
1299 | + 5. | ||
1300 | + <text class="hs1">组团有效期间内,拼购商品订单不允许取消。</text> | ||
1271 | </view> | 1301 | </view> |
1272 | </view> | 1302 | </view> |
1273 | </view> | 1303 | </view> |
1274 | </block> | 1304 | </block> |
1275 | -<!----弹起领券----> | 1305 | +<!-- --弹起领券-- --> |
1276 | <view wx:if='{{coupon==1}}'> | 1306 | <view wx:if='{{coupon==1}}'> |
1277 | <view class="cover-layer flex-center" data-coupon='0' bindtap="switchCoupon"></view> | 1307 | <view class="cover-layer flex-center" data-coupon='0' bindtap="switchCoupon"></view> |
1278 | <view class="cx-popup {{coupon== true ? 'up' : 'down'}} "> | 1308 | <view class="cx-popup {{coupon== true ? 'up' : 'down'}} "> |
1279 | <view class="top-frame"> | 1309 | <view class="top-frame"> |
1280 | - <!-- <view class="top two-level-word t-c"> --> | 1310 | + <!-- <view class="top two-level-word t-c"> --> |
1281 | <view class="top t-c">优惠券领取</view> | 1311 | <view class="top t-c">优惠券领取</view> |
1282 | </view> | 1312 | </view> |
1283 | <!-- <view class="top-frame"> | 1313 | <!-- <view class="top-frame"> |
@@ -1286,209 +1316,205 @@ | @@ -1286,209 +1316,205 @@ | ||
1286 | <view class="xc-frame"> | 1316 | <view class="xc-frame"> |
1287 | <view class="top-frame"> | 1317 | <view class="top-frame"> |
1288 | <view class="xc-coupon-frame "> | 1318 | <view class="xc-coupon-frame "> |
1289 | - <!---单张的券---> | ||
1290 | - <view class="rel" wx:for="{{quan_list}}" wx:key="{{index}}"> | ||
1291 | - <view class="coupon flex"> | ||
1292 | - <view class="circle xc-circular-one"></view> | ||
1293 | - <view class="xc-coupon-left "> | ||
1294 | - <view class="flex ai_c xc-money-frame"> | ||
1295 | - <text class="xc-money two-level-word xc-rmb">¥</text> | ||
1296 | - <text class="one-level-word xc-money">{{item.money}}</text> | ||
1297 | - </view> | ||
1298 | - <view class="xc-money four-level-word xc-spacing"> | ||
1299 | - 满{{item.condition}}元可用 | ||
1300 | - </view> | 1319 | + <!-- -单张的券- --> |
1320 | + <view class="rel" wx:for="{{quan_list}}" wx:key="{{index}}"> | ||
1321 | + <view class="coupon flex"> | ||
1322 | + <view class="circle xc-circular-one"></view> | ||
1323 | + <view class="xc-coupon-left "> | ||
1324 | + <view class="flex ai_c xc-money-frame"> | ||
1325 | + <text class="xc-money two-level-word xc-rmb">¥</text> | ||
1326 | + <text class="one-level-word xc-money">{{item.money}}</text> | ||
1301 | </view> | 1327 | </view> |
1302 | - <view class="xc-coupon-right flex"> | ||
1303 | - <view class="xc-detail-coupon"> | ||
1304 | - <view class="four-level-word">订单金额满{{item.condition}}元可用</view> | ||
1305 | - <view class="four-level-word xc-below">{{filters.replace_time2(item.start)}} 至 {{filters.replace_time2(item.end)}}</view> | 1328 | + <view class="xc-money four-level-word xc-spacing">满{{item.condition}}元可用</view> |
1329 | + </view> | ||
1330 | + <view class="xc-coupon-right flex"> | ||
1331 | + <view class="xc-detail-coupon"> | ||
1332 | + <view class="four-level-word">订单金额满{{item.condition}}元可用</view> | ||
1333 | + <view class="four-level-word xc-below"> | ||
1334 | + {{filters.replace_time2(item.start)}} 至 {{filters.replace_time2(item.end)}} | ||
1306 | </view> | 1335 | </view> |
1307 | - <view class="flex-vertical"> | ||
1308 | - <view class="three-level-word xc-get background {{item.everyone_num>0 && item.lqnum>=item.everyone_num?'nouse':''}}" | ||
1309 | - data-ind="{{index}}" data-cid="{{item.id}}" bindtap="get_quan">{{ item.linging==1?'领取中':'领取'}}</view> | 1336 | + </view> |
1337 | + <view class="flex-vertical"> | ||
1338 | + <view class="three-level-word xc-get background {{item.everyone_num>0 && item.lqnum>=item.everyone_num?'nouse':''}}" data-ind="{{index}}" data-cid="{{item.id}}" bindtap="get_quan"> | ||
1339 | + {{ item.linging==1?'领取中':'领取'}} | ||
1310 | </view> | 1340 | </view> |
1311 | </view> | 1341 | </view> |
1312 | - <view class="circle xc-circular-two"></view> | ||
1313 | </view> | 1342 | </view> |
1343 | + <view class="circle xc-circular-two"></view> | ||
1314 | </view> | 1344 | </view> |
1345 | + </view> | ||
1315 | </view> | 1346 | </view> |
1316 | </view> | 1347 | </view> |
1317 | </view> | 1348 | </view> |
1318 | <view class="cx-confirm pd20" data-coupon='0' bindtap="switchCoupon"> | 1349 | <view class="cx-confirm pd20" data-coupon='0' bindtap="switchCoupon"> |
1319 | - <view class="confirm t-c">关闭</view> | 1350 | + <view class="confirm t-c">关闭</view> |
1320 | </view> | 1351 | </view> |
1321 | </view> | 1352 | </view> |
1322 | </view> | 1353 | </view> |
1323 | - | ||
1324 | <!-- 选择门店的弹框,1.1版最新的 --> | 1354 | <!-- 选择门店的弹框,1.1版最新的 --> |
1325 | <block wx:if="{{store==1}}"> | 1355 | <block wx:if="{{store==1}}"> |
1326 | <view class="mongolia-layer" bindtap="close_popup"></view> | 1356 | <view class="mongolia-layer" bindtap="close_popup"></view> |
1327 | <view class="popup-frame"> | 1357 | <view class="popup-frame"> |
1328 | - <block wx:if="{{sort_store==0}}"> | ||
1329 | - <!-- 头部 标题 --> | ||
1330 | - <view class="popup-top flex-space-between"> | ||
1331 | - <text class="fs32 nearby_store">{{choice_sort_store==0?'附近的门店':region_name}}</text> | 1358 | + <block wx:if="{{sort_store==0}}"> |
1359 | + <!-- 头部 标题 --> | ||
1360 | + <view class="popup-top flex-space-between"> | ||
1361 | + <text class="fs32 nearby_store">{{choice_sort_store==0?'附近的门店':region_name}}</text> | ||
1332 | <view> | 1362 | <view> |
1333 | - <view> | ||
1334 | - <icon bindtap="close_popup" class="modal-closes" color="black" size="22" type="cancel"></icon> | ||
1335 | - </view> | ||
1336 | - <view class="felx choose_more" bindtap="more_store"> | ||
1337 | - <text class="fs26 red-co" wx:if="{{is_show_sto_cat}}">{{choice_sort_store==0?'更多门店':'返回'}}</text> | ||
1338 | - <view class="bg_rights" wx:if="{{is_show_sto_cat}}"></view> | ||
1339 | - </view> | 1363 | + <view> |
1364 | + <icon bindtap="close_popup" class="modal-closes" color="black" size="22" type="cancel"></icon> | ||
1365 | + </view> | ||
1366 | + <view class="felx choose_more" bindtap="more_store"> | ||
1367 | + <text class="fs26 red-co" wx:if="{{is_show_sto_cat}}"> | ||
1368 | + {{choice_sort_store==0?'更多门店':'返回'}} | ||
1369 | + </text> | ||
1370 | + <view class="bg_rights" wx:if="{{is_show_sto_cat}}"></view> | ||
1340 | </view> | 1371 | </view> |
1341 | - </view> | ||
1342 | - <!-- 门店列表,最外层的门店列表,一开始 --> | ||
1343 | - <view class="store-list"> | ||
1344 | - <!--如果还没有点击更多门店的时候 --> | ||
1345 | - <block wx:if="{{choice_sort_store==0}}"> | ||
1346 | - <!-- 需要for循环 --> | ||
1347 | - <block wx:if="{{is_show_sto_cat==1}}"> | ||
1348 | - <view class="store_choose flex" wx:for="{{def_pickpu_list}}" bindtap="choose_for_store_fir" data-ind="{{index}}"> | ||
1349 | - <view class="store flex-vertical"> | 1372 | + </view> |
1373 | + </view> | ||
1374 | + <!-- 门店列表,最外层的门店列表,一开始 --> | ||
1375 | + <view class="store-list"> | ||
1376 | + <!-- 如果还没有点击更多门店的时候 --> | ||
1377 | + <block wx:if="{{choice_sort_store==0}}"> | ||
1378 | + <!-- 需要for循环 --> | ||
1379 | + <block wx:if="{{is_show_sto_cat==1}}"> | ||
1380 | + <view class="store_choose flex" wx:for="{{def_pickpu_list}}" bindtap="choose_for_store_fir" data-ind="{{index}}"> | ||
1381 | + <view class="store flex-vertical"> | ||
1350 | <!-- 需要点击事件 --> | 1382 | <!-- 需要点击事件 --> |
1351 | <block wx:if="{{index==fir_pick_index}}"> | 1383 | <block wx:if="{{index==fir_pick_index}}"> |
1352 | - <view class="circle white xc-hook fs20 red-b">Г</view> | ||
1353 | - </block> | 1384 | + <view class="circle white xc-hook fs20 red-b">Г</view> |
1385 | + </block> | ||
1354 | <block wx:else> | 1386 | <block wx:else> |
1355 | - <view class="circle xc-hooks"></view> | ||
1356 | - </block> | 1387 | + <view class="circle xc-hooks"></view> |
1388 | + </block> | ||
1357 | <view class="address-frame xc-ash"> | 1389 | <view class="address-frame xc-ash"> |
1358 | - <view class="flex-vertical-between butttem5"> | ||
1359 | - <view class="flex xc-ash"> | ||
1360 | - <view class="fs30 xc-black3 address_name">{{item.pickup_name}}</view> | ||
1361 | - </view> | ||
1362 | - <view> | ||
1363 | - <view class="distance fs24 address-val"wx:if="{{item.distance!=null}}"> | ||
1364 | - 距离:{{item.distance>1000?filters.toFix(item.distance/1000,2)+'km':filters.toFix(item.distance,0)+"m"}}</view> | 1390 | + <view class="flex-vertical-between butttem5"> |
1391 | + <view class="flex xc-ash"> | ||
1392 | + <view class="fs30 xc-black3 address_name">{{item.pickup_name}}</view> | ||
1393 | + </view> | ||
1394 | + <view> | ||
1395 | + <view class="distance fs24 address-val" wx:if="{{item.distance!=null}}"> | ||
1396 | + 距离:{{item.distance>1000?filters.toFix(item.distance/1000,2)+'km':filters.toFix(item.distance,0)+"m"}} | ||
1397 | + </view> | ||
1398 | + </view> | ||
1365 | </view> | 1399 | </view> |
1400 | + <view class="fs24 xc-ash-9f">地址:{{item.fulladdress}}</view> | ||
1401 | + </view> | ||
1366 | </view> | 1402 | </view> |
1367 | - <view class="fs24 xc-ash-9f">地址:{{item.fulladdress}}</view> | ||
1368 | - </view> | ||
1369 | </view> | 1403 | </view> |
1370 | - </view> | ||
1371 | - </block> | ||
1372 | - <block wx:else> | ||
1373 | - <view class="store_choose flex" wx:for="{{only_pk}}" bindtap="choose_for_store_fir" data-ind="{{index}}"> | ||
1374 | - <view class="store flex-vertical"> | ||
1375 | - <!-- 需要点击事件 --> | ||
1376 | - <block wx:if="{{index==fir_pick_index}}" > | ||
1377 | - <view class="circle white xc-hook fs20 red-b">Г</view> | ||
1378 | - </block> | ||
1379 | - <block wx:else> | ||
1380 | - <view class="circle xc-hooks"></view> | ||
1381 | - </block> | ||
1382 | - | ||
1383 | - <view class="address-frame xc-ash"> | ||
1384 | - <view class="flex-vertical-between "> | ||
1385 | - <view class="flex xc-ash"> | ||
1386 | - <view class="fs30 xc-black3 address_name">{{item.pickup_name}}</view> | ||
1387 | - </view> | ||
1388 | - <view> | ||
1389 | - <view class="distance fs24 address-val" | ||
1390 | - wx:if="{{item.distance!=null}}">距离:{{item.distance>1000?filters.toFix(item.distance/1000,2)+"km":filters.toFix(item.distance,0)+"m"}} | ||
1391 | - </view> | ||
1392 | - </view> | ||
1393 | - </view> | ||
1394 | - <view class="fs24 xc-ash-9f">地址:{{item.fulladdress}}</view> | ||
1395 | - </view> | ||
1396 | - </view> | ||
1397 | - </view> | ||
1398 | - </block> | ||
1399 | - </block> | ||
1400 | - <block wx:else> <!-- 如果是点击选择门店分类后显示分类下的门店 --> | ||
1401 | - <view class="store_choose flex" wx:for="{{sec_sto.s_arr}}" data-ind="{{index}}" bindtap="choose_for_store"> | ||
1402 | - <view class="store flex-vertical"> | ||
1403 | - <!-- 需要点击事件 --> | ||
1404 | - <block wx:if="{{index==sec_pick_index}}"> | ||
1405 | - <view class="circle white xc-hook fs20 red-b">Г</view> | ||
1406 | - </block> | ||
1407 | - <block wx:else> | ||
1408 | - <view class="circle xc-hooks"></view> | ||
1409 | - </block> | ||
1410 | - | ||
1411 | - <view class="address-frame xc-ash"> | ||
1412 | - <view class="flex-vertical-between "> | ||
1413 | - <view class="flex xc-ash"> | ||
1414 | - <view class="fs28 xc-black3 address_name">{{item.pickup_name}}</view> | ||
1415 | - </view> | ||
1416 | - <view> | ||
1417 | - <view class="distance fs24 address-val"wx:if="{{item.distance!=null}}"> | ||
1418 | - 距离:{{item.distance>1000?filters.toFix(item.distance/1000,2)+"km":filters.toFix(item.distance,0)+"m"}}</view> | ||
1419 | - </view> | 1404 | + </block> |
1405 | + <block wx:else> | ||
1406 | + <view class="store_choose flex" wx:for="{{only_pk}}" bindtap="choose_for_store_fir" data-ind="{{index}}"> | ||
1407 | + <view class="store flex-vertical"> | ||
1408 | + <!-- 需要点击事件 --> | ||
1409 | + <block wx:if="{{index==fir_pick_index}}"> | ||
1410 | + <view class="circle white xc-hook fs20 red-b">Г</view> | ||
1411 | + </block> | ||
1412 | + <block wx:else> | ||
1413 | + <view class="circle xc-hooks"></view> | ||
1414 | + </block> | ||
1415 | + <view class="address-frame xc-ash"> | ||
1416 | + <view class="flex-vertical-between "> | ||
1417 | + <view class="flex xc-ash"> | ||
1418 | + <view class="fs30 xc-black3 address_name">{{item.pickup_name}}</view> | ||
1419 | + </view> | ||
1420 | + <view> | ||
1421 | + <view class="distance fs24 address-val" wx:if="{{item.distance!=null}}"> | ||
1422 | + 距离:{{item.distance>1000?filters.toFix(item.distance/1000,2)+"km":filters.toFix(item.distance,0)+"m"}} | ||
1420 | </view> | 1423 | </view> |
1421 | - <view class="fs24 xc-ash-9f">地址:{{item.fulladdress}}</view> | ||
1422 | </view> | 1424 | </view> |
1423 | </view> | 1425 | </view> |
1426 | + <view class="fs24 xc-ash-9f">地址:{{item.fulladdress}}</view> | ||
1424 | </view> | 1427 | </view> |
1428 | + </view> | ||
1429 | + </view> | ||
1430 | + </block> | ||
1431 | + </block> | ||
1432 | + <block wx:else> | ||
1433 | + <!-- 如果是点击选择门店分类后显示分类下的门店 --> | ||
1434 | + <view class="store_choose flex" wx:for="{{sec_sto.s_arr}}" data-ind="{{index}}" bindtap="choose_for_store"> | ||
1435 | + <view class="store flex-vertical"> | ||
1436 | + <!-- 需要点击事件 --> | ||
1437 | + <block wx:if="{{index==sec_pick_index}}"> | ||
1438 | + <view class="circle white xc-hook fs20 red-b">Г</view> | ||
1439 | + </block> | ||
1440 | + <block wx:else> | ||
1441 | + <view class="circle xc-hooks"></view> | ||
1425 | </block> | 1442 | </block> |
1426 | - | ||
1427 | - </view> | ||
1428 | - | ||
1429 | - <!-- 门店列表底部 --> | ||
1430 | - <view class="store-bottom-frame"> | ||
1431 | - <view class="store-bottom flex-vertical-between"> | ||
1432 | - <view class="determine red-b fs28 white t-c" bindtap="sure_pick" | ||
1433 | - data-openindstore="{{open_ind_store}}">确定</view> | ||
1434 | - <view class="default t-c fs28" bindtap="set_def_pick"data-openindstore="{{open_ind_store}}">设为默认</view> | ||
1435 | - </view> | 1443 | + <view class="address-frame xc-ash"> |
1444 | + <view class="flex-vertical-between "> | ||
1445 | + <view class="flex xc-ash"> | ||
1446 | + <view class="fs28 xc-black3 address_name">{{item.pickup_name}}</view> | ||
1447 | + </view> | ||
1448 | + <view> | ||
1449 | + <view class="distance fs24 address-val" wx:if="{{item.distance!=null}}"> | ||
1450 | + 距离:{{item.distance>1000?filters.toFix(item.distance/1000,2)+"km":filters.toFix(item.distance,0)+"m"}} | ||
1451 | + </view> | ||
1452 | + </view> | ||
1453 | + </view> | ||
1454 | + <view class="fs24 xc-ash-9f">地址:{{item.fulladdress}}</view> | ||
1455 | + </view> | ||
1456 | + </view> | ||
1457 | + </view> | ||
1458 | + </block> | ||
1459 | + </view> | ||
1460 | + <!-- 门店列表底部 --> | ||
1461 | + <view class="store-bottom-frame"> | ||
1462 | + <view class="store-bottom flex-vertical-between"> | ||
1463 | + <view class="determine red-b fs28 white t-c" bindtap="sure_pick" data-openindstore="{{open_ind_store}}"> | ||
1464 | + 确定 | ||
1465 | + </view> | ||
1466 | + <view class="default t-c fs28" bindtap="set_def_pick" data-openindstore="{{open_ind_store}}"> | ||
1467 | + 设为默认 | ||
1436 | </view> | 1468 | </view> |
1437 | - | ||
1438 | - </block> | ||
1439 | - | ||
1440 | - | ||
1441 | - <block wx:else> | ||
1442 | - <view class="popup-top flex-space-between"> | ||
1443 | - <text class="fs32 nearby_store">门店分类选择</text> | 1469 | + </view> |
1470 | + </view> | ||
1471 | + </block> | ||
1472 | + <block wx:else> | ||
1473 | + <view class="popup-top flex-space-between"> | ||
1474 | + <text class="fs32 nearby_store">门店分类选择</text> | ||
1444 | <view> | 1475 | <view> |
1445 | - <view> | ||
1446 | - <icon bindtap="close_popup" class="modal-closes" color="black" size="22" type="cancel"></icon> | ||
1447 | - </view> | ||
1448 | - <view class="felx choose_mores" bindtap="returns"> | ||
1449 | - <text class="fs26 red-co">返回</text> | ||
1450 | - </view> | 1476 | + <view> |
1477 | + <icon bindtap="close_popup" class="modal-closes" color="black" size="22" type="cancel"></icon> | ||
1451 | </view> | 1478 | </view> |
1452 | - </view> | ||
1453 | - <view class="sort_store_list"> | ||
1454 | - | ||
1455 | - <view class="sort-store-frame" wx:for="{{all_sto}}" data-index="{{index}}" bindtap="choice_sort_store" data-region="{{item.name}}"> | ||
1456 | - <view class="sort-store flex-vertical-between" > | ||
1457 | - <view class="fs30" di>{{item.name}}</view> | ||
1458 | - <view class="black_rights-frame"> | ||
1459 | - <view class="black_rights"></view> | ||
1460 | - </view> | ||
1461 | - </view> | 1479 | + <view class="felx choose_mores" bindtap="returns"> |
1480 | + <text class="fs26 red-co">返回</text> | ||
1481 | + </view> | ||
1482 | + </view> | ||
1483 | + </view> | ||
1484 | + <view class="sort_store_list"> | ||
1485 | + <view class="sort-store-frame" wx:for="{{all_sto}}" data-index="{{index}}" bindtap="choice_sort_store" data-region="{{item.name}}"> | ||
1486 | + <view class="sort-store flex-vertical-between"> | ||
1487 | + <view class="fs30" di>{{item.name}}</view> | ||
1488 | + <view class="black_rights-frame"> | ||
1489 | + <view class="black_rights"></view> | ||
1490 | + </view> | ||
1462 | </view> | 1491 | </view> |
1463 | - | ||
1464 | - </view> | ||
1465 | - </block> | 1492 | + </view> |
1493 | + </view> | ||
1494 | + </block> | ||
1466 | </view> | 1495 | </view> |
1467 | -</block> | ||
1468 | -<!-- ---------------分享弹窗--------------- --> | ||
1469 | -<!--二维码显示页面--> | 1496 | +</block> |
1497 | +<!-- ---------------分享弹窗--------------- --> | ||
1498 | +<!-- 二维码显示页面 --> | ||
1470 | <canvas canvas-id='share' style='width:750rpx;height:1217rpx;background-color:white;' wx:if='{{!canvasHidden}}'></canvas> | 1499 | <canvas canvas-id='share' style='width:750rpx;height:1217rpx;background-color:white;' wx:if='{{!canvasHidden}}'></canvas> |
1471 | <warn id="warn"></warn> | 1500 | <warn id="warn"></warn> |
1472 | - | ||
1473 | - | ||
1474 | <!-- 分享控件,底部弹出 --> | 1501 | <!-- 分享控件,底部弹出 --> |
1475 | -<share id="share_button" bind:send="send" bind:cancel="cancel" bind:share_img="saveImageToPhotosAlbum" wx:if="{{share_hidden}}"></share> | ||
1476 | - | ||
1477 | - | 1502 | +<share id="share_button" bind:send="send" bind:cancel="cancel" bind:share_img="saveImageToPhotosAlbum" wx:if="{{share_hidden}}"></share> |
1478 | <view wx:if="{{showPoster}}"> | 1503 | <view wx:if="{{showPoster}}"> |
1479 | - <view class="mask" catchtap="closePoster"></view> | ||
1480 | - <view class="poster-container"> | ||
1481 | - <view class="poster-wrapper"> | ||
1482 | - <view class="poster"> | ||
1483 | - <!-- <view class="poster" bindtap="previewImage"> --> | ||
1484 | - <image src="{{shareImgPath}}" class="poster-img" ></image> | ||
1485 | - <view class="btn-close" catchtap="closePoster"><text class="iconfont icon-close"></text></view> | ||
1486 | - </view> | ||
1487 | - <view class="btn-container"> | ||
1488 | - <!--<button class="btn-share" open-type="share" bindtap="">微信好友分享</button>--> | ||
1489 | - <button class="btn-share" bindtap="savePic">保存到相册</button> | ||
1490 | - </view> | 1504 | + <view class="mask" catchtap="closePoster"></view> |
1505 | + <view class="poster-container"> | ||
1506 | + <view class="poster-wrapper"> | ||
1507 | + <view class="poster"> | ||
1508 | + <!-- <view class="poster" bindtap="previewImage"> --> | ||
1509 | + <image src="{{shareImgPath}}" class="poster-img"></image> | ||
1510 | + <view class="btn-close" catchtap="closePoster"> | ||
1511 | + <text class="iconfont icon-close"></text> | ||
1512 | + </view> | ||
1513 | + </view> | ||
1514 | + <view class="btn-container"> | ||
1515 | + <!-- <button class="btn-share" open-type="share" bindtap="">微信好友分享</button> --> | ||
1516 | + <button class="btn-share" bindtap="savePic">保存到相册</button> | ||
1517 | + </view> | ||
1518 | + </view> | ||
1491 | </view> | 1519 | </view> |
1492 | - </view> | ||
1493 | -</view> | ||
1494 | - | 1520 | +</view> |
1495 | \ No newline at end of file | 1521 | \ No newline at end of file |