From 46b0d9969dd4b6e6cae02e7868bffa8d164c3cde Mon Sep 17 00:00:00 2001
From: yangyin <1850366751@qq.com>
Date: 星期二, 23 七月 2024 15:05:10 +0800
Subject: [PATCH] Revert "fix: 修改登录页面"
---
app.json | 36 ++++++-----------
/dev/null | 1
login/login/index.wxss | 33 ++++------------
login/login/index.wxml | 26 ++++++-------
login/login/index.js | 2
style/main.wxss | 6 +-
project.private.config.json | 6 +-
project.config.json | 2
utils/constant.js | 4 +-
9 files changed, 44 insertions(+), 72 deletions(-)
diff --git a/app.json b/app.json
index 041d12b..ea5862a 100644
--- a/app.json
+++ b/app.json
@@ -2,8 +2,7 @@
"pages": [
"workDesktop/index/index",
"repair/assessTable/index",
- "overview/list/index",
-
+
"test/reportTable/index",
"station/list/index",
"repair/addReport/index",
@@ -49,7 +48,7 @@
"product/detail/general/index",
"product/detail/newPumpDetail/index",
"product/listInStation/index",
- "monitor/station/index",
+ "monitor/station/index",
"monitor/meter/index",
"reportForm/index/index",
"reportForm/Detail/index",
@@ -63,9 +62,9 @@
],
"window": {
"backgroundTextStyle": "light",
- "navigationBarBackgroundColor": "#2567E8",
+ "navigationBarBackgroundColor": "#16b5cb",
"navigationBarTitleText": "宸℃",
- "navigationBarTextStyle": "white",
+ "navigationBarTextStyle": "black",
"pageOrientation": "auto"
},
"sitemapLocation": "sitemap.json",
@@ -73,29 +72,15 @@
"location"
],
"tabBar": {
- "custom": true,
- "color": "#7D838C",
- "selectedColor": "#0D0D1B",
+ "color": "#8E9397",
+ "selectedColor": "#16b5cb",
"backgroundColor": "#ffffff",
"list": [
{
- "pagePath": "overview/list/index",
- "text": "鎬昏",
- "iconPath": "images/tabbar/minitorUnActive.png",
- "selectedIconPath": "images/tabbar/minitorActive.png"
- },
- {
"pagePath": "station/list/index",
- "text": "娉电珯",
+ "text": "鍒楄〃",
"iconPath": "images/tabbar/minitorUnActive.png",
"selectedIconPath": "images/tabbar/minitorActive.png"
- },
- {
- "pagePath": "map/index",
- "text": "鍦板浘",
- "bulge":true,
- "iconPath": "images/tabbar/mapUnActive.png",
- "selectedIconPath": "images/tabbar/mapActive.png"
},
{
"pagePath": "workDesktop/index/index",
@@ -103,7 +88,12 @@
"iconPath": "images/tabbar/workDesktopUnActive.png",
"selectedIconPath": "images/tabbar/workDesktopActive.png"
},
-
+ {
+ "pagePath": "map/index",
+ "text": "鍦板浘",
+ "iconPath": "images/tabbar/mapUnActive.png",
+ "selectedIconPath": "images/tabbar/mapActive.png"
+ },
{
"pagePath": "mine/index/index",
"text": "鎴戠殑",
diff --git a/login/login/index.js b/login/login/index.js
index 30b0419..c32d257 100644
--- a/login/login/index.js
+++ b/login/login/index.js
@@ -7,7 +7,7 @@
password: '',
checked: false,
imageWidth: 100,
- imageHeight:500,
+ imageHeight: 100,
inputViewWidth: 100,
inputViewHeight: 100,
inputWidth: 100,
diff --git a/login/login/index.wxml b/login/login/index.wxml
index 34b1f15..fba147e 100644
--- a/login/login/index.wxml
+++ b/login/login/index.wxml
@@ -1,25 +1,24 @@
<!--index.wxml-->
<view class="container">
- <view style="width: {{imageWidth}}px; height: 337px;" class="login-log">
+ <view style="width: {{imageWidth}}px; height: {{imageHeight}}px;" class="login-log">
+ <!-- <image style="width: {{imageWidth}}px; height: {{imageHeight}}px;" src="http://www.beng35.com/assets/miniProgram/loginLog.png"></image> -->
<view style="width: {{imageWidth}}px; height: {{imageHeight}}px;background:url({{BackgroupImageUrl}})" class="loginBac">
<view>
<image src="{{LogoUrl}}" class="imgStyle"></image>
</view>
<view class="textStyle" style="color: #ffffff;text-align: center;font-size: x-large;font-weight: 900;margin-top: 50rpx;">
- <text>鏅烘车绠″骞冲彴</text>
+ <text>閲戝涵鏅烘収姘村姟骞冲彴</text>
</view>
</view>
</view>
- <view class="inputBg">
-
- <view class="set-content-bg">
+ <view style="width: 100%; min-height: 90px;" class="inputBg">
<view class="cu-form-group">
- <view class="title" style="width: 28%;"><i class="cuIcon-profile margin-right-sm"></i>璐﹀彿</view>
+ <view class="title" style="width: 25%;"><i class="cuIcon-profile margin-right-sm"></i>璐﹀彿</view>
<input placeholder="璇疯緭鍏ヨ处鍙�" name="input" bindinput="phoneInput" value='{{phone}}'></input>
<icon wx:if="{{phone.length>0}}" class="cuIcon-roundclose" bindtap="clearnAccount" style="font-size: 30rpx;line-height: 2;"></icon>
</view>
<view class="cu-form-group">
- <view class="title" style="width: 28%;"><i class="cuIcon-lock margin-right-sm"></i>瀵嗙爜</view>
+ <view class="title" style="width: 25%;"><i class="cuIcon-lock margin-right-sm"></i>瀵嗙爜</view>
<input placeholder="璇疯緭鍏ュ瘑鐮�" name="input" password="{{!isShowPwd}}" bindinput="passwordInput" value='{{password}}'></input>
<icon wx:if="{{!isShowPwd}}" class="cuIcon-attention" bindtap="changePwdView" style="font-size: 30rpx;line-height: 2;"></icon>
<icon wx:else class="cuIcon-attentionforbid" bindtap="changePwdView" style="font-size: 30rpx;line-height: 2;"></icon>
@@ -27,22 +26,21 @@
<view class="psdBox">
<checkbox-group bindchange="rememberPwd">
<checkbox value="1" checked="{{checked}}" />
- <label for="check" style="margin-left: 24rpx;">璁颁綇瀵嗙爜</label>
+ <label for="check">璁颁綇瀵嗙爜</label>
</checkbox-group>
</view>
- <view class="loginBtnView">
- <button class="loginBtnReal" type="primary" bindtap="tapBindUserReal" style="background-color: rgb(29, 97, 231)">鐧诲綍</button>
</view>
+ <view class="loginBtnView">
+ <button class="loginBtnReal" type="primary" bindtap="tapBindUserReal" style="background-color: #39b5de;">鐧诲綍</button>
+ <!-- <button class="loginBtnDemo" type="primary" bindtap="tapBindUserDemo"
+ style="background-color: #B9D3EE;">婕旂ず</button> -->
</view>
-
- </view>
-
<view class="explain call_style" style="display: flex; justify-content: center; align-items: center; flex-direction: column;">
<label bindtap="call">褰撳墠鐗堟湰:
<text class="call" bindtap="call">{{m_SoftWareVersion}}</text>
</label>
<label bindtap="call">鎶�鏈敮鎸�:
- <text class="call" bindtap="call">涔夌淮绉戞妧鏈夐檺鍏徃</text>
+ <text class="call" bindtap="call">鑻忓窞甯傚惔涓尯閲戝涵鑷潵姘村巶</text>
</label>
</view>
</view>
\ No newline at end of file
diff --git a/login/login/index.wxss b/login/login/index.wxss
index 5fbb159..d35cbfd 100644
--- a/login/login/index.wxss
+++ b/login/login/index.wxss
@@ -9,26 +9,13 @@
justify-content: space-between;
padding: 0;
box-sizing: border-box;
- background-color: #F6F8FA;
+ background-color: #f2f2f2;
}
-.login-log{
- background-color:#2567E8 ;
-}
+
.inputBg {
margin-top: 0px;
- width: 100%;
- height: 390px;
- position: absolute;
- top: 34%;
- padding: 48rpx;
}
-.set-content-bg{
- width: 654rpx;
- height: 100%;
- background-color: #fff;
- padding: 30rpx;
- border-radius: 20rpx;
-}
+
.inputView {
float: left;
display: flex;
@@ -90,9 +77,8 @@
.loginBtnView {
width: 100%;
height: auto;
- background: rgb(29, 97, 231);
+ background-color: #efeff4;
margin-top: 0px;
- border-radius: 10rpx;
margin-bottom: 0px;
padding-bottom: 0px;
}
@@ -100,7 +86,8 @@
.loginBtnReal {
width: 80%;
margin-top: 25px;
- color: rgb(29, 97, 231);
+ background-color: #39b5de;
+ color: #39b5de;
border-radius: 0px;
}
@@ -150,9 +137,8 @@
}
.textStyle {
- /* background-image: -webkit-linear-gradient(bottom, #1ae8c8, #4a8aff);
- background: linear-gradient(bottom, #1ae8c8, #4a8aff); */
- background: #fff;
+ background-image: -webkit-linear-gradient(bottom, #1ae8c8, #4a8aff);
+ background: linear-gradient(bottom, #1ae8c8, #4a8aff);
-webkit-background-clip: text;
background-clip: text;
-webkit-text-fill-color: transparent;
@@ -166,8 +152,7 @@
margin-bottom: 20px;
}
.psdBox {
- margin: 24rpx 20rpx 28rpx 20rpx;
- min-height:60rpx;
+ margin: 14rpx 20rpx 28rpx 20rpx
}
checkbox .wx-checkbox-input {
width: 28rpx;
diff --git a/overview/list/index.js b/overview/list/index.js
deleted file mode 100644
index b7083b9..0000000
--- a/overview/list/index.js
+++ /dev/null
@@ -1,66 +0,0 @@
-// overview/list/index.js
-Page({
-
- /**
- * 椤甸潰鐨勫垵濮嬫暟鎹�
- */
- data: {
-
- },
-
- /**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
- */
- onLoad(options) {
-
- },
-
- /**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
- */
- onReady() {
-
- },
-
- /**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
- */
- onShow() {
-
- },
-
- /**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰闅愯棌
- */
- onHide() {
-
- },
-
- /**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍗歌浇
- */
- onUnload() {
-
- },
-
- /**
- * 椤甸潰鐩稿叧浜嬩欢澶勭悊鍑芥暟--鐩戝惉鐢ㄦ埛涓嬫媺鍔ㄤ綔
- */
- onPullDownRefresh() {
-
- },
-
- /**
- * 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
- */
- onReachBottom() {
-
- },
-
- /**
- * 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
- */
- onShareAppMessage() {
-
- }
-})
\ No newline at end of file
diff --git a/overview/list/index.json b/overview/list/index.json
deleted file mode 100644
index 8835af0..0000000
--- a/overview/list/index.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "usingComponents": {}
-}
\ No newline at end of file
diff --git a/overview/list/index.wxml b/overview/list/index.wxml
deleted file mode 100644
index 3f2c191..0000000
--- a/overview/list/index.wxml
+++ /dev/null
@@ -1,2 +0,0 @@
-<!--overview/list/index.wxml-->
-<text>鎬昏锛岃繕鏈紑鍙�</text>
\ No newline at end of file
diff --git a/overview/list/index.wxss b/overview/list/index.wxss
deleted file mode 100644
index cf61cce..0000000
--- a/overview/list/index.wxss
+++ /dev/null
@@ -1 +0,0 @@
-/* overview/list/index.wxss */
\ No newline at end of file
diff --git a/project.config.json b/project.config.json
index 2d34b40..e804dcb 100644
--- a/project.config.json
+++ b/project.config.json
@@ -50,5 +50,5 @@
"ignore": [],
"include": []
},
- "appid": "wxd057c30bdb9eeb54"
+ "appid": "wxf9004037673ecd0b"
}
\ No newline at end of file
diff --git a/project.private.config.json b/project.private.config.json
index b92cdaf..beb7535 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -1,8 +1,8 @@
{
- "projectname": "IStation.V1.0",
+ "projectname": "Wechart.V1.0",
"setting": {
- "compileHotReLoad": true,
- "urlCheck": false
+ "compileHotReLoad": false,
+ "urlCheck": true
},
"description": "椤圭洰绉佹湁閰嶇疆鏂囦欢銆傛鏂囦欢涓殑鍐呭灏嗚鐩� project.config.json 涓殑鐩稿悓瀛楁銆傞」鐩殑鏀瑰姩浼樺厛鍚屾鍒版鏂囦欢涓�傝瑙佹枃妗ｏ細https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
"libVersion": "3.4.9",
diff --git a/style/main.wxss b/style/main.wxss
index 969328a..7d4ea3b 100644
--- a/style/main.wxss
+++ b/style/main.wxss
@@ -2359,12 +2359,12 @@
padding: 1rpx 30rpx;
display: flex;
align-items: center;
- min-height: 120rpx;
+ min-height: 100rpx;
justify-content: space-between;
}
-.cu-form-group {
- border-bottom: 1rpx solid #eee;
+.cu-form-group+.cu-form-group {
+ border-top: 1rpx solid #eee;
}
.cu-form-group .title {
diff --git a/utils/constant.js b/utils/constant.js
index 4f598eb..14b615c 100644
--- a/utils/constant.js
+++ b/utils/constant.js
@@ -6,8 +6,8 @@
var TencenteMapKey = "GFDBZ-D3NKX-LNL4Z-TSWGU-RYCE3-4HB3I";
var IMAGE_ROOT_URL = "https://www.xpump.net/ProductLibraryFile/";
-var SOFTWARE_VERSION = "1.22.0704B";
-var UPDATE_TIME = "1.24.0704A";
+var SOFTWARE_VERSION = "1.24.0514A";
+var UPDATE_TIME = "1.24.0514A";
// 灏嗘柟娉曘�佸彉閲忔毚闇插嚭鍘�
module.exports = {
BASE_SERVER_URL: BASE_SERVER_URL,
--
Gitblit v1.9.3