瀏覽代碼

🎨 修改细节问题

快乐的梦鱼 1 月之前
父節點
當前提交
c095e4a185

+ 6 - 1
src/api/system/ConfigurationApi.ts

@@ -21,6 +21,11 @@ export const CommonConfigurationConfig = {
 export interface IConfigurationItem {
 export interface IConfigurationItem {
   baseServerUrl: string,
   baseServerUrl: string,
   articleMark: string,
   articleMark: string,
+  articleBorrow: {
+    url: string,
+    text: string,
+    icon: string,
+  },
 }
 }
 
 
 export class ConfigurationApi extends UpdateServerRequestModule<DataModel> {
 export class ConfigurationApi extends UpdateServerRequestModule<DataModel> {
@@ -48,7 +53,7 @@ export class ConfigurationApi extends UpdateServerRequestModule<DataModel> {
         })).data!.data;
         })).data!.data;
     } catch (error) {
     } catch (error) {
       LogUtils.printLog("ConfigurationApi", 'error', '获取配置失败,使用默认配置', error);
       LogUtils.printLog("ConfigurationApi", 'error', '获取配置失败,使用默认配置', error);
-      return DefaultConfiguration;
+      return DefaultConfiguration as IConfigurationItem;
     }
     }
   }
   }
 }
 }

+ 6 - 1
src/api/system/DefaultConfiguration.json

@@ -1,4 +1,9 @@
 {
 {
   "baseServerUrl": "https://mnwh.wenlvti.net/api",
   "baseServerUrl": "https://mnwh.wenlvti.net/api",
-  "articleMark": "以上内容摘自:"
+  "articleMark": "以上内容摘自:",
+  "articleBorrow": {
+    "url": "https://mn.wenlvti.net/xmlib/opac/m/search?q={0}&curlibcode=&searchWay=title&hasholding=1",
+    "icon": "https://mn.wenlvti.net/app_static/minnan/images/inhert/IconBorrow.png",
+    "text": "点击查询借阅"
+  }
 }
 }

+ 2 - 0
src/pages/article/data/CommonCategoryDynamicEvax.ts

@@ -118,6 +118,8 @@ export function doEvaluateDynamicDataExpression(expressions: string, context: ID
     switch (type) {
     switch (type) {
       case 'A': 
       case 'A': 
         return accessDynamicKeyOrPrevResult(key, false);
         return accessDynamicKeyOrPrevResult(key, false);
+      default:
+        return accessDynamicKeyOrPrevResult(type, false);
       case 'M': {
       case 'M': {
         if (arr.length < 3)
         if (arr.length < 3)
           return undefined;
           return undefined;

+ 7 - 4
src/pages/article/details.vue

@@ -53,9 +53,9 @@
               class="w-100"
               class="w-100"
               titleColor="title-text"
               titleColor="title-text"
               title2
               title2
-              image="https://mn.wenlvti.net/app_static/minnan/images/inhert/IconBorrow.png"
+              :image="appConfiguration?.articleBorrow?.icon"
               :title="loader.content.value.title"
               :title="loader.content.value.title"
-              desc="点击查询借阅"
+              :desc="appConfiguration?.articleBorrow?.text"
               @click="goBorrow(loader.content.value.title)"
               @click="goBorrow(loader.content.value.title)"
             />
             />
           </view>
           </view>
@@ -123,7 +123,7 @@ import { DataDateUtils } from "@imengyu/js-request-transform";
 import { useSimplePageContentLoader } from "@/common/composeabe/SimplePageContentLoader";
 import { useSimplePageContentLoader } from "@/common/composeabe/SimplePageContentLoader";
 import { useLoadQuerys } from "@/common/composeabe/LoadQuerys";
 import { useLoadQuerys } from "@/common/composeabe/LoadQuerys";
 import { computed } from "vue";
 import { computed } from "vue";
-import { StringUtils } from "@imengyu/imengyu-utils";
+import { FormatUtils, StringUtils } from "@imengyu/imengyu-utils";
 import { injectAppConfiguration } from "@/api/system/useAppConfiguration";
 import { injectAppConfiguration } from "@/api/system/useAppConfiguration";
 import { useSimpleDataLoader } from "@/common/composeabe/SimpleDataLoader";
 import { useSimpleDataLoader } from "@/common/composeabe/SimpleDataLoader";
 import { navTo, redirectTo } from "@/components/utils/PageAction";
 import { navTo, redirectTo } from "@/components/utils/PageAction";
@@ -275,6 +275,7 @@ function goArchive(id: number) {
           })
           })
         },
         },
         fail: (res) => {
         fail: (res) => {
+          console.error(res);
           uni.hideLoading()
           uni.hideLoading()
           uni.showToast({
           uni.showToast({
             title: '下载文件失败,请检查网络',
             title: '下载文件失败,请检查网络',
@@ -304,7 +305,9 @@ function goDetails(id: number) {
   });
   });
 }
 }
 function goBorrow(title: string) {
 function goBorrow(title: string) {
-  navTo('/pages/article/web/ewebview', { url: `https://mn.wenlvti.net/xmlib/opac/m/search?q=${encodeURIComponent(title)}&curlibcode=&searchWay=title&hasholding=1` });
+  navTo('/pages/article/web/ewebview', { 
+    url: FormatUtils.formatString(appConfiguration.value?.articleBorrow?.url || '', { title })
+  });
 }
 }
 
 
 function getPageShareData() {
 function getPageShareData() {