zs hace 3 años
padre
commit
1ebe6bd0d4
Se han modificado 6 ficheros con 32 adiciones y 62 borrados
  1. 3 3
      app.json
  2. 9 3
      icon/icon.wxss
  3. 1 1
      pages/competition/index.wxss
  4. 1 4
      pages/team/apply.js
  5. 10 8
      pages/team/apply.wxml
  6. 8 43
      pages/team/apply.wxss

+ 3 - 3
app.json

@@ -1,6 +1,6 @@
 {
   "pages": [
-    "pages/team/examine",
+    "pages/team/apply",
     "pages/me/index",
     "pages/login/index",
     "pages/home/index",
@@ -10,8 +10,8 @@
     "pages/competition/index",
     "pages/team/index",
     "pages/team/detail",
-   
-    "pages/team/apply",
+    "pages/team/examine",
+    
     "pages/ranking/index",
     "pages/index/index",
     "pages/register/index",

+ 9 - 3
icon/icon.wxss

@@ -1,9 +1,9 @@
 @font-face {
   font-family: "iconfont";
   /* Project id 3244772 */
-  src: url('//at.alicdn.com/t/font_3244772_44enwkgp5il.woff2?t=1647574012924') format('woff2'),
-    url('//at.alicdn.com/t/font_3244772_44enwkgp5il.woff?t=1647574012924') format('woff'),
-    url('//at.alicdn.com/t/font_3244772_44enwkgp5il.ttf?t=1647574012924') format('truetype');
+  src: url('//at.alicdn.com/t/font_3244772_uub65pm4ndp.woff2?t=1647601849963') format('woff2'),
+    url('//at.alicdn.com/t/font_3244772_uub65pm4ndp.woff?t=1647601849963') format('woff'),
+    url('//at.alicdn.com/t/font_3244772_uub65pm4ndp.ttf?t=1647601849963') format('truetype');
 }
 
 .iconfont {
@@ -14,6 +14,12 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-jian-:before {
+  content: "\e72c";
+  font-size: 25px;
+  color: #cfcfcf;
+}
+
 .icon-jia:before {
   content: "\e6a1";
   font-size: 25px;

+ 1 - 1
pages/competition/index.wxss

@@ -77,7 +77,7 @@
 }
 .button{
   width: 300px !important;
-  background-color: rgb(102, 177, 247);
+  background-color: rgb(247, 189, 102);
   background-image: linear-gradient(to right, rgb(247, 124, 53) , rgb(255, 153, 0));
   border-radius: 30px; 
   color:#ffffff; 

+ 1 - 4
pages/team/apply.js

@@ -42,10 +42,7 @@ Page({
 
       {
         id: '1',name:'老头8',head:'/image/tou.png'
-      },
-      {
-        id: '1',name:'老头9',head:'/image/tou.png'
-      },
+      }
     ],
   },
   back: function () {

+ 10 - 8
pages/team/apply.wxml

@@ -48,6 +48,13 @@
           <view class="thr-right"><text class="name">{{item.name}}</text> </view>
         </view>
       </view>
+      <view class="thr-2">
+        <view class="thr2">
+          <view class="thr3">
+            <text class=" icon iconfont icon-jian-"></text>
+          </view>
+        </view>
+      </view>
       <view class="thr-2">
         <view class="thr2">
           <view class="thr3">
@@ -57,14 +64,9 @@
       </view>
     </view>
     <view class="four">
-      <view class="four-1">
-        <view class="four1">
-          <button class="button" form-type="submit">驳回</button>
-        </view>
-        <view class="four2">
-          <button class="buttons" form-type="submit">通过</button>
-        </view>
-      </view>
+      <button class="button" form-type="submit">待通过</button>
+      <button class="button" form-type="submit">申请加入</button>
+      <button class="button" form-type="submit">退出团队</button>
     </view>
   </view>
 </mobile-main>

+ 8 - 43
pages/team/apply.wxss

@@ -131,53 +131,18 @@
 }
 .four{
   background-color: white;
-}
-.four-1{
-  background-color: white;
-  width: 100%;
-  height: 280px;
-  margin-top: 10%;
-}
-.four1{
-  background-color: white;
-  margin-top: 15%;
-  margin-bottom: 15%;
-  margin-left: 10%;
-  float: left;
-  width: 37%;
-}
-.four2{
-  background-color: white;
-  margin-top: 15%;
-  margin-bottom: 15%;
-  float: left;
-  width: 30%;
+  padding-top: 180px;
+  padding-bottom: 20px;
 }
 .button{
-  margin-top: 0 !important;
-  width: 140px !important;
-  height: 35px;
-  background-color: rgba(209, 205, 205, 0.5);
-  /* background-image: linear-gradient(to right, rgb(236, 75, 83) , rgb(247, 41, 230)); */
-  border-top-left-radius: 1.5em;
-  border-top-right-radius: 0em;
-  border-bottom-right-radius: 0em;
-  border-bottom-left-radius: 1.5em;
-  color:#777777; 
-  font-size: 14px;
-}
-.buttons{
-  margin-top: 0 !important;
-  width: 140px !important;
+  margin-top: 5px !important;
+  width: 300px !important;
   height: 35px;
-  background-color: rgba(32, 88, 243, 0.5);
-  background-image: linear-gradient(to right, rgb(75, 113, 236) , rgb(203, 97, 245));
-  border-top-left-radius: 0em;
-  border-top-right-radius: 1.5em;
-  border-bottom-right-radius: 1.5em;
-  border-bottom-left-radius: 0em;
+  background-color: rgba(243, 32, 162,0.5);
+  background-image: linear-gradient(to right, rgb(247, 59, 69) , rgb(223, 41, 247));
+  border-radius: 30px; 
   color:#ffffff; 
-  font-size: 14px;
+  font-size: 13px;
 }
 .group{
   width: 100%;