-
Status changed to merged
-
mentioned in commit 72ae1bbf91dd294346c5e463421dff03425b32ec
Showing
6 changed files
packageA/pages/goodsInfo/goodsInfo.js
packageA/pages/goodsInfo/goodsInfo.wxml
@@ -4,468 +4,502 @@ | @@ -4,468 +4,502 @@ | ||
4 | <wxs module="tool" src="filter.wxs"></wxs> | 4 | <wxs module="tool" src="filter.wxs"></wxs> |
5 | 5 | ||
6 | <!-- 商品内容区域,普通商品,秒杀,拼团 --> | 6 | <!-- 商品内容区域,普通商品,秒杀,拼团 --> |
7 | -<!-- <block wx:if="{{isshow}}"> --> | ||
8 | -<block> | ||
9 | - <view class="container"> | ||
10 | - <!-- <view class="type-navbar"> | ||
11 | - <view class="type-box" wx:for="{{categories}}" wx:key="categories"> | ||
12 | - <view bindtap="tabClick" class="type-navbar-item {{activeCategoryId==item.id?'type-item-on':''}}" id="{{item.id}}"> | ||
13 | - {{item.name}} | ||
14 | - </view> | ||
15 | - </view> | ||
16 | - </view> --> | ||
17 | - <view class="goods-detail"> | ||
18 | - <view class="goods-info" hidden="{{activeCategoryId==0?false:true}}"> | ||
19 | - <view id="id" bindtouchstart="handletouchtart" bindtouchmove="handletouchmove"> | ||
20 | - <view class="xc-videos-picture rel"> | ||
21 | - <swiper autoplay="{{false}}" current="{{swiperCurrent}}" class="swiper_box swiperContainer rel" duration="{{1000}}" indicatorDots="{{mapurl?false:true}}" interval="{{3000}}" vertical="{{false}}" bindchange="swiperChange"> | ||
22 | - <swiper-item> | ||
23 | - <image class="wh100" src="{{iurl}}{{data.image_url?data.image_url:'miniapp/images/default_g_img.gif'}}" binderror="bind_bnerr" | ||
24 | - mode="aspectFit" lazy-load="true" data-errorimg="gallery[{{index}}].image_url"></image> | ||
25 | - </swiper-item> | ||
26 | - </swiper> | ||
27 | - </view> | ||
28 | - </view> | ||
29 | - | ||
30 | - <block> | ||
31 | - | ||
32 | - <view class="goods-price rel"> | ||
33 | - <view class="co-red" style="overflow: hidden"> | ||
34 | - <view class="market-price" style="overflow: hidden"></view> | ||
35 | - </view> | ||
36 | - | ||
37 | - <view> | ||
38 | - <view class="co-red"><text class="rel yuan">¥</text>{{filters.toFix(data.shop_price,2)}}</view> | ||
39 | - <view class="goods-title"> <view class="goods-name elli">{{data.goods_name}}</view></view> | ||
40 | - </view> | ||
41 | - | ||
42 | - <view class="goods-num"> | ||
43 | - <view class="sales">销量:{{data.sales_sum}}</view> | ||
44 | - <view class="sales">有效天数:{{data.validDays?data.validDays:'不限'}}</view> | 7 | +<block> |
8 | + <view class="container"> | ||
9 | + <view class="type-navbar"> | ||
10 | + <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}}"> | ||
12 | + {{item.name}} | ||
13 | + </view> | ||
45 | </view> | 14 | </view> |
46 | - | ||
47 | - </view> | ||
48 | - </block> | ||
49 | - | ||
50 | - <!-- 门店收货地址 --> | ||
51 | - <view class="xc-address_frame bdt16 flex-vertical xc-ash {{def_pick_store!=null?'sn_height':'on_height'}}" > | ||
52 | - <view class="address_frame" bindtap="choice_store" data-ind="0"> | ||
53 | - <view class="flex-vertical-between "> | ||
54 | - <view class="flex-vertical select_store_height"> | ||
55 | - <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image> | ||
56 | - <view class="fs30" style="color:black;">选择门店</view> | ||
57 | - </view> | ||
58 | - <view class="red_bb fs26">更多门店<text class="bg_jj"></text></view> | ||
59 | - </view> | ||
60 | - | ||
61 | - <view wx:if="{{def_pick_store && def_pick_store.pickup_name}}"> | ||
62 | - <view class="flex-space-between address ai_end "> | ||
63 | - <view> | ||
64 | - <text class="fs30 xc-black3 shop_name">{{def_pick_store.pickup_name}}</text> | ||
65 | - </view> | ||
66 | - <view class="distance fs24"wx:if="{{def_pick_store.distance!=null}}"> | ||
67 | - 距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}} | ||
68 | - | ||
69 | - </view> | ||
70 | - </view> | ||
71 | - | ||
72 | - <view class="no_store" wx:if="{{only_pk && !only_pk.length}}">(未找到门店)</view> | ||
73 | - <block wx:else> | ||
74 | - <view class="no_store" wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">(未找到门店)</view> | ||
75 | - <block wx:else> | ||
76 | - <view class="no_store" wx:if="{{def_pick_store && def_pick_store.is_no_dis}}">(配送不匹配)</view> | ||
77 | - </block> | ||
78 | - </block> | ||
79 | - | ||
80 | - <view class="fs24 xc-ash-9f">地址:{{def_pick_store.fulladdress}}</view> | ||
81 | - </view> | ||
82 | - </view> | ||
83 | - | ||
84 | - </view> | ||
85 | - | ||
86 | - <view class="bz_view flex bdt16" wx:if="{{store_config}}"> | ||
87 | - <image class="bzfu_img" src="{{iurl}}/miniapp/images/bzfu_w.png"></image> | ||
88 | - <view class="flex f1 ai_c rel"> | ||
89 | - <view class="bz-content {{flag ? '':'ellipsis-1'}} f1">{{store_config.service_bz}}</view> | ||
90 | - <view bindtap="clickCollapse" class="cx-obtain-coupon wsize arrow"> | ||
91 | - <text class="bg_jj {{flag?'down1':''}}"></text> | 15 | + </view> |
16 | + <view class="goods-detail"> | ||
17 | + <view class="goods-info" hidden="{{activeCategoryId==0?false:true}}"> | ||
18 | + <view id="id" bindtouchstart="handletouchtart" bindtouchmove="handletouchmove"> | ||
19 | + <view class="xc-videos-picture rel"> | ||
20 | + <swiper autoplay="{{false}}" current="{{swiperCurrent}}" class="swiper_box swiperContainer rel" duration="{{1000}}" | ||
21 | + indicatorDots="{{mapurl?false:true}}" interval="{{3000}}" vertical="{{false}}" bindchange="swiperChange"> | ||
22 | + <swiper-item> | ||
23 | + <image class="wh100" src="{{iurl}}{{data.image_url?data.image_url:'miniapp/images/default_g_img.gif'}}" | ||
24 | + binderror="bind_bnerr" mode="aspectFit" lazy-load="true" data-errorimg="gallery[{{index}}].image_url"></image> | ||
25 | + </swiper-item> | ||
26 | + </swiper> | ||
27 | + </view> | ||
28 | + </view> | ||
29 | + | ||
30 | + <block> | ||
31 | + | ||
32 | + <view class="goods-price rel"> | ||
33 | + <view class="co-red" style="overflow: hidden"> | ||
34 | + <view class="market-price" style="overflow: hidden"></view> | ||
35 | + </view> | ||
36 | + | ||
37 | + <view> | ||
38 | + <view class="co-red"><text class="rel yuan">¥</text>{{filters.toFix(data.shop_price,2)}}</view> | ||
39 | + <view class="goods-title"> | ||
40 | + <view class="goods-name elli">{{data.goods_name}}</view> | ||
41 | + </view> | ||
42 | + </view> | ||
43 | + | ||
44 | + <view class="goods-num"> | ||
45 | + <view class="sales">销量:{{data.sales_sum}}</view> | ||
46 | + <view class="sales">有效天数:{{data.validDays?data.validDays:'不限'}}</view> | ||
47 | + </view> | ||
48 | + | ||
49 | + </view> | ||
50 | + </block> | ||
51 | + | ||
52 | + | ||
53 | + | ||
54 | + <!-- 门店收货地址 --> | ||
55 | + <view class="xc-address_frame bdt16 flex-vertical xc-ash {{def_pick_store!=null?'sn_height':'on_height'}}"> | ||
56 | + <view class="address_frame" bindtap="choice_store" data-ind="0"> | ||
57 | + <view class="flex-vertical-between "> | ||
58 | + <view class="flex-vertical select_store_height"> | ||
59 | + <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image> | ||
60 | + <view class="fs30" style="color:black;">选择门店</view> | ||
61 | + </view> | ||
62 | + <view class="red_bb fs26">更多门店<text class="bg_jj"></text></view> | ||
63 | + </view> | ||
64 | + | ||
65 | + <view wx:if="{{def_pick_store && def_pick_store.pickup_name}}"> | ||
66 | + <view class="flex-space-between address ai_end "> | ||
67 | + <view> | ||
68 | + <text class="fs30 xc-black3 shop_name">{{def_pick_store.pickup_name}}</text> | ||
69 | + </view> | ||
70 | + <view class="distance fs24" wx:if="{{def_pick_store.distance!=null}}"> | ||
71 | + 距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}} | ||
72 | + | ||
92 | </view> | 73 | </view> |
93 | - <!-- <text class="bg_jj" bindtap="clickCollapse"></text> --> | ||
94 | - <!-- <text class="iconfont icon-shuangjiantouxia c-db"></text> --> | ||
95 | </view> | 74 | </view> |
75 | + | ||
76 | + <view class="no_store" wx:if="{{only_pk && !only_pk.length}}">(未找到门店)</view> | ||
77 | + <block wx:else> | ||
78 | + <view class="no_store" wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">(未找到门店)</view> | ||
79 | + <block wx:else> | ||
80 | + <view class="no_store" wx:if="{{def_pick_store && def_pick_store.is_no_dis}}">(配送不匹配)</view> | ||
81 | + </block> | ||
82 | + </block> | ||
83 | + | ||
84 | + <view class="fs24 xc-ash-9f">地址:{{def_pick_store.fulladdress}}</view> | ||
96 | </view> | 85 | </view> |
97 | - | ||
98 | - | ||
99 | - | ||
100 | - | ||
101 | - | ||
102 | - | ||
103 | - | ||
104 | - <!-- 图文详情 --> | ||
105 | - <view class="pd20"> | ||
106 | - <!-- <view class="tuwen_title"> | ||
107 | - <view class="g_line"></view> | ||
108 | - <view class="center_s"> | ||
109 | - <image src="{{iurl}}/miniapp/images/tuwen_c.png"></image><text>详情</text> | ||
110 | - </view> | ||
111 | - </view> --> | ||
112 | - | ||
113 | - <view wx:if="{{service_list}}"> | ||
114 | - <view class="goods-num pdv20 t-c" style="font-size: 26rpx; background-color: #f6f5f4;"> | ||
115 | - <view class="stock">项目名称</view> | ||
116 | - <view class="stock">耗时(分)</view> | ||
117 | - <!-- <view class="stock">手工费</view> --> | ||
118 | - <view class="stock">次数</view> | ||
119 | - </view> | ||
120 | - <block wx:for="{{service_list}}"> | ||
121 | - <view class="goods-num pdv20 t-c" style="margin-bottom: 10rpx;font-size: 22rpx;"> | ||
122 | - <view class="stock">{{item.projectName}}</view> | ||
123 | - <view class="stock">{{item.timeConsuming}}</view> | ||
124 | - <!-- <view class="stock">{{item.money}}</view> --> | ||
125 | - <view class="stock">{{item.frequency}}</view> | ||
126 | - </view> | ||
127 | - </block> | ||
128 | - </view> | ||
129 | - | ||
130 | - <view class="wxParse"> | ||
131 | - <template is="wxParse" data="{{wxParseData:content.nodes}}"></template> | ||
132 | - </view> | ||
133 | - | ||
134 | - </view> | 86 | + </view> |
87 | + | ||
88 | + </view> | ||
89 | + | ||
90 | + <view class="bz_view flex bdt16" wx:if="{{store_config}}"> | ||
91 | + <image class="bzfu_img" src="{{iurl}}/miniapp/images/bzfu_w.png"></image> | ||
92 | + <view class="flex f1 ai_c rel"> | ||
93 | + <view class="bz-content {{flag ? '':'ellipsis-1'}} f1">{{store_config.service_bz}}</view> | ||
94 | + <view bindtap="clickCollapse" class="cx-obtain-coupon wsize arrow"> | ||
95 | + <text class="bg_jj {{flag?'down1':''}}"></text> | ||
96 | + </view> | ||
97 | + <!-- <text class="bg_jj" bindtap="clickCollapse"></text> --> | ||
98 | + <!-- <text class="iconfont icon-shuangjiantouxia c-db"></text> --> | ||
99 | + </view> | ||
100 | + </view> | ||
101 | + | ||
102 | + | ||
135 | 103 | ||
136 | - <!-- 推荐商品 --> | ||
137 | - <!-- <view class="flex-center rel xc-linellae-frame"> | ||
138 | - <view class="xc-linellae"></view> | ||
139 | - <view class="abs flex-center xc-recommend-frame "> | ||
140 | - <image class=" xc-recommend" src="{{iurl}}/miniapp/images/diamond.png"> | ||
141 | - </image> | ||
142 | - <view class="xc-recommend-word">推荐</view> | 104 | + |
105 | + | ||
106 | + | ||
107 | + | ||
108 | + <!-- 图文详情 --> | ||
109 | + <view class="t_g_info bdt16"> | ||
110 | + <view class="red_shu"></view> | ||
111 | + <view class="fs30 bold">商品详情</view> | ||
112 | + </view> | ||
113 | + <view class="pd20"> | ||
114 | + <view class="table_s" wx:if="{{service_list}}"> | ||
115 | + <view class="tb_item tb-l"> | ||
116 | + <view class="item_left f1"> | ||
117 | + <text>项目名称</text> | ||
118 | + </view> | ||
119 | + <view class="item_left f1"> | ||
120 | + <text>耗时(分)</text> | ||
121 | + </view> | ||
122 | + <view class="item_left f1"> | ||
123 | + <text>次数</text> | ||
124 | + </view> | ||
143 | </view> | 125 | </view> |
144 | - </view> | ||
145 | - <goods_recommend id="goods_list"></goods_recommend> --> | 126 | + <view class="tb_item tb-l" wx:for="{{service_list}}"> |
127 | + <view class="item_right f1"> | ||
128 | + <text>{{item.projectName}}</text> | ||
129 | + </view> | ||
130 | + <view class="item_right f1"> | ||
131 | + <text>{{item.timeConsuming}}</text> | ||
132 | + </view> | ||
133 | + <view class="item_right f1"> | ||
134 | + <text>{{item.frequency}}</text> | ||
135 | + </view> | ||
136 | + </view> | ||
137 | + </view> | ||
146 | 138 | ||
147 | - </view> | 139 | + <view class="wxParse"> |
140 | + <template is="wxParse" data="{{wxParseData:content.nodes}}"></template> | ||
141 | + </view> | ||
148 | 142 | ||
149 | - </view> | ||
150 | - </view> | ||
151 | - <!---滚动到顶部----> | ||
152 | - <view bindtap="doScrollTop" class="toTop" wx:if="{{supportPageScroll}}"> | ||
153 | - <image class="wh100" src="{{iurl}}/miniapp/images/topup.png"></image> | ||
154 | - </view> | ||
155 | - | ||
156 | - <!-- 底部按钮 --> | ||
157 | - <view class="join-cart jc_sb"> | ||
158 | - | ||
159 | - <view class="flex"> | ||
160 | - <button wx:if="{{sys_switch.weapp_customertype==1}}" class="custom-service cart-ico new_split f1" open-type="contact" session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}" style="text-align: center"> | ||
161 | - <image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image> | ||
162 | - <view>客服</view> | ||
163 | - </button> | ||
164 | - | ||
165 | - <view wx:elif="{{sys_switch.weapp_customertype==2}}" class="custom-service cart-ico new_split f1" bindtap="con_weixin" style="text-align: center"> | ||
166 | - <image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image> | ||
167 | - <view>客服</view> | ||
168 | - </view> | ||
169 | - | ||
170 | - <view wx:else class="custom-service cart-ico new_split f1" bindtap="contactService" style="text-align: center"> | ||
171 | - <image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image> | ||
172 | - <view>客服</view> | ||
173 | </view> | 143 | </view> |
174 | - | ||
175 | - <view class="shopping-cart cart-ico new_split f1"> | ||
176 | - <navigator open-type="switchTab" url="/pages/cart/cart/cart" style="text-align: center"> | ||
177 | - <image class="sc-img" src="{{iurl}}/miniapp/images/shopping-cart.png"></image> | ||
178 | - <view class="cart-num ellipsis-1"> {{cartGoodsNum}} </view> | ||
179 | - <view>购物车</view> | ||
180 | - </navigator> | ||
181 | - </view> | ||
182 | </view> | 144 | </view> |
183 | - | ||
184 | - | ||
185 | - <view class="flex f1 pdh20"> | ||
186 | 145 | ||
187 | - <view bindtap="openSpecModel" data-ind="1" class="join-btn cart-btn f1">加入购物车</view> | ||
188 | - <view bindtap="openSpecModel" data-ind="2" class="buy-btn cart-btn f1">立即购买</view> | ||
189 | - </view> | ||
190 | - | ||
191 | - </view> | ||
192 | - | ||
193 | - <!-- 制作一个圆球导航 --> | ||
194 | - <nav_box></nav_box> | 146 | + <view class="goods-norms" hidden="{{activeCategoryId==1?false:true}}"> |
147 | + <view class="pd20"> | ||
148 | + <view class="table_s" wx:if="{{service_list}}"> | ||
149 | + <view class="tb_item tb-l"> | ||
150 | + <view class="item_left f1"> | ||
151 | + <text>项目名称</text> | ||
152 | + </view> | ||
153 | + <view class="item_left f1"> | ||
154 | + <text>耗时(分)</text> | ||
155 | + </view> | ||
156 | + <view class="item_left f1"> | ||
157 | + <text>次数</text> | ||
158 | + </view> | ||
159 | + </view> | ||
160 | + <view class="tb_item tb-l" wx:for="{{service_list}}"> | ||
161 | + <view class="item_right f1"> | ||
162 | + <text>{{item.projectName}}</text> | ||
163 | + </view> | ||
164 | + <view class="item_right f1"> | ||
165 | + <text>{{item.timeConsuming}}</text> | ||
166 | + </view> | ||
167 | + <view class="item_right f1"> | ||
168 | + <text>{{item.frequency}}</text> | ||
169 | + </view> | ||
170 | + </view> | ||
171 | + </view> | ||
172 | + | ||
173 | + <view class="wxParse"> | ||
174 | + <template is="wxParse" data="{{wxParseData:content.nodes}}"></template> | ||
175 | + </view> | ||
176 | + | ||
177 | + </view> | ||
178 | + </view> | ||
179 | + | ||
180 | + </view> | ||
181 | + </view> | ||
182 | + <!---滚动到顶部----> | ||
183 | + <view bindtap="doScrollTop" class="toTop" wx:if="{{supportPageScroll}}"> | ||
184 | + <image class="wh100" src="{{iurl}}/miniapp/images/topup.png"></image> | ||
185 | + </view> | ||
186 | + | ||
187 | + <!-- 底部按钮 --> | ||
188 | + <view class="join-cart jc_sb"> | ||
189 | + | ||
190 | + <view class="flex"> | ||
191 | + <button wx:if="{{sys_switch.weapp_customertype==1}}" class="custom-service cart-ico new_split f1" open-type="contact" | ||
192 | + session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}" style="text-align: center"> | ||
193 | + <image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image> | ||
194 | + <view>客服</view> | ||
195 | + </button> | ||
196 | + | ||
197 | + <view wx:elif="{{sys_switch.weapp_customertype==2}}" class="custom-service cart-ico new_split f1" bindtap="con_weixin" | ||
198 | + style="text-align: center"> | ||
199 | + <image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image> | ||
200 | + <view>客服</view> | ||
201 | + </view> | ||
202 | + | ||
203 | + <view wx:else class="custom-service cart-ico new_split f1" bindtap="contactService" style="text-align: center"> | ||
204 | + <image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image> | ||
205 | + <view>客服</view> | ||
206 | + </view> | ||
207 | + | ||
208 | + <view class="shopping-cart cart-ico new_split f1"> | ||
209 | + <navigator open-type="switchTab" url="/pages/cart/cart/cart" style="text-align: center"> | ||
210 | + <image class="sc-img" src="{{iurl}}/miniapp/images/shopping-cart.png"></image> | ||
211 | + <view class="cart-num ellipsis-1"> {{cartGoodsNum}} </view> | ||
212 | + <view>购物车</view> | ||
213 | + </navigator> | ||
214 | + </view> | ||
215 | + </view> | ||
216 | + | ||
217 | + | ||
218 | + <view class="flex f1 pdh20"> | ||
219 | + | ||
220 | + <view bindtap="openSpecModel" data-ind="1" class="join-btn cart-btn f1">加入购物车</view> | ||
221 | + <view bindtap="openSpecModel" data-ind="2" class="buy-btn cart-btn f1">立即购买</view> | ||
222 | + </view> | ||
223 | + | ||
224 | + </view> | ||
225 | + | ||
226 | + <!-- 制作一个圆球导航 --> | ||
227 | + <nav_box></nav_box> | ||
195 | </block> | 228 | </block> |
196 | 229 | ||
197 | <!-- 弹起来,选择规格数量,普通商品购买和秒杀 --> | 230 | <!-- 弹起来,选择规格数量,普通商品购买和秒杀 --> |
198 | <view hidden="{{!openSpecModal}}"> | 231 | <view hidden="{{!openSpecModal}}"> |
199 | - <view bindtap="closeSpecModal" class="cover-layer"></view> | ||
200 | - <view class="spec-model"> | ||
201 | - <view class="pding"> | ||
202 | - <icon bindtap="closeSpecModal" class="modal-close" color="black" size="22" type="cancel"></icon> | ||
203 | - <view class="spec-goods"> | ||
204 | - <image class="wh100 spec-img" src="{{iurl}}{{data.image_url?data.image_url:'miniapp/images/default_g_img.gif'}}" binderror="pop_err_img" data-errorimg="data.image_url"/> | ||
205 | - <view class="spec-goods-info"> | ||
206 | - <view class="spec-goods-name ellipsis-2">{{data.goods_name}}</view> | ||
207 | - <view class="flex ai_end xc-val-money" > | ||
208 | - <view class="spec-goods-price"><text class="fs20">¥</text><block wx>{{data.shop_price}}</block></view> | ||
209 | - </view> | ||
210 | - </view> | ||
211 | - </view> | ||
212 | - | ||
213 | - <!-- 选择门店模块 --> | ||
214 | - <view class="flex-space-between address ai_end xc-width" style="padding-top: 30rpx;"> | ||
215 | - <view class="flex ai_end" wx:if="{{def_pick_store && def_pick_store.pickup_name}}"> | ||
216 | - <text class="fs30 xc-black3 shop_name">{{def_pick_store.pickup_name}}</text> | ||
217 | - <view class="distance fs24 xc-ash"wx:if="{{def_pick_store.distance!=null}}"> | ||
218 | - 距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}} | ||
219 | - | ||
220 | - </view> | ||
221 | - </view> | ||
222 | - | ||
223 | - <!-- 没有门店的时候 --> | ||
224 | - <view class="flex" bindtap="choice_store" wx:else> | ||
225 | - <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image> | ||
226 | - <view class="fs30" style="color:black;">选择门店</view> | ||
227 | - </view> | ||
228 | - | ||
229 | - <view class="red-co fs28" bindtap="choice_store" >更多门店<text class="right-arrow"></text></view> | ||
230 | - </view> | ||
231 | - <view wx:if="{{only_pk && !only_pk.length}}">(库存不足)</view> | ||
232 | - <block wx:else> | ||
233 | - <view wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">(库存不足)</view> | ||
234 | - <block wx:else> | ||
235 | - <view class="no_store" wx:if="{{def_pick_store.is_no_dis}}">(配送不匹配)</view> | ||
236 | - <view wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && sales_rules==2 && prom_type==0}}">(库存不足)</view> | ||
237 | - </block> | ||
238 | - </block> | ||
239 | - | ||
240 | - <view class="fs24 xc-ash-9f xc-distance-top "wx:if="{{def_pick_store && def_pick_store.fulladdress}}">地址:{{def_pick_store.fulladdress}}</view> | ||
241 | - </view> | ||
242 | - | ||
243 | - | ||
244 | - | ||
245 | - <view class="b_num"> | ||
246 | - <view>购买数量</view> | ||
247 | - <view class="count"> | ||
248 | - <view bindtap="subCartNum" class="sub {{goodsInputNum <= 1 ? 'active':''}}">-</view> | ||
249 | - <input bindblur="inputCartNum" type="number" value="{{goodsInputNum}}"></input> | ||
250 | - <view bindtap="addCartNum" class="add">+</view> | ||
251 | - </view> | ||
252 | - </view> | ||
253 | - | ||
254 | - | ||
255 | - | ||
256 | - <view class="spec-cart-btns"> | ||
257 | - <view wx:if="{{def_pick_store && def_pick_store.is_no_dis}}" class="spec-cart-btn fs32" data-action="add" | ||
258 | - style="background-color: #dcdcdc;color: #999;">配送不匹配</view> | ||
259 | - <block wx:else> | ||
260 | - | ||
261 | - <!-- 根本就找不到门店 --> | ||
262 | - <block wx:if="{{!only_pk && !def_pickpu_list}}"> | ||
263 | - <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">库存不足</view> | ||
264 | - </block> | ||
265 | - <block wx:else> | ||
266 | - | ||
267 | - | ||
268 | - <block wx:if="{{only_pk.length && !only_pk.length}}"> | ||
269 | - <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">库存不足</view> | ||
270 | - </block> | ||
271 | - <block wx:else> | ||
272 | - <block wx:if="{{def_pickpu_list && !def_pickpu_list.length}}"> | ||
273 | - <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">库存不足</view> | ||
274 | - </block> | ||
275 | - <block wx:else> | ||
276 | - <block wx:if="{{!def_pick_store}}"> | ||
277 | - <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">请先选择门店</view> | ||
278 | - </block> | ||
279 | - <block wx:else> | ||
280 | - <!-- 如果是线下库存购买的时候,且是普通商品购买的时候 --> | ||
281 | - <block wx:if="{{sales_rules==2 && prom_type==0}}"> | ||
282 | - <block wx:if="{{!def_pick_store.CanOutQty}}"> | ||
283 | - <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">库存不足</view> | ||
284 | - </block> | ||
285 | - <block wx:else> | ||
286 | - <view wx:if="{{openSpecModal_ind==1}}" bindtap="addCart"data-openSpecModal_ind="{{openSpecModal_ind}}" | ||
287 | - class="spec-cart-btn yellow fs32" data-action="add">加入购物车</view> | ||
288 | - <view wx:if="{{openSpecModal_ind==2}}" bindtap="addCart"data-openSpecModal_ind="{{openSpecModal_ind}}" | ||
289 | - class="spec-cart-btn spec-buy" data-action="buy"> | ||
290 | - {{sele_g.offline_price?"券后购买":"立即购买"}} | ||
291 | - </view> | ||
292 | - </block> | ||
293 | - </block> | ||
294 | - <!-- 线上销售 --> | ||
295 | - <block wx:else> | ||
296 | - <block wx:if="{{sele_g.store_count<=0}}"> | ||
297 | - <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">库存不足</view> | ||
298 | - </block> | ||
299 | - <block wx:else> | ||
300 | - <view wx:if="{{openSpecModal_ind==1}}" bindtap="addCart"data-openSpecModal_ind="{{openSpecModal_ind}}" | ||
301 | - class="spec-cart-btn yellow fs32 {{!sto_sele_name?'gray':''}}" data-action="add">加入购物车</view> | ||
302 | - <view wx:if="{{openSpecModal_ind==2}}" bindtap="addCart"data-openSpecModal_ind="{{openSpecModal_ind}}" | ||
303 | - class="spec-cart-btn spec-buy {{!sto_sele_name?'gray':''}}" data-action="buy"> | ||
304 | - {{sele_g.offline_price?"券后购买":"立即购买"}} | ||
305 | - </view> | ||
306 | - </block> | ||
307 | - </block> | ||
308 | - </block> | ||
309 | - </block> | ||
310 | - </block> | ||
311 | - </block> | ||
312 | - | ||
313 | - </block> | ||
314 | - </view> | ||
315 | - | ||
316 | - | ||
317 | - | ||
318 | - <view class="clear"></view> | ||
319 | - | ||
320 | - </view> | 232 | + <view bindtap="closeSpecModal" class="cover-layer"></view> |
233 | + <view class="spec-model"> | ||
234 | + <view class="pding"> | ||
235 | + <icon bindtap="closeSpecModal" class="modal-close" color="black" size="22" type="cancel"></icon> | ||
236 | + <view class="spec-goods"> | ||
237 | + <image class="wh100 spec-img" src="{{iurl}}{{data.image_url?data.image_url:'miniapp/images/default_g_img.gif'}}" | ||
238 | + binderror="pop_err_img" data-errorimg="data.image_url" /> | ||
239 | + <view class="spec-goods-info"> | ||
240 | + <view class="spec-goods-name ellipsis-2">{{data.goods_name}}</view> | ||
241 | + <view class="flex ai_end xc-val-money"> | ||
242 | + <view class="spec-goods-price"><text class="fs20">¥</text> | ||
243 | + <block wx>{{data.shop_price}}</block> | ||
244 | + </view> | ||
245 | + </view> | ||
246 | + </view> | ||
247 | + </view> | ||
248 | + | ||
249 | + <!-- 选择门店模块 --> | ||
250 | + <view class="flex-space-between address ai_end xc-width" style="padding-top: 30rpx;"> | ||
251 | + <view class="flex ai_end" wx:if="{{def_pick_store && def_pick_store.pickup_name}}"> | ||
252 | + <text class="fs30 xc-black3 shop_name">{{def_pick_store.pickup_name}}</text> | ||
253 | + <view class="distance fs24 xc-ash" wx:if="{{def_pick_store.distance!=null}}"> | ||
254 | + 距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}} | ||
255 | + | ||
256 | + </view> | ||
257 | + </view> | ||
258 | + | ||
259 | + <!-- 没有门店的时候 --> | ||
260 | + <view class="flex" bindtap="choice_store" wx:else> | ||
261 | + <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image> | ||
262 | + <view class="fs30" style="color:black;">选择门店</view> | ||
263 | + </view> | ||
264 | + | ||
265 | + <view class="red-co fs28" bindtap="choice_store">更多门店<text class="right-arrow"></text></view> | ||
266 | + </view> | ||
267 | + <view wx:if="{{only_pk && !only_pk.length}}">(库存不足)</view> | ||
268 | + <block wx:else> | ||
269 | + <view wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">(库存不足)</view> | ||
270 | + <block wx:else> | ||
271 | + <view class="no_store" wx:if="{{def_pick_store.is_no_dis}}">(配送不匹配)</view> | ||
272 | + <view wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && sales_rules==2 && prom_type==0}}">(库存不足)</view> | ||
273 | + </block> | ||
274 | + </block> | ||
275 | + | ||
276 | + <view class="fs24 xc-ash-9f xc-distance-top " wx:if="{{def_pick_store && def_pick_store.fulladdress}}">地址:{{def_pick_store.fulladdress}}</view> | ||
277 | + </view> | ||
278 | + | ||
279 | + | ||
280 | + | ||
281 | + <view class="b_num"> | ||
282 | + <view>购买数量</view> | ||
283 | + <view class="count"> | ||
284 | + <view bindtap="subCartNum" class="sub {{goodsInputNum <= 1 ? 'active':''}}">-</view> | ||
285 | + <input bindblur="inputCartNum" type="number" value="{{goodsInputNum}}"></input> | ||
286 | + <view bindtap="addCartNum" class="add">+</view> | ||
287 | + </view> | ||
288 | + </view> | ||
289 | + | ||
290 | + | ||
291 | + | ||
292 | + <view class="spec-cart-btns"> | ||
293 | + <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> | ||
294 | + <block wx:else> | ||
295 | + | ||
296 | + <!-- 根本就找不到门店 --> | ||
297 | + <block wx:if="{{!only_pk && !def_pickpu_list}}"> | ||
298 | + <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">库存不足</view> | ||
299 | + </block> | ||
300 | + <block wx:else> | ||
301 | + | ||
302 | + | ||
303 | + <block wx:if="{{only_pk.length && !only_pk.length}}"> | ||
304 | + <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">库存不足</view> | ||
305 | + </block> | ||
306 | + <block wx:else> | ||
307 | + <block wx:if="{{def_pickpu_list && !def_pickpu_list.length}}"> | ||
308 | + <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">库存不足</view> | ||
309 | + </block> | ||
310 | + <block wx:else> | ||
311 | + <block wx:if="{{!def_pick_store}}"> | ||
312 | + <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">请先选择门店</view> | ||
313 | + </block> | ||
314 | + <block wx:else> | ||
315 | + <!-- 如果是线下库存购买的时候,且是普通商品购买的时候 --> | ||
316 | + <block wx:if="{{sales_rules==2 && prom_type==0}}"> | ||
317 | + <block wx:if="{{!def_pick_store.CanOutQty}}"> | ||
318 | + <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">库存不足</view> | ||
319 | + </block> | ||
320 | + <block wx:else> | ||
321 | + <view wx:if="{{openSpecModal_ind==1}}" bindtap="addCart" data-openSpecModal_ind="{{openSpecModal_ind}}" class="spec-cart-btn yellow fs32" | ||
322 | + data-action="add">加入购物车</view> | ||
323 | + <view wx:if="{{openSpecModal_ind==2}}" bindtap="addCart" data-openSpecModal_ind="{{openSpecModal_ind}}" class="spec-cart-btn spec-buy" | ||
324 | + data-action="buy"> | ||
325 | + {{sele_g.offline_price?"券后购买":"立即购买"}} | ||
326 | + </view> | ||
327 | + </block> | ||
328 | + </block> | ||
329 | + <!-- 线上销售 --> | ||
330 | + <block wx:else> | ||
331 | + <block wx:if="{{sele_g.store_count<=0}}"> | ||
332 | + <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">库存不足</view> | ||
333 | + </block> | ||
334 | + <block wx:else> | ||
335 | + <view wx:if="{{openSpecModal_ind==1}}" bindtap="addCart" data-openSpecModal_ind="{{openSpecModal_ind}}" class="spec-cart-btn yellow fs32 {{!sto_sele_name?'gray':''}}" | ||
336 | + data-action="add">加入购物车</view> | ||
337 | + <view wx:if="{{openSpecModal_ind==2}}" bindtap="addCart" data-openSpecModal_ind="{{openSpecModal_ind}}" class="spec-cart-btn spec-buy {{!sto_sele_name?'gray':''}}" | ||
338 | + data-action="buy"> | ||
339 | + {{sele_g.offline_price?"券后购买":"立即购买"}} | ||
340 | + </view> | ||
341 | + </block> | ||
342 | + </block> | ||
343 | + </block> | ||
344 | + </block> | ||
345 | + </block> | ||
346 | + </block> | ||
347 | + | ||
348 | + </block> | ||
349 | + </view> | ||
350 | + | ||
351 | + | ||
352 | + | ||
353 | + <view class="clear"></view> | ||
354 | + | ||
355 | + </view> | ||
321 | </view> | 356 | </view> |
322 | 357 | ||
323 | 358 | ||
324 | 359 | ||
325 | <!-- 选择门店的弹框,1.1版最新的 --> | 360 | <!-- 选择门店的弹框,1.1版最新的 --> |
326 | <block wx:if="{{store==1}}"> | 361 | <block wx:if="{{store==1}}"> |
327 | - <view class="mongolia-layer" bindtap="close_popup"></view> | ||
328 | - <view class="popup-frame"> | ||
329 | - <block wx:if="{{sort_store==0}}"> | ||
330 | - <!-- 头部 标题 --> | ||
331 | - <view class="popup-top flex-space-between"> | ||
332 | - <text class="fs32 nearby_store">{{choice_sort_store==0?'附近的门店':region_name}}</text> | ||
333 | - <view> | ||
334 | - <view> | ||
335 | - <icon bindtap="close_popup" class="modal-closes" color="black" size="22" type="cancel"></icon> | ||
336 | - </view> | ||
337 | - <view class="felx choose_more" bindtap="more_store" wx:if="{{is_show_sto_cat>0}}" > | ||
338 | - <text class="fs26 red-co">{{choice_sort_store==0?'更多门店':'返回'}}</text> | ||
339 | - <view class="bg_rights"></view> | ||
340 | - </view> | ||
341 | - </view> | ||
342 | - </view> | ||
343 | - <!-- 门店列表,最外层的门店列表,一开始 --> | ||
344 | - <view class="store-list"> | ||
345 | - <!--如果还没有点击更多门店的时候 --> | ||
346 | - <block wx:if="{{choice_sort_store==0}}"> | ||
347 | - <!-- 需要for循环 --> | ||
348 | - <block wx:if="{{is_show_sto_cat==1}}"> | ||
349 | - <view class="store_choose flex" wx:for="{{def_pickpu_list}}" bindtap="choose_for_store_fir" data-ind="{{index}}"> | ||
350 | - <view class="store flex-vertical"> | ||
351 | - <!-- 需要点击事件 --> | ||
352 | - <block wx:if="{{index==fir_pick_index}}"> | ||
353 | - <view class="circle white xc-hook fs20 red-b">Г</view> | ||
354 | - </block> | ||
355 | - <block wx:else> | ||
356 | - <view class="circle xc-hooks"></view> | ||
357 | - </block> | ||
358 | - <view class="address-frame xc-ash"> | ||
359 | - <view class="flex-vertical-between butttem5"> | ||
360 | - <view class="flex xc-ash"> | ||
361 | - <view class="fs30 xc-black3 address_name">{{item.pickup_name}}</view> | ||
362 | - </view> | ||
363 | - <view> | ||
364 | - <view class="distance fs24 address-val"wx:if="{{item.distance!=null}}"> | ||
365 | - 距离:{{item.distance>1000?filters.toFix(item.distance/1000,2)+'km':filters.toFix(item.distance,0)+"m"}}</view> | ||
366 | - </view> | ||
367 | - </view> | ||
368 | - <view class="fs24 xc-ash-9f">地址:{{item.fulladdress}}</view> | ||
369 | - </view> | ||
370 | - </view> | ||
371 | - </view> | ||
372 | - </block> | ||
373 | - <block wx:else> | ||
374 | - <view class="store_choose flex" wx:for="{{only_pk}}" bindtap="choose_for_store_fir" data-ind="{{index}}"> | ||
375 | - <view class="store flex-vertical"> | ||
376 | - <!-- 需要点击事件 --> | ||
377 | - <block wx:if="{{index==fir_pick_index}}" > | ||
378 | - <view class="circle white xc-hook fs20 red-b">Г</view> | ||
379 | - </block> | ||
380 | - <block wx:else> | ||
381 | - <view class="circle xc-hooks"></view> | ||
382 | - </block> | ||
383 | - | ||
384 | - <view class="address-frame xc-ash"> | ||
385 | - <view class="flex-vertical-between "> | ||
386 | - <view class="flex xc-ash"> | ||
387 | - <view class="fs30 xc-black3 address_name">{{item.pickup_name}}</view> | ||
388 | - </view> | ||
389 | - <view> | ||
390 | - <view class="distance fs24 address-val" | ||
391 | - wx:if="{{item.distance!=null}}">距离:{{item.distance>1000?filters.toFix(item.distance/1000,2)+"km":filters.toFix(item.distance,0)+"m"}} | ||
392 | - </view> | ||
393 | - </view> | ||
394 | - </view> | ||
395 | - <view class="fs24 xc-ash-9f">地址:{{item.fulladdress}}</view> | ||
396 | - </view> | ||
397 | - </view> | ||
398 | - </view> | ||
399 | - </block> | ||
400 | - </block> | ||
401 | - <block wx:else> <!-- 如果是点击选择门店分类后显示分类下的门店 --> | ||
402 | - <view class="store_choose flex" wx:for="{{sec_sto.s_arr}}" data-ind="{{index}}" bindtap="choose_for_store"> | ||
403 | - <view class="store flex-vertical"> | ||
404 | - <!-- 需要点击事件 --> | ||
405 | - <block wx:if="{{index==sec_pick_index}}"> | ||
406 | - <view class="circle white xc-hook fs20 red-b">Г</view> | ||
407 | - </block> | ||
408 | - <block wx:else> | ||
409 | - <view class="circle xc-hooks"></view> | ||
410 | - </block> | ||
411 | - | ||
412 | - <view class="address-frame xc-ash"> | ||
413 | - <view class="flex-vertical-between "> | ||
414 | - <view class="flex xc-ash"> | ||
415 | - <view class="fs28 xc-black3 address_name">{{item.pickup_name}}</view> | ||
416 | - </view> | ||
417 | - <view> | ||
418 | - <view class="distance fs24 address-val"wx:if="{{item.distance!=null}}"> | ||
419 | - 距离:{{item.distance>1000?filters.toFix(item.distance/1000,2)+"km":filters.toFix(item.distance,0)+"m"}}</view> | ||
420 | - </view> | ||
421 | - </view> | ||
422 | - <view class="fs24 xc-ash-9f">地址:{{item.fulladdress}}</view> | ||
423 | - </view> | ||
424 | - </view> | ||
425 | - </view> | ||
426 | - </block> | ||
427 | - | ||
428 | - </view> | ||
429 | - | ||
430 | - <!-- 门店列表底部 --> | ||
431 | - <view class="store-bottom-frame"> | ||
432 | - <view class="store-bottom flex-vertical-between"> | ||
433 | - <view class="determine red-b fs28 white t-c" bindtap="sure_pick" | ||
434 | - data-openindstore="{{open_ind_store}}">确定</view> | ||
435 | - <view class="default t-c fs28" bindtap="set_def_pick"data-openindstore="{{open_ind_store}}">设为默认</view> | ||
436 | - </view> | ||
437 | - </view> | ||
438 | - | ||
439 | - </block> | ||
440 | - | ||
441 | - | ||
442 | - <block wx:else> | ||
443 | - <view class="popup-top flex-space-between"> | ||
444 | - <text class="fs32 nearby_store">门店分类选择</text> | ||
445 | - <view> | ||
446 | - <view> | ||
447 | - <icon bindtap="close_popup" class="modal-closes" color="black" size="22" type="cancel"></icon> | ||
448 | - </view> | ||
449 | - <view class="felx choose_mores" bindtap="returns"> | ||
450 | - <text class="fs26 red-co">返回</text> | ||
451 | - </view> | ||
452 | - </view> | ||
453 | - </view> | ||
454 | - <view class="sort_store_list"> | ||
455 | - | ||
456 | - <view class="sort-store-frame" wx:for="{{all_sto}}" data-index="{{index}}" bindtap="choice_sort_store" data-region="{{item.name}}"> | ||
457 | - <view class="sort-store flex-vertical-between" > | ||
458 | - <view class="fs30" di>{{item.name}}</view> | ||
459 | - <view class="black_rights-frame"> | ||
460 | - <view class="black_rights"></view> | ||
461 | - </view> | ||
462 | - </view> | ||
463 | - </view> | 362 | + <view class="mongolia-layer" bindtap="close_popup"></view> |
363 | + <view class="popup-frame"> | ||
364 | + <block wx:if="{{sort_store==0}}"> | ||
365 | + <!-- 头部 标题 --> | ||
366 | + <view class="popup-top flex-space-between"> | ||
367 | + <text class="fs32 nearby_store">{{choice_sort_store==0?'附近的门店':region_name}}</text> | ||
368 | + <view> | ||
369 | + <view> | ||
370 | + <icon bindtap="close_popup" class="modal-closes" color="black" size="22" type="cancel"></icon> | ||
371 | + </view> | ||
372 | + <view class="felx choose_more" bindtap="more_store" wx:if="{{is_show_sto_cat>0}}"> | ||
373 | + <text class="fs26 red-co">{{choice_sort_store==0?'更多门店':'返回'}}</text> | ||
374 | + <view class="bg_rights"></view> | ||
375 | + </view> | ||
376 | + </view> | ||
377 | + </view> | ||
378 | + <!-- 门店列表,最外层的门店列表,一开始 --> | ||
379 | + <view class="store-list"> | ||
380 | + <!--如果还没有点击更多门店的时候 --> | ||
381 | + <block wx:if="{{choice_sort_store==0}}"> | ||
382 | + <!-- 需要for循环 --> | ||
383 | + <block wx:if="{{is_show_sto_cat==1}}"> | ||
384 | + <view class="store_choose flex" wx:for="{{def_pickpu_list}}" bindtap="choose_for_store_fir" data-ind="{{index}}"> | ||
385 | + <view class="store flex-vertical"> | ||
386 | + <!-- 需要点击事件 --> | ||
387 | + <block wx:if="{{index==fir_pick_index}}"> | ||
388 | + <view class="circle white xc-hook fs20 red-b">Г</view> | ||
389 | + </block> | ||
390 | + <block wx:else> | ||
391 | + <view class="circle xc-hooks"></view> | ||
392 | + </block> | ||
393 | + <view class="address-frame xc-ash"> | ||
394 | + <view class="flex-vertical-between butttem5"> | ||
395 | + <view class="flex xc-ash"> | ||
396 | + <view class="fs30 xc-black3 address_name">{{item.pickup_name}}</view> | ||
397 | + </view> | ||
398 | + <view> | ||
399 | + <view class="distance fs24 address-val" wx:if="{{item.distance!=null}}"> | ||
400 | + 距离:{{item.distance>1000?filters.toFix(item.distance/1000,2)+'km':filters.toFix(item.distance,0)+"m"}}</view> | ||
401 | + </view> | ||
402 | + </view> | ||
403 | + <view class="fs24 xc-ash-9f">地址:{{item.fulladdress}}</view> | ||
404 | + </view> | ||
405 | + </view> | ||
406 | + </view> | ||
407 | + </block> | ||
408 | + <block wx:else> | ||
409 | + <view class="store_choose flex" wx:for="{{only_pk}}" bindtap="choose_for_store_fir" data-ind="{{index}}"> | ||
410 | + <view class="store flex-vertical"> | ||
411 | + <!-- 需要点击事件 --> | ||
412 | + <block wx:if="{{index==fir_pick_index}}"> | ||
413 | + <view class="circle white xc-hook fs20 red-b">Г</view> | ||
414 | + </block> | ||
415 | + <block wx:else> | ||
416 | + <view class="circle xc-hooks"></view> | ||
417 | + </block> | ||
418 | + | ||
419 | + <view class="address-frame xc-ash"> | ||
420 | + <view class="flex-vertical-between "> | ||
421 | + <view class="flex xc-ash"> | ||
422 | + <view class="fs30 xc-black3 address_name">{{item.pickup_name}}</view> | ||
423 | + </view> | ||
424 | + <view> | ||
425 | + <view class="distance fs24 address-val" wx:if="{{item.distance!=null}}">距离:{{item.distance>1000?filters.toFix(item.distance/1000,2)+"km":filters.toFix(item.distance,0)+"m"}} | ||
426 | + </view> | ||
427 | + </view> | ||
428 | + </view> | ||
429 | + <view class="fs24 xc-ash-9f">地址:{{item.fulladdress}}</view> | ||
430 | + </view> | ||
431 | + </view> | ||
432 | + </view> | ||
433 | + </block> | ||
434 | + </block> | ||
435 | + <block wx:else> | ||
436 | + <!-- 如果是点击选择门店分类后显示分类下的门店 --> | ||
437 | + <view class="store_choose flex" wx:for="{{sec_sto.s_arr}}" data-ind="{{index}}" bindtap="choose_for_store"> | ||
438 | + <view class="store flex-vertical"> | ||
439 | + <!-- 需要点击事件 --> | ||
440 | + <block wx:if="{{index==sec_pick_index}}"> | ||
441 | + <view class="circle white xc-hook fs20 red-b">Г</view> | ||
442 | + </block> | ||
443 | + <block wx:else> | ||
444 | + <view class="circle xc-hooks"></view> | ||
445 | + </block> | ||
446 | + | ||
447 | + <view class="address-frame xc-ash"> | ||
448 | + <view class="flex-vertical-between "> | ||
449 | + <view class="flex xc-ash"> | ||
450 | + <view class="fs28 xc-black3 address_name">{{item.pickup_name}}</view> | ||
451 | + </view> | ||
452 | + <view> | ||
453 | + <view class="distance fs24 address-val" wx:if="{{item.distance!=null}}"> | ||
454 | + 距离:{{item.distance>1000?filters.toFix(item.distance/1000,2)+"km":filters.toFix(item.distance,0)+"m"}}</view> | ||
455 | + </view> | ||
456 | + </view> | ||
457 | + <view class="fs24 xc-ash-9f">地址:{{item.fulladdress}}</view> | ||
458 | + </view> | ||
459 | + </view> | ||
460 | + </view> | ||
461 | + </block> | ||
462 | + | ||
463 | + </view> | ||
464 | 464 | ||
465 | - </view> | ||
466 | - </block> | ||
467 | - </view> | ||
468 | -</block> | 465 | + <!-- 门店列表底部 --> |
466 | + <view class="store-bottom-frame"> | ||
467 | + <view class="store-bottom flex-vertical-between"> | ||
468 | + <view class="determine red-b fs28 white t-c" bindtap="sure_pick" data-openindstore="{{open_ind_store}}">确定</view> | ||
469 | + <view class="default t-c fs28" bindtap="set_def_pick" data-openindstore="{{open_ind_store}}">设为默认</view> | ||
470 | + </view> | ||
471 | + </view> | ||
472 | + | ||
473 | + </block> | ||
474 | + | ||
475 | + | ||
476 | + <block wx:else> | ||
477 | + <view class="popup-top flex-space-between"> | ||
478 | + <text class="fs32 nearby_store">门店分类选择</text> | ||
479 | + <view> | ||
480 | + <view> | ||
481 | + <icon bindtap="close_popup" class="modal-closes" color="black" size="22" type="cancel"></icon> | ||
482 | + </view> | ||
483 | + <view class="felx choose_mores" bindtap="returns"> | ||
484 | + <text class="fs26 red-co">返回</text> | ||
485 | + </view> | ||
486 | + </view> | ||
487 | + </view> | ||
488 | + <view class="sort_store_list"> | ||
489 | + | ||
490 | + <view class="sort-store-frame" wx:for="{{all_sto}}" data-index="{{index}}" bindtap="choice_sort_store" data-region="{{item.name}}"> | ||
491 | + <view class="sort-store flex-vertical-between"> | ||
492 | + <view class="fs30" di>{{item.name}}</view> | ||
493 | + <view class="black_rights-frame"> | ||
494 | + <view class="black_rights"></view> | ||
495 | + </view> | ||
496 | + </view> | ||
497 | + </view> | ||
498 | + | ||
499 | + </view> | ||
500 | + </block> | ||
501 | + </view> | ||
502 | +</block> | ||
469 | <!-- ---------------分享弹窗--------------- --> | 503 | <!-- ---------------分享弹窗--------------- --> |
470 | <!--二维码显示页面--> | 504 | <!--二维码显示页面--> |
471 | <canvas canvas-id='share' style='width:750rpx;height:1217rpx;background-color:white;' wx:if='{{!canvasHidden}}'></canvas> | 505 | <canvas canvas-id='share' style='width:750rpx;height:1217rpx;background-color:white;' wx:if='{{!canvasHidden}}'></canvas> |
@@ -473,14 +507,13 @@ | @@ -473,14 +507,13 @@ | ||
473 | 507 | ||
474 | 508 | ||
475 | <view wx:if="{{showPoster}}"> | 509 | <view wx:if="{{showPoster}}"> |
476 | - <view class="mask" catchtap="closePoster"></view> | ||
477 | - <view class="poster-container"> | ||
478 | - <view class="poster-wrapper"> | ||
479 | - <view class="poster"> | ||
480 | - <image src="{{shareImgPath}}" class="poster-img" show-menu-by-longpress></image> | ||
481 | - <view class="btn-close" catchtap="closePoster"><text class="iconfont icon-close"></text></view> | ||
482 | - </view> | ||
483 | - </view> | ||
484 | - </view> | 510 | + <view class="mask" catchtap="closePoster"></view> |
511 | + <view class="poster-container"> | ||
512 | + <view class="poster-wrapper"> | ||
513 | + <view class="poster"> | ||
514 | + <image src="{{shareImgPath}}" class="poster-img" show-menu-by-longpress></image> | ||
515 | + <view class="btn-close" catchtap="closePoster"><text class="iconfont icon-close"></text></view> | ||
516 | + </view> | ||
517 | + </view> | ||
518 | + </view> | ||
485 | </view> | 519 | </view> |
486 | - |
packageA/pages/goodsInfo/goodsInfo.wxss
@@ -3,7 +3,10 @@ | @@ -3,7 +3,10 @@ | ||
3 | image { | 3 | image { |
4 | vertical-align: top; | 4 | vertical-align: top; |
5 | } | 5 | } |
6 | -.goods-detail{overflow: hidden} | 6 | +.goods-detail{ |
7 | + /* overflow: hidden */ | ||
8 | + padding-top: 78rpx; | ||
9 | +} | ||
7 | 10 | ||
8 | .type-navbar { | 11 | .type-navbar { |
9 | display: flex; | 12 | display: flex; |
@@ -56,6 +59,7 @@ image { | @@ -56,6 +59,7 @@ image { | ||
56 | .swiper_box { | 59 | .swiper_box { |
57 | width: 100%; | 60 | width: 100%; |
58 | height: 750rpx; | 61 | height: 750rpx; |
62 | + background-color: #f2f2f2; | ||
59 | } | 63 | } |
60 | .goods-title { | 64 | .goods-title { |
61 | display: flex; | 65 | display: flex; |
@@ -1006,10 +1010,10 @@ left:31rpx;} | @@ -1006,10 +1010,10 @@ left:31rpx;} | ||
1006 | .red_shu{ width: 10rpx; height: 36rpx; background-color:#da0035; margin-right: 8rpx; } | 1010 | .red_shu{ width: 10rpx; height: 36rpx; background-color:#da0035; margin-right: 8rpx; } |
1007 | 1011 | ||
1008 | .tb-l{ /* line-height: 96rpx; */} | 1012 | .tb-l{ /* line-height: 96rpx; */} |
1009 | -.table_s{ border:#e4e4e4 1rpx solid; box-sizing: border-box;font-size: 26rpx;} | 1013 | +.table_s{ border:#e4e4e4 1rpx solid; box-sizing: border-box;font-size: 26rpx;border-right: none;} |
1010 | .tb_item{display: flex; /* height: 96rpx; */ border-bottom: 1rpx solid #e4e4e4 } | 1014 | .tb_item{display: flex; /* height: 96rpx; */ border-bottom: 1rpx solid #e4e4e4 } |
1011 | .item_left{width: 210rpx; height: 100%; box-sizing:border-box; text-align: center;padding: 20rpx; background: #f9f9f9 ;border-right:2rpx solid #e4e4e4} .item_left text{ /* margin-left: 44rpx; */} | 1015 | .item_left{width: 210rpx; height: 100%; box-sizing:border-box; text-align: center;padding: 20rpx; background: #f9f9f9 ;border-right:2rpx solid #e4e4e4} .item_left text{ /* margin-left: 44rpx; */} |
1012 | -.item_right{flex:1; height: 100%; overflow : hidden;white-space:nowrap;text-overflow: ellipsis; padding: 20rpx;} | 1016 | +.item_right{flex:1; height: 100%; overflow : hidden;white-space:nowrap;text-overflow: ellipsis; padding: 20rpx;border-right:2rpx solid #e4e4e4;text-align: center;} |
1013 | .item_right text{ /* margin-left: 66rpx; */} | 1017 | .item_right text{ /* margin-left: 66rpx; */} |
1014 | 1018 | ||
1015 | .table_s .tb-l:last-child {border-bottom: none;} | 1019 | .table_s .tb-l:last-child {border-bottom: none;} |
packageA/pages/jfbuy/jfbuy.js
@@ -187,64 +187,102 @@ Page({ | @@ -187,64 +187,102 @@ Page({ | ||
187 | /** | 187 | /** |
188 | * 用户点击右上角分享 | 188 | * 用户点击右上角分享 |
189 | */ | 189 | */ |
190 | - // onShareAppMessage: function () { | ||
191 | - // var th = this; | ||
192 | - // //礼包的转发 | ||
193 | - // if(th.data.currentIndex==3){ | ||
194 | - // var lbid=th.data.hui_active.lbId; | ||
195 | - // var url="pages/giftpack/giftpacklist/giftpacklist?lbId="+lbid+"&isBuy=1"; | ||
196 | - // if(getApp().globalData.user_id){ | ||
197 | - // url+="&first_leader="+getApp().globalData.user_id; | ||
198 | - // } | ||
199 | - // var img=this.data.share_img; | ||
200 | - // var title=th.data.hui_active.giftTitle; | 190 | + onShareAppMessage: function () { |
191 | + | ||
192 | + var store_name = getApp().globalData.config ? getApp().globalData.config.store_name:''; | ||
193 | + | ||
194 | + var pagePath = this.route; //当前页面url | ||
195 | + | ||
196 | + if(!store_name) store_name = getApp().globalData.setting.appName; | ||
197 | + | ||
198 | + if(pagePath.indexOf('/') != 0) { | ||
199 | + pagePath = '/' + pagePath; | ||
200 | + } | ||
201 | + | ||
202 | + if(getApp().globalData.user_id){ | ||
203 | + if(pagePath.indexOf('?')>0){ | ||
204 | + pagePath += '&first_leader=' + getApp().globalData.user_id; | ||
205 | + }else{ | ||
206 | + pagePath += '?first_leader=' + getApp().globalData.user_id; | ||
207 | + } | ||
208 | + } | ||
209 | + return { | ||
210 | + title: store_name + '-积分购', | ||
211 | + path: pagePath, | ||
212 | + } | ||
213 | + // var th = this; | ||
214 | + // //礼包的转发 | ||
215 | + // if(th.data.currentIndex==3){ | ||
216 | + // var lbid=th.data.hui_active.lbId; | ||
217 | + // var url="pages/giftpack/giftpacklist/giftpacklist?lbId="+lbid+"&isBuy=1"; | ||
218 | + // if(getApp().globalData.user_id){ | ||
219 | + // url+="&first_leader="+getApp().globalData.user_id; | ||
220 | + // } | ||
221 | + // var img=this.data.share_img; | ||
222 | + // var title=th.data.hui_active.giftTitle; | ||
201 | 223 | ||
202 | - // var ob={ | ||
203 | - // title:title, | ||
204 | - // path:url, | ||
205 | - // imageUrl: img, | ||
206 | - // }; | ||
207 | - // th.setData({share_hidden:1}); | ||
208 | - // return ob; | 224 | + // var ob={ |
225 | + // title:title, | ||
226 | + // path:url, | ||
227 | + // imageUrl: img, | ||
228 | + // }; | ||
229 | + // th.setData({share_hidden:1}); | ||
230 | + // return ob; | ||
209 | 231 | ||
210 | - // }else{ | ||
211 | - // //---秒杀,拼团,促销--- | ||
212 | - // var item=this.data.share_good; | ||
213 | - // if(item){ | ||
214 | - // var price = item.shop_price; | ||
215 | - // var title= item.goods_name; | ||
216 | - // var img=this.data.url+item.original_img; | ||
217 | - // var url="/pages/goods/goodsInfo/goodsInfo?goods_id=" + th.data.gid; | ||
218 | - // if(getApp().globalData.user_id){ | ||
219 | - // url+="&first_leader="+getApp().globalData.user_id; | ||
220 | - // } | ||
221 | - // var ob={ | ||
222 | - // title: price + "元 " +title, | ||
223 | - // path:url, | ||
224 | - // imageUrl: img, | ||
225 | - // }; | ||
226 | - // th.setData({share_hidden:1,share_good:null}); | ||
227 | - // return ob; | ||
228 | - // }else{ | ||
229 | - // var url="/pages/index/index/index"; | ||
230 | - // if(getApp().globalData.user_id){ | ||
231 | - // url+="?first_leader="+getApp().globalData.user_id; | ||
232 | - // } | ||
233 | - // var hui_active=this.data.hui_active; | ||
234 | - // var title=hui_active.name; | ||
235 | - // if(!title) title=hui_active.main_goods_name; | ||
236 | - // if(!title) title=hui_active.giftTitle; | 232 | + // }else{ |
233 | + // //---秒杀,拼团,促销--- | ||
234 | + // var item=this.data.share_good; | ||
235 | + // if(item){ | ||
236 | + // var price = item.shop_price; | ||
237 | + // var title= item.goods_name; | ||
238 | + // var img=this.data.url+item.original_img; | ||
239 | + // var url="/pages/goods/goodsInfo/goodsInfo?goods_id=" + th.data.gid; | ||
240 | + // if(getApp().globalData.user_id){ | ||
241 | + // url+="&first_leader="+getApp().globalData.user_id; | ||
242 | + // } | ||
243 | + // var ob={ | ||
244 | + // title: price + "元 " +title, | ||
245 | + // path:url, | ||
246 | + // imageUrl: img, | ||
247 | + // }; | ||
248 | + // th.setData({share_hidden:1,share_good:null}); | ||
249 | + // return ob; | ||
250 | + // }else{ | ||
251 | + // var url="/pages/index/index/index"; | ||
252 | + // if(getApp().globalData.user_id){ | ||
253 | + // url+="?first_leader="+getApp().globalData.user_id; | ||
254 | + // } | ||
255 | + // var hui_active=this.data.hui_active; | ||
256 | + // var title=hui_active.name; | ||
257 | + // if(!title) title=hui_active.main_goods_name; | ||
258 | + // if(!title) title=hui_active.giftTitle; | ||
237 | 259 | ||
238 | - // var ob={ | ||
239 | - // title: title, | ||
240 | - // path:url, | ||
241 | - // }; | ||
242 | - // th.setData({share_hidden:1,share_good:null}); | ||
243 | - // return ob; | ||
244 | - // } | ||
245 | - // } | 260 | + // var ob={ |
261 | + // title: title, | ||
262 | + // path:url, | ||
263 | + // }; | ||
264 | + // th.setData({share_hidden:1,share_good:null}); | ||
265 | + // return ob; | ||
266 | + // } | ||
267 | + // } | ||
246 | 268 | ||
247 | - // }, | 269 | + }, |
270 | + | ||
271 | + | ||
272 | + onShareTimeline() { | ||
273 | + var store_name = getApp().globalData.config ? getApp().globalData.config.store_name:''; | ||
274 | + | ||
275 | + var pagePath = this.route; //当前页面url | ||
276 | + | ||
277 | + if(!store_name) store_name = getApp().globalData.setting.appName; | ||
278 | + if(pagePath.indexOf('/') != 0) { | ||
279 | + pagePath = '/' + pagePath; | ||
280 | + } | ||
281 | + return { | ||
282 | + title: store_name + '-积分购', | ||
283 | + path: pagePath, | ||
284 | + } | ||
285 | + }, | ||
248 | 286 | ||
249 | 287 | ||
250 | //-- 点击tab -- | 288 | //-- 点击tab -- |
packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js
@@ -486,7 +486,7 @@ Page({ | @@ -486,7 +486,7 @@ Page({ | ||
486 | // var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" + | 486 | // var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" + |
487 | // os.stoid + "?sceneValue=" + scene + "&pageValue=packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo"; | 487 | // os.stoid + "?sceneValue=" + scene + "&pageValue=packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo"; |
488 | var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" + | 488 | var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" + |
489 | - os.stoid + "?sceneValue=" + scene + "&pageValue=pages/goods/goodsInfo/goodsInfo"; | 489 | + os.stoid + "?sceneValue=" + scene + "&pageValue=packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo"; |
490 | 490 | ||
491 | 491 | ||
492 | // 读取文件成功则OK-- | 492 | // 读取文件成功则OK-- |
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
@@ -4649,7 +4649,7 @@ Page({ | @@ -4649,7 +4649,7 @@ Page({ | ||
4649 | } | 4649 | } |
4650 | ///二微码 | 4650 | ///二微码 |
4651 | var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" + | 4651 | var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" + |
4652 | - os.stoid + "?sceneValue=" + scene + "&pageValue=pages/goods/goodsInfo/goodsInfo"; | 4652 | + os.stoid + "?sceneValue=" + scene + "&pageValue=packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo"; |
4653 | // var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" + | 4653 | // var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" + |
4654 | // os.stoid + "?sceneValue=" + scene + "&pageValue=packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo"; | 4654 | // os.stoid + "?sceneValue=" + scene + "&pageValue=packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo"; |
4655 | 4655 |