miniprogram / binhaineigou · 提交

转到一个项目

作者 lihongjuan
提交 6666d6fa5a3ea49981ac43ae4cecdd287c923550 1 个父辈 b79d6d67

1

内嵌 并排对比
正在显示 36 个修改的文件 包含 483 行增加 和 172 行删除
@@ -6,14 +6,30 @@ @@ -6,14 +6,30 @@
6 </view> 6 </view>
7 <view class='real_goods_bottom'> 7 <view class='real_goods_bottom'>
8 <view class='goods_title'>{{item.name}}</view> 8 <view class='goods_title'>{{item.name}}</view>
  9 + <view wx:if="{{item.price2!=null}}">
  10 +
9 <view class='goods_flex'> 11 <view class='goods_flex'>
10 <view class='score'>积分</view> 12 <view class='score'>积分</view>
  13 + <view class='price'>{{item.price2}}</view>
  14 +
  15 +
  16 + <view class='sell'>已卖出{{item.paynum}}件</view>
  17 + </view>
  18 +
  19 + <view class='oldprice'>{{item.price}}</view>
  20 + </view>
  21 +
  22 + <view class='goods_flex' wx:else>
  23 + <view class='score'>积分</view>
11 <view class='price'>{{item.price}}</view> 24 <view class='price'>{{item.price}}</view>
  25 +
  26 +
12 <view class='sell'>已卖出{{item.paynum}}件</view> 27 <view class='sell'>已卖出{{item.paynum}}件</view>
13 </view> 28 </view>
  29 +
14 </view> 30 </view>
15 31
16 - <view class="pink_cover" wx:if="{{item.sold == 0}}"/> 32 + <view class="pink_cover" wx:if="{{item.sold==0}}" />
17 33
18 </view> 34 </view>
19 </view> 35 </view>
1 .real_goods { 1 .real_goods {
2 - width: 708rpx; 2 + width: 750rpx;
3 margin: 0 auto; 3 margin: 0 auto;
4 background: #f9f9f9; 4 background: #f9f9f9;
5 display: flex; 5 display: flex;
6 flex-wrap: wrap; 6 flex-wrap: wrap;
7 - padding: 8rpx 11rpx 20rpx; 7 + padding: 8rpx 0 20rpx;
8 box-sizing: border-box; 8 box-sizing: border-box;
9 } 9 }
10 10
@@ -15,6 +15,11 @@ @@ -15,6 +15,11 @@
15 background: #fff; 15 background: #fff;
16 overflow: hidden; 16 overflow: hidden;
17 position: relative; 17 position: relative;
  18 + display:flex;
  19 + flex-direction: column;
  20 +
  21 + align-items: center;
  22 +
18 } 23 }
19 24
20 .real_goods_img { 25 .real_goods_img {
@@ -48,7 +53,7 @@ @@ -48,7 +53,7 @@
48 } 53 }
49 54
50 .goods_title { 55 .goods_title {
51 - height: 72rpx; 56 +
52 font-size: 26rpx; 57 font-size: 26rpx;
53 font-family: PingFang SC; 58 font-family: PingFang SC;
54 font-weight: 500; 59 font-weight: 500;
@@ -59,7 +64,7 @@ @@ -59,7 +64,7 @@
59 display: -webkit-box; 64 display: -webkit-box;
60 -webkit-box-orient: vertical; 65 -webkit-box-orient: vertical;
61 -webkit-line-clamp: 2; 66 -webkit-line-clamp: 2;
62 - margin-bottom: 20rpx; 67 + margin-bottom: 10rpx;
63 } 68 }
64 69
65 .goods_flex { 70 .goods_flex {
@@ -105,3 +110,8 @@ @@ -105,3 +110,8 @@
105 left: 0; 110 left: 0;
106 top: 0; 111 top: 0;
107 } 112 }
  113 +.oldprice{
  114 + color:#BDC4CE;
  115 + font-size: 24rpx;
  116 + text-decoration: line-through
  117 +}
