From 82c9cca892d17a564f91a6cf648d0b1cd85325e2 Mon Sep 17 00:00:00 2001
From: jianglong <jianglong@123.com.cn>
Date: Tue, 30 Apr 2024 14:58:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/user.js                            |   1 +
 bundle/pages/user/vip.vue              |  29 +++++++
 components/components/explore.vue      |   9 +--
 components/components/like-header.vue  |  10 +--
 components/components/organ.vue        |  25 +++---
 components/components/team.vue         |  16 ++--
 components/tab/tab.vue                 |   2 -
 components/tabs/tabs.vue               |   6 +-
 pages.json                             |  59 ++++++++++++++
 pages/community/community.vue          |  13 ++-
 pages/community/organ_team_details.vue |  16 +++-
 pages/news_list/news_list.vue          |   5 +-
 pages/resource_list/resource_list.vue  | 142 +++++++++++++++++++++++++++------
 static/images/icon_toutiao.png         | Bin 5952 -> 6442 bytes
 store/modules/city.js                  |   4 +-
 15 files changed, 260 insertions(+), 77 deletions(-)

diff --git a/api/user.js b/api/user.js
index 4c0e49c..92dbb38 100644
--- a/api/user.js
+++ b/api/user.js
@@ -348,3 +348,4 @@ export function organDetail(id) {
 	return request.get('user/organDetail', {params:{id}})
 }
 
+
diff --git a/bundle/pages/user/vip.vue b/bundle/pages/user/vip.vue
index 8dc3976..864c084 100644
--- a/bundle/pages/user/vip.vue
+++ b/bundle/pages/user/vip.vue
@@ -264,6 +264,22 @@
 				getUserShip().then(res => {
 					let data = res.data;
 					this.memberType = data;
+					console.log("套餐数据",data.length)
+					if (data.length > 0 ){
+						let svip = data[0]
+						console.log("套餐数据",svip)
+						this.type = svip.type;
+						this.svip = svip;
+						this.totalPrice = svip.pre_price
+						this.mc_id = svip.id
+						this.org_id = svip.id
+						getUserVipTime({
+							id: svip.id,
+						}).then(res => {
+							this.memberEndTime = res.data.time;
+						});
+					}
+					
 				}).catch(err => {
 				
 				});
@@ -342,6 +358,12 @@
 			    });
 			},
 			async orderFreeBuyFun() {
+				if(!this.org_id){
+					this.$toast({
+						title: "请选择会员套餐"
+					})
+					return;
+				}
 				 const submitObj = {
 				     org_id: this.org_id //当前免费开通的id
 				 };
@@ -368,6 +390,13 @@
 			
 			async orderBuyFun() {
 				//支付中状态改为true 防止继续购买
+				if(!this.org_id){
+					this.$toast({
+						title: "请选择会员套餐"
+					})
+					return;
+				}
+				
 				this.inPay = true;
 				 const submitObj = {
 				     org_id: this.org_id //当前购买的资料id
diff --git a/components/components/explore.vue b/components/components/explore.vue
index 9a0a985..639a050 100644
--- a/components/components/explore.vue
+++ b/components/components/explore.vue
@@ -13,14 +13,14 @@
         <view class="content" v-if="type==1">
             <tabs :current="current" @change="changeTabs" height="100" >
                 <tab v-for="(item, index) in tabList1" :key="index" :name="item.name">
-                    <lists :cateId="item.id" :typeId="1" :i="index" :index="current"></lists>
+                    <lists :cateId="item.id" :typeId="1" ></lists>
                 </tab>
             </tabs>
         </view>
 		<view class="content" v-if="type==0">
 		    <tabs :current="current" @change="changeTabs" height="100" >
 		        <tab v-for="(item, index) in tabList" :key="index" :name="item.name">
-		            <lists :cateId="item.id" :typeId="0" :i="index" :index="current"></lists>
+		            <lists :cateId="item.id" :typeId="0" ></lists>
 		        </tab>
 		    </tabs>
 		</view>
@@ -56,7 +56,7 @@
 				    name: '全部',
 				    id: ''
 				}],
-                current: 0.,
+                current: 0,
 				type:this.active == 2?0:1,
 				cate_id : 0,
             }
