wxd / MShopWeApp

Commit a55ffcb53b61efa90fc9de1480803afb5ec1eaa4

Authored by 后端研发-苏泰源
2 parents 2ee13bf0 40f1b068

Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

Inline Side-by-side
Showing 29 changed files with 2935 additions and 246 deletions
components/diy_advertising/diy_advertising.wxml
  View file @a55ffcb
1 1 <wxs module="g_filter" src="../diy_notice/g_filter.wxs"></wxs>
2 2 <!--上下两块-->
3 3 <block wx:if='{{object.style==0}}'>
4   -<view class="zwp_s1" style="background-color: {{object.bg_color?object.bg_color:'none'}}">
5   - <block wx:for="{{object.data}}" wx:key="{{index}}">
6   - <view class='s1' style="padding: 0 {{object.two_side}}px">
7   - <view class='s1_gk'>
8   - <block wx:if="{{item.src==''}}">
9   - <text>建议宽度640</text>
10   - </block>
11   - <block wx:if="{{item.src!=''}}">
12   - <navigator url="{{item.wxapp_imgurl}}" class="s1_gk_a1"
13   - wx:if="{{g_filter.has_char(item.wxapp_imgurl,'plugin')>=0}}">
  4 + <view class="zwp_s1" style="background-color: {{object.bg_color?object.bg_color:'none'}}">
  5 + <block wx:for="{{object.data}}" wx:key="{{index}}">
  6 + <view class='s1' style="padding: 0 {{object.two_side}}px">
  7 + <view class='s1_gk'>
  8 + <block wx:if="{{item.src==''}}">
  9 + <text>建议宽度640</text>
  10 + </block>
  11 + <block wx:if="{{item.src!=''}}">
  12 + <block wx:if="{{g_filter.has_char(item.wxapp_imgurl,'plugin')>=0}}">
  13 + <navigator url="{{item.wxapp_imgurl}}" class="s1_gk_a1">
14 14 <image src="{{item.src}}" mode="widthFix" lazy-load="true"></image>
15   - </navigator>
16   - <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
  15 + </navigator>
  16 + </block>
  17 + <block wx:elif="{{item.AppId}}">
  18 + <navigator url="{{item.wxapp_imgurl}}" class="s1_gk_a1" target="miniProgram" app-id="{{item.AppId}}" path="{{item.wxapp_url}}">
17 19 <image src="{{item.src}}" mode="widthFix" lazy-load="true"></image>
18   - </view>
19   - </block>
20   - </view>
  20 + </navigator>
  21 + </block>
  22 + <block wx:else>
  23 + <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
  24 + <image src="{{item.src}}" mode="widthFix" lazy-load="true"></image>
  25 + </view>
  26 + </block>
  27 + </block>
  28 + </view>
21 29  
22   - </view>
23   - </block>
24   -</view>
  30 + </view>
  31 + </block>
  32 + </view>
25 33 </block>
26 34 <view class="clear"></view>
27 35 <!--一张图片-->
... ... @@ -34,16 +42,24 @@
34 42 <text>建议宽度640</text>
35 43 </block>
36 44 <block wx:if="{{item.src!=''}}">
37   - <navigator url="{{item.wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(item.wxapp_imgurl,'plugin')>=0}}">
38   - <image src="{{item.src}}" mode="widthFix" lazy-load="true"></image>
39   - </navigator>
  45 + <block wx:if="{{g_filter.has_char(item.wxapp_imgurl,'plugin')>=0}}">
  46 + <navigator url="{{item.wxapp_imgurl}}" class="s1_gk_a1">
  47 + <image src="{{item.src}}" mode="widthFix" lazy-load="true"></image>
  48 + </navigator>
  49 + </block>
  50 + <block wx:elif="{{item.AppId}}">
  51 + <navigator class="s1_gk_a1" target="miniProgram" app-id="{{item.AppId}}" path="{{item.wxapp_url}}">
  52 + <image src="{{item.src}}" mode="widthFix" lazy-load="true"></image>
  53 + </navigator>
  54 + </block>
40 55  
41   - <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
42   - <image src="{{item.src}}" mode="widthFix" lazy-load="true"></image>
43   - </view>
  56 + <block wx:else>
  57 + <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
  58 + <image src="{{item.src}}" mode="widthFix" lazy-load="true"></image>
  59 + </view>
  60 + </block>
44 61  
45 62 </block>
46   -
47 63 </view>
48 64 </view>
49 65 </block>
... ... @@ -62,13 +78,30 @@
62 78 <text>300*300</text>
63 79 </block>
64 80 <block wx:if="{{item.src!=''}}">
65   - <navigator url="{{item.wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(item.wxapp_imgurl,'plugin')>=0}}">
  81 + <!-- <navigator url="{{item.wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(item.wxapp_imgurl,'plugin')>=0}}">
66 82 <image src="{{item.src}}" mode="widthFix" lazy-load="true"></image>
67 83 </navigator>
68 84  
69 85 <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
70 86 <image src="{{item.src}}" mode="widthFix" lazy-load="true"></image>
71   - </view>
  87 + </view> -->
  88 +
  89 + <block wx:if="{{g_filter.has_char(item.wxapp_imgurl,'plugin')>=0}}">
  90 + <navigator url="{{item.wxapp_imgurl}}" class="s1_gk_a1">
  91 + <image src="{{item.src}}" mode="widthFix" lazy-load="true"></image>
  92 + </navigator>
  93 + </block>
  94 + <block wx:elif="{{item.AppId}}">
  95 + <navigator class="s1_gk_a1" target="miniProgram" app-id="{{item.AppId}}" path="{{item.wxapp_url}}">
  96 + <image src="{{item.src}}" mode="widthFix" lazy-load="true"></image>
  97 + </navigator>
  98 + </block>
  99 +
  100 + <block wx:else>
  101 + <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
  102 + <image src="{{item.src}}" mode="widthFix" lazy-load="true"></image>
  103 + </view>
  104 + </block>
72 105  
73 106  
74 107 </block>
... ... @@ -80,8 +113,7 @@
80 113 </view>
81 114 <view class="clear"></view>
82 115 <!--2行三列-->
83   -<view class='s4' wx:if='{{object.style==3}}'
84   - style="padding:0 {{object.two_side}}px;display: flex; background-color:{{object.bg_color?object.bg_color:'none'}}">
  116 +<view class='s4' wx:if='{{object.style==3}}' style="padding:0 {{object.two_side}}px;display: flex; background-color:{{object.bg_color?object.bg_color:'none'}}">
85 117  
86 118 <block wx:for="{{object.data}}" wx:key="{{index}}">
87 119  
... ... @@ -90,8 +122,29 @@
90 122 <text>200*200</text>
91 123 </block>
92 124 <block wx:if="{{item.src!=''}}">
93   - <navigator url="{{item.wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(item.wxapp_imgurl,'plugin')>=0}}"><image src="{{item.src}}" mode="widthFix" lazy-load="true"></image></navigator>
94   - <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else><image src="{{item.src}}" mode="widthFix" lazy-load="true"></image></view>
  125 + <!-- <navigator url="{{item.wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(item.wxapp_imgurl,'plugin')>=0}}">
  126 + <image src="{{item.src}}" mode="widthFix" lazy-load="true"></image>
  127 + </navigator>
  128 + <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
  129 + <image src="{{item.src}}" mode="widthFix" lazy-load="true"></image>
  130 + </view> -->
  131 +
  132 + <block wx:if="{{g_filter.has_char(item.wxapp_imgurl,'plugin')>=0}}">
  133 + <navigator url="{{item.wxapp_imgurl}}" class="s1_gk_a1">
  134 + <image src="{{item.src}}" mode="widthFix" lazy-load="true"></image>
  135 + </navigator>
  136 + </block>
  137 + <block wx:elif="{{item.AppId}}">
  138 + <navigator class="s1_gk_a1" target="miniProgram" app-id="{{item.AppId}}" path="{{item.wxapp_url}}">
  139 + <image src="{{item.src}}" mode="widthFix" lazy-load="true"></image>
  140 + </navigator>
  141 + </block>
  142 +
  143 + <block wx:else>
  144 + <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
  145 + <image src="{{item.src}}" mode="widthFix" lazy-load="true"></image>
  146 + </view>
  147 + </block>
95 148 </block>
96 149 </view>
97 150  
... ... @@ -100,8 +153,29 @@
100 153 <text>200*200</text>
101 154 </block>
102 155 <block wx:if="{{item.src!=''}}">
103   - <navigator url="{{item.wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(item.wxapp_imgurl,'plugin')>=0}}"><image src="{{item.src}}" mode="widthFix" lazy-load="true"></image></navigator>
104   - <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else><image src="{{item.src}}" mode="widthFix" lazy-load="true"></image></view>
  156 + <!-- <navigator url="{{item.wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(item.wxapp_imgurl,'plugin')>=0}}">
  157 + <image src="{{item.src}}" mode="widthFix" lazy-load="true"></image>
  158 + </navigator>
  159 + <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
  160 + <image src="{{item.src}}" mode="widthFix" lazy-load="true"></image>
  161 + </view> -->
  162 +
  163 + <block wx:if="{{g_filter.has_char(item.wxapp_imgurl,'plugin')>=0}}">
  164 + <navigator url="{{item.wxapp_imgurl}}" class="s1_gk_a1">
  165 + <image src="{{item.src}}" mode="widthFix" lazy-load="true"></image>
  166 + </navigator>
  167 + </block>
  168 + <block wx:elif="{{item.AppId}}">
  169 + <navigator class="s1_gk_a1" target="miniProgram" app-id="{{item.AppId}}" path="{{item.wxapp_url}}">
  170 + <image src="{{item.src}}" mode="widthFix" lazy-load="true"></image>
  171 + </navigator>
  172 + </block>
  173 +
  174 + <block wx:else>
  175 + <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
  176 + <image src="{{item.src}}" mode="widthFix" lazy-load="true"></image>
  177 + </view>
  178 + </block>
105 179 </block>
106 180 </view>
107 181  
... ... @@ -118,12 +192,21 @@
118 192 <text>300*300</text>
119 193 </block>
120 194 <block wx:if="{{object.data[0].src!=''}}">
121   - <navigator url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[0].wxapp_imgurl,'plugin')>=0}}">>
122   - <image src="{{object.data[0].src}}" lazy-load="true"></image>
123   - </navigator>
124   - <view data-url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
125   - <image src="{{object.data[0].src}}" lazy-load="true"></image>
126   - </view>
  195 + <block wx:if="{{g_filter.has_char(object.data[0].wxapp_imgurl,'plugin')>=0}}">
  196 + <navigator url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1">
  197 + <image src="{{object.data[0].src}}" lazy-load="true"></image>
  198 + </navigator>
  199 + </block>
  200 + <block wx:elif="{{object.data[0].AppId}}">
  201 + <navigator target="miniProgram" app-id="{{object.data[0].AppId}}" path="{{object.data[0].wxapp_url}}" class="s1_gk_a1">
  202 + <image src="{{object.data[0].src}}" lazy-load="true"></image>
  203 + </navigator>
  204 + </block>
  205 + <block wx:else>
  206 + <view data-url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
  207 + <image src="{{object.data[0].src}}" lazy-load="true"></image>
  208 + </view>
  209 + </block>
127 210 </block>
128 211 </view>
129 212  
... ... @@ -133,13 +216,29 @@
133 216 <text>300*150</text>
134 217 </block>
135 218 <block wx:if="{{object.data[1].src!=''}}">
136   - <navigator url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[1].wxapp_imgurl,'plugin')>=0}}">
137   - <image src="{{object.data[1].src}}" lazy-load="true"></image>
  219 + <!-- <navigator url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[1].wxapp_imgurl,'plugin')>=0}}">
  220 + <image src="{{object.data[1].src}}" lazy-load="true"></image>
138 221 </navigator>
139 222  
140 223 <view data-url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
141 224 <image src="{{object.data[1].src}}" lazy-load="true"></image>
142   - </view>
  225 + </view> -->
  226 +
  227 + <block wx:if="{{g_filter.has_char(object.data[1].wxapp_imgurl,'plugin')>=0}}">
  228 + <navigator url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1">
  229 + <image src="{{object.data[1].src}}" lazy-load="true"></image>
  230 + </navigator>
  231 + </block>
  232 + <block wx:elif="{{object.data[1].AppId}}">
  233 + <navigator target="miniProgram" app-id="{{object.data[1].AppId}}" path="{{object.data[1].wxapp_url}}" class="s1_gk_a1">
  234 + <image src="{{object.data[1].src}}" lazy-load="true"></image>
  235 + </navigator>
  236 + </block>
  237 + <block wx:else>
  238 + <view data-url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
  239 + <image src="{{object.data[1].src}}" lazy-load="true"></image>
  240 + </view>
  241 + </block>
143 242  
144 243  
145 244 </block>
... ... @@ -149,12 +248,29 @@
149 248 <text>300*150</text>
150 249 </block>
151 250 <block wx:if="{{object.data[2].src!=''}}">
152   - <navigator url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[2].wxapp_imgurl,'plugin')>=0}}">
  251 + <!-- <navigator url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[2].wxapp_imgurl,'plugin')>=0}}">
153 252 <image src="{{object.data[2].src}}" lazy-load="true"></image>
154 253 </navigator>
155   - <view data-url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
  254 + <view data-url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
156 255 <image src="{{object.data[2].src}}" lazy-load="true"></image>
157   - </view>
  256 + </view> -->
  257 +
  258 + <block wx:if="{{g_filter.has_char(object.data[2].wxapp_imgurl,'plugin')>=0}}">
  259 + <navigator url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1">
  260 + <image src="{{object.data[2].src}}" lazy-load="true"></image>
  261 + </navigator>
  262 + </block>
  263 + <block wx:elif="{{object.data[2].AppId}}">
  264 + <navigator target="miniProgram" app-id="{{object.data[2].AppId}}" path="{{object.data[2].wxapp_url}}" class="s1_gk_a1">
  265 + <image src="{{object.data[2].src}}" lazy-load="true"></image>
  266 + </navigator>
  267 + </block>
  268 + <block wx:else>
  269 + <view data-url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
  270 + <image src="{{object.data[2].src}}" lazy-load="true"></image>
  271 + </view>
  272 + </block>
  273 +
158 274  
159 275  
160 276 </block>
... ... @@ -171,13 +287,28 @@
171 287 <text>200*200</text>
172 288 </block>
173 289 <block wx:if="{{object.data[0].src!=''}}">
174   - <navigator url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[0].wxapp_imgurl,'plugin')>=0}}">
175   - <image src="{{object.data[0].src}}" lazy-load="true"></image>
  290 + <!-- <navigator url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[0].wxapp_imgurl,'plugin')>=0}}">
  291 + <image src="{{object.data[0].src}}" lazy-load="true"></image>
176 292 </navigator>
177 293  
178 294 <view data-url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
179 295 <image src="{{object.data[0].src}}" lazy-load="true"></image>
180   - </view>
  296 + </view> -->
  297 + <block wx:if="{{g_filter.has_char(object.data[0].wxapp_imgurl,'plugin')>=0}}">
  298 + <navigator url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1">
  299 + <image src="{{object.data[0].src}}" lazy-load="true"></image>
  300 + </navigator>
  301 + </block>
  302 + <block wx:elif="{{object.data[0].AppId}}">
  303 + <navigator target="miniProgram" app-id="{{object.data[0].AppId}}" path="{{object.data[0].wxapp_url}}" class="s1_gk_a1">
  304 + <image src="{{object.data[0].src}}" lazy-load="true"></image>
  305 + </navigator>
  306 + </block>
  307 + <block wx:else>
  308 + <view data-url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
  309 + <image src="{{object.data[0].src}}" lazy-load="true"></image>
  310 + </view>
  311 + </block>
181 312  
182 313 </block>
183 314 </view>
... ... @@ -186,13 +317,28 @@
186 317 <text>400*200</text>
187 318 </block>
188 319 <block wx:if="{{object.data[1].src!=''}}">
189   - <navigator url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[1].wxapp_imgurl,'plugin')>=0}}">
  320 + <!-- <navigator url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[1].wxapp_imgurl,'plugin')>=0}}">
190 321 <image src="{{object.data[1].src}}" lazy-load="true"></image>
191 322 </navigator>
192 323  
193 324 <view data-url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
194 325 <image src="{{object.data[1].src}}" lazy-load="true"></image>
195   - </view>
  326 + </view> -->
  327 + <block wx:if="{{g_filter.has_char(object.data[1].wxapp_imgurl,'plugin')>=0}}">
  328 + <navigator url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1">
  329 + <image src="{{object.data[1].src}}" lazy-load="true"></image>
  330 + </navigator>
  331 + </block>
  332 + <block wx:elif="{{object.data[1].AppId}}">
  333 + <navigator target="miniProgram" app-id="{{object.data[1].AppId}}" path="{{object.data[1].wxapp_url}}" class="s1_gk_a1">
  334 + <image src="{{object.data[1].src}}" lazy-load="true"></image>
  335 + </navigator>
  336 + </block>
  337 + <block wx:else>
  338 + <view data-url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
  339 + <image src="{{object.data[1].src}}" lazy-load="true"></image>
  340 + </view>
  341 + </block>
196 342  
197 343 </block>
198 344 </view>
... ... @@ -204,13 +350,28 @@
204 350 <text>400*200</text>
205 351 </block>
206 352 <block wx:if="{{object.data[2].src!=''}}">
207   - <navigator url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[2].wxapp_imgurl,'plugin')>=0}}">
208   - <image src="{{object.data[2].src}}" lazy-load="true"></image>
209   - </navigator>
  353 + <!-- <navigator url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[2].wxapp_imgurl,'plugin')>=0}}">
  354 + <image src="{{object.data[2].src}}" lazy-load="true"></image>
  355 + </navigator>
210 356  
211 357 <view data-url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
212 358 <image src="{{object.data[2].src}}" lazy-load="true"></image>
213   - </view>
  359 + </view> -->
  360 + <block wx:if="{{g_filter.has_char(object.data[2].wxapp_imgurl,'plugin')>=0}}">
  361 + <navigator url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1">
  362 + <image src="{{object.data[2].src}}" lazy-load="true"></image>
  363 + </navigator>
  364 + </block>
  365 + <block wx:elif="{{object.data[2].AppId}}">
  366 + <navigator target="miniProgram" app-id="{{object.data[2].AppId}}" path="{{object.data[2].wxapp_url}}" class="s1_gk_a1">
  367 + <image src="{{object.data[2].src}}" lazy-load="true"></image>
  368 + </navigator>
  369 + </block>
  370 + <block wx:else>
  371 + <view data-url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
  372 + <image src="{{object.data[2].src}}" lazy-load="true"></image>
  373 + </view>
  374 + </block>
214 375  
215 376 </block>
216 377 </view>
... ... @@ -219,13 +380,28 @@
219 380 <text>200*200</text>
220 381 </block>
221 382 <block wx:if="{{object.data[3].src!=''}}">
222   - <navigator url="{{object.data[3].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[3].wxapp_imgurl,'plugin')>=0}}">
  383 + <!-- <navigator url="{{object.data[3].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[3].wxapp_imgurl,'plugin')>=0}}">
