wxd / MShopWeApp

Commit 48677d187ccda9fdaf3c1acc5f8728f1103808ae

Authored by season
2 parents c8ebdca8 460365c8

9-12合并到dev

Inline Side-by-side
Showing 24 changed files with 1553 additions and 312 deletions
app.wxss
  View file @48677d1
... ... @@ -2,6 +2,9 @@
2 2 .flex {
3 3 display: flex;
4 4 }
  5 +.ib{
  6 + display: inline-block;
  7 +}
5 8 .flex_auto {
6 9 flex: 1;
7 10 }
... ... @@ -10,6 +13,7 @@
10 13 display: flex; flex-direction: column;
11 14 justify-content: space-between;
12 15 box-sizing: border-box;
  16 + overflow-x:hidden;
13 17 }
14 18 page {
15 19 overflow-x: hidden;
... ... @@ -240,9 +244,7 @@ justify-content:space-around;
240 244 .t-l{
241 245 text-align: right;
242 246 }
243   -.white{
244   - color: #fff;
245   -}
  247 +
246 248 .img_gray{
247 249 -webkit-filter: grayscale(1);/* Webkit */
248 250 filter:gray;/* IE6-9 */
... ... @@ -273,6 +275,7 @@ justify-content:space-around;
273 275 font-size:30rpx;
274 276 }
275 277  
  278 +
276 279 .fs35{
277 280 font-size:35rpx;
278 281 }
... ... @@ -285,7 +288,9 @@ justify-content:space-around;
285 288  
286 289  
287 290 /* 7.26 */
288   -
  291 +.white{
  292 + color: #fff;
  293 +}
289 294 .red-b{
290 295 background: #d60021;
291 296 }
... ... @@ -306,15 +311,21 @@ color: #b9b9b9;
306 311 .xc-black{
307 312 color: #000;
308 313 }
  314 +.xc-black3{
  315 + color: #333;
  316 +}
309 317  
310 318  
311 319 .xc-fixed{
312 320 position: fixed;
313 321  
314 322 }
315   -.yellow{
  323 +.yellow-b{
316 324 background-color: #ffb03f;
317 325 }
  326 +.yellow-co{
  327 + color: #ffb03f;
  328 +}
318 329 .green{
319 330 background-color: #16ba63;
320 331 }
... ... @@ -342,8 +353,11 @@ background: #ffe3e2;
342 353 font-size: 24rpx;
343 354 }
344 355 .fs36 {
345   - font-size: 36rpx;
  356 + font-size: 36rpx;
346 357 }
347 358 .fs40 {
348 359 font-size: 40rpx;
349   -}
350 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
  View file @48677d1
  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 86 \ No newline at end of file
... ...
components/goods_list/goods_list.json 0 → 100644
  View file @48677d1
  1 +{
  2 + "component": true,
  3 + "usingComponents": {}
  4 +}
0 5 \ No newline at end of file
... ...
components/goods_list/goods_list.wxml 0 → 100644
  View file @48677d1
  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 39 \ No newline at end of file
... ...
components/goods_list/goods_list.wxss 0 → 100644
  View file @48677d1
  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 138 \ No newline at end of file
... ...
pages/activity/pind_list/pind_list.js
  View file @48677d1
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 5 var regeneratorRuntime = require('../../../utils/runtime.js');
3 6  
4   -Page({
  7 +Page({
5 8 data: {
6 9 url: a.imghost,
7 10 killtime: null,
... ... @@ -11,6 +14,7 @@ Page({
11 14 timer:null,
12 15 ismore:1,
13 16 isshow:0,
  17 + iurl: os.imghost,
14 18 },
15 19  
16 20 onShow: function(t) {
... ... @@ -60,7 +64,7 @@ Page({
60 64 let min = parseInt(time % (60 * 60 * 24) % 3600 / 60);
61 65 let sec = parseInt(time % (60 * 60 * 24) % 3600 % 60);
62 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 69 }else{
66 70 //活动已结束，全部设置为'00'
... ... @@ -101,6 +105,7 @@ Page({
101 105 alllist.push(plist[i]);
102 106 }
103 107 e.data.currentPage++;
  108 +
104 109 th.setData({goodlist:alllist,isshow:1});
105 110 },
106 111  
... ...
pages/activity/pind_list/pind_list.wxml
  View file @48677d1
1 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 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 11 <image class="wh100" src="{{url+item.original_img}}" data-val="{{item.original_img}}"
12 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 14 </navigator>
17 15 <view class="kill-cont">
18 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 39 <text class='tui-conutdown-box'>{{item.djs.day}}</text>天
25 40 <text class='tui-conutdown-box'>{{item.djs.hou}}</text>时
26 41 <text class='tui-conutdown-box'>{{item.djs.min}}</text>分
27 42 <text class='tui-conutdown-box tui-countdown-bg'>{{item.djs.sec}}</text>秒
28 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 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 60 <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" wx:if="{{item.status==1 && type==1 && item.kttype==2}}">去开团</navigator>
37 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 65 </view>
42 66 </view>
43 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 83 </view>
45 84  
46 85 <view class="no-more" wx:if="{{goodlist.length==0}}">没有相关内容</view>
  86 +</view>
47 87 </block>
48 88 \ No newline at end of file
... ...
pages/activity/pind_list/pind_list.wxss
  View file @48677d1
  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 12 .kill-time {
2 13 text-align: center;
3 14 justify-content: space-around;
4 15 align-items: center;
5   - height: 178rpx;
  16 + height: 101rpx;
6 17 border-bottom: 1px solid #ddd;
7 18 border-top: 1px solid #ddd;
8 19 background-color: #f6f6f6;
9 20 }
10 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 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 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 39 .kill-item {
23   - display: flex;
  40 + display: flex;
24 41 justify-content: space-between;
25 42 background-color: #fff;
26 43 padding: 10rpx 20rpx;
27 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 53 .kill-pic {
31   - width: 200rpx;
32   - height: 200rpx;
  54 + width: 215rpx;
  55 + height: 215rpx;
33 56 position: relative;
34 57 }
35 58  
... ... @@ -40,23 +63,28 @@
40 63 }
41 64  
42 65 .kill-cont {
43   - width: 480rpx;
  66 + width: 440rpx;
  67 + height: 215rpx;
  68 + margin-left: 16rpx;
44 69 }
45 70  
46 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 80 .goods-num {
54   - padding-top: 10rpx;
  81 + height: 60rpx;
55 82 display: flex;
56 83 justify-content: space-between;
57   - line-height: 42rpx;
  84 + margin-top: 10rpx;
58 85 font-size: 24rpx;
59 86 color: #999;
  87 + align-items: center;
60 88 }
61 89  
62 90 .goods-num .co-red {
... ... @@ -70,12 +98,18 @@
70 98  
71 99 .kill-btn {
72 100 text-align: right;
  101 + padding-top: 15rpx;
  102 +
73 103 }
74 104  
  105 +
75 106 .kill-btn>navigator {
76 107 padding: 0 20rpx;
77 108 background: #e23245;
78 109 color: #fff;
  110 + border-radius: 20rem;
  111 +line-height: 43rpx;
  112 +margin-top: 4rpx;
79 113 }
80 114  
81 115 .kill-btn .gray {
... ... @@ -89,5 +123,76 @@
89 123 color: #333;
90 124 }
91 125  
92   -.kill-btn>navigator.huise{background-color: gainsboro;}
93   -.tneirong{color:#555; font-size: 21rpx;}
94 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 200 \ No newline at end of file
... ...
pages/activity/seckill_list/seckill_list.js
  View file @48677d1
... ... @@ -58,11 +58,11 @@ Page({
58 58 let min = parseInt(time % (60 * 60 * 24) % 3600 / 60);
59 59 let sec = parseInt(time % (60 * 60 * 24) % 3600 % 60);
60 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 63 }else{
64 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 67 var txt ="goodlist["+i+"].djs";
68 68 th.setData({ [txt]: obj});
... ... @@ -80,6 +80,7 @@ Page({
80 80 {isShowLoading:1,data:{store_id:os.stoid,timetype:th.data.type,is_end:0,is_show:1}}
81 81 ).then(res=>{
82 82 plist=res.data.data.pageData;
  83 + console.log("是什么即将开始",plist);
83 84 });
84 85  
85 86 if(plist.length<=0){
... ... @@ -101,6 +102,7 @@ Page({
101 102 alllist.push(plist[i]);
102 103 }
103 104 e.data.currentPage++;
  105 + console.log("秒杀商品列表", alllist);
104 106 th.setData({goodlist:alllist,isshow:1});
105 107  
106 108 },
... ...
pages/activity/seckill_list/seckill_list.wxml
  View file @48677d1
  1 +<wxs module="filters" src="../../../utils/filter.wxs"></wxs>
1 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 13 <image class="wh100" src="{{url+item.original_img}}" data-val="{{item.original_img}}"
12 14 data-errorimg="goodlist[{{index}}].original_img" binderror="bind_bnerr2" lazy-load="true"></image>
13 15 </navigator>
14 16 <view class="kill-cont">
15 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 32 <view class="goods-num">
17 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 37 <text class='tui-conutdown-box'>{{item.djs.hou}}</text>时
22 38 <text class='tui-conutdown-box'>{{item.djs.min}}</text>分
23 39 <text class='tui-conutdown-box tui-countdown-bg'>{{item.djs.sec}}</text>秒
24 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 46 </view>
26 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 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 51 </view>
31 52 </view>
32 53 </view>
33 54 </view>
  55 + <view style="height:120rpx"></view>
34 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 71 <view class="no-more" wx:if="{{goodlist.length==0}}">没有相关内容</view>
  72 +</view>
  73 +
36 74 </block>
... ...
pages/activity/seckill_list/seckill_list.wxss
  View file @48677d1
  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 28 .kill-time {
2 29 text-align: center;
3 30 justify-content: space-around;
4 31 align-items: center;
5   - height: 178rpx;
  32 + height: 101rpx;
6 33 border-bottom: 1px solid #ddd;
7 34 border-top: 1px solid #ddd;
8 35 background-color: #f6f6f6;
9 36 }
10 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 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 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 51 .kill-item {
22 52 display: flex;
23 53 justify-content: space-between;
24 54 background-color: #fff;
25   - padding: 10rpx 20rpx;
  55 + padding: 10rpx 10rpx;
26 56 margin-bottom: 10rpx;
  57 + border-radius: 10rpx;
  58 + height: 249rpx;
  59 + align-items: center;
27 60 }
28 61  
29 62 .kill-pic {
30   - width: 200rpx;
31   - height: 200rpx;
  63 + width: 215rpx;
  64 + height: 215rpx;
32 65 }
33 66  
34 67 .kill-cont {
35   - width: 480rpx;
  68 + width: 465rpx;
  69 + margin-left:20rpx;
  70 + margin-right: 5rpx;
36 71 }
37 72  
38 73 .goods-name {
39   - height: 96rpx;
40   - line-height: 48rpx;
41   - font-size: 24rpx;
  74 + height: 60rpx;
  75 + font-size: 27rpx;
42 76 color: #555;
  77 + line-height: 30rpx;
  78 +
43 79 }
44 80  
45 81 .goods-num {
... ... @@ -57,17 +93,28 @@
57 93 }
58 94  
59 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 102 .kill-btn {
64 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 111 .kill-btn>navigator {
68 112 padding: 0 20rpx;
69 113 background: #e23245;
70 114 color: #fff;
  115 + border-radius: 20rpx;
  116 + margin-top: 37px;
  117 +
71 118 }
72 119  
73 120 .kill-btn .gray {
... ... @@ -81,4 +128,51 @@
81 128 color: #333;
82 129 }
83 130  
84   -.kill-btn>navigator.huise{background-color: gainsboro;}
85 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 180 \ No newline at end of file
... ...
pages/goods/categoryList/categoryList.js
  View file @48677d1
... ... @@ -9,7 +9,7 @@ Page({
9 9 windowHeight:0,
10 10 windowWidth: 0,
11 11 eachLetterHeight:0,
12   - lettersPosition:0,
  12 + lettersPosition:0,
13 13 catelist:null, //分类读取
14 14 nationlist: null,//国家读取
15 15 groups: null, //品牌读取
... ...
pages/goods/goodsInfo/goodsInfo.js
  View file @48677d1
... ... @@ -8,7 +8,7 @@ var t = require(&quot;../../../utils/util.js&quot;),
8 8 oo = s.globalData,
9 9 o = s.globalData.setting,
10 10 os = o;
11   -//评价加载更多
  11 +//评价加载更多
12 12 var more = function(e) {
13 13 return e && e.__esModule ? e : {
14 14 default: e
... ... @@ -1402,6 +1402,7 @@ Page({
1402 1402 prom_start_time: prom_start_time,
1403 1403 isshow:1,
1404 1404 });
  1405 +
1405 1406  
1406 1407 var newTime = ut.gettimestamp();
1407 1408 var endTime2 = t.data.data.end_time;
... ...
pages/goods/goodsInfo/goodsInfo.wxml
  View file @48677d1
... ... @@ -266,7 +266,7 @@
266 266 </view>
267 267 <view class="word-line fs24 xc-unit-price">零售价￥{{data.market_price}}</view>
268 268 </view>
269   - <view class="xc-val-price">
  269 + <view class="xc-val-price">
270 270 <view class="fs30" style='padding-left:13rpx;'>已抢:{{prom_act.buy_num+prom_act.virtual}}件</view>
271 271 <view class="fs30 save t-c">秒杀立省￥{{filters.toFix(data.market_price-prom_price,2)}}</view>
272 272 </view>
... ...
pages/goods/goodsInfo/goodsInfo.wxss
  View file @48677d1
... ... @@ -1139,7 +1139,7 @@ left:31rpx;}
1139 1139 width: 100%;
1140 1140 height: 42rpx;
1141 1141 padding-left: 34rpx;
1142   - color: #948485;
  1142 + color: #333;
1143 1143  
1144 1144 }
1145 1145 .xc_comment-have-pictures{
... ... @@ -2228,6 +2228,8 @@ right:17rpx; top:55rpx;
2228 2228  
2229 2229 .no_pj_list{text-align: center; width: 100%; color: #999; margin-top: 30rpx; display: inline-block; font-size: 28rpx}
2230 2230  
  2231 +
2231 2232 .join-cart>view.no_store {
2232 2233 width: 58%; background-color: #adadad;
2233 2234 }
  2235 +
... ...
pages/goods/search/search.js
  View file @48677d1
... ... @@ -44,6 +44,14 @@ Page({
44 44 })
45 45 e.init(this, "", "requestData");
46 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 55 if (0 != t.brand_id && t.brand_id!=undefined){ url += "&brand_id=" + t.brand_id;}
48 56 if (0 != t.nation_id && t.nation_id!=undefined) { url += "&nation_id=" + t.nation_id;}
49 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 81 requestSearch: function(t) {
74 82 var a = this;
75 83 console.log('requestSearch');
76   - console.log(t);
  84 + console.log(t,"扫描商品的搜索商品1111111111111111111111111111");
77 85  
78 86 this.data.requestUrl = t,
79 87 //t += "&orderField=" + a.data.tabname;
... ... @@ -136,6 +144,7 @@ Page({
136 144  
137 145 //-----点击搜索按钮----
138 146 search: function(t) {
  147 + console.log(t,"是什么的");
139 148 if ("string" != typeof t || "" == t) return a.showWarning("请输入搜索关键词");
140 149 this.resetData(), this.requestSearch(this.data.baseUrl + "&key_str=" + encodeURIComponent(t));
141 150 },
... ...
pages/index/index/index.js
  View file @48677d1
... ... @@ -6,7 +6,7 @@ var e = function (e) {
6 6 i = require("../../../utils/util.js"), ut = i, s = require("../../../utils/common.js"), n = new e.default();
7 7 var regeneratorRuntime = require('../../../utils/runtime.js');
8 8 var api = require('../../../api/api.js');
9   -
  9 +
10 10 Page({
11 11 data: {
12 12 url: o.imghost,
... ... @@ -34,7 +34,6 @@ Page({
34 34 pindGoods: null,//拼单数据
35 35 newGoods:null,//新商品
36 36 hotGoods:null,//hot商品
37   -
38 37 //----控制是是否显示计时器---
39 38 is_timer:1,
40 39 ishow:0,
... ... @@ -42,32 +41,95 @@ Page({
42 41 isTemplate:0,
43 42 template_arr:null,
44 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 60 onLoad: function () {
47 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 80 async onShow() {
  81 + var th=this;
  82 +
51 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 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 126 onHide:function(){
65 127 this.data.is_timer=0;
  128 + clearInterval(this.data.pt_timer)
66 129 },
67 130  
68 131 //同步初始加载
69 132 async init_load(){
70   -
71 133 var th=this;
72 134 await getApp().get_isbuy();
73 135 this.setappdata(getApp().globalData.wxapp_buy_obj);
... ... @@ -83,8 +145,8 @@ Page({
83 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 151 if(getApp().globalData.config && getApp().globalData.config.store_name!=undefined && getApp().globalData.config.store_name!=null ){
90 152 wx.setNavigationBarTitle({
... ... @@ -113,6 +175,7 @@ Page({
113 175 }
114 176 console.log(arr);
115 177 if (arr.length>0) e.setData({ banner: arr, });
  178 +
116 179 wx.stopPullDownRefresh();
117 180 })
118 181  
... ... @@ -133,8 +196,7 @@ Page({
133 196 flash_data = e.data.data.pageData;
134 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 201 var nt = ut.gettimestamp();
140 202 console.log(nt);
... ... @@ -153,7 +215,7 @@ Page({
153 215 th.setData({
154 216 saleGoods: arr
155 217 });
156   - th.countDown();
  218 + //th.countDown();
157 219 }
158 220 });
159 221  
... ... @@ -163,31 +225,45 @@ Page({
163 225 store_id: os.stoid,
164 226 is_end: 0,
165 227 is_show: 1,
166   - pageSize: 9
  228 + pageSize: 6
167 229 }
168 230 }).then(res => {
169 231 var e = res;
170 232 if (e.data.code == 0) {
171 233 var pd_data = e.data.data.pageData;
  234 +
172 235 if (pd_data.length == 0) return;
173   -
174   - //当前时间戳
  236 +
  237 + //获取当前
175 238 var nt = ut.gettimestamp();
176 239 pd_data.forEach(function (val,ind) {
177 240 if(val.start_time>nt) pd_data[ind].status=0;
178 241 else if(val.end_time>nt) pd_data[ind].status=1;
179 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 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 263 th.setData({
188 264 pindGoods: arr
189 265 });
190   - //th.countDown2();
  266 + th.countDown2();
191 267 }
192 268 })
193 269  
... ... @@ -231,13 +307,14 @@ Page({
231 307 }
232 308 })
233 309 //---调用信息---
234   - this.requestRecommend();
  310 + // this.requestRecommend();
235 311 this.setData({ishow:1});
236 312 //---先获取会员---
237 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 332 },
256 333 //---加载更多是靠这个函数----
257 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 343 onPullDownRefresh: function (e) {
271 344 this.data.recommend = null, this.data.currentPage = 1, n.resetConfig(), this.requestHomePage(),
... ... @@ -298,13 +371,16 @@ Page({
298 371 scrollTop: e.scrollTop
299 372 });
300 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 377 frontColor: "#ffffff",
303 378 backgroundColor: "#f95959"
304 379 }) : wx.setNavigationBarColor({
305 380 frontColor: "#000000",
306 381 backgroundColor: "#eeeeee"
307   - }));
  382 + }));--*/
  383 +
308 384 },
309 385 jumpSearch: function () {
310 386 wx.navigateTo({
... ... @@ -327,12 +403,10 @@ Page({
327 403 bind_bnerr2: function (e) {
328 404 var _errImg = e.target.dataset.errorimg;
329 405 var _errurl = e.target.dataset.url;
330   - var ii = _errurl.indexOf(o.imghost);
331   - if (ii != -1) {
332 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 412 bind_bnerr3: function (e) {
... ... @@ -404,6 +478,9 @@ Page({
404 478 //----拼单倒计时函数-----
405 479 countDown2() {
406 480 if(!this.data.is_timer) return false;
  481 +
  482 +
  483 +
407 484 var th = this;
408 485 // 获取当前时间，同时得到活动结束时间数组
409 486 var newTime = ut.gettimestamp();
... ... @@ -441,6 +518,9 @@ Page({
441 518 }
442 519 }
443 520 var txt = "pindGoods[" + j + "][" + i + "].djs";
  521 +
  522 +
  523 +
444 524 th.setData({
445 525 [txt]: obj
446 526 });
... ... @@ -449,5 +529,85 @@ Page({
449 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 614 \ No newline at end of file
... ...
pages/index/index/index.json
  View file @48677d1
1 1 {
2   - "navigationBarBackgroundColor": "#eeeeee",
  2 + "navigationBarBackgroundColor": "#ff7295",
  3 + "navigationBarTextStyle": "white",
3 4 "usingComponents": {
  5 + "goods_recommend":"/components/goods_list/goods_list",
4 6 "nav": "/components/diy_nav/diy_nav",
5 7 "advertising":"/components/diy_advertising/diy_advertising",
6 8 "groupbuy": "/components/diy_groupbuy/diy_groupbuy",
7   - "goodsGroup": "/components/diy_goodsGroup/diy_goodsGroup",
  9 + "goodsGroup": "/components/diy_goodsGroup/diy_goodsGroup",
8 10 "seckill": "/components/diy_seckill/diy_seckill",
9 11 "searchbox":"/components/diy_searchbox/diy_searchbox",
10 12 "shopname": "/components/diy_shopname/diy_shopname",
... ...
pages/index/index/index.wxml
  View file @48677d1
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 13 <view class="search-inner">
6 14 <view class="search-img">
7 15 <image class="wh100" src="{{url}}/miniapp/images/search.png"></image>
8 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 23 </view>
11 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 28 <swiper-item wx:for="{{banner}}" wx:key="banner">
16   - <navigator url="{{item.media_link}}">
  29 + <view url="{{item.media_link}}" class="slide-image-frame">
17 30 <image class="slide-image" src="{{item.ad_code}}" lazy-load="true" binderror="bind_bnerr" data-errorimg="banner[{{index}}].ad_code"></image>
18   - </navigator>
  31 + </view>
19 32 </swiper-item>
20 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 39 </view>
22 40 <view class="pd-view" wx:else></view>
23 41  
... ... @@ -56,183 +74,226 @@
56 74 </view>
57 75 </view>
58 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 120 <view class="seckill" wx:if="{{saleGoods!=null && pindGoods.length!=0 }}">
61 121 <navigator url="/pages/activity/seckill_list/seckill_list">
62 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 126 </view>
  127 + <view class="flex seckill-list">
  128 + <text class="fs24 xc-marfin-right">查看全部</text>
66 129 <image class="arrow-right" src="{{url}}/miniapp/images/icon-arrowdown.png"></image>
  130 + </view>
67 131 </view>
68 132 </navigator>
69 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 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 140 <image src="{{url+aitem.original_img}}" lazy-load="true" data-errorimg="saleGoods[{{index}}][{{aind}}].original_img"
77 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 146 <image wx:if="{{aitem.status==0}}" class="status_img" src="{{url}}/miniapp/images/miao/yure.png"></image>
88 147 <image wx:if="{{aitem.status==1}}" class="status_img" src="{{url}}/miniapp/images/miao/going.png"></image>
89 148 <image wx:if="{{aitem.status==2}}" class="status_img" src="{{url}}/miniapp/images/miao/mend.png"></image>
90 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 152 <text class="un_line">￥{{aitem.market_price}}</text>
94 153 </view>
95 154 </navigator>
96 155 </swiper-item>
97 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 161 </view>
99 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 165 <navigator url="/pages/activity/pind_list/pind_list">
103 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 177 </view>
  178 + <view class="flex seckill-list">
  179 + <text class="fs24 xc-marfin-right">查看全部</text>
107 180 <image class="arrow-right" src="{{url}}/miniapp/images/icon-arrowdown.png"></image>
  181 + </view>
108 182 </view>
109 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" 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}}
130 199  
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>
  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>
134 212  
135   - </view>
136   - <view>{{aitem.title}}</view>
137   - <view class="co-red">￥{{aitem.price}}</view>
138   - <view class="co-red2">{{aitem.ct_num}}人团</view>
  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>
139 234  
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 235  
145   - </navigator>
146   - </swiper-item>
147   - </swiper>
148   - </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 236 </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>
  237 + </view>
  238 +
  239 + </navigator>
  240 +
  241 +
  242 + </view>
  243 +
  244 +</view>
  245 +
  246 +
176 247 </swiper-item>
177 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'}}">
178 252 </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 253 </view>
209   - </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>
215 254 </view>
216 255 </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>
  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>
233 271 </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>
  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 289 </view>
235   -</view>
  290 + <!-- 商品列表组件 -->
  291 + <goods_recommend id="goods_list"></goods_recommend>
  292 + <!-- 商品列表 -->
  293 +
  294 + </view>
  295 +
  296 + </view>
236 297 <!--是否是自定义-->
237 298 <view class="container" wx:if="{{isTemplate}}" style="background-color:{{bgcolor_t}}">
238 299 <block wx:for="{{template_arr}}" wx:key="{{index}}" >
... ...
pages/index/index/index.wxss
  View file @48677d1
  1 +.pink-b{
  2 + background: #ff7295;
  3 +}
1 4 .search-box {
2 5 position: fixed;
3 6 top: 0;
4 7 left: 0;
5   - width: 100%;
  8 + width: 100%;
6 9 height: 88rpx;
7 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 17 .logo {
12 18 width: 48rpx;
13 19 height: 48rpx;
... ... @@ -19,48 +25,59 @@
19 25 .search-inner {
20 26 display: flex;
21 27 align-items: center;
22   - margin: 15rpx 30rpx;
23   - width: 675rpx;
  28 + margin: 20rpx 25rpx;
  29 + width: 566rpx;
24 30 height: 58rpx;
25 31 border-radius: 29rpx;
26 32 background-color: #fff;
  33 + justify-content: center;
27 34 }
28 35  
29 36 .search-img {
30   - margin-right: 12rpx;
  37 +
31 38 width: 30rpx;
32 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 47 .search-cont {
38 48 height: 58rpx;
39   - width: 536rpx;
  49 + width: 530rpx;
40 50 padding-left: 12rpx;
41 51 line-height: 58rpx;
42 52 font-size: 24rpx;
43 53 color: #666;
  54 + margin-left: 56rpx;
  55 +
44 56 }
45 57  
46 58 .search-fixed {
47   - background: rgba(242,48,48,0.8);
  59 + background: #ff7295;
48 60 }
49 61  
50 62 .swiper_box {
51 63 width: 100%;
52   - height: 380rpx;
  64 +
53 65 }
54 66 .s_prom{
55 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 76 width: 100%;
61   - height: 380rpx;
62 77 display: inline-block;
63 78 overflow: hidden;
  79 + border-radius: 14rpx;
  80 +
64 81 }
65 82  
66 83 .venues_box {
... ... @@ -103,6 +120,12 @@ swiper-item image {
103 120 width: 100%;
104 121 height: 368rpx;
105 122 }
  123 +.title-img{
  124 + margin-top: 110rpx;
  125 +
  126 + margin-bottom: 15rpx;
  127 +
  128 +}
106 129  
107 130 .choice_box .choice_list .title {
108 131 height: 36rpx;
... ... @@ -177,6 +200,7 @@ swiper-item image {
177 200 align-items: center;
178 201 height: 72rpx;
179 202 color: #333;
  203 + margin-bottom: 20rpx;
180 204 }
181 205  
182 206 .sk-tips {
... ... @@ -221,34 +245,38 @@ swiper-item image {
221 245 }
222 246  
223 247 .seckill-list {
224   - height: 360rpx;
  248 +
225 249 overflow: hidden;
226 250 }
227 251  
228   -.seckill-list navigator {
  252 +/* .seckill-list navigator {
229 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 258 .seckill-list view {
238   - height: 45rpx;
  259 + height: 62rpx;
239 260 padding: 0 10rpx;
240   - line-height: 45rpx;
  261 + line-height: 33rpx;
241 262 overflow: hidden;
242   - font-size: 30rpx;
  263 + font-size: 28rpx;
243 264 }
244 265  
245 266 .seckill-list view.imgview{
246   - width: 236rpx;
247   - height: 236rpx;
  267 + width: 203rpx;
  268 + height: 210rpx;
248 269 position: relative;
249   - overflow: hidden
  270 + overflow: hidden;
  271 +
  272 +
  273 +}
  274 +.imgview image{
  275 + width: 203rpx;
  276 + height: 203rpx;
  277 + border-radius: 10rpx;
  278 +
250 279 }
251   -
252 280 .seckill-list view.djs_view{
253 281 background:rgba(9,9,9,0.5);color: #fff; font-size: 20rpx;
254 282 width: 216rpx; height: 36rpx; line-height: 36rpx;
... ... @@ -258,7 +286,7 @@ swiper-item image {
258 286 .seckill-list image.status_img{
259 287 width: 100rpx; height: 35rpx;
260 288 position: absolute;
261   - top: 5rpx; left: 10rpx; z-index: 5;
  289 + top: 0rpx; left: 10rpx; z-index: 5;
262 290 }
263 291  
264 292 .seckill-list view.status_view{
... ... @@ -292,10 +320,414 @@ swiper-item image {
292 320 bottom: 30rpx; right: 10rpx; z-index: 5; border-radius: 5rpx;padding: 0;
293 321 }
294 322  
295   -.arrow-right{width: 30rpx; height: 30rpx;}
  323 +.arrow-right{width: 24rpx; height: 24rpx;}
296 324 .pd-view{height: 80rpx;}
297 325  
  326 +
298 327 .xc-grow-ups{
299 328 margin-left:8rpx;
300 329 margin-top:6rpx;
301 330 }
  331 +.xc-top-img{
  332 +width: 100%;
  333 +top: -1rpx;
  334 +height: 315rpx;
  335 +
  336 +}
  337 +
  338 +.classify-frame{
  339 +line-height: 25rpx;
  340 +}
  341 +.slide-image-frame{
  342 + width: 95%;
  343 +margin: auto;
  344 +border-radius: 10rpx;
  345 +height: 380rpx;
  346 +}
  347 +.xc-hook{
  348 + width: 52rpx;
  349 + height: 52rpx;
  350 +
  351 +
  352 +}
  353 +.margin-left{
  354 +margin-left: 10rpx;
  355 +}
  356 +.xc-class-img{
  357 + width: 83rpx;
  358 + height: 83rpx;
  359 +}
  360 +.xc-class-frame{
  361 + line-height: 40rpx;
  362 + margin-top: 40rpx;
  363 + margin-bottom: 20rpx;
  364 +
  365 +
  366 +}
  367 +.xc-title-img{
  368 + height: 220rpx;
  369 + width: 100%;
  370 +}
  371 +
  372 +.title-img-frame{
  373 + width: 95%;
  374 +margin: auto;
  375 +margin-top: 30rpx;
  376 +
  377 +}
  378 +.seckill-list{
  379 + line-height: 24rpx;
  380 +}
  381 +.seckill-lists{
  382 + line-height: 30rpx;
  383 +}
  384 +
  385 +.xc-marfin-right{
  386 +margin-right: 8rpx;
  387 +}
  388 +.classname .clock-img{
  389 + width:36rpx;
  390 + height: 36rpx;
  391 + margin-right: 10rpx;
  392 +}
  393 +.classname .seckill-ttitle-img{
  394 + width:150rpx;
  395 + height: 40rpx;
  396 +}
  397 +.seckill-ttitle-img.height{
  398 + height: 35rpx
  399 +}
  400 +.split-line{
  401 + width:100%;height:10rpx;background:#eee;
  402 +}
  403 +.mar-top10{
  404 +margin-top: 10rpx;
  405 +}
  406 +.classname .user-img{
  407 +width: 30rpx;
  408 +height:30rpx;
  409 +margin-left:20rpx;
  410 +margin-right: 10rpx;
  411 +}
  412 +.user-frame{
  413 +
  414 + /* border-left: 5rpx solid #eee; */
  415 + height: 35rpx;
  416 + line-height: 35rpx;
  417 + margin-left: 10rpx;
  418 +
  419 +}
  420 +.user-name{
  421 + width: 66rpx;
  422 + border-left: 5rpx solid #eee;
  423 +}
  424 +
  425 +
  426 +/* 团购列表 */
  427 +
  428 +.kill-item {
  429 +
  430 + display: flex;
  431 + justify-content: space-between;
  432 + background-color: #fff;
  433 + padding: 10rpx 10rpx;
  434 + margin-bottom: 10rpx;
  435 + border-radius: 10rpx;
  436 + height: 249rpx;
  437 + align-items: center;
  438 +
  439 +
  440 +}
  441 +.kill-pic {
  442 + width: 215rpx;
  443 + height: 215rpx;
  444 + position: relative;
  445 +}
  446 +.teamheight{
  447 +height: 289rpx;
  448 +border-bottom:6rpx solid #eee;
  449 +
  450 +}
  451 +
  452 +
  453 +.kill-cont {
  454 + width: 440rpx;
  455 + height: 215rpx;
  456 + margin-left: 16rpx;
  457 +}
  458 +.goods-name {
  459 + max-height: 60rpx;
  460 + font-size: 24rpx;
  461 + color: #555;
  462 + line-height: 55rpx;
  463 +
  464 +}
  465 +
  466 +.xc-team-img{
  467 +width:38rpx;
  468 +height: 45rpx;
  469 +left: -1rpx;
  470 +top: -16rpx;
  471 +}
  472 +
  473 +.tneirong{
  474 + color:#fff;
  475 + font-size: 20rpx;
  476 + border-radius:20rpx;
  477 + padding-left: 32rpx;
  478 + padding-right: 15rpx;
  479 + padding-bottom: 2rpx;
  480 + height: 28rpx;
  481 + line-height: 28rpx;
  482 +
  483 +white-space: nowrap;
  484 + }
  485 + .xc-people-val-frame{
  486 + border: 3rpx solid #d60021;border-radius: 8rpx;white-space: nowrap;
  487 +height: 28rpx;
  488 +
  489 +}
  490 +.xc-people-val-frame .val-img{
  491 +width:33rpx;height:28rpx;border-radius: 8rpx;margin-left: -2rpx;
  492 +}
  493 +.people-img{
  494 + width:20rpx;height:20rpx
  495 +}
  496 +.goods-num {
  497 + height: 50rpx;
  498 + display: flex;
  499 + justify-content: space-between;
  500 +margin-top: 10rpx;
  501 + font-size: 24rpx;
  502 + color: #999;
  503 +
  504 +}
  505 +.xc-top15{
  506 + padding-top: 15rpx;
  507 + margin-top: 25rpx;
  508 +}
  509 +.underline {
  510 + text-decoration: line-through; color:#999999; font-size: 20rpx; margin-left: 5rpx;margin-top: 5rpx;
  511 +}
  512 +.navigator.navwidth{
  513 + width: 100%；
  514 +}
  515 +.view.left{
  516 + padding: 0 5rpx;
  517 +
  518 +}
  519 +
  520 +
  521 +
  522 +/* 热门好物 */
  523 +
  524 +.title .China {
  525 + width: 100%;
  526 + margin-top: 10rpx;
  527 + margin-bottom: 10rpx;
  528 + line-height: 0rpx;
  529 +}
  530 +
  531 +.title .China .line view {
  532 + width: 2rpx;
  533 +}
  534 +
  535 +.title .China .line {
  536 + height: 40rpx;
  537 + color: rgb(51,51, 51);
  538 +}
  539 +.title .China .line view{
  540 + border-left: 3rpx solid #000;
  541 + margin-left: 5rpx;
  542 +}
  543 +.title .China .line .one {
  544 + height: 23rpx;
  545 +}
  546 +
  547 +.title .China .line .two {
  548 + height: 15rpx;
  549 +}
  550 +
  551 +.title .China .line .three {
  552 + height: 18rpx;
  553 +}
  554 +
  555 +.title .China .Recommend {
  556 + margin: 0rpx 20rpx;
  557 + font-size: 28rpx;
  558 + line-height: 39rpx;
  559 + font-weight: bold;
  560 +}
  561 +
  562 +.title .english .silk {
  563 + width: 214rpx;
  564 + height: 2rpx;
  565 + background-color: #000;
  566 +}
  567 +
  568 +.title .english .esh {
  569 + margin: 0rpx 15rpx;
  570 +}
  571 +
  572 +.collects {
  573 + margin-top: 40rpx;
  574 +}
  575 +
  576 +.hang {
  577 + width: 100%;
  578 + margin: auto;
  579 + padding-left: 21rpx;
  580 +}
  581 +
  582 +.hang .collect {
  583 + width: 347rpx;
  584 + height: 571rpx;
  585 + border-radius: 25rpx;
  586 + border: 1rpx solid rgb(214, 214, 214);
  587 + overflow: hidden;
  588 + margin-right: 14rpx;
  589 + margin-bottom: 5rpx;
  590 +}
  591 +
  592 +.collect .bottom {
  593 + padding: 0rpx 20rpx;
  594 +}
  595 +
  596 +.collect .sp {
  597 + width: 100%;
  598 + height: 326rpx;
  599 +}
  600 +
  601 +.collect .money {
  602 + margin-top: 60rpx;
  603 + margin-bottom: 18rpx;
  604 + line-height: 28rpx;
  605 + align-items: baseline;
  606 +}
  607 +.collect .money view{
  608 + line-height: 28rpx;
  609 +}
  610 +.collect .money .flex {
  611 + font-weight: bold;
  612 +}
  613 +.collect .money .flex .fs24{
  614 + padding-top: 5rpx;
  615 +}
  616 +.collect .Discount {
  617 + width: 156rpx;
  618 + height: 28rpx;
  619 + border-radius: 20rpx;
  620 + background-color: rgb(56, 56, 56);
  621 + font-size: 18rpx;
  622 + color: rgb(255, 255, 255);
  623 +}
  624 +
  625 +.collect .Discount image {
  626 + height: 18rpx;
  627 + width: 18rpx;
  628 + line-height: 28rpx;
  629 + margin-right: 3rpx;
  630 +}
  631 +
  632 +.collect.ml20 {
  633 + margin-left: 13rpx;
  634 +}
  635 +
  636 +.fs24.dollar {
  637 + padding: 0rpx;
  638 +}
  639 +
  640 +.money .price {
  641 + margin-left: 12rpx;
  642 + text-decoration: line-through;
  643 + line-height: 23rpx;
  644 +}
  645 +
  646 +.province {
  647 + line-height: 26rpx;
  648 +}
  649 +
  650 +.nothing {
  651 + height: 75rpx;
  652 + width: 100%;
  653 +}
  654 +
  655 +.nothing .no_content {
  656 + margin: 0rpx 11rpx;
  657 + color: rgb(138, 138, 138);
  658 +}
  659 +
  660 +.nothing .Foil {
  661 + width: 80rpx;
  662 + height: 2rpx;
  663 + background-color: rgb(138, 138, 138);
  664 +}
  665 +.goods_name{
  666 + height: 70rpx;
  667 + margin-top: 6rpx;
  668 +}
  669 +.seckill-list view.translation{
  670 + width:108rpx;height:20rpx; border-radius: 20rpx;background:#dfdfdf;margin: auto;line-height: 20rpx;
  671 +}
  672 +.seckill-list view.spot{
  673 + width:10rpx;
  674 + height:10rpx;
  675 + padding: 0rpx;
  676 +
  677 +}
  678 +
  679 +.spot{
  680 + width:10rpx;
  681 + height:10rpx;
  682 + padding: 0rpx;
  683 +
  684 +}
  685 +.translation{
  686 + width:108rpx;height:20rpx; border-radius: 20rpx;background:#e0e0e0;line-height: 20rpx;
  687 + bottom: 45rpx;
  688 +left: 43%;
  689 +
  690 +}
  691 +
  692 +.translation{
  693 + width:108rpx;height:20rpx; border-radius: 20rpx;background:#b8d1d6;line-height: 20rpx;
  694 + bottom: 12rpx;
  695 +left: 43%;
  696 +}
  697 +.translations{
  698 + width:108rpx;height:20rpx; border-radius: 20rpx;background:#dfdfdf;line-height: 20rpx;
  699 + bottom: 25rpx;
  700 +left: 43%;
  701 +}
  702 +.mar-top{
  703 + margin-top: 20rpx;
  704 +}
  705 +.mar-tops{
  706 + margin-top: 10rpx;
  707 +}
  708 +
  709 +.pt_active{ animation: sport 0.5s;}
  710 +@keyframes sport {
  711 + 0% {transform: translateY(80rpx);opacity: 0;}
  712 + 100% {transform: translateY(0rpx);opacity: 1}
  713 +}
  714 +.m-left{
  715 + margin-left: 18rpx;
  716 +}
  717 +.martop4{
  718 +margin-top: 4rpx;
  719 +
  720 +}
  721 +.time-blue{
  722 +margin-left: 10rpx;
  723 +}
  724 +.is_seckill_height{
  725 + height:40rpx;line-height:32rpx;
  726 +}
  727 +
  728 +
  729 +.assemble-top-border{
  730 + border-top: 10rpx solid #eee;
  731 + padding-top:20rpx;
  732 + margin-top:0rpx;
  733 +}
... ...
pages/team/team_success/team_success.js
  View file @48677d1
... ... @@ -4,7 +4,7 @@ var t = require(&quot;../../../utils/util.js&quot;),
4 4 a = require("../../../utils/wxParse/wxParse.js"),
5 5 s = getApp(),
6 6 i = s.request,
7   - rq = i,
  7 + rq = i,
8 8 oo = s.globalData,
9 9 o = s.globalData.setting,
10 10 os = o;
... ...
utils/LoadMore.js
  View file @48677d1
... ... @@ -65,6 +65,7 @@ var e = function() {
65 65 console.log('loadmore');
66 66 console.log(t.data.data.pageData);
67 67 console.log(c );
  68 +
68 69  
69 70 //如果已经的第二页的时候，就是把数据加入数组
70 71 if (c !=undefined && c.data[l]) {
... ... @@ -73,35 +74,35 @@ var e = function() {
73 74 f = "" != d ? c.data[l][d] : c.data[l], [].push.apply(f, i), g = c.data[l];
74 75 } else g = t.data.data.pageData;
75 76  
76   -
  77 +
77 78 //格式化
78 79 var glist="";
79   - for (var i = 0; i < g.length; i++) {
  80 + for (var ij = 0; ij < g.length; ij++) {
80 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[ij].prom_type == 1) {
  83 + glist += g[ij].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[ij].original_img!=undefined){
  86 + if (g[ij].original_img.indexOf(oo.imghost)==-1)
  87 + g[ij].original_img = oo.imghost + g[ij].original_img;
87 88 }
88 89  
89   - if (g[i].add_time != undefined){
90   - var tx = g[i].add_time + "";
  90 + if (g[ij].add_time != undefined){
  91 + var tx = g[ij].add_time + "";
91 92 if (tx.indexOf('-') == -1) {
92   - g[i].add_time = ut.formatTime(g[i].add_time, 'yyyy-MM-dd hh:mm:ss');
  93 + g[ij].add_time = ut.formatTime(g[i].add_time, 'yyyy-MM-dd hh:mm:ss');
93 94 }
94 95 }
95 96 if (rurl.indexOf('comment/page')!=-1){
96 97 console.log('comment/page');
97   - console.log(g[i].img);
98   - var tx1 = g[i].img;
  98 + console.log(g[ij].img);
  99 + var tx1 = g[ij].img;
99 100  
100 101 if (tx1 != "" && tx1 != null && ut.isString(tx1)){
101 102 var arr = ut.unserialize(tx1);
102   - g[i].img=arr;
  103 + g[ij].img=arr;
103 104 } else if (!ut.isArray(tx1)){
104   - g[i].img="";
  105 + g[ij].img="";
105 106 }
106 107 }
107 108 }
... ... @@ -109,13 +110,13 @@ var e = function() {
109 110  
110 111 //没有活动，就不用调用接口
111 112 if (glist==""){
112   - c.setData(a({}, l, g));
  113 + //c.setData(a({}, l, g));
113 114 if ("function" == typeof e && (n = e(t)), !1 === n) return !1;
114 115 i && 0 != i.length || (s.data.goodsLoadFinishFlag = !0, u && o.showWarning("加载完啦", null, 500, !1));
115 116 return false;
116 117 }
117 118  
118   - c.setData(a({}, l, g));
  119 + // c.setData(a({}, l, g));
119 120 if ("function" == typeof e && (n = e(t)), !1 === n) return !1;
120 121 i && 0 != i.length || (s.data.goodsLoadFinishFlag = !0, u && o.showWarning("加载完啦", null, 500, !1));
121 122  
... ...
utils/filter.wxs
  View file @48677d1
... ... @@ -2,7 +2,7 @@ var filters = {
2 2 toFix:function(val,count){
3 3 return val.toFixed(count)
4 4 },
5   - replace_time:function(val){
  5 + replace_time:function(val){
6 6 if(!val) return "不限";
7 7 return val.replace("00:00:00","");
8 8 },
... ...
utils/util.js
  View file @48677d1
... ... @@ -248,6 +248,16 @@ function check_mobile(phoneMobile){
248 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 261 module.exports = {
252 262 formatTime: function(e, r) {
253 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 347 sub_last: sub_last,//去掉末尾一个字符
338 348 measureText: measureText,//画布需要的函数
339 349 check_mobile: check_mobile,//验证手机
  350 + get_rand_item:get_rand_item, //随机获取元素
340 351  
341 352 };
... ...