update

pages/index/index.wxml

@@ -1,9 +1,16 @@
 <!--index.wxml-->
 <view class="top">
   <view class="logo">
-    <image src="../../images/logo.png" mode="widthFix"></image>
+    <image src="../../images/logo.png" ></image>
     <view>巴中逸沣安全培训</view>
-    <text>bazhongyifenganquanpeixun</text>
+    <text>BA ZHONG YIFENG SAFETY TRAINING</text>
+  </view>
+  <view wx:if="{{data.length>0}}" class="marquee_container" style="--marqueeWidth--:-12em">
+    <view class="zd"></view>
+    <image src="../../images/tt.png" mode="widthFix"></image>
+      <view class="marquee_text">
+        <text wx:for="{{news}}">{{item}}</text>
+      </view>
   </view>
   <block wx:for="{{data}}" wx:key='*this'>
   <navigator class="part" wx:if="{{item.type == 'nav'}}" open-type="{{item.name == '在线报名'?'switchTab':'navigate'}}"  url="..{{item.path}}">
@@ -46,15 +53,6 @@
       <!-- <image src="../../images/tt.png" mode="widthFix"></image>
       <text wx:for="{{news}}">{{item}}</text> -->
   <!-- </view> -->
-
-<view wx:if="{{data.length>0}}" class="marquee_container" style="--marqueeWidth--:-12em">
-  <view class="zd"></view>
-  <image src="../../images/tt.png" mode="widthFix"></image>
-    <view class="marquee_text">
-      <text wx:for="{{news}}">{{item}}</text>
-    </view>
-</view>
-
 </view>
 
 <view class="bottom">

pages/index/index.wxss

