Revert "fix: 修改登录页面"

yangyin

2024-07-23 46b0d9969dd4b6e6cae02e7868bffa8d164c3cde

Revert "fix: 修改登录页面"

This reverts commit 0e91f622ec33a28b47a46204996462a2b7643fe1.

 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": "我的",

 login/login/index.js

@@ -7,7 +7,7 @@
    password: '',
    checked: false,
    imageWidth: 100,
    imageHeight:500,
    imageHeight: 100,
    inputViewWidth: 100,
    inputViewHeight: 100,
    inputWidth: 100,

 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>

 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;

 overview/list/index.js

ÎļþÒÑɾ³ý

 overview/list/index.json

ÎļþÒÑɾ³ý

 overview/list/index.wxml

ÎļþÒÑɾ³ý

 overview/list/index.wxss

ÎļþÒÑɾ³ý

 project.config.json

@@ -50,5 +50,5 @@
    "ignore": [],
    "include": []
  },
  "appid": "wxd057c30bdb9eeb54"
  "appid": "wxf9004037673ecd0b"
}

 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",

 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 {

 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,