223 384 <image src="{{object.data[3].src}}" lazy-load="true"></image>
224 385 </navigator>
225 386  
226 387 <view data-url="{{object.data[3].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
227 388 <image src="{{object.data[3].src}}" lazy-load="true"></image>
228   - </view>
  389 + </view> -->
  390 + <block wx:if="{{g_filter.has_char(object.data[3].wxapp_imgurl,'plugin')>=0}}">
  391 + <navigator url="{{object.data[3].wxapp_imgurl}}" class="s1_gk_a1">
  392 + <image src="{{object.data[3].src}}" lazy-load="true"></image>
  393 + </navigator>
  394 + </block>
  395 + <block wx:elif="{{object.data[3].AppId}}">
  396 + <navigator target="miniProgram" app-id="{{object.data[3].AppId}}" path="{{object.data[3].wxapp_url}}" class="s1_gk_a1">
  397 + <image src="{{object.data[3].src}}" lazy-load="true"></image>
  398 + </navigator>
  399 + </block>
  400 + <block wx:else>
  401 + <view data-url="{{object.data[3].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
  402 + <image src="{{object.data[3].src}}" lazy-load="true"></image>
  403 + </view>
  404 + </block>
229 405  
230 406 </block>
231 407 </view>
... ... @@ -241,13 +417,28 @@
241 417 <text>300*150</text>
242 418 </block>
243 419 <block wx:if="{{object.data[0].src!=''}}">
244   - <navigator url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[0].wxapp_imgurl,'plugin')>=0}}">
  420 + <!-- <navigator url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[0].wxapp_imgurl,'plugin')>=0}}">
245 421 <image src="{{object.data[0].src}}" lazy-load="true"></image>
246 422 </navigator>
247 423  
248 424 <view data-url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
249 425 <image src="{{object.data[0].src}}" lazy-load="true"></image>
250   - </view>
  426 + </view> -->
  427 + <block wx:if="{{g_filter.has_char(object.data[0].wxapp_imgurl,'plugin')>=0}}">
  428 + <navigator url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1">
  429 + <image src="{{object.data[0].src}}" lazy-load="true"></image>
  430 + </navigator>
  431 + </block>
  432 + <block wx:elif="{{object.data[0].AppId}}">
  433 + <navigator target="miniProgram" app-id="{{object.data[0].AppId}}" path="{{object.data[0].wxapp_url}}" class="s1_gk_a1">
  434 + <image src="{{object.data[0].src}}" lazy-load="true"></image>
  435 + </navigator>
  436 + </block>
  437 + <block wx:else>
  438 + <view data-url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
  439 + <image src="{{object.data[0].src}}" lazy-load="true"></image>
  440 + </view>
  441 + </block>
251 442  
252 443 </block>
253 444 </view>
... ... @@ -257,12 +448,27 @@
257 448 <text>300*300</text>
258 449 </block>
259 450 <block wx:if="{{object.data[1].src!=''}}">
260   - <navigator url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[1].wxapp_imgurl,'plugin')>=0}}">
  451 + <!-- <navigator url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[1].wxapp_imgurl,'plugin')>=0}}">
261 452 <image src="{{object.data[1].src}}" lazy-load="true"></image>
262 453 </navigator>
263 454 <view data-url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
264 455 <image src="{{object.data[1].src}}" lazy-load="true"></image>
265   - </view>
  456 + </view> -->
  457 + <block wx:if="{{g_filter.has_char(object.data[1].wxapp_imgurl,'plugin')>=0}}">
  458 + <navigator url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1">
  459 + <image src="{{object.data[1].src}}" lazy-load="true"></image>
  460 + </navigator>
  461 + </block>
  462 + <block wx:elif="{{object.data[1].AppId}}">
  463 + <navigator target="miniProgram" app-id="{{object.data[1].AppId}}" path="{{object.data[1].wxapp_url}}" class="s1_gk_a1">
  464 + <image src="{{object.data[1].src}}" lazy-load="true"></image>
  465 + </navigator>
  466 + </block>
  467 + <block wx:else>
  468 + <view data-url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
  469 + <image src="{{object.data[1].src}}" lazy-load="true"></image>
  470 + </view>
  471 + </block>
266 472  
267 473 </block>
268 474  
... ... @@ -275,13 +481,28 @@
275 481 <text>300*300</text>
276 482 </block>
277 483 <block wx:if="{{object.data[2].src!=''}}">
278   - <navigator url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[2].wxapp_imgurl,'plugin')>=0}}">
279   - <image src="{{object.data[2].src}}" lazy-load="true"></image>
  484 + <!-- <navigator url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[2].wxapp_imgurl,'plugin')>=0}}">
  485 + <image src="{{object.data[2].src}}" lazy-load="true"></image>
280 486 </navigator>
281 487  
282 488 <view data-url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
283 489 <image src="{{object.data[2].src}}" lazy-load="true"></image>
284   - </view>
  490 + </view> -->
  491 + <block wx:if="{{g_filter.has_char(object.data[2].wxapp_imgurl,'plugin')>=0}}">
  492 + <navigator url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1">
  493 + <image src="{{object.data[2].src}}" lazy-load="true"></image>
  494 + </navigator>
  495 + </block>
  496 + <block wx:elif="{{object.data[2].AppId}}">
  497 + <navigator target="miniProgram" app-id="{{object.data[2].AppId}}" path="{{object.data[2].wxapp_url}}" class="s1_gk_a1">
  498 + <image src="{{object.data[2].src}}" lazy-load="true"></image>
  499 + </navigator>
  500 + </block>
  501 + <block wx:else>
  502 + <view data-url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
  503 + <image src="{{object.data[2].src}}" lazy-load="true"></image>
  504 + </view>
  505 + </block>
285 506  
286 507 </block>
287 508 </view>
... ... @@ -290,13 +511,28 @@
290 511 <text>300*150</text>
291 512 </block>
292 513 <block wx:if="{{object.data[3].src!=''}}">
293   - <navigator url="{{object.data[3].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[3].wxapp_imgurl,'plugin')>=0}}">
  514 + <!-- <navigator url="{{object.data[3].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[3].wxapp_imgurl,'plugin')>=0}}">
294 515 <image src="{{object.data[3].src}}" lazy-load="true"></image>
295 516 </navigator>
296 517  
297 518 <view data-url="{{object.data[3].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
298 519 <image src="{{object.data[3].src}}" lazy-load="true"></image>
299   - </view>
  520 + </view> -->
  521 + <block wx:if="{{g_filter.has_char(object.data[3].wxapp_imgurl,'plugin')>=0}}">
  522 + <navigator url="{{object.data[3].wxapp_imgurl}}" class="s1_gk_a1">
  523 + <image src="{{object.data[3].src}}" lazy-load="true"></image>
  524 + </navigator>
  525 + </block>
  526 + <block wx:elif="{{object.data[3].AppId}}">
  527 + <navigator target="miniProgram" app-id="{{object.data[3].AppId}}" path="{{object.data[3].wxapp_url}}" class="s1_gk_a1">
  528 + <image src="{{object.data[3].src}}" lazy-load="true"></image>
  529 + </navigator>
  530 + </block>
  531 + <block wx:else>
  532 + <view data-url="{{object.data[3].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
  533 + <image src="{{object.data[3].src}}" lazy-load="true"></image>
  534 + </view>
  535 + </block>
300 536  
301 537 </block>
302 538 </view>
... ... @@ -314,13 +550,28 @@
314 550 <text>200*200</text>
315 551 </block>
316 552 <block wx:if="{{object.data[0].src!=''}}">
317   - <navigator url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[0].wxapp_imgurl,'plugin')>=0}}">
318   - <image src="{{object.data[0].src}}" lazy-load="true"></image>
  553 + <!-- <navigator url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[0].wxapp_imgurl,'plugin')>=0}}">
  554 + <image src="{{object.data[0].src}}" lazy-load="true"></image>
319 555 </navigator>
320   -
  556 +
321 557 <view data-url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
322   - <image src="{{object.data[0].src}}" lazy-load="true"></image>
323   - </view>
  558 + <image src="{{object.data[0].src}}" lazy-load="true"></image>
  559 + </view> -->
  560 + <block wx:if="{{g_filter.has_char(object.data[0].wxapp_imgurl,'plugin')>=0}}">
  561 + <navigator url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1">
  562 + <image src="{{object.data[0].src}}" lazy-load="true"></image>
  563 + </navigator>
  564 + </block>
  565 + <block wx:elif="{{object.data[0].AppId}}">
  566 + <navigator target="miniProgram" app-id="{{object.data[0].AppId}}" path="{{object.data[0].wxapp_url}}" class="s1_gk_a1">
  567 + <image src="{{object.data[0].src}}" lazy-load="true"></image>
  568 + </navigator>
  569 + </block>
  570 + <block wx:else>
  571 + <view data-url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
  572 + <image src="{{object.data[0].src}}" lazy-load="true"></image>
  573 + </view>
  574 + </block>
324 575  
325 576 </block>
326 577 </view>
... ... @@ -329,13 +580,28 @@
329 580 <text>200*200</text>
330 581 </block>
331 582 <block wx:if="{{object.data[1].src!=''}}">
332   - <navigator url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[1].wxapp_imgurl,'plugin')>=0}}">
  583 + <!-- <navigator url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[1].wxapp_imgurl,'plugin')>=0}}">
333 584 <image src="{{object.data[1].src}}" lazy-load="true"></image>
334 585 </navigator>
335 586  
336 587 <view data-url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
337 588 <image src="{{object.data[1].src}}" lazy-load="true"></image>
338   - </view>
  589 + </view> -->
  590 + <block wx:if="{{g_filter.has_char(object.data[1].wxapp_imgurl,'plugin')>=0}}">
  591 + <navigator url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1">
  592 + <image src="{{object.data[1].src}}" lazy-load="true"></image>
  593 + </navigator>
  594 + </block>
  595 + <block wx:elif="{{object.data[1].AppId}}">
  596 + <navigator target="miniProgram" app-id="{{object.data[1].AppId}}" path="{{object.data[1].wxapp_url}}" class="s1_gk_a1">
  597 + <image src="{{object.data[1].src}}" lazy-load="true"></image>
  598 + </navigator>
  599 + </block>
  600 + <block wx:else>
  601 + <view data-url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
  602 + <image src="{{object.data[1].src}}" lazy-load="true"></image>
  603 + </view>
  604 + </block>
339 605 </block>
340 606 </view>
341 607 </view>
... ... @@ -347,13 +613,29 @@
347 613 <text>200*200</text>
348 614 </block>
349 615 <block wx:if="{{object.data[2].src!=''}}">
350   - <navigator url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[2].wxapp_imgurl,'plugin')>=0}}">
  616 + <!-- <navigator url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[2].wxapp_imgurl,'plugin')>=0}}">
351 617 <image src="{{object.data[2].src}}" lazy-load="true"></image>
352 618 </navigator>
353 619  
354 620 <view data-url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
355 621 <image src="{{object.data[2].src}}" lazy-load="true"></image>
356   - </view>
  622 + </view> -->
  623 +
  624 + <block wx:if="{{g_filter.has_char(object.data[2].wxapp_imgurl,'plugin')>=0}}">
  625 + <navigator url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1">
  626 + <image src="{{object.data[2].src}}" lazy-load="true"></image>
  627 + </navigator>
  628 + </block>
  629 + <block wx:elif="{{object.data[2].AppId}}">
  630 + <navigator target="miniProgram" app-id="{{object.data[2].AppId}}" path="{{object.data[2].wxapp_url}}" class="s1_gk_a1">
  631 + <image src="{{object.data[2].src}}" lazy-load="true"></image>
  632 + </navigator>
  633 + </block>
  634 + <block wx:else>
  635 + <view data-url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
  636 + <image src="{{object.data[2].src}}" lazy-load="true"></image>
  637 + </view>
  638 + </block>
357 639  
358 640  
359 641 </block>
... ... @@ -363,13 +645,22 @@
363 645 <text>200*200</text>
364 646 </block>
365 647 <block wx:if="{{object.data[3].src!=''}}">
366   - <navigator url="{{object.data[3].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[3].wxapp_imgurl,'plugin')>=0}}">
367   - <image src="{{object.data[3].src}}" lazy-load="true"></image>
368   - </navigator>
  648 + <block wx:if="{{g_filter.has_char(object.data[3].wxapp_imgurl,'plugin')>=0}}">
  649 + <navigator url="{{object.data[3].wxapp_imgurl}}" class="s1_gk_a1">
  650 + <image src="{{object.data[3].src}}" lazy-load="true"></image>
  651 + </navigator>
  652 + </block>
  653 + <block wx:elif="{{object.data[3].AppId}}">
  654 + <navigator target="miniProgram" app-id="{{object.data[3].AppId}}" path="{{object.data[3].wxapp_url}}" class="s1_gk_a1">
  655 + <image src="{{object.data[3].src}}" lazy-load="true"></image>
  656 + </navigator>
  657 + </block>
  658 + <block wx:else>
  659 + <view data-url="{{object.data[3].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
  660 + <image src="{{object.data[3].src}}" lazy-load="true"></image>
  661 + </view>
  662 + </block>
369 663  
370   - <view data-url="{{object.data[3].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
371   - <image src="{{object.data[3].src}}" lazy-load="true"></image>
372   - </view>
373 664 </block>
374 665 </view>
375 666 </view>
... ... @@ -382,13 +673,21 @@
382 673 <text>200*420</text>
383 674 </block>
384 675 <block wx:if="{{object.data[4].src!=''}}">
385   - <navigator url="{{object.data[4].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[4].wxapp_imgurl,'plugin')>=0}}">
386   - <image src="{{object.data[4].src}}" style='height:492rpx' lazy-load="true"></image>
387   - </navigator>
388   -
389   - <view data-url="{{object.data[4].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
390   - <image src="{{object.data[4].src}}" style='height:492rpx' lazy-load="true"></image>
391   - </view>
  676 + <block wx:if="{{g_filter.has_char(object.data[4].wxapp_imgurl,'plugin')>=0}}">
  677 + <navigator url="{{object.data[4].wxapp_imgurl}}" class="s1_gk_a1">
  678 + <image src="{{object.data[4].src}}" lazy-load="true"></image>
  679 + </navigator>
  680 + </block>
  681 + <block wx:elif="{{object.data[4].AppId}}">
  682 + <navigator target="miniProgram" app-id="{{object.data[4].AppId}}" path="{{object.data[4].wxapp_url}}" class="s1_gk_a1">
  683 + <image src="{{object.data[4].src}}" lazy-load="true"></image>
  684 + </navigator>
  685 + </block>
  686 + <block wx:else>
  687 + <view data-url="{{object.data[4].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
  688 + <image src="{{object.data[4].src}}" lazy-load="true"></image>
  689 + </view>
  690 + </block>
392 691  
393 692 </block>
394 693 </view>
... ... @@ -401,34 +700,36 @@
401 700 <block wx:if='{{object.style==4 && is_show}}'>
402 701  
403 702  
404   - <swiper class="swiper" circular="true" autoplay="{{autoplay}}" current="{{object.sw_index}}"
405   - indicator-dots="true"
406   - indicator-color="{{object.dot_color}}"
407   - indicator-active-color="{{object.dot_color_act}}"
408   - interval="{{object.swiper_time?object.swiper_time*1000:interval}}" duration="{{duration}}"
409   - style="height:{{max_sw_height}}rpx" >
410   - <block wx:for="{{object.data}}" wx:for-index="index" >
411   -
  703 + <swiper class="swiper" circular="true" autoplay="{{autoplay}}" current="{{object.sw_index}}" indicator-dots="true" indicator-color="{{object.dot_color}}" indicator-active-color="{{object.dot_color_act}}" interval="{{object.swiper_time?object.swiper_time*1000:interval}}" duration="{{duration}}" style="height:{{max_sw_height}}rpx">
  704 + <block wx:for="{{object.data}}" wx:for-index="index">
412 705 <block wx:if="{{(!item.begin_date || g_filter.beg_time(item.begin_date) ) && (!item.end_date || g_filter.end_time(item.end_date) )}}">
413   - <navigator url="{{item.wxapp_imgurl}}" class="s1_gk_a1" style="height:{{max_sw_height}}rpx" wx:if="{{g_filter.has_char(item.wxapp_imgurl,'plugin')>=0}}">
414   - <swiper-item>
415   - <image src="{{item.src}}" bindload="imageLoad" data-index="{{index}}" class="slide-image" mode="widthFix" lazy-load="true"/>
416   - <view class="title" wx:if="{{item.title}}">{{item.title}}</view>
417   - </swiper-item>
418   - </navigator>
  706 + <block wx:if="{{g_filter.has_char(item.wxapp_imgurl,'plugin')>=0}}">
  707 + <navigator url="{{item.wxapp_imgurl}}" class="s1_gk_a1" style="height:{{max_sw_height}}rpx">
  708 + <swiper-item>
  709 + <image src="{{item.src}}" bindload="imageLoad" data-index="{{index}}" class="slide-image" mode="widthFix" lazy-load="true" />
  710 + <view class="title" wx:if="{{item.title}}">{{item.title}}</view>
  711 + </swiper-item>
  712 + </navigator>
  713 + </block>
419 714  
420   - <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" style="height:{{max_sw_height}}rpx" bindtap="go_url" wx:else>
421   - <swiper-item>
422   - <image src="{{item.src}}" bindload="imageLoad" data-index="{{index}}" class="slide-image" mode="widthFix" lazy-load="true"/>
  715 + <block wx:elif="{{item.AppId}}">
  716 + <navigator target="miniProgram" app-id="{{item.AppId}}" path="{{item.wxapp_url}}">
  717 + <swiper-item>
  718 + <image src="{{item.src}}" bindload="imageLoad" data-index="{{index}}" class="slide-image" mode="widthFix" lazy-load="true" />
423 719 <view class="title" wx:if="{{item.title}}">{{item.title}}</view>
424   - </swiper-item>
425   - </view>
426   - </block>
  720 + </swiper-item>
  721 + </navigator>
  722 + </block>
427 723  
  724 + <block wx:else>
  725 + <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" style="height:{{max_sw_height}}rpx" bindtap="go_url">
  726 + <swiper-item>
  727 + <image src="{{item.src}}" bindload="imageLoad" data-index="{{index}}" class="slide-image" mode="widthFix" lazy-load="true" />
  728 + <view class="title" wx:if="{{item.title}}">{{item.title}}</view>
  729 + </swiper-item>
  730 + </view>
  731 + </block>
  732 + </block>
428 733 </block>
429 734 </swiper>
430   -
431   -
432   -
433   -
434   -</block>
  735 +</block>
435 736 \ No newline at end of file
... ...
components/diy_nav/diy_nav.wxml
  View file @a55ffcb
