From 086bd449449b3b887f3b85e33567fec594716a24 Mon Sep 17 00:00:00 2001
From: lijianzhong <m18328725261@163.com>
Date: Wed, 20 Mar 2024 17:09:58 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E7=99=BB=E5=BD=95=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                 |  4 ++--
 pages/index/index.js   | 10 ++++++++
 pages/index/index.wxml |  2 +-
 pages/login/index.js   | 11 ++++++++-
 pages/login/index.wxml | 39 +++++++++++++++++++++++++++----
 pages/login/index.wxss | 52 ++++++++++++++++++++++++++++++++++++------
 pages/web/index.js     | 19 ++++++++++++++-
 pages/web/index.wxml   |  4 +++-
 pages/web/index.wxss   |  6 +++++
 9 files changed, 130 insertions(+), 17 deletions(-)

diff --git a/app.js b/app.js
index bb78467..0258966 100644
--- a/app.js
+++ b/app.js
@@ -50,8 +50,8 @@ App({
   globalData: {
     versionCode: 'V1',
     userInfo: {},
-    // headerUrl: "http://42.193.40.239:8017/"
-    headerUrl: "http://192.168.110.186:8017/"
+    headerUrl: "http://42.193.40.239:8017/"
+    // headerUrl: "http://192.168.110.186:8017/"
   },
 
   // 文件服务器地址
diff --git a/pages/index/index.js b/pages/index/index.js
index 893ac3f..bf4ff07 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -158,6 +158,16 @@ Page({
     })
   },
 
+  /**
+   * 通知详情
+   */
+  toMsgDetail: function (params) {
+    const item = params.currentTarget.dataset.item;
+    wx.navigateTo({
+      url: `/pages/web/index?id=${item.govNoticeId}`,
+    })
+  },
+
   onLoad(option) {
     this.data.userInfo = app.globalData.userInfo;
     this.getBanner();
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 461d031..20c4d34 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -10,7 +10,7 @@
 <!-- 消息 -->
 <swiper class="item-bg swiper-msg" autoplay indicator-dots indicator-active-color='#ffffff'>
   <swiper-item class="item" wx:for="{{notice}}" wx:key="{{item}}">
-    <image class="img" src="{{baseImgUrl+item.coverImg}}" mode="widthFix"></image>
+    <image catchtap="toMsgDetail" data-item="{{item}}" class="img" src="{{baseImgUrl+item.coverImg}}" mode="widthFix"></image>
     <text class="title ellipsis">{{item.title}}</text>
   </swiper-item>
 </swiper>
diff --git a/pages/login/index.js b/pages/login/index.js
index 80da46c..59385e8 100644
--- a/pages/login/index.js
+++ b/pages/login/index.js
@@ -8,7 +8,16 @@ Page({
    */
   data: {
     username: 'admin',
-    password: 'Daofu123456'
+    password: 'Daofu123456',
+    showLogin: true,
+  },
+
+  /**
+   * 切换登录/注册
+   */
+  changeWay: function (e) {
+    this.data.showLogin = e.currentTarget.dataset.type;
+    this.setData(this.data)
   },
 
   /**
diff --git a/pages/login/index.wxml b/pages/login/index.wxml
index 59c8444..73eb519 100644
--- a/pages/login/index.wxml
+++ b/pages/login/index.wxml
@@ -1,8 +1,13 @@
 <!--pages/login/index.wxml-->
 <image class="bg-img" src="/images/bg.png" mode="aspectFill" />
+<view class="top">
+  <text class="nh">您好！</text>
+  <text class="des">欢迎来到鲜水镇“智慧鲜水”数字化平台</text>
+</view>
 <view class="v-div v-center form">
-  <view class="item v-div v-center">
-    <text class="title">“智慧鲜水”数字化平台</text>
+  <!-- 登录 -->
+  <view wx:if="{{showLogin}}" class="item v-div v-center">
+    <text class="title">手机号登录</text>
     <view class="h-div v-center in-bg">
       <image src="/images/user_icon.png"></image>
       <input type="text" value="{{username}}" placeholder="请输入用户名" bindinput="inputMethed" data-type="username" />
@@ -13,8 +18,34 @@
     </view>
 
     <view catchtap="login" class="btn" data-type="{{1}}">登录</view>
-    <text class="tag">或</text>
-    <view catchtap="login" class="wx-login" data-type="{{2}}">微信登录</view>
+    <view class="h-div v-center bot">
+      <text class="tag" catchtap="changeWay" data-type="{{false}}">还没有账号？立即注册</text>
+      <view class="forget-pwd">忘记密码</view>
+    </view>
+  </view>
+  <!-- 注册 -->
+  <view wx:else class="item v-div v-center">
+    <text class="title">注册</text>
+    <view class="h-div v-center in-bg">
+      <text class="lab">姓名</text>
+      <input type="text" value="{{form.name}}" placeholder="请输入姓名" bindinput="inputMethed" data-type="name" />
+    </view>
+    <view class="h-div v-center in-bg">
+      <text class="lab">手机号码</text>
+      <input type="text" value="{{form.phone}}" placeholder="请输入手机号码" bindinput="inputMethed" data-type="phone" />
+    </view>
+    <view class="h-div v-center in-bg">
+      <text class="lab">登录密码</text>
+      <input type="text" value="{{form.password}}" placeholder="请输入登录密码" bindinput="inputMethed" data-type="password" />
+    </view>
+    <view class="h-div v-center in-bg">
+      <text class="lab">所属社区</text>
+    </view>
+
+    <view catchtap="login" class="btn" data-type="{{1}}">立即注册</view>
+    <view class="h-div v-center" style="margin-top: 30rpx;">
+      <text class="tag" catchtap="changeWay" data-type="{{true}}">已有账号？立即登录</text>
+    </view>
   </view>
 </view>
 
diff --git a/pages/login/index.wxss b/pages/login/index.wxss
index 7b8e887..007a38d 100644
--- a/pages/login/index.wxss
+++ b/pages/login/index.wxss
@@ -8,6 +8,27 @@ page {
   height: 100vh;
   position: absolute;
   z-index: -1;
+  top: 0;
+}
+
+.top {
+  margin: 190rpx 75rpx 0 75rpx;
+  display: flex;
+  flex-direction: column;
+}
+
+.top .nh {
+  font-size: 70rpx;
+  color: #FFFFFF;
+  text-shadow: 0px 3px 6px #1054B7;
+  text-align: left;
+}
+
+.top .des {
+  font-size: 32rpx;
+  color: #FFFFFF;
+  text-shadow: 0px 3px 6px #1054B7;
+  text-align: left;
 }
 
 .form {
@@ -16,23 +37,27 @@ page {
   justify-content: center;
   width: 100vw;
   height: 100vh;
+  position: absolute;
+  left: 0;
+  top: 0;
 }
 
 .item {
   margin: 0 5%;
   width: 90%;
   padding: 30rpx 16rpx;
-  background: rgba(255, 255, 255, 0.7);
+  background: #FFFFFF;
   box-shadow: 0px 0px 12rpx 1rpx #b6c7e4;
   border-radius: 20rpx;
-  margin-top: 30rpx;
+  margin-top: 100rpx;
+  box-sizing: border-box;
 }
 
 .item .title {
   font-size: 38rpx;
   color: #222222;
   font-weight: bold;
-  margin-bottom: 50rpx;
+  margin: 40rpx 0;
 }
 
 
@@ -56,6 +81,13 @@ page {
   margin-right: 20rpx;
 }
 
+.item .in-bg .lab {
+  margin-left: 20rpx;
+  width: 230rpx;
+  font-size: 28rpx;
+  color: #333333;
+}
+
 .btn {
   display: flex;
   align-items: center;
@@ -72,15 +104,21 @@ page {
   opacity: 0.8;
 }
 
-.tag {
-  font-size: 28rpx;
+.bot {
+  width: 90%;
+  margin: 30rpx 60rpx;
+}
+
+.bot .tag {
+  flex: 1;
+  font-size: 30rpx;
+  color: #666666;
   margin: 10rpx 0;
 }
 
-.wx-login {
+.bot .forget-pwd {
   font-size: 30rpx;
   color: #666666;
-  text-decoration: underline;
 }
 
 .pop .btn {
diff --git a/pages/web/index.js b/pages/web/index.js
index 00bddf2..dc328a7 100644
--- a/pages/web/index.js
+++ b/pages/web/index.js
@@ -12,11 +12,26 @@ Page({
     title: ''
   },
 
+  /**
+   * 获取消息详情
+   */
+  getDetail: function (id) {
+    app.axios("GET", "app", `/notice/noticeDetail/${id}`, {}, false).then(res => {
+      if (res.code == 1) {
+        this.data.content = res.data.content;
+        this.setData(this.data)
+        wx.setNavigationBarTitle({
+          title: res.data.title,
+        })
+      }
+    })
+  },
+
   /** 
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-    const title = options.title;
+    const title = options.title || '';
     this.data.title = title;
     this.setData(this.data)
     wx.setNavigationBarTitle({
@@ -27,6 +42,8 @@ Page({
       this.data.url = url;
       this.setData(this.data)
     })
+
+    this.getDetail(options.id)
   },
 
   /**
diff --git a/pages/web/index.wxml b/pages/web/index.wxml
index baf3492..c2951f3 100644
--- a/pages/web/index.wxml
+++ b/pages/web/index.wxml
@@ -1,3 +1,5 @@
 <!--pages/web/index.wxml-->
 <web-view wx:if="{{url}}" src="{{url}}" />
-<rich-text wx:else />
\ No newline at end of file
+<scroll-view wx:else class="sc">
+  <rich-text nodes="{{content}}" />
+</scroll-view>
\ No newline at end of file
diff --git a/pages/web/index.wxss b/pages/web/index.wxss
index 9c8eeec..999ea2d 100644
--- a/pages/web/index.wxss
+++ b/pages/web/index.wxss
@@ -1,4 +1,10 @@
 /* pages/web/index.wxss */
 .web {
   width: 100vw;
+}
+
+.sc {
+  background-color: white;
+  height: 100vh;
+  padding: 30rpx 20rpx;
 }
\ No newline at end of file