guhongwei пре 3 година
родитељ
комит
b3e4cee118

+ 1 - 1
commpents/mobile-frame/top.wxss

@@ -1,7 +1,7 @@
 .top {
   float: left;
   width: 100%;
-  background-color: #0425b4;
+  background-color: #0017ff;
 }
 
 .top .left {

+ 65 - 6
icon/icon.wxss

@@ -1,9 +1,8 @@
 @font-face {
-  font-family: "iconfont";
-  /* Project id 3094003 */
-  src: url('//at.alicdn.com/t/font_3094003_xu5no0ebyg.woff2?t=1640938844892') format('woff2'),
-    url('//at.alicdn.com/t/font_3094003_xu5no0ebyg.woff?t=1640938844892') format('woff'),
-    url('//at.alicdn.com/t/font_3094003_xu5no0ebyg.ttf?t=1640938844892') format('truetype');
+  font-family: "iconfont"; /* Project id 3094003 */
+  src: url('//at.alicdn.com/t/font_3094003_ftswc2w1xd7.woff2?t=1646129440299') format('woff2'),
+       url('//at.alicdn.com/t/font_3094003_ftswc2w1xd7.woff?t=1646129440299') format('woff'),
+       url('//at.alicdn.com/t/font_3094003_ftswc2w1xd7.ttf?t=1646129440299') format('truetype');
 }
 
 .iconfont {
@@ -14,6 +13,66 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-jurassic_add-users:before {
+  content: "\e6f4";
+}
+
+.icon-mima1:before {
+  content: "\e629";
+}
+
+.icon-dianhua1:before {
+  content: "\e615";
+}
+
+.icon-xiangqu:before {
+  content: "\e673";
+}
+
+.icon-weizhi:before {
+  content: "\e7e6";
+}
+
+.icon-weizhixinxiweihu:before {
+  content: "\e642";
+}
+
+.icon-change_password:before {
+  content: "\e622";
+}
+
+.icon-xitongguanli:before {
+  content: "\e60a";
+}
+
+.icon-qunzu:before {
+  content: "\e62c";
+}
+
+.icon-weifaanjian:before {
+  content: "\e606";
+}
+
+.icon-yangbenxinxidanjibenxinxi:before {
+  content: "\e62f";
+}
+
+.icon-renyuanxinxi-copy:before {
+  content: "\e649";
+}
+
+.icon-anjianguanli:before {
+  content: "\e6a2";
+}
+
+.icon-kehuweizhixinxicaiji:before {
+  content: "\e6d0";
+}
+
+.icon-xitongshouye:before {
+  content: "\e634";
+}
+
 .icon-jiucuo:before {
   content: "\e614";
 }
@@ -112,4 +171,4 @@
 
 .icon-shenfenleibie:before {
   content: "\e64c";
-}
+}


+ 10 - 1
pages/home/index.wxml

@@ -1,5 +1,14 @@
 <mobile-main frameStyle="{{frameStyle}}" bind:tabPath="tabPath">
   <view slot="info" class="main" style="height:{{infoHeight}}px;">
-    消息列表
+    <view class="one"> 
+      <view class="content">
+          <view class="left">
+            <text class=" icon iconfont icon-jurassic_add-users"></text>
+          </view>
+          <view class="right">
+            <input placeholder='新建群组' placeholder-class="placeholder"></input>
+          </view>
+        </view>
+    </view>
   </view>
 </mobile-main>

+ 12 - 0
pages/home/index.wxss

@@ -1,4 +1,16 @@
 .main {
   position: relative;
   width: 100%;
+  background-image: linear-gradient(#ffffff);
+}
+.main .one {
+  position: relative;
+  text-align: left;
+}
+.main .one .content .left {
+  float: left;
+  margin: 0px 80px 0px 0px;
+}
+.main .one .content .right {
+  float: left;
 }

+ 5 - 2
pages/login/index.js

@@ -7,7 +7,8 @@ Page({
    * 页面的初始数据
    */
   data: {
-    frameStyle: { useTop: true, name: '登录', leftArrow: false, useBar: false },
+    src: '/image/s1.png',
+    frameStyle: { useTop: false, name: '登录', leftArrow: false, useBar: false },
     // 主体高度
     infoHeight: '',
   },
@@ -50,11 +51,13 @@ Page({
   searchHeight: function () {
     let frameStyle = this.data.frameStyle;
     let client = app.globalData.client;
+    let infoHeight=client.windowHeight;
     // 减去状态栏
-    let infoHeight = client.windowHeight - (client.statusBarHeight + client.getMenu.height + (client.getMenu.top - client.statusBarHeight) * 2);
+    if (frameStyle.useTop) infoHeight = infoHeight - (client.statusBarHeight + client.getMenu.height + (client.getMenu.top - client.statusBarHeight) * 2)
     // 是否减去底部菜单
     if (frameStyle.useBar) infoHeight = infoHeight - 50;
     if (infoHeight) this.setData({ infoHeight: infoHeight })
+    console.log(infoHeight);
   },
   /**
    * 生命周期函数--监听页面初次渲染完成

+ 4 - 4
pages/login/index.wxml

@@ -1,13 +1,13 @@
 <mobile-main frameStyle="{{frameStyle}}" bind:back="back">
   <view slot="info" class="main" style="height:{{infoHeight}}px;">
     <view class="one">
-      欢迎登录
+      <image style="width: 375px; height: 246px; background-color: #eeeeee;" src="{{src}}"></image>
     </view>
     <view class="two">
       <form bindsubmit="onSubmit">
         <view class="content">
           <view class="left">
-            <text class=" icon iconfont icon-dianhua"></text>
+            <text class=" icon iconfont icon-dianhua1"></text>
           </view>
           <view class="right">
             <input type='number' name="phone" value="{{form.phone}}" maxlength="11" placeholder='请输入账号' placeholder-class="placeholder"></input>
@@ -15,14 +15,14 @@
         </view>
         <view class="content">
           <view class="left">
-            <text class="icon iconfont icon-mima"></text>
+            <text class="icon iconfont icon-mima1"></text>
           </view>
           <view class="right">
             <input type='text' name="password" value="{{form.password}}" password placeholder='请输入密码' placeholder-class="placeholder"></input>
           </view>
         </view>
         <view class="save">
-          <button type="primary" size="mini" form-type="submit">提交登录</button>
+          <button class="button" form-type="submit">提交登录</button>
         </view>
       </form>
     </view>

+ 27 - 18
pages/login/index.wxss

@@ -1,47 +1,51 @@
 .main {
   position: relative;
   width: 100%;
-  background-image: linear-gradient(#409eff9f, #9198e5);
+  background-image: linear-gradient(#ffffff);
 }
 
 .main .one {
   position: relative;
   text-align: center;
-  color: #ffffff;
+  color: 	#ffffff;
   font-size: 30px;
   font-family: cursive;
-  padding: 50px 0;
   font-weight: bold;
 }
 
 .main .two {
   position: relative;
+  text-align: center;
   padding: 0 30px;
 }
 
 .main .two .content {
   position: relative;
-  background-color: #ffffff9f;
-  padding: 10px 0;
+  background-color: #ffffff;
+  padding: 35px 0;
   border-radius: 30px;
-  margin: 0 0 15px 0;
+  /* margin: 0 0 15px 15px; */
 }
 
 .main .two .content .left {
   float: left;
-  margin: 0 10px;
+  margin: 0 80px;
+}
+.main .two .content .right {
+  float: left;
+  margin: 0 -80px;
 }
 
 .main .two .content .left .icon {
-  color: #ffffff;
+  color: #4169E1;
 }
 
 .main .two .content .right input {
-  color: #ffffff;
+  color: #4169E1;
 }
 
 .main .two .content .right .placeholder {
-  color: #ffffff;
+  color: 	#A9A9A9;
 }
 
 .main .two .content .right .picker view {
@@ -49,28 +53,33 @@
 }
 
 .main .two .save {
-  margin: 30px 10px;
+  margin: 40px 10px;
   text-align: center;
 }
-
+.button{
+  background-color:#F08080;
+  border-radius: 25px; 
+  color:#ffffff; 
+  width: 220px; 
+  height: 38px;
+  text-align: center;
+  font-size: small;
+}
 .main .thr {
   text-align: center;
 }
 
 .main .thr .thr_1 {
   position: relative;
+  text-align: center;
+  font-size: small;
   margin: 0 0 20px 0;
 }
 
 .main .thr .thr_1 text {
-  color: #ffffff;
-  font-weight: bold;
-}
+  color: #A9A9A9;
 
-.main .thr .thr_1 text:nth-child(2) {
-  margin: 0 15px;
 }
-
 .main .thr .thr_2 text {
   color: #1AAD19;
   font-size: 40px;

+ 74 - 74
project.config.json

@@ -1,81 +1,81 @@
 {
-  "description": "项目配置文件",
-  "packOptions": {
-    "ignore": [
-      {
-        "type": "file",
-        "value": ".eslintrc.js"
-      }
-    ]
-  },
-  "setting": {
-    "urlCheck": false,
-    "es6": true,
-    "enhance": true,
-    "postcss": true,
-    "preloadBackgroundData": false,
-    "minified": true,
-    "newFeature": false,
-    "coverView": true,
-    "nodeModules": true,
-    "autoAudits": false,
-    "showShadowRootInWxmlPanel": true,
-    "scopeDataCheck": false,
-    "uglifyFileName": false,
-    "checkInvalidKey": true,
-    "checkSiteMap": true,
-    "uploadWithSourceMap": true,
-    "compileHotReLoad": false,
-    "lazyloadPlaceholderEnable": false,
-    "useMultiFrameRuntime": true,
-    "useApiHook": true,
-    "useApiHostProcess": true,
-    "babelSetting": {
-      "ignore": [],
-      "disablePlugins": [],
-      "outputPath": ""
+    "description": "项目配置文件",
+    "packOptions": {
+        "ignore": [
+            {
+                "type": "file",
+                "value": ".eslintrc.js"
+            }
+        ]
     },
-    "useIsolateContext": false,
-    "userConfirmedBundleSwitch": false,
-    "packNpmManually": false,
-    "packNpmRelationList": [],
-    "minifyWXSS": true,
-    "disableUseStrict": false,
-    "minifyWXML": true,
-    "showES6CompileOption": false,
-    "useCompilerPlugins": false
-  },
-  "compileType": "miniprogram",
-  "libVersion": "2.21.2",
-  "appid": "wx0fd4b616bc7cf3bb",
-  "projectname": "tobacco-applet",
-  "debugOptions": {
-    "hidedInDevtools": []
-  },
-  "scripts": {},
-  "staticServerOptions": {
-    "baseURL": "",
-    "servePath": ""
-  },
-  "isGameTourist": false,
-  "condition": {
-    "search": {
-      "list": []
+    "setting": {
+        "urlCheck": false,
+        "es6": true,
+        "enhance": true,
+        "postcss": true,
+        "preloadBackgroundData": false,
+        "minified": true,
+        "newFeature": false,
+        "coverView": true,
+        "nodeModules": true,
+        "autoAudits": false,
+        "showShadowRootInWxmlPanel": true,
+        "scopeDataCheck": false,
+        "uglifyFileName": false,
+        "checkInvalidKey": true,
+        "checkSiteMap": true,
+        "uploadWithSourceMap": true,
+        "compileHotReLoad": false,
+        "lazyloadPlaceholderEnable": false,
+        "useMultiFrameRuntime": true,
+        "useApiHook": true,
+        "useApiHostProcess": true,
+        "babelSetting": {
+            "ignore": [],
+            "disablePlugins": [],
+            "outputPath": ""
+        },
+        "useIsolateContext": false,
+        "userConfirmedBundleSwitch": false,
+        "packNpmManually": false,
+        "packNpmRelationList": [],
+        "minifyWXSS": true,
+        "disableUseStrict": false,
+        "minifyWXML": true,
+        "showES6CompileOption": false,
+        "useCompilerPlugins": false
     },
-    "conversation": {
-      "list": []
+    "compileType": "miniprogram",
+    "libVersion": "2.21.2",
+    "appid": "wx0fd4b616bc7cf3bb",
+    "projectname": "tobacco-applet",
+    "debugOptions": {
+        "hidedInDevtools": []
     },
-    "game": {
-      "list": []
+    "scripts": {},
+    "staticServerOptions": {
+        "baseURL": "",
+        "servePath": ""
     },
-    "plugin": {
-      "list": []
-    },
-    "gamePlugin": {
-      "list": []
-    },
-    "miniprogram": {
-      "list": []
+    "isGameTourist": false,
+    "condition": {
+        "search": {
+            "list": []
+        },
+        "conversation": {
+            "list": []
+        },
+        "game": {
+            "list": []
+        },
+        "plugin": {
+            "list": []
+        },
+        "gamePlugin": {
+            "list": []
+        },
+        "miniprogram": {
+            "list": []
+        }
     }
-  }
 }