@@ -126,10 +126,9 @@
 							    id: ''
 							}, ...res.data]
 						}
-						console.log("cate数据:",this.cid)
 						this.tabList1.forEach((item, index) => {
 							if(this.cid>0 && item.id == this.cid){
-								this.current = index
+								this.current = index+1
 							}
 						})
                     } else {
diff --git a/components/components/like-header.vue b/components/components/like-header.vue
index be21f41..e3f582b 100644
--- a/components/components/like-header.vue
+++ b/components/components/like-header.vue
@@ -15,14 +15,7 @@
 			<view class="mainnav--item" :class="{'active': current === 2}" @click="changeNav(2)">
 			    <text>需求</text>
 			</view>
-			
-		<!-- 	<view class="mainnav--item" :class="{'active': current === 3}" @click="changeNav(3)">
-			    <text>机构</text>
-			</view>
-			
-			<view class="mainnav--item" :class="{'active': current === 4}" @click="changeNav(4)">
-			    <text>专家</text>
-			</view> -->
+		
 			
         </view>
         <view class="user flex row-right">
@@ -65,7 +58,6 @@
         },
         methods: {
             changeNav(index) {
-				console.log("当前页面cid",this.cid)
                 if(!this.isLogin) return this.$Router.push('/pages/login/login')
                 this.$emit('change', index);
             }
diff --git a/components/components/organ.vue b/components/components/organ.vue
index 0880d03..6f3e432 100644
--- a/components/components/organ.vue
+++ b/components/components/organ.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="news-list organ">
-		<mescroll-body ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
-			:up="upOption">
+		<mescroll-body ref="mescrollRef1" @init="mescrollInit" @down="downCallback2" @up="upCallback2"
+			:up="upOption1">
 			<view class="contain">
 				<view class="banner">
 					<ad-swipers  :pid="32" height="340rpx">
@@ -27,7 +27,7 @@
 									<view class="info flex-1">
 										<view class="title lg line-2 m-b-20">{{ item.name }}</view>
 										<view class="lighter line-2">
-											<view>{{ item.intro }}</view>
+											<view>检测站之一：{{ item.intro }}</view>
 										</view>
 										<view class="flex row-between m-t-20 price">
 											<view class="xs muted">区域: <text style="color: red;">{{item.address}}</text></view>
@@ -53,6 +53,7 @@
 </template>
 
 <script>
+	
 	import {
 		mapGetters,
 		mapActions
@@ -66,12 +67,12 @@
 		props: {
 		    active: {
 		        type: Number
-		    }
+		    },
 		},
 		data() {
 			return {
 				active: 0,
-				upOption: {
+				upOption1: {
 					auto: false,
 					empty: {
 						icon: '/static/images/news_null.png',
@@ -93,7 +94,7 @@
 			cityInfo(){
 				console.log(111)
 				// 选择城市后是否刷新
-				this.downCallback();
+				this.downCallback2();
 			}
 		},
 		async onShow() {
@@ -101,7 +102,7 @@
 				title: '检测机构'
 			});
 			// 选择城市后是否刷新
-			await this.downCallback();
+			await this.downCallback2();
 		},
 		
 		async onLoad(options) {
@@ -110,7 +111,7 @@
 				title: '检测机构'
 			});
 			// 选择城市后是否刷新
-			await this.downCallback();
+			await this.downCallback2();
 		
 		},
 
@@ -120,10 +121,12 @@
 				this.newsList = [] // 先置空列表,显示加载进度
 				this.mescroll.resetUpScroll() // 再刷新列表数据
 			},