... ... @@ -3,13 +3,21 @@
3 3 <block wx:if="{{object.style==1}}">
4 4 <view class="{{object.seticon==1?'big':object.seticon==2?'big_one_two':'big_border_three'}}">
5 5 <block wx:for="{{nav_list}}">
6   - <navigator style="width:{{100/nav_list.length}}%;" url="{{item.wxapp_url}}" class="s1_gk_a1"
7   - wx:if="{{g_filter.has_char(item.wxapp_url,'plugin')>=0}}">
8   - <include src="diy_nav_part1.wxml" />
9   - </navigator>
10   - <view style="width:{{100/nav_list.length}}%;" data-url="{{item.wxapp_url}}" class="s1_gk_a1" bindtap="go_url" wx:else>
11   - <include src="diy_nav_part1.wxml" />
12   - </view>
  6 + <block wx:if="{{g_filter.has_char(item.wxapp_url,'plugin')>=0}}">
  7 + <navigator style="width:{{100/nav_list.length}}%;" url="{{item.wxapp_url}}" class="s1_gk_a1">
  8 + <include src="diy_nav_part1.wxml" />
  9 + </navigator>
  10 + </block>
  11 + <block wx:elif="{{item.AppId}}">
  12 + <navigator style="width:{{100/nav_list.length}}%;" target="miniProgram" app-id="{{item.AppId}}" path="{{item.wxapp_url}}">
  13 + <include src="diy_nav_part1.wxml" />
  14 + </navigator>
  15 + </block>
  16 + <block wx:else>
  17 + <view style="width:{{100/nav_list.length}}%;" data-url="{{item.wxapp_url}}" class="s1_gk_a1" bindtap="go_url">
  18 + <include src="diy_nav_part1.wxml" />
  19 + </view>
  20 + </block>
13 21 </block>
14 22 </view>
15 23 </block>
... ... @@ -18,14 +26,21 @@
18 26 <view class="big_two">
19 27 <!-- 图片一 -->
20 28 <block wx:for="{{nav_list}}">
21   - <navigator data-url="{{item.wxapp_url}}" class="s1_gk_a1" bindtap="go_url"
22   - wx:if="{{g_filter.has_char(item.wxapp_url,'plugin')>=0}}">
23   - <include src="diy_nav_part2.wxml" />
24   - </navigator>
25   - <view data-url="{{item.wxapp_url}}" class="s1_gk_a1" bindtap="go_url" wx:else>
26   - <include src="diy_nav_part2.wxml" />
27   - </view>
  29 + <block wx:if="{{g_filter.has_char(item.wxapp_url,'plugin')>=0}}">
  30 + <navigator data-url="{{item.wxapp_url}}" class="s1_gk_a1" bindtap="go_url">
  31 + <include src="diy_nav_part2.wxml" />
  32 + </navigator>
  33 + </block>
  34 + <block wx:elif="{{item.AppId}}">
  35 + <navigator target="miniProgram" app-id="{{item.AppId}}" path="{{item.wxapp_url}}">
  36 + <include src="diy_nav_part2.wxml" />
  37 + </navigator>
  38 + </block>
  39 + <block wx:else>
  40 + <view data-url="{{item.wxapp_url}}" class="s1_gk_a1" bindtap="go_url">
  41 + <include src="diy_nav_part2.wxml" />
  42 + </view>
  43 + </block>
28 44 </block>
29 45 </view>
30   -</block>
31   -
  46 +</block>
32 47 \ No newline at end of file
... ...
components/diy_picMax/diy_picMax.wxml
  View file @a55ffcb
... ... @@ -9,6 +9,11 @@
9 9 <image src="{{item.src}}" style="display: block; height: 100%; width: 100%;"></image>
10 10 </navigator>
11 11 </block>
  12 + <block wx:elif="{{item.AppId}}">
  13 + <navigator target="miniProgram" app-id="{{item.AppId}}" path="{{item.wxapp_url}}">
  14 + <image src="{{item.src}}" mode="widthFix" style="display: block; height: 100%; width: 100%;"></image>
  15 + </navigator>
  16 + </block>
12 17 <block wx:else>
13 18 <image bindtap='gopage' wx:if="{{item.wxapp_url}}" data-url="{{item.wxapp_url}}" src="{{item.src}}" style="display: block; height: 100%; width: 100%;"></image>
14 19 <image bindtap='previewImage' wx:else data-src="{{item.src}}" src="{{item.src}}" style="display: block; height: 100%; width: 100%;"></image>
... ... @@ -25,7 +30,7 @@
25 30 </navigator>
26 31 </block>
27 32 <block wx:elif="{{item.AppId}}">
28   - <navigator target="miniProgram" app-id="{{item.AppId}}" path="{{item.wxapp_url}}">
  33 + <navigator target="miniProgram" app-id="{{item.AppId}}" path="{{item.wxapp_url}}">
29 34 <image src="{{item.src}}" mode="widthFix" style="display: block;"></image>
30 35 </navigator>
31 36 </block>
... ...
components/diy_store_select/diy_store_select.wxss
  View file @a55ffcb
