xuqiaoying 3 سال پیش
والد
کامیت
f08367c737
4فایلهای تغییر یافته به همراه23 افزوده شده و 16 حذف شده
  1. 4 4
      common/request.js
  2. 6 6
      pages/course/index.vue
  3. 8 5
      pages4/courseTopic/goodsTopic.vue
  4. 5 1
      pages5/mockExam/examApply.vue

+ 4 - 4
common/request.js

@@ -4,21 +4,21 @@ import store from '@/store/index.js'
 import api from './api.js'
 var num = 1
 //接口api   
-// export const BASE_URL = 'https://api.xyyxt.net'   //release
+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://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
 // export const BASE_IMG_URL = 'https://file-dev.xyyxt.net/'  //test
 
 // web_view的
-// export const WEBVIEW_URL = 'https://m.xyyxt.net/'  //release
-export const WEBVIEW_URL = 'https://testm.xyyxt.net/'  //预发布
+export const WEBVIEW_URL = 'https://m.xyyxt.net/'  //release
+// export const WEBVIEW_URL = 'https://testm.xyyxt.net/'  //预发布
 // export const WEBVIEW_URL = 'http://120.79.166.78:18001/' // 测试环境
 // export const WEBVIEW_URL = 'http://api.xyyxt.net:6066/'  //预发布(弃用了)
 

+ 6 - 6
pages/course/index.vue

@@ -288,12 +288,12 @@ export default {
 		},
 		active2(item){
 			// console.log('item', item)
-			if (item.topicId) {
-				uni.navigateTo({
-					url: '/pages4/courseTopic/goodsTopic?topicId=' + item.topicId
-				})
-				return
-			}
+			// if (item.topicId) {
+			// 	uni.navigateTo({
+			// 		url: '/pages4/courseTopic/goodsTopic?topicId=' + item.topicId
+			// 	})
+			// 	return
+			// }
 			
 			this.selObj.bId = item.id
 			this.show = false

+ 8 - 5
pages4/courseTopic/goodsTopic.vue

@@ -97,7 +97,7 @@
                 </view>
                 <view class="pop_prices">
                     <text class="price">¥ {{ skuItem.standPrice || 0 }}</text>
-                    <text v-if="skuItem.linePrice" class="lin_price">{{ skuItem.linePrice }}</text>
+                    <text v-if="skuItem.linePrice" class="lin_price">{{ skuItem.linePrice }}</text>
                 </view>
                 <view class="check_con">
                     <scroll-view scroll-y="true" style="height: 550rpx;">
@@ -134,8 +134,8 @@ export default {
             courseNum: 0,
             topicId: '',
             goodsInfo: {},
-            toggleCourseShow: true,
-            courseSku: [1],
+            toggleCourseShow: false,
+            courseSku: [],
             skuItem: {},
             skuIndex: -1,
         }
@@ -153,8 +153,9 @@ export default {
     methods: {
         getgoodsInfo() {
             this.$http({
-                url: `/course/topicPage/get/goodsInfo/${this.topicId}`,
+                url: `/app/common/get/goodsInfo/${this.topicId}`,
                 method: 'get',
+                noToken: true
             }).then((res) => {
                 if (res.data.code == 200) {
                     this.goodsInfo = res.data.data
@@ -190,8 +191,9 @@ export default {
             this.skuItem = {}
             this.skuIndex = -1
             this.$http({
-                url: '/course/topicPage/get/goodsList',
+                url: '/app/common/get/goodsList',
                 method: 'get',
+                noToken: true,
                 data: {
                     subjectType: subjectType,
                     topicId: this.topicId,
@@ -448,6 +450,7 @@ export default {
             color: #999999;
             font-size: 30rpx;
             text-decoration:line-through;
+            margin-left: 8rpx;
         }
     }
     .headers {

+ 5 - 1
pages5/mockExam/examApply.vue

@@ -1,11 +1,12 @@
 <template>
 <!-- 模考报名页面 -->
     <view class="exam_apply">
+        <nav-bar title="模考报名" class="navbar"></nav-bar>
         <!-- background="{ background: '#498AFE' }" -->
         <image class="mock_bg" src="../static/mock_bg.png"></image>
 		<!-- <u-navbar :is-back="false" title="模考报名" :border-bottom="false"  title-color="#fff" back-icon-color="#ffffff" background="{ background: '#498AFE' }">
 		</u-navbar> -->
-        <!-- <nav-bar title="模考报名" class="navbar"></nav-bar> -->
+        
         <!-- <u-line color="#D6D6DB" /> -->
         <view class="mains">
             <u-form :model="examform" ref="uForm" :rules="rules" label-width='74'>
@@ -142,6 +143,9 @@ export default {
             this.activityId = tid.split('=')[1]
             console.log('activityId: ', this.activityId)
             this.getActivity()
+        } else {
+            this.activityId = option.tid
+            this.getActivity()
         }
     },
     onShow() {