flat: 合并
This commit is contained in:
@@ -11,10 +11,10 @@
|
|||||||
<view v-if="loading" class="btn nocheck" loading="true">登录中</view>
|
<view v-if="loading" class="btn nocheck" loading="true">登录中</view>
|
||||||
<view v-else-if="validate" class="btn" @click="login">立即登录</view>
|
<view v-else-if="validate" class="btn" @click="login">立即登录</view>
|
||||||
<view v-else class="btn nocheck">立即登录</view>
|
<view v-else class="btn nocheck">立即登录</view>
|
||||||
<view class="changeLogintype">
|
<!-- <view class="changeLogintype">
|
||||||
<view class="" @click="goReg">手机注册</view>
|
<view class="" @click="goReg">手机注册</view>
|
||||||
<view class="" @click="goForget">忘记密码</view>
|
<view class="" @click="goForget">忘记密码</view>
|
||||||
</view>
|
</view> -->
|
||||||
</login-template>
|
</login-template>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@@ -73,12 +73,14 @@
|
|||||||
},
|
},
|
||||||
login(e) {
|
login(e) {
|
||||||
if (this.validate) {
|
if (this.validate) {
|
||||||
if (!this.userChecked) {
|
this.userChecked = true;
|
||||||
uni.showToast({
|
console.log(this.userChecked)
|
||||||
title:'请先阅读并同意《服务及隐私协议》',
|
// if (!this.userChecked) {
|
||||||
icon:'none',
|
// uni.showToast({
|
||||||
})
|
// title:'请先阅读并同意《服务及隐私协议》',
|
||||||
} else {
|
// icon:'none',
|
||||||
|
// })
|
||||||
|
// } else {
|
||||||
var that = this
|
var that = this
|
||||||
this.loading = true
|
this.loading = true
|
||||||
this.$store.dispatch("LoginByUsername", {
|
this.$store.dispatch("LoginByUsername", {
|
||||||
@@ -103,8 +105,9 @@
|
|||||||
}).catch((err) => {
|
}).catch((err) => {
|
||||||
this.loading = false
|
this.loading = false
|
||||||
// this.$refs.code.refushCode()
|
// this.$refs.code.refushCode()
|
||||||
|
location.href = "https://dy12333.org.cn/h5/"
|
||||||
});
|
});
|
||||||
}
|
// }
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
// 步骤
|
// 步骤
|
||||||
|
|||||||
@@ -5,11 +5,11 @@
|
|||||||
<slot></slot>
|
<slot></slot>
|
||||||
<view v-if="!hideBottom" class="bottomt">
|
<view v-if="!hideBottom" class="bottomt">
|
||||||
<view class="bottomt-box">
|
<view class="bottomt-box">
|
||||||
<view class="check-icon" @click="checkChanged">
|
<!-- <view class="check-icon" @click="checkChanged">
|
||||||
<image v-if="userChecked" src="../../static/img/checkOk.png" style="width: 30rpx;height:30rpx;"></image>
|
<image v-if="userChecked" src="../../static/img/checkOk.png" style="width: 30rpx;height:30rpx;"></image>
|
||||||
<view class="noneCheck" v-else></view>
|
<view class="noneCheck" v-else></view>
|
||||||
</view>
|
</view>
|
||||||
已阅读并同意<text class="bottomtText" @click="goMent">《服务及隐私协议》</text>
|
已阅读并同意<text class="bottomtText" @click="goMent">《服务及隐私协议》</text> -->
|
||||||
|
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
|
|||||||
@@ -81,11 +81,14 @@
|
|||||||
帮助与反馈
|
帮助与反馈
|
||||||
<image src="../../static/img/right.svg" mode=""></image>
|
<image src="../../static/img/right.svg" mode=""></image>
|
||||||
</view>
|
</view>
|
||||||
<view class="btnList" @click="go('/pageMy/my/set')">
|
<!-- <view class="btnList" @click="go('/pageMy/my/set')">
|
||||||
<image src="../../static/img/set.svg" mode=""></image>
|
<image src="../../static/img/set.svg" mode=""></image>
|
||||||
设置
|
设置
|
||||||
<image src="../../static/img/right.svg" mode=""></image>
|
<image src="../../static/img/right.svg" mode=""></image>
|
||||||
</view>
|
</view> -->
|
||||||
|
</view>
|
||||||
|
<view class="btn-out" @click="logout">
|
||||||
|
退出登录
|
||||||
</view>
|
</view>
|
||||||
<view class="bottom" @click="makePhoneCall">
|
<view class="bottom" @click="makePhoneCall">
|
||||||
客服电话 18500206848 工作时间 9:00-18:00
|
客服电话 18500206848 工作时间 9:00-18:00
|
||||||
@@ -130,6 +133,16 @@
|
|||||||
this.federationStatus = e.data.data.joined
|
this.federationStatus = e.data.data.joined
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
logout() {
|
||||||
|
this.$store.dispatch('LogOut').then(() => {
|
||||||
|
// uni.reLaunch({
|
||||||
|
// url: '/pages/login/login'
|
||||||
|
// })
|
||||||
|
this.$store.dispatch('clearAuthState')
|
||||||
|
this.$store.dispatch('endRefreshNewsTimer')
|
||||||
|
location.href = "https://dy12333.org.cn/h5/"
|
||||||
|
})
|
||||||
|
},
|
||||||
go(url) {
|
go(url) {
|
||||||
uni.navigateTo({
|
uni.navigateTo({
|
||||||
url
|
url
|
||||||
@@ -294,4 +307,13 @@
|
|||||||
position: relative;
|
position: relative;
|
||||||
overflow: auto;
|
overflow: auto;
|
||||||
}
|
}
|
||||||
|
.btn-out {
|
||||||
|
background-color: #fefefe;
|
||||||
|
margin-top: 20rpx;
|
||||||
|
padding: 20rpx 0;
|
||||||
|
text-align: center;
|
||||||
|
font-family: PingFangSC-Regular;
|
||||||
|
font-size: 32rpx;
|
||||||
|
color: #F46161;
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -126,7 +126,7 @@ export default {
|
|||||||
},
|
},
|
||||||
}, {
|
}, {
|
||||||
id: "1",
|
id: "1",
|
||||||
title: "个人户申请",
|
title: "个体户申请",
|
||||||
icon: "../../../static/img/own_recruit.svg",
|
icon: "../../../static/img/own_recruit.svg",
|
||||||
page: {
|
page: {
|
||||||
current: 0,
|
current: 0,
|
||||||
@@ -199,8 +199,7 @@ export default {
|
|||||||
uni.navigateTo({
|
uni.navigateTo({
|
||||||
url: './jobProjectList'
|
url: './jobProjectList'
|
||||||
})
|
})
|
||||||
} else if (item.title == '个人户申请') {
|
} else if (item.title == '个体户申请') {
|
||||||
console.log('个人户申请')
|
|
||||||
uni.navigateTo({
|
uni.navigateTo({
|
||||||
url: './policyList'
|
url: './policyList'
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -81,8 +81,8 @@
|
|||||||
<u-form-item label="企业名称" prop="jobCompanyName" borderBottom labelWidth="80" ref="item1">
|
<u-form-item label="企业名称" prop="jobCompanyName" borderBottom labelWidth="80" ref="item1">
|
||||||
<u--input v-model="info.jobCompanyName" border="none" placeholder="请输入企业名称"></u--input>
|
<u--input v-model="info.jobCompanyName" border="none" placeholder="请输入企业名称"></u--input>
|
||||||
</u-form-item>
|
</u-form-item>
|
||||||
<u-form-item label="企业规模" prop="jobCompanyScale" borderBottom labelWidth="80" ref="item1">
|
<u-form-item label="企业信用代码" prop="jobCompanyScale" borderBottom labelWidth="80" ref="item1">
|
||||||
<u--input v-model="info.jobCompanyScale" border="none" placeholder="请输入企业规模"></u--input>
|
<u--input v-model="info.jobCompanyScale" border="none" placeholder="请输入企业信用代码"></u--input>
|
||||||
</u-form-item>
|
</u-form-item>
|
||||||
<u-form-item label="所属行业" prop="jobCompanyIndustry" borderBottom labelWidth="80" ref="item1">
|
<u-form-item label="所属行业" prop="jobCompanyIndustry" borderBottom labelWidth="80" ref="item1">
|
||||||
<u--input v-model="info.jobCompanyIndustry" border="none" placeholder="请输入所属行业"></u--input>
|
<u--input v-model="info.jobCompanyIndustry" border="none" placeholder="请输入所属行业"></u--input>
|
||||||
@@ -187,7 +187,7 @@
|
|||||||
educationLabel: '', // 学历要求前端显示
|
educationLabel: '', // 学历要求前端显示
|
||||||
experienceDesc: '', // 经验要求
|
experienceDesc: '', // 经验要求
|
||||||
jobCompanyName: '', // 企业名称
|
jobCompanyName: '', // 企业名称
|
||||||
jobCompanyScale: '', // 企业规模
|
jobCompanyScale: '', // 企业信用代码
|
||||||
jobCompanyIndustry: '', // 所属行业
|
jobCompanyIndustry: '', // 所属行业
|
||||||
jobCompanyNature: '', // 企业性质
|
jobCompanyNature: '', // 企业性质
|
||||||
jobCompanyDescription: '', // 企业介绍
|
jobCompanyDescription: '', // 企业介绍
|
||||||
|
|||||||
@@ -79,8 +79,8 @@
|
|||||||
<u-form-item label="企业名称" prop="jobCompanyName" borderBottom labelWidth="80" ref="item1">
|
<u-form-item label="企业名称" prop="jobCompanyName" borderBottom labelWidth="80" ref="item1">
|
||||||
<u--input v-model="info.jobCompanyName" border="none" placeholder="请输入企业名称"></u--input>
|
<u--input v-model="info.jobCompanyName" border="none" placeholder="请输入企业名称"></u--input>
|
||||||
</u-form-item>
|
</u-form-item>
|
||||||
<u-form-item label="企业规模" prop="jobCompanyScale" borderBottom labelWidth="80" ref="item1">
|
<u-form-item label="企业信用代码" prop="jobCompanyScale" borderBottom labelWidth="80" ref="item1">
|
||||||
<u--input v-model="info.jobCompanyScale" border="none" placeholder="请输入企业规模"></u--input>
|
<u--input v-model="info.jobCompanyScale" border="none" placeholder="请输入企业信用代码"></u--input>
|
||||||
</u-form-item>
|
</u-form-item>
|
||||||
<u-form-item label="所属行业" prop="jobCompanyIndustry" borderBottom labelWidth="80" ref="item1">
|
<u-form-item label="所属行业" prop="jobCompanyIndustry" borderBottom labelWidth="80" ref="item1">
|
||||||
<u--input v-model="info.jobCompanyIndustry" border="none" placeholder="请输入所属行业"></u--input>
|
<u--input v-model="info.jobCompanyIndustry" border="none" placeholder="请输入所属行业"></u--input>
|
||||||
@@ -182,7 +182,7 @@
|
|||||||
education: '', // 学历要求
|
education: '', // 学历要求
|
||||||
experienceDesc: '', // 经验要求
|
experienceDesc: '', // 经验要求
|
||||||
jobCompanyName: '', // 企业名称
|
jobCompanyName: '', // 企业名称
|
||||||
jobCompanyScale: '', // 企业规模
|
jobCompanyScale: '', // 企业信用代码
|
||||||
jobCompanyIndustry: '', // 所属行业
|
jobCompanyIndustry: '', // 所属行业
|
||||||
jobCompanyNature: '', // 企业性质
|
jobCompanyNature: '', // 企业性质
|
||||||
jobCompanyDescription: '', // 企业介绍
|
jobCompanyDescription: '', // 企业介绍
|
||||||
@@ -423,7 +423,7 @@
|
|||||||
},
|
},
|
||||||
reset() {
|
reset() {
|
||||||
// jobCompanyName: '', // 企业名称
|
// jobCompanyName: '', // 企业名称
|
||||||
// jobCompanyScale: '', // 企业规模
|
// jobCompanyScale: '', // 企业信用代码
|
||||||
// jobCompanyIndustry: '', // 所属行业
|
// jobCompanyIndustry: '', // 所属行业
|
||||||
// jobCompanyNature: '', // 企业性质
|
// jobCompanyNature: '', // 企业性质
|
||||||
// jobCompanyDescription: '', // 企业介绍
|
// jobCompanyDescription: '', // 企业介绍
|
||||||
|
|||||||
@@ -79,8 +79,8 @@
|
|||||||
<u-form-item label="企业名称" prop="jobCompanyName" borderBottom labelWidth="80" ref="item1">
|
<u-form-item label="企业名称" prop="jobCompanyName" borderBottom labelWidth="80" ref="item1">
|
||||||
<u--input v-model="info.jobCompanyName" border="none" placeholder="请输入企业名称"></u--input>
|
<u--input v-model="info.jobCompanyName" border="none" placeholder="请输入企业名称"></u--input>
|
||||||
</u-form-item>
|
</u-form-item>
|
||||||
<u-form-item label="企业规模" prop="jobCompanyScale" borderBottom labelWidth="80" ref="item1">
|
<u-form-item label="企业信用代码" prop="jobCompanyScale" borderBottom labelWidth="80" ref="item1">
|
||||||
<u--input v-model="info.jobCompanyScale" border="none" placeholder="请输入企业规模"></u--input>
|
<u--input v-model="info.jobCompanyScale" border="none" placeholder="请输入企业信用代码"></u--input>
|
||||||
</u-form-item>
|
</u-form-item>
|
||||||
<u-form-item label="所属行业" prop="jobCompanyIndustry" borderBottom labelWidth="80" ref="item1">
|
<u-form-item label="所属行业" prop="jobCompanyIndustry" borderBottom labelWidth="80" ref="item1">
|
||||||
<u--input v-model="info.jobCompanyIndustry" border="none" placeholder="请输入所属行业"></u--input>
|
<u--input v-model="info.jobCompanyIndustry" border="none" placeholder="请输入所属行业"></u--input>
|
||||||
@@ -183,7 +183,7 @@
|
|||||||
educationLabel: '', // 学历要求前端显示
|
educationLabel: '', // 学历要求前端显示
|
||||||
experienceDesc: '', // 经验要求
|
experienceDesc: '', // 经验要求
|
||||||
jobCompanyName: '', // 企业名称
|
jobCompanyName: '', // 企业名称
|
||||||
jobCompanyScale: '', // 企业规模
|
jobCompanyScale: '', // 企业信用代码
|
||||||
jobCompanyIndustry: '', // 所属行业
|
jobCompanyIndustry: '', // 所属行业
|
||||||
jobCompanyNature: '', // 企业性质
|
jobCompanyNature: '', // 企业性质
|
||||||
jobCompanyDescription: '', // 企业介绍
|
jobCompanyDescription: '', // 企业介绍
|
||||||
|
|||||||
@@ -38,8 +38,11 @@
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style>
|
<style>
|
||||||
page{
|
/* page{
|
||||||
padding: 20px 20px 20px 20px;
|
padding: 20px 20px 20px 20px;
|
||||||
overflow: auto;
|
overflow: auto;
|
||||||
|
} */
|
||||||
|
.policy-content {
|
||||||
|
padding: 30rpx;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -162,23 +162,24 @@ export function Promisify(func) {
|
|||||||
export function GoLogin() {
|
export function GoLogin() {
|
||||||
if (showModal) {
|
if (showModal) {
|
||||||
showModal = false
|
showModal = false
|
||||||
uni.showModal({
|
location.href = "https://dy12333.org.cn/h5/"
|
||||||
title: "提示",
|
// uni.showModal({
|
||||||
content: "您还未登录,点击确认去登录",
|
// title: "提示",
|
||||||
success({
|
// content: "您还未登录,点击确认去登录",
|
||||||
confirm
|
// success({
|
||||||
}) {
|
// confirm
|
||||||
if (confirm) {
|
// }) {
|
||||||
uni.redirectTo({
|
// if (confirm) {
|
||||||
url: "/pages/login/login"
|
// uni.redirectTo({
|
||||||
});
|
// url: "/pages/login/login"
|
||||||
}
|
// });
|
||||||
showModal = true
|
// }
|
||||||
},
|
// showModal = true
|
||||||
fail() {
|
// },
|
||||||
showModal = true
|
// fail() {
|
||||||
}
|
// showModal = true
|
||||||
})
|
// }
|
||||||
|
// })
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user