znz-04-30

b7d6623f · tangjinlin · cc227045 · b7d6623f · b7d6623f · b7d6623f
Commit b7d6623f authored Apr 30, 2020 by tangjinlin
22 changed files
--- a/src/wx/app.json
+++ b/src/wx/app.json
@@ -83,7 +83,7 @@
    }
  },
  "tabBar": {
-    "selectedColor": "#FF82AB",
+    "selectedColor": "#c33d48",
    "borderStyle": "white",
    "list": [
      {

--- a/src/wx/app.wxss
+++ b/src/wx/app.wxss
@@ -8,17 +8,46 @@
  padding: 200rpx 0;
  box-sizing: border-box;
 }
-page, view, scroll-view, swiper, movable-area, cover-view, text, icon, rich-text,
-progress, button, checkbox-group, checkbox, form, input, label, picker,
-picker-view, radio-group, slider, switch, textarea, navigator, audio, image,
-video, live-player, live-pusher, open-data, web-view {
-    font-family: "仿宋";
-    font-size:14px;
-}
-.van-tabbar-item{
+
+page,
+view,
+scroll-view,
+swiper,
+movable-area,
+cover-view,
+text,
+icon,
+rich-text,
+progress,
+button,
+checkbox-group,
+checkbox,
+form,
+input,
+label,
+picker,
+picker-view,
+radio-group,
+slider,
+switch,
+textarea,
+navigator,
+audio,
+image,
+video,
+live-player,
+live-pusher,
+open-data,
+web-view {
+  font-family: "仿宋";
+  font-size: 14px;
+}
+
+.van-tabbar-item {
  position: relative;
 }
-.circle{
+
+.circle {
  position: absolute;
  top: 0;
  bottom: 15px;
@@ -34,10 +63,12 @@ video, live-player, live-pusher, open-data, web-view {
  background: #FFFFE5;
  z-index: 5;
 }
-.listVolunteers{
+
+.listVolunteers {
  width: 100%;
 }
-.listVolunteers>view{
+
+.listVolunteers>view {
  width: 94%;
  height: 110px;
  margin: 0 auto;
@@ -46,14 +77,16 @@ video, live-player, live-pusher, open-data, web-view {
  align-items: center;
  flex-wrap: wrap;
 }
-.listVolunteers>view>text{
+
+.listVolunteers>view>text {
  display: block;
  width: 90%;
  height: 1px;
  background: #f6f6f6;
  margin: 0 auto;
 }
-.activelist{
+
+.activelist {
  width: 95%;
  height: 125px;
  margin: 0 auto;
@@ -62,21 +95,24 @@ video, live-player, live-pusher, open-data, web-view {
  align-items: center;
  flex-wrap: wrap;
 }
-.activelist>text{
+
+.activelist>text {
  display: block;
  width: 80%;
  height: 1px;
  background: #f0f0f0;
  margin: 0 auto;
 }
-.activeLine{
+
+.activeLine {
  display: block;
  width: 80%;
  height: 1px;
  background: #ccc;
  margin: 0 auto;
 }
-.left_listVolunteers{
+
+.left_listVolunteers {
  width: 30%;
  height: 80px;
  border-radius: 5px;
@@ -84,11 +120,13 @@ video, live-player, live-pusher, open-data, web-view {
  margin-left: 15px;
  position: relative;
 }
-.left_listVolunteers>image{
+
+.left_listVolunteers>image {
  width: 100%;
  height: 100%;
 }
-.left_listVolunteers>text{
+
+.left_listVolunteers>text {
  position: absolute;
  left: 0;
  bottom: 0;
@@ -97,11 +135,12 @@ video, live-player, live-pusher, open-data, web-view {
  text-align: center;
  line-height: 20px;
  border-radius: 0 0 5px 5px;
-  background: rgba(0,0,0,0.5);
+  background: rgba(0, 0, 0, 0.5);
  font-size: 12px;
  color: #fff;
 }
-.left_listVolunteers>view{
+
+.left_listVolunteers>view {
  position: absolute;
  top: 3px;
  right: 0;
@@ -111,28 +150,30 @@ video, live-player, live-pusher, open-data, web-view {
  line-height: 20px;
  font-size: 14px;
 }
-.right_listVolunteers{
+
+.right_listVolunteers {
  width: 62%;
  font-size: 12px;
  color: #969696;
 }

-.right_listVolunteers>view{
+.right_listVolunteers>view {
  margin-top: 5px
 }

-.right_listVolunteers .itemTitle{
-  color:#363636;
+.right_listVolunteers .itemTitle {
+  color: #363636;
  font-size: 15px;
 }

-.formtable>view{
+.formtable>view {
  display: flex;
  align-items: center;
  margin-bottom: 30px;
  flex-wrap: wrap;
 }
-.formtable>view>text{
+
+.formtable>view>text {
  width: 100px;
  text-align: right;
  box-sizing: border-box;
@@ -141,13 +182,16 @@ video, live-player, live-pusher, open-data, web-view {
  font-weight: bold;
  color: #1e1e1e;
 }
-.formtable>view>van-cell-group{
+
+.formtable>view>van-cell-group {
  flex: 1
 }
-.formtable .van-cell{
+
+.formtable .van-cell {
  padding: 0;
 }
-.formtable input{
+
+.formtable input {
  box-sizing: border-box;
  padding-left: 8px;
  height: 30px;
@@ -157,21 +201,23 @@ video, live-player, live-pusher, open-data, web-view {
  text-align: center;
  color: #4f4f4f;
 }
-.button button{
+
+.button button {
  padding: 20px 90px;
  border-radius: 5px;
  background: #0D76ED;
  color: #fff;
 }

-.tr{
+.tr {
  display: flex;
  justify-content: center;
  align-items: center;
  width: 95%;
  margin: 10px auto;
 }
-.th{
+
+.th {
  flex: 1;
  height: 32px;
  line-height: 32px;
@@ -179,14 +225,16 @@ video, live-player, live-pusher, open-data, web-view {
  /* border: 1px solid #ccc; */
  font-size: 14px;
 }
-.td{
+
+.td {
  flex: 1;
  height: 28px;
  line-height: 28px;
  text-align: center;
  font-size: 12px;
 }
-.idNum{
+
+.idNum {
  display: block;
  width: 30px;
  height: 30px;
@@ -195,6 +243,7 @@ video, live-player, live-pusher, open-data, web-view {
  border-radius: 50%;
  margin: 0 auto;
 }
+
 .van-swipe-cell__right {
  display: inline-block;
  width: 50px;
@@ -205,7 +254,8 @@ video, live-player, live-pusher, open-data, web-view {
  text-align: center;
  background-color: #f44;
 }
-.listPractice>view{
+
+.listPractice>view {
  width: 94%;
  height: 110px;
  margin: 0 auto;
@@ -214,14 +264,16 @@ video, live-player, live-pusher, open-data, web-view {
  align-items: center;
  flex-wrap: wrap;
 }
-.listPractice>view>text{
+
+.listPractice>view>text {
  display: block;
  width: 90%;
  height: 1px;
  background: #f6f6f6;
  margin: 0 auto;
 }
-.left_listPractice{
+
+.left_listPractice {
  width: 30%;
  height: 80px;
  border-radius: 5px;
@@ -229,23 +281,28 @@ video, live-player, live-pusher, open-data, web-view {
  margin-left: 15px;
  position: relative;
 }
-.left_listPractice>image{
+
+.left_listPractice>image {
  width: 100%;
  height: 100%;
 }
-.right_listPractice{
+
+.right_listPractice {
  width: 60%;
  height: 80px;
  font-size: 12px;
  color: #000;
 }
-.right_listPractice>view{
+
+.right_listPractice>view {
  line-height: 20px;
 }
-.right_listPractice>text{
+
+.right_listPractice>text {
  color: #000;
 }
-.listPublicWelfare>view{
+
+.listPublicWelfare>view {
  width: 90%;
  height: 110px;
  margin: 0 auto;
@@ -254,25 +311,29 @@ video, live-player, live-pusher, open-data, web-view {
  align-items: center;
  flex-wrap: wrap;
 }
-.listPublicWelfare>view>text{
+
+.listPublicWelfare>view>text {
  display: block;
  width: 90%;
  height: 1px;
  background: #f6f6f6;
  margin: 0 auto;
 }
-.left_listPublicWelfare{
+
+.left_listPublicWelfare {
  width: 120px;
  height: 67px;
  border-radius: 5px;
  overflow: hidden;
  position: relative;
 }
-.left_listPublicWelfare>image{
+
+.left_listPublicWelfare>image {
  width: 100%;
  height: 100%;
 }
-.right_listPublicWelfare{
+
+.right_listPublicWelfare {
  flex: 1;
  height: 67px;
  font-size: 12px;
@@ -280,35 +341,42 @@ video, live-player, live-pusher, open-data, web-view {
  box-sizing: border-box;
  padding-left: 30px;
 }
-.right_listPublicWelfare>text{
+
+.right_listPublicWelfare>text {
  display: block;
  height: 18px;
  font-size: 14px;
-  overflow:hidden;
-  text-overflow:ellipsis;
+  overflow: hidden;
+  text-overflow: ellipsis;
 }
-.right_listPublicWelfare .activeTitle{
+
+.right_listPublicWelfare .activeTitle {
  font-size: 15px;
  font-weight: bold;
  color: #363636;
 }
-.right_listPublicWelfare>view{
+
+.right_listPublicWelfare>view {
  height: 30px;
  display: flex;
  align-items: center;
 }
-.right_listPublicWelfare>view>image{
+
+.right_listPublicWelfare>view>image {
  width: 15px;
  height: 15px;
  /* margin-left: 10px; */
 }
-.right_listPublicWelfare>view{
+
+.right_listPublicWelfare>view {
  color: #666;
 }
-.right_listPublicWelfare>view .van-button__text{
+
+.right_listPublicWelfare>view .van-button__text {
  color: #666;
 }
-.conSwiper{
+
+.conSwiper {
  width: 90%;
  height: 40px;
  margin: 20px auto;
@@ -320,12 +388,14 @@ video, live-player, live-pusher, open-data, web-view {
  box-sizing: border-box;
  padding: 0 10px;
 }
-.conSwiper>image{
+
+.conSwiper>image {
  width: 20px;
  height: 20px;
  margin-right: 5px;
 }
-.conSwiper>view{
+
+.conSwiper>view {
  flex: 1;
  height: 25px;
  color: #F2A508;
@@ -333,24 +403,27 @@ video, live-player, live-pusher, open-data, web-view {
  line-height: 25px;
  text-align: right;
  border-radius: 5px;
-
 }
-.lookmore{
-  color: #599eff!important;
+
+.lookmore {
+  color: #599eff !important;
 }
-.listNull{
+
+.listNull {
  width: 100%;
-  display: block!important;
+  display: block !important;
  box-sizing: border-box;
  padding-bottom: 20px;
 }
-.listNull>image{
+
+.listNull>image {
  display: block;
  width: 80px;
  height: 80px;
  margin: 0 auto;
 }
-.listNull>view{
+
+.listNull>view {
  width: 150px;
  margin: 0 auto;
  font-size: 12px;

--- a/src/wx/components/top-navi/index.js
+++ b/src/wx/components/top-navi/index.js
@@ -19,6 +19,18 @@ Component({
      type: String,
      value: "#fff"
    },
+    bg1: {
+      type: String,
+      value: "#e55b66"
+    },
+    bg2: {
+      type: String,
+      value: "#ff6aa5"
+    },
+    bg3: {
+      type: String,
+      value: "#ffa481"
+    },
    color: {
      type: String,
      value: "#000"

--- a/src/wx/components/top-navi/index.wxml
+++ b/src/wx/components/top-navi/index.wxml
-<view class="navbar" style="height:{{navHeight}};background:{{background}}">
+<view class="navbar" style="height:{{navHeight}};background:linear-gradient(to right, {{bg1}}, {{bg2}}, {{bg3}})">
  <view class='title-container' style="top:{{navTop}}">
    <view class='capsule' wx:if="{{back||home}}">
      <view bindtap='back' wx:if="{{back}}">

--- a/src/wx/img/circle.png
+++ b/src/wx/img/circle.png
--- a/src/wx/img/circleactive.png
+++ b/src/wx/img/circleactive.png
--- a/src/wx/img/conHeader.jpg
+++ b/src/wx/img/conHeader.jpg
--- a/src/wx/img/conHeader.png
+++ b/src/wx/img/conHeader.png
--- a/src/wx/img/gykt.png
+++ b/src/wx/img/gykt.png
--- a/src/wx/img/hot.png
+++ b/src/wx/img/hot.png
--- a/src/wx/img/index.png
+++ b/src/wx/img/index.png
--- a/src/wx/img/indexactive.png
+++ b/src/wx/img/indexactive.png
--- a/src/wx/img/logo.png
+++ b/src/wx/img/logo.png
--- a/src/wx/img/mine.png
+++ b/src/wx/img/mine.png
--- a/src/wx/img/mineactive.png
+++ b/src/wx/img/mineactive.png
--- a/src/wx/img/right.png
+++ b/src/wx/img/right.png
--- a/src/wx/img/shoucang.png
+++ b/src/wx/img/shoucang.png
--- a/src/wx/img/zxdy.png
+++ b/src/wx/img/zxdy.png
--- a/src/wx/img/zyhd.png
+++ b/src/wx/img/zyhd.png
--- a/src/wx/img/zyyw.png
+++ b/src/wx/img/zyyw.png
--- a/src/wx/pages/index/index.wxml
+++ b/src/wx/pages/index/index.wxml
--- a/src/wx/pages/index/index.wxss
+++ b/src/wx/pages/index/index.wxss
 /* pages/index/index.wxss */
-.indexHeader{
-  position: relative;
+.indexHeader {
  width: 100%;
-  height: 150px;
-  border-radius: 0 0 10px 10px;
-  background: #FF82AB;
-  margin-bottom: 70px
-}
-.con_indexHeader{
-  position: absolute;
-  bottom: -60px;
-  left: 0;
-  right: 0;
-  margin: auto;
-  width: 95%;
-  height: 150px;
-  border-radius: 7px;
-  background: #fff;
+  height: 50px;
+  background: linear-gradient(to right, #e55b66, #ff6aa5, #ffa481);
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding-bottom: 20px;
 }
-.con_indexHeader>view{
-  position: absolute;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  margin: auto;
-  width: 95%;
-  height: 134px;
-  border-radius: 4px;
-  background: #fff;
-  overflow: hidden;
-}
-.con_indexHeader>view>image{
-  width: 100%;
-  height: 134px;
+
+.indexHeader .title {
+  color: white;
+  font-size: 17px;
+  padding-left: 20px;
 }
-.title{
-  position: absolute;
-  top: 0;
-  left: 7%;
-  font-size: 13px;
+
+.header_user {
  display: flex;
  align-items: center;
  height: 50px;
+  font-size: 13px;
+  padding-right: 20px;
  color: #fff;
 }
-.title>image{
+
+.header_user image {
  width: 40px;
  height: 40px;
  border-radius: 50%;
-  margin-right: 10px;
 }
-.girdList{
+
+.con_indexHeader image {
+  margin-top: -20px;
+  width: 100%;
+  border-radius: 15px 15px 0 0;
+}
+
+.entrance {
  width: 90%;
-  margin: 0 auto;
+  height: 50px;
  display: flex;
-  justify-content: space-between;
  align-items: center;
-  flex-wrap: wrap;
-  font-size: 12px;
+  justify-content: center;
+  border-radius: 10px;
+  box-shadow: 0 5px 15px rgba(0, 0, 0, 0.3);
+  margin-top: -30px;
+  margin-left: 5%;
 }
-.girdList>view{
-  width: 25%;
-  height: 73px;
+
+.entrance .bgColor {
+  width: 100%;
+  height: 50px;
+  background-color: white;
+  font-size: 13px;
+  font-weight: bolder;
  display: flex;
+  align-items: center;
  justify-content: center;
+  border-radius: 10px;
+}
+
+.entrance .bgColor .logo_img {
+  width: 40px;
+  height: 48px;
+}
+
+.entrance .bgColor view {
+  display: flex;
+  align-items: center;
+}
+
+.entrance .bgColor text {
+  padding: 0 10px;
+}
+
+.entrance .bgColor view .right_img {
+  width: 8px;
+  height: 15px;
+}
+
+.girdList {
+  display: flex;
+  flex-direction: row;
  align-items: center;
-  flex-wrap: wrap;
+  justify-content: space-between;
+  margin: 20px;
 }
-.girdList>view>image{
+
+.girdList view {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+
+.girdList view image {
  width: 42px;
  height: 42px;
+  padding: 10px 0;
 }
-.girdList>view>view{
+
+.girdList>view>view {
  width: 100%;
  text-align: center;
 }

-.messageCount {
-  position: relative;
-  width:20px;
-  height:20px;
-  line-height: 20px;
-  background: red;
-  color:#fff;
-  font-size: 12px;
+.topTitle {
+  position: static;
+  width: 100%;
+  height: 30px;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+}
+
+.topTitle .title {
+  margin-left: 10px;
+  font-size: 15px;
+  color: #000;
+  font-weight: bold;
+}
+
+.topTitle .leftLine {
+  height: 20px;
+  border-left: 5px solid #efc04c;
+  margin-left: 30px;
+}
+
+.topTitle .lookmore {
+  position: absolute;
+  right: 30px;
+  display: flex;
+  flex-direction: row;
+}
+
+.topTitle .lookmore text {
+  margin-right: 5px;
+}
+
+.topTitle .lookmore image {
+  width: 8px;
+  height: 15px;
+}
+
+.listActivity {
+  width: 100%;
+}
+
+.listActivity .activity {
+  margin: 20px;
  border-radius: 10px;
-  text-align: center;
-  right:-50px;
-  top:-15px;
+  box-shadow: 0 5px 15px rgba(0, 0, 0, 0.3);
 }

-.topTitle{
+.activity .enroll_time {
  width: 100%;
-  height: 30px;
  display: flex;
-  justify-content: space-between;
  align-items: center;
+  justify-content: center;
+  height: 30px;
+}
+
+.activityContent {
  position: relative;
 }
-.topTitle>view{
+
+.listActivity .activityContent .top_title {
+  position: absolute;
+  top: 0;
+  right: 0;
+  border-radius: 0 10px 10px 10px;
+  background: #c1527e;
+  font-size: 14px;
+  padding: 5px 10px;
+  color: #fff;
+}
+
+.listActivity .activityContent .bottom_title {
  display: flex;
  align-items: center;
-  font-size: 14px;
-  width: 100%;
  justify-content: center;
-}
-.topTitle>view>text{
-  margin: 0 10px;
-  font-size: 15px;
-  color: #000;
+  width: 100%;
+  position: absolute;
+  bottom: 3px;
+  left: 0;
+  background: rgba(0, 0, 0, 0.5);
+  font-size: 16px;
+  color: #fff;
+  padding: 5px 0;
  font-weight: bold;
 }
-.leftLine{
-  width: 18%;
-  height: 2px;
-  background: linear-gradient(to left, #599eff, #fff);
+
+.listActivity .activityContent image {
+  width: 100%;
+  border-radius: 10px 10px 0 0;
 }
-.rightLine{
-  width: 18%;
-  height: 2px;
-  background: linear-gradient(to right, #599eff, #fff);
+
+.class_info {
+  height: 30px;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+  margin: 0 10px;
 }
-.topTitle>text{
-  position: absolute; 
-  top: 0;
-  bottom: 0;
-  right: 5%;
-  margin: auto;
-  font-size: 12px;
-  color: #666;
+
+.class_info view {
  display: flex;
+  flex-direction: row;
  align-items: center;
+  justify-content: center;
 }

-.practice>view{
-  width: 100%;
+.class_info image {
+  width: 20px;
+  height: 20px;
 }

+.class_info .watch {
+  font-size: 12px;
+  color: #999999;
+}
\ No newline at end of file