3

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/plan/plan.js

@@ -12,9 +12,7 @@ Page({
     list:[]
   },
   onLoad: function (options) {
-    wx.showLoading({
-      title: '',
-    })
+    
     this.getData()
     wx.request({
       url: host + '/api/wx/sujectitem',
@@ -53,6 +51,9 @@ Page({
     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/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,8 @@ Page({
     idnoimg_back: "", //反面照
     halfbody_img: "", //半身照
     education_img: "", //学历照
-    id:''
+    id:'',
+    train_type:''
   },
 
   /**
@@ -33,6 +34,7 @@ Page({
           idnoimg_back: res.data.data.idnoimg_back, //反面照
           halfbody_img: res.data.data.halfbody_img, //半身照
           education_img: res.data.data.education_img, //学历照
+          train_type: res.data.data.train_type
         })
         if (!res.data.data.idnoimg_face){
           wx.request({
@@ -94,6 +96,9 @@ Page({
       })
       return false
     }
+    wx.showLoading({
+      title: '',
+    })
     wx.request({
       url: host+'/api/wx/signup',
       method:'PUT',
@@ -103,6 +108,7 @@ Page({
       data: formData,
       success:res=>{
         if(res.data.status == 'suc'){
+          wx.hideLoading()
           wx.showToast({
             title: '提交成功',
             icon: 'success',
@@ -119,11 +125,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 +141,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 +152,7 @@ Page({
             'file': res.tempFilePaths[0]
           },
           success:res=>{
+            wx.hideLoading()
             var data=JSON.parse(res.data)
             console.log(data)
             if(id == 1){  //正面

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,9 +29,18 @@
       <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.education_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>
+
   <view bindtap="post" class="post">提交资料</view>
 </view>
 

pages/user/user.js

@@ -14,7 +14,8 @@ Page({
     show: false,
     data:{
 
-    }
+    },
+    img: ''
   },
 
   /**
@@ -58,11 +59,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({
@@ -104,7 +103,8 @@ Page({
               _data.education_img = data.data.url
             }
             _this.setData({
-              data:_data
+              data:_data,
+              
             })
           }
         })

pages/user/user.wxml

@@ -44,7 +44,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 +52,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 +60,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 +68,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.education_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>
 
 <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,7 +88,7 @@ form .item image{
   display: block;
 }
 .model image{
-  width: 80%;
+  width: 100%;
   position: absolute;
   top:0;
   left: 0;