From 184f379d07c0d6eb88038ec0e603d3459a296ab0 Mon Sep 17 00:00:00 2001
From: yangsanTT <812952667@qq.com>
Date: Mon, 19 Apr 2021 22:42:04 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81=20?=
=?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BB=A3=E7=90=86=E5=95=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages.json | 12 +-
pages/goods/coupon-details/coupon-details.vue | 4 +-
pages/goods/externalCoupon/externalCoupon.vue | 4 +-
pages/pay/success/success.vue | 4 +-
pages/user/agentCoupons/agentCoupons.vue | 111 +++++++++++
.../mineCouponsDestails.vue | 4 +-
pages/user/minePromotion/minePromotion.vue | 179 ++++++++++++++++--
uni.scss | 18 +-
8 files changed, 313 insertions(+), 23 deletions(-)
create mode 100644 pages/user/agentCoupons/agentCoupons.vue
diff --git a/pages.json b/pages.json
index a67e7db..bde49a8 100644
--- a/pages.json
+++ b/pages.json
@@ -1,5 +1,6 @@
{
"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
+
{
"path": "pages/tabBar/home/home",
"style": {
@@ -312,19 +313,26 @@
"enablePullDownRefresh": false
}
+ }
+
+ , {
+ "path": "pages/user/agentCoupons/agentCoupons",
+ "style": {
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": false
+ }
+
},
{
"path": "pages/user/minePromotion/minePromotion",
"style": {
"navigationBarTitleText": "",
- "enablePullDownRefresh": true,
"backgroundTextStyle": "light",
"navigationBarBackgroundColor": "#f06c7a",
"backgroundColorTop": "#f06c7a",
"navigationBarTextStyle": "white"
}
}
-
],
"globalStyle": {
diff --git a/pages/goods/coupon-details/coupon-details.vue b/pages/goods/coupon-details/coupon-details.vue
index 4de1300..dff7c7b 100644
--- a/pages/goods/coupon-details/coupon-details.vue
+++ b/pages/goods/coupon-details/coupon-details.vue
@@ -224,8 +224,8 @@
}
.coupon-qr {
- width: 150px;
- height: 150px;
+ width: 190px;
+ height: 190px;
}
.coupon-des {
diff --git a/pages/goods/externalCoupon/externalCoupon.vue b/pages/goods/externalCoupon/externalCoupon.vue
index 4757005..4e42baf 100644
--- a/pages/goods/externalCoupon/externalCoupon.vue
+++ b/pages/goods/externalCoupon/externalCoupon.vue
@@ -290,8 +290,8 @@
}
.coupon-img {
- width: 80px;
- height: 80px;
+ width: 100px;
+ height: 100px;
margin-top: 10px;
}
diff --git a/pages/pay/success/success.vue b/pages/pay/success/success.vue
index 94050af..586605e 100644
--- a/pages/pay/success/success.vue
+++ b/pages/pay/success/success.vue
@@ -185,8 +185,8 @@
}
.coupon-img {
- width: 80px;
- height: 80px;
+ width: 100px;
+ height: 100px;
margin-top: 10px;
}
diff --git a/pages/user/agentCoupons/agentCoupons.vue b/pages/user/agentCoupons/agentCoupons.vue
new file mode 100644
index 0000000..7a93d93
--- /dev/null
+++ b/pages/user/agentCoupons/agentCoupons.vue
@@ -0,0 +1,111 @@
+
+
+
+
+
+ 重庆中石化码商券
+
+
+ 42342424234234
+
+
+ 300.00
+
+
+
+
+
+
+ 出售时间:2021.4.13 23:14
+
+
+
+
+
+
+ 重庆中石化码商券
+
+
+ 42342424234234
+
+
+ 300.00
+
+
+
+
+
+
+ 出售时间:2021.4.13 23:14
+
+
+
+
+
+
+ 重庆中石化码商券
+
+
+ 42342424234234
+
+
+ 300.00
+
+
+
+
+
+
+ 出售时间:2021.4.13 23:14
+
+
+
+
+
+
+
+
diff --git a/pages/user/mineCouponsDestails/mineCouponsDestails.vue b/pages/user/mineCouponsDestails/mineCouponsDestails.vue
index a26e2e4..ee50629 100644
--- a/pages/user/mineCouponsDestails/mineCouponsDestails.vue
+++ b/pages/user/mineCouponsDestails/mineCouponsDestails.vue
@@ -141,8 +141,8 @@
}
.coupon-img {
- width: 80px;
- height: 80px;
+ width: 100px;
+ height: 100px;
margin-top: 10px;
}
diff --git a/pages/user/minePromotion/minePromotion.vue b/pages/user/minePromotion/minePromotion.vue
index c69c36b..3a8294a 100644
--- a/pages/user/minePromotion/minePromotion.vue
+++ b/pages/user/minePromotion/minePromotion.vue
@@ -1,17 +1,135 @@
- 我的推广
-
-
+ 我的推广
+
+
+
+ 今日数据
- 今日数据
+
+
+
+ 7
+ 5300.00
+
+
+ 今日订单
+ 今日流水
+
+
+
+
+
+
+
+ 库存管理
+
+
+
+
+
+
+
+
+ 剩余库存(24)
+
+
+ 总计 9500.00
+
+
+
+
+
+ 面额100.00
+
+
+ 13张
+
+
+ 1300.00
+
+
+
+
+ 面额100.00
+
+
+ 13张
+
+
+ 1300.00
+
+
+
+
+ 面额100.00
+
+
+ 13张
+
+
+ 1300.00
+
+
+
+
+
+
+
+ 销售统计
+
+
+
+
+
+
+
+
+
+ 已销售(24)
+
+
+ 总计 1129500.00
+
-
- 7
- 5300.00
+
+
+
+ 面额100.00
+
+
+ 13张
+
+
+ 1300.00
+
+
+
+
+ 面额100.00
+
+
+ 13张
+
+
+ 1300.00
+
+
+
+
+ 面额100.00
+
+
+ 13张
+
+
+ 1300.00
+
@@ -25,7 +143,12 @@
}
},
methods: {
-
+ //跳转代理商卡券
+ jumpAgent(){
+ uni.navigateTo({
+ url:'../agentCoupons/agentCoupons'
+ })
+ }
}
}
@@ -39,7 +162,7 @@
position: absolute;
top: 50px;
border-radius: 5px;
- box-shadow: 0px 2px 10px 2px #999999;
+ box-shadow: 0px 2px 6px 2px #999999;
}
.promotion_xg {
@@ -47,7 +170,7 @@
height: 2px;
margin-top: 8px;
background-color: #f06c7a;
- transform: rotate(120deg);
+ transform: rotate(100deg);
}
.promotoin_text {
@@ -60,6 +183,40 @@
margin-top: 8px;
height: 2px;
background-color: #f06c7a;
- transform: rotate(120deg);
+ transform: rotate(100deg);
+ }
+
+ .promotion_kc {
+ padding-bottom: 10px;
+ border-radius: 5px;
+ box-shadow: 0px 2px 4px 2px #999999;
+ }
+
+ .pro_img {
+ width: 40px;
+ height: 40px;
+ }
+
+ .pro_cont {
+ height: 35px;
+ margin-left: 50px;
+ ;
+ }
+
+ .pro_title {
+ width: 110px;
+ }
+
+ .pro_price {
+ margin-right: 10px;
+ margin-left: 110px;
+ }
+
+ .pro_mok {
+ background-color: #1296db;
+ height: 95px;
+ margin-left: 2.5%;
+ width: 30%;
+ display: inline-block;
}
diff --git a/uni.scss b/uni.scss
index 2adad58..382e7d5 100644
--- a/uni.scss
+++ b/uni.scss
@@ -314,8 +314,15 @@ $uni-font-size-paragraph:30upx;
.height90 {
height: 90px;
}
+
+
+.height100p {
+ height: 100px;
+}
-
+.height120{
+ height: 120px;
+}
.height30 {
height: 30px;
@@ -345,7 +352,10 @@ $uni-font-size-paragraph:30upx;
.mart90 {
margin-top: 90px;
}
-
+
+.mart80{
+ margin-top: 80px;
+}
.mart60{
margin-top: 60px;
}
@@ -417,6 +427,10 @@ $uni-font-size-paragraph:30upx;
.paddtop13 {
padding-top: 13px;
+}
+
+.paddtop15 {
+ padding-top: 15px;
}
.paddleft10 {