diff --git a/app.json b/app.json
index 615e6b6..c9e4503 100644
--- a/app.json
+++ b/app.json
@@ -1,7 +1,6 @@
{
"pages": [
"pages/home/home",
- "pages/index/index",
"pages/logs/logs",
"pages/classify/classify",
"pages/shopping-cart/shopping-cart",
@@ -27,7 +26,10 @@
"pages/cart-affirm-order/cart-affirm-order",
"pages/integral-order/integral-order",
"pages/refund-after/refund-after",
- "pages/my-discount-card/my-discount-card"
+ "pages/my-discount-card/my-discount-card",
+ "pages/all-evaluate/all-evaluate",
+ "pages/index/index"
+
],
"window": {
"backgroundTextStyle": "light",
diff --git a/app.wxss b/app.wxss
index 60194c3..60eca1b 100644
--- a/app.wxss
+++ b/app.wxss
@@ -1,2 +1,6 @@
/**app.wxss**/
-
+page{
+ width: 100%;
+ height: 100%;
+ overflow-x: hidden;
+}
\ No newline at end of file
diff --git a/images/icon_close@2x.png b/images/icon_close@2x.png
new file mode 100644
index 0000000..bc8c560
Binary files /dev/null and b/images/icon_close@2x.png differ
diff --git a/images/message@2x.png b/images/message@2x.png
new file mode 100644
index 0000000..d28aa5b
Binary files /dev/null and b/images/message@2x.png differ
diff --git a/pages/affirm-order/affirm-order.js b/pages/affirm-order/affirm-order.js
index c812afb..2b7dadf 100644
--- a/pages/affirm-order/affirm-order.js
+++ b/pages/affirm-order/affirm-order.js
@@ -14,8 +14,9 @@ Page({
}],
goodsData: '',
show: false,
- currentDate: '12:00',
- currentDateTwo: '13:00',
+ // currentDate: '12:00',
+ // currentDateTwo: '13:00',
+ date:'',
minHour: 1,
maxHour: 23,
length: 0,
@@ -331,9 +332,9 @@ Page({
title: data.msg,
icon: 'none'
})
- setTimeout(() => {
- util.getUser()
- }, 2000)
+ // setTimeout(() => {
+ // util.getUser()
+ // }, 2000)
}
})
}
diff --git a/pages/affirm-order/affirm-order.wxml b/pages/affirm-order/affirm-order.wxml
index 93e883a..f1b8de3 100644
--- a/pages/affirm-order/affirm-order.wxml
+++ b/pages/affirm-order/affirm-order.wxml
@@ -1,19 +1,24 @@
<!--pages/affirm-order/affirm-order.wxml-->
<view class="container">
<!-- 地址 -->
- <view class="address" catchtap="selectAdd">
- <view class="userName">{{userData.name}}</view>
- <view class="userTell">{{userData.phone}}</view>
- <view class="default" wx:if="{{userData.delFlag==1}}">默认</view>
- <view class="userAddress">{{userData.area}}{{userData.address}}</view>
+ <view class="address" catchtap="selectAdd" >
+ <view wx:if="{{userData!==''}}">
+ <view class="userName">{{userData.name}}</view>
+ <view class="userTell">{{userData.phone}}</view>
+ <view class="default" wx:if="{{userData.delFlag==1}}">默认</view>
+ <view class="userAddress">{{userData.area}}{{userData.address}}</view>
+ </view>
+ <view class="noAdd" wx:if="{{userData==''}}">
+ 请选择收货地址
+ </view>
<view class="arrow">
<image src="/images/04-01/arrow.png"></image>
</view>
</view>
-
- <!-- 配送时间 -->
- <view class="timeBox">
+
+ <!-- 配送时间 -->
+ <view class="timeBox">
<view class="calendar ">
<image src="/images/04-01/rili.png"></image>
</view>
@@ -62,8 +67,8 @@
<!-- 买家留言 -->
<view class="messageBox">
<view class="messageTitle">买家留言:</view>
- <textarea name="" id="" cols="30" rows="10" value="{{content}}" placeholder="留言建议提前协商50字之内" maxlength="{{maxlength}}"
- bindinput="userInput"></textarea>
+ <textarea name="" id="" cols="30" rows="10" value="{{content}}" placeholder="留言建议提前协商50字之内"
+ maxlength="{{maxlength}}" bindinput="userInput"></textarea>
<view class="numLength">{{length}}/50</view>
</view>
<!-- 优惠券 -->
diff --git a/pages/affirm-order/affirm-order.wxss b/pages/affirm-order/affirm-order.wxss
index 1b0c6d7..baa5f8f 100644
--- a/pages/affirm-order/affirm-order.wxss
+++ b/pages/affirm-order/affirm-order.wxss
@@ -1,7 +1,8 @@
/* pages/affirm-order/affirm-order.wxss */
-page{
+page {
background-color: #f1f2f4;
}
+
.container {
padding-top: 34rpx;
width: 750rpx;
@@ -11,6 +12,12 @@ page{
}
/* 地址 */
+.noAdd{
+ width: 90%;
+ font-size: 32rpx;
+ font-weight: 600;
+ color: #323233;
+}
.address {
width: 686rpx;
/* height: 200rpx; */
@@ -20,7 +27,7 @@ page{
padding: 32rpx 28rpx 32rpx 36rpx;
box-sizing: border-box;
position: relative;
-
+ display: flex;
}
.userName {
@@ -72,11 +79,9 @@ page{
}
.arrow {
- width: 32rpx;
- height: 32rpx;
- position: absolute;
- top: 65rpx;
- left: 626rpx;
+ display: flex;
+ align-items: center;
+ width: 15%;
}
.arrow image {
@@ -116,9 +121,10 @@ page{
width: 200rpx;
} */
/* 配送时间 */
-.picker{
+.picker {
width: 600rpx;
}
+
.timeBox {
width: 686rpx;
height: 104rpx;
@@ -399,6 +405,7 @@ textarea {
.money {
color: #ff4444;
}
+
/* 底部 */
.bottomBox {
width: 750rpx;
diff --git a/pages/all-evaluate/all-evaluate.js b/pages/all-evaluate/all-evaluate.js
new file mode 100644
index 0000000..9f28557
--- /dev/null
+++ b/pages/all-evaluate/all-evaluate.js
@@ -0,0 +1,63 @@
+// pages/all-evaluate/all-evaluate.js
+Page({
+ data: {
+ list:[],
+ goodsId:''
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad: function (options) {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload: function () {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh: function () {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom: function () {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage: function () {
+
+ }
+})
\ No newline at end of file
diff --git a/pages/all-evaluate/all-evaluate.json b/pages/all-evaluate/all-evaluate.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/pages/all-evaluate/all-evaluate.json
@@ -0,0 +1,3 @@
+{
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/pages/all-evaluate/all-evaluate.wxml b/pages/all-evaluate/all-evaluate.wxml
new file mode 100644
index 0000000..ecae5d8
--- /dev/null
+++ b/pages/all-evaluate/all-evaluate.wxml
@@ -0,0 +1,15 @@
+<!--pages/all-evaluate/all-evaluate.wxml-->
+<view class="outerBox">
+ <view class="userBox">
+ <view class="wxHead">
+ <image src="{{}}"></image>
+ </view>
+ <view class="wxName"></view>
+ </view>
+ <view class="text"></view>
+ <view class="picBox">
+ <view class="pic" wx:for="{{item.images}}">
+ <image src="{{item}}"></image>
+ </view>
+ </view>
+</view>
\ No newline at end of file
diff --git a/pages/all-evaluate/all-evaluate.wxss b/pages/all-evaluate/all-evaluate.wxss
new file mode 100644
index 0000000..a225ed9
--- /dev/null
+++ b/pages/all-evaluate/all-evaluate.wxss
@@ -0,0 +1,59 @@
+/* pages/all-evaluate/all-evaluate.wxss */
+page{
+ background-color: #f1f2f4;
+ padding-top: 24rpx;
+}
+.outerBox{
+ background-color: #ffffff;
+ width: 750rpx;
+ padding: 32rpx;
+}
+.userBox {
+ width: 686rpx;
+ height: 72rpx;
+ background-color: #ffffff;
+ display: flex;
+}
+
+.wxHead {
+ width: 72rpx;
+ height: 72rpx;
+ margin-right:16rpx;
+ background-color: aqua;
+}
+
+.wxHead image {
+ width: 72rpx;
+ height: 72rpx;
+}
+
+.wxName {
+ height: 100%;
+ width: 200rpx;
+ max-width: 500rpx;
+ background-color: bisque;
+ display: flex;
+ align-items: center;
+ justify-content: left;
+}
+
+.text {
+ width: 686rpx;
+ height: 200rpx;
+ font-size: 28rpx;
+ font-weight: 400;
+ text-align: left;
+ color: #333333;
+ background-color: blueviolet;
+ margin-top: 20rpx;
+}
+
+.picBox {
+ display: flex;
+ height: 200rpx;
+ width: 100%;
+}
+
+.pic {
+
+}
\ No newline at end of file
diff --git a/pages/all-order/all-order.js b/pages/all-order/all-order.js
index 2ea6f7a..2396e6b 100644
--- a/pages/all-order/all-order.js
+++ b/pages/all-order/all-order.js
@@ -4,126 +4,19 @@ const util = require("../../utils/util.js");
Page({
data: {
pageNum: 1,
- index: '',
+ index: 4,
active: 2,
status: '',
orederId: '',
goodsid: '',
tabList: [],
- totalList: [{
- text: '待付款',
- number: '22416545878874455',
- status: 0,
- url: '/images/1.jpg',
- name: '鲜切泰国桃子',
- detail: '果肉饱满，香甜可口',
- price: '25',
- num: '2',
- totalMoney: '8.00',
- carriage: '4',
- btnTxtOne: '立即支付',
- btnTxtTwo: '取消订单'
- }, {
- text: '待收货',
- number: '22416545878874455',
- status: 1,
- url: '/images/1.jpg',
- name: '鲜切泰国桃子',
- detail: '果肉饱满，香甜可口',
- price: '25',
- num: '2',
- totalMoney: '8.00',
- carriage: '4',
- btnTxtOne: '再次购买',
- btnTxtTwo: '申请退款'
- }, {
- text: 2,
- number: '22416545878874455',
- status: 3,
- url: '/images/1.jpg',
- name: '鲜切泰国桃子',
- detail: '果肉饱满，香甜可口',
- price: '25',
- num: '2',
- totalMoney: '8.00',
- carriage: '4',
- btnTxtOne: '确认收货',
- btnTxtTwo: '申请退款',
- btnTxtThree: '查看物流'
- }, {
- text: 4,
- number: '22416545878874455',
- status: 5,
- url: '/images/1.jpg',
- name: '鲜切泰国桃子',
- detail: '果肉饱满，香甜可口',
- price: '25',
- num: '2',
- totalMoney: '8.00',
- carriage: '4',
- btnTxtOne: '立即评价',
- btnTxtTwo: '申请退款',
- btnTxtThree: '再次购买'
- }],
- payList: [{
- text: '待付款',
- number: '22416545878874455',
- status: '待付款',
- url: '/images/1.jpg',
- name: '鲜切泰国桃子',
- detail: '果肉饱满，香甜可口',
- price: '25',
- num: '2',
- totalMoney: '8.00',
- carriage: '4',
- btnTxtOne: '立即支付',
- btnTxtTwo: '取消订单'
- }],
- sendList: [{
- text: '待发货',
- number: '22416545878874455',
- status: '待发货',
- url: '/images/1.jpg',
- name: '鲜切泰国桃子',
- detail: '果肉饱满，香甜可口',
- price: '25',
- num: '2',
- totalMoney: '8.00',
- carriage: '4',
- btnTxtOne: '再次购买',
- btnTxtTwo: '申请退款'
- }],
- evaluateList: [{
- text: '待评价',
- number: '22416545878874455',
- status: '待评价',
- url: '/images/1.jpg',
- name: '鲜切泰国桃子',
- detail: '果肉饱满，香甜可口',
- price: '25',
- num: '2',
- totalMoney: '8.00',
- carriage: '4',
- btnTxtOne: '立即评价',
- btnTxtTwo: '申请退款',
- btnTxtThree: '再次购买'
- }],
- reapList: [{
- text: '待收货',
- number: '22416545878874455',
- status: '待发货',
- url: '/images/1.jpg',
- name: '鲜切泰国桃子',
- detail: '果肉饱满，香甜可口',
- price: '25',
- num: '2',
- totalMoney: '8.00',
- carriage: '4',
- btnTxtOne: '确认收货',
- btnTxtTwo: '申请退款',
- btnTxtThree: '查看物流'
- }],
- orderid: ''
+ totalList: [],
+ payList: [],
+ sendList: [],
+ evaluateList: [],
+ reapList: [],
+ orderid: '',
+ bottomHint: false //触底提示
},
// 导航切换事件
onClick: function (e) {
@@ -131,18 +24,33 @@ Page({
switch (index) {
case 1:
this.unPayment()
+ this.setData({
+ index: 0
+ })
break;
case 2:
this.unSend()
+ this.setData({
+ index: 1
+ })
break;
case 3:
this.unReap()
+ this.setData({
+ index: 2
+ })
break;
case 4:
this.unEvaluate()
+ this.setData({
+ index: 3
+ })
break;
case 0:
this.allOrder()
+ this.setData({
+ index: 4
+ })
break;
}
},
@@ -161,6 +69,7 @@ Page({
type: -1
}
method.postRequest("/order/list", postData, data => {
+ wx.stopPullDownRefresh()
let list = this.data.pageNum == 1 ? data.data : this.data.tabList.concat(data.data);
if (data.statusCode == 0) {
this.setData({
@@ -181,15 +90,16 @@ Page({
type: 0
}
method.postRequest("/order/list", postData, data => {
+ wx.stopPullDownRefresh()
let list = this.data.pageNum == 1 ? data.data : this.data.tabList.concat(data.data);
if (data.statusCode == 0) {
this.setData({
tabList: list
})
} else {
- setTimeout(() => {
- util.getUser()
- }, 2000)
+ // setTimeout(() => {
+ // util.getUser()
+ // }, 2000)
}
})
},
@@ -201,6 +111,7 @@ Page({
type: 1
}
method.postRequest("/order/list", postData, data => {
+ wx.stopPullDownRefresh()
let list = this.data.pageNum == 1 ? data.data : this.data.tabList.concat(data.data);
if (data.statusCode == 0) {
this.setData({
@@ -221,6 +132,7 @@ Page({
type: 5
}
method.postRequest("/order/list", postData, data => {
+ wx.stopPullDownRefresh()
let list = this.data.pageNum == 1 ? data.data : this.data.tabList.concat(data.data);
if (data.statusCode == 0) {
this.setData({
@@ -241,6 +153,7 @@ Page({
type: 2
}
method.postRequest("/order/list", postData, data => {
+ wx.stopPullDownRefresh()
let list = this.data.pageNum == 1 ? data.data : this.data.tabList.concat(data.data);
if (data.statusCode == 0) {
this.setData({
@@ -296,7 +209,7 @@ Page({
method.getRequest("/order/cancelOrder/" + orderId, data => {
if (data.statusCode == 0) {
- }else{
+ } else {
setTimeout(() => {
util.getUser()
}, 2000)
@@ -358,7 +271,8 @@ Page({
wx.showToast({
title: '收货成功',
})
- lists.splice(index, 1);
+ // lists.splice(index, 1);
+ this.unReap();
this.setData({
list: lists
})
@@ -389,12 +303,16 @@ Page({
let that = this;
//判断第一次加载订单状态
that.fristLoad(options.index)
+ console.log(options.index)
if (options.index == null) {
this.setData({
active: 0
})
this.allOrder();
} else {
+ this.setData({
+ index:options.index
+ })
this.fristLoad(options.index)
}
},
@@ -410,7 +328,13 @@ Page({
* 生命周期函数--监听页面显示
*/
onShow: function () {
+ // let active=this.data.active;
+ // if(active==){
+ // }
+ // this.setData({
+ // index:4
+ // })
},
/**
@@ -430,8 +354,43 @@ Page({
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
+ onRefresh() {
+ // wx.showNavigationBarLoading();
+ let index = this.data.index;
+ if (index == 4) {
+ this.setData({
+ pageNum: 1,
+ totalList: []
+ })
+ this.allOrder();
+ } else if (index == 0) {
+ this.setData({
+ pageNum: 1,
+ payList: []
+ })
+ this.unPayment();
+ } else if (index == 1) {
+ this.setData({
+ pageNum: 1,
+ sendList: []
+ })
+ this.unSend();
+ } else if (index == 2) {
+ this.setData({
+ pageNum: 1,
+ reapList: []
+ })
+ this.unReap();
+ } else {
+ this.setData({
+ pageNum: 1,
+ evaluateList: []
+ })
+ this.unEvaluate();
+ }
+ },
onPullDownRefresh: function () {
-
+ this.onRefresh()
},
/**
@@ -442,6 +401,14 @@ Page({
pageNum: this.data.pageNum + 1
})
this.allOrder()
+ this.setData({
+ bottomHint: true
+ })
+ setTimeout(() => {
+ this.setData({
+ bottomHint: false
+ })
+ }, 2000)
},
/**
diff --git a/pages/all-order/all-order.json b/pages/all-order/all-order.json
index 9488f7d..ef9013e 100644
--- a/pages/all-order/all-order.json
+++ b/pages/all-order/all-order.json
@@ -3,5 +3,6 @@
"van-tab": "@vant/weapp/tab/index",
"van-tabs": "@vant/weapp/tabs/index"
},
- "navigationBarTitleText": "全部订单"
+ "navigationBarTitleText": "全部订单",
+ "enablePullDownRefresh": true
}
\ No newline at end of file
diff --git a/pages/all-order/all-order.wxml b/pages/all-order/all-order.wxml
index 71aefa1..bf39312 100644
--- a/pages/all-order/all-order.wxml
+++ b/pages/all-order/all-order.wxml
@@ -10,7 +10,8 @@
</view>
<!-- 订单 -->
<view class="container">
- <view class="orderItem" wx:for="{{tabList}}" catchtap="orderDetail" data-orderid="{{item.orderId}}" wx:if="{{item.status!==6}}">
+ <view class="orderItem" wx:for="{{tabList}}" catchtap="orderDetail" data-orderid="{{item.orderId}}"
+ wx:if="{{item.status!==6}}">
<!-- 订单号 -->
<view class="top">
<view class="orderNumber">订单号：{{item.orderId}}</view>
@@ -45,26 +46,38 @@
</view>
<!-- 按钮 -->
<view wx:if="{{item.status!==4}}">
- <view class="btnBox" wx:if="{{item.status==0}}">
- <view class="third btnPublic" wx:if="{{item.btnTxtThree!==undefined}}">{{item.btnTxtThree}}</view>
- <view class="second btnPublic" data-orderId="{{item.orderId}}" catchtap="delOrder" data-index="{{index}}">取消订单</view>
- <view class="frist btnPublic" bindtap="payment" data-id="{{item.orderId}}">立即支付</view>
- </view>
- <view class="btnBox" wx:if="{{item.status==1}}">
- <view class="third btnPublic" wx:if="{{item.btnTxtThree!==undefined}}" >{{item.btnTxtThree}}</view>
- <view class="second btnPublic" catchtap="refund" data-orderid="{{item.orderId}}">申请退款</view>
- <view class="frist btnPublic" data-goodsid="{{item.listGoodsVoList[0].goodsId}}" catchtap="buyAgain">再次购买</view>
- </view>
- <view class="btnBox" wx:if="{{item.status==2}}">
- <view class="third btnPublic" catchtap="logistics" data-orderid="{{item.orderId}}">查看物流</view>
- <view class="second btnPublic" catchtap="refund" data-orderid="{{item.orderId}}">申请退款</view>
- <view class="frist btnPublic" data-orderid="{{item.orderId}}" catchtap="receipt">确认收货</view>
- </view>
- <view class="btnBox" wx:if="{{item.status==5}}">
- <view class="third btnPublic" data-goodsid="{{item.listGoodsVoList[0].goodsId}}" catchtap="buyAgain">再次购买</view>
- <view class="second btnPublic" catchtap="refund" data-orderid="{{item.orderId}}">申请退款</view>
- <view class="frist btnPublic" data-goodsid="{{item.listGoodsVoList[0].goodsId}}" data-orderid="{{item.orderId}}" catchtap="evaluate">立即评价</view>
+ <view class="btnBox" wx:if="{{item.status==0}}">
+ <view class="third btnPublic" wx:if="{{item.btnTxtThree!==undefined}}">{{item.btnTxtThree}}</view>
+ <view class="second btnPublic" data-orderId="{{item.orderId}}" catchtap="delOrder" data-index="{{index}}">取消订单
+ </view>
+ <view class="frist btnPublic" bindtap="payment" data-id="{{item.orderId}}">立即支付</view>
+ </view>
+ <view class="btnBox" wx:if="{{item.status==1}}">
+ <view class="third btnPublic" wx:if="{{item.btnTxtThree!==undefined}}">{{item.btnTxtThree}}</view>
+ <view class="second btnPublic" catchtap="refund" data-orderid="{{item.orderId}}">申请退款</view>
+ <view class="frist btnPublic" data-goodsid="{{item.listGoodsVoList[0].goodsId}}" catchtap="buyAgain">再次购买</view>
+ </view>
+ <view class="btnBox" wx:if="{{item.status==2}}">
+ <view class="third btnPublic" catchtap="logistics" data-orderid="{{item.orderId}}">查看物流</view>
+ <view class="second btnPublic" catchtap="refund" data-orderid="{{item.orderId}}">申请退款</view>
+ <view class="frist btnPublic" data-orderid="{{item.orderId}}" catchtap="receipt">确认收货</view>
+ </view>
+ <view class="btnBox" wx:if="{{item.status==5}}">
+ <view class="third btnPublic" data-goodsid="{{item.listGoodsVoList[0].goodsId}}" catchtap="buyAgain">再次购买</view>
+ <view class="second btnPublic" catchtap="refund" data-orderid="{{item.orderId}}">申请退款</view>
+ <view class="frist btnPublic" data-goodsid="{{item.listGoodsVoList[0].goodsId}}" data-orderid="{{item.orderId}}"
+ catchtap="evaluate">立即评价</view>
+ </view>
</view>
</view>
+ <view class="bottomHint" wx:if="{{bottomHint}}">
+ 我是有底线的~
+</view>
+ <view class="noData" wx:if="{{tabList.length==0}}">
+ <view class="noDataPic">
+ <image src="/images/message@2x.png"></image>
+ </view>
+ <view class="top1">您还没有相关的订单</view>
+ <view class="bottom1">可以去看看有那些想买的</view>
</view>
</view>
\ No newline at end of file
diff --git a/pages/all-order/all-order.wxss b/pages/all-order/all-order.wxss
index 81b9b80..4470a0f 100644
--- a/pages/all-order/all-order.wxss
+++ b/pages/all-order/all-order.wxss
@@ -102,7 +102,7 @@ page{
}
.price {
- font-size: 36rpx;
+ font-size: 28rpx;
font-weight: 500;
text-align: left;
color: #ff4444;
@@ -132,7 +132,7 @@ page{
}
.totalMoney {
- height: 40rpx;
+ height: 36rpx;
font-size: 28rpx;
margin-right: 16rpx;
margin-left: 16rpx;
@@ -165,4 +165,35 @@ page{
border: 2rpx solid #fb8319;
color: #FB7600;
}
-
+.noData{
+ margin-top: 100rpx;
+}
+.top1,.bottom1{
+ width:750rpx;
+ display: flex;
+ justify-content: center;
+}
+.top1{
+ font-size: 28rpx;
+ color: #323233;
+}
+.bottom1{
+ font-size: 24rpx;
+ color: #999999;
+}
+.noDataPic{
+ width: 200rpx;
+ height: 200rpx;
+ margin: 0 auto;
+}
+.noDataPic image{
+ width: 200rpx;
+ height: 200rpx;
+}
+.bottomHint{
+ font-size: 24rpx;
+ color: gray;
+ display: flex;
+ justify-content: center;
+ padding-bottom: 10rpx;
+}
diff --git a/pages/apply-after-sale/apply-after-sale.js b/pages/apply-after-sale/apply-after-sale.js
index 3e962f5..bd69f7d 100644
--- a/pages/apply-after-sale/apply-after-sale.js
+++ b/pages/apply-after-sale/apply-after-sale.js
@@ -1,6 +1,7 @@
// pages/apply-after-sale/apply-after-sale.js
let method = require("../../utils/reuqest.js");
const util = require("../../utils/util.js");
+const ary = [];
Page({
data: {
id: '', //订单号
@@ -29,9 +30,9 @@ Page({
postList: data.data
})
}else{
- setTimeout(() => {
- util.getUser()
- }, 2000)
+ // setTimeout(() => {
+ // util.getUser()
+ // }, 2000)
}
})
},
@@ -59,9 +60,9 @@ Page({
columns:data.data
})
}else{
- setTimeout(() => {
- util.getUser()
- }, 2000)
+ // setTimeout(() => {
+ // util.getUser()
+ // }, 2000)
}
})
// this.setData({
@@ -77,46 +78,160 @@ Page({
})
},
//上传凭证
- chooseImageTap: function () {
- var that = this;
- if (that.data.imgs.length == 3) {
+ // chooseImageTap: function () {
+ // var that = this;
+ // if (that.data.imgs.length == 3) {
+ // wx.showToast({
+ // title: '最多可以上传三张图片~',
+ // icon: 'icon'
+ // })
+ // }
+ // wx.showActionSheet({
+ // itemList: ['从相册中选择', '拍照'],
+ // itemColor: "#00000",
+ // success: function (res) {
+ // if (!res.cancel) {
+ // if (res.tapIndex == 0) {
+ // that.chooseWxImage('album')
+ // } else if (res.tapIndex == 1) {
+ // that.chooseWxImage('camera')
+ // }
+ // }
+ // }
+ // })
+ // },
+ // chooseWxImage: function (type) {
+ // var that = this;
+ // var imgsPaths = that.data.imgs;
+ // var list = that.data.lists;
+ // wx.chooseImage({
+ // sizeType: ['original', 'compressed'],
+ // sourceType: [type],
+ // success: function (res) {
+ // console.log(res.tempFilePaths[0]);
+ // that.setData({
+ // imgs: res.tempFilePaths,
+ // })
+ // console.log(that.data.imgs.length, 'length')
+ // //that.upImgs(res.tempFilePaths[0], 0) //调用上传方法
+ // }
+ // })
+ // },
+ //删除图片
+ chooseImage(e) {
+ let that = this;
+ var type = e.currentTarget.dataset.type;
+ // let num = type == 1 ? (4 - that.data.ppath.length) : (4 - that.data.cpath.length);
+ if(that.data.imgs.length<3){
+ wx.chooseImage({
+ // count: num,
+ sizeType: ['compressed'],
+ sourceType: ['album', 'camera'],
+ success(res) {
+ wx.showLoading({
+ title: '上传中...',
+ mask: true
+ })
+ var uploaderList = res.tempFilePaths;
+ // ary.push(uploaderList[0])
+ // if (ary.length <= 3) {
+ // // that.setData({
+ // // imgs: ary
+ // // })
+ // } else {
+ // wx.showToast({
+ // title: '最多只能上传3张图片',
+ // icon: 'none'
+ // })
+ // }
+
+ console.log(uploaderList, 'liost')
+ if (type == 1) {
+ that.setData({
+ imags: that.data.puploaderList.concat(res.tempFilePaths),
+ })
+ // that.setData({
+ // puploaderNum: that.data.puploaderList.length
+ // })
+ // } else {
+ // that.setData({
+ // cuploaderList: that.data.cuploaderList.concat(res.tempFilePaths),
+ // })
+ // that.setData({
+ // cuploaderNum: that.data.cuploaderList.length
+ // })
+ }
+ that.uploadDIY(uploaderList, 0, 0, 0, uploaderList.length, type);
+ }
+
+ })
+ }else{
wx.showToast({
- title: '最多可以上传三张图片~',
- icon: 'icon'
+ title: '最多只能上传三张图片',
+ icon:'none'
})
}
- wx.showActionSheet({
- itemList: ['从相册中选择', '拍照'],
- itemColor: "#00000",
- success: function (res) {
- if (!res.cancel) {
- if (res.tapIndex == 0) {
- that.chooseWxImage('album')
- } else if (res.tapIndex == 1) {
- that.chooseWxImage('camera')
- }
- }
- }
- })
+
},
- chooseWxImage: function (type) {
- var that = this;
- var imgsPaths = that.data.imgs;
- var list = that.data.lists;
- wx.chooseImage({
- sizeType: ['original', 'compressed'],
- sourceType: [type],
+
+ uploadDIY(filePaths, successUp, failUp, i, length, type) {
+ let that = this;
+ wx.uploadFile({
+ filePath: filePaths[i],
+ name: 'file',
+ url: 'http://sjhl.brotop.cn/myUser/common/upload',
+ header: {
+ 'content-type': 'multipart/form-data',
+ 'Authorization': wx.getStorageSync('Authorization') || ''
+ },
success: function (res) {
- console.log(res.tempFilePaths[0]);
- that.setData({
- imgs: res.tempFilePaths,
- })
- console.log(that.data.imgs.length, 'length')
- //that.upImgs(res.tempFilePaths[0], 0) //调用上传方法
- }
+ successUp++;
+ console.log('上传图片成功：', JSON.parse(res.data));
+ var data = JSON.parse(res.data);
+ let url = JSON.parse(res.data).data
+ if (that.data.imgs.length < 3) {
+ ary.push(url);
+ that.setData({
+ imgs: ary
+ })
+ }
+
+ if (type == 1) {
+ that.data.ppath[i] = url;
+ that.setData({
+ ppath: that.data.ppath
+ })
+ } else {
+ that.data.cpath[i] = url;
+ that.setData({
+ cpath: that.data.cpath
+ })
+ }
+ // 把获取到的路径存入imagesurl字符串中
+ // this.data.imagesurl
+ // this.setData({
+ // imagesurl: this.data.imagesurl.concat(data.data)
+ // })
+ // console.log(this.data.imagesurl)
+ },
+ fail: (res) => {
+ failUp++;
+ },
+ complete: () => {
+ i++;
+ if (i == length) {
+ // Toast('总共' + successUp + '张上传成功,' + failUp + '张上传失败！');
+ wx.showToast({
+ title: '上传成功',
+ })
+ } else { //递归调用uploadDIY函数
+ that.uploadDIY(filePaths, successUp, failUp, i, length, type);
+ }
+ },
})
+
+
},
- //删除图片
delPic(e) {
console.log(e, 'e')
let index = e.currentTarget.dataset.index;
@@ -145,9 +260,9 @@ Page({
url: '/pages/all-order/all-order',
})
}else{
- setTimeout(() => {
- util.getUser()
- }, 2000)
+ // setTimeout(() => {
+ // util.getUser()
+ // }, 2000)
}
})
},
diff --git a/pages/apply-after-sale/apply-after-sale.wxml b/pages/apply-after-sale/apply-after-sale.wxml
index 1380128..4b4849c 100644
--- a/pages/apply-after-sale/apply-after-sale.wxml
+++ b/pages/apply-after-sale/apply-after-sale.wxml
@@ -77,7 +77,7 @@
<view class="right">最多可上传3张</view>
</view>
<view class="photo">
- <view class="photoOne" bindtap="chooseImageTap">
+ <view class="photoOne" bindtap="chooseImage">
<image src="/images/05-06/photo.png"></image>
</view>
<view class="photoOne" wx:for="{{imgs}}" data-index="{{index}}">
diff --git a/pages/card-detail/card-detail.js b/pages/card-detail/card-detail.js
index e5823f2..8651b30 100644
--- a/pages/card-detail/card-detail.js
+++ b/pages/card-detail/card-detail.js
@@ -22,7 +22,8 @@ Page({
time: '2020/12/25 12:09',
num: '-176'
}],
- t:'1'
+ t: '1',
+ bottomHint: false
},
//第一次数据加载
getList() {
@@ -31,7 +32,7 @@ Page({
this.setData({
postData: data.data
})
- }else{
+ } else {
setTimeout(() => {
util.getUser()
}, 2000)
@@ -46,11 +47,12 @@ Page({
t: this.data.t
}
method.postRequest("/myUser/myMembershipCardDetails", postData, data => {
+ wx.stopPullDownRefresh()
if (data.statusCode == 0) {
- this.setData({
- list:data.data
- })
- }else{
+ this.setData({
+ list: data.data
+ })
+ } else {
setTimeout(() => {
util.getUser()
}, 2000)
@@ -63,13 +65,13 @@ Page({
switch (idx) {
case 0:
this.setData({
- t:'1'
+ t: '1'
})
this.cardDetail()
break;
case 1:
this.setData({
- t:'2'
+ t: '2'
})
this.cardDetail()
break;
@@ -112,15 +114,37 @@ Page({
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
+ onRefresh() {
+ if(this.data.t==1){
+ this.setData({
+ page: 1,
+ integralList: []
+ })
+ this.cardDetail();
+ }else{
+ this.setData({
+ page: 1,
+ exchangeList: []
+ })
+ this.cardDetail();
+ }
+ },
onPullDownRefresh: function () {
-
+ this.onRefresh()
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
-
+ this.setData({
+ bottomHint: true
+ })
+ setTimeout(() => {
+ this.setData({
+ bottomHint: false
+ })
+ }, 2000)
},
/**
diff --git a/pages/card-detail/card-detail.json b/pages/card-detail/card-detail.json
index e55afef..cf8dd9d 100644
--- a/pages/card-detail/card-detail.json
+++ b/pages/card-detail/card-detail.json
@@ -3,5 +3,6 @@
"van-tab": "@vant/weapp/tab/index",
"van-tabs": "@vant/weapp/tabs/index"
},
- "navigationBarTitleText": "会员卡详情"
+ "navigationBarTitleText": "会员卡详情",
+ "enablePullDownRefresh": true
}
\ No newline at end of file
diff --git a/pages/card-detail/card-detail.wxml b/pages/card-detail/card-detail.wxml
index 2515b76..e0336dc 100644
--- a/pages/card-detail/card-detail.wxml
+++ b/pages/card-detail/card-detail.wxml
@@ -9,7 +9,7 @@
</view>
</view>
<!-- tab -->
-<van-tabs active="{{ active }}" bind:change="onChange" >
+<van-tabs active="{{ active }}" bind:change="onChange">
<van-tab title="{{item.title}}" wx:for="{{tabList}}">{{}}</van-tab>
</van-tabs>
<!-- content -->
@@ -20,9 +20,12 @@
<view class="time">{{item.time}}</view>
</view>
<view class="right">
- <view class="display:inline-block" wx:if="{{item.state==2}}">-</view>
- <view class="display:inline-block" wx:if="{{item.state==1}}">+</view>
+ <view class="display:inline-block" wx:if="{{item.state==2}}">-</view>
+ <view class="display:inline-block" wx:if="{{item.state==1}}">+</view>
{{item.num}}
</view>
</view>
+</view>
+<view class="bottomHint" wx:if="{{bottomHint}}">
+ 我是有底线的~
</view>
\ No newline at end of file
diff --git a/pages/card-detail/card-detail.wxss b/pages/card-detail/card-detail.wxss
index bcc0967..9cdf5b2 100644
--- a/pages/card-detail/card-detail.wxss
+++ b/pages/card-detail/card-detail.wxss
@@ -57,3 +57,11 @@ margin-top: 16rpx;
font-weight: 400;
color: #ee231c;
}
+
+.bottomHint{
+ font-size: 24rpx;
+ color: gray;
+ display: flex;
+ justify-content: center;
+ padding-bottom: 10rpx;
+}
\ No newline at end of file
diff --git a/pages/cart-affirm-order/cart-affirm-order.js b/pages/cart-affirm-order/cart-affirm-order.js
index 0ed5f8a..11ab04d 100644
--- a/pages/cart-affirm-order/cart-affirm-order.js
+++ b/pages/cart-affirm-order/cart-affirm-order.js
@@ -3,9 +3,7 @@ let method = require("../../utils/reuqest.js");
const util = require("../../utils/util.js");
Page({
data: {
- userData: {
- address: '请选择收货地址'
- },
+ userData:"",
addressId: '',
startTime: '',
cartList: [], //商品列表
diff --git a/pages/cart-affirm-order/cart-affirm-order.wxml b/pages/cart-affirm-order/cart-affirm-order.wxml
index 312faf1..67a0b5c 100644
--- a/pages/cart-affirm-order/cart-affirm-order.wxml
+++ b/pages/cart-affirm-order/cart-affirm-order.wxml
@@ -2,10 +2,15 @@
<view class="container">
<!-- 地址 -->
<view class="address" bindtap="emit">
- <view class="userName">{{userData.name}}</view>
- <view class="userTell">{{userData.phone}}</view>
- <view class="default" wx:if="{{userData.delFlag==1}}">默认</view>
- <view class="userAddress">{{userData.area}}{{userData.address}}</view>
+ <view wx:if="{{userData!==''}}">
+ <view class="userName">{{userData.name}}</view>
+ <view class="userTell">{{userData.phone}}</view>
+ <view class="default" wx:if="{{userData.delFlag==1}}">默认</view>
+ <view class="userAddress">{{userData.area}}{{userData.address}}</view>
+ </view>
+ <view wx:if="{{userData==''}}" class="noAdd">
+ 请选择收货地址
+ </view>
<view class="arrow">
<image src="/images/04-01/arrow.png"></image>
</view>
@@ -13,7 +18,7 @@
<!-- 配送时间 -->
<view class="timeBox">
<view class="section">
- <picker mode="date" value="{{date}}" start="{{startTime}}" bindchange="bindDateChange">
+ <picker mode="date" value="{{date}}" start="{{startTime}}" bindchange="bindDateChange">
<view class="picker">
配送时间: {{date}}
</view>
@@ -49,7 +54,8 @@
<!-- 买家留言 -->
<view class="messageBox">
<view class="messageTitle">买家留言:</view>
- <textarea name="" id="" cols="30" rows="10" value="{{content}}" placeholder="留言建议提前协商50字之内" maxlength="50" bindinput="userInput"></textarea>
+ <textarea name="" id="" cols="30" rows="10" value="{{content}}" placeholder="留言建议提前协商50字之内" maxlength="50"
+ bindinput="userInput"></textarea>
<view class="numLength">{{length}}/50</view>
</view>
<!-- 优惠券 -->
diff --git a/pages/cart-affirm-order/cart-affirm-order.wxss b/pages/cart-affirm-order/cart-affirm-order.wxss
index 3591204..2680e6c 100644
--- a/pages/cart-affirm-order/cart-affirm-order.wxss
+++ b/pages/cart-affirm-order/cart-affirm-order.wxss
@@ -9,6 +9,11 @@
}
/* 地址 */
+.noAdd{
+ font-size: 32rpx;
+ font-weight: 600;
+ width: 90%;
+}
.address {
width: 686rpx;
/* height: 200rpx; */
@@ -18,6 +23,7 @@
padding: 32rpx 28rpx 32rpx 36rpx;
box-sizing: border-box;
position: relative;
+ display: flex;
}
@@ -70,11 +76,9 @@
}
.arrow {
- width: 32rpx;
- height: 32rpx;
- position: absolute;
- top: 65rpx;
- left: 626rpx;
+ width: 15%;
+ display: flex;
+ align-items: center;
}
.arrow image {
diff --git a/pages/classify/classify.wxml b/pages/classify/classify.wxml
index 07d88ea..cdb8e9e 100644
--- a/pages/classify/classify.wxml
+++ b/pages/classify/classify.wxml
@@ -1,11 +1,10 @@
<!--pages/classify/classify.wxml-->
<!-- 搜索框 -->
<view class="searchMain">
- <view class="locationIcon">
- <image src="/images/location.png"></image>
- </view>
<view class="location">
- {{location}}
+ <image src="/images/location.png"></image>
+ <text>{{location}}</text>
+
</view>
<view class="searchBox">
<view class="search_center" catchtap="goSearch">
diff --git a/pages/classify/classify.wxss b/pages/classify/classify.wxss
index 7ddcdda..15c543a 100644
--- a/pages/classify/classify.wxss
+++ b/pages/classify/classify.wxss
@@ -11,16 +11,17 @@
position: relative;
}
-.locationIcon {
+/* .locationIcon {
display: inline-block;
position: absolute;
left: 26rpx;
top: -2rpx;
-}
+} */
-.locationIcon image {
+.location image {
width: 16rpx;
height: 20rpx;
+ position: absolute;
}
.search_center {
@@ -109,11 +110,16 @@
.location {
width: 142rpx;
height: 60rpx;
- /* background-color: blanchedalmond; */
font-size: 24rpx;
color: #323232;
text-indent: 1em;
- margin-left: 22rpx;
+ /* margin-left: 22rpx; */
+ display: flex;
+ position: relative;
+ /* flex-wrap: wrap; */
+ overflow: hidden;
+ padding-left: 20rpx;
+ box-sizing: border-box;
}
.searchBox {
@@ -124,16 +130,12 @@
/* 侧边导航 */
.navSide {
- position: fixed;
- left: 0;
margin-top: 4rpx;
+ display: flex;
}
.navContent {
- position: absolute;
- top: 0;
- left: 218rpx;
- margin-right: 32rpx;
+ margin-left: 32rpx;
}
.scroll-view {
@@ -256,7 +258,7 @@
left: 0;
border-radius: 10rpx 10rpx 0 0;
background: #fff;
- padding: 30rpx 32rpx 0;
+ padding: 30rpx 32rpx ;
box-sizing: border-box;
max-height: 94%;
overflow-y: auto;
@@ -440,8 +442,10 @@
.confrimBtn {
height: 78rpx;
display: flex;
- background-color: #d12324;
+ background-color: #f16304;
color: #ffffff;
align-items: center;
justify-content: center;
+ margin-top: 20rpx;
+ border-radius: 36rpx;
}
\ No newline at end of file
diff --git a/pages/discount-card/discount-card.js b/pages/discount-card/discount-card.js
index 9eabaf6..6d52ee7 100644
--- a/pages/discount-card/discount-card.js
+++ b/pages/discount-card/discount-card.js
@@ -1,6 +1,6 @@
// pages/discount-card/discount-card.js
let method = require("../../utils/reuqest.js")
-let util=require("../../utils/util.js")
+let util = require("../../utils/util.js")
Page({
data: {
startTime: '',
@@ -8,18 +8,20 @@ Page({
pages: "1",
cardList: "",
id: '',
+ bottomHint: false //触底提示
},
//获取优惠券
getDiscounCard() {
- let that=this;
- console.log(that.data.pages,'pages')
+ let that = this;
+ console.log(that.data.pages, 'pages')
let postData = {
page: that.data.pages,
size: 10,
type: 0
}
method.postRequest("/coupon/list", postData, data => {
+ wx.stopPullDownRefresh()
let lists = that.data.pages == 1 ? data.data : that.data.cardList.concat(data.data)
if (data.statusCode == 0) {
that.setData({
@@ -40,14 +42,14 @@ Page({
})
})
- }else{
+ } else {
setTimeout(() => {
util.getUser()
}, 2000)
}
})
},
-
+
/**
* 生命周期函数--监听页面加载
@@ -55,7 +57,7 @@ Page({
onLoad: function (options) {
let that = this;
that.getDiscounCard()
- console.log(that.data.pages,'onload')
+ console.log(that.data.pages, 'onload')
},
/**
@@ -89,8 +91,16 @@ Page({
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
+ onRefresh() {
+ wx.showNavigationBarLoading();
+ this.setData({
+ pageNum: 1,
+ cardList: []
+ })
+ this.getDiscounCard();
+ },
onPullDownRefresh: function () {
-
+ this.onRefresh()
},
/**
@@ -100,12 +110,19 @@ Page({
// util.onReachListData(this, this.data.pageNums, this.data.cardList, this.getDiscounCard);
// },
onReachBottom: function () {
- console.log(this.data.pages,'第一次')
this.setData({
pages: Number(this.data.pages) + 1
})
- console.log(this.data.pages,'nums')
- this.getDiscounCard()
+ this.getDiscounCard();
+
+ this.setData({
+ bottomHint: true
+ })
+ setTimeout(() => {
+ this.setData({
+ bottomHint: false
+ })
+ }, 2000)
},
/**
diff --git a/pages/discount-card/discount-card.json b/pages/discount-card/discount-card.json
index bd1f84a..4e92c82 100644
--- a/pages/discount-card/discount-card.json
+++ b/pages/discount-card/discount-card.json
@@ -1,4 +1,5 @@
{
"usingComponents": {},
- "navigationBarTitleText": "优惠券"
+ "navigationBarTitleText": "优惠券",
+ "enablePullDownRefresh": true
}
\ No newline at end of file
diff --git a/pages/discount-card/discount-card.wxml b/pages/discount-card/discount-card.wxml
index e7cf3f6..3a6669b 100644
--- a/pages/discount-card/discount-card.wxml
+++ b/pages/discount-card/discount-card.wxml
@@ -14,7 +14,11 @@
<view class="topCircle"></view>
<view class="bottomCircle"></view>
</view>
+ <view class="bottomHint" wx:if="{{bottomHint}}">
+ 我是有底线的~
+</view>
<view class="listBlank" wx:if="{{cardList.length==0}}">
暂无可用优惠券~
</view>
</view>
+
diff --git a/pages/discount-card/discount-card.wxss b/pages/discount-card/discount-card.wxss
index bec8f94..06e0192 100644
--- a/pages/discount-card/discount-card.wxss
+++ b/pages/discount-card/discount-card.wxss
@@ -86,4 +86,11 @@ margin-top: 24rpx;
align-items: center;
color: #999999;
font-size: 30rpx;
+}
+.bottomHint{
+ font-size: 24rpx;
+ color: gray;
+ display: flex;
+ justify-content: center;
+ padding-bottom: 10rpx;
}
\ No newline at end of file
diff --git a/pages/edit-address/edit-address.js b/pages/edit-address/edit-address.js
index 1258424..595c6f2 100644
--- a/pages/edit-address/edit-address.js
+++ b/pages/edit-address/edit-address.js
@@ -8,13 +8,9 @@ Page({
username: '',
phone: '',
value: '',
- checked: 0,
+ switchChecked:false,
show: false,
selectBox: true,
- // region: ['广东省', '广州市', '海珠区'],
- // province: '选择省/',
- // city: '市/',
- // county: '区',
location: '',
flag: true,
latitude: "",
@@ -128,12 +124,27 @@ Page({
},
//开关
- onChange() {
+ // onChange(detail) {
+ // if(this.data.checked==1){
+ // this.setData({
+ // checked:!detail
+ // })
+ // }else{
+ // this.setData({
+ // checked:detail
+ // // checked: !this.data.checked
+ // })
+ // }
+
+ // console.log(detail,'detail')
+ // },
+ switch1Change(e){
+ console.log(e.detail.value,'value')
this.setData({
- checked: !this.data.checked
+ switchChecked:e.detail.value
})
- },
- //保存
+ },
+ //保存
save() {
if (this.data.username == '') {
wx.showToast({
@@ -151,7 +162,7 @@ Page({
icon: 'none'
})
} else {
- let delFlags = this.data.checked == true ? 1 : 0;
+ let delFlags = this.data.switchChecked == true ? 1 : 0;
// let region = this.data.region;
// let addressStr = region[0] + "" + region[1] + "" + region[2]
let postData = {
@@ -223,15 +234,14 @@ Page({
username: options.name,
phone: options.phone,
value: options.address,
- checked: options.delFlag,
+ switchChecked: options.delFlag == 1 ?true:false,
location: options.area,
locations: options.locations,
latitudes: options.locations.split(",")[0], //传值给后台
longitudes: options.locations.split(",")[1],
id: options.id
})
- console.log(this.data.latitudes, '11')
- console.log(this.data.longitudes, '222')
+ console.log(this.data.switchChecked)
// }
},
diff --git a/pages/edit-address/edit-address.wxml b/pages/edit-address/edit-address.wxml
index 621fda6..d277eb7 100644
--- a/pages/edit-address/edit-address.wxml
+++ b/pages/edit-address/edit-address.wxml
@@ -1,7 +1,7 @@
<!--pages/add-address/add-address.wxml-->
<view class="container">
<van-cell-group class="addContent">
- <van-field value="{{ username }}" clearable label="姓名" icon="question-o" placeholder="请输入姓名"
+ <van-field value="{{ username }}" clearable label="姓名" icon="question-o" placeholder="请输入姓名"
bind:click-icon="onClickIcon" bindinput="inputName" />
<van-field value="{{ phone }}" label="电话" placeholder="请输入电话" bindinput="inputDel" bindblur="blurPhone" />
<!-- 地址 -->
@@ -32,11 +32,14 @@
<view class="defaultAddress">
<view class="defaultText">设为默认地址</view>
<view class="switch">
- <van-switch checked="{{ checked }}" bind:change="onChange" inactive-color="#d3d3d3" size="48rpx"
- style="margin-left:-60rpx" />
+ <!-- <van-switch checked="{{checked}}" bind:change="onChange" inactive-color="#d3d3d3" size="48rpx"
+ style="margin-left:-60rpx" /> -->
+ <view class="body-view">
+ <switch checked="{{switchChecked}}" bindchange="switch1Change" />
+ </view>
</view>
</view>
<!-- 保存删除 -->
<view class="save" bindtap="save">保存</view>
- <view class="del" bindtap="delEvent" >删除</view>
+ <view class="del" bindtap="delEvent">删除</view>
</view>
\ No newline at end of file
diff --git a/pages/edit-address/edit-address.wxss b/pages/edit-address/edit-address.wxss
index 5a3b69f..723740f 100644
--- a/pages/edit-address/edit-address.wxss
+++ b/pages/edit-address/edit-address.wxss
@@ -63,7 +63,6 @@
/* 默认地址 */
.defaultAddress {
- width: 750rpx;
height: 88rpx;
margin-top: 16rpx;
display: flex;
diff --git a/pages/home/home.js b/pages/home/home.js
index f5fe143..438be34 100644
--- a/pages/home/home.js
+++ b/pages/home/home.js
@@ -15,10 +15,14 @@ Page({
moreCount: '更多优惠',
time: '', //限时优惠倒计时
timeData: {},
+ hour: "",
+ minute: "",
+ second: "",
+ endTimess: '',
nowTimes: '', //获取当前时间戳
endTimes: "",
countDownShow: true,
- discountArray: [], //每日特价
+ discountArray: [], //每日特价
dayPrice: '每日特价',
dayPriceShow: true,
morePrice: '更多特价',
@@ -33,7 +37,8 @@ Page({
discountCartArray: [],
categoryId: '',
times: '', //每日特价倒计时
- timeDatas: {}
+ timeDatas: {},
+ bottomHint:false //上拉触底
},
//搜索
@@ -52,18 +57,8 @@ Page({
}
})
},
- //限时优惠倒计时
- onChange1(e) {
- this.setData({
- timeData: e.detail,
- });
- },
- //每日特价倒计时
- onChange2(e) {
- this.setData({
- timeDatas: e.detail,
- });
- },
+
+
// 点击进入轮播图详情
goBannnerDetail(e) {
let url = e.currentTarget.dataset.url;
@@ -102,12 +97,10 @@ Page({
t: {}
}
method.postRequest('/goods/limitedTimeOffer', postData, data => {
- console.log(data, 'data')
if (data.statusCode == 0) {
this.setData({
discountArray: data.data
})
- console.log(this.data.discountArray)
if (data.data.length <= 0) {
this.setData({
limitCountShow: false
@@ -116,18 +109,22 @@ Page({
}
})
},
- // 限时特惠倒计时
+ onChange1(e) {
+ this.setData({
+ timeData: e.detail,
+ });
+ },
countDown() {
let startTime = null;
let endTime = null;
- let date = null;
- let nowTimes = this.data.nowTimes
+ // let date = null;
+ // let nowTimes = this.data.nowTimes
method.getRequest('/goods/getActivity', data => {
if (data.statusCode == 0) {
- startTime = Date.parse(data.data.startDate);
+ startTime = new Date().getTime();
endTime = Date.parse(data.data.endDate);
this.setData({
- endTimes: endTime
+ endTimess: endTime
})
date = (Number(endTime) - Number(startTime));
if (Number(data.data.endTimes) < Number(data.data.nowTimes)) {
@@ -142,6 +139,29 @@ Page({
}
})
},
+ //限时优惠倒计时
+ demoDown() {
+ this.setData({
+ timer: setInterval(() => {
+ let that = this;
+ // that.countDown();
+ let startTime = new Date().getTime();
+ let date = (Number(this.data.endTimess) - Number(startTime));
+ this.setData({
+ time: date
+ })
+ let downTime = Number(that.data.time);
+ var hour = parseInt(downTime / 1000 / 60 / 60) < 10 ? "0" + parseInt(downTime / 1000 / 60 / 60) : parseInt(downTime / 1000 / 60 / 60);
+ var minute = parseInt(downTime / 1000 / 60 % 60) < 10 ? "0" + parseInt(downTime / 1000 / 60 % 60) : parseInt(downTime / 1000 / 60 % 60)
+ var second = parseInt(downTime / 1000 % 60) < 10 ? "0" + parseInt(downTime / 1000 % 60) : parseInt(downTime / 1000 % 60)
+ this.setData({
+ hour: hour,
+ minute: minute,
+ second: second
+ })
+ }, 1000)
+ })
+ },
//每日特价倒计时
// 获取当前时间
getCurrentDate(format) {
@@ -182,6 +202,11 @@ Page({
times: jieguo
})
},
+ onChange2(e) {
+ this.setData({
+ timeDatas: e.detail,
+ });
+ },
//更多优惠
moreCount() {
wx.switchTab({
@@ -245,7 +270,7 @@ Page({
})
if (data.data.length == 0) {
this.setData({
- dayPriceShow:false
+ dayPriceShow: false
})
}
}
@@ -282,7 +307,6 @@ Page({
})
},
-
// 弹出优惠券领取
getCard() {
method.getRequest("/myUser/get", data => {
@@ -435,7 +459,11 @@ Page({
that.dataRequest();
that.countDown();
that.oneDataRequest();
- that.discountList()
+ that.discountList();
+ // setTimeout(() => {
+ // that.demoDown();
+ // }, 300)
+
},
/**
@@ -451,6 +479,9 @@ Page({
onShow: function () {
this.dayCountDown();
this.getName(); //九月主推
+ setTimeout(() => {
+ this.demoDown();
+ }, 200)
},
/**
@@ -478,7 +509,14 @@ Page({
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
-
+ this.setData({
+ bottomHint:true
+ })
+ setTimeout(()=>{
+ this.setData({
+ bottomHint:false
+ })
+ },2000)
},
/**
diff --git a/pages/home/home.json b/pages/home/home.json
index 561af21..c064c46 100644
--- a/pages/home/home.json
+++ b/pages/home/home.json
@@ -6,5 +6,6 @@
"van-popup": "@vant/weapp/popup/index",
"van-count-down": "@vant/weapp/count-down/index"
},
- "navigationBarTitleText": "首页"
+ "navigationBarTitleText": "首页",
+ "navigationStyle": "custom"
}
\ No newline at end of file
diff --git a/pages/home/home.wxml b/pages/home/home.wxml
index d4d8136..63e456c 100644
--- a/pages/home/home.wxml
+++ b/pages/home/home.wxml
@@ -37,13 +37,18 @@
<view class="limitCount">{{limitCount}}</view>
<!-- 倒计时 -->
<view class="countTime" wx:if="{{countDownShow}}">
- <van-count-down use-slot time="{{ time }}" bind:change="onChange1">
+ <view class="textss">{{hour}}</view>
+ <view class="maohao">:</view>
+ <view class="textss">{{minute}}</view>
+ <view class="maohao">:</view>
+ <view class="textss">{{second}}</view>
+ <!-- <van-count-down use-slot time="{{ time }}" bind:change="onChange1">
<text class="item">{{ timeData.hours }}</text>
<text style="color:#FF593C">:</text>
<text class="item">{{ timeData.minutes }}</text>
<text style="color:#FF593C">:</text>
<text class="item">{{ timeData.seconds }}</text>
- </van-count-down>
+ </van-count-down> -->
</view>
<view class="moreCount" bindtap="moreCount">{{moreCount}}</view>
<view class="arrow" bindtap="moreCount"></view>
@@ -68,7 +73,7 @@
</view>
<!-- 每日特价 -->
<view class="dayPriceContent">
- <view class="dayPrice" wx:if="{{dayPriceShow}}">
+ <view class="dayPrice">
<view class="dayPriceTitle">
<view class="dayPriceText">{{dayPrice}}</view>
<view class="dayPriceTime">
@@ -133,24 +138,29 @@
<van-popup show="{{show}}" bind:close="onClose">
<view class="popupBox">
<view class="delIcon" bindtap="onClose">
- <image src="/images/01-02/quxiao.png"></image>
+ <image src="/images/icon_close@2x.png"></image>
</view>
<view class="popupPic">
<image src="/images/popup.png"></image>
</view>
<view>
<view class="popupText"> 实名优惠活动券</view>
- <view class="popupImg" wx:for="{{discountCartArray}}" wx:if="{{item.status}}">
- <view class="left"></view>
- <view class="right"></view>
- <view class="popupNamePic">{{item.name}}</view>
- <view class="popupPriceBox">
- <view class="popupIcon">￥</view>
- <view class="popupPrice">{{item.amount}}</view>
+ <view class="discountBox">
+ <view class="popupImg" wx:for="{{discountCartArray}}" wx:if="{{item.status}}">
+ <view class="left"></view>
+ <view class="right"></view>
+ <view class="popupNamePic">{{item.name}}</view>
+ <view class="popupPriceBox">
+ <view class="popupIcon">￥</view>
+ <view class="popupPrice">{{item.amount}}</view>
+ </view>
</view>
</view>
<view class="popupBtn" bindtap="getDiscountCart">立即领取</view>
</view>
</view>
</van-popup>
+</view>
+<view class="bottomHint" wx:if="{{bottomHint}}">
+ 我是有底线的~
</view>
\ No newline at end of file
diff --git a/pages/home/home.wxss b/pages/home/home.wxss
index d9abed1..b2cc9a3 100644
--- a/pages/home/home.wxss
+++ b/pages/home/home.wxss
@@ -80,7 +80,7 @@
}
.classifyItem {
- width: 156rpx;
+ width: 146rpx;
display: inline-block;
}
@@ -130,12 +130,33 @@
}
.countTime {
- display: inline-block;
- width: 192rpx;
+ display:flex;
+ /* width: 192rpx; */
/* background-color: #9b74fb; */
height: 40rpx;
margin-left: -20rpx;
}
+.countTime .maohao{
+ color: #ff593c;
+ width: 20rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ padding-bottom: 10rpx;
+}
+.countTime .textss {
+ width: 40rpx;
+ height: 40rpx;
+ background: #ff593c;
+ border-radius: 8rpx;
+ font-size: 26rpx;
+ color: #ffffff;
+ display: inline-block;
+ display: flex;
+ justify-content: center;
+ padding-top: 3rpx;
+ box-sizing: border-box;
+}
.item {
display: inline-block;
@@ -220,6 +241,7 @@
font-size: 28rpx;
margin-top: 4rpx;
overflow: hidden;
+ text-overflow: ellipsis;
}
.countPrice {
@@ -501,13 +523,13 @@
width: 40rpx;
height: 40rpx;
position: absolute;
- top: 0;
- right: 0;
+ top: 20rpx;
+ right: 26rpx;
}
.delIcon image {
- width: 40rpx;
- height: 40rpx;
+ width: 50rpx;
+ height: 50rpx;
}
.popupBox {
@@ -536,7 +558,10 @@
color: #ffffff;
margin-top: 24rpx;
}
-
+.discountBox{
+ max-height: 350rpx;
+ overflow: auto;
+}
.popupImg {
width: 540rpx;
height: 148rpx;
@@ -605,4 +630,11 @@
justify-content: center;
align-items: center;
margin-top: 24rpx;
+}
+.bottomHint{
+ background-color: #f1f2f4;
+ font-size: 24rpx;
+ color: gray;
+ display: flex;
+ justify-content: center;
}
\ No newline at end of file
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 278eac6..b8693e6 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -1,17 +1,20 @@
<!--index.wxml-->
-<view class="storeLogo">
- <image src=""></image>
-</view>
-<view class="storeName">
- 掌上商城
+<view class="container">
+<view class="top">
+ <view class="storeLogo">
+ <image src=""></image>
+ </view>
+ <view class="storeName">
+ 掌上商城
+ </view>
+ <button open-type="getUserInfo" bindgetuserinfo="bindGetUserInfo">授权登录</button>
</view>
- <button open-type="getUserInfo" bindgetuserinfo="bindGetUserInfo" >授权登录</button>
-<view class="hint">
- <view class="hintTop">用心服务于人民 严格要求保证质量</view>
- <view class="hintBottom">
- 做到货真价实 诚信经营 诚信合作
+<view class="bottom">
+ <view class="hint">
+ <view class="hintTop">用心服务于人民 严格要求保证质量</view>
+ <view class="hintBottom">
+ 做到货真价实 诚信经营 诚信合作
+ </view>
</view>
-
-
-
+</view>
</view>
\ No newline at end of file
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index e4c37b3..052ec5a 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -1,15 +1,10 @@
/**index.wxss**/
-.container{
- width: 100%;
- height: 100%;
-}
.storeLogo {
width: 200rpx;
height: 200rpx;
border-radius: 34px;
background: #719df0;
margin: 0 auto;
- margin-top: 240rpx;
}
.storeName {
@@ -36,5 +31,20 @@
line-height: 42rpx;
letter-spacing: 1rpx;
margin: 0 auto;
- margin-top: 726rpx;
+}
+.container{
+ width: 100%;
+ height: 100%;
+ padding-top: 240rpx;
+ box-sizing: border-box;
+}
+.top{
+ width: 100%;
+ height: 80%;
+ justify-content: center;
+}
+.bottom{
+ width: 100%;
+ height: 20%;
+ justify-content: center;
}
\ No newline at end of file
diff --git a/pages/integral-order/integral-order.js b/pages/integral-order/integral-order.js
index 9b205b9..54027b0 100644
--- a/pages/integral-order/integral-order.js
+++ b/pages/integral-order/integral-order.js
@@ -3,18 +3,11 @@ let method = require("../../utils/reuqest.js");
const util = require("../../utils/util.js");
Page({
data: {
- userData: {
- address: '请选择收货地址'
- },
+ userData: "",
data: '', //配送时间
startTime: '',
// endTime: '',
- cartList: [{
- url: '/images/1.jpg',
- name: '鲜切泰国桃子',
- detail: '果肉饱满，香甜可口',
- price: '25'
- }],
+ cartList: [],
goodsData: '',
show: false,
currentDate: '12:00',
@@ -97,8 +90,9 @@ Page({
let index = wx.getStorageSync('addIndex')
method.getRequest("/address", data => {
if (data.statusCode == 0) {
+ let list=data.data.reverse();
this.setData({
- userData: data.data[index],
+ userData: list[index],
})
}
})
@@ -140,6 +134,7 @@ Page({
this.setData({
goodsData: data.data
})
+ console.log(this.data.goodsData,'goods')
}
})
},
@@ -197,6 +192,12 @@ Page({
},
//商品-生成订单
creatOrder() {
+ if(this.data.userData==undefined){
+ wx.showToast({
+ title: '请选择收货地址',
+ icon:'none'
+ })
+ }
let postData = {
addressId: this.data.userData.id,
couponId: "",
@@ -266,6 +267,7 @@ Page({
skuId: defaultSku
})
this.getAddress()
+
},
/**
@@ -279,7 +281,7 @@ Page({
* 生命周期函数--监听页面显示
*/
onShow: function () {
- this.getList();
+ // this.getList();
this.getAddress();
this.getDayTime(); //配送时间 获取当天时间
},
diff --git a/pages/integral-order/integral-order.wxml b/pages/integral-order/integral-order.wxml
index 2bc755a..56ebb6f 100644
--- a/pages/integral-order/integral-order.wxml
+++ b/pages/integral-order/integral-order.wxml
@@ -1,36 +1,26 @@
<!--pages/affirm-order/affirm-order.wxml-->
<view class="container">
<!-- 地址 -->
- <view class="address" bindtap="emit">
- <view class="userName">{{userData.name}}</view>
- <view class="userTell">{{userData.phone}}</view>
- <view class="default" wx:if="{{userData.delFlag==1}}">默认</view>
- <view class="userAddress">{{userData.area}}{{userData.address}}</view>
+ <view class="address" bindtap="emit">
+ <view class="address_content_left">
+ <view>
+ <view class="userName">{{userData.name}}</view>
+ <view class="userTell">{{userData.phone}}</view>
+ <view class="default" wx:if="{{userData.delFlag==1}}">默认</view>
+ </view>
+ <view class="userAddress">{{userData.area}}{{userData.address}}</view>
+ </view>
+ <view wx:if="{{userData==''}}" class="noAdd">
+ 请选择收货地址
+ </view>
<view class="arrow">
<image src="/images/04-01/arrow.png"></image>
</view>
</view>
<!-- 配送时间 -->
<view class="timeBox">
- <!-- <view class="text" bindtap="selectTime">
- <view class="startTime">
- <picker mode="time" value="{{startTime}}" start="09:01" end="21:01" bindchange="bindStartTimeChange">
- <view class="picker">
- 请选择配送时间：{{startTime}}
- </view>
- </picker>
- </view>
- <view class="endTime">
- <picker mode="time" value="{{endTime}}" start="09:01" end="21:01" bindchange="bindEndTimeChange">
- <view class="pickerEndTime">
- -
- {{endTime}}
- </view>
- </picker>
- </view>
- </view> -->
<view class="section">
- <picker mode="date" value="{{date}}" start="{{startTime}}" bindchange="bindDateChange">
+ <picker mode="date" value="{{date}}" start="{{startTime}}" bindchange="bindDateChange">
<view class="picker">
配送时间: {{date}}
</view>
@@ -39,13 +29,8 @@
</view>
<!-- 商品列表 -->
<view class="cartList">
- <view class="cartListItem" wx:for="{{cartList}}">
- <!-- <view class="itemLeft">
- <view data-type="{{checkType}}" bindtap="checkEvent" data-index="{{index}}">
- <image src="/images/04-01/uncheck.png" wx:if="{{checkType==1}}"></image>
- <image src="/images/04-01/check.png" wx:if="{{checkType==0}}"></image>
- </view>
- </view> -->
+ <!-- <view class="cartListItem" wx:for="{{cartList}}"> -->
+ <view class="cartListItem">
<view class="itemRight">
<view class="productPic">
<image src="{{goodsData.goodsImg}}"></image>
@@ -56,13 +41,6 @@
<view class="productPrice">
<view class="price">￥{{goodsData.goodsPrice}}</view>
<view class="num">
- <!-- <view class="reduce" catchtap="dec">
- <image src="/images/04-01/reduce.png"></image>
- </view>
- <view class="numContent">{{count}}</view>
- <view class="add" catchtap="add">
- <image src="/images/04-01/add.png"></image>
- </view> -->
<view>X{{count}}</view>
</view>
</view>
@@ -73,7 +51,8 @@
<!-- 买家留言 -->
<view class="messageBox">
<view class="messageTitle">买家留言:</view>
- <textarea name="" id="" cols="30" rows="10" value="{{content}}" placeholder="留言建议提前协商50字之内" maxlength="50" bindinput="userInput"></textarea>
+ <textarea name="" id="" cols="30" rows="10" value="{{content}}" placeholder="留言建议提前协商50字之内" maxlength="50"
+ bindinput="userInput"></textarea>
<view class="numLength">{{length}}/50</view>
</view>
<!-- 优惠券 -->
diff --git a/pages/integral-order/integral-order.wxss b/pages/integral-order/integral-order.wxss
index 6cd4c7b..c729f78 100644
--- a/pages/integral-order/integral-order.wxss
+++ b/pages/integral-order/integral-order.wxss
@@ -9,17 +9,25 @@
margin-bottom: 130rpx;
}
+
/* 地址 */
+.noAdd {
+ width: 300rpx;
+ position: absolute;
+ top: 76rpx;
+ font-weight: 600;
+ font-size: 32rpx;
+ color: #323233;
+}
+
.address {
- width: 686rpx;
- /* height: 200rpx; */
- background-color: #ffffff;
- margin: 0 auto;
+ width: 90%;
+ margin-left: 5%;
+ background: #fff;
border-radius: 16rpx;
- padding: 32rpx 28rpx 32rpx 36rpx;
+ display: flex;
+ padding: 32rpx 0 32rpx 32rpx;
box-sizing: border-box;
- position: relative;
-
}
.userName {
@@ -67,15 +75,14 @@
text-align: left;
color: #6c6c6d;
line-height: 40rpx;
- margin-top: 16rpx;
+ margin-top: 12rpx;
}
.arrow {
- width: 32rpx;
- height: 32rpx;
- position: absolute;
- top: 65rpx;
- left: 626rpx;
+ width: 15%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
}
.arrow image {
diff --git a/pages/look-logistics/look-logistics.js b/pages/look-logistics/look-logistics.js
index e1c2479..fbad545 100644
--- a/pages/look-logistics/look-logistics.js
+++ b/pages/look-logistics/look-logistics.js
@@ -3,6 +3,7 @@ let method = require("../../utils/reuqest.js")
let list = [];
Page({
data: {
+ orderId:'', //订单id
postData: {
name: '泰国桃子',
detail: '果肉饱满，香甜可口',
@@ -35,7 +36,12 @@ Page({
],
list:[]
},
-
+ //申请退款
+ refund(){
+ wx.redirectTo({
+ url: '/pages/apply-after-sale/apply-after-sale?orderid='+this.data.orderId,
+ })
+ },
/**
* 生命周期函数--监听页面加载
*/
@@ -48,6 +54,7 @@ Page({
if (data.statusCode == 0) {
this.setData({
postData: data.data,
+ orderId:options.orderId,
//dataVoList: JSON.parse(JSON.stringify((data.data.dataVoList).Traces).replace(/AcceptStation/g,'desc')),
dataVoList: JSON.parse(data.data.dataVoList).Traces
})
diff --git a/pages/look-logistics/look-logistics.wxml b/pages/look-logistics/look-logistics.wxml
index 85d88eb..4b5de5f 100644
--- a/pages/look-logistics/look-logistics.wxml
+++ b/pages/look-logistics/look-logistics.wxml
@@ -47,7 +47,7 @@
</van-steps>
</view>
<!-- bottom -->
- <view class="bottomBox">
+ <view class="bottomBox" bindtap="refund">
<view class="btn">申请退款</view>
</view>
</view>
\ No newline at end of file
diff --git a/pages/my-collect/my-collect.js b/pages/my-collect/my-collect.js
index 7e0ec95..ae496c5 100644
--- a/pages/my-collect/my-collect.js
+++ b/pages/my-collect/my-collect.js
@@ -6,30 +6,30 @@ Page({
list: [],
},
//商品详情
- goDetail(e){
- let goodsId=e.currentTarget.dataset.goodid;
- console.log(e,'e')
- console.log(goodsId,'goodsi')
- wx.navigateTo({
- url: '/pages/product-detail/product-detail?id='+goodsId,
- })
+ goDetail(e) {
+ let goodsId = e.currentTarget.dataset.goodid;
+ console.log(e, 'e')
+ console.log(goodsId, 'goodsi')
+ wx.navigateTo({
+ url: '/pages/product-detail/product-detail?id=' + goodsId,
+ })
},
//删除
- del(e){
- let that=this;
+ del(e) {
+ let that = this;
wx.showModal({
title: '提示',
content: '确定取消收藏该商品吗？',
- success (res) {
+ success(res) {
if (res.confirm) {
- that.handleDeleteProduct(e,that)//这是啥在哪出来的，没有这个方法没这个方法获取不到
+ that.handleDeleteProduct(e, that) //这是啥在哪出来的，没有这个方法没这个方法获取不到
} else if (res.cancel) {
-
+
}
}
})
},
- handleDeleteProduct: function (e,that) {
+ handleDeleteProduct: function (e, that) {
let list = that.data.list;
let idx = e.currentTarget.dataset.delindex;
let id = e.currentTarget.dataset.id
@@ -53,6 +53,7 @@ Page({
pageSize: 10,
}
method.postRequest("/myUser/myCollection", postData, data => {
+ wx.stopPullDownRefresh()
if (data.statusCode == 0) {
this.setData({
list: data.data
@@ -96,15 +97,29 @@ Page({
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
+ onRefresh() {
+ this.setData({
+ page:1,
+ list:[]
+ })
+ this.getCollect();
+ },
onPullDownRefresh: function () {
-
+ this.onRefresh()
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
-
+ this.setData({
+ bottomHint: true
+ })
+ setTimeout(() => {
+ this.setData({
+ bottomHint: false
+ })
+ }, 2000)
},
/**
diff --git a/pages/my-collect/my-collect.json b/pages/my-collect/my-collect.json
index 659f05b..dfb1869 100644
--- a/pages/my-collect/my-collect.json
+++ b/pages/my-collect/my-collect.json
@@ -2,5 +2,6 @@
"usingComponents": {
"van-card": "@vant/weapp/card/index"
},
- "navigationBarTitleText": "我的收藏"
+ "navigationBarTitleText": "我的收藏",
+ "enablePullDownRefresh": true
}
\ No newline at end of file
diff --git a/pages/my-collect/my-collect.wxml b/pages/my-collect/my-collect.wxml
index 11044ed..7ea0465 100644
--- a/pages/my-collect/my-collect.wxml
+++ b/pages/my-collect/my-collect.wxml
@@ -1,11 +1,12 @@
<!--pages/my-collect/my-collect.wxml-->
<view class="container">
<view class="main">
- <view class="main_item" wx:for="{{list}}" data-index="{{index}}" catchtap="goDetail" data-goodid="{{item. goodsId}}">
+ <view class="main_item" wx:for="{{list}}" data-index="{{index}}" catchtap="goDetail"
+ data-goodid="{{item. goodsId}}">
<movable-area>
<movable-view damping="100" direction="horizontal" x="{{x}}" animation="false" bindchange="handleMovableChange"
capture-bind:touchstart="handleTouchestart" capture-bind:touchend="handleTouchend">
- <view class="main_item_content " >
+ <view class="main_item_content ">
<!-- <van-card num="{{item.num}}" price="{{item.goodsPrice}}" desc="{{item.goodsAttributes}}" title="{{item.goodsName}}" thumb="{{item.goodsImg}}" /> -->
<view class="left">
<image src="{{item.goodsImg}}"></image>
@@ -20,8 +21,18 @@
</movable-area>
<view class="delete_btn ">
<view class="delete_mask" data-delIndex="{{index}} " catchtap="del" data-id="{{item.id}}">删除</view>
- <view class="delete_btn " data-delIndex="{{index}} " data-id="{{item.id}}">删除</view>
+ <view class="delete_btn " data-delIndex="{{index}} " data-id="{{item.id}}">删除</view>
</view>
</view>
+ <view class="bottomHint" wx:if="{{bottomHint}}">
+ 我是有底线的~
+</view>
+ <view wx:if="{{list.length==0}}" class="noDataBox">
+ <view class="noDataPic">
+ <image src="/images/message@2x.png"></image>
+ </view>
+ <view class="noDataText">这里已经空空如也~</view>
+
+ </view>
</view>
-</view>
\ No newline at end of file
+</view>
diff --git a/pages/my-collect/my-collect.wxss b/pages/my-collect/my-collect.wxss
index aa5f60a..f9f61ed 100644
--- a/pages/my-collect/my-collect.wxss
+++ b/pages/my-collect/my-collect.wxss
@@ -143,4 +143,32 @@ movable-view {
position: absolute;
bottom: 68rpx;
left: 0;
+}
+/* 没有收藏商品 */
+.noDataBox{
+ margin-top: 200rpx;
+}
+.noDataPic{
+ width: 200rpx;
+ height: 200rpx;
+ margin: 0 auto;
+}
+.noDataPic image{
+ width: 200rpx;
+ height: 200rpx;
+}
+.noDataText{
+ width: 750rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ font-size: 28rpx;
+ color: #8e8e8e;
+}
+.bottomHint{
+ font-size: 24rpx;
+ color: gray;
+ display: flex;
+ justify-content: center;
+ padding-bottom: 10rpx;
}
\ No newline at end of file
diff --git a/pages/my-member/my-member.wxml b/pages/my-member/my-member.wxml
index 7651d57..864c594 100644
--- a/pages/my-member/my-member.wxml
+++ b/pages/my-member/my-member.wxml
@@ -38,7 +38,7 @@
</view>
<!-- 会员卡详情 -->
<view class="cardDetail" wx:if="{{vip}}">
- <image src="/images/card.png" mode="widthFix"></image>
+ <image src="/images/card.png" ></image>
<!-- content -->
<view class="cardBox">
<view class="headPic">
diff --git a/pages/my-member/my-member.wxss b/pages/my-member/my-member.wxss
index 9ab3b3c..01cc6c8 100644
--- a/pages/my-member/my-member.wxss
+++ b/pages/my-member/my-member.wxss
@@ -1,6 +1,6 @@
/* pages/my-member/my-member.wxss */
.topLine {
- width: 750px;
+ width: 100%;
height: 2rpx;
background: #f2f2f2;
}
@@ -144,13 +144,14 @@
/* 会员卡详情 */
.cardDetail {
- width: 750rpx;
- height: 1448rpx;
+ width: 100%;
+ height: 100%;
+ overflow: hidden;
}
.cardDetail image {
- width: 750rpx;
- height: 1448rpx;
+ width: 100%;
+ height: 100%;
}
.cardBox {
@@ -239,4 +240,11 @@
display: flex;
align-items: center;
justify-content: center;
+}
+.bottomHint{
+ font-size: 24rpx;
+ color: gray;
+ display: flex;
+ justify-content: center;
+ padding-bottom: 10rpx;
}
\ No newline at end of file
diff --git a/pages/order-detail/order-detail.js b/pages/order-detail/order-detail.js
index c1c55ef..aa55398 100644
--- a/pages/order-detail/order-detail.js
+++ b/pages/order-detail/order-detail.js
@@ -2,24 +2,13 @@
let method = require("../../utils/reuqest.js")
Page({
data: {
+ flag:false, //判断是否为退款订单
+ refoundStatus:'',
goodsId:'',
userData: {
- name: '陈先生',
- tell: '12345678910',
- address: '天津市南开区阳光100'
},
requestData: {},
- cartList: [{
- url: '/images/1.jpg',
- name: '鲜切泰国桃子',
- detail: '果肉饱满，香甜可口',
- price: '25'
- }, {
- url: '/images/1.jpg',
- name: '鲜切泰国桃子',
- detail: '果肉饱满，香甜可口',
- price: '250'
- }],
+ cartList: [],
num: '2222',
discountText: '满3减1满3减1',
allMoney: '4.00',
@@ -36,8 +25,14 @@ Page({
if (data.statusCode == 0) {
this.setData({
requestData:data.data,
- goodsId:data.data.listGoodsVoList[0].goodsId
+ goodsId:data.data.listGoodsVoList[0].goodsId,
+ // refoundStatus:this.data.requestData.returnVos[0].status
})
+ let status=this.data.requestData.returnVos[0].status
+ this.setData({
+ refoundStatus:status
+ })
+ console.log(this.data.requestData.returnVos[0].status)
}
})
},
@@ -53,6 +48,11 @@ Page({
*/
onLoad: function (options) {
let orderId = options.orderId
+ if(options.flag){
+ this.setData({
+ flag:true
+ })
+ }
if(options.orderId){
this.orderDetail(orderId)
}else{
diff --git a/pages/order-detail/order-detail.wxml b/pages/order-detail/order-detail.wxml
index e85b32c..e23457d 100644
--- a/pages/order-detail/order-detail.wxml
+++ b/pages/order-detail/order-detail.wxml
@@ -1,14 +1,19 @@
<!--pages/order-detail/order-detail.wxml-->
<view class="container">
+ <view class="refundStatus" wx:if="{{flag}}">
+ <view class="inner" data-status="{{refoundStatus}}">
+ <view wx:if="{{refoundStatus==1}}">退款中</view>
+ <view wx:if="{{refoundStatus==2}}">审核失败</view>
+ <view wx:if="{{refoundStatus==3}}">审核通过</view>
+ </view>
+
+ </view>
<!-- 地址 -->
<view class="address">
<view class="userName">{{requestData.receiverName}}</view>
<view class="userTell">{{requestData.receiverPhone}}</view>
<view class="default">默认</view>
<view class="userAddress">{{requestData.receiverDetailAddress}}</view>
- <view class="arrow">
- <image src="/images/04-01/arrow.png"></image>
- </view>
</view>
<!-- 配送时间 -->
<!-- <view class="timeBox">
@@ -85,10 +90,6 @@
<view>{{requestData.payAmount}}</view>
</view>
</view>
- <!-- 退款状态 -->
- <view wx:if="{{requestData.returnVos[0].status==1}}" class="itemBox">
- <image src="/images/refund.png"></image>
- </view>
</view>
<!-- 再次购买 -->
<view class="bottomBox">
diff --git a/pages/order-detail/order-detail.wxss b/pages/order-detail/order-detail.wxss
index 09e6822..3327a74 100644
--- a/pages/order-detail/order-detail.wxss
+++ b/pages/order-detail/order-detail.wxss
@@ -1,7 +1,8 @@
/* pages/order-detail/order-detail.wxss */
-page{
+page {
background: #f1f2f4;
}
+
.container {
width: 750rpx;
background: #f1f2f4;
@@ -11,18 +12,28 @@ page{
}
/* 退款状态 */
-
-.itemBox{
- width: 154rpx;
- height: 154rpx;
- position: absolute;
- bottom: 0;
- right: 15px;
+.refundStatus {
+ width: 750rpx;
+ height: 124rpx;
+ background-color: #fb7600;
+ color: #323233;
+ font-weight: 600;
+ padding-top: 20rpx;
+ box-sizing: border-box;
+ margin-bottom: 24rpx;
}
-.itemBox image{
- width: 154rpx;
- height: 154rpx;
+
+.inner {
+ width: 686rpx;
+ height: 80rpx;
+ margin: 0 auto;
+ background-color: #ffffff;
+ border-radius: 16rpx;
+ display: flex;
+ align-items: center;
+ padding-left: 30rpx;
}
+
/* 地址 */
.address {
width: 686rpx;
@@ -398,7 +409,7 @@ textarea {
}
.content .icon {
- margin-right: -8rpx;
+ margin-right: -2rpx;
}
/* bottom */
diff --git a/pages/product-detail/product-detail.js b/pages/product-detail/product-detail.js
index ac27b43..e054697 100644
--- a/pages/product-detail/product-detail.js
+++ b/pages/product-detail/product-detail.js
@@ -11,6 +11,10 @@ Page({
}],
time: '', //倒计时
timeData: '',
+ hour: "",
+ minute: "",
+ second: "",
+ endTimess:'',
goodsData: '',
productName: '三好龙虾 招牌泼油小龙虾',
price: '￥688.00',
@@ -19,13 +23,7 @@ Page({
infoList: [], //评价
image: '', //评价图片
flags: true,
- deacArray: [{
- img: '/images/1.jpg'
- }, {
- img: '/images/1.jpg'
- }, {
- img: '/images/1.jpg'
- }],
+ deacArray: [],
flag: 1,
showMask: false,
showMaskTwo: false,
@@ -52,10 +50,11 @@ Page({
let date = null;
method.getRequest('/goods/getActivity', data => {
if (data.statusCode == 0) {
- startTime = Date.parse(data.data.startDate);
+ startTime = new Date().getTime();
endTime = Date.parse(data.data.endDate);
date = (Number(endTime) - Number(startTime));
this.setData({
+ endTimess:endTime,
time: date
})
var str2 = toString(date / 1000 / 3600);
@@ -64,6 +63,27 @@ Page({
}
})
},
+ demoDown() {
+ this.setData({
+ timer: setInterval(() => {
+ let that = this;
+ let startTime = new Date().getTime();
+ let date = (Number(this.data.endTimess) - Number(startTime));
+ this.setData({
+ time: date
+ })
+ let downTime = Number(that.data.time);
+ var hour = parseInt(downTime / 1000 / 60 / 60) < 10 ? "0" + parseInt(downTime / 1000 / 60 / 60) : parseInt(downTime / 1000 / 60 / 60);
+ var minute = parseInt(downTime / 1000 / 60 % 60) < 10 ? "0" + parseInt(downTime / 1000 / 60 % 60) : parseInt(downTime / 1000 / 60 % 60)
+ var second = parseInt(downTime / 1000 % 60) < 10 ? "0" + parseInt(downTime / 1000 % 60) : parseInt(downTime / 1000 % 60)
+ this.setData({
+ hour: hour,
+ minute: minute,
+ second: second
+ })
+ }, 1000)
+ })
+ },
//banner商品加载
bannerList(url) {
method.getRequest(url, data => {
@@ -147,7 +167,7 @@ Page({
goodsData: data
})
}
- method.getRequest("/myUser/myCollection/" + this.data.id, data => {
+ method.getRequest("/myUser/myCollection/" + this.data.goodsId, data => {
if (data.statusCode == 0) {
} else {
@@ -201,6 +221,18 @@ Page({
})
console.log(skuId, 'id')
},
+ //在线客服
+ myKefu() {
+ wx.makePhoneCall({
+ phoneNumber: '111111111000',
+ success() {
+ console.log('拨打电话成功')
+ },
+ fail() {
+ console.log('拨打电话失败')
+ }
+ })
+ },
//加入购物车
addCart() {
this.setData({
@@ -421,6 +453,9 @@ Page({
*/
onShow: function () {
this.countDown() //获取优惠剩余时间
+ setTimeout(() => {
+ this.demoDown();
+ }, 200)
},
/**
diff --git a/pages/product-detail/product-detail.wxml b/pages/product-detail/product-detail.wxml
index a25f510..f0dad4a 100644
--- a/pages/product-detail/product-detail.wxml
+++ b/pages/product-detail/product-detail.wxml
@@ -7,7 +7,7 @@
<swiper class="swiper" indicator-dots="true" autoplay="true" interval="5000" duration="1000">
<block wx:for="{{swiperArray}}" wx:for-index="idx">
<swiper-item>
- <image src="{{item}}" class="slideImage" ></image>
+ <image src="{{item}}" class="slideImage"></image>
</swiper-item>
</block>
</swiper>
@@ -16,13 +16,11 @@
<text class="countDownTxt">距结束仅剩</text>
<!-- 倒计时 -->
<view class="countTime">
- <van-count-down use-slot time="{{ time }}" bind:change="onChange1">
- <text class="item">{{ timeData.hours }}</text>:
- <text style="color:#FF593C">:</text>
- <text class="item">{{ timeData.minutes }}</text>:
- <text style="color:#FF593C">:</text>
- <text class="item">{{ timeData.seconds }}</text>
- </van-count-down>
+ <view class="textss">{{hour}}</view>
+ <view class="maohao">:</view>
+ <view class="textss">{{minute}}</view>
+ <view class="maohao">:</view>
+ <view class="textss">{{second}}</view>
</view>
</view>
</view>
@@ -74,7 +72,7 @@
</view>
<view class="evaluateDetails">{{item.content}}</view>
<view class="evaluatePic" wx:if="{{item.images}}">
- <view class="picBox" wx:for="{{item.images}}" data-item="data">
+ <view class="picBox" wx:for="{{item.images}}" data-item="data">
<image src="{{item}}"></image>
</view>
</view>
@@ -100,7 +98,7 @@
</view> -->
<view class="bottom">
<view class="bottom_left">
- <view class="bottom_left_item" catchtap="linkKefu">
+ <view class="bottom_left_item" catchtap="myKefu">
<image src="/images/01-03/kefu.png"></image>
<view>客服</view>
</view>
diff --git a/pages/product-detail/product-detail.wxss b/pages/product-detail/product-detail.wxss
index d873b0d..7f7f926 100644
--- a/pages/product-detail/product-detail.wxss
+++ b/pages/product-detail/product-detail.wxss
@@ -115,9 +115,10 @@
font-weight: 500;
text-align: left;
color: #ffffff;
- line-height: 82rpx;
padding-left: 32rpx;
box-sizing: border-box;
+ display: flex;
+ align-items: center;
}
.countDownTxt {
@@ -130,8 +131,33 @@
height: 40rpx;
margin-left: -20rpx;
}
-
-.item {
+.countTime {
+ display:flex;
+ /* width: 192rpx; */
+ /* background-color: #9b74fb; */
+ height: 40rpx;
+ margin-left: -20rpx;
+}
+.countTime .maohao{
+ color: rgba(95, 0, 0, 0.8);
+ width: 20rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ padding-bottom: 10rpx;
+}
+.countTime .textss {
+ width: 40rpx;
+ height: 40rpx;
+ background: rgba(95, 0, 0, 0.8);
+ border-radius: 8rpx;
+ font-size: 26rpx;
+ color: #ffffff;
+ display: flex;
+ justify-content: center;
+ box-sizing: border-box;
+}
+/* .item {
display: inline-block;
width: 40rpx;
color: #fff;
@@ -141,7 +167,7 @@
border-radius: 8rpx;
margin-right: 6rpx;
margin-left: 6rpx;
-}
+} */
/* 请选择 */
.selectMain {
@@ -553,7 +579,7 @@ button {
left: 0;
border-radius: 10rpx 10rpx 0 0;
background: #fff;
- padding: 30rpx 32rpx 0;
+ padding: 30rpx 32rpx ;
box-sizing: border-box;
max-height: 94%;
overflow-y: auto;
@@ -698,10 +724,12 @@ button {
.confrimBtn {
height: 78rpx;
display: flex;
- background-color: #d12324;
+ background-color: #f16304;
color: #ffffff;
align-items: center;
justify-content: center;
+ border-radius: 36rpx;
+ margin-top: 20rpx;
}
/* 商品明细 */
diff --git a/pages/refund-after/refund-after.js b/pages/refund-after/refund-after.js
index bbaaec7..615c148 100644
--- a/pages/refund-after/refund-after.js
+++ b/pages/refund-after/refund-after.js
@@ -6,122 +6,15 @@ Page({
active: 2,
status: '',
orederId: '',
- goodsid:'',
+ goodsid: '',
tabList: [],
- totalList: [{
- text: '待付款',
- number: '22416545878874455',
- status: 0,
- url: '/images/1.jpg',
- name: '鲜切泰国桃子',
- detail: '果肉饱满，香甜可口',
- price: '25',
- num: '2',
- totalMoney: '8.00',
- carriage: '4',
- btnTxtOne: '立即支付',
- btnTxtTwo: '取消订单'
- }, {
- text: '待收货',
- number: '22416545878874455',
- status: 1,
- url: '/images/1.jpg',
- name: '鲜切泰国桃子',
- detail: '果肉饱满，香甜可口',
- price: '25',
- num: '2',
- totalMoney: '8.00',
- carriage: '4',
- btnTxtOne: '再次购买',
- btnTxtTwo: '申请退款'
- }, {
- text: 2,
- number: '22416545878874455',
- status: 3,
- url: '/images/1.jpg',
- name: '鲜切泰国桃子',
- detail: '果肉饱满，香甜可口',
- price: '25',
- num: '2',
- totalMoney: '8.00',
- carriage: '4',
- btnTxtOne: '确认收货',
- btnTxtTwo: '申请退款',
- btnTxtThree: '查看物流'
- }, {
- text: 4,
- number: '22416545878874455',
- status: 5,
- url: '/images/1.jpg',
- name: '鲜切泰国桃子',
- detail: '果肉饱满，香甜可口',
- price: '25',
- num: '2',
- totalMoney: '8.00',
- carriage: '4',
- btnTxtOne: '立即评价',
- btnTxtTwo: '申请退款',
- btnTxtThree: '再次购买'
- }],
- payList: [{
- text: '待付款',
- number: '22416545878874455',
- status: '待付款',
- url: '/images/1.jpg',
- name: '鲜切泰国桃子',
- detail: '果肉饱满，香甜可口',
- price: '25',
- num: '2',
- totalMoney: '8.00',
- carriage: '4',
- btnTxtOne: '立即支付',
- btnTxtTwo: '取消订单'
- }],
- sendList: [{
- text: '待发货',
- number: '22416545878874455',
- status: '待发货',
- url: '/images/1.jpg',
- name: '鲜切泰国桃子',
- detail: '果肉饱满，香甜可口',
- price: '25',
- num: '2',
- totalMoney: '8.00',
- carriage: '4',
- btnTxtOne: '再次购买',
- btnTxtTwo: '申请退款'
- }],
- evaluateList: [{
- text: '待评价',
- number: '22416545878874455',
- status: '待评价',
- url: '/images/1.jpg',
- name: '鲜切泰国桃子',
- detail: '果肉饱满，香甜可口',
- price: '25',
- num: '2',
- totalMoney: '8.00',
- carriage: '4',
- btnTxtOne: '立即评价',
- btnTxtTwo: '申请退款',
- btnTxtThree: '再次购买'
- }],
- reapList: [{
- text: '待收货',
- number: '22416545878874455',
- status: '待发货',
- url: '/images/1.jpg',
- name: '鲜切泰国桃子',
- detail: '果肉饱满，香甜可口',
- price: '25',
- num: '2',
- totalMoney: '8.00',
- carriage: '4',
- btnTxtOne: '确认收货',
- btnTxtTwo: '申请退款',
- btnTxtThree: '查看物流'
- }],
- orderid: ''
+ totalList: [],
+ payList: [],
+ sendList: [],
+ evaluateList: [],
+ reapList: [],
+ orderid: '',
+ bottomHint: false //触底提示
},
// 导航切换事件
onClick: function (e) {
@@ -145,37 +38,13 @@ Page({
}
},
//订单详情
- orderDetail(e){
- let orderId=e.currentTarget.dataset.orderid
- wx.navigateTo({
- url: '/pages/order-detail/order-detail?orderId='+orderId,
- })
+ orderDetail(e) {
+ let orderId = e.currentTarget.dataset.orderid
+ wx.navigateTo({
+ url: '/pages/order-detail/order-detail?orderId=' + orderId + "&flag=" + "true",
+ })
},
- //订单状态
- // orderStatus(status) {
- // switch (status) {
- // case 0:
- // this.setData({
- // status: '待付款'
- // })
- // break;
- // case 1:
- // this.setData({
- // status: '待发货'
- // })
- // break;
- // case 2:
- // this.setData({
- // status: '待收货'
- // })
- // break;
- // case 3:
- // this.setData({
- // status: '待评价'
- // })
- // break;
- // }
- // },
+
//全部订单
allOrder() {
let postData = {
@@ -259,6 +128,7 @@ Page({
type: 6
}
method.postRequest("/order/list", postData, data => {
+ wx.stopPullDownRefresh()
if (data.statusCode == 0) {
this.setData({
tabList: data.data
@@ -329,7 +199,7 @@ Page({
refund(e) {
let orderid = e.currentTarget.dataset.orderid;
wx.navigateTo({
- url: '/pages/apply-after-sale/apply-after-sale?orderid=' +orderid,
+ url: '/pages/apply-after-sale/apply-after-sale?orderid=' + orderid,
})
},
//再次购买
@@ -373,14 +243,14 @@ Page({
evaluate() {
let orderId = e.currentTarget.dataset.orderid
wx.navigateTo({
- url: '/pages/evaluate/evaluate?goodsid'+goodsId,
+ url: '/pages/evaluate/evaluate?goodsid' + goodsId,
})
},
//查看物流
- logistics(){
- wx.navigateTo({
- url: '/pages/look-logistics/look-logistics',
- })
+ logistics() {
+ wx.navigateTo({
+ url: '/pages/look-logistics/look-logistics',
+ })
},
onLoad: function (options) {
let that = this;
@@ -431,15 +301,29 @@ Page({
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
+ onRefresh() {
+ this.setData({
+ page: 1,
+ tabList: []
+ })
+ this.refunds();
+ },
onPullDownRefresh: function () {
-
+ this.onRefresh()
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
-
+ this.setData({
+ bottomHint: true
+ })
+ setTimeout(() => {
+ this.setData({
+ bottomHint: false
+ })
+ }, 2000)
},
/**
diff --git a/pages/refund-after/refund-after.json b/pages/refund-after/refund-after.json
index 5140917..342a8e1 100644
--- a/pages/refund-after/refund-after.json
+++ b/pages/refund-after/refund-after.json
@@ -3,5 +3,6 @@
"van-tab": "@vant/weapp/tab/index",
"van-tabs": "@vant/weapp/tabs/index"
},
- "navigationBarTitleText": "退款售后"
+ "navigationBarTitleText": "退款售后",
+ "enablePullDownRefresh": true
}
\ No newline at end of file
diff --git a/pages/refund-after/refund-after.wxml b/pages/refund-after/refund-after.wxml
index 5e99a88..8199fd0 100644
--- a/pages/refund-after/refund-after.wxml
+++ b/pages/refund-after/refund-after.wxml
@@ -69,4 +69,7 @@
<view class="frist btnPublic" data-goodsid="{{item.id}}" bindtap="evaluate">立即评价</view>
</view> -->
</view>
+</view>
+<view class="bottomHint" wx:if="{{bottomHint}}">
+ 我是有底线的~
</view>
\ No newline at end of file
diff --git a/pages/refund-after/refund-after.wxss b/pages/refund-after/refund-after.wxss
index bdcf986..fc45e01 100644
--- a/pages/refund-after/refund-after.wxss
+++ b/pages/refund-after/refund-after.wxss
@@ -165,4 +165,11 @@ page{
border: 2rpx solid #fb8319;
color: #FB7600;
}
+.bottomHint{
+ font-size: 24rpx;
+ color: gray;
+ display: flex;
+ justify-content: center;
+ padding-bottom: 10rpx;
+}
diff --git a/pages/shopping-cart/shopping-cart.js b/pages/shopping-cart/shopping-cart.js
index 60bca31..b4a3b1e 100644
--- a/pages/shopping-cart/shopping-cart.js
+++ b/pages/shopping-cart/shopping-cart.js
@@ -4,7 +4,7 @@ const util = require("../../utils/util.js")
Page({
data: {
checkType: 1,
- userData: {},
+ userData: "",
addHint: false, //判断有没有地址
startTime: '', //日历选择获取当天日期
date: '',
@@ -20,12 +20,24 @@ Page({
pitchCart: [], //选中商品
pitchList: [], //选中商品id
hasList: false, // 列表是否有数据
- cartnoData: false, //购物车是否为空
+ cartnoData: "", //购物车是否为空
totalPrice: 0, // 总价，初始为0
selectAllStatus: true, // 全选状态，默认全选
obj: {
name: "hello"
- }
+ },
+ bottomHint: false, //上拉提示
+ },
+ //购物车列表
+ getList() {
+ method.getRequest('/cart', data => {
+ wx.stopPullDownRefresh()
+ if (data.statusCode == 0) {
+ this.setData({
+ carts: data.data,
+ })
+ }
+ })
},
//地址信息
getAddress() {
@@ -308,13 +320,7 @@ Page({
* 生命周期函数--监听页面显示
*/
onShow: function () {
- method.getRequest('/cart', data => {
- if (data.statusCode == 0) {
- this.setData({
- carts: data.data,
- })
- }
- })
+ this.getList();
this.setData({
hasList: true,
carts: [],
@@ -328,13 +334,17 @@ Page({
pitchList: []
})
- setTimeout(() => { //判断购物车是否有商品
+ setTimeout(() => { //判断购物车是否有商品
if (this.data.carts.length == 0) {
this.setData({
cartnoData: true
})
+ } else {
+ this.setData({
+ cartnoData: false
+ })
}
- }, 500)
+ }, 300)
},
@@ -355,15 +365,26 @@ Page({
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
+ onRefresh() {
+ wx.showNavigationBarLoading();
+ this.getList();
+ },
onPullDownRefresh: function () {
-
+ this.onRefresh()
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
-
+ this.setData({
+ bottomHint: true
+ })
+ setTimeout(() => {
+ this.setData({
+ bottomHint: false
+ })
+ }, 2000)
},
/**
diff --git a/pages/shopping-cart/shopping-cart.json b/pages/shopping-cart/shopping-cart.json
index 939e90c..d09f52f 100644
--- a/pages/shopping-cart/shopping-cart.json
+++ b/pages/shopping-cart/shopping-cart.json
@@ -1,5 +1,6 @@
{
"usingComponents": {
},
- "navigationBarTitleText": "购物车"
+ "navigationBarTitleText": "购物车",
+ "enablePullDownRefresh": true
}
\ No newline at end of file
diff --git a/pages/shopping-cart/shopping-cart.wxml b/pages/shopping-cart/shopping-cart.wxml
index 6ab3d47..60bce3a 100644
--- a/pages/shopping-cart/shopping-cart.wxml
+++ b/pages/shopping-cart/shopping-cart.wxml
@@ -2,15 +2,20 @@
<view class="container">
<!-- 地址 -->
<view class="userInfo" bindtap="goAddress1">
- <view class="addHint" wx:if="{{addHint==false}}">
+ <!-- <view class="addHint" wx:if="{{addHint==false}}">
<view class="addItem1">暂未获取到收获地址</view>
<view class="addItem2"> 请选择收货地址</view>
- </view>
- <view wx:if="{{addHint==true}}">
- <view class="userName">{{userData.name}}</view>
- <view class="userTell">{{userData.phone}}</view>
- <view class="default" wx:if="{{userData.delFlag==1}}">默认</view>
- <view class="userAddress">{{userData.area}}{{userData.address}}</view>
+ </view> -->
+ <view>
+ <view wx:if="{{userData!==''}}">
+ <view class="userName">{{userData.name}}</view>
+ <view class="userTell">{{userData.phone}}</view>
+ <view class="default" wx:if="{{userData.delFlag==1}}">默认</view>
+ <view class="userAddress">{{userData.area}}{{userData.address}}</view>
+ </view>
+ <view wx:if="{{userData==''}}" class="noAdd">
+ 请选择收货地址
+ </view>
<view class="arrow">
<image src="/images/04-01/arrow.png"></image>
</view>
@@ -34,8 +39,8 @@
<view class="main">
<view wx:if="{{hasList}}">
<view class="cart-box">
- <view class="cart-list" wx:for="{{carts}}" wx:key="{{index}}" data-goodsid="{{item.goodsId}}"
- bindtap="goDetail" bindlongpress="delGoods" data-index="{{index}}" data-cartId="{{item.cartId}}">
+ <view class="cart-list" wx:for="{{carts}}" wx:key="{{index}}" data-goodsid="{{item.goodsId}}" bindtap="goDetail"
+ bindlongpress="delGoods" data-index="{{index}}" data-cartId="{{item.cartId}}">
<icon wx:if="{{item.selected}}" type="success" color="#FF4903" data-index="{{index}}" class="cart-pro-select"
catchtap="selectList" />
<icon wx:else type="circle" class="cart-pro-select" data-index="{{index}}" catchtap="selectList" />
@@ -52,27 +57,18 @@
<text class="cart-count-add" catchtap="addCount" data-index="{{index}}"
data-goodSkuId="{{item.goodsSkuId}}">+</text>
</view>
-
</view>
</view>
-
- <!-- <view class="cart-footer">
- <icon wx:if="{{selectAllStatus}}" type="success_circle" color="#fff" class="total-select" bindtap="selectAll" />
- <icon wx:else type="circle" color="#fff" class="total-select" bindtap="selectAll" />
- <view class="order-icon">
- <navigator url="../orders/orders">
- <image src="/image/icon3.png"></image>
- </navigator>
- </view>
- <text>全选</text>
- <text class="cart-toatl-price">￥{{totalPrice}}</text>
- </view> -->
</view>
+ <!-- <view wx:if="{{carts.length==0}}"> -->
<view wx:if="{{cartnoData}}">
<view class="cart-no-data">一件商品都没有呢</view>
<view class="cart-no-data-btn" bindtap="goHome">去逛逛</view>
</view>
</view>
+ <view class="bottomHint" wx:if="{{bottomHint}}">
+ 我是有底线的~
+ </view>
<!-- 立即购买 -->
<view class="bottom">
<!-- <view class="checkPic">
diff --git a/pages/shopping-cart/shopping-cart.wxss b/pages/shopping-cart/shopping-cart.wxss
index b5a4eff..c2030d7 100644
--- a/pages/shopping-cart/shopping-cart.wxss
+++ b/pages/shopping-cart/shopping-cart.wxss
@@ -10,29 +10,18 @@ page {
padding-bottom: 120rpx;
}
-.addHint {
- height: 128rpx;
- align-items: center;
- padding-top: 26rpx;
-}
-.addItem1 {
- font-size: 28rpx;
- font-weight: 400;
- text-align: left;
- color: #323233;
- display:block;
-}
-.addItem2{
+
+
+/* 用户信息 */
+.noAdd{
+ width: 300rpx;
font-size: 32rpx;
font-weight: 600;
- text-align: left;
color: #323233;
- margin-top: 20rpx;
+ position: absolute;
+ top: 82rpx;
}
-
-
-/* 用户信息 */
.userInfo {
width: 686rpx;
height: 200rpx;
@@ -520,4 +509,11 @@ page {
line-height: 72rpx;
position: absolute;
left: 518rpx;
+}
+.bottomHint{
+ font-size: 24rpx;
+ color: gray;
+ display: flex;
+ justify-content: center;
+ padding-bottom: 10rpx;
}
\ No newline at end of file
diff --git a/project.config.json b/project.config.json
index cb0e521..042156a 100644
--- a/project.config.json
+++ b/project.config.json
@@ -255,6 +255,14 @@
"id": -1,
"name": "pages/edit-address/edit-address",
"pathName": "pages/edit-address/edit-address",
+ "query": "",
+ "scene": null
+ },
+ {
+ "id": -1,
+ "name": "pages/all-evaluate/all-evaluate",
+ "pathName": "pages/all-evaluate/all-evaluate",
+ "query": "",
"scene": null
}
]