xuqiaoying 3 年之前
父節點
當前提交
b224d78654
共有 5 個文件被更改,包括 12 次插入4 次删除
  1. 2 2
      common/request.js
  2. 1 0
      pages2/appointment/order.vue
  3. 1 1
      pages5/examList/index.vue
  4. 8 1
      pages5/mockExam/examApply.vue
  5. 二進制
      pages5/static/mock_bg.png

+ 2 - 2
common/request.js

@@ -6,11 +6,11 @@ var num = 1
 //接口api   
 // export const BASE_URL = 'https://api.xyyxt.net'   //release
 // export const BASE_URL = 'https://test.xyyxt.net'   //预发布
-export const BASE_URL = 'http://120.79.166.78:19012' // 测试环境
+// export const BASE_URL = 'http://120.79.166.78:19012' // 测试环境
 // export const BASE_URL = 'http://42.192.164.187:19005'    //test(后端本地)
 // export const BASE_URL = 'http://192.168.1.222:5055'    //后端本地更新到222
 // export const BASE_URL = 'http://192.168.1.24:5055'    //后端本地
-// export const BASE_URL = 'http://192.168.1.7:5055'    //后端本地
+export const BASE_URL = 'http://192.168.1.7:5055'    //后端本地
 
  //图片上传api
 // export const BASE_IMG_URL = 'https://file.xyyxt.net/'     //release

+ 1 - 0
pages2/appointment/order.vue

@@ -234,6 +234,7 @@ export default {
         return;
       }
       this.siteId = this.listData[index].siteId
+      console.log('siteId: ', this.siteId, index)
       if (this.addressId === this.listData[index].id) {
         this.address_show = false;
         return;

+ 1 - 1
pages5/examList/index.vue

@@ -43,7 +43,7 @@
 						<view class="btn-wrap">
 							<view class="btn-line">
 								<!-- mockActivity 1是活动模考,0否 && (!item.handStatus || item.handStatus == 0)-->
-								<view v-if="item.mockActivity == 1 " class="btn" @click="goExamCount(item,index)">去考试</view>
+								<view v-if="item.mockActivity == 1 && (!item.handStatus || item.handStatus == 0) " class="btn" @click="goExamCount(item,index)">去考试</view>
 								<view v-else>
 								<view class="btn test-disabled" v-if="goTest(item)" @click="goExamCount(item,index)">去考试</view>
 								<view class="btn test-disabled"  v-else-if="item.handStatus">已考试</view>

+ 8 - 1
pages5/mockExam/examApply.vue

@@ -1,7 +1,10 @@
 <template>
 <!-- 模考报名页面 -->
     <view class="exam_apply">
-        <nav-bar title="模考报名"></nav-bar>
+        <image mode="widthFix" class="mock_bg" src="/pages5/static/mock_bg.png"></image>
+		<u-navbar :is-back="false" title="模考报名" :border-bottom="false"  title-color="#333333" back-icon-color="#ffffff">
+		</u-navbar>
+        <!-- <nav-bar title="模考报名"></nav-bar> -->
         <u-line color="#D6D6DB" />
         <view class="mains">
             <u-form :model="examform" ref="uForm" :rules="rules" label-width='74'>
@@ -232,6 +235,10 @@ page {
 .exam_apply {
     width: 100%;
     height: 100%;
+    .mock_bg {
+        width: 100%;
+        height: 760rpx;
+    }
     .mains {
         padding: 16rpx;
         background-color: #F7F7F9;

二進制
pages5/static/mock_bg.png