From 208037760e0577f62e31809da56f0c9a9d7fa0aa Mon Sep 17 00:00:00 2001
From: Wik-T <812952667@qq.com>
Date: Sat, 8 Oct 2022 09:16:47 +0800
Subject: [PATCH] =?UTF-8?q?1.=20H5=20=E5=B0=8F=E7=A8=8B=E5=BA=8F2.0?=
=?UTF-8?q?=E7=9A=84=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?=
=?UTF-8?q?=202.=20=E8=82=AF=E5=BE=B7=E5=9F=BA=E8=AE=A2=E5=8D=95=E8=AF=A6?=
=?UTF-8?q?=E6=83=85=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages.json | 2 +-
pages/goods/goods-list/goods-list.vue | 8 +-
pages/goods/goods.vue | 379 +------------
pages/tabBar/home/home.vue | 282 ++++-----
pages/tabBar/user/user.vue | 99 +---
pages/user/coupon/coupon.vue | 21 +-
pages/user/news/news.vue | 11 +-
pages/user/order_details/order_details.vue | 598 ++++++++++++++------
pages/user/order_list/order_list.vue | 17 +-
pages/welcome/welcome.vue | 2 +-
qianzhu-KFC/order-details/order-details.vue | 7 +-
uni.scss | 4 +
12 files changed, 598 insertions(+), 832 deletions(-)
diff --git a/pages.json b/pages.json
index c83bb07..7314c39 100644
--- a/pages.json
+++ b/pages.json
@@ -83,7 +83,7 @@
"path": "pages/user/order_details/order_details",
"style": {
"navigationBarTitleText": "订单详情",
- "navigationBarBackgroundColor": "#0083f5",
+ "navigationBarBackgroundColor": "#3da7e7",
"navigationBarTextStyle": "white",
"enablePullDownRefresh": false
}
diff --git a/pages/goods/goods-list/goods-list.vue b/pages/goods/goods-list/goods-list.vue
index 3da3e72..a99c9d9 100644
--- a/pages/goods/goods-list/goods-list.vue
+++ b/pages/goods/goods-list/goods-list.vue
@@ -264,11 +264,11 @@
}
})
},
- toSearch() {
+ toSearch() {
this.pageNum = 1;
- this.pageSize = 10;
- this.isNoMoreData = false;
+ this.pageSize = 10;
this.goodsList = [];
+ this.isNoMoreData = false;
if (this.typeId == 3) {
this.getBrandCouponList();
} else {
@@ -295,7 +295,7 @@
margin-left: 5%;
margin-top: 15px;
height: 70rpx;
- background-color: #f5f5f5;
+ background-color: #ffffff;
border-radius: 10rpx;
position: relative;
display: flex;
diff --git a/pages/goods/goods.vue b/pages/goods/goods.vue
index 66b9fad..212f170 100644
--- a/pages/goods/goods.vue
+++ b/pages/goods/goods.vue
@@ -1,15 +1,14 @@
-
-
限购{{goodsData[0].limitNumber}}件
@@ -64,12 +51,6 @@
{{goodsData[0].couponName}}
-
嗨森逛
@@ -110,7 +91,7 @@
{{ product.highCouponModel.couponName }}
- 有效期至：{{product.highCouponModel.salesEndTime | formatDate('-')}}
+ 有效期至:{{product.highCouponModel.salesEndTime | formatDate('-')}}
￥{{ product.highCouponModel.discountPrice}}
@@ -643,21 +624,6 @@
margin-bottom: 20rpx;
}
- .goods-info {
- .price {
- font-size: 15px;
- font-weight: 600;
- color: #f47925;
- }
-
- .zprice {
- text-decoration: line-through;
- }
-
- .title {
- font-size: 30upx;
- }
- }
.spec {
.row {
@@ -712,69 +678,6 @@
}
}
- .comments {
- .row {
- width: 100%;
- height: 40upx;
- display: flex;
- align-items: center;
- margin: 0 0 30upx 0;
-
- .text {
- font-size: 30upx;
- }
-
- .arrow {
- font-size: 28upx;
- position: absolute;
- right: 4%;
- color: #17e6a1;
-
- .show {
- display: flex;
- align-items: center;
-
- .icon {
- color: #17e6a1;
- }
- }
- }
- }
-
- .comment {
- width: 100%;
-
- .user-info {
- width: 100%;
- height: 40upx;
- display: flex;
- align-items: center;
-
- .face {
- width: 40upx;
- height: 40upx;
- margin-right: 8upx;
-
- image {
- width: 40upx;
- height: 40upx;
- border-radius: 100%;
- }
- }
-
- .username {
- font-size: 24upx;
- color: #999;
- }
- }
-
- .content {
- margin-top: 10upx;
- font-size: 26upx;
- }
- }
- }
-
.description {
.title {
width: 100%;
@@ -863,280 +766,4 @@
}
}
- .popup {
- position: fixed;
- top: 0;
- width: 100%;
- height: 100%;
- z-index: 20;
- display: none;
-
- .mask {
- position: fixed;
- top: 0;
- width: 100%;
- height: 100%;
- z-index: 21;
- background-color: rgba(0, 0, 0, 0.6);
- }
-
- .layer {
- position: fixed;
- z-index: 22;
- bottom: -70%;
- width: 92%;
- padding: 0 4%;
- height: 70%;
- border-radius: 20upx 20upx 0 0;
- background-color: #fff;
- display: flex;
- flex-wrap: wrap;
- align-content: space-between;
-
- .content {
- width: 100%;
- padding: 20upx 0;
- }
-
- .btn {
- width: 100%;
- height: 100upx;
-
- .button {
- width: 100%;
- height: 80upx;
- border-radius: 40upx;
- color: #fff;
- display: flex;
- align-items: center;
- justify-content: center;
- background-color: #f47952;
- font-size: 28upx;
- }
- }
- }
-
- &.show {
- display: block;
-
- .mask {
- animation: showPopup 0.2s linear both;
- }
-
- .layer {
- animation: showLayer 0.2s linear both;
- }
- }
-
- &.hide {
- display: block;
-
- .mask {
- animation: hidePopup 0.2s linear both;
- }
-
- .layer {
- animation: hideLayer 0.2s linear both;
- }
- }
-
- &.none {
- display: none;
- }
-
- &.service {
- .row {
- margin: 30upx 0;
-
- .title {
- font-size: 30upx;
- margin: 10upx 0;
- }
-
- .description {
- font-size: 28upx;
- color: #999;
- }
- }
- }
-
- &.spec {
- .title {
- font-size: 30upx;
- margin: 30upx 0;
- }
-
- .sp {
- display: flex;
-
- view {
- font-size: 28upx;
- padding: 5upx 20upx;
- border-radius: 8upx;
- margin: 0 30upx 20upx 0;
- background-color: #f6f6f6;
-
- &.on {
- padding: 3upx 18upx;
- border: solid 1upx #f47925;
- }
- }
- }
-
- .length {
- margin-top: 30upx;
- border-top: solid 1upx #aaa;
- display: flex;
- justify-content: space-between;
- align-items: center;
- padding-top: 20upx;
-
- .text {
- font-size: 30upx;
- }
-
- .number {
- display: flex;
- justify-content: center;
- align-items: center;
-
- .input {
- width: 80upx;
- height: 60upx;
- margin: 0 10upx;
- background-color: #f3f3f3;
- display: flex;
- justify-content: center;
- align-items: center;
- text-align: center;
-
- input {
- width: 80upx;
- height: 60upx;
- display: flex;
- justify-content: center;
- align-items: center;
- text-align: center;
- font-size: 26upx;
- }
- }
-
- .sub,
- .add {
- width: 60upx;
- height: 60upx;
- background-color: #f3f3f3;
- border-radius: 5upx;
-
- .icon {
- font-size: 30upx;
- width: 60upx;
- height: 60upx;
- display: flex;
- justify-content: center;
- align-items: center;
-
- }
- }
- }
- }
-
- }
- }
-
- .share {
- display: none;
-
- &.show {
- display: block;
-
- .mask {
- animation: showPopup 0.15s linear both;
- }
-
- .layer {
- animation: showLayer 0.15s linear both;
- }
- }
-
- &.hide {
- display: block;
-
- .mask {
- animation: hidePopup 0.15s linear both;
- }
-
- .layer {
- animation: hideLayer 0.15s linear both;
- }
- }
-
- &.none {
- display: none;
- }
-
- .mask {
- background-color: rgba(0, 0, 0, .5);
- position: fixed;
- width: 100%;
- height: 100%;
- top: 0;
- z-index: 11;
- }
-
- .layer {
- width: 92%;
- position: fixed;
- z-index: 12;
- padding: 0 4%;
- top: 100%;
- background-color: rgba(255, 255, 255, 0.9);
-
- .list {
- width: 100%;
- display: flex;
- padding: 10upx 0 30upx 0;
-
- .box {
- width: 25%;
- display: flex;
- justify-content: center;
- flex-wrap: wrap;
-
- image {
- width: 13.8vw;
- height: 13.8vw;
- }
-
- .title {
- margin-top: 10upx;
- display: flex;
- justify-content: center;
- width: 100%;
- font-size: 26upx;
- }
- }
- }
-
- .btn {
- width: 100%;
- height: 100upx;
- display: flex;
- justify-content: center;
- align-items: center;
- font-size: 28upx;
- border-top: solid 1upx #666666;
- }
-
- .h1 {
- width: 100%;
- height: 80upx;
- display: flex;
- justify-content: center;
- align-items: center;
- font-size: 34upx;
- }
- }
-
- }
diff --git a/pages/tabBar/home/home.vue b/pages/tabBar/home/home.vue
index 1d84e11..86e8671 100644
--- a/pages/tabBar/home/home.vue
+++ b/pages/tabBar/home/home.vue
@@ -26,130 +26,133 @@
-
+
-
-
-
+
+
+
+
+
+
+ {{ row.title }}
+
+
+
+
+
+
+
+
+
- {{ row.title }}
+ {{ row.title }}
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+ 放松放松方放松放松方放松放松方
+ 40分钟前
+
+
+
+
+
+
- {{ row.title }}
-
-
-
-
-
-
-
-
-
-
-
- 放松放松方放松放松方放松放松方
- 40分钟前
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 加油专区
-
- 更多
-
-
-
-
- ETC加油券
- 2020.09.21-2202.10.12
- ¥240
-
-
-
- ETC加油券
- 2020.09.21-2202.10.12
- ¥240
+
+
+
+
+
+
+
+
+
-
-
- ETC加油券
- 2020.09.21-2202.10.12
- ¥240
+
+
+
+ 加油专区
+
+ 更多
-
-
-
-
- 惠享生活
+
+
+
+ ETC加油券
+ 2020.09.21-2202.10.12
+ ¥240
+
+
+
+ ETC加油券
+ 2020.09.21-2202.10.12
+ ¥240
+
+
+
+ ETC加油券
+ 2020.09.21-2202.10.12
+ ¥240
+
-
-
-
-
-
-
-
-
-
-
- 天天好券
+
+
+
+ 惠享生活
+
- 更多
-
-
-
-
- 加油优惠券包
- 2020.09.21-2202.10.12
- ¥240
+
+
+
+
+
-
-
- 加油优惠券包
- 2020.09.21-2202.10.12
- ¥240
+
+
+
+ 天天好券
+
+ 更多
-
-
- 加油优惠券包
- 2020.09.21-2202.10.12
- ¥240
+
+
+
+ 加油优惠券包
+ 2020.09.21-2202.10.12
+ ¥240
+
+
+
+ 加油优惠券包
+ 2020.09.21-2202.10.12
+ ¥240
+
+
+
+ 加油优惠券包
+ 2020.09.21-2202.10.12
+ ¥240
+
@@ -234,15 +237,15 @@
onShow() {
if (app.globalData.cityName != '') {
this.city = app.globalData.qianzhuCityName;
- this.getCouponListArea();
- this.getCouponListgold();
- this.getunioncardCouponListgold();
- this.getCmsContent();
- this.getCmsContentcmshome();
+ // this.getCouponListArea();
+ // this.getCouponListgold();
+ // this.getunioncardCouponListgold();
+ // this.getCmsContent();
+ // this.getCmsContentcmshome();
this.getCmsContentcmsContent();
- if (app.globalData.userInfo.phone) {
- this.getMembershipLevel();
- }
+ // if (app.globalData.userInfo.phone) {
+ // this.getMembershipLevel();
+ // }
}
// #ifdef H5
uni.getStorage({
@@ -334,12 +337,12 @@
that.city = '重庆市';
app.globalData.cityName = '重庆市';
app.globalData.cityId = '500000';
- that.getCouponListArea();
- that.getCouponListgold();
- that.getunioncardCouponListgold();
- that.getCmsContent();
- that.getCmsAactibity();
- that.getCmsContentcmshome();
+ // that.getCouponListArea();
+ // that.getCouponListgold();
+ // that.getunioncardCouponListgold();
+ // that.getCmsContent();
+ // that.getCmsAactibity();
+ // that.getCmsContentcmshome();
that.getCmsContentcmsContent();
}
);
@@ -379,14 +382,15 @@
getCmsContentcmsContent() {
let code;
// #ifdef H5
- code = 'CMS_H5_IMG'
+ code = '2'
// #endif
// #ifdef MP
- code = 'CMS_HOME_CONTENT'
+ code = '1'
// #endif
let params = {
- regionId: app.globalData.cityId,
- categoryCode: code
+ companyId: app.globalData.companyId,
+ platform: code,
+ categoryCode: 'CMS_HOME'
}
getCmsContent(params).then(res => {
if (res.return_code == '000000') {
@@ -545,14 +549,14 @@
uni.setStorage({
key: "cityId",
data: res.return_data.regionId
- })
- uni.setStorage({
- key: "cityName",
- data: res.return_data.provinceName
- })
- uni.setStorage({
- key: "qianzhuCityName",
- data: res.return_data.cityName
+ })
+ uni.setStorage({
+ key: "cityName",
+ data: res.return_data.provinceName
+ })
+ uni.setStorage({
+ key: "qianzhuCityName",
+ data: res.return_data.cityName
})
uni.setStorage({
key: "companyId",
@@ -560,12 +564,12 @@
})
// app.globalData.cityId = '500103';
if (res.return_data.regionId) {
- that.getCouponListArea();
- that.getCouponListgold();
- that.getunioncardCouponListgold();
- that.getCmsContent();
- that.getCmsAactibity();
- that.getCmsContentcmshome();
+ // that.getCouponListArea();
+ // that.getCouponListgold();
+ // that.getunioncardCouponListgold();
+ // that.getCmsContent();
+ // that.getCmsAactibity();
+ // that.getCmsContentcmshome();
that.getCmsContentcmsContent();
}
uni.getStorage({
@@ -760,8 +764,8 @@
this.currentSwiper = event.detail.current;
},
test(item) {
- uni.navigateTo({
- url:'../../user/news/news'
+ uni.navigateTo({
+ url: '../../user/news/news'
})
},
diff --git a/pages/tabBar/user/user.vue b/pages/tabBar/user/user.vue
index f54975d..de7528f 100644
--- a/pages/tabBar/user/user.vue
+++ b/pages/tabBar/user/user.vue
@@ -1,10 +1,7 @@
-
-
-
-
+
@@ -155,7 +152,6 @@
-
diff --git a/pages/user/order_list/order_list.vue b/pages/user/order_list/order_list.vue
index 06e591c..656a825 100644
--- a/pages/user/order_list/order_list.vue
+++ b/pages/user/order_list/order_list.vue
@@ -1,7 +1,7 @@
-
+
@@ -20,7 +20,7 @@
-
+
{{item}}
@@ -98,11 +98,11 @@
export default {
data() {
return {
- headerPosition: "fixed",
imagewxUrl: app.globalData.imageWxImg,
imgadres: 'noorder.png',
imgadres1: 'dhf.png',
- headerTop: "0px",
+ headerTop: "0px",
+ headerswper:'120px',
typeText: {
1: '等待付款',
2: '订单已支付',
@@ -132,7 +132,8 @@
onLoad(option) {
// #ifdef H5
- this.headerTop = '44px';
+ this.headerTop = '44px';
+ this.headerswper = '150px';
// #endif
let tbIndex = parseInt(option.tbIndex) + 1;
if (tbIndex == 0) {
@@ -144,11 +145,6 @@
this.tabbarIndex = tbIndex;
this.getUserOrderList();
},
- onPageScroll(e) {
- return;
- //兼容iOS端下拉时顶部漂移
- this.headerPosition = e.scrollTop >= 0 ? "fixed" : "absolute";
- },
onReachBottom() {
this.getUserOrderList();
},
@@ -445,7 +441,6 @@
position: fixed;
z-index: 999;
height: 50px;
- top: 120px;
background-color: #f3f3f3;
display: flex;
flex-direction: row;
diff --git a/pages/welcome/welcome.vue b/pages/welcome/welcome.vue
index ef8084f..b0cf1e3 100644
--- a/pages/welcome/welcome.vue
+++ b/pages/welcome/welcome.vue
@@ -137,7 +137,7 @@
},
jumpcdx() {
location.href =
- 'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxa075e8509802f826&redirect_uri=https%3A%2F%2Fhsg.dctpay.com%2FhsgH5%2Findex.html%23%2F&response_type=code&scope=snsapi_base&state=1#wechat_redirect';
+ 'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxa075e8509802f826&redirect_uri=https%3A%2F%2Fhsgcs.dctpay.com%2FhsgH5%2Findex.html%23%2F&response_type=code&scope=snsapi_base&state=1#wechat_redirect';
},
}
}
diff --git a/qianzhu-KFC/order-details/order-details.vue b/qianzhu-KFC/order-details/order-details.vue
index 3f136fb..6d976c6 100644
--- a/qianzhu-KFC/order-details/order-details.vue
+++ b/qianzhu-KFC/order-details/order-details.vue
@@ -2,15 +2,10 @@
-
+
{{countdownm}}:{{countdowns}}
-
若超时未支付,订单将自动取消
-
立即支付
diff --git a/uni.scss b/uni.scss
index 416d983..50938cf 100644
--- a/uni.scss
+++ b/uni.scss
@@ -215,6 +215,10 @@ $uni-font-size-paragraph:30upx;
.fcor666 {
color: #666666;
+}
+
+.fcor777 {
+ color: #777777;
}
.fcor999 {