Skip to content

S
site-uniapp
提交 3d346c87 作者: wk
操作

加入组织

父级 df0e535f
正在显示 包含 827 行增加 和 84 行删除
App.vue
...@@ -19,40 +19,34 @@ ...@@ -19,40 +19,34 @@
} }
.uni-blue-button { .uni-blue-button {
height: 100rpx; height: 96rpx;
display: flex; display: flex;
flex: 1; flex: 1;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
background-color: #3B73FE; background-color: #3B73FE;
border-radius: 4rpx;
font-size: 32rpx; font-size: 32rpx;
color: #FFFFFF; color: #FFFFFF;
margin-left: 32rpx;
} }
/* 适用重置 */ /* 适用重置 */
.uni-grey-button { .uni-grey-button {
height: 100rpx; height: 96rpx;
display: flex; display: flex;
flex: 1; flex: 1;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
background-color: #FFFFFF; background-color: #FFFFFF;
border-radius: 4rpx;
border: 2rpx solid #BFBFBF;
font-size: 32rpx; font-size: 32rpx;
color: #666666; color: #666666;
margin-left: 32rpx;
} }
.uni-group-button { .uni-group-button {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
border-top: 2rpx solid rgba(0, 0, 0, 0.1); border-top: 2rpx solid rgba(0, 0, 0, 0.1);
padding: 0px 32rpx;
margin-top: 10rpx; margin-top: 10rpx;
height: 144rpx; height: 96rpx;
background-color: #FFFFFF; background-color: #FFFFFF;
align-items: center; align-items: center;
position: fixed; position: fixed;
......
api/api.js
...@@ -3,6 +3,21 @@ import { ...@@ -3,6 +3,21 @@ import {
} from "./param.js" } from "./param.js"
const params = { const params = {
/* 公共中心接口 */
checkBind: {
url: "/api/v1/system/p_user_third/check_bind_by_unique_token",
method: "post"
},
//已绑定直接登录
bindLogin: {
url: "/api/v1/system/p_user_third/do_login",
method: "post"
},
//code换取unique_token
exchangeToken: {
url: "/api/v1/system/p_user_third/get_wx_mini_program_openid",
method: "post"
},
/* 防疫模块*/ /* 防疫模块*/
// 获取上一次填报记录 // 获取上一次填报记录
getBeforeRecord: { getBeforeRecord: {
...@@ -12,6 +27,22 @@ const params = { ...@@ -12,6 +27,22 @@ const params = {
saveRecord: { saveRecord: {
url: "/api/v1/common_check/pass_code_record/save", url: "/api/v1/common_check/pass_code_record/save",
method: "post" method: "post"
},
/* 加入组织 */
// 根据二维码获取单位信息
getInfoByCode: {
url: "/api/v1/org/company/detail_by_invite_code",
method: "post"
},
//根据邀请码加入组织
joinOrgByCode: {
url: "/api/v1/org/o_comp_user/join_comp_by_invite_code",
method: "post"
},
// 扫码加入
scanToJoin: {
url: "/api/v2/org/o_org_v2/join_org",
method: "post"
} }
} }
......
components/titleBar/titleBar.vue 0 → 100644
<template>
<view class="navbar-home">
<view class="navbar-content">
<view :style="{height:statusBarHeight+'px'}"></view>
<view class="navbar-v-navbar" :style="{width:screenWidth+'px',height:titlebarHeight+'px'}">
<view class="navbar-v-content">
<view class="navbar-v-back" v-if="showBack" @click="finish">
<image src="../../static/ic-back.png" style="width: 24px;height: 24px;"></image>
</view>
<!-- <view class="navbar-v-back" @click="back">
<image src="../../static/icon_model.png" style="width: 24px;height: 24px;"></image>
</view> -->
<view class="navbar-v-title">{{title}}</view>
</view>
</view>
</view>
<view :style="{height:statusBarHeight + titlebarHeight +'px'}"></view>
</view>
</template>
<script>
export default {
props: {
title: {
type: String,
default: '标题'
},
showBack: {
type: Boolean,
default: true
}
},
data() {
return {
screenWidth: 325,
statusBarHeight: 20,
titlebarHeight: 45
};
},
created() {
const info = uni.getSystemInfoSync()
this.screenWidth = info.screenWidth
this.statusBarHeight = info.statusBarHeight
console.log(info);
//#ifdef MP-WEIXIN
const menu = uni.getMenuButtonBoundingClientRect()
this.titlebarHeight = (menu.bottom - info.statusBarHeight) + (menu.top - info.statusBarHeight)
console.log(menu.bottom);
this.screenWidth = menu.left
//#endif
console.log(this.titlebarHeight);
},
methods: {
// 返回app列表页
back() {
uni.redirectTo({
url: '../app-list/app-list'
})
},
finish() {
uni.navigateBack({
delta: 1
})
}
},
}
</script>
<style lang="scss">
.navbar-home {
.navbar-content {
position: fixed;
top: 0;
left: 0;
margin-bottom: 16px;
width: 100%;
background: linear-gradient(138.42deg, #59a3fe 0%, #1757ff 100%);
.navbar-v-navbar {
display: flex;
justify-content: center;
align-items: center;
height: 45px;
width: 100%;
box-sizing: border-box;
.navbar-v-content {
display: flex;
align-items: center;
width: 100%;
padding: 10px;
box-sizing: border-box;
.navbar-v-back {
display: flex;
align-items: center;
justify-content: center;
}
.navbar-v-title {
display: flex;
margin-left: 10px;
color: #FFFFFF;
font-weight: bolder;
}
}
}
}
}
</style>
main.js
...@@ -4,8 +4,6 @@ import App from './App' ...@@ -4,8 +4,6 @@ import App from './App'
import Vue from 'vue' import Vue from 'vue'
import tabBar from 'components/uni-tabbar/uni-tabbar.vue' import tabBar from 'components/uni-tabbar/uni-tabbar.vue'
import $api from 'api/api.js'
Vue.prototype.$api = $api;
import $toast from './common/toast.js' import $toast from './common/toast.js'
import $config from './common/config.js' import $config from './common/config.js'
Vue.prototype.$toast = $toast Vue.prototype.$toast = $toast
......
manifest.json
...@@ -54,7 +54,12 @@ ...@@ -54,7 +54,12 @@
"setting" : { "setting" : {
"urlCheck" : false "urlCheck" : false
}, },
"usingComponents" : true "usingComponents" : true,
"permission" : {
"scope.userLocation" : {
"desc" : "获取当前位置，以便查询天气情况"
}
}
}, },
"mp-alipay" : { "mp-alipay" : {
"usingComponents" : true "usingComponents" : true
......
pages.json
...@@ -94,18 +94,49 @@ ...@@ -94,18 +94,49 @@
"path": "pages/score/score", "path": "pages/score/score",
"style": { "style": {
"navigationBarTitleText": "", "navigationBarTitleText": "",
"enablePullDownRefresh": false "enablePullDownRefresh": false,
"navigationStyle": "custom"
} }
}, { }, {
"path": "pages/login/joinOrg/joinOrg", "path": "pages/login/joinOrg/joinOrg",
"style": { "style": {
"navigationBarTitleText": "", "navigationBarTitleText": "",
"enablePullDownRefresh": false "enablePullDownRefresh": false,
"navigationStyle": "custom"
} }
} }
], ,{
"path" : "pages/login/bindLogin/bindLogin",
"style" :
{
"navigationBarTitleText": "",
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
}
,{
"path" : "pages/login/userInfo/userInfo",
"style" :
{
"navigationBarTitleText": "授权信息",
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
}
,{
"path" : "pages/login/joinDepartment/joinDepartment",
"style" :
{
"navigationBarTitleText": "加入部门",
"enablePullDownRefresh": false
}
}
],
"globalStyle": { "globalStyle": {
"navigationBarTextStyle": "white", "navigationBarTextStyle": "white",
"navigationBarTitleText": "uni-app", "navigationBarTitleText": "uni-app",
......
pages/index/index.vue
...@@ -100,6 +100,7 @@ ...@@ -100,6 +100,7 @@
</template> </template>
<script> <script>
import qqmapsdk from "../../common/qqmap-wx-jssdk1.2/qqmap-wx-jssdk.js"
export default { export default {
data() { data() {
return { return {
...@@ -118,7 +119,7 @@ ...@@ -118,7 +119,7 @@
this.loginState() this.loginState()
}, },
onShow() { onShow() {
this.getSetting()
}, },
methods: { methods: {
loginState() { loginState() {
...@@ -131,10 +132,10 @@ ...@@ -131,10 +132,10 @@
fail() { fail() {
uni.showModal({ uni.showModal({
title: '登录提示', title: '登录提示',
content: '是否已有组织账号，还是以访客身份访问？', content: '该账号还没登录，是否去登录',
showCancel: true, showCancel: true,
confirmText: "账号登录", confirmText: "登录",
cancelText: "访客模式", cancelText: "取消",
confirmColor: '#3B73FE', confirmColor: '#3B73FE',
success: res => { success: res => {
if (res.confirm) { if (res.confirm) {
...@@ -147,7 +148,7 @@ ...@@ -147,7 +148,7 @@
}, },
toLogin: function() { toLogin: function() {
uni.reLaunch({ uni.reLaunch({
url: "/pages/login/login/login" url: "/pages/login/joinOrg/joinOrg"
}) })
}, },
isLineVisil(index) { isLineVisil(index) {
...@@ -171,6 +172,84 @@ ...@@ -171,6 +172,84 @@
} }
return list return list
}, },
getSetting() {
const that = this
uni.getSetting({
success(res) {
console.log(res)
if (res.authSetting['scope.userLocation']) {
that.getLocation()
} else {
that.getAuthorize()
}
}
})
},
// 获取用户的地理位置，
getLocation() {
const that = this
uni.getLocation({
type: 'gcj02',
altitude: true,
success(res) {
console.log('当前位置的经度：' + res.longitude);
console.log('当前位置的纬度：' + res.latitude);
const QQMapWX = new qqmapsdk({
//填写自己申请的Key
key: 'XJ6BZ-FDYK4-3ETUM-XWJNJ-VQUVS-GQBYJ'
});
// 解析地址
QQMapWX.reverseGeocoder({
location: {
latitude: res.latitude,
longitude: res.longitude
},
success: (res) => {
//定位成功
console.log("当前位置", res.result.address);
that.address = res.result.address
that.$emit("change", that.index, that.address)
},
fail: function(res) {
console.log(res);
uni.showToast({
title: res.message,
duration: 2000,
icon: "none",
})
},
})
}
})
},
// 用户授权
getAuthorize() {
const that = this
uni.authorize({
scope: 'scope.userLocation',
success(res) {
that.getLocation()
},
// 授权失败
fail(err) {
uni.showModal({
title: '提示',
showCancel: false,
confirmText: '确认授权',
success() {
uni.openSetting({
success(res) {
console.log(res)
},
fail(err) {
console.log(err)
}
})
}
})
}
})
}
} }
} }
</script> </script>
......
pages/login/bindLogin/bindLogin.vue 0 → 100644
<template>
<view class="login-parent">
<view class="login-content">
<view class="login-logo" v-if="false">
<image src="../../static/logo.png"></image>
</view>
<view class="login-app-name" v-if="false">
<text>{{appName}}</text>
</view>
<view class="login-layout">
<view class="login-account">
<text>账号</text>
<input placeholder="输入账号" type="text" v-model="account" />
</view>
<view class="login-password">
<text>密码</text>
<input placeholder="输入密码" password="true" v-model="password" />
</view>
</view>
<button @click="bindLogin">绑定</button>
<button @click="register">注册</button>
</view>
</view>
</template>
<script>
export default {
data() {
return {
password: "",
account: "",
unique_token: "",
appName: uni.getStorageSync("application_name") === "" ? "" : uni.getStorageSync("application_name"),
appLogo: uni.getStorageSync("application_name") === "" ? "" : uni.getStorageSync("version_pic")
}
},
onLoad: function(option) {
this.unique_token = option.unique_token
},
methods: {
register: function() {
uni.redirectTo({
url: `../register/register?unique_token=${this.unique_token}&type=bind`
})
},
bindLogin() {
if (this.account == "") {
uni.showToast({
title: "请输入账号",
duration: 1000,
icon: 'none',
})
return
}
if (this.password == "") {
uni.showToast({
title: "请输入密码",
duration: 1000,
icon: 'none',
})
return
}
this.$http.consolePost({
url: "/api/v1/system/p_user_third/user_third_bind",
data: {
"user_no": this.account,
"third_type": 1,
"unique_token": this.unique_token,
"password": this.password
}
}).then((res) => {
let result = res.data
console.log("登录用户信息：", result);
if (result.code === 0) {
uni.setStorageSync('isCanUse', false); //记录是否第一次授权 false:表示不是第一次授权
this.setToken(result.data.access_token)
uni.setStorageSync("short_token", result.data.short_token)
uni.setStorageSync("user_info", result.data)
uni.setStorageSync("company_id", result.data.comp_id)
uni.setStorageSync("refresh_token", result.data.refresh_token)
uni.showToast({
title: "登录成功",
icon: 'none'
})
uni.switchTab({
url: "../desk-page/desk-page"
})
} else {
uni.showToast({
title: result.msg,
icon: 'none'
})
}
})
},
}
}
</script>
<style lang="scss">
.login-parent {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
.login-content {
width: 100%;
display: flex;
margin-top: 100px;
flex-direction: column;
align-items: center;
justify-content: center;
button {
background-color: #007AFF;
width: 70%;
color: #FFFFFF;
margin-top: 30px;
}
.login-logo {
image {
width: 80px;
height: 80px;
}
}
.login-app-name {
margin-top: 10px;
text {
font-size: 16px;
color: #333333;
}
}
.login-type {
display: flex;
height: 50px;
flex-direction: row;
padding: 20px;
align-items: center;
justify-content: center;
margin-top: 80px;
.line {
width: 20px;
display: flex;
align-items: center;
justify-content: center;
color: #E5E5E5;
}
.login-type-select {
font-size: 16px;
color: #1890FF;
}
.login-type-unselect {
font-size: 16px;
color: #333333;
}
}
.login-layout {
margin-top: 30px;
display: flex;
width: 70%;
flex-direction: column;
.login-account {
display: flex;
width: 100%;
align-items: center;
flex-direction: row;
flex-wrap: nowrap;
text {
font-size: 14px;
color: #333333;
}
input {
flex: 1;
padding: 5px;
margin-left: 10px;
font-size: 14px;
border-bottom: 1px solid #555555;
color: #333333;
}
}
.login-password {
margin-top: 20px;
display: flex;
align-items: center;
width: 100%;
flex-direction: row;
flex-wrap: nowrap;
input {
padding: 5px;
flex: 1;
margin-left: 10px;
font-size: 14px;
border-bottom: 1px solid #555555;
color: #333333;
}
text {
font-size: 14px;
color: #333333;
}
.login-code {
font-size: 12px;
color: #1890FF;
padding: 5px 10px;
border-radius: 2px;
}
}
}
}
}
</style>
pages/login/joinDepartment/joinDepartment.vue 0 → 100644
<template>
<view class="join-root">
<view class="join-item">
<text class="text-black-normal">加入部门</text>
<picker @change="departChange" range-key="dept_name" :range="departList">
<view
style="border: 1rpx solid #E5E5E5;width: 680rpx;display: flex;flex-direction: row;justify-content: space-between;margin-top: 32rpx;height: 88rpx;align-items: center;">
<text class="text-black-normal" style="margin-left: 32rpx;">{{selectDepart.dept_name}}</text>
<image src="../../static/icon_drop_arrow.png"
style="width: 48rpx;height: 24rpx;margin-right: 32rpx;"></image>
</view>
</picker>
<view
style="display: flex;flex-direction: row;align-self:flex-end;color: #1890FF;font-size: 14px;margin-top: 10px;"
@click="createProject">
创建项目部</view>
<text class="text-black-normal" style="margin-top: 32rpx;">加入岗位</text>
<picker @change="postChange" range-key="job_name" :range="postList">
<view
style="border: 1rpx solid #E5E5E5;width: 680rpx;display: flex;flex-direction: row;justify-content: space-between;margin-top: 32rpx;height: 96rpx;align-items: center;">
<text class="text-black-normal" style="margin-left: 32rpx;">{{selectPost.job_name}}</text>
<image src="../../static/icon_drop_arrow.png"
style="width: 48rpx;height: 24rpx;margin-right: 32rpx;"></image>
</view>
</picker>
</view>
<view style="height: 144rpx;"></view>
<view class="uni-group-button">
<button class="uni-grey-button" @click="toBefore">上一步</button>
<button class="uni-blue-button" @click="toSubmit">提交</button>
</view>
</view>
</template>
<script>
export default {
data() {
return {
code: "",
departList: [],
selectDepart: {
dept_id: ""
},
postList: [],
selectPost: {
job_id: ""
},
type: "company",
projectId: ""
}
},
onLoad(option) {
this.code = option.code
this.type = option.type
this.projectId = option.projectId
this.getDepartment()
},
onShow() {
uni.$once("refreshDepart", res => {
this.getDepartment()
})
},
methods: {
createProject() {
uni.navigateTo({
url: `../create-project/create-project?code=${this.code}`
})
},
toBefore() {
uni.navigateBack({
delta: 1
})
},
toSubmit() {
let depart_id = this.selectDepart.dept_id
let job_id = this.selectPost.job_id
let data = {
dept_id: depart_id,
invite_code: this.code,
job_id: job_id
}
if (this.type == 'project') {
data = {
dept_id: depart_id,
invite_code: this.code,
job_id: job_id,
project_id: this.projectId
}
}
this.$http.consoleGet({
url: "/api/v2/org/o_org_v2/join_org",
data: data,
header: {
"access_token": this.getToken()
}
}).then((res) => {
let result = res.data
if (result.code == 0) {
this.$toast.showToast("申请已提交")
uni.navigateBack({
delta: 1
})
} else {
this.$toast.showToast(result.msg)
}
})
},
departChange(e) {
console.log("选中部门", e);
let depart = this.departList[Number(e.detail.value)]
if (depart.dept_id != this.selectDepart.dept_id) {
this.selectDepart = depart
this.selectPost = {
job_id: ""
}
this.getPost()
}
},
postChange(e) {
console.log("选中岗位", e);
this.selectPost = this.postList[Number(e.detail.value)]
},
getDepartment() {
this.$http.consoleGet({
url: "/api/v2/org/o_org_v2/get_dept_list_by_code",
data: {
"invite_code": this.code
},
header: {
"access_token": this.getToken()
}
}).then((res) => {
let result = res.data
console.log("部门列表", result);
if (result.code == 0) {
this.departList = result.data.list
if (this.type == 'project' || this.type == 'department') {
this.selectDepart = this.departList[0]
this.getPost()
}
} else if (result.code == 90003) {
uni.showModal({
title: '提示',
content: result.msg,
showCancel: true,
confirmText: "知道了",
confirmColor: '#1890FF',
showCancel: false,
success: res => {
if (res.confirm) {
uni.navigateBack({
delta: 1
})
}
}
})
} else {
this.$toast.showToast(result.msg)
}
})
},
getPost() {
this.$http.consoleGet({
url: "/api/v2/org/o_job_v2/get_job_list_by_dept_id",
data: {
"dept_id": this.selectDepart.dept_id,
"is_page": 0
},
header: {
"access_token": this.getToken()
}
}).then((res) => {
let result = res.data
console.log("岗位列表", result);
if (result.code == 0) {
this.postList = result.data.list
} else {
this.$toast.showToast(result.msg)
}
})
}
}
}
</script>
<style>
.join-root {
display: flex;
flex-direction: column;
}
.join-item {
margin-top: 100rpx;
display: flex;
flex-direction: column;
padding: 32rpx;
}
</style>
pages/login/joinOrg/joinOrg.vue
<template> <template>
<view class="join-company-root"> <view class="join-company-root">
<titleBar title="加入组织"></titleBar>
<view class="join-company-code"> <view class="join-company-code">
<text class="text-black-normal">邀请码</text> <text class="title">邀请码：</text>
<input placeholder="请输入邀请码" v-model="code" <input placeholder="请输入邀请码" v-model="code" class="input-content" placeholder-class="placeholderStyle" />
style="border: 1rpx solid #E5E5E5;margin-left: 32rpx;padding: 20rpx;"
placeholder-class="placeholderStyle" />
</view> </view>
<view style="height: 144rpx;"></view> <view style="height: 144rpx;"></view>
<view class="uni-group-button"> <view class="uni-group-button">
<button class="uni-grey-button" @click="toScan">扫码加入</button> <view class="uni-grey-button" @click="toScan">扫码加入</view>
<button class="uni-blue-button" @click="toNext">下一步</button> <view class="uni-blue-button" @click="toJoin">加入组织/项目</view>
</view> </view>
</view> </view>
</template> </template>
<script> <script>
import Api from "../../../api/api.js"
export default { export default {
data() { data() {
return { return {
code: "" code: "",
projectId: ""
} }
}, },
methods: { methods: {
...@@ -31,19 +32,10 @@ ...@@ -31,19 +32,10 @@
let type = result.type let type = result.type
if (type == "company") { if (type == "company") {
this.code = result.text this.code = result.text
uni.navigateTo({ this.scanToJoin()
url: `../join-department/join-department?code=${this.code}&type=company`
})
} else if (type == "project") { } else if (type == "project") {
this.code = result.text this.code = result.text
uni.navigateTo({ this.scanToJoin()
url: `../join-department/join-department?code=${this.code}&type=project&projectId=${result.ext.id}`
})
} else if (type == "department") {
this.code = result.text
uni.navigateTo({
url: `../join-department/join-department?code=${this.code}&type=department`
})
} else { } else {
this.$toast.showToast("二维码格式不正确") this.$toast.showToast("二维码格式不正确")
} }
...@@ -54,6 +46,30 @@ ...@@ -54,6 +46,30 @@
} }
}) })
}, },
scanToJoin() {
let data = {
invite_code: this.code,
}
if (this.type == 'project') {
data = {
invite_code: this.code,
project_id: this.projectId
}
}
Api.scanToJoin({
data: data
}).then((res) => {
let result = res.data
if (result.code == 0) {
this.$toast.showToast("申请已提交")
uni.navigateBack({
delta: 1
})
} else {
this.$toast.showToast(result.msg)
}
})
},
toNext() { toNext() {
if (this.code == "") { if (this.code == "") {
return return
...@@ -64,13 +80,9 @@ ...@@ -64,13 +80,9 @@
}, },
toJoin: function() { toJoin: function() {
let that = this let that = this
this.$http.consoleGet({ Api.getInfoByCode({
url: "/api/v1/org/company/detail_by_invite_code",
data: { data: {
invite_code: this.code invite_code: this.code
},
header: {
access_token: this.getToken()
} }
}).then((res) => { }).then((res) => {
let result = res.data let result = res.data
...@@ -81,7 +93,7 @@ ...@@ -81,7 +93,7 @@
content: `确定加入${result.data.company_name}?`, content: `确定加入${result.data.company_name}?`,
showCancel: true, showCancel: true,
confirmText: "加入", confirmText: "加入",
confirmColor: "#1890FF", confirmColor: "#3B73FE",
success: function(res) { success: function(res) {
if (res.confirm) { if (res.confirm) {
that.joinCompany() that.joinCompany()
...@@ -94,13 +106,9 @@ ...@@ -94,13 +106,9 @@
}) })
}, },
joinCompany: function() { joinCompany: function() {
this.$http.consolePost({ Api.joinOrgByCode({
url: "/api/v1/org/o_comp_user/join_comp_by_invite_code",
data: { data: {
invite_code: this.code invite_code: this.code
},
header: {
access_token: this.getToken()
} }
}).then((res) => { }).then((res) => {
let result = res.data let result = res.data
...@@ -111,7 +119,7 @@ ...@@ -111,7 +119,7 @@
content: "你的申请已提交", content: "你的申请已提交",
showCancel: false, showCancel: false,
confirmText: "确定", confirmText: "确定",
confirmColor: "#1890FF", confirmColor: "#3B73FE",
success: function(res) { success: function(res) {
if (res.confirm) { if (res.confirm) {
uni.navigateBack({ uni.navigateBack({
...@@ -130,17 +138,40 @@ ...@@ -130,17 +138,40 @@
} }
</script> </script>
<style> <style lang="scss">
.join-company-root { .join-company-root {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
}
.join-company-code { .join-company-code {
display: flex; display: flex;
flex-direction: row; flex-direction: column;
align-items: center; margin: 30rpx;
justify-content: center; padding: 30rpx;
height: 800rpx; border-radius: 30rpx;
background-color: #fff;
.title {
font-weight: 400;
font-size: 28rpx;
color: #333;
}
.input-content {
width: 610rpx;
margin-top: 20rpx;
padding-left: 20rpx;
height: 36px;
border-radius: 16rpx;
background: transparent;
border: 2rpx solid #999;
}
.placeholderStyle {
font-weight: 400;
font-size: 28rpx;
color: #999;
}
}
} }
</style> </style>
pages/login/login/login.vue
...@@ -187,8 +187,8 @@ ...@@ -187,8 +187,8 @@
this.$http.consolePost({ this.$http.consolePost({
url: "/api/v1/access/access_system/get_key", url: "/api/v1/access/access_system/get_key",
data: { data: {
"system_no": this.systemCode, "system_no": this.$config.systemCode,
"auth_code": this.authCode "auth_code": this.$config.authCode
}, },
header: { header: {
"Content-Type": "application/json" "Content-Type": "application/json"
...@@ -256,7 +256,7 @@ ...@@ -256,7 +256,7 @@
"phone": this.phone, "phone": this.phone,
"code": this.code, "code": this.code,
"login_type": 2, "login_type": 2,
"system_no": this.systemCode "system_no": this.$config.systemCode
}, },
header: { header: {
"key": key, "key": key,
...@@ -280,7 +280,7 @@ ...@@ -280,7 +280,7 @@
this.toAuthLogin() this.toAuthLogin()
} else { } else {
uni.switchTab({ uni.switchTab({
url: "../desk-page/desk-page" url: "../index/index"
}) })
// uni.switchTab({ // uni.switchTab({
// url: "../index/index" // url: "../index/index"
......
pages/login/userInfo/userInfo.vue 0 → 100644
<template>
<view>
</view>
</template>
<script>
export default {
data() {
return {
}
},
methods: {
}
}
</script>
<style lang="scss">
.content{
display: flex;
flex-direction: column;
align-items: center;
image{
width: 160rpx;
height: 160rpx;
margin-top: 50px;
}
}
</style>
pages/login/wxLogin/wxLogin.vue
...@@ -3,23 +3,20 @@ ...@@ -3,23 +3,20 @@
<view v-if="isCanUse"> <view v-if="isCanUse">
<view> <view>
<view class='header'> <view class='header'>
<image src='../../static/icon_wechat.jpg'></image> <image src='../../../static/icon_wechat.jpg'></image>
</view> </view>
<view class='content'> <view class='content'>
<view>申请获取以下权限</view> <view>申请获取微信授权登录</view>
<text>获得你的公开信息(昵称，头像、地区等)</text> <!-- <text>获得你的公开信息(昵称，头像、地区等)</text> -->
</view> </view>
<button class='bottom' type='primary' withCredentials="true" lang="zh_CN" @tap="authLogin">授权登录</button>
<button class='bottom' type='primary' open-type="chooseAvatar" withCredentials="true" lang="zh_CN"
@tap="bindchooseavatar">
授权登录
</button>
</view> </view>
</view> </view>
</view> </view>
</template> </template>
<script> <script>
import Api from "../../../api/api.js"
export default { export default {
data() { data() {
return { return {
...@@ -31,6 +28,16 @@ ...@@ -31,6 +28,16 @@
}; };
}, },
methods: { methods: {
authLogin() {
if (this.unique_token !== '') {
this.checkBind()
} else {
uni.showToast({
title: "授权失败",
icon: 'none'
})
}
},
//第一授权获取用户信息===》按钮触发 //第一授权获取用户信息===》按钮触发
wxGetUserInfo() { wxGetUserInfo() {
let _this = this; let _this = this;
...@@ -83,12 +90,10 @@ ...@@ -83,12 +90,10 @@
} }
}, //登录 }, //登录
checkBind: function() { checkBind: function() {
this.$http.consolePost({ Api.checkBind({
url: "/api/v1/system/p_user_third/check_bind_by_unique_token",
data: { data: {
unique_token: this.unique_token unique_token: this.unique_token
}, }
header: {}
}).then((res) => { }).then((res) => {
let code = res.data.code let code = res.data.code
if (code == 0) { //已绑定直接登录 if (code == 0) { //已绑定直接登录
...@@ -110,7 +115,8 @@ ...@@ -110,7 +115,8 @@
content: '您还未授权绑定账号', content: '您还未授权绑定账号',
showCancel: true, showCancel: true,
confirmText: "去绑定", confirmText: "去绑定",
confirmColor: '#1890FF', cancelText: "微信登录",
confirmColor: '#3B73FE',
success: res => { success: res => {
if (res.confirm) { if (res.confirm) {
uni.redirectTo({ uni.redirectTo({
...@@ -121,8 +127,7 @@ ...@@ -121,8 +127,7 @@
}) })
}, },
directLogin: function() { directLogin: function() {
this.$http.consolePost({ Api.bindLogin({
url: "/api/v1/system/p_user_third/do_login",
data: { data: {
unique_token: this.unique_token unique_token: this.unique_token
} }
...@@ -139,7 +144,7 @@ ...@@ -139,7 +144,7 @@
icon: 'none' icon: 'none'
}) })
uni.switchTab({ uni.switchTab({
url: "../desk-page/desk-page" url: "/pages/index/index"
}) })
} else { } else {
uni.showToast({ uni.showToast({
...@@ -160,22 +165,18 @@ ...@@ -160,22 +165,18 @@
success: function(loginRes) { success: function(loginRes) {
let code = loginRes.code; let code = loginRes.code;
//2.将用户登录code传递到后台置换用户SessionKey、OpenId等信息 //2.将用户登录code传递到后台置换用户SessionKey、OpenId等信息
_this.$http.consolePost({ Api.exchangeToken({
url: "/api/v1/system/p_user_third/get_wx_mini_program_openid",
data: { data: {
"js_code": code, "js_code": code,
"system_no": _this.systemCode "system_no": _this.$config.systemCode
}, },
header: { header: {
"Content-Type": "application/json" "Content-Type": "application/json"
} }
}).then((res) => { }).then((res) => {
// 获取openId
let result = res.data
console.log(result); console.log(result);
_this.unique_token = result.data.unique_token _this.unique_token = result.data.unique_token
}) })
}, },
}); });
...@@ -215,6 +216,7 @@ ...@@ -215,6 +216,7 @@
.bottom { .bottom {
border-radius: 80rpx; border-radius: 80rpx;
background-color: 3B73FE;
margin: 70rpx 50rpx; margin: 70rpx 50rpx;
font-size: 35rpx; font-size: 35rpx;
} }
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
Please register or to comment