-			async downCallback() {
+			async downCallback2() {
+				console.log(1122334455)
 				this.mescroll.resetUpScroll();
 			},
-			upCallback(page) {
+			upCallback2(page) {
+				console.log("organPage",1111)
 				let {
 					cityInfo,
 					isLogin,
@@ -145,6 +148,8 @@
 					let curPageLen = curPageData.length;
 					let hasNext = !!data.more;
 					this.newsList = this.newsList.concat(curPageData);
+					console.log(hasNext,"是否下一页")
+					console.log(curPageLen,"curPageLen")
 					this.mescroll.endSuccess(curPageLen, hasNext);
 				}).catch(() => {
 					this.mescroll.endErr()
diff --git a/components/components/team.vue b/components/components/team.vue
index 80e8e84..381a47f 100644
--- a/components/components/team.vue
+++ b/components/components/team.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="news-list team">
-		<mescroll-body ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
-			:up="upOption">
+		<!-- <mescroll-body ref="mescrollRef2" @init="mescrollInit" @down="downCallback3" @up="upCallback3"
+			:up="upOption"> -->
 			<view class="contain">
 				<view class="banner">
 					<ad-swipers  :pid="31" height="340rpx">
@@ -48,7 +48,7 @@
 				</view>
 			</view>
 
-		</mescroll-body>
+		<!-- </mescroll-body> -->
 	</view>
 </template>
 
@@ -91,7 +91,7 @@
 		    },
 			cityInfo(){
 				// 选择城市后是否刷新
-				this.downCallback();
+				this.downCallback3();
 			}
 		},
 		async onShow() {
@@ -99,7 +99,7 @@
 				title: '专家信息'
 			});
 			// 选择城市后是否刷新
-			await this.downCallback();
+			await this.downCallback3();
 		},
 		
 		async onLoad(options) {
@@ -107,7 +107,7 @@
 				title: '专家信息'
 			});
 			// 选择城市后是否刷新
-			await this.downCallback();
+			await this.downCallback3();
 		
 		},
 
@@ -117,10 +117,10 @@
 				this.newsList = [] // 先置空列表,显示加载进度
 				this.mescroll.resetUpScroll() // 再刷新列表数据
 			},
