diff --git a/config/baseUrl.js b/config/baseUrl.js
index 112a8e5..e58b8b5 100644
--- a/config/baseUrl.js
+++ b/config/baseUrl.js
@@ -2,12 +2,12 @@ let baseUrl = "";
let socketUrl = "";
if (process.env.NODE_ENV === 'development') {
//开发环境
- // baseUrl = "https://api.nuttyreading.com/"; // 线上正式
- baseUrl = "http://192.168.110.100:9200/pb/"; // 张川川
+ baseUrl = "https://api.nuttyreading.com/"; // 线上正式
+ //baseUrl = "http://192.168.110.100:9200/pb/"; // 张川川
} else if (process.env.NODE_ENV === 'production') {
//生产环境
- // baseUrl = "https://api.nuttyreading.com/";
- baseUrl = "http://192.168.110.100:9200/pb/"; // 张川川
+ baseUrl = "https://api.nuttyreading.com/";
+ //baseUrl = "http://192.168.110.100:9200/pb/"; // 张川川
}
const courtConfig = {
//微信公众号APPID
diff --git a/manifest.json b/manifest.json
index 172b059..a7059df 100644
--- a/manifest.json
+++ b/manifest.json
@@ -13,8 +13,8 @@
}
],
"sassImplementationName" : "node-sass",
- "versionName" : "1.2.79",
- "versionCode" : 1279,
+ "versionName" : "1.2.81",
+ "versionCode" : 1281,
"app-plus" : {
"compatible" : {
"ignoreVersion" : true
diff --git a/pages/peanut/home.vue b/pages/peanut/home.vue
index f77c2e6..15d029b 100644
--- a/pages/peanut/home.vue
+++ b/pages/peanut/home.vue
@@ -120,13 +120,13 @@
- {{ item.title }}
-
{{ item.title }}
@@ -347,6 +347,8 @@
yxCurIndex: 0, // 当前营销标签序号
SystemInfoSync: {}, // 屏幕尺寸
newsList: [], // 播报新闻列表
+ catTagIndex: 0,
+ curChildrenIndex: 0
};
},
onPageScroll(e) {
@@ -471,7 +473,7 @@
},
requestAll() {
this.getUserInfo();
- this.tjProList = [];
+ // this.tjProList = [];
uni.hideTabBar();
// this.getData();
this.getTags();
@@ -584,9 +586,11 @@
if (this.catTagList[0].isLast == 1) {
this.getJtData(this.catTagList[0].id);
} else {
- this.childrenCatList = this.catTagList[0].children;
- this.curChildrenId = this.childrenCatList[0].id;
- this.getJtData(this.childrenCatList[0].id);
+ const currentCatTag = this.catTagList?.[this.catTagIndex];
+ this.childrenCatList = currentCatTag.children.length > 0 ? currentCatTag.children : currentCatTag;
+ this.curChildrenId = this.childrenCatList[this.curChildrenIndex]?.id || this.childrenCatList.id;
+ //this.getJtData(this.childrenCatList[this.curChildrenIndex]?.id);
+ this.getJtData(this.curChildrenId);
}
}
})
@@ -597,11 +601,13 @@
// 二级分类点击
childrenChange(item, index) {
// console.log(item,this.curChildrenId,'点击')
+ this.curChildrenIndex = index;
this.curChildrenId = this.childrenCatList[index].id;
this.getJtData(this.childrenCatList[index].id);
},
tabsChange(item, cindex) {
// this.tjProList = []
+ this.catTagIndex = cindex;
this.tabsid = item.id;
this.childrenCatList = [];
if (this.catTagList[cindex].isLast == 1) {
@@ -610,6 +616,7 @@
this.childrenCatList = this.catTagList[cindex].children;
this.curChildrenId = this.childrenCatList[0].id;
this.getJtData(this.childrenCatList[0].id);
+ this.curChildrenIndex = 0
}
// this.getJtData()
// if (this.tabsid == 15) {
@@ -1214,7 +1221,7 @@
color: #0e583a;
font-size: 34rpx;
line-height: 42rpx;
- padding: 5px 10px;
+ padding: 10rpx 0 14rpx 10rpx;
font-weight: bold;
display: block;
width: 100%;
@@ -1223,6 +1230,7 @@
overflow: hidden;
text-align: center;
letter-spacing: 10rpx;
+ width: 3.5em;
}
text:last-child {