From 7fb2efa58b1b3276e820f3279efb18a67fe3e5ce Mon Sep 17 00:00:00 2001
From: YM <479443481@qq.com>
Date: 星期三, 22 五月 2024 14:16:24 +0800
Subject: [PATCH] 调整数据，清理无用代码，优化结构
---
src/assets/js/middleGround/api/resource.js | 5
/dev/null | 135 ----------------
src/assets/js/config.js | 38 ----
src/assets/js/toolClass.js | 169 ---------------------
vue.config.js | 4
src/assets/js/middleGround/tool.js | 2
src/main.js | 4
src/books/childHealth/view/index.vue | 71 +-------
8 files changed, 22 insertions(+), 406 deletions(-)
diff --git a/src/assets/js/config.js b/src/assets/js/config.js
index 5d22fd5..f8eebe0 100644
--- a/src/assets/js/config.js
+++ b/src/assets/js/config.js
@@ -1,58 +1,26 @@
import axios from "axios";
export const requestCtx = "https://jsek.bnuic.com"; // 璇锋眰鍦板潃
-export const resourceCtx = "http://182.92.203.7:3007/books/resource/4"; // 璧勬簮璇锋眰鍦板潃
-export const publicCtx = "http://182.92.203.7:3007/books/book/1"; // 璧勬簮璇锋眰鍦板潃
+export const resourceCtx = "http://182.92.203.7:3007/books/resource/1"; // 璧勬簮璇锋眰鍦板潃
export let activeBook = {}; // 璧勬簮璇锋眰鍦板潃
export let goodsStore = "";
-export let publicStore = "";
+// 璇锋眰鏁欐潗閰嶇疆淇℃伅
const getBookConfig = async () => {
const response = await axios.get(resourceCtx + "/bookConfig.json");
activeBook = response.data;
- goodsStore = activeBook.storeRefcode;
- publicStore = activeBook.storeRefcode;
+ goodsStore = response.data.storeRefcode;
return response.data;
};
-
-
-// export const bookList = [
-// {id:1,name:"childHealth",bookName:"瀛﹀墠鍎跨鍗敓涓庝繚鍋�",bookId:'2358',rootCmsItemId:'24080',storeRefcode:'defaultGoodsStore3'},
-// {id:2,name:'content',bookName:"濠村辜鍎跨敓娲绘姢鐓�",bookId: '3335',rootCmsItemId:'66969',storeRefcode:'jsek_jslx'},
-// {id:3,name:"embedded",bookNmae:"宓屽叆寮忕粍鎬佹帶鍒舵妧鏈�",bookId:'',rootCmsItemId:"",}
-// ]
-// activeBook = bookList[2]
export const appId = 3;
export const requestTimeOut = 300000; // 璇锋眰瓒呮椂鏃堕棿
export const tokenKey = "jsek-token";
-export const userInfoKey = "website-front-userInfo"; // 鐢ㄦ埛淇℃伅key
-export const appRefCode = "jingshieke";
-// export const goodsStore = `defaultGoodsStore${appId}`; // 榛樿鍟嗗搧搴�(涔﹀煄)
-// export const publicStore = `defaultPublicStore${appId}`; // 榛樿璧勬簮寮�鏀句粨鍌�
-
-export const publicRepository = `defaultPublicRepository${appId}`; // 榛樿璧勬簮寮�鏀惧簱
-export const digitalCourses = "jsek_digitalCourses"; //鏁板瓧璇剧▼
-export const digitalTextbooks = "jsek_digitalTextbooks"; //鏁板瓧鏁欐潗
-export const seminar = "jsek_seminar"; //涓撻鐮旇
-export const reg_tel =
- /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/; // 鐢佃瘽鍙锋鍒�
-export const reg_telphone = /^0\d{2}-\d{8}$|^0\d{3}-\d{7}$/; //搴ф満鍙锋鍒�
-export const fontUrl = "https://jsek.bnuic.com/website";
const config = {
requestCtx,
resourceCtx,
- publicCtx,
activeBook,
requestTimeOut,
tokenKey,
- userInfoKey,
- appRefCode,
goodsStore,
- digitalCourses,
- digitalTextbooks,
- seminar,
- fontUrl,
- reg_tel,
- reg_telphone,
appId,
getBookConfig,
};
diff --git a/src/assets/js/middleGround/api/resource.js b/src/assets/js/middleGround/api/resource.js
index 864a7dd..4a1efb2 100644
--- a/src/assets/js/middleGround/api/resource.js
+++ b/src/assets/js/middleGround/api/resource.js
@@ -1,5 +1,4 @@
import request from "@/plugin/axios/index.js";
-import { publicStore, publicRepository } from "@/assets/js/config";
import { tokenKey } from "@/assets/js/config";
import { handleQueryResourceListData } from "../tool";
import toolClass from "@/assets/js/toolClass";
@@ -17,8 +16,8 @@
*/
getItem: ({
path,
- storeInfo = publicStore,
- repositoryInfo = publicRepository,
+ storeInfo,
+ repositoryInfo,
queryType,
linkType,
paging,
diff --git a/src/assets/js/middleGround/tool.js b/src/assets/js/middleGround/tool.js
index df51682..1d60512 100644
--- a/src/assets/js/middleGround/tool.js
+++ b/src/assets/js/middleGround/tool.js
@@ -437,3 +437,5 @@
if (height) src += `&height=${height}`;
return src;
}
+
+export default {}
\ No newline at end of file
diff --git a/src/assets/js/toolClass.js b/src/assets/js/toolClass.js
index 61db6fb..a6019ed 100644
--- a/src/assets/js/toolClass.js
+++ b/src/assets/js/toolClass.js
@@ -1,6 +1,4 @@
import SparkMD5 from "spark-md5";
-import { getPublicImage } from "@/assets/js/middleGround/tool.js";
-// import moment from "moment";
var tool = {
secondToTime(second) {
@@ -71,71 +69,6 @@
return time.getTime();
}
};
-
-// 澶勭悊璁㈠崟璁板綍
-// export function setOrderList(res) {
-// // 鑾峰彇褰撳墠骞翠唤鐨勫紑濮嬫椂闂�
-// let currentTimestamp = moment().startOf("year");
-// let arr = [];
-// for (let i = 0; i < res.length; i++) {
-// const item = res[i];
-// // 鍙戠エ鐘舵�佷负瀹℃牳涓垨鑰呭鏍稿け璐ワ紝灏唅tem閫変腑鐘舵�佽缃�変腑銆�
-// // UI鎺у埗绂佺敤锛堟樉绀虹殑鏁堟灉涓� 閫変腑骞朵笖绂佺敤锛�
-// if (item.invoiceInfo) {
-// item.checked = true;
-// } else {
-// item.checked = false;
-// }
-// // 鍒ゆ柇鏄惁瓒呭嚭鐢宠鍙戠エ鐨勬棩鏈�
-// item.exceedingTheSpecifiedTime = moment(item.createDate).isBefore(
-// currentTimestamp
-// );
-// if (item.saleMethodLinks.length > 0) {
-// let itemName = null;
-// let itemIcon = null;
-// let cmsItemList = null;
-// try {
-// cmsItemList = item.saleMethodLinks[0].orderSaleMethod.cmsItemList[0];
-// } catch (error) {
-// cmsItemList = null;
-// }
-// if (cmsItemList && cmsItemList.icon) {
-// itemName = cmsItemList.name;
-// itemIcon = cmsItemList.icon;
-// } else {
-// itemName = item.saleMethodLinks[0].orderSaleMethod.product.name;
-// itemIcon = item.saleMethodLinks[0].orderSaleMethod.product.icon;
-// }
-// item.saleMethodLinks[0].title = itemName;
-// item.saleMethodLinks[0].icon = getPublicImage(itemIcon);
-// } else {
-// const itemIcon = require("@/assets/images/bookCity/place_img.png");
-// const saleMethodLink = [];
-// const obj = {
-// icon: itemIcon,
-// orderSaleMethod: {
-// price: item.payPrice,
-// },
-// };
-// saleMethodLink.push(obj);
-// item.saleMethodLinks = saleMethodLink;
-// }
-// if (item.state == "Success") {
-// item.CustomState = "鏀粯鎴愬姛";
-// }
-// if (item.state == "Cancel") {
-// item.CustomState = "鍙栨秷鏀粯";
-// }
-// if (item.state == "WaitPay") {
-// item.CustomState = "绛夊緟鏀粯";
-// }
-// if (item.state == "WaitDeliver") {
-// item.CustomState = "姝ｅ湪鏀粯";
-// }
-// arr.push(item);
-// }
-// return arr;
-// }
//澶勭悊琛ㄥ崟鎻愪氦鏁版嵁
export function worksData(res) {
@@ -365,114 +298,12 @@
}
}
-// 澶勭悊鏃堕棿锛岀敤浜庢樉绀洪煶瑙嗛褰撳墠鏃堕棿
-// export function realFormatSecond(time) {
-// let duration = parseInt(time);
-// let minute = parseInt(duration / 60);
-// let sec = (duration % 60) + "";
-// let isM0 = ":";
-// if (minute == 0) {
-// minute = "00";
-// } else if (minute < 10) {
-// minute = "0" + minute;
-// }
-// if (sec.length == 1) {
-// sec = "0" + sec;
-// }
-// return minute + isM0 + sec;
-// }
-
-// export function parseHtml(content) {
-// const tagReg =
-// /<\/?div[^>]*>|<\/?span[^>]*>|<\/?table[^>]*>|<\/?th[^>]*>|<\/?thead>|<\/?tbody>|<\/?tr>|<\/?td[^>]*>|<br[^>]*>|<\/?p[^>]*>|<\/?sub>|<\/?sup>|<\/?font[^>]*>|<img[^>]*>|<\/?a[^>]*>|\n|\\n/gi;
-// const escapeReg =
-// /&(lt|gt|le|ge|nbsp|amp|quot|times|Alpha|Beta|Gamma|Delta|Epsilon|Zeta|Eta|Theta|Iota|Kappa|Lambda|MU|NU|Xi|Omicron|Pi|Rho|Sigma|Tau|Upsilon|Phi|Chi|Psi|Omega|alpha|beta|gamma|delta|epsilon|zeta|eta|theta|iota|kappa|lambda|mu|nu|xi|omicron|pi|rho|sigmaf|sigma|tau|upsilon|phi|chi|psi|omega|thetasym|upsih|piv|circ|tilde|ndash|permil|lsquo|rsquo|ldquo|rdquo|prime);/gi;
-// const escapeElements = {
-// lt: "<",
-// gt: ">",
-// le: "鈮�",
-// ge: "鈮�",
-// nbsp: " ",
-// amp: "&",
-// quot: '""',
-// times: "脳",
-// Alpha: "螒",
-// Beta: "螔",
-// Gamma: "螕",
-// Delta: "螖",
-// Epsilon: "螘",
-// Zeta: "螙",
-// Eta: "螚",
-// Theta: "螛",
-// Iota: "螜",
-// Kappa: "螝",
-// Lambda: "螞",
-// Mu: "螠",
-// Nu: "螡",
-// Xi: "螢",
-// Omicron: "螣",
-// Pi: "螤",
-// Rho: "巍",
-// Sigma: "危",
-// Tau: "韦",
-// Upsilon: "违",
-// Phi: "桅",
-// Chi: "围",
-// Psi: "唯",
-// Omega: "惟",
-// alpha: "伪",
-// beta: "尾",
-// gamma: "纬",
-// delta: "未",
-// epsilon: "蔚",
-// zeta: "味",
-// eta: "畏",
-// theta: "胃",
-// iota: "喂",
-// kappa: "魏",
-// lambda: "位",
-// mu: "渭",
-// nu: "谓",
-// xi: "尉",
-// omicron: "慰",
-// pi: "蟺",
-// rho: "蟻",
-// sigmaf: "蟼",
-// sigma: "蟽",
-// tau: "蟿",
-// upsilon: "蠀",
-// phi: "蠁",
-// chi: "蠂",
-// psi: "蠄",
-// omega: "蠅",
-// thetasym: "蠎",
-// upsih: "蠏",
-// piv: "蠔",
-// circ: "藛",
-// tilde: "藴",
-// ndash: "鈥�",
-// permil: "鈥�",
-// lsquo: "鈥�",
-// rsquo: "鈥�",
-// ldquo: "鈥�",
-// rdquo: "鈥�",
-// prime: "鈥�",
-// };
-// const contentWithoutTag = content.replace(tagReg, "");
-// const contentWithOnlyOneSpace = contentWithoutTag.replace(/ {2,}/g, " ");
-// return contentWithOnlyOneSpace.replace(
-// escapeReg,
-// (all, t) => escapeElements[t]
-// );
-// }
-
export default {
...tool,
uuid,
getFileMd5,
worksDataBytool,
UpdateworksDataBytool,
- getPublicImage,
worksData,
getParentNodeByClassName
// parseHtml,
diff --git a/src/assets/js/userAction.js b/src/assets/js/userAction.js
deleted file mode 100644
index 8ecf23a..0000000
--- a/src/assets/js/userAction.js
+++ /dev/null
@@ -1,135 +0,0 @@
-import config from "@/assets/js/config.js";
-
-import jobApi from "./middleGround/api/job"; // newJobWithNewView // newSession,
-
-export function setSessionGuid(type, id) {
- var cityCode = null;
- var SnIp = null;
- try {
- // eslint-disable-next-line
- SnIp = window.returnCitySN;
- } catch (error) {
- SnIp = null;
- console.log(error);
- }
- if (SnIp != undefined && SnIp != null) {
- cityCode = SnIp;
- } else {
- cityCode = {
- cip: "0.0.0.0",
- cname: "鏈煡",
- };
- }
- const _city = cityCode.cname.substring(3);
- const _province = cityCode.cname.substring(0, 3);
- const params = {
- appRefCode: config.appRefCode,
- hostName: config.requestCtx,
- ipAddress: cityCode.cip,
- browser: myBrowser(),
- os: navigator.platform,
- device: "pc",
- province: _province,
- city: _city ? _city : _province,
- };
-
- jobApi.newSession(params).then(res => {
- storage.set("sessionGuid", res, 30);
- setNewView(type, id);
- });
-}
-
-export const storage = {
- /*
- * set 瀛樺偍鏂规硶
- * @ param {String} key 閿�
- * @ param {String} value 鍊硷紝
- * @ param {String} expired 杩囨湡鏃堕棿锛屼互鍒嗛挓涓哄崟浣嶏紝闈炲繀椤�
- */
- set(key, val, expired) {
- if (typeof val !== "string") {
- val = JSON.stringify(val);
- }
- window.sessionStorage.setItem(key, val);
- if (expired) {
- window.sessionStorage.setItem(
- `${key}__expires__`,
- `${Date.now() + 1000 * 60 * expired}`
- );
- }
- },
- /*
- * get 鑾峰彇鏂规硶
- * @ param {String} key 閿�
- * @ param {String} expired 瀛樺偍鏃朵负闈炲繀椤诲瓧娈碉紝鎵�浠ユ湁鍙兘鍙栦笉鍒帮紝榛樿涓� Date.now+1
- */
- get(key) {
- const expired =
- window.sessionStorage.getItem(`${key}__expires__`) || Date.now + 1;
- const now = Date.now();
-
- if (now >= expired) {
- window.sessionStorage.removeItem(key);
- return;
- }
- let val = window.sessionStorage.getItem(key);
- try {
- val = JSON.parse(val);
- } catch (e) {
- return e;
- }
- return val;
- },
-};
-
-function myBrowser() {
- const userAgent = navigator.userAgent; //鍙栧緱娴忚鍣ㄧ殑userAgent瀛楃涓�
- const isOpera = userAgent.indexOf("Opera") > -1;
- if (isOpera) {
- //鍒ゆ柇鏄惁Opera娴忚鍣�
- return "Opera";
- }
- if (userAgent.indexOf("Firefox") > -1) {
- //鍒ゆ柇鏄惁Firefox娴忚鍣�
- return "Firefox";
- }
- if (userAgent.indexOf("Chrome") > -1) {
- return "Chrome";
- }
- if (userAgent.indexOf("Safari") > -1) {
- //鍒ゆ柇鏄惁Safari娴忚鍣�
- return "Safari";
- }
- if (
- userAgent.indexOf("compatible") > -1 &&
- userAgent.indexOf("MSIE") > -1 &&
- !isOpera
- ) {
- //鍒ゆ柇鏄惁IE娴忚鍣�
- return "IE";
- }
- return "";
-}
-
-export function setNewView(type, id) {
- if (!sessionStorage.getItem("sessionGuid")) {
- setSessionGuid(type, id);
- }
-
- const sessionGuid = sessionStorage.getItem("sessionGuid");
- const fromPath = sessionStorage.getItem("fromPath");
- const toPath = sessionStorage.getItem("toPath");
- if (sessionGuid) {
- let params = {
- sessionGuid: sessionGuid,
- appRefCode: config.appRefCode,
- type: "View",
- url: toPath == null ? "/" : toPath,
- ref: fromPath == null ? "/" : fromPath,
- };
- if (id) {
- params[type] = id;
- }
- jobApi.newJobWithNewView(params).then(res => {});
- }
-}
\ No newline at end of file
diff --git a/src/books/childHealth/view/index.vue b/src/books/childHealth/view/index.vue
index 673f897..3c0e84d 100644
--- a/src/books/childHealth/view/index.vue
+++ b/src/books/childHealth/view/index.vue
@@ -4,7 +4,7 @@
@mouseup="handleMouseUp"
:style="{
fontSize: fontSize ? fontSize + 'px' : '16px',
- transform: `scale(${pageZoom ? pageZoom : 1})`,
+ transform: `scale(${pageZoom ? pageZoom : 1})`
}"
>
<pageContent></pageContent>
@@ -14,18 +14,11 @@
<script>
import pageContent from "./content/index.vue";
export default {
- name: "child-health",
components: {
- pageContent,
+ pageContent
},
data() {
- return {
- bookData: {},
- type: "option",
- idPathList: [],
- cardList: [],
- isMouseDown: false,
- };
+ return {};
},
computed: {
fontSize() {
@@ -33,52 +26,10 @@
},
pageZoom() {
return this.$store.state.qiankun.scale / 100;
- },
+ }
},
- mounted() {
- // this.getBookInfo();
- },
+ mounted() {},
methods: {
- getBookInfo() {
- let query = {
- path: "*",
- queryType: "*",
- productId: this.config.bookId,
- favoriteTypes: "FavoriteBookCity",
- itemFields: {
- "SysType=": "CmsFolder",
- },
- coverSize: {
- height: 300,
- },
- fields: {
- seriesName: [],
- author: [],
- isbn: [],
- publicationDate: [],
- bookClassification: [],
- paperPrice: [],
- JDLink: [],
- tmallLink: [],
- dangdangLink: [],
- weidianLink: [],
- content: [],
- authorIntroduction: [],
- // isApplyPaperBook: [],
- // isApplyEBook: [],
- isApplyBook: [],
- isSell: [],
- pdf: [],
- protectedEpub: [],
- probationPage: [], //pdf璇曡椤垫暟
- freeEpubPage: [], //epub璇曡鐧惧垎姣�
- },
- };
- this.MG.store.getProductDetail(query).then((res) => {
- this.$data.bookData = res.datas;
- this.$store.commit("setRootCmsItemId", res.datas.rootCmsItemId);
- });
- },
getParentWithClass(element, className) {
while (element.parentElement) {
element = element.parentElement;
@@ -113,7 +64,7 @@
txt,
page,
x: e.x,
- y: e.y,
+ y: e.y
});
}
}
@@ -124,13 +75,15 @@
txt: "",
page: "",
x: e.x,
- y: e.y,
+ y: e.y
});
}
}
- },
- },
+ }
+ }
};
</script>
-<style lang="less" scoped></style>
+<style lang="less">
+@import "../assets/main.less";
+</style>
diff --git a/src/main.js b/src/main.js
index 0e7d9bc..17ec245 100644
--- a/src/main.js
+++ b/src/main.js
@@ -2,11 +2,11 @@
import App from "./App.vue";
import less from "less";
// 瀛﹀墠鍎跨鍗敓涓庡仴搴�
-// import "./books/childHealth/assets/main.less";
+
// import './books/content/css/default.less';
// 宓屽叆寮忕粍鎬佹帶鍒舵妧鏈�
-import './books/embedded/assets/main.less';
+// import './books/embedded/assets/main.less';
import ElementUI from "element-ui";
import "element-ui/lib/theme-chalk/index.css";
import store from "./store";
diff --git a/vue.config.js b/vue.config.js
index 8d76185..9b41f49 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -1,9 +1,7 @@
-// const { publicCtx } = require("@/assets/js/config");
-// import {publicCtx} from '@/assets/js/config'
const { defineConfig } = require("@vue/cli-service");
module.exports = defineConfig({
// publicPath: 'http://182.92.203.7:3007/books/book/3',
- publicPath:'/books/book/1',
+ publicPath:'/books/book',
transpileDependencies: true,
lintOnSave: false,
// devServer: {
--
Gitblit v1.9.1