-			async downCallback() {
+			async downCallback3() {
 				this.mescroll.resetUpScroll();
 			},
-			upCallback(page) {
+			upCallback3(page) {
 				let {
 					cityInfo,
 					isLogin,
diff --git a/components/tab/tab.vue b/components/tab/tab.vue
index 49078de..66b6a23 100644
--- a/components/tab/tab.vue
+++ b/components/tab/tab.vue
@@ -25,8 +25,6 @@
 			}
 		},
 		created(){
-			console.log('this----------------')
-			console.log(this.tabs.childrens)
 			this.tabs.childrens=[]
 		},
 		// mounted () {
diff --git a/components/tabs/tabs.vue b/components/tabs/tabs.vue
index cdf8656..c92254d 100644
--- a/components/tabs/tabs.vue
+++ b/components/tabs/tabs.vue
@@ -122,7 +122,7 @@
             // 是否显示底部的滑块
             showBar: {
                 type: Boolean,
-                default: true
+                default: false
             },
             // 底部滑块的自定义样式
             barStyle: {
@@ -159,7 +159,7 @@
             // 异步使用：需手动更改这个值才能点击
             async: {
                 type: Boolean,
-                default: false
+                default: true
             }
         },
         provide() {
@@ -185,6 +185,7 @@
             // 监听tab的变化，重新计算tab菜单的布局信息，因为实际使用中菜单可能是通过
             // 后台获取的（如新闻app顶部的菜单），获取返回需要一定时间，所以list变化时，重新获取布局信息
             list(n, o) {
+				console.log("接受到的数组",this.list)
                 // list变动时，重制内部索引，否则可能导致超出数组边界的情况
                 if (!this.barFirstTimeMove && n.length !== o.length) {
                     this.currentIndex = 0;
@@ -256,7 +257,6 @@
         },
         methods: {
             updateTabs() {
-				console.log(this.childrens)
                 this.list = this.childrens.map((item) => {
                     const {
                         name,
diff --git a/pages.json b/pages.json
index 0dd6cac..4d6875c 100644
--- a/pages.json
+++ b/pages.json
@@ -1,5 +1,6 @@
 {
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
+		
 		{
 			"path": "pages/index/index",
 			"name": "index",
@@ -241,6 +242,41 @@
 			"root": "bundle",
 			"pages": [
 				{
+					"path": "pages/user/team",
+					"name": "user_team",
+					"meta": {
+						"auth": false,
+						"keepScroll": true
+					},
+					"style": {
+						"navigationBarTitleText": "专家申请",
+						"disableScroll": true
+					}
+				},	
+				{
+					"path": "pages/user/team_recode",
+					"name": "team_recode",
+					"meta": {
+						"auth": false,
+						"keepScroll": true
+					},
+					"style": {
+						"navigationBarTitleText": "专家申请记录",
+						"disableScroll": true
+					}
+				},{
+					"path": "pages/user/team_result",
+					"name": "team_result",
+					"meta": {
+						"auth": false,
+						"keepScroll": true
+					},
+					"style": {
+						"navigationBarTitleText": "专家申请结果",
+						"disableScroll": true
+					}
+				},	
+				{
 					"path": "pages/user/organ",
 					"name": "user_organ",
 					"meta": {
@@ -871,6 +907,28 @@
             "root": "bundle_b",
             "pages": [
 				{
+					"path": "pages/resource_list/ogran_list",
+					"name": "ogran_list",
+					"meta": {
+						"auth": false,
+						"keepScroll": true
+					},
+					"style": {
+						"navigationBarTitleText": "机构"
+					}
+				},
+				{
+					"path": "pages/resource_list/team_list",
+					"name": "team_list",
+					"meta": {
+						"auth": false,
+						"keepScroll": true
+					},
+					"style": {
+						"navigationBarTitleText": "专家"
+					}
+				},
+				{
 					"path": "pages/resource_search/resource_search",
 					"meta": {
 						"auth": true
@@ -879,6 +937,7 @@
 						"navigationBarTitleText": "资料搜索"
 					}
 				},
+				
 				{
 					"path": "pages/confirm_order/confirm_order",
 					"meta": {
diff --git a/pages/community/community.vue b/pages/community/community.vue
index 992bd86..506b165 100644
--- a/pages/community/community.vue
+++ b/pages/community/community.vue
@@ -20,25 +20,24 @@
         	    <view class="muted mt20">当前页面暂无内容～</view>
         	</view>
         </template>
-		<tabbar></tabbar>
+		<!-- <tabbar></tabbar> -->
     </view>
 </template>
 
 <script>
     import LikeHeader from "../../components/components/like-header.vue"
     import Explore from "../../components/components/explore.vue"
-	// import Xuqiu from "../../components/components/xuqiu.vue"
-	import Organ from "../../components/components/organ.vue"
+	// import Organ from "../../components/components/organ.vue"
     import Follow from "../../components/components/follow.vue"
-	import Team from "../../components/components/team.vue"
+	// import Team from "../../components/components/team.vue"
     export default {
         components: {
             LikeHeader,
             Explore,
             Follow,
 			// Xuqiu,
-			Organ,
-			Team
+			// Organ,
+			// Team
         },
         data() {
             return {
@@ -64,7 +63,7 @@
 				let p_cate = params['cate'];
 				
 				if(p_index !=undefined && p_index!=""){
-					this.current = parseInt(p_index)
+					// this.current = parseInt(p_index)
 					this.currentNav = parseInt(p_index)
 				}
 				if(p_cate !=undefined && p_cate!=""){
diff --git a/pages/community/organ_team_details.vue b/pages/community/organ_team_details.vue
index 2c2388d..ff3434b 100644
--- a/pages/community/organ_team_details.vue
+++ b/pages/community/organ_team_details.vue
@@ -7,14 +7,19 @@
 		<view class="title xl m-t-30">{{ articleDetail.name }}</view>
         <view class="row-between">
 			<view class="flex lighter" style="justify-content: space-between;">
-            <view class="xs">公司名称：{{ articleDetail.company }}</view>
+			<view class="xs  m-t-10">所属地区：{{ articleDetail.address }}</view>
             <view class="flex">
                 <image class="icon-sm" src="/static/images/icon_see.png"></image>
                 <view class="m-l-10 xs muted">{{ articleDetail.visit }}人浏览</view>
             </view>
 			</view>
-			<view class="xs lighter m-t-10">地区：{{ articleDetail.address }}</view>
+			<view v-if="type == 1" class="xs lighter m-t-10">所属企业：{{ articleDetail.company }}</view>
 			<view class="xs lighter m-t-10">联系方式：{{ articleDetail.contact }}</view>
+			<view v-if="type == 1 " class="xs lighter m-t-10">专家简介：{{ articleDetail.intro }}</view>
+			<view v-if="type == 0 " class="xs lighter m-t-10">机构位置：{{ articleDetail.address_detail == null ? "":articleDetail.address_detail}}</view>
+			<view v-if="type == 0 " class="xs lighter m-t-10">检测站：{{ articleDetail.intro == null ? "":articleDetail.intro}}</view>
+			<view v-if="type == 0" class="xs lighter m-t-10">检测站联系方式：{{ articleDetail.company == null ? "":articleDetail.company}}</view>
+			<view v-if="type == 0" class="xs lighter m-t-10">检测站位置：{{ articleDetail.jcz_address == null ? "":articleDetail.jcz_address}}</view>
         </view>
 		<!-- <view class="row-between">
 			
@@ -27,7 +32,7 @@
 		</view> -->
     </view>
 	<view class="main">
-	   简介：{{ articleDetail.intro }}
+	   <!-- 简介：{{ articleDetail.intro }} <br> -->
 	   <u-parse  class='m-t-10' :html="article_content" />
 	</view>
    <!-- <view class="main">
@@ -48,7 +53,8 @@ export default {
       showLoading: true,
       articleDetail: {},
       article_content: "",
-	  swiperList:[]
+	  swiperList:[],
+	  type:0
     };
   },
 
@@ -64,10 +70,12 @@ export default {
     this.id = options.id;
 
     if (this.type) {
+	
       uni.setNavigationBarTitle({
         title: '专家详情'
       });
     } else {
+	  this.type = 0
       uni.setNavigationBarTitle({
         title: '机构详情'
       });
diff --git a/pages/news_list/news_list.vue b/pages/news_list/news_list.vue
index cb595e8..a2682f1 100644
--- a/pages/news_list/news_list.vue
+++ b/pages/news_list/news_list.vue
@@ -10,7 +10,6 @@
 					</ad-swipers>
 				</view>
 				<tabs :current="active" @change="changeActive" :bar-width="60">
-					<tab name="全部"></tab>
 					<tab v-for="(item, index) in categoryList" :key="index" :name="item.name"></tab>
 				</tabs>
 				<view class="main">
@@ -102,7 +101,7 @@
 				const { type, active, categoryList } = this
 				getArticleList({
 					type: this.type,
-					cid: this.active ? categoryList[active - 1].id : '',
+					cid: this.active ? categoryList[active].id : '',
 					page_size:page.size,
 					page_no:page.num
 				}).then(({
@@ -130,7 +129,7 @@
 					console.log("类型：",this.cid)
 					this.categoryList.forEach((item, index) => {
 						if(this.cid>0 && item.id == this.cid){
-							this.active = index+1
+							this.active = index
 							console.log("active：",this.active)
 						}
 					})
diff --git a/pages/resource_list/resource_list.vue b/pages/resource_list/resource_list.vue
index a9d1479..8903bb3 100644
--- a/pages/resource_list/resource_list.vue
+++ b/pages/resource_list/resource_list.vue
@@ -44,9 +44,15 @@
 					</ad-swipers>
 				</view>
 				<tabs :current="active" @change="changeActive" :bar-width="60">
-					<tab name="全部"></tab>
+					<!-- <tab name="全部"></tab> -->
 					<tab v-for="(item, index) in categoryList" :key="index" :name="item.name"></tab>
 				</tabs>
+				
+				<tabs  v-if="categoryList2.length" :current="active2" @change="changeActive2" :bar-width="60">
+					<!-- <tab name="全部"></tab> -->
+					<tab v-for="(item, index) in categoryList2" :key="index" :name="item.name"></tab>
+				</tabs>
+				
 				<view class="main">
 					<view class="article-list">
 						<view class="article-item bg-white"  v-for="(item, index) in newsList" :key="index" >
@@ -83,8 +89,8 @@
 </template>
 
 <script>
-	import Organ from "../../components/components/organ.vue"
-	import Team from "../../components/components/team.vue"
+	// import Organ from "../../components/components/organ.vue"
+	// import Team from "../../components/components/team.vue"
 	
 	import {
 		mapGetters,
@@ -96,16 +102,17 @@
 	} from '@/api/store';
 	import MescrollMixin from "@/components/mescroll-uni/mescroll-mixins";
 	export default {
-		components: {
-			Organ,
-			Team
-		},
+		// components: {
+		// 	Organ,
+		// 	Team
+		// },
 		mixins: [MescrollMixin],
 		data() {
 			return {
 				current:1,
 				currentNav:1,
 				active: 0,
+				active2: 0,
 				upOption: {
 					auto: false,
 					empty: {
@@ -114,7 +121,9 @@
 					}
 				},
 				cid:0,
+				cid2:0,
 				categoryList: [],
+				categoryList2: [],
 				newsList: [],
 				type: -1,
 				cate_type:0,
@@ -123,15 +132,15 @@
 
 		async onShow() {
 			console.log(111)
-			this.categoryList = [],
-			this.type =  0;
-			this.cate_type =  0;
+			// this.categoryList = [],
+			// this.type =  0;
+			// this.cate_type =  0;
 			uni.setNavigationBarTitle({
 				title: '资料库'
 			});
-			this.cid = 0
-			this.current = 1
-			this.currentNav = 1
+			// this.cid = 0
+			// this.current = 1
+			// this.currentNav = 1
 			
 			let queryString = uni.getStorageSync("params") 
 			uni.removeStorageSync("params")
@@ -153,15 +162,21 @@
 				if(p_index !=undefined && p_index!=""){
 					this.current = parseInt(p_index)
 					this.currentNav = parseInt(p_index)
+				}else{
+					this.current = 1
+				    this.currentNav = 1
 				}
 				
 				if(p_cate !=undefined && p_cate!=""){
 					this.cid = parseInt(p_cate)
+				}else{
+					this.cid = 0
 				}
 				
 				if(cate_type !=undefined && cate_type!=""){
 					this.cate_type = parseInt(cate_type)
 					this.active = 0
+					this.active2 = 0
 					if(this.cate_type == 1){
 						uni.setNavigationBarTitle({
 							title: '全国案例'
@@ -169,9 +184,18 @@
 					}
 				}
 				
+			}else if(queryString == ""){
+				this.cid = 0
+				this.current = 1
+				this.currentNav = 1
+				this.categoryList = [],
+				this.type =  0;
+				this.cate_type =  0;
 			}
 			
-		
+			
+			console.log("this.cate_type :",this.cate_type,this.cate_type )
+		    console.log("this.active :",this.current,this.currentNav )
 			// 选择城市后是否刷新
 			await this.downCallback();
 		},
@@ -190,26 +214,50 @@
 
 		methods: {
 			changeNav(index){
-				this.current = index
-				this.currentNav = index
-				console.log("此时数据：",this.currentNav)
+				if(index == 1){
+					this.current = index
+					this.currentNav = index
+					console.log("此时数据：",this.currentNav)
+					this.mescroll.resetUpScroll();
+				}else if(index == 3){
+				
+					uni.navigateTo({
+						url: "/bundle_b/pages/resource_list/ogran_list"
+					});
+				}
+				else if(index == 4){
+					uni.navigateTo({
+						url: "/bundle_b/pages/resource_list/team_list"
+					});
+				}
 			},
 			changeActive(e) {
+				this.active2 = 0 ;
 				this.active = e;
 				this.newsList = [] // 先置空列表,显示加载进度
 				this.mescroll.resetUpScroll() // 再刷新列表数据
 			},
+			changeActive2(e) {
+				this.active2 = e;
+				this.newsList = [] // 先置空列表,显示加载进度
+				this.mescroll.resetUpScroll() // 再刷新列表数据
+			},
 			async downCallback() {
 				await this.getCategoryListFun();
-				console.log("后续值",this.categoryList)
-				console.log("后续值2",this.cid)
-				this.mescroll.resetUpScroll();
+				this.mescroll.resetUpScroll();		
 			},
 			upCallback(page) {
-				const { type, active, categoryList } = this
+				const { cityInfo,type, active, categoryList } = this
+				console.log("active:",categoryList[this.active])
+				let city_id=0
+				if(cityInfo.id !=null && cityInfo.id!=undefined && cityInfo.id>0){
+					city_id = cityInfo.id
+				}
 				getResourceList({
 					type: this.type,
-					cid: this.active ? categoryList[active-1].id : '',
+					cid: this.active ? categoryList[this.active].id : '',
+					cid2: this.active2 ? this.categoryList2[this.active2].id : '',
+					city_id:city_id,
 					page_size:page.size,
 					page_no:page.num,
 					cate_type: this.cate_type,
@@ -225,8 +273,44 @@
 				}).catch(() => {
 					this.mescroll.endErr()
 				})
+				this.getCategoryListFun2();
 			},
 	
+			async getCategoryListFun2() {
+				console.log("获取子分类开始",this.active)
+				this.categoryList2 = [];
+				console.log("当前分类",this.categoryList[this.active].id)
+				
+				const {
+					code,
+					data
+				} = await getResourceCategoryList({
+					pid: this.active ? this.categoryList[this.active].id : 999,
+				})
+				
+				if (code == 1 && data.length>0) {
+					this.categoryList2 = [{
+							name: '全部',
+							id: ''
+						}, ...data]
+				}
+				let item = {}
+				
+				this.$nextTick(() => {
+					// 在DOM更新之后使用Vue.set来更新数组
+					this.categoryList2.forEach((item, index) => {
+					  this.$set(this.categoryList2, index, item);
+					});
+				  });
+				
+				this.categoryList2.forEach((item, index) => {
+					if(this.cid2>0 && item.id == this.cid2){
+						this.active2 = index+1	
+					}
+				})
+			},
+
+			
 			async getCategoryListFun() {
 				this.categoryList = [];
 				console.log("当前分类",this.categoryList)
@@ -242,7 +326,10 @@
 				})
 				
 				if (code == 1) {
-					this.categoryList = data
+					this.categoryList = [{
+							name: '全部',
+							id: ''
+						}, ...data]
 				}
 				let item = {}
 				
@@ -270,7 +357,14 @@
 				
 				this.categoryList.forEach((item, index) => {
 					if(this.cid>0 && item.id == this.cid){
-						this.active = index+1
+						console.log("当前值：{}",this.cate_type)
+						if(this.cate_type == 0){
+							this.active = index+1
+						}else{
+							this.active = index
+						}
+						console.log("当前值：{}",this.active)
+						
 					}
 				})
 				
diff --git a/static/images/icon_toutiao.png b/static/images/icon_toutiao.png
index 9bcae7d54ad2d6a52093c4f52585a698513cbfc8..c22c9485fd708d256712d2d48d534368b6deda86 100644
GIT binary patch
delta 5760
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

delta 5194
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
Eg5R}<xBvhE

diff --git a/store/modules/city.js b/store/modules/city.js
index 49bf069..7b4b9a5 100644
--- a/store/modules/city.js
+++ b/store/modules/city.js
@@ -75,11 +75,11 @@ const actions = {
     },
 	// 逆解析地址
 	getGeocoderFunc({ commit }, location) {
-		console.log(location)
+		console.log(location,123123)
 		getGeocoder({ ...location }).then(res => {
 			console.log(res)
 			if( res.code == 1 ) {
-				if(res.data == []){
+				if(res.data.length==0  ){
 					return;
 				}
 				const result = res.data.result