From 9f468ffd0fb061213fe6d78e7f0571f5e9704b58 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Wed, 29 Mar 2023 10:43:54 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
apis/modules/parner.js | 12 ++
apis/modules/user.js | 4 +
config/request.js | 4 +-
manifest.json | 6 +-
order/editCourse/editCourse.vue | 17 +-
order/orderDetail/orderDetail.vue | 17 +-
pages/index/index.vue | 127 +++++++++-----
pages/info/info.vue | 274 ++++++++++++++++++++----------
pages/login/login.vue | 2 +-
pages/person/person.vue | 148 ++++++++++++++--
pages/reg/reg.vue | 4 +-
pages/study/study.vue | 165 +++++++++++++-----
static/image/info-bg.jpg | Bin 0 -> 54178 bytes
static/image/person8.png | Bin 0 -> 1562 bytes
static/image/person9.png | Bin 0 -> 657 bytes
static/image/study-bg.jpg | Bin 0 -> 56626 bytes
static/image/unfold.png | Bin 0 -> 287 bytes
team/article/article.vue | 7 +-
team/qrcode/qrcode.vue | 3 +-
team/setting/setting.vue | 19 +--
team/teams/teams.vue | 13 +-
21 files changed, 593 insertions(+), 229 deletions(-)
create mode 100644 static/image/info-bg.jpg
create mode 100644 static/image/person8.png
create mode 100644 static/image/person9.png
create mode 100644 static/image/study-bg.jpg
create mode 100644 static/image/unfold.png
diff --git a/apis/modules/parner.js b/apis/modules/parner.js
index da2adfe..c3a3f0b 100644
--- a/apis/modules/parner.js
+++ b/apis/modules/parner.js
@@ -27,4 +27,16 @@ export const mailFileSend = (data) => {
export const salesProgress = data => {
return post(`nakadai/nakadai/applets/partner/salesProgress`, data)
+}
+
+export const annualOperatingAnalysis = data => {
+ return post(`nakadai/nakadai/applets/partner/annualOperatingAnalysis`, data)
+}
+
+export const editProvinceCity = data => {
+ return post(`nakadai/nakadai/partner-team/editProvinceCity`, data)
+}
+
+export const getPartnerTeamRates = data => {
+ return post(`nakadai/nakadai/partner-team/getPartnerTeamRates`, data)
}
\ No newline at end of file
diff --git a/apis/modules/user.js b/apis/modules/user.js
index 88e8df1..27f7a1b 100644
--- a/apis/modules/user.js
+++ b/apis/modules/user.js
@@ -13,6 +13,10 @@ export const queryCity = (data) => {
return get('nakadai/nakadai/city/queryCity', data)
}
+export const updateAvatars = url => {
+ return post(`users/users/user/updateAvatars?url=` + url)
+}
+
export const userBinding = (data) => {
return post('users/users/user/userBinding', data)
}
diff --git a/config/request.js b/config/request.js
index 3656ab0..042bc89 100644
--- a/config/request.js
+++ b/config/request.js
@@ -6,8 +6,8 @@
export default {
// baseURL: 'https://huorantech.cn/',
- baseURL: 'http://192.168.31.151:9000/',
- // baseURL: 'http://121.37.12.51/',
+ // baseURL: 'http://192.168.31.151:9000/',
+ baseURL: 'http://121.37.12.51/',
headers: {
'Content-Type': 'application/json;charset=UTF-8'
},
diff --git a/manifest.json b/manifest.json
index 01ed783..c249f93 100644
--- a/manifest.json
+++ b/manifest.json
@@ -55,9 +55,9 @@
"minified" : true
},
"usingComponents" : true,
- "optimization": {
- "subPackages": true
- }
+ "optimization" : {
+ "subPackages" : true
+ }
},
"vueVersion" : "2"
}
diff --git a/order/editCourse/editCourse.vue b/order/editCourse/editCourse.vue
index a1dfab0..9c002ad 100644
--- a/order/editCourse/editCourse.vue
+++ b/order/editCourse/editCourse.vue
@@ -52,7 +52,7 @@
{{ item.discountRate }}
- 平台服务费
+ 市场服务费
{{ item.serviceFee }}元
@@ -75,6 +75,7 @@
diff --git a/pages/login/login.vue b/pages/login/login.vue
index d2bf190..18f893c 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -45,7 +45,7 @@
}
},
onShow() {
- // uni.setStorageSync('token', 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJ1c2VyIiwiaWF0IjoxNjc5NjQ5Nzk2LCJleHAiOjE2Nzk2OTI5OTYsImFjY291bnRJZCI6IjIwNCJ9.17xb5qZyaBF1Qf_sjO0XvkUnLBb8e3Z__d4lZViFpi0')
+ // uni.setStorageSync('token', 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJ1c2VyIiwiaWF0IjoxNjc5OTcwMDM5LCJleHAiOjE2ODAwMTMyMzksImFjY291bnRJZCI6IjIwNCJ9.sO9Nguaw5dNlWWE2Jg3599PE4D-njPcsNI8ODH9hJD8')
// 先授权用户信息，再授权手机号
this.checkLogin()
},
diff --git a/pages/person/person.vue b/pages/person/person.vue
index 2375f1d..7b2f75f 100644
--- a/pages/person/person.vue
+++ b/pages/person/person.vue
@@ -3,14 +3,16 @@
-
+
{{ my.info.userName }}
{{ my.info.phone }}
-
+
我的团队
@@ -21,36 +23,56 @@
团队收益
- {{ my.teamIncome}}元
+ {{ my.teamIncome }}元
-
+
我的项目收益
- {{ my.myIncome}}元
+ {{ my.myIncome }}元
-
+
+
市场服务费：
- 项目抽成{{ my.myIncome}}%
+ 项目抽成{{ my.teamInfo.annualMarketingFee || 0 }}%
-
+
团队年费：
- 固定年费{{ my.myIncome}}%
+ 固定年费{{ my.teamInfo.annualTeamFee || 0 }}w
+
+
+
+
+ 业务省份
+
+
+ {{ provinceName }}
+
+
+
+
+
+
+ 业务城市
+
+
+ {{ cityName }}
+
+
-
+
设置
@@ -63,7 +85,8 @@