Browse Source

fix userLogin style

Notobey 5 years ago
parent
commit
724f74bec5

+ 0 - 7
app.js

@@ -22,13 +22,6 @@ App({
         }
       }
     })
-    //获取设备信息
-    wx.getSystemInfo({
-      success (res) {
-        console.log(res.windowHeight);
-        this.globalData.height = res.windowHeight;
-      }
-    })
   },
   globalData: {
     userInfo: null

+ 5 - 4
pages/collection/collection.wxml

@@ -30,7 +30,8 @@
         <swiper-item class="swiper-box-item" >
             <block>
                 <view class="NoContent">
-                    <image src="/image/noContent.png"></image>
+                    <text class="icon-empty text-gray" style="font-size:400rpx"></text>
+                    <!-- <image src="/image/noContent.png"></image> -->
                     <view class="but-box">
                         <text style="font-size:30rpx" class="text-gray">没有内容</text>
                         <button class="but">看看推荐</button>
@@ -41,7 +42,7 @@
         <swiper-item>
             <block>
                 <view class="NoContent">
-                    <image src="/image/noContent.png"></image>
+                    <text class="icon-empty text-gray" style="font-size:400rpx"></text>
                     <view class="but-box">
                         <text style="font-size:30rpx" class="text-gray">没有内容</text>
                         <button class="but">看看推荐</button>
@@ -52,7 +53,7 @@
         <swiper-item>
             <block>
                 <view class="NoContent">
-                    <image src="/image/noContent.png"></image>
+                    <text class="icon-empty text-gray" style="font-size:400rpx"></text>
                     <view class="but-box">
                         <text style="font-size:30rpx" class="text-gray">没有内容</text>
                         <button class="but">看看推荐</button>
@@ -63,7 +64,7 @@
         <swiper-item>
             <block>
                 <view class="NoContent">
-                    <image src="/image/noContent.png"></image>
+                    <text class="icon-empty text-gray" style="font-size:400rpx"></text>
                     <view class="but-box">
                         <text style="font-size:30rpx" class="text-gray">没有内容</text>
                         <button class="but">更多礼包</button>

+ 2 - 0
pages/collection/collection.wxss

@@ -65,6 +65,8 @@ swiper{
   margin-top: 100rpx;
   display: flex;
   flex-direction: column;
+  justify-content: center;
+  text-align: center;
 }
 .NoContent image{
   width: 400rpx;

+ 12 - 3
pages/user/phoneLogin/phoneLogin.js

@@ -1,19 +1,28 @@
 const app = getApp();
-let height = app.globalData.phoneheight
+
 Page({
 
   /**
    * 页面的初始数据
    */
   data: {
-    height:height
+    height:400
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-    
+    //获取设备信息
+    var that = this;
+    wx.getSystemInfo({
+      success(res) {
+        console.log(res.windowHeight);
+        that.setData({
+          height: res.screenHeight
+        })
+      }
+    })
   },
   login: function () {
     wx.showToast({

+ 2 - 1
pages/user/phoneLogin/phoneLogin.wxss

@@ -10,6 +10,8 @@
     width: 80%;
     margin: 0rpx auto;
     margin-top: 100rpx;
+    display: flex;
+    flex-wrap: wrap
 }
 .slogn{
     width: 100%;
@@ -43,7 +45,6 @@
     text-align: center;
     padding-right: 20rpx;
     border-right: 1rpx solid #cccccc;
-    /* box-sizing: border-box; */
     margin-right: 20rpx;
     color: #cccccc;
 }

+ 1 - 1
project.config.json

@@ -21,7 +21,7 @@
 		}
 	},
 	"compileType": "miniprogram",
-	"libVersion": "2.10.0",
+	"libVersion": "2.10.3",
 	"appid": "wx101d03d3f1aab84c",
 	"projectname": "%E4%BB%BF%E5%96%9C%E9%A9%AC%E6%8B%89%E9%9B%85lite",
 	"debugOptions": {