From 234420e1b6042b6085fee942a1aa16c1ae8d51c4 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 08 Dec 2023 16:04:11 +0800
Subject: [PATCH] 游客
---
pages/login/login-account.vue | 99 +++++++++++++++++++++++++++----------------------
pages/home/index.vue | 14 +++---
2 files changed, 61 insertions(+), 52 deletions(-)
diff --git a/pages/home/index.vue b/pages/home/index.vue
index d1b1901..1727114 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -257,7 +257,7 @@
liveList: [], //生活菜单
contactList: [], //便民服务联系方式
isShowHouse: false, //显示楼盘表
- isShowNotice: false, //显示通知公告
+ isShowNotice: true, //显示通知公告
isShowContact: false,
bannerList: [],
navList: [{
@@ -298,11 +298,11 @@
},
onReady() {
- if (!uni.getStorageSync("userInfo")) {
- uni.redirectTo({
- url: "/pages/login/login-account"
- })
- }
+ // if (!uni.getStorageSync("userInfo")) {
+ // uni.redirectTo({
+ // url: "/pages/login/login-account"
+ // })
+ // }
},
computed: {
@@ -357,7 +357,7 @@
this.selectRole = uni.getStorageSync("activeRole")
this.getMenuList()
this.getSiteList()
- // this.getNoticeList()
+ this.getNoticeList()
},
getBanner() {
diff --git a/pages/login/login-account.vue b/pages/login/login-account.vue
index 2533065..7f0df49 100644
--- a/pages/login/login-account.vue
+++ b/pages/login/login-account.vue
@@ -10,27 +10,28 @@
<image class="bg" src="/static/img/login-bg.png" :style="{height:screenHeight}" mode="aspectFill"></image>
- <view class="content" v-if="!loginType">
- <image class="title-img" src="/static/icon/login-title.png" mode="aspectFill"></image>
- <view class="flex f-d-c a-i-c" style="margin-bottom:60rpx;">
- <view class="f-28">登录后即可展示自己</view>
- <view class="fw" style="font-size:56rpx;margin:40rpx 0 38rpx;">185****1647</view>
- <view class="f-22">认证服务由中国移动提供</view>
- </view>
-
- <button class="submit-btn f-28">本机号码一键登录</button>
- <button class="btn bgc-ff f-28 mt-30" @click="accountLogin()">账号登录</button>
- <view class="agreement flex">
- <u-checkbox-group v-model="isAgreement">
- <u-checkbox shape="circle" size="16" ></u-checkbox>
- </u-checkbox-group>
-
- <view class="f-22">我已阅读并同意<text class="c-main">用户协议</text>和<text class="c-main">隐私政策</text>以及 <text class="c-main">《中国移动认证服务条款》</text>·同时登录并使用基层智治综合协同平台</view>
+ <view class="content" v-if="!loginType">
+ <image class="title-img" src="/static/icon/login-title.png" mode="aspectFill"></image>
+ <view class="flex f-d-c a-i-c" style="margin-bottom:60rpx;">
+ <view class="f-28">登录后即可展示自己</view>
+ <view class="fw" style="font-size:56rpx;margin:40rpx 0 38rpx;">185****1647</view>
+ <view class="f-22">认证服务由中国移动提供</view>
</view>
- </view>
-
- <view class="content" v-if="loginType == 1">
+ <button class="submit-btn f-28">本机号码一键登录</button>
+ <button class="btn bgc-ff f-28 mt-30" @click="accountLogin()">账号登录</button>
+ <view class="agreement flex">
+ <u-checkbox-group v-model="isAgreement">
+ <u-checkbox shape="circle" size="16"></u-checkbox>
+ </u-checkbox-group>
+
+ <view class="f-22">我已阅读并同意<text class="c-main">用户协议</text>和<text class="c-main">隐私政策</text>以及 <text
+ class="c-main">《中国移动认证服务条款》</text>·同时登录并使用基层智治综合协同平台</view>
+ </view>
+ </view>
+
+
+ <view class="content" v-if="loginType == 1">
<image class="title-img" src="/static/icon/login-title.png" mode="aspectFill"></image>
@@ -40,15 +41,17 @@
<u-input placeholder="请输入用户名" prefixIcon="account"
prefixIconStyle="font-size: 28px;color: #017BFC"
placeholderStyle="font-size:28rpx;color:#ABABAB;"
- customStyle="background:#fff;width:634rpx;height:120rpx;" v-model="form.phone"></u-input>
+ customStyle="background:#fff;width:634rpx;height:120rpx;" v-model="form.phone"></u-input>
</u-form-item>
<u-form-item prop="password" borderBottom ref="password">
<u-input placeholder="请输入密码" prefixIcon="lock" prefixIconStyle="font-size: 28px;color: #017BFC"
placeholderStyle="font-size:28rpx;color:#ABABAB;"
- customStyle="background:#fff;width:634rpx;height:120rpx;" :type="passwordProps.passwordType" v-model="form.password">
+ customStyle="background:#fff;width:634rpx;height:120rpx;" :type="passwordProps.passwordType"
+ v-model="form.password">
<template slot="suffix">
- <u-icon @click="showPassword" :name="passwordProps.passwordIcon" size="24" color="#9FA5C0"></u-icon>
+ <u-icon @click="showPassword" :name="passwordProps.passwordIcon" size="24"
+ color="#9FA5C0"></u-icon>
</template>
</u-input>
</u-form-item>
@@ -121,8 +124,8 @@
form: {
phone: "",
password: "",
-
-
+
+
},
rules: {
'phone': [{
@@ -153,31 +156,33 @@
passwordType: "password"
},
screenHeight: "",
- loginType:1 ,//登录类型 1账号密码 2 一键登录
- isAgreement:true
+ loginType: 1, //登录类型 1账号密码 2 一键登录
+ isAgreement: true
}
},
onLoad() {
this.screenHeight = `${uni.getSystemInfoSync().screenHeight}px`;
+ this.form.phone = uni.getStorageSync("phoneNmber");
},
methods: {
-
- accountLogin(){
+
+ accountLogin() {
// if(!this.isAgreement){
-
+
// }
console.log(111);
this.loginType = 1;
},
-
+
submit() {
const that = this
this.$refs.form.validate().then(res => {
this.$u.api
.token(this.tenantId, this.form.phone, md5(this.form.password))
.then(data => {
+ uni.setStorageSync("phoneNmber", this.form.phone)
this.$u.func.login(data)
})
.catch(err => {
@@ -437,26 +442,30 @@
justify-content: space-evenly;
}
}
- .submit-btn{
- width:634rpx;
- height:94rpx;
+
+ .submit-btn {
+ width: 634rpx;
+ height: 94rpx;
line-height: 94rpx;
background: linear-gradient(163deg, #01BDFC 0%, #017BFC 100%);
border-radius: 8rpx 8rpx 8rpx 8rpx;
- color:#fff;
+ color: #fff;
}
- .mt-190{
- margin-top:190rpx;
+
+ .mt-190 {
+ margin-top: 190rpx;
}
- .btn{
- width:634rpx;
- height:94rpx;
+
+ .btn {
+ width: 634rpx;
+ height: 94rpx;
line-height: 94rpx;
- margin-top:30rpx;
-
+ margin-top: 30rpx;
+
}
- .agreement{
- width:634rpx;
- margin:37rpx auto 0;
+
+ .agreement {
+ width: 634rpx;
+ margin: 37rpx auto 0;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3