Merge branch 'master' of http://git.ndjsxh.cn:10080/ndjsxh/study_wxapp

pages/exam/do/index.wxml

@@ -1,4 +1,4 @@
-<wxs module="enumItem" src="../../../wxs/enumItem.wxs"></wxs>
+<wxs module="filter" src="../../../wxs/exam-fun.wxs"></wxs>
 <view class="exam-page">
   <view class="view-wrap">
     <view class="exam-count-down" wx:if="{{isFinish}}">已经交卷</view>
@@ -63,10 +63,12 @@
                     </checkbox>
                   </view>
                 </label>
+                
               </checkbox-group>
+
             </view>
 
-            <view class="exam-clear mt20" wx:if="{{isFinish}}" >
+            <view class="exam-clear mt20"  wx:if="{{isFinish}}">
                 <view class="exam-extend-item" >
                   答题结果:
                   <text class="question-answer-right question-answer-result" 
@@ -116,7 +118,7 @@
       </i-panel>
 
       <view>
-        <button class="i-btn  i-btn-primary i-btn-square" form-type='submit'>提交</button>
+        <button class="i-btn  i-btn-primary i-btn-square" form-type='submit'  disabled="{{!!isFinish}}">提交</button>
       </view>
 
       <i-action-sheet visible="true" visible="{{timeOutShow}}" mask-closable="{{ false }}">

utils/util.js

@@ -1,4 +1,4 @@
-// const baseUrl = "http://192.168.3.2:8000/"
+// const baseUrl = "http://127.0.0.1:8000/"
 const baseUrl = "https://edu.ndjsxh.cn:8443/"
 const ossUrl = "https://sm-sign.oss-cn-shanghai.aliyuncs.com/cert/"
 const md5 = require('./md5.js');