chenxiong преди 3 години
родител
ревизия
04c44ad4e9
променени са 4 файла, в които са добавени 11 реда и са изтрити 9 реда
  1. 2 2
      common/request.js
  2. 1 1
      pages2/exam/exam_appointment.vue
  3. 3 1
      pages2/invoice/index.vue
  4. 5 5
      pages2/msg/detail.vue

+ 2 - 2
common/request.js

@@ -5,8 +5,8 @@ import api from './api.js'
 var num = 1
 //接口api   
 // export const BASE_URL = 'https://api.xyyxt.net'   //release
-export const BASE_URL = 'http://120.79.166.78:19009'   //预发布
-// export const BASE_URL = 'http://42.192.164.187:19005'    //test 
+// export const BASE_URL = 'http://120.79.166.78:19009'   //预发布
+export const BASE_URL = 'http://42.192.164.187:19005'    //test 
 // export const BASE_URL = 'http://192.168.1.222:5055'    //dev
 
  //图片上传api

+ 1 - 1
pages2/exam/exam_appointment.vue

@@ -75,7 +75,7 @@
 					</view>
 					<view class="item">
 						报考专业:
-						<text class="val">{{ activeList.categoryName }}</text>
+						<text class="val">{{ activeList.categoryName || ''}}</text>
 					</view>
 					<view class="item">
 						考试地点:

+ 3 - 1
pages2/invoice/index.vue

@@ -231,11 +231,13 @@
 											<view slot="title">发票抬头:</view>
 											<text>{{invoiceDetail.invoiceTitle}}</text>
 										</u-cell-item>
-										<template v-if="invoiceDetail.type == 2">
+										<template v-if="invoiceDetail.subject == 2">
 											<u-cell-item :border-bottom="false" hover-class="none" :arrow="false">
 												<view slot="title">纳税登记号:</view>
 												<text>{{invoiceDetail.taxRegistryNumber || ''}}</text>
 											</u-cell-item>
+										</template>
+										<template v-if="invoiceDetail.type == 2">
 											<u-cell-item :border-bottom="false" hover-class="none" :arrow="false">
 												<view slot="title">单位地址:</view>
 												<text>{{invoiceDetail.companyAddress || ''}}</text>

+ 5 - 5
pages2/msg/detail.vue

@@ -97,10 +97,10 @@ export default {
 						let currentTime = this.$method.timest();
 						console.log(currentTime)
 						console.log(item)
-						console.log(item.studyStartTime)
-						console.log(item.studyEndTime)
-						console.log(currentTime < item.studyStartTime || currentTime > item.studyEndTime)
-						if(currentTime < item.studyStartTime || currentTime > item.studyEndTime) {
+						console.log(item.serviceStartTime)
+						console.log(item.serviceEndTime)
+						console.log(currentTime < item.serviceStartTime || currentTime > item.serviceEndTime)
+						if(currentTime < item.serviceStartTime || currentTime > item.serviceEndTime) {
 							uni.showToast({
 								title:'不在学习有效期,不可以学习了哦',
 								icon:'none'
@@ -140,7 +140,7 @@ export default {
 							return;
 						}
 						
-						if(item.gradeStatus == 1 && item.status == 1 && (item.studyEndTime > currentTime) &&  (item.classEndTime && (item.classEndTime < currentTime)) && (item.periodStatus == 0 || item.periodStatus == -1) && item.studyCount > 0) {
+						if(item.gradeStatus == 1 && item.status == 1 && (item.serviceEndTime > currentTime) &&  (item.classEndTime && (item.classEndTime < currentTime)) && (item.periodStatus == 0 || item.periodStatus == -1) && item.studyCount > 0) {
 							
 							uni.showModal({
 								title:'提示',