浏览代码

1.即将开班列表样式修改
2.认证时loading消失时间修改(增强用户体验)

ssfg 4 年之前
父节点
当前提交
8f537977ab

+ 1 - 18
app.js

@@ -1,22 +1,5 @@
 App({
   globalData: {
     showAnimation: true
-  },
-  // onLaunch: function () {
-  //   wx.onNetworkStatusChange((res) => {
-  //     console.log(res, "0000000000000")
-  //     if (this.data.networkType == "wifi" && res.networkType != "wifi") {
-  //       this.data.videoContext.pause()
-  //       wx.showModal({
-  //         showCancel: false,
-  //         content: "非wifi网络,是否继续播放",
-  //         success: (res) => {
-  //           if (res.confirm) {
-  //             this.data.videoContext.play()
-  //           }
-  //         }
-  //       })
-  //     }
-  //   })
-  // }
+  }
 })

+ 0 - 1
app.json

@@ -2,7 +2,6 @@
   "pages": [
     "pages/welcome/welcome",
     "pages/dbDetails/dbDetails",
-   
     "pages/dbVideo/dbVideo",
     "pages/myClass/myClass",
     "pages/zbDetails/zbDetails",

+ 5 - 10
pages/Identity/Identity.js

@@ -84,7 +84,6 @@ Page({
         return false
       }
       if (this.data.carWin_img == "" || this.data.carWin_img == null) {
-        wx.hideLoading();
         wx.showModal({
           title: '请点击上方选择照片或者视频哦',
           showCancel: false
@@ -113,7 +112,6 @@ Page({
             if (credentials) {
               stsCache = result.data.credential
             } else {
-              wx.hideLoading();
               wx.showModal({
                 title: '临时密钥获取失败',
                 content: JSON.stringify(data),
@@ -123,7 +121,6 @@ Page({
             callback(stsCache && stsCache.credentials);
           },
           error: function (err) {
-            wx.hideLoading();
             wx.showModal({
               title: '临时密钥获取失败',
               content: JSON.stringify(err),
@@ -172,7 +169,6 @@ Page({
             this.tj(params, res.header.Location)
           },
           fail: function () {
-            wx.hideLoading();
             wx.showModal({
               title: '上传腾讯云失败',
               showCancel: false
@@ -180,20 +176,19 @@ Page({
           }
         });
         requestTask.onProgressUpdate(function (res) {
-          console.log('进度:', res);
-          if (res.progress == 100) {
-            wx.hideLoading();
-          }
+          console.log('进度:', res.progress);
+          // if (res.progress == 100) {
+          //   wx.hideLoading();
+          // }
         });
       });
     } else {
-      wx.hideLoading()
+      // wx.hideLoading()
       wx.showModal({
         showCancel: false,
         content: "您已经认证过了"
       })
     }
-
   },
   // 如果有就把信息回显出来
   getInformation(sessionKey) {

+ 9 - 1
pages/agoClass/agoClass.wxss

@@ -25,7 +25,7 @@ page {
   float: right;
   height: 141rpx;
   width: 530rpx;
-  margin-top: 30rpx;
+  margin-top: 10rpx;
 }
 
 .t1 {
@@ -33,10 +33,18 @@ page {
   font-size: 25rpx;
   margin-top: 10rpx;
   font-weight: 700;
+  width: 500rpx;
+  overflow: hidden;
+  text-overflow:ellipsis;
+  white-space: nowrap;
 }
 
 .t2 {
   color: #999999;
   font-size: 24rpx;
   margin-top: 10rpx;
+  width: 500rpx;
+  overflow: hidden;
+  text-overflow:ellipsis;
+  white-space: nowrap;
 }

+ 1 - 40
pages/answerAfterclass/answerAfterclass.js

@@ -4,46 +4,7 @@ Page({
   data: {
     index: 0, // 题目序列
     chooseValue: [], // 选择的答案序列
-    questionList: [
-      // {
-      //   id: 10,
-      //   "QuestStem": "以下属于传统协同办公应用开发的典型问题的是?",
-      //   'QuestChoice': [{
-      //       name: 'a',
-      //       value: 'aaaaaaa',
-      //       checked: false
-      //     },
-      //     {
-      //       name: 'aa',
-      //       value: 'sdsdsd',
-      //       checked: false
-      //     },
-      //     {
-      //       name: 'a3',
-      //       value: 'ewewewe',
-      //       checked: false
-      //     },
-      //   ],
-      //   "QuestType": 1,
-      //   "checked": false
-      // },
-      // {
-      //   id: 12,
-      //   "QuestStem": "企业微信建立开放办公应用生态的主要策略是000?",
-      //   "QuestChoice": ['A', 'B'],
-      //   "QuestType": 2,
-      //   "scores": 10,
-      //   "checked": false
-      // },
-
-      // {
-      //   id: 123,
-      //   "QuestStem": "企业微信建立开放办公应用生态的主要策略是?",
-      //   "QuestType": 3,
-      //   "scores": 10,
-      //   "checked": false
-      // },
-    ],
+    questionList: [],
     totalScore: 0,
     id: '', //考试主键id(可取list接口中id)
     paperId: '', //试卷id(可取list接口中paperId)

+ 0 - 13
pages/answerAfterclasses/answerAfterclasses.js

@@ -120,19 +120,6 @@ Page({
     })
     wx.setStorageSync('titleINDEX' + wx.getStorageSync('answersId'), this.data.index);
   },
-  // onShow: function () {
-  //   if (wx.getStorageSync('questionList' + wx.getStorageSync('answersId'))) {
-  //     const questionList = wx.getStorageSync('questionList' + wx.getStorageSync('answersId'));
-  //     this.setData({
-  //       questionList: questionList,
-  //       index: wx.getStorageSync('titleINDEX' + wx.getStorageSync('answersId')),
-  //       answersId: wx.getStorageSync('answersId' + wx.getStorageSync('answersId')),
-  //       chooseValue: wx.getStorageSync('chooseValue' + wx.getStorageSync('answersId')),
-  //     })
-  //   } else {
-  //     this.allShi(this.data.id, this.data.paperId, this.data.sessionKey);
-  //   }
-  // },
   async onLoad(options) {
     const sessionKey = await tools.checkSessionAndLogin();
     wx.setStorageSync('answersId', options.answersId);

+ 1 - 2
pages/dbDetails/dbDetails.js

@@ -312,16 +312,15 @@ Page({
       }
     }
   },
+  // 获取当前网络状态
   async getNetStatus() {
     return new Promise((resolve, reject) => {
       wx.getNetworkType({
         success: (res) => {
-          console.log(res.networkType, "999999")
           resolve(res.networkType);
         }
       })
     });
-
   },
   async onLoad(options) {
     this.setData({

+ 0 - 2
pages/dbVideo/dbVideo.js

@@ -1,5 +1,3 @@
-//index.js
-//获取应用实例
 const app = require('../../utils/util.js');
 Page({
   data: {

+ 1 - 6
pages/evaluationCourse/evaluationCourse.js

@@ -128,7 +128,6 @@ Page({
     date = new Date(date);
     return `${date.getFullYear()-1}/${date.getMonth() + 1}/${date.getDate()}`;
   },
-
   share1(e) {
     this.data.postshow[e.currentTarget.dataset.index] = true;
     this.data.names[e.currentTarget.dataset.index] = e.currentTarget.dataset.names;
@@ -187,7 +186,6 @@ Page({
     })
   },
   submitForm() {
-
     let obj = this.data.chooseValue.find(item=>!item.currentAnswer)
     if(!obj){
       wx.showLoading({
@@ -203,8 +201,6 @@ Page({
           answersId: wx.getStorageSync('answersId')
         },
         success: (res) => {
-          console.log("提交上去可");
-        
           wx.hideLoading();
           if (res.data.code == 0) {
             wx.showModal({
@@ -232,12 +228,11 @@ Page({
     }else{
       wx.showModal({
         showCancel: false,
-        content: '333333',
+        content: '请补全信息',
         success() {
         }
       })
     }
-  
   },
   timeFormat(date, fmt) {
     let o = {

+ 4 - 0
pages/index/index.wxss

@@ -29,11 +29,15 @@
 }
 
 .text {
+  width:600rpx;
   color: #fff;
   position: absolute;
   left: 50rpx;
   z-index: 99;
   font-weight: 900;
+  overflow: hidden;
+  text-overflow:ellipsis;
+  white-space: nowrap;
 }
 
 .text0 {

+ 9 - 3
pages/startClass/startClass.wxss

@@ -6,7 +6,6 @@ page {
   width: 710rpx;
   margin-left: 20rpx;
   height: 200rpx;
-  /* border: 1px solid red; */
   margin-top: 20rpx;
   background-color: #fff;
   border-radius: 5rpx;
@@ -26,8 +25,7 @@ page {
   float: right;
   height: 141rpx;
   width: 530rpx;
-  margin-top: 30rpx;
-  /* border: 1px solid red;   */
+  margin-top: 10rpx;
 }
 
 .t1 {
@@ -35,10 +33,18 @@ page {
   font-size: 25rpx;
   margin-top: 10rpx;
   font-weight: 700;
+  width: 500rpx;
+  overflow: hidden;
+  text-overflow:ellipsis;
+  white-space: nowrap;
 }
 
 .t2 {
   color: #999999;
   font-size: 24rpx;
   margin-top: 10rpx;
+  width: 500rpx;
+  overflow: hidden;
+  text-overflow:ellipsis;
+  white-space: nowrap;
 }

+ 7 - 5
pages/studentRegistration/studentRegistration.js

@@ -16,6 +16,7 @@ Page({
         name: '硕士'
       },
     ],
+    kaihuindex: 0,
     nameIsTrue: false, //名字是否填写
     cultureIsTrue: false, //文化是否填写
     graduationIsTrue: false, //毕业学校
@@ -95,11 +96,11 @@ Page({
     date = new Date(date);
     return `${date.getFullYear()-1}/${date.getMonth() + 1}/${date.getDate()}`;
   },
-  kaihuListChange: function (e) {
+  kaihuListChange (e) {
     console.log(e, "8888888888888")
     this.setData({
       kaihuindex: e.detail.value,
-      kaihutext: '',
+      kaihutext: this.data.kaihuList[e.detail.value].name,
     })
   },
   share1() {
@@ -249,6 +250,7 @@ Page({
         peixunshijianTrue: false
       })
     }
+    console.log(this.data.kaihuList,this.data.kaihuindex,"000000")
     e.detail.value.culture = this.data.kaihuList[this.data.kaihuindex].name;
     e.detail.value.tenure = this.data.tenure;
     e.detail.value.sessionKey = this.data.sessionKey;
@@ -272,7 +274,7 @@ Page({
           console.log("提交成功");
           wx.showModal({
             showCancel: false,
-            content: '提交成功',
+            content: '报到成功',
             success() {
               wx.navigateBack({
                 delta: 1
@@ -284,7 +286,7 @@ Page({
           console.log(res)
           wx.showModal({
             showCancel: false,
-            content: '提交失败',
+            content: '报到失败',
             success() {
               wx.navigateBack({
                 delta: 1
@@ -343,7 +345,7 @@ Page({
         sessionKey: sessionKey,
       },
       success: (res) => {
-        // console.log(rs)
+        console.log(res)
         if (res.data.code == 0) {
           this.data.parameter.forEach(item => {
             if (item.value == res.data.data.studentSex) {

+ 9 - 3
pages/studentRegistration/studentRegistration.wxml

@@ -35,9 +35,16 @@
 				<image src="/images/quan.png" style="width:20rpx;height:20rpx"> </image>
 			</view>
 			<view class="xingbie">文化程度</view>
-			<picker bindchange="kaihuListChange" name="culture" value="{{kaihuList[kaihuindex].name}}" range-key="{{'name'}}" range="{{kaihuList}}" disabled="{{flag}}">
+			<!-- <picker bindchange="kaihuListChange" name="culture" value="{{kaihuList[kaihuindex].name}}" range-key="{{'name'}}" range="{{kaihuList}}" disabled="{{flag}}">
 				<view class="weui-input aaa">
-					{{kaihuList[kaihuindex].name}} <text >{{kaihutext == null? '请选择':kaihutext}}</text>
+					{{kaihuList[kaihuindex].name}} 
+					<text >{{kaihutext == null? '请选择':''}}</text>
+				</view>
+			</picker> -->
+			<picker bindchange="kaihuListChange" ame="culture" value="{{kaihuindex}}" range-key="{{'name'}}" range="{{kaihuList}}">
+				<view class="weui-input aaa">
+					{{kaihutext == null? '请选择':kaihutext}}
+					<!-- {{kaihuList[kaihuindex].name}} -->
 				</view>
 			</picker>
 		</view>
@@ -93,6 +100,5 @@
 		<view style="margin-top: 100rpx;margin-bottom:100rpx">
 			<van-button round formType="submit">提交表单</van-button>
 		</view>
-
 	</form>
 </view>

+ 0 - 5
pages/zbDetails/zbDetails.wxss

@@ -5,7 +5,6 @@ page {
   width: 750rpx;
   height: 100vh;
 }
-
 .area {
   width: 700rpx;
   height: 600rpx;
@@ -24,7 +23,6 @@ page {
   font-size: 25rpx;
   position: absolute;
   top:0rpx;
-  /* border: 1px solid red; */
 }
 .puthands_box {
   width: 700rpx;
@@ -130,15 +128,12 @@ page {
 }
 .t4{
   height: 67rpx;
-  /* margin-left: 95rpx; */
   border-radius: 40rpx;
   font-size: 29rpx;
   font-weight: 600;
   color: #fff;
   background: -webkit-linear-gradient(left, #d7301d, #f99c30);
-  /* margin-bottom: 20rpx; */
   text-align: center;
-  /* margin-top: 100rpx; */
   position: absolute;
   top: 520rpx;
   left: 230rpx;