Merge branch 'master' of http://118.190.145.217:3000/xiaojincai/yifengxcx

app.js

@@ -23,6 +23,7 @@ App({
               },
               success: res => {
                 if (res.data.data.openid){
+                  _this.globalData.openid = res.data.data.openid
                   wx.setStorage({
                     key: 'openid',
                     data: res.data.data.openid,
@@ -64,6 +65,7 @@ App({
   globalData: {
     userInfo: null,
     host:'https://www.scxjc.club',
-    categoryArray:[]
+    categoryArray:[],
+    openid:''
   }
 })

app.json

@@ -1,10 +1,9 @@
 {
   "pages":[ 
-    
     "pages/index/index",
-    "pages/plan/plan",
     "pages/user/user",
     "pages/online/online",
+    "pages/plan/plan",
     "pages/pay/pay",
     "pages/apply/apply",
     "pages/post/post",

pages/index/index.js

@@ -58,13 +58,14 @@ Page({
       key: 'userInfo',
       data: e.detail.userInfo,
     })
+    console.log(app.globalData.openid)
     wx.request({
       url: host+'/api/wx/authinfo',
       method:'POST',
       data:{
         nickname: e.detail.userInfo.nickName, 
         avatar: e.detail.userInfo.avatarUrl, 
-        openid: this.data.openid, 
+        openid: app.globalData.openid, 
       },
       success:res=>{
           console.log(res)

pages/index/index.wxml

@@ -50,7 +50,9 @@
 <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">国家安全生产监督管理总局30号令</view>
+    <view class="marquee_text">
+      <text wx:for="{{news}}">{{item}}</text>
+    </view>
 </view>
 
 </view>

pages/index/index.wxss

@@ -26,7 +26,7 @@ page{
 }
 .logo image{
   width: 120rpx;
-  height: 120rpx;
+  max-height: 120rpx;
   position: absolute;
   left: 15px;
   top: 0;
@@ -156,3 +156,6 @@ page{
   animation-iteration-count: infinite;
   animation-timing-function:linear;
 }
+.marquee_text text{
+  margin-right: 200px;
+}

pages/intro/intro.js

@@ -7,7 +7,7 @@ Page({
    * 页面的初始数据
    */
   data: {
-
+    
   },
 
   /**

pages/online/online.js

@@ -11,7 +11,8 @@ Page({
     array1: ['特种作业'],
     index1: 0,
     papers:[],
-    videos:[]
+    videos:[],
+    show:0
   },
 
   /**
@@ -43,9 +44,23 @@ Page({
       },
       data:{},
       success:res=>{
+        
+        let video = res.data.data.videos, papers = res.data.data.papers;
+        let flag1=1,flag=1;
+        for(let i=0;i<video.length;i++){
+          if (!video[i].status){
+            flag1=0
+          }
+        };
+        for (let i = 0; i < papers.length; i++) {
+          if (!papers[i].status) {
+            flag2 = 0
+          }
+        };
         this.setData({
-          papers:res.data.data.papers,
-          videos: res.data.data.videos,
+          papers: papers,
+          videos: video,
+          show: flag1 || flag2
         })
       }
     })

pages/online/online.wxml

@@ -36,7 +36,7 @@
         <view class="title">{{item.title}}</view>
         <view>{{item.class_hour}}学时</view>
         <text>{{item.finished_time}}/{{item.total_time}}</text>
-        <view class="check" style="color:#FF5E4E;" wx:if='{{item.status == 1}}'>未完成</view>
+        <view class="check" style="color:#FF5E4E;" wx:if='{{item.status != 1}}'>未完成</view>
         <view class="check" wx:else><image src="../../images/gou.png" mode="widthFix"></image>已完成</view>
       </view>
   </navigator>
@@ -53,3 +53,6 @@
         <navigator wx:else url="../subject/subject?id={{item.id}}">开始练习</navigator>
     </view>
 </view>
+
+
+<view wx:if="{{show}}" class="complete">已完成学习，立即生成学时证明</view>

pages/online/online.wxss

@@ -2,9 +2,11 @@
 page{
   background: #F4F7F9;
 }
+
 .content{
   min-height: 90vh;
   background: #fff;
+  padding-bottom: 50px;
 }
 .tab{
   background: #fff;
@@ -143,3 +145,15 @@ page{
 .section image{
   width: 32rpx;
 }
+
+.complete{
+  width: calc(100% - 24px);
+  line-height: 38px;
+  color: #fff;
+  text-align: center;
+  position: fixed;
+  left: 12px;
+  bottom: 10px;
+  background: #07c160;
+  border-radius: 4px;
+}

pages/plan/plan.js

@@ -9,12 +9,11 @@ Page({
     index1:-1,
     index2: -1,
     index3: -1,
-    list:[]
+    list:[],
+    show:1
   },
   onLoad: function (options) {
-    wx.showLoading({
-      title: '',
-    })
+    
     this.getData()
     wx.request({
       url: host + '/api/wx/sujectitem',
@@ -50,9 +49,32 @@ Page({
         index3: e.detail.value
       })
     };
-    this.getData();
+    // this.getData();
+  },
+  show:function(){
+    this.setData({
+      show: 1
+    })
+  },
+  sure:function(){
+    if(this.data.index1<0){
+      wx.showToast({
+        title: '请选择培训项目',
+        icon: 'none',
+        duration: 2000
+      })
+    }else{
+      this.setData({
+        show: 0
+      })
+      this.getData()
+    }
   },
   getData:function(){
+    
+    wx.showLoading({
+      title: '',
+    })
     var parm={}
     if (this.data.index1>=0){
       parm.subject_item0 = this.data.array1[this.data.index1].name

pages/plan/plan.wxml

@@ -1,29 +1,45 @@
-<view class="section">
-  <picker data-id='1' bindchange="bindPickerChange" value="{{index1}}" range="{{array1}}" range-key="name">
-    <view class="picker">
-    <text wx:if="{{index1<0}}">请选择</text>
-      {{array1[index1].name}}
-      <image src="../../images/arrow-bottom.png" mode="widthFix"></image>
-    </view>
-  </picker>
+<view class="section" bindtap="show">
+  请选择培训项目
+</view>
 
-  <picker data-id='2' bindchange="bindPickerChange" value="{{index2}}" range="{{array2}}" range-key="name">
-    <view class="picker">
-    <text wx:if="{{index2<0}}">请选择</text>
-      {{array2[index2].name}}
-      <image src="../../images/arrow-bottom.png" mode="widthFix"></image>
-    </view>
-  </picker>
+<view class="model" wx:if="{{show}}">
+    <view class="model_view">
+        <view class="item">
+              <label>培训项目</label>
+              <picker data-id='1' bindchange="bindPickerChange" value="{{index1}}" range="{{array1}}" range-key="name">
+                <view class="picker">
+                <text wx:if="{{index1<0}}">请选择</text>
+                  {{array1[index1].name}}
+                  <image src="../../images/arrow-bottom.png" mode="widthFix"></image>
+                </view>
+              </picker>
+        </view>
 
-  <picker data-id='3' bindchange="bindPickerChange" value="{{index3}}" range="{{array3}}" range-key="name">
-    <view class="picker">
-    <text wx:if="{{index3<0}}">请选择</text>
-      {{array3[index3].name}}
-      <image src="../../images/arrow-bottom.png" mode="widthFix"></image>
+        <view class="item">
+              <label>作业类别</label>
+              <picker data-id='2' bindchange="bindPickerChange" value="{{index2}}" range="{{array2}}" range-key="name">
+              <view class="picker">
+              <text wx:if="{{index2<0}}">请选择</text>
+                {{array2[index2].name}}
+                <image src="../../images/arrow-bottom.png" mode="widthFix"></image>
+              </view>
+            </picker>
+        </view>
+
+        <view class="item">
+              <label>准操项目</label>
+              <picker data-id='3' bindchange="bindPickerChange" value="{{index3}}" range="{{array3}}" range-key="name">
+              <view class="picker">
+              <text wx:if="{{index3<0}}">请选择</text>
+                {{array3[index3].name}}
+                <image src="../../images/arrow-bottom.png" mode="widthFix"></image>
+              </view>
+            </picker>
+        </view>
+
+        <view bindtap="sure" class="btn">确定</view>
     </view>
-  </picker>
 </view>
-
 <view class="content">
   <view class="list" wx:for="{{list}}" wx:key="*this">
       <view class="title">{{item.type}}培训班</view>

pages/plan/plan.wxss

@@ -3,34 +3,40 @@ page{
   background: #F4F7F9;
 }
 .section{
-  display: flex;
-  justify-content: space-between;
-  padding: 12px;
-  background: #fff;
+  background:rgba(53,139,255,1);
   position: fixed;
-  left: 0;
-  top: 0;
-  z-index: 99;
-  width: 100%;
+  left: 12px;
+  top: 10px;
+  z-index: 9;
+  width: calc(100% - 24px);
+  line-height: 38px;
+  color: #fff;
+  text-align: center;
+  border-radius: 4px;
+  box-shadow:0px 2px 12px 0px rgba(0,0,0,0.08);
 }
-.section picker{
-  width: 33%;
+.item picker{
+  width: 70%;
   position: relative;
-  
+  /* text-align: right; */
+  border: 1px solid #d7d7d7;
+  line-height: 30px;
+  border-radius: 4px;
+  color: #999;
+  padding-left: 10px;
 }
-.section .picker{
-  padding-right: 32rpx;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  text-align: center;
-  font-size: 24rpx;
+.item .picker{
+  font-size: 26rpx;
+}
+.item text{
+  color: #999;
 }
-.section image{
+
+.item image{
   width: 32rpx;
   position: absolute;
-  right: 0;
-  top:2px;
+  right: 5px;
+  top:7px;
 }
 
 .content{
@@ -78,4 +84,51 @@ page{
   right: 12px;
   bottom: 12px;
   line-height: 32px;
+}
+
+.model{
+  position: fixed;
+  width: 100%;
+  height: 100vh;
+  background: rgba(0,0,0,.5);
+  left: 0;
+  top: 0;
+  z-index: 9;
+  transition: all .3s linear;
+}
+.model_view{
+  width: 80%;
+  height: 235px;
+  background: #fff;
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  margin: auto;
+  left: 0;
+  right: 0;
+  padding: 30px 20px;
+  border-radius: 4px;
+  
+}
+
+.item label{
+  font-size: 30rpx;
+  line-height: 30px;
+}
+.item{
+  display: flex;
+  justify-content: space-between;
+  margin-bottom: 12px;
+}
+.btn{
+  height:40px;
+  background:rgba(53,139,255,1);
+  border-radius:4px;
+  text-align: center;
+  line-height: 40px;
+  color: #fff;
+  margin-top: 20px;
+}
+.hide{
+  top: -100%;
 }

pages/post/post.wxml

@@ -49,7 +49,7 @@
       </picker>
       <image src="../../images/arrow-bottom.png" mode="widthFix"></image>
 
-      <view wx:if="{{category>=0}}" class="intro">{{categoryArray[category].intro}}</view>
+      <view wx:if="{{categoryArray[category].intro}}" class="intro">{{categoryArray[category].intro}}</view>
   </view>
 
   <view class="item" wx:if="{{type != 3}}">
@@ -62,7 +62,7 @@
         </view>
       </picker>
       <image src="../../images/arrow-bottom.png" mode="widthFix"></image>
-      <view wx:if="{{subject>=0}}" class="intro">{{subjectArray[subject].intro}}</view>
+      <view wx:if="{{subjectArray[subject].intro}}" class="intro">{{subjectArray[subject].intro}}</view>
   </view>
 
   <view class="item">
@@ -188,7 +188,7 @@
       </picker>
       <image src="../../images/arrow-bottom.png" mode="widthFix"></image>
 
-      <view wx:if="{{category>=0}}" class="intro">{{categoryArray[category].intro}}</view>
+      <view wx:if="{{categoryArray[category].intro}}" class="intro">{{categoryArray[category].intro}}</view>
   </view>
 
   <view class="item" wx:if="{{!class_id}}">
@@ -201,7 +201,7 @@
         </view>
       </picker>
       <image src="../../images/arrow-bottom.png" mode="widthFix"></image>
-      <view wx:if="{{subject>=0}}" class="intro">{{subjectArray[subject].intro}}</view>
+      <view wx:if="{{subjectArray[subject].intro}}" class="intro">{{subjectArray[subject].intro}}</view>
   </view>
 
   <view class="item">

pages/upload/upload.js

@@ -12,7 +12,9 @@ Page({
     idnoimg_back: "", //反面照
     halfbody_img: "", //半身照
     education_img: "", //学历照
-    id:''
+    oldcard_img:'',
+    id:'',
+    train_type:''
   },
 
   /**
@@ -33,6 +35,8 @@ Page({
           idnoimg_back: res.data.data.idnoimg_back, //反面照
           halfbody_img: res.data.data.halfbody_img, //半身照
           education_img: res.data.data.education_img, //学历照
+          oldcard_img: res.data.data.oldcard_img,
+          train_type: res.data.data.train_type
         })
         if (!res.data.data.idnoimg_face){
           wx.request({
@@ -46,6 +50,7 @@ Page({
                 idnoimg_back: res.data.data.idnoimg_back, //反面照
                 halfbody_img: res.data.data.halfbody_img, //半身照
                 education_img: res.data.data.education_img, //学历照
+                oldcard_img: res.data.data.oldcard_img
               })
             }
           })
@@ -94,6 +99,9 @@ Page({
       })
       return false
     }
+    wx.showLoading({
+      title: '',
+    })
     wx.request({
       url: host+'/api/wx/signup',
       method:'PUT',
@@ -103,6 +111,7 @@ Page({
       data: formData,
       success:res=>{
         if(res.data.status == 'suc'){
+          wx.hideLoading()
           wx.showToast({
             title: '提交成功',
             icon: 'success',
@@ -119,11 +128,9 @@ Page({
   },
   showImg:function(e){
     this.setData({
-      show:true
+      show: true,
+      img: '../../images/zj' + e.target.dataset.id + '.jpg'
     })
-    if (e.target.dataset.name == 0){
-
-    }
   },
   hideImg: function (e) {
     this.setData({
@@ -137,6 +144,9 @@ Page({
       count:1,
       success: function(res) {
         console.log(res.tempFilePaths[0])
+        wx.showLoading({
+          title: '',
+        })
         wx.uploadFile({
           url: host+'/api/wx/uploadfile',
           filePath: res.tempFilePaths[0],
@@ -145,6 +155,7 @@ Page({
             'file': res.tempFilePaths[0]
           },
           success:res=>{
+            wx.hideLoading()
             var data=JSON.parse(res.data)
             console.log(data)
             if(id == 1){  //正面
@@ -167,6 +178,11 @@ Page({
                 education_img: data.data.url
               })
             }
+            if (id == 5) {
+              _this.setData({
+                oldcard_img: data.data.url
+              })
+            }
           }
         })
       },

pages/upload/upload.wxml

@@ -5,7 +5,7 @@
       <image wx:else data-id='1' bindtap="takePhoto" src="../../images/upload.png" mode="widthFix"></image>
       <view class="title">身份证正面照，务必保持清晰</view>
       <text>注意：拍完整不能斜着拍，和复印效果一样！</text>
-      <view data-id='0' bindtap="showImg" class="tips">点击查看参考图片</view>
+      <view data-id='1' bindtap="showImg" class="tips">点击查看参考图片</view>
   </view>
 
   <view class="item">
@@ -13,7 +13,7 @@
       <image wx:else data-id='2' bindtap="takePhoto" src="../../images/upload.png" mode="widthFix"></image>
       <view class="title">身份证反面照，务必保持清晰</view>
       <text>注意：拍完整不能斜着拍，和复印效果一样！</text>
-      <view data-id='1' bindtap="showImg" class="tips">点击查看参考图片</view>
+      <view data-id='2' bindtap="showImg" class="tips">点击查看参考图片</view>
   </view>
 
   <view class="item">
@@ -21,7 +21,7 @@
       <image wx:else data-id='3' bindtap="takePhoto" src="../../images/upload.png" mode="widthFix"></image>
       <view class="title">上半身照，务必保持清晰</view>
       <text>注意：头像大小与1寸照片相近，纯色背景，不能穿红色衣服！</text>
-      <view data-id='2' bindtap="showImg" class="tips" style="margin:0;">点击查看参考图片</view>
+      <view data-id='3' bindtap="showImg" class="tips" style="margin:0;">点击查看参考图片</view>
   </view>
 
   <view class="item">
@@ -29,7 +29,15 @@
       <image wx:else data-id='4' bindtap="takePhoto" src="../../images/upload.png" mode="widthFix"></image>
       <view class="title">毕业证书照或户口本个人现实学历页，务必保持清晰！</view>
       <text>注意：拍完整不能斜着拍，和复印效果一样！</text>
-      <view data-id='3' bindtap="showImg" class="tips" style="margin:0;">点击查看参考图片</view>
+      <view data-id='4' bindtap="showImg" class="tips" style="margin:0;">点击查看参考图片</view>
+  </view>
+
+    <view class="item" wx:if="{{train_type == '换证'}}">
+      <image wx:if='{{data.oldcard_img}}' data-id='5' bindtap="takePhoto" src="{{data.education_img}}" mode="widthFix"></image>
+      <image wx:else data-id='5' bindtap="takePhoto" src="../../images/upload.png" mode="widthFix"></image>
+      <view class="title">复审/换证证件照，务必保持清晰</view>
+      <text>注意：拍完整不能斜着拍，和复印效果一样！</text>
+      <view data-id='5' bindtap="showImg" class="tips" style="margin:0;">点击查看参考图片</view>
   </view>
 
   <view bindtap="post" class="post">提交资料</view>

pages/user/user.js

@@ -14,7 +14,8 @@ Page({
     show: false,
     data:{
 
-    }
+    },
+    img: ''
   },
 
   /**
@@ -56,13 +57,23 @@ Page({
       })
     };
   },
+  preview:function(){
+    var _this=this;
+    wx.previewImage({
+      current: _this.data.data.idnoimg_face, // 当前显示图片的http链接
+      urls: [_this.data.data.idnoimg_face] // 需要预览的图片http链接列表
+    })
+  },
   showImg: function (e) {
     this.setData({
-      show: true
+      show: true,
+      img: '../../images/zj' + e.target.dataset.id + '.jpg'
     })
-    if (e.target.dataset.name == 0) {
-
-    }
+    // var _this = this;
+    // wx.previewImage({
+    //   current: '../../images/zj' + e.target.dataset.id + '.jpg', // 当前显示图片的http链接
+    //   urls: ['../../images/zj' + e.target.dataset.id + '.jpg'] // 需要预览的图片http链接列表
+    // })
   },
   hideImg: function (e) {
     this.setData({
@@ -103,8 +114,13 @@ Page({
             if (id == 4) {  //学历照
               _data.education_img = data.data.url
             }
+            if (id == 5) {  
+              _data.oldcard_img = data.data.url
+            }
+            
             _this.setData({
-              data:_data
+              data:_data,
+              
             })
           }
         })

pages/user/user.wxml

@@ -35,7 +35,11 @@
       <label>单位全称</label>
       <input bindinput="inputChange" data-name='company'  value="{{data.company}}" placeholder="请输入您的单位名称"></input>
   </view>
-
+  
+  <view class="item xs">
+      <label>学时证明</label>
+      <image bindtap="preview" wx:if='{{data.idnoimg_face}}' src="{{data.idnoimg_face}}" mode="widthFix"></image>
+  </view>
 </form>
 
 <view class="content">
@@ -44,7 +48,7 @@
       <image wx:else data-id='1' bindtap="takePhoto" src="../../images/upload.png" mode="widthFix"></image>
       <view class="title">身份证正面照，务必保持清晰</view>
       <text>注意：拍完整不能斜着拍，和复印效果一样！</text>
-      <view data-id='0' bindtap="showImg" class="tips">点击查看参考图片</view>
+      <view data-id='1' bindtap="showImg" class="tips">点击查看参考图片</view>
   </view>
 
   <view class="item">
@@ -52,7 +56,7 @@
       <image wx:else data-id='2' bindtap="takePhoto" src="../../images/upload.png" mode="widthFix"></image>
       <view class="title">身份证反面照，务必保持清晰</view>
       <text>注意：拍完整不能斜着拍，和复印效果一样！</text>
-      <view data-id='1' bindtap="showImg" class="tips">点击查看参考图片</view>
+      <view data-id='2' bindtap="showImg" class="tips">点击查看参考图片</view>
   </view>
 
   <view class="item">
@@ -60,7 +64,7 @@
       <image wx:else data-id='3' bindtap="takePhoto" src="../../images/upload.png" mode="widthFix"></image>
       <view class="title">上半身照，务必保持清晰</view>
       <text>注意：头像大小与1寸照片相近，纯色背景，不能穿红色衣服！</text>
-      <view data-id='2' bindtap="showImg" class="tips" style="margin:0;">点击查看参考图片</view>
+      <view data-id='3' bindtap="showImg" class="tips" style="margin:0;">点击查看参考图片</view>
   </view>
 
   <view class="item">
@@ -68,12 +72,20 @@
       <image wx:else data-id='4' bindtap="takePhoto" src="../../images/upload.png" mode="widthFix"></image>
       <view class="title">毕业证书照或户口本个人现实学历页，务必保持清晰！</view>
       <text>注意：拍完整不能斜着拍，和复印效果一样！</text>
-      <view data-id='3' bindtap="showImg" class="tips" style="margin:0;">点击查看参考图片</view>
+      <view data-id='4' bindtap="showImg" class="tips" style="margin:0;">点击查看参考图片</view>
+  </view>
+
+  <view class="item">
+      <image wx:if='{{data.oldcard_img}}' data-id='5' bindtap="takePhoto" src="{{data.oldcard_img}}" mode="widthFix"></image>
+      <image wx:else data-id='5' bindtap="takePhoto" src="../../images/upload.png" mode="widthFix"></image>
+      <view class="title">复审/换证证件照，务必保持清晰</view>
+      <text>注意：拍完整不能斜着拍，和复印效果一样！</text>
+      <view data-id='5' bindtap="showImg" class="tips" style="margin:0;">点击查看参考图片</view>
   </view>
 </view>
 
 <view bindtap="post" class="post">提交资料</view>
 
 <view class="model {{show?'show':''}}" bindtap="hideImg">
-  <image src="../../images/upload.png" mode="widthFix"></image>
+  <image src="{{img}}" mode="widthFix"></image>
 </view>

pages/user/user.wxss

@@ -77,7 +77,7 @@ form .item image{
 .model{
   position: fixed;
   z-index: 9;
-  background: rgba(0,0,0,.5);
+  background: rgba(0,0,0);
   width: 100%;
   height: 100vh;
   top: 0;
@@ -88,11 +88,19 @@ form .item image{
   display: block;
 }
 .model image{
-  width: 80%;
+  width: 100%;
   position: absolute;
   top:0;
   left: 0;
   bottom: 0;
   right: 0;
   margin: auto;
+}
+form .xs image{
+  position: static;
+  width: 100px;
+  margin-left: 30px;
+}
+form .xs label{
+  vertical-align: top;
 }

pages/video/video.wxml

@@ -1 +1,2 @@
 <video src='{{url}}' title="{{title}}" initial-time='{{time}}' bindpause='pause'></video>
+<view>{{title}}</view>

pages/video/video.wxss

@@ -1,4 +1,10 @@
 /* pages/video/video.wxss */
 video{
   width: 100%;
+}
+view{
+  font-size: 32rpx;
+  font-weight: 600;
+  margin-top: 12px;
+  padding: 0 12px;
 }

project.config.json

@@ -14,7 +14,7 @@
 	},
 	"compileType": "miniprogram",
 	"libVersion": "2.11.0",
-	"appid": "wxecaa5147d8564e89",
+	"appid": "wx2938132b773c7b5a",
 	"projectname": "yifeng",
 	"debugOptions": {
 		"hidedInDevtools": []