倪静楠 / huarunwj · 提交

转到一个项目

作者 倪静楠
提交 2958112f4807d1b611a5dd4644b08486606d362d 1 个父辈 cdac4b61

上下刷新

内嵌 并排对比
正在显示 65 个修改的文件 包含 1226 行增加 和 710 行删除
1 { 1 {
2 "pages": [ 2 "pages": [
3 "pages/home/home", 3 "pages/home/home",
4 - "pages/index/index",  
5 "pages/logs/logs", 4 "pages/logs/logs",
6 "pages/classify/classify", 5 "pages/classify/classify",
7 "pages/shopping-cart/shopping-cart", 6 "pages/shopping-cart/shopping-cart",
@@ -27,7 +26,10 @@ @@ -27,7 +26,10 @@
27 "pages/cart-affirm-order/cart-affirm-order", 26 "pages/cart-affirm-order/cart-affirm-order",
28 "pages/integral-order/integral-order", 27 "pages/integral-order/integral-order",
29 "pages/refund-after/refund-after", 28 "pages/refund-after/refund-after",
30 - "pages/my-discount-card/my-discount-card" 29 + "pages/my-discount-card/my-discount-card",
  30 + "pages/all-evaluate/all-evaluate",
  31 + "pages/index/index"
  32 +
31 ], 33 ],
32 "window": { 34 "window": {
33 "backgroundTextStyle": "light", 35 "backgroundTextStyle": "light",
1 /**app.wxss**/ 1 /**app.wxss**/
2 - 2 +page{
  3 + width: 100%;
  4 + height: 100%;
  5 + overflow-x: hidden;
  6 +}
@@ -14,8 +14,9 @@ Page({ @@ -14,8 +14,9 @@ Page({
14 }], 14 }],
15 goodsData: '', 15 goodsData: '',
16 show: false, 16 show: false,
17 - currentDate: '12:00',  
18 - currentDateTwo: '13:00', 17 + // currentDate: '12:00',
  18 + // currentDateTwo: '13:00',
  19 + date:'',
19 minHour: 1, 20 minHour: 1,
20 maxHour: 23, 21 maxHour: 23,
21 length: 0, 22 length: 0,
@@ -331,9 +332,9 @@ Page({ @@ -331,9 +332,9 @@ Page({
331 title: data.msg, 332 title: data.msg,
332 icon: 'none' 333 icon: 'none'
333 }) 334 })
334 - setTimeout(() => {  
335 - util.getUser()  
336 - }, 2000) 335 + // setTimeout(() => {
  336 + // util.getUser()
  337 + // }, 2000)
337 } 338 }
338 }) 339 })
339 } 340 }
1 <!--pages/affirm-order/affirm-order.wxml--> 1 <!--pages/affirm-order/affirm-order.wxml-->
2 <view class="container"> 2 <view class="container">
3 <!-- 地址 --> 3 <!-- 地址 -->
4 - <view class="address" catchtap="selectAdd">  
5 - <view class="userName">{{userData.name}}</view>  
6 - <view class="userTell">{{userData.phone}}</view>  
7 - <view class="default" wx:if="{{userData.delFlag==1}}">默认</view>  
8 - <view class="userAddress">{{userData.area}}{{userData.address}}</view> 4 + <view class="address" catchtap="selectAdd" >
  5 + <view wx:if="{{userData!==''}}">
  6 + <view class="userName">{{userData.name}}</view>
  7 + <view class="userTell">{{userData.phone}}</view>
  8 + <view class="default" wx:if="{{userData.delFlag==1}}">默认</view>
  9 + <view class="userAddress">{{userData.area}}{{userData.address}}</view>
  10 + </view>
  11 + <view class="noAdd" wx:if="{{userData==''}}">
  12 + 请选择收货地址
  13 + </view>
9 <view class="arrow"> 14 <view class="arrow">
10 <image src="/images/04-01/arrow.png"></image> 15 <image src="/images/04-01/arrow.png"></image>
11 </view> 16 </view>
12 </view> 17 </view>
13 18
14 -  
15 - <!-- 配送时间 -->  
16 - <view class="timeBox"> 19 +
  20 + <!-- 配送时间 -->
  21 + <view class="timeBox">
17 <view class="calendar "> 22 <view class="calendar ">
18 <image src="/images/04-01/rili.png"></image> 23 <image src="/images/04-01/rili.png"></image>
19 </view> 24 </view>
@@ -62,8 +67,8 @@ @@ -62,8 +67,8 @@
62 <!-- 买家留言 --> 67 <!-- 买家留言 -->
63 <view class="messageBox"> 68 <view class="messageBox">
64 <view class="messageTitle">买家留言:</view> 69 <view class="messageTitle">买家留言:</view>
65 - <textarea name="" id="" cols="30" rows="10" value="{{content}}" placeholder="留言建议提前协商50字之内" maxlength="{{maxlength}}"  
66 - bindinput="userInput"></textarea> 70 + <textarea name="" id="" cols="30" rows="10" value="{{content}}" placeholder="留言建议提前协商50字之内"
  71 + maxlength="{{maxlength}}" bindinput="userInput"></textarea>
67 <view class="numLength">{{length}}/50</view> 72 <view class="numLength">{{length}}/50</view>
68 </view> 73 </view>
69 <!-- 优惠券 --> 74 <!-- 优惠券 -->
1 /* pages/affirm-order/affirm-order.wxss */ 1 /* pages/affirm-order/affirm-order.wxss */
2 -page{ 2 +page {
3 background-color: #f1f2f4; 3 background-color: #f1f2f4;
4 } 4 }
  5 +
