diff --git a/gasStation-uni/pages.json b/gasStation-uni/pages.json
index 2a842ae2c..474b7e88b 100644
--- a/gasStation-uni/pages.json
+++ b/gasStation-uni/pages.json
@@ -320,8 +320,8 @@
{
"path": "myorder/myorder",
"style": {
- "navigationBarTitleText": "我的订单",
- "navigationStyle": "custom"
+ "navigationBarTitleText": "消费记录"
+
}
},
{
@@ -393,4 +393,4 @@
"backgroundColor": "#F8F8F8"
},
"uniIdRouter": {}
-}
+}
\ No newline at end of file
diff --git a/gasStation-uni/pages/my/my.vue b/gasStation-uni/pages/my/my.vue
index 73cab736e..d2108296b 100644
--- a/gasStation-uni/pages/my/my.vue
+++ b/gasStation-uni/pages/my/my.vue
@@ -30,7 +30,7 @@
手机号: xxxxxxxxxxxx
-
+
@@ -56,7 +56,7 @@
{{myPoints || 0 }}
-
+
@@ -71,7 +71,7 @@
每日签到
-
+
@@ -220,12 +220,34 @@
this.getAllOrderList();
},
methods: {
+ goMypages(num) {
+
+ if (num == 1) {
+ uni.navigateTo({
+ url: '/pagesHome/certificate/index'
+ })
+ }
+ if (num == 2) {
+ uni.navigateTo({
+ url: '/pagesHome/QRcode/QRcode'
+ })
+ }
+
+
+ },
goPagesmy(num) {
+ // 签到
if (num == 1) {
uni.navigateTo({
url: '/pagesMy/signIn/index'
})
}
+ //消费记录
+ if (num == 2) {
+ uni.navigateTo({
+ url: '/pagesMy/myorder/myorder'
+ })
+ }
},
// 查询全部充值订单
getAllOrderList() {
@@ -298,12 +320,12 @@
},
goOil() {
uni.navigateTo({
- url: '/pagesMy/oilBalance/oilBalance'
+ url: '/pagesHome/cardDetails/detailed?type=oilCard'
})
},
goMony() {
uni.navigateTo({
- url: '/pagesMy/moneyBalance/moneyBalance'
+ url: '/pagesHome/cardDetails/detailed?type=balance'
})
},
goSetup() {
diff --git a/gasStation-uni/pagesMy/myorder/myorder.vue b/gasStation-uni/pagesMy/myorder/myorder.vue
index df1ad083d..d9ecb9b91 100644
--- a/gasStation-uni/pagesMy/myorder/myorder.vue
+++ b/gasStation-uni/pagesMy/myorder/myorder.vue
@@ -1,124 +1,82 @@
-
-
-
-
-
-
-
-
-
- 搜索
-
-
-
-
- {{item.text}}
-
-
-
+
+
+
-
-
-
-
-
- {{getStoreName(storeList,item.storeId)}}
-
- 已支付
- 支付失败
- 已退款
- 退款中
- 未支付
-
-
-
-
- 订单金额
- ￥{{item.orderAmount}}
-
-
- 优惠合计
- ￥{{item.discountAmount}}
-
-
- 订单时间
- {{item.payTime}}
- {{item.createTime}}
-
-
-
- 去评价
-
-
-
-
- 去评价
-
-
-
-
- 已评价
-
-
-
-
- 去支付
-
-
-
-
-
+ 当前积分
+ {{cardBalance.points || 0}}
+
+
+ 类型筛选
+ 全部时间
+
+
+
+
+
+
+
+
+ {{item.changeReason}}
+ {{item.pointsChange}}
+ -{{item.pointsChange}}
+ 0
-
-
-
-
-
-
-
+
+ 会员积分
+ 余额{{item.currentPoints || 0}}
+
+
+ {{item.storeName}}
+ {{item.createTime}}
+
+
-
+
+
+
+
+
+
+
@@ -128,460 +86,213 @@
export default {
data() {
return {
- title: '',
- tapindex: 0,
- tapList: [{
- text: '全部'
- },
- {
- text: '待支付'
- },
- {
- text: '已完成'
- },
- {
- text: '待评价'
- },
+ query: {
+ chainStoreId: '',
+ couponType: '',
+ useStatus: 0,
+ pageNo: 1,
+ pageSize: 10
+ },
+ cardBalance: {},
+ show: false,
+ show1: false,
+ value1: Number(new Date()),
+ columns: [
+ ['全部类型', '消费有礼', '充值有礼', '积分兑换', '开卡有礼', '邀请有礼', '生日有礼', '推荐会员充值有礼',
+ '推荐会员推荐有礼', '每日签到', '大转盘抽奖', '九宫格抽奖'
+ ]
],
- // 订单列表信息
- orderList: [],
- list: [],
- // 储值卡订单列表信息
- balanceList:[],
- list1: [],
- map: {
- page: 1,
- pageSize: 10,
+ queryParams: {
+ pageNo: 1,
+ pageSize: 30,
+ type: "",
storeId: uni.getStorageSync("storeId"),
- orderStatus: "",
- remark: "",
- payType:uni.getStorageSync("appltType")
+ changeReason: "",
+ startTime: ""
},
- map1: {
- page: 1,
- pageSize: 10,
- status: "",
- },
- // 总条数
- total: 0,
- total1: 0,
- // 店铺列表信息
- storeList: [],
- // 支付状态列表
- payList: [],
- query: "",
- status: 'more', // 状态-正在加载中
- scrollTop: 0,
+ pointsList: [],
+ total: 0
}
},
- onLoad(option) {
- this.tapindex = option.id
- this.getTapIndex(option.id)
- // this.getMyOrder()
- this.getStores()
- // this.getPayList()
- },
onShow() {
- this.getTapIndex(0)
+ this.query.chainStoreId = uni.getStorageSync('chainStoreId');
+ this.getUserBalance()
+ this.getList()
},
- components: {
-
+ onPullDownRefresh() {
+ console.log("刷新");
+ this.pointsList = []
+ this.queryParams = {
+ pageNo: 1,
+ pageSize: 30,
+ type: "",
+ storeId: uni.getStorageSync("storeId"),
+ changeReason: "",
+ startTime: ""
+ }
+ this.getList()
+ },
+ onReachBottom() {
+ // 触底加载
+ if (this.pointsList.length < this.total) {
+ this.queryParams.pageNo++
+ this.getList()
+ }
},
methods: {
- // 搜索我的订单
- queryOrder() {
- let _this = this;
- _this.list = [];
- _this.list1 = [];
- if (_this.query == "") {
- _this.list = _this.orderList
- } else {
- _this.storeList.forEach(item => {
- _this.orderList.forEach(item1 => {
- if (item.name.includes(_this.query)) {
- if (item1.storeId == item.id) {
- _this.list.push(item1)
- }
- return
- }
- if (item.name.includes(_this.query)) {
- if (item1.storeId == item.id) {
- _this.list.push(item1)
- }
- }
- })
- })
- _this.storeList.forEach(item => {
- _this.balanceList.forEach(item1 => {
- if (item.name.includes(_this.query)) {
- if (item1.storeId == item.id) {
- _this.list1.push(item1)
- }
- return
- }
- if (item.name.includes(_this.query)) {
- if (item1.storeId == item.id) {
- _this.list1.push(item1)
- }
- }
- })
- })
- }
- },
- parseTime(dateTime) {
- let date = new Date(dateTime);
- let y = date.getFullYear() + "-";
- let mon = ((date.getMonth() + 1 < 10) ? ('0' + date.getMonth()) : date.getMonth()) + "-";
- let d = ((date.getDate() < 10) ? ('0' + date.getDate()) : date.getDate()) + " ";
- let h = ((date.getHours() < 10) ? ('0' + date.getHours()) : date.getHours()) + ":";
- let m = ((date.getMinutes() < 10) ? ('0' + date.getMinutes()) : date.getMinutes()) + ":";
- let s = ((date.getSeconds() < 10) ? ('0' + date.getSeconds()) : date.getSeconds());
- return y + mon + d + h + m + s;
- },
- getStoreName(list, id) {
- let name = "";
- list.forEach(item => {
- if (item.id == id) {
- if (item.description != "" && item.description != null) {
- name = item.name + "(" + item.description + ")"
- } else {
- name = item.name
- }
- }
- })
- return name;
- },
- getPayName(list, type) {
- let name = "";
- list.forEach(item => {
- if (item.dictValue == type) {
- name = item.dictLabel
- }
- })
- return name;
- },
- // 查询支付状态列表信息
- getPayList() {
- let _this = this;
+ // 获取余额信息
+ getUserBalance() {
request({
- url: "system/dict/data/type/pay_status",
+ url: '/business/userManager/user/getUserBalanceApplet',
method: 'get',
- }).then((res) => {
- console.log(res);
- _this.payList = res.data
- })
- },
- // 查询店铺列表信息
- getStores() {
- let _this = this;
- request({
- url: "business/storeInformation/store/list",
- method: 'get',
- }).then((res) => {
- _this.storeList = res.data
- })
- },
- // 滚动区域
- scrolltolower() {
- if (this.orderList.length < this.total) {
- this.map.page++;
- this.getMyOrder()
- } else {
- this.status = "no-more"
- }
- // if (this.balanceList.length < this.total1) {
- // this.map1.page++;
- // this.getBalanceOrder()
- // } else {
- // this.status = "no-more"
- // }
- },
- // 查询我的油品订单信息
- getMyOrder() {
- let _this = this;
- _this.map.storeId = uni.getStorageSync("storeId")
- request({
- url: "business/oilOrder/userOrders",
- method: 'get',
- params: _this.map,
- }).then((res) => {
- uni.showLoading({
- title: '加载中'
- });
+ params: this.query
+ }).then(res => {
if (res.code == 200) {
- if (_this.map.page == 1) {
- _this.orderList = res.data.records
- _this.list = res.data.records
- } else {
- _this.orderList = _this.orderList.concat(res.data.records)
- _this.list = _this.list.concat(res.data.records)
- }
- _this.total = res.data.total
- uni.hideLoading();
+ this.cardBalance = res.data
}
-
})
},
- // 查询我的储值卡订单信息
- getBalanceOrder() {
- let _this = this;
+ getList() {
request({
- url: "business/marketingActivity/activeExchange/cardValueOrders/list",
+ url: '/business/integral/integralDetail/queryByPageUni',
method: 'get',
- params: _this.map1,
- }).then((res) => {
- console.log(res,uni.getStorageSync("userId"))
- uni.showLoading({
- title: '加载中'
- });
+ params: this.queryParams
+ }).then(res => {
if (res.code == 200) {
- if (_this.map1.page == 1) {
- _this.balanceList = res.data.records
- _this.list1 = res.data.records
- } else {
- _this.balanceList = _this.balanceList.concat(res.data.records)
- _this.list1 = _this.list.concat(res.data.records)
- }
- _this.total1 = res.data.total
- uni.hideLoading();
+ this.pointsList = res.data.records
+ this.total = res.data.total
}
-
})
},
- getTapIndex(index) {
- this.orderList = []
- this.list = []
- this.total = 0
- this.tapindex = index
- if (this.tapindex == 0) {
- this.map = {
- page: 1,
- pageSize: 10,
- storeId: "",
- orderStatus: "",
- remark: "",
- payType:uni.getStorageSync("appltType")
- }
- this.getMyOrder()
- // this.map1 = {
- // page: 1,
- // pageSize: 10,
- // status: "",
- // }
- // this.getBalanceOrder()
- } else if (this.tapindex == 1) {
- this.map = {
- page: 1,
- pageSize: 10,
- storeId: "",
- orderStatus: "unpaid",
- remark: "",
- payType:uni.getStorageSync("appltType")
- }
- this.getMyOrder()
- // this.map1 = {
- // page: 1,
- // pageSize: 10,
- // status: "unpaid",
- // }
- // this.getBalanceOrder()
- } else if (this.tapindex == 2) {
- this.map = {
- page: 1,
- pageSize: 10,
- storeId: "",
- orderStatus: "paid",
- remark: "",
- payType:uni.getStorageSync("appltType")
- }
- this.getMyOrder()
- // this.map1 = {
- // page: 1,
- // pageSize: 10,
- // status: "paid",
- // }
- // this.getBalanceOrder()
+ confirm(e) {
+ this.queryParams.pageNo = 1
+ if (e.value[0] == '全部类型') {
+ this.queryParams.type = ""
} else {
- this.map = {
- page: 1,
- pageSize: 10,
- storeId: "",
- orderStatus: "paid",
- remark: "1",
- payType:uni.getStorageSync("appltType")
- }
- this.getMyOrder()
- // this.map1 = {
- // page: 1,
- // pageSize: 10,
- // status: "paid",
- // }
- // this.getBalanceOrder()
+ this.queryParams.type = e.value[0]
}
+ this.getList()
+ this.show1 = false
},
- goPayment(orderNo){
- uni.navigateTo({
- url: '/pagesRefuel/orderDetail/index?orderNo=' + orderNo,
- })
+ cancel() {
+ this.show1 = false
},
- goOrderInfo(orderNo){
- uni.navigateTo({
- url: '/pagesMy/details/details?orderNo=' + orderNo,
- })
+ timestampToString(timestamp) {
+ // 将时间戳转换为Date对象
+ const date = new Date(timestamp);
+ // 使用toLocaleDateString和toLocaleTimeString可以根据本地格式转换日期和时间
+ const dateString = date.toLocaleDateString()
+ const timeString = date.toLocaleTimeString();
+ // 返回日期和时间的组合
+ return date.getFullYear() + '-' + (date.getMonth() + 1);
},
- goComment(orderId) {
- uni.navigateTo({
- url: "/pagesMy/comment/comment?orderId=" + orderId,
- })
+ confirm1(e) {
+ this.queryParams.startTime = this.timestampToString(e.value)
+ this.queryParams.pageNo = 1
+ this.getList()
+ this.show = false
},
- goBack() {
- uni.navigateBack()
+ cancel1() {
+ this.show = false
}
}
}
\ No newline at end of file
diff --git a/gasStation-uni/pagesMy/signIn/index.vue b/gasStation-uni/pagesMy/signIn/index.vue
index 8be104ff9..0aa5c5628 100644
--- a/gasStation-uni/pagesMy/signIn/index.vue
+++ b/gasStation-uni/pagesMy/signIn/index.vue
@@ -10,15 +10,50 @@
天
-
+
第6天
5积分
+
+ 连续签到获得更多积分
+
+ 签到规则
+
+
签到
+
+
+ +10积分
+
+
+
+
+ 签到规则
+
+
+
+
+ 1.签到时间：
+ 全天可签到，不限制具体时间段。
+ 2.签到方式：
+ 用户通过小程序的签到入口进行点击签到。
+ 3、签到奖励：
+ 为鼓励用户签到，我们设置了签到奖励：积分。
+ 签到奖励可能随着连续签到天数的增加而增加，形成签到
+ 激励机制。
+ 4、补签与断签：
+ 不允许用户进行补签，以恢复连续签到天数。
+ 断签后，用户需重新开始计算连续签到天数。
+
+
+
+
+
@@ -27,8 +62,9 @@
export default {
data() {
return {
-
-
+ wIndex: 0,
+ show: false,
+ equityShow: false
}
},
onLoad() {
@@ -57,6 +93,13 @@
},
methods: {
+ equityclose() {
+ this.equityShow = false
+ },
+ setIndex(index) {
+ this.wIndex = index
+ this.show = true
+ },
//滞空方法
resetting() {
this.pageNo = 1
@@ -170,9 +213,74 @@
color: #fff;
border-radius: 50px;
margin: 25px auto;
+
}
.acv_w {
background: #FF9655 !important;
+ color: #fff !important;
+ }
+
+ .bottom_bs {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ box-sizing: border-box;
+ padding: 10px;
+ font-size: 14px;
+ color: #999999;
+ }
+
+ .d-s {
+ display: flex;
+ align-items: center;
+ }
+
+ .box_ {
+ width: 230px;
+ height: 200px;
+ background: url('http://47.94.122.58:83/qdcg.png') no-repeat;
+ background-size: 100% 100%;
+ position: relative;
+ left: 50%;
+ transform: translate(-50%, 150%);
+ bottom: 10%;
+
+ }
+
+ .r_size {
+ position: absolute;
+ left: 50%;
+ transform: translate(-50%, -50%);
+ bottom: 10%;
+ color: #FA6400;
+ }
+
+ ._tbox {
+ border-radius: 10px;
+ background: #fff;
+ width: 100%;
+
+
+ }
+
+ ._btop {
+ box-sizing: border-box;
+ padding: 15px;
+ border-bottom: 1px solid #EEEEEE;
+ text-align: center;
+ font-weight: 600;
+ font-size: 14px;
+ color: #333333;
+ }
+
+ ._bbox {
+ box-sizing: border-box;
+ padding: 15px;
+ font-weight: 400;
+ font-size: 14px;
+ color: #333333;
+ line-height: 18px;
}
\ No newline at end of file