Commit 2867ffaa223dbfbd6ed40dd6a3cc12ed04262796

Authored by 后端研发-苏明海
2 parents 19361b15 6d332752

Merge branch 'test' into 'qa'

Test

See merge request !100
app.wxss
@@ -2,6 +2,9 @@ @@ -2,6 +2,9 @@
2 .flex { 2 .flex {
3 display: flex; 3 display: flex;
4 } 4 }
  5 +.ib{
  6 + display: inline-block;
  7 +}
5 .flex_auto { 8 .flex_auto {
6 flex: 1; 9 flex: 1;
7 } 10 }
@@ -10,6 +13,7 @@ @@ -10,6 +13,7 @@
10 display: flex; flex-direction: column; 13 display: flex; flex-direction: column;
11 justify-content: space-between; 14 justify-content: space-between;
12 box-sizing: border-box; 15 box-sizing: border-box;
  16 + overflow-x:hidden;
13 } 17 }
14 page { 18 page {
15 overflow-x: hidden; 19 overflow-x: hidden;
@@ -240,9 +244,7 @@ justify-content:space-around; @@ -240,9 +244,7 @@ justify-content:space-around;
240 .t-l{ 244 .t-l{
241 text-align: right; 245 text-align: right;
242 } 246 }
243 -.white{  
244 - color: #fff;  
245 -} 247 +
246 .img_gray{ 248 .img_gray{
247 -webkit-filter: grayscale(1);/* Webkit */ 249 -webkit-filter: grayscale(1);/* Webkit */
248 filter:gray;/* IE6-9 */ 250 filter:gray;/* IE6-9 */
@@ -273,6 +275,7 @@ justify-content:space-around; @@ -273,6 +275,7 @@ justify-content:space-around;
273 font-size:30rpx; 275 font-size:30rpx;
274 } 276 }
275 277
  278 +
276 .fs35{ 279 .fs35{
277 font-size:35rpx; 280 font-size:35rpx;
278 } 281 }
@@ -285,7 +288,9 @@ justify-content:space-around; @@ -285,7 +288,9 @@ justify-content:space-around;
285 288
286 289
287 /* 7.26 */ 290 /* 7.26 */
288 - 291 +.white{
  292 + color: #fff;
  293 +}
289 .red-b{ 294 .red-b{
290 background: #d60021; 295 background: #d60021;
291 } 296 }
@@ -306,15 +311,21 @@ color: #b9b9b9; @@ -306,15 +311,21 @@ color: #b9b9b9;
306 .xc-black{ 311 .xc-black{
307 color: #000; 312 color: #000;
308 } 313 }
  314 +.xc-black3{
  315 + color: #333;
  316 +}
309 317
310 318
311 .xc-fixed{ 319 .xc-fixed{
312 position: fixed; 320 position: fixed;
313 321
314 } 322 }
315 -.yellow{ 323 +.yellow-b{
316 background-color: #ffb03f; 324 background-color: #ffb03f;
317 } 325 }
  326 +.yellow-co{
  327 + color: #ffb03f;
  328 +}
318 .green{ 329 .green{
319 background-color: #16ba63; 330 background-color: #16ba63;
320 } 331 }
@@ -342,8 +353,11 @@ background: #ffe3e2; @@ -342,8 +353,11 @@ background: #ffe3e2;
342 font-size: 24rpx; 353 font-size: 24rpx;
343 } 354 }
344 .fs36 { 355 .fs36 {
345 - font-size: 36rpx; 356 + font-size: 36rpx;
346 } 357 }
347 .fs40 { 358 .fs40 {
348 font-size: 40rpx; 359 font-size: 40rpx;
349 -}  
350 \ No newline at end of file 360 \ No newline at end of file
  361 +}
  362 +.ai_and{
  363 + align-items:flex-end;
  364 +}
components/goods_list/goods_list.js 0 → 100644
  1 +// pages/user/yhq/qr_code/qr_code.js
  2 +
  3 +
  4 +var
  5 + t = getApp(), a = t.request, o = t.globalData.setting, os = o,
  6 + i = require("../../utils/util.js"), ut = i, s = require("../../utils/common.js");
  7 +
  8 +
  9 +Component({
  10 + data: {
  11 + url: o.imghost,
  12 + object: null,
  13 + curPage:1,
  14 + is_no_more:1,//加载完所有数据的控制器
  15 + load_complete:0//加载完成
  16 + },
  17 + properties: {
  18 + // 这里定义了innerText属性,属性值可以在组件使用时指定
  19 + },
  20 + ready: function () {
  21 + },
  22 +
  23 +
  24 + methods: {
  25 +
  26 + get_list:function(){
  27 +
  28 + var that = this;
  29 + if(that.data.is_no_more==0) return false;
  30 +
  31 +
  32 + var curPage = that.data.curPage;
  33 + getApp().request.get('/api/weshop/goods/page?page',{
  34 + data: { is_mainshow: 1, isonsale: 1,
  35 + is_recommend: 1, is_on_sale: 1,
  36 + store_id: o.stoid,
  37 + page: curPage,
  38 + pageSize:6,
  39 + },
  40 + success: function (res){
  41 + var data=res.data;
  42 + var total=data.data.total;
  43 + if (total <= curPage*6){
  44 + that.setData({ is_no_more: 0 });
  45 + }else{
  46 + that.data.curPage++;
  47 + }
  48 +
  49 +
  50 + //加载完成
  51 + if (data.data.pageData) {
  52 + that.setData({load_complete:1});
  53 + }
  54 + if(that.data.recommend!=null){
  55 + var ra=that.data.recommend.concat(data.data.pageData);
  56 + that.setData({ recommend: ra });
  57 + }else{
  58 + that.setData({recommend:data.data.pageData});
  59 + }
  60 + }
  61 + })
  62 + },
  63 + bind_bnerr_xc: function (e) {
  64 + var _errImg = e.target.dataset.errorimg;
  65 + var _errurl = e.target.dataset.url;
  66 +
  67 + var _errObj = {};
  68 + _errObj[_errImg] = "/miniapp/images/default_g_img.gif";
  69 + this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
  70 +
  71 + },
  72 +
  73 + reset:function(){
  74 + curPage=1;
  75 + },
  76 +
  77 +
  78 +
  79 + },
  80 +
  81 +
  82 +
  83 +
  84 +
  85 +})
0 \ No newline at end of file 86 \ No newline at end of file
components/goods_list/goods_list.json 0 → 100644
  1 +{
  2 + "component": true,
  3 + "usingComponents": {}
  4 +}
0 \ No newline at end of file 5 \ No newline at end of file
components/goods_list/goods_list.wxml 0 → 100644
  1 + <!-- 商品列表 -->
  2 + <wxs module="filter" src="../../utils/filter.wxs"></wxs>
  3 + <view class="collects">
  4 + <view class="hang ">
  5 + <!-- 商品详情 -->
  6 + <view class="collect ib" wx:for="{{recommend}}" bindtap="go_url" data-url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}">
  7 + <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}">
  8 + <!-- 商品图片 -->
  9 + <image class="sp" src="{{url+item.original_img}}" mode="scaleToFill" binderror="bind_bnerr_xc" data-url="{{item.original_img}}" data-errorimg="recommend[{{index}}].original_img"></image>
  10 + <view class="bottom">
  11 + <!-- 商品名称 -->
  12 + <view class="goods_name ellipsis-2 fs28">{{item.goods_name}}</view>
  13 + <!-- 商品价格 -->
  14 + <view class="money flex">
  15 + <!-- 办卡价 -->
  16 + <view class="flex xc-wc">
  17 + <view class="fs24">¥</view>
  18 + <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view>
  19 + </view>
  20 + <!-- 原价 -->
  21 + <view class="price flex xc-ash">
  22 + <view class="fs22">¥</view>
  23 + <view class="fs22">{{item.market_price}}</view>
  24 + </view>
  25 + </view>
  26 + </view>
  27 + </navigator>
  28 + </view>
  29 + </view>
  30 + <view class="nothing flex-center" wx:if="{{is_no_more==0}}">
  31 + <view class="Foil"></view>
  32 + <view class="no_content fs24">没有更多内容了</view>
  33 + <view class="Foil"></view>
  34 + </view>
  35 + </view>
  36 +
  37 +
  38 +
0 \ No newline at end of file 39 \ No newline at end of file
components/goods_list/goods_list.wxss 0 → 100644
  1 +.collects {
  2 + margin-top: 40rpx;
  3 +}
  4 +.ib{
  5 + display: inline-block;
  6 +}
  7 +.fs24{
  8 + font-size: 24rpx;
  9 +}
  10 +.flex-center{
  11 +display:flex;
  12 +justify-content:center;
  13 +align-items:center;
  14 +}
  15 +.xc-wc{
  16 + color: #d60021;
  17 +
  18 +}
  19 +.fs22{
  20 + font-size: 22rpx;
  21 +}
  22 +.xc-ash{
  23 +color: #b9b9b9;
  24 +}
  25 +.choice_box .choice_list .choice_footer .price {
  26 + color: #f23030; height: 10px
  27 +}
  28 +.fs35{
  29 + font-size:35rpx;
  30 +}
  31 +.flex{display: flex}
  32 +.ellipsis-2 {
  33 + overflow: hidden;
  34 + text-overflow: ellipsis;
  35 + display: -webkit-box;
  36 + -webkit-box-orient: vertical;
  37 + -webkit-line-clamp: 2;
  38 +}
  39 +.goods_name{
  40 + height: 62rpx;
  41 + margin-top: 6rpx;
  42 + line-height: 30rpx;
  43 +
  44 +
  45 +}
  46 +.hang {
  47 + width: 100%;
  48 + margin: auto;
  49 + padding-left: 21rpx;
  50 +}
  51 +.fs28{
  52 + font-size: 28rpx;
  53 +}
  54 +
  55 +.hang .collect {
  56 + width: 347rpx;
  57 + height: 495rpx;
  58 + border-radius: 25rpx;
  59 + border: 1rpx solid rgb(214, 214, 214);
  60 + overflow: hidden;
  61 + margin-right: 14rpx;
  62 + margin-bottom: 5rpx;
  63 +}
  64 +
  65 +.collect .bottom {
  66 + padding: 0rpx 20rpx;
  67 +}
  68 +
  69 +.collect .sp {
  70 + width: 100%;
  71 + height: 326rpx;
  72 +}
  73 +
  74 +.collect .money {
  75 + margin-top: 30rpx;
  76 + margin-bottom: 18rpx;
  77 + line-height: 28rpx;
  78 + align-items: baseline;
  79 +}
  80 +.collect .money view{
  81 + line-height: 28rpx;
  82 +}
  83 +.collect .money .flex {
  84 + font-weight: bold;
  85 +}
  86 +.collect .money .flex .fs24{
  87 + padding-top: 5rpx;
  88 +}
  89 +.collect .Discount {
  90 + width: 156rpx;
  91 + height: 28rpx;
  92 + border-radius: 20rpx;
  93 + background-color: rgb(56, 56, 56);
  94 + font-size: 18rpx;
  95 + color: rgb(255, 255, 255);
  96 +}
  97 +
  98 +.collect .Discount image {
  99 + height: 18rpx;
  100 + width: 18rpx;
  101 + line-height: 28rpx;
  102 + margin-right: 3rpx;
  103 +}
  104 +
  105 +.collect.ml20 {
  106 + margin-left: 13rpx;
  107 +}
  108 +
  109 +.fs24.dollar {
  110 + padding: 0rpx;
  111 +}
  112 +
  113 +.money .price {
  114 + margin-left: 12rpx;
  115 + text-decoration: line-through;
  116 + line-height: 23rpx;
  117 +}
  118 +
  119 +.province {
  120 + line-height: 26rpx;
  121 +}
  122 +
  123 +.nothing {
  124 + height: 75rpx;
  125 + width: 100%;
  126 +}
  127 +
  128 +.nothing .no_content {
  129 + margin: 0rpx 11rpx;
  130 + color: rgb(138, 138, 138);
  131 +}
  132 +
  133 +.nothing .Foil {
  134 + width: 80rpx;
  135 + height: 2rpx;
  136 + background-color: rgb(138, 138, 138);
  137 +}
0 \ No newline at end of file 138 \ No newline at end of file
pages/activity/pind_list/pind_list.js
1 -var e = getApp(), i = e.request, a = e.globalData.setting,os=a,ut = require("../../../utils/util.js"); 1 +var e = getApp(),
  2 +i = e.request,
  3 + a = e.globalData.setting,
  4 + os=a,ut = require("../../../utils/util.js");
