6/11

Gkzs/index/result/result.wxml

@@ -3,26 +3,26 @@
 <view class='page'>
   <view class="page__bd">
 
-    <view class = "baseInfo">
-    <view class="weui-flex">
-      <view class="weui-flex__item">
-        <view class="left">您输入的成绩为：{{grade}}分</view>
+    <view class="baseInfo">
+      <view class="weui-flex">
+        <view class="weui-flex__item">
+          <view class="left">您输入的成绩为：{{grade}}分</view>
+        </view>
+        <view class="weui-flex__item">
+          <view class="right">全省排名{{rank}}名</view>
+        </view>
       </view>
-      <view class="weui-flex__item">
-        <view class="right">全省排名{{rank}}名</view>
-      </view>
-    </view>
     </view>
 
-<view class = "baseInfo">
-    <view class="weui-flex" wx:if="{{showFreeInfo}}">
-      <view class="weui-flex__item">
-        <view class="left">为您匹配到的保底大学</view>
+    <view class="baseInfo">
+      <view class="weui-flex" wx:if="{{showFreeInfo}}">
+        <view class="weui-flex__item">
+          <view class="left">为您匹配到的保底大学</view>
+        </view>
+        <view class="weui-flex__item">
+          <view class="right">{{college_count}}所</view>
+        </view>
       </view>
-      <view class="weui-flex__item">
-        <view class="right">{{college_count}}所</view>
-      </view>
-    </view>
     </view>
 
 
@@ -30,10 +30,10 @@
       为您匹配到{{major_count}}条高校（专业)
     </view>
 
-    <view class='baseInfo' wx:if="{{showPaidInfo}}" wx:for="{{paidInfo}}">
+    <view class='majorInfo' wx:if="{{showPaidInfo}}" wx:for="{{paidInfo}}">
       <view class='weui-flex'>
-        <view class='weui-flex__item'>{{item.college}}</view>
-        <view class='weui-flex__item'>{{item.province}}</view>
+        <view class='weui-flex__item'><view class='college'>{{item.college}}</view></view>
+        <view class='weui-flex__item' style='margin-top:10rpx'><image style='width:15px;height:15px;' src='../../images/IP.png' mode='aspectFit'></image>{{item.province}}</view>
       </view>
       <view class='weui-flex'>
         <view class='weui-flex__item'>专业：{{item.major}} {{item.type}}</view>
@@ -42,15 +42,15 @@
         <view class='weui-flex__item'>{{item.year}}年</view>
       </view>
       <view class='weui-flex'>
-        <view class='weui-flex__item'>最低分 {{item.miss_grade}}</view>
-        <view class='weui-flex__item'>最高分 {{item.max_grade}}</view>
-        <view class='weui-flex__item'>平均分 {{item.avg_grade}}</view>
+        <view class='weui-flex__item' style='color:3CB371'>最低分 {{item.miss_grade}}</view>
+        <view class='weui-flex__item' style='color:FF4500'>最高分 {{item.max_grade}}</view>
+        <view class='weui-flex__item' style='color:DAA520'>平均分 {{item.avg_grade}}</view>
       </view>
 
       <view class='weui-flex'>
-        <view class='weui-flex__item'>最低位次 {{item.miss_rank}}</view>
-        <view class='weui-flex__item'>最高位次 {{item.max_rank}}</view>
-        <view class='weui-flex__item'>平均位次 {{item.avg_rank}}</view>
+        <view class='weui-flex__item' style='color:3CB371'>最低位次 {{item.miss_rank}}</view>
+        <view class='weui-flex__item' style='color:FF4500'>最高位次 {{item.max_rank}}</view>
+        <view class='weui-flex__item' style='color:DAA520'>平均位次 {{item.avg_rank}}</view>
       </view>
     </view>
 

Gkzs/index/result/result.wxss

@@ -7,11 +7,26 @@
 }
 
 .baseInfo{
+  border-radius: 15rpx;
   margin: 20rpx;
-  background-color: #999
+  background-color: #3CB371
 }
 .major{
+  border-radius: 15rpx;
   margin: 20rpx;
-  background-color: #999;
+  background-color: #3CB371;
   text-align: center
+}
+.college{
+  font-size: 40rpx;
+  font-weight: bold;
+}
+.IPimage{
+  width: 20rpx;
+  height: auto
+}
+.majorInfo{
+  border-radius: 15rpx;
+  margin: 20rpx;
+  background-color: #FFF8DC
 }

Gkzs/login/login.wxml

@@ -1,8 +1,19 @@
 <!--login/login.wxml-->
 <view class='page'>
   <view class="page__hd">
+  <image src='../images/logo.png' mode='aspectFit'></image>
+    <view class="weui-flex">
+      <view class="weui-flex__item">
+        <view class="left">申请获取以下权限</view>
+      </view>
+    </view>
+    <view class="weui-flex">
+      <view class="weui-flex__item">
+        <view class="left-text">获得你的公开信息（昵称、头像等）</view>
+      </view>
+    </view>
     <view class="weui-btn-area">
-      <button open-type='getUserInfo' class="weui-btn" type="primary" bindtap="userLogin">登陆</button>
+      <button open-type='getUserInfo' class="weui-btn" type="primary" bindtap="userLogin">授权登录</button>
     </view>
   </view>
 </view>

Gkzs/login/login.wxss

@@ -1 +1,12 @@
-/* login/login.wxss */
+/* login/login.wxss */
+.left{
+  text-align: left;
+  float: 40rpx;
+  margin-top: 40rpx;
+}
+.left-text{
+  text-align: left;
+  float: 40rpx;
+  margin-top: 40rpx;
+  color:#C0C0C0
+}