From 02a7098a88fd4cfda68631a46117e2992f3a8447 Mon Sep 17 00:00:00 2001
From: Wik-T <812952667@qq.com>
Date: Sun, 9 Oct 2022 16:10:18 +0800
Subject: [PATCH] =?UTF-8?q?1.=E9=93=B6=E8=81=94=20=E6=94=B9=E7=89=882.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
high-unionPay/App.vue | 16 +-
high-unionPay/Utils/Api.js | 5 +
high-unionPay/pages.json | 18 +-
.../pages/goods/goods-list/goods-list.vue | 281 ++--
high-unionPay/pages/goods/goods.vue | 1149 ++++++-----------
high-unionPay/pages/tabBar/home/home.vue | 1085 ++++++----------
high-unionPay/pages/tabBar/user/user.vue | 1049 +++++++--------
high-unionPay/pages/user/coupon/coupon.vue | 335 ++---
high-unionPay/pages/user/news/news.vue | 120 ++
.../user/order_details/order_details.vue | 335 ++++-
.../pages/user/order_list/order_list.vue | 389 +++---
.../order-details/order-details.vue | 311 +++--
.../qianzhu-KFC/static/imgs/desloca.png | Bin 0 -> 904 bytes
high-unionPay/static/img/cusservice.png | Bin 0 -> 9306 bytes
high-unionPay/static/img/home/cusser.png | Bin 0 -> 3997 bytes
high-unionPay/static/img/home/home3.png | Bin 0 -> 158013 bytes
high-unionPay/static/img/home/home4.png | Bin 0 -> 91509 bytes
high-unionPay/static/img/home/home5.png | Bin 0 -> 8781 bytes
high-unionPay/static/img/home/home6.png | Bin 0 -> 21381 bytes
high-unionPay/static/img/home/home7.png | Bin 0 -> 44595 bytes
high-unionPay/static/img/user/user1.png | Bin 0 -> 4330 bytes
high-unionPay/static/img/user/user10.png | Bin 0 -> 5366 bytes
high-unionPay/static/img/user/user11.png | Bin 0 -> 5239 bytes
high-unionPay/static/img/user/user12.png | Bin 0 -> 3629 bytes
high-unionPay/static/img/user/user13.png | Bin 0 -> 11223 bytes
high-unionPay/static/img/user/user14.png | Bin 0 -> 5698 bytes
high-unionPay/static/img/user/user15.png | Bin 0 -> 312 bytes
high-unionPay/static/img/user/user16.png | Bin 0 -> 487 bytes
high-unionPay/static/img/user/user2.png | Bin 0 -> 2263 bytes
high-unionPay/static/img/user/user3.png | Bin 0 -> 3947 bytes
high-unionPay/static/img/user/user4.png | Bin 0 -> 5317 bytes
high-unionPay/static/img/user/user5.png | Bin 0 -> 7635 bytes
high-unionPay/static/img/user/user6.png | Bin 0 -> 4773 bytes
high-unionPay/static/img/user/user7.png | Bin 0 -> 4861 bytes
high-unionPay/static/img/user/user8.png | Bin 0 -> 5644 bytes
high-unionPay/static/img/user/user9.png | Bin 0 -> 4131 bytes
high-unionPay/uni.scss | 57 +-
37 files changed, 2478 insertions(+), 2672 deletions(-)
create mode 100644 high-unionPay/pages/user/news/news.vue
create mode 100644 high-unionPay/qianzhu-KFC/static/imgs/desloca.png
create mode 100644 high-unionPay/static/img/cusservice.png
create mode 100644 high-unionPay/static/img/home/cusser.png
create mode 100644 high-unionPay/static/img/home/home3.png
create mode 100644 high-unionPay/static/img/home/home4.png
create mode 100644 high-unionPay/static/img/home/home5.png
create mode 100644 high-unionPay/static/img/home/home6.png
create mode 100644 high-unionPay/static/img/home/home7.png
create mode 100644 high-unionPay/static/img/user/user1.png
create mode 100644 high-unionPay/static/img/user/user10.png
create mode 100644 high-unionPay/static/img/user/user11.png
create mode 100644 high-unionPay/static/img/user/user12.png
create mode 100644 high-unionPay/static/img/user/user13.png
create mode 100644 high-unionPay/static/img/user/user14.png
create mode 100644 high-unionPay/static/img/user/user15.png
create mode 100644 high-unionPay/static/img/user/user16.png
create mode 100644 high-unionPay/static/img/user/user2.png
create mode 100644 high-unionPay/static/img/user/user3.png
create mode 100644 high-unionPay/static/img/user/user4.png
create mode 100644 high-unionPay/static/img/user/user5.png
create mode 100644 high-unionPay/static/img/user/user6.png
create mode 100644 high-unionPay/static/img/user/user7.png
create mode 100644 high-unionPay/static/img/user/user8.png
create mode 100644 high-unionPay/static/img/user/user9.png
diff --git a/high-unionPay/App.vue b/high-unionPay/App.vue
index 37cdcaf..749f788 100644
--- a/high-unionPay/App.vue
+++ b/high-unionPay/App.vue
@@ -5,15 +5,15 @@
// brestUrl: 'http://192.168.3.4:9302/brest',
// imgUrl: 'https://192.168.3.4:9301/filesystem/',
//正式
- url: 'https://hsg.dctpay.com/crest',
- imgUrl: 'https://hsg.dctpay.com/filesystem/',
- brestUrl : 'https://hsg.dctpay.com/brest',
- imageWxImg:'https://hsg.dctpay.com/filesystem/wxApplets/',
+ // url: 'https://hsg.dctpay.com/crest',
+ // imgUrl: 'https://hsg.dctpay.com/filesystem/',
+ // brestUrl : 'https://hsg.dctpay.com/brest',
+ // imageWxImg:'https://hsg.dctpay.com/filesystem/wxApplets/',
//测试
- // url: 'https://hsgcs.dctpay.com/crest',
- // brestUrl : 'https://hsgcs.dctpay.com/brest',
- // imgUrl: 'https://hsgcs.dctpay.com/filesystem/',
- // imageWxImg:'https://hsgcs.dctpay.com/filesystem/wxApplets/',
+ url: 'https://hsgcs.dctpay.com/crest',
+ brestUrl : 'https://hsgcs.dctpay.com/brest',
+ imgUrl: 'https://hsgcs.dctpay.com/filesystem/',
+ imageWxImg:'https://hsgcs.dctpay.com/filesystem/wxApplets/',
userInfo: "",
brestUserInfo : '',
openId: '',
diff --git a/high-unionPay/Utils/Api.js b/high-unionPay/Utils/Api.js
index 86d19ec..5bdaf55 100644
--- a/high-unionPay/Utils/Api.js
+++ b/high-unionPay/Utils/Api.js
@@ -131,6 +131,11 @@ export const cancelOrder = params => {
export const getOrderById = params => {
return POST('GET', `${base}/highOrder/getOrderById`, params).then(res => res.data);
}
+
+//已完成未查看
+export const orderCheck = params => {
+ return POST('GET', `${base}/highOrder/orderCheck`, params).then(res => res.data);
+}
//获取商户列表
export const getMerchantList = params => {
return POST('GET', `${base}/highMerchantStore/getMerchantList`, params).then(res => res.data);
diff --git a/high-unionPay/pages.json b/high-unionPay/pages.json
index 18e8128..7c7a0ec 100644
--- a/high-unionPay/pages.json
+++ b/high-unionPay/pages.json
@@ -5,8 +5,8 @@
"style": {
"navigationBarTextStyle": "white",
"navigationBarTitleText": "嗨森逛",
- "navigationBarBackgroundColor": "#0083f5",
- "backgroundColorTop": "#0083f5",
+ "navigationBarBackgroundColor": "#3da7e7",
+ "backgroundColorTop": "#3da7e7",
"onReachBottomDistance": 50,
"app-plus": {
"titleNView": false, //禁用原生导航栏
@@ -700,7 +700,19 @@
}
}
- ],
+ ,{
+ "path" : "pages/user/news/news",
+ "style" :
+ {
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": false,
+ "app-plus": {
+ "titleNView": false //禁用原生导航栏
+ }
+ }
+
+ }
+ ],
"subpackages": [{
"root": "subPages",
"pages": [{
diff --git a/high-unionPay/pages/goods/goods-list/goods-list.vue b/high-unionPay/pages/goods/goods-list/goods-list.vue
index 9789374..e3e5156 100644
--- a/high-unionPay/pages/goods/goods-list/goods-list.vue
+++ b/high-unionPay/pages/goods/goods-list/goods-list.vue
@@ -2,7 +2,7 @@
-
+
@@ -24,35 +24,21 @@
@click="switchid(item)" :class="[goodtyid == item.id ? 'fcor089 borbtom fontwig6' : '']" :key="index">
{{item.title}}
-
-
-
-
- {{row.couponName}}
+
+
+
+ {{row.couponName}}
限购{{row.limitNumber}}件
-
-
-
- {{ row.discountPrice*100}}
-
-
- ¥ {{ row.discountPrice}}
+
+
+ ¥{{ row.discountPrice}}
-
-
-
-
-
- {{ row.salesPrice*100}}
-
- ¥{{ row.salesPrice}}
+
+ ¥{{ row.salesPrice}}
@@ -61,6 +47,7 @@
+
diff --git a/high-unionPay/pages/goods/goods.vue b/high-unionPay/pages/goods/goods.vue
index 645c404..8a8bab0 100644
--- a/high-unionPay/pages/goods/goods.vue
+++ b/high-unionPay/pages/goods/goods.vue
@@ -1,340 +1,333 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{currentSwiper+1}}/{{swiperList.length}}
-
-
-
- ¥{{goodsData[0].discountPrice}}
- 门市参考价: ¥{{goodsData[0].salesPrice}}
-
-
-
-
- {{goodsData[0].discountPrice *100}}
-
- 门市参考价:
- {{goodsData[0].salesPrice *100}}
-
-
- 限购{{goodsData[0].limitNumber}}件
-
-
-
-
-
-
- {{goodsData[0].couponName}}
-
-
- 有效期至: {{goodsData[0].salesEndTime | formatDate('-')}}
- 库存 :
- {{goodsData[0].stockCount}}件
-
-
-
-
-
-
- 点击去选择门店
-
- {{storeName}}
-
-
-
-
-
- 赠送卡券
-
-
-
-
-
-
-
- ———— 商品详情 ————
-
-
-
-
-
-
- 赠送卡券
-
-
-
-
- {{ product.highCouponModel.couponName }}
- 有效期至:{{product.highCouponModel.salesEndTime | formatDate('-')}}
-
- ¥{{ product.highCouponModel.discountPrice}}
-
- ¥{{ product.highCouponModel.salesPrice}}
-
-
-
-
- {{ product.highCouponModel.discountPrice*100}}
-
-
-
- {{ product.highCouponModel.salesPrice*100}}
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/high-unionPay/pages/tabBar/home/home.vue b/high-unionPay/pages/tabBar/home/home.vue
index 72795e7..5656c94 100644
--- a/high-unionPay/pages/tabBar/home/home.vue
+++ b/high-unionPay/pages/tabBar/home/home.vue
@@ -1,58 +1,133 @@
-
+
+
+
+
+
+
+
+
+
+ {{ row.title }}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ row.title }}
+
+
+
+
+
+
+
+
+
+
+
+ 放松放松方放松放松方放松放松方
+ 40分钟前
+
+
+
+
+
+
+
+
-
-
+
-
-
-
-
-
-
-
-
-
-
- {{ row.title }}
+
+
+
+ 加油专区
+ 更多
-
-
-
+
+
+
+ ETC加油券
+ 2020.09.21-2202.10.12
+ ¥240
+
+
+
+ ETC加油券
+ 2020.09.21-2202.10.12
+ ¥240
+
+
+
+ ETC加油券
+ 2020.09.21-2202.10.12
+ ¥240
+
-
-
-
-
-
- {{pro.couponName}}
-
-
- {{pro.discountPrice *100}}
-
-
-
-
-
-
-
-
+
+
+
+ 惠享生活
+
+
+
+
+
+
+
+
+
+
+
+ 天天好券
+
+ 更多
+
+
+
+
+ 加油优惠券包
+ 2020.09.21-2202.10.12
+ ¥240
+
+
+
+ 加油优惠券包
+ 2020.09.21-2202.10.12
+ ¥240
+
+
+
+ 加油优惠券包
+ 2020.09.21-2202.10.12
+ ¥240
+
+
+
+
-
-
+
@@ -88,10 +163,11 @@
currentSwiper: 0,
imageUrl: app.globalData.imgUrl,
imagewxUrl: app.globalData.imageWxImg,
- imgadres: 'headunion.png',
- imgadres1: 'jbhed.png',
- imgadres2: 'jt.png',
- imgadres3: '',
+ imgadres: '/home/home1.png',
+ imgadres1: '/home/home2.png',
+ imgadres2: 'jt.png',
+ imgadres5: 'unionarea.png',
+ imgadres3: '',
imgadres4: 'cusservice.png',
webUrl: '',
// 轮播图片
@@ -152,26 +228,10 @@
success(e) {
app.globalData.token = e.data;
}
- // fail() {
- // uni.navigateTo({
- // url: '../../userLogin/userLogin'
- // })
- // }
})
- // if (!app.globalData.userInfo.phone) {
- // uni.navigateTo({
- // url: '../../userLogin/userLogin'
- // })
- // return;
- // }
that.getCacheParam();
}
})
- // if (app.globalData.cityName != '') {
- // this.city = app.globalData.cityName;
- // this.getCouponListArea();
- // this.getCouponListgold();
- // }
},
onLoad() {
this.hqaddress();
@@ -213,6 +273,11 @@
delCacheParam(params).then(res => {
})
+ },
+ test(item) {
+ uni.navigateTo({
+ url:'../../user/news/news'
+ })
},
//定位信息
hqaddress() {
@@ -451,49 +516,6 @@
uni.navigateTo({
url: item.ext1
})
- // if (!app.globalData.userInfo) {
- // uni.navigateTo({
- // url: '../../userLogin/userLogin'
- // })
- // return;
- // }
- // if (!app.globalData.userInfo.phone) {
- // uni.navigateTo({
- // url: '../../userLogin/userLogin'
- // })
- // return;
- // }
- // if (item.title == '在线加油') {
- // uni.navigateTo({
- // url: '/pages/goods/refuel/refuel'
- // })
- // return;
- // }
- // if (item.title == '话费充值') {
- // uni.navigateTo({
- // url: '../../unionPay/recharge/recharge'
- // })
- // return;
- // }
- // if (item.title == '积分专区') {
- // uni.navigateTo({
- // url: '/pages/goods/goods-list/goods-list?id=3'
- // })
- // return;
- // }
- // if (item.title == '优选商品') {
- // uni.navigateTo({
- // url: '../../../subPages/preferred-goods/preferred-goods'
- // })
- // return;
- // }
- // if (item.title == '优惠券包') {
- // uni.navigateTo({
- // url: '../../../subPages/coupon-package/coupon-package'
- // })
- // return;
- // }
-
},
//调整商品列表
goGoodsList(item) {
@@ -506,608 +528,261 @@
};
diff --git a/high-unionPay/pages/tabBar/user/user.vue b/high-unionPay/pages/tabBar/user/user.vue
index 7c7d82b..3859232 100644
--- a/high-unionPay/pages/tabBar/user/user.vue
+++ b/high-unionPay/pages/tabBar/user/user.vue
@@ -1,8 +1,7 @@
-
-
-
-
+
+
+
@@ -10,119 +9,142 @@
-
+
- 请授权登录
- {{user.name}}
- 积分: 0
- 积分: {{user.gold}} 个
-
+ {{user.name}}
+ {{userphone}}
-
-
-
-
-
-
-
-
-
+
+
+
+
+ {{textnum}} 张
+ 卡券
+
+
+
+
+ {{textSend}} 张
+ 优惠券
+
+
+
+
- 我的订单
+
+ 订单
+ 全部订单
+
+
+
-
+
+
-
+
- {{row.text}}
+ {{row.text}}
+
+
+
+
+
+
+
+ 等待付款
+ 剩余时间: 13:44
+
+
+ 去支付
+
+
+
+
+
-
+
-
- 话费充值
-
-
-
-
-
-
- {{row.text}}
+
+ 我的资产
+
+
+
+ 进入卡包
+
+
+
+
+
+ ****
+ ¥2400
+ 积分余额
+
+
+ ****
+ ¥2400
+ 油卡余额
+
+
+ ****
+ ¥2400
+ 工会卡余额
-
-
- 卡券中心
-
-
-
-
-
-
-
-
- {{row.text}}
+
+
+
+ 商务中心
+
+
+
+
+
+ 我的推广
-
-
+
+
+
-
-
-
+
-
+
- {{row.text}}
- {{row.text}}
-
-
- -->
-
-
- 我的
-
-
-
-
-
-
- {{row.text}}
+ {{row.text}}
-
@@ -142,91 +164,36 @@
isfirst: true,
imagewxUrl: app.globalData.imageWxImg,
imgadres: 'head.png',
- headerPosition: "fixed",
textnum: '',
textSend: '',
therrNum: '',
- rechargeOrderNum:'', //话费待支付
- headerTop: null,
- statusTop: null,
- showHeader: true,
+ rechargeOrderNum:'', //话费待支付
+ whetherCheckNum: '', //未查看数量
+ orderPayNum: '', //支付订单数量
//个人信息,
user: "",
// 订单类型
orderList: [{
text: '待支付',
- icon: "fukuan"
+ icon: "../../../static/img/user/user1.png"
},
{
text: '已支付',
- icon: "fahuo"
+ icon: "../../../static/img/user/user2.png"
},
{
text: '已完成',
- icon: "shouhuo"
+ icon: "../../../static/img/user/user3.png"
}, {
text: '已退款',
- icon: "tuihuo"
- }, {
- text: '已取消',
- icon: "pingjia"
+ icon: "../../../static/img/user/user4.png"
}
],
- huafeiList: [{
- text: '待支付',
- icon: "fukuan"
- },
- {
- text: '已支付',
- icon: "fahuo"
- },
- {
- text: '已完成',
- icon: "shouhuo"
- }, {
- text: '已取消',
- icon: "pingjia"
- }, {
- text: '已退款',
- icon: "tuihuo"
- }
- ],
- // 工具栏列表
- mytoolbarList: [{
- url: '/pages/goods/recording/recording',
- text: '积分记录',
- img: 'user/mingxi.png'
- },
- // ,
- // {
- // url: '/pages/goods/recording/recording?id=2',
- // text: '消费记录',
- // img: 'user/quan.png'
- // },
- {
- url: '/pages/user/mineCoupons/mineCoupons',
- text: '我的卡券',
- img: 'user/choujiang.png'
- },
- {
- url: '../../user/coupon/coupon',
- text: '我的优惠券',
- img: 'user/momey.png'
- },
- {
- url: '/pages/user/myPromotion/myPromotion',
- text: '我的推广',
- img: 'user/extension.png'
- }
- // ,
- // {
- // url: '/pages/user/generatePoster/generatePoster',
- // text: '生成海报',
- // img: 'user/poster.png'
- // }
- ],
//操作列表
- czList: '',
+ czList: '',
+ nopaylist: [1, 2, 3, 4, 5],
+ assetsstu: 2,
+ userphone:'' // 手机号
}
},
//下拉刷新,需要自己在page.json文件中配置开启页面下拉刷新 "enablePullDownRefresh": true
@@ -235,18 +202,10 @@
uni.stopPullDownRefresh();
}, 1000);
},
- onPageScroll(e) {
- //兼容iOS端下拉时顶部漂移
- this.headerPosition = e.scrollTop >= 0 ? "fixed" : "absolute";
- this.headerTop = e.scrollTop >= 0 ? null : 0;
- this.statusTop = e.scrollTop >= 0 ? null : -this.statusHeight + 'px';
- },
- onLoad() {
- this.statusHeight = 0;
- // #ifdef H5
- this.showHeader = true;
- // this.statusHeight = plus.navigator.getStatusbarHeight();
- // #endif
+ onLoad() {
+ if (!app.globalData.userInfo) {
+ this.findUser()
+ }
},
onReady() {
//此处,演示,每次页面初次渲染都把登录状态重置
@@ -261,45 +220,39 @@
if (app.globalData.userInfo) {
this.findUser();
}
- if (!app.globalData.userInfo.isSetPayPwd) {
- this.czList = [{
- url: '../../../subPages/cardsList/cardsList',
- text: '卡包',
- img: '../../../static/img/ghkpay.png',
- type: 2
- }, {
- url: '',
- text: '客服',
- img: 'user/kefu.png',
- type: 1
- },
- {
- url: '../../login/updatePas/updatePas',
- text: '设置积分密码',
- img: '../../../static/img/pas.png',
- type: 2
- },
- ]
- return;
- }
- // '../../user/unionCard/unionCard'
- this.czList = [{
- url: '../../../subPages/cardsList/cardsList',
- text: '卡包',
- img: '../../../static/img/ghkpay.png',
- type: 2
- }, {
- url: '',
- text: '客服',
- img: 'user/kefu.png',
- type: 1
- },
- {
- url: '../../login/updatePas/resetPas',
- text: '修改积分密码',
- img: '../../../static/img/pas.png',
- type: 2
- },
+ if (!app.globalData.userInfo.isSetPayPwd) {
+ this.czList = [{
+ url: '/pages/goods/recording/recording',
+ text: '积分记录',
+ img: '../../../static/img/ghkpay.png'
+ },
+ {
+ url: '../../login/updatePas/updatePas',
+ text: '支付密码',
+ img: '../../../static/img/user/user11.png'
+ }, {
+ url: '',
+ text: '客服',
+ img: '../../../static/img/user/user13.png'
+ }
+ ]
+ return;
+ }
+ this.czList = [{
+ url: '../../../subPages/cardsList/cardsList',
+ text: '卡包',
+ img: '../../../static/img/ghkpay.png'
+ },
+ {
+ url: '../../login/updatePas/resetPas',
+ text: '支付密码',
+ img: '../../../static/img/user/user11.png'
+ },
+ {
+ url: '',
+ text: '客服',
+ img: '../../../static/img/user/user13.png'
+ }
]
},
methods: {
@@ -308,11 +261,14 @@
findUser(params).then(res => {
if (res.return_code == '000000') {
app.globalData.userInfo = res.return_data;
- this.user = res.return_data;
- this.textnum = res.return_data.unusedCouponNum;
- this.textSend = res.return_data.unusedDiscount;
+ this.user = res.return_data;
+ this.textnum = res.return_data.unusedCouponNum;
+ this.textSend = res.return_data.unusedDiscount;
this.therrNum = res.return_data.unpaid;
- this.rechargeOrderNum = res.return_data.rechargeOrderNum;
+ this.whetherCheckNum = res.return_data.whetherCheckNum;
+ this.orderPayNum = res.return_data.orderPayNum;
+ this.rechargeOrderNum = res.return_data.rechargeOrderNum;
+ this.geTel(this.user.phone);
uni.setStorage({
key: "user",
data: res.return_data
@@ -340,6 +296,53 @@
this.toDeposit();
}
});
+ },
+ // 隐藏手机号
+ geTel(tel) {
+ var reg = /^(\d{3})\d{4}(\d{4})$/;
+ this.userphone = tel.replace(reg, "$1****$2");
+ },
+ // 资产查看状态
+ updatestu(item) {
+ if (item == 1) {
+ this.assetsstu = 2;
+ }
+ if (item == 2) {
+ this.assetsstu = 1;
+ }
+ },
+ // 推广
+ jumppage(item) {
+ // if (item == 1) {
+ // uni.navigateTo({
+ // url: '../../login/login?id=1'
+ // })
+ // }
+ // if (item == 2) {
+ // uni.navigateTo({
+ // url: '../../login/login?id=2'
+ // })
+ // }
+ if (item == 3) {
+ uni.navigateTo({
+ url: '/pages/user/myPromotion/myPromotion'
+ })
+ }
+ if (item == 4) {
+ uni.navigateTo({
+ url: '../../../subPages/cardsList/cardsList'
+ })
+ }
+ if (item == 5) {
+ uni.navigateTo({
+ url: '/pages/user/mineCoupons/mineCoupons'
+ })
+ }
+ if (item == 6) {
+ uni.navigateTo({
+ url: '../../user/coupon/coupon'
+ })
+ }
},
//跳转登录
jumplogin() {
@@ -418,11 +421,7 @@
uni.navigateTo({
url: url
})
- } else {
- // uni.showModal({
- // title: '客服',
- // content: '4006780738'
- // })
+ } else {
this.playPhone();
}
@@ -452,379 +451,259 @@
}
diff --git a/high-unionPay/pages/user/coupon/coupon.vue b/high-unionPay/pages/user/coupon/coupon.vue
index 7595d9c..c6af601 100644
--- a/high-unionPay/pages/user/coupon/coupon.vue
+++ b/high-unionPay/pages/user/coupon/coupon.vue
@@ -1,68 +1,75 @@
- 可用({{couponcout}})
- 已失效
-
+
+ 待使用
+ 已使用
+ 已过期
+
+
+ {{item}}
+
-
+
-
-
-
- {{row.highDiscount.discountName}}
+
+
+
+
+ 折扣券
+
+
+
+ 话费券
+ {{row.highDiscount.discountName}}
- 截止时间:{{row.useEndTime | formatDate('-')}}
+ 有效期:{{row.useEndTime | formatDate('-')}}
-
-
{{row.highDiscount.discountPrice * 10}}
-
-
- {{row.highDiscount.discountPrice}}
+
+
+ {{row.highDiscount.discountPrice}}
折
-
-
- 元
+
+
+ 元
-
+
去使用
-
+
+
-
-
@@ -70,13 +77,43 @@
{{row.highDiscount.discountName}}
- 截止时间:{{row.highDiscount.salesEndTime | formatDate('-')}}
+ 使用时间:{{row.useTime | formatDate('-')}}
-
-
+
+
+
+
+ {{row.highDiscount.discountPrice}}
+
+
+ 元
+
+
+
+ {{row.highDiscount.discountName}}
+
+
+ 已使用
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{row.highDiscount.discountName}}
+
+
+ 过期时间:{{row.useEndTime | formatDate('-')}}
-
-
@@ -91,7 +128,7 @@
{{row.highDiscount.discountName}}
- 已失效
+ 已过期
@@ -112,8 +149,9 @@
return {
couponValidList: [],
couponinvalidList: [],
+ couponnoinvalidList: [],
imagewxUrl: app.globalData.imageWxImg,
- imgadres:'noorder.png',
+ imgadres: 'noorder.png',
headerTop: 0,
//控制滑动效果
typeClass: 'valid',
@@ -124,8 +162,10 @@
pageNum: 1,
pageSize: 10,
isNoMoreData: false,
- loadingText: '',
- couponcout:0
+ loadingText: '',
+ couponcout: 0,
+ orderTyplist: ['全部订单', '在线加油', '肯德基', '星巴克', '话费充值', '卡券订单'], //消息类型
+ ordertypeid: 1 //类型id
}
},
onPageScroll(e) {
@@ -172,8 +212,10 @@
onReachBottom() {
if (this.typeClass == 'valid') {
this.getUserDiscountList(1);
- } else {
+ } else if (this.typeClass == 'invalid') {
this.getUserDiscountList(2);
+ } else {
+ this.getUserDiscountList(0);
}
},
methods: {
@@ -201,49 +243,52 @@
this.isNoMoreData = true;
}
if (this.typeClass == 'valid') {
- this.couponValidList = this.couponValidList.concat(res.return_data.list);
+ this.couponValidList = this.couponValidList.concat(res.return_data.list);
this.couponcout = res.return_data.total;
- } else {
+ } else if (this.typeClass == 'invalid') {
this.couponinvalidList = this.couponinvalidList.concat(res.return_data.list);
+ } else {
+ this.couponnoinvalidList = this.couponnoinvalidList.concat(res.return_data.list);
}
this.pageNum = res.return_data.list.length == this.pageSize ? ++pagenum : pagenum;
} else {
this.couponValidList = [];
this.couponinvalidList = [];
+ this.couponnoinvalidList = [];
uni.hideLoading()
}
})
},
//跳转详情
- jumpcoupons(e) {
- if(e.highDiscount.useScope == 3){
- uni.navigateTo({
- url: '../../unionPay/recharge/recharge'
- })
- }else if (e.highDiscount.useScope == 4) {
+ jumpcoupons(e) {
+ if (e.highDiscount.useScope == 3) {
+ uni.navigateTo({
+ url: '../../../subPages/recharge/recharge'
+ })
+ } else if (e.highDiscount.useScope == 4) {
app.globalData.distinguishid = 1;
uni.navigateTo({
url: '/qianzhu-KFC/buffet-order/buffet-order'
})
- } else if (e.highDiscount.useScope == 5) {
+ } else if (e.highDiscount.useScope == 5) {
app.globalData.distinguishid = 2;
uni.navigateTo({
- url: '/qianzhu-KFC/buffet-order/buffet-order'
+ url: '/qianzhu-KFC/buffet-order/buffet-order'
})
} else if (e.highDiscount.useScope == 6) {
uni.navigateTo({
url: '/member-Recharge/choicepage/choicepage'
})
- }else if (e.highDiscount.useScope == 7) {
+ } else if (e.highDiscount.useScope == 7) {
uni.navigateTo({
url: '../../goods/refuel/refuel'
})
- } else{
- uni.navigateTo({
- url: '../mineCouponsDestails/mineCouponsDestails?id=' + e.id
- })
+ } else {
+ uni.navigateTo({
+ url: '../mineCouponsDestails/mineCouponsDestails?id=' + e.id
+ })
}
-
+
},
switchType(type) {
if (this.typeClass == type) {
@@ -255,91 +300,28 @@
})
this.typeClass = type;
this.subState = this.typeClass == '' ? '' : 'show' + type;
- setTimeout(() => {
- this.oldIndex = null;
- this.theIndex = null;
- this.subState = this.typeClass == 'valid' ? '' : this.subState;
- }, 200)
+ // setTimeout(() => {
+ // this.oldIndex = null;
+ // this.theIndex = null;
+ // this.subState = this.typeClass == 'valid' ? '' : this.subState;
+ // }, 200)
if (this.typeClass == 'valid') {
this.pageNum = 1;
this.couponValidList = []
this.isNoMoreData = false;
this.getUserDiscountList(1);
- } else {
+ } else if (this.typeClass == 'invalid') {
this.pageNum = 1;
this.couponinvalidList = []
this.isNoMoreData = false;
this.getUserDiscountList(2);
+ } else {
+ this.pageNum = 1;
+ this.couponnoinvalidList = []
+ this.isNoMoreData = false;
+ this.getUserDiscountList(0);
}
- },
- //控制左滑删除效果-begin
- touchStart(index, event) {
- //多点触控不触发
- if (event.touches.length > 1) {
- this.isStop = true;
- return;
- }
- this.oldIndex = this.theIndex;
- this.theIndex = null;
- //初始坐标
- this.initXY = [event.touches[0].pageX, event.touches[0].pageY];
- },
- touchMove(index, event) {
- //多点触控不触发
- if (event.touches.length > 1) {
- this.isStop = true;
- return;
- }
- let moveX = event.touches[0].pageX - this.initXY[0];
- let moveY = event.touches[0].pageY - this.initXY[1];
-
- if (this.isStop || Math.abs(moveX) < 5) {
- return;
- }
- if (Math.abs(moveY) > Math.abs(moveX)) {
- // 竖向滑动-不触发左滑效果
- this.isStop = true;
- return;
- }
-
- if (moveX < 0) {
- this.theIndex = index;
- this.isStop = true;
- } else if (moveX > 0) {
- if (this.theIndex != null && this.oldIndex == this.theIndex) {
- this.oldIndex = index;
- this.theIndex = null;
- this.isStop = true;
- setTimeout(() => {
- this.oldIndex = null;
- }, 150)
- }
- }
- },
-
- touchEnd(index, $event) {
- //解除禁止触发状态
- this.isStop = false;
- },
-
- //删除商品
- deleteCoupon(id, List) {
- let len = List.length;
- for (let i = 0; i < len; i++) {
- if (id == List[i].id) {
- List.splice(i, 1);
- break;
- }
- }
- this.oldIndex = null;
- this.theIndex = null;
- },
-
- discard() {
- //丢弃
}
-
-
}
}
@@ -350,6 +332,44 @@
}
+ .srollview {
+ position: fixed;
+ z-index: 9999;
+ top: 45px;
+ height: 60px;
+ background-color: #ffffff;
+ display: flex;
+ flex-direction: row;
+ flex-wrap: nowrap;
+ white-space: nowrap;
+
+ .conent {
+ height: 24px;
+ line-height: 24px;
+ margin-top: 15px;
+ padding-left: 10px;
+ font-size: 10px;
+ padding-right: 10px;
+ border-radius: 20px;
+ margin-left: 15px;
+ display: inline-flex;
+ flex-direction: column;
+ text-align: center;
+ position: relative;
+ }
+ }
+
+
+ .frontconent {
+ background-color: #eeeeee;
+ color: #333333;
+ }
+
+ .activeconent {
+ background-color: #e8eff4;
+ color: #009DFF;
+ }
+
page {
position: relative;
background-color: #f5f5f5;
@@ -361,7 +381,7 @@
.place {
width: 100%;
- height: 95upx;
+ height: 110px;
}
.tabr {
@@ -375,7 +395,7 @@
z-index: 10;
view {
- width: 50%;
+ width: 33.3%;
height: 90upx;
justify-content: center;
align-items: center;
@@ -385,16 +405,7 @@
.on {
color: #0083f5;
- }
-
- .border {
- height: 4upx;
- background-color: #0083f5;
- transition: all .3s ease-out;
-
- &.invalid {
- transform: translate3d(100%, 0, 0);
- }
+ border-bottom: 2px solid #0083f5;
}
}
@@ -425,6 +436,16 @@
}
}
+ @keyframes shownoInvalid {
+ 0% {
+ transform: translateX(0);
+ }
+
+ 100% {
+ transform: translateX(-200%);
+ }
+ }
+
.sub-list {
&.invalid {
position: absolute;
@@ -443,6 +464,11 @@
animation: showInvalid 0.20s linear both;
}
+ &.shownoinvalid {
+ display: flex;
+ animation: shownoInvalid 0.20s linear both;
+ }
+
width: 100%;
padding: 20upx 0 120upx 0;
@@ -456,7 +482,7 @@
.row {
width: 92%;
- height: 24vw;
+ height: 27vw;
margin: 20upx auto 10upx auto;
border-radius: 8upx;
// box-shadow: 0upx 0 10upx rgba(0,0,0,0.1);
@@ -512,7 +538,6 @@
animation: closeMenu 0.15s linear both;
}
- background-color: #fff;
position: absolute;
width: 100%;
padding: 0 0;
@@ -521,18 +546,20 @@
flex-wrap: nowrap;
.left {
- width: 100%;
+ background-color: #fff;
+ width: 72%;
+ background-image: radial-gradient(6px at top right, #f5f5f5 50px, #ffffff);
.title {
- padding-top: 3vw;
width: 90%;
margin: 0 5%;
font-size: 36upx;
}
.term {
- width: 90%;
- margin: 0 5%;
+ width: 95%;
+ background-image: radial-gradient(6px at bottom right, #f5f5f5 50px, #ffffff);
+ margin-left: 5%;
font-size: 26upx;
color: #999;
}
@@ -570,7 +597,8 @@
flex-shrink: 0;
width: 28%;
color: #fff;
- background: linear-gradient(to right, #ec625c, #ee827f);
+ background: linear-gradient(to right, #66c4ff, #009DFF);
+ background-image: radial-gradient(6px at bottom left, #f5f5f5 50px, #009DFF);
&.invalid {
background: linear-gradient(to right, #aaa, #999);
@@ -588,18 +616,18 @@
}
.ticket {
+ background-image: radial-gradient(6px at top left, #f5f5f5 50px, #009DFF);
padding-top: 1vw;
justify-content: center;
align-items: baseline;
- height: 6vw;
.num {
- font-size: 42upx;
+ font-size: 60upx;
font-weight: 600;
}
.unit {
- font-size: 24upx;
+ font-size: 28upx;
}
}
@@ -610,18 +638,19 @@
}
.use {
- width: 50%;
- height: 40upx;
+ width: 70%;
+ height: 60rpx;
justify-content: center;
align-items: center;
- font-size: 24upx;
+ font-size: 28rpx;
background-color: #fff;
- color: #ee827f;
- border-radius: 40upx;
- padding: 0 10upx;
+ color: #009DFF;
+ border-radius: 40rpx;
+ padding: 0 10rpx;
}
}
}
+
}
}
diff --git a/high-unionPay/pages/user/news/news.vue b/high-unionPay/pages/user/news/news.vue
new file mode 100644
index 0000000..f4a13fb
--- /dev/null
+++ b/high-unionPay/pages/user/news/news.vue
@@ -0,0 +1,120 @@
+
+
+
+
+ {{item}}
+
+
+
+
+
+
+ 服务通知
+
+
+
+
+ 最新电影已上映快来抢购
+
+
+
+
+
+ 付款成功
+
+ ¥9.58
+
+ 交易对象
+ 电信话费充值200元
+
+
+
+ 交易时间
+ 2022年9月30日
+
+ 查看详情
+
+
+
+
+
+
+ 客服消息提醒
+
+
+ 你的问题我们已提交技术人员处理,请耐心等候
+
+
+ 查看详情
+
+
+
+
+
+
+
+
+
+
+
diff --git a/high-unionPay/pages/user/order_details/order_details.vue b/high-unionPay/pages/user/order_details/order_details.vue
index 8270a79..5a6c3bd 100644
--- a/high-unionPay/pages/user/order_details/order_details.vue
+++ b/high-unionPay/pages/user/order_details/order_details.vue
@@ -1,16 +1,131 @@
- 待支付
- 已支付
- 已完成
- 已退款
- 已取消
- 退款中
- 退款失败
+
+
+
+
+ {{countdownm}}:{{countdowns}}
+
+ 若超时未支付,订单将自动取消
+ 立即支付
+
+
+
+
+ {{typeText[recinfo.orderStatus]}}
+
+ 实付:¥{{recinfo.payRealPrice}}
+ {{recinfo.createTime | formatDate('-')}}
+
+
+
+ 本单优惠
+
+ 立减-¥8.15
+
+ 感谢您信任嗨森逛,欢迎再次消费
+
+
+
+
+ 商家/订单信息
+
+ 交易单号
+ HF202220823829374671902
+
+
+ 流水号
+ 433423423425123123123211
+
+
+ 下单时间
+ 2022-09-06 10:36:38
+
+
+ 油站名称
+ 延长壳牌南充亚华加油站
+
+
+ 支付方式
+ 微信
+
+
+ 地址
+ 四川省南充市顺庆区金鱼领路541号1
+
+
+
+
+
+ 商品信息
+
+ 商品名称
+ 100元电信话费充值
+
+
+ 商品单价
+ ¥99.00
+
+
+ 商品数量
+ 2份
+
+
+ 商品总金额
+ ¥188.00
+
+
+
+
+
+
+ 商品信息
+
+ 加油优惠
+ -¥2.86
+
+
+ 积分抵扣
+ -¥1.86
+
+
+
+
+
+
+
+
+
+
+
+ 加油实付 ¥{{recinfo.payRealPrice}}
+
+
+
+
+
+
+
+
+
-
-
@@ -36,9 +151,9 @@
-
+ -->
-
+
- 预约订单详情
+
+
+
+
+
+
+
+
+ 再来一单
+
@@ -286,15 +451,33 @@
imageUrl: app.globalData.imgUrl,
imagewxUrl: app.globalData.imageWxImg,
imgadres1: 'dhf.png',
- preByOrderInfo: ''
+ preByOrderInfo: '',
+ countdownh: '', //倒计时时
+ countdownm: '', // 倒计时分
+ countdowns: '', // 倒计时秒
+ timer: null, //重复执行
+ typeText: {
+ 1: '待支付',
+ 2: '已支付',
+ 3: '已完成',
+ 4: '已退款',
+ 5: '已取消',
+ 6: '退款中',
+ 7: '退款失败'
+ },
+
};
},
onShow() {
//页面显示时,加载订单信息
this.getOrderById();
+ this.getPreByOrderIdId();
},
onHide() {
+ },
+ onUnload() {
+ clearInterval(this.timer);
},
onLoad(option) {
this.orderId = option.id
@@ -360,6 +543,29 @@
}
})
},
+ //倒计时
+ showtime() {
+ var nowtime = new Date(), //获取当前时间
+ endtime = this.orderList.createTime + 900000; //定义结束时间
+ var lefttime = endtime - nowtime, //距离结束时间的毫秒数
+ leftd = Math.floor(lefttime / (1000 * 60 * 60 * 24)), //计算天数
+ lefth = Math.floor((lefttime / (1000 * 60 * 60) % 24) + leftd * 24) < 10 ? "0" + Math.floor((lefttime /
+ (1000 * 60 * 60) % 24) + leftd * 24) : Math.floor((lefttime / (1000 * 60 * 60) % 24) + leftd *
+ 24), //计算小时数
+ leftm = Math.floor(lefttime / (1000 * 60) % 60) < 10 ? "0" + Math.floor(lefttime / (1000 * 60) % 60) :
+ Math.floor(lefttime / (1000 * 60) % 60), //计算分钟数
+ lefts = Math.floor(lefttime / 1000 % 60) < 10 ? "0" + Math.floor(lefttime / 1000 % 60) : Math.floor(
+ lefttime / 1000 % 60); //计算秒数
+ this.countdownh = lefth //返回倒计时的字符串
+ this.countdownm = leftm //返回倒计时的字符串
+ this.countdowns = lefts //返回倒计时的字符串
+ // 倒计时结束时,显示00:00:00
+ if (lefttime < 0) {
+ this.getThirdOrderByOrderId();
+ clearInterval(this.timer);
+ this.countdownh = this.countdownm = this.countdowns = "00"
+ }
+ },
//预约商品完成
orderComplete() {
let that = this;
@@ -468,6 +674,23 @@
diff --git a/high-unionPay/pages/user/order_list/order_list.vue b/high-unionPay/pages/user/order_list/order_list.vue
index 3198c43..d44ae3b 100644
--- a/high-unionPay/pages/user/order_list/order_list.vue
+++ b/high-unionPay/pages/user/order_list/order_list.vue
@@ -1,108 +1,85 @@
-
-
-
- {{grid}}
+
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+ {{grid}}
+
+
+
+
+ {{item}}
+
-
-
-
-
- 卡券订单
-
-
-
- 积分充值
-
-
-
- 优惠券包
-
-
-
- 加油订单
+
+
+
+ 在线加油
+
-
-
- 电影票
-
-
-
- KFC
-
-
-
- 星巴克
-
-
-
- 会员充值
-
-
-
- 工会卡充值
-
-
- {{row.createTime | formatDate('-')}}
+
+ {{typeText[row.orderStatus]}}
-
-
+
-
- {{row.highChildOrderList[0].goodsName}}
-
-
- 数量 : {{row.highChildOrderList[0].saleCount}}
+
+ {{row.highChildOrderList[0].goodsName}}
-
- ¥{{row.payPrice}}
+
+ x1
+
+
+
+
+ 订单编号:{{row.orderNo}}
+
+
+
+
+ 下单时间 : {{row.createTime | formatDate('-')}}
-
-
- {{row.payPrice * 10 * 10}}
+
+
+
+ 合计: ¥{{row.payPrice}}
- {{typeText[row.orderStatus]}}
-
- 取消订单
- 付款
+
+ 取消订单
+
+ 立即支付
@@ -113,17 +90,19 @@