miniprogram / shengxian · 提交

转到一个项目

作者 王旭宇
提交 e12f1a0cd32afd0062b2a857c8d7b3a5ecbc7d76 1 个父辈 5dae2e36

realfinish

内嵌 并排对比
正在显示 20 个修改的文件 包含 1085 行增加 和 756 行删除

要显示太多修改。
重新载入完整差异 差异文件 邮件补丁

为保证性能只显示 20 of 20+ 个文件。

@@ -69,7 +69,8 @@ @@ -69,7 +69,8 @@
69 "pages/index/goodsDetials/goodsDetials", 69 "pages/index/goodsDetials/goodsDetials",
70 "pages/navigate/navigate", 70 "pages/navigate/navigate",
71 "pages/index/user_comment_detail/user_comment_detail", 71 "pages/index/user_comment_detail/user_comment_detail",
72 - "pages/my/paySuccess/paySuccess" 72 + "pages/my/paySuccess/paySuccess",
  73 + "pages/my/shenqingshouhou/shengqingshouhou"
73 ], 74 ],
74 "window": { 75 "window": {
75 "backgroundTextStyle": "dark", 76 "backgroundTextStyle": "dark",
@@ -275,6 +275,11 @@ input, textarea { @@ -275,6 +275,11 @@ input, textarea {
275 background-color: #ffda44; 275 background-color: #ffda44;
276 box-shadow: 5rpx 0px 5rpx rgba(248, 207, 38, 0.3); 276 box-shadow: 5rpx 0px 5rpx rgba(248, 207, 38, 0.3);
277 } 277 }
  278 +.icon-gouwuches {
  279 + font-size: 29rpx;
  280 + color: #444;
  281 +
  282 +}
278 283
279 /* 头部信息 */ 284 /* 头部信息 */
280 285
@@ -354,6 +359,9 @@ input, textarea { @@ -354,6 +359,9 @@ input, textarea {
354 .icon-gouwuche:before { 359 .icon-gouwuche:before {
355 content: "\e6be"; 360 content: "\e6be";
356 } 361 }
  362 +.icon-gouwuches:before {
  363 + content: "\e6be";
  364 +}
357 365
358 .icon-cuowu:before { 366 .icon-cuowu:before {
359 content: "\e657"; 367 content: "\e657";
@@ -25,7 +25,8 @@ Page({ @@ -25,7 +25,8 @@ Page({
25 chuandi: 0, 25 chuandi: 0,
26 chuandis: 0, 26 chuandis: 0,
27 xuanzhong: true, 27 xuanzhong: true,
28 - shengyu: 0 28 + shengyu: 0,
  29 + freeprice: null,
29 }, 30 },
30 //跳转至详情页 31 //跳转至详情页
31 goDetail(e) { 32 goDetail(e) {
@@ -174,9 +175,7 @@ Page({ @@ -174,9 +175,7 @@ Page({
174 that.setData({ 175 that.setData({
175 all_both_choose: all_both_choose, 176 all_both_choose: all_both_choose,
176 }) 177 })
177 - console.log(all_both_choose + "前")  
178 - this.totalPrice();  
179 - console.log(all_both_choose+"后") 178 + // this.totalPrice();
180 }, 179 },
181 //fetchUser 180 //fetchUser
182 fetchUser() { 181 fetchUser() {
@@ -187,7 +186,7 @@ Page({ @@ -187,7 +186,7 @@ Page({
187 this.setData({ 186 this.setData({
188 is_vip: r.data.user.is_vip 187 is_vip: r.data.user.is_vip
189 }) 188 })
190 - this.fetchCartList(); 189 + this.fetchCartList();
191 this.amount(); 190 this.amount();
192 } 191 }
193 }) 192 })
@@ -225,17 +224,17 @@ Page({ @@ -225,17 +224,17 @@ Page({
225 r.data.promotion.forEach(function(ele, index) { 224 r.data.promotion.forEach(function(ele, index) {
226 ele.chooseAll=true 225 ele.chooseAll=true
227 for (let v in ele.list) { 226 for (let v in ele.list) {
228 - ele.list[v].t = false 227 + ele.list[v].flag = true
229 if (vip == 1) { 228 if (vip == 1) {
230 var price = ele.list[v].vip_price 229 var price = ele.list[v].vip_price
231 price = price.substring(0, price.length - 3) * 1 230 price = price.substring(0, price.length - 3) * 1
232 ele.list[v].goods_price = ele.list[v].number * price 231 ele.list[v].goods_price = ele.list[v].number * price
233 } else { 232 } else {
234 var price = ele.list[v].price 233 var price = ele.list[v].price
235 - price = price.substring(0, price.length - 3) * 1 234 + // price = price.substring(0, price.length - 3) * 1
236 ele.list[v].goods_price = ele.list[v].number * price 235 ele.list[v].goods_price = ele.list[v].number * price
237 } 236 }
238 - totalPrice += ele.list[v].goods_price 237 + totalPrice += ele.list[v].price
239 } 238 }
240 }) 239 })
241 chuandis = totalPrice 240 chuandis = totalPrice
@@ -244,9 +243,11 @@ Page({ @@ -244,9 +243,11 @@ Page({
244 } else { 243 } else {
245 shipprice = r.data.shipment.price 244 shipprice = r.data.shipment.price
246 } 245 }
247 - var ship_balance = that.data.shipment.free * 1 - totalPrice  
248 - if (ship_balance <= 0) {  
249 - shipprice = 0 246 + var ship_balance = r.data.shipment.free * 1 - totalPrice
  247 + if (ship_balance <= 0) {
  248 + var shipprices = 0
  249 + }else{
  250 + var shipprices = ship_balance
250 } 251 }
251 chuandi = totalPrice * 1 + shipprice * 1 252 chuandi = totalPrice * 1 + shipprice * 1
252 that.setData({ 253 that.setData({
@@ -256,12 +257,15 @@ Page({ @@ -256,12 +257,15 @@ Page({
256 number: number, 257 number: number,
257 shipment: r.data.shipment, 258 shipment: r.data.shipment,
258 shipPrice: r.data.shipment.price, 259 shipPrice: r.data.shipment.price,
  260 + freeprice:r.data.shipment.free,
259 shengyu: r.data.minimum_price, 261 shengyu: r.data.minimum_price,
260 - totalPrice: totalPrice, 262 + totalPrice: chuandi,
261 chuandi:chuandi, 263 chuandi:chuandi,
262 - chuandis:chuandis 264 + chuandis:chuandis,
  265 + ship_balance:shipprices
263 }); 266 });
264 }); 267 });
  268 + that.totalPrice()
265 }, 269 },
266 //每个商品总价 270 //每个商品总价
267 amount() { 271 amount() {
@@ -284,15 +288,15 @@ Page({ @@ -284,15 +288,15 @@ Page({
284 }) 288 })
285 promotion.forEach(function(ele, index) { 289 promotion.forEach(function(ele, index) {
286 for (let v in ele.list) { 290 for (let v in ele.list) {
287 - if (vip == 1) {  
288 - var price = ele.list[v].vip_price  
289 - price = price.substring(0, price.length - 3) * 1  
290 - ele.list[v].goods_price = ele.list[v].number * price  
291 - } else {  
292 - var price = ele.list[v].price  
293 - price = price.substring(0, price.length - 3) * 1  
294 - ele.list[v].goods_price = ele.list[v].number * price  
295 - } 291 + // if (vip == 1) {
  292 + // var price = ele.list[v].vip_price
  293 + // price = price.substring(0, price.length - 3) * 1
  294 + // ele.list[v].goods_price = ele.list[v].number * price
  295 + // } else {
  296 + // var price = ele.list[v].price
  297 + // price = price.substring(0, price.length - 3) * 1
  298 + // ele.list[v].goods_price = ele.list[v].number * price
  299 + // }
296 } 300 }
297 }) 301 })
298 }, 302 },
@@ -323,30 +327,33 @@ Page({ @@ -323,30 +327,33 @@ Page({
323 promotion.forEach(function(ele, index) { 327 promotion.forEach(function(ele, index) {
324 for (var i in ele.list) { 328 for (var i in ele.list) {
325 if (ele.list[i].flag) { 329 if (ele.list[i].flag) {
326 - if (that.data.is_vip == 1) {  
327 - str_price = ele.list[i].vip_price;  
328 - } else { 330 + // if (that.data.is_vip == 1) {
  331 + // str_price = ele.list[i].vip_price;
  332 + // } else {
329 str_price = ele.list[i].price; 333 str_price = ele.list[i].price;
330 - }  
331 - str_price = str_price.substring(0, str_price.length - 3);  
332 - str_price = str_price * 1 * ele.list[i].number  
333 - price2 = price2 + str_price; 334 + // }
  335 + // str_price = str_price.substring(0, str_price.length - 3);
  336 + // str_price = str_price * 1 * ele.list[i].number
  337 + str_price = ele.list[i].price*ele.list[i].number
  338 + // price2 = price2 + str_price;
  339 + price2 += ele.list[i].price * ele.list[i].number
334 } 340 }
335 } 341 }
336 }); 342 });
337 price3 = price + price2; 343 price3 = price + price2;
338 - if (price3 > that.data.shipment.free) { 344 + if (price3 >= that.data.freeprice) {
339 shipPrice = 0 345 shipPrice = 0
340 } else { 346 } else {
341 - shipPrice = this.data.shipment.price 347 + shipPrice = this.data.shipPrice
342 } 348 }
343 - var ship_balance = that.data.shipment.free * 1 - price3 349 + var ship_balance = that.data.freeprice * 1 - price3
344 if (ship_balance <= 0) { 350 if (ship_balance <= 0) {
345 ship_balance = 0 351 ship_balance = 0
  352 + }else{
  353 + ship_balance = ship_balance
346 } 354 }
347 let price4 = price3 355 let price4 = price3
348 let price5 = price3 * 1 + shipPrice * 1 356 let price5 = price3 * 1 + shipPrice * 1
349 - // console.log(price5+"嗯嗯嗯")  
350 that.setData({ 357 that.setData({
351 totalPrice: price5, 358 totalPrice: price5,
352 chuandi: price5, 359 chuandi: price5,
@@ -394,13 +401,19 @@ Page({ @@ -394,13 +401,19 @@ Page({
394 title: '删除成功', 401 title: '删除成功',
395 icon: 'none' 402 icon: 'none'
396 }) 403 })
397 - this.totalPrice();  
398 - this.fetchCartList();  
399 - // this.choose();  
400 - // this.choose2();  
401 - let a = this.data.shipment.free 404 + this.fetchCartList();
  405 + this.totalPrice();
  406 + console.log(this.data.totalPrice+'啊呀呦')
  407 + console.log(this.data.shipment.free + '啊呀呦')
  408 + let b = 0
  409 + let a = this.data.shipment.free - this.data.totalPrice
  410 + if(a<0){
  411 + b = 0
  412 + }else{
  413 + b = a
  414 + }
402 this.setData({ 415 this.setData({
403 - ship_balance: a, 416 + ship_balance: b,
404 all_both_choose: false, 417 all_both_choose: false,
405 totalPrice: 0 418 totalPrice: 0
406 }) 419 })
@@ -420,14 +433,13 @@ Page({ @@ -420,14 +433,13 @@ Page({
420 */ 433 */
421 onLoad: function(options) { 434 onLoad: function(options) {
422 this.fetchUser(); 435 this.fetchUser();
423 - this.allBothChooses()  
424 - console.log(this.data.all_both_choose + "zhong") 436 + console.log(this.data.shipment)
425 }, 437 },
426 // 再逛逛 438 // 再逛逛
427 get_return() { 439 get_return() {
428 - wx.switchTab({  
429 - url: '../../pages/index/index'  
430 - }); 440 + wx.switchTab({
  441 + url: '../index/index',
  442 + })
431 }, 443 },
432 //购物车结算 444 //购物车结算
433 settleAccountGoods() { 445 settleAccountGoods() {
@@ -908,12 +920,13 @@ Page({ @@ -908,12 +920,13 @@ Page({
908 */ 920 */
909 onShow: function() { 921 onShow: function() {
910 let a=this.data.shipment.free 922 let a=this.data.shipment.free
911 - this.fetchCartList(); 923 + this.fetchUser();
  924 +
912 this.setData({ 925 this.setData({
913 // chooseAll: false, 926 // chooseAll: false,
914 // chooseAll2: false, 927 // chooseAll2: false,
915 totalPrice: 0, 928 totalPrice: 0,
916 - // all_both_choose: false, 929 + all_both_choose: true,
917 ship_balance:a 930 ship_balance:a
918 }) 931 })
919 this.fetchCartNum() 932 this.fetchCartNum()
@@ -9,12 +9,12 @@ @@ -9,12 +9,12 @@
9 <view class='left'> 9 <view class='left'>
10 <view class='note'>提示</view>满{{listlist.shipment.free}}元包邮,还差{{ship_balance}}包邮 10 <view class='note'>提示</view>满{{listlist.shipment.free}}元包邮,还差{{ship_balance}}包邮
11 </view> 11 </view>
12 - <view class='right' catchtap='get_return'>再逛逛 12 + <view class='right' bindtap='get_return'>再逛逛
13 <icon class='iconfont icon-icondayu'></icon> 13 <icon class='iconfont icon-icondayu'></icon>
14 </view> 14 </view>
15 </view> 15 </view>
16 <!-- 商品列表 --> 16 <!-- 商品列表 -->
17 - <view class='da'> 17 + <view class='da'>
18 <view class='product_list' wx:if='{{goodsList.length>0||promotion.length>0}}'> 18 <view class='product_list' wx:if='{{goodsList.length>0||promotion.length>0}}'>
19 <view class='singlepart' wx:for='{{goodsList}}' wx:for-item='cell' wx:for-index='cellindex' wx:key='{{cellindex}}'> 19 <view class='singlepart' wx:for='{{goodsList}}' wx:for-item='cell' wx:for-index='cellindex' wx:key='{{cellindex}}'>
20 <view class='single_part_top'> 20 <view class='single_part_top'>
@@ -66,7 +66,7 @@ @@ -66,7 +66,7 @@
66 </view> --> 66 </view> -->
67 </view> 67 </view>
68 <view class='single_part_items'> 68 <view class='single_part_items'>
69 - <view class='single_part_item' wx:for='{{cell.list}}' wx:key='*this' wx:for-index='index' wx:for-item='value'> 69 + <view class='single_part_item' wx:for='{{cell.list}}' wx:key='{{index}}' wx:for-index='index' wx:for-item='value'>
70 <view class='iconfont icon-weixuanzhong {{value.flag?"active":""}}' catchtap='choose2' data-cell='{{cellindex}}' data-id='{{value.id}}' data-flag='{{value.flag}}' data-index='{{index}}'></view> 70 <view class='iconfont icon-weixuanzhong {{value.flag?"active":""}}' catchtap='choose2' data-cell='{{cellindex}}' data-id='{{value.id}}' data-flag='{{value.flag}}' data-index='{{index}}'></view>
71 <view class='single_part_imgbox'> 71 <view class='single_part_imgbox'>
72 <image src='{{value.more.thumbnail}}' mode='widthFix'></image> 72 <image src='{{value.more.thumbnail}}' mode='widthFix'></image>
@@ -76,7 +76,7 @@ @@ -76,7 +76,7 @@
76 <view class='product_type'>{{value.sku_values}}</view> 76 <view class='product_type'>{{value.sku_values}}</view>
77 <view class='product_action'> 77 <view class='product_action'>
78 <view class='price'>￥ 78 <view class='price'>￥
79 - <text class='detail_price'>{{value.goods_price}}</text> 79 + <text class='detail_price'>{{value.price}}</text>
80 </view> 80 </view>
81 <!-- <view class='action_box'> 81 <!-- <view class='action_box'>
82 <view class='short action_btn' catchtap='dec2' data-number='{{value.number}}' data-index='{{index}}' data-cellindex='{{cellindex}}'>-</view> 82 <view class='short action_btn' catchtap='dec2' data-number='{{value.number}}' data-index='{{index}}' data-cellindex='{{cellindex}}'>-</view>
@@ -108,7 +108,7 @@ @@ -108,7 +108,7 @@
108 <text class='detail_price'>{{totalPrice}} </text> 108 <text class='detail_price'>{{totalPrice}} </text>
109 </view> 109 </view>
110 </view> 110 </view>
111 - <view class='fee'> 111 + <view class='fee' wx:if='{{ship_balance>0}}'>
112 含运费{{shipPrice}}元 112 含运费{{shipPrice}}元
113 </view> 113 </view>
114 </view> 114 </view>
@@ -6,10 +6,19 @@ page{ @@ -6,10 +6,19 @@ page{
6 width: 100%; 6 width: 100%;
7 height: 100%; 7 height: 100%;
8 } 8 }
  9 +::-webkit-scrollbar{
  10 + display: none
  11 +}
  12 +.icon-icondayu{
  13 + color: #000!important;
  14 + font-weight: 500!important
  15 +}
9 .page{ 16 .page{
10 width: 100%; 17 width: 100%;
11 height: 100%; 18 height: 100%;
12 overflow-x: hidden; 19 overflow-x: hidden;
  20 + padding-bottom: 100rpx;
  21 + box-sizing: border-box
13 } 22 }
14 .da{ 23 .da{
15 width: 100%; 24 width: 100%;
@@ -22,7 +31,10 @@ page{ @@ -22,7 +31,10 @@ page{
22 line-height: 500rpx; 31 line-height: 500rpx;
23 color: #888; 32 color: #888;
24 font-size: 32rpx; 33 font-size: 32rpx;
25 - position: relative; 34 + position: absolute;
  35 + top: 50%;
  36 + left: 50%;
  37 + transform: translate(-50%,-50%)
26 } 38 }
27 .gogogo image{ 39 .gogogo image{
28 height: 247rpx; 40 height: 247rpx;
@@ -45,10 +57,10 @@ page{ @@ -45,10 +57,10 @@ page{
45 top: 50% 57 top: 50%
46 } 58 }
47 .cart_box{ 59 .cart_box{
48 - height: calc(100% - 100rpx);  
49 flex: 1; 60 flex: 1;
50 display: flex; 61 display: flex;
51 flex-flow: column; 62 flex-flow: column;
  63 + /* height: calc(100% - 100rpx) */
52 } 64 }
53 .top_label { 65 .top_label {
54 height: 85rpx; 66 height: 85rpx;
@@ -80,12 +92,17 @@ page{ @@ -80,12 +92,17 @@ page{
80 font-size: 24rpx; 92 font-size: 24rpx;
81 padding: 0 40rpx; 93 padding: 0 40rpx;
82 } 94 }
  95 +
83 .left,.right,icon{ 96 .left,.right,icon{
84 display: flex; 97 display: flex;
85 align-items: center; 98 align-items: center;
86 justify-content: center; 99 justify-content: center;
87 color: #222; 100 color: #222;
88 } 101 }
  102 +.right{
  103 + width: 150rpx;
  104 + height: 100%;
  105 +}
89 .note{ 106 .note{
90 height: 32rpx; 107 height: 32rpx;
91 border-radius: 16rpx; 108 border-radius: 16rpx;
@@ -226,6 +243,7 @@ page{ @@ -226,6 +243,7 @@ page{
226 display: flex; 243 display: flex;
227 font-size: 26rpx; 244 font-size: 26rpx;
228 color: #888; 245 color: #888;
  246 + line-height: 100rpx
229 } 247 }
230 .choose .iconfont { 248 .choose .iconfont {
231 margin-right: 24rpx; 249 margin-right: 24rpx;
@@ -146,10 +146,10 @@ @@ -146,10 +146,10 @@
146 </view> 146 </view>
147 </view> 147 </view>
148 </view> 148 </view>
149 - <view class='bottom_btn'> 149 + <view class='bottom_btn' wx:if='{{!showMore}}'>
150 <view class='hint_btn'> 150 <view class='hint_btn'>
151 <view class='shop_car' bindtap='get_car'> 151 <view class='shop_car' bindtap='get_car'>
152 - <view class='iconfont icon-gouwuche'></view> 152 + <view class='iconfont icon-gouwuches'></view>
153 <view>购物车</view> 153 <view>购物车</view>
154 <view class='cart_count'>{{goods.cartCount}}</view> 154 <view class='cart_count'>{{goods.cartCount}}</view>
155 </view> 155 </view>
@@ -74,12 +74,15 @@ page { @@ -74,12 +74,15 @@ page {
74 74
75 .banner_box { 75 .banner_box {
76 position: relative; 76 position: relative;
  77 + width: 100%;
  78 + height: 710rpx;
  79 + padding-top: 80rpx;
  80 + box-sizing: border-box;
77 } 81 }
78 82
79 .banner_img { 83 .banner_img {
  84 + width: 100%;
80 height: 630rpx; 85 height: 630rpx;
81 - padding-top: 80rpx;  
82 - box-sizing: border-box;  
83 } 86 }
84 87
85 .banner_img image { 88 .banner_img image {
@@ -711,7 +714,7 @@ page { @@ -711,7 +714,7 @@ page {
711 .cart_count { 714 .cart_count {
712 position: absolute; 715 position: absolute;
713 right: 2rpx; 716 right: 2rpx;
714 - top: 0; 717 + top: -2rpx;
715 width: 24rpx; 718 width: 24rpx;
716 height: 24rpx; 719 height: 24rpx;
717 border-radius: 50%; 720 border-radius: 50%;
@@ -1141,7 +1144,7 @@ page { @@ -1141,7 +1144,7 @@ page {
1141 1144
1142 .replace_dishes_center { 1145 .replace_dishes_center {
1143 display: flex; 1146 display: flex;
1144 - /* align-items: center */ 1147 + align-items: center
1145 } 1148 }
1146 1149
1147 .replace_image { 1150 .replace_image {
@@ -1149,6 +1152,9 @@ page { @@ -1149,6 +1152,9 @@ page {
1149 height: 29rpx; 1152 height: 29rpx;
1150 margin-right: 18rpx; 1153 margin-right: 18rpx;
1151 margin-top: -14rpx; 1154 margin-top: -14rpx;
  1155 + display: flex;
  1156 + align-items: center;
  1157 + justify-content: center
1152 } 1158 }
1153 1159
1154 .replace_image image { 1160 .replace_image image {
@@ -50,6 +50,13 @@ Page({ @@ -50,6 +50,13 @@ Page({
50 string:'', 50 string:'',
51 gggPrice: null 51 gggPrice: null
52 }, 52 },
  53 + //进入评论详情
  54 + go_comment_detail(e){
  55 + var id = e.currentTarget.dataset.id
  56 + wx.navigateTo({
  57 + url: '../user_comment_detail/user_comment_detail?id='+id,
  58 + })
  59 + },
53 //进入基本参数 60 //进入基本参数
54 jumpBasicInfo() { 61 jumpBasicInfo() {
55 this.setData({ 62 this.setData({
@@ -22,7 +22,7 @@ @@ -22,7 +22,7 @@
22 <view wx:else class='banner_box_group '> 22 <view wx:else class='banner_box_group '>
23 距离团购 23 距离团购
24 <text wx:if='{{goods.groupType.group_status==1}}'>开始\t\t\t</text> 24 <text wx:if='{{goods.groupType.group_status==1}}'>开始\t\t\t</text>
25 - <text wx:elif='{{goods.groupType.group_status==2}}'>结束\t\t\t</text> {{day}}天{{hour}}小时{{minute}}分钟 25 + <text wx:elif='{{goods.groupType.group_status==2}}'>结束\t\t\t</text> {{day}}天{{hour}}时{{minute}}分
26 </view> 26 </view>
27 </view> 27 </view>
28 <!-- </view> --> 28 <!-- </view> -->
@@ -39,8 +39,8 @@ @@ -39,8 +39,8 @@
39 <view class='item_list '> 39 <view class='item_list '>
40 <view class='banner_title '>{{goods.info.title}}</view> 40 <view class='banner_title '>{{goods.info.title}}</view>
41 <view class='introduce '>{{goods.info.excerpt}}</view> 41 <view class='introduce '>{{goods.info.excerpt}}</view>
42 - <view wx:if='{{groupList.length>0}}'>  
43 - <view class='good_price_progress ' wx:if='{{goods.groupType.group_status==2}} '> 42 + <view>
  43 + <view class='good_price_progress ' wx:if='{{goods.groupType.group_status==2}}'>
44 <progress show-info border-radius='4 ' activeColor='#ffda44 ' stroke-width='8 ' percent='{{percent}} ' font-size='12 '></progress> 44 <progress show-info border-radius='4 ' activeColor='#ffda44 ' stroke-width='8 ' percent='{{percent}} ' font-size='12 '></progress>
45 <text class='group_font '>已拼{{goods.info.group_number}}份\t\t\t\t目标{{goods.info.group_min_number}}份</text> 45 <text class='group_font '>已拼{{goods.info.group_number}}份\t\t\t\t目标{{goods.info.group_min_number}}份</text>
46 </view> 46 </view>
@@ -136,7 +136,7 @@ @@ -136,7 +136,7 @@
136 <view class='iconfont icon-jinru icon-jinrus'></view> 136 <view class='iconfont icon-jinru icon-jinrus'></view>
137 </view> 137 </view>
138 </view> 138 </view>
139 - <view class='user_information_box' wx:for='{{comment}}' wx:for-index='index' wx:key='{{index}}'> 139 + <view class='user_information_box' wx:for='{{comment}}' wx:for-index='index' wx:key='{{index}}' data-id='{{item.id}}' catchtap='go_comment_detail'>
140 <view class='user_information'> 140 <view class='user_information'>
141 <view class='the_star'> 141 <view class='the_star'>
142 <view class='head_portrait'> 142 <view class='head_portrait'>
@@ -168,7 +168,7 @@ @@ -168,7 +168,7 @@
168 </view> 168 </view>
169 </view> 169 </view>
170 </view> 170 </view>
171 - <view class='comments_btn'> 171 + <view class='comments_btn' data-id='{{item.id}}' catchtap='go_comment_detail'>
172 <view class='iconfont icon-message'></view> 172 <view class='iconfont icon-message'></view>
173 <view class='comments'>评论</view> 173 <view class='comments'>评论</view>
174 </view> 174 </view>
@@ -176,7 +176,7 @@ @@ -176,7 +176,7 @@
176 </view> 176 </view>
177 <view class='item_list3' wx:if='{{goods.promotion.length>0}}'> 177 <view class='item_list3' wx:if='{{goods.promotion.length>0}}'>
178 <view class='package_title'>购买含本商品套餐更优惠</view> 178 <view class='package_title'>购买含本商品套餐更优惠</view>
179 - <view class='package_box' bindtap='jump_goodsDetial2' data-id='{{item.promotion_id}}' wx:for='{{goods.promotion}}' wx:key='{{item.id}}'> 179 + <view class='package_box' bindtap='jump_goodsDetial2' data-id='{{item.id}}' wx:for='{{goods.promotion}}' wx:key='{{item.id}}'>
180 <view class='package_img_box'> 180 <view class='package_img_box'>
181 <view class='package_img'> 181 <view class='package_img'>
182 <image src='{{item.thumbnail}}'></image> 182 <image src='{{item.thumbnail}}'></image>
@@ -284,9 +284,11 @@ @@ -284,9 +284,11 @@
284 <view class='hint_btn'> 284 <view class='hint_btn'>
285 <view> 285 <view>
286 <navigator class='shop_car' url='../../cart/cart' open-type="switchTab"> 286 <navigator class='shop_car' url='../../cart/cart' open-type="switchTab">
287 - <view class='iconfont icon-gouwuche'></view>  
288 - <view>购物车</view> 287 + <!-- <view class='iconfont icon-gouwuche'></view>
  288 + <view class='gouwuche'>购物车</view> -->
289 <view class='cart_count'>{{goods.cartCount}}</view> 289 <view class='cart_count'>{{goods.cartCount}}</view>
  290 + <view class='iconfont icon-gouwuches'></view>
  291 + <view class='shop_car'>购物车</view>
290 </navigator> 292 </navigator>
291 </view> 293 </view>
292 <view bindtap='collection' bindtap='collection_true' data-id='{{goods.info.id}}'> 294 <view bindtap='collection' bindtap='collection_true' data-id='{{goods.info.id}}'>
@@ -8,6 +8,20 @@ page { @@ -8,6 +8,20 @@ page {
8 text{ 8 text{
9 height: 0!important 9 height: 0!important
10 } 10 }
  11 +.icon-gouwuche{
  12 + font-size: 29rpx;
  13 + color: #444;
  14 + background: transparent!important;
  15 + box-shadow: 0 0 0 0 transparent!important;
  16 + line-height: 30rpx!important;
  17 + border-radius: 0!important
  18 +}
  19 +.gouwuche{
  20 + position: absolute;
  21 + bottom: 0;
  22 + /* left: 50%; */
  23 + /* transform: translateX(-50%) */
  24 +}
11 .big_box { 25 .big_box {
12 width: 100%; 26 width: 100%;
13 height: 100%; 27 height: 100%;
@@ -71,12 +85,13 @@ text{ @@ -71,12 +85,13 @@ text{
71 } 85 }
72 .banner_box{ 86 .banner_box{
73 position: relative; 87 position: relative;
74 - 88 + width: 750rpx;
  89 + height: 710rpx;
  90 + padding-top: 80rpx;
  91 + box-sizing: border-box;
75 } 92 }
76 .banner_img { 93 .banner_img {
77 height: 630rpx; 94 height: 630rpx;
78 - padding-top: 80rpx;  
79 - box-sizing: border-box;  
80 } 95 }
81 96
82 .banner_img image { 97 .banner_img image {
@@ -791,11 +806,16 @@ white-space: nowrap; @@ -791,11 +806,16 @@ white-space: nowrap;
791 color: #747b7d; 806 color: #747b7d;
792 position: relative; 807 position: relative;
793 } 808 }
  809 +.shop_cars{
  810 + width: 60rpx;
  811 + height: 58rpx;
  812 + position: relative;
  813 +}
794 814
795 .cart_count { 815 .cart_count {
796 position: absolute; 816 position: absolute;
797 right: 2rpx; 817 right: 2rpx;
798 - top: 0; 818 + top: -4rpx;
799 width: 24rpx; 819 width: 24rpx;
800 height: 24rpx; 820 height: 24rpx;
801 border-radius: 50%; 821 border-radius: 50%;
@@ -23,7 +23,9 @@ Page({ @@ -23,7 +23,9 @@ Page({
23 is_vip: 0, 23 is_vip: 0,
24 prices: 0, 24 prices: 0,
25 origin: 0, 25 origin: 0,
26 - originIndex: 0 26 + originIndex: 0,
  27 + jine: 0,
  28 + jiesheng: 0,
27 }, 29 },
28 //渲染购物车 30 //渲染购物车
29 fetchCart() { 31 fetchCart() {
@@ -142,7 +144,11 @@ Page({ @@ -142,7 +144,11 @@ Page({
142 } else { 144 } else {
143 console.log(total_price + "总价") 145 console.log(total_price + "总价")
144 wx.navigateTo({ 146 wx.navigateTo({
145 - url: '../../my/settle_account/settle_account?sale=' + skuid_arr + '&proId=' + this.data.info.id + '&gPrice=' + total_price 147 + url: '../../my/settle_account/settle_account?sale=' + skuid_arr + '&proId=' + this.data.info.id + '&gPrice=' + this.data.jine
  148 + })
  149 + that.setData({
  150 + jine: 0,
  151 + jiesheng:0
146 }) 152 })
147 } 153 }
148 }, 154 },
@@ -283,6 +289,9 @@ Page({ @@ -283,6 +289,9 @@ Page({
283 var that = this; 289 var that = this;
284 var goodsList = that.data.goodsList 290 var goodsList = that.data.goodsList
285 var chooseAll = that.data.chooseAll 291 var chooseAll = that.data.chooseAll
  292 + var jine = 0
  293 + var jiesheng = 0
  294 + var is_vip = that.data.is_vip
286 if(chooseAll){ 295 if(chooseAll){
287 chooseAll = false 296 chooseAll = false
288 }else{ 297 }else{
@@ -291,13 +300,24 @@ Page({ @@ -291,13 +300,24 @@ Page({
291 goodsList.forEach(function(ele, index) { 300 goodsList.forEach(function(ele, index) {
292 if (chooseAll) { 301 if (chooseAll) {
293 ele.t = true 302 ele.t = true
  303 + if(is_vip==1){
  304 + jine += ele.vip_priceq
  305 + }else{
  306 + jine += ele.priceq
  307 + }
  308 + jiesheng += ele.save_priceq
294 } else { 309 } else {
295 ele.t = false 310 ele.t = false
  311 + jine = 0
  312 + jiesheng = 0
296 } 313 }
297 }); 314 });
  315 + jine = jine - jiesheng
298 that.setData({ 316 that.setData({
299 goodsList: goodsList, 317 goodsList: goodsList,
300 - chooseAll: chooseAll 318 + chooseAll: chooseAll,
  319 + jine: jine,
  320 + jiesheng: jiesheng
301 }); 321 });
302 }, 322 },
303 //选中商品 323 //选中商品
@@ -307,18 +327,43 @@ Page({ @@ -307,18 +327,43 @@ Page({
307 var indexs = e.currentTarget.dataset.index; 327 var indexs = e.currentTarget.dataset.index;
308 var goodsList = this.data.goodsList 328 var goodsList = this.data.goodsList
309 var chooseAll = false 329 var chooseAll = false
  330 + var jiesheng = that.data.jiesheng
  331 + var jine = that.data.jine
310 goodsList.forEach(function(ele, index) { 332 goodsList.forEach(function(ele, index) {
  333 + ele.saveprice = ele.save_price.substring(0, ele.save_price.length - 3)*1
  334 + ele.vipprice = ele.vip_price.substring(0, ele.vip_price.length - 3) * 1
  335 + ele.ppprice = ele.price.substring(0, ele.price.length - 3) * 1
  336 + ele.daprice = null
  337 + if(that.data.is_vip==1){
  338 + ele.daprice = ele.vipprice
  339 + } else {
  340 + ele.daprice = ele.ppprice
  341 + }
  342 + // if(ele.t){
  343 + // jine += ele.daprice - ele.save_price
  344 + // }
  345 + // that.setData({
  346 + // jine:jine
  347 + // })
311 if (index == indexs) { 348 if (index == indexs) {
312 if (ele.t) { 349 if (ele.t) {
313 - ele.t = false 350 + ele.t = false
  351 + jine -= (ele.daprice - ele.save_price)
  352 + jiesheng -= ele.saveprice
314 } else { 353 } else {
315 - ele.t = true  
316 - } 354 + ele.t = true
  355 + jiesheng += ele.saveprice
  356 + jine += (ele.daprice - ele.saveprice)
  357 + }
  358 + that.setData({
  359 + jine: jine,
  360 + jiesheng: jiesheng
  361 + })
317 } 362 }
318 }) 363 })
319 that.setData({ 364 that.setData({
320 goodsList: goodsList, 365 goodsList: goodsList,
321 - chooseAll: chooseAll 366 + chooseAll: chooseAll,
322 }); 367 });
323 }, 368 },
324 //加入购物车 369 //加入购物车
@@ -375,7 +420,9 @@ Page({ @@ -375,7 +420,9 @@ Page({
375 } 420 }
376 that.setData({ 421 that.setData({
377 goodsList: goodsList, 422 goodsList: goodsList,
378 - chooseAll:false 423 + chooseAll:false,
  424 + jine: 0,
  425 + jiesheng:0
379 }) 426 })
380 that.fetchCart() 427 that.fetchCart()
381 } else { 428 } else {
@@ -397,6 +444,14 @@ Page({ @@ -397,6 +444,14 @@ Page({
397 } 444 }
398 app.post(url, params).then(r => { 445 app.post(url, params).then(r => {
399 r.data.list.forEach(function (ele, index) { 446 r.data.list.forEach(function (ele, index) {
  447 + ele.priceq = ele.price.substring(0, ele.price.length - 3) * 1
  448 + ele.vip_priceq = ele.vip_price.substring(0, ele.vip_price.length - 3) * 1
  449 + ele.save_priceq = ele.save_price.substring(0, ele.save_price.length - 3) * 1
  450 + if(is_vip==1){
  451 + ele.showjine = ele.vip_priceq - ele.save_priceq
  452 + }else{
  453 + ele.showjine = ele.priceq - ele.save_priceq
  454 + }
400 ele.attprice = ele.price 455 ele.attprice = ele.price
401 ele.attvipprice=ele.vip_price 456 ele.attvipprice=ele.vip_price
402 ele.t = false 457 ele.t = false
@@ -26,7 +26,7 @@ @@ -26,7 +26,7 @@
26 </view> 26 </view>
27 </view> 27 </view>
28 <view class='product_list'> 28 <view class='product_list'>
29 - <view class='singlepart'> 29 + <view class='singlepart'>
30 <view class='single_part_top'> 30 <view class='single_part_top'>
31 <view class='single_part_left'> 31 <view class='single_part_left'>
32 <view class='iconfont icon-weixuanzhong single_part_left_icon {{chooseAll?"active":""}}' bindtap='chooseAll'></view> 32 <view class='iconfont icon-weixuanzhong single_part_left_icon {{chooseAll?"active":""}}' bindtap='chooseAll'></view>
@@ -49,7 +49,7 @@ @@ -49,7 +49,7 @@
49 <view class='product_action'> 49 <view class='product_action'>
50 <view class='price'>￥ 50 <view class='price'>￥
51 <!-- <view> --> 51 <!-- <view> -->
52 - <text class='detail_price' wx:if='{{value.ggprice}}'>{{value.ggprice}}</text> 52 + <text class='detail_price' wx:if='{{value.ggprice}}'>{{value.showjine}}</text>
53 <text wx:else class='detail_price'>{{value.new_price}}</text> 53 <text wx:else class='detail_price'>{{value.new_price}}</text>
54 <!-- </view> --> 54 <!-- </view> -->
55 <text class='save_after'>已省</text> 55 <text class='save_after'>已省</text>
@@ -66,15 +66,12 @@ @@ -66,15 +66,12 @@
66 66
67 <view class='bottom_btn'> 67 <view class='bottom_btn'>
68 <view class='hint_btn'> 68 <view class='hint_btn'>
69 - <navigator class='shop_car' url='../../cart/cart' open-type='switchTab'>  
70 - <view class='iconfont icon-gouwuche'></view>  
71 - <view>购物车</view>  
72 - <view class='cart_count'>{{cart_count}}</view>  
73 - </navigator>  
74 - <view>  
75 - <view class='iconfont '></view><!-- icon-shoucang {{goods.is_favorite==1||shoucang?"active":""}} -->  
76 - <view class='shop_car {{info.is_favorite==1||shoucang?"active":""}}'></view>  
77 - </view> 69 + <view class='shangmianbyn'>
  70 + <view class='shangmianbyi'>套餐价</view>
  71 + <view class='shangmianber'>￥</view>
  72 + <view class='shangmianbsan'>{{jine}}</view>
  73 + </view>
  74 + <view class='yisheng'>已省￥{{jiesheng}}</view>
78 </view> 75 </view>
79 <view class='join_btn' bindtap='join_btn'>加入购物车</view> 76 <view class='join_btn' bindtap='join_btn'>加入购物车</view>
80 <view class='immediately_btn' bindtap='go_pay_sale'>立即购买</view> 77 <view class='immediately_btn' bindtap='go_pay_sale'>立即购买</view>
1 /* pages/index/goodsDetial/goodsDetial.wxss */ 1 /* pages/index/goodsDetial/goodsDetial.wxss */
2 2
3 page { 3 page {
4 - background: #f3f5f5;  
5 - width: 100%;  
6 - height: 100% 4 + background: #f3f5f5;
  5 + width: 100%;
  6 + height: 100%;
7 } 7 }
8 -.page{  
9 - width: 100%;  
10 - height: 100% 8 +
  9 +.page {
  10 + width: 100%;
  11 + height: 100%;
11 } 12 }
12 -.page.active{  
13 - overflow: hidden 13 +
  14 +.page.active {
  15 + overflow: hidden;
14 } 16 }
  17 +
15 .coupons { 18 .coupons {
16 - font-size: 30rpx;  
17 - color: #222;  
18 - display: flex; 19 + font-size: 30rpx;
  20 + color: #222;
  21 + display: flex;
19 } 22 }
  23 +
20 .icon-shoucang.active { 24 .icon-shoucang.active {
21 - color: #ff6700; 25 + color: #ff6700;
22 } 26 }
  27 +
23 .goods_detail { 28 .goods_detail {
24 - font-weight: bold;  
25 - border-bottom: 3rpx solid #ffda44; 29 + font-weight: bold;
  30 + border-bottom: 3rpx solid #ffda44;
26 } 31 }
27 32
28 .graphic_detail { 33 .graphic_detail {
29 - font-weight: bold;  
30 - margin-left: 56rpx; 34 + font-weight: bold;
  35 + margin-left: 56rpx;
31 } 36 }
32 37
33 .share { 38 .share {
34 - font-size: 28rpx;  
35 - color: #222; 39 + font-size: 28rpx;
  40 + color: #222;
36 } 41 }
37 42
38 .banner_box { 43 .banner_box {
39 - width: 100%;  
40 - height: 630rpx;  
41 - display: flex;  
42 - flex-wrap: wrap; 44 + width: 100%;
  45 + height: 630rpx;
  46 + display: flex;
  47 + flex-wrap: wrap;
43 } 48 }
44 -.banner_box image{  
45 - width: 100%;  
46 - height: 100% 49 +
  50 +.banner_box image {
  51 + width: 100%;
  52 + height: 100%;
47 } 53 }
48 54
49 .banner_img { 55 .banner_img {
50 - width: 50%;  
51 - height: 315rpx; 56 + width: 50%;
  57 + height: 315rpx;
52 } 58 }
53 59
54 .banner_img image { 60 .banner_img image {
55 - width: 100%;  
56 - height: 100%; 61 + width: 100%;
  62 + height: 100%;
57 } 63 }
58 64
59 .item_list { 65 .item_list {
60 - padding: 32rpx 25rpx;  
61 - background-color: #fff;  
62 - margin-bottom: 20rpx; 66 + padding: 32rpx 25rpx;
  67 + background-color: #fff;
  68 + margin-bottom: 20rpx;
63 } 69 }
64 70
65 .banner_title { 71 .banner_title {
66 - font-size: 34rpx;  
67 - color: #222; 72 + font-size: 34rpx;
  73 + color: #222;
68 } 74 }
69 75
70 .introduce { 76 .introduce {
71 - font-size: 28rpx;  
72 - color: #888; 77 + font-size: 28rpx;
  78 + color: #888;
73 } 79 }
  80 +
74 .share { 81 .share {
75 - font-size: 28rpx;  
76 - color: #222; 82 + font-size: 28rpx;
  83 + color: #222;
77 } 84 }
78 85
79 .share_btn { 86 .share_btn {
80 - background: transparent;  
81 - padding: 0;  
82 - margin: 0;  
83 - border: 0 !important;  
84 - color: #222;  
85 - font-size: 28rpx;  
86 - margin-top: 10rpx; 87 + background: transparent;
  88 + padding: 0;
  89 + margin: 0;
  90 + border: 0 !important;
  91 + color: #222;
  92 + font-size: 28rpx;
  93 + margin-top: 10rpx;
87 } 94 }
  95 +
88 .banner_character { 96 .banner_character {
89 - height: 100rpx;  
90 - display: flex;  
91 - justify-content: space-between;  
92 - align-items: center;  
93 - font-size: 24rpx;  
94 - color: #888;  
95 - margin-top: 16rpx; 97 + height: 100rpx;
  98 + display: flex;
  99 + justify-content: space-between;
  100 + align-items: center;
  101 + font-size: 24rpx;
  102 + color: #888;
  103 + margin-top: 16rpx;
96 } 104 }
97 105
98 .banner_price { 106 .banner_price {
99 - display: flex;  
100 - align-items: center;  
101 - /* padding-bottom:20rpx; */  
102 - box-sizing: border-box 107 + display: flex;
  108 + align-items: center;
  109 + /* padding-bottom:20rpx; */
  110 + box-sizing: border-box;
103 } 111 }
104 112
105 .money_icon { 113 .money_icon {
106 - font-size: 22rpx;  
107 - color: #222; 114 + font-size: 22rpx;
  115 + color: #222;
108 } 116 }
109 117
110 .money { 118 .money {
111 - font-size: 38rpx;  
112 - font-weight: bold;  
113 - color: #222; 119 + font-size: 38rpx;
  120 + font-weight: bold;
  121 + color: #222;
114 } 122 }
115 123
116 .original_price { 124 .original_price {
117 - color: #888;  
118 - text-decoration: line-through; 125 + color: #888;
  126 + text-decoration: line-through;
119 } 127 }
120 128
121 .display_box { 129 .display_box {
122 - margin-left: 40rpx; 130 + margin-left: 40rpx;
123 } 131 }
124 132
125 .money_icon2 { 133 .money_icon2 {
126 - font-size: 22rpx;  
127 - color: #f44; 134 + font-size: 22rpx;
  135 + color: #f44;
128 } 136 }
129 137
130 .money2 { 138 .money2 {
131 - font-size: 38rpx;  
132 - font-weight: bold;  
133 - color: #f44; 139 + font-size: 38rpx;
  140 + font-weight: bold;
  141 + color: #f44;
134 } 142 }
135 143
136 .vip { 144 .vip {
137 - color: #fff;  
138 - background-color: #f44;  
139 - margin-left: 5rpx; 145 + color: #fff;
  146 + background-color: #f44;
  147 + margin-left: 5rpx;
140 } 148 }
141 149
142 .list_content { 150 .list_content {
143 - display: flex;  
144 - justify-content: space-between;  
145 - align-items: center; 151 + display: flex;
  152 + justify-content: space-between;
  153 + align-items: center;
146 } 154 }
147 155
148 .content_title { 156 .content_title {
149 - display: flex; 157 + display: flex;
150 } 158 }
151 159
152 .title { 160 .title {
153 - font-size: 24rpx;  
154 - color: #888; 161 + font-size: 24rpx;
  162 + color: #888;
155 } 163 }
156 164
157 .content { 165 .content {
158 - font-size: 24rpx;  
159 - color: #222;  
160 - margin-left: 47rpx; 166 + font-size: 24rpx;
  167 + color: #222;
  168 + margin-left: 47rpx;
161 } 169 }
162 170
163 .icon-jinru { 171 .icon-jinru {
164 - font-size: 22rpx;  
165 - color: #c7c7c7; 172 + font-size: 22rpx;
  173 + color: #c7c7c7;
166 } 174 }
167 175
168 .more_box { 176 .more_box {
169 - font-size: 24rpx;  
170 - color: #949a9a;  
171 - border-top: 1rpx solid #ededed;  
172 - display: flex;  
173 - justify-content: center;  
174 - align-items: center;  
175 - padding-top: 24rpx;  
176 - margin-top: 35rpx; 177 + font-size: 24rpx;
  178 + color: #949a9a;
  179 + border-top: 1rpx solid #ededed;
  180 + display: flex;
  181 + justify-content: center;
  182 + align-items: center;
  183 + padding-top: 24rpx;
  184 + margin-top: 35rpx;
177 } 185 }
178 186
179 .icon-zhankai { 187 .icon-zhankai {
180 - font-size: 14rpx;  
181 - margin-left: 10rpx; 188 + font-size: 14rpx;
  189 + margin-left: 10rpx;
182 } 190 }
183 191
184 .item_list1 { 192 .item_list1 {
185 - background-color: #fff;  
186 - margin-bottom: 20rpx;  
187 - display: flex;  
188 - justify-content: space-between;  
189 - align-items: center;  
190 - padding: 19rpx 16rpx 0; 193 + background-color: #fff;
  194 + margin-bottom: 20rpx;
  195 + display: flex;
  196 + justify-content: space-between;
  197 + align-items: center;
  198 + padding: 19rpx 16rpx 0;
191 } 199 }
192 200
193 .hint1 { 201 .hint1 {
194 - font-size: 22rpx;  
195 - color: #222;  
196 - background-color: #fafafa;  
197 - border-radius: 12rpx;  
198 - padding: 25rpx 39rpx; 202 + font-size: 22rpx;
  203 + color: #222;
  204 + background-color: #fafafa;
  205 + border-radius: 12rpx;
  206 + padding: 25rpx 39rpx;
199 } 207 }
200 208
201 .cash_back { 209 .cash_back {
202 - font-size: 28rpx;  
203 - font-weight: bold;  
204 - color: #222; 210 + font-size: 28rpx;
  211 + font-weight: bold;
  212 + color: #222;
205 } 213 }
206 214
207 .red_font { 215 .red_font {
208 - font-weight: bold;  
209 - color: #f44; 216 + font-weight: bold;
  217 + color: #f44;
210 } 218 }
211 219
212 .attribute { 220 .attribute {
213 - width: 375rpx;  
214 - display: flex;  
215 - align-items: center;  
216 - /* margin-left: 49rpx; */ 221 + width: 375rpx;
  222 + display: flex;
  223 + align-items: center;
  224 + /* margin-left: 49rpx; */
217 } 225 }
218 226
219 .attribute_titel { 227 .attribute_titel {
220 - font-size: 26rpx;  
221 - color: #94999a; 228 + font-size: 26rpx;
  229 + color: #94999a;
222 } 230 }
223 231
224 .stars { 232 .stars {
225 - display: flex;  
226 - font-size: 26rpx;  
227 - color: #222;  
228 - margin-left: 35rpx; 233 + display: flex;
  234 + font-size: 26rpx;
  235 + color: #222;
  236 + margin-left: 35rpx;
229 } 237 }
230 238
231 .icon-pingfen { 239 .icon-pingfen {
232 - font-size: 26rpx;  
233 - color: #222; 240 + font-size: 26rpx;
  241 + color: #222;
234 } 242 }
235 243
236 .attribute_content { 244 .attribute_content {
237 - font-size: 26rpx;  
238 - color: #222;  
239 - margin-left: 113rpx; 245 + font-size: 26rpx;
  246 + color: #222;
  247 + margin-left: 113rpx;
240 } 248 }
241 249
242 .item_list2, .item_list3, .item_list4, .itme_list5, .item_list6 { 250 .item_list2, .item_list3, .item_list4, .itme_list5, .item_list6 {
243 - background-color: #fff;  
244 - margin-bottom: 20rpx; 251 + background-color: #fff;
  252 + margin-bottom: 20rpx;
245 } 253 }
246 254
247 .user_evaluation { 255 .user_evaluation {
248 - display: flex;  
249 - justify-content: space-between;  
250 - align-items: center;  
251 - border-bottom: 1rpx solid #f3f5f5;  
252 - padding: 31rpx 25rpx; 256 + display: flex;
  257 + justify-content: space-between;
  258 + align-items: center;
  259 + border-bottom: 1rpx solid #f3f5f5;
  260 + padding: 31rpx 25rpx;
253 } 261 }
254 262
255 .user_evaluation_title { 263 .user_evaluation_title {
256 - font-size: 30rpx;  
257 - font-weight: bold;  
258 - color: #222; 264 + font-size: 30rpx;
  265 + font-weight: bold;
  266 + color: #222;
259 } 267 }
260 268
261 .user_evaluation_time { 269 .user_evaluation_time {
262 - font-size: 24rpx;  
263 - color: #c7c7c7;  
264 - display: flex;  
265 - align-items: center; 270 + font-size: 24rpx;
  271 + color: #c7c7c7;
  272 + display: flex;
  273 + align-items: center;
266 } 274 }
267 275
268 .comments_btn { 276 .comments_btn {
269 - display: flex;  
270 - justify-content: flex-end;  
271 - align-items: center;  
272 - font-size: 23rpx;  
273 - color: #949a9a;  
274 - margin-top: 24rpx; 277 + display: flex;
  278 + justify-content: flex-end;
  279 + align-items: center;
  280 + font-size: 23rpx;
  281 + color: #949a9a;
  282 + margin-top: 24rpx;
275 } 283 }
276 284
277 .icon-message { 285 .icon-message {
278 - font-size: 22rpx;  
279 - color: #949a9a;  
280 - margin-right: 10rpx; 286 + font-size: 22rpx;
  287 + color: #949a9a;
  288 + margin-right: 10rpx;
281 } 289 }
282 290
283 .user_information_box { 291 .user_information_box {
284 - padding: 31rpx 25rpx 25rpx 25rpx; 292 + padding: 31rpx 25rpx 25rpx 25rpx;
285 } 293 }
286 294
287 .user_information { 295 .user_information {
288 - display: flex;  
289 - justify-content: space-between;  
290 - align-items: center; 296 + display: flex;
  297 + justify-content: space-between;
  298 + align-items: center;
291 } 299 }
292 300
293 .head_portrait { 301 .head_portrait {
294 - width: 62rpx;  
295 - height: 62rpx; 302 + width: 62rpx;
  303 + height: 62rpx;
296 } 304 }
297 305
298 .head_portrait image { 306 .head_portrait image {
299 - width: 100%;  
300 - height: 100%; 307 + width: 100%;
  308 + height: 100%;
301 } 309 }
302 310
303 .star_box { 311 .star_box {
304 - margin-left: 25rpx; 312 + margin-left: 25rpx;
305 } 313 }
306 314
307 .the_star { 315 .the_star {
308 - display: flex;  
309 - align-items: center; 316 + display: flex;
  317 + align-items: center;
310 } 318 }
311 319
312 .stars1 { 320 .stars1 {
313 - display: flex; 321 + display: flex;
314 } 322 }
315 323
316 .user_name { 324 .user_name {
317 - font-size: 26rpx;  
318 - color: #222; 325 + font-size: 26rpx;
  326 + color: #222;
319 } 327 }
320 328
321 .evaluation { 329 .evaluation {
322 - font-size: 24rpx;  
323 - color: #222;  
324 - margin-top: 25rpx; 330 + font-size: 24rpx;
  331 + color: #222;
  332 + margin-top: 25rpx;
325 } 333 }
326 334
327 .evaluation_img { 335 .evaluation_img {
328 - margin-top: 21rpx; 336 + margin-top: 21rpx;
329 } 337 }
330 338
331 .upload_img_box { 339 .upload_img_box {
332 - display: flex; 340 + display: flex;
333 } 341 }
334 342
335 .upload_img { 343 .upload_img {
336 - width: 160rpx;  
337 - height: 160rpx;  
338 - margin-right: 20rpx; 344 + width: 160rpx;
  345 + height: 160rpx;
  346 + margin-right: 20rpx;
339 } 347 }
340 348
341 .upload_img image { 349 .upload_img image {
342 - width: 100%;  
343 - height: 100%; 350 + width: 100%;
  351 + height: 100%;
344 } 352 }
345 353
346 .item_list3 { 354 .item_list3 {
347 - padding: 46rpx 44rpx; 355 + padding: 46rpx 44rpx;
348 } 356 }
349 357
350 .item_list4 { 358 .item_list4 {
351 - padding: 30rpx 25rpx; 359 + padding: 30rpx 25rpx;
352 } 360 }
353 361
354 .charge_btn { 362 .charge_btn {
355 - height: 80rpx;  
356 - display: flex;  
357 - justify-content: center;  
358 - align-items: center;  
359 - font-size: 26rpx;  
360 - color: #f44;  
361 - border: 1rpx solid #f44;  
362 - border-radius: 40rpx;  
363 - margin-top: 30rpx; 363 + height: 80rpx;
  364 + display: flex;
  365 + justify-content: center;
  366 + align-items: center;
  367 + font-size: 26rpx;
  368 + color: #f44;
  369 + border: 1rpx solid #f44;
  370 + border-radius: 40rpx;
  371 + margin-top: 30rpx;
364 } 372 }
365 373
366 .detection_item { 374 .detection_item {
367 - display: flex;  
368 - justify-content: space-around;  
369 - margin-top: 58rpx; 375 + display: flex;
  376 + justify-content: space-around;
  377 + margin-top: 58rpx;
370 } 378 }
371 379
372 .detection { 380 .detection {
373 - display: flex;  
374 - justify-content: center;  
375 - align-items: center; 381 + display: flex;
  382 + justify-content: center;
  383 + align-items: center;
376 } 384 }
377 385
378 .line1 { 386 .line1 {
379 - width: 115rpx;  
380 - height: 1rpx;  
381 - background: linear-gradient(to right, #fff, #bbb); 387 + width: 115rpx;
  388 + height: 1rpx;
  389 + background: linear-gradient(to right, #fff, #bbb);
382 } 390 }
383 391
384 .line2 { 392 .line2 {
385 - width: 115rpx;  
386 - height: 1rpx;  
387 - background: linear-gradient(to left, #fff, #bbb); 393 + width: 115rpx;
  394 + height: 1rpx;
  395 + background: linear-gradient(to left, #fff, #bbb);
388 } 396 }
389 397
390 .detection_title { 398 .detection_title {
391 - font-size: 26rpx;  
392 - font-weight: bold;  
393 - color: #222;  
394 - margin: 0 30rpx; 399 + font-size: 26rpx;
  400 + font-weight: bold;
  401 + color: #222;
  402 + margin: 0 30rpx;
395 } 403 }
396 404
397 .detection_box { 405 .detection_box {
398 - font-size: 26rpx;  
399 - color: #222; 406 + font-size: 26rpx;
  407 + color: #222;
400 } 408 }
401 409
402 .detection_img { 410 .detection_img {
403 - margin: 0 auto;  
404 - width: 54rpx;  
405 - height: 54rpx; 411 + margin: 0 auto;
  412 + width: 54rpx;
  413 + height: 54rpx;
406 } 414 }
407 415
408 .detection_img image { 416 .detection_img image {
409 - width: 100%;  
410 - height: 100%; 417 + width: 100%;
  418 + height: 100%;
411 } 419 }
412 420
413 .detection_hint { 421 .detection_hint {
414 - font-size: 22rpx;  
415 - color: #94999a;  
416 - text-align: center;  
417 - margin-top: 20rpx; 422 + font-size: 22rpx;
  423 + color: #94999a;
  424 + text-align: center;
  425 + margin-top: 20rpx;
418 } 426 }
419 427
420 .itme_list5 { 428 .itme_list5 {
421 - position: relative;  
422 - padding: 45rpx 25rpx 30rpx 25rpx;  
423 - box-sizing: border-box; 429 + position: relative;
  430 + padding: 45rpx 25rpx 30rpx 25rpx;
  431 + box-sizing: border-box;
424 } 432 }
425 433
426 .recommended_box { 434 .recommended_box {
427 - width: 150rpx;  
428 - height: 45rpx;  
429 - display: flex;  
430 - align-items: center;  
431 - justify-content: center;  
432 - background: #ffda44;  
433 - border-radius: 0 0 16rpx 16rpx;  
434 - font-size: 22rpx;  
435 - color: #333;  
436 - position: absolute;  
437 - right: 24rpx;  
438 - top: 0; 435 + width: 150rpx;
  436 + height: 45rpx;
  437 + display: flex;
  438 + align-items: center;
  439 + justify-content: center;
  440 + background: #ffda44;
  441 + border-radius: 0 0 16rpx 16rpx;
  442 + font-size: 22rpx;
  443 + color: #333;
  444 + position: absolute;
  445 + right: 24rpx;
  446 + top: 0;
439 } 447 }
440 448
441 .foretaste_box { 449 .foretaste_box {
442 - display: flex;  
443 - align-items: center;  
444 - font-size: 30rpx; 450 + display: flex;
  451 + align-items: center;
  452 + font-size: 30rpx;
445 } 453 }
446 454
447 .buyer_recommend { 455 .buyer_recommend {
448 - font-size: 22rpx;  
449 - color: #94999a;  
450 - margin-left: 20rpx; 456 + font-size: 22rpx;
  457 + color: #94999a;
  458 + margin-left: 20rpx;
451 } 459 }
452 460
453 .buyer_name { 461 .buyer_name {
454 - font-size: 30rpx;  
455 - color: #222; 462 + font-size: 30rpx;
  463 + color: #222;
456 } 464 }
457 465
458 .recommend_content { 466 .recommend_content {
459 - background-color: #fafafa;  
460 - border-radius: 16rpx;  
461 - padding: 25rpx 25rpx 25rpx 25rpx;  
462 - margin-top: 30rpx;  
463 - font-size: 26rpx;  
464 - color: #222;  
465 - position: relative; 467 + background-color: #fafafa;
  468 + border-radius: 16rpx;
  469 + padding: 25rpx 25rpx 25rpx 25rpx;
  470 + margin-top: 30rpx;
  471 + font-size: 26rpx;
  472 + color: #222;
  473 + position: relative;
466 } 474 }
467 475
468 .icon-shangyinhao { 476 .icon-shangyinhao {
469 - font-size: 22rpx;  
470 - color: #e3e3e3; 477 + font-size: 22rpx;
  478 + color: #e3e3e3;
471 } 479 }
472 480
473 .triangle { 481 .triangle {
474 - width: 0;  
475 - height: 0;  
476 - border-left: 60rpx solid #fafafa;  
477 - border-top: 30rpx solid transparent;  
478 - border-bottom: 30rpx solid transparent;  
479 - position: absolute;  
480 - top: -30rpx;  
481 - left: 50rpx; 482 + width: 0;
  483 + height: 0;
  484 + border-left: 60rpx solid #fafafa;
  485 + border-top: 30rpx solid transparent;
  486 + border-bottom: 30rpx solid transparent;
  487 + position: absolute;
  488 + top: -30rpx;
  489 + left: 50rpx;
482 } 490 }
483 491
484 .recommend_character { 492 .recommend_character {
485 - margin-left: 10rpx; 493 + margin-left: 10rpx;
486 } 494 }
487 495
488 .ingredients { 496 .ingredients {
489 - margin-top: 40rpx; 497 + margin-top: 40rpx;
490 } 498 }
491 499
492 .ingredients_title { 500 .ingredients_title {
493 - font-size: 30rpx;  
494 - font-weight: bold;  
495 - color: #222;  
496 - text-align: center; 501 + font-size: 30rpx;
  502 + font-weight: bold;
  503 + color: #222;
  504 + text-align: center;
497 } 505 }
498 506
499 .ingredients_img { 507 .ingredients_img {
500 - width: 280rpx;  
501 - height: 280rpx; 508 + width: 280rpx;
  509 + height: 280rpx;
502 } 510 }
503 511
504 .ingredients_box { 512 .ingredients_box {
505 - display: flex; 513 + display: flex;
506 } 514 }
507 515
508 .ingredients_img image { 516 .ingredients_img image {
509 - width: 100%;  
510 - height: 100%; 517 + width: 100%;
  518 + height: 100%;
511 } 519 }
512 520
513 .ingredients_item { 521 .ingredients_item {
514 - width: 400rpx;  
515 - font-size: 26rpx;  
516 - display: flex;  
517 - /* margin-left: 34rpx; */  
518 - margin-top: 34rpx;  
519 - border: 1px solid red; 522 + width: 400rpx;
  523 + font-size: 26rpx;
  524 + display: flex;
  525 + /* margin-left: 34rpx; */
  526 + margin-top: 34rpx;
  527 + border: 1px solid red;
520 } 528 }
521 529
522 .ingredients_name { 530 .ingredients_name {
523 - color: #94999a;  
524 - width: 80rpx; 531 + color: #94999a;
  532 + width: 80rpx;
525 } 533 }
526 534
527 .ingredients_content { 535 .ingredients_content {
528 - width: 300rpx;  
529 - display: flex;  
530 - flex-wrap: wrap;  
531 - margin-left: 30rpx;  
532 - border: 1px solid red; 536 + width: 300rpx;
  537 + display: flex;
  538 + flex-wrap: wrap;
  539 + margin-left: 30rpx;
  540 + border: 1px solid red;
533 } 541 }
534 542
535 .graphic_ingredients_box { 543 .graphic_ingredients_box {
536 - margin-top: 40rpx; 544 + margin-top: 40rpx;
537 } 545 }
538 546
539 .graphic_ingredients { 547 .graphic_ingredients {
540 - height: 200rpx;  
541 - border: 1rpx solid red;  
542 - display: flex;  
543 - align-items: center;  
544 - justify-content: center;  
545 - background-image: url('http://hifresh.w.bronet.cn/assets/wxapp/keshihua@2x.png');  
546 - margin-bottom: 20rpx; 548 + height: 200rpx;
  549 + border: 1rpx solid red;
  550 + display: flex;
  551 + align-items: center;
  552 + justify-content: center;
  553 + background-image: url('http://hifresh.w.bronet.cn/assets/wxapp/keshihua@2x.png');
  554 + margin-bottom: 20rpx;
547 } 555 }
548 556
549 .graphic_ingredients_background { 557 .graphic_ingredients_background {
550 - width: 450rpx;  
551 - height: 110rpx;  
552 - background-color: #ffb244;  
553 - display: flex;  
554 - align-items: center;  
555 - justify-content: center; 558 + width: 450rpx;
  559 + height: 110rpx;
  560 + background-color: #ffb244;
  561 + display: flex;
  562 + align-items: center;
  563 + justify-content: center;
556 } 564 }
557 565
558 .graphic_ingredients_border { 566 .graphic_ingredients_border {
559 - font-size: 38rpx;  
560 - color: #fff;  
561 - width: 430rpx;  
562 - height: 90rpx;  
563 - border: 1rpx solid #fff;  
564 - display: flex;  
565 - align-items: center;  
566 - justify-content: center; 567 + font-size: 38rpx;
  568 + color: #fff;
  569 + width: 430rpx;
  570 + height: 90rpx;
  571 + border: 1rpx solid #fff;
  572 + display: flex;
  573 + align-items: center;
  574 + justify-content: center;
567 } 575 }
568 576
569 .item_list6 { 577 .item_list6 {
570 - padding: 30rpx 25rpx 0rpx;  
571 - margin-bottom:120rpx 578 + padding: 30rpx 25rpx 0rpx;
  579 + margin-bottom: 120rpx;
572 } 580 }
573 581
574 .collocation_title { 582 .collocation_title {
575 - font-size: 30rpx;  
576 - font-weight: bold;  
577 - color: #222;  
578 - margin-bottom: 40rpx; 583 + font-size: 30rpx;
  584 + font-weight: bold;
  585 + color: #222;
  586 + margin-bottom: 40rpx;
579 } 587 }
580 588
581 .collocation { 589 .collocation {
582 - display: flex;  
583 - justify-content: space-between;  
584 - flex-wrap: wrap;  
585 - margin-top: 39rpx; 590 + display: flex;
  591 + justify-content: space-between;
  592 + flex-wrap: wrap;
  593 + margin-top: 39rpx;
586 } 594 }
587 595
588 .collocation_box { 596 .collocation_box {
589 - width: 340rpx;  
590 - border: 1rpx solid red;  
591 - border-radius: 16rpx;  
592 - overflow: hidden;  
593 - margin-bottom: 20rpx; 597 + width: 340rpx;
  598 + border: 1rpx solid red;
  599 + border-radius: 16rpx;
  600 + overflow: hidden;
  601 + margin-bottom: 20rpx;
594 } 602 }
595 603
596 .collocation_img { 604 .collocation_img {
597 - width: 340rpx;  
598 - height: 340rpx; 605 + width: 340rpx;
  606 + height: 340rpx;
599 } 607 }
600 608
601 .collocation_img image { 609 .collocation_img image {
602 - width: 100%;  
603 - height: 100%; 610 + width: 100%;
  611 + height: 100%;
604 } 612 }
605 613
606 .collocation_content { 614 .collocation_content {
607 - background: #fafafa;  
608 - font-size: 30rpx;  
609 - color: #222;  
610 - padding: 22rpx; 615 + background: #fafafa;
  616 + font-size: 30rpx;
  617 + color: #222;
  618 + padding: 22rpx;
611 } 619 }
612 620
613 .bottom_btn { 621 .bottom_btn {
614 - width: 100%;  
615 - height: 100rpx;  
616 - background: #fff;  
617 - display: flex;  
618 - justify-content: flex-end;  
619 - align-items: center;  
620 - position: fixed;  
621 - bottom:0;  
622 - left: 0; 622 + width: 100%;
  623 + height: 100rpx;
  624 + background: #fff;
  625 + display: flex;
  626 + justify-content: flex-end;
  627 + align-items: center;
  628 + position: fixed;
  629 + bottom: 0;
  630 + left: 0;
623 } 631 }
624 632
625 .hint_btn { 633 .hint_btn {
626 - width: 12%;  
627 - display: flex;  
628 - justify-content: center;  
629 - align-items: center; 634 + width: 36%;
  635 + height: 100%;
  636 + padding-left: 25rpx;
  637 +}
  638 +
  639 +.shangmianbyn {
  640 + display: flex;
  641 + height: 30rpx;
  642 + margin-top: 19rpx;
  643 +}
  644 +
  645 +.shangmianbyi {
  646 + height: 18rpx;
  647 + margin-top: 12rpx;
  648 + line-height: 18rpx;
  649 + font-size: 18rpx;
  650 + font-family: PingFang SC;
  651 + font-weight: 500;
  652 + color: rgba(116, 123, 125, 1);
  653 +}
  654 +
  655 +.shangmianber {
  656 + padding-top: 1rpx;
  657 + box-sizing: border-box;
  658 + height: 22rpx;
  659 + font-size: 22rpx;
  660 + font-family: PingFang SC;
  661 + font-weight: 800;
  662 + color: rgba(93, 194, 72, 1);
  663 + line-height: 22rpx;
  664 + margin: 8rpx 3rpx 0;
  665 +}
  666 +
  667 +.shangmianbsan {
  668 + padding-top: 1rpx;
  669 + box-sizing: border-box;
  670 + height: 30rpx;
  671 + font-size: 38rpx;
  672 + line-height: 30rpx;
  673 + font-family: PingFang SC;
  674 + font-weight: 800;
  675 + color: rgba(93, 194, 72, 1);
  676 +}
  677 +
  678 +.yisheng {
  679 + margin-top: 12rpx;
  680 + height: 17rpx;
  681 + font-size: 18rpx;
  682 + font-family: PingFang SC;
  683 + font-weight: 500;
  684 + color: rgba(116, 123, 125, 1);
  685 + line-height: 17rpx;
630 } 686 }
631 687
632 .shop_car { 688 .shop_car {
633 - font-size: 18rpx;  
634 - color: #747b7d;  
635 - position: relative; 689 + font-size: 18rpx;
  690 + color: #747b7d;
  691 + position: relative;
636 } 692 }
637 693
638 .cart_count { 694 .cart_count {
639 - position: absolute;  
640 - right: 2rpx;  
641 - top: 0;  
642 - width: 24rpx;  
643 - height: 24rpx;  
644 - border-radius: 50%;  
645 - background: red;  
646 - text-align: center;  
647 - line-height: 24rpx;  
648 - color: #fff;  
649 - font-size: 18rpx; 695 + position: absolute;
  696 + right: 2rpx;
  697 + top: 0;
  698 + width: 24rpx;
  699 + height: 24rpx;
  700 + border-radius: 50%;
  701 + background: red;
  702 + text-align: center;
  703 + line-height: 24rpx;
  704 + color: #fff;
  705 + font-size: 18rpx;
650 } 706 }
651 707
652 .join_btn { 708 .join_btn {
653 - width: 44%;  
654 - height: 100rpx;  
655 - background: linear-gradient(to left, #ffda44, #ffb244);  
656 - display: flex;  
657 - align-items: center;  
658 - justify-content: center;  
659 - font-size: 26rpx;  
660 - color: #fff; 709 + width: 32%;
  710 + height: 100rpx;
  711 + background: linear-gradient(to left, #ffda44, #ffb244);
  712 + display: flex;
  713 + align-items: center;
  714 + justify-content: center;
  715 + font-size: 26rpx;
  716 + color: #fff;
661 } 717 }
662 718
663 .immediately_btn { 719 .immediately_btn {
664 - width: 44%;  
665 - height: 100rpx;  
666 - background: linear-gradient(to left, #f99115, #f56800);  
667 - display: flex;  
668 - align-items: center;  
669 - justify-content: center;  
670 - font-size: 26rpx;  
671 - color: #fff; 720 + width: 32%;
  721 + height: 100rpx;
  722 + background: linear-gradient(to left, #f99115, #f56800);
  723 + display: flex;
  724 + align-items: center;
  725 + justify-content: center;
  726 + font-size: 26rpx;
  727 + color: #fff;
672 } 728 }
673 729
674 -.tips{  
675 - padding: 0 25rpx;  
676 - box-sizing: border-box; 730 +.tips {
  731 + padding: 0 25rpx;
  732 + box-sizing: border-box;
677 } 733 }
678 -.tips_content{  
679 - margin-top: 30rpx;  
680 - line-height: 40rpx; 734 +
  735 +.tips_content {
  736 + margin-top: 30rpx;
  737 + line-height: 40rpx;
681 } 738 }
  739 +
682 .item_list7 { 740 .item_list7 {
683 - height: 368rpx;  
684 - background: rgba(255, 255, 255, 1);  
685 - border-radius: 16rpx;  
686 - box-shadow: 15rpx 0rpx 30rpx rgba(214, 214, 214, 0.6);  
687 - font-size: 26rpx;  
688 - color: #222;  
689 - margin: 0 auto;  
690 - margin-bottom: 20rpx;  
691 - padding: 34rpx 49rpx; 741 + height: 368rpx;
  742 + background: rgba(255, 255, 255, 1);
  743 + border-radius: 16rpx;
  744 + box-shadow: 15rpx 0rpx 30rpx rgba(214, 214, 214, 0.6);
  745 + font-size: 26rpx;
  746 + color: #222;
  747 + margin: 0 auto;
  748 + margin-bottom: 20rpx;
  749 + padding: 34rpx 49rpx;
692 } 750 }
  751 +
693 /**/ 752 /**/
694 753
695 -.product_list{ 754 +.product_list {
696 padding: 0 25rpx; 755 padding: 0 25rpx;
697 flex: 1; 756 flex: 1;
698 overflow-y: scroll; 757 overflow-y: scroll;
699 background: #fff; 758 background: #fff;
700 - margin-bottom:120rpx 759 + margin-bottom: 120rpx;
701 } 760 }
702 -.singlepart{  
703 - border-top: 22rpx solid #FAFAFA; 761 +
  762 +.singlepart {
  763 + border-top: 22rpx solid #fafafa;
  764 + padding-bottom: 100rpx;
  765 + box-sizing: border-box
704 } 766 }
705 -.single_part_top{ 767 +
  768 +.single_part_top {
706 height: 90rpx; 769 height: 90rpx;
707 display: flex; 770 display: flex;
708 align-items: center; 771 align-items: center;
709 justify-content: space-between; 772 justify-content: space-between;
710 font-size: 24rpx; 773 font-size: 24rpx;
711 color: #888; 774 color: #888;
712 - border-bottom: 1rpx solid #EDEDED; 775 + border-bottom: 1rpx solid #ededed;
713 } 776 }
714 -.single_part_right,.single_part_left{ 777 +
  778 +.single_part_right, .single_part_left {
715 display: flex; 779 display: flex;
716 } 780 }
717 -.single_part_left{  
718 - color: #222222; 781 +
  782 +.single_part_left {
  783 + color: #222;
719 font-size: 30rpx; 784 font-size: 30rpx;
720 font-weight: 800; 785 font-weight: 800;
721 } 786 }
722 -.single_part_left_icon{  
723 - color: #EDEDED; 787 +
  788 +.single_part_left_icon {
  789 + color: #ededed;
724 font-size: 40rpx; 790 font-size: 40rpx;
725 margin-right: 24rpx; 791 margin-right: 24rpx;
726 } 792 }
727 -.single_part_left_icon.active{  
728 - color:#FFDA44 793 +
  794 +.single_part_left_icon.active {
  795 + color: #ffda44;
729 } 796 }
730 -.single_part_item{ 797 +
  798 +.single_part_item {
731 display: flex; 799 display: flex;
732 margin: 50rpx 0 50rpx; 800 margin: 50rpx 0 50rpx;
733 height: 140rpx; 801 height: 140rpx;
734 align-items: center; 802 align-items: center;
735 - border-bottom:1rpx solid #fafafa; 803 + border-bottom: 1rpx solid #fafafa;
736 } 804 }
737 -.single_part_item:last-child{  
738 - border:0 805 +
  806 +.single_part_item:last-child {
  807 + border: 0;
739 } 808 }
740 - .iconfonts{ 809 +
  810 +.iconfonts {
741 font-size: 40rpx; 811 font-size: 40rpx;
742 - color: #EDEDED; 812 + color: #ededed;
743 } 813 }
744 -.iconfonts.active{  
745 - color:#FFDA44 814 +
  815 +.iconfonts.active {
  816 + color: #ffda44;
746 } 817 }
747 -.single_part_imgbox{ 818 +
  819 +.single_part_imgbox {
748 width: 140rpx; 820 width: 140rpx;
749 height: 140rpx; 821 height: 140rpx;
750 overflow: hidden; 822 overflow: hidden;
@@ -752,81 +824,94 @@ page { @@ -752,81 +824,94 @@ page {
752 margin-right: 40rpx; 824 margin-right: 40rpx;
753 } 825 }
754 826
755 -.single_part_imgbox image{ 827 +.single_part_imgbox image {
756 width: 100%; 828 width: 100%;
757 } 829 }
758 -.single_part_detail{  
759 - flex:1; 830 +
  831 +.single_part_detail {
  832 + flex: 1;
760 height: 100%; 833 height: 100%;
761 display: flex; 834 display: flex;
762 flex-flow: column; 835 flex-flow: column;
763 - margin-top:-20rpx; 836 + margin-top: -20rpx;
764 } 837 }
765 -.product_action{ 838 +
  839 +.product_action {
766 font-size: 28rpx; 840 font-size: 28rpx;
767 color: #333; 841 color: #333;
768 line-height: 1; 842 line-height: 1;
769 } 843 }
770 -.product_title{ 844 +
  845 +.product_title {
771 color: #333; 846 color: #333;
772 font-size: 28rpx; 847 font-size: 28rpx;
773 margin-bottom: 4rpx; 848 margin-bottom: 4rpx;
774 - margin-top:-16rpx; 849 + margin-top: -16rpx;
775 } 850 }
  851 +
776 .product_type { 852 .product_type {
777 - height: 30rpx;  
778 - overflow: hidden; 853 + height: 30rpx;
  854 + overflow: hidden;
779 color: #888; 855 color: #888;
780 font-size: 24rpx; 856 font-size: 24rpx;
781 - margin-bottom:2rpx; 857 + margin-bottom: 2rpx;
782 } 858 }
783 -.save_after{  
784 - color:#888;  
785 - margin-right:6rpx; 859 +
  860 +.save_after {
  861 + color: #888;
  862 + margin-right: 6rpx;
786 } 863 }
  864 +
787 .product_types { 865 .product_types {
788 color: #888; 866 color: #888;
789 font-size: 24rpx; 867 font-size: 24rpx;
790 - margin-bottom:12rpx;  
791 - float: left 868 + margin-bottom: 12rpx;
  869 + float: left;
792 } 870 }
793 -.dayuya{  
794 - width: 100rpx;  
795 - height: 100rpx;  
796 - font-size: 120rpx 871 +
  872 +.dayuya {
  873 + width: 100rpx;
  874 + height: 100rpx;
  875 + font-size: 120rpx;
797 } 876 }
798 -.product_action{ 877 +
  878 +.product_action {
799 display: flex; 879 display: flex;
800 justify-content: space-between; 880 justify-content: space-between;
801 } 881 }
802 -.price{ 882 +
  883 +.price {
803 font-size: 24rpx; 884 font-size: 24rpx;
804 - color: #FF4444; 885 + color: #f44;
805 } 886 }
806 -.detail_price{ 887 +
  888 +.detail_price {
807 font-size: 34rpx; 889 font-size: 34rpx;
808 font-weight: bold; 890 font-weight: bold;
809 - margin-right:6rpx;  
810 - margin-left:-10rpx; 891 + margin-right: 6rpx;
  892 + margin-left: -10rpx;
811 } 893 }
812 -.action_box{ 894 +
  895 +.action_box {
813 display: flex; 896 display: flex;
814 align-items: center; 897 align-items: center;
815 font-size: 30rpx; 898 font-size: 30rpx;
816 } 899 }
  900 +
817 .action_btn { 901 .action_btn {
818 display: flex; 902 display: flex;
819 height: 38rpx; 903 height: 38rpx;
820 width: 38rpx; 904 width: 38rpx;
821 border-radius: 50%; 905 border-radius: 50%;
822 - border: 1rpx solid #94999A; 906 + border: 1rpx solid #94999a;
823 align-items: center; 907 align-items: center;
824 justify-content: center; 908 justify-content: center;
825 font-size: 30rpx; 909 font-size: 30rpx;
826 } 910 }
827 -.choose_sku{  
828 - width: 100%;  
829 - color: #888; 911 +
  912 +.choose_sku {
  913 + width: 100%;
  914 + color: #888;
830 font-size: 24rpx; 915 font-size: 24rpx;
831 display: flex; 916 display: flex;
832 /* justify-content: space-between */ 917 /* justify-content: space-between */
@@ -835,210 +920,214 @@ page { @@ -835,210 +920,214 @@ page {
835 /*购物车添加状态*/ 920 /*购物车添加状态*/
836 921
837 .cart_mask { 922 .cart_mask {
838 - position: fixed;  
839 - top: 0;  
840 - left: 0;  
841 - width: 100%;  
842 - height: 100%;  
843 - background: rgba(0, 0, 0, 0.8);  
844 - z-index: 9999999; 923 + position: fixed;
  924 + top: 0;
  925 + left: 0;
  926 + width: 100%;
  927 + height: 100%;
  928 + background: rgba(0, 0, 0, 0.8);
  929 + z-index: 9999999;
845 } 930 }
846 931
847 .cart_mask_diceng { 932 .cart_mask_diceng {
848 - width: 80%;  
849 - /* min-height: 550rpx; */  
850 - position: absolute;  
851 - top: 50%;  
852 - margin-left: 10%;  
853 - transform: translateY(-50%);  
854 - background: rgba(255, 255, 255, 1);  
855 - border-radius: 10px;  
856 - padding-top: 20rpx;  
857 - padding-bottom: 130rpx; 933 + width: 80%;
  934 + /* min-height: 550rpx; */
  935 + position: absolute;
  936 + top: 50%;
  937 + margin-left: 10%;
  938 + transform: translateY(-50%);
  939 + background: rgba(255, 255, 255, 1);
  940 + border-radius: 10px;
  941 + padding-top: 20rpx;
  942 + padding-bottom: 130rpx;
858 } 943 }
859 944
860 .goods_name { 945 .goods_name {
861 - font-size: 30rpx;  
862 - font-family: PingFang-SC-Bold;  
863 - font-weight: bold;  
864 - color: rgba(51, 51, 51, 1);  
865 - line-height: 36rpx;  
866 - text-align: center;  
867 - margin-top: 30rpx; 946 + font-size: 30rpx;
  947 + font-family: PingFang-SC-Bold;
  948 + font-weight: bold;
  949 + color: rgba(51, 51, 51, 1);
  950 + line-height: 36rpx;
  951 + text-align: center;
  952 + margin-top: 30rpx;
868 } 953 }
869 954
870 .weight { 955 .weight {
871 - height: 100rpx;  
872 - margin-top: 34rpx;  
873 - /* margin-bottom:44rpx; */  
874 - padding: 0 47rpx 0 36rpx;  
875 - box-sizing: border-box; 956 + height: 100rpx;
  957 + margin-top: 34rpx;
  958 + /* margin-bottom:44rpx; */
  959 + padding: 0 47rpx 0 36rpx;
  960 + box-sizing: border-box;
876 } 961 }
877 962
878 .weight_view { 963 .weight_view {
879 - font-size: 26rpx;  
880 - font-family: PingFang-SC-Medium;  
881 - font-weight: 500;  
882 - color: rgba(51, 51, 51, 1);  
883 - line-height: 36rpx; 964 + font-size: 26rpx;
  965 + font-family: PingFang-SC-Medium;
  966 + font-weight: 500;
  967 + color: rgba(51, 51, 51, 1);
  968 + line-height: 36rpx;
884 } 969 }
885 970
886 .quality { 971 .quality {
887 - margin-top: 24rpx; 972 + margin-top: 24rpx;
888 } 973 }
889 974
890 .quality_left { 975 .quality_left {
891 - width: 150rpx;  
892 - height: 50rpx;  
893 - margin-bottom: 20rpx;  
894 - background: rgba(247, 247, 247, 1);  
895 - border-radius: 10rpx;  
896 - text-align: center;  
897 - line-height: 50rpx;  
898 - font-size: 26rpx;  
899 - font-family: FZY3JW--GB1-0;  
900 - font-weight: 400;  
901 - color: rgba(26, 26, 26, 1);  
902 - float: left;  
903 - margin-right: 20rpx; 976 + width: 150rpx;
  977 + height: 50rpx;
  978 + margin-bottom: 20rpx;
  979 + background: rgba(247, 247, 247, 1);
  980 + border-radius: 10rpx;
  981 + text-align: center;
  982 + line-height: 50rpx;
  983 + font-size: 26rpx;
  984 + font-family: FZY3JW--GB1-0;
  985 + font-weight: 400;
  986 + color: rgba(26, 26, 26, 1);
  987 + float: left;
  988 + margin-right: 20rpx;
904 } 989 }
905 990
906 .quality_left.active { 991 .quality_left.active {
907 - background: rgba(255, 218, 68, 1); 992 + background: rgba(255, 218, 68, 1);
908 } 993 }
909 994
910 .last_box { 995 .last_box {
911 - width: 100%;  
912 - height: 110rpx;  
913 - background: rgba(247, 247, 247, 1);  
914 - border-radius: 0px 0px 10px 10px;  
915 - margin-top: 100rpx;  
916 - padding: 18rpx 0 0 51rpx;  
917 - box-sizing: border-box;  
918 - position: absolute;  
919 - bottom: 0; 996 + width: 100%;
  997 + height: 110rpx;
  998 + background: rgba(247, 247, 247, 1);
  999 + border-radius: 0px 0px 10px 10px;
  1000 + margin-top: 100rpx;
  1001 + padding: 18rpx 0 0 51rpx;
  1002 + box-sizing: border-box;
  1003 + position: absolute;
  1004 + bottom: 0;
920 } 1005 }
921 1006
922 .last_box_top { 1007 .last_box_top {
923 - font-size: 26rpx; 1008 + font-size: 26rpx;
924 } 1009 }
925 1010
926 .last_box_top_price { 1011 .last_box_top_price {
927 - display: flex;  
928 - color: #f44;  
929 - line-height: 36rpx;  
930 - font-family: PingFang-SC-Bold;  
931 - font-weight: bold; 1012 + display: flex;
  1013 + color: #f44;
  1014 + line-height: 36rpx;
  1015 + font-family: PingFang-SC-Bold;
  1016 + font-weight: bold;
932 } 1017 }
933 1018
934 .last_box_top_price text { 1019 .last_box_top_price text {
935 - color: #333;  
936 - font-size: 18rpx;  
937 - margin-left: 10rpx; 1020 + color: #333;
  1021 + font-size: 18rpx;
  1022 + margin-left: 10rpx;
938 } 1023 }
939 1024
940 .member_price { 1025 .member_price {
941 - color: rgba(187, 138, 54, 1); 1026 + color: rgba(187, 138, 54, 1);
942 } 1027 }
943 1028
944 .member { 1029 .member {
945 - text-align: center;  
946 - font-family: PingFang-SC-Medium;  
947 - margin-left: 24rpx;  
948 - background: linear-gradient(-90deg, rgba(244, 243, 200, 1), rgba(250, 216, 90, 1));  
949 - border-radius: 5px;  
950 - color: rgba(187, 138, 54, 1);  
951 - padding: 4rpx -2rpx;  
952 - box-sizing: border-box;  
953 - /* margin-top:8rpx; */  
954 - font-size: 18rpx;  
955 - font-weight: 400; 1030 + text-align: center;
  1031 + font-family: PingFang-SC-Medium;
  1032 + margin-left: 24rpx;
  1033 + background: linear-gradient(-90deg, rgba(244, 243, 200, 1), rgba(250, 216, 90, 1));
  1034 + border-radius: 5px;
  1035 + color: rgba(187, 138, 54, 1);
  1036 + padding: 4rpx -2rpx;
  1037 + box-sizing: border-box;
  1038 + /* margin-top:8rpx; */
  1039 + font-size: 18rpx;
  1040 + font-weight: 400;
956 } 1041 }
957 1042
958 .purchase { 1043 .purchase {
959 - width: 160rpx;  
960 - height: 50rpx;  
961 - background: rgba(255, 218, 68, 1);  
962 - border-radius: 25rpx;  
963 - font-size: 24rpx;  
964 - font-family: PingFang-SC-Medium;  
965 - font-weight: 500;  
966 - color: rgba(26, 26, 26, 1);  
967 - line-height: 50rpx;  
968 - text-align: center;  
969 - position: absolute;  
970 - right: 36rpx;  
971 - top: 30rpx; 1044 + width: 160rpx;
  1045 + height: 50rpx;
  1046 + background: rgba(255, 218, 68, 1);
  1047 + border-radius: 25rpx;
  1048 + font-size: 24rpx;
  1049 + font-family: PingFang-SC-Medium;
  1050 + font-weight: 500;
  1051 + color: rgba(26, 26, 26, 1);
  1052 + line-height: 50rpx;
  1053 + text-align: center;
  1054 + position: absolute;
  1055 + right: 36rpx;
  1056 + top: 30rpx;
972 } 1057 }
973 1058
974 .jiajian { 1059 .jiajian {
975 - width: 120rpx;  
976 - height: 50rpx;  
977 - position: absolute;  
978 - right: 200rpx;  
979 - top: 40rpx;  
980 - display: flex;  
981 - justify-content: space-between; 1060 + width: 120rpx;
  1061 + height: 50rpx;
  1062 + position: absolute;
  1063 + right: 200rpx;
  1064 + top: 40rpx;
  1065 + display: flex;
  1066 + justify-content: space-between;
982 } 1067 }
983 1068
984 .dec_num { 1069 .dec_num {
985 - width: 32rpx;  
986 - height: 32rpx;  
987 - border-radius: 50%;  
988 - background: #ffda44;  
989 - font-size: 32rpx;  
990 - color: #fff;  
991 - font-weight: bold;  
992 - text-align: center;  
993 - line-height: 32rpx; 1070 + width: 32rpx;
  1071 + height: 32rpx;
  1072 + border-radius: 50%;
  1073 + background: #ffda44;
  1074 + font-size: 32rpx;
  1075 + color: #fff;
  1076 + font-weight: bold;
  1077 + text-align: center;
  1078 + line-height: 32rpx;
994 } 1079 }
995 1080
996 .numnum { 1081 .numnum {
997 - width: 32rpx;  
998 - height: 32rpx;  
999 - text-align: center;  
1000 - line-height: 32rpx;  
1001 - font-size: 30rpx;  
1002 - font-family: PingFang-SC-Medium;  
1003 - font-weight: 500;  
1004 - color: rgba(102, 102, 102, 1); 1082 + width: 32rpx;
  1083 + height: 32rpx;
  1084 + text-align: center;
  1085 + line-height: 32rpx;
  1086 + font-size: 30rpx;
  1087 + font-family: PingFang-SC-Medium;
  1088 + font-weight: 500;
  1089 + color: rgba(102, 102, 102, 1);
1005 } 1090 }
1006 1091
1007 .close_jump_cart { 1092 .close_jump_cart {
1008 - position: absolute;  
1009 - top: 24rpx;  
1010 - right: 24rpx;  
1011 - color: #ededed;  
1012 - font-size: 36rpx; 1093 + position: absolute;
  1094 + top: 24rpx;
  1095 + right: 24rpx;
  1096 + color: #ededed;
  1097 + font-size: 36rpx;
1013 } 1098 }
  1099 +
1014 .pickage_display { 1100 .pickage_display {
1015 - font-size: 24rpx;  
1016 - color: #f44;  
1017 - margin-top: 47rpx; 1101 + font-size: 24rpx;
  1102 + color: #f44;
  1103 + margin-top: 47rpx;
1018 } 1104 }
  1105 +
1019 .money_icon2 { 1106 .money_icon2 {
1020 - font-size: 22rpx;  
1021 - color: #f44; 1107 + font-size: 22rpx;
  1108 + color: #f44;
1022 } 1109 }
1023 1110
1024 .money2 { 1111 .money2 {
1025 - font-size: 38rpx;  
1026 - font-weight: bold;  
1027 - color: #f44; 1112 + font-size: 38rpx;
  1113 + font-weight: bold;
  1114 + color: #f44;
1028 } 1115 }
  1116 +
1029 /*团购样式*/ 1117 /*团购样式*/
1030 -.banner_box_group{  
1031 - width:700rpx;  
1032 - height:45rpx;  
1033 - position: absolute;  
1034 - left: 0;  
1035 - bottom: 0;  
1036 - background: linear-gradient(to right,#ffda44,transparent);  
1037 - padding-left:26rpx;  
1038 - z-index: 999;  
1039 - font-size:26rpx;  
1040 -font-family:PingFang-SC-Medium;  
1041 -font-weight:500;  
1042 -color:rgba(255,255,255,1);  
1043 -line-height:45rpx;  
1044 -}  
  1118 +
  1119 +.banner_box_group {
  1120 + width: 700rpx;
  1121 + height: 45rpx;
  1122 + position: absolute;
  1123 + left: 0;
  1124 + bottom: 0;
  1125 + background: linear-gradient(to right, #ffda44, transparent);
  1126 + padding-left: 26rpx;
  1127 + z-index: 999;
  1128 + font-size: 26rpx;
  1129 + font-family: PingFang-SC-Medium;
  1130 + font-weight: 500;
  1131 + color: rgba(255, 255, 255, 1);
  1132 + line-height: 45rpx;
  1133 +}
@@ -85,6 +85,7 @@ Page({ @@ -85,6 +85,7 @@ Page({
85 packageList: [], 85 packageList: [],
86 86
87 st: '', 87 st: '',
  88 + sts:'',
88 sku_values:'', 89 sku_values:'',
89 ast:'', 90 ast:'',
90 scrolltop:0, 91 scrolltop:0,
@@ -233,7 +234,8 @@ Page({ @@ -233,7 +234,8 @@ Page({
233 }) 234 })
234 } 235 }
235 this.setData({ 236 this.setData({
236 - show_cart_mask: false 237 + show_cart_mask: false,
  238 + item: 1
237 }); 239 });
238 }, 240 },
239 //渲染商品列表 241 //渲染商品列表
@@ -330,10 +332,13 @@ Page({ @@ -330,10 +332,13 @@ Page({
330 }, 332 },
331 //跳转至专题列表 333 //跳转至专题列表
332 jump_special_list(e) { 334 jump_special_list(e) {
333 - var specialid = e.currentTarget.dataset.specialid 335 + // var specialid = e.currentTarget.dataset.specialid
  336 + var url = e.currentTarget.dataset.url
  337 + if (url != '') {
334 wx.navigateTo({ 338 wx.navigateTo({
335 - url: './special_list/special_list?id=' + specialid, 339 + url: '../navigate/navigate?url=' + url
336 }) 340 })
  341 + }
337 }, 342 },
338 //切换筛选id 343 //切换筛选id
339 changeId(e) { 344 changeId(e) {
@@ -383,7 +388,7 @@ Page({ @@ -383,7 +388,7 @@ Page({
383 let select = this.data.select; 388 let select = this.data.select;
384 let id_str = []; 389 let id_str = [];
385 let new_arr = []; 390 let new_arr = [];
386 - for (let v of select) { 391 + for (let v of select) {
387 console.log(v.chooseIndex); 392 console.log(v.chooseIndex);
388 console.log(id_str); 393 console.log(id_str);
389 new_arr = new_arr.concat(v.chooseIndex); 394 new_arr = new_arr.concat(v.chooseIndex);
@@ -562,7 +567,7 @@ Page({ @@ -562,7 +567,7 @@ Page({
562 }) 567 })
563 } 568 }
564 time(cut) 569 time(cut)
565 - let sst = setInterval(time, 1000) 570 + let sst = setInterval(time, 60000)
566 if (ele.minutes == 0 && ele.seconds == 0) { 571 if (ele.minutes == 0 && ele.seconds == 0) {
567 clearInterval(sst) 572 clearInterval(sst)
568 } 573 }
@@ -586,58 +591,110 @@ Page({ @@ -586,58 +591,110 @@ Page({
586 var percent = 0 591 var percent = 0
587 r.data.group.forEach(function(ele, index) { 592 r.data.group.forEach(function(ele, index) {
588 var current = Math.floor(new Date() / 1000) 593 var current = Math.floor(new Date() / 1000)
  594 + var qa = new Date().getTime()
  595 + console.log(qa)
589 var shengyu = ele.group_end_date - current 596 var shengyu = ele.group_end_date - current
590 console.log(shengyu) 597 console.log(shengyu)
  598 + if (ele.group_status==1){
  599 + function times() {
  600 + var timess = new Date().getTime()
  601 + console.log(timess)
  602 + var cut = ele.group_start_date - timess
  603 + console.log(cut)
  604 + ele.daysa = Math.floor((cut) / (60 * 60 * 24));
  605 + ele.hoursa = Math.floor((cut) / (60 * 60)) % 24;
  606 + ele.minutesa = Math.floor((cut) / (60)) % 60;
  607 + if (ele.daysa < 10) {
  608 + ele.daysa = '0' + ele.daysa
  609 + }
  610 + if (ele.daysa == 0) {
  611 + ele.daysa = '00'
  612 + }
  613 + if (ele.hoursa < 10) {
  614 + ele.hoursa = '0' + ele.hoursa
  615 + }
  616 + if (ele.hoursa == 0) {
  617 + ele.hoursa = '00'
  618 + }
  619 + if (ele.minutesa < 10) {
  620 + ele.minutesa = '0' + ele.minutesa
  621 + }
  622 + if (ele.minutesa == 0) {
  623 + ele.minutesa = '00'
  624 + }
  625 + if (ele.secondsa < 10) {
  626 + ele.secondsa = '0' + ele.secondsa
  627 + }
  628 + if (ele.secondsa == 0) {
  629 + ele.secondsa = '00'
  630 + }
  631 + ele.secondsa = cut % 60
  632 + if (ele.secondsa < 0) {
  633 + clearInterval(ssts)
  634 + }
  635 + }
  636 + times()
  637 + let ssts = setInterval(times, 1000)
  638 + if (ele.minutesa == 0 && ele.secondsa < 0) {
  639 + clearInterval(ssts)
  640 + }
  641 + that.setData({
  642 + sts: ssts
  643 + })
  644 + }
  645 + if (ele.group_status == 2) {
  646 +
591 // if(shengyu>0){ 647 // if(shengyu>0){
592 function time() { 648 function time() {
593 - var a = new Date().getTime()  
594 - a = Math.floor(a / 1000)  
595 - var cut_time = ele.group_end_date - a  
596 - ele.days = Math.floor((cut_time) / ( 60 * 60 * 24));  
597 - ele.hours = Math.floor((cut_time) / ( 60 * 60)) % 24;  
598 - ele.minutes = Math.floor((cut_time) / ( 60)) % 60;  
599 - if (ele.days < 10) {  
600 - ele.days = '0'+ele.days  
601 - }  
602 - if (ele.days == 0) {  
603 - ele.days = '00'  
604 - }  
605 - if (ele.hours < 10) {  
606 - ele.hours = '0'+ele.hours  
607 - }  
608 - if (ele.hours == 0) {  
609 - ele.hours = '00'  
610 - }  
611 - if(ele.minutes<10){  
612 - ele.minutes='0'+ele.minutes  
613 - }  
614 - if (ele.minutes == 0) {  
615 - ele.minutes = '00'  
616 - }  
617 - if (ele.seconds < 10) {  
618 - ele.seconds = '0'+ele.seconds  
619 - }  
620 - if (ele.seconds == 0) {  
621 - ele.seconds = '00'  
622 - }  
623 - ele.seconds = cut_time % 60  
624 - if(ele.seconds < 0){  
625 - clearInterval(sst)  
626 - }  
627 - ele.percent = ele.group_number * 100 / ele.group_min_number  
628 - that.setData({  
629 - groupList: r.data.group  
630 - }) 649 + var a = new Date().getTime()
  650 + a = Math.floor(a / 1000)
  651 + var cut_time = ele.group_end_date - a
  652 + ele.days = Math.floor((cut_time) / (60 * 60 * 24));
  653 + ele.hours = Math.floor((cut_time) / (60 * 60)) % 24;
  654 + ele.minutes = Math.floor((cut_time) / (60)) % 60;
  655 + if (ele.days < 10) {
  656 + ele.days = '0' + ele.days
  657 + }
  658 + if (ele.days == 0) {
  659 + ele.days = '00'
  660 + }
  661 + if (ele.hours < 10) {
  662 + ele.hours = '0' + ele.hours
  663 + }
  664 + if (ele.hours == 0) {
  665 + ele.hours = '00'
  666 + }
  667 + if (ele.minutes < 10) {
  668 + ele.minutes = '0' + ele.minutes
  669 + }
  670 + if (ele.minutes == 0) {
  671 + ele.minutes = '00'
  672 + }
  673 + if (ele.seconds < 10) {
  674 + ele.seconds = '0' + ele.seconds
  675 + }
  676 + if (ele.seconds == 0) {
  677 + ele.seconds = '00'
  678 + }
  679 + ele.seconds = cut_time % 60
  680 + if (ele.seconds < 0) {
  681 + clearInterval(sst)
  682 + }
  683 + ele.percent = ele.group_number * 100 / ele.group_min_number
  684 + that.setData({
  685 + groupList: r.data.group
  686 + })
631 } 687 }
632 - time()  
633 - let sst = setInterval(time, 1000)  
634 - if (ele.minutes == 0 && ele.seconds < 0) {  
635 - clearInterval(sst)  
636 - }  
637 - that.setData({  
638 - st: sst  
639 - }) 688 + time()
  689 + let sst = setInterval(time, 1000)
  690 + if (ele.minutes == 0 && ele.seconds < 0) {
  691 + clearInterval(sst)
  692 + }
  693 + that.setData({
  694 + st: sst,
  695 + })
640 // } 696 // }
  697 + }
641 }) 698 })
642 that.setData({ 699 that.setData({
643 hotList: r.data.gohi, 700 hotList: r.data.gohi,
@@ -713,9 +770,13 @@ Page({ @@ -713,9 +770,13 @@ Page({
713 }, 770 },
714 //分类下面的轮播图跳转 771 //分类下面的轮播图跳转
715 jump_web(e){ 772 jump_web(e){
  773 + var jump = e.currentTarget.dataset.jump
  774 + console.log('jump:'+jump)
  775 + if (jump != '') {
716 wx.navigateTo({ 776 wx.navigateTo({
717 - url: '../navigate/navigate?url='+e.currentTarget.dataset.jump, 777 + url: '../navigate/navigate?url=' + jump
718 }) 778 })
  779 + }
719 }, 780 },
720 //切换导航 781 //切换导航
721 changeNav1() { 782 changeNav1() {
@@ -1047,6 +1108,8 @@ Page({ @@ -1047,6 +1108,8 @@ Page({
1047 onUnload: function() { 1108 onUnload: function() {
1048 let st=this.data.st 1109 let st=this.data.st
1049 clearInterval(st) 1110 clearInterval(st)
  1111 + let sts = this.data.sts
  1112 + clearInterval(sts)
1050 }, 1113 },
1051 1114
1052 /** 1115 /**
@@ -31,20 +31,20 @@ @@ -31,20 +31,20 @@
31 <text class='iconfont icon-fenlei'></text> 31 <text class='iconfont icon-fenlei'></text>
32 </view> 32 </view>
33 </view> 33 </view>
34 - <view class='zuida'> 34 + <view class='zuida'>
35 <block wx:if='{{nav==0}}'> 35 <block wx:if='{{nav==0}}'>
36 <view class='yyh'> 36 <view class='yyh'>
37 <swiper next-margin='40rpx' previous-margin='10rpx' circular='true' autoplay='true' display-multiple-items='1' class='swiper_banner_box' interval='5000'> 37 <swiper next-margin='40rpx' previous-margin='10rpx' circular='true' autoplay='true' display-multiple-items='1' class='swiper_banner_box' interval='5000'>
38 <block wx:for='{{special}}' wx:key='{{item.id}}'> 38 <block wx:for='{{special}}' wx:key='{{item.id}}'>
39 <!-- <swiper-item > --> 39 <!-- <swiper-item > -->
40 - <swiper-item bindtap='jump_special_list' data-specialid='{{item.id}}'> 40 + <swiper-item bindtap='jump_special_list' data-specialid='{{item.id}}' data-url='{{item.outlink}}'>
41 <image src='{{item.image}}' class="slide-image {{currentIndex == 0 ? 'active': ''}} uiuiui"></image> 41 <image src='{{item.image}}' class="slide-image {{currentIndex == 0 ? 'active': ''}} uiuiui"></image>
42 </swiper-item> 42 </swiper-item>
43 </block> 43 </block>
44 </swiper> 44 </swiper>
45 </view> 45 </view>
46 <view class='real_save'> 46 <view class='real_save'>
47 - <view class='safe_box'> 47 + <view class='safe_box'>
48 <view bindtap='go_mind_detect'> 48 <view bindtap='go_mind_detect'>
49 <!-- <view class='real_anxin'> 49 <!-- <view class='real_anxin'>
50 <image src='../imgs/anxin.png' class='anxin'></image> 50 <image src='../imgs/anxin.png' class='anxin'></image>
@@ -94,7 +94,7 @@ @@ -94,7 +94,7 @@
94 <scroll-view class='scroll_box' scroll-x> 94 <scroll-view class='scroll_box' scroll-x>
95 <navigator url='/pages/index/goodsDetial/goodsDetial?id={{item.id}} ' class='new_person_item' wx:for='{{new_person}}' wx:key='{{item.id}}'> 95 <navigator url='/pages/index/goodsDetial/goodsDetial?id={{item.id}} ' class='new_person_item' wx:for='{{new_person}}' wx:key='{{item.id}}'>
96 <view class='position_box'> 96 <view class='position_box'>
97 - <image src='{{imgUrl}}pic1.png'></image> 97 + <image src='{{item.more.thumbnail}}'></image>
98 <view class='goods_name'>{{item.title}}</view> 98 <view class='goods_name'>{{item.title}}</view>
99 <view> 99 <view>
100 <text class='rmb'>￥</text> 100 <text class='rmb'>￥</text>
@@ -130,11 +130,11 @@ @@ -130,11 +130,11 @@
130 <view wx:if='{{wangge==0}}'> 130 <view wx:if='{{wangge==0}}'>
131 <view wx:for='{{product_item}}' wx:key='{{item.id}}'> 131 <view wx:for='{{product_item}}' wx:key='{{item.id}}'>
132 <view class='classfy' bindtap='jump_web' data-jump='{{item.more.banner_url}}' style='padding-top:40rpx;' wx:if='{{item.more.banner!=""}}'> 132 <view class='classfy' bindtap='jump_web' data-jump='{{item.more.banner_url}}' style='padding-top:40rpx;' wx:if='{{item.more.banner!=""}}'>
133 - <image src='{{item.more.banner}}' bindtap=''></image> 133 + <image src='{{item.more.banner}}'></image>
134 </view> 134 </view>
135 <view class='goodbox'> 135 <view class='goodbox'>
136 - <view class='good_item' wx:for='{{item.product_item}}' wx:key='{{item.id}}' data-goods='{{item.id}}'>  
137 - <view class='good_img' bindtap='get_goodsDetial' data-goods='{{item.id}}'> 136 + <view class='good_item' wx:for='{{item.product_item}}' wx:key='{{item.id}}' data-goods='{{item.id}}' bindtap='get_goodsDetial'>
  137 + <view class='good_img'>
138 <image src='{{item.label}}' class='label_image'></image> 138 <image src='{{item.label}}' class='label_image'></image>
139 <image class='goods_img_image' src='{{item.more.thumbnail}}'></image> 139 <image class='goods_img_image' src='{{item.more.thumbnail}}'></image>
140 </view> 140 </view>
@@ -171,18 +171,27 @@ @@ -171,18 +171,27 @@
171 <view class='goodbox goods_margin_top'> 171 <view class='goodbox goods_margin_top'>
172 <view class='good_item' wx:for='{{groupList}}' wx:key='{{item.id}}' data-goods='{{item.id}}' bindtap='get_goodsDetial' data-goods='{{item.id}}'> 172 <view class='good_item' wx:for='{{groupList}}' wx:key='{{item.id}}' data-goods='{{item.id}}' bindtap='get_goodsDetial' data-goods='{{item.id}}'>
173 <view class='good_img'> 173 <view class='good_img'>
  174 + <image src='../imgs/pintuanchenggong.png' class='pintuan_img' wx:if='{{item.group_number==item.group_min_number&&item.group_status==3}}'></image>
  175 + <image src='../imgs/pintuanshibai.png' class='pintuan_img' wx:if='{{item.group_number<item.group_min_number&&item.group_status==3}}'></image>
174 <image src='{{item.label}}' class='label_image'></image> 176 <image src='{{item.label}}' class='label_image'></image>
175 <image class='goods_img_image' src='{{item.more.thumbnail}}'></image> 177 <image class='goods_img_image' src='{{item.more.thumbnail}}'></image>
176 <view class='group_time {{item.group_status==3?"active":""}} {{item.group_status==2?"activity":""}}'> 178 <view class='group_time {{item.group_status==3?"active":""}} {{item.group_status==2?"activity":""}}'>
177 - <view wx:if='{{item.group_status==3}}'>已结束</view>  
178 - <view wx:else>  
179 - 距  
180 - <text wx:if='{{item.group_status==1}}'>开始\t\t\t</text>  
181 - <text wx:elif='{{item.group_status==2}}' style='margin-left:-4rpx;'>结束</text> {{item.days}}天{{item.hours}}时{{item.minutes}}分 179 + <view wx:if='{{item.group_status==3}}'>
  180 + <text wx:if='{{item.group_number==item.group_min_number}}'>拼团成功</text>
  181 + <text>拼团失败</text>
  182 + </view>
  183 + <view wx:else class=''>
  184 +
  185 + <text wx:if='{{item.group_status==1}}'> 距开始{{item.daysa}}天{{item.hoursa}}时{{item.minutesa}}分</text>
  186 + <text wx:elif='{{item.group_status==2}}' style='margin-left:-4rpx;'>
  187 + <text wx:if='{{item.group_number<item.group_min_number}}'> 距结束{{item.days}}天{{item.hours}}时{{item.minutes}}分</text>
  188 + <text wx:elif='{{item.group_number==item.group_min_number}}'>拼团成功</text>
  189 + </text>
182 </view> 190 </view>
183 </view> 191 </view>
184 </view> 192 </view>
185 <view class='good_right goods_right'> 193 <view class='good_right goods_right'>
  194 + <view class='lijicantuan'>立即参团</view>
186 <view class='good_name yititle'>{{item.title}}</view> 195 <view class='good_name yititle'>{{item.title}}</view>
187 <view class='good_stand'></view> 196 <view class='good_stand'></view>
188 <view class='good_price_progressaa'> 197 <view class='good_price_progressaa'>
@@ -206,7 +215,7 @@ @@ -206,7 +215,7 @@
206 </view> 215 </view>
207 </view> 216 </view>
208 <view wx:if='{{wangge==1}}' class='wangge_box'> 217 <view wx:if='{{wangge==1}}' class='wangge_box'>
209 - <view wx:for='{{product_item}}' wx:key='{{item.id}}'> 218 + <view wx:for='{{product_item}}' wx:key='{{item.id}}' >
210 <view class='classfy' bindtap='jump_web' wx:if='{{item.more.banner!=""}}' data-jump='{{item.more.banner_url}}' style='padding-top:40rpx;' wx:if='{{item.more.banner!=""}}'> 219 <view class='classfy' bindtap='jump_web' wx:if='{{item.more.banner!=""}}' data-jump='{{item.more.banner_url}}' style='padding-top:40rpx;' wx:if='{{item.more.banner!=""}}'>
211 <image src='{{item.more.banner}}'></image> 220 <image src='{{item.more.banner}}'></image>
212 </view> 221 </view>
@@ -249,7 +258,7 @@ @@ -249,7 +258,7 @@
249 <image src='{{item.more.banner}}'></image> 258 <image src='{{item.more.banner}}'></image>
250 </view> --> 259 </view> -->
251 <view class='collocation collections'> 260 <view class='collocation collections'>
252 - <view class='collocation_box' wx:for='{{groupList}}' wx:key='{{item.id}}' data-goods='{{item.id}}' bindtap=' get_goodsDetial'> 261 + <view class='collocation_box' wx:for='{{groupList}}' wx:key='{{index}}' wx:for-index='index' data-goods='{{item.id}}' bindtap=' get_goodsDetial'>
253 <view class='collocation_img'> 262 <view class='collocation_img'>
254 <view> 263 <view>
255 <view wx:if='{{item.group_status==3}}' class='zhongtu_position active'>已结束</view> 264 <view wx:if='{{item.group_status==3}}' class='zhongtu_position active'>已结束</view>
@@ -259,7 +268,7 @@ @@ -259,7 +268,7 @@
259 距 268 距
260 <text wx:if='{{item.group_status==1}}'>开始\t\t\t</text> 269 <text wx:if='{{item.group_status==1}}'>开始\t\t\t</text>
261 <!-- <text wx:elif='{{item.group_status==2}}'>结束\t\t\t</text> {{item.days}}天{{item.hours}}小时{{item.minutes}}分 --> 270 <!-- <text wx:elif='{{item.group_status==2}}'>结束\t\t\t</text> {{item.days}}天{{item.hours}}小时{{item.minutes}}分 -->
262 - <text wx:elif='{{item.group_status==2}}'>结束\t\t\t</text> {{item.days}}:{{item.hours}}:{{item.minutes}}:{{item.seconds}} 271 + <text wx:elif='{{item.group_status==2}}'>结束\t\t\t</text>{{item.days}}天 {{item.hours}}时{{item.minutes}}分
263 272
264 </view> 273 </view>
265 </view> 274 </view>
@@ -268,7 +277,7 @@ @@ -268,7 +277,7 @@
268 <image class='collocation_img_image_posiimg' src='{{item.label}}'></image> 277 <image class='collocation_img_image_posiimg' src='{{item.label}}'></image>
269 </view> 278 </view>
270 <view class='collocation_content'> 279 <view class='collocation_content'>
271 - 280 +<view class='lijicantuans'>立即参团</view>
272 <view class='zhongtu_title_hei'>{{item.title}}</view> 281 <view class='zhongtu_title_hei'>{{item.title}}</view>
273 282
274 283
@@ -285,9 +294,9 @@ @@ -285,9 +294,9 @@
285 <text class='original_price '>￥{{item.old_price}}</text> 294 <text class='original_price '>￥{{item.old_price}}</text>
286 </view> 295 </view>
287 </view> 296 </view>
288 - <view class='good_btn cart_icon'> 297 + <!-- <view class='good_btn cart_icon'>
289 <view class='iconfont icon-gouwuche' catchtap='show_cart_mask' data-goods='{{item.id}}'></view> 298 <view class='iconfont icon-gouwuche' catchtap='show_cart_mask' data-goods='{{item.id}}'></view>
290 - </view> 299 + </view> -->
291 </view> 300 </view>
292 </view> 301 </view>
293 </view> 302 </view>
@@ -340,7 +349,7 @@ @@ -340,7 +349,7 @@
340 </navigator> 349 </navigator>
341 </view> --> 350 </view> -->
342 <view class='big_img_box'> 351 <view class='big_img_box'>
343 - <view class='goods_for' wx:for='{{groupList}}' wx:key='{{item.id}}' bindtap='get_goodsDetial' data-goods='{{item.id}}'> 352 + <view class='goods_for' wx:for='{{groupList}}' wx:key bindtap='get_goodsDetial' data-goods='{{item.id}}'>
344 <view class='goods_for_img'> 353 <view class='goods_for_img'>
345 <image class='goods_for_img_image' src='{{item.more.thumbnail}}'></image> 354 <image class='goods_for_img_image' src='{{item.more.thumbnail}}'></image>
346 <image class='goods_for_img_image_posiimg' src='{{item.more.thumbnail}}'></image> 355 <image class='goods_for_img_image_posiimg' src='{{item.more.thumbnail}}'></image>
@@ -349,19 +358,20 @@ @@ -349,19 +358,20 @@
349 <view wx:else>距离团购 358 <view wx:else>距离团购
350 <text wx:if=' {{item.group_status==1}} '>开始\t\t\t</text> 359 <text wx:if=' {{item.group_status==1}} '>开始\t\t\t</text>
351 <!-- <text wx:elif='{{item.group_status==2}} '>结束\t\t\t</text> {{item.days}}天{{item.hours}}小时{{item.minutes}}分 --> 360 <!-- <text wx:elif='{{item.group_status==2}} '>结束\t\t\t</text> {{item.days}}天{{item.hours}}小时{{item.minutes}}分 -->
352 - <text wx:elif='{{item.group_status==2}} '>结束\t\t\t</text> {{item.days}}:{{item.hours}}:{{item.minutes}}:{{item.seconds}} 361 + <text wx:elif='{{item.group_status==2}}'>结束\t\t\t</text>{{item.days}}天 {{item.hours}}时{{item.minutes}}分
353 </view> 362 </view>
354 </view> 363 </view>
355 </view> 364 </view>
356 <view class='goods_for_font '> 365 <view class='goods_for_font '>
357 - <view class='good_btn cart_icons '> 366 + <!-- <view class='good_btn cart_icons '>
358 <view class='iconfont icon-gouwuche ' catchtap='show_cart_mask' data-goods='{{item.id}} '></view> 367 <view class='iconfont icon-gouwuche ' catchtap='show_cart_mask' data-goods='{{item.id}} '></view>
359 - </view> 368 + </view> -->
  369 + <view class='lijicantuanss'>立即参团</view>
360 <view class='goods_for_font_one santitle'>{{item.title}}</view> 370 <view class='goods_for_font_one santitle'>{{item.title}}</view>
361 - <progress show-info border-radius='4 ' activeColor='#ffda44 ' stroke-width='8 ' percent='{{item.percent}} ' font-size='12 '></progress> 371 + <progress show-info border-radius='4 ' activeColor='#ffda44 ' stroke-width='8 ' percent='{{item.group_number*10}} ' font-size='12 '></progress>
362 <text class='group_font'>已拼{{item.group_number}}份\t\t\t\t目标{{item.group_min_number}}份</text> 372 <text class='group_font'>已拼{{item.group_number}}份\t\t\t\t目标{{item.group_min_number}}份</text>
363 <view class='goods_for_font_threes'> 373 <view class='goods_for_font_threes'>
364 - <view class='goods_for_font_three_ones '> 374 + <view class='goods_for_font_three_ones'>
365 <view>￥</view> 375 <view>￥</view>
366 {{item.price}} 376 {{item.price}}
367 </view> 377 </view>
@@ -383,7 +393,7 @@ @@ -383,7 +393,7 @@
383 <!-- <scroll-view srcoll-x style='width:100%'> --> 393 <!-- <scroll-view srcoll-x style='width:100%'> -->
384 <!-- <swiper display-multiple-items='{{2}}' class='look_swiper '> --> 394 <!-- <swiper display-multiple-items='{{2}}' class='look_swiper '> -->
385 <!-- <swiper-item circular='true ' class='look_swiper-item ' wx:for='{{commentList}}' wx:key='*this'> --> 395 <!-- <swiper-item circular='true ' class='look_swiper-item ' wx:for='{{commentList}}' wx:key='*this'> -->
386 - <view class='user_look_item ' wx:for='{{commentList}}' wx:key='*this'> 396 + <view class='user_look_item ' wx:for='{{commentList}}' wx:key='{{item.id}}'>
387 <view class='user_look_item_image '> 397 <view class='user_look_item_image '>
388 <image src='{{item.show_img}}'></image> 398 <image src='{{item.show_img}}'></image>
389 </view> 399 </view>
@@ -411,7 +421,7 @@ @@ -411,7 +421,7 @@
411 <swiper wx:if='{{(navsPhotos.length>0)}}' next-margin='40rpx' previous-margin='10rpx' circular='true' autoplay='true' display-multiple-items='1' class='swiper_banner_box {{maodianFlag?"active":""}}' interval='5000'> 421 <swiper wx:if='{{(navsPhotos.length>0)}}' next-margin='40rpx' previous-margin='10rpx' circular='true' autoplay='true' display-multiple-items='1' class='swiper_banner_box {{maodianFlag?"active":""}}' interval='5000'>
412 <block wx:for='{{item.more.photos}}' wx:key='{{item}}'> 422 <block wx:for='{{item.more.photos}}' wx:key='{{item}}'>
413 <!-- next-margin='40rpx' previous-margin='10rpx' circular='true' autoplay='true' display-multiple-items='1' class='swiper_banner_box' --> 423 <!-- next-margin='40rpx' previous-margin='10rpx' circular='true' autoplay='true' display-multiple-items='1' class='swiper_banner_box' -->
414 - <swiper-item bindtap='jump_special_list' data-specialid='{{item.id}}'> 424 + <swiper-item bindtap='jump_special_list' data-url='{{item.jump}}'>
415 <image src='{{item.url}}' class="slide-image uiuiui"></image> 425 <image src='{{item.url}}' class="slide-image uiuiui"></image>
416 </swiper-item> 426 </swiper-item>
417 </block> 427 </block>
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 } 10 }
11 .zuida.active{ 11 .zuida.active{
12 height: 100%; 12 height: 100%;
13 - overflow: hidden 13 + overflow: hidden;
14 } 14 }
15 page { 15 page {
16 /* background-color: #fafafa; */ 16 /* background-color: #fafafa; */
@@ -329,7 +329,7 @@ page { @@ -329,7 +329,7 @@ page {
329 background-color: #fff; 329 background-color: #fff;
330 } 330 }
331 .safe_box { 331 .safe_box {
332 - height: 36rpx; 332 + height:40rpx;
333 display: flex; 333 display: flex;
334 align-items: center; 334 align-items: center;
335 justify-content: space-around; 335 justify-content: space-around;
@@ -395,6 +395,14 @@ page { @@ -395,6 +395,14 @@ page {
395 width: 100%; 395 width: 100%;
396 height: 100% 396 height: 100%
397 } 397 }
  398 +.pintuan_img{
  399 + position: absolute;
  400 + top: 50%;
  401 + left: 50%;
  402 + transform: translate(-50%,-70%);
  403 + width: 90rpx!important;
  404 + height:90rpx!important;
  405 +}
398 .label_image { 406 .label_image {
399 width: 70rpx; 407 width: 70rpx;
400 height: 70rpx; 408 height: 70rpx;
@@ -436,15 +444,18 @@ page { @@ -436,15 +444,18 @@ page {
436 444
437 .goods_right{ 445 .goods_right{
438 padding-top:10rpx; 446 padding-top:10rpx;
439 - box-sizing: border-box 447 + box-sizing: border-box;
  448 + position: relative
440 } 449 }
441 .goods_rights{ 450 .goods_rights{
442 padding-top:30rpx; 451 padding-top:30rpx;
443 box-sizing: border-box; 452 box-sizing: border-box;
444 width: calc(100% - 220rpx); 453 width: calc(100% - 220rpx);
  454 + position: relative
445 } 455 }
446 .goods_right{ 456 .goods_right{
447 - padding-top:8rpx 457 + padding-top:8rpx;
  458 + position: relative
448 } 459 }
449 460
450 .good_price_three { 461 .good_price_three {
@@ -579,7 +590,7 @@ page { @@ -579,7 +590,7 @@ page {
579 width: 267rpx; 590 width: 267rpx;
580 height: 170rpx; 591 height: 170rpx;
581 border-radius: 16rpx; 592 border-radius: 16rpx;
582 - z-index: 10; 593 + /* z-index: 10; */
583 } 594 }
584 595
585 .goods_name { 596 .goods_name {
@@ -619,7 +630,7 @@ page { @@ -619,7 +630,7 @@ page {
619 left: 0; 630 left: 0;
620 background-color: rgba(51,51,51,0.6); 631 background-color: rgba(51,51,51,0.6);
621 /* background: rgba(0,0,0,0.6); */ 632 /* background: rgba(0,0,0,0.6); */
622 - z-index: 9999; 633 + z-index: 999999;
623 display: flex; 634 display: flex;
624 align-items: center; 635 align-items: center;
625 justify-content: center; 636 justify-content: center;
@@ -1175,7 +1186,7 @@ page { @@ -1175,7 +1186,7 @@ page {
1175 font-size:22rpx; 1186 font-size:22rpx;
1176 font-family:PingFang-SC-Medium; 1187 font-family:PingFang-SC-Medium;
1177 font-weight:500; 1188 font-weight:500;
1178 - color:rgba(51,51,51,1); 1189 + color:#fff;
1179 line-height:30rpx; 1190 line-height:30rpx;
1180 padding-left:20rpx; 1191 padding-left:20rpx;
1181 } 1192 }
@@ -1204,6 +1215,7 @@ page { @@ -1204,6 +1215,7 @@ page {
1204 font-size: 30rpx; 1215 font-size: 30rpx;
1205 color: #222; 1216 color: #222;
1206 padding: 22rpx; 1217 padding: 22rpx;
  1218 + position: relative;
1207 } 1219 }
1208 1220
1209 .zhongtu_title_hei{ 1221 .zhongtu_title_hei{
@@ -1401,7 +1413,7 @@ page { @@ -1401,7 +1413,7 @@ page {
1401 font-size:26rpx; 1413 font-size:26rpx;
1402 font-family:PingFang-SC-Medium; 1414 font-family:PingFang-SC-Medium;
1403 font-weight:500; 1415 font-weight:500;
1404 - color:rgba(51,51,51,1); 1416 + color:#fff;
1405 position: absolute; 1417 position: absolute;
1406 bottom:0; 1418 bottom:0;
1407 left: 0 1419 left: 0
@@ -1417,7 +1429,32 @@ page { @@ -1417,7 +1429,32 @@ page {
1417 box-sizing: border-box; 1429 box-sizing: border-box;
1418 position: relative; 1430 position: relative;
1419 } 1431 }
1420 - 1432 +.lijicantuan,.lijicantuans,.lijicantuanss{
  1433 + width: 150rpx;
  1434 + height: 40rpx;
  1435 + line-height: 40rpx;
  1436 + text-align: center;
  1437 + color: #fff;
  1438 + border-radius: 20rpx;
  1439 + background: #ffda44;
  1440 + position: absolute;
  1441 + bottom: 0;
  1442 + right: 20rpx;
  1443 + font-size: 26rpx;
  1444 +}
  1445 +.lijicantuans{
  1446 + width: 130rpx;
  1447 + bottom: 10rpx;
  1448 + font-size: 22rpx;
  1449 + right: 10rpx
  1450 +}
  1451 +.lijicantuanss{
  1452 + width: 200rpx;
  1453 + height: 50rpx;
  1454 + line-height: 50rpx;
  1455 + font-size: 28rpx;
  1456 + border-radius: 50rpx
  1457 +}
1421 .goods_for_font_one { 1458 .goods_for_font_one {
1422 height: 32rpx; 1459 height: 32rpx;
1423 font-size: 30rpx; 1460 font-size: 30rpx;
@@ -1658,7 +1695,7 @@ padding-left: 30rpx @@ -1658,7 +1695,7 @@ padding-left: 30rpx
1658 font-size: 20rpx; 1695 font-size: 20rpx;
1659 font-family: PingFang-SC-Medium; 1696 font-family: PingFang-SC-Medium;
1660 font-weight: 500; 1697 font-weight: 500;
1661 - color: #333; 1698 + color: #fff;
1662 line-height: 54rpx; 1699 line-height: 54rpx;
1663 text-align: center; 1700 text-align: center;
1664 display: flex; 1701 display: flex;
@@ -1953,6 +1990,7 @@ color:rgba(18,25,27,1); @@ -1953,6 +1990,7 @@ color:rgba(18,25,27,1);
1953 position: fixed; 1990 position: fixed;
1954 right: 40rpx; 1991 right: 40rpx;
1955 top:80%; 1992 top:80%;
  1993 + z-index: 9999!important
1956 } 1994 }
1957 .message_kefu{ 1995 .message_kefu{
1958 padding:12rpx 23rpx 0; 1996 padding:12rpx 23rpx 0;
@@ -1965,7 +2003,8 @@ color:rgba(18,25,27,1); @@ -1965,7 +2003,8 @@ color:rgba(18,25,27,1);
1965 margin:0; 2003 margin:0;
1966 padding:0; 2004 padding:0;
1967 color: #000; 2005 color: #000;
1968 - font-size: 18rpx 2006 + font-size: 18rpx;
  2007 + z-index: 9999
1969 } 2008 }
1970 .icon-weixin{ 2009 .icon-weixin{
1971 color: #fff; 2010 color: #fff;
@@ -1998,10 +2037,10 @@ color:rgba(18,25,27,1); @@ -1998,10 +2037,10 @@ color:rgba(18,25,27,1);
1998 } 2037 }
1999 2038
2000 .icon-aaa{ 2039 .icon-aaa{
2001 - font-size: 36rpx!important; 2040 + font-size: 34rpx!important;
2002 color: #222; 2041 color: #222;
2003 font-weight: 500; 2042 font-weight: 500;
2004 - line-height: 36rpx; 2043 + /* line-height:30rpx; */
2005 margin-left: -2rpx 2044 margin-left: -2rpx
2006 } 2045 }
2007 .nopadding{ 2046 .nopadding{
@@ -210,7 +210,8 @@ Page({ @@ -210,7 +210,8 @@ Page({
210 }) 210 })
211 } 211 }
212 this.setData({ 212 this.setData({
213 - show_cart_mask: false 213 + show_cart_mask: false,
  214 + item: 1
214 }); 215 });
215 216
216 }, 217 },
@@ -106,7 +106,7 @@ @@ -106,7 +106,7 @@
106 </view> 106 </view>
107 <view class='collocation_content'> 107 <view class='collocation_content'>
108 108
109 - <view>{{item.title}}</view> 109 + <view class='zhongjianwangge'>{{item.title}}</view>
110 <view class='introduce introduces'>{{item.excerpt}}</view> 110 <view class='introduce introduces'>{{item.excerpt}}</view>
111 <view> 111 <view>
112 <view class='price_big_box'> 112 <view class='price_big_box'>