1 App({ 1 App({
2 onLaunch: function () { 2 onLaunch: function () {
3 - 3 + this.getmessagelist()
4 //自动更新版本 4 //自动更新版本
5 const updateManager = wx.getUpdateManager() 5 const updateManager = wx.getUpdateManager()
6 updateManager.onCheckForUpdate(function (res) { 6 updateManager.onCheckForUpdate(function (res) {
@@ -77,6 +77,47 @@ App({ @@ -77,6 +77,47 @@ App({
77 return promise; 77 return promise;
78 }, 78 },
79 79
  80 + getmessagelist() {
  81 + let that = this
  82 + let url = '/information/get_all';
  83 + let data = {
  84 + page: 1,
  85 + pageNum: 10,
  86 +
  87 + }
  88 + this.post(url, data, "POST").then((r) => {
  89 + // console.log(r)
  90 + // that.setData({
  91 + // messagelist: that.data.messagelist.concat(r.msg)
  92 + // })
  93 +
  94 + let newlist = [];
  95 + r.msg.forEach(function (value, index, array) {
  96 + console.log(newlist)
  97 + if (value.status == 1) {
  98 + newlist.push(value)
  99 + }
  100 + })
  101 +
  102 + console.log('77889944556',newlist)
  103 + if (newlist.length != 0) {
  104 + wx.showTabBarRedDot({
  105 + index: 1,
  106 + success: function (red) {
  107 +
  108 + wx.setTabBarBadge({
  109 + index: 1,
  110 + text: newlist.length.toString(),
  111 + })
  112 + }
  113 + })
  114 + }
  115 +
  116 +
  117 + }).catch((err) => { })
  118 + },
  119 +
  120 +
80 //接口管理 121 //接口管理
81 interface: { 122 interface: {
82 123
@@ -50,8 +50,8 @@ @@ -50,8 +50,8 @@
50 { 50 {
51 "pagePath": "pages/message/message", 51 "pagePath": "pages/message/message",
52 "text": "消息", 52 "text": "消息",
53 - "iconPath": "images/tabbar/icon_69.png",  
54 - "selectedIconPath": "images/tabbar/icon_74.png" 53 + "iconPath": "images/tabbar/message.png",
  54 + "selectedIconPath": "images/tabbar/messageactive.png"
55 }, 55 },
56 { 56 {
57 "pagePath": "pages/shop_cart/shop_cart", 57 "pagePath": "pages/shop_cart/shop_cart",
@@ -47,3 +47,18 @@ @@ -47,3 +47,18 @@
47 align-items: center; 47 align-items: center;
48 justify-content: center; 48 justify-content: center;
49 } 49 }
  50 +
  51 +
  52 +.empty {
  53 + font-size: 36rpx;
  54 + font-family: PingFang SC;
  55 + font-weight: 400;
  56 + color: #ccc;
  57 + margin-top: 200rpx;
  58 + text-align: center;
  59 +}
  60 +.oldprice{
  61 + color:#BDC4CE;
  62 + font-size: 24rpx;
  63 + text-decoration: line-through
  64 +}

973 字节 | 宽: | 高:

1.9 KB | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖

645 字节 | 宽: | 高:

1.0 KB | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖

651 字节 | 宽: | 高:

1.1 KB | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖

1.3 KB | 宽: | 高:

1.7 KB | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖

1.2 KB | 宽: | 高:

1.5 KB | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖

618 字节 | 宽: | 高:

1.4 KB | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖
@@ -24,7 +24,12 @@ Page({ @@ -24,7 +24,12 @@ Page({
24 hou :'', 24 hou :'',
25 min :'', 25 min :'',
26 sec :'', 26 sec :'',
27 - endTime:'' 27 + endTime:'',
  28 + activitystatus:'',
  29 + showtime:false,
  30 + status1:'',
  31 + status2:'',
  32 + title2:''
28 }, 33 },
29 34
30 scroll(e){ 35 scroll(e){
@@ -48,6 +53,27 @@ Page({ @@ -48,6 +53,27 @@ Page({
48 }) 53 })
49 }, 54 },
50 55
  56 + // 控制活动专区和限时抢购显示隐藏
  57 + ishow(){
  58 + let that = this
  59 + let url = '//wb/wb';
  60 + let data = {
  61 +
  62 +
  63 + }
  64 + app.post(url, data, "POST").then((r) => {
  65 + console.log('4456789',r)
  66 + that.setData({
  67 + status1: r.msg.status1,
  68 + status2: r.msg.status2,
  69 + title2: r.msg.title2
  70 + })
  71 +
  72 +
  73 +
  74 + }).catch((err) => { })
  75 + },
  76 +
51 // 限时抢购 77 // 限时抢购
52 getxianshi(){ 78 getxianshi(){
53 let that = this 79 let that = this
@@ -62,7 +88,8 @@ Page({ @@ -62,7 +88,8 @@ Page({
62 console.log(r.msg.residue_time) 88 console.log(r.msg.residue_time)
63 that.setData({ 89 that.setData({
64 xianshilist: r.msg.list, 90 xianshilist: r.msg.list,
65 - endTime: r.msg.residue_time 91 + endTime: r.msg.residue_time,
  92 + activitystatus:r.msg.status
66 }) 93 })
67 var time = that.date_format(r.msg.residue_time); 94 var time = that.date_format(r.msg.residue_time);
68 console.log(time) 95 console.log(time)
@@ -285,10 +312,12 @@ date_format(micro_second) { @@ -285,10 +312,12 @@ date_format(micro_second) {
285 pid: pid 312 pid: pid
286 } 313 }
287 app.post(url, params).then((res) => { 314 app.post(url, params).then((res) => {
  315 + console.log('88776654',res)
288 wx.hideLoading() 316 wx.hideLoading()
289 if (type == 1) { 317 if (type == 1) {
290 let obj={ 318 let obj={
291 - name:'首页' 319 + name:'首页',
  320 + id:''
292 } 321 }
293 res.msg.unshift(obj) 322 res.msg.unshift(obj)
294 that.setData({ 323 that.setData({
@@ -296,11 +325,17 @@ date_format(micro_second) { @@ -296,11 +325,17 @@ date_format(micro_second) {
296 }) 325 })
297 that.get_info(res.msg[0].id, 2) 326 that.get_info(res.msg[0].id, 2)
298 } else if (type == 2) { 327 } else if (type == 2) {
  328 + console.log('666',res)
  329 + // let obj = {
  330 + // name: '全部',
  331 + // id: ''
  332 + // }
  333 + // res.msg.unshift(obj)
299 that.setData({ 334 that.setData({
300 class_arr: res.msg, 335 class_arr: res.msg,
301 - cid: res.msg[0].id 336 + cid: ''
302 }) 337 })
303 - that.good_list(res.msg[0].id, that.data.c_index) 338 + that.good_list('', that.data.c_index)
304 } 339 }
305 }).catch((er) => { 340 }).catch((er) => {
306 wx.hideLoading() 341 wx.hideLoading()
@@ -349,11 +384,21 @@ date_format(micro_second) { @@ -349,11 +384,21 @@ date_format(micro_second) {
349 * 生命周期函数--监听页面加载 384 * 生命周期函数--监听页面加载
350 */ 385 */
351 onLoad: function(options) { 386 onLoad: function(options) {
  387 + let that=this
352 this.get_banner() 388 this.get_banner()
353 this.get_info(0, 1); 389 this.get_info(0, 1);
354 // 获取活动专区 390 // 获取活动专区
355 this.getzhuanqulist(); 391 this.getzhuanqulist();
356 - this.getxianshi() 392 + this.getxianshi();
  393 + setTimeout(function(){
  394 + that.setData({
  395 + showtime:true
  396 + })
  397 + },990)
  398 +
  399 +
  400 +
  401 +
357 }, 402 },
358 //获取购物车数量 403 //获取购物车数量
359 get_shopnum() { 404 get_shopnum() {
@@ -377,6 +422,46 @@ date_format(micro_second) { @@ -377,6 +422,46 @@ date_format(micro_second) {
377 } 422 }
378 }) 423 })
379 }, 424 },
  425 +
  426 + getmessagelist() {
  427 + let that = this
  428 + let url = '/information/get_all';
  429 + let data = {
  430 + page: 1,
  431 + pageNum: 10,
  432 +
  433 + }
  434 + app.post(url, data, "POST").then((r) => {
  435 + // console.log(r)
  436 + // that.setData({
  437 + // messagelist: that.data.messagelist.concat(r.msg)
  438 + // })
  439 +
  440 + let newlist = [];
  441 + r.msg.forEach(function (value, index, array) {
  442 + console.log(newlist)
  443 + if (value.status == 1) {
  444 + newlist.push(value)
  445 + }
  446 + })
  447 +
  448 + console.log('77889944556', newlist)
  449 + if (newlist.length != 0) {
  450 + wx.showTabBarRedDot({
  451 + index: 1,
  452 + success: function (red) {
  453 +
  454 + wx.setTabBarBadge({
  455 + index: 1,
  456 + text: newlist.length.toString(),
  457 + })
  458 + }
  459 + })
  460 + }
  461 +
  462 +
  463 + }).catch((err) => { })
  464 + },
380 /** 465 /**
381 * 生命周期函数--监听页面初次渲染完成 466 * 生命周期函数--监听页面初次渲染完成
382 */ 467 */
@@ -390,6 +475,9 @@ date_format(micro_second) { @@ -390,6 +475,9 @@ date_format(micro_second) {
390 onShow: function() { 475 onShow: function() {
391 this.get_notice() 476 this.get_notice()
392 this.get_shopnum() 477 this.get_shopnum()
  478 + this.getmessagelist()
  479 + //控制显示隐藏
  480 + this.ishow()
393 }, 481 },
394 482
395 /** 483 /**
@@ -49,14 +49,8 @@ @@ -49,14 +49,8 @@
49 </view> 49 </view>
50 </view> --> 50 </view> -->
51 <!-- 活动区域 --> 51 <!-- 活动区域 -->
52 - <view class="actity">  
53 - <view class="miaoshatopk flextwo">  
54 - <view class="miaoshatopleft flexone">  
55 - <view class="miaoshaoname">活动专区</view>  
56 -  
57 - </view>  
58 -  
59 - </view> 52 + <view class="actity" wx:if="{{status1==1}}">
  53 + <!-- <view class="miaoshaoname">活动专区</view> -->
60 54
61 <view class="active flexone"> 55 <view class="active flexone">
62 56
@@ -74,12 +68,13 @@ @@ -74,12 +68,13 @@
74 </view> 68 </view>
75 69
76 <!-- 秒杀商城 --> 70 <!-- 秒杀商城 -->
  71 + <!-- wx:if="{{activitystatus==3}}" -->
77 72
78 - <view class="miaosha xianshi"> 73 + <view class="miaosha xianshi" wx:if="{{status2==1}}">
79 <view class="miaoshatop flextwo"> 74 <view class="miaoshatop flextwo">
80 <view class="miaoshatopleft flexone"> 75 <view class="miaoshatopleft flexone">
81 - <view class="miaoshaoname">限时抢购</view>  
82 - <view class="hourgou">倒计时{{day}}天 {{hou}}：{{min}}：{{sec}}</view> 76 + <view class="miaoshaoname">{{title2}}</view>
  77 + <!-- <view class="hourgou" wx:if="{{showtime}}">{{day}}：{{hou}}：{{min}}：{{sec}}</view> -->
83 </view> 78 </view>
84 <view class="miaosharight" bindtap="moremiao"> 79 <view class="miaosharight" bindtap="moremiao">
85 查看更多> 80 查看更多>
@@ -87,12 +82,14 @@ @@ -87,12 +82,14 @@
87 </view> 82 </view>
88 83
89 <view class="miaoshalist"> 84 <view class="miaoshalist">
90 - <view class="miaoshalistitem" wx:for="{{xianshilist}}" wx:key=""> 85 + <view class="miaoshalistitem" wx:for="{{xianshilist}}" wx:key="" bindtap="look_more" data-id="{{item.id}}">
91 <view class="goodimg"> 86 <view class="goodimg">
92 <image src="{{item.images[0]}}"></image> 87 <image src="{{item.images[0]}}"></image>
93 </view> 88 </view>
94 - <view class="price">￥{{item.price}}</view>  
95 - <!-- <view class="oldprice">{{item.price}}</view> --> 89 +
  90 + <view class="price">￥{{item.price2!=null?item.price2:item.price}}</view>
  91 +
  92 +
96 </view> 93 </view>
97 94
98 </view> 95 </view>
@@ -119,7 +116,6 @@ @@ -119,7 +116,6 @@
119 <!-- {{stick==1?'navactive':''}} --> 116 <!-- {{stick==1?'navactive':''}} -->
120 117
121 <view class="navactive"> 118 <view class="navactive">
122 - <view class="flexone">  
123 <view class="horizontal_nav "> 119 <view class="horizontal_nav ">
124 120
125 <view class="nav_item {{nav_index == index?'active':''}}" wx:for="{{nav_arr}}" wx:key="index" bindtap="select_nav" data-index="{{index}}" data-id="{{item.id}}">{{item.name}}</view> 121 <view class="nav_item {{nav_index == index?'active':''}}" wx:for="{{nav_arr}}" wx:key="index" bindtap="select_nav" data-index="{{index}}" data-id="{{item.id}}">{{item.name}}</view>
@@ -132,7 +128,6 @@ @@ -132,7 +128,6 @@
132 <image src="/images/more.png"></image> 128 <image src="/images/more.png"></image>
133 </view> 129 </view>
134 </view> 130 </view>
135 - </view>  
136 131
137 <!-- 小分类 --> 132 <!-- 小分类 -->
138 133
1 page { 1 page {
2 width: 100%; 2 width: 100%;
3 height: 100%; 3 height: 100%;
4 - background: #f9f9f9; 4 + background: #fff;
5 } 5 }
6 6
7 image { 7 image {
@@ -15,8 +15,8 @@ image { @@ -15,8 +15,8 @@ image {
15 15
16 .top { 16 .top {
17 width: 750rpx; 17 width: 750rpx;
18 - height: 98rpx;  
19 - padding: 15rpx 32rpx; 18 + height: 80rpx;
  19 + padding: 5rpx 32rpx;
20 box-sizing: border-box; 20 box-sizing: border-box;
21 background: rgba(61, 154, 248, 1); 21 background: rgba(61, 154, 248, 1);
22 position: fixed; 22 position: fixed;
@@ -28,8 +28,8 @@ image { @@ -28,8 +28,8 @@ image {
28 .lunbo_box { 28 .lunbo_box {
29 border: none !important; 29 border: none !important;
30 background: rgba(61, 154, 248, 1); 30 background: rgba(61, 154, 248, 1);
31 - padding: 20rpx 32rpx 25rpx;  
32 - box-sizing: border-box; 31 + /* padding: 2rpx 32rpx 25rpx;
  32 + box-sizing: border-box; */
33 position: relative; 33 position: relative;
34 margin-top: 10rpx; 34 margin-top: 10rpx;
35 } 35 }
@@ -81,8 +81,7 @@ image { @@ -81,8 +81,7 @@ image {
81 color: rgba(174, 214, 255, 1); 81 color: rgba(174, 214, 255, 1);
82 padding: 0 12rpx; 82 padding: 0 12rpx;
83 box-sizing: border-box; 83 box-sizing: border-box;
84 - position: relative;  
85 - /* position: fixed; 84 + /* position: relative; *//* position: fixed;
86 top:128rpx; 85 top:128rpx;
87 left:0; */ 86 left:0; */
88 } 87 }
@@ -111,18 +110,20 @@ image { @@ -111,18 +110,20 @@ image {
111 } 110 }
112 111
113 .navactive { 112 .navactive {
  113 + width: 100%;
114 position: fixed; 114 position: fixed;
115 - top: 99rpx; 115 + display: flex;
  116 + top: 79rpx;
116 left: 0; 117 left: 0;
117 z-index: 999; 118 z-index: 999;
118 } 119 }
119 120
120 .boxactive { 121 .boxactive {
121 - margin-top: 173rpx; 122 + margin-top: 166rpx;
122 } 123 }
123 124
124 .nav_item { 125 .nav_item {
125 - padding: 0 40rpx; 126 + padding: 0 18rpx;
126 box-sizing: border-box; 127 box-sizing: border-box;
127 display: inline-block; 128 display: inline-block;
128 } 129 }
@@ -136,7 +137,7 @@ image { @@ -136,7 +137,7 @@ image {
136 /* margin-top: 36rpx; */ 137 /* margin-top: 36rpx; */
137 display: flex; 138 display: flex;
138 flex-wrap: wrap; 139 flex-wrap: wrap;
139 - margin-top:195rpx; 140 + margin-top: 195rpx;
140 /* background: #fff; */ 141 /* background: #fff; */
141 } 142 }
142 143
@@ -181,8 +182,10 @@ image { @@ -181,8 +182,10 @@ image {
181 } 182 }
182 183
183 .swiper_box { 184 .swiper_box {
184 - width: 686rpx;  
185 - height: 304rpx; 185 + /* width: 686rpx;
  186 + height: 304rpx; */
  187 + width: 750rpx;
  188 + height: 320rpx;
186 position: relative; 189 position: relative;
187 } 190 }
188 191
@@ -231,11 +234,12 @@ image { @@ -231,11 +234,12 @@ image {
231 height: 88rpx; 234 height: 88rpx;
232 width: 100%; 235 width: 100%;
233 background: #fff; 236 background: #fff;
234 - padding: 0 98rpx; 237 + padding: 0 32rpx;
235 box-sizing: border-box; 238 box-sizing: border-box;
236 display: flex; 239 display: flex;
237 align-items: center; 240 align-items: center;
238 justify-content: space-between; 241 justify-content: space-between;
  242 + margin: 0 auto;
239 } 243 }
240 244
241 .select_item { 245 .select_item {
@@ -281,13 +285,13 @@ image { @@ -281,13 +285,13 @@ image {
281 285
282 .notice { 286 .notice {
283 width: 100%; 287 width: 100%;
284 - padding: 18rpx 32rpx; 288 + padding: 24rpx 32rpx;
285 box-sizing: border-box; 289 box-sizing: border-box;
286 background: #fff; 290 background: #fff;
287 display: flex; 291 display: flex;
288 align-items: center; 292 align-items: center;
289 - border-top: 20rpx solid #f9f9f9;  
290 - border-bottom: 20rpx solid #f9f9f9; 293 + /* border-top: 20rpx solid #f9f9f9;
  294 + border-bottom: 20rpx solid #f9f9f9; */
291 } 295 }
292 296
293 .notice_tips { 297 .notice_tips {
@@ -353,26 +357,29 @@ image { @@ -353,26 +357,29 @@ image {
353 } 357 }
354 358
355 .activeitem { 359 .activeitem {
356 - width: 325rpx;  
357 - height: 200rpx; 360 + width: 218rpx;
  361 + height: 240rpx;
358 font-size: 0; 362 font-size: 0;
359 display: flex; 363 display: flex;
360 justify-content: center; 364 justify-content: center;
361 align-items: center; 365 align-items: center;
362 border-radius: 16rpx; 366 border-radius: 16rpx;
  367 + margin-right: 24rpx;
  368 + margin: 0 auto;
363 } 369 }
364 -.activeitem image{ 370 +
  371 +.activeitem image {
365 border-radius: 16rpx; 372 border-radius: 16rpx;
366 } 373 }
367 374
368 .actbox { 375 .actbox {
369 - 376 + width: 218rpx;
370 display: flex; 377 display: flex;
371 justify-content: center; 378 justify-content: center;
372 flex-direction: column; 379 flex-direction: column;
373 align-items: center; 380 align-items: center;
374 - margin-right: 12rpx;  
375 - margin-bottom:20rpx; 381 + margin-right: 16rpx;
  382 +
376 } 383 }
377 384
378 image { 385 image {
@@ -387,11 +394,13 @@ image { @@ -387,11 +394,13 @@ image {
387 } 394 }
388 395
389 .actity { 396 .actity {
390 - width:750rpx;  
391 - padding: 0 0rpx 0 64rpx; 397 + width: 750rpx;
  398 + padding: 24rpx 30rpx;
392 box-sizing: border-box; 399 box-sizing: border-box;
393 - margin-top:10rpx;  
394 background: #fff; 400 background: #fff;
  401 + border-bottom: 16rpx solid #f5f5f5;
  402 + border-top:16rpx solid #f5f5f5;
  403 + margin-top:20rpx;
395 } 404 }
396 405
397 .miaosha { 406 .miaosha {
@@ -400,69 +409,85 @@ image { @@ -400,69 +409,85 @@ image {
400 } 409 }
401 410
402 .active { 411 .active {
403 - flex-wrap: wrap; 412 + flex-wrap: nowrap;
  413 + /* overflow-x: scroll; */
404 } 414 }
405 415
406 .miaoshaoname { 416 .miaoshaoname {
407 - color: rgba(61, 154, 248, 1); 417 + color: #06121e;
408 font-size: 32rpx; 418 font-size: 32rpx;
409 font-weight: bold; 419 font-weight: bold;
410 } 420 }
411 421
412 .hourgou { 422 .hourgou {
413 - color: rgba(5, 9, 26, 1);  
414 - font-size: 28rpx; 423 + width: 220rpx;
  424 + height: 44rpx;
  425 + background: rgba(255, 255, 255, 1);
  426 + border: 1rpx solid rgba(200, 37, 25, 1);
  427 + opacity: 1;
  428 + border-radius: 22rpx;
  429 + color: #ea322b;
  430 + font-size: 24rpx;
415 margin-left: 20rpx; 431 margin-left: 20rpx;
  432 + text-align: center;
  433 + line-height: 44rpx;
416 } 434 }
417 435
418 .miaoshatop { 436 .miaoshatop {
419 - padding: 0 32rpx 32rpx; 437 + padding: 0;
420 box-sizing: border-box; 438 box-sizing: border-box;
421 } 439 }
422 440
423 .miaosharight { 441 .miaosharight {
424 color: rgba(61, 154, 248, 1); 442 color: rgba(61, 154, 248, 1);
425 - font-size: 28rpx; 443 + font-size: 24rpx;
426 } 444 }
427 -.miaoshatopk{  
428 - padding: 32rpx 0;  
429 - box-sizing: border-box 445 +
  446 +.miaoshatopk {
  447 + color: #06121e;
  448 + font-size: 32rpx;
  449 + font-weight: bold;
  450 + /* padding: 32rpx 0;
  451 + box-sizing: border-box */
430 } 452 }
431 453
432 .miaoshalist { 454 .miaoshalist {
433 display: flex; 455 display: flex;
434 align-items: center; 456 align-items: center;
435 - flex-wrap: wrap 457 + flex-wrap: wrap;
  458 + margin-top: 24rpx;
436 } 459 }
437 460
438 .miaoshalistitem { 461 .miaoshalistitem {
439 - width: 217rpx; 462 + width: 140rpx;
440 display: flex; 463 display: flex;
441 flex-direction: column; 464 flex-direction: column;
442 justify-content: center; 465 justify-content: center;
443 align-items: center; 466 align-items: center;
444 - margin-right: 12rpx;  
445 - padding-bottom: 24rpx; 467 + margin-right: 24rpx;
446 box-sizing: border-box; 468 box-sizing: border-box;
447 } 469 }
448 470
449 .goodimg { 471 .goodimg {
450 - width: 180rpx;  
451 - height: 180rpx; 472 + width: 140rpx;
  473 + height: 140rpx;
452 font-size: 0; 474 font-size: 0;
453 border-radius: 10rpx; 475 border-radius: 10rpx;
454 -  
455 } 476 }
456 -.goodimg image{ 477 +
  478 +.goodimg image {
457 border-radius: 10rpx; 479 border-radius: 10rpx;
458 } 480 }
459 481
460 .price { 482 .price {
461 - width:180rpx; 483 + width: 140rpx;
462 text-align: center; 484 text-align: center;
463 - color: rgba(61, 154, 248, 1);  
464 - font-size: 28rpx;  
465 - margin-top: 5rpx; 485 + color: rgba(156, 156, 156, 1);
  486 + font-size: 24rpx;
  487 + overflow: hidden;
  488 + text-overflow: ellipsis;
  489 + white-space: nowrap;
  490 + margin-top: 10rpx;
466 } 491 }
467 492
468 .oldprice { 493 .oldprice {
@@ -472,22 +497,26 @@ image { @@ -472,22 +497,26 @@ image {
472 } 497 }
473 498
474 .activename { 499 .activename {
  500 + width: 140rpx;
  501 + overflow: hidden;
  502 + text-overflow: ellipsis;
  503 + white-space: nowrap;
475 color: rgba(156, 156, 156, 1); 504 color: rgba(156, 156, 156, 1);
476 - font-size: 28rpx;  
477 - text-align: left;  
478 - width: 324rpx; 505 + font-size: 24rpx;
  506 + text-align: center;
479 margin-top: 10rpx; 507 margin-top: 10rpx;
480 } 508 }
481 -.xianshi{  
482 - width:686rpx;  
483 - border-radius: 20rpx;  
484 - margin:20rpx auto 0; 509 +
  510 +.xianshi {
  511 + width: 750rpx;
  512 + padding: 24rpx 30rpx;
  513 + box-sizing: border-box;
485 background: #fff; 514 background: #fff;
486 - padding: 32rpx 0;  
487 - box-sizing: border-box  
488 -}  
489 -.topnav{ 515 + border-bottom:16rpx solid #f5f5f5;
  516 + }
  517 +
  518 +.topnav {
490 position: fixed; 519 position: fixed;
491 - top:0;  
492 - left:0 520 + top: 0;
  521 + left: 0;
493 } 522 }
@@ -5,18 +5,22 @@ Page({ @@ -5,18 +5,22 @@ Page({
5 * 页面的初始数据 5 * 页面的初始数据
6 */ 6 */
7 data: { 7 data: {
8 - 8 + info:[]
9 }, 9 },
10 // 获取页面信息 10 // 获取页面信息
11 get_info(order) { 11 get_info(order) {
  12 + let that=this
12 let url = app.interface.kuaidi 13 let url = app.interface.kuaidi
13 let params = { 14 let params = {
14 order_odd: order 15 order_odd: order
15 } 16 }
16 app.post(url,params).then((res)=>{ 17 app.post(url,params).then((res)=>{
  18 + console.log(res)
17 this.setData({ 19 this.setData({
18 - info: res.msg 20 + info: res.msg.kuaidi
19 }) 21 })
  22 +
  23 + console.log(that.data.info)
20 }) 24 })
21 }, 25 },
22 /** 26 /**
1 <!-- 商品 --> 1 <!-- 商品 -->
2 -<view class="show_good">  
3 - <image src="{{info.product_image}}" mode="aspectFill" />  
4 - <text>{{info.State>2?(item.State>3?'问题件':'已签收'):'运输中'}}</text>  
5 -</view> 2 +<view class="block">
  3 +<view wx:for="{{info}}" wx:key=''>
  4 + <view class="show_good">
  5 + <image src="{{item.kuaidi.product_image}}" mode="aspectFill"/>
  6 + <view class="dai" wx:if="{{item.kuaidi.State==0}}">待取件</view>
  7 + <view class="dai" wx:if="{{item.kuaidi.State==1}}">已揽收</view>
  8 + <view class="dai" wx:if="{{item.kuaidi.State==2}}">在途中</view>
  9 + <view class="dai" wx:if="{{item.kuaidi.State==3}}">已签收</view>
  10 + <view class="dai" wx:if="{{item.kuaidi.State==4}}">问题件</view>
  11 + </view>
6 12
7 -<!-- 物流 -->  
8 -<view class="logistics"> 13 + <!-- 物流 -->
  14 + <view class="logistics">
9 <view class="info"> 15 <view class="info">
10 <view class="right"> 16 <view class="right">
11 - <view class="name">{{info.name}}</view>  
12 - <view class="order_num">快递单号：{{info.LogisticCode}}</view> 17 + <view class="name">{{item.kuaidi.name}}</view>
  18 + <view class="order_num">快递单号：{{item.kuaidi.LogisticCode}}</view>
13 </view> 19 </view>
14 </view> 20 </view>
15 21
16 <view class="order_box"> 22 <view class="order_box">
17 - <view class="order_item" wx:for="{{info.Traces}}" wx:key="index"> 23 + <view class="order_item" wx:for="{{item.kuaidi.Traces}}" wx:key="index">
18 <view class="time_box"> 24 <view class="time_box">
19 <view class="date">{{item.AcceptTime}}</view> 25 <view class="date">{{item.AcceptTime}}</view>
20 </view> 26 </view>
21 <view class="status_img"> 27 <view class="status_img">
22 <image src="/images/icon_62.png" /> 28 <image src="/images/icon_62.png" />
23 - <view class="line"/> 29 + <view class="line" />
24 </view> 30 </view>
25 <view class="status_info"> 31 <view class="status_info">
26 <view class="status_word">{{item.Remark?item.Remark:''}}</view> 32 <view class="status_word">{{item.Remark?item.Remark:''}}</view>
@@ -28,4 +34,6 @@ @@ -28,4 +34,6 @@
28 </view> 34 </view>
29 </view> 35 </view>
30 </view> 36 </view>
  37 + </view>
  38 +</view>
31 </view> 39 </view>
@@ -76,7 +76,9 @@ page { @@ -76,7 +76,9 @@ page {
76 76
77 .order_item { 77 .order_item {
78 width: 100%; 78 width: 100%;
79 - height: 170rpx; 79 + /* height: 170rpx; */
  80 + padding: 30rpx 0;
  81 + box-sizing: border-box;
80 display: flex; 82 display: flex;
81 align-items: center; 83 align-items: center;
82 } 84 }
@@ -146,3 +148,6 @@ page { @@ -146,3 +148,6 @@ page {
146 color: rgba(156, 156, 156, 1); 148 color: rgba(156, 156, 156, 1);
147 margin-top: 12rpx; 149 margin-top: 12rpx;
148 } 150 }
  151 +.dai{
  152 + margin-left:20rpx;
  153 +}
1 // pages/message/message.js 1 // pages/message/message.js
2 -const app=getApp() 2 +const app = getApp()
3 Page({ 3 Page({
4 4
5 /** 5 /**
6 * 页面的初始数据 6 * 页面的初始数据
7 */ 7 */
8 data: { 8 data: {
9 - page:1,  
10 - messagelist:[] 9 + page: 1,
  10 + messagelist: []
11 }, 11 },
12 12
13 /** 13 /**
14 * 生命周期函数--监听页面加载 14 * 生命周期函数--监听页面加载
15 */ 15 */
16 - onLoad: function (options) { 16 + onLoad: function(options) {
17 17
18 }, 18 },
19 19
20 - getmessagelist(){  
21 - let that=this 20 + getmessagelist() {
  21 + let that = this
22 let url = '/information/get_all'; 22 let url = '/information/get_all';
23 let data = { 23 let data = {
24 - page:that.data.page, 24 + page: that.data.page,
25 pageNum: 10, 25 pageNum: 10,
26 26
27 } 27 }
@@ -31,33 +31,54 @@ Page({ @@ -31,33 +31,54 @@ Page({
31 messagelist: that.data.messagelist.concat(r.msg) 31 messagelist: that.data.messagelist.concat(r.msg)
32 }) 32 })
33 33
34 - console.log(that.data.messagelist) 34 + let newlist = [];
  35 + that.data.messagelist.forEach(function(value, index, array) {
  36 + console.log(newlist)
  37 + if (value.status == 1) {
  38 + newlist.push(value)
  39 + }
  40 + })
  41 +
  42 + console.log(newlist)
  43 + if (newlist.length != 0) {
  44 + wx.showTabBarRedDot({
  45 + index: 1,
  46 + success: function(red) {
  47 +
  48 + wx.setTabBarBadge({
  49 + index: 1,
  50 + text: newlist.length.toString(),
  51 + })
  52 + }
  53 + })
  54 + }
  55 +
35 56
36 - }).catch((err) => { }) 57 + }).catch((err) => {})
37 }, 58 },
38 59
39 // 订单详情 60 // 订单详情
40 - ordertail(e){  
41 - let id=e.currentTarget.dataset.id; 61 + ordertail(e) {
  62 + let id = e.currentTarget.dataset.id;
42 wx.navigateTo({ 63 wx.navigateTo({
43 - url: '/pages/messagedetail/messagedetail?id='+id, 64 + url: '/pages/messagedetail/messagedetail?id=' + id,
44 }) 65 })
45 }, 66 },
46 67
47 /** 68 /**
48 * 生命周期函数--监听页面初次渲染完成 69 * 生命周期函数--监听页面初次渲染完成
49 */ 70 */
50 - onReady: function () { 71 + onReady: function() {
51 72
52 }, 73 },
53 74
54 /** 75 /**
55 * 生命周期函数--监听页面显示 76 * 生命周期函数--监听页面显示
56 */ 77 */
57 - onShow: function () { 78 + onShow: function() {
58 this.setData({ 79 this.setData({
59 - messagelist:[],  
60 - page:1 80 + messagelist: [],
  81 + page: 1
61 }) 82 })
62 this.getmessagelist() 83 this.getmessagelist()
63 }, 84 },
@@ -65,32 +86,32 @@ Page({ @@ -65,32 +86,32 @@ Page({
65 /** 86 /**
66 * 生命周期函数--监听页面隐藏 87 * 生命周期函数--监听页面隐藏
67 */ 88 */
68 - onHide: function () { 89 + onHide: function() {
69 90
70 }, 91 },
71 92
72 /** 93 /**
73 * 生命周期函数--监听页面卸载 94 * 生命周期函数--监听页面卸载
74 */ 95 */
75 - onUnload: function () { 96 + onUnload: function() {
76 97
77 }, 98 },
78 99
79 /** 100 /**
80 * 页面相关事件处理函数--监听用户下拉动作 101 * 页面相关事件处理函数--监听用户下拉动作
81 */ 102 */
82 - onPullDownRefresh: function () { 103 + onPullDownRefresh: function() {
83 104
84 }, 105 },
85 106
86 /** 107 /**
87 * 页面上拉触底事件的处理函数 108 * 页面上拉触底事件的处理函数
88 */ 109 */
89 - onReachBottom: function () {  
90 - let newpage=this.data.page; 110 + onReachBottom: function() {
  111 + let newpage = this.data.page;
91 newpage++; 112 newpage++;
92 this.setData({ 113 this.setData({
93 - page:newpage 114 + page: newpage
94 }) 115 })
95 this.getmessagelist() 116 this.getmessagelist()
96 }, 117 },
@@ -98,7 +119,7 @@ Page({ @@ -98,7 +119,7 @@ Page({
98 /** 119 /**
99 * 用户点击右上角分享 120 * 用户点击右上角分享
100 */ 121 */
101 - onShareAppMessage: function () { 122 + onShareAppMessage: function() {
102 123
103 } 124 }
104 }) 125 })
1 -<view class="messagelist"> 1 +
  2 + <view class="empty" wx:if="{{messagelist.length==0}}">暂无更多数据</view>
  3 +
  4 +<view class="messagelist" wx:else>
2 <view class='mssageitem' wx:for="{{messagelist}}" wx:key="" bindtap="ordertail" data-id="{{item.id}}"> 5 <view class='mssageitem' wx:for="{{messagelist}}" wx:key="" bindtap="ordertail" data-id="{{item.id}}">
3 <view class="messageitemtop flextwo"> 6 <view class="messageitemtop flextwo">
4 <view class="messtopleft {{item.status==1?'activeleft':''}}">{{item.title}}</view> 7 <view class="messtopleft {{item.status==1?'activeleft':''}}">{{item.title}}</view>
@@ -19,7 +19,7 @@ page { @@ -19,7 +19,7 @@ page {
19 19
20 .messtopleft { 20 .messtopleft {
21 color: rgba(19, 26, 46, 1); 21 color: rgba(19, 26, 46, 1);
22 - font-size: 22rpx; 22 + font-size: 28rpx;
23 } 23 }
24 24
25 .activeleft { 25 .activeleft {
@@ -42,7 +42,7 @@ page { @@ -42,7 +42,7 @@ page {
42 42
43 .messtopright, .messagename { 43 .messtopright, .messagename {
44 color: #939a9e; 44 color: #939a9e;
45 - font-size: 22rpx; 45 + font-size: 28rpx;
46 } 46 }
47 47
48 .messagename { 48 .messagename {
@@ -36,6 +36,10 @@ Page({ @@ -36,6 +36,10 @@ Page({
36 that.setData({ 36 that.setData({
37 kuaidi: r.msg 37 kuaidi: r.msg
38 }) 38 })
  39 + that.data.kuaidi.forEach(function(value,index,array){
  40 + console.log(value.kuaidi[0].kuaidi.Traces)
  41 + })
  42 +
39 43
40 console.log(that.data.kuaidi) 44 console.log(that.data.kuaidi)
41 45
@@ -60,11 +60,11 @@ @@ -60,11 +60,11 @@
60 <view class="swiper-item"> 60 <view class="swiper-item">
61 <view class='wuliutop flextwo'> 61 <view class='wuliutop flextwo'>
62 <view class="wutopleft">最新物流</view> 62 <view class="wutopleft">最新物流</view>
63 - <view class="wutopright">{{item.kuaidi.Traces[0].AcceptTime}}</view> 63 + <view class="wutopright">{{item.kuaidi[0].kuaidi.Traces[0].AcceptTime}}</view>
64 </view> 64 </view>
65 <view class="wuliubot flexone"> 65 <view class="wuliubot flexone">
66 <view class="wuliuleft"> 66 <view class="wuliuleft">
67 - <image src="{{item.kuaidi.product_image}}"></image> 67 + <image src="{{item.kuaidi[0].kuaidi.product_image}}"></image>
68 </view> 68 </view>
69 69
70 <view class="wuliuitemright"> 70 <view class="wuliuitemright">
@@ -73,13 +73,13 @@ @@ -73,13 +73,13 @@
73 <view class="wuliuimg"> 73 <view class="wuliuimg">
74 <image src="/images/icon_30.png"></image> 74 <image src="/images/icon_30.png"></image>
75 </view> 75 </view>
76 - <view class="dai" wx:if="{{item.kuaidi.State==0}}">待取件</view>  
77 - <view class="dai" wx:if="{{item.kuaidi.State==1}}">已揽收</view>  
78 - <view class="dai" wx:if="{{item.kuaidi.State==2}}">在途中</view>  
79 - <view class="dai" wx:if="{{item.kuaidi.State==3}}">签收</view>  
80 - <view class="dai" wx:if="{{item.kuaidi.State==4}}">问题件</view> 76 + <view class="dai" wx:if="{{item.kuaidi[0].kuaidi.State==0}}">待取件</view>
  77 + <view class="dai" wx:if="{{item.kuaidi[0].kuaidi.State==1}}">已揽收</view>
  78 + <view class="dai" wx:if="{{item.kuaidi[0].kuaidi.State==2}}">在途中</view>
  79 + <view class="dai" wx:if="{{item.kuaidi[0].kuaidi.State==3}}">已签收</view>
  80 + <view class="dai" wx:if="{{item.kuaidi[0].kuaidi.State==4}}">问题件</view>
81 </view> 81 </view>
82 - <view class="daiquname">{{item.kuaidi.Traces[0].AcceptStation}}</view> 82 + <view class="daiquname">{{item.kuaidi[0].kuaidi.Traces[0].AcceptStation}}</view>
83 83
84 </view> 84 </view>
85 </view> 85 </view>
@@ -11,7 +11,8 @@ Page({ @@ -11,7 +11,8 @@ Page({
11 * 生命周期函数--监听页面加载 11 * 生命周期函数--监听页面加载
12 */ 12 */
13 onLoad: function(options) { 13 onLoad: function(options) {
14 - this.getCodeFun() 14 + this.getCodeFun();
  15 +
15 }, 16 },
16 17
17 // 进入页面获取code 18 // 进入页面获取code
@@ -103,6 +104,8 @@ Page({ @@ -103,6 +104,8 @@ Page({
103 104
104 }, 105 },
105 106
  107 +
  108 +
106 // 暂不授权 109 // 暂不授权
107 returnPageFun() { 110 returnPageFun() {
108 wx.navigateBack() 111 wx.navigateBack()
@@ -13,10 +13,12 @@ @@ -13,10 +13,12 @@
13 <view class='two'> 13 <view class='two'>
14 <view class='two_one'> 14 <view class='two_one'>
15 <view class='score'>积分</view> 15 <view class='score'>积分</view>
16 - <view class='price'>{{info.price}}</view> 16 + <view class='price'>{{info.price2==null?info.price:info.price2}}</view>
17 </view> 17 </view>
  18 +
  19 + <view class="oldprice" wx:if="{{info.price2!=null}}">{{info.price}}</view>
18 <view class='two_two'>{{info.name}}</view> 20 <view class='two_two'>{{info.name}}</view>
19 - <view class='two_three'> 21 + <view class='two_three two_threek'>
20 <view>库存：{{info.sold}}</view> 22 <view>库存：{{info.sold}}</view>
21 <view>销量：{{info.paynum}}</view> 23 <view>销量：{{info.paynum}}</view>
22 </view> 24 </view>
@@ -117,6 +117,9 @@ page { @@ -117,6 +117,9 @@ page {
117 color: rgba(156, 156, 156, 1); 117 color: rgba(156, 156, 156, 1);
118 margin-top: 18rpx; 118 margin-top: 18rpx;
119 } 119 }
  120 +.two_threek{
  121 + padding: 0;
  122 +}
120 123
121 .three { 124 .three {
122 margin-top: 18rpx; 125 margin-top: 18rpx;
1 -<view class="miaoshatime flexthree" wx:if="{{showtime==true}}"> 1 +<!-- <view class="miaoshatime flexthree" wx:if="{{showtime==true}}">
2 <view class='miaoname'>距离开始</view> 2 <view class='miaoname'>距离开始</view>
3 <view class='miaotime miaohour boxsizing'>{{day}}</view> 3 <view class='miaotime miaohour boxsizing'>{{day}}</view>
4 <view class="miaoname">天</view> 4 <view class="miaoname">天</view>
5 - <!-- <view class="miaofen flexone miaohour">  
6 - <view class='miaotime boxsizing miaohour'>{{hou}}</view>  
7 - <view class='miaotime'>3</view>  
8 - </view> --> 5 +
9 <view class='miaotime miaohour boxsizing'>{{hou}}</view> 6 <view class='miaotime miaohour boxsizing'>{{hou}}</view>
10 <view class="miaoname">:</view> 7 <view class="miaoname">:</view>
11 - <!-- <view class="miaofen flexone miaohour">  
12 - <view class='miaotime boxsizing miaohour'>{{min}}</view>  
13 - <view class='miaotime boxsizing'>5</view>  
14 - </view> --> 8 +
15 <view class='miaotime miaohour boxsizing'>{{min}}</view> 9 <view class='miaotime miaohour boxsizing'>{{min}}</view>
16 <view class="miaoname">:</view> 10 <view class="miaoname">:</view>
17 - <!-- <view class="miaofen flexone miaohour">  
18 - <view class='miaotime boxsizing miaohour'>{{sec}}</view>  
19 - <view class='miaotime boxsizing'>2</view>  
20 - </view> --> 11 +
21 <view class='miaotime miaohour boxsizing'>{{sec}}</view> 12 <view class='miaotime miaohour boxsizing'>{{sec}}</view>
22 - </view> 13 +</view> -->
23 <view class="searchgood commnonpadding"> 14 <view class="searchgood commnonpadding">
24 <view class="searchgooditem flextwo boxsizing" wx:for="{{xianshilist}}" wx:key=""> 15 <view class="searchgooditem flextwo boxsizing" wx:for="{{xianshilist}}" wx:key="">
25 <view class="gooditemleft"> 16 <view class="gooditemleft">
@@ -54,4 +45,4 @@ @@ -54,4 +45,4 @@
54 45
55 46
56 47
57 - </view>  
  48 +</view>
@@ -24,10 +24,19 @@ Page({ @@ -24,10 +24,19 @@ Page({
24 24
25 //轮播图 25 //轮播图
26 look_more(e) { 26 look_more(e) {
27 - let id = e.currentTarget.dataset.id 27 + let id = e.currentTarget.dataset.id;
  28 + console.log(id)
  29 + let type=e.currentTarget.dataset.type;
  30 + if(type==1){
28 wx.navigateTo({ 31 wx.navigateTo({
29 url: '/pages/shop_detail/shop_detail?id=' + id 32 url: '/pages/shop_detail/shop_detail?id=' + id
30 }) 33 })
  34 + }else{
  35 + wx.navigateTo({
  36 + url: '/pages/taocandetail/taocandetail?id=' + id
  37 + })
  38 + }
  39 +
31 40
32 }, 41 },
33 42
1 { 1 {
2 - "navigationBarTitleText": "会员专区" 2 + "navigationBarTitleText": "活动专区"
3 } 3 }
@@ -5,24 +5,72 @@ @@ -5,24 +5,72 @@
5 <Model_item list="{{shop_arr}}" /> 5 <Model_item list="{{shop_arr}}" />
6 6
7 <view class='real_goods' wx:if="{{activelist.length>0}}"> 7 <view class='real_goods' wx:if="{{activelist.length>0}}">
8 - <view class="real_goods_item" wx:for="{{activelist}}" wx:key="index" data-id="{{item.id}}" bindtap="{{item.sold==0?'':'look_more'}}"> 8 + <view class="real_goods_item" wx:for="{{activelist}}" wx:key="index" data-id="{{item.type==1?item.product_id:item.combo.id}}" bindtap="{{item.product.sold==0?'':'look_more'}}" data-type="{{item.type}}">
  9 +
  10 + <view wx:if="{{item.type==1}}">
9 <view class='real_goods_img'> 11 <view class='real_goods_img'>
10 - <image src='{{item.images[0]}}' mode="aspectFill" /> 12 + <image src='{{item.product.images[0]}}' mode="aspectFill" />
11 <image src='/images/mei.png' class="tip" wx:if="{{item.sold == 0}}" /> 13 <image src='/images/mei.png' class="tip" wx:if="{{item.sold == 0}}" />
12 </view> 14 </view>
13 <view class='real_goods_bottom'> 15 <view class='real_goods_bottom'>
14 - <view class='goods_title'>{{item.name}}</view> 16 + <view class='goods_title'>{{item.product.name}}</view>
  17 + <view wx:if="{{item.product.price2!=null}}">
  18 +
15 <view class='goods_flex'> 19 <view class='goods_flex'>
16 <view class='score'>积分</view> 20 <view class='score'>积分</view>
17 - <view class='price'>{{item.price}}</view>  
18 - <view class='sell'>已卖出{{item.paynum}}件</view> 21 + <view class='price'>{{item.product.price2}}</view>
  22 +
  23 +
  24 + <view class='sell'>已卖出{{item.product.paynum}}件</view>
19 </view> 25 </view>
  26 +
  27 + <view class='oldprice'>{{item.product.price}}</view>
20 </view> 28 </view>
21 29
22 - <view class="pink_cover" wx:if="{{item.sold == 0}}"/> 30 + <view class='goods_flex' wx:else>
  31 + <view class='score'>积分</view>
  32 + <view class='price'>{{item.product.price}}</view>
  33 +
23 34
  35 + <view class='sell'>已卖出{{item.product.paynum}}件</view>
  36 + </view>
  37 + </view>
  38 + <view class="pink_cover" wx:if="{{item.product.sold == 0}}" />
  39 + </view>
  40 +
  41 + <view wx:else>
  42 + <view class='real_goods_img'>
  43 + <image src='{{item.combo.image}}' mode="aspectFill" />
  44 + <image src='/images/mei.png' class="tip" wx:if="{{item.sold == 0}}" />
  45 + </view>
  46 + <view class='real_goods_bottom'>
  47 + <view class='goods_title'>{{item.combo.name}}</view>
  48 + <view wx:if="{{item.combo.price2!=null}}">
  49 +
  50 + <view class='goods_flex'>
  51 + <view class='score'>积分</view>
  52 + <view class='price'>{{item.combo.price2}}</view>
  53 +
  54 +
  55 + <!-- <view class='sell'>已卖出{{item.combo.paynum}}件</view> -->
  56 + </view>
  57 +
  58 + <view class='oldprice'>{{item.combo.price}}</view>
  59 + </view>
  60 +
  61 + <view class='goods_flex' wx:else>
  62 + <view class='score'>积分</view>
  63 + <view class='price'>{{item.combo.price}}</view>
  64 +
  65 +
  66 + <!-- <view class='sell'>已卖出{{item.combo.paynum}}件</view> -->
  67 + </view>
  68 + </view>
  69 +
  70 + </view>
  71 +
  72 + </view>
24 </view> 73 </view>
25 -</view>  
26 <view class="empty" wx:else>暂无更多数据</view> 74 <view class="empty" wx:else>暂无更多数据</view>
27 </view> 75 </view>
28 76
@@ -98,12 +98,12 @@ page { @@ -98,12 +98,12 @@ page {
98 text-align: center; 98 text-align: center;
99 } 99 }
100 .real_goods { 100 .real_goods {
101 - width: 708rpx; 101 + width: 750rpx;
102 margin: 0 auto; 102 margin: 0 auto;
103 background: #f9f9f9; 103 background: #f9f9f9;
104 display: flex; 104 display: flex;
105 flex-wrap: wrap; 105 flex-wrap: wrap;
106 - padding: 8rpx 11rpx 20rpx; 106 + /* padding: 8rpx 11rpx 20rpx; */
107 box-sizing: border-box; 107 box-sizing: border-box;
108 } 108 }
109 109
@@ -114,6 +114,11 @@ page { @@ -114,6 +114,11 @@ page {
114 background: #fff; 114 background: #fff;
115 overflow: hidden; 115 overflow: hidden;
116 position: relative; 116 position: relative;
  117 + display:flex;
  118 + flex-direction: column;
  119 + justify-content: center;
  120 + align-items: center
  121 +
117 } 122 }
118 123
119 .real_goods_img { 124 .real_goods_img {
@@ -147,7 +152,7 @@ page { @@ -147,7 +152,7 @@ page {
147 } 152 }
148 153
149 .goods_title { 154 .goods_title {
150 - height: 72rpx; 155 +
151 font-size: 26rpx; 156 font-size: 26rpx;
152 font-family: PingFang SC; 157 font-family: PingFang SC;
153 font-weight: 500; 158 font-weight: 500;
@@ -158,7 +163,7 @@ page { @@ -158,7 +163,7 @@ page {
158 display: -webkit-box; 163 display: -webkit-box;
159 -webkit-box-orient: vertical; 164 -webkit-box-orient: vertical;
160 -webkit-line-clamp: 2; 165 -webkit-line-clamp: 2;
161 - margin-bottom: 20rpx; 166 +
162 } 167 }
163 168
164 .goods_flex { 169 .goods_flex {
@@ -22,12 +22,13 @@ Page({ @@ -22,12 +22,13 @@ Page({
22 let that = this 22 let that = this
23 let url = '/getopenid/product_view_log'; 23 let url = '/getopenid/product_view_log';
24 let data = { 24 let data = {
25 - 25 + page:that.data.page,
  26 + pageNum:10
26 } 27 }
27 app.post(url, data, "POST").then((r) => { 28 app.post(url, data, "POST").then((r) => {
28 console.log(r) 29 console.log(r)
29 that.setData({ 30 that.setData({
30 - zujilist: r.msg 31 + zujilist: that.data.zujilist.concat(r.msg)
31 }) 32 })
32 33
33 console.log(that.data.zujilist) 34 console.log(that.data.zujilist)
@@ -84,7 +85,13 @@ Page({ @@ -84,7 +85,13 @@ Page({
84 * 页面上拉触底事件的处理函数 85 * 页面上拉触底事件的处理函数
85 */ 86 */
86 onReachBottom: function () { 87 onReachBottom: function () {
  88 + let newpage=this.data.page;
  89 + newpage++;
  90 + this.setData({
  91 + page:newpage
  92 + })
87 93
  94 + this.getzujilist()
88 }, 95 },
89 96
90 /** 97 /**
@@ -98,12 +98,12 @@ page { @@ -98,12 +98,12 @@ page {
98 text-align: center; 98 text-align: center;
99 } 99 }
100 .real_goods { 100 .real_goods {
101 - width: 708rpx; 101 + width: 750rpx;
102 margin: 0 auto; 102 margin: 0 auto;
103 background: #f9f9f9; 103 background: #f9f9f9;
104 display: flex; 104 display: flex;
105 flex-wrap: wrap; 105 flex-wrap: wrap;
106 - padding: 8rpx 11rpx 20rpx; 106 + padding: 8rpx 0 20rpx;
107 box-sizing: border-box; 107 box-sizing: border-box;
108 } 108 }
109 109
@@ -114,6 +114,10 @@ page { @@ -114,6 +114,10 @@ page {
114 background: #fff; 114 background: #fff;
115 overflow: hidden; 115 overflow: hidden;
116 position: relative; 116 position: relative;
  117 + display:flex;
  118 + flex-direction: column;
  119 + justify-content: center;
  120 + align-items: center
117 } 121 }
118 122
119 .real_goods_img { 123 .real_goods_img {