db 3 anni fa
parent
commit
41fb1095b2

+ 2 - 2
config/config.js

@@ -1,6 +1,6 @@
 
- export const baseUrl = 'http://8.136.199.33:8500/api';//小程序开发接口地址
-//export const baseUrl = 'https://cygx.hzinsights.com/api';//小程序线上接口地址
+ //export const baseUrl = 'http://8.136.199.33:8500/api';//小程序开发接口地址
+export const baseUrl = 'https://cygx.hzinsights.com/api';//小程序线上接口地址
 // #ifdef H5
 export const H5baseUrl=process.env.NODE_ENV === 'development'?window.location.origin+'/':baseUrl
 // #endif

+ 2 - 2
pages/reportDetail/reportDetail.vue

@@ -61,8 +61,8 @@
 				reportInfo:'',
 				//linkurl:'http://192.168.1.61:2000/raiReportDtl',//链接地址
 				// linkurl:'http://8.136.199.33:8088/raiReportDtl',//链接地址
-				//linkurl:'https://details.hzinsights.com/raiReportDtl',//线上链接地址
-				linkurl:' http://192.168.1.155:2000/raiReportDtl',//链接地址
+				linkurl:'https://details.hzinsights.com/raiReportDtl',//线上链接地址
+				//linkurl:' http://192.168.1.155:2000/raiReportDtl',//链接地址
 				showNav:false,
 				id:'',
 				idReport:null,

+ 6 - 6
pages/reportForm/reportForm.vue

@@ -58,13 +58,13 @@
      </view>
      <view></view>
      </view>
-     <view class="industry-box" @click="isClickHandle(tradeList.CategoryId)">
+     <view class="industry-box" @click="isClickHandle(item.CategoryId)" v-for="item in tradeList" :key="item.CategoryId">
        <view class="box-left">
-         {{tradeList.SubCategoryName}}
-         <text v-if="tradeList.IsRed"></text>
+         {{item.MatchTypeName}}
+         <text v-if="item.IsRed"></text>
        </view>
        <view class="box-right">
-         <text>{{tradeList.UpdateTime}}更新</text>
+         <text>{{item.UpdateTime}}更新</text>
         	<u-icon name="arrow-right" color="#BDBDBD" size="34"></u-icon>
        </view>
      </view>
@@ -164,7 +164,7 @@
 		strategyIndex:null,
 		strategyIndexTwo:0,
 		isSwitchover:1,
-		tradeList:null,
+		tradeList:[],
 		OrderColumn:'',
 		industryList:[],
 		loadText: {
@@ -275,7 +275,7 @@
 		  }).then(res=>{
 			  if(res.Ret==200){
 				  if(res.Data.List){
-					  this.tradeList=res.Data.List[0]
+					  this.tradeList=res.Data.List
 				  }else{
 					   this.tradeList=null
 				  }   

+ 11 - 9
pages/search/search.vue

@@ -112,7 +112,7 @@
 				page_no: 1,
 				pageSize: 10,
 				totalPage: 0,
-				orderColumn:'Comprehensive',
+				orderColumn:'Matching',
 				loadText:{
 					loadmore: '上拉加载更多',
 					loading: '加载中',
@@ -121,15 +121,17 @@
 				status:'loadmore',
 				tabAct_id: 1,
 				isTabAct:true,
-				tabBars: [{
-        					PermissionName: '综合排序',
-							ChartPermissionId:1,
-							mode:'Comprehensive'
-        				}, {
+				tabBars: [ {
         					PermissionName: '匹配度排序',
-							ChartPermissionId:2,
+							ChartPermissionId:1,
 							mode:'Matching'
-        				}, {
+        				}, 
+						{
+									PermissionName: '综合排序',
+									ChartPermissionId:2,
+									mode:'Comprehensive'
+								},
+						{
         					PermissionName: '发布时间排序',
 							ChartPermissionId:3,
 							mode:'PublishDate'
@@ -254,7 +256,7 @@
 				
 				this.searchTxt = '';
 				this.isTabAct=false
-				this.orderColumn='Comprehensive'
+				this.orderColumn='Matching'
 				// 
 			},
 			/* 历史搜索清空 */