diff --git a/components/base/navbar.vue b/components/base/navbar.vue
index 45beebe..6176611 100644
--- a/components/base/navbar.vue
+++ b/components/base/navbar.vue
@@ -118,6 +118,7 @@
display: flex;
justify-content: center;
font-size: 32rpx;
+ font-weight: 500;
align-items: center;
z-index: 999;
.left{
diff --git a/components/partner/posterPopup.vue b/components/partner/posterPopup.vue
new file mode 100644
index 0000000..edc963d
--- /dev/null
+++ b/components/partner/posterPopup.vue
@@ -0,0 +1,455 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 3d4942e..b17c566 100644
--- a/pages.json
+++ b/pages.json
@@ -99,6 +99,15 @@
},
{
"path": "member/switch"
+ },
+ {
+ "path": "partner/apply"
+ },
+ {
+ "path": "partner/team"
+ },
+ {
+ "path": "partner/withdraw"
}
]
}],
diff --git a/pages/index/center.vue b/pages/index/center.vue
index b8866c2..3a0da77 100644
--- a/pages/index/center.vue
+++ b/pages/index/center.vue
@@ -278,7 +278,7 @@
.card {
margin-top: 32rpx;
width: 100%;
- background: #FAFAFF;
+ background: #FFFFFF;
border: 2rpx solid #FFFFFF;
border-radius: 32rpx;
box-sizing: border-box;
diff --git a/pages/index/index.vue b/pages/index/index.vue
index c065bdf..a7d5016 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -93,7 +93,7 @@
}
},
onLoad() {
- this.$utils.navigateTo(`/pages_order/growing/activity/applyEmail`)
+ // this.$utils.navigateTo(`/pages_order/growing/activity/applyEmail`)
// uni.navigateTo({
// url: `/pages_order/order/orderConfirm/index`
// })
diff --git a/pages/index/partner.vue b/pages/index/partner.vue
index 5c2d16d..453e5d1 100644
--- a/pages/index/partner.vue
+++ b/pages/index/partner.vue
@@ -1,21 +1,453 @@
+
+
+
+
+
+
+
+
+
+
+ {{ item }}
+
+
+
+
+
+
+
+
+ 家长
+
+
+
+ 战斗世界
+ ID:5625354
+
+
+
+ 888
+ 推广人数
+
+
+ 341
+ 总佣金
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+ {{ `+¥${item.price}` }}
+ {{ item.createTime }}
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages_order/auth/wxUserInfo.vue b/pages_order/auth/wxUserInfo.vue
index 4c4ef41..fa57642 100644
--- a/pages_order/auth/wxUserInfo.vue
+++ b/pages_order/auth/wxUserInfo.vue
@@ -202,7 +202,7 @@
.page__view {
width: 100vw;
min-height: 100vh;
- background-color: $uni-bg-color;
+ background: unset;
position: relative;
/deep/ .nav-bar__view {
@@ -218,7 +218,7 @@
.card {
padding: 32rpx;
- background: #FAFAFF;
+ background: #FFFFFF;
border: 2rpx solid #FFFFFF;
border-radius: 32rpx;
@@ -374,7 +374,7 @@
font-size: 36rpx;
line-height: 1;
color: #FFFFFF;
- background-image: linear-gradient(to right, #21FEEC #019AF9);
+ background: linear-gradient(to right, #21FEEC, #019AF9);
border: 2rpx solid #00A9FF;
border-radius: 41rpx;
}
diff --git a/pages_order/center/styles/card.scss b/pages_order/center/styles/card.scss
index 90dd6a5..301431c 100644
--- a/pages_order/center/styles/card.scss
+++ b/pages_order/center/styles/card.scss
@@ -2,7 +2,7 @@
.card {
margin-top: 32rpx;
width: 100%;
- background: #FAFAFF;
+ background: #FFFFFF;
border: 2rpx solid #FFFFFF;
border-radius: 32rpx;
box-sizing: border-box;
diff --git a/pages_order/comment/commentWrite.vue b/pages_order/comment/commentWrite.vue
index 8109fe5..9803bf3 100644
--- a/pages_order/comment/commentWrite.vue
+++ b/pages_order/comment/commentWrite.vue
@@ -188,7 +188,7 @@
.card {
padding: 32rpx;
- background: #FAFAFF;
+ background: #FFFFFF;
border: 2rpx solid #FFFFFF;
border-radius: 32rpx;
diff --git a/pages_order/growing/activity/applyEmail.vue b/pages_order/growing/activity/applyEmail.vue
index b479dde..8243fb5 100644
--- a/pages_order/growing/activity/applyEmail.vue
+++ b/pages_order/growing/activity/applyEmail.vue
@@ -91,6 +91,7 @@
message: '请输入邮寄地址',
},
},
+ formItemStyle: { padding: 0 },
}
},
onLoad(arg) {
@@ -174,6 +175,7 @@
color: #191919;
}
}
+
.form {
&-item {
margin-top: 32rpx;
diff --git a/pages_order/growing/activity/markPopup.vue b/pages_order/growing/activity/markPopup.vue
index 93dc43d..776b822 100644
--- a/pages_order/growing/activity/markPopup.vue
+++ b/pages_order/growing/activity/markPopup.vue
@@ -58,6 +58,7 @@
message: '请上传图片',
},
},
+ formItemStyle: { padding: 0 },
}
},
methods: {
diff --git a/pages_order/order/orderList/index.vue b/pages_order/order/orderList/index.vue
index 44eded3..fccb28c 100644
--- a/pages_order/order/orderList/index.vue
+++ b/pages_order/order/orderList/index.vue
@@ -11,7 +11,7 @@
:list="tabs"
:current="current"
:scrollable="false"
- lineColor="#7451DE"
+ lineColor="#00A9FF"
lineWidth="48rpx"
lineHeight="4rpx"
:activeStyle="{
@@ -19,7 +19,7 @@
'font-weight': 500,
'font-size': '32rpx',
'line-height': 1.4,
- 'color': '#7451DE',
+ 'color': '#00A9FF',
}"
:inactiveStyle="{
'font-family': 'PingFang SC',
@@ -71,7 +71,8 @@
{ name: '待收货' },
{ name: '待评价' },
],
- mixinsListApi: 'getOrderList',
+ // todo
+ mixinsListApi: '',
current: 0,
}
},
diff --git a/pages_order/partner/apply.vue b/pages_order/partner/apply.vue
new file mode 100644
index 0000000..5317867
--- /dev/null
+++ b/pages_order/partner/apply.vue
@@ -0,0 +1,252 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item }}
+
+
+
+
+
+
+
+
+
+
+
+
+ 姓名
+
+
+
+
+
+
+
+
+
+
+ 电话
+
+
+
+
+
+
+
+
+ 推荐人
+
+
+
+
+
+
+
+
+
+
+
+ 提交
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages_order/partner/team.vue b/pages_order/partner/team.vue
new file mode 100644
index 0000000..a05f0f5
--- /dev/null
+++ b/pages_order/partner/team.vue
@@ -0,0 +1,242 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages_order/partner/withdraw.vue b/pages_order/partner/withdraw.vue
new file mode 100644
index 0000000..6062fab
--- /dev/null
+++ b/pages_order/partner/withdraw.vue
@@ -0,0 +1,233 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 真实姓名
+
+
+
+
+
+
+
+ 提现金额
+
+
+
+
+
+
+
+
+
+
+ 请仔细检查并确认相关信息,因用户个人疏忽导致的充值错误。需由用户自行承担。
+
+ 《提现须知》
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/static/image/icon-checkmark-circle-fill.png b/static/image/icon-checkmark-circle-fill.png
new file mode 100644
index 0000000..d001e4b
Binary files /dev/null and b/static/image/icon-checkmark-circle-fill.png differ
diff --git a/static/image/partner/apply.png b/static/image/partner/apply.png
new file mode 100644
index 0000000..5356451
Binary files /dev/null and b/static/image/partner/apply.png differ
diff --git a/static/image/partner/icon-cash.png b/static/image/partner/icon-cash.png
new file mode 100644
index 0000000..f486748
Binary files /dev/null and b/static/image/partner/icon-cash.png differ
diff --git a/static/image/partner/icon-nav.png b/static/image/partner/icon-nav.png
new file mode 100644
index 0000000..58a6d88
Binary files /dev/null and b/static/image/partner/icon-nav.png differ
diff --git a/static/image/partner/icon-qrcode.png b/static/image/partner/icon-qrcode.png
new file mode 100644
index 0000000..0b0bd9c
Binary files /dev/null and b/static/image/partner/icon-qrcode.png differ
diff --git a/static/image/partner/icon-team.png b/static/image/partner/icon-team.png
new file mode 100644
index 0000000..9b84424
Binary files /dev/null and b/static/image/partner/icon-team.png differ
diff --git a/static/image/temp-50.jpg b/static/image/temp-50.jpg
new file mode 100644
index 0000000..fbae1ab
Binary files /dev/null and b/static/image/temp-50.jpg differ
diff --git a/static/image/temp-51.png b/static/image/temp-51.png
new file mode 100644
index 0000000..e501f82
Binary files /dev/null and b/static/image/temp-51.png differ