up

miniprogram/config.js

@@ -5,29 +5,29 @@
 
 module.exports = {
   // 版本号
-  app_version: "v1.9.7",
+  app_version: "v1.9.8",
   // laf后台服务地址
   laf_url: 'https://cohbpk.mplaf.sysucats.com:9443',
   // laf后台服务地址（开发环境），一般和上面一致就好
-  laf_dev_url: 'https://y37csy.lafyun.com:443',
+  laf_dev_url: 'https://cohbpk.mplaf.sysucats.com:9443',
   // 使用私有的腾讯云cos存储，需要url签名
   use_private_tencent_cos: false,
 
   // 科普页图片
   science_imgs: [
-    "https://oss.lafyun.com/y37csy-cat/系统/科普1.png",
-    "https://oss.lafyun.com/y37csy-cat/系统/科普2.png",
-    "https://oss.lafyun.com/y37csy-cat/系统/科普3.png",
-    "https://oss.lafyun.com/y37csy-cat/系统/科普4.png",
-    "https://oss.lafyun.com/y37csy-cat/系统/科普5.png"
+    "https://oss.mplaf.sysucats.com:9443/cohbpk-cat/系统/科普1.png",
+    "https://oss.mplaf.sysucats.com:9443/cohbpk-cat/系统/科普2.png",
+    "https://oss.mplaf.sysucats.com:9443/cohbpk-cat/系统/科普3.png",
+    "https://oss.mplaf.sysucats.com:9443/cohbpk-cat/系统/科普4.png",
+    "https://oss.mplaf.sysucats.com:9443/cohbpk-cat/系统/科普5.png"
   ],
 
   // 赞赏码图片
-  reward_img: "https://oss.lafyun.com/y37csy-cat/系统/赞赏码.jpg",
+  reward_img: "https://oss.mplaf.sysucats.com:9443/cohbpk-cat/系统/赞赏码.jpg",
   // 新猫问卷图片
-  feedback_wj_img: "https://oss.lafyun.com/y37csy-cat/系统/新猫问卷.png",
+  feedback_wj_img: "https://oss.mplaf.sysucats.com:9443/cohbpk-cat/系统/新猫问卷.png",
   // 小程序菊花码图片
-  mpcode_img: "https://oss.lafyun.com/y37csy-cat/系统/菊花码.jpg",
+  mpcode_img: "https://oss.mplaf.sysucats.com:9443/cohbpk-cat/系统/菊花码.jpg",
 
   // 首页banner广告
   ad_genealogy_banner: "adunit-9a7dcb84fe2c4db1",

miniprogram/pages/genealogy/genealogy.js

@@ -128,7 +128,7 @@ Page({
     await this.loadNews();
 
     // 设置广告ID
-    const ads = await getGlobalSettings('ads');
+    const ads = await getGlobalSettings('ads') || {};
     this.setData({
       ad: {
         banner: ads.genealogy_banner
@@ -501,17 +501,17 @@ Page({
     });
   },
   // 点击category filter，全选/反选该类下所有sub
-  fClickCategory: async function (e) {
+  fClickCategory: async function (e, singleChoose) {
+    console.log(e);
     var filters = this.data.filters;
     var {index, filters_sub} = e.target.dataset;
     if (filters_sub == undefined) {
       filters_sub = this.data.filters_sub;
     }
 
-    console.log(e);
     const all_active = !filters[filters_sub].category[index].all_active;
     var category = filters[filters_sub].category[index];
-    if (index == 0) { // 默认第0个是'全部'
+    if (index == 0 || singleChoose) { // 默认第0个是'全部'
       for (let i = 0, len = filters[filters_sub].category.length; i < len; ++i) { // 把所有项反激活
         var ctg = filters[filters_sub].category[i];
         ctg.all_active = false;
@@ -696,7 +696,7 @@ Page({
       console.log("Page is locking");
       return false;
     }
-    await this.fClickCategory(e);
+    await this.fClickCategory(e, true);
     await this.fComfirm();
   },
   // 发起文字搜索

miniprogram/pages/info/devTeam/devTeam.js

@@ -11,6 +11,13 @@ Page({
     text_cfg: text_cfg,
     github_link: "https://github.com/sysucats/zhongdamaopu",
     update_log: [{
+      version: "v1.9.8",
+      content: [
+        "修复了一些问题",
+        "首页外显校区选项改成单选"
+      ],
+      time: "2023/1/11"
+    }, {
       version: "v1.9.7",
       content: [
         "猫猫照片可以移动了",

miniprogram/pages/info/reward/reward.js

@@ -28,7 +28,7 @@ Page({
     });
 
     // 设置广告ID
-    const ads = await getGlobalSettings('ads');
+    const ads = await getGlobalSettings('ads') || {};
 
     // 在页面onLoad回调事件中创建激励视频广告实例
     var that = this;

miniprogram/pages/recognize/recognize.js

@@ -70,7 +70,7 @@ Page({
     this.checkAuth();
 
     // 设置广告ID
-    const ads = await getGlobalSettings('ads');
+    const ads = await getGlobalSettings('ads') || {};
     this.setData({
       ad: {
         banner: ads.recognize_banner