diff --git a/apis/modules/parner.js b/apis/modules/parner.js
index 383c0bb..0ab2f35 100644
--- a/apis/modules/parner.js
+++ b/apis/modules/parner.js
@@ -47,4 +47,7 @@ export const getTeamsByPlatformId = data => {
}
export const platformTeamAccountList = data => {
return post(`nakadai/kindergarten/platformTeamAccount/platformTeamAccountList`, data)
+}
+export const transferTeam = data => {
+ return post(`nakadai/kindergarten/platformTeamAccount/transferTeam`, data)
}
\ No newline at end of file
diff --git a/apis/modules/user.js b/apis/modules/user.js
index 278114e..d427319 100644
--- a/apis/modules/user.js
+++ b/apis/modules/user.js
@@ -68,30 +68,6 @@ export const userBinding = (data) => {
return post('users/users/user/userBinding', data)
}
-export const examinePassword = (data) => {
- return post('users/users/userAccount/examinePassword', data)
-}
-
-export const getUserRolesPermissionMenu = (data) => {
- return get('users/users/user-role/getUserRolesPermissionMenu', data)
-}
-
-export const updatePersonCenter = (data) => {
- return post('users/users/userAccount/updatePersonCenter', data)
-}
-
-export const queryUserInfoDetails = () => {
- return get('users/users/userAccount/queryUserInfoDetails')
-}
-
-export const updateMyEmail = (data) => {
- return post('nakadai/nakadai/partner-team/updateMyEmail', data)
-}
-
-export const mailCodeSend = (data) => {
- return post('nakadai/nakadai/partner-team/mailCodeSend', data)
-}
-
export const changeAccount = account => {
return post(`users/users/applets/mine/changeAccount?account=${account}`)
}
@@ -116,16 +92,6 @@ export const getSessionKey = data => {
return post(`users/users/user/getSessionKey`, data)
}
-export const partnerAccountApplication = data => {
- return post(`nakadai/nakadai/partnerAccount/partnerAccountApplication`, data)
-}
-
-export const loginByOpenid = openid => {
- return post(`users/users/user/loginByOpenid?openid=` + openid)
-}
-
-export const checkWorkNumOrAccount = account => {
- return post(`occupationlab/occupationlab/architecture/checkWorkNumOrAccount?platformId=4&type=0&account=` + account)
+export const inviteJoinOrganization = data => {
+ return post(`nakadai/kindergarten/platformTeamAccount/inviteJoinOrganization`, data)
}
-
-export const updateUserAvatars = `http://39.108.250.202:9000/users/users/userAccount/updateUserAvatars`
\ No newline at end of file
diff --git a/apis/request.js b/apis/request.js
index 4031782..b54ca2f 100644
--- a/apis/request.js
+++ b/apis/request.js
@@ -14,7 +14,7 @@ const request = options => {
const header = Object.assign({}, config.headers, {
token: uni.getStorageSync('token')
})
- const otherUrl = ['queryPartnerAccount', 'getSessionKey', 'loginByOpenid', 'partnerAccountApplication', 'checkWorkNumOrAccount']
+ const otherUrl = []
return new Promise((resolve, reject)=>{
const { url } = options
uni.request({
diff --git a/libs/share.js b/libs/share.js
index 8c87eaa..010e49c 100644
--- a/libs/share.js
+++ b/libs/share.js
@@ -1,12 +1,10 @@
export default{
// 监听用户点击右上角菜单的「转发」按钮时触发的事件
onShareAppMessage(e) {
- const pages = getCurrentPages()
- const { route, $page } = pages[pages.length - 1]
// 设置转发的参数
return {
title: "GPAC",
- path: route === 'other/activityDetail/activityDetail' ? $page : '',
+ path: '',
imageUrl: "",
success: function(res) {
if (res.errMsg == 'shareAppMessage:ok') {
diff --git a/other/activityDetail/activityDetail.vue b/other/activityDetail/activityDetail.vue
index 5ea781e..ad86eb9 100644
--- a/other/activityDetail/activityDetail.vue
+++ b/other/activityDetail/activityDetail.vue
@@ -142,6 +142,25 @@
onLoad() {
this.focus = false
},
+ // 监听用户点击右上角菜单的「转发」按钮时触发的事件
+ onShareAppMessage(e) {
+ const pages = getCurrentPages()
+ const { $page } = pages[pages.length - 1]
+ // 设置转发的参数
+ return {
+ title: "GPAC",
+ path: $page,
+ imageUrl: "",
+ success: function(res) {
+ if (res.errMsg == 'shareAppMessage:ok') {
+ console.log("成功", res)
+ }
+ },
+ fail: function(res) {
+ console.log("失败", res)
+ }
+ }
+ },
methods: {
// 获取详情
getInfo() {
diff --git a/other/supplierDetail/supplierDetail.vue b/other/supplierDetail/supplierDetail.vue
index a053c97..9b7999b 100644
--- a/other/supplierDetail/supplierDetail.vue
+++ b/other/supplierDetail/supplierDetail.vue
@@ -2,7 +2,8 @@
-
+
+
{{ form.classificationName }}
@@ -27,7 +28,7 @@
- {{ form.briefIntroduction }}
+ {{ form.briefIntroduction || '暂无数据' }}
联系我们
@@ -258,13 +259,18 @@
font-weight: 600;
color: #000;
}
+ .icon {
+ width: 80rpx;
+ min-width: 80rpx;
+ height: 80rpx;
+ margin-right: 20rpx;
+ border-radius: 50%;
+ object-fit: cover;
+ }
.logo {
width: 120rpx;
min-width: 120rpx;
height: 120rpx;
- margin-right: 20rpx;
- border-radius: 50%;
- object-fit: cover;
}
.slogan {
margin-top: 40rpx;
@@ -301,15 +307,15 @@
}
.info {
display: flex;
- align-items: flex-start;
+ align-items: center;
font-size: 26rpx;
color: #333;
&.address {
margin: 30rpx 0 20rpx;
}
.icon {
- width: 40rpx;
- min-width: 40rpx;
+ width: 30rpx;
+ min-width: 30rpx;
margin-right: 10rpx;
}
}
diff --git a/pages.json b/pages.json
index 640669e..c6547bf 100644
--- a/pages.json
+++ b/pages.json
@@ -250,6 +250,22 @@
"navigationBarTitleText" : "实名认证",
"enablePullDownRefresh" : false
}
+ },
+ {
+ "path" : "join/join",
+ "style" :
+ {
+ "navigationBarTitleText" : "",
+ "enablePullDownRefresh" : false
+ }
+ },
+ {
+ "path" : "joinSuccess/joinSuccess",
+ "style" :
+ {
+ "navigationBarTitleText" : "加入成功",
+ "enablePullDownRefresh" : false
+ }
}
]
}
diff --git a/team/auth/auth.vue b/team/auth/auth.vue
index f44634d..4237992 100644
--- a/team/auth/auth.vue
+++ b/team/auth/auth.vue
@@ -136,12 +136,12 @@
success: (res) => {
uni.setStorageSync('platformId', that.platformId)
const name = that.platformId == 6 ? '供应商' : '幼儿园'
- that.$util.sucMsg(`您已成功提交${name}认证,现在为您切换到${name}端。`)
+ that.$util.errMsg(`您已成功提交${name}认证,现在为您切换到${name}端。`)
setTimeout(() => {
uni.switchTab({
url: '/pages/person/person'
})
- }, 1500)
+ }, 2000)
},
fail: function(err) {
uni.showToast({
diff --git a/team/join/join.vue b/team/join/join.vue
new file mode 100644
index 0000000..6a4bc9a
--- /dev/null
+++ b/team/join/join.vue
@@ -0,0 +1,188 @@
+
+
+ 欢迎加入
+
+
+ {{ teamName + '邀请你加入他的团队' }}
+
+
+
+
+
+
+
+
+
+
+ {{ phoneBtnText }}
+
+
+
+
+
+
+
+
+
diff --git a/team/joinSuccess/joinSuccess.vue b/team/joinSuccess/joinSuccess.vue
new file mode 100644
index 0000000..647f26a
--- /dev/null
+++ b/team/joinSuccess/joinSuccess.vue
@@ -0,0 +1,44 @@
+
+
+
+ 加入成功
+ 前往登录
+
+
+
+
+
+
diff --git a/team/phone/phone.vue b/team/phone/phone.vue
index 37c178b..2fb9561 100644
--- a/team/phone/phone.vue
+++ b/team/phone/phone.vue
@@ -107,13 +107,6 @@
flex: 1;
}
.send-code {
- width: 100px;
- margin-left: 20px;
- text-align: center;
- color: #4386ff;
- font-size: 12px;
- line-height: 36px;
- border: 1px solid #4386ff;
- border-radius: 5px;
+ font-size: 24rpx;
}
diff --git a/team/qrcode/qrcode.vue b/team/qrcode/qrcode.vue
index b02ce9b..b41bd6c 100644
--- a/team/qrcode/qrcode.vue
+++ b/team/qrcode/qrcode.vue
@@ -11,13 +11,15 @@
{{ team.partnerClassificationName }}
-
+
+
+
- 邀请二维码失效日期:{{ expireTime }}
+
@@ -30,6 +32,7 @@
data() {
return {
Common,
+ team: uni.getStorageSync('team'),
teamId: uni.getStorageSync('teamId'),
openId: uni.getStorageSync('openId'),
platformId: uni.getStorageSync('platformId'),
@@ -39,12 +42,27 @@
link: '',
qrcodeImg: '',
size: uni.upx2px(420),
- team: uni.getStorageSync('team')
}
},
onShow() {
this.getInfo()
},
+ // 监听用户点击右上角菜单的「转发」按钮时触发的事件
+ onShareAppMessage(e) {
+ return {
+ title: "GPAC",
+ path: `/team/join/join?accountId=${this.team.accountId}&id=${this.teamId}&isTeam=0&teamName=${this.info.userName}&platformId=${this.platformId}`,
+ imageUrl: "",
+ success: function(res) {
+ if (res.errMsg == 'shareAppMessage:ok') {
+ console.log("成功", res)
+ }
+ },
+ fail: function(res) {
+ console.log("失败", res)
+ }
+ }
+ },
methods: {
// 个人信息
async getInfo() {
@@ -143,6 +161,16 @@
margin: 20rpx 0;
font-size: 30rpx;
}
+ .share {
+ width: 300rpx;
+ margin: 0;
+ font-size: 28rpx;
+ color: #fff;
+ text-align: center;
+ background-color: $uni-primary;
+ border-radius: 40rpx;
+ border: 0;
+ }
.qrcode {
display: none;
}
diff --git a/team/teams/teams.vue b/team/teams/teams.vue
index 0f2f43e..b3282a4 100644
--- a/team/teams/teams.vue
+++ b/team/teams/teams.vue
@@ -21,6 +21,7 @@
团队负责人
+ 转让超管
@@ -34,7 +35,7 @@
@@ -161,6 +191,16 @@
background-color: #2979ff;
border-radius: 20px;
}
+ .btn {
+ position: absolute;
+ bottom: 20rpx;
+ right: 40rpx;
+ padding: 8rpx 28rpx;
+ font-size: 28rpx;
+ color: #fff;
+ background-color: $uni-primary;
+ border-radius: 4px;
+ }
}
.plus {
position: fixed;