master
yujialong 12 months ago
parent b7eb30ac13
commit 9a33def7de
  1. 3
      apis/modules/parner.js
  2. 10
      apis/modules/user.js
  3. 4
      config/request.js
  4. 2
      manifest.json
  5. 9
      pages.json
  6. 15
      pages/index/index.vue
  7. 2
      pages/login/login.vue
  8. 187
      pages/reg/reg.vue
  9. 2
      pages/supplier/supplier.vue
  10. 106
      team/auth/auth.vue
  11. 6
      team/certified/certified.vue
  12. 8
      team/teams/teams.vue

@ -44,4 +44,7 @@ export const getPartnerTeamRates = data => {
// new // new
export const getTeamsByPlatformId = data => { export const getTeamsByPlatformId = data => {
return get(`nakadai/kindergarten/platformTeamAccount/getTeamsByPlatformId`, data) return get(`nakadai/kindergarten/platformTeamAccount/getTeamsByPlatformId`, data)
}
export const platformTeamAccountList = data => {
return post(`nakadai/kindergarten/platformTeamAccount/platformTeamAccountList`, data)
} }

@ -13,9 +13,17 @@ export const realNameAuthentication = (data) => {
export const faceAuthentication = (data) => { export const faceAuthentication = (data) => {
return post(`users/users/autonym/faceAuthentication?imgFile=${data.imgFile}&side=${data.side}`) return post(`users/users/autonym/faceAuthentication?imgFile=${data.imgFile}&side=${data.side}`)
} }
export const authenticationOrNot = (data) => { export const authenticationOrNot = () => {
return post(`users/users/autonym/authenticationOrNot`) return post(`users/users/autonym/authenticationOrNot`)
} }
export const businessLicensePictureVerification = (imgFile) => {
return post(`users/users/autonym/businessLicensePictureVerification?imgFile=${imgFile}`)
}
export const creditCodeAuthentication = (data) => {
return post(`users/users/autonym/creditCodeAuthentication`, data)
}
export const queryProvince = () => { export const queryProvince = () => {
return get('nakadai/nakadai/province/queryProvince') return get('nakadai/nakadai/province/queryProvince')

@ -6,8 +6,8 @@
export default { export default {
// baseURL: 'https://huorantech.cn/', // baseURL: 'https://huorantech.cn/',
baseURL: 'http://192.168.31.51:10010/', baseURL: 'http://192.168.31.217:10010/',
// baseURL: 'http://121.37.12.51/', // baseURL: '124.71.79.122/',
headers: { headers: {
'Content-Type': 'application/json;charset=UTF-8' 'Content-Type': 'application/json;charset=UTF-8'
}, },

@ -1,5 +1,5 @@
{ {
"name" : "职站商城", "name" : "GPAC",
"appid" : "__UNI__2E89BA6", "appid" : "__UNI__2E89BA6",
"description" : "", "description" : "",
"versionName" : "1.0.0", "versionName" : "1.0.0",

@ -40,15 +40,6 @@
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
} }
,{
"path" : "pages/reg/reg",
"style" :
{
"navigationBarTitleText": "",
"enablePullDownRefresh": false
}
}
], ],
"subPackages": [ "subPackages": [
{ {

@ -2,14 +2,14 @@
<view :class="[{oh: !per}]"> <view :class="[{oh: !per}]">
<view class="page"> <view class="page">
<view class="search-wrap"> <view class="search-wrap">
<uni-search-bar class="search" radius="30" placeholder="请输入" v-model="keyword" clearButton="auto" cancelButton="none" @confirm="initList" /> <uni-search-bar class="search" radius="30" placeholder="请输入" v-model="keyword" clearButton="auto" cancelButton="none" @confirm="initList" @clear="clearKeyword" />
<view> <view>
<uni-icons type="notification" size="20"></uni-icons> <uni-icons type="notification" size="20"></uni-icons>
</view> </view>
</view> </view>
<view class="banner"> <view class="banner">
<image class="pic" src="@/static/image/info-bg.jpg" mode="widthFix"></image> <image class="pic" src="https://occupationlab.com/images/preschoolEdu/index-banner.jpg" mode="widthFix"></image>
</view> </view>
@ -18,7 +18,7 @@
<view class="title">爆款推荐</view> <view class="title">爆款推荐</view>
</view> </view>
<image class="hot" src="@/static/image/info-bg.jpg" mode="widthFix"></image> <image class="hot" src="https://occupationlab.com/images/preschoolEdu/index-hot.jpg"></image>
</view> </view>
<view class="module"> <view class="module">
@ -174,6 +174,11 @@
} }
this.$set(item, 'signing', signing) this.$set(item, 'signing', signing)
}, },
// keyword
clearKeyword() {
this.keyword = ''
this.initList()
},
// //
toDetail(item) { toDetail(item) {
@ -248,6 +253,10 @@
width: 100%; width: 100%;
} }
} }
.hot {
width: 100%;
height: 200rpx;
}
.module { .module {
margin: 20rpx; margin: 20rpx;
padding: 20rpx; padding: 20rpx;

@ -14,7 +14,7 @@
快捷登录 快捷登录
</view> </view>
</template> </template>
<view class="tips">如果没有账号会自动创建账号</view> <view class="tips">如果没有账号会自动创建账号</view>
<view class="agree"> <view class="agree">
<uni-data-checkbox class="check" multiple v-model="agree" :localdata="agreeData"></uni-data-checkbox> <uni-data-checkbox class="check" multiple v-model="agree" :localdata="agreeData"></uni-data-checkbox>

@ -1,187 +0,0 @@
<template>
<view class="page">
<image class="logo" src="@/static/image/logo.png" mode="widthFix"></image>
<view class="wrap">
<view class="hello">
{{ form.isTeam ? '或然科技城市合伙人,欢迎回来!' : form.isTeam === 0 ? '请认真填写您的姓名和意向开展业务的区域。创建成功后,我们将会有区域运营与您联系沟通后续事宜。' : '欢迎加入或然城市合伙人计划!请认真填写您的姓名和意向开展业务的区域。注册后,我们将会有区域运营与您联系沟通后续事宜。'}}
</view>
<view>
<uni-forms>
<uni-forms-item label="姓名">
<uni-easyinput type="text" v-model="form.userName" placeholder="请输入姓名" :disabled="exist" />
</uni-forms-item>
<uni-forms-item label="业务省份">
<view v-if="form.isTeam" class="location">{{ form.provinceName }}</view>
<uni-data-picker v-else placeholder="请选择省份" popup-title="请选择省份" preload :localdata="provinces" :map="{text: 'provinceName', value: 'provinceId'}" v-model="form.provinceId" @change="getCity"></uni-data-picker>
</uni-forms-item>
<uni-forms-item label="业务城市">
<view v-if="form.isTeam" class="location">{{ form.cityName }}</view>
<uni-data-picker v-else placeholder="请选择城市" popup-title="请选择城市" preload :localdata="cities" :map="{text: 'cityName', value: 'cityId'}" v-model="form.cityId"></uni-data-picker>
</uni-forms-item>
</uni-forms>
<view class="btns">
<button type="primary" @click="submit">{{ form.isTeam ? '登录' : form.isTeam === 0 ? '确定' : '注册' }}</button>
<button @click="back">取消</button>
</view>
</view>
</view>
</view>
</template>
<script>
import { queryPartnerAccount, queryProvince, queryCity, partnerAccountApplication, loginByOpenid, checkWorkNumOrAccount } from '@/apis/modules/user.js'
export default {
data() {
return {
openid: '',
phone: '',
my: false,
form: {
userName: '',
provinceId: '',
cityId: '',
},
accountRepeat: false,
provinces: [],
cities: [],
exist: false
}
},
onShow() {
const pages = getCurrentPages()
const { options } = pages[pages.length - 1]
this.openid = options.openid
this.phone = options.phone
this.my = options.my
this.getProvince()
this.checkLogin()
},
methods: {
//
checkLogin() {
// isTeam 10team
queryPartnerAccount(this.phone).then(({ team, username }) => {
if (team) {
team.teamId && uni.setStorageSync('teamId', team.teamId)
this.form.userName = team.userName
if (team) this.exist = true
if (team.isTeam) {
this.form = team
this.getCity()
} else {
this.form.isTeam = 0
if (team.userName) this.form.userName = team.userName
}
} else if (username) { // username
this.form.userName = username
}
}).catch(e => {})
},
//
getProvince() {
queryProvince().then(({ list }) => {
this.provinces = list
}).catch(res => {})
},
//
getCity(val) {
if (this.form.provinceId) {
queryCity({
provinceId: this.form.provinceId
}).then(({ list }) => {
this.cities = list
}).catch(res => {})
} else {
this.cities = []
}
if (val) this.form.cityId = ''
},
//
submit() {
const { form } = this
if (!form.userName) return this.$util.errMsg('请输入姓名!')
if (!form.provinceId) return this.$util.errMsg('请选择意向省份!')
if (!form.cityId) return this.$util.errMsg('请选择意向城市!')
form.phone = this.phone
form.appOpenId = this.openid
form.uniqueIdentification = Date.now()
if (form.isTeam) { //
loginByOpenid(this.openid).then(({ data }) => {
uni.setStorageSync('token', data.token)
this.toIndex()
}).catch(res => {})
} else { // or
partnerAccountApplication(form).then(({ token, teamId }) => {
this.$util.sucMsg(form.isTeam === 0 ? '创建成功' : '注册成功')
// tokenteamId
if (token) {
teamId && uni.setStorageSync('teamId', teamId)
uni.setStorageSync('token', token)
setTimeout(() => {
this.toIndex()
}, 1500)
} else {
setTimeout(() => {
uni.redirectTo({
url: '../login/login'
})
}, 1500)
}
}).catch(res => {})
}
},
//
toIndex() {
uni.reLaunch({
url: this.my ? '../person/person' : '../index/index'
})
},
//
back() {
uni.navigateBack()
}
}
}
</script>
<style scoped lang="scss">
.page {
min-height: 100%;
text-align: center;
background: url(@/static/image/login1.png) 0 0/175rpx auto no-repeat,
url(@/static/image/login2.png) bottom right/123rpx auto no-repeat;
.logo {
width: 393rpx;
margin: 100rpx 0 60rpx;
}
}
.wrap {
position: relative;
padding: 60rpx;
margin: 0 61rpx;
text-align: center;
border-radius: 8rpx;
background-color: #fff;
.hello {
margin-bottom: 30rpx;
font-size: 28rpx;
color: #333;
}
.btns {
display: flex;
button {
width: 200rpx;
font-size: 30rpx;
}
}
.location {
padding-left: 10px;
line-height: 38px;
font-size: 14px;
color: #D5D5D5;
border: 1px solid #e5e5e5;
background-color: #F7F6F6;
border-radius: 4px;
}
}
</style>

@ -5,7 +5,7 @@
<uni-search-bar class="search" radius="30" placeholder="请输入" v-model="keyword" clearButton="auto" cancelButton="none" @confirm="searchConfirm" /> <uni-search-bar class="search" radius="30" placeholder="请输入" v-model="keyword" clearButton="auto" cancelButton="none" @confirm="searchConfirm" />
</view> </view>
<image class="banner" src="@/static/image/info-bg.jpg" mode="widthFix"></image> <image class="banner" src="https://occupationlab.com/images/preschoolEdu/supplier-banner.jpg" mode="widthFix"></image>
<view class="wrap"> <view class="wrap">
<sideSelect :menus="menus" @menuClick="menuClick" /> <sideSelect :menus="menus" @menuClick="menuClick" />

@ -1,35 +1,35 @@
<template> <template>
<view class="page"> <view class="page">
<view class="block">
<view class="title">上传营业执照</view>
<image class="credential" :src="businessLicense" mode="widthFix" @click="uploadBusinessLicense"></image>
</view>
<view v-if="isPreschool" class="block">
<view class="title">上传办学许可证</view>
<image class="credential" src="https://occupationlab.com/images/preschoolEdu/credentials2.png" mode="widthFix"></image>
</view>
<view class="block"> <view class="block">
<view class="form-list"> <view class="form-list">
<view class="line with-arrow"> <view class="line with-arrow">
<view class="name">幼儿园名称</view> <view class="name">{{ platformName }}名称</view>
<input type="text" placeholder="请输入幼儿园名称" /> <input type="text" :placeholder="'请输入' + platformName + '名称'" v-model="form.comapnyName" />
<uni-icons type="right" size="18" color="#ababab"></uni-icons> <uni-icons type="right" size="18" color="#ababab"></uni-icons>
</view> </view>
<view class="line with-arrow"> <view class="line with-arrow">
<view class="name">统一社会信用代码</view> <view class="name">统一社会信用代码</view>
<input type="text" placeholder="请输入证件号码" /> <input type="text" placeholder="请输入证件号码" v-model="form.creditCode" />
<uni-icons type="right" size="18" color="#ababab"></uni-icons> <uni-icons type="right" size="18" color="#ababab"></uni-icons>
</view> </view>
<view class="line with-arrow"> <view class="line with-arrow">
<view class="name">法人</view> <view class="name">法人</view>
<input type="text" placeholder="请输入法人" /> <input type="text" placeholder="请输入法人" v-model="form.legalPerson" />
<uni-icons type="right" size="18" color="#ababab"></uni-icons> <uni-icons type="right" size="18" color="#ababab"></uni-icons>
</view> </view>
</view> </view>
</view> </view>
<view class="block">
<view class="title">上传营业执照</view>
<image class="credential" :src="yy" mode="widthFix" @click="uploadYY"></image>
</view>
<view class="block">
<view class="title">上传办学许可证</view>
<image class="credential" src="https://occupationlab.com/images/preschoolEdu/credentials2.png" mode="widthFix"></image>
</view>
<view class="btn-wrap"> <view class="btn-wrap">
<view class="btn" @click="submit">认证信息</view> <view class="btn" @click="submit">认证信息</view>
</view> </view>
@ -37,43 +37,85 @@
</template> </template>
<script> <script>
import { my } from '@/apis/modules/parner.js' import { creditCodeAuthentication, businessLicensePictureVerification } from '@/apis/modules/user.js'
import OSS from '@/libs/Oss/upload' import OSS from '@/libs/Oss/upload'
export default { export default {
data() { data() {
return { return {
img: '', form: {
yy: 'https://occupationlab.com/images/preschoolEdu/credentials1.png' comapnyName: '',
creditCode: '',
legalPerson: '',
},
platformId: uni.getStorageSync('platformId'),
businessLicense: 'https://occupationlab.com/images/preschoolEdu/credentials1.png'
} }
}, },
computed: {
//
isPreschool() {
return this.platformId === 5
},
//
platformName() {
return this.platformId === 6 ? '供应商' : this.platformId === 5 ? '幼儿园' : ''
},
},
onShow() { onShow() {
// this.getInfo()
}, },
methods: { methods: {
//
getInfo() {
const { partnerId, teamId } = uni.getStorageSync('team')
my({
partnerId,
teamId
}).then(({ my }) => {
this.info = my.info
}).catch(e => {})
},
// //
uploadYY() { uploadBusinessLicense() {
const that = this
uni.chooseImage({
success: (res) => {
const file = res.tempFilePaths[0];
OSS(file, async (name) => {
that.businessLicense = name
const { data } = await businessLicensePictureVerification(name)
if (data) {
that.form = {
comapnyName: data.name,
creditCode: data.reg_num,
legalPerson: data.person,
address: data.address,
business: data.business,
capital: data.capital,
establish_date: data.establish_date,
type: data.type,
valid_period: data.valid_period,
}
}
})
}
});
},
//
uploadBack() {
const that = this const that = this
uni.chooseImage({ uni.chooseImage({
success: (res) => { success: (res) => {
const file = res.tempFilePaths[0]; const file = res.tempFilePaths[0];
OSS(file, (name) => { OSS(file, async (name) => {
that.yy = name that.reverseOfIDCard = name
}) })
} }
}); });
}, },
submit() { submit() {
const { form } = this
if (!form.comapnyName) return this.$util.errMsg(`请输入${platformName}名称!`)
if (!form.creditCode) return this.$util.errMsg('请输入统一社会信用代码!')
if (!form.legalPerson) return this.$util.errMsg('请输入法人!')
creditCodeAuthentication(form).then(res => {
this.$util.sucMsg('认证成功!')
setTimeout(() => {
uni.switchTab({
url: '/pages/person/person'
})
}, 1500)
}).catch(e => {})
}, },
} }
} }

@ -8,15 +8,15 @@
<view class="form-list"> <view class="form-list">
<view class="line"> <view class="line">
<view class="name">幼儿园名称</view> <view class="name">幼儿园名称</view>
<view class="val">测试测试</view> <view class="val">梅林一村幼儿园</view>
</view> </view>
<view class="line"> <view class="line">
<view class="name">统一社会信用代码</view> <view class="name">统一社会信用代码</view>
<view class="val">测试测试</view> <view class="val">124403004557455223O</view>
</view> </view>
<view class="line"> <view class="line">
<view class="name">法人</view> <view class="name">法人</view>
<view class="val">测试测试</view> <view class="val">谢韵</view>
</view> </view>
</view> </view>
</view> </view>

@ -32,11 +32,12 @@
</template> </template>
<script> <script>
import { teamList } from '@/apis/modules/parner.js' import { platformTeamAccountList } from '@/apis/modules/parner.js'
export default { export default {
data() { data() {
return { return {
isTeam: uni.getStorageSync('team').isTeam == 1, // isTeam: uni.getStorageSync('team').isTeam == 1, //
platformId: uni.getStorageSync('platformId'),
per: true, // per: true, //
reachBottom: 0, // 0->,1->,-1-> reachBottom: 0, // 0->,1->,-1->
status: 'more', // more|loading|noMore status: 'more', // more|loading|noMore
@ -80,12 +81,13 @@
uni.showLoading({ uni.showLoading({
title: '加载中' title: '加载中'
}) })
teamList({ platformTeamAccountList({
type: 1, type: 1,
pageNum: this.page, pageNum: this.page,
pageSize: this.pageSize, pageSize: this.pageSize,
keyWord: this.keyword, keyWord: this.keyword,
partnerClassificationId: uni.getStorageSync('team').teamId platformId: this.platformId,
classificationId: uni.getStorageSync('team').teamId
}).then(({ pageList }) => { }).then(({ pageList }) => {
uni.hideLoading() uni.hideLoading()
const { records } = pageList const { records } = pageList

Loading…
Cancel
Save