From d5cc5349ea8a923d5ff139a4c2bf4457c22d558b Mon Sep 17 00:00:00 2001
From: whyneedname <542399163@qq.com>
Date: Mon, 17 Oct 2022 18:41:20 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=A7=AF=E5=88=86?=
=?UTF-8?q?=E5=85=91=E6=8D=A2=E9=A1=B5;=E7=AD=BE=E5=88=B0=E9=A1=B5?=
=?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=A7=AF=E5=88=86=E5=95=86=E5=93=81;?=
=?UTF-8?q?=E5=94=AE=E5=90=8E=E8=AF=A6=E6=83=85;=E7=89=A9=E6=B5=81?=
=?UTF-8?q?=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
assets/css/style.css | 101 --------
assets/css/style.less | 202 ++++++++--------
config/index.js | 8 +-
pages.json | 19 +-
pages/order/Logistics/index.vue | 298 +++++++++++++++++++++--
pages/order/OrderDetails/index.vue | 5 +
pages/order/OrderReturnDetail/index.vue | 175 ++++++++++++--
pages/shop/IntegralList/index.vue | 302 ------------------------
pages/user/User/index.vue | 30 ++-
pages/user/signIn/Sign/index.vue | 104 +++++---
10 files changed, 652 insertions(+), 592 deletions(-)
delete mode 100644 pages/shop/IntegralList/index.vue
diff --git a/assets/css/style.css b/assets/css/style.css
index 2e10354..35f32b0 100644
--- a/assets/css/style.css
+++ b/assets/css/style.css
@@ -2068,107 +2068,6 @@ page {
margin-left: 14rpx;
}
/*物流信息*/
-.logistics .header {
- padding: 23rpx 30rpx;
- background-color: #fff;
- height: 166rpx;
-}
-.logistics .header .pictrue {
- width: 120rpx;
- height: 120rpx;
-}
-.logistics .header .pictrue image {
- width: 100%;
- height: 100%;
- border-radius: 6rpx;
-}
-.logistics .header .text {
- width: 540rpx;
- font-size: 28rpx;
- color: #999;
- margin-top: 6rpx;
-}
-.logistics .header .text .name {
- width: 365rpx;
- color: #282828;
-}
-.logistics .header .text .money {
- text-align: right;
-}
-.logistics .logisticsCon {
- background-color: #fff;
- margin: 12rpx 0;
-}
-.logistics .logisticsCon .company {
- height: 120rpx;
- margin: 0 0 45rpx 30rpx;
- padding-right: 30rpx;
- border-bottom: 1px solid #f5f5f5;
-}
-.logistics .logisticsCon .company .picTxt {
- width: 520rpx;
-}
-.logistics .logisticsCon .company .picTxt .iconfont {
- width: 50rpx;
- height: 50rpx;
- background-color: #666;
- text-align: center;
- line-height: 50rpx;
- color: #fff;
- font-size: 35rpx;
-}
-.logistics .logisticsCon .company .picTxt .text {
- width: 450rpx;
- font-size: 26rpx;
- color: #282828;
-}
-.logistics .logisticsCon .company .picTxt .text .name {
- color: #999;
-}
-.logistics .logisticsCon .company .picTxt .text .express {
- margin-top: 5rpx;
-}
-.logistics .logisticsCon .company .copy {
- font-size: 20rpx;
- width: 106rpx;
- height: 40rpx;
- border-radius: 3rpx;
- border: 1px solid #999;
-}
-.logistics .logisticsCon .item {
- padding: 0 40rpx;
- position: relative;
-}
-.logistics .logisticsCon .item .circular {
- width: 20rpx;
- height: 20rpx;
- border-radius: 50%;
- position: absolute;
- top: -1rpx;
- left: 31.5rpx;
- background-color: #ddd;
-}
-.logistics .logisticsCon .item .circular.on {
- background-color: #eb3729;
-}
-.logistics .logisticsCon .item .text {
- font-size: 26rpx;
- color: #666;
- width: 615rpx;
- border-left: 1px solid #e6e6e6;
- padding: 0 0 60rpx 38rpx;
-}
-.logistics .logisticsCon .item .text.on {
- border-left-color: #f8c1bd;
-}
-.logistics .logisticsCon .item .text .data {
- font-size: 24rpx;
- color: #999;
- margin-top: 10rpx;
-}
-.logistics .logisticsCon .item .text .data .time {
- margin-left: 15rpx;
-}
/*支付状态*/
.payment-status {
background-color: #fff;
diff --git a/assets/css/style.less b/assets/css/style.less
index 547beb4..54c7734 100644
--- a/assets/css/style.less
+++ b/assets/css/style.less
@@ -4098,127 +4098,127 @@ page {
}
/*物流信息*/
-.logistics .header {
- padding: 0.23 * 100rpx 0.3 * 100rpx;
- background-color: #fff;
- height: 1.66 * 100rpx;
-}
+// .logistics .header {
+// padding: 0.23 * 100rpx 0.3 * 100rpx;
+// background-color: #fff;
+// height: 1.66 * 100rpx;
+// }
-.logistics .header .pictrue {
- width: 1.2 * 100rpx;
- height: 1.2 * 100rpx;
-}
+// .logistics .header .pictrue {
+// width: 1.2 * 100rpx;
+// height: 1.2 * 100rpx;
+// }
-.logistics .header .pictrue image {
- width: 100%;
- height: 100%;
- border-radius: 0.06 * 100rpx;
-}
+// .logistics .header .pictrue image {
+// width: 100%;
+// height: 100%;
+// border-radius: 0.06 * 100rpx;
+// }
-.logistics .header .text {
- width: 5.4 * 100rpx;
- font-size: 0.28 * 100rpx;
- color: #999;
- margin-top: 0.06 * 100rpx;
-}
+// .logistics .header .text {
+// width: 5.4 * 100rpx;
+// font-size: 0.28 * 100rpx;
+// color: #999;
+// margin-top: 0.06 * 100rpx;
+// }
-.logistics .header .text .name {
- width: 3.65 * 100rpx;
- color: #282828;
-}
+// .logistics .header .text .name {
+// width: 3.65 * 100rpx;
+// color: #282828;
+// }
-.logistics .header .text .money {
- text-align: right;
-}
+// .logistics .header .text .money {
+// text-align: right;
+// }
-.logistics .logisticsCon {
- background-color: #fff;
- margin: 0.12 * 100rpx 0;
-}
+// .logistics .logisticsCon {
+// background-color: #fff;
+// margin: 0.12 * 100rpx 0;
+// }
-.logistics .logisticsCon .company {
- height: 1.2 * 100rpx;
- margin: 0 0 0.45 * 100rpx 0.3 * 100rpx;
- padding-right: 0.3 * 100rpx;
- border-bottom: 1px solid #f5f5f5;
-}
+// .logistics .logisticsCon .company {
+// height: 1.2 * 100rpx;
+// margin: 0 0 0.45 * 100rpx 0.3 * 100rpx;
+// padding-right: 0.3 * 100rpx;
+// border-bottom: 1px solid #f5f5f5;
+// }
-.logistics .logisticsCon .company .picTxt {
- width: 5.2 * 100rpx;
-}
+// .logistics .logisticsCon .company .picTxt {
+// width: 5.2 * 100rpx;
+// }
-.logistics .logisticsCon .company .picTxt .iconfont {
- width: 0.5 * 100rpx;
- height: 0.5 * 100rpx;
- background-color: #666;
- text-align: center;
- line-height: 0.5 * 100rpx;
- color: #fff;
- font-size: 0.35 * 100rpx;
-}
+// .logistics .logisticsCon .company .picTxt .iconfont {
+// width: 0.5 * 100rpx;
+// height: 0.5 * 100rpx;
+// background-color: #666;
+// text-align: center;
+// line-height: 0.5 * 100rpx;
+// color: #fff;
+// font-size: 0.35 * 100rpx;
+// }
-.logistics .logisticsCon .company .picTxt .text {
- width: 4.5 * 100rpx;
- font-size: 0.26 * 100rpx;
- color: #282828;
-}
+// .logistics .logisticsCon .company .picTxt .text {
+// width: 4.5 * 100rpx;
+// font-size: 0.26 * 100rpx;
+// color: #282828;
+// }
-.logistics .logisticsCon .company .picTxt .text .name {
- color: #999;
-}
+// .logistics .logisticsCon .company .picTxt .text .name {
+// color: #999;
+// }
-.logistics .logisticsCon .company .picTxt .text .express {
- margin-top: 0.05 * 100rpx;
-}
+// .logistics .logisticsCon .company .picTxt .text .express {
+// margin-top: 0.05 * 100rpx;
+// }
-.logistics .logisticsCon .company .copy {
- font-size: 0.2 * 100rpx;
- width: 1.06 * 100rpx;
- height: 0.4 * 100rpx;
- border-radius: 0.03 * 100rpx;
- border: 1px solid #999;
-}
+// .logistics .logisticsCon .company .copy {
+// font-size: 0.2 * 100rpx;
+// width: 1.06 * 100rpx;
+// height: 0.4 * 100rpx;
+// border-radius: 0.03 * 100rpx;
+// border: 1px solid #999;
+// }
-.logistics .logisticsCon .item {
- padding: 0 0.4 * 100rpx;
- position: relative;
-}
+// .logistics .logisticsCon .item {
+// padding: 0 0.4 * 100rpx;
+// position: relative;
+// }
-.logistics .logisticsCon .item .circular {
- width: 0.2 * 100rpx;
- height: 0.2 * 100rpx;
- border-radius: 50%;
- position: absolute;
- top: -0.01 * 100rpx;
- left: 0.315 * 100rpx;
- background-color: #ddd;
-}
+// .logistics .logisticsCon .item .circular {
+// width: 0.2 * 100rpx;
+// height: 0.2 * 100rpx;
+// border-radius: 50%;
+// position: absolute;
+// top: -0.01 * 100rpx;
+// left: 0.315 * 100rpx;
+// background-color: #ddd;
+// }
-.logistics .logisticsCon .item .circular.on {
- background-color: #eb3729;
-}
+// .logistics .logisticsCon .item .circular.on {
+// background-color: #eb3729;
+// }
-.logistics .logisticsCon .item .text {
- font-size: 0.26 * 100rpx;
- color: #666;
- width: 6.15 * 100rpx;
- border-left: 1px solid #e6e6e6;
- padding: 0 0 0.6 * 100rpx 0.38 * 100rpx;
-}
+// .logistics .logisticsCon .item .text {
+// font-size: 0.26 * 100rpx;
+// color: #666;
+// width: 6.15 * 100rpx;
+// border-left: 1px solid #e6e6e6;
+// padding: 0 0 0.6 * 100rpx 0.38 * 100rpx;
+// }
-.logistics .logisticsCon .item .text.on {
- border-left-color: #f8c1bd;
-}
+// .logistics .logisticsCon .item .text.on {
+// border-left-color: #f8c1bd;
+// }
-.logistics .logisticsCon .item .text .data {
- font-size: 0.24 * 100rpx;
- color: #999;
- margin-top: 0.1 * 100rpx;
-}
+// .logistics .logisticsCon .item .text .data {
+// font-size: 0.24 * 100rpx;
+// color: #999;
+// margin-top: 0.1 * 100rpx;
+// }
-.logistics .logisticsCon .item .text .data .time {
- margin-left: 0.15 * 100rpx;
-}
+// .logistics .logisticsCon .item .text .data .time {
+// margin-left: 0.15 * 100rpx;
+// }
/*支付状态*/
.payment-status {
diff --git a/config/index.js b/config/index.js
index e2ada4c..c081c7e 100644
--- a/config/index.js
+++ b/config/index.js
@@ -1,8 +1,8 @@
// export const VUE_APP_API_URL = 'http://192.168.10.129:48080/bxgApp'
-// export const VUE_APP_API_URL = 'http://192.168.10.113:48080/bxgApp'
-export const VUE_APP_API_URL = 'https://farm.lotus-wallet.com/bxgApp'
+export const VUE_APP_API_URL = 'http://192.168.10.113:48080/bxgApp'
+// export const VUE_APP_API_URL = 'https://farm.lotus-wallet.com/bxgApp'
// export const VUE_APP_API_URL = 'https://xiaohui.shop.cyjyyjy.com/xiaohuiapp'
export const VUE_APP_RESOURCES_URL = 'https://h5.yixiang.co/static'
-export const BXG_TENANT_ID = 129
-// export const BXG_TENANT_ID = 138
+// export const BXG_TENANT_ID = 129
+export const BXG_TENANT_ID = 138
// export const BXG_TENANT_ID = 128
\ No newline at end of file
diff --git a/pages.json b/pages.json
index d1aff5e..ec577c3 100644
--- a/pages.json
+++ b/pages.json
@@ -307,7 +307,8 @@
{
"path": "pages/order/Logistics/index",
"style": {
- "navigationBarTitleText": "查看物流"
+ "navigationBarTitleText": "查看物流",
+ "navigationStyle": "custom"
}
},
{
@@ -493,14 +494,14 @@
"navigationStyle": "custom"
}
},
- {
- "path": "pages/shop/IntegralList/index",
- "style": {
- "navigationBarTitleText": "",
- "enablePullDownRefresh": false,
- "navigationStyle": "custom"
- }
- },
+ // {
+ // "path": "pages/shop/IntegralList/index",
+ // "style": {
+ // "navigationBarTitleText": "",
+ // "enablePullDownRefresh": false,
+ // "navigationStyle": "custom"
+ // }
+ // },
{
"path": "pages/shop/Evaluations/EvaluationDetail/index",
"style": {
diff --git a/pages/order/Logistics/index.vue b/pages/order/Logistics/index.vue
index 4044dbb..96774b5 100644
--- a/pages/order/Logistics/index.vue
+++ b/pages/order/Logistics/index.vue
@@ -1,6 +1,53 @@
-
@@ -38,16 +86,45 @@
{{ express.time }}
-
+ -->
+
+
+ 物流详情
+
+
+
+
+
+
+
+
+ {{ item.acceptStation }}
+ {{ item.acceptTime }}
+
+
+
+ {{ item.acceptStation }}
+ {{ item.acceptTime }}
+
+
+
+
+ {{ item.acceptStation }}
+ {{ item.acceptTime }}
+
+
+
+
+
+
+
-
-
-
+
+
@@ -78,16 +155,16 @@
-
+ -->
-
+
diff --git a/pages/user/User/index.vue b/pages/user/User/index.vue
index 5f804e2..93e544c 100644
--- a/pages/user/User/index.vue
+++ b/pages/user/User/index.vue
@@ -248,18 +248,24 @@ export default {
pic: "../../../static/images/my-favorites.png",
uniapp_url: "/pages/shop/GoodsCollection/index"
},
- {
- name: "积分兑换",
- enName: "EXCHANGE",
- pic: "../../../static/images/exchange.png",
- uniapp_url: "/pages/shop/IntegralList/index"
- },
+ // {
+ // name: "积分兑换",
+ // enName: "EXCHANGE",
+ // pic: "../../../static/images/exchange.png",
+ // uniapp_url: "/pages/shop/IntegralList/index"
+ // },
{
name: "地址管理",
enName: "MY ADDRESS",
pic: "../../../static/images/my-address.png",
uniapp_url: "/pages/user/address/AddressManagement/index"
},
+ {
+ name: "常见问题",
+ enName: "Q&A",
+ pic: "../../../static/images/Q&A.png",
+ uniapp_url: "/pages/user/address/AddressManagement/index"
+ },
{
name: "关于我们",
enName: "ABOUT US",
@@ -268,12 +274,12 @@ export default {
}
],
MyMenus2: [
- {
- name: "常见问题",
- enName: "Q&A",
- pic: "../../../static/images/Q&A.png",
- uniapp_url: "/pages/user/address/AddressManagement/index"
- },
+ // {
+ // name: "常见问题",
+ // enName: "Q&A",
+ // pic: "../../../static/images/Q&A.png",
+ // uniapp_url: "/pages/user/address/AddressManagement/index"
+ // },
{
name: "联系客服",
enName: "SERVICE",
diff --git a/pages/user/signIn/Sign/index.vue b/pages/user/signIn/Sign/index.vue
index 7488ac3..ef9b798 100644
--- a/pages/user/signIn/Sign/index.vue
+++ b/pages/user/signIn/Sign/index.vue
@@ -4,14 +4,14 @@
@@ -57,7 +57,7 @@
据说连续签到{{day}}天可获得超额积分,一定要坚持签到哦
-
+
+
+
+
+ 积分兑换
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ¥{{ goodsDetail.minPrice }}
+ ¥{{ goodsDetail.price }}
+
+ {{ goodsDetail.title }}
+ {{ goodsDetail.info }}
+
+
+
+
+
+
+
+
+ 砍价中
+
+
+
+
+
+
+
+
+
+ ¥{{ bargainHelpCount.alreadyPrice || 0 }}
+ 已减
+
+
+
+
+ 您的好友已砍{{ bargainHelpCount.alreadyPrice || 0 }}元
+ 助力ta再砍一刀!
+
+
+ {{bargainHelpCount.price === 0?'':'加油!'}}
+ 恭喜您砍价成功!
+ 还可再砍{{bargainHelpCount.price || 0}}元
+
+
+
+ 砍价进度
+ {{bargainHelpCount.pricePercent + '%'}}
+
+
+
+
+
+
+
+
+
+
+ 立即发起砍价
+
+
+
+
+
+ 立即支付
+
+
+
+ 帮好友砍一刀
+
+
+ 我也要砍价
+
+
+
+
+
+ 助力好友记录
+ {{bargainShare.userCount || 0}}人已砍价
+
+
+
+
+
+
+
+
+
+
+ -¥{{ item.price }}
+
+
+
+
+
-
-
-
+
+
+ 帮助砍价、帮砍成功:
+
-
-
+ -->
+
+
+ // 砍价进度条
-
+ // 砍价进度条下的金额
砍价成功
-
-
+ // 砍价成功:
+
+ // surplusPrice 砍价剩余金额为0
+ // bargainUid 砍价人为发起砍价用户
+ // userBargainStatus 砍价状态为
+
恭喜您砍价成功,快去支付吧~
-
+ // 参与砍价按钮 同一人
立即发起砍价
-
+ // 邀请好友按钮
邀请好友帮砍价
-
+ // 帮砍好友砍按钮
帮好友砍一刀
-
+ // 发起砍价按钮 非同一人
我也要砍价
-
+ // 支付按钮
立即支付
抢更多商品
@@ -89,8 +206,9 @@
位好友成功帮您砍价
-
-
+ -->
+
+
+
+
+
+
您已砍掉
@@ -144,7 +263,12 @@
邀请好友帮砍价
我也要参与
-
+
+
+
+
+
+
-
diff --git a/pages/activity/GroupDetails/index.vue b/pages/activity/GroupDetails/index.vue
index bd1dfb2..3cb3861 100644
--- a/pages/activity/GroupDetails/index.vue
+++ b/pages/activity/GroupDetails/index.vue
@@ -21,23 +21,16 @@
-
-
+
+
- 3/{{ storeInfo.people }}已参团
+
{{ storeInfo.people }}
人团
-
@@ -136,7 +129,7 @@
-
+
@@ -149,7 +142,9 @@
去拼单
+
+
@@ -234,7 +229,7 @@
单独购买
- 报名参团
+ 发起拼团
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 立刻拼团
+ 再次开团
+ 取消开团
+ 查看订单信息
+
+
+
+
+ 已拼2020件
{{ storeCombination.people || 0 }}人团
-
-
-
+ -->
+
+
+ 不许人间见白头
-
+ 小可爱本人
@@ -55,7 +140,8 @@
取消开团
查看订单信息
-
+ -->
+
-
diff --git a/pages/activity/SeckillDetails/index.vue b/pages/activity/SeckillDetails/index.vue
index 726d868..3975a0e 100644
--- a/pages/activity/SeckillDetails/index.vue
+++ b/pages/activity/SeckillDetails/index.vue
@@ -786,38 +786,38 @@ export default {
line-height: 28rpx;
}
-.tui-share-btn {
- display: block;
- background: transparent;
- margin: 0;
- padding: 0;
- border-radius: 0;
- border: 0;
-}
+// .tui-share-btn {
+// display: block;
+// background: transparent;
+// margin: 0;
+// padding: 0;
+// border-radius: 0;
+// border: 0;
+// }
-.tui-share-btn::after {
- border: 0;
-}
+// .tui-share-btn::after {
+// border: 0;
+// }
-.tui-share-box {
- display: flex;
- align-items: center;
-}
+// .tui-share-box {
+// display: flex;
+// align-items: center;
+// }
-.tui-share-position {
- position: absolute;
- right: 0;
- top: 30rpx;
-}
+// .tui-share-position {
+// position: absolute;
+// right: 0;
+// top: 30rpx;
+// }
-.tui-share-text {
- padding-left: 8rpx;
-}
+// .tui-share-text {
+// padding-left: 8rpx;
+// }
-.tui-sub-title {
- padding: 20rpx 0;
- line-height: 32rpx;
-}
+// .tui-sub-title {
+// padding: 20rpx 0;
+// line-height: 32rpx;
+// }
.tui-sale-info {
display: flex;
diff --git a/pages/activity/activity/index.vue b/pages/activity/activity/index.vue
index 819de7f..c7263c8 100644
--- a/pages/activity/activity/index.vue
+++ b/pages/activity/activity/index.vue
@@ -57,25 +57,27 @@
{{item.title}}
-
-
+
+
{{activityType == 0?'秒杀':activityType == 1?'拼团':'砍价'}}剩余
{{100 - item.percent}}%
-
+
-
+
+ {{activityType == 1?'单买价 ':'原价 '}}¥{{activityType == 1?item.productPrice:item.price}}
+
- {{activityType == 0?'秒杀':activityType == 1?'拼团':'砍价'}}价¥{{activityType != 2?item.price:item.minPrice}}
+ {{activityType == 0?'秒杀价':activityType == 1?'拼团价':'可砍至'}}¥{{activityType != 2?item.price:item.minPrice}}
- ¥{{activityType == 0?item.otPrice:activityType == 1?item.productPrice:item.price}}
+ ¥{{item.otPrice}}
- 立即{{activityType == 0?'秒杀':activityType == 1?'拼团':'砍价'}}
+ {{activityType == 0?'立即秒杀':'发起' + (activityType == 1?'拼团':'砍价')}}
@@ -177,9 +179,13 @@
})
} else {
this.$yrouter.push({
- path: "/pages/activity/DargainDetails/index",
+ path: "/pages/activity/DargainGoodsDetails/index",
query: { id, partake: 0 }
});
+ // this.$yrouter.push({
+ // path: "/pages/activity/DargainDetails/index",
+ // query: { id, partake: 0 }
+ // });
}
},
seckillInfo() {
@@ -495,6 +501,14 @@
}
}
+ .original-price {
+ height: 60rpx;
+ padding-top: 20rpx;
+ .otPrice {
+ text-decoration: none;
+ }
+ }
+
.price {
font-size: 30rpx;
font-family: PingFang SC;
diff --git a/pages/order/MyOrder/index.vue b/pages/order/MyOrder/index.vue
index 1c88fdb..86eff8a 100644
--- a/pages/order/MyOrder/index.vue
+++ b/pages/order/MyOrder/index.vue
@@ -219,9 +219,10 @@ export default {
DataFormat,
},
computed: mapGetters(['userInfo']),
+ onLoad() {
+ this.type = parseInt(this.$yroute.query.type) || 0
+ },
onShow: function() {
- console.log(this)
- this.type = parseInt(this.$yroute.query.type) || 0
this.changeType(this.type)
this.getOrderData()
this.getOrderList()
diff --git a/pages/order/OrderDetails/index.vue b/pages/order/OrderDetails/index.vue
index 61319f0..890c053 100644
--- a/pages/order/OrderDetails/index.vue
+++ b/pages/order/OrderDetails/index.vue
@@ -31,7 +31,7 @@
交易完成
-
+
{{ orderInfo._status._title }}
diff --git a/pages/shop/ShoppingCart/index.vue b/pages/shop/ShoppingCart/index.vue
index 208ec67..b95568d 100644
--- a/pages/shop/ShoppingCart/index.vue
+++ b/pages/shop/ShoppingCart/index.vue
@@ -2,8 +2,8 @@