Merge branch '20250528-dev-king' into dev

api/contentLibrary.js

+import requestModule from './request.js';
+const {
+	api
+} = requestModule;
+
+/**
+ * 获取积分信息
+ * @returns
+ */
+
+export const fetchContentLibraryJSON = () => api.get('/c/front/content',{type:'contentLibrary'});
\ No newline at end of file

main.js

@@ -2,8 +2,8 @@ import App from "./App";
 // import apiRequest from "@/api/request.js";
 import * as Pinia from 'pinia';
 
-// const BASE_URL = 'https://duiba.oss-cn-hangzhou.aliyuncs.com/fh/';
-const BASE_URL = 'https://firmus-member-test-1253290912.cos.ap-beijing.myqcloud.com/xmh-mini-program/';
+const BASE_URL = 'https://duiba.oss-cn-hangzhou.aliyuncs.com/fh/';
+// const BASE_URL = 'https://firmus-member-test-1253290912.cos.ap-beijing.myqcloud.com/xmh-mini-program/';
 
 // #ifndef VUE3
 import Vue from "vue";

views/Integral.vue

@@ -1124,6 +1124,12 @@
 
 	//积分兑换按钮点击事件
 	const handleExchargeClick = () => {
+
+		jump({
+		type: 1,
+		url: '/pages/library/ContentLibrary'
+	});return;
+		
 		const url = vipIntegral.value.excharge.url; 
 		const type = vipIntegral.value.excharge.type;
 		const extra = vipIntegral.value.excharge.extra;