... ... @@ -188,7 +188,7 @@
188 188  
189 189 /* 门店分类列表 */
190 190 .sort_store_list {
191   - height: 82%;
  191 + max-height: 700rpx;
192 192 overflow: hidden;
193 193 overflow-y: scroll;
194 194 width: 95%;
... ...
packageA/pages/distribution/shop/shop.js
  View file @a55ffcb
... ... @@ -196,7 +196,7 @@ Page({
196 196 //--- 判断是等级会员，且在有效期范围内 ---
197 197 if (user.card_field && now < end) {
198 198 var card_name = ob.name_map.get(user.card_field);
199   - if (card_name.length > 4) card_name = card_name.substring(0, 8);
  199 + if (card_name && card_name.length > 4) card_name = card_name.substring(0, 8);
200 200 th.setData({
201 201 card_field: user.card_field,
202 202 card_name: card_name,
... ...
packageA/pages/goodsInfo/goodsInfo.wxss
  View file @a55ffcb
... ... @@ -2575,7 +2575,7 @@ line-height: 38rpx;
2575 2575 }
2576 2576 /* 门店分类列表 */
2577 2577 .sort_store_list{
2578   - height: 82%;
  2578 + max-height: 700rpx;
2579 2579 overflow: hidden;
2580 2580 overflow-y: scroll;
2581 2581 width: 95%;
... ...
packageA/pages/profile/profile.wxss
  View file @a55ffcb
... ... @@ -532,7 +532,7 @@ input {
532 532 /* 门店分类列表 */
533 533  
534 534 .sort_store_list {
535   - height: 82%;
  535 + max-height: 700rpx;
536 536 overflow: hidden;
537 537 overflow-y: scroll;
538 538 width: 95%;
... ...
packageA/pages/prom_list/prom_list.wxss
  View file @a55ffcb
... ... @@ -267,7 +267,7 @@
267 267 }
268 268 /* 门店分类列表 */
269 269 .sort_store_list{
270   - height: 82%;
  270 + max-height: 700rpx;
271 271 overflow: hidden;
272 272 overflow-y: scroll;
273 273 width: 95%;
... ...
packageA/pages/serviceCard_pd/team_show/team_show.wxss
  View file @a55ffcb
... ... @@ -2178,7 +2178,7 @@ page {
2178 2178  
2179 2179  
2180 2180 .sort_store_list{
2181   - height: 82%;
  2181 + max-height: 700rpx;
2182 2182 overflow: hidden;
2183 2183 overflow-y: scroll;
2184 2184 width: 95%;
... ...
packageA/pages/serviceCard_pd/team_success/team_success.js 0 → 100644
  View file @a55ffcb
  1 +var ut = require("../../../../utils/util.js"),
  2 + e = require("../../../../utils/common.js"),
  3 + a = require("../../../../utils/wxParse/wxParse.js"),
  4 + s = getApp(),
  5 + i = s.request,
  6 + o = s.globalData.setting,
  7 + os = o;
  8 + var regeneratorRuntime = require('../../../../utils/runtime.js');
  9 +
  10 +Page({
  11 + data: {
  12 + //activity_type:1,//活动类型 商家1 阶梯2 会员3
  13 + p_status:1,//会员团的详细情况 1是正在行 2是成功 3失败
  14 + sf_length: 1,//人数大于5
  15 +
  16 + erweima:false,
  17 + meng:false,
  18 + zk:true,
  19 + stoid: o.stoid,
  20 + hiddenName: true,
  21 + teamlist:null,
  22 + teamgroup:null,
  23 + goods:null,//商品数据
  24 + pindGoods: null,//拼单数据
  25 + imageurl: o.imghost,
  26 + pay_f:0,//支付是否成功
  27 + order_sn:"",//订单编号
  28 + canvasHidden:false, //画画版
  29 + screenWidth:0,
  30 +
  31 + pd_xx: 0, //弹框
  32 + max_num:0,//最低成团人数
  33 + min_price:0,//最低价格
  34 + is_show:0,//加载完才显示
  35 +
  36 + share_img_localpath:"", //分享图片的本地图片
  37 + share_ewm_localpath: "", //分享的二维码本地图片
  38 + share_head:"", //分享头像的本地图片
  39 +
  40 + iurl:os.imghost,
  41 + ct_price:0,//阶梯团成团价格
  42 + sf_arr:null,
  43 +
  44 + },
  45 + onLoad: function (t) {
  46 + wx.setNavigationBarTitle({ title: "拼团订单",})
  47 + var that=this;
  48 + var th=this;
  49 + //获取用户设备信息，屏幕宽度
  50 + wx.getSystemInfo({
  51 + success: res => {
  52 + that.setData({ screenWidth: res.screenWidth })
  53 + }
  54 + })
  55 + var pay_f = t.payf, order_sn = t.ordersn;
  56 + this.setData({ pay_f: pay_f, order_sn: order_sn});
  57 + this.init(order_sn);
  58 +
  59 + //-- 自定义海报 --
  60 + getApp().request.promiseGet("/api/weshop/goods/poster/page",{
  61 + data:{store_id:os.stoid, type:1, is_use:1 }
  62 + }).then(res=>{
  63 + if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData[0] ){
  64 +
  65 + var poster_data=res.data.data.pageData[0];
  66 + var json_str=poster_data.jsonStr;
  67 + if(json_str){
  68 + var json_data=JSON.parse(json_str);
  69 + if(json_data.bg_img){
  70 +
  71 + //-- 把图片那到本地 --
  72 + wx.getImageInfo({
  73 + src:json_data.bg_img,
  74 + success: function(res) {
  75 + var path= res.path;
  76 + th.setData({share_b_img:path})
  77 + },
  78 + fail: function(res) {}
  79 + });
  80 + }
  81 + th.setData({poster:json_data})
  82 + }
  83 + }
  84 + })
  85 + },
  86 + onShow:function () {
  87 + getApp().check_can_share();
  88 + },
  89 +
  90 + //关闭展开列表
  91 + click:function(e){
  92 + this.setData({
  93 + hiddenName: !this.data.hiddenName,
  94 + zk: !this.data.zk,
  95 + })
  96 + },
  97 + //打开收起拼团列表
  98 + czk:function(e){
  99 + this.setData({
  100 + zk:!this.data.zk,
  101 + hiddenName: !this.data.hiddenName,
  102 + })
  103 + },
  104 + //打开蒙板提示
  105 + cmeng:function(e){
  106 + this.setData({
  107 + meng:!this.data.meng,
  108 + })
  109 + },
  110 +
  111 + //关闭蒙板提示
  112 + cmc:function(e){
  113 + this.setData({
  114 + meng: !this.data.meng,
  115 + })
  116 + },
  117 +//打开二维码提示
  118 + cerweima:function(e){
  119 + this.setData({
  120 + meng: !this.data.meng,
  121 + erweima: !this.data.erweima,
  122 + })
  123 + },
  124 +
  125 + cerc:function(e){
  126 + this.setData({
  127 + erweima: !this.data.erweima,
  128 + meng: !this.data.meng,
  129 + })
  130 + },
  131 +
  132 + async init( order_sn) {
  133 +
  134 + wx.showLoading();
  135 +
  136 + var goods_id = 0,//商品ID,
  137 + pageteam=null,//
  138 + original_img=null ,//商品图片
  139 + order=null,//订单编号
  140 + service_list=null, //服务卡崇拜
  141 + id = 0,//团购id
  142 + pt_listno = "",//团编号
  143 + pt_prom_id = 0, //活动id
  144 + ee = this,
  145 + team_id = 0,//活动id
  146 + ordertx=[],//头像图片
  147 + share_img=null,//分享图片
  148 + teamlist=null,//活动表
  149 + teamgroup=null,//活動从表
  150 + max_num=0,//最低价格时的成团人数
  151 + p_status=1;
  152 +
  153 + //--如果商家团的时候,这个要改---
  154 + await getApp().request.promisePost("/api/weshop/order/pay/vipAutoTuan", {
  155 + data: {orderSn:order_sn,storeId:os.stoid }
  156 + })
  157 +
  158 + await getApp().request.promiseGet("/api/weshop/recharge/get/"+os.stoid+"/"+order_sn, {
  159 + }).then(rs1=>{
  160 + if(rs1.data.code==0){
  161 + order=rs1.data.data;
  162 + }
  163 + })
  164 +
  165 +
  166 + //获取order信息根据订单编号order_sn
  167 + await getApp().request.promiseGet("/api/weshop/rechargeServicelist/page", {
  168 + data: { store_id: os.stoid, order_id: order.order_id,}
  169 + }).then(res => {
  170 + service_list = res.data.data.pageData[0];
  171 + pt_prom_id = service_list.prom_id;
  172 + pt_listno = service_list.pt_listno;
  173 + })
  174 +
  175 + if (this.data.payf || service_list.pt_status == 3) p_status = 3; //失败
  176 + if (service_list.pt_status == 2 || service_list.pt_status == 4 || service_list.pt_status == 5)
  177 + p_status = 2; //成功
  178 + if (service_list.pt_status < 2 && !this.data.payf)
  179 + p_status = 1; //正在进行
  180 + if ( service_list.pt_status == 6) p_status = 4; //支付尾款失败
  181 +
  182 + //多少人参团头像
  183 + await getApp().request.promiseGet("/api/weshop/rechargeServicelist/pagePtList", {
  184 + data: { store_id: o.stoid, pt_listno: pt_listno, }
  185 + }).then(res => {
  186 + ordertx = res.data.data.pageData;
  187 + })
  188 +
  189 + var min_price=0;
  190 + //获取活动表的信息根据活动pt_prom_id
  191 + await getApp().request.promiseGet("/api/weshop/teamlist/get/" + os.stoid + "/" + pt_prom_id, {
  192 + data: { }
  193 + }).then(res => {
  194 + if(res.data.code==0){
  195 + teamlist=res.data.data;
  196 + this.setData({
  197 + teamlist:teamlist
  198 + });
  199 + var nt =ut.gettimestamp();
  200 + teamlist.status=0;
  201 +
  202 + if (nt >= teamlist.start_time) teamlist.status = 1;
  203 + goods_id = res.data.data.goods_id;
  204 + id = res.data.data.id;
  205 + share_img = ee.data.imageurl + res.data.data.share_imgurl;
  206 +
  207 + //----------查看阶梯团------------
  208 + if (teamlist.ct_rylist != "" && teamlist.ct_rylist != null && teamlist.ct_rylist != undefined){
  209 + var ct_rylist = JSON.parse(teamlist.ct_rylist);
  210 + var max=0; var pri=0;
  211 + ct_rylist.forEach(function (val,ind) {
  212 + if(val.rynum>max){
  213 + max=val.rynum;
  214 + pri = val.price;
  215 + }
  216 + })
  217 + max_num=max;
  218 + min_price=pri;
  219 + }
  220 +
  221 + }
  222 +
  223 + //-- 商品地址 --
  224 + original_img = ee.data.imageurl+ service_list.img_url,
  225 + ee.setData({goods: service_list,image: original_img,})
  226 +
  227 +
  228 + })
  229 +
  230 + //只装5个
  231 + var ordertx2=[],sf_num=0,ct_nun=teamlist.ct_num;
  232 + if(max_num){
  233 + ct_nun=parseInt(max_num);
  234 + if (ordertx && ct_nun < ordertx.length) ct_nun = ordertx.length;
  235 + }
  236 +
  237 + if(ct_nun>5) ct_nun=5;
  238 + for(var i=0;i<ct_nun;i++){
  239 + if (ordertx && i >= ordertx.length) sf_num++
  240 + else
  241 + ordertx2.push(ordertx[i]);
  242 + }
  243 +
  244 + var sf_arr=[];
  245 + for (var i=0;i<sf_num;i++){
  246 + sf_arr.push(i);
  247 + }
  248 +
  249 +
  250 + //获取活动从表信息team_id:305暂时
  251 + await getApp().request.promiseGet("/api/weshop/teamgroup/page" , {
  252 + data: { store_id: os.stoid, listno: pt_listno, team_id: pt_prom_id }
  253 + }).then(res => {
  254 + teamgroup = res.data.data.pageData[0];
  255 + if (teamgroup){
  256 + var buy_start_date = ut.formatTime(teamgroup.buy_start_date, "yyyy-MM-dd hh:mm:ss");
  257 + teamgroup.buy_start_date=buy_start_date;
  258 + }
  259 + })
  260 +
  261 +
  262 + var ct_price = 0,
  263 + num_0 = ordertx.length;
  264 + if (teamlist.kttype == 3){
  265 + var js_data = JSON.parse(teamlist.ct_rylist);
  266 + js_data.forEach(function (val,ind) {
  267 + if (num_0<=val.rynum && ct_price==0){
  268 + ct_price=val.price;
  269 + }
  270 + })
  271 + if(ct_price==0) ct_price=min_price;
  272 + }
  273 +
  274 + //获取大家都在团信息
  275 + getApp().request.promiseGet("/api/weshop/teamlist/pageteam/1?store_id="+ os.stoid +"&is_end=0&is_show=1" , {
  276 + data:{page:1,pageSize:2}
  277 + }).then(res => {
  278 + if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){
  279 + pageteam = res.data.data.pageData;
  280 + ee.setData({pageteam: pageteam,})
  281 + }
  282 +
  283 + })
  284 +
  285 + //--当是成团的时候的操作--
  286 + if(order.pt_status==2 || order.pt_status==4 || order.pt_status==5){
  287 + //设置值
  288 +
  289 + ee.setData({
  290 + ordertx2: ordertx2, ordertx: ordertx, teamlist: teamlist, teamgroup: teamgroup, min_price: min_price,
  291 + order: order, share_img: share_img,max_num:max_num,
  292 + pindGoods: teamlist,is_show:1, zk:false,
  293 + hiddenName: false, ct_price:ct_price,p_status:p_status,sf_arr:sf_arr});
  294 +
  295 + //--是否支付了尾款--
  296 + if(order.pt_status==4 || order.pt_status==5){
  297 + ee.setData({is_pay_wk:1});
  298 + }
  299 + }else{
  300 + console.log("239什么鬼", teamlist);
  301 + //设置值
  302 + ee.setData({
  303 + ordertx2: ordertx2, ordertx: ordertx, teamlist: teamlist, teamgroup: teamgroup,
  304 + order: order, p_status: p_status, min_price:min_price,
  305 + share_img: share_img, max_num: max_num, pindGoods: teamlist, is_show: 1,
  306 + ct_price: ct_price, p_status: p_status,sf_arr:sf_arr});
  307 + }
  308 +
  309 + wx.hideLoading();
  310 +
  311 + wx.setNavigationBarTitle({
  312 + title: "拼团详情",
  313 + })
  314 +
  315 + ee.countDown2();
  316 +
  317 + //获取分享图片的本地地址
  318 + var path2 = os.imghost + teamlist.share_imgurl;
  319 + wx.getImageInfo({
  320 + src: path2,
  321 + success: function (res) {
  322 + //res.path是网络图片的本地地址
  323 + ee.data.share_img_localpath = res.path;
  324 + },
  325 + fail: function (res) {
  326 + //失败回调
  327 + }
  328 + });
  329 +
  330 +
  331 + },
  332 + //---小于10的格式化函数----
  333 + timeFormat(param) {
  334 + return param < 10 ? '0' + param : param;
  335 + },
  336 + countDown2() {
  337 + var th = this;
  338 + // 获取当前时间，同时得到活动结束时间数组
  339 + var newTime = ut.gettimestamp();
  340 + var o = this.data.teamgroup;
  341 + if(!o) return false;
  342 +
  343 + var endTime = o.kt_end_time;
  344 + if (o.status == 0) endTime = o.start_time;
  345 +
  346 + //看一下，是否要支付尾款
  347 + if(o.team_type==3 && th.data.order.pt_status==2){
  348 + endTime = o.wk_end_time;
  349 + }
  350 +
  351 + let obj = null;
  352 + // 如果活动未结束，对时间进行处理
  353 + if (endTime - newTime > 0) {
  354 + let time = (endTime - newTime);
  355 + // 获取天、时、分、秒
  356 + let day = parseInt(time / (60 * 60 * 24));
  357 + let hou = parseInt(time % (60 * 60 * 24) / 3600);
  358 + let min = parseInt(time % (60 * 60 * 24) % 3600 / 60);
  359 + let sec = parseInt(time % (60 * 60 * 24) % 3600 % 60);
  360 + obj = {
  361 + day: this.timeFormat(day),
  362 + hou: this.timeFormat(hou),
  363 + min: this.timeFormat(min),
  364 + sec: this.timeFormat(sec)
  365 + }
  366 + } else {
  367 + //活动已结束，全部设置为'00'
  368 + obj = {
  369 + day: '00',
  370 + hou: '00',
  371 + min: '00',
  372 + sec: '00'
  373 + }
  374 + }
  375 + var txt = "pindGoods.djs";
  376 + th.setData({
  377 + obj: obj
  378 + });
  379 + setTimeout(th.countDown2, 1000);
  380 + },
  381 +
  382 + //--定义的保存图片方法，分享团---
  383 + saveImageToPhotosAlbum: function () {
  384 + //类型 0普通商品 1秒杀商品 2商家和会员团 3阶梯团
  385 + var type=1;
  386 + if(this.data.teamlist.kttype==3) type=2;
  387 +
  388 + wx.showLoading({ title: '生成中...', })
  389 + var that = this, th = that;
  390 + //设置画板显示，才能开始绘图
  391 + that.setData({
  392 + canvasHidden: true,
  393 + })
  394 +
  395 + if(this.data.share_hidden) {
  396 + this.setData({
  397 + share_hidden: false,
  398 + });
  399 + };
  400 +
  401 + var app = getApp();
  402 + var unit = that.data.screenWidth / 750 * 1.35;
  403 + var scene=th.data.teamgroup.id;
  404 + var goods_id=th.data.teamlist.goods_id;
  405 + var user_id=getApp().globalData.user_id?getApp().globalData.user_id:0;
  406 + if(user_id>0){
  407 + scene+="_"+user_id;
  408 + }
  409 + if(goods_id !==""){
  410 + scene+="_"+goods_id;
  411 + }
  412 +
  413 + //二微码
  414 + var path3 = os.url+ "/api/wx/open/app/user/getWeAppEwm/"+
  415 + os.stoid+"?sceneValue="+scene+"&pageValue=pages/team/team_show/team_show";
  416 +
  417 + console.log(path3,6000);
  418 +
  419 + //读取文件成功则OK--
  420 + wx.getImageInfo({
  421 + src: path3,
  422 + success:function (res) {
  423 + console.log(res,5000);
  424 + //回调写法
  425 + th.get_head_temp(th.get_goods_temp,function () {
  426 + var vpath = res.path;
  427 + var context = wx.createCanvasContext('share');
  428 +
  429 +
  430 + //先画背景
  431 + var pg_path = "../../../../images/share/share_bg.png";
  432 + //-- 如果有自定义海报的时候，判断背景的图片 --
  433 + if(th.data.share_b_img){
  434 + pg_path=th.data.share_b_img;
  435 + }
  436 +
  437 + var share_title=th.data.teamlist.share_title;
  438 + if(!share_title)
  439 + share_title=th.data.teamlist.title;
  440 + context.drawImage(pg_path, 0, 0, 554 * unit, 899 * unit);
  441 +
  442 + //-- 是自定义海报的情况下 --
  443 + if(th.data.poster && parseInt(th.data.poster.style)==2){
  444 + //在线上分享人的情况下
  445 + if(parseInt(th.data.poster.show_headpic)){
  446 + //获取坐标
  447 + var x=parseFloat(th.data.poster.head_x)*2;
  448 + var y=parseFloat(th.data.poster.head_y)*2;
  449 + var x1=(x+90) *unit;
  450 + var y1=(y+50) *unit;
  451 + //--昵称---
  452 + context.setFontSize(24 * unit)
  453 + context.setFillStyle("black")
  454 + context.fillText(app.globalData.userInfo.nickname, x1, y1);
  455 + var width = 24 * app.globalData.userInfo.nickname.length * unit + 4 * unit;
  456 + //强烈推荐 改许程
  457 + var tj_path = "../../../../images/share/q_tj.png";
  458 + context.drawImage(tj_path, x1 + width, y1-22*unit, 85 * unit, 30 * unit);
  459 + context.setFontSize(16 * unit)
  460 + context.setLineJoin('round'); //交点设置成圆角
  461 + context.setFillStyle("white")
  462 + context.fillText('强烈推荐', x1 + width+8*unit, y1-1*unit);
  463 + }
  464 +
  465 + }else{
  466 + //--昵称---
  467 + context.setFontSize(24 * unit)
  468 + context.setFillStyle("black")
  469 + context.fillText(app.globalData.userInfo.nickname, 152 * unit, 76 * unit);
  470 + var width = 24 * app.globalData.userInfo.nickname.length * unit + 2 * unit;
  471 + //强烈推荐
  472 + var tj_path = "../../../../images/share/q_tj.png";
  473 + context.drawImage(tj_path, 152 * unit + width, 54 * unit, 110 * unit, 30 * unit);
  474 + context.setFontSize(18 * unit)
  475 + context.setFillStyle("white")
  476 + context.fillText('强烈推荐', 152 * unit + width + 20 * unit, 76 * unit);
  477 + }
  478 +
  479 +
  480 + //---产品名称---
  481 + context.setFontSize(21.3 * unit);
  482 + context.setFillStyle("black");
  483 +
  484 +
  485 +
  486 +
  487 + th.draw_Text(context,share_title,
  488 + 38 * unit, 180 * unit, 200 * unit, 279 * unit, unit);
  489 + //------产品的价格-------
  490 + context.setFontSize(24 * unit)
  491 + context.setFillStyle("red")
  492 +
  493 + var pri0 = th.data.teamlist.price;
  494 + pri0=parseFloat(pri0).toFixed(2);
  495 + var wd1=th.data.screenWidth-ut.measureText(pri0, 31 * unit)-25;
  496 + context.fillText("￥", wd1-15, 180 * unit);
  497 + context.setFontSize(31 * unit)
  498 + context.fillText(pri0, wd1, 180 * unit);
  499 +
  500 + //---市场价划掉---
  501 + context.setFillStyle("gray")
  502 + context.setFontSize(22 * unit)
  503 + pri0= "￥" + parseFloat(th.data.goods.market_price).toFixed(2);
  504 + var wd2=th.data.screenWidth-ut.measureText(pri0, 22 * unit)-25;
  505 + context.fillText(pri0, wd2, 210 * unit);
  506 +
  507 + context.setStrokeStyle('gray')
  508 + context.setLineWidth(1 * unit)
  509 + context.moveTo(wd2-5, 204 * unit)
  510 + context.lineTo(wd2+ut.measureText(pri0, 22 * unit)+5, 204 * unit)
  511 + context.stroke();
  512 + console.log(th.data.share_img_localpath);
  513 +
  514 +
  515 + //---中间大图---
  516 + context.drawImage(th.data.share_img_localpath, 68 * unit, 242 * unit, 410 * unit, 410 * unit);
  517 +
  518 + var g_ct=th.data.teamlist.ct_num-th.data.ordertx.length;
  519 + var wz= "";
  520 + if(g_ct>0) wz="还差"+g_ct+"人成团，";
  521 + else{
  522 + g_ct= th.data.max_num -th.data.ordertx.length;
  523 + if(g_ct>0){
  524 + wz="还差"+g_ct+"人享最低优惠，";
  525 + }else{
  526 + wz="已享受最优惠，";
  527 + }
  528 + }
  529 +
  530 + //-------大图后面就不一样了-----------
  531 + switch (type) {
  532 + case 1://会员团和商家团的展示
  533 + //---画线---
  534 + context.setLineWidth(1 * unit)
  535 + context.moveTo(32 * unit, 670 * unit)
  536 + context.lineTo(520 * unit, 670 * unit)
  537 + context.stroke();
  538 +
  539 + //---文字---
  540 + context.setFontSize(22 * unit)
  541 + context.setFillStyle("black")
  542 + context.fillText("好物拼起来,拼拼更划算", 40 * unit, 726 * unit);
  543 +
  544 + //绘制成团图片
  545 + var ct_img ="../../../../images/share/ct_num.png";
  546 + context.drawImage(ct_img, 40 * unit, 740 * unit, 120 * unit, 30 * unit);
  547 + var ct_num = th.data.teamlist.ct_num;
  548 + context.setFontSize(14 * unit)
  549 +
  550 + context.setFillStyle("red")
  551 + if(ct_num<10){
  552 + context.fillText(ct_num+"人拼团", 92 * unit, 760 * unit);
  553 + }else{
  554 + context.fillText(ct_num+"人拼团", 86 * unit, 760 * unit);
  555 + }
  556 + context.setFontSize(22 * unit)
  557 + context.fillText("已拼"+th.data.teamlist.buy_num+"份", 166 * unit, 763 * unit);
  558 + context.setFillStyle("gray")
  559 + context.fillText(wz+"快来和我一起拼团吧！", 40 * unit, 826 * unit);
  560 + context.setFillStyle("black")
  561 +
  562 + context.setFontSize(22 * unit)
  563 + context.fillText("长按识别二维码，立即参团", 40 * unit, 856 * unit);
  564 + //---二维吗图---
  565 + //-- 自定义海报 --
  566 + if(th.data.poster){
  567 + var erm_x= parseFloat(th.data.poster.ewm_x)*2;
  568 + var erm_y= parseFloat(th.data.poster.ewm_y)*2;
  569 + context.drawImage(vpath, erm_x * unit, erm_y * unit, 120 * unit, 120 * unit);
  570 + }else{
  571 + //---二维吗图---
  572 + context.drawImage(vpath, 420 * unit, 726 * unit, 120 * unit, 120 * unit);
  573 + }
  574 + break
  575 + case 2://阶梯团的展示
  576 + //---画线---
  577 + context.setLineWidth(1 * unit)
  578 + context.moveTo(32 * unit, 670 * unit)
  579 + context.lineTo(520 * unit, 670 * unit)
  580 + context.stroke();
  581 + //---文字---
  582 + context.setFontSize(22 * unit)
  583 + context.setFillStyle("black")
  584 + context.fillText("好物拼起来,拼拼更划算", 40 * unit, 726 * unit);
  585 + //---绘制中间阶梯的价格---
  586 + var list= JSON.parse(th.data.teamlist.ct_rylist);
  587 + for(var i=0; i<list.length;i++){
  588 + var item=list[i];
  589 + var wi=i*90*unit;
  590 + context.setFontSize(16 * unit)
  591 + context.setFillStyle("red")
  592 + context.fillText("￥", 40 * unit+wi, 756 * unit);
  593 + context.setFontSize(22 * unit)
  594 + var pri=parseFloat(item.price).toFixed(2);
  595 + context.fillText(pri, 56 * unit+wi, 756 * unit);
  596 + context.setFillStyle("gray")
  597 + context.fillText("满"+item.rynum+"人", 40 * unit+wi, 786 * unit);
  598 + }
  599 +
  600 + //----------------下面部分----------------
  601 + context.setFillStyle("gray")
  602 + context.fillText(wz+"快来和我一起拼团吧！", 40 * unit, 830 * unit);
  603 + context.setFillStyle("black")
  604 + context.setFontSize(22 * unit)
  605 +
  606 + context.fillText("长按识别二维码，立即参团", 40 * unit, 860 * unit);
  607 + //---二维吗图---
  608 + //-- 自定义海报 --
  609 + if(th.data.poster){
  610 + var erm_x= parseFloat(th.data.poster.ewm_x)*2;
  611 + var erm_y= parseFloat(th.data.poster.ewm_y)*2;
  612 + context.drawImage(vpath, erm_x * unit, erm_y * unit, 120 * unit, 120 * unit);
  613 + }else{
  614 + //---二维吗图---
  615 + context.drawImage(vpath, 420 * unit, 726 * unit, 120 * unit, 120 * unit);
  616 + }
  617 + break
  618 + }
  619 +
  620 + //--- 如果是自定义海报的时候 ---
  621 + if(th.data.poster && parseInt(th.data.poster.style)==2){
  622 +
  623 + //如果显示会员信息的话
  624 + if(parseInt(th.data.poster.show_headpic)){
  625 + //获取坐标
  626 + var x= parseFloat(th.data.poster.head_x)*2;
  627 + var y=parseFloat(th.data.poster.head_y)*2;
  628 + //---绘制圆形要放在最后----
  629 + context.save();
  630 + context.beginPath();
  631 + var h_x = x* unit;
  632 + var h_y = y * unit;
  633 + var h_r = 40 * unit;
  634 + var cx = h_x + h_r;
  635 + var cy = h_y + h_r;
  636 + context.arc(cx, cy, h_r, 0, Math.PI * 2, false);
  637 + context.closePath();
  638 + context.fill();
  639 + context.clip();
  640 + context.drawImage(th.data.share_head, h_x, h_y, h_r * 2, h_r * 2);
  641 + context.restore();
  642 + }
  643 +
  644 + }else{
  645 + //---绘制圆形要放在最后----
  646 + context.save();
  647 + context.beginPath();
  648 + var h_x = 60 * unit;
  649 + var h_y = 24 * unit;
  650 + var h_r = 40 * unit;
  651 + var cx = h_x + h_r;
  652 + var cy = h_y + h_r;
  653 + context.arc(cx, cy, h_r, 0, Math.PI * 2, false);
  654 + context.closePath();
  655 + context.fill();
  656 + context.clip();
  657 + context.drawImage(th.data.share_head, h_x, h_y, h_r * 2, h_r * 2);
  658 + context.restore();
  659 + }
  660 +
  661 + //把画板内容绘制成图片，并回调 画板图片路径
  662 + context.draw(false, function () {
  663 + setTimeout(function () {
  664 + wx.canvasToTempFilePath({
  665 + x: 0, y: 0,
  666 + width: 750,
  667 + height: 1217,
  668 + destWidth: 750 * 750 / that.data.screenWidth,
  669 + destHeight: 1217 * 750 / that.data.screenWidth,
  670 + canvasId: 'share',
  671 + success: function (res) {
  672 +
  673 + that.setData({
  674 + shareImgPath: res.tempFilePath, canvasHidden: false,
  675 + })
  676 + if (!res.tempFilePath) {
  677 + wx.showModal({
  678 + title: '提示',
  679 + content: '图片绘制中，请稍后重试',
  680 + showCancel: false
  681 + })
  682 + return false;
  683 + }
  684 +
  685 + // wx.previewImage({
  686 + // //将图片预览出来
  687 + // urls: [that.data.shareImgPath]
  688 + // });
  689 +
  690 + that.setData({
  691 + showPoster: true,
  692 + });
  693 +
  694 + wx.hideLoading();
  695 + }
  696 + })
  697 + },500)
  698 + });
  699 + });
  700 + }
  701 + });
  702 + },
  703 +
  704 +
  705 + //文本换行 参数：1、canvas对象，2、文本 3、距离左侧的距离 4、距离顶部的距离 5、6、文本的宽度
  706 + draw_Text: function (ctx, str, leftWidth, initHeight, titleHeight, canvasWidth, unit) {
  707 + var lineWidth = 0;
  708 + var lastSubStrIndex = 0; //每次开始截取的字符串的索引
  709 + var han = 0;
  710 + for (let i = 0; i < str.length; i++) {
  711 + if (han == 2) return;
  712 +
  713 + //lineWidth += ctx.measureText(str[i]).width;
  714 + lineWidth += ut.measureText(str[i], 21.3 * unit);
  715 +
  716 + if (lineWidth > canvasWidth) {
  717 + han++;
  718 + if (han == 2)
  719 + ctx.fillText(str.substring(lastSubStrIndex, i) + '...', leftWidth, initHeight); //绘制截取部分
  720 + else
  721 + ctx.fillText(str.substring(lastSubStrIndex, i), leftWidth, initHeight);
  722 +
  723 + initHeight += 22; //22为字体的高度
  724 + lineWidth = 0;
  725 + lastSubStrIndex = i;
  726 + titleHeight += 20;
  727 + }
  728 + if (i == str.length - 1) { //绘制剩余部分
  729 + ctx.fillText(str.substring(lastSubStrIndex, i + 1), leftWidth, initHeight);
  730 + }
  731 + }
  732 + },
  733 +
  734 + //c点击打开拼团弹窗
  735 + cpd: function() {
  736 + console.log("heheh");
  737 + this.setData({ pd_xx: 1,})
  738 + },
  739 +
  740 + //点击关闭拼团弹窗
  741 + close_pt_xx: function() {
  742 + this.setData({ pd_xx: 0, })
  743 + },
  744 +
  745 + go_goodsinfo:function (e) {
  746 + var index=e.currentTarget.dataset.index;
  747 + var item=this.data.pageteam[index];
  748 + var gid=item.goods_id;
  749 + var url="/pages/goods/goodsInfo/goodsInfo?goods_id="+gid+"&prom_id="+item.id+"&prom_type=6";
  750 + if(item.goods_type==1){
  751 + url="/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?goods_id="+gid+"&prom_id="+item.id+"&prom_type=6";
  752 + }
  753 + getApp().goto(url); //跳到非tabbar页
  754 + },
  755 +
  756 + gohome:function () {
  757 + getApp().goto("/pages/index/index/index");
  758 + },
  759 +
  760 + //--获取头像的本地缓存,回调写法--
  761 + get_head_temp:function (tt,func) {
  762 + var ee=this;
  763 + if(ee.data.share_head){
  764 + tt(func);
  765 + return false;
  766 + }
  767 + //---获取分享图片的本地地址,头像和商品图片----
  768 + var path2 = getApp().globalData.userInfo.head_pic;
  769 + if(path2==""){
  770 + ee.data.share_head ="../../../images/share/hui_hear_pic.png";
  771 + tt(func);
  772 + }else {
  773 + path2=path2.replace("http://thirdwx.qlogo.cn","https://wx.qlogo.cn");
  774 + path2=path2.replace("https://thirdwx.qlogo.cn","https://wx.qlogo.cn");
  775 + wx.getImageInfo({
  776 + src: path2,
  777 + success: function (res) {
  778 + //res.path是网络图片的本地地址
  779 + ee.data.share_head = res.path;
  780 + tt(func);;
  781 + },
  782 + fail: function (res) {
  783 + ee.data.share_head = "../../../images/share/hui_hear_pic.png"; //分享的图片不能用网络的
  784 + tt(func);
  785 + }
  786 + });
  787 + }
  788 + },
  789 +
  790 + //--获取商品图片的本地缓存，回调写法--
  791 + get_goods_temp:function (tt) {
  792 + var ee=this;
  793 + if(ee.data.share_img_localpath) {
  794 + tt();
  795 + return false;
  796 + }
  797 + var path2 = os.imghost + ee.data.teamlist.share_imgurl;
  798 + //获取商品是分享图信息
  799 + wx.getImageInfo({
  800 + src: path2,
  801 + success: function (res) {
  802 + //res.path是网络图片的本地地址
  803 + ee.data.share_img_localpath = res.path;
  804 + tt();
  805 + },
  806 + fail: function (res) {
  807 + ee.data.share_img_localpath= "../../../images/share/default_g_img.gif"; //分享的图片不能用网络的
  808 + tt();
  809 + }
  810 + });
  811 + },
  812 +
  813 + go_pay_wk:function(){
  814 + var url = "/pages/cart/cart_wk/cart_wk?order_id=" + this.data.order.order_id;
  815 + getApp().goto(url);
  816 + },
  817 +
  818 + img_show_err:function(e){
  819 + var err_img = e.currentTarget.dataset.err;
  820 + var ob={};
  821 + ob[err_img] = this.data.iurl + "/miniapp/images/default_g_img.gif";
  822 + this.setData(ob);
  823 +
  824 + },
  825 +
  826 + //------ 分享配置 --------
  827 + onShareAppMessage: function (e) {
  828 + getApp().globalData.no_clear=1;
  829 + var th=this;
  830 + var scene=this.data.teamgroup.id;
  831 + var goods_id=this.data.teamlist.goods_id;
  832 + var url="/pages/team/team_show/team_show?tg_id="+scene+"&goods_id="+goods_id;
  833 + //--分享图片--
  834 + var img=th.data.iurl+th.data.teamlist.share_imgurl;
  835 + //--把会员分享出去--
  836 + if(getApp().globalData.user_id){
  837 + if(url.indexOf("?")>0)
  838 + url+="&first_leader="+getApp().globalData.user_id;
  839 + else
  840 + url+="?first_leader="+getApp().globalData.user_id;
  841 + }
  842 + // console.log('url+++++>>>>>', url, th.data.teamlist.title);
  843 +
  844 + var share_title=th.data.teamlist.title;
  845 + if(th.data.teamlist.share_title){
  846 + share_title=th.data.teamlist.share_title;
  847 + }
  848 + return {
  849 + path:url,
  850 + title: share_title,
  851 + imageUrl: img,
  852 + }
  853 + },
  854 +
  855 + clickShare() {
  856 + if(!getApp().globalData.user_id){
  857 + getApp().goto("/pages/togoin/togoin");
  858 + return false;
  859 + }
  860 + this.setData({
  861 + share_hidden: true,
  862 + });
  863 + },
  864 +
  865 + send() {
  866 + this.setData({
  867 + share_hidden:false,
  868 + });
  869 + },
  870 +
  871 + cancel() {
  872 + this.setData({
  873 + share_hidden:false,
  874 + });
  875 + },
  876 +
  877 +
  878 + closePoster() {
  879 + this.setData({
  880 + showPoster: false,
  881 + });
  882 + },
  883 +
  884 +
  885 + // 保存图片到手机
  886 + savePic() {
  887 + console.log('保存图片');
  888 + var self = this;
  889 + // 获取用户的当前设置，返回值中有小程序已经向用户请求过的权限
  890 + this.getSetting().then((res) => {
  891 + // 判断用户是否授权了保存到相册的权限，如果没有发起授权
  892 + if (!res.authSetting['scope.writePhotosAlbum']) {
  893 + this.authorize().then(() => {
  894 + // 同意授权后保存下载文件
  895 + this.saveImage(self.data.shareImgPath)
  896 + .then(() => {
  897 + self.setData({
  898 + showPoster: false
  899 + });
  900 + });
  901 + })
  902 + } else {
  903 + // 如果已经授权，保存下载文件
  904 + this.saveImage(self.data.shareImgPath)
  905 + .then(() => {
  906 + self.setData({
  907 + showPoster: false
  908 + });
  909 + });
  910 + }
  911 +
  912 + })
  913 + },
  914 +
  915 +
  916 + // 保存图片到系统相册
  917 + saveImage(saveUrl) {
  918 + var self = this;
  919 + return new Promise((resolve, reject) => {
  920 + wx.saveImageToPhotosAlbum({
  921 + filePath: saveUrl,
  922 + success: (res) => {
  923 + wx.showToast({
  924 + title: '保存成功',
  925 + duration: 1000,
  926 + });
  927 + self.setData({
  928 + showPlaybill: 'true'
  929 + });
  930 + resolve();
  931 + },
  932 + fail: () => {
  933 + wx.showToast({
  934 + title: '保存失败',
  935 + duration: 1000,
  936 + });
  937 + }
  938 + })
  939 + })
  940 + },
  941 +
  942 + // 获取用户已经授予了哪些权限
  943 + getSetting() {
  944 + return new Promise((resolve, reject) => {
  945 + wx.getSetting({
  946 + success: res => {
  947 + resolve(res)
  948 + }
  949 + })
  950 + })
  951 + },
  952 +
  953 + // 发起首次授权请求
  954 + authorize() {
  955 + // isFirst 用来记录是否为首次发起授权，
  956 + // 如果首次授权拒绝后，isFirst赋值为1
  957 + let isFirst = wx.getStorageSync('isFirst') || 0;
  958 + return new Promise((resolve, reject) => {
  959 + wx.authorize({
  960 + scope: 'scope.writePhotosAlbum',
  961 + // 同意授权
  962 + success: () => {
  963 + resolve();
  964 + },
  965 + // 拒绝授权,这里是用户拒绝授权后的回调
  966 + fail: res => {
  967 + if(isFirst === 0) {
  968 + wx.setStorageSync('isFirst', 1);
  969 + wx.showToast({
  970 + title: '保存失败',
  971 + icon: 'none',
  972 + duration: 1000
  973 + })
  974 + } else {
  975 + this.showModal();
  976 + }
  977 + console.log('拒绝授权');
  978 + reject();
  979 + }
  980 + })
  981 + })
  982 + },
  983 +
  984 +
  985 + go_to:function (e) {
  986 + var url=e.currentTarget.dataset.url;
  987 + getApp().goto(url);
  988 + }
  989 +
  990 +})
  991 +
... ...
packageA/pages/serviceCard_pd/team_success/team_success.json 0 → 100644
  View file @a55ffcb
  1 +{
  2 + "windom": {
  3 + "navigationBarTitleText": "拼团订单",
  4 + "backgroundTextStyle": "light",
  5 + "navigationBarTextStyle": "white",
  6 + "navigationBarBackgroundColor": "#ffffff",
  7 + "backgroundColor": "#eeeeee"
  8 + },
  9 + "usingComponents": {
  10 + "share": "/components/share/share"
  11 + }
  12 +}
0 13 \ No newline at end of file
... ...
packageA/pages/serviceCard_pd/team_success/team_success.wxml 0 → 100644
  View file @a55ffcb
  1 +<wxs module="filters" src="../../../../utils/filter.wxs"></wxs>
  2 +<!---- //文字"-->
  3 +<view wx:if="{{is_show}}">
  4 +
  5 + <view class='center' bindtap="go_to" data-url="/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?goods_id={{goods.card_id}}&prom_type=6&prom_id={{teamlist.id}}">
  6 + <view class='cenleft'>
  7 + <image src='{{image}}' binderror='img_show_err' data-err="image"></image>
  8 + </view>
  9 + <view class='cenright'>
  10 + <!----//图片区域---->
  11 + <view class='cenrt'>
  12 + <view class='xc-goods-details ellipsis-2 fs30'>
  13 + {{goods.service_name}}
  14 + </view>
  15 + </view>
  16 + <view class='cenrcen flex-vertical-between'>
  17 + <view>
  18 + <view class="fs40 xc-wc" style='font-size:40rpx'>
  19 + <span class="fs28 xc-rmbs" style="font-weight:500;">￥</span>{{teamlist.price}}</view>
  20 + <view class="fs22 word-line xc-wc" style="width:172rpx;">
  21 + 零售价￥{{goods.show_price}}
  22 + </view>
  23 + </view>
  24 + <view class="xc-wc fs24">
  25 + <view>
  26 + <view class="">已拼{{teamlist.buy_num}}件</view>
  27 + <view class="flex xc-valframe t-c">
  28 + <view class="xc-frame-img">
  29 + <image class="picture" src="{{iurl}}/miniapp/images/bai-ren.png"></image>
  30 + </view>
  31 + <view class="xc-people-val">
  32 + {{teamlist.ct_num}}人拼
  33 + </view>
  34 + </view>
  35 + </view>
  36 + </view>
  37 + </view>
  38 + </view>
  39 + <view class='clear'></view>
  40 + </view>
  41 + <!----以上商品显示完成---->
  42 +
  43 +
  44 + <view class='body'>
  45 + <!-- 阶梯团 -->
  46 + <view class='bodytop' wx:if="{{teamlist.kttype==3&& p_status==1}}">
  47 + 当前价格
  48 + <text class="xc-wc">¥{{ct_price}}</text>,
  49 + <block wx:if="{{max_num-ordertx.length>0}}">
  50 + <text class="xc-wc">还差{{max_num-ordertx.length}}</text>人享受最低价格<text class="xc-wc">￥{{min_price}}</text>
  51 + </block>
  52 + <block wx:else>
  53 + 该团已经拼购到最低价了哦~
  54 + </block>
  55 + </view>
  56 + <!-- 拼团成功 -->
  57 + <view class="xc-ptcomplete-ladder flex-level fs28" wx:if="{{teamlist.kttype==3&&p_status==2}}">
  58 + <view class="xc-wc">拼团成功</view>,当前价格
  59 + <text class="xc-wc">￥{{ct_price}}</text>
  60 + <view class="xc-img-frame oh">
  61 + <image class="img" src="{{iurl}}/miniapp/images/xc_qtcg.png"></image>
  62 + </view>
  63 + </view>
  64 +
  65 + <view style="height: 20rpx" wx:if="{{teamlist.kttype==3&&p_status==4}}"></view>
  66 +
  67 +
  68 + <!-- 阶梯团失败 -->
  69 + <view class=".xc-fail-ladder flex-level fs28" wx:if="{{pay_f==1 || order.pt_status==3}}">
  70 + <view class="xc-wc">拼团失败</view>
  71 + <view class="xc-img-frame oh" >
  72 + <image class="img" src="{{iurl}}/miniapp/images/xc-qtshibai.png"></image>
  73 + </view>
  74 + </view>
  75 +
  76 + <!-- 会员团和商家团 -->
  77 + <view class='bodytop' wx:if="{{(teamlist.kttype==2 || teamlist.kttype==1) && p_status==1}}">
  78 + 还差
  79 + <text class="xc-wc">{{teamlist.ct_num-ordertx.length}}</text>人成团,组团成功为您节省
  80 + <text class="xc-wc">{{filters.toFix(goods.show_price-teamlist.price,2)}}</text>元
  81 + </view>
  82 + <!-- 拼团成功 -->
  83 + <view class="xc-ptcomplete flex-level fs28" wx:if="{{p_status==2 && (teamlist.kttype==2||teamlist.kttype==1)}}">
  84 + <view class="xc-wc">拼团成功</view>,为您节省
  85 + <text class="xc-wc">{{filters.toFix(goods.market_price-teamlist.price,2)}}</text>元
  86 + <view class="xc-img-frame oh">
  87 + <image class="img" src="{{iurl}}/miniapp/images/xc_qtcg.png"></image>
  88 + </view>
  89 + </view>
  90 +
  91 + <!----//// //头像---->
  92 + <view class="flex_tou">
  93 + <view class='bodyimg flex-level'>
  94 + <view class='d' wx:for="{{ordertx2}}" wx:key>
  95 + <image src='{{item.head_pic}}'></image>
  96 + <span wx:if="{{item.is_pt_tz==1}}">团长</span>
  97 + </view>
  98 + <view class='d' wx:for="{{sf_arr}}" wx:if="{{p_status!=2}}">
  99 + <image src='{{iurl}}/miniapp/images/shafa.png'></image>
  100 + </view>
  101 +
  102 + <view class='xc-ellipsis-img flex-vertical' wx:if="{{ordertx.length>5}}">
  103 + <image class="pictures " src="{{iurl}}/miniapp/images/xc_ellipsis.png"></image>
  104 + </view>
  105 + </view>
  106 + </view>
  107 +
  108 + <view class='bodytime'>
  109 + <!----/ //旁边直线---->
  110 + <view class='bodytimeleft'>
  111 + <view class='xian'></view>
  112 + </view>
  113 +
  114 + <!-- 阶梯团 开始-->
  115 + <view class='bodytimecen' wx:if='{{p_status==1}}'>
  116 + 剩余
  117 +
  118 + <span>{{obj.hou}}</span>:
  119 + <span>{{obj.hou}}</span>:
  120 + <span>{{obj.min}}</span>:
  121 + <span>{{obj.sec}}</span>结束
  122 + </view>
  123 +
  124 + <!-- 阶梯团 成功-->
  125 + <view class='bodytimecen-success' wx:if='{{teamlist.kttype==3&&p_status==2 && is_pay_wk!=1}}'>
  126 + 剩余支付时间:
  127 +
  128 + <span>{{obj.hou}}</span>时
  129 + <span>{{obj.min}}</span>分
  130 + <span>{{obj.sec}}</span>秒
  131 + </view>
  132 +
  133 + <view class='bodytimecen-success' wx:if='{{teamlist.kttype==3&&p_status==4 }}'>
  134 + 拼团已结束
  135 + </view>
  136 +
  137 + <!-- </block> -->
  138 + <!-- 阶梯团失败 -->
  139 + <view class='bodytimecen' wx:if='{{p_status==3}}'>
  140 + 还差
  141 + <text class="xc-wc">{{teamlist.ct_num-ordertx.length}}</text>人参团, 拼团失败。
  142 + </view>
  143 + <!-- 会员团 -->
  144 + <view class='bodytimecen' wx:if='{{(teamlist.kttype==1 || teamlist.kttype==2) && p_status==2}}'>
  145 + 已经有
  146 + <text class="xc-wc">{{ordertx.length}}</text>人参团, 拼团成功。
  147 + </view>
  148 +
  149 + <!----//旁边直线---->
  150 + <view class='bodytimeright'>
  151 + <view class='xian'></view>
  152 + </view>
  153 + </view>
  154 +
  155 + <!-- 阶梯团 -->
  156 + <view class='fs30 xc-green' wx:if='{{teamlist.kttype==3&&p_status==2}}'>
  157 + 拼团成功, 规定时间内支付尾款即发货
  158 + </view>
  159 + <view class="xc-wc fs30 t-c xc-onclik" wx:if="{{p_status==1}}">
  160 + 点击下方按钮分享给小伙伴,可快速成团！
  161 + </view>
  162 +
  163 + <!-- <block wx:if="{{pay_f!=1 && order.pt_status<2}}"> -->
  164 + <!----/ // // // //按钮---->
  165 +
  166 + <view wx:if="{{teamlist.kttype==3}}" class='bodybutton'>
  167 + <!-- 阶梯团 -->
  168 + <button wx:if="{{p_status==1}}" bindtap="clickShare" style='background-color:#fab55a; color:#fff'>
  169 + <!-- <button wx:if="{{p_status==1}}" bindtap="clickShare" bindtap='cmeng' style='background-color:#fab55a; color:#fff'> -->
  170 + 邀请好友参团
  171 + </button>
  172 + <button bindtap="go_pay_wk" style='background-color:#42c780;' wx:if="{{order.pt_status==2 && order.is_zsorder==4 }}">
  173 + 支付尾款
  174 + </button>
  175 + </view>
  176 +
  177 + <!--会员团 商家团-->
  178 + <button class="bodybutton" style='background-color:#fab55a; color:#fff' bindtap='clickShare'
  179 + wx:if="{{(teamlist.kttype==2||teamlist.kttype==1)&&p_status==1}}">邀请好友参团</button>
  180 +
  181 + <view class="xc-home-page-frame">
  182 + <button class="xc-home-page" bindtap='gohome'> 返回首页</button>
  183 + </view>
  184 +
  185 + <view class='zspan' hidden="{{hiddenName}}" bindtap='click'>查看拼团列表
  186 + <view class='down-arrow1'></view>
  187 + </view>
  188 +
  189 + </view>
  190 +
  191 + <!---/ // // // // //展开拼团列表---->
  192 + <view class='bodyfoot'>
  193 + <view class='bodyselect' wx:if="{{zk}}" bindtap='czk'>
  194 + <span>查看拼团列表
  195 + <view class='down-arrow'></view>
  196 + </span>
  197 + </view>
  198 +
  199 + <view class='zhangxi' hidden="{{hiddenName}}" wx:for="{{ordertx}}" wx:for-index="ky">
  200 + <view class='img rel'>
  201 + <view class="xc-list" wx:if="{{item.is_pt_tz}}">
  202 + <span>团长</span>
  203 + </view>
  204 + <image src='{{item.head_pic}}'></image>{{item.nickname}}
  205 + </view>
  206 +
  207 + <view class='zssj' wx:if="{{ky==0 &&teamlist.kttype!=1}}">{{item.add_time_date}}
  208 + <text>开团</text>
  209 + </view>
  210 + <view class='zssj' wx:else>{{item.add_time_date}} 参团</view>
  211 + <view class="clear"></view>
  212 + </view>
  213 +
  214 +
  215 + <view class='clear'></view>
  216 + </view>
  217 + <view class='clear'></view>
  218 +
  219 + <!----//大家都在团---->
  220 + <view class='goodslist'>
  221 + <view class='goodslisttop'>
  222 + <!-- 推荐商品 -->
  223 + <view class="flex-center rel xc-linellae-frame">
  224 + <view class="xc-linellae"></view>
  225 + <view class="abs flex-center xc-recommend-frame ">
  226 + <image class=" xc-recommend" src="{{iurl}}/miniapp/images/diamond.png">
  227 + </image>
  228 + <view class="xc-recommend-word">大家都在团</view>
  229 + </view>
  230 + </view>
  231 + <view class='goodslisttopright'></view>
  232 + </view>
  233 + <view class="changxin">
  234 + <view class='onegoods' wx:for="{{pageteam}}" wx:key="{{index}}" bindtap="go_goodsinfo" data-index="{{index}}">
  235 + <view class='onegoodsimg'>
  236 + <image src="{{imageurl+item.share_imgurl}}"></image>
  237 + </view>
  238 + <view class="xc-buttmo-frame">
  239 + <view class='onegoodsdesc '>
  240 +
  241 + <view class='price flex-vertical-between'>
  242 + <view class='jgleft fs32 flex-center xc-wc'>
  243 + <view class="xc-ping xc-wc fs26 t-c">拼</view>
  244 + <text class="fs20"style='height:39rpx;margin-right:5rpx;margin-left:15rpx;' >¥</text>{{item.price}}
  245 + </view>
  246 + <view class='jgright'>{{item.ct_num}}
  247 + <span>人参团</span>
  248 + </view>
  249 + </view>
  250 + </view>
  251 + <view class="xc-shuoming ellipsis-2 fs26">
  252 + <text>{{item.goods_name}}</text>
  253 + </view>
  254 + </view>
  255 + </view>
  256 + </view>
  257 + </view>
  258 +</view>
  259 +
  260 +
  261 +<!--二维码显示页面-->
  262 +<canvas canvas-id='share' style='width:750rpx;height:1217rpx;' wx:if='{{canvasHidden}}'></canvas>
  263 +<!--拼团玩法弹出框-->
  264 +<!----弹起的---->
  265 +<block wx:if="{{pd_xx}}">
  266 + <view class="bview"></view>
  267 + <view class="juzhong">
  268 + <view class="xq">
  269 + <view class="title" bindtap="close_pt_xx">拼团玩法介绍
  270 + <image src="{{iurl}}/miniapp/images/gbi.png" class="close"></image>
  271 + </view>
  272 + <view>1.开团：
  273 + <text class="hs1">选择心仪商品，点击“发起X人团”按钮，付款后即为开团成功；</text>
  274 + </view>
  275 + <view>2.参团：
  276 + <text class="hs1">进入朋友分享的页面，点击“立即参团”按钮，付款后即为参团成功，若多人同时支付，支付成功时间较早的人获得参团资格；</text>
  277 + </view>
  278 + <view>3.成团：
  279 + <text class="hs1">在开团或参团成功后，点击“邀请小伙伴参团”将页面分享给好友，在有效时间内凑齐人数即为成团，此时商家会开始发货；</text>
  280 + </view>
  281 + <view>4.组团失败：
  282 + <text class="hs1">在有效时间内未凑齐人数，即为组团失败，此时付款项会原路退回到支付账户；</text>
  283 + </view>
  284 + <view>5.
  285 + <text class="hs1">组团有效期间内，拼购商品订单不允许取消。 </text>
  286 + </view>
  287 + </view>
  288 + </view>
  289 +</block>
  290 +
  291 +<!-- 分享控件，底部弹出 -->
  292 +<share id="share_button" bind:send="send" bind:cancel="cancel" bind:share_img="saveImageToPhotosAlbum" wx:if="{{share_hidden}}"></share>
  293 +
  294 +<view wx:if="{{showPoster}}">
  295 + <view class="mask" catchtap="closePoster"></view>
  296 + <view class="poster-container">
  297 + <view class="poster-wrapper">
  298 + <view class="poster">
  299 + <image src="{{shareImgPath}}" class="poster-img" show-menu-by-longpress></image>
  300 + <view class="btn-close" catchtap="closePoster"><text class="iconfont icon-close"></text></view>
  301 + </view>
  302 + <view class="btn-container">
  303 + <button class="btn-share" bindtap="savePic">保存到相册</button>
  304 + </view>
  305 + </view>
  306 + </view>
  307 +</view>
  308 +
  309 +
  310 +
... ...
packageA/pages/serviceCard_pd/team_success/team_success.wxss 0 → 100644
  View file @a55ffcb
  1 +page{
  2 + background-color:#eee;
  3 +}
  4 +.top{
  5 + background-color:rgb(216, 230, 220);
  6 + color: rgb(98, 155, 13);
  7 + text-align: center;
  8 + height:120rpx;
  9 + width: 100%;
  10 + padding-top:24rpx;
  11 +}
  12 +
  13 +.center{
  14 + height: 240rpx;
  15 + width: 100%;
  16 + position: relative;
  17 + background:#fff;
  18 +}
  19 +
  20 +.cenleft{
  21 + width: 240rpx;
  22 + height: 100%;
  23 +
  24 + float: left;
  25 + display:flex;
  26 + justify-content: center;
  27 + align-items: center;
  28 +}
  29 +
  30 +.cenleft image{
  31 + background-color:white ;
  32 + width: 200rpx;
  33 + height: 200rpx;
  34 +
  35 +}
  36 +
  37 +
  38 +.cenrt{
  39 + width: 460rpx; margin-top: 10rpx;
  40 +}
  41 +
  42 +.cenright{
  43 + height: 100%;
  44 + width: 460rpx;
  45 +
  46 + float: left;
  47 +}
  48 +
  49 +.cenrtop{
  50 + margin-top: 10rpx;
  51 + background-color: red;
  52 + color: white;
  53 + border-radius:10rpx;
  54 + padding-left: 16rpx;
  55 + width: 140rpx;
  56 + font-size: 32rpx;
  57 + float: left;
  58 + height: 40rpx;
  59 +}
  60 +
  61 +.cenrtoptitle{
  62 + float: left;
  63 + width: 295rpx;
  64 + height: 40rpx;
  65 + margin-left: 12rpx;
  66 + font-size: 28rpx;
  67 + margin-top:12rpx;
  68 +}
  69 +
  70 +.cenrtoptitle>span{
  71 + width: 100%;
  72 + display: inline-block;
  73 + overflow:hidden;
  74 + text-overflow:ellipsis;
  75 + white-space:nowrap
  76 +}
  77 +
  78 +.cenrcen{
  79 + height: 70rpx;
  80 + margin-top: 35rpx;
  81 + width:474rpx;
  82 +}
  83 +.jg{ font-size: 40rpx;
  84 + margin-right: 30rpx;}
  85 +.jgx{
  86 + font-size: 28rpx;
  87 + color: #777;
  88 + text-decoration:line-through;
  89 + margin-left: 20rpx;
  90 +}
  91 +
  92 +.cenrfoot{
  93 + align-content: center;
  94 + text-align: center;
  95 + border: 2rpx solid red;
  96 + border-radius:10rpx;
  97 + color: red;
  98 + float: left;
  99 + font-size: 24rpx;
  100 + padding: 4rpx 16rpx;
  101 +}
  102 +
  103 +.body{
  104 + background-color: white;
  105 + /* min-height:418rpx; */
  106 + width: 100%;
  107 + margin-top: 4rpx;
  108 + border-top:5rpx solid #eee;
  109 + height: auto;
  110 +}
  111 +
  112 +.bodytop{
  113 + background-color: white;
  114 + text-align: center;
  115 + font-size: 28rpx;
  116 + height:100rpx;
  117 + line-height:117rpx;
  118 +
  119 +}
  120 +
  121 +.bodytop span{
  122 + color: red;
  123 +}
  124 +
  125 +
  126 +.bodyimg{
  127 + height:140rpx;
  128 + width:590rpx;
  129 +
  130 +
  131 +
  132 +}
  133 +.bodyimg image{
  134 +
  135 +border-radius:50rpx;
  136 +height: 96rpx;
  137 +width: 96rpx;
  138 +background-color:burlywood;
  139 +margin-top: 30rpx;
  140 + position: absolute;
  141 +
  142 +}
  143 +
  144 +.d{
  145 +width:101rpx;
  146 + height:101rpx;
  147 + display: inline-block;
  148 + margin-right:15rpx;
  149 +
  150 +}
  151 +
  152 +.bodyimg span{
  153 + background-color:#e22b44;
  154 + color: white;
  155 + font-size: 24rpx;
  156 + border-radius:6rpx;
  157 + padding:2rpx 10rpx;
  158 + position: relative;
  159 + top: 0rpx;
  160 + left: 40rpx;
  161 +}
  162 +
  163 +
  164 +
  165 +.bodyspan{
  166 + color: red;
  167 + text-align: center;
  168 + font-size: 26rpx;
  169 +
  170 +}
  171 +
  172 +.bodyselect{
  173 + line-height: 47rpx;
  174 +}
  175 +
  176 +.bodytime{
  177 + height: 88rpx;
  178 + width: 100%;
  179 + display: flex;
  180 + flex-wrap: nowrap;
  181 + margin-left:40rpx;
  182 + align-items:center;
  183 +
  184 +}
  185 +
  186 +.bodytimeleft{
  187 + text-decoration:line-through;
  188 + flex-grow: 1.7;
  189 +}
  190 +
  191 +
  192 +.bodytimecen-success{
  193 + text-align: center;
  194 + flex-grow: 1;
  195 + line-height:75rpx;
  196 + font-size: 30rpx;
  197 + color: #000;
  198 +}
  199 +.bodytimecen-success span{
  200 +
  201 + color: #18ba5f;
  202 + border-radius:7rpx;
  203 + font-size: 30rpx;
  204 + margin: 0 auto;
  205 +
  206 +}
  207 +.bodytimecen{
  208 + text-align: center;
  209 + flex-grow: 1;
  210 +
  211 + font-size: 30rpx;
  212 + color: #000;
  213 +}
  214 +.bodytimecen span{
  215 + background-color: #333333;
  216 + color: white;
  217 + border-radius:7rpx;
  218 + padding-left: 10rpx;
  219 + font-size: 30rpx;
  220 + margin: 0 auto;
  221 + padding-right:10rpx;
  222 + margin-right:5px
  223 +}
  224 +
  225 +
  226 +.bodytimecen span:last-child{
  227 + margin-right: 10rpx;
  228 +}
  229 +
  230 +.bodytimeright{
  231 + flex-grow: 1.7;
  232 + margin-right:72rpx;
  233 +
  234 +}
  235 +
  236 +.bodybutton{
  237 + width: 90%;
  238 + margin: 0 auto;
  239 + text-align: center;
  240 + line-height: 60rpx;
  241 + border-radius:15rpx;
  242 + height: auto;
  243 +}
  244 +
  245 +.bodybutton button{
  246 + height:60rpx;
  247 + width: 100%;
  248 + background-color: #e4374d;
  249 + color: white;
  250 + font-size:26rpx;
  251 + border-radius:12rpx;
  252 +
  253 +}
  254 +
  255 +.bodyfoot{
  256 +
  257 + width: 100%;
  258 + text-align: center;
  259 +
  260 + font-size: 28rpx;
  261 + color: #000;
  262 + background-color: white;
  263 +}
  264 +
  265 +
  266 +
  267 +
  268 +
  269 +.pintuan{
  270 + width: 100%;
  271 + height: 84rpx;
  272 + background-color: white;
  273 + color: black;
  274 + text-align: center;
  275 + font-size:36rpx;
  276 + margin-top: 60rpx;
  277 +}
  278 +
  279 +.pintuanzhou{
  280 +float: left;
  281 +
  282 +line-height: 84rpx;
  283 +width: 220rpx;
  284 +}
  285 +
  286 +.pintuanyou{
  287 + float: right;
  288 + color: rgb(168, 167, 167);
  289 + line-height: 84rpx;
  290 + font-size: 28rpx;
  291 + margin-right: 20rpx;
  292 +}
  293 +
  294 +.onegoods{
  295 + background-color: white;
  296 + width: 345rpx;
  297 + min-height: 490rpx;
  298 + height:auto;
  299 +
  300 + border:2rpx solid #eee;
  301 +
  302 + float: left;
  303 + margin-right:17rpx;
  304 + border-radius:20rpx;
  305 +}
  306 +
  307 +.goodsl{
  308 + background-color: white;
  309 +}
  310 +
  311 +.onegoodsimg{
  312 + width: 100%;
  313 + height: 360rpx;
  314 +}
  315 +
  316 +.onegoodsimg image{
  317 + height: 100%;
  318 + width: 100%;
  319 + border-radius:20rpx 20rpx 0 0;
  320 +
  321 +}
  322 + .xc-buttmo-frame{
  323 + min-height: 103rpx;
  324 + height: auto;
  325 + padding-bottom:15rpx;
  326 +
  327 + }
  328 +.xc-buttmo-frame .onegoodsdesc {
  329 +
  330 + height: 80rpx;
  331 +}
  332 +
  333 +.xc-buttmo-frame .onegoodsdesc .price{
  334 +
  335 + padding-left:10rpx;
  336 + height:85rpx;
  337 +
  338 +}
  339 +.xc-ping{
  340 + border-radius: 50%;
  341 + background: #fff;
  342 + line-height:34rpx;
  343 +width:34rpx;
  344 +height:34rpx;
  345 +font-size:24rpx;
  346 +
  347 +}
  348 +.jgleft{
  349 +border-radius:36rpx;
  350 +height:45rpx;
  351 +line-height:50rpx;
  352 +color:#fff;
  353 +padding-left:7rpx;
  354 +padding-right:24rpx;
  355 +background:#e4374d;
  356 +}
  357 +
  358 +.jgright{
  359 + font-size: 26rpx;
  360 + height:16rpx;
  361 +padding-right:10rpx;
  362 +color:rgb(168, 167, 167);
  363 +}
  364 +
  365 +.jgright span{
  366 + color: rgb(168, 167, 167);
  367 +}
  368 +
  369 +.goodslisttop{
  370 + width: 100%;
  371 +}
  372 +
  373 +.goodslisttop{
  374 + width: 100%;
  375 + margin-top: 5rpx;
  376 + border-bottom: 4rpx solid #eee;
  377 + text-align: center;
  378 +}
  379 +
  380 +.goodslistspan{
  381 +
  382 + margin: 0 auto;
  383 + padding-top: 20rpx;
  384 +}
  385 +
  386 +.xian{
  387 + width: 100%;
  388 + border-bottom: 2rpx solid #eee;
  389 + float: left;
  390 +}
  391 +
  392 +.bodyselect{
  393 + height: 90rpx;
  394 + background-color: white;
  395 + width: 100%;
  396 + line-height:90rpx;
  397 +
  398 +}
  399 +
  400 +
  401 +.changxin{
  402 + overflow: hidden;
  403 + width: 100%;
  404 + padding-left:20rpx;
  405 +
  406 +}
  407 +
  408 +.zhangxi{
  409 + width: 100%;
  410 + background-color:white;
  411 + color: black;
  412 +}
  413 +
  414 +.img{
  415 + height: 100rpx;
  416 + margin-bottom: 0rpx;
  417 + float: left;
  418 + color: black;
  419 + line-height:100rpx;
  420 +display:flex;
  421 +align-items:center;
  422 +
  423 +}
  424 +
  425 +.zhangxi image{
  426 + border-radius:50rpx;
  427 + height: 60rpx;
  428 + width: 60rpx;
  429 + float: left;
  430 +
  431 + background-color: red;
  432 + margin-left: 40rpx;
  433 + margin-right:10rpx;
  434 +
  435 +}
  436 +
  437 +.zhangxi .zssj{
  438 + width: 413rpx;
  439 + margin-left: 28rpx;
  440 + float: right;
  441 + margin-top:32rpx;
  442 +}
  443 +
  444 +.zspan{
  445 + float: left;
  446 + text-align: center;
  447 + display: flex;
  448 + align-items: center;
  449 + justify-content: center;
  450 + height: 48rpx;
  451 + font-size: 28rpx;
  452 + color:#000;
  453 + margin-bottom: 10rpx;
  454 + padding-bottom: 10rpx;
  455 + width: 100%;
  456 + background: #fff;
  457 + border-bottom:3rpx solid #eee;
  458 + margin-top:20rpx;
  459 +
  460 +}
  461 +
  462 +
  463 +
  464 +.mtop{
  465 + text-align: center;
  466 + color: white;
  467 + background-color:rgba(0, 0, 0, .4);
  468 + width: 100%;
  469 + height: 100%;
  470 + position: fixed;
  471 + z-index: 5;top:0;left: 0;
  472 +
  473 +}
  474 +
  475 +.mt1{
  476 + margin-top: 200rpx;
  477 + margin-bottom: 20rpx;
  478 +}
  479 +
  480 +.mts{
  481 + color:#E1E10B;
  482 +}
  483 +
  484 +.mcou{
  485 + font-size: 48rpx;
  486 +
  487 +}
  488 +
  489 +.mfoot{
  490 + width: 100%;
  491 + margin-top: 700rpx;
  492 +}
  493 +
  494 +
  495 +.mbtn{
  496 + margin-top: 60rrpx;
  497 + width: 400rpx;
  498 + background: #666666;
  499 + color: #fff;
  500 + border-radius: 20rpx;
  501 + font-size: 32rpx;
  502 +}
  503 +
  504 +
  505 +
  506 +
  507 +
  508 +
  509 +
  510 +.etop{
  511 + padding-top: 200rpx;
  512 + width: 100%;
  513 + height: 100%;
  514 + position: fixed;
  515 + left: 0rpx;
  516 + top: 0rpx;
  517 + z-index: 12rpx;
  518 +background-color:rgba(0, 0, 0, .4);
  519 +
  520 +}
  521 +
  522 +.emyimage{
  523 + display:flex;
  524 + justify-content: center;
  525 + align-items: center;
  526 +}
  527 +
  528 +
  529 +.emyimage image{
  530 + background-color: red;
  531 + width: 300rpx;
  532 + height: 300rpx;
  533 + margin: 0 auto;
  534 +
  535 +}
  536 +
  537 +.espan{
  538 + font-size: 32rpx;
  539 + margin-top: 10rpx;
  540 +}
  541 +
  542 +.erweima{
  543 + margin-top: 10rpx;
  544 + display: flex;
  545 + width: 100%;
  546 +
  547 +}
  548 +
  549 +.erzhou{
  550 + width: 200rpx;
  551 +
  552 +
  553 + margin-right: 20rpx;
  554 +}
  555 +
  556 +.erzhou image{
  557 + background-color: blanchedalmond;
  558 + width: 200rpx;
  559 + height: 200rpx;
  560 +}
  561 +
  562 +
  563 +.eright{
  564 + width: 500rpx;
  565 + font-size: 32rpx;
  566 +
  567 +}
  568 +
  569 +
  570 +
  571 +.ecc{
  572 + float: right;
  573 + margin-right: 48rpx;
  574 +}
  575 +
  576 +
  577 +.eee{
  578 + padding-top:40rpx;
  579 +
  580 +width:90%;
  581 +height:70%;
  582 +
  583 +padding-left:32rpx;
  584 +margin-left:20rpx;
  585 +
  586 +background-color:white;
  587 +
  588 +}
  589 +
  590 +.clear{
  591 + clear: both;
  592 +}
  593 +
  594 +.down-arrow {
  595 + display: inline-block;
  596 + position: relative;
  597 + width: 40rpx;
  598 + height: 30rpx;
  599 + margin-right: 20rpx;
  600 +}
  601 +
  602 +.down-arrow::after {
  603 + display: inline-block;
  604 + content: " ";
  605 + height: 18rpx;
  606 + width: 18rpx;
  607 + border-width: 0 2rpx 2rpx 0;
  608 + border-color: #000;
  609 + border-style: solid;
  610 + transform: matrix(0.71, 0.71, -0.71, 0.71, 0, 0);
  611 + transform-origin: center;
  612 + transition: transform 0.3s;
  613 + position: absolute;
  614 + top: 50%;
  615 + right: 10rpx;
  616 + margin-top: -10rpx;
  617 +}
  618 +
  619 +.down-arrow1 {
  620 + display: inline-block;
  621 + position: relative;
  622 + width: 40rpx;
  623 + height: 30rpx;
  624 + margin-right: 20rpx;
  625 + margin-top: 12rpx;
  626 +}
  627 +
  628 +.down-arrow1::after {
  629 + display: inline-block;
  630 + content: " ";
  631 + height: 18rpx;
  632 + width: 18rpx;
  633 + border-width: 0 2rpx 2rpx 0;
  634 + border-color: #000;
  635 + border-style: solid;
  636 + transform: matrix(0.71, 0.71, -0.71, 0.71, 0, 0);
  637 + transform-origin: center;
  638 + transition: transform 0.3s;
  639 + position: absolute;
  640 + top: 50%;
  641 + right: 10rpx;
  642 + margin-top: -10rpx;
  643 +}
  644 +
  645 +.down-arrow1::after {
  646 + transform-origin: center;
  647 + transform: rotate(-135deg);
  648 + transition: transform 0.3s;
  649 +}
  650 +
  651 +.bview {
  652 + position: fixed;
  653 + top: 0;
  654 + left: 0;
  655 + width: 100%;
  656 + height: 100%;
  657 + background-color: rgba(0, 0, 0, 0.5);
  658 +}
  659 +
  660 +.juzhong {
  661 + position: fixed;
  662 + top: 0;
  663 + left: 0;
  664 + width: 100%;
  665 + height: 100%;
  666 + display: flex;
  667 + flex-direction: row;
  668 + justify-content: center;
  669 + align-items: center;
  670 +}
  671 +
  672 +.juzhong .xq {
  673 + padding: 0 20rpx;
  674 + background: #fff;
  675 + font-size: 30rpx;
  676 + padding-bottom: 20rpx;
  677 +}
  678 +
  679 +.juzhong .xq .title {
  680 + text-align: center;
  681 + margin: 20rpx 0;
  682 + position: relative;
  683 + height: 50rpx;
  684 +}
  685 +
  686 +.juzhong .xq .hs1 {
  687 + font-size: 28rpx;
  688 + color: #ab8f9e;
  689 +}
  690 +
  691 +.juzhong .xq .title .close {
  692 + position: absolute;
  693 + top: 0;
  694 + right: 0;
  695 + width: 45rpx;
  696 + height: 45rpx;
  697 +}
  698 +
  699 +.pt_qd {
  700 + margin-top: 40rpx;
  701 + height: auto;
  702 +}
  703 +
  704 +.spec-cart-btn.w100 {
  705 + width: 100%;
  706 + margin-left: 0;
  707 + height: 80rpx;
  708 + line-height: 80rpx;
  709 +}
  710 +
  711 +.pt_status_set{
  712 + position: absolute; right: 10rpx; top:50rpx; width: 120rpx; height: 120rpx;
  713 +}
  714 +
  715 +
  716 +
  717 +.xc-goods-details{
  718 +width:479rpx;
  719 +margin-top:20rpx;
  720 +height:77rpx;
  721 +}
  722 +
  723 +.xc-valframe{
  724 + border-radius:7rpx;
  725 +border:1rpx solid;
  726 +margin-top:3rpx;
  727 +}
  728 +.xc-valframe .xc-frame-img{
  729 + width:30rpx;
  730 +height:100%;
  731 +background:#e22b44;
  732 +}
  733 +.xc-valframe .xc-frame-img .picture{
  734 + width:25rpx;
  735 +height:25rpx;
  736 +margin-top:4rpx;
  737 +
  738 +}
  739 +.xc-ellipsis-img{
  740 +width:56rpx;
  741 +height:96rpx;
  742 +
  743 +}
  744 +.xc-ellipsis-img .pictures{
  745 + width:56rpx;height:56rpx;
  746 +}
  747 +.flex_tou{ display: flex; justify-content: center; width: 100%;}
  748 +.xc-ptcomplete{
  749 + width:74%;
  750 +height:105rpx;
  751 +line-height:105rpx;
  752 +float:right;
  753 +
  754 +}
  755 +.xc-ptcomplete .xc-img-frame .img{
  756 + width: 105rpx;
  757 + height: 105rpx;
  758 + float: right;
  759 +}
  760 +.xc-ptcomplete-ladder .xc-img-frame{
  761 + width:201rpx;
  762 + height: 105rpx;
  763 + margin-top:20rpx;
  764 +}
  765 +.xc-ptcomplete-ladder .xc-img-frame .img{
  766 + width: 105rpx;
  767 + height: 105rpx;
  768 + float: right;
  769 + padding-right:6rpx;
  770 +}
  771 +.xc-ptcomplete .xc-img-frame{
  772 + width:190rpx;
  773 + height: 105rpx;
  774 + margin-top:20rpx;
  775 +}
  776 +.xc-ptcomplete .xc-end{
  777 + width:283rpx;
  778 +text-align:right;
  779 +}
  780 +.iw{
  781 +padding-right:33rpx;
  782 +}
  783 +.xc-ptcomplete .xc-img-frames{
  784 + width:360rpx;
  785 +height:105rpx;
  786 +margin-top:20rpx;
  787 +
  788 +}
  789 +.xc-ptcomplete .xc-img-frames .img{
  790 + width: 105rpx;
  791 + height: 105rpx;
  792 + float: right;
  793 + padding-right:6rpx;
  794 +}
  795 +.xc-home-page-frame{
  796 + padding-top:16rpx;
  797 +
  798 +}
  799 +.xc-home-page-frame .xc-home-page{
  800 + background-color: #e22b44;border-radius:15rpx;
  801 +width:90%;
  802 +color:#fff;
  803 +height:60rpx;
  804 +font-size:26rpx;
  805 +line-height:60rpx;
  806 +}
  807 +/* */
  808 +.xc-people-val{
  809 + padding-left:8rpx;
  810 +padding-right:8rpx;
  811 +}
  812 +.xc-onclik{
  813 + width:100%;
  814 +height:70rpx;
  815 +
  816 +}
  817 +.xc-green{
  818 + color: #18ba5f;
  819 + text-align:center;
  820 +flex-grow:1;
  821 +height:90rpx;
  822 +
  823 +
  824 +}
  825 +.xc-ptcomplete-ladder{
  826 + width:74%;
  827 +height:105rpx;
  828 +line-height:105rpx;
  829 +float:right;
  830 +}
  831 +.xc-fail-ladder{
  832 + width:61%;
  833 +height:105rpx;
  834 +line-height:105rpx;
  835 +float:right;
  836 +
  837 +}
  838 +.xc-fail-ladder .xc-img-frame{
  839 + width:61%;
  840 +height:105rpx;
  841 +margin-top:20rpx;
  842 +}
  843 +.xc-fail-ladder .xc-img-frame .img{
  844 + width: 105rpx;
  845 + height: 105rpx;
  846 + float: right;
  847 + padding-right:6rpx;
  848 +}
  849 +.xc-list{
  850 + background-color:#e22b44;
  851 +color:white;
  852 +font-size:17rpx;
  853 +border-radius:6rpx;
  854 +padding:0 5rpx;
  855 +position:absolute;
  856 +top:13rpx;
  857 +left:80rpx;
  858 +width:34rpx;
  859 +line-height:25rpx;
  860 +
  861 +}
  862 +
  863 +.xc-linellae-frame{
  864 + width: 100%;
  865 + height: 60rpx;
  866 + background: #eee;
  867 +}
  868 +.xc-linellae-frame .xc-linellae{
  869 + width: 425rpx;
  870 + height: 1rpx;
  871 + border-bottom: 1rpx solid #a5a5a5;
  872 +}
  873 +.xc-recommend-frame{
  874 +background:#eee;
  875 +width:200rpx;
  876 +height:100%;
  877 +
  878 +}
  879 +.xc-recommend-frame .xc-recommend{
  880 + width: 35rpx;
  881 + height: 27rpx;
  882 + margin-top:7rpx;
  883 +}
  884 +.xc-recommend-frame .xc-recommend-word{
  885 +font-size:26rpx;
  886 +color: #a9a9a9;
  887 +margin-left:5rpx;
  888 +}
  889 +.xc-rmbs{
  890 +
  891 +height:40rpx;
  892 +}
  893 +.xc-shuoming{
  894 + padding-left:10rpx;
  895 +}
  896 +
  897 +
  898 +.poster-container {
  899 + box-sizing: border-box;
  900 + position: fixed;
  901 + top: 50%;
  902 + left: 50%;
  903 + transform: translate(-50%, -50%);
  904 + width: calc(100% - 210rpx);
  905 + z-index: 1000;
  906 +}
  907 +.mask {
  908 + position: fixed;
  909 + top: 0;
  910 + left: 0;
  911 + width: 100%;
  912 + height: 100%;
  913 + z-index: 999;
  914 + background-color: rgba(0,0,0,.4);
  915 +}
  916 +.poster-wrapper {
  917 + width: 100%;
  918 +}
  919 +
  920 +.poster {
  921 + box-sizing: border-box;
  922 + width: 100%;
  923 + height: 905rpx;
  924 + border-radius: 20rpx;
  925 + /* box-shadow: 0 8px 12px #666; */
  926 + position: relative;
  927 + z-index: 999;
  928 + overflow: hidden;
  929 +}
  930 +.poster-img {
  931 + display: block;
  932 + width: 100%;
  933 + height: 100%;
  934 +}
  935 +.btn-container {
  936 + display: flex;
  937 + justify-content: space-around;
  938 +}
  939 +.btn-share {
  940 + display: block;
  941 + background-color: #FE6867;
  942 + color: white;
  943 + border-radius: 8rpx;
  944 + line-height: 80rpx;
  945 + margin-top: 28rpx;
  946 + padding: 0 60rpx;
  947 +}
  948 +
  949 +
  950 +.btn-close {
  951 + /* background-color: rgba(0,0,0,.5); */
  952 + color: #ccc;
  953 + width: 50rpx;
  954 + height: 50rpx;
  955 + line-height: 50rpx;
  956 + text-align: center;
  957 + border-radius: 50%;
  958 + position: absolute;
  959 + right: 20rpx;
  960 + top: 20rpx;
  961 +}
  962 +
  963 +.icon-close {
  964 + font-size: 48rpx;
  965 +}
0 966 \ No newline at end of file
... ...
packageB/pages/zuhegou/index/index.wxss
  View file @a55ffcb
... ... @@ -338,7 +338,7 @@ page {
338 338 }
339 339 /* 门店分类列表 */
340 340 .sort_store_list{
341   - height: 82%;
  341 + max-height: 700rpx;
342 342 overflow: hidden;
343 343 overflow-y: scroll;
344 344 width: 95%;
... ...
packageB/pages/zuhegou/preindex/index.wxss
  View file @a55ffcb
... ... @@ -334,7 +334,7 @@ page {
334 334 }
335 335 /* 门店分类列表 */
336 336 .sort_store_list{
337   - height: 82%;
  337 + max-height: 700rpx;
338 338 overflow: hidden;
339 339 overflow-y: scroll;
340 340 width: 95%;
... ...
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxss
  View file @a55ffcb
... ... @@ -2574,7 +2574,7 @@ line-height: 38rpx;
2574 2574 }
2575 2575 /* 门店分类列表 */
2576 2576 .sort_store_list{
2577   - height: 82%;
  2577 + max-height: 700rpx;
2578 2578 overflow: hidden;
2579 2579 overflow-y: scroll;
2580 2580 width: 95%;
... ...
packageC/pages/presell/goodsInfo/goodsInfo.wxss
  View file @a55ffcb
... ... @@ -2570,7 +2570,7 @@ line-height: 38rpx;
2570 2570 }
2571 2571 /* 门店分类列表 */
2572 2572 .sort_store_list{
2573   - height: 82%;
  2573 + max-height: 700rpx;
2574 2574 overflow: hidden;
2575 2575 overflow-y: scroll;
2576 2576 width: 95%;
... ...
packageC/pages/presell/list/list.js
  View file @a55ffcb
... ... @@ -68,6 +68,14 @@ Page({
68 68 if (room_user_share) getApp().globalData.room_user_share = room_user_share;
69 69 }
70 70  
  71 +
  72 + if(this.data.act_id){
  73 + getApp().promiseGet("/api/weshop/marketing/marketingPresellForm/get/"+os.stoid+"/"+this.data.act_id,{}).then(res=>{
  74 + if(res.data.code==0)
  75 + th.data.pre_act=res.data.data
  76 + })
  77 + }
  78 +
71 79 },
72 80 onShow: function (t) {
73 81 var userInfo=getApp().globalData.userInfo;
... ... @@ -260,8 +268,16 @@ Page({
260 268 }
261 269  
262 270 var url = "/packageC/pages/presell/list/list";
  271 +
  272 + if(this.data.act_id){
  273 + url += "?act_id=" + this.data.act_id;
  274 + }
263 275 if (getApp().globalData.user_id) {
264   - url += "&first_leader=" + getApp().globalData.user_id;
  276 +
  277 + if(url.indexOf("?")==-1)
  278 + url += "?first_leader=" + getApp().globalData.user_id;
  279 + else
  280 + url += "&first_leader=" + getApp().globalData.user_id;
265 281 }
266 282 //-- 如果房间分享，且不是会员分享的 --
267 283 if (getApp().globalData.room_id &&
... ... @@ -271,13 +287,18 @@ Page({
271 287 url += "&room_id=" + getApp().globalData.room_id + "&room_user_share=1";
272 288 }
273 289  
274   - var ob = {
275   - title: "预售列表", path: url,
276   - };
  290 + var ob={};
  291 + if(this.data.pre_act){
  292 + ob = { title: this.data.pre_act.share_title, path: url,imageUrl:os.imghost+this.data.pre_act.share_img };
  293 + }else{
277 294  
278   - if(img){
279   - ob.imageUrl=img;
  295 + ob = { title: "预售列表", path: url, };
  296 + if(img){
  297 + ob.imageUrl=img;
  298 + }
280 299 }
  300 +
  301 +
281 302 return ob;
282 303 }
283 304  
... ...
packageC/pages/presell/pregoodsInfo/goodsInfo.wxss
  View file @a55ffcb
... ... @@ -2570,7 +2570,7 @@ line-height: 38rpx;
2570 2570 }
2571 2571 /* 门店分类列表 */
2572 2572 .sort_store_list{
2573   - height: 82%;
  2573 + max-height: 700rpx;
2574 2574 overflow: hidden;
2575 2575 overflow-y: scroll;
2576 2576 width: 95%;
... ...
pages/cart/cart2/cart2.js
  View file @a55ffcb
... ... @@ -173,7 +173,7 @@ Page({
173 173 is_no_by: {},
174 174 is_by: {},
175 175 send_gf: {},
176   - send_lb:{},
  176 + send_lb: {},
177 177 })
178 178 },
179 179  
... ... @@ -453,7 +453,7 @@ Page({
453 453  
454 454 //要把优惠活动加入,prom_goods_map中,赠品不要运算
455 455 if (item1.prom_type == 3 && item1.is_gift != 1) {
456   - th.check_is_youhui(item1.goods_id, item1.pick_id);
  456 + // th.check_is_youhui(item1.goods_id, item1.pick_id);
457 457 await th.add_prom_goods_map(item1);
458 458 }
459 459  
... ... @@ -916,7 +916,7 @@ Page({
916 916 t.data.data.prom_id = gg.prom_id;
917 917 t.data.data.prom_type = 3;
918 918 //如果是优惠活动，就要调用活动，计算价格
919   - th.check_is_youhui(gg.goods_id,gg.pick_id);
  919 + // th.check_is_youhui(gg.goods_id, gg.pick_id);
920 920 th.buy_now_prom_goods(gg.prom_id, t.data.data, function (data) {
921 921 //判断一下购买商品的数量是不是超过
922 922 if (data.gift_goods_id && (!data.zp_mode || parseInt(data.zp_mode) == 0)) {
... ... @@ -1213,7 +1213,8 @@ Page({
1213 1213 item_map.s_intValue = get_data.intValue;
1214 1214 item_map.s_coupon_id = get_data.coupon_id;
1215 1215 item_map.s_coupon_num = get_data.coupon_num;
1216   -
  1216 + item_map.lbtitle = get_data.lbtitle;
  1217 + item_map.zxlbtitle = get_data.zxlbtitle;
1217 1218  
1218 1219 if (get_data.gift_id && parseInt(get_data.zp_mode) != 1
1219 1220 && get_data.zp_num * item_map.bs <= get_data.limit_num
... ... @@ -1364,22 +1365,22 @@ Page({
1364 1365 if (item_map.s_libao) {
1365 1366 if (!cart_item.s_libao) {
1366 1367 cart_item.s_libao = item_map.s_libao + "";
1367   - cart_item.g_lb_num = [{ 'l_id': item_map.s_libao, "num": item_map.s_lb_num }];
  1368 + cart_item.g_lb_num = [{ 'l_id': item_map.s_libao, "num": item_map.s_lb_num, 'lbtitle': item_map.lbtitle }];
1368 1369 }
1369 1370 else {
1370 1371 cart_item.s_libao += "," + item_map.s_libao;
1371   - cart_item.g_lb_num.push({ 'l_id': item_map.s_libao, "num": item_map.s_lb_num })
  1372 + cart_item.g_lb_num.push({ 'l_id': item_map.s_libao, "num": item_map.s_lb_num, 'lbtitle': item_map.lbtitle })
1372 1373 }
1373 1374 }
1374 1375  
1375 1376 if (item_map.zx_libao) {
1376 1377 if (!cart_item.zx_libao) {
1377 1378 cart_item.zx_libao = item_map.zx_libao + "";
1378   - cart_item.g_zxlb_num = [{ 'l_id': item_map.zx_libao, "num": item_map.zx_lb_num }];
  1379 + cart_item.g_zxlb_num = [{ 'l_id': item_map.zx_libao, "num": item_map.zx_lb_num, 'zxlbtitle': item_map.zxlbtitle }];
1379 1380 }
1380 1381 else {
1381 1382 cart_item.zx_libao += "," + item_map.zx_libao;
1382   - cart_item.g_zxlb_num.push({ 'l_id': item_map.zx_libao, "num": item_map.zx_lb_num })
  1383 + cart_item.g_zxlb_num.push({ 'l_id': item_map.zx_libao, "num": item_map.zx_lb_num, 'zxlbtitle': item_map.zxlbtitle })
1383 1384 }
1384 1385 }
1385 1386 }
... ... @@ -1390,7 +1391,7 @@ Page({
1390 1391 var arr = Object.keys(send_gf);
1391 1392 var arr2 = Object.keys(th.data.send_gf);
1392 1393 if (arr2.length > 0) return false;
1393   -
  1394 + th.calclate_lbNum(c_arr);
1394 1395 if (arr.length > 0) {
1395 1396 th.setData({ send_gf: send_gf })
1396 1397 } else {
... ... @@ -1398,6 +1399,60 @@ Page({
1398 1399 }
1399 1400  
1400 1401 },
  1402 + calclate_lbNum(r_data) {
  1403 + let send_lb = this.data.send_lb;
  1404 + //g_lb_num我的礼包 g_zxlb_num专享礼包
  1405 + r_data.forEach(r_d => {
  1406 + let arr = [];
  1407 + if (r_d.g_zxlb_num) {
  1408 + let g_lb = r_d.g_zxlb_num;
  1409 + for (let i = 0; i < g_lb.length; i++) {
  1410 + let item = g_lb[i];
  1411 + let new_lb = g_lb.filter(lb => {
  1412 + return item.l_id === lb.l_id;
  1413 + });
  1414 + if (new_lb.length == 1) {
  1415 + arr.push(item);
  1416 + } else {
  1417 + item.num = new_lb.reduce((pre, next) => {
  1418 + return pre + next.num;
  1419 + }, 0);
  1420 + arr.push(item);
  1421 + g_lb = g_lb.filter(ii => {
  1422 + return ii.l_id !== item.l_id;
  1423 + });
  1424 + }
  1425 + send_lb[r_d.pickup_id] = arr;
  1426 + }
  1427 + }
  1428 + if (r_d.g_lb_num) {
  1429 + let zx_lb = r_d.g_lb_num;
  1430 + for (let i = 0; i < zx_lb.length; i++) {
  1431 + let item = zx_lb[i];
  1432 + item.flag = 1;
  1433 + let new_lb = zx_lb.filter(lb => {
  1434 + return item.l_id === lb.l_id;
  1435 + });
  1436 + if (new_lb.length == 1) {
  1437 + arr.push(item);
  1438 + } else {
  1439 + item.num = new_lb.reduce((pre, next) => {
  1440 + return pre + next.num;
  1441 + }, 0);
  1442 + arr.push(item);
  1443 + zx_lb = zx_lb.filter(ii => {
  1444 + return ii.l_id !== item.l_id;
  1445 + });
  1446 + }
  1447 + send_lb[r_d.pickup_id] = arr;
  1448 + }
  1449 + }
  1450 + })
  1451 + this.setData({
  1452 + send_lb,
  1453 + })
  1454 +
  1455 + },
1401 1456  
1402 1457 //-------------------计算订单价格-------------------
1403 1458 calculatePrice: function (t, s) {
... ... @@ -4099,7 +4154,8 @@ Page({
4099 4154 }
4100 4155 arr.s_libao = get_data.libao;
4101 4156 arr.s_lb_num = get_data.lb_num;
4102   -
  4157 + arr.lbtitle = get_data.lbtitle;
  4158 + arr.zxlbtitle = get_data.zxlbtitle;
4103 4159 arr.zx_libao = get_data.zxlibao;
4104 4160 arr.zx_lb_num = get_data.zxlb_num;
4105 4161  
... ... @@ -4195,7 +4251,6 @@ Page({
4195 4251 ob.is_xz_yh = prom.is_xz_yh;
4196 4252 ob.goods = new Array();
4197 4253 ob.goods.push({ goods_id: item.goods_id, goods_price: item.goods_price, goods_num: item.goods_num });
4198   -
4199 4254 var obj = {};
4200 4255 obj[item.prom_id] = ob;
4201 4256 map[pickid] = obj;
... ... @@ -4203,87 +4258,78 @@ Page({
4203 4258 }
4204 4259 },
4205 4260 //---检查有没有优惠活动---
4206   - check_is_youhui: function (gid, pick_id) {
4207   - let th = this;
4208   - let user_id = getApp().globalData.user_id;
4209   - let send_lb = th.data.send_lb;
4210   - if (!user_id) user_id = 0;
4211   - //调用接口判断订单优惠，
4212   - getApp().request.get("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + gid + "/0" + "/" + user_id, {
4213   - success: function (res) {
4214   - if (res.data.code == 0 && res.data.data) {
4215   - let r_data = res.data.data.promGoodsLists.filter(lb => {
4216   - return lb.lb_id ?? lb.zxlb_id;
4217   - });
4218   - r_data.forEach(item => {
4219   - if (send_lb[pick_id]) {
4220   - for (let i = 0; i < send_lb[pick_id].length; i++) {
4221   - let sends = send_lb[pick_id][i];
  4261 + check_is_youhui: function (r_data, pick_id) {
  4262 + let send_lb = this.data.send_lb;
  4263 + let lodash = null;
  4264 + r_data.forEach(item => {
  4265 + if (send_lb[pick_id]) {
  4266 + for (let i = 0; i < send_lb[pick_id].length; i++) {
  4267 + let sends = send_lb[pick_id][i];
  4268 + if (item.lb_id) {
  4269 + if (sends.id === item.lb_id) {
  4270 + sends['num']++;
  4271 + } else {
  4272 + let send_arr1 = send_lb[pick_id].filter(ii => ii.id === item.lb_id);
  4273 + if (send_arr1.length == 0) {
4222 4274 if (item.lb_id) {
4223   - if (sends.id === item.lb_id) {
4224   - sends['num']++;
4225   - } else {
4226   - let send_arr1 = send_lb[pick_id].filter(ii=>ii.id === item.lb_id);
4227   - if (send_arr1.length == 0) {
4228   - if (item.lb_id) {
4229   - let ob = {};
4230   - ob.num = 1;
4231   - ob.title = item.lbtitle;
4232   - ob.id = item.lb_id;
4233   - send_lb[pick_id].push(ob);
4234   - break;
4235   - }
4236   - }
4237   -
4238   - }
4239   - }
4240   - if (item.zxlb_id) {
4241   - if (sends.id === item.zxlb_id) {
4242   - sends['num']++;
4243   - } else {
4244   - let send_arr = send_lb[pick_id].filter(ii=>ii.id === item.zxlb_id);
4245   - if (send_arr.length == 0) {
4246   - if (item.zxlb_id) {
4247   - let ob = {};
4248   - ob.num = 1;
4249   - ob.flag = 1;
4250   - ob.title = item.zxlbtitle;
4251   - ob.id = item.zxlb_id;
4252   - send_lb[pick_id].push(ob);
4253   - break;
4254   - }
4255   - }
4256   - }
  4275 + let ob = {};
  4276 + ob.num = 1;
  4277 + ob.title = item.lbtitle;
  4278 + ob.id = item.lb_id;
  4279 + lodash.push(ob);
  4280 + // break;
4257 4281 }
4258 4282 }
4259 4283  
  4284 + }
  4285 + }
  4286 + if (item.zxlb_id) {
  4287 + if (sends.id === item.zxlb_id) {
  4288 + sends['num']++;
4260 4289 } else {
4261   - let arr = new Array();
4262   - if (item.lb_id) {
4263   - let ob = {};
4264   - ob.num = 1;
4265   - ob.title = item.lbtitle;
4266   - ob.id = item.lb_id;
4267   - arr.push(ob);
4268   - }
4269   - if (item.zxlb_id) {
4270   - let ob = {};
4271   - ob.num = 1;
4272   - ob.flag = 1;
4273   - ob.title = item.zxlbtitle;
4274   - ob.id = item.zxlb_id;
4275   - arr.push(ob);
  4290 + let send_arr = send_lb[pick_id].filter(ii => ii.id === item.zxlb_id);
  4291 + if (send_arr.length == 0) {
  4292 + if (item.zxlb_id) {
  4293 + let ob = {};
  4294 + ob.num = 1;
  4295 + ob.flag = 1;
  4296 + ob.title = item.zxlbtitle;
  4297 + ob.id = item.zxlb_id;
  4298 + lodash.push(ob);
  4299 + // break;
  4300 + }
4276 4301 }
4277   - send_lb[pick_id] = arr;
4278 4302 }
4279   - })
4280   - th.setData({
4281   - send_lb,
4282   - })
  4303 + }
  4304 + }
4283 4305  
  4306 + } else {
  4307 + let arr = new Array();
  4308 + if (item.lb_id) {
  4309 + let ob = {};
  4310 + ob.num = 1;
  4311 + ob.title = item.lbtitle;
  4312 + ob.id = item.lb_id;
  4313 + arr.push(ob);
  4314 + }
  4315 + if (item.zxlb_id) {
  4316 + let ob = {};
  4317 + ob.num = 1;
  4318 + ob.flag = 1;
  4319 + ob.title = item.zxlbtitle;
  4320 + ob.id = item.zxlb_id;
  4321 + arr.push(ob);
4284 4322 }
  4323 + send_lb[pick_id] = arr;
  4324 + lodash = JSON.parse(JSON.stringify(send_lb[pick_id]));
4285 4325 }
4286 4326 })
  4327 + send_lb[pick_id] = lodash;
  4328 + th.setData({
  4329 + send_lb,
  4330 + })
  4331 +
  4332 +
4287 4333 },
4288 4334  
4289 4335 //计算立即购买赠品的物流费用
... ...
pages/cart/cart2/cart2.wxml
  View file @a55ffcb
... ... @@ -182,7 +182,7 @@
182 182 <block wx:for="{{send_lb[item.pickup_id]}}" wx:key="id" wx:for-item="send">
183 183 <view class="coupon-mes flex jc_sb" style="margin: 10rpx 0; padding-right: 35rpx" data-id="{{send.id}}" data-flag="{{send.flag}}" bindtap="viewLbDetails">
184 184 <view class="flex ai_c">
185   - <view class="circle1">赠</view>{{send.title}}
  185 + <view class="circle1">赠</view>{{send.zxlbtitle?send.zxlbtitle:send.lbtitle}}
186 186 <!-- <view class="circle1" wx:if="{{item.zxlb_id>0}}">赠</view>{{item.zxlbtitle}} -->
187 187 </view>
188 188 <view class="flex ai_c">
... ... @@ -359,18 +359,28 @@
359 359 </view>
360 360  
361 361 <!-- 有送礼包 -->
362   - <view wx:if="{{send_lb[bn_pick]}}">
363   - <block wx:for="{{send_lb[bn_pick]}}" wx:key="id" wx:for-item="send">
364   - <view class="coupon-mes flex jc_sb" style="margin: 10rpx 0; padding-right: 35rpx" data-id="{{send.id}}" data-flag="{{send.flag}}" bindtap="viewLbDetails">
  362 + <view wx:if="{{bn_goods.s_libao}}">
  363 + <view class="coupon-mes flex jc_sb" style="margin: 10rpx 0; padding-right: 35rpx" data-id="{{bn_goods.s_libao}}" bindtap="viewLbDetails">
365 364 <view class="flex ai_c">
366   - <view class="circle1">赠</view>{{send.title}}
  365 + <view class="circle1">赠</view>{{bn_goods.lbtitle}}
367 366 <!-- <view class="circle1" wx:if="{{item.zxlb_id>0}}">赠</view>{{item.zxlbtitle}} -->
368 367 </view>
369 368 <view class="flex ai_c">
370   - x{{send.num}}<text class="bg_jj"></text>
  369 + x{{bn_goods.s_lb_num}}<text class="bg_jj"></text>
  370 + </view>
  371 + </view>
  372 + </view>
  373 + <!-- 有送专享礼包 -->
  374 + <view wx:if="{{bn_goods.zx_libao}}">
  375 + <view class="coupon-mes flex jc_sb" style="margin: 10rpx 0; padding-right: 35rpx" data-id="{{bn_goods.zx_libao}}" data-flag="1" bindtap="viewLbDetails">
  376 + <view class="flex ai_c">
  377 + <view class="circle1">赠</view>{{bn_goods.zxlbtitle}}
  378 + <!-- <view class="circle1" wx:if="{{item.zxlb_id>0}}">赠</view>{{item.zxlbtitle}} -->
  379 + </view>
  380 + <view class="flex ai_c">
  381 + x{{bn_goods.zx_lb_num}}<text class="bg_jj"></text>
371 382 </view>
372 383 </view>
373   - </block>
374 384 </view>
375 385  
376 386  
... ...
pages/giftpack/buygiftpack/giftpackbuy.wxml
  View file @a55ffcb
  1 +<wxs module="filter" src="../../../utils/filter.wxs"></wxs>
1 2 <view class="top_img" style="background-color: {{ad_data?ad_data.bgcolor:'rgb(250, 120, 88)'}};">
2 3 <block wx:if="{{ad_data}}">
3 4 <view class="top_img">
... ... @@ -20,7 +21,7 @@
20 21 <a class="top_title_blacktext" bindtap="redirectTo" data-url="/pages/giftpack/mygiftpack/mygiftpack">我的礼包</a>
21 22 </view>
22 23 </view>
23   - <block wx:for="{{wareCard}}" wx:for-item="items" wx:for-index="index" wx:key="index">
  24 + <block wx:for="{{wareCard}}" wx:if="{{now > filter.gettimestamp(items.starTime) || (items.is_show && now > items.show_time)}}" wx:for-item="items" wx:for-index="index" wx:key="index">
24 25 <view class="content_box">
25 26 <view class="content_box_ware" bindtap="navigateTo" data-url="/pages/giftpack/giftpacklist/giftpacklist?isBuy=1&lbId={{items.lbId}}&orderSn=''">
26 27 <view class="content_box_img">
... ... @@ -48,8 +49,11 @@
48 49 <view class="content_ware_price">
49 50 <text class="ellipsis-1">{{"零售价:￥"+items.giftPosPrice}}</text>
50 51 </view>
51   - <view class="content_ware_time">
52   - <text class="ellipsis-1">{{"活动结束时间:"+items.endTime}}</text>
  52 + <view wx:if="{{items.is_show && now < filter.gettimestamp(items.starTime)}}" class="content_ware_time">
  53 + <text class="ellipsis-1">{{"活动开始时间："+items.starTime}}</text>
  54 + </view>
  55 + <view wx:else class="content_ware_time">
  56 + <text class="ellipsis-1">{{"活动结束时间："+items.endTime}}</text>
53 57 </view>
54 58 </view>
55 59 </view>
... ... @@ -57,7 +61,7 @@
57 61 <view class="box_button_remark">
58 62 <text>{{"已售:"+items.giftQty+"件"}}</text>
59 63 </view>
60   - <block wx:if="{{now > item.starTime}}">
  64 + <block wx:if="{{now > filter.gettimestamp(items.starTime)}}">
61 65 <view class="flex-vertical">
62 66 <block wx:if="{{items.payMoney>0 && items.payIntegral>0}}">
63 67 <block wx:if="{{items.payMoney>0}}">
... ... @@ -91,8 +95,8 @@
91 95 </view>
92 96 </block>
93 97 <block wx:else>
94   - <view class="flex-vertical">
95   - <view >活动还未开始</view>
  98 + <view class="flex-vertical" style="color: #666;">
  99 + <button class="box_button_dui box_button_buy" style="background-color: #666;">活动还未开始</button>
96 100 </view>
97 101 </block>
98 102 </view>
... ...
pages/giftpack/public/buy_com.js
  View file @a55ffcb
... ... @@ -227,7 +227,7 @@ module.exports = {
227 227 json.guide_id=that.data.guide_id
228 228 }
229 229  
230   - if(that.data.def_pick_store){
  230 + if(th.data.sele_g.is_pickup && that.data.def_pick_store){
231 231 json.pickup_id=that.data.def_pick_store.pickup_id;
232 232 }
233 233  
... ...
pages/goods/goodsInfo/goodsInfo.wxss
  View file @a55ffcb
... ... @@ -3447,7 +3447,7 @@ margin: auto; */
3447 3447  
3448 3448 /* 门店分类列表 */
3449 3449 .sort_store_list {
3450   - height: 82%;
  3450 + max-height: 700rpx;
3451 3451 overflow: hidden;
3452 3452 overflow-y: scroll;
3453 3453 width: 95%;
... ...
pages/index/index/index.wxss
  View file @a55ffcb
... ... @@ -1028,7 +1028,7 @@ page {
1028 1028  
1029 1029  
1030 1030 .container.nor{
1031   - padding-top: 80rpx;
  1031 + padding-top: 140rpx;
1032 1032 }
1033 1033  
1034 1034 /* page,
... ...
pages/team/team_show/team_show.wxss
  View file @a55ffcb
... ... @@ -2178,7 +2178,7 @@ page {
2178 2178  
2179 2179  
2180 2180 .sort_store_list{
2181   - height: 82%;
  2181 + max-height: 700rpx;
2182 2182 overflow: hidden;
2183 2183 overflow-y: scroll;
2184 2184 width: 95%;
... ...
pages/user/index/filter.wxs
  View file @a55ffcb
... ... @@ -8,7 +8,7 @@ var is_close = function (name,c_list) {
8 8 map['我的权益']="5";
9 9 map['联系客服']="6";
10 10 map['收藏夹']="7";
11   - map['附近门店']="8";
  11 + map['我的地址']="8";
12 12 map['收入卡包']="9";
13 13 map['专享礼包']="10";
14 14 map['我的服务']="12";
... ... @@ -19,6 +19,7 @@ var is_close = function (name,c_list) {
19 19 map['幸运大转盘']="17";
20 20 map['幸运购']="18";
21 21 map['AI测肤']="20";
  22 + map['附近门店']="21";
22 23 var index=map[name];
23 24  
24 25 //我的权益要判断5，和11
... ...
pages/user/userinfo/userinfo.wxss
  View file @a55ffcb
... ... @@ -529,7 +529,7 @@ input {
529 529 /* 门店分类列表 */
530 530  
531 531 .sort_store_list {
532   - height: 82%;
  532 + max-height: 700rpx;
533 533 overflow: hidden;
534 534 overflow-y: scroll;
535 535 width: 95%;
... ...
utils/filter.wxs
  View file @a55ffcb
... ... @@ -10,6 +10,13 @@ var filters = {
10 10 if (!val) return "不限";
11 11 return val.replace("00:00:00", "");
12 12 },
  13 + gettimestamp: function (date) {
  14 + console.log(date);
  15 + var timestamp = getDate(date).getTime();
  16 + console.log(timestamp);
  17 + timestamp = parseInt(timestamp / 1000)
  18 + return timestamp;
  19 + },
13 20  
14 21 replace_time2: function (val) {
15 22 if (val == null || val == undefined || val == '') return "";
... ... @@ -278,5 +285,6 @@ module.exports = {
278 285 JSONStringify: filters.JSONStringify,
279 286 count: filters.count,
280 287 isExpired: filters.isExpired,
  288 + gettimestamp: filters.gettimestamp,
281 289 showStartAndEndDate: filters.showStartAndEndDate,
282 290 }
283 291 \ No newline at end of file
... ...