2 var regeneratorRuntime = require('../../../utils/runtime.js'); 5 var regeneratorRuntime = require('../../../utils/runtime.js');
3 6
4 -Page({ 7 +Page({
5 data: { 8 data: {
6 url: a.imghost, 9 url: a.imghost,
7 killtime: null, 10 killtime: null,
@@ -11,6 +14,7 @@ Page({ @@ -11,6 +14,7 @@ Page({
11 timer:null, 14 timer:null,
12 ismore:1, 15 ismore:1,
13 isshow:0, 16 isshow:0,
  17 + iurl: os.imghost,
14 }, 18 },
15 19
16 onShow: function(t) { 20 onShow: function(t) {
@@ -60,7 +64,7 @@ Page({ @@ -60,7 +64,7 @@ Page({
60 let min = parseInt(time % (60 * 60 * 24) % 3600 / 60); 64 let min = parseInt(time % (60 * 60 * 24) % 3600 / 60);
61 let sec = parseInt(time % (60 * 60 * 24) % 3600 % 60); 65 let sec = parseInt(time % (60 * 60 * 24) % 3600 % 60);
62 obj = { 66 obj = {
63 - day: this.timeFormat(day), hou: this.timeFormat(hou), min: this.timeFormat(min), sec: this.timeFormat(sec) 67 + day: this.timeFormat(day), hou: this.timeFormat(hou), min: this.timeFormat(min), sec: this.timeFormat(sec),hide:1
64 } 68 }
65 }else{ 69 }else{
66 //活动已结束,全部设置为'00' 70 //活动已结束,全部设置为'00'
@@ -101,6 +105,7 @@ Page({ @@ -101,6 +105,7 @@ Page({
101 alllist.push(plist[i]); 105 alllist.push(plist[i]);
102 } 106 }
103 e.data.currentPage++; 107 e.data.currentPage++;
  108 +
104 th.setData({goodlist:alllist,isshow:1}); 109 th.setData({goodlist:alllist,isshow:1});
105 }, 110 },
106 111
pages/activity/pind_list/pind_list.wxml
1 <block wx:if="{{isshow}}"> 1 <block wx:if="{{isshow}}">
2 -<view class="kill-time">  
3 - <view class="theader" >  
4 - <view bindtap='tip' data-ty="1" class="timeac left {{type==1?'active':''}}">进行中</view>  
5 - <view bindtap='tip' data-ty="0" class="timeac right {{type==0?'active':''}}">即将开始</view>  
6 - </view>  
7 -</view> 2 +
  3 +<view class=" body_frame">
  4 +
  5 +<image class="xc-top-img" src="{{url}}/miniapp/images/team.jpg">
  6 +</image>
  7 +
8 <view class="kill-list"> 8 <view class="kill-list">
9 - <view class="kill-item" wx:for="{{goodlist}}" >  
10 - <navigator class="kill-pic" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}"> 9 + <view class="kill-item" wx:for="{{goodlist}}" wx:if="{{item.djs.hide==1}}">
  10 + <navigator class="kill-pic " url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}">
11 <image class="wh100" src="{{url+item.original_img}}" data-val="{{item.original_img}}" 11 <image class="wh100" src="{{url+item.original_img}}" data-val="{{item.original_img}}"
12 data-errorimg="goodlist[{{index}}].original_img" binderror="bind_bnerr2" lazy-load="true"></image> 12 data-errorimg="goodlist[{{index}}].original_img" binderror="bind_bnerr2" lazy-load="true"></image>
13 - <view wx:if="{{item.kttype==1}}" class="tbiao">商家团</view>  
14 - <view wx:if="{{item.kttype==2}}" class="tbiao">会员团</view>  
15 - <view wx:if="{{item.kttype==3}}" class="tbiao">阶梯团</view> 13 +
16 </navigator> 14 </navigator>
17 <view class="kill-cont"> 15 <view class="kill-cont">
18 <navigator class="goods-name ellipsis-2" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}">{{item.title}}</navigator> 16 <navigator class="goods-name ellipsis-2" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}">{{item.title}}</navigator>
19 - <view class="tneirong">已团{{item.buy_num}}件 {{item.ct_num}}人团</view>  
20 - <view class="goods-num">  
21 - <view>  
22 - <view class="co-red">¥{{item.price}}<span class="underline">¥{{item.market_price}}</span></view>  
23 - <view> 17 + <view class="flex">
  18 + <view class="tneirong red-b flex-vertical rel" wx:if="{{type==1}}">
  19 + <image class="xc-team-img abs" src="{{url}}/miniapp/images/fril.png"></image>
  20 + 已拼{{item.buy_num}}份</view>
  21 + <view class="fs20 flex xc-people-val-frame"
  22 + style="border-color:{{type==1?'#d60021':'#059de5'}};margin-left:{{type==1?'15rpx':'0rpx'}}">
  23 + <view class=" flex-center val-img {{type==1?'red-b':'blue_b'}}">
  24 + <image class="people-img"src="{{iurl}}/miniapp/images/bai-ren.png"></image>
  25 + </view>
  26 + <text class="{{type==1?'red-co':'blue_c ai-bas'}}" style="margin-left:8rpx; margin-right:8rpx">{{item.ct_num}}人团</text>
  27 + </view>
  28 + <view class="fs20 blue_c time-blue" wx:if="{{type==0}}">
  29 + 距开始:
  30 + <text class='tui-conutdown-box'>{{item.djs.day}}</text>天
  31 + <text class='tui-conutdown-box'>{{item.djs.hou}}</text>时
  32 + <text class='tui-conutdown-box'>{{item.djs.min}}</text>分
  33 + <text class='tui-conutdown-box tui-countdown-bg'>{{item.djs.sec}}</text>秒
  34 + </view>
  35 +
  36 +
  37 + </view>
  38 + <view class="fs24 red-co" wx:if="{{type==1}}">
24 <text class='tui-conutdown-box'>{{item.djs.day}}</text>天 39 <text class='tui-conutdown-box'>{{item.djs.day}}</text>天
25 <text class='tui-conutdown-box'>{{item.djs.hou}}</text>时 40 <text class='tui-conutdown-box'>{{item.djs.hou}}</text>时
26 <text class='tui-conutdown-box'>{{item.djs.min}}</text>分 41 <text class='tui-conutdown-box'>{{item.djs.min}}</text>分
27 <text class='tui-conutdown-box tui-countdown-bg'>{{item.djs.sec}}</text>秒 42 <text class='tui-conutdown-box tui-countdown-bg'>{{item.djs.sec}}</text>秒
28 </view> 43 </view>
  44 + <view class="goods-num"style="margin-top:{{type==0?'42rpx':'18rpx'}}">
  45 + <view>
  46 +
  47 + <view class="fs40 flex xc-top15 {{type==1?'red-co ai-bas':'blue_c xc-lihe42 ai-bas'}}">
  48 + <text class="fs28 {{type==0?'martop13':''}}">¥</text>
  49 + <text style="margin-left:-5rpx">{{item.price}}</text>
  50 + <span class="underline {{type==0?'martop18':''}}">零售价¥{{item.market_price}}</span>
  51 + </view>
  52 +
29 </view> 53 </view>
30 - <view class="kill-btn ">  
31 - <navigator class="huise" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" wx:if="{{type==0 && item.kttype==1 }}" >去参团</navigator>  
32 - <navigator class="huise" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" wx:if="{{type==0 && item.kttype==2 }}" >去开团</navigator>  
33 - <navigator class="huise" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" wx:if="{{type==0 && item.kttype==3 }}" >去开团</navigator> 54 + <view class="kill-btn">
  55 + <navigator class="huise"style="background-color: #059de5;" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" wx:if="{{type==0 && item.kttype==1 }}">即将开始</navigator>
  56 + <navigator class="huise"style="background-color: #059de5;" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" wx:if="{{type==0 && item.kttype==2 }}" >即将开始</navigator>
  57 + <navigator class="huise"style="background-color: #059de5;" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" wx:if="{{type==0 && item.kttype==3 }}" >即将开始</navigator>
34 58
35 - <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" wx:if="{{item.status==1 && type==1 && item.kttype==1}}">去参团</navigator> 59 + <navigator class="blue_b" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" wx:if="{{item.status==1 && type==1 && item.kttype==1}}">去参团</navigator>
36 <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" wx:if="{{item.status==1 && type==1 && item.kttype==2}}">去开团</navigator> 60 <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" wx:if="{{item.status==1 && type==1 && item.kttype==2}}">去开团</navigator>
37 <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" wx:if="{{item.status==1 && type==1 && item.kttype==3}}">去开团</navigator> 61 <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" wx:if="{{item.status==1 && type==1 && item.kttype==3}}">去开团</navigator>
38 62
@@ -41,7 +65,23 @@ @@ -41,7 +65,23 @@
41 </view> 65 </view>
42 </view> 66 </view>
43 </view> 67 </view>
  68 + <view style="height:120rpx"></view>
  69 +</view>
  70 +<view class="kill-time xc-seckill-bottom">
  71 +
  72 + <view class="theader" >
  73 + <view bindtap='tip' data-ty="1" class="xc-border-right flex-center timeac left {{type==1?'active':''}}">
  74 + <image class="xc-bottom"
  75 + src="{{type==1?'{{url}}/miniapp/images/fire-red.png':'{{url}}/miniapp/images/fire-black.png'}}"></image>
  76 + 火热进行中</view>
  77 + <view bindtap='tip' data-ty="0" class=" flex-center timeac right {{type==0?'active':''}}">
  78 + <image class="xc-bottom"
  79 + src="{{type==0?'{{url}}/miniapp/images/clock-rad.png':'{{url}}/miniapp/images/clock-black.png'}}"></image>
  80 + 即将开始</view>
  81 + </view>
  82 +
44 </view> 83 </view>
45 84
46 <view class="no-more" wx:if="{{goodlist.length==0}}">没有相关内容</view> 85 <view class="no-more" wx:if="{{goodlist.length==0}}">没有相关内容</view>
  86 +</view>
47 </block> 87 </block>
48 \ No newline at end of file 88 \ No newline at end of file
pages/activity/pind_list/pind_list.wxss
  1 +page{
  2 + background: #eee
  3 +}
  4 +.kill-list{
  5 + width: 95%;
  6 + margin-top: -50rpx;
  7 + position:absolute;
  8 + left: 2.5%;
  9 +
  10 +}
  11 +
1 .kill-time { 12 .kill-time {
2 text-align: center; 13 text-align: center;
3 justify-content: space-around; 14 justify-content: space-around;
4 align-items: center; 15 align-items: center;
5 - height: 178rpx; 16 + height: 101rpx;
6 border-bottom: 1px solid #ddd; 17 border-bottom: 1px solid #ddd;
7 border-top: 1px solid #ddd; 18 border-top: 1px solid #ddd;
8 background-color: #f6f6f6; 19 background-color: #f6f6f6;
9 } 20 }
10 .kill-time .theader{ 21 .kill-time .theader{
11 - width: 86%; display: flex; margin: 0 auto; 22 + display: flex; margin: 0 auto; align-items: center;
  23 + height: 100rpx;
  24 +
12 } 25 }
13 26
  27 +
14 .kill-time .theader .timeac { 28 .kill-time .theader .timeac {
15 - font-size: 32rpx; height: 78rpx; line-height:78rpx; width: 50%; margin-top: 50rpx; 29 + font-size: 32rpx; height:100%; width: 50%;
16 color: #333; background-color: #fff; 30 color: #333; background-color: #fff;
  31 +
17 } 32 }
18 -.kill-time .theader .timeac.left{border-top-left-radius: 86rpx; border-bottom-left-radius: 86rpx;}  
19 -.kill-time .theader .timeac.right{border-top-right-radius: 86rpx; border-bottom-right-radius: 86rpx;}  
20 -.kill-time .theader .timeac.active{background-color: #c4182e;color: #fff} 33 +
  34 +/* .kill-time .theader .timeac.left{border-top-left-radius: 86rpx; border-bottom-left-radius: 86rpx;}
  35 +.kill-time .theader .timeac.right{border-top-right-radius: 86rpx; border-bottom-right-radius: 86rpx;} */
  36 +.kill-time .theader .timeac.active{color: #c4182e}
  37 +
21 38
22 .kill-item { 39 .kill-item {
23 - display: flex; 40 + display: flex;
24 justify-content: space-between; 41 justify-content: space-between;
25 background-color: #fff; 42 background-color: #fff;
26 padding: 10rpx 20rpx; 43 padding: 10rpx 20rpx;
27 margin-bottom: 10rpx; 44 margin-bottom: 10rpx;
  45 + border-radius: 10rpx;
  46 + height: 249rpx;
  47 + align-items: center;
  48 + padding-left: 20rpx;
  49 +
  50 +
28 } 51 }
29 52
30 .kill-pic { 53 .kill-pic {
31 - width: 200rpx;  
32 - height: 200rpx; 54 + width: 215rpx;
  55 + height: 215rpx;
33 position: relative; 56 position: relative;
34 } 57 }
35 58
@@ -40,23 +63,28 @@ @@ -40,23 +63,28 @@
40 } 63 }
41 64
42 .kill-cont { 65 .kill-cont {
43 - width: 480rpx; 66 + width: 440rpx;
  67 + height: 215rpx;
  68 + margin-left: 16rpx;
44 } 69 }
45 70
46 .goods-name { 71 .goods-name {
47 - height: 48rpx;  
48 - line-height: 48rpx;  
49 - font-size: 24rpx;  
50 - color: #555; 72 + height: 60rpx;
  73 + margin-bottom: 18rpx;
  74 + font-size: 27rpx;
  75 + color: #555;
  76 + line-height: 30rpx;
  77 +
51 } 78 }
52 79
53 .goods-num { 80 .goods-num {
54 - padding-top: 10rpx; 81 + height: 60rpx;
55 display: flex; 82 display: flex;
56 justify-content: space-between; 83 justify-content: space-between;
57 - line-height: 42rpx; 84 + margin-top: 10rpx;
58 font-size: 24rpx; 85 font-size: 24rpx;
59 color: #999; 86 color: #999;
  87 + align-items: center;
60 } 88 }
61 89
62 .goods-num .co-red { 90 .goods-num .co-red {
@@ -70,12 +98,18 @@ @@ -70,12 +98,18 @@
70 98
71 .kill-btn { 99 .kill-btn {
72 text-align: right; 100 text-align: right;
  101 + padding-top: 15rpx;
  102 +
73 } 103 }
74 104
  105 +
75 .kill-btn>navigator { 106 .kill-btn>navigator {
76 padding: 0 20rpx; 107 padding: 0 20rpx;
77 background: #e23245; 108 background: #e23245;
78 color: #fff; 109 color: #fff;
  110 + border-radius: 20rem;
  111 +line-height: 43rpx;
  112 +margin-top: 4rpx;
79 } 113 }
80 114
81 .kill-btn .gray { 115 .kill-btn .gray {
@@ -89,5 +123,76 @@ @@ -89,5 +123,76 @@
89 color: #333; 123 color: #333;
90 } 124 }
91 125
92 -.kill-btn>navigator.huise{background-color: gainsboro;}  
93 -.tneirong{color:#555; font-size: 21rpx;}  
94 \ No newline at end of file 126 \ No newline at end of file
  127 +.kill-btn>navigator.huise{background-color:#999999;}
  128 +.tneirong{
  129 + color:#fff;
  130 + font-size: 20rpx;
  131 + border-radius:20rpx;
  132 + padding-left: 32rpx;
  133 + padding-right: 15rpx;
  134 + padding-bottom: 2rpx;
  135 + height: 28rpx;
  136 + line-height: 28rpx;
  137 +
  138 +
  139 + }
  140 +.body_frame {
  141 +width: 100%;
  142 +height: 100%;
  143 +
  144 +}
  145 +.xc-top-img{
  146 + width: 100%;
  147 + height: 333rpx;
  148 + margin-top: 5rpx;
  149 +
  150 +}
  151 +.xc-seckill-bottom{
  152 + position: fixed;
  153 +bottom: 0rpx;
  154 +width: 100%;
  155 +}
  156 +.xc-bottom{
  157 + width: 45rpx;
  158 + height: 45rpx;
  159 + margin-right: 13rpx;
  160 +}
  161 +.xc-border-right{
  162 + border-right: 4rpx solid #eee;
  163 +}
  164 +.xc-team-img{
  165 +width:38rpx;
  166 +height: 45rpx;
  167 +left: -1rpx;
  168 +top: -16rpx;
  169 +}
  170 +
  171 +.xc-people-val-frame{
  172 + border: 3rpx solid #d60021;border-radius: 8rpx;overflow: hidden;
  173 +
  174 +}
  175 +.xc-people-val-frame .val-img{
  176 +width:33rpx;height:28rpx;border-radius: 8rpx;margin-left: -2rpx;
  177 +}
  178 +.xc-top15{
  179 + padding-top: 15rpx;
  180 + margin-top: 6rpx;
  181 +}
  182 +.people-img{
  183 + width:20rpx;height:20rpx
  184 +}
  185 +.time-blue{
  186 +margin-left: 10rpx;
  187 +}
  188 +.martop13{
  189 +margin-top:4rpx;
  190 +
  191 +}
  192 +.martop18{
  193 +margin-top: 8rpx;
  194 +
  195 +}
  196 +.xc-lihe42{
  197 + height: 60rpx;
  198 +
  199 +}
95 \ No newline at end of file 200 \ No newline at end of file
pages/activity/seckill_list/seckill_list.js
@@ -58,11 +58,11 @@ Page({ @@ -58,11 +58,11 @@ Page({
58 let min = parseInt(time % (60 * 60 * 24) % 3600 / 60); 58 let min = parseInt(time % (60 * 60 * 24) % 3600 / 60);
59 let sec = parseInt(time % (60 * 60 * 24) % 3600 % 60); 59 let sec = parseInt(time % (60 * 60 * 24) % 3600 % 60);
60 obj = { 60 obj = {
61 - day: this.timeFormat(day), hou: this.timeFormat(hou), min: this.timeFormat(min), sec: this.timeFormat(sec) 61 + day: this.timeFormat(day), hou: this.timeFormat(hou), min: this.timeFormat(min), sec: this.timeFormat(sec), hide: 1
62 } 62 }
63 }else{ 63 }else{
64 //活动已结束,全部设置为'00' 64 //活动已结束,全部设置为'00'
65 - obj = { day: '00', hou: '00', min: '00', sec: '00' } 65 + obj = { day: '00', hou: '00', min: '00', sec: '00' }
66 } 66 }
67 var txt ="goodlist["+i+"].djs"; 67 var txt ="goodlist["+i+"].djs";
68 th.setData({ [txt]: obj}); 68 th.setData({ [txt]: obj});
@@ -80,6 +80,7 @@ Page({ @@ -80,6 +80,7 @@ Page({
80 {isShowLoading:1,data:{store_id:os.stoid,timetype:th.data.type,is_end:0,is_show:1}} 80 {isShowLoading:1,data:{store_id:os.stoid,timetype:th.data.type,is_end:0,is_show:1}}
81 ).then(res=>{ 81 ).then(res=>{
82 plist=res.data.data.pageData; 82 plist=res.data.data.pageData;
  83 + console.log("是什么即将开始",plist);
83 }); 84 });
84 85
85 if(plist.length<=0){ 86 if(plist.length<=0){
@@ -101,6 +102,7 @@ Page({ @@ -101,6 +102,7 @@ Page({
101 alllist.push(plist[i]); 102 alllist.push(plist[i]);
102 } 103 }
103 e.data.currentPage++; 104 e.data.currentPage++;
  105 + console.log("秒杀商品列表", alllist);
104 th.setData({goodlist:alllist,isshow:1}); 106 th.setData({goodlist:alllist,isshow:1});
105 107
106 }, 108 },
pages/activity/seckill_list/seckill_list.wxml
  1 +<wxs module="filters" src="../../../utils/filter.wxs"></wxs>
1 <block wx:if="{{isshow}}"> 2 <block wx:if="{{isshow}}">
2 -<view class="kill-time">  
3 - <view class="theader" >  
4 - <view bindtap='tip' data-ty="1" class="timeac left {{type==1?'active':''}}">秒杀中</view>  
5 - <view bindtap='tip' data-ty="0" class="timeac right {{type==0?'active':''}}">即将秒杀</view>  
6 - </view>  
7 -</view>  
8 -<view class="kill-list">  
9 - <view class="kill-item" wx:for="{{goodlist}}" >  
10 - <navigator class="kill-pic" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}"> 3 +<view class=" body_frame">
  4 +
  5 +<image class="xc-top-img" src="{{url}}/miniapp/images/seckill_top_img.jpg">
  6 +</image>
  7 +
  8 +
  9 +<view class="kill-list abs seckill_list">
  10 + <view class="kill-item" wx:for="{{goodlist}}" wx:if="{{item.djs.hide}}" >
  11 + <navigator class="kill-pic rel" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}">
  12 + <image class="abs xc-miaosha" src="{{url}}/miniapp/images/zms.png"></image>
11 <image class="wh100" src="{{url+item.original_img}}" data-val="{{item.original_img}}" 13 <image class="wh100" src="{{url+item.original_img}}" data-val="{{item.original_img}}"
12 data-errorimg="goodlist[{{index}}].original_img" binderror="bind_bnerr2" lazy-load="true"></image> 14 data-errorimg="goodlist[{{index}}].original_img" binderror="bind_bnerr2" lazy-load="true"></image>
13 </navigator> 15 </navigator>
14 <view class="kill-cont"> 16 <view class="kill-cont">
15 <navigator class="goods-name ellipsis-2" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}">{{item.title}}</navigator> 17 <navigator class="goods-name ellipsis-2" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}">{{item.title}}</navigator>
  18 + <view class="flex-vertical xc-strip-frame">
  19 + <view class="xc-strip-blank rel">
  20 +
  21 + <view class="flex-vertical rel total">
  22 + <view class="t-c abs xc-fill"style="width:{{type==1?100-(item.buy_num+item.virtual) /(item.goods_num+item.virtual)*100:'100'}}%;background:{{type==1?'#e4374d':'#059de5'}};">
  23 + </view>
  24 + <text class="fs20 white abs xc-fill-text" style="">剩余{{type==1?filters.toFix(100-(item.buy_num+item.virtual)/(item.goods_num+item.virtual)*100,0):'100'}}%</text>
  25 + </view>
  26 +
  27 + </view>
  28 + <view class=" ml10 fs20 " > 已抢{{item.buy_num+item.virtual}}件</view>
  29 + </view>
  30 +
  31 +
16 <view class="goods-num"> 32 <view class="goods-num">
17 <view> 33 <view>
18 - <view class="co-red">¥{{item.price}}<span class="underline">¥{{item.market_price}}</span></view>  
19 - <view>  
20 - <text class='tui-conutdown-box'>{{item.djs.day}}</text>天 34 + <view class="{{type==1?'xc-wc':'blue_c'}}">
  35 + <text>剩余:</text>
  36 + <text class='tui-conutdown-box'> {{item.djs.day}}</text>天
21 <text class='tui-conutdown-box'>{{item.djs.hou}}</text>时 37 <text class='tui-conutdown-box'>{{item.djs.hou}}</text>时
22 <text class='tui-conutdown-box'>{{item.djs.min}}</text>分 38 <text class='tui-conutdown-box'>{{item.djs.min}}</text>分
23 <text class='tui-conutdown-box tui-countdown-bg'>{{item.djs.sec}}</text>秒 39 <text class='tui-conutdown-box tui-countdown-bg'>{{item.djs.sec}}</text>秒
24 </view> 40 </view>
  41 + <view class="fs40 flex xc-buttom-money {{type==1?'xc-wc':'blue_c'}}" >
  42 + <view class="fs28" style="line-height: 16px;">¥</view>
  43 + <text>{{item.price}}</text>
  44 + <span class="underline fs20">零售价¥{{item.market_price}}</span></view>
  45 +
25 </view> 46 </view>
26 <view class="kill-btn "> 47 <view class="kill-btn ">
27 - <navigator class="huise" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" wx:if="{{type==0}}" >马上抢</navigator> 48 + <navigator style="background-color: #059de5;" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" wx:if="{{type==0}}" >立即开始</navigator>
28 <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" wx:if="{{item.status==1 && type==1}}">马上抢</navigator> 49 <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" wx:if="{{item.status==1 && type==1}}">马上抢</navigator>
29 - <navigator class="huise" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" wx:if="{{item.status==3 && type==1}}">已抢光</navigator> 50 + <navigator class="huise"url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" wx:if="{{item.status==3 && type==1}}">已抢光</navigator>
30 </view> 51 </view>
31 </view> 52 </view>
32 </view> 53 </view>
33 </view> 54 </view>
  55 + <view style="height:120rpx"></view>
34 </view> 56 </view>
  57 +<view class="kill-time xc-seckill-bottom">
  58 + <view class="theader" >
  59 + <view bindtap='tip' data-ty="1" class="xc-border-right flex-center timeac left {{type==1?'active':''}}">
  60 + <image class="xc-bottom"
  61 + src="{{type==1?'{{url}}/miniapp/images/fire-red.png':'{{url}}/miniapp/images/fire-black.png'}}"></image>
  62 + 火热进行中</view>
  63 + <view bindtap='tip' data-ty="0" class=" flex-center timeac right {{type==0?'active':''}}">
  64 + <image class="xc-bottom"
  65 + src="{{type==0?'{{url}}/miniapp/images/clock-rad.png':'{{url}}/miniapp/images/clock-black.png'}}"></image>
  66 + 即将开始</view>
  67 + </view>
  68 +</view>
  69 +
  70 +
35 <view class="no-more" wx:if="{{goodlist.length==0}}">没有相关内容</view> 71 <view class="no-more" wx:if="{{goodlist.length==0}}">没有相关内容</view>
  72 +</view>
  73 +
36 </block> 74 </block>
pages/activity/seckill_list/seckill_list.wxss
  1 + page{
  2 + background: #eee;
  3 + color: #333;
  4 + }
  5 + .body_frame{
  6 + width: 100%;
  7 + height: 100%;
  8 +
  9 + }
  10 +.xc-top-img{
  11 + width: 100%;
  12 + height: 333rpx;
  13 + margin-top: 5rpx;
  14 +}
  15 +.kill-list{
  16 + /* height: 807rpx; */
  17 + /* overflow-y: scroll; */
  18 +}
  19 +.seckill_list{
  20 +margin-top: -50rpx;
  21 +left: 2%;
  22 +}
  23 +.seckill{
  24 + width: 95%;
  25 +margin: auto;
  26 +
  27 +}
1 .kill-time { 28 .kill-time {
2 text-align: center; 29 text-align: center;
3 justify-content: space-around; 30 justify-content: space-around;
4 align-items: center; 31 align-items: center;
5 - height: 178rpx; 32 + height: 101rpx;
6 border-bottom: 1px solid #ddd; 33 border-bottom: 1px solid #ddd;
7 border-top: 1px solid #ddd; 34 border-top: 1px solid #ddd;
8 background-color: #f6f6f6; 35 background-color: #f6f6f6;
9 } 36 }
10 .kill-time .theader{ 37 .kill-time .theader{
11 - width: 86%; display: flex; margin: 0 auto; 38 + display: flex; margin: 0 auto; align-items: center;
  39 + height: 100rpx;
  40 +
12 } 41 }
13 .kill-time .theader .timeac { 42 .kill-time .theader .timeac {
14 - font-size: 32rpx; height: 78rpx; line-height:78rpx; width: 50%; margin-top: 50rpx; 43 + font-size: 32rpx; height:100%; width: 50%;
15 color: #333; background-color: #fff; 44 color: #333; background-color: #fff;
  45 +
16 } 46 }
17 -.kill-time .theader .timeac.left{border-top-left-radius: 86rpx; border-bottom-left-radius: 86rpx;}  
18 -.kill-time .theader .timeac.right{border-top-right-radius: 86rpx; border-bottom-right-radius: 86rpx;}  
19 -.kill-time .theader .timeac.active{background-color: #c4182e;color: #fff} 47 +/* .kill-time .theader .timeac.left{border-top-left-radius: 86rpx; border-bottom-left-radius: 86rpx;}
  48 +.kill-time .theader .timeac.right{border-top-right-radius: 86rpx; border-bottom-right-radius: 86rpx;} */
  49 +.kill-time .theader .timeac.active{color: #c4182e}
20 50
21 .kill-item { 51 .kill-item {
22 display: flex; 52 display: flex;
23 justify-content: space-between; 53 justify-content: space-between;
24 background-color: #fff; 54 background-color: #fff;
25 - padding: 10rpx 20rpx; 55 + padding: 10rpx 10rpx;
26 margin-bottom: 10rpx; 56 margin-bottom: 10rpx;
  57 + border-radius: 10rpx;
  58 + height: 249rpx;
  59 + align-items: center;
27 } 60 }
28 61
29 .kill-pic { 62 .kill-pic {
30 - width: 200rpx;  
31 - height: 200rpx; 63 + width: 215rpx;
  64 + height: 215rpx;
32 } 65 }
33 66
34 .kill-cont { 67 .kill-cont {
35 - width: 480rpx; 68 + width: 465rpx;
  69 + margin-left:20rpx;
  70 + margin-right: 5rpx;
36 } 71 }
37 72
38 .goods-name { 73 .goods-name {
39 - height: 96rpx;  
40 - line-height: 48rpx;  
41 - font-size: 24rpx; 74 + height: 60rpx;
  75 + font-size: 27rpx;
42 color: #555; 76 color: #555;
  77 + line-height: 30rpx;
  78 +
43 } 79 }
44 80
45 .goods-num { 81 .goods-num {
@@ -57,17 +93,28 @@ @@ -57,17 +93,28 @@
57 } 93 }
58 94
59 .underline { 95 .underline {
60 - text-decoration: line-through; color:#999999; font-size: 20rpx; margin-left: 5rpx; 96 + text-decoration: line-through;
  97 + color:#999999; font-size: 20rpx;
  98 + margin-left: 10rpx;
  99 + line-height: 30rpx;
61 } 100 }
62 101
63 .kill-btn { 102 .kill-btn {
64 text-align: right; 103 text-align: right;
  104 + display: flex;
  105 +height: 100%;
  106 +align-items: flex-end;
  107 +padding-top: 4rpx;
  108 +
65 } 109 }
66 110
67 .kill-btn>navigator { 111 .kill-btn>navigator {
68 padding: 0 20rpx; 112 padding: 0 20rpx;
69 background: #e23245; 113 background: #e23245;
70 color: #fff; 114 color: #fff;
  115 + border-radius: 20rpx;
  116 + margin-top: 37px;
  117 +
71 } 118 }
72 119
73 .kill-btn .gray { 120 .kill-btn .gray {
@@ -81,4 +128,51 @@ @@ -81,4 +128,51 @@
81 color: #333; 128 color: #333;
82 } 129 }
83 130
84 -.kill-btn>navigator.huise{background-color: gainsboro;}  
85 \ No newline at end of file 131 \ No newline at end of file
  132 +.kill-btn>navigator.huise{background-color: #999;}
  133 +.xc-seckill-bottom{
  134 + position: fixed;
  135 +bottom: 0rpx;
  136 +width: 100%;
  137 +
  138 +}
  139 +.xc-bottom{
  140 + width: 45rpx;
  141 + height: 45rpx;
  142 + margin-right: 13rpx;
  143 +}
  144 +.xc-border-right{
  145 + border-right: 4rpx solid #eee;
  146 +
  147 +}
  148 +.ml10{
  149 +margin-left: 45rpx;
  150 +}
  151 +.total{
  152 + width:215rpx;height:26rpx;border-radius:20rpx;
  153 + background: #ffe3e2;
  154 +}
  155 +.xc-buttom-money{
  156 + align-items: baseline;
  157 +padding-top: 43rpx;
  158 +}
  159 +
  160 +.xc-miaosha{
  161 +width: 68rpx;
  162 +height: 40rpx;
  163 +
  164 +}
  165 +.xc-strip-frame{
  166 + width:440rpx;margin-top: 10rpx;
  167 +}
  168 +.xc-strip-blank{
  169 + width:180rpx;
  170 +height: 26rpx;
  171 +}
  172 +.xc-fill{
  173 +border-radius:20rpx;height:26rpx;
  174 +}
  175 +.xc-fill-text{
  176 + left:34%;
  177 + line-height: 26rpx;
  178 +
  179 +}
86 \ No newline at end of file 180 \ No newline at end of file
pages/goods/categoryList/categoryList.js
@@ -9,7 +9,7 @@ Page({ @@ -9,7 +9,7 @@ Page({
9 windowHeight:0, 9 windowHeight:0,
10 windowWidth: 0, 10 windowWidth: 0,
11 eachLetterHeight:0, 11 eachLetterHeight:0,
12 - lettersPosition:0, 12 + lettersPosition:0,
13 catelist:null, //分类读取 13 catelist:null, //分类读取
14 nationlist: null,//国家读取 14 nationlist: null,//国家读取
15 groups: null, //品牌读取 15 groups: null, //品牌读取
pages/goods/goodsInfo/goodsInfo.js
@@ -8,7 +8,7 @@ var t = require(&quot;../../../utils/util.js&quot;), @@ -8,7 +8,7 @@ var t = require(&quot;../../../utils/util.js&quot;),
8 oo = s.globalData, 8 oo = s.globalData,
9 o = s.globalData.setting, 9 o = s.globalData.setting,
10 os = o; 10 os = o;
11 -//评价加载更多 11 +//评价加载更多
12 var more = function(e) { 12 var more = function(e) {
13 return e && e.__esModule ? e : { 13 return e && e.__esModule ? e : {
14 default: e 14 default: e
@@ -1402,6 +1402,7 @@ Page({ @@ -1402,6 +1402,7 @@ Page({
1402 prom_start_time: prom_start_time, 1402 prom_start_time: prom_start_time,
1403 isshow:1, 1403 isshow:1,
1404 }); 1404 });
  1405 +
1405 1406
1406 var newTime = ut.gettimestamp(); 1407 var newTime = ut.gettimestamp();
1407 var endTime2 = t.data.data.end_time; 1408 var endTime2 = t.data.data.end_time;
pages/goods/goodsInfo/goodsInfo.wxml
@@ -266,7 +266,7 @@ @@ -266,7 +266,7 @@
266 </view> 266 </view>
267 <view class="word-line fs24 xc-unit-price">零售价¥{{data.market_price}}</view> 267 <view class="word-line fs24 xc-unit-price">零售价¥{{data.market_price}}</view>
268 </view> 268 </view>
269 - <view class="xc-val-price"> 269 + <view class="xc-val-price">
270 <view class="fs30" style='padding-left:13rpx;'>已抢:{{prom_act.buy_num+prom_act.virtual}}件</view> 270 <view class="fs30" style='padding-left:13rpx;'>已抢:{{prom_act.buy_num+prom_act.virtual}}件</view>
271 <view class="fs30 save t-c">秒杀立省¥{{filters.toFix(data.market_price-prom_price,2)}}</view> 271 <view class="fs30 save t-c">秒杀立省¥{{filters.toFix(data.market_price-prom_price,2)}}</view>
272 </view> 272 </view>
pages/goods/goodsInfo/goodsInfo.wxss
@@ -1139,7 +1139,7 @@ left:31rpx;} @@ -1139,7 +1139,7 @@ left:31rpx;}
1139 width: 100%; 1139 width: 100%;
1140 height: 42rpx; 1140 height: 42rpx;
1141 padding-left: 34rpx; 1141 padding-left: 34rpx;
1142 - color: #948485; 1142 + color: #333;
1143 1143
1144 } 1144 }
1145 .xc_comment-have-pictures{ 1145 .xc_comment-have-pictures{
@@ -2228,6 +2228,8 @@ right:17rpx; top:55rpx; @@ -2228,6 +2228,8 @@ right:17rpx; top:55rpx;
2228 2228
2229 .no_pj_list{text-align: center; width: 100%; color: #999; margin-top: 30rpx; display: inline-block; font-size: 28rpx} 2229 .no_pj_list{text-align: center; width: 100%; color: #999; margin-top: 30rpx; display: inline-block; font-size: 28rpx}
2230 2230
  2231 +
2231 .join-cart>view.no_store { 2232 .join-cart>view.no_store {
2232 width: 58%; background-color: #adadad; 2233 width: 58%; background-color: #adadad;
2233 } 2234 }
  2235 +
pages/goods/search/search.js
@@ -44,6 +44,14 @@ Page({ @@ -44,6 +44,14 @@ Page({
44 }) 44 })
45 e.init(this, "", "requestData"); 45 e.init(this, "", "requestData");
46 var url = this.data.baseUrl; 46 var url = this.data.baseUrl;
  47 +
  48 + //扫一扫过来,显示搜索的内容
  49 + var s_key = t.s_key;
  50 + if (s_key){
  51 + this.search(s_key); this.openSearchModal();
  52 + return;
  53 + }
  54 +
47 if (0 != t.brand_id && t.brand_id!=undefined){ url += "&brand_id=" + t.brand_id;} 55 if (0 != t.brand_id && t.brand_id!=undefined){ url += "&brand_id=" + t.brand_id;}
48 if (0 != t.nation_id && t.nation_id!=undefined) { url += "&nation_id=" + t.nation_id;} 56 if (0 != t.nation_id && t.nation_id!=undefined) { url += "&nation_id=" + t.nation_id;}
49 if (0 != t.max_price && t.max_price!=undefined) { url += "&min_pirce=" + t.min_pirce + "&max_price=" + t.max_price;} 57 if (0 != t.max_price && t.max_price!=undefined) { url += "&min_pirce=" + t.min_pirce + "&max_price=" + t.max_price;}
@@ -73,7 +81,7 @@ Page({ @@ -73,7 +81,7 @@ Page({
73 requestSearch: function(t) { 81 requestSearch: function(t) {
74 var a = this; 82 var a = this;
75 console.log('requestSearch'); 83 console.log('requestSearch');
76 - console.log(t); 84 + console.log(t,"扫描商品的搜索商品1111111111111111111111111111");
77 85
78 this.data.requestUrl = t, 86 this.data.requestUrl = t,
79 //t += "&orderField=" + a.data.tabname; 87 //t += "&orderField=" + a.data.tabname;
@@ -136,6 +144,7 @@ Page({ @@ -136,6 +144,7 @@ Page({
136 144
137 //-----点击搜索按钮---- 145 //-----点击搜索按钮----
138 search: function(t) { 146 search: function(t) {
  147 + console.log(t,"是什么的");
139 if ("string" != typeof t || "" == t) return a.showWarning("请输入搜索关键词"); 148 if ("string" != typeof t || "" == t) return a.showWarning("请输入搜索关键词");
140 this.resetData(), this.requestSearch(this.data.baseUrl + "&key_str=" + encodeURIComponent(t)); 149 this.resetData(), this.requestSearch(this.data.baseUrl + "&key_str=" + encodeURIComponent(t));
141 }, 150 },
pages/index/index/index.js
@@ -6,7 +6,7 @@ var e = function (e) { @@ -6,7 +6,7 @@ var e = function (e) {
6 i = require("../../../utils/util.js"), ut = i, s = require("../../../utils/common.js"), n = new e.default(); 6 i = require("../../../utils/util.js"), ut = i, s = require("../../../utils/common.js"), n = new e.default();
7 var regeneratorRuntime = require('../../../utils/runtime.js'); 7 var regeneratorRuntime = require('../../../utils/runtime.js');
8 var api = require('../../../api/api.js'); 8 var api = require('../../../api/api.js');
9 - 9 +
10 Page({ 10 Page({
11 data: { 11 data: {
12 url: o.imghost, 12 url: o.imghost,
@@ -34,7 +34,6 @@ Page({ @@ -34,7 +34,6 @@ Page({
34 pindGoods: null,//拼单数据 34 pindGoods: null,//拼单数据
35 newGoods:null,//新商品 35 newGoods:null,//新商品
36 hotGoods:null,//hot商品 36 hotGoods:null,//hot商品
37 -  
38 //----控制是是否显示计时器--- 37 //----控制是是否显示计时器---
39 is_timer:1, 38 is_timer:1,
40 ishow:0, 39 ishow:0,
@@ -42,32 +41,95 @@ Page({ @@ -42,32 +41,95 @@ Page({
42 isTemplate:0, 41 isTemplate:0,
43 template_arr:null, 42 template_arr:null,
44 bgcolor_t:'', 43 bgcolor_t:'',
  44 +
  45 + banner_index:0,
  46 + flash_index:0,
  47 + pt_index:0,
  48 +
  49 + pt_timer_item:null,
  50 + pt_timer_arr:null,
  51 + pt_timer:null,
  52 + pt_timer_active:0,
  53 +
  54 + //看下商家是否开通会员权益
  55 + is_boot:0,
  56 + gd_category:null,
  57 + is_no_more:0,
45 }, 58 },
  59 +
46 onLoad: function () { 60 onLoad: function () {
47 var th = this; 61 var th = this;
48 - n.init(th, "", "recommend"); 62 + // n.init(th, "", "recommend");
  63 +
  64 + //看一下商家是否开通了权益
  65 + //--初始化是否有打勾--
  66 + getApp().request.promiseGet("/api/weshop/users/grade/vip/init/get", {
  67 + data: { storeId: os.stoid}
  68 + }).then(res => {
  69 + if(res.data.data){
  70 + var is_init=res.data.data.isBool;
  71 + th.setData({is_boot:is_init});
  72 + }
  73 + })
  74 +
  75 +
  76 +
49 }, 77 },
  78 +
  79 +
50 async onShow() { 80 async onShow() {
  81 + var th=this;
  82 +
51 await this.init_load(); 83 await this.init_load();
52 //显示的时候要开启计时器 84 //显示的时候要开启计时器
53 - this.data.is_timer=1; 85 + this.data.is_timer = 1;
54 //如果是自定义模板 86 //如果是自定义模板
55 - if(this.data.isTemplate) { 87 + if (this.data.isTemplate) {
56 //---先获取会员--- 88 //---先获取会员---
57 - t.getUserFir(function () {});  
58 - }else{ 89 + t.getUserFir(function () {
  90 + });
  91 + } else {
59 await this.init_fir(); 92 await this.init_fir();
60 } 93 }
61 - },  
62 94
  95 + //--正再拼团中的处理--
  96 + var url = "/api/weshop/order/pageTuan?pt_status=2&is_pt=1&store_id=" + os.stoid + "&pageSize=6&page=1"
  97 + await getApp().request.promiseGet(url, {}).then(res => {
  98 + if (res.data.code == 0 && res.data.data && res.data.data.pageData) {
  99 + th.data.pt_timer_arr = res.data.data.pageData;
  100 + }
  101 + })
  102 + if (th.data.pt_timer_arr && th.data.pt_timer_arr.length > 0) {
  103 + for (var i in th.data.pt_timer_arr) {
  104 + var p_item = th.data.pt_timer_arr[i];
  105 + await getApp().request.promiseGet("/api/weshop/users/get/" + os.stoid + "/" + p_item.user_id, {1: 1}).then(res => {
  106 + th.data.pt_timer_arr[i].head_pic = res.data.data.head_pic;
  107 + th.data.pt_timer_arr[i].nickname = res.data.data.nickname;
  108 + })
  109 + }
  110 + th.Interval_pt();
  111 + }
  112 +
  113 + //---处理正在6个分类----
  114 + await getApp().request.promiseGet("/api/weshop/goodscategory/page", {
  115 + data: {store_id: os.stoid, pageSize: 5,is_show:1}
  116 + }).then(res => {
  117 + if(res.data.data) {
  118 + var gd_category = res.data.data.pageData;
  119 +
  120 + th.setData({gd_category: gd_category});
  121 + }
  122 + })
  123 + },
  124 +
63 //当隐藏的时候就关闭计时器 125 //当隐藏的时候就关闭计时器
64 onHide:function(){ 126 onHide:function(){
65 this.data.is_timer=0; 127 this.data.is_timer=0;
  128 + clearInterval(this.data.pt_timer)
66 }, 129 },
67 130
68 //同步初始加载 131 //同步初始加载
69 async init_load(){ 132 async init_load(){
70 -  
71 var th=this; 133 var th=this;
72 await getApp().get_isbuy(); 134 await getApp().get_isbuy();
73 this.setappdata(getApp().globalData.wxapp_buy_obj); 135 this.setappdata(getApp().globalData.wxapp_buy_obj);
@@ -83,8 +145,8 @@ Page({ @@ -83,8 +145,8 @@ Page({
83 th.setData({ template_arr: t_arr, isTemplate: 1, bgcolor_t: temp_data.bkcolor}); 145 th.setData({ template_arr: t_arr, isTemplate: 1, bgcolor_t: temp_data.bkcolor});
84 } 146 }
85 }) 147 })
86 - console.log("init_load");  
87 - console.log(getApp().globalData.config); 148 +
  149 +
88 //--首页的问题-- 150 //--首页的问题--
89 if(getApp().globalData.config && getApp().globalData.config.store_name!=undefined && getApp().globalData.config.store_name!=null ){ 151 if(getApp().globalData.config && getApp().globalData.config.store_name!=undefined && getApp().globalData.config.store_name!=null ){
90 wx.setNavigationBarTitle({ 152 wx.setNavigationBarTitle({
@@ -113,6 +175,7 @@ Page({ @@ -113,6 +175,7 @@ Page({
113 } 175 }
114 console.log(arr); 176 console.log(arr);
115 if (arr.length>0) e.setData({ banner: arr, }); 177 if (arr.length>0) e.setData({ banner: arr, });
  178 +
116 wx.stopPullDownRefresh(); 179 wx.stopPullDownRefresh();
117 }) 180 })
118 181
@@ -133,8 +196,7 @@ Page({ @@ -133,8 +196,7 @@ Page({
133 flash_data = e.data.data.pageData; 196 flash_data = e.data.data.pageData;
134 if (flash_data == null || flash_data.length <= 0) return false; 197 if (flash_data == null || flash_data.length <= 0) return false;
135 198
136 - console.log('flash_data');  
137 - console.log(flash_data); 199 +
138 //当前时间戳 200 //当前时间戳
139 var nt = ut.gettimestamp(); 201 var nt = ut.gettimestamp();
140 console.log(nt); 202 console.log(nt);
@@ -153,7 +215,7 @@ Page({ @@ -153,7 +215,7 @@ Page({
153 th.setData({ 215 th.setData({
154 saleGoods: arr 216 saleGoods: arr
155 }); 217 });
156 - th.countDown(); 218 + //th.countDown();
157 } 219 }
158 }); 220 });
159 221
@@ -163,31 +225,45 @@ Page({ @@ -163,31 +225,45 @@ Page({
163 store_id: os.stoid, 225 store_id: os.stoid,
164 is_end: 0, 226 is_end: 0,
165 is_show: 1, 227 is_show: 1,
166 - pageSize: 9 228 + pageSize: 6
167 } 229 }
168 }).then(res => { 230 }).then(res => {
169 var e = res; 231 var e = res;
170 if (e.data.code == 0) { 232 if (e.data.code == 0) {
171 var pd_data = e.data.data.pageData; 233 var pd_data = e.data.data.pageData;
  234 +
172 if (pd_data.length == 0) return; 235 if (pd_data.length == 0) return;
173 -  
174 - //当前时间戳 236 +
  237 + //获取当前
175 var nt = ut.gettimestamp(); 238 var nt = ut.gettimestamp();
176 pd_data.forEach(function (val,ind) { 239 pd_data.forEach(function (val,ind) {
177 if(val.start_time>nt) pd_data[ind].status=0; 240 if(val.start_time>nt) pd_data[ind].status=0;
178 else if(val.end_time>nt) pd_data[ind].status=1; 241 else if(val.end_time>nt) pd_data[ind].status=1;
179 if(val.buy_num>=val.goods_num) pd_data[ind].status=2; 242 if(val.buy_num>=val.goods_num) pd_data[ind].status=2;
180 }); 243 });
181 - 244 +
  245 + //获取当前时间,比较拼团中还在未开始
  246 + var timestamp = new Date().getTime();
  247 + var is_team_tepy;
  248 + for (var j = 0; j < pd_data.length;j++ ){
  249 + pd_data[j].is_team_tepy = 1;
  250 + if (timestamp<pd_data[j].start_time*1000){
  251 + var is_team_tepy;
  252 + pd_data[j].is_team_tepy = 0;
  253 + }
  254 + }
  255 +
182 var arr = new Array(); 256 var arr = new Array();
183 - //--三个三个一组---  
184 - for(var i=0;i< pd_data.length;i+=3){  
185 - arr.push(pd_data.slice(i,i+3)); 257 + //--2个2个一组---
  258 + for(var i=0;i< pd_data.length;i+=2){
  259 +
  260 + arr.push(pd_data.slice(i,i+2));
186 } 261 }
  262 +
187 th.setData({ 263 th.setData({
188 pindGoods: arr 264 pindGoods: arr
189 }); 265 });
190 - //th.countDown2(); 266 + th.countDown2();
191 } 267 }
192 }) 268 })
193 269
@@ -231,13 +307,14 @@ Page({ @@ -231,13 +307,14 @@ Page({
231 } 307 }
232 }) 308 })
233 //---调用信息--- 309 //---调用信息---
234 - this.requestRecommend(); 310 + // this.requestRecommend();
235 this.setData({ishow:1}); 311 this.setData({ishow:1});
236 //---先获取会员--- 312 //---先获取会员---
237 t.getUserFir(function () { 313 t.getUserFir(function () {
238 314
239 }); 315 });
240 - 316 + var goods_list = this.selectComponent("#goods_list"); //组件的id
  317 + goods_list.get_list();
241 }, 318 },
242 319
243 //--判断小程序是否过期-- 320 //--判断小程序是否过期--
@@ -255,17 +332,13 @@ Page({ @@ -255,17 +332,13 @@ Page({
255 }, 332 },
256 //---加载更多是靠这个函数---- 333 //---加载更多是靠这个函数----
257 onReachBottom: function () { 334 onReachBottom: function () {
258 - n.canloadMore() && this.requestRecommend(); 335 +
  336 + var goods_list = this.selectComponent("#goods_list"); //组件的id
  337 + goods_list.get_list();
  338 +
259 }, 339 },
260 340
261 - //--更多商品--  
262 - requestRecommend: function () {  
263 - var e = this, t = '/api/weshop/goods/page?page=' + e.data.currentPage;  
264 - n.request(t, function () {  
265 - e.data.currentPage++;  
266 - }  
267 - , null, { is_mainshow: 1, isonsale: 1, is_recommend:1, is_on_sale: 1, store_id: o.stoid, pageSize: 10 });  
268 - }, 341 +
269 342
270 onPullDownRefresh: function (e) { 343 onPullDownRefresh: function (e) {
271 this.data.recommend = null, this.data.currentPage = 1, n.resetConfig(), this.requestHomePage(), 344 this.data.recommend = null, this.data.currentPage = 1, n.resetConfig(), this.requestHomePage(),
@@ -298,13 +371,16 @@ Page({ @@ -298,13 +371,16 @@ Page({
298 scrollTop: e.scrollTop 371 scrollTop: e.scrollTop
299 }); 372 });
300 var t = getCurrentPages(); 373 var t = getCurrentPages();
301 - "pages/index/index/index" == t[t.length - 1].route && (e.scrollTop > 10 ? wx.setNavigationBarColor({ 374 + "pages/index/index/index" == t[t.length - 1].route;
  375 + /*--
  376 + && (e.scrollTop > 10 ? wx.setNavigationBarColor({
302 frontColor: "#ffffff", 377 frontColor: "#ffffff",
303 backgroundColor: "#f95959" 378 backgroundColor: "#f95959"
304 }) : wx.setNavigationBarColor({ 379 }) : wx.setNavigationBarColor({
305 frontColor: "#000000", 380 frontColor: "#000000",
306 backgroundColor: "#eeeeee" 381 backgroundColor: "#eeeeee"
307 - })); 382 + }));--*/
  383 +
308 }, 384 },
309 jumpSearch: function () { 385 jumpSearch: function () {
310 wx.navigateTo({ 386 wx.navigateTo({
@@ -327,12 +403,10 @@ Page({ @@ -327,12 +403,10 @@ Page({
327 bind_bnerr2: function (e) { 403 bind_bnerr2: function (e) {
328 var _errImg = e.target.dataset.errorimg; 404 var _errImg = e.target.dataset.errorimg;
329 var _errurl = e.target.dataset.url; 405 var _errurl = e.target.dataset.url;
330 - var ii = _errurl.indexOf(o.imghost);  
331 - if (ii != -1) {  
332 var _errObj = {}; 406 var _errObj = {};
333 - _errObj[_errImg] = this.data.url + "/miniapp/images/default_g_img.gif";  
334 - this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;  
335 - } 407 + _errObj[_errImg] = "/miniapp/images/default_g_img.gif";
  408 + this.setData(_errObj); //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
  409 +
336 }, 410 },
337 //图片失败,默认图片 411 //图片失败,默认图片
338 bind_bnerr3: function (e) { 412 bind_bnerr3: function (e) {
@@ -404,6 +478,9 @@ Page({ @@ -404,6 +478,9 @@ Page({
404 //----拼单倒计时函数----- 478 //----拼单倒计时函数-----
405 countDown2() { 479 countDown2() {
406 if(!this.data.is_timer) return false; 480 if(!this.data.is_timer) return false;
  481 +
  482 +
  483 +
407 var th = this; 484 var th = this;
408 // 获取当前时间,同时得到活动结束时间数组 485 // 获取当前时间,同时得到活动结束时间数组
409 var newTime = ut.gettimestamp(); 486 var newTime = ut.gettimestamp();
@@ -441,6 +518,9 @@ Page({ @@ -441,6 +518,9 @@ Page({
441 } 518 }
442 } 519 }
443 var txt = "pindGoods[" + j + "][" + i + "].djs"; 520 var txt = "pindGoods[" + j + "][" + i + "].djs";
  521 +
  522 +
  523 +
444 th.setData({ 524 th.setData({
445 [txt]: obj 525 [txt]: obj
446 }); 526 });
@@ -449,5 +529,85 @@ Page({ @@ -449,5 +529,85 @@ Page({
449 setTimeout(th.countDown2, 1000); 529 setTimeout(th.countDown2, 1000);
450 }, 530 },
451 531
  532 + bannerSwiperChange:function (e) {
  533 + var index=e.detail.current;
  534 + this.setData({banner_index:index});
  535 + },
  536 + flashSwiperChange:function (e) {
  537 + var index=e.detail.current;
  538 + this.setData({flash_index:index});
  539 + },
  540 + ptSwiperChange:function (e) {
  541 + var index=e.detail.current;
  542 + this.setData({pt_index:index});
  543 + },
  544 +
  545 + Interval_pt() {
  546 + var th=this;
  547 + this.data.pt_timer=setInterval(function () {
  548 + var item=ut.get_rand_item(th.data.pt_timer_arr);
  549 +
  550 + console.log("Interval_pt");
  551 + console.log(item);
  552 +
  553 + th.setData({pt_timer_active:1,pt_timer_item:item});
  554 + setTimeout(function () {
  555 + th.setData({pt_timer_active:0});
  556 + },1500)
  557 + },4000);
  558 + },
  559 +
  560 +
  561 + //---扫一扫的函数---
  562 + getScancode: function () {
  563 + var _this = this;
  564 + // 允许从相机和相册扫码
  565 + wx.scanCode({
  566 + success: (res) => {
  567 + var result = res.result;
  568 + console.log(res,"是什么所扫码的内容"+result);
  569 + wx.navigateTo({
  570 + url: "/pages/goods/search/search?s_key="+result,
  571 + });
  572 + }
  573 + })
  574 + },
  575 +
  576 + //跳转到分类
  577 + go_cate:function(){
  578 + getApp().goto("/pages/goods/categoryList/categoryList");
  579 + },
  580 +
  581 + go_url:function(e){
  582 + var url=e.currentTarget.dataset.url;
  583 + getApp().goto(url);
  584 + },
  585 +
  586 + bind_bnerr_icon:function (e) {
  587 + var def = "/miniapp/images/no_cate_def.png";
  588 + var _err = e.currentTarget.dataset.err;
  589 + var ob={};
  590 + ob[_err]=def;
  591 + this.setData(ob);
  592 + },
  593 +
  594 + //跳转到分类的商品列表
  595 + go_cate2: function (t) {
  596 + var cid = t.currentTarget.dataset.cid;
  597 + var pid = t.currentTarget.dataset.pid;
  598 + var lurl = "/pages/goods/goodsList/goodsList?cat_id=" + cid + "&pid=" + pid;
  599 + wx.navigateTo({ url: lurl });
  600 + },
  601 +
  602 + //跳转到权益
  603 + go_quanyi:function(t){
  604 + var user_info = getApp().globalData.userInfo;
  605 + if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
  606 + wx.navigateTo({ url: '/pages/getphone/getphone', })
  607 + return false;
  608 + }
  609 + getApp().goto("/pages/user/userqy/userqy");
  610 + }
  611 +
452 612
453 }); 613 });
454 \ No newline at end of file 614 \ No newline at end of file
pages/index/index/index.json
1 { 1 {
2 - "navigationBarBackgroundColor": "#eeeeee", 2 + "navigationBarBackgroundColor": "#ff7295",
  3 + "navigationBarTextStyle": "white",
3 "usingComponents": { 4 "usingComponents": {
  5 + "goods_recommend":"/components/goods_list/goods_list",
4 "nav": "/components/diy_nav/diy_nav", 6 "nav": "/components/diy_nav/diy_nav",
5 "advertising":"/components/diy_advertising/diy_advertising", 7 "advertising":"/components/diy_advertising/diy_advertising",
6 "groupbuy": "/components/diy_groupbuy/diy_groupbuy", 8 "groupbuy": "/components/diy_groupbuy/diy_groupbuy",
7 - "goodsGroup": "/components/diy_goodsGroup/diy_goodsGroup", 9 + "goodsGroup": "/components/diy_goodsGroup/diy_goodsGroup",
8 "seckill": "/components/diy_seckill/diy_seckill", 10 "seckill": "/components/diy_seckill/diy_seckill",
9 "searchbox":"/components/diy_searchbox/diy_searchbox", 11 "searchbox":"/components/diy_searchbox/diy_searchbox",
10 "shopname": "/components/diy_shopname/diy_shopname", 12 "shopname": "/components/diy_shopname/diy_shopname",
pages/index/index/index.wxml
1 <!--普通界面--> 1 <!--普通界面-->
2 -<view class="container" wx:if="{{ishow}}">  
3 - <!--搜索框-->  
4 - <view class="search-box {{scrollTop>10?'search-fixed':''}}"> 2 +<wxs module="filter" src="../../../utils/filter.wxs"></wxs>
  3 +<view class="container rel" wx:if="{{ishow}}">
  4 +<block wx:if="{{banner}}">
  5 +<image class="xc-top-img abs" src="{{url}}/miniapp/images/top-img.png"></image>
  6 +</block>
  7 + <!--搜索框-->
  8 + <view class="{{banner==null?'pink-b ':''}} search-box {{scrollTop>10?'search-fixed':''}} flex-center white ">
  9 + <view class="classify-frame t-c" bindtap="go_cate">
  10 + <image class="classify-img" src="{{url}}/miniapp/images/classify.png"></image>
  11 + <view class="fs20">分<text class="white fs22">类</text></view>
  12 + </view>
5 <view class="search-inner"> 13 <view class="search-inner">
6 <view class="search-img"> 14 <view class="search-img">
7 <image class="wh100" src="{{url}}/miniapp/images/search.png"></image> 15 <image class="wh100" src="{{url}}/miniapp/images/search.png"></image>
8 </view> 16 </view>
9 - <input bindfocus="jumpSearch" class="search-cont" placeholder="请输入您所搜索的商品" type="text"></input> 17 + <input bindfocus="jumpSearch" class="search-cont" placeholder="请输入您所搜索的商品" type="text">
  18 + </input>
  19 + </view>
  20 + <view class="classify-frame t-c" bindtap="getScancode">
  21 + <image class="classify-img" src="{{url}}/miniapp/images/scanning.png"></image>
  22 + <view class="fs20">扫一扫</view>
10 </view> 23 </view>
11 </view> 24 </view>
12 <!--滚动广告--> 25 <!--滚动广告-->
13 - <view wx:if="{{banner}}">  
14 - <swiper autoplay="true" class="swiper_box" duration="1000" indicatorDots="true" interval="3000" vertical=""> 26 + <view class="rel title-img" wx:if="{{banner}}" >
  27 + <swiper autoplay="true" class="swiper_box" duration="1000" interval="3000" vertical=""bindchange="bannerSwiperChange">
15 <swiper-item wx:for="{{banner}}" wx:key="banner"> 28 <swiper-item wx:for="{{banner}}" wx:key="banner">
16 - <navigator url="{{item.media_link}}">  
17 - <image class="slide-image" src="{{item.ad_code}}" lazy-load="true" binderror="bind_bnerr" data-errorimg="banner[{{index}}].ad_code"></image>  
18 - </navigator> 29 + <view url="{{item.media_link}}" class="slide-image-frame">
  30 + <image class="slide-image"mode="widthFix" src="{{item.ad_code}}" lazy-load="true" binderror="bind_bnerr" data-errorimg="banner[{{index}}].ad_code"></image>
  31 + </view>
19 </swiper-item> 32 </swiper-item>
20 </swiper> 33 </swiper>
  34 +
  35 + <view class="flex-center-around translation abs">
  36 + <view class="circle spot" wx:for="{{banner}}" wx:key="{{index}}" style="background:{{index==banner_index?'#fff':'#999'}}">
  37 + </view>
  38 + </view>
21 </view> 39 </view>
22 <view class="pd-view" wx:else></view> 40 <view class="pd-view" wx:else></view>
23 41
@@ -56,183 +74,226 @@ @@ -56,183 +74,226 @@
56 </view> 74 </view>
57 </view> 75 </view>
58 </view> 76 </view>
  77 +
  78 +
  79 + <view class="flex-center-around {{banner==null?'mar-top':'mar-tops'}}" >
  80 + <view class="flex-vertical">
  81 + <image class="xc-hook" src="{{url}}/miniapp/images/index/youxuan.png">
  82 + </image>
  83 + <text class="yellow-co fs26 margin-left">人工优先</text>
  84 + </view>
  85 +
  86 +
  87 + <view class="flex-vertical">
  88 + <image class="xc-hook" src="{{url}}/miniapp/images/index/zhengpin.png">
  89 + </image>
  90 + <text class="yellow-co fs26 margin-left">正品保证</text>
  91 + </view>
  92 +
  93 + <view class="flex-vertical">
  94 + <image class="xc-hook" src="{{url}}/miniapp/images/index/shouhou.png">
  95 + </image>
  96 + <text class="yellow-co fs26 margin-left">售后无忧</text>
  97 + </view>
  98 + </view>
  99 +
  100 + <!---大分类--->
  101 + <view class="flex-center-around">
  102 + <view wx:for="{{gd_category}}"
  103 + bindtap="go_cate2" data-cid="{{item.id}}" data-pid="0">
  104 + <view class="circle xc-class-frame t-c">
  105 + <image class="xc-class-img" src="{{item.icoimg==null||item.icoimg==''?url+item.icon:item.icoimg}}" binderror="bind_bnerr_icon"
  106 + data-err="gd_category[{{index}}].icon"></image>
  107 + <view class="fs24">{{item.name}}</view>
  108 + </view>
  109 + </view>
  110 + </view>
  111 +
  112 + <!---跳转我的权益--->
  113 + <view class="title-img-frame" wx:if="{{is_boot}}" bindtap="go_quanyi" >
  114 + <image class="xc-title-img"src="{{url}}/miniapp/images/title.png"></image>
  115 + </view>
  116 +
  117 + <view class="split-line"></view>
  118 +
59 <!--秒杀--> 119 <!--秒杀-->
60 <view class="seckill" wx:if="{{saleGoods!=null && pindGoods.length!=0 }}"> 120 <view class="seckill" wx:if="{{saleGoods!=null && pindGoods.length!=0 }}">
61 <navigator url="/pages/activity/seckill_list/seckill_list"> 121 <navigator url="/pages/activity/seckill_list/seckill_list">
62 <view class="seckill-time"> 122 <view class="seckill-time">
63 - <view class="classname">  
64 - <text class="sk-tips">秒杀特区</text> 123 + <view class="classname flex">
  124 + <image class="clock-img" src="{{url}}/miniapp/images/clock.png"></image>
  125 + <image class="seckill-ttitle-img height"src="{{url}}/miniapp/images/seckill-ttitle.png"></image>
65 </view> 126 </view>
  127 + <view class="flex seckill-list">
  128 + <text class="fs24 xc-marfin-right">查看全部</text>
66 <image class="arrow-right" src="{{url}}/miniapp/images/icon-arrowdown.png"></image> 129 <image class="arrow-right" src="{{url}}/miniapp/images/icon-arrowdown.png"></image>
  130 + </view>
67 </view> 131 </view>
68 </navigator> 132 </navigator>
69 <view class="seckill-list"> 133 <view class="seckill-list">
70 - <swiper class="s_prom" indicator-active-color='red' indicator-dots="true">  
71 - <swiper-item wx:for="{{saleGoods}}" wx:key="{{index}}" class="p_swiper" wx:key="saleGoods">  
72 - <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{aitem.goods_id}}" 134 + <swiper class="s_prom" indicator-dots="{{false}}" bindchange="flashSwiperChange">
  135 + <swiper-item wx:for="{{saleGoods}}" wx:key="{{index}}" class="p_swiper " wx:key="saleGoods">
  136 + <navigator class="ib m-left" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{aitem.goods_id}}"
73 wx:for="{{item}}" wx:key="item" wx:for-item="aitem" wx:for-index="aind" 137 wx:for="{{item}}" wx:key="item" wx:for-item="aitem" wx:for-index="aind"
74 > 138 >
75 - <view class="imgview"> 139 + <view class="imgview ">
76 <image src="{{url+aitem.original_img}}" lazy-load="true" data-errorimg="saleGoods[{{index}}][{{aind}}].original_img" 140 <image src="{{url+aitem.original_img}}" lazy-load="true" data-errorimg="saleGoods[{{index}}][{{aind}}].original_img"
77 binderror="bind_bnerr3" data-img="{{aitem.original_img}}"></image> 141 binderror="bind_bnerr3" data-img="{{aitem.original_img}}"></image>
78 142
79 - <!--<view class="djs_view">-->  
80 - <!--<text class='tui-conutdown-box'>{{aitem.djs.day}}</text>天-->  
81 - <!--<text class='tui-conutdown-box'>{{aitem.djs.hou}}</text>时-->  
82 - <!--<text class='tui-conutdown-box'>{{aitem.djs.min}}</text>分-->  
83 - <!--<text class='tui-conutdown-box tui-countdown-bg'>{{aitem.djs.sec}}</text>秒-->  
84 - <!--</view>--> 143 +
85 144
86 145
87 <image wx:if="{{aitem.status==0}}" class="status_img" src="{{url}}/miniapp/images/miao/yure.png"></image> 146 <image wx:if="{{aitem.status==0}}" class="status_img" src="{{url}}/miniapp/images/miao/yure.png"></image>
88 <image wx:if="{{aitem.status==1}}" class="status_img" src="{{url}}/miniapp/images/miao/going.png"></image> 147 <image wx:if="{{aitem.status==1}}" class="status_img" src="{{url}}/miniapp/images/miao/going.png"></image>
89 <image wx:if="{{aitem.status==2}}" class="status_img" src="{{url}}/miniapp/images/miao/mend.png"></image> 148 <image wx:if="{{aitem.status==2}}" class="status_img" src="{{url}}/miniapp/images/miao/mend.png"></image>
90 </view> 149 </view>
91 - <view>{{aitem.title}}</view>  
92 - <view class="co-red">¥{{aitem.price}} 150 + <view class="ellipsis-2">{{aitem.title}}</view>
  151 + <view class="red-co mar-top10 is_seckill_height" > <text class="fs20">¥</text>{{aitem.price}}
93 <text class="un_line">¥{{aitem.market_price}}</text> 152 <text class="un_line">¥{{aitem.market_price}}</text>
94 </view> 153 </view>
95 </navigator> 154 </navigator>
96 </swiper-item> 155 </swiper-item>
97 </swiper> 156 </swiper>
  157 + <view class="flex-center-around translation">
  158 + <view class="circle spot" wx:for="{{saleGoods}}" wx:key="{{index}}" style="background:{{index==flash_index?'#fff':'#999'}}">
  159 + </view>
  160 + </view>
98 </view> 161 </view>
99 </view> 162 </view>
100 <!----拼单----> 163 <!----拼单---->
101 - <view class="seckill" wx:if="{{pindGoods!=null && pindGoods.length!=0 }}"> 164 + <view class="seckill assemble-top-border" wx:if="{{pindGoods!=null && pindGoods.length!=0 }}">
102 <navigator url="/pages/activity/pind_list/pind_list"> 165 <navigator url="/pages/activity/pind_list/pind_list">
103 <view class="seckill-time"> 166 <view class="seckill-time">
104 - <view class="classname">  
105 - <text class="sk-tips">天天拼单</text> 167 + <view class="classname flex">
  168 + <image class="clock-img" src="{{url}}/miniapp/images/clock.png"></image>
  169 + <image class="seckill-ttitle-img"src="{{url}}/miniapp/images/team.png"></image>
  170 + <block wx:if="{{pt_timer_item}}">
  171 + <view class="flex user-frame t-c xc-ash {{pt_timer_active==1?'pt_active':''}}">
  172 + <image class="user-img circle" src="{{pt_timer_item.head_pic}}"></image>
  173 + <view class="ellipsis-1 user-name fs24">{{pt_timer_item.nickname}}</view>
  174 + <text class="fs20">刚拼团成功</text>
  175 + </view>
  176 + </block>
106 </view> 177 </view>
  178 + <view class="flex seckill-list">
  179 + <text class="fs24 xc-marfin-right">查看全部</text>
107 <image class="arrow-right" src="{{url}}/miniapp/images/icon-arrowdown.png"></image> 180 <image class="arrow-right" src="{{url}}/miniapp/images/icon-arrowdown.png"></image>
  181 + </view>
108 </view> 182 </view>
109 </navigator> 183 </navigator>
110 - <view class="seckill-list">  
111 - <swiper class="s_prom" indicator-active-color='red' indicator-dots="true">  
112 - <swiper-item wx:for="{{pindGoods}}" wx:key="{{index}}" class="p_swiper">  
113 - <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{aitem.goods_id}}"  
114 - wx:for="{{item}}" wx:key="item" wx:for-item="aitem" wx:for-index="aind"  
115 - >  
116 - <view class="imgview">  
117 - <image src="{{url+aitem.original_img}}" lazy-load="true" data-errorimg="pindGoods[{{index}}][{{aind}}].original_img"  
118 - data-img="{{aitem.original_img}}" binderror="bind_bnerr3"></image>  
119 - <!--  
120 - <view class="djs_view">  
121 - <text class='tui-conutdown-box'>{{aitem.djs.day}}</text>天  
122 - <text class='tui-conutdown-box'>{{aitem.djs.hou}}</text>时  
123 - <text class='tui-conutdown-box'>{{aitem.djs.min}}</text>分  
124 - <text class='tui-conutdown-box tui-countdown-bg'>{{aitem.djs.sec}}</text>秒  
125 - </view>--> 184 + <view class="seckill-lists rel">
  185 + <swiper class="s_proms" style="height:{{pindGoods[0].length>1?'590':'290'}}rpx" indicator-active-color='red' bindchange="ptSwiperChange">
  186 + <swiper-item wx:for="{{pindGoods}}" wx:key="{{index}}" wx:for-index="pix">
  187 + <view class="teamheight" style='display:block;' wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind">
  188 + <view class="kill-item">
  189 + <navigator class="flex navwidth" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{aitem.goods_id}}">
  190 + <view class="kill-pic">
  191 + <image class="wh100" src="{{url+aitem.original_img}}" data-val="{{aitem.original_img}}"
  192 + data-errorimg="pindGoods[{{pix}}][{{aind}}].original_img" binderror="bind_bnerr2" lazy-load="true">
  193 + </image>
  194 + </view>
126 195
127 - <image wx:if="{{aitem.status==0}}" class="status_img" src="{{url}}/miniapp/images/miao/yure.png"></image>  
128 - <image wx:if="{{aitem.status==1}}" class="status_img" src="{{url}}/miniapp/images/miao/going.png"></image>  
129 - <image wx:if="{{aitem.status==2}}" class="status_img" src="{{url}}/miniapp/images/miao/mend.png"></image> 196 + <view class="kill-cont">
  197 + <navigator class="goods-name ellipsis-2" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}">
  198 + {{aitem.title}}
  199 +
  200 + </navigator>
  201 + <view class="flex left">
  202 + <view class="tneirong red-b flex-vertical rel" wx:if="{{aitem.is_team_tepy!=0}}">
  203 + <image class="xc-team-img abs" src="{{url}}/miniapp/images/fril.png"></image>
  204 + 已拼{{aitem.buy_num}}份</view>
  205 + <view class="fs20 flex xc-people-val-frame"
  206 + style="border-color:{{aitem.is_team_tepy==0?'#059de5':'#d60021'}};margin-left:{{aitem.is_team_tepy==0?'':'8rpx'}}">
  207 + <view class=" flex-center val-img {{aitem.is_team_tepy==0?'blue_b':'red-b'}}">
  208 + <image class="people-img"src="{{url}}/miniapp/images/bai-ren.png"></image>
  209 + </view>
  210 + <text class="{{aitem.is_team_tepy==0?'blue_c':'red-co'}}" style="margin-left:8rpx; margin-right:8rpx">{{aitem.ct_num}}人团</text>
  211 + </view>
  212 +
  213 + <view class="fs20 blue_c time-blue" wx:if="{{aitem.is_team_tepy==0}}">
  214 + 距开始:
  215 + <text class='tui-conutdown-box'>{{aitem.djs.day}}</text>天
  216 + <text class='tui-conutdown-box'>{{aitem.djs.hou}}</text>时
  217 + <text class='tui-conutdown-box'>{{aitem.djs.min}}</text>分
  218 + <text class='tui-conutdown-box tui-countdown-bg'>{{aitem.djs.sec}}</text>
  219 + 秒
  220 + </view>
  221 + </view>
  222 +
  223 +
  224 + <view class="goods-num"style="margin-top:{{type==0?'70rpx':'40rpx'}}">
  225 + <view>
  226 +
  227 + <view class="fs40 flex xc-top15 {{aitem.is_team_tepy==0?'blue_c ai-bas':' red-co ai-bas'}}">
  228 + <text class="fs28 {{aitem.is_team_tepy==0?'martop4':''}}">¥</text>
  229 + <text style="margin-left:-5rpx">{{aitem.price}}</text>
  230 + <span class="underline {{type==0?'martop18':''}}">零售价¥{{aitem.market_price}}</span>
  231 + </view>
  232 +
  233 + </view>
130 234
131 - <view wx:if="{{aitem.kttype==1}}" class="status_view">商家团</view>  
132 - <view wx:if="{{aitem.kttype==2}}" class="status_view">会员团</view>  
133 - <view wx:if="{{aitem.kttype==3}}" class="status_view">阶梯团</view>  
134 235
135 - </view>  
136 - <view>{{aitem.title}}</view>  
137 - <view class="co-red">¥{{aitem.price}}</view>  
138 - <view class="co-red2">{{aitem.ct_num}}人团</view> 236 + </view>
  237 + </view>
  238 +
  239 + </navigator>
139 240
140 - <view wx:if="{{aitem.kttype==1 && aitem.goods_num>aitem.buy_num }}" class="cantuan">去参团</view>  
141 - <view wx:if="{{aitem.kttype==2 && aitem.goods_num>aitem.buy_num }}" class="cantuan">去开团</view>  
142 - <view wx:if="{{aitem.kttype==3 && aitem.goods_num>aitem.buy_num }}" class="cantuan">去开团</view>  
143 - <view wx:if="{{aitem.goods_num<=aitem.buy_num }}" class="cantuan">已抢光</view>  
144 241
145 - </navigator> 242 + </view>
  243 +
  244 +</view>
  245 +
  246 +
146 </swiper-item> 247 </swiper-item>
147 </swiper> 248 </swiper>
  249 +
  250 + <view class="flex-center-around translations abs">
  251 + <view class="circle spot" wx:for="{{pindGoods}}" wx:key="{{index}}" style="background:{{index==pt_index?'#fff':'#999'}}">
148 </view> 252 </view>
149 - </view>  
150 - <!--新品上市-->  
151 - <view class="seckill" wx:if="{{newGoods!=null}}">  
152 - <navigator url="/pages/goods/goodsList/goodsList?is_new=1">  
153 - <view class="seckill-time">  
154 - <view class="classname">  
155 - <text class="sk-tips">新品上市</text>  
156 - </view>  
157 - <image class="arrow-right" src="{{url}}/miniapp/images/icon-arrowdown.png"></image>  
158 - </view>  
159 - </navigator>  
160 - <view class="seckill-list">  
161 - <swiper class="s_prom" indicator-active-color='red' indicator-dots="true">  
162 - <swiper-item wx:for="{{newGoods}}" class="p_swiper" wx:key="{{index}}">  
163 - <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{aitem.goods_id}}"  
164 - wx:for="{{item}}" wx:key="item" wx:for-item="aitem" wx:for-index="aind"  
165 - >  
166 - <view class="imgview">  
167 - <image src="{{url+aitem.original_img}}" lazy-load="true" data-errorimg="newGoods[{{index}}][{{aind}}].original_img"  
168 - binderror="bind_bnerr3" data-img="{{aitem.original_img}}"></image>  
169 -  
170 - </view>  
171 - <view>{{aitem.goods_name}}</view>  
172 - <view class="co-red">¥{{aitem.shop_price}}  
173 - <text class="un_line">¥{{aitem.market_price}}</text>  
174 - </view>  
175 - </navigator>  
176 - </swiper-item>  
177 - </swiper>  
178 </view> 253 </view>
179 - </view>  
180 - <!--热销商品-->  
181 - <view class="seckill" wx:if="{{hotGoods!=null}}">  
182 - <navigator url="/pages/goods/goodsList/goodsList?is_hot=1">  
183 - <view class="seckill-time">  
184 - <view class="classname">  
185 - <text class="sk-tips">热销商品</text>  
186 - </view>  
187 - <image class="arrow-right" src="{{url}}/miniapp/images/icon-arrowdown.png"></image>  
188 - </view>  
189 - </navigator>  
190 - <view class="seckill-list">  
191 - <swiper class="s_prom" indicator-active-color='red' indicator-dots="true">  
192 - <swiper-item wx:for="{{hotGoods}}" class="p_swiper" wx:key="{{index}}">  
193 - <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{aitem.goods_id}}"  
194 - wx:for="{{item}}" wx:key="item" wx:for-item="aitem" wx:for-index="aind"  
195 - >  
196 - <view class="imgview">  
197 - <image src="{{url+aitem.original_img}}" lazy-load="true" data-errorimg="hotGoods[{{index}}][{{aind}}].original_img"  
198 - binderror="bind_bnerr3" data-img="{{aitem.original_img}}"></image>  
199 -  
200 - </view>  
201 - <view>{{aitem.goods_name}}</view>  
202 - <view class="co-red">¥{{aitem.shop_price}}  
203 - <text class="un_line">¥{{aitem.market_price}}</text>  
204 - </view>  
205 - </navigator>  
206 - </swiper-item>  
207 - </swiper>  
208 </view> 254 </view>
209 </view> 255 </view>
210 - <!--推荐商品-->  
211 - <view class="section">  
212 - <view class="section-title">推荐商品</view>  
213 - <view class="section-subtitle">  
214 - <image class="wh100" src="{{url}}/miniapp/images/pic-interesting.png"></image> 256 +
  257 +
  258 +
  259 +
  260 +
  261 + <!-- 好物推荐 -->
  262 + <view class="title">
  263 + <!-- 标题 -->
  264 + <view>
  265 + <!-- 中文名标题 -->
  266 + <view class="China flex-level">
  267 + <view class="line flex-vertical">
  268 + <view class="one"></view>
  269 + <view class="two"></view>
  270 + <view class="three"></view>
215 </view> 271 </view>
216 - </view>  
217 - <view class="choice_box">  
218 - <view class="choice_list">  
219 - <view class="choice_item" wx:for="{{recommend}}" wx:key="{{index}}" >  
220 - <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}">  
221 - <image src="{{item.original_img}}" lazy-load="true" binderror="bind_bnerr2" data-url="{{item.original_img}}" data-errorimg="recommend[{{index}}].original_img"></image>  
222 - </navigator>  
223 - <navigator class="title shelue" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}">{{item.goods_name}}</navigator>  
224 - <view class="choice_footer">  
225 - <view class="price flex">  
226 - <!--<view class="meiz" wx:if="{{index==1}}">美妆价</view><view class="dengj" wx:if="{{index==3}}">等级价</view>-->  
227 - ¥{{item.shop_price}} <view class="xiafa">¥{{item.market_price}}</view>  
228 - </view>  
229 - <view class="ys">已售{{item.sales_sum}}</view>  
230 - <!-- <navigator class="similer" url="/pages/goods/goodsList/goodsList?cat_id={{item.cat_id}}">找相似</navigator>-->  
231 - </view>  
232 - </view> 272 +
  273 + <view class="Recommend flex-level" bindtap="requestList">好物推荐</view>
  274 +
  275 + <view class="line flex-vertical">
  276 + <view class="three"></view>
  277 + <view class="two"></view>
  278 + <view class="one"></view>
233 </view> 279 </view>
  280 + </view>
  281 +
  282 + <!-- 英文标题 -->
  283 + <view class="english flex-center">
  284 + <view class="silk"></view>
  285 + <view class="esh five-level-word">GOOD HOT THING</view>
  286 + <view class="silk"></view>
  287 + </view>
  288 +
234 </view> 289 </view>
235 -</view> 290 + <!-- 商品列表组件 -->
  291 + <goods_recommend id="goods_list"></goods_recommend>
  292 + <!-- 商品列表 -->
  293 +
  294 + </view>
  295 +
  296 + </view>
236 <!--是否是自定义--> 297 <!--是否是自定义-->
237 <view class="container" wx:if="{{isTemplate}}" style="background-color:{{bgcolor_t}}"> 298 <view class="container" wx:if="{{isTemplate}}" style="background-color:{{bgcolor_t}}">
238 <block wx:for="{{template_arr}}" wx:key="{{index}}" > 299 <block wx:for="{{template_arr}}" wx:key="{{index}}" >
pages/index/index/index.wxss
  1 +.pink-b{
  2 + background: #ff7295;
  3 +}
1 .search-box { 4 .search-box {
2 position: fixed; 5 position: fixed;
3 top: 0; 6 top: 0;
4 left: 0; 7 left: 0;
5 - width: 100%; 8 + width: 100%;
6 height: 88rpx; 9 height: 88rpx;
7 z-index: 10; 10 z-index: 10;
8 - background: linear-gradient(rgba(0,0,0,.2),rgba(255,255,255,0)); 11 + /* background: linear-gradient(rgba(0,0,0,.2),rgba(255,255,255,0)); */
  12 +}
  13 +.classify-img{
  14 + width: 50rpx;
  15 + height: 45rpx
9 } 16 }
10 -  
11 .logo { 17 .logo {
12 width: 48rpx; 18 width: 48rpx;
13 height: 48rpx; 19 height: 48rpx;
@@ -19,48 +25,59 @@ @@ -19,48 +25,59 @@
19 .search-inner { 25 .search-inner {
20 display: flex; 26 display: flex;
21 align-items: center; 27 align-items: center;
22 - margin: 15rpx 30rpx;  
23 - width: 675rpx; 28 + margin: 20rpx 25rpx;
  29 + width: 566rpx;
24 height: 58rpx; 30 height: 58rpx;
25 border-radius: 29rpx; 31 border-radius: 29rpx;
26 background-color: #fff; 32 background-color: #fff;
  33 + justify-content: center;
27 } 34 }
28 35
29 .search-img { 36 .search-img {
30 - margin-right: 12rpx; 37 +
31 width: 30rpx; 38 width: 30rpx;
32 height: 30rpx; 39 height: 30rpx;
33 - margin-top: -6rpx;  
34 - margin-left: 20rpx; 40 + margin-left: 36rpx;
  41 +display: flex;
  42 +align-items: center;
  43 +position: absolute;
  44 +left: 10%;
35 } 45 }
36 46
37 .search-cont { 47 .search-cont {
38 height: 58rpx; 48 height: 58rpx;
39 - width: 536rpx; 49 + width: 530rpx;
40 padding-left: 12rpx; 50 padding-left: 12rpx;
41 line-height: 58rpx; 51 line-height: 58rpx;
42 font-size: 24rpx; 52 font-size: 24rpx;
43 color: #666; 53 color: #666;
  54 + margin-left: 56rpx;
  55 +
44 } 56 }
45 57
46 .search-fixed { 58 .search-fixed {
47 - background: rgba(242,48,48,0.8); 59 + background: #ff7295;
48 } 60 }
49 61
50 .swiper_box { 62 .swiper_box {
51 width: 100%; 63 width: 100%;
52 - height: 380rpx;  
53 -} 64 +
  65 +}
54 .s_prom{ 66 .s_prom{
55 width: 100%; 67 width: 100%;
56 - height: 380rpx; 68 + height: 340rpx;
  69 +}
  70 +.s_proms{
  71 + width: 100%;
  72 + height:590rpx;
57 } 73 }
58 74
59 -swiper-item image { 75 +.slide-image{
60 width: 100%; 76 width: 100%;
61 - height: 380rpx;  
62 display: inline-block; 77 display: inline-block;
63 overflow: hidden; 78 overflow: hidden;
  79 + border-radius: 14rpx;
  80 +
64 } 81 }
65 82
66 .venues_box { 83 .venues_box {
@@ -103,6 +120,12 @@ swiper-item image { @@ -103,6 +120,12 @@ swiper-item image {
103 width: 100%; 120 width: 100%;
104 height: 368rpx; 121 height: 368rpx;
105 } 122 }
  123 +.title-img{
  124 + margin-top: 110rpx;
  125 +
  126 + margin-bottom: 15rpx;
  127 +
  128 +}
106 129
107 .choice_box .choice_list .title { 130 .choice_box .choice_list .title {
108 height: 36rpx; 131 height: 36rpx;
@@ -177,6 +200,7 @@ swiper-item image { @@ -177,6 +200,7 @@ swiper-item image {
177 align-items: center; 200 align-items: center;
178 height: 72rpx; 201 height: 72rpx;
179 color: #333; 202 color: #333;
  203 + margin-bottom: 20rpx;
180 } 204 }
181 205
182 .sk-tips { 206 .sk-tips {
@@ -221,34 +245,39 @@ swiper-item image { @@ -221,34 +245,39 @@ swiper-item image {
221 } 245 }
222 246
223 .seckill-list { 247 .seckill-list {
224 - height: 360rpx; 248 +
225 overflow: hidden; 249 overflow: hidden;
226 } 250 }
227 251
228 -.seckill-list navigator { 252 +/* .seckill-list navigator {
229 width: 236rpx; margin-right: 10rpx; position: relative; 253 width: 236rpx; margin-right: 10rpx; position: relative;
230 -} 254 +} */
  255 +
231 256
232 -.seckill-list image {  
233 - width: 236rpx;  
234 - height: 236rpx;  
235 -}  
236 257
237 .seckill-list view { 258 .seckill-list view {
238 - height: 45rpx; 259 + height: 62rpx;
239 padding: 0 10rpx; 260 padding: 0 10rpx;
240 - line-height: 45rpx; 261 + line-height: 33rpx;
241 overflow: hidden; 262 overflow: hidden;
242 - font-size: 30rpx; 263 + font-size: 28rpx;
  264 + width: 203rpx
243 } 265 }
244 266
245 .seckill-list view.imgview{ 267 .seckill-list view.imgview{
246 - width: 236rpx;  
247 - height: 236rpx; 268 + width: 203rpx;
  269 + height: 210rpx;
248 position: relative; 270 position: relative;
249 - overflow: hidden 271 + overflow: hidden;
  272 +
  273 +
  274 +}
  275 +.imgview image{
  276 + width: 203rpx;
  277 + height: 203rpx;
  278 + border-radius: 10rpx;
  279 +
250 } 280 }
251 -  
252 .seckill-list view.djs_view{ 281 .seckill-list view.djs_view{
253 background:rgba(9,9,9,0.5);color: #fff; font-size: 20rpx; 282 background:rgba(9,9,9,0.5);color: #fff; font-size: 20rpx;
254 width: 216rpx; height: 36rpx; line-height: 36rpx; 283 width: 216rpx; height: 36rpx; line-height: 36rpx;
@@ -258,7 +287,7 @@ swiper-item image { @@ -258,7 +287,7 @@ swiper-item image {
258 .seckill-list image.status_img{ 287 .seckill-list image.status_img{
259 width: 100rpx; height: 35rpx; 288 width: 100rpx; height: 35rpx;
260 position: absolute; 289 position: absolute;
261 - top: 5rpx; left: 10rpx; z-index: 5; 290 + top: 0rpx; left: 10rpx; z-index: 5;
262 } 291 }
263 292
264 .seckill-list view.status_view{ 293 .seckill-list view.status_view{
@@ -292,10 +321,414 @@ swiper-item image { @@ -292,10 +321,414 @@ swiper-item image {
292 bottom: 30rpx; right: 10rpx; z-index: 5; border-radius: 5rpx;padding: 0; 321 bottom: 30rpx; right: 10rpx; z-index: 5; border-radius: 5rpx;padding: 0;
293 } 322 }
294 323
295 -.arrow-right{width: 30rpx; height: 30rpx;} 324 +.arrow-right{width: 24rpx; height: 24rpx;}
296 .pd-view{height: 80rpx;} 325 .pd-view{height: 80rpx;}
297 326
  327 +
298 .xc-grow-ups{ 328 .xc-grow-ups{
299 margin-left:8rpx; 329 margin-left:8rpx;
300 margin-top:6rpx; 330 margin-top:6rpx;
301 } 331 }
  332 +.xc-top-img{
  333 +width: 100%;
  334 +top: -1rpx;
  335 +height: 315rpx;
  336 +
  337 +}
  338 +
  339 +.classify-frame{
  340 +line-height: 25rpx;
  341 +}
  342 +.slide-image-frame{
  343 + width: 95%;
  344 +margin: auto;
  345 +border-radius: 10rpx;
  346 +
  347 +}
  348 +.xc-hook{
  349 + width: 52rpx;
  350 + height: 52rpx;
  351 +
  352 +
  353 +}
  354 +.margin-left{
  355 +margin-left: 10rpx;
  356 +}
  357 +.xc-class-img{
  358 + width: 83rpx;
  359 + height: 83rpx;
  360 +}
  361 +.xc-class-frame{
  362 + line-height: 40rpx;
  363 + margin-top: 40rpx;
  364 + margin-bottom: 20rpx;
  365 +
  366 +
  367 +}
  368 +.xc-title-img{
  369 + height: 220rpx;
  370 + width: 100%;
  371 +}
  372 +
  373 +.title-img-frame{
  374 + width: 95%;
  375 +margin: auto;
  376 +margin-top: 30rpx;
  377 +
  378 +}
  379 +.seckill-list{
  380 + line-height: 24rpx;
  381 +}
  382 +.seckill-lists{
  383 + line-height: 30rpx;
  384 +}
  385 +
  386 +.xc-marfin-right{
  387 +margin-right: 8rpx;
  388 +}
  389 +.classname .clock-img{
  390 + width:36rpx;
  391 + height: 36rpx;
  392 + margin-right: 10rpx;
  393 +}
  394 +.classname .seckill-ttitle-img{
  395 + width:150rpx;
  396 + height: 40rpx;
  397 +}
  398 +.seckill-ttitle-img.height{
  399 + height: 35rpx
  400 +}
  401 +.split-line{
  402 + width:100%;height:10rpx;background:#eee;
  403 +}
  404 +.mar-top10{
  405 +margin-top: 10rpx;
  406 +}
  407 +.classname .user-img{
  408 +width: 30rpx;
  409 +height:30rpx;
  410 +margin-left:20rpx;
  411 +margin-right: 10rpx;
  412 +}
  413 +.user-frame{
  414 +
  415 + /* border-left: 5rpx solid #eee; */
  416 + height: 35rpx;
  417 + line-height: 35rpx;
  418 + margin-left: 10rpx;
  419 +
  420 +}
  421 +.user-name{
  422 + width: 66rpx;
  423 + border-left: 5rpx solid #eee;
  424 +}
  425 +
  426 +
  427 +/* 团购列表 */
  428 +
  429 +.kill-item {
  430 +
  431 + display: flex;
  432 + justify-content: space-between;
  433 + background-color: #fff;
  434 + padding: 10rpx 10rpx;
  435 + margin-bottom: 10rpx;
  436 + border-radius: 10rpx;
  437 + height: 249rpx;
  438 + align-items: center;
  439 +
  440 +
  441 +}
  442 +.kill-pic {
  443 + width: 215rpx;
  444 + height: 215rpx;
  445 + position: relative;
  446 +}
  447 +.teamheight{
  448 +height: 289rpx;
  449 +border-bottom:6rpx solid #eee;
  450 +
  451 +}
  452 +
  453 +
  454 +.kill-cont {
  455 + width: 440rpx;
  456 + height: 215rpx;
  457 + margin-left: 16rpx;
  458 +}
  459 +.goods-name {
  460 + max-height: 60rpx;
  461 + font-size: 24rpx;
  462 + color: #555;
  463 + line-height: 55rpx;
  464 +
  465 +}
  466 +
  467 +.xc-team-img{
  468 +width:38rpx;
  469 +height: 45rpx;
  470 +left: -1rpx;
  471 +top: -16rpx;
  472 +}
  473 +
  474 +.tneirong{
  475 + color:#fff;
  476 + font-size: 20rpx;
  477 + border-radius:20rpx;
  478 + padding-left: 32rpx;
  479 + padding-right: 15rpx;
  480 + padding-bottom: 2rpx;
  481 + height: 28rpx;
  482 + line-height: 28rpx;
  483 +
  484 +white-space: nowrap;
  485 + }
  486 + .xc-people-val-frame{
  487 + border: 3rpx solid #d60021;border-radius: 8rpx;white-space: nowrap;
  488 +height: 28rpx;
  489 +
  490 +}
  491 +.xc-people-val-frame .val-img{
  492 +width:33rpx;height:28rpx;border-radius: 8rpx;margin-left: -2rpx;
  493 +}
  494 +.people-img{
  495 + width:20rpx;height:20rpx
  496 +}
  497 +.goods-num {
  498 + height: 50rpx;
  499 + display: flex;
  500 + justify-content: space-between;
  501 +margin-top: 10rpx;
  502 + font-size: 24rpx;
  503 + color: #999;
  504 +
  505 +}
  506 +.xc-top15{
  507 + padding-top: 15rpx;
  508 + margin-top: 25rpx;
  509 +}
  510 +.underline {
  511 + text-decoration: line-through; color:#999999; font-size: 20rpx; margin-left: 5rpx;margin-top: 5rpx;
  512 +}
  513 +.navigator.navwidth{
  514 + width: 100%;
  515 +}
  516 +.view.left{
  517 + padding: 0 5rpx;
  518 +
  519 +}
  520 +
  521 +
  522 +
  523 +/* 热门好物 */
  524 +
  525 +.title .China {
  526 + width: 100%;
  527 + margin-top: 10rpx;
  528 + margin-bottom: 10rpx;
  529 + line-height: 0rpx;
  530 +}
  531 +
  532 +.title .China .line view {
  533 + width: 2rpx;
  534 +}
  535 +
  536 +.title .China .line {
  537 + height: 40rpx;
  538 + color: rgb(51,51, 51);
  539 +}
  540 +.title .China .line view{
  541 + border-left: 3rpx solid #000;
  542 + margin-left: 5rpx;
  543 +}
  544 +.title .China .line .one {
  545 + height: 23rpx;
  546 +}
  547 +
  548 +.title .China .line .two {
  549 + height: 15rpx;
  550 +}
  551 +
  552 +.title .China .line .three {
  553 + height: 18rpx;
  554 +}
  555 +
  556 +.title .China .Recommend {
  557 + margin: 0rpx 20rpx;
  558 + font-size: 28rpx;
  559 + line-height: 39rpx;
  560 + font-weight: bold;
  561 +}
  562 +
  563 +.title .english .silk {
  564 + width: 214rpx;
  565 + height: 2rpx;
  566 + background-color: #000;
  567 +}
  568 +
  569 +.title .english .esh {
  570 + margin: 0rpx 15rpx;
  571 +}
  572 +
  573 +.collects {
  574 + margin-top: 40rpx;
  575 +}
  576 +
  577 +.hang {
  578 + width: 100%;
  579 + margin: auto;
  580 + padding-left: 21rpx;
  581 +}
  582 +
  583 +.hang .collect {
  584 + width: 347rpx;
  585 + height: 571rpx;
  586 + border-radius: 25rpx;
  587 + border: 1rpx solid rgb(214, 214, 214);
  588 + overflow: hidden;
  589 + margin-right: 14rpx;
  590 + margin-bottom: 5rpx;
  591 +}
  592 +
  593 +.collect .bottom {
  594 + padding: 0rpx 20rpx;
  595 +}
  596 +
  597 +.collect .sp {
  598 + width: 100%;
  599 + height: 326rpx;
  600 +}
  601 +
  602 +.collect .money {
  603 + margin-top: 60rpx;
  604 + margin-bottom: 18rpx;
  605 + line-height: 28rpx;
  606 + align-items: baseline;
  607 +}
  608 +.collect .money view{
  609 + line-height: 28rpx;
  610 +}
  611 +.collect .money .flex {
  612 + font-weight: bold;
  613 +}
  614 +.collect .money .flex .fs24{
  615 + padding-top: 5rpx;
  616 +}
  617 +.collect .Discount {
  618 + width: 156rpx;
  619 + height: 28rpx;
  620 + border-radius: 20rpx;
  621 + background-color: rgb(56, 56, 56);
  622 + font-size: 18rpx;
  623 + color: rgb(255, 255, 255);
  624 +}
  625 +
  626 +.collect .Discount image {
  627 + height: 18rpx;
  628 + width: 18rpx;
  629 + line-height: 28rpx;
  630 + margin-right: 3rpx;
  631 +}
  632 +
  633 +.collect.ml20 {
  634 + margin-left: 13rpx;
  635 +}
  636 +
  637 +.fs24.dollar {
  638 + padding: 0rpx;
  639 +}
  640 +
  641 +.money .price {
  642 + margin-left: 12rpx;
  643 + text-decoration: line-through;
  644 + line-height: 23rpx;
  645 +}
  646 +
  647 +.province {
  648 + line-height: 26rpx;
  649 +}
  650 +
  651 +.nothing {
  652 + height: 75rpx;
  653 + width: 100%;
  654 +}
  655 +
  656 +.nothing .no_content {
  657 + margin: 0rpx 11rpx;
  658 + color: rgb(138, 138, 138);
  659 +}
  660 +
  661 +.nothing .Foil {
  662 + width: 80rpx;
  663 + height: 2rpx;
  664 + background-color: rgb(138, 138, 138);
  665 +}
  666 +.goods_name{
  667 + height: 70rpx;
  668 + margin-top: 6rpx;
  669 +}
  670 +.seckill-list view.translation{
  671 + width:108rpx;height:20rpx; border-radius: 20rpx;background:#dfdfdf;margin: auto;line-height: 20rpx;
  672 +}
  673 +.seckill-list view.spot{
  674 + width:10rpx;
  675 + height:10rpx;
  676 + padding: 0rpx;
  677 +
  678 +}
  679 +
  680 +.spot{
  681 + width:10rpx;
  682 + height:10rpx;
  683 + padding: 0rpx;
  684 +
  685 +}
  686 +.translation{
  687 + width:108rpx;height:20rpx; border-radius: 20rpx;background:#e0e0e0;line-height: 20rpx;
  688 + bottom: 45rpx;
  689 +left: 43%;
  690 +
  691 +}
  692 +
  693 +.translation{
  694 + width:108rpx;height:20rpx; border-radius: 20rpx;background:#b8d1d6;line-height: 20rpx;
  695 + bottom: 12rpx;
  696 +left: 43%;
  697 +}
  698 +.translations{
  699 + width:108rpx;height:20rpx; border-radius: 20rpx;background:#dfdfdf;line-height: 20rpx;
  700 + bottom: 25rpx;
  701 +left: 43%;
  702 +}
  703 +.mar-top{
  704 + margin-top: 20rpx;
  705 +}
  706 +.mar-tops{
  707 + margin-top: 10rpx;
  708 +}
  709 +
  710 +.pt_active{ animation: sport 0.5s;}
  711 +@keyframes sport {
  712 + 0% {transform: translateY(80rpx);opacity: 0;}
  713 + 100% {transform: translateY(0rpx);opacity: 1}
  714 +}
  715 +.m-left{
  716 + margin-left: 18rpx;
  717 +}
  718 +.martop4{
  719 +margin-top: 4rpx;
  720 +
  721 +}
  722 +.time-blue{
  723 +margin-left: 10rpx;
  724 +}
  725 +.is_seckill_height{
  726 + height:40rpx;line-height:32rpx;
  727 +}
  728 +
  729 +
  730 +.assemble-top-border{
  731 + border-top: 10rpx solid #eee;
  732 + padding-top:20rpx;
  733 + margin-top:0rpx;
  734 +}
pages/team/team_success/team_success.js
@@ -4,7 +4,7 @@ var t = require(&quot;../../../utils/util.js&quot;), @@ -4,7 +4,7 @@ var t = require(&quot;../../../utils/util.js&quot;),
4 a = require("../../../utils/wxParse/wxParse.js"), 4 a = require("../../../utils/wxParse/wxParse.js"),
5 s = getApp(), 5 s = getApp(),
6 i = s.request, 6 i = s.request,
7 - rq = i, 7 + rq = i,
8 oo = s.globalData, 8 oo = s.globalData,
9 o = s.globalData.setting, 9 o = s.globalData.setting,
10 os = o; 10 os = o;
utils/LoadMore.js
@@ -76,32 +76,33 @@ var e = function() { @@ -76,32 +76,33 @@ var e = function() {
76 76
77 //格式化 77 //格式化
78 var glist=""; 78 var glist="";
79 - for (var i = 0; i < g.length; i++) { 79 +
  80 + for (var ii = 0; ii < g.length; ii++) {
80 //if(g[i].prom_type == 1 || g[i].prom_type == 2 || g[i].prom_type == 6) { 81 //if(g[i].prom_type == 1 || g[i].prom_type == 2 || g[i].prom_type == 6) {
81 - if (g[i].prom_type == 1) {  
82 - glist += g[i].goods_id+","; 82 + if (g[ii].prom_type == 1) {
  83 + glist += g[ii].goods_id+",";
83 } 84 }
84 - if (g[i].original_img!=undefined){  
85 - if (g[i].original_img.indexOf(oo.imghost)==-1)  
86 - g[i].original_img = oo.imghost + g[i].original_img; 85 + if (g[ii].original_img!=undefined){
  86 + if (g[ii].original_img.indexOf(oo.imghost)==-1)
  87 + g[ii].original_img = oo.imghost + g[ii].original_img;
87 } 88 }
88 89
89 - if (g[i].add_time != undefined){  
90 - var tx = g[i].add_time + ""; 90 + if (g[ii].add_time != undefined){
  91 + var tx = g[ii].add_time + "";
91 if (tx.indexOf('-') == -1) { 92 if (tx.indexOf('-') == -1) {
92 - g[i].add_time = ut.formatTime(g[i].add_time, 'yyyy-MM-dd hh:mm:ss'); 93 + g[ii].add_time = ut.formatTime(g[ii].add_time, 'yyyy-MM-dd hh:mm:ss');
93 } 94 }
94 } 95 }
95 if (rurl.indexOf('comment/page')!=-1){ 96 if (rurl.indexOf('comment/page')!=-1){
96 console.log('comment/page'); 97 console.log('comment/page');
97 - console.log(g[i].img);  
98 - var tx1 = g[i].img; 98 + console.log(g[ii].img);
  99 + var tx1 = g[ii].img;
99 100
100 if (tx1 != "" && tx1 != null && ut.isString(tx1)){ 101 if (tx1 != "" && tx1 != null && ut.isString(tx1)){
101 var arr = ut.unserialize(tx1); 102 var arr = ut.unserialize(tx1);
102 - g[i].img=arr; 103 + g[ii].img=arr;
103 } else if (!ut.isArray(tx1)){ 104 } else if (!ut.isArray(tx1)){
104 - g[i].img=""; 105 + g[ii].img="";
105 } 106 }
106 } 107 }
107 } 108 }
utils/filter.wxs
@@ -2,7 +2,7 @@ var filters = { @@ -2,7 +2,7 @@ var filters = {
2 toFix:function(val,count){ 2 toFix:function(val,count){
3 return val.toFixed(count) 3 return val.toFixed(count)
4 }, 4 },
5 - replace_time:function(val){ 5 + replace_time:function(val){
6 if(!val) return "不限"; 6 if(!val) return "不限";
7 return val.replace("00:00:00",""); 7 return val.replace("00:00:00","");
8 }, 8 },
utils/util.js
@@ -248,6 +248,16 @@ function check_mobile(phoneMobile){ @@ -248,6 +248,16 @@ function check_mobile(phoneMobile){
248 return ob; 248 return ob;
249 } 249 }
250 250
  251 +//获取随机元素
  252 +function get_rand_item(arr){
  253 + if(!arr) return null;
  254 + if(arr.length<=0) return null;
  255 + if(arr.length==1) return arr[0];
  256 + var ind=Math.floor(Math.random()*arr.length);
  257 + if(ind==arr.length) ind=arr.length-1;
  258 + return arr[ind];
  259 +}
  260 +
251 module.exports = { 261 module.exports = {
252 formatTime: function(e, r) { 262 formatTime: function(e, r) {
253 var t = e ? new Date(1e3 * e) : new Date(), n = t.getFullYear(), o = t.getMonth() + 1, a = t.getDate(), u = t.getHours(), i = t.getMinutes(), f = t.getSeconds(), s = function(e) { 263 var t = e ? new Date(1e3 * e) : new Date(), n = t.getFullYear(), o = t.getMonth() + 1, a = t.getDate(), u = t.getHours(), i = t.getMinutes(), f = t.getSeconds(), s = function(e) {
@@ -337,5 +347,6 @@ module.exports = { @@ -337,5 +347,6 @@ module.exports = {
337 sub_last: sub_last,//去掉末尾一个字符 347 sub_last: sub_last,//去掉末尾一个字符
338 measureText: measureText,//画布需要的函数 348 measureText: measureText,//画布需要的函数
339 check_mobile: check_mobile,//验证手机 349 check_mobile: check_mobile,//验证手机
  350 + get_rand_item:get_rand_item, //随机获取元素
340 351
341 }; 352 };