@@ -13,11 +13,14 @@ page{
   background:linear-gradient(90deg,rgba(75,153,255,1) 0%,rgba(91,61,255,1) 100%);
   border-radius:6px;
   position: relative;
-  padding: 48rpx 170rpx;
+  padding: 58rpx 58rpx 0rpx 170rpx;
   width: 100%;
+  height: 220rpx;
 }
 .logo view{
-  font-size: 40rpx;
+  font-family: cursive;
+  font-weight: bold;
+  font-size: 46rpx;
   color: #fff;
 }
 .logo text{
@@ -44,7 +47,7 @@ page{
   padding: 15px;
 }
 .part image{
-  width: 80rpx;
+  width: 100rpx;
   max-height: 100%;
   position: absolute;
   right: 15px;
@@ -54,7 +57,9 @@ page{
 }
 .part view{
   color: #333333;
-  font-size: 32rpx;
+  font-size: 34rpx;
+  font-family: 'Microsoft YaHei';
+  font-weight: 500;
 }
 .part text{
   color: #999999;

pages/online/online.wxml

@@ -2,30 +2,6 @@
     <text data-id='0' bindtap="tabChange" class="{{tab==0?'act':''}}">视频课程</text>
     <text data-id='1' bindtap="tabChange" class="{{tab==1?'act':''}}">在线学习</text>
 </view>
-
-<!-- <view class="section">
-  <picker bindchange="bindPickerChange" value="{{index1}}" range="{{array1}}">
-    <view class="picker">
-      {{array1[index1]}}
-      <image src="../../images/arrow-bottom.png" mode="widthFix"></image>
-    </view>
-  </picker>
-
-  <picker bindchange="bindPickerChange" value="{{index1}}" range="{{array1}}">
-    <view class="picker">
-      {{array1[index1]}}
-      <image src="../../images/arrow-bottom.png" mode="widthFix"></image>
-    </view>
-  </picker>
-
-  <picker bindchange="bindPickerChange" value="{{index1}}" range="{{array1}}">
-    <view class="picker">
-      {{array1[index1]}}
-      <image src="../../images/arrow-bottom.png" mode="widthFix"></image>
-    </view>
-  </picker>
-</view> -->
-
 <view wx:if='{{tab==0}}' class="content">
   <navigator wx:for="{{videos}}" wx:key="*this" url="../video/video?title={{item.title}}&&url={{item.url}}&&time={{item.finished_time}}" class="list">
       <view class="img">
@@ -53,6 +29,5 @@
         <navigator wx:else url="../subject/subject?id={{item.id}}">开始练习</navigator>
     </view>
 </view>
+<view style="position:fixed;bottom:20rpx;" wx:if="{{show}}" class="complete">已完成学习，立即生成学时证明</view>
 
-
-<view wx:if="{{show}}" class="complete">已完成学习，立即生成学时证明</view>

pages/onlinePost/onlinePost.js

@@ -18,6 +18,7 @@ Page({
       url: host + '/api/wx/sujectitem',
       success: res => {
         // let list = res.data.data.filter(item => item.name == options.name)
+        console.log(res.data.data,"列表")
         this.setData({
           list: res.data.data
         })
@@ -30,7 +31,8 @@ Page({
     })
   },
   gotoForm:function(e){
-    let id = e.target.dataset.id, name = e.target.dataset.name
+    console.log(e)
+    let id = e.currentTarget.dataset.id, name = e.currentTarget.dataset.name
     wx.navigateTo({
       url: '../post/post?type=1&&s_id='+id,
     })

pages/onlinePost/onlinePost.wxss

@@ -14,12 +14,15 @@ page{
   min-height: 80vh;
   background: #fff;
   padding: 12px;
+  height: 80vh;
+  overflow:scroll;
 }
+
 .step1 view{
-  font-size: 32rpx;
+  font-size: 30rpx;
   font-weight: 600;
   text-align: center;
-  margin-bottom: 12px;
+  margin-bottom: 12rpx;
 }
 .step .btn{
   width:100%;
@@ -31,17 +34,24 @@ page{
   text-align: center;
   color: #fff;  
   margin-top: 20px;
+  font-size:34rpx;
 }
 
-.step2 view{
-  height: 110px;
-  line-height: 110px;
+.step2 .item{
+  height: 80px;
+  /* line-height: 80px; */
   padding: 0 20px;
   background:rgba(255,255,255,1);
-  border-radius:7px;
+  border-radius:7rpx;
   margin-bottom: 20px;
   position: relative;
-  font-weight: 600;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+}
+.step2 .item .item-title{
+  font-size:32rpx;
+  font-weight:bold;
 }
 .step2 image{
   width: 100px;

pages/plan/plan.wxml

@@ -1,11 +1,12 @@
 <view class="section" bindtap="show">
-  请选择培训项目
+  请选择培训科目
 </view>
 
 <view class="model" wx:if="{{show}}">
     <view class="model_view">
+        <view class="model-title">请选择正确的培训科目：</view>
         <view class="item">
-              <label>培训项目</label>
+              <label>培训科目</label>
               <picker data-id='1' bindchange="bindPickerChange" value="{{index1}}" range="{{array1}}" range-key="name">
                 <view class="picker">
                 <text wx:if="{{index1<0}}">请选择</text>
@@ -42,13 +43,11 @@
 </view>
 <view class="content">
   <view class="list" wx:for="{{list}}" wx:key="*this">
-      <view class="title">{{item.type}}培训班</view>
+      <!-- <view class="title">{{item.type}}培训班</view> -->
       <view class="kc" wx:for="{{item.classes}}" wx:for-item="class" wx:key="*this">
-          <text>{{class.class_time}}<text class="price">¥{{class.price}}</text></text>
-          <text decode="{{true}}">开班时间&nbsp;&nbsp;&nbsp;{{class.class_time}}  </text>
-          <text decode="{{true}}">开班人数&nbsp;&nbsp;&nbsp;{{class.thresh_count}}</text>
-          <text decode="{{true}}">&nbsp;&nbsp;&nbsp;已报名&nbsp;&nbsp;&nbsp;{{class.signuped_count}}</text>
-          <navigator url="../post/post?class_id={{class.id}}&price={{class.price_new}}_{{class.price_re}}_{{class.price_change}}&&type=3"  class="apply">报名</navigator>
+          <text class="name" decode="{{true}}">{{class.name}}</text>
+          <text decode="{{true}}">计划100人/已报名{{class.signuped_count}}</text>
+          <navigator url="../post/post?class_id={{class.id}}&price={{class.price_new}}_{{class.price_re}}_{{class.price_change}}&&type=3"  class="apply">立即报名</navigator>
       </view>
   </view>
 </view>

pages/plan/plan.wxss

@@ -14,6 +14,14 @@ page{
   text-align: center;
   border-radius: 4px;
   box-shadow:0px 2px 12px 0px rgba(0,0,0,0.08);
+  font-size: 34rpx;
+}
+.item{
+  height: 80rpx;
+  line-height: 80rpx;
+}
+.item label{
+  font-size: 32rpx;
 }
 .item picker{
   width: 70%;
@@ -50,6 +58,10 @@ page{
   margin-bottom: 12px;
   
 }
+.list .name{
+  font-size:32rpx;
+  font-weight: bold;
+}
 .title{
   color: #222;
   font-size: 32rpx;
@@ -63,6 +75,7 @@ page{
   border-bottom: 1px solid #F2F3F4;
   padding: 12px;
   position: relative;
+  border-radius: 6rpx;
 }
 .kc>text{
   display: block;
@@ -97,8 +110,8 @@ page{
   transition: all .3s linear;
 }
 .model_view{
-  width: 80%;
-  height: 235px;
+  width: 90%;
+  height: 305px;
   background: #fff;
   position: absolute;
   top: 0;
@@ -106,10 +119,15 @@ page{
   margin: auto;
   left: 0;
   right: 0;
-  padding: 30px 20px;
+  padding: 20px 20px;
   border-radius: 4px;
   
 }
+.model_view .model-title{
+  height: 80rpx;
+  font-size: 34rpx;
+  font-weight: bold;
+}
 
 .item label{
   font-size: 30rpx;

pages/post/post.js

@@ -35,6 +35,7 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+    console.log(options.type,options.s_id)
     this.setData({
       type: options.type
     })

pages/post/post.wxml

@@ -36,7 +36,7 @@
 
   <view class="item">
       <label>单位全称</label>
-      <input  value="{{company}}" name='company' placeholder="请输入您的单位名称"></input>
+      <input placeholder-style="color:#358BFF"  value="{{company}}" name='company' placeholder="单位全称（无单位可不填写）"></input>
   </view>
 
   <view class="item" wx:if="{{type != 3}}">

pages/post/post.wxss

@@ -18,6 +18,7 @@ form{
   width: 60px;
   vertical-align: middle;
   text-align: right;
+  font-weight:bold;
 }
 .item input,.item picker{
   display: inline-block;