5 .container { 6 .container {
6 padding-top: 34rpx; 7 padding-top: 34rpx;
7 width: 750rpx; 8 width: 750rpx;
@@ -11,6 +12,12 @@ page{ @@ -11,6 +12,12 @@ page{
11 } 12 }
12 13
13 /* 地址 */ 14 /* 地址 */
  15 +.noAdd{
  16 + width: 90%;
  17 + font-size: 32rpx;
  18 + font-weight: 600;
  19 + color: #323233;
  20 +}
14 .address { 21 .address {
15 width: 686rpx; 22 width: 686rpx;
16 /* height: 200rpx; */ 23 /* height: 200rpx; */
@@ -20,7 +27,7 @@ page{ @@ -20,7 +27,7 @@ page{
20 padding: 32rpx 28rpx 32rpx 36rpx; 27 padding: 32rpx 28rpx 32rpx 36rpx;
21 box-sizing: border-box; 28 box-sizing: border-box;
22 position: relative; 29 position: relative;
23 - 30 + display: flex;
24 } 31 }
25 32
26 .userName { 33 .userName {
@@ -72,11 +79,9 @@ page{ @@ -72,11 +79,9 @@ page{
72 } 79 }
73 80
74 .arrow { 81 .arrow {
75 - width: 32rpx;  
76 - height: 32rpx;  
77 - position: absolute;  
78 - top: 65rpx;  
79 - left: 626rpx; 82 + display: flex;
  83 + align-items: center;
  84 + width: 15%;
80 } 85 }
81 86
82 .arrow image { 87 .arrow image {
@@ -116,9 +121,10 @@ page{ @@ -116,9 +121,10 @@ page{
116 width: 200rpx; 121 width: 200rpx;
117 } */ 122 } */
118 /* 配送时间 */ 123 /* 配送时间 */
119 -.picker{ 124 +.picker {
120 width: 600rpx; 125 width: 600rpx;
121 } 126 }
  127 +
122 .timeBox { 128 .timeBox {
123 width: 686rpx; 129 width: 686rpx;
124 height: 104rpx; 130 height: 104rpx;
@@ -399,6 +405,7 @@ textarea { @@ -399,6 +405,7 @@ textarea {
399 .money { 405 .money {
400 color: #ff4444; 406 color: #ff4444;
401 } 407 }
  408 +
402 /* 底部 */ 409 /* 底部 */
403 .bottomBox { 410 .bottomBox {
404 width: 750rpx; 411 width: 750rpx;
  1 +// pages/all-evaluate/all-evaluate.js
  2 +Page({
  3 + data: {
  4 + list:[],
  5 + goodsId:''
  6 + },
  7 +
  8 + /**
  9 + * 生命周期函数--监听页面加载
  10 + */
  11 + onLoad: function (options) {
  12 +
  13 + },
  14 +
  15 + /**
  16 + * 生命周期函数--监听页面初次渲染完成
  17 + */
  18 + onReady: function () {
  19 +
  20 + },
  21 +
  22 + /**
  23 + * 生命周期函数--监听页面显示
  24 + */
  25 + onShow: function () {
  26 +
  27 + },
  28 +
  29 + /**
  30 + * 生命周期函数--监听页面隐藏
  31 + */
  32 + onHide: function () {
  33 +
  34 + },
  35 +
  36 + /**
  37 + * 生命周期函数--监听页面卸载
  38 + */
  39 + onUnload: function () {
  40 +
  41 + },
  42 +
  43 + /**
  44 + * 页面相关事件处理函数--监听用户下拉动作
  45 + */
  46 + onPullDownRefresh: function () {
  47 +
  48 + },
  49 +
  50 + /**
  51 + * 页面上拉触底事件的处理函数
  52 + */
  53 + onReachBottom: function () {
  54 +
  55 + },
  56 +
  57 + /**
  58 + * 用户点击右上角分享
  59 + */
  60 + onShareAppMessage: function () {
  61 +
  62 + }
  63 +})
  1 +{
  2 + "usingComponents": {}
  3 +}
  1 +<!--pages/all-evaluate/all-evaluate.wxml-->
  2 +<view class="outerBox">
  3 + <view class="userBox">
  4 + <view class="wxHead">
  5 + <image src="{{}}"></image>
  6 + </view>
  7 + <view class="wxName"></view>
  8 + </view>
  9 + <view class="text"></view>
  10 + <view class="picBox">
  11 + <view class="pic" wx:for="{{item.images}}">
  12 + <image src="{{item}}"></image>
  13 + </view>
  14 + </view>
  15 +</view>
  1 +/* pages/all-evaluate/all-evaluate.wxss */
  2 +page{
  3 + background-color: #f1f2f4;
  4 + padding-top: 24rpx;
  5 +}
  6 +.outerBox{
  7 + background-color: #ffffff;
  8 + width: 750rpx;
  9 + padding: 32rpx;
  10 +}
  11 +.userBox {
  12 + width: 686rpx;
  13 + height: 72rpx;
  14 + background-color: #ffffff;
  15 + display: flex;
  16 +}
  17 +
  18 +.wxHead {
  19 + width: 72rpx;
  20 + height: 72rpx;
  21 + margin-right:16rpx;
  22 + background-color: aqua;
  23 +}
  24 +
  25 +.wxHead image {
  26 + width: 72rpx;
  27 + height: 72rpx;
  28 +}
  29 +
  30 +.wxName {
  31 + height: 100%;
  32 + width: 200rpx;
  33 + max-width: 500rpx;
  34 + background-color: bisque;
  35 + display: flex;
  36 + align-items: center;
  37 + justify-content: left;
  38 +}
  39 +
  40 +.text {
  41 + width: 686rpx;
  42 + height: 200rpx;
  43 + font-size: 28rpx;
  44 + font-weight: 400;
  45 + text-align: left;
  46 + color: #333333;
  47 + background-color: blueviolet;
  48 + margin-top: 20rpx;
  49 +}
  50 +
  51 +.picBox {
  52 + display: flex;
  53 + height: 200rpx;
  54 + width: 100%;
  55 +}
  56 +
  57 +.pic {
  58 +
  59 +}
@@ -4,126 +4,19 @@ const util = require("../../utils/util.js"); @@ -4,126 +4,19 @@ const util = require("../../utils/util.js");
4 Page({ 4 Page({
5 data: { 5 data: {
6 pageNum: 1, 6 pageNum: 1,
7 - index: '', 7 + index: 4,
8 active: 2, 8 active: 2,
9 status: '', 9 status: '',
10 orederId: '', 10 orederId: '',
11 goodsid: '', 11 goodsid: '',
12 tabList: [], 12 tabList: [],
13 - totalList: [{  
14 - text: '待付款',  
15 - number: '22416545878874455',  
16 - status: 0,  
17 - url: '/images/1.jpg',  
18 - name: '鲜切泰国桃子',  
19 - detail: '果肉饱满，香甜可口',  
20 - price: '25',  
21 - num: '2',  
22 - totalMoney: '8.00',  
23 - carriage: '4',  
24 - btnTxtOne: '立即支付',  
25 - btnTxtTwo: '取消订单'  
26 - }, {  
27 - text: '待收货',  
28 - number: '22416545878874455',  
29 - status: 1,  
30 - url: '/images/1.jpg',  
31 - name: '鲜切泰国桃子',  
32 - detail: '果肉饱满，香甜可口',  
33 - price: '25',  
34 - num: '2',  
35 - totalMoney: '8.00',  
36 - carriage: '4',  
37 - btnTxtOne: '再次购买',  
38 - btnTxtTwo: '申请退款'  
39 - }, {  
40 - text: 2,  
41 - number: '22416545878874455',  
42 - status: 3,  
43 - url: '/images/1.jpg',  
44 - name: '鲜切泰国桃子',  
45 - detail: '果肉饱满，香甜可口',  
46 - price: '25',  
47 - num: '2',  
48 - totalMoney: '8.00',  
49 - carriage: '4',  
50 - btnTxtOne: '确认收货',  
51 - btnTxtTwo: '申请退款',  
52 - btnTxtThree: '查看物流'  
53 - }, {  
54 - text: 4,  
55 - number: '22416545878874455',  
56 - status: 5,  
57 - url: '/images/1.jpg',  
58 - name: '鲜切泰国桃子',  
59 - detail: '果肉饱满，香甜可口',  
60 - price: '25',  
61 - num: '2',  
62 - totalMoney: '8.00',  
63 - carriage: '4',  
64 - btnTxtOne: '立即评价',  
65 - btnTxtTwo: '申请退款',  
66 - btnTxtThree: '再次购买'  
67 - }],  
68 - payList: [{  
69 - text: '待付款',  
70 - number: '22416545878874455',  
71 - status: '待付款',  
72 - url: '/images/1.jpg',  
73 - name: '鲜切泰国桃子',  
74 - detail: '果肉饱满，香甜可口',  
75 - price: '25',  
76 - num: '2',  
77 - totalMoney: '8.00',  
78 - carriage: '4',  
79 - btnTxtOne: '立即支付',  
80 - btnTxtTwo: '取消订单'  
81 - }],  
82 - sendList: [{  
83 - text: '待发货',  
84 - number: '22416545878874455',  
85 - status: '待发货',  
86 - url: '/images/1.jpg',  
87 - name: '鲜切泰国桃子',  
88 - detail: '果肉饱满，香甜可口',  
89 - price: '25',  
90 - num: '2',  
91 - totalMoney: '8.00',  
92 - carriage: '4',  
93 - btnTxtOne: '再次购买',  
94 - btnTxtTwo: '申请退款'  
95 - }],  
96 - evaluateList: [{  
97 - text: '待评价',  
98 - number: '22416545878874455',  
99 - status: '待评价',  
100 - url: '/images/1.jpg',  
101 - name: '鲜切泰国桃子',  
102 - detail: '果肉饱满，香甜可口',  
103 - price: '25',  
104 - num: '2',  
105 - totalMoney: '8.00',  
106 - carriage: '4',  
107 - btnTxtOne: '立即评价',  
108 - btnTxtTwo: '申请退款',  
109 - btnTxtThree: '再次购买'  
110 - }],  
111 - reapList: [{  
112 - text: '待收货',  
113 - number: '22416545878874455',  
114 - status: '待发货',  
115 - url: '/images/1.jpg',  
116 - name: '鲜切泰国桃子',  
117 - detail: '果肉饱满，香甜可口',  
118 - price: '25',  
119 - num: '2',  
120 - totalMoney: '8.00',  
121 - carriage: '4',  
122 - btnTxtOne: '确认收货',  
123 - btnTxtTwo: '申请退款',  
124 - btnTxtThree: '查看物流'  
125 - }],  
126 - orderid: '' 13 + totalList: [],
  14 + payList: [],
  15 + sendList: [],
  16 + evaluateList: [],
  17 + reapList: [],
  18 + orderid: '',
  19 + bottomHint: false //触底提示
127 }, 20 },
128 // 导航切换事件 21 // 导航切换事件
129 onClick: function (e) { 22 onClick: function (e) {
@@ -131,18 +24,33 @@ Page({ @@ -131,18 +24,33 @@ Page({
131 switch (index) { 24 switch (index) {
132 case 1: 25 case 1:
133 this.unPayment() 26 this.unPayment()
  27 + this.setData({
  28 + index: 0
  29 + })
134 break; 30 break;
135 case 2: 31 case 2:
136 this.unSend() 32 this.unSend()
  33 + this.setData({
  34 + index: 1
  35 + })
137 break; 36 break;
138 case 3: 37 case 3:
139 this.unReap() 38 this.unReap()
  39 + this.setData({
  40 + index: 2
  41 + })
140 break; 42 break;
141 case 4: 43 case 4:
142 this.unEvaluate() 44 this.unEvaluate()
  45 + this.setData({
  46 + index: 3
  47 + })
143 break; 48 break;
144 case 0: 49 case 0:
145 this.allOrder() 50 this.allOrder()
  51 + this.setData({
  52 + index: 4
  53 + })
146 break; 54 break;
147 } 55 }
148 }, 56 },
@@ -161,6 +69,7 @@ Page({ @@ -161,6 +69,7 @@ Page({
161 type: -1 69 type: -1
162 } 70 }
163 method.postRequest("/order/list", postData, data => { 71 method.postRequest("/order/list", postData, data => {
  72 + wx.stopPullDownRefresh()
164 let list = this.data.pageNum == 1 ? data.data : this.data.tabList.concat(data.data); 73 let list = this.data.pageNum == 1 ? data.data : this.data.tabList.concat(data.data);
165 if (data.statusCode == 0) { 74 if (data.statusCode == 0) {
166 this.setData({ 75 this.setData({
@@ -181,15 +90,16 @@ Page({ @@ -181,15 +90,16 @@ Page({
181 type: 0 90 type: 0
182 } 91 }
183 method.postRequest("/order/list", postData, data => { 92 method.postRequest("/order/list", postData, data => {
  93 + wx.stopPullDownRefresh()
184 let list = this.data.pageNum == 1 ? data.data : this.data.tabList.concat(data.data); 94 let list = this.data.pageNum == 1 ? data.data : this.data.tabList.concat(data.data);
185 if (data.statusCode == 0) { 95 if (data.statusCode == 0) {
186 this.setData({ 96 this.setData({
187 tabList: list 97 tabList: list
188 }) 98 })
189 } else { 99 } else {
190 - setTimeout(() => {  
191 - util.getUser()  
192 - }, 2000) 100 + // setTimeout(() => {
  101 + // util.getUser()
  102 + // }, 2000)
193 } 103 }
194 }) 104 })
195 }, 105 },
@@ -201,6 +111,7 @@ Page({ @@ -201,6 +111,7 @@ Page({
201 type: 1 111 type: 1
202 } 112 }
203 method.postRequest("/order/list", postData, data => { 113 method.postRequest("/order/list", postData, data => {
  114 + wx.stopPullDownRefresh()
204 let list = this.data.pageNum == 1 ? data.data : this.data.tabList.concat(data.data); 115 let list = this.data.pageNum == 1 ? data.data : this.data.tabList.concat(data.data);
205 if (data.statusCode == 0) { 116 if (data.statusCode == 0) {
206 this.setData({ 117 this.setData({
@@ -221,6 +132,7 @@ Page({ @@ -221,6 +132,7 @@ Page({
221 type: 5 132 type: 5
222 } 133 }
223 method.postRequest("/order/list", postData, data => { 134 method.postRequest("/order/list", postData, data => {
  135 + wx.stopPullDownRefresh()
224 let list = this.data.pageNum == 1 ? data.data : this.data.tabList.concat(data.data); 136 let list = this.data.pageNum == 1 ? data.data : this.data.tabList.concat(data.data);
225 if (data.statusCode == 0) { 137 if (data.statusCode == 0) {
226 this.setData({ 138 this.setData({
@@ -241,6 +153,7 @@ Page({ @@ -241,6 +153,7 @@ Page({
241 type: 2 153 type: 2
242 } 154 }
243 method.postRequest("/order/list", postData, data => { 155 method.postRequest("/order/list", postData, data => {
  156 + wx.stopPullDownRefresh()
244 let list = this.data.pageNum == 1 ? data.data : this.data.tabList.concat(data.data); 157 let list = this.data.pageNum == 1 ? data.data : this.data.tabList.concat(data.data);
245 if (data.statusCode == 0) { 158 if (data.statusCode == 0) {
246 this.setData({ 159 this.setData({
@@ -296,7 +209,7 @@ Page({ @@ -296,7 +209,7 @@ Page({
296 method.getRequest("/order/cancelOrder/" + orderId, data => { 209 method.getRequest("/order/cancelOrder/" + orderId, data => {
297 if (data.statusCode == 0) { 210 if (data.statusCode == 0) {
298 211
299 - }else{ 212 + } else {
300 setTimeout(() => { 213 setTimeout(() => {
301 util.getUser() 214 util.getUser()
302 }, 2000) 215 }, 2000)
@@ -358,7 +271,8 @@ Page({ @@ -358,7 +271,8 @@ Page({
358 wx.showToast({ 271 wx.showToast({
359 title: '收货成功', 272 title: '收货成功',
360 }) 273 })
361 - lists.splice(index, 1); 274 + // lists.splice(index, 1);
  275 + this.unReap();
362 this.setData({ 276 this.setData({
363 list: lists 277 list: lists
364 }) 278 })
@@ -389,12 +303,16 @@ Page({ @@ -389,12 +303,16 @@ Page({
389 let that = this; 303 let that = this;
390 //判断第一次加载订单状态 304 //判断第一次加载订单状态
391 that.fristLoad(options.index) 305 that.fristLoad(options.index)
  306 + console.log(options.index)
392 if (options.index == null) { 307 if (options.index == null) {
393 this.setData({ 308 this.setData({
394 active: 0 309 active: 0
395 }) 310 })
396 this.allOrder(); 311 this.allOrder();
397 } else { 312 } else {
  313 + this.setData({
  314 + index:options.index
  315 + })
398 this.fristLoad(options.index) 316 this.fristLoad(options.index)
399 } 317 }
400 }, 318 },
@@ -410,7 +328,13 @@ Page({ @@ -410,7 +328,13 @@ Page({
410 * 生命周期函数--监听页面显示 328 * 生命周期函数--监听页面显示
411 */ 329 */
412 onShow: function () { 330 onShow: function () {
  331 + // let active=this.data.active;
  332 + // if(active==){
413 333
  334 + // }
  335 + // this.setData({
  336 + // index:4
  337 + // })
414 }, 338 },
415 339
416 /** 340 /**
@@ -430,8 +354,43 @@ Page({ @@ -430,8 +354,43 @@ Page({
430 /** 354 /**
431 * 页面相关事件处理函数--监听用户下拉动作 355 * 页面相关事件处理函数--监听用户下拉动作
432 */ 356 */
  357 + onRefresh() {
  358 + // wx.showNavigationBarLoading();
  359 + let index = this.data.index;
  360 + if (index == 4) {
  361 + this.setData({
  362 + pageNum: 1,
  363 + totalList: []
  364 + })
  365 + this.allOrder();
  366 + } else if (index == 0) {
  367 + this.setData({
  368 + pageNum: 1,
  369 + payList: []
  370 + })
  371 + this.unPayment();
  372 + } else if (index == 1) {
  373 + this.setData({
  374 + pageNum: 1,
  375 + sendList: []
  376 + })
  377 + this.unSend();
  378 + } else if (index == 2) {
  379 + this.setData({
  380 + pageNum: 1,
  381 + reapList: []
  382 + })
  383 + this.unReap();
  384 + } else {
  385 + this.setData({
  386 + pageNum: 1,
  387 + evaluateList: []
  388 + })
  389 + this.unEvaluate();
  390 + }
  391 + },
433 onPullDownRefresh: function () { 392 onPullDownRefresh: function () {
434 - 393 + this.onRefresh()
435 }, 394 },
436 395
437 /** 396 /**
@@ -442,6 +401,14 @@ Page({ @@ -442,6 +401,14 @@ Page({
442 pageNum: this.data.pageNum + 1 401 pageNum: this.data.pageNum + 1
443 }) 402 })
444 this.allOrder() 403 this.allOrder()
  404 + this.setData({
  405 + bottomHint: true
  406 + })
  407 + setTimeout(() => {
  408 + this.setData({
  409 + bottomHint: false
  410 + })
  411 + }, 2000)
445 }, 412 },
446 413
447 /** 414 /**
@@ -3,5 +3,6 @@ @@ -3,5 +3,6 @@
3 "van-tab": "@vant/weapp/tab/index", 3 "van-tab": "@vant/weapp/tab/index",
4 "van-tabs": "@vant/weapp/tabs/index" 4 "van-tabs": "@vant/weapp/tabs/index"
5 }, 5 },
6 - "navigationBarTitleText": "全部订单" 6 + "navigationBarTitleText": "全部订单",
  7 + "enablePullDownRefresh": true
7 } 8 }
@@ -10,7 +10,8 @@ @@ -10,7 +10,8 @@
10 </view> 10 </view>
11 <!-- 订单 --> 11 <!-- 订单 -->
12 <view class="container"> 12 <view class="container">
13 - <view class="orderItem" wx:for="{{tabList}}" catchtap="orderDetail" data-orderid="{{item.orderId}}" wx:if="{{item.status!==6}}"> 13 + <view class="orderItem" wx:for="{{tabList}}" catchtap="orderDetail" data-orderid="{{item.orderId}}"
  14 + wx:if="{{item.status!==6}}">
14 <!-- 订单号 --> 15 <!-- 订单号 -->
15 <view class="top"> 16 <view class="top">
16 <view class="orderNumber">订单号：{{item.orderId}}</view> 17 <view class="orderNumber">订单号：{{item.orderId}}</view>
@@ -45,26 +46,38 @@ @@ -45,26 +46,38 @@
45 </view> 46 </view>
46 <!-- 按钮 --> 47 <!-- 按钮 -->
47 <view wx:if="{{item.status!==4}}"> 48 <view wx:if="{{item.status!==4}}">
48 - <view class="btnBox" wx:if="{{item.status==0}}">  
49 - <view class="third btnPublic" wx:if="{{item.btnTxtThree!==undefined}}">{{item.btnTxtThree}}</view>  
50 - <view class="second btnPublic" data-orderId="{{item.orderId}}" catchtap="delOrder" data-index="{{index}}">取消订单</view>  
51 - <view class="frist btnPublic" bindtap="payment" data-id="{{item.orderId}}">立即支付</view>  
52 - </view>  
53 - <view class="btnBox" wx:if="{{item.status==1}}">  
54 - <view class="third btnPublic" wx:if="{{item.btnTxtThree!==undefined}}" >{{item.btnTxtThree}}</view>  
55 - <view class="second btnPublic" catchtap="refund" data-orderid="{{item.orderId}}">申请退款</view>  
56 - <view class="frist btnPublic" data-goodsid="{{item.listGoodsVoList[0].goodsId}}" catchtap="buyAgain">再次购买</view>  
57 - </view>  
58 - <view class="btnBox" wx:if="{{item.status==2}}">  
59 - <view class="third btnPublic" catchtap="logistics" data-orderid="{{item.orderId}}">查看物流</view>  
60 - <view class="second btnPublic" catchtap="refund" data-orderid="{{item.orderId}}">申请退款</view>  
61 - <view class="frist btnPublic" data-orderid="{{item.orderId}}" catchtap="receipt">确认收货</view>  
62 - </view>  
63 - <view class="btnBox" wx:if="{{item.status==5}}">  
64 - <view class="third btnPublic" data-goodsid="{{item.listGoodsVoList[0].goodsId}}" catchtap="buyAgain">再次购买</view>  
65 - <view class="second btnPublic" catchtap="refund" data-orderid="{{item.orderId}}">申请退款</view>  
66 - <view class="frist btnPublic" data-goodsid="{{item.listGoodsVoList[0].goodsId}}" data-orderid="{{item.orderId}}" catchtap="evaluate">立即评价</view> 49 + <view class="btnBox" wx:if="{{item.status==0}}">
  50 + <view class="third btnPublic" wx:if="{{item.btnTxtThree!==undefined}}">{{item.btnTxtThree}}</view>
  51 + <view class="second btnPublic" data-orderId="{{item.orderId}}" catchtap="delOrder" data-index="{{index}}">取消订单
  52 + </view>
  53 + <view class="frist btnPublic" bindtap="payment" data-id="{{item.orderId}}">立即支付</view>
  54 + </view>
  55 + <view class="btnBox" wx:if="{{item.status==1}}">
  56 + <view class="third btnPublic" wx:if="{{item.btnTxtThree!==undefined}}">{{item.btnTxtThree}}</view>
  57 + <view class="second btnPublic" catchtap="refund" data-orderid="{{item.orderId}}">申请退款</view>
  58 + <view class="frist btnPublic" data-goodsid="{{item.listGoodsVoList[0].goodsId}}" catchtap="buyAgain">再次购买</view>
  59 + </view>
  60 + <view class="btnBox" wx:if="{{item.status==2}}">
  61 + <view class="third btnPublic" catchtap="logistics" data-orderid="{{item.orderId}}">查看物流</view>
  62 + <view class="second btnPublic" catchtap="refund" data-orderid="{{item.orderId}}">申请退款</view>
  63 + <view class="frist btnPublic" data-orderid="{{item.orderId}}" catchtap="receipt">确认收货</view>
  64 + </view>
  65 + <view class="btnBox" wx:if="{{item.status==5}}">
  66 + <view class="third btnPublic" data-goodsid="{{item.listGoodsVoList[0].goodsId}}" catchtap="buyAgain">再次购买</view>
  67 + <view class="second btnPublic" catchtap="refund" data-orderid="{{item.orderId}}">申请退款</view>
  68 + <view class="frist btnPublic" data-goodsid="{{item.listGoodsVoList[0].goodsId}}" data-orderid="{{item.orderId}}"
  69 + catchtap="evaluate">立即评价</view>
  70 + </view>
67 </view> 71 </view>
68 </view> 72 </view>
  73 + <view class="bottomHint" wx:if="{{bottomHint}}">
  74 + 我是有底线的~
  75 +</view>
  76 + <view class="noData" wx:if="{{tabList.length==0}}">
  77 + <view class="noDataPic">
  78 + <image src="/images/message@2x.png"></image>
  79 + </view>
  80 + <view class="top1">您还没有相关的订单</view>
  81 + <view class="bottom1">可以去看看有那些想买的</view>
69 </view> 82 </view>
70 </view> 83 </view>
@@ -102,7 +102,7 @@ page{ @@ -102,7 +102,7 @@ page{
102 } 102 }
103 103
104 .price { 104 .price {
105 - font-size: 36rpx; 105 + font-size: 28rpx;
106 font-weight: 500; 106 font-weight: 500;
107 text-align: left; 107 text-align: left;
108 color: #ff4444; 108 color: #ff4444;
@@ -132,7 +132,7 @@ page{ @@ -132,7 +132,7 @@ page{
132 } 132 }
133 133
134 .totalMoney { 134 .totalMoney {
135 - height: 40rpx; 135 + height: 36rpx;
136 font-size: 28rpx; 136 font-size: 28rpx;
137 margin-right: 16rpx; 137 margin-right: 16rpx;
138 margin-left: 16rpx; 138 margin-left: 16rpx;
@@ -165,4 +165,35 @@ page{ @@ -165,4 +165,35 @@ page{
165 border: 2rpx solid #fb8319; 165 border: 2rpx solid #fb8319;
166 color: #FB7600; 166 color: #FB7600;
167 } 167 }
168 - 168 +.noData{
  169 + margin-top: 100rpx;
  170 +}
  171 +.top1,.bottom1{
  172 + width:750rpx;
  173 + display: flex;
  174 + justify-content: center;
  175 +}
  176 +.top1{
  177 + font-size: 28rpx;
  178 + color: #323233;
  179 +}
  180 +.bottom1{
  181 + font-size: 24rpx;
  182 + color: #999999;
  183 +}
  184 +.noDataPic{
  185 + width: 200rpx;
  186 + height: 200rpx;
  187 + margin: 0 auto;
  188 +}
  189 +.noDataPic image{
  190 + width: 200rpx;
  191 + height: 200rpx;
  192 +}
  193 +.bottomHint{
  194 + font-size: 24rpx;
  195 + color: gray;
  196 + display: flex;
  197 + justify-content: center;
  198 + padding-bottom: 10rpx;
  199 +}
1 // pages/apply-after-sale/apply-after-sale.js 1 // pages/apply-after-sale/apply-after-sale.js
2 let method = require("../../utils/reuqest.js"); 2 let method = require("../../utils/reuqest.js");
3 const util = require("../../utils/util.js"); 3 const util = require("../../utils/util.js");
  4 +const ary = [];
4 Page({ 5 Page({
5 data: { 6 data: {
6 id: '', //订单号 7 id: '', //订单号
@@ -29,9 +30,9 @@ Page({ @@ -29,9 +30,9 @@ Page({
29 postList: data.data 30 postList: data.data
30 }) 31 })
31 }else{ 32 }else{
32 - setTimeout(() => {  
33 - util.getUser()  
34 - }, 2000) 33 + // setTimeout(() => {
  34 + // util.getUser()
  35 + // }, 2000)
35 } 36 }
36 }) 37 })
37 }, 38 },
@@ -59,9 +60,9 @@ Page({ @@ -59,9 +60,9 @@ Page({
59 columns:data.data 60 columns:data.data
60 }) 61 })
61 }else{ 62 }else{
62 - setTimeout(() => {  
63 - util.getUser()  
64 - }, 2000) 63 + // setTimeout(() => {
  64 + // util.getUser()
  65 + // }, 2000)
65 } 66 }
66 }) 67 })
67 // this.setData({ 68 // this.setData({
@@ -77,46 +78,160 @@ Page({ @@ -77,46 +78,160 @@ Page({
77 }) 78 })
78 }, 79 },
79 //上传凭证 80 //上传凭证
80 - chooseImageTap: function () {  
81 - var that = this;  
82 - if (that.data.imgs.length == 3) { 81 + // chooseImageTap: function () {
  82 + // var that = this;
  83 + // if (that.data.imgs.length == 3) {
  84 + // wx.showToast({
  85 + // title: '最多可以上传三张图片~',
  86 + // icon: 'icon'
  87 + // })
  88 + // }
  89 + // wx.showActionSheet({
  90 + // itemList: ['从相册中选择', '拍照'],
  91 + // itemColor: "#00000",
  92 + // success: function (res) {
  93 + // if (!res.cancel) {
  94 + // if (res.tapIndex == 0) {
  95 + // that.chooseWxImage('album')
  96 + // } else if (res.tapIndex == 1) {
  97 + // that.chooseWxImage('camera')
  98 + // }
  99 + // }
  100 + // }
  101 + // })
  102 + // },
  103 + // chooseWxImage: function (type) {
  104 + // var that = this;
  105 + // var imgsPaths = that.data.imgs;
  106 + // var list = that.data.lists;
  107 + // wx.chooseImage({
  108 + // sizeType: ['original', 'compressed'],
  109 + // sourceType: [type],
  110 + // success: function (res) {
  111 + // console.log(res.tempFilePaths[0]);
  112 + // that.setData({
  113 + // imgs: res.tempFilePaths,
  114 + // })
  115 + // console.log(that.data.imgs.length, 'length')
  116 + // //that.upImgs(res.tempFilePaths[0], 0) //调用上传方法
  117 + // }
  118 + // })
  119 + // },
  120 + //删除图片
  121 + chooseImage(e) {
  122 + let that = this;
  123 + var type = e.currentTarget.dataset.type;
  124 + // let num = type == 1 ? (4 - that.data.ppath.length) : (4 - that.data.cpath.length);
  125 + if(that.data.imgs.length<3){
  126 + wx.chooseImage({
  127 + // count: num,
  128 + sizeType: ['compressed'],
  129 + sourceType: ['album', 'camera'],
  130 + success(res) {
  131 + wx.showLoading({
  132 + title: '上传中...',
  133 + mask: true
  134 + })
  135 + var uploaderList = res.tempFilePaths;
  136 + // ary.push(uploaderList[0])
  137 + // if (ary.length <= 3) {
  138 + // // that.setData({
  139 + // // imgs: ary
  140 + // // })
  141 + // } else {
  142 + // wx.showToast({
  143 + // title: '最多只能上传3张图片',
  144 + // icon: 'none'
  145 + // })
  146 + // }
  147 +
  148 + console.log(uploaderList, 'liost')
  149 + if (type == 1) {
  150 + that.setData({
  151 + imags: that.data.puploaderList.concat(res.tempFilePaths),
  152 + })
  153 + // that.setData({
  154 + // puploaderNum: that.data.puploaderList.length
  155 + // })
  156 + // } else {
  157 + // that.setData({
  158 + // cuploaderList: that.data.cuploaderList.concat(res.tempFilePaths),
  159 + // })
  160 + // that.setData({
  161 + // cuploaderNum: that.data.cuploaderList.length
  162 + // })
  163 + }
  164 + that.uploadDIY(uploaderList, 0, 0, 0, uploaderList.length, type);
  165 + }
  166 +
  167 + })
  168 + }else{
83 wx.showToast({ 169 wx.showToast({
84 - title: '最多可以上传三张图片~',  
85 - icon: 'icon' 170 + title: '最多只能上传三张图片',
  171 + icon:'none'
86 }) 172 })
87 } 173 }
88 - wx.showActionSheet({  
89 - itemList: ['从相册中选择', '拍照'],  
90 - itemColor: "#00000",  
91 - success: function (res) {  
92 - if (!res.cancel) {  
93 - if (res.tapIndex == 0) {  
94 - that.chooseWxImage('album')  
95 - } else if (res.tapIndex == 1) {  
96 - that.chooseWxImage('camera')  
97 - }  
98 - }  
99 - }  
100 - }) 174 +
101 }, 175 },
102 - chooseWxImage: function (type) {  
103 - var that = this;  
104 - var imgsPaths = that.data.imgs;  
105 - var list = that.data.lists;  
106 - wx.chooseImage({  
107 - sizeType: ['original', 'compressed'],  
108 - sourceType: [type], 176 +
  177 + uploadDIY(filePaths, successUp, failUp, i, length, type) {
  178 + let that = this;
  179 + wx.uploadFile({
  180 + filePath: filePaths[i],
  181 + name: 'file',
  182 + url: 'http://sjhl.brotop.cn/myUser/common/upload',
  183 + header: {
  184 + 'content-type': 'multipart/form-data',
  185 + 'Authorization': wx.getStorageSync('Authorization') || ''
  186 + },
109 success: function (res) { 187 success: function (res) {
110 - console.log(res.tempFilePaths[0]);  
111 - that.setData({  
112 - imgs: res.tempFilePaths,  
113 - })  
114 - console.log(that.data.imgs.length, 'length')  
115 - //that.upImgs(res.tempFilePaths[0], 0) //调用上传方法  
116 - } 188 + successUp++;
  189 + console.log('上传图片成功：', JSON.parse(res.data));
  190 + var data = JSON.parse(res.data);
  191 + let url = JSON.parse(res.data).data
  192 + if (that.data.imgs.length < 3) {
  193 + ary.push(url);
  194 + that.setData({
  195 + imgs: ary
  196 + })
  197 + }
  198 +
  199 + if (type == 1) {
  200 + that.data.ppath[i] = url;
  201 + that.setData({
  202 + ppath: that.data.ppath
  203 + })
  204 + } else {
  205 + that.data.cpath[i] = url;
  206 + that.setData({
  207 + cpath: that.data.cpath
  208 + })
  209 + }
  210 + // 把获取到的路径存入imagesurl字符串中
  211 + // this.data.imagesurl
  212 + // this.setData({
  213 + // imagesurl: this.data.imagesurl.concat(data.data)
  214 + // })
  215 + // console.log(this.data.imagesurl)
  216 + },
  217 + fail: (res) => {
  218 + failUp++;
  219 + },
  220 + complete: () => {
  221 + i++;
  222 + if (i == length) {
  223 + // Toast('总共' + successUp + '张上传成功,' + failUp + '张上传失败！');
  224 + wx.showToast({
  225 + title: '上传成功',
  226 + })
  227 + } else { //递归调用uploadDIY函数
  228 + that.uploadDIY(filePaths, successUp, failUp, i, length, type);
  229 + }
  230 + },
117 }) 231 })
  232 +
  233 +
118 }, 234 },
119 - //删除图片  
120 delPic(e) { 235 delPic(e) {
121 console.log(e, 'e') 236 console.log(e, 'e')
122 let index = e.currentTarget.dataset.index; 237 let index = e.currentTarget.dataset.index;
@@ -145,9 +260,9 @@ Page({ @@ -145,9 +260,9 @@ Page({
145 url: '/pages/all-order/all-order', 260 url: '/pages/all-order/all-order',
146 }) 261 })
147 }else{ 262 }else{
148 - setTimeout(() => {  
149 - util.getUser()  
150 - }, 2000) 263 + // setTimeout(() => {
  264 + // util.getUser()
  265 + // }, 2000)
151 } 266 }
152 }) 267 })
153 }, 268 },
@@ -77,7 +77,7 @@ @@ -77,7 +77,7 @@
77 <view class="right">最多可上传3张</view> 77 <view class="right">最多可上传3张</view>
78 </view> 78 </view>
79 <view class="photo"> 79 <view class="photo">
80 - <view class="photoOne" bindtap="chooseImageTap"> 80 + <view class="photoOne" bindtap="chooseImage">
81 <image src="/images/05-06/photo.png"></image> 81 <image src="/images/05-06/photo.png"></image>
82 </view> 82 </view>
83 <view class="photoOne" wx:for="{{imgs}}" data-index="{{index}}"> 83 <view class="photoOne" wx:for="{{imgs}}" data-index="{{index}}">
@@ -22,7 +22,8 @@ Page({ @@ -22,7 +22,8 @@ Page({
22 time: '2020/12/25 12:09', 22 time: '2020/12/25 12:09',
23 num: '-176' 23 num: '-176'
24 }], 24 }],
25 - t:'1' 25 + t: '1',
  26 + bottomHint: false
26 }, 27 },
27 //第一次数据加载 28 //第一次数据加载
28 getList() { 29 getList() {
@@ -31,7 +32,7 @@ Page({ @@ -31,7 +32,7 @@ Page({
31 this.setData({ 32 this.setData({
32 postData: data.data 33 postData: data.data
33 }) 34 })
34 - }else{ 35 + } else {
35 setTimeout(() => { 36 setTimeout(() => {
36 util.getUser() 37 util.getUser()
37 }, 2000) 38 }, 2000)
@@ -46,11 +47,12 @@ Page({ @@ -46,11 +47,12 @@ Page({
46 t: this.data.t 47 t: this.data.t
47 } 48 }
48 method.postRequest("/myUser/myMembershipCardDetails", postData, data => { 49 method.postRequest("/myUser/myMembershipCardDetails", postData, data => {
  50 + wx.stopPullDownRefresh()
49 if (data.statusCode == 0) { 51 if (data.statusCode == 0) {
50 - this.setData({  
51 - list:data.data  
52 - })  
53 - }else{ 52 + this.setData({
  53 + list: data.data
  54 + })
  55 + } else {
54 setTimeout(() => { 56 setTimeout(() => {
55 util.getUser() 57 util.getUser()
56 }, 2000) 58 }, 2000)
@@ -63,13 +65,13 @@ Page({ @@ -63,13 +65,13 @@ Page({
63 switch (idx) { 65 switch (idx) {
64 case 0: 66 case 0:
65 this.setData({ 67 this.setData({
66 - t:'1' 68 + t: '1'
67 }) 69 })
68 this.cardDetail() 70 this.cardDetail()
69 break; 71 break;
70 case 1: 72 case 1:
71 this.setData({ 73 this.setData({
72 - t:'2' 74 + t: '2'
73 }) 75 })
74 this.cardDetail() 76 this.cardDetail()
75 break; 77 break;
@@ -112,15 +114,37 @@ Page({ @@ -112,15 +114,37 @@ Page({
112 /** 114 /**
113 * 页面相关事件处理函数--监听用户下拉动作 115 * 页面相关事件处理函数--监听用户下拉动作
114 */ 116 */
  117 + onRefresh() {
  118 + if(this.data.t==1){
  119 + this.setData({
  120 + page: 1,
  121 + integralList: []
  122 + })
  123 + this.cardDetail();
  124 + }else{
  125 + this.setData({
  126 + page: 1,
  127 + exchangeList: []
  128 + })
  129 + this.cardDetail();
  130 + }
  131 + },
115 onPullDownRefresh: function () { 132 onPullDownRefresh: function () {
116 - 133 + this.onRefresh()
117 }, 134 },
118 135
119 /** 136 /**
120 * 页面上拉触底事件的处理函数 137 * 页面上拉触底事件的处理函数
121 */ 138 */
122 onReachBottom: function () { 139 onReachBottom: function () {
123 - 140 + this.setData({
  141 + bottomHint: true
  142 + })
  143 + setTimeout(() => {
  144 + this.setData({
  145 + bottomHint: false
  146 + })
  147 + }, 2000)
124 }, 148 },
125 149
126 /** 150 /**
@@ -3,5 +3,6 @@ @@ -3,5 +3,6 @@
3 "van-tab": "@vant/weapp/tab/index", 3 "van-tab": "@vant/weapp/tab/index",
4 "van-tabs": "@vant/weapp/tabs/index" 4 "van-tabs": "@vant/weapp/tabs/index"
5 }, 5 },
6 - "navigationBarTitleText": "会员卡详情" 6 + "navigationBarTitleText": "会员卡详情",
  7 + "enablePullDownRefresh": true
7 } 8 }
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
9 </view> 9 </view>
10 </view> 10 </view>
11 <!-- tab --> 11 <!-- tab -->
12 -<van-tabs active="{{ active }}" bind:change="onChange" > 12 +<van-tabs active="{{ active }}" bind:change="onChange">
13 <van-tab title="{{item.title}}" wx:for="{{tabList}}">{{}}</van-tab> 13 <van-tab title="{{item.title}}" wx:for="{{tabList}}">{{}}</van-tab>
14 </van-tabs> 14 </van-tabs>
15 <!-- content --> 15 <!-- content -->
@@ -20,9 +20,12 @@ @@ -20,9 +20,12 @@
20 <view class="time">{{item.time}}</view> 20 <view class="time">{{item.time}}</view>
21 </view> 21 </view>
22 <view class="right"> 22 <view class="right">
23 - <view class="display:inline-block" wx:if="{{item.state==2}}">-</view>  
24 - <view class="display:inline-block" wx:if="{{item.state==1}}">+</view> 23 + <view class="display:inline-block" wx:if="{{item.state==2}}">-</view>
  24 + <view class="display:inline-block" wx:if="{{item.state==1}}">+</view>
25 {{item.num}} 25 {{item.num}}
26 </view> 26 </view>
27 </view> 27 </view>
  28 +</view>
  29 +<view class="bottomHint" wx:if="{{bottomHint}}">
  30 + 我是有底线的~
28 </view> 31 </view>
@@ -57,3 +57,11 @@ margin-top: 16rpx; @@ -57,3 +57,11 @@ margin-top: 16rpx;
57 font-weight: 400; 57 font-weight: 400;
58 color: #ee231c; 58 color: #ee231c;
59 } 59 }
  60 +
  61 +.bottomHint{
  62 + font-size: 24rpx;
  63 + color: gray;
  64 + display: flex;
  65 + justify-content: center;
  66 + padding-bottom: 10rpx;
  67 +}
@@ -3,9 +3,7 @@ let method = require("../../utils/reuqest.js"); @@ -3,9 +3,7 @@ let method = require("../../utils/reuqest.js");
3 const util = require("../../utils/util.js"); 3 const util = require("../../utils/util.js");
4 Page({ 4 Page({
5 data: { 5 data: {
6 - userData: {  
7 - address: '请选择收货地址'  
8 - }, 6 + userData:"",
9 addressId: '', 7 addressId: '',
10 startTime: '', 8 startTime: '',
11 cartList: [], //商品列表 9 cartList: [], //商品列表
@@ -2,10 +2,15 @@ @@ -2,10 +2,15 @@
2 <view class="container"> 2 <view class="container">
3 <!-- 地址 --> 3 <!-- 地址 -->
4 <view class="address" bindtap="emit"> 4 <view class="address" bindtap="emit">
5 - <view class="userName">{{userData.name}}</view>  
6 - <view class="userTell">{{userData.phone}}</view>  
7 - <view class="default" wx:if="{{userData.delFlag==1}}">默认</view>  
8 - <view class="userAddress">{{userData.area}}{{userData.address}}</view> 5 + <view wx:if="{{userData!==''}}">
  6 + <view class="userName">{{userData.name}}</view>
  7 + <view class="userTell">{{userData.phone}}</view>
  8 + <view class="default" wx:if="{{userData.delFlag==1}}">默认</view>
  9 + <view class="userAddress">{{userData.area}}{{userData.address}}</view>
  10 + </view>
  11 + <view wx:if="{{userData==''}}" class="noAdd">
  12 + 请选择收货地址
  13 + </view>
9 <view class="arrow"> 14 <view class="arrow">
10 <image src="/images/04-01/arrow.png"></image> 15 <image src="/images/04-01/arrow.png"></image>
11 </view> 16 </view>
@@ -13,7 +18,7 @@ @@ -13,7 +18,7 @@
13 <!-- 配送时间 --> 18 <!-- 配送时间 -->
14 <view class="timeBox"> 19 <view class="timeBox">
15 <view class="section"> 20 <view class="section">
16 - <picker mode="date" value="{{date}}" start="{{startTime}}" bindchange="bindDateChange"> 21 + <picker mode="date" value="{{date}}" start="{{startTime}}" bindchange="bindDateChange">
17 <view class="picker"> 22 <view class="picker">
18 配送时间: {{date}} 23 配送时间: {{date}}
19 </view> 24 </view>
@@ -49,7 +54,8 @@ @@ -49,7 +54,8 @@
49 <!-- 买家留言 --> 54 <!-- 买家留言 -->
50 <view class="messageBox"> 55 <view class="messageBox">
51 <view class="messageTitle">买家留言:</view> 56 <view class="messageTitle">买家留言:</view>
52 - <textarea name="" id="" cols="30" rows="10" value="{{content}}" placeholder="留言建议提前协商50字之内" maxlength="50" bindinput="userInput"></textarea> 57 + <textarea name="" id="" cols="30" rows="10" value="{{content}}" placeholder="留言建议提前协商50字之内" maxlength="50"
  58 + bindinput="userInput"></textarea>
53 <view class="numLength">{{length}}/50</view> 59 <view class="numLength">{{length}}/50</view>
54 </view> 60 </view>
55 <!-- 优惠券 --> 61 <!-- 优惠券 -->
@@ -9,6 +9,11 @@ @@ -9,6 +9,11 @@
9 } 9 }
10 10
11 /* 地址 */ 11 /* 地址 */
  12 +.noAdd{
  13 + font-size: 32rpx;
  14 + font-weight: 600;
  15 + width: 90%;
  16 +}
12 .address { 17 .address {
13 width: 686rpx; 18 width: 686rpx;
14 /* height: 200rpx; */ 19 /* height: 200rpx; */
@@ -18,6 +23,7 @@ @@ -18,6 +23,7 @@
18 padding: 32rpx 28rpx 32rpx 36rpx; 23 padding: 32rpx 28rpx 32rpx 36rpx;
19 box-sizing: border-box; 24 box-sizing: border-box;
20 position: relative; 25 position: relative;
  26 + display: flex;
21 27
22 } 28 }
23 29
@@ -70,11 +76,9 @@ @@ -70,11 +76,9 @@
70 } 76 }
71 77
72 .arrow { 78 .arrow {
73 - width: 32rpx;  
74 - height: 32rpx;  
75 - position: absolute;  
76 - top: 65rpx;  
77 - left: 626rpx; 79 + width: 15%;
  80 + display: flex;
  81 + align-items: center;
78 } 82 }
79 83
80 .arrow image { 84 .arrow image {
1 <!--pages/classify/classify.wxml--> 1 <!--pages/classify/classify.wxml-->
2 <!-- 搜索框 --> 2 <!-- 搜索框 -->
3 <view class="searchMain"> 3 <view class="searchMain">
4 - <view class="locationIcon">  
5 - <image src="/images/location.png"></image>  
6 - </view>  
7 <view class="location"> 4 <view class="location">
8 - {{location}} 5 + <image src="/images/location.png"></image>
  6 + <text>{{location}}</text>
  7 +
9 </view> 8 </view>
10 <view class="searchBox"> 9 <view class="searchBox">
11 <view class="search_center" catchtap="goSearch"> 10 <view class="search_center" catchtap="goSearch">
@@ -11,16 +11,17 @@ @@ -11,16 +11,17 @@
11 position: relative; 11 position: relative;
12 } 12 }
13 13
14 -.locationIcon { 14 +/* .locationIcon {
15 display: inline-block; 15 display: inline-block;
16 position: absolute; 16 position: absolute;
17 left: 26rpx; 17 left: 26rpx;
18 top: -2rpx; 18 top: -2rpx;
19 -} 19 +} */
20 20
21 -.locationIcon image { 21 +.location image {
22 width: 16rpx; 22 width: 16rpx;
23 height: 20rpx; 23 height: 20rpx;
  24 + position: absolute;
24 } 25 }
25 26
26 .search_center { 27 .search_center {
@@ -109,11 +110,16 @@ @@ -109,11 +110,16 @@
109 .location { 110 .location {
110 width: 142rpx; 111 width: 142rpx;
111 height: 60rpx; 112 height: 60rpx;
112 - /* background-color: blanchedalmond; */  
113 font-size: 24rpx; 113 font-size: 24rpx;
114 color: #323232; 114 color: #323232;
115 text-indent: 1em; 115 text-indent: 1em;
116 - margin-left: 22rpx; 116 + /* margin-left: 22rpx; */
  117 + display: flex;
  118 + position: relative;
  119 + /* flex-wrap: wrap; */
  120 + overflow: hidden;
  121 + padding-left: 20rpx;
  122 + box-sizing: border-box;
117 } 123 }
118 124
119 .searchBox { 125 .searchBox {
@@ -124,16 +130,12 @@ @@ -124,16 +130,12 @@
124 130
125 /* 侧边导航 */ 131 /* 侧边导航 */
126 .navSide { 132 .navSide {
127 - position: fixed;  
128 - left: 0;  
129 margin-top: 4rpx; 133 margin-top: 4rpx;
  134 + display: flex;
130 } 135 }
131 136
132 .navContent { 137 .navContent {
133 - position: absolute;  
134 - top: 0;  
135 - left: 218rpx;  
136 - margin-right: 32rpx; 138 + margin-left: 32rpx;
137 } 139 }
138 140
139 .scroll-view { 141 .scroll-view {
@@ -256,7 +258,7 @@ @@ -256,7 +258,7 @@
256 left: 0; 258 left: 0;
257 border-radius: 10rpx 10rpx 0 0; 259 border-radius: 10rpx 10rpx 0 0;
258 background: #fff; 260 background: #fff;
259 - padding: 30rpx 32rpx 0; 261 + padding: 30rpx 32rpx ;
260 box-sizing: border-box; 262 box-sizing: border-box;
261 max-height: 94%; 263 max-height: 94%;
262 overflow-y: auto; 264 overflow-y: auto;
@@ -440,8 +442,10 @@ @@ -440,8 +442,10 @@
440 .confrimBtn { 442 .confrimBtn {
441 height: 78rpx; 443 height: 78rpx;
442 display: flex; 444 display: flex;
443 - background-color: #d12324; 445 + background-color: #f16304;
444 color: #ffffff; 446 color: #ffffff;
445 align-items: center; 447 align-items: center;
446 justify-content: center; 448 justify-content: center;
  449 + margin-top: 20rpx;
  450 + border-radius: 36rpx;
447 } 451 }
1 // pages/discount-card/discount-card.js 1 // pages/discount-card/discount-card.js
2 let method = require("../../utils/reuqest.js") 2 let method = require("../../utils/reuqest.js")
3 -let util=require("../../utils/util.js") 3 +let util = require("../../utils/util.js")
4 Page({ 4 Page({
5 data: { 5 data: {
6 startTime: '', 6 startTime: '',
@@ -8,18 +8,20 @@ Page({ @@ -8,18 +8,20 @@ Page({
8 pages: "1", 8 pages: "1",
9 cardList: "", 9 cardList: "",
10 id: '', 10 id: '',
  11 + bottomHint: false //触底提示
11 }, 12 },
12 13
13 //获取优惠券 14 //获取优惠券
14 getDiscounCard() { 15 getDiscounCard() {
15 - let that=this;  
16 - console.log(that.data.pages,'pages') 16 + let that = this;
  17 + console.log(that.data.pages, 'pages')
17 let postData = { 18 let postData = {
18 page: that.data.pages, 19 page: that.data.pages,
19 size: 10, 20 size: 10,
20 type: 0 21 type: 0
21 } 22 }
22 method.postRequest("/coupon/list", postData, data => { 23 method.postRequest("/coupon/list", postData, data => {
  24 + wx.stopPullDownRefresh()
23 let lists = that.data.pages == 1 ? data.data : that.data.cardList.concat(data.data) 25 let lists = that.data.pages == 1 ? data.data : that.data.cardList.concat(data.data)
24 if (data.statusCode == 0) { 26 if (data.statusCode == 0) {
25 that.setData({ 27 that.setData({
@@ -40,14 +42,14 @@ Page({ @@ -40,14 +42,14 @@ Page({
40 }) 42 })
41 43
42 }) 44 })
43 - }else{ 45 + } else {
44 setTimeout(() => { 46 setTimeout(() => {
45 util.getUser() 47 util.getUser()
46 }, 2000) 48 }, 2000)
47 } 49 }
48 }) 50 })
49 }, 51 },
50 - 52 +
51 53
52 /** 54 /**
53 * 生命周期函数--监听页面加载 55 * 生命周期函数--监听页面加载
@@ -55,7 +57,7 @@ Page({ @@ -55,7 +57,7 @@ Page({
55 onLoad: function (options) { 57 onLoad: function (options) {
56 let that = this; 58 let that = this;
57 that.getDiscounCard() 59 that.getDiscounCard()
58 - console.log(that.data.pages,'onload') 60 + console.log(that.data.pages, 'onload')
59 }, 61 },
60 62
61 /** 63 /**
@@ -89,8 +91,16 @@ Page({ @@ -89,8 +91,16 @@ Page({
89 /** 91 /**
90 * 页面相关事件处理函数--监听用户下拉动作 92 * 页面相关事件处理函数--监听用户下拉动作
91 */ 93 */
  94 + onRefresh() {
  95 + wx.showNavigationBarLoading();
  96 + this.setData({
  97 + pageNum: 1,
  98 + cardList: []
  99 + })
  100 + this.getDiscounCard();
  101 + },
92 onPullDownRefresh: function () { 102 onPullDownRefresh: function () {
93 - 103 + this.onRefresh()
94 }, 104 },
95 105
96 /** 106 /**
@@ -100,12 +110,19 @@ Page({ @@ -100,12 +110,19 @@ Page({
100 // util.onReachListData(this, this.data.pageNums, this.data.cardList, this.getDiscounCard); 110 // util.onReachListData(this, this.data.pageNums, this.data.cardList, this.getDiscounCard);
101 // }, 111 // },
102 onReachBottom: function () { 112 onReachBottom: function () {
103 - console.log(this.data.pages,'第一次')  
104 this.setData({ 113 this.setData({
105 pages: Number(this.data.pages) + 1 114 pages: Number(this.data.pages) + 1
106 }) 115 })
107 - console.log(this.data.pages,'nums')  
108 - this.getDiscounCard() 116 + this.getDiscounCard();
  117 +
  118 + this.setData({
  119 + bottomHint: true
  120 + })
  121 + setTimeout(() => {
  122 + this.setData({
  123 + bottomHint: false
  124 + })
  125 + }, 2000)
109 }, 126 },
110 127
111 /** 128 /**
1 { 1 {
2 "usingComponents": {}, 2 "usingComponents": {},
3 - "navigationBarTitleText": "优惠券" 3 + "navigationBarTitleText": "优惠券",
  4 + "enablePullDownRefresh": true
4 } 5 }
@@ -14,7 +14,11 @@ @@ -14,7 +14,11 @@
14 <view class="topCircle"></view> 14 <view class="topCircle"></view>
15 <view class="bottomCircle"></view> 15 <view class="bottomCircle"></view>
16 </view> 16 </view>
  17 + <view class="bottomHint" wx:if="{{bottomHint}}">
  18 + 我是有底线的~
  19 +</view>
17 <view class="listBlank" wx:if="{{cardList.length==0}}"> 20 <view class="listBlank" wx:if="{{cardList.length==0}}">
18 暂无可用优惠券~ 21 暂无可用优惠券~
19 </view> 22 </view>
20 </view> 23 </view>
  24 +
@@ -86,4 +86,11 @@ margin-top: 24rpx; @@ -86,4 +86,11 @@ margin-top: 24rpx;
86 align-items: center; 86 align-items: center;
87 color: #999999; 87 color: #999999;
88 font-size: 30rpx; 88 font-size: 30rpx;
  89 +}
  90 +.bottomHint{
  91 + font-size: 24rpx;
  92 + color: gray;
  93 + display: flex;
  94 + justify-content: center;
  95 + padding-bottom: 10rpx;
89 } 96 }
@@ -8,13 +8,9 @@ Page({ @@ -8,13 +8,9 @@ Page({
8 username: '', 8 username: '',
9 phone: '', 9 phone: '',
10 value: '', 10 value: '',
11 - checked: 0, 11 + switchChecked:false,
12 show: false, 12 show: false,
13 selectBox: true, 13 selectBox: true,
14 - // region: ['广东省', '广州市', '海珠区'],  
15 - // province: '选择省/',  
16 - // city: '市/',  
17 - // county: '区',  
18 location: '', 14 location: '',
19 flag: true, 15 flag: true,
20 latitude: "", 16 latitude: "",
@@ -128,12 +124,27 @@ Page({ @@ -128,12 +124,27 @@ Page({
128 }, 124 },
129 125
130 //开关 126 //开关
131 - onChange() { 127 + // onChange(detail) {
  128 + // if(this.data.checked==1){
  129 + // this.setData({
  130 + // checked:!detail
  131 + // })
  132 + // }else{
  133 + // this.setData({
  134 + // checked:detail
  135 + // // checked: !this.data.checked
  136 + // })
  137 + // }
  138 +
  139 + // console.log(detail,'detail')
  140 + // },
  141 + switch1Change(e){
  142 + console.log(e.detail.value,'value')
132 this.setData({ 143 this.setData({
133 - checked: !this.data.checked 144 + switchChecked:e.detail.value
134 }) 145 })
135 - },  
136 - //保存 146 + },
  147 + //保存
137 save() { 148 save() {
138 if (this.data.username == '') { 149 if (this.data.username == '') {
139 wx.showToast({ 150 wx.showToast({
@@ -151,7 +162,7 @@ Page({ @@ -151,7 +162,7 @@ Page({
151 icon: 'none' 162 icon: 'none'
152 }) 163 })
153 } else { 164 } else {
154 - let delFlags = this.data.checked == true ? 1 : 0; 165 + let delFlags = this.data.switchChecked == true ? 1 : 0;
155 // let region = this.data.region; 166 // let region = this.data.region;
156 // let addressStr = region[0] + "" + region[1] + "" + region[2] 167 // let addressStr = region[0] + "" + region[1] + "" + region[2]
157 let postData = { 168 let postData = {
@@ -223,15 +234,14 @@ Page({ @@ -223,15 +234,14 @@ Page({
223 username: options.name, 234 username: options.name,
224 phone: options.phone, 235 phone: options.phone,
225 value: options.address, 236 value: options.address,
226 - checked: options.delFlag, 237 + switchChecked: options.delFlag == 1 ?true:false,
227 location: options.area, 238 location: options.area,
228 locations: options.locations, 239 locations: options.locations,
229 latitudes: options.locations.split(",")[0], //传值给后台 240 latitudes: options.locations.split(",")[0], //传值给后台
230 longitudes: options.locations.split(",")[1], 241 longitudes: options.locations.split(",")[1],
231 id: options.id 242 id: options.id
232 }) 243 })
233 - console.log(this.data.latitudes, '11')  
234 - console.log(this.data.longitudes, '222') 244 + console.log(this.data.switchChecked)
235 // } 245 // }
236 246
237 }, 247 },
1 <!--pages/add-address/add-address.wxml--> 1 <!--pages/add-address/add-address.wxml-->
2 <view class="container"> 2 <view class="container">
3 <van-cell-group class="addContent"> 3 <van-cell-group class="addContent">
4 - <van-field value="{{ username }}" clearable label="姓名" icon="question-o" placeholder="请输入姓名" 4 + <van-field value="{{ username }}" clearable label="姓名" icon="question-o" placeholder="请输入姓名"
5 bind:click-icon="onClickIcon" bindinput="inputName" /> 5 bind:click-icon="onClickIcon" bindinput="inputName" />
6 <van-field value="{{ phone }}" label="电话" placeholder="请输入电话" bindinput="inputDel" bindblur="blurPhone" /> 6 <van-field value="{{ phone }}" label="电话" placeholder="请输入电话" bindinput="inputDel" bindblur="blurPhone" />
7 <!-- 地址 --> 7 <!-- 地址 -->
@@ -32,11 +32,14 @@ @@ -32,11 +32,14 @@
32 <view class="defaultAddress"> 32 <view class="defaultAddress">
33 <view class="defaultText">设为默认地址</view> 33 <view class="defaultText">设为默认地址</view>
34 <view class="switch"> 34 <view class="switch">
35 - <van-switch checked="{{ checked }}" bind:change="onChange" inactive-color="#d3d3d3" size="48rpx"  
36 - style="margin-left:-60rpx" /> 35 + <!-- <van-switch checked="{{checked}}" bind:change="onChange" inactive-color="#d3d3d3" size="48rpx"
  36 + style="margin-left:-60rpx" /> -->
  37 + <view class="body-view">
  38 + <switch checked="{{switchChecked}}" bindchange="switch1Change" />
  39 + </view>
37 </view> 40 </view>
38 </view> 41 </view>
39 <!-- 保存删除 --> 42 <!-- 保存删除 -->
40 <view class="save" bindtap="save">保存</view> 43 <view class="save" bindtap="save">保存</view>
41 - <view class="del" bindtap="delEvent" >删除</view> 44 + <view class="del" bindtap="delEvent">删除</view>
42 </view> 45 </view>
@@ -63,7 +63,6 @@ @@ -63,7 +63,6 @@
63 63
64 /* 默认地址 */ 64 /* 默认地址 */
65 .defaultAddress { 65 .defaultAddress {
66 - width: 750rpx;  
67 height: 88rpx; 66 height: 88rpx;
68 margin-top: 16rpx; 67 margin-top: 16rpx;
69 display: flex; 68 display: flex;
@@ -15,10 +15,14 @@ Page({ @@ -15,10 +15,14 @@ Page({
15 moreCount: '更多优惠', 15 moreCount: '更多优惠',
16 time: '', //限时优惠倒计时 16 time: '', //限时优惠倒计时
17 timeData: {}, 17 timeData: {},
  18 + hour: "",
  19 + minute: "",
  20 + second: "",
  21 + endTimess: '',
18 nowTimes: '', //获取当前时间戳 22 nowTimes: '', //获取当前时间戳
19 endTimes: "", 23 endTimes: "",
20 countDownShow: true, 24 countDownShow: true,
21 - discountArray: [], //每日特价 25 + discountArray: [], //每日特价
22 dayPrice: '每日特价', 26 dayPrice: '每日特价',
23 dayPriceShow: true, 27 dayPriceShow: true,
24 morePrice: '更多特价', 28 morePrice: '更多特价',
@@ -33,7 +37,8 @@ Page({ @@ -33,7 +37,8 @@ Page({
33 discountCartArray: [], 37 discountCartArray: [],
34 categoryId: '', 38 categoryId: '',
35 times: '', //每日特价倒计时 39 times: '', //每日特价倒计时
36 - timeDatas: {} 40 + timeDatas: {},
  41 + bottomHint:false //上拉触底
37 }, 42 },
38 43
39 //搜索 44 //搜索
@@ -52,18 +57,8 @@ Page({ @@ -52,18 +57,8 @@ Page({
52 } 57 }
53 }) 58 })
54 }, 59 },
55 - //限时优惠倒计时  
56 - onChange1(e) {  
57 - this.setData({  
58 - timeData: e.detail,  
59 - });  
60 - },  
61 - //每日特价倒计时  
62 - onChange2(e) {  
63 - this.setData({  
64 - timeDatas: e.detail,  
65 - });  
66 - }, 60 +
  61 +
67 // 点击进入轮播图详情 62 // 点击进入轮播图详情
68 goBannnerDetail(e) { 63 goBannnerDetail(e) {
69 let url = e.currentTarget.dataset.url; 64 let url = e.currentTarget.dataset.url;
@@ -102,12 +97,10 @@ Page({ @@ -102,12 +97,10 @@ Page({
102 t: {} 97 t: {}
103 } 98 }
104 method.postRequest('/goods/limitedTimeOffer', postData, data => { 99 method.postRequest('/goods/limitedTimeOffer', postData, data => {
105 - console.log(data, 'data')  
106 if (data.statusCode == 0) { 100 if (data.statusCode == 0) {
107 this.setData({ 101 this.setData({
108 discountArray: data.data 102 discountArray: data.data
109 }) 103 })
110 - console.log(this.data.discountArray)  
111 if (data.data.length <= 0) { 104 if (data.data.length <= 0) {
112 this.setData({ 105 this.setData({
113 limitCountShow: false 106 limitCountShow: false
@@ -116,18 +109,22 @@ Page({ @@ -116,18 +109,22 @@ Page({
116 } 109 }
117 }) 110 })
118 }, 111 },
119 - // 限时特惠倒计时 112 + onChange1(e) {
  113 + this.setData({
  114 + timeData: e.detail,
  115 + });
  116 + },
120 countDown() { 117 countDown() {
121 let startTime = null; 118 let startTime = null;
122 let endTime = null; 119 let endTime = null;
123 - let date = null;  
124 - let nowTimes = this.data.nowTimes 120 + // let date = null;
  121 + // let nowTimes = this.data.nowTimes
125 method.getRequest('/goods/getActivity', data => { 122 method.getRequest('/goods/getActivity', data => {
126 if (data.statusCode == 0) { 123 if (data.statusCode == 0) {
127 - startTime = Date.parse(data.data.startDate); 124 + startTime = new Date().getTime();
128 endTime = Date.parse(data.data.endDate); 125 endTime = Date.parse(data.data.endDate);
129 this.setData({ 126 this.setData({
130 - endTimes: endTime 127 + endTimess: endTime
131 }) 128 })
132 date = (Number(endTime) - Number(startTime)); 129 date = (Number(endTime) - Number(startTime));
133 if (Number(data.data.endTimes) < Number(data.data.nowTimes)) { 130 if (Number(data.data.endTimes) < Number(data.data.nowTimes)) {
@@ -142,6 +139,29 @@ Page({ @@ -142,6 +139,29 @@ Page({
142 } 139 }
143 }) 140 })
144 }, 141 },
  142 + //限时优惠倒计时
  143 + demoDown() {
  144 + this.setData({
  145 + timer: setInterval(() => {
  146 + let that = this;
  147 + // that.countDown();
  148 + let startTime = new Date().getTime();
  149 + let date = (Number(this.data.endTimess) - Number(startTime));
  150 + this.setData({
  151 + time: date
  152 + })
  153 + let downTime = Number(that.data.time);
  154 + var hour = parseInt(downTime / 1000 / 60 / 60) < 10 ? "0" + parseInt(downTime / 1000 / 60 / 60) : parseInt(downTime / 1000 / 60 / 60);
  155 + var minute = parseInt(downTime / 1000 / 60 % 60) < 10 ? "0" + parseInt(downTime / 1000 / 60 % 60) : parseInt(downTime / 1000 / 60 % 60)
  156 + var second = parseInt(downTime / 1000 % 60) < 10 ? "0" + parseInt(downTime / 1000 % 60) : parseInt(downTime / 1000 % 60)
  157 + this.setData({
  158 + hour: hour,
  159 + minute: minute,
  160 + second: second
  161 + })
  162 + }, 1000)
  163 + })
  164 + },
145 //每日特价倒计时 165 //每日特价倒计时
146 // 获取当前时间 166 // 获取当前时间
147 getCurrentDate(format) { 167 getCurrentDate(format) {
@@ -182,6 +202,11 @@ Page({ @@ -182,6 +202,11 @@ Page({
182 times: jieguo 202 times: jieguo
183 }) 203 })
184 }, 204 },
  205 + onChange2(e) {
  206 + this.setData({
  207 + timeDatas: e.detail,
  208 + });
  209 + },
185 //更多优惠 210 //更多优惠
186 moreCount() { 211 moreCount() {
187 wx.switchTab({ 212 wx.switchTab({
@@ -245,7 +270,7 @@ Page({ @@ -245,7 +270,7 @@ Page({
245 }) 270 })
246 if (data.data.length == 0) { 271 if (data.data.length == 0) {
247 this.setData({ 272 this.setData({
248 - dayPriceShow:false 273 + dayPriceShow: false
249 }) 274 })
250 } 275 }
251 } 276 }
@@ -282,7 +307,6 @@ Page({ @@ -282,7 +307,6 @@ Page({
282 }) 307 })
283 }, 308 },
284 309
285 -  
286 // 弹出优惠券领取 310 // 弹出优惠券领取
287 getCard() { 311 getCard() {
288 method.getRequest("/myUser/get", data => { 312 method.getRequest("/myUser/get", data => {
@@ -435,7 +459,11 @@ Page({ @@ -435,7 +459,11 @@ Page({
435 that.dataRequest(); 459 that.dataRequest();
436 that.countDown(); 460 that.countDown();
437 that.oneDataRequest(); 461 that.oneDataRequest();
438 - that.discountList() 462 + that.discountList();
  463 + // setTimeout(() => {
  464 + // that.demoDown();
  465 + // }, 300)
  466 +
439 }, 467 },
440 468
441 /** 469 /**
@@ -451,6 +479,9 @@ Page({ @@ -451,6 +479,9 @@ Page({
451 onShow: function () { 479 onShow: function () {
452 this.dayCountDown(); 480 this.dayCountDown();
453 this.getName(); //九月主推 481 this.getName(); //九月主推
  482 + setTimeout(() => {
  483 + this.demoDown();
  484 + }, 200)
454 }, 485 },
455 486
456 /** 487 /**
@@ -478,7 +509,14 @@ Page({ @@ -478,7 +509,14 @@ Page({
478 * 页面上拉触底事件的处理函数 509 * 页面上拉触底事件的处理函数
479 */ 510 */
480 onReachBottom: function () { 511 onReachBottom: function () {
481 - 512 + this.setData({
  513 + bottomHint:true
  514 + })
  515 + setTimeout(()=>{
  516 + this.setData({
  517 + bottomHint:false
  518 + })
  519 + },2000)
482 }, 520 },
483 521
484 /** 522 /**
@@ -6,5 +6,6 @@ @@ -6,5 +6,6 @@
6 "van-popup": "@vant/weapp/popup/index", 6 "van-popup": "@vant/weapp/popup/index",
7 "van-count-down": "@vant/weapp/count-down/index" 7 "van-count-down": "@vant/weapp/count-down/index"
8 }, 8 },
9 - "navigationBarTitleText": "首页" 9 + "navigationBarTitleText": "首页",
  10 + "navigationStyle": "custom"
10 } 11 }
@@ -37,13 +37,18 @@ @@ -37,13 +37,18 @@
37 <view class="limitCount">{{limitCount}}</view> 37 <view class="limitCount">{{limitCount}}</view>
38 <!-- 倒计时 --> 38 <!-- 倒计时 -->
39 <view class="countTime" wx:if="{{countDownShow}}"> 39 <view class="countTime" wx:if="{{countDownShow}}">
40 - <van-count-down use-slot time="{{ time }}" bind:change="onChange1"> 40 + <view class="textss">{{hour}}</view>
  41 + <view class="maohao">:</view>
  42 + <view class="textss">{{minute}}</view>
  43 + <view class="maohao">:</view>
  44 + <view class="textss">{{second}}</view>
  45 + <!-- <van-count-down use-slot time="{{ time }}" bind:change="onChange1">
41 <text class="item">{{ timeData.hours }}</text> 46 <text class="item">{{ timeData.hours }}</text>
42 <text style="color:#FF593C">:</text> 47 <text style="color:#FF593C">:</text>
43 <text class="item">{{ timeData.minutes }}</text> 48 <text class="item">{{ timeData.minutes }}</text>
44 <text style="color:#FF593C">:</text> 49 <text style="color:#FF593C">:</text>
45 <text class="item">{{ timeData.seconds }}</text> 50 <text class="item">{{ timeData.seconds }}</text>
46 - </van-count-down> 51 + </van-count-down> -->
47 </view> 52 </view>
48 <view class="moreCount" bindtap="moreCount">{{moreCount}}</view> 53 <view class="moreCount" bindtap="moreCount">{{moreCount}}</view>
49 <view class="arrow" bindtap="moreCount"></view> 54 <view class="arrow" bindtap="moreCount"></view>
@@ -68,7 +73,7 @@ @@ -68,7 +73,7 @@
68 </view> 73 </view>
69 <!-- 每日特价 --> 74 <!-- 每日特价 -->
70 <view class="dayPriceContent"> 75 <view class="dayPriceContent">
71 - <view class="dayPrice" wx:if="{{dayPriceShow}}"> 76 + <view class="dayPrice">
72 <view class="dayPriceTitle"> 77 <view class="dayPriceTitle">
73 <view class="dayPriceText">{{dayPrice}}</view> 78 <view class="dayPriceText">{{dayPrice}}</view>
74 <view class="dayPriceTime"> 79 <view class="dayPriceTime">
@@ -133,24 +138,29 @@ @@ -133,24 +138,29 @@
133 <van-popup show="{{show}}" bind:close="onClose"> 138 <van-popup show="{{show}}" bind:close="onClose">
134 <view class="popupBox"> 139 <view class="popupBox">
135 <view class="delIcon" bindtap="onClose"> 140 <view class="delIcon" bindtap="onClose">
136 - <image src="/images/01-02/quxiao.png"></image> 141 + <image src="/images/icon_close@2x.png"></image>
137 </view> 142 </view>
138 <view class="popupPic"> 143 <view class="popupPic">
139 <image src="/images/popup.png"></image> 144 <image src="/images/popup.png"></image>
140 </view> 145 </view>
141 <view> 146 <view>
142 <view class="popupText"> 实名优惠活动券</view> 147 <view class="popupText"> 实名优惠活动券</view>
143 - <view class="popupImg" wx:for="{{discountCartArray}}" wx:if="{{item.status}}">  
144 - <view class="left"></view>  
145 - <view class="right"></view>  
146 - <view class="popupNamePic">{{item.name}}</view>  
147 - <view class="popupPriceBox">  
148 - <view class="popupIcon">￥</view>  
149 - <view class="popupPrice">{{item.amount}}</view> 148 + <view class="discountBox">
  149 + <view class="popupImg" wx:for="{{discountCartArray}}" wx:if="{{item.status}}">
  150 + <view class="left"></view>
  151 + <view class="right"></view>
  152 + <view class="popupNamePic">{{item.name}}</view>
  153 + <view class="popupPriceBox">
  154 + <view class="popupIcon">￥</view>
  155 + <view class="popupPrice">{{item.amount}}</view>
  156 + </view>
150 </view> 157 </view>
151 </view> 158 </view>
152 <view class="popupBtn" bindtap="getDiscountCart">立即领取</view> 159 <view class="popupBtn" bindtap="getDiscountCart">立即领取</view>
153 </view> 160 </view>
154 </view> 161 </view>
155 </van-popup> 162 </van-popup>
  163 +</view>
  164 +<view class="bottomHint" wx:if="{{bottomHint}}">
  165 + 我是有底线的~
156 </view> 166 </view>
@@ -80,7 +80,7 @@ @@ -80,7 +80,7 @@
80 } 80 }
81 81
82 .classifyItem { 82 .classifyItem {
83 - width: 156rpx; 83 + width: 146rpx;
84 display: inline-block; 84 display: inline-block;
85 } 85 }
86 86
@@ -130,12 +130,33 @@ @@ -130,12 +130,33 @@
130 } 130 }
131 131
132 .countTime { 132 .countTime {
133 - display: inline-block;  
134 - width: 192rpx; 133 + display:flex;
  134 + /* width: 192rpx; */
135 /* background-color: #9b74fb; */ 135 /* background-color: #9b74fb; */
136 height: 40rpx; 136 height: 40rpx;
137 margin-left: -20rpx; 137 margin-left: -20rpx;
138 } 138 }
  139 +.countTime .maohao{
  140 + color: #ff593c;
  141 + width: 20rpx;
  142 + display: flex;
  143 + align-items: center;
  144 + justify-content: center;
  145 + padding-bottom: 10rpx;
  146 +}
  147 +.countTime .textss {
  148 + width: 40rpx;
  149 + height: 40rpx;
  150 + background: #ff593c;
  151 + border-radius: 8rpx;
  152 + font-size: 26rpx;
  153 + color: #ffffff;
  154 + display: inline-block;
  155 + display: flex;
  156 + justify-content: center;
  157 + padding-top: 3rpx;
  158 + box-sizing: border-box;
  159 +}
139 160
140 .item { 161 .item {
141 display: inline-block; 162 display: inline-block;
@@ -220,6 +241,7 @@ @@ -220,6 +241,7 @@
220 font-size: 28rpx; 241 font-size: 28rpx;
221 margin-top: 4rpx; 242 margin-top: 4rpx;
222 overflow: hidden; 243 overflow: hidden;
  244 + text-overflow: ellipsis;
223 } 245 }
224 246
225 .countPrice { 247 .countPrice {
@@ -501,13 +523,13 @@ @@ -501,13 +523,13 @@
501 width: 40rpx; 523 width: 40rpx;
502 height: 40rpx; 524 height: 40rpx;
503 position: absolute; 525 position: absolute;
504 - top: 0;  
505 - right: 0; 526 + top: 20rpx;
  527 + right: 26rpx;
506 } 528 }
507 529
508 .delIcon image { 530 .delIcon image {
509 - width: 40rpx;  
510 - height: 40rpx; 531 + width: 50rpx;
  532 + height: 50rpx;
511 } 533 }
512 534
513 .popupBox { 535 .popupBox {
@@ -536,7 +558,10 @@ @@ -536,7 +558,10 @@
536 color: #ffffff; 558 color: #ffffff;
537 margin-top: 24rpx; 559 margin-top: 24rpx;
538 } 560 }
539 - 561 +.discountBox{
  562 + max-height: 350rpx;
  563 + overflow: auto;
  564 +}
540 .popupImg { 565 .popupImg {
541 width: 540rpx; 566 width: 540rpx;
542 height: 148rpx; 567 height: 148rpx;
@@ -605,4 +630,11 @@ @@ -605,4 +630,11 @@
605 justify-content: center; 630 justify-content: center;
606 align-items: center; 631 align-items: center;
607 margin-top: 24rpx; 632 margin-top: 24rpx;
  633 +}
  634 +.bottomHint{
  635 + background-color: #f1f2f4;
  636 + font-size: 24rpx;
  637 + color: gray;
  638 + display: flex;
  639 + justify-content: center;
608 } 640 }
1 <!--index.wxml--> 1 <!--index.wxml-->
2 -<view class="storeLogo">  
3 - <image src=""></image>  
4 -</view>  
5 -<view class="storeName">  
6 - 掌上商城 2 +<view class="container">
  3 +<view class="top">
  4 + <view class="storeLogo">
  5 + <image src=""></image>
  6 + </view>
  7 + <view class="storeName">
  8 + 掌上商城
  9 + </view>
  10 + <button open-type="getUserInfo" bindgetuserinfo="bindGetUserInfo">授权登录</button>
7 </view> 11 </view>
8 - <button open-type="getUserInfo" bindgetuserinfo="bindGetUserInfo" >授权登录</button>  
9 -<view class="hint">  
10 - <view class="hintTop">用心服务于人民 严格要求保证质量</view>  
11 - <view class="hintBottom">  
12 - 做到货真价实 诚信经营 诚信合作 12 +<view class="bottom">
  13 + <view class="hint">
  14 + <view class="hintTop">用心服务于人民 严格要求保证质量</view>
  15 + <view class="hintBottom">
  16 + 做到货真价实 诚信经营 诚信合作
  17 + </view>
13 </view> 18 </view>
14 -  
15 -  
16 - 19 +</view>
17 </view> 20 </view>
1 /**index.wxss**/ 1 /**index.wxss**/
2 -.container{  
3 - width: 100%;  
4 - height: 100%;  
5 -}  
6 .storeLogo { 2 .storeLogo {
7 width: 200rpx; 3 width: 200rpx;
8 height: 200rpx; 4 height: 200rpx;
9 border-radius: 34px; 5 border-radius: 34px;
10 background: #719df0; 6 background: #719df0;
11 margin: 0 auto; 7 margin: 0 auto;
12 - margin-top: 240rpx;  
13 } 8 }
14 9
15 .storeName { 10 .storeName {
@@ -36,5 +31,20 @@ @@ -36,5 +31,20 @@
36 line-height: 42rpx; 31 line-height: 42rpx;
37 letter-spacing: 1rpx; 32 letter-spacing: 1rpx;
38 margin: 0 auto; 33 margin: 0 auto;
39 - margin-top: 726rpx; 34 +}
  35 +.container{
  36 + width: 100%;
  37 + height: 100%;
  38 + padding-top: 240rpx;
  39 + box-sizing: border-box;
  40 +}
  41 +.top{
  42 + width: 100%;
  43 + height: 80%;
  44 + justify-content: center;
  45 +}
  46 +.bottom{
  47 + width: 100%;
  48 + height: 20%;
  49 + justify-content: center;
40 } 50 }
@@ -3,18 +3,11 @@ let method = require("../../utils/reuqest.js"); @@ -3,18 +3,11 @@ let method = require("../../utils/reuqest.js");
3 const util = require("../../utils/util.js"); 3 const util = require("../../utils/util.js");
4 Page({ 4 Page({
5 data: { 5 data: {
6 - userData: {  
7 - address: '请选择收货地址'  
8 - }, 6 + userData: "",
9 data: '', //配送时间 7 data: '', //配送时间
10 startTime: '', 8 startTime: '',
11 // endTime: '', 9 // endTime: '',
12 - cartList: [{  
13 - url: '/images/1.jpg',  
14 - name: '鲜切泰国桃子',  
15 - detail: '果肉饱满，香甜可口',  
16 - price: '25'  
17 - }], 10 + cartList: [],
18 goodsData: '', 11 goodsData: '',
19 show: false, 12 show: false,
20 currentDate: '12:00', 13 currentDate: '12:00',
@@ -97,8 +90,9 @@ Page({ @@ -97,8 +90,9 @@ Page({
97 let index = wx.getStorageSync('addIndex') 90 let index = wx.getStorageSync('addIndex')
98 method.getRequest("/address", data => { 91 method.getRequest("/address", data => {
99 if (data.statusCode == 0) { 92 if (data.statusCode == 0) {
  93 + let list=data.data.reverse();
100 this.setData({ 94 this.setData({
101 - userData: data.data[index], 95 + userData: list[index],
102 }) 96 })
103 } 97 }
104 }) 98 })
@@ -140,6 +134,7 @@ Page({ @@ -140,6 +134,7 @@ Page({
140 this.setData({ 134 this.setData({
141 goodsData: data.data 135 goodsData: data.data
142 }) 136 })
  137 + console.log(this.data.goodsData,'goods')
143 } 138 }
144 }) 139 })
145 }, 140 },
@@ -197,6 +192,12 @@ Page({ @@ -197,6 +192,12 @@ Page({
197 }, 192 },
198 //商品-生成订单 193 //商品-生成订单
199 creatOrder() { 194 creatOrder() {
  195 + if(this.data.userData==undefined){
  196 + wx.showToast({
  197 + title: '请选择收货地址',
  198 + icon:'none'
  199 + })
  200 + }
200 let postData = { 201 let postData = {
201 addressId: this.data.userData.id, 202 addressId: this.data.userData.id,
202 couponId: "", 203 couponId: "",
@@ -266,6 +267,7 @@ Page({ @@ -266,6 +267,7 @@ Page({
266 skuId: defaultSku 267 skuId: defaultSku
267 }) 268 })
268 this.getAddress() 269 this.getAddress()
  270 +
269 }, 271 },
270 272
271 /** 273 /**
@@ -279,7 +281,7 @@ Page({ @@ -279,7 +281,7 @@ Page({
279 * 生命周期函数--监听页面显示 281 * 生命周期函数--监听页面显示
280 */ 282 */
281 onShow: function () { 283 onShow: function () {
282 - this.getList(); 284 + // this.getList();
283 this.getAddress(); 285 this.getAddress();
284 this.getDayTime(); //配送时间 获取当天时间 286 this.getDayTime(); //配送时间 获取当天时间
285 }, 287 },
1 <!--pages/affirm-order/affirm-order.wxml--> 1 <!--pages/affirm-order/affirm-order.wxml-->
2 <view class="container"> 2 <view class="container">
3 <!-- 地址 --> 3 <!-- 地址 -->
4 - <view class="address" bindtap="emit">  
5 - <view class="userName">{{userData.name}}</view>  
6 - <view class="userTell">{{userData.phone}}</view>  
7 - <view class="default" wx:if="{{userData.delFlag==1}}">默认</view>  
8 - <view class="userAddress">{{userData.area}}{{userData.address}}</view> 4 + <view class="address" bindtap="emit">
  5 + <view class="address_content_left">
  6 + <view>
  7 + <view class="userName">{{userData.name}}</view>
  8 + <view class="userTell">{{userData.phone}}</view>
  9 + <view class="default" wx:if="{{userData.delFlag==1}}">默认</view>
  10 + </view>
  11 + <view class="userAddress">{{userData.area}}{{userData.address}}</view>
  12 + </view>
  13 + <view wx:if="{{userData==''}}" class="noAdd">
  14 + 请选择收货地址
  15 + </view>
9 <view class="arrow"> 16 <view class="arrow">
10 <image src="/images/04-01/arrow.png"></image> 17 <image src="/images/04-01/arrow.png"></image>
11 </view> 18 </view>
12 </view> 19 </view>
13 <!-- 配送时间 --> 20 <!-- 配送时间 -->
14 <view class="timeBox"> 21 <view class="timeBox">
15 - <!-- <view class="text" bindtap="selectTime">  
16 - <view class="startTime">  
17 - <picker mode="time" value="{{startTime}}" start="09:01" end="21:01" bindchange="bindStartTimeChange">  
18 - <view class="picker">  
19 - 请选择配送时间：{{startTime}}  
20 - </view>  
21 - </picker>  
22 - </view>  
23 - <view class="endTime">  
24 - <picker mode="time" value="{{endTime}}" start="09:01" end="21:01" bindchange="bindEndTimeChange">  
25 - <view class="pickerEndTime">  
26 - -  
27 - {{endTime}}  
28 - </view>  
29 - </picker>  
30 - </view>  
31 - </view> -->  
32 <view class="section"> 22 <view class="section">
33 - <picker mode="date" value="{{date}}" start="{{startTime}}" bindchange="bindDateChange"> 23 + <picker mode="date" value="{{date}}" start="{{startTime}}" bindchange="bindDateChange">
34 <view class="picker"> 24 <view class="picker">
35 配送时间: {{date}} 25 配送时间: {{date}}
36 </view> 26 </view>
@@ -39,13 +29,8 @@ @@ -39,13 +29,8 @@
39 </view> 29 </view>
40 <!-- 商品列表 --> 30 <!-- 商品列表 -->
41 <view class="cartList"> 31 <view class="cartList">
42 - <view class="cartListItem" wx:for="{{cartList}}">  
43 - <!-- <view class="itemLeft">  
44 - <view data-type="{{checkType}}" bindtap="checkEvent" data-index="{{index}}">  
45 - <image src="/images/04-01/uncheck.png" wx:if="{{checkType==1}}"></image>  
46 - <image src="/images/04-01/check.png" wx:if="{{checkType==0}}"></image>  
47 - </view>  
48 - </view> --> 32 + <!-- <view class="cartListItem" wx:for="{{cartList}}"> -->
  33 + <view class="cartListItem">
49 <view class="itemRight"> 34 <view class="itemRight">
50 <view class="productPic"> 35 <view class="productPic">
51 <image src="{{goodsData.goodsImg}}"></image> 36 <image src="{{goodsData.goodsImg}}"></image>
@@ -56,13 +41,6 @@ @@ -56,13 +41,6 @@
56 <view class="productPrice"> 41 <view class="productPrice">
57 <view class="price">￥{{goodsData.goodsPrice}}</view> 42 <view class="price">￥{{goodsData.goodsPrice}}</view>
58 <view class="num"> 43 <view class="num">
59 - <!-- <view class="reduce" catchtap="dec">  
60 - <image src="/images/04-01/reduce.png"></image>  
61 - </view>  
62 - <view class="numContent">{{count}}</view>  
63 - <view class="add" catchtap="add">  
64 - <image src="/images/04-01/add.png"></image>  
65 - </view> -->  
66 <view>X{{count}}</view> 44 <view>X{{count}}</view>
67 </view> 45 </view>
68 </view> 46 </view>
@@ -73,7 +51,8 @@ @@ -73,7 +51,8 @@
73 <!-- 买家留言 --> 51 <!-- 买家留言 -->
74 <view class="messageBox"> 52 <view class="messageBox">
75 <view class="messageTitle">买家留言:</view> 53 <view class="messageTitle">买家留言:</view>
76 - <textarea name="" id="" cols="30" rows="10" value="{{content}}" placeholder="留言建议提前协商50字之内" maxlength="50" bindinput="userInput"></textarea> 54 + <textarea name="" id="" cols="30" rows="10" value="{{content}}" placeholder="留言建议提前协商50字之内" maxlength="50"
  55 + bindinput="userInput"></textarea>
77 <view class="numLength">{{length}}/50</view> 56 <view class="numLength">{{length}}/50</view>
78 </view> 57 </view>
79 <!-- 优惠券 --> 58 <!-- 优惠券 -->
@@ -9,17 +9,25 @@ @@ -9,17 +9,25 @@
9 margin-bottom: 130rpx; 9 margin-bottom: 130rpx;
10 } 10 }
11 11
  12 +
12 /* 地址 */ 13 /* 地址 */
  14 +.noAdd {
  15 + width: 300rpx;
  16 + position: absolute;
  17 + top: 76rpx;
  18 + font-weight: 600;
  19 + font-size: 32rpx;
  20 + color: #323233;
  21 +}
  22 +
13 .address { 23 .address {
14 - width: 686rpx;  
15 - /* height: 200rpx; */  
16 - background-color: #ffffff;  
17 - margin: 0 auto; 24 + width: 90%;
  25 + margin-left: 5%;
  26 + background: #fff;
18 border-radius: 16rpx; 27 border-radius: 16rpx;
19 - padding: 32rpx 28rpx 32rpx 36rpx; 28 + display: flex;
  29 + padding: 32rpx 0 32rpx 32rpx;
20 box-sizing: border-box; 30 box-sizing: border-box;
21 - position: relative;  
22 -  
23 } 31 }
24 32
25 .userName { 33 .userName {
@@ -67,15 +75,14 @@ @@ -67,15 +75,14 @@
67 text-align: left; 75 text-align: left;
68 color: #6c6c6d; 76 color: #6c6c6d;
69 line-height: 40rpx; 77 line-height: 40rpx;
70 - margin-top: 16rpx; 78 + margin-top: 12rpx;
71 } 79 }
72 80
73 .arrow { 81 .arrow {
74 - width: 32rpx;  
75 - height: 32rpx;  
76 - position: absolute;  
77 - top: 65rpx;  
78 - left: 626rpx; 82 + width: 15%;
  83 + display: flex;
  84 + align-items: center;
  85 + justify-content: center;
79 } 86 }
80 87
81 .arrow image { 88 .arrow image {
@@ -3,6 +3,7 @@ let method = require("../../utils/reuqest.js") @@ -3,6 +3,7 @@ let method = require("../../utils/reuqest.js")
3 let list = []; 3 let list = [];
4 Page({ 4 Page({
5 data: { 5 data: {
  6 + orderId:'', //订单id
6 postData: { 7 postData: {
7 name: '泰国桃子', 8 name: '泰国桃子',
8 detail: '果肉饱满，香甜可口', 9 detail: '果肉饱满，香甜可口',
@@ -35,7 +36,12 @@ Page({ @@ -35,7 +36,12 @@ Page({
35 ], 36 ],
36 list:[] 37 list:[]
37 }, 38 },
38 - 39 + //申请退款
  40 + refund(){
  41 + wx.redirectTo({
  42 + url: '/pages/apply-after-sale/apply-after-sale?orderid='+this.data.orderId,
  43 + })
  44 + },
39 /** 45 /**
40 * 生命周期函数--监听页面加载 46 * 生命周期函数--监听页面加载
41 */ 47 */
@@ -48,6 +54,7 @@ Page({ @@ -48,6 +54,7 @@ Page({
48 if (data.statusCode == 0) { 54 if (data.statusCode == 0) {
49 this.setData({ 55 this.setData({
50 postData: data.data, 56 postData: data.data,
  57 + orderId:options.orderId,
51 //dataVoList: JSON.parse(JSON.stringify((data.data.dataVoList).Traces).replace(/AcceptStation/g,'desc')), 58 //dataVoList: JSON.parse(JSON.stringify((data.data.dataVoList).Traces).replace(/AcceptStation/g,'desc')),
52 dataVoList: JSON.parse(data.data.dataVoList).Traces 59 dataVoList: JSON.parse(data.data.dataVoList).Traces
53 }) 60 })
@@ -47,7 +47,7 @@ @@ -47,7 +47,7 @@
47 </van-steps> 47 </van-steps>
48 </view> 48 </view>
49 <!-- bottom --> 49 <!-- bottom -->
50 - <view class="bottomBox"> 50 + <view class="bottomBox" bindtap="refund">
51 <view class="btn">申请退款</view> 51 <view class="btn">申请退款</view>
52 </view> 52 </view>
53 </view> 53 </view>
@@ -6,30 +6,30 @@ Page({ @@ -6,30 +6,30 @@ Page({
6 list: [], 6 list: [],
7 }, 7 },
8 //商品详情 8 //商品详情
9 - goDetail(e){  
10 - let goodsId=e.currentTarget.dataset.goodid;  
11 - console.log(e,'e')  
12 - console.log(goodsId,'goodsi')  
13 - wx.navigateTo({  
14 - url: '/pages/product-detail/product-detail?id='+goodsId,  
15 - }) 9 + goDetail(e) {
  10 + let goodsId = e.currentTarget.dataset.goodid;
  11 + console.log(e, 'e')
  12 + console.log(goodsId, 'goodsi')
  13 + wx.navigateTo({
  14 + url: '/pages/product-detail/product-detail?id=' + goodsId,
  15 + })
16 }, 16 },
17 //删除 17 //删除
18 - del(e){  
19 - let that=this; 18 + del(e) {
  19 + let that = this;
20 wx.showModal({ 20 wx.showModal({
21 title: '提示', 21 title: '提示',
22 content: '确定取消收藏该商品吗？', 22 content: '确定取消收藏该商品吗？',
23 - success (res) { 23 + success(res) {
24 if (res.confirm) { 24 if (res.confirm) {
25 - that.handleDeleteProduct(e,that)//这是啥在哪出来的，没有这个方法没这个方法获取不到 25 + that.handleDeleteProduct(e, that) //这是啥在哪出来的，没有这个方法没这个方法获取不到
26 } else if (res.cancel) { 26 } else if (res.cancel) {
27 - 27 +
28 } 28 }
29 } 29 }
30 }) 30 })
31 }, 31 },
32 - handleDeleteProduct: function (e,that) { 32 + handleDeleteProduct: function (e, that) {
33 let list = that.data.list; 33 let list = that.data.list;
34 let idx = e.currentTarget.dataset.delindex; 34 let idx = e.currentTarget.dataset.delindex;
35 let id = e.currentTarget.dataset.id 35 let id = e.currentTarget.dataset.id
@@ -53,6 +53,7 @@ Page({ @@ -53,6 +53,7 @@ Page({
53 pageSize: 10, 53 pageSize: 10,
54 } 54 }
55 method.postRequest("/myUser/myCollection", postData, data => { 55 method.postRequest("/myUser/myCollection", postData, data => {
  56 + wx.stopPullDownRefresh()
56 if (data.statusCode == 0) { 57 if (data.statusCode == 0) {
57 this.setData({ 58 this.setData({
58 list: data.data 59 list: data.data
@@ -96,15 +97,29 @@ Page({ @@ -96,15 +97,29 @@ Page({
96 /** 97 /**
97 * 页面相关事件处理函数--监听用户下拉动作 98 * 页面相关事件处理函数--监听用户下拉动作
98 */ 99 */
  100 + onRefresh() {
  101 + this.setData({
  102 + page:1,
  103 + list:[]
  104 + })
  105 + this.getCollect();
  106 + },
99 onPullDownRefresh: function () { 107 onPullDownRefresh: function () {
100 - 108 + this.onRefresh()
101 }, 109 },
102 110
103 /** 111 /**
104 * 页面上拉触底事件的处理函数 112 * 页面上拉触底事件的处理函数
105 */ 113 */
106 onReachBottom: function () { 114 onReachBottom: function () {
107 - 115 + this.setData({
  116 + bottomHint: true
  117 + })
  118 + setTimeout(() => {
  119 + this.setData({
  120 + bottomHint: false
  121 + })
  122 + }, 2000)
108 }, 123 },
109 124
110 /** 125 /**
@@ -2,5 +2,6 @@ @@ -2,5 +2,6 @@
2 "usingComponents": { 2 "usingComponents": {
3 "van-card": "@vant/weapp/card/index" 3 "van-card": "@vant/weapp/card/index"
4 }, 4 },
5 - "navigationBarTitleText": "我的收藏" 5 + "navigationBarTitleText": "我的收藏",
  6 + "enablePullDownRefresh": true
6 } 7 }
1 <!--pages/my-collect/my-collect.wxml--> 1 <!--pages/my-collect/my-collect.wxml-->
2 <view class="container"> 2 <view class="container">
3 <view class="main"> 3 <view class="main">
4 - <view class="main_item" wx:for="{{list}}" data-index="{{index}}" catchtap="goDetail" data-goodid="{{item. goodsId}}"> 4 + <view class="main_item" wx:for="{{list}}" data-index="{{index}}" catchtap="goDetail"
  5 + data-goodid="{{item. goodsId}}">
5 <movable-area> 6 <movable-area>
6 <movable-view damping="100" direction="horizontal" x="{{x}}" animation="false" bindchange="handleMovableChange" 7 <movable-view damping="100" direction="horizontal" x="{{x}}" animation="false" bindchange="handleMovableChange"
7 capture-bind:touchstart="handleTouchestart" capture-bind:touchend="handleTouchend"> 8 capture-bind:touchstart="handleTouchestart" capture-bind:touchend="handleTouchend">
8 - <view class="main_item_content " > 9 + <view class="main_item_content ">
9 <!-- <van-card num="{{item.num}}" price="{{item.goodsPrice}}" desc="{{item.goodsAttributes}}" title="{{item.goodsName}}" thumb="{{item.goodsImg}}" /> --> 10 <!-- <van-card num="{{item.num}}" price="{{item.goodsPrice}}" desc="{{item.goodsAttributes}}" title="{{item.goodsName}}" thumb="{{item.goodsImg}}" /> -->
10 <view class="left"> 11 <view class="left">
11 <image src="{{item.goodsImg}}"></image> 12 <image src="{{item.goodsImg}}"></image>
@@ -20,8 +21,18 @@ @@ -20,8 +21,18 @@
20 </movable-area> 21 </movable-area>
21 <view class="delete_btn "> 22 <view class="delete_btn ">
22 <view class="delete_mask" data-delIndex="{{index}} " catchtap="del" data-id="{{item.id}}">删除</view> 23 <view class="delete_mask" data-delIndex="{{index}} " catchtap="del" data-id="{{item.id}}">删除</view>
23 - <view class="delete_btn " data-delIndex="{{index}} " data-id="{{item.id}}">删除</view> 24 + <view class="delete_btn " data-delIndex="{{index}} " data-id="{{item.id}}">删除</view>
24 </view> 25 </view>
25 </view> 26 </view>
  27 + <view class="bottomHint" wx:if="{{bottomHint}}">
  28 + 我是有底线的~
  29 +</view>
  30 + <view wx:if="{{list.length==0}}" class="noDataBox">
  31 + <view class="noDataPic">
  32 + <image src="/images/message@2x.png"></image>
  33 + </view>
  34 + <view class="noDataText">这里已经空空如也~</view>
  35 +
  36 + </view>
26 </view> 37 </view>
27 -</view>  
  38 +</view>
@@ -143,4 +143,32 @@ movable-view { @@ -143,4 +143,32 @@ movable-view {
143 position: absolute; 143 position: absolute;
144 bottom: 68rpx; 144 bottom: 68rpx;
145 left: 0; 145 left: 0;
  146 +}
  147 +/* 没有收藏商品 */
  148 +.noDataBox{
  149 + margin-top: 200rpx;
  150 +}
  151 +.noDataPic{
  152 + width: 200rpx;
  153 + height: 200rpx;
  154 + margin: 0 auto;
  155 +}
  156 +.noDataPic image{
  157 + width: 200rpx;
  158 + height: 200rpx;
  159 +}
  160 +.noDataText{
  161 + width: 750rpx;
  162 + display: flex;
  163 + align-items: center;
  164 + justify-content: center;
  165 + font-size: 28rpx;
  166 + color: #8e8e8e;
  167 +}
  168 +.bottomHint{
  169 + font-size: 24rpx;
  170 + color: gray;
  171 + display: flex;
  172 + justify-content: center;
  173 + padding-bottom: 10rpx;
146 } 174 }
@@ -38,7 +38,7 @@ @@ -38,7 +38,7 @@
38 </view> 38 </view>
39 <!-- 会员卡详情 --> 39 <!-- 会员卡详情 -->
40 <view class="cardDetail" wx:if="{{vip}}"> 40 <view class="cardDetail" wx:if="{{vip}}">
41 - <image src="/images/card.png" mode="widthFix"></image> 41 + <image src="/images/card.png" ></image>
42 <!-- content --> 42 <!-- content -->
43 <view class="cardBox"> 43 <view class="cardBox">
44 <view class="headPic"> 44 <view class="headPic">
1 /* pages/my-member/my-member.wxss */ 1 /* pages/my-member/my-member.wxss */
2 .topLine { 2 .topLine {
3 - width: 750px; 3 + width: 100%;
4 height: 2rpx; 4 height: 2rpx;
5 background: #f2f2f2; 5 background: #f2f2f2;
6 } 6 }
@@ -144,13 +144,14 @@ @@ -144,13 +144,14 @@
144 144
145 /* 会员卡详情 */ 145 /* 会员卡详情 */
146 .cardDetail { 146 .cardDetail {
147 - width: 750rpx;  
148 - height: 1448rpx; 147 + width: 100%;
  148 + height: 100%;
  149 + overflow: hidden;
149 } 150 }
150 151
151 .cardDetail image { 152 .cardDetail image {
152 - width: 750rpx;  
153 - height: 1448rpx; 153 + width: 100%;
  154 + height: 100%;
154 } 155 }
155 156
156 .cardBox { 157 .cardBox {
@@ -239,4 +240,11 @@ @@ -239,4 +240,11 @@
239 display: flex; 240 display: flex;
240 align-items: center; 241 align-items: center;
241 justify-content: center; 242 justify-content: center;
  243 +}
  244 +.bottomHint{
  245 + font-size: 24rpx;
  246 + color: gray;
  247 + display: flex;
  248 + justify-content: center;
  249 + padding-bottom: 10rpx;
242 } 250 }
@@ -2,24 +2,13 @@ @@ -2,24 +2,13 @@
2 let method = require("../../utils/reuqest.js") 2 let method = require("../../utils/reuqest.js")
3 Page({ 3 Page({
4 data: { 4 data: {
  5 + flag:false, //判断是否为退款订单
  6 + refoundStatus:'',
5 goodsId:'', 7 goodsId:'',
6 userData: { 8 userData: {
7 - name: '陈先生',  
8 - tell: '12345678910',  
9 - address: '天津市南开区阳光100'  
10 }, 9 },
11 requestData: {}, 10 requestData: {},
12 - cartList: [{  
13 - url: '/images/1.jpg',  
14 - name: '鲜切泰国桃子',  
15 - detail: '果肉饱满，香甜可口',  
16 - price: '25'  
17 - }, {  
18 - url: '/images/1.jpg',  
19 - name: '鲜切泰国桃子',  
20 - detail: '果肉饱满，香甜可口',  
21 - price: '250'  
22 - }], 11 + cartList: [],
23 num: '2222', 12 num: '2222',
24 discountText: '满3减1满3减1', 13 discountText: '满3减1满3减1',
25 allMoney: '4.00', 14 allMoney: '4.00',
@@ -36,8 +25,14 @@ Page({ @@ -36,8 +25,14 @@ Page({
36 if (data.statusCode == 0) { 25 if (data.statusCode == 0) {
37 this.setData({ 26 this.setData({
38 requestData:data.data, 27 requestData:data.data,
39 - goodsId:data.data.listGoodsVoList[0].goodsId 28 + goodsId:data.data.listGoodsVoList[0].goodsId,
  29 + // refoundStatus:this.data.requestData.returnVos[0].status
40 }) 30 })
  31 + let status=this.data.requestData.returnVos[0].status
  32 + this.setData({
  33 + refoundStatus:status
  34 + })
  35 + console.log(this.data.requestData.returnVos[0].status)
41 } 36 }
42 }) 37 })
43 }, 38 },
@@ -53,6 +48,11 @@ Page({ @@ -53,6 +48,11 @@ Page({
53 */ 48 */
54 onLoad: function (options) { 49 onLoad: function (options) {
55 let orderId = options.orderId 50 let orderId = options.orderId
  51 + if(options.flag){
  52 + this.setData({
  53 + flag:true
  54 + })
  55 + }
56 if(options.orderId){ 56 if(options.orderId){
57 this.orderDetail(orderId) 57 this.orderDetail(orderId)
58 }else{ 58 }else{
1 <!--pages/order-detail/order-detail.wxml--> 1 <!--pages/order-detail/order-detail.wxml-->
2 <view class="container"> 2 <view class="container">
  3 + <view class="refundStatus" wx:if="{{flag}}">
  4 + <view class="inner" data-status="{{refoundStatus}}">
  5 + <view wx:if="{{refoundStatus==1}}">退款中</view>
  6 + <view wx:if="{{refoundStatus==2}}">审核失败</view>
  7 + <view wx:if="{{refoundStatus==3}}">审核通过</view>
  8 + </view>
  9 +
  10 + </view>
3 <!-- 地址 --> 11 <!-- 地址 -->
4 <view class="address"> 12 <view class="address">
5 <view class="userName">{{requestData.receiverName}}</view> 13 <view class="userName">{{requestData.receiverName}}</view>
6 <view class="userTell">{{requestData.receiverPhone}}</view> 14 <view class="userTell">{{requestData.receiverPhone}}</view>
7 <view class="default">默认</view> 15 <view class="default">默认</view>
8 <view class="userAddress">{{requestData.receiverDetailAddress}}</view> 16 <view class="userAddress">{{requestData.receiverDetailAddress}}</view>
9 - <view class="arrow">  
10 - <image src="/images/04-01/arrow.png"></image>  
11 - </view>  
12 </view> 17 </view>
13 <!-- 配送时间 --> 18 <!-- 配送时间 -->
14 <!-- <view class="timeBox"> 19 <!-- <view class="timeBox">
@@ -85,10 +90,6 @@ @@ -85,10 +90,6 @@
85 <view>{{requestData.payAmount}}</view> 90 <view>{{requestData.payAmount}}</view>
86 </view> 91 </view>
87 </view> 92 </view>
88 - <!-- 退款状态 -->  
89 - <view wx:if="{{requestData.returnVos[0].status==1}}" class="itemBox">  
90 - <image src="/images/refund.png"></image>  
91 - </view>  
92 </view> 93 </view>
93 <!-- 再次购买 --> 94 <!-- 再次购买 -->
94 <view class="bottomBox"> 95 <view class="bottomBox">
1 /* pages/order-detail/order-detail.wxss */ 1 /* pages/order-detail/order-detail.wxss */
2 -page{ 2 +page {
3 background: #f1f2f4; 3 background: #f1f2f4;
4 } 4 }
  5 +
5 .container { 6 .container {
6 width: 750rpx; 7 width: 750rpx;
7 background: #f1f2f4; 8 background: #f1f2f4;
@@ -11,18 +12,28 @@ page{ @@ -11,18 +12,28 @@ page{
11 } 12 }
12 13
13 /* 退款状态 */ 14 /* 退款状态 */
14 -  
15 -.itemBox{  
16 - width: 154rpx;  
17 - height: 154rpx;  
18 - position: absolute;  
19 - bottom: 0;  
20 - right: 15px; 15 +.refundStatus {
  16 + width: 750rpx;
  17 + height: 124rpx;
  18 + background-color: #fb7600;
  19 + color: #323233;
  20 + font-weight: 600;
  21 + padding-top: 20rpx;
  22 + box-sizing: border-box;
  23 + margin-bottom: 24rpx;
21 } 24 }
22 -.itemBox image{  
23 - width: 154rpx;  
24 - height: 154rpx; 25 +
  26 +.inner {
  27 + width: 686rpx;
  28 + height: 80rpx;
  29 + margin: 0 auto;
  30 + background-color: #ffffff;
  31 + border-radius: 16rpx;
  32 + display: flex;
  33 + align-items: center;
  34 + padding-left: 30rpx;
25 } 35 }
  36 +
26 /* 地址 */ 37 /* 地址 */
27 .address { 38 .address {
28 width: 686rpx; 39 width: 686rpx;
@@ -398,7 +409,7 @@ textarea { @@ -398,7 +409,7 @@ textarea {
398 } 409 }
399 410
400 .content .icon { 411 .content .icon {
401 - margin-right: -8rpx; 412 + margin-right: -2rpx;
402 } 413 }
403 414
404 /* bottom */ 415 /* bottom */
@@ -11,6 +11,10 @@ Page({ @@ -11,6 +11,10 @@ Page({
11 }], 11 }],
12 time: '', //倒计时 12 time: '', //倒计时
13 timeData: '', 13 timeData: '',
  14 + hour: "",
  15 + minute: "",
  16 + second: "",
  17 + endTimess:'',
14 goodsData: '', 18 goodsData: '',
15 productName: '三好龙虾 招牌泼油小龙虾', 19 productName: '三好龙虾 招牌泼油小龙虾',
16 price: '￥688.00', 20 price: '￥688.00',
@@ -19,13 +23,7 @@ Page({ @@ -19,13 +23,7 @@ Page({
19 infoList: [], //评价 23 infoList: [], //评价
20 image: '', //评价图片 24 image: '', //评价图片
21 flags: true, 25 flags: true,
22 - deacArray: [{  
23 - img: '/images/1.jpg'  
24 - }, {  
25 - img: '/images/1.jpg'  
26 - }, {  
27 - img: '/images/1.jpg'  
28 - }], 26 + deacArray: [],
29 flag: 1, 27 flag: 1,
30 showMask: false, 28 showMask: false,
31 showMaskTwo: false, 29 showMaskTwo: false,
@@ -52,10 +50,11 @@ Page({ @@ -52,10 +50,11 @@ Page({
52 let date = null; 50 let date = null;
53 method.getRequest('/goods/getActivity', data => { 51 method.getRequest('/goods/getActivity', data => {
54 if (data.statusCode == 0) { 52 if (data.statusCode == 0) {
55 - startTime = Date.parse(data.data.startDate); 53 + startTime = new Date().getTime();
56 endTime = Date.parse(data.data.endDate); 54 endTime = Date.parse(data.data.endDate);
57 date = (Number(endTime) - Number(startTime)); 55 date = (Number(endTime) - Number(startTime));
58 this.setData({ 56 this.setData({
  57 + endTimess:endTime,
59 time: date 58 time: date
60 }) 59 })
61 var str2 = toString(date / 1000 / 3600); 60 var str2 = toString(date / 1000 / 3600);
@@ -64,6 +63,27 @@ Page({ @@ -64,6 +63,27 @@ Page({
64 } 63 }
65 }) 64 })
66 }, 65 },
  66 + demoDown() {
  67 + this.setData({
  68 + timer: setInterval(() => {
  69 + let that = this;
  70 + let startTime = new Date().getTime();
  71 + let date = (Number(this.data.endTimess) - Number(startTime));
  72 + this.setData({
  73 + time: date
  74 + })
  75 + let downTime = Number(that.data.time);
  76 + var hour = parseInt(downTime / 1000 / 60 / 60) < 10 ? "0" + parseInt(downTime / 1000 / 60 / 60) : parseInt(downTime / 1000 / 60 / 60);
  77 + var minute = parseInt(downTime / 1000 / 60 % 60) < 10 ? "0" + parseInt(downTime / 1000 / 60 % 60) : parseInt(downTime / 1000 / 60 % 60)
  78 + var second = parseInt(downTime / 1000 % 60) < 10 ? "0" + parseInt(downTime / 1000 % 60) : parseInt(downTime / 1000 % 60)
  79 + this.setData({
  80 + hour: hour,
  81 + minute: minute,
  82 + second: second
  83 + })
  84 + }, 1000)
  85 + })
  86 + },
67 //banner商品加载 87 //banner商品加载
68 bannerList(url) { 88 bannerList(url) {
69 method.getRequest(url, data => { 89 method.getRequest(url, data => {
@@ -147,7 +167,7 @@ Page({ @@ -147,7 +167,7 @@ Page({
147 goodsData: data 167 goodsData: data
148 }) 168 })
149 } 169 }
150 - method.getRequest("/myUser/myCollection/" + this.data.id, data => { 170 + method.getRequest("/myUser/myCollection/" + this.data.goodsId, data => {
151 if (data.statusCode == 0) { 171 if (data.statusCode == 0) {
152 172
153 } else { 173 } else {
@@ -201,6 +221,18 @@ Page({ @@ -201,6 +221,18 @@ Page({
201 }) 221 })
202 console.log(skuId, 'id') 222 console.log(skuId, 'id')
203 }, 223 },
  224 + //在线客服
  225 + myKefu() {
  226 + wx.makePhoneCall({
  227 + phoneNumber: '111111111000',
  228 + success() {
  229 + console.log('拨打电话成功')
  230 + },
  231 + fail() {
  232 + console.log('拨打电话失败')
  233 + }
  234 + })
  235 + },
204 //加入购物车 236 //加入购物车
205 addCart() { 237 addCart() {
206 this.setData({ 238 this.setData({
@@ -421,6 +453,9 @@ Page({ @@ -421,6 +453,9 @@ Page({
421 */ 453 */
422 onShow: function () { 454 onShow: function () {
423 this.countDown() //获取优惠剩余时间 455 this.countDown() //获取优惠剩余时间
  456 + setTimeout(() => {
  457 + this.demoDown();
  458 + }, 200)
424 }, 459 },
425 460
426 /** 461 /**
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 <swiper class="swiper" indicator-dots="true" autoplay="true" interval="5000" duration="1000"> 7 <swiper class="swiper" indicator-dots="true" autoplay="true" interval="5000" duration="1000">
8 <block wx:for="{{swiperArray}}" wx:for-index="idx"> 8 <block wx:for="{{swiperArray}}" wx:for-index="idx">
9 <swiper-item> 9 <swiper-item>
10 - <image src="{{item}}" class="slideImage" ></image> 10 + <image src="{{item}}" class="slideImage"></image>
11 </swiper-item> 11 </swiper-item>
12 </block> 12 </block>
13 </swiper> 13 </swiper>
@@ -16,13 +16,11 @@ @@ -16,13 +16,11 @@
16 <text class="countDownTxt">距结束仅剩</text> 16 <text class="countDownTxt">距结束仅剩</text>
17 <!-- 倒计时 --> 17 <!-- 倒计时 -->
18 <view class="countTime"> 18 <view class="countTime">
19 - <van-count-down use-slot time="{{ time }}" bind:change="onChange1">  
20 - <text class="item">{{ timeData.hours }}</text>:  
21 - <text style="color:#FF593C">:</text>  
22 - <text class="item">{{ timeData.minutes }}</text>:  
23 - <text style="color:#FF593C">:</text>  
24 - <text class="item">{{ timeData.seconds }}</text>  
25 - </van-count-down> 19 + <view class="textss">{{hour}}</view>
  20 + <view class="maohao">:</view>
  21 + <view class="textss">{{minute}}</view>
  22 + <view class="maohao">:</view>
  23 + <view class="textss">{{second}}</view>
26 </view> 24 </view>
27 </view> 25 </view>
28 </view> 26 </view>
@@ -74,7 +72,7 @@ @@ -74,7 +72,7 @@
74 </view> 72 </view>
75 <view class="evaluateDetails">{{item.content}}</view> 73 <view class="evaluateDetails">{{item.content}}</view>
76 <view class="evaluatePic" wx:if="{{item.images}}"> 74 <view class="evaluatePic" wx:if="{{item.images}}">
77 - <view class="picBox" wx:for="{{item.images}}" data-item="data"> 75 + <view class="picBox" wx:for="{{item.images}}" data-item="data">
78 <image src="{{item}}"></image> 76 <image src="{{item}}"></image>
79 </view> 77 </view>
80 </view> 78 </view>
@@ -100,7 +98,7 @@ @@ -100,7 +98,7 @@
100 </view> --> 98 </view> -->
101 <view class="bottom"> 99 <view class="bottom">
102 <view class="bottom_left"> 100 <view class="bottom_left">
103 - <view class="bottom_left_item" catchtap="linkKefu"> 101 + <view class="bottom_left_item" catchtap="myKefu">
104 <image src="/images/01-03/kefu.png"></image> 102 <image src="/images/01-03/kefu.png"></image>
105 <view>客服</view> 103 <view>客服</view>
106 </view> 104 </view>
@@ -115,9 +115,10 @@ @@ -115,9 +115,10 @@
115 font-weight: 500; 115 font-weight: 500;
116 text-align: left; 116 text-align: left;
117 color: #ffffff; 117 color: #ffffff;
118 - line-height: 82rpx;  
119 padding-left: 32rpx; 118 padding-left: 32rpx;
120 box-sizing: border-box; 119 box-sizing: border-box;
  120 + display: flex;
  121 + align-items: center;
121 } 122 }
122 123
123 .countDownTxt { 124 .countDownTxt {
@@ -130,8 +131,33 @@ @@ -130,8 +131,33 @@
130 height: 40rpx; 131 height: 40rpx;
131 margin-left: -20rpx; 132 margin-left: -20rpx;
132 } 133 }
133 -  
134 -.item { 134 +.countTime {
  135 + display:flex;
  136 + /* width: 192rpx; */
  137 + /* background-color: #9b74fb; */
  138 + height: 40rpx;
  139 + margin-left: -20rpx;
  140 +}
  141 +.countTime .maohao{
  142 + color: rgba(95, 0, 0, 0.8);
  143 + width: 20rpx;
  144 + display: flex;
  145 + align-items: center;
  146 + justify-content: center;
  147 + padding-bottom: 10rpx;
  148 +}
  149 +.countTime .textss {
  150 + width: 40rpx;
  151 + height: 40rpx;
  152 + background: rgba(95, 0, 0, 0.8);
  153 + border-radius: 8rpx;
  154 + font-size: 26rpx;
  155 + color: #ffffff;
  156 + display: flex;
  157 + justify-content: center;
  158 + box-sizing: border-box;
  159 +}
  160 +/* .item {
135 display: inline-block; 161 display: inline-block;
136 width: 40rpx; 162 width: 40rpx;
137 color: #fff; 163 color: #fff;
@@ -141,7 +167,7 @@ @@ -141,7 +167,7 @@
141 border-radius: 8rpx; 167 border-radius: 8rpx;
142 margin-right: 6rpx; 168 margin-right: 6rpx;
143 margin-left: 6rpx; 169 margin-left: 6rpx;
144 -} 170 +} */
145 171
146 /* 请选择 */ 172 /* 请选择 */
147 .selectMain { 173 .selectMain {
@@ -553,7 +579,7 @@ button { @@ -553,7 +579,7 @@ button {
553 left: 0; 579 left: 0;
554 border-radius: 10rpx 10rpx 0 0; 580 border-radius: 10rpx 10rpx 0 0;
555 background: #fff; 581 background: #fff;
556 - padding: 30rpx 32rpx 0; 582 + padding: 30rpx 32rpx ;
557 box-sizing: border-box; 583 box-sizing: border-box;
558 max-height: 94%; 584 max-height: 94%;
559 overflow-y: auto; 585 overflow-y: auto;
@@ -698,10 +724,12 @@ button { @@ -698,10 +724,12 @@ button {
698 .confrimBtn { 724 .confrimBtn {
699 height: 78rpx; 725 height: 78rpx;
700 display: flex; 726 display: flex;
701 - background-color: #d12324; 727 + background-color: #f16304;
702 color: #ffffff; 728 color: #ffffff;
703 align-items: center; 729 align-items: center;
704 justify-content: center; 730 justify-content: center;
  731 + border-radius: 36rpx;
  732 + margin-top: 20rpx;
705 } 733 }
706 734
707 /* 商品明细 */ 735 /* 商品明细 */
@@ -6,122 +6,15 @@ Page({ @@ -6,122 +6,15 @@ Page({
6 active: 2, 6 active: 2,
7 status: '', 7 status: '',
8 orederId: '', 8 orederId: '',
9 - goodsid:'', 9 + goodsid: '',
10 tabList: [], 10 tabList: [],
11 - totalList: [{  
12 - text: '待付款',  
13 - number: '22416545878874455',  
14 - status: 0,  
15 - url: '/images/1.jpg',  
16 - name: '鲜切泰国桃子',  
17 - detail: '果肉饱满，香甜可口',  
18 - price: '25',  
19 - num: '2',  
20 - totalMoney: '8.00',  
21 - carriage: '4',  
22 - btnTxtOne: '立即支付',  
23 - btnTxtTwo: '取消订单'  
24 - }, {  
25 - text: '待收货',  
26 - number: '22416545878874455',  
27 - status: 1,  
28 - url: '/images/1.jpg',  
29 - name: '鲜切泰国桃子',  
30 - detail: '果肉饱满，香甜可口',  
31 - price: '25',  
32 - num: '2',  
33 - totalMoney: '8.00',  
34 - carriage: '4',  
35 - btnTxtOne: '再次购买',  
36 - btnTxtTwo: '申请退款'  
37 - }, {  
38 - text: 2,  
39 - number: '22416545878874455',  
40 - status: 3,  
41 - url: '/images/1.jpg',  
42 - name: '鲜切泰国桃子',  
43 - detail: '果肉饱满，香甜可口',  
44 - price: '25',  
45 - num: '2',  
46 - totalMoney: '8.00',  
47 - carriage: '4',  
48 - btnTxtOne: '确认收货',  
49 - btnTxtTwo: '申请退款',  
50 - btnTxtThree: '查看物流'  
51 - }, {  
52 - text: 4,  
53 - number: '22416545878874455',  
54 - status: 5,  
55 - url: '/images/1.jpg',  
56 - name: '鲜切泰国桃子',  
57 - detail: '果肉饱满，香甜可口',  
58 - price: '25',  
59 - num: '2',  
60 - totalMoney: '8.00',  
61 - carriage: '4',  
62 - btnTxtOne: '立即评价',  
63 - btnTxtTwo: '申请退款',  
64 - btnTxtThree: '再次购买'  
65 - }],  
66 - payList: [{  
67 - text: '待付款',  
68 - number: '22416545878874455',  
69 - status: '待付款',  
70 - url: '/images/1.jpg',  
71 - name: '鲜切泰国桃子',  
72 - detail: '果肉饱满，香甜可口',  
73 - price: '25',  
74 - num: '2',  
75 - totalMoney: '8.00',  
76 - carriage: '4',  
77 - btnTxtOne: '立即支付',  
78 - btnTxtTwo: '取消订单'  
79 - }],  
80 - sendList: [{  
81 - text: '待发货',  
82 - number: '22416545878874455',  
83 - status: '待发货',  
84 - url: '/images/1.jpg',  
85 - name: '鲜切泰国桃子',  
86 - detail: '果肉饱满，香甜可口',  
87 - price: '25',  
88 - num: '2',  
89 - totalMoney: '8.00',  
90 - carriage: '4',  
91 - btnTxtOne: '再次购买',  
92 - btnTxtTwo: '申请退款'  
93 - }],  
94 - evaluateList: [{  
95 - text: '待评价',  
96 - number: '22416545878874455',  
97 - status: '待评价',  
98 - url: '/images/1.jpg',  
99 - name: '鲜切泰国桃子',  
100 - detail: '果肉饱满，香甜可口',  
101 - price: '25',  
102 - num: '2',  
103 - totalMoney: '8.00',  
104 - carriage: '4',  
105 - btnTxtOne: '立即评价',  
106 - btnTxtTwo: '申请退款',  
107 - btnTxtThree: '再次购买'  
108 - }],  
109 - reapList: [{  
110 - text: '待收货',  
111 - number: '22416545878874455',  
112 - status: '待发货',  
113 - url: '/images/1.jpg',  
114 - name: '鲜切泰国桃子',  
115 - detail: '果肉饱满，香甜可口',  
116 - price: '25',  
117 - num: '2',  
118 - totalMoney: '8.00',  
119 - carriage: '4',  
120 - btnTxtOne: '确认收货',  
121 - btnTxtTwo: '申请退款',  
122 - btnTxtThree: '查看物流'  
123 - }],  
124 - orderid: '' 11 + totalList: [],
  12 + payList: [],
  13 + sendList: [],
  14 + evaluateList: [],
  15 + reapList: [],
  16 + orderid: '',
  17 + bottomHint: false //触底提示
125 }, 18 },
126 // 导航切换事件 19 // 导航切换事件
127 onClick: function (e) { 20 onClick: function (e) {
@@ -145,37 +38,13 @@ Page({ @@ -145,37 +38,13 @@ Page({
145 } 38 }
146 }, 39 },
147 //订单详情 40 //订单详情
148 - orderDetail(e){  
149 - let orderId=e.currentTarget.dataset.orderid  
150 - wx.navigateTo({  
151 - url: '/pages/order-detail/order-detail?orderId='+orderId,  
152 - }) 41 + orderDetail(e) {
  42 + let orderId = e.currentTarget.dataset.orderid
  43 + wx.navigateTo({
  44 + url: '/pages/order-detail/order-detail?orderId=' + orderId + "&flag=" + "true",
  45 + })
153 }, 46 },
154 - //订单状态  
155 - // orderStatus(status) {  
156 - // switch (status) {  
157 - // case 0:  
158 - // this.setData({  
159 - // status: '待付款'  
160 - // })  
161 - // break;  
162 - // case 1:  
163 - // this.setData({  
164 - // status: '待发货'  
165 - // })  
166 - // break;  
167 - // case 2:  
168 - // this.setData({  
169 - // status: '待收货'  
170 - // })  
171 - // break;  
172 - // case 3:  
173 - // this.setData({  
174 - // status: '待评价'  
175 - // })  
176 - // break;  
177 - // }  
178 - // }, 47 +
179 //全部订单 48 //全部订单
180 allOrder() { 49 allOrder() {
181 let postData = { 50 let postData = {
@@ -259,6 +128,7 @@ Page({ @@ -259,6 +128,7 @@ Page({
259 type: 6 128 type: 6
260 } 129 }
261 method.postRequest("/order/list", postData, data => { 130 method.postRequest("/order/list", postData, data => {
  131 + wx.stopPullDownRefresh()
262 if (data.statusCode == 0) { 132 if (data.statusCode == 0) {
263 this.setData({ 133 this.setData({
264 tabList: data.data 134 tabList: data.data
@@ -329,7 +199,7 @@ Page({ @@ -329,7 +199,7 @@ Page({
329 refund(e) { 199 refund(e) {
330 let orderid = e.currentTarget.dataset.orderid; 200 let orderid = e.currentTarget.dataset.orderid;
331 wx.navigateTo({ 201 wx.navigateTo({
332 - url: '/pages/apply-after-sale/apply-after-sale?orderid=' +orderid, 202 + url: '/pages/apply-after-sale/apply-after-sale?orderid=' + orderid,
333 }) 203 })
334 }, 204 },
335 //再次购买 205 //再次购买
@@ -373,14 +243,14 @@ Page({ @@ -373,14 +243,14 @@ Page({
373 evaluate() { 243 evaluate() {
374 let orderId = e.currentTarget.dataset.orderid 244 let orderId = e.currentTarget.dataset.orderid
375 wx.navigateTo({ 245 wx.navigateTo({
376 - url: '/pages/evaluate/evaluate?goodsid'+goodsId, 246 + url: '/pages/evaluate/evaluate?goodsid' + goodsId,
377 }) 247 })
378 }, 248 },
379 //查看物流 249 //查看物流
380 - logistics(){  
381 - wx.navigateTo({  
382 - url: '/pages/look-logistics/look-logistics',  
383 - }) 250 + logistics() {
  251 + wx.navigateTo({
  252 + url: '/pages/look-logistics/look-logistics',
  253 + })
384 }, 254 },
385 onLoad: function (options) { 255 onLoad: function (options) {
386 let that = this; 256 let that = this;
@@ -431,15 +301,29 @@ Page({ @@ -431,15 +301,29 @@ Page({
431 /** 301 /**
432 * 页面相关事件处理函数--监听用户下拉动作 302 * 页面相关事件处理函数--监听用户下拉动作
433 */ 303 */
  304 + onRefresh() {
  305 + this.setData({
  306 + page: 1,
  307 + tabList: []
  308 + })
  309 + this.refunds();
  310 + },
434 onPullDownRefresh: function () { 311 onPullDownRefresh: function () {
435 - 312 + this.onRefresh()
436 }, 313 },
437 314
438 /** 315 /**
439 * 页面上拉触底事件的处理函数 316 * 页面上拉触底事件的处理函数
440 */ 317 */
441 onReachBottom: function () { 318 onReachBottom: function () {
442 - 319 + this.setData({
  320 + bottomHint: true
  321 + })
  322 + setTimeout(() => {
  323 + this.setData({
  324 + bottomHint: false
  325 + })
  326 + }, 2000)
443 }, 327 },
444 328
445 /** 329 /**
@@ -3,5 +3,6 @@ @@ -3,5 +3,6 @@
3 "van-tab": "@vant/weapp/tab/index", 3 "van-tab": "@vant/weapp/tab/index",
4 "van-tabs": "@vant/weapp/tabs/index" 4 "van-tabs": "@vant/weapp/tabs/index"
5 }, 5 },
6 - "navigationBarTitleText": "退款售后" 6 + "navigationBarTitleText": "退款售后",
  7 + "enablePullDownRefresh": true
7 } 8 }
@@ -69,4 +69,7 @@ @@ -69,4 +69,7 @@
69 <view class="frist btnPublic" data-goodsid="{{item.id}}" bindtap="evaluate">立即评价</view> 69 <view class="frist btnPublic" data-goodsid="{{item.id}}" bindtap="evaluate">立即评价</view>
70 </view> --> 70 </view> -->
71 </view> 71 </view>
  72 +</view>
  73 +<view class="bottomHint" wx:if="{{bottomHint}}">
  74 + 我是有底线的~
72 </view> 75 </view>
@@ -165,4 +165,11 @@ page{ @@ -165,4 +165,11 @@ page{
165 border: 2rpx solid #fb8319; 165 border: 2rpx solid #fb8319;
166 color: #FB7600; 166 color: #FB7600;
167 } 167 }
  168 +.bottomHint{
  169 + font-size: 24rpx;
  170 + color: gray;
  171 + display: flex;
  172 + justify-content: center;
  173 + padding-bottom: 10rpx;
  174 +}
168 175
@@ -4,7 +4,7 @@ const util = require("../../utils/util.js") @@ -4,7 +4,7 @@ const util = require("../../utils/util.js")
4 Page({ 4 Page({
5 data: { 5 data: {
6 checkType: 1, 6 checkType: 1,
7 - userData: {}, 7 + userData: "",
8 addHint: false, //判断有没有地址 8 addHint: false, //判断有没有地址
9 startTime: '', //日历选择获取当天日期 9 startTime: '', //日历选择获取当天日期
10 date: '', 10 date: '',
@@ -20,12 +20,24 @@ Page({ @@ -20,12 +20,24 @@ Page({
20 pitchCart: [], //选中商品 20 pitchCart: [], //选中商品
21 pitchList: [], //选中商品id 21 pitchList: [], //选中商品id
22 hasList: false, // 列表是否有数据 22 hasList: false, // 列表是否有数据
23 - cartnoData: false, //购物车是否为空 23 + cartnoData: "", //购物车是否为空
24 totalPrice: 0, // 总价，初始为0 24 totalPrice: 0, // 总价，初始为0
25 selectAllStatus: true, // 全选状态，默认全选 25 selectAllStatus: true, // 全选状态，默认全选
26 obj: { 26 obj: {
27 name: "hello" 27 name: "hello"
28 - } 28 + },
  29 + bottomHint: false, //上拉提示
  30 + },
  31 + //购物车列表
  32 + getList() {
  33 + method.getRequest('/cart', data => {
  34 + wx.stopPullDownRefresh()
  35 + if (data.statusCode == 0) {
  36 + this.setData({
  37 + carts: data.data,
  38 + })
  39 + }
  40 + })
29 }, 41 },
30 //地址信息 42 //地址信息
31 getAddress() { 43 getAddress() {
@@ -308,13 +320,7 @@ Page({ @@ -308,13 +320,7 @@ Page({
308 * 生命周期函数--监听页面显示 320 * 生命周期函数--监听页面显示
309 */ 321 */
310 onShow: function () { 322 onShow: function () {
311 - method.getRequest('/cart', data => {  
312 - if (data.statusCode == 0) {  
313 - this.setData({  
314 - carts: data.data,  
315 - })  
316 - }  
317 - }) 323 + this.getList();
318 this.setData({ 324 this.setData({
319 hasList: true, 325 hasList: true,
320 carts: [], 326 carts: [],
@@ -328,13 +334,17 @@ Page({ @@ -328,13 +334,17 @@ Page({
328 pitchList: [] 334 pitchList: []
329 }) 335 })
330 336
331 - setTimeout(() => { //判断购物车是否有商品 337 + setTimeout(() => { //判断购物车是否有商品
332 if (this.data.carts.length == 0) { 338 if (this.data.carts.length == 0) {
333 this.setData({ 339 this.setData({
334 cartnoData: true 340 cartnoData: true
335 }) 341 })
  342 + } else {
  343 + this.setData({
  344 + cartnoData: false
  345 + })
336 } 346 }
337 - }, 500) 347 + }, 300)
338 348
339 }, 349 },
340 350
@@ -355,15 +365,26 @@ Page({ @@ -355,15 +365,26 @@ Page({
355 /** 365 /**
356 * 页面相关事件处理函数--监听用户下拉动作 366 * 页面相关事件处理函数--监听用户下拉动作
357 */ 367 */
  368 + onRefresh() {
  369 + wx.showNavigationBarLoading();
  370 + this.getList();
  371 + },
358 onPullDownRefresh: function () { 372 onPullDownRefresh: function () {
359 - 373 + this.onRefresh()
360 }, 374 },
361 375
362 /** 376 /**
363 * 页面上拉触底事件的处理函数 377 * 页面上拉触底事件的处理函数
364 */ 378 */
365 onReachBottom: function () { 379 onReachBottom: function () {
366 - 380 + this.setData({
  381 + bottomHint: true
  382 + })
  383 + setTimeout(() => {
  384 + this.setData({
  385 + bottomHint: false
  386 + })
  387 + }, 2000)
367 }, 388 },
368 389
369 /** 390 /**
1 { 1 {
2 "usingComponents": { 2 "usingComponents": {
3 }, 3 },
4 - "navigationBarTitleText": "购物车" 4 + "navigationBarTitleText": "购物车",
  5 + "enablePullDownRefresh": true
5 } 6 }
@@ -2,15 +2,20 @@ @@ -2,15 +2,20 @@
2 <view class="container"> 2 <view class="container">
3 <!-- 地址 --> 3 <!-- 地址 -->
4 <view class="userInfo" bindtap="goAddress1"> 4 <view class="userInfo" bindtap="goAddress1">
5 - <view class="addHint" wx:if="{{addHint==false}}"> 5 + <!-- <view class="addHint" wx:if="{{addHint==false}}">
6 <view class="addItem1">暂未获取到收获地址</view> 6 <view class="addItem1">暂未获取到收获地址</view>
7 <view class="addItem2"> 请选择收货地址</view> 7 <view class="addItem2"> 请选择收货地址</view>
8 - </view>  
9 - <view wx:if="{{addHint==true}}">  
10 - <view class="userName">{{userData.name}}</view>  
11 - <view class="userTell">{{userData.phone}}</view>  
12 - <view class="default" wx:if="{{userData.delFlag==1}}">默认</view>  
13 - <view class="userAddress">{{userData.area}}{{userData.address}}</view> 8 + </view> -->
  9 + <view>
  10 + <view wx:if="{{userData!==''}}">
  11 + <view class="userName">{{userData.name}}</view>
  12 + <view class="userTell">{{userData.phone}}</view>
  13 + <view class="default" wx:if="{{userData.delFlag==1}}">默认</view>
  14 + <view class="userAddress">{{userData.area}}{{userData.address}}</view>
  15 + </view>
  16 + <view wx:if="{{userData==''}}" class="noAdd">
  17 + 请选择收货地址
  18 + </view>
14 <view class="arrow"> 19 <view class="arrow">
15 <image src="/images/04-01/arrow.png"></image> 20 <image src="/images/04-01/arrow.png"></image>
16 </view> 21 </view>
@@ -34,8 +39,8 @@ @@ -34,8 +39,8 @@
34 <view class="main"> 39 <view class="main">
35 <view wx:if="{{hasList}}"> 40 <view wx:if="{{hasList}}">
36 <view class="cart-box"> 41 <view class="cart-box">
37 - <view class="cart-list" wx:for="{{carts}}" wx:key="{{index}}" data-goodsid="{{item.goodsId}}"  
38 - bindtap="goDetail" bindlongpress="delGoods" data-index="{{index}}" data-cartId="{{item.cartId}}"> 42 + <view class="cart-list" wx:for="{{carts}}" wx:key="{{index}}" data-goodsid="{{item.goodsId}}" bindtap="goDetail"
  43 + bindlongpress="delGoods" data-index="{{index}}" data-cartId="{{item.cartId}}">
39 <icon wx:if="{{item.selected}}" type="success" color="#FF4903" data-index="{{index}}" class="cart-pro-select" 44 <icon wx:if="{{item.selected}}" type="success" color="#FF4903" data-index="{{index}}" class="cart-pro-select"
40 catchtap="selectList" /> 45 catchtap="selectList" />
41 <icon wx:else type="circle" class="cart-pro-select" data-index="{{index}}" catchtap="selectList" /> 46 <icon wx:else type="circle" class="cart-pro-select" data-index="{{index}}" catchtap="selectList" />
@@ -52,27 +57,18 @@ @@ -52,27 +57,18 @@
52 <text class="cart-count-add" catchtap="addCount" data-index="{{index}}" 57 <text class="cart-count-add" catchtap="addCount" data-index="{{index}}"
53 data-goodSkuId="{{item.goodsSkuId}}">+</text> 58 data-goodSkuId="{{item.goodsSkuId}}">+</text>
54 </view> 59 </view>
55 -  
56 </view> 60 </view>
57 </view> 61 </view>
58 -  
59 - <!-- <view class="cart-footer">  
60 - <icon wx:if="{{selectAllStatus}}" type="success_circle" color="#fff" class="total-select" bindtap="selectAll" />  
61 - <icon wx:else type="circle" color="#fff" class="total-select" bindtap="selectAll" />  
62 - <view class="order-icon">  
63 - <navigator url="../orders/orders">  
64 - <image src="/image/icon3.png"></image>  
65 - </navigator>  
66 - </view>  
67 - <text>全选</text>  
68 - <text class="cart-toatl-price">￥{{totalPrice}}</text>  
69 - </view> -->  
70 </view> 62 </view>
  63 + <!-- <view wx:if="{{carts.length==0}}"> -->
71 <view wx:if="{{cartnoData}}"> 64 <view wx:if="{{cartnoData}}">
72 <view class="cart-no-data">一件商品都没有呢</view> 65 <view class="cart-no-data">一件商品都没有呢</view>
73 <view class="cart-no-data-btn" bindtap="goHome">去逛逛</view> 66 <view class="cart-no-data-btn" bindtap="goHome">去逛逛</view>
74 </view> 67 </view>
75 </view> 68 </view>
  69 + <view class="bottomHint" wx:if="{{bottomHint}}">
  70 + 我是有底线的~
  71 + </view>
76 <!-- 立即购买 --> 72 <!-- 立即购买 -->
77 <view class="bottom"> 73 <view class="bottom">
78 <!-- <view class="checkPic"> 74 <!-- <view class="checkPic">
@@ -10,29 +10,18 @@ page { @@ -10,29 +10,18 @@ page {
10 padding-bottom: 120rpx; 10 padding-bottom: 120rpx;
11 } 11 }
12 12
13 -.addHint {  
14 - height: 128rpx;  
15 - align-items: center;  
16 - padding-top: 26rpx;  
17 -}  
18 13
19 -.addItem1 {  
20 - font-size: 28rpx;  
21 - font-weight: 400;  
22 - text-align: left;  
23 - color: #323233;  
24 - display:block;  
25 -}  
26 -.addItem2{ 14 +
  15 +
  16 +/* 用户信息 */
  17 +.noAdd{
  18 + width: 300rpx;
27 font-size: 32rpx; 19 font-size: 32rpx;
28 font-weight: 600; 20 font-weight: 600;
29 - text-align: left;  
30 color: #323233; 21 color: #323233;
31 - margin-top: 20rpx; 22 + position: absolute;
  23 + top: 82rpx;
32 } 24 }
33 -  
34 -  
35 -/* 用户信息 */  
36 .userInfo { 25 .userInfo {
37 width: 686rpx; 26 width: 686rpx;
38 height: 200rpx; 27 height: 200rpx;
@@ -520,4 +509,11 @@ page { @@ -520,4 +509,11 @@ page {
520 line-height: 72rpx; 509 line-height: 72rpx;
521 position: absolute; 510 position: absolute;
522 left: 518rpx; 511 left: 518rpx;
  512 +}
  513 +.bottomHint{
  514 + font-size: 24rpx;
  515 + color: gray;
  516 + display: flex;
  517 + justify-content: center;
  518 + padding-bottom: 10rpx;
523 } 519 }
@@ -255,6 +255,14 @@ @@ -255,6 +255,14 @@
255 "id": -1, 255 "id": -1,
256 "name": "pages/edit-address/edit-address", 256 "name": "pages/edit-address/edit-address",
257 "pathName": "pages/edit-address/edit-address", 257 "pathName": "pages/edit-address/edit-address",
  258 + "query": "",
  259 + "scene": null
  260 + },
  261 + {
  262 + "id": -1,
  263 + "name": "pages/all-evaluate/all-evaluate",
  264 + "pathName": "pages/all-evaluate/all-evaluate",
  265 + "query": "",
258 "scene": null 266 "scene": null
259 } 267 }
260 ] 268 ]