~EL00Xa@JsKQ_>e;XzJ&yr5D;LY1@k~bLU+<*x%>8nXavAHEF)*B^SQg
zessOkOn3?evp{)Mp1i%BEj@rT~2Z
z2D2s94re9TimAPAM1Kv(71zkCWjC6Th+~{cN?>LeCg2^9m?J{XsXI_}Dq?W!(fO$w
zVl%4pIn2T;fDHM*_s1P))NLY;eN6y~w)z@Gqob$auho+HN
z=TJsYWOw@60+svWe?IBIE0BZI!9AP(7xkZVq3MxE*lJTAq(~}mo8o<$r6<+L5(Z|6
zMmFRn{g4z8w7dD)PkSKNkdNz~cCLJFOHLphU*1ju
z@m2gc*@{PF;as%Juf8%-U(D{*`tE=~>f}Vqjq^-bY)&oWQ5K8AQ}-YU=kso0nao+`&kT}1{`5Uk1W-(w6(BBr}~#cz$)(y4XwL+30ok=ZQQ6U{4VjoB5z
zERg>fMn)hHd^X=R`duLmqkNXDp%1O5d%)Ki-cH&gkbtCET3-
zYh7;6gfyBq4Mrdh?*Fv`EPegu@HZAPGn;6Ul0KYvP_
zChX6F`Z6ks{l5?-?xzpGe+BU7)*a#JYC91C8k$W@vNs+SyHoeaado5fnw8<<)iEo(
z;Lon{cq^lwtNAt+_a>&N2ToAXH^lSd5;6yGfB&WgT{uxbO=s!Drrde=gi_Fsuib{Y
z#CfPBI4_aDKL)&IP&vcvMi8GdZ@R1wHwTr0
zxPRpv(zgC_`A6uU(t$x5_wG$g{)+qFYQdq#Z$1un#fBgrJKNfY7`z#3^rBjO#uR91
zwW*k1*k|4{?MJo)@83FH5O@(J`EQ`2gkXefjn
zv{)VCnp?-z1nRIR82#i9e{i}Z%|Alzk5&Y+2op6Lv^SV;_Ij>g-`TSxzfRl?ksg!>U>+Rte}
o1ZXT?f); {
- item === handler;
- })
- // 不存在直接返回
- if (index < 0) {
- return false;
- }
-
- if (this.handlers[key].length === 1) {
- // 只有一个直接删除key 节省内存
- delete this.handlers[key]
- } else {
- this.handlers[key].splice(index, 1)
- }
- return true;
- },
-
- // 触发
- commit : function(key) {
- // 取出参数并转化为数组
- if (!this.handlers[key]) return false;
- const args = Array.prototype.slice.call(arguments, 1)
- this.handlers[key].forEach(handler => {
- // 防止this指向乱掉
- try{ handler.apply(this, args); } catch(e){console.warn(e);}
- });
- return true;
- }
-}
-
-export const getEventBus = new PubSub();
\ No newline at end of file
diff --git a/SHST-WEL/utils/md5.js b/SHST-WEL/utils/md5.js
deleted file mode 100644
index 2b35519..0000000
--- a/SHST-WEL/utils/md5.js
+++ /dev/null
@@ -1,262 +0,0 @@
-/*
- * A JavaScript implementation of the RSA Data Security, Inc. MD5 Message
- * Digest Algorithm, as defined in RFC 1321.
- * Version 2.1 Copyright (C) Paul Johnston 1999 - 2002.
- * Other contributors: Greg Holt, Andrew Kepert, Ydnar, Lostinet
- * Distributed under the BSD License
- * See http://pajhome.org.uk/crypt/md5 for more info.
- */
-module.exports = {
- hexMD5: hex_md5, //需要输出的加密算法，我这边只写了我需要得两种
- b64Md5: b64_md5,
-}
-/*
- * Configurable variables. You may need to tweak these to be compatible with
- * the server-side, but the defaults work in most cases.
- */
-var hexcase = 0; /* hex output format. 0 - lowercase; 1 - uppercase */
-var b64pad = ""; /* base-64 pad character. "=" for strict RFC compliance */
-var chrsz = 8; /* bits per input character. 8 - ASCII; 16 - Unicode */
-
-/*
- * These are the functions you'll usually want to call
- * They take string arguments and return either hex or base-64 encoded strings
- */
-function hex_md5(s){ return binl2hex(core_md5(str2binl(s), s.length * chrsz));}
-function b64_md5(s){ return binl2b64(core_md5(str2binl(s), s.length * chrsz));}
-function str_md5(s){ return binl2str(core_md5(str2binl(s), s.length * chrsz));}
-function hex_hmac_md5(key, data) { return binl2hex(core_hmac_md5(key, data)); }
-function b64_hmac_md5(key, data) { return binl2b64(core_hmac_md5(key, data)); }
-function str_hmac_md5(key, data) { return binl2str(core_hmac_md5(key, data)); }
-
-/*
- * Perform a simple self-test to see if the VM is working
- */
-function md5_vm_test()
-{
- return hex_md5("abc") == "900150983cd24fb0d6963f7d28e17f72";
-}
-
-/*
- * Calculate the MD5 of an array of little-endian words, and a bit length
- */
-function core_md5(x, len)
-{
- /* append padding */
- x[len >> 5] |= 0x80 << ((len) % 32);
- x[(((len + 64) >>> 9) << 4) + 14] = len;
-
- var a = 1732584193;
- var b = -271733879;
- var c = -1732584194;
- var d = 271733878;
-
- for(var i = 0; i < x.length; i += 16)
- {
- var olda = a;
- var oldb = b;
- var oldc = c;
- var oldd = d;
-
- a = md5_ff(a, b, c, d, x[i+ 0], 7 , -680876936);
- d = md5_ff(d, a, b, c, x[i+ 1], 12, -389564586);
- c = md5_ff(c, d, a, b, x[i+ 2], 17, 606105819);
- b = md5_ff(b, c, d, a, x[i+ 3], 22, -1044525330);
- a = md5_ff(a, b, c, d, x[i+ 4], 7 , -176418897);
- d = md5_ff(d, a, b, c, x[i+ 5], 12, 1200080426);
- c = md5_ff(c, d, a, b, x[i+ 6], 17, -1473231341);
- b = md5_ff(b, c, d, a, x[i+ 7], 22, -45705983);
- a = md5_ff(a, b, c, d, x[i+ 8], 7 , 1770035416);
- d = md5_ff(d, a, b, c, x[i+ 9], 12, -1958414417);
- c = md5_ff(c, d, a, b, x[i+10], 17, -42063);
- b = md5_ff(b, c, d, a, x[i+11], 22, -1990404162);
- a = md5_ff(a, b, c, d, x[i+12], 7 , 1804603682);
- d = md5_ff(d, a, b, c, x[i+13], 12, -40341101);
- c = md5_ff(c, d, a, b, x[i+14], 17, -1502002290);
- b = md5_ff(b, c, d, a, x[i+15], 22, 1236535329);
-
- a = md5_gg(a, b, c, d, x[i+ 1], 5 , -165796510);
- d = md5_gg(d, a, b, c, x[i+ 6], 9 , -1069501632);
- c = md5_gg(c, d, a, b, x[i+11], 14, 643717713);
- b = md5_gg(b, c, d, a, x[i+ 0], 20, -373897302);
- a = md5_gg(a, b, c, d, x[i+ 5], 5 , -701558691);
- d = md5_gg(d, a, b, c, x[i+10], 9 , 38016083);
- c = md5_gg(c, d, a, b, x[i+15], 14, -660478335);
- b = md5_gg(b, c, d, a, x[i+ 4], 20, -405537848);
- a = md5_gg(a, b, c, d, x[i+ 9], 5 , 568446438);
- d = md5_gg(d, a, b, c, x[i+14], 9 , -1019803690);
- c = md5_gg(c, d, a, b, x[i+ 3], 14, -187363961);
- b = md5_gg(b, c, d, a, x[i+ 8], 20, 1163531501);
- a = md5_gg(a, b, c, d, x[i+13], 5 , -1444681467);
- d = md5_gg(d, a, b, c, x[i+ 2], 9 , -51403784);
- c = md5_gg(c, d, a, b, x[i+ 7], 14, 1735328473);
- b = md5_gg(b, c, d, a, x[i+12], 20, -1926607734);
-
- a = md5_hh(a, b, c, d, x[i+ 5], 4 , -378558);
- d = md5_hh(d, a, b, c, x[i+ 8], 11, -2022574463);
- c = md5_hh(c, d, a, b, x[i+11], 16, 1839030562);
- b = md5_hh(b, c, d, a, x[i+14], 23, -35309556);
- a = md5_hh(a, b, c, d, x[i+ 1], 4 , -1530992060);
- d = md5_hh(d, a, b, c, x[i+ 4], 11, 1272893353);
- c = md5_hh(c, d, a, b, x[i+ 7], 16, -155497632);
- b = md5_hh(b, c, d, a, x[i+10], 23, -1094730640);
- a = md5_hh(a, b, c, d, x[i+13], 4 , 681279174);
- d = md5_hh(d, a, b, c, x[i+ 0], 11, -358537222);
- c = md5_hh(c, d, a, b, x[i+ 3], 16, -722521979);
- b = md5_hh(b, c, d, a, x[i+ 6], 23, 76029189);
- a = md5_hh(a, b, c, d, x[i+ 9], 4 , -640364487);
- d = md5_hh(d, a, b, c, x[i+12], 11, -421815835);
- c = md5_hh(c, d, a, b, x[i+15], 16, 530742520);
- b = md5_hh(b, c, d, a, x[i+ 2], 23, -995338651);
-
- a = md5_ii(a, b, c, d, x[i+ 0], 6 , -198630844);
- d = md5_ii(d, a, b, c, x[i+ 7], 10, 1126891415);
- c = md5_ii(c, d, a, b, x[i+14], 15, -1416354905);
- b = md5_ii(b, c, d, a, x[i+ 5], 21, -57434055);
- a = md5_ii(a, b, c, d, x[i+12], 6 , 1700485571);
- d = md5_ii(d, a, b, c, x[i+ 3], 10, -1894986606);
- c = md5_ii(c, d, a, b, x[i+10], 15, -1051523);
- b = md5_ii(b, c, d, a, x[i+ 1], 21, -2054922799);
- a = md5_ii(a, b, c, d, x[i+ 8], 6 , 1873313359);
- d = md5_ii(d, a, b, c, x[i+15], 10, -30611744);
- c = md5_ii(c, d, a, b, x[i+ 6], 15, -1560198380);
- b = md5_ii(b, c, d, a, x[i+13], 21, 1309151649);
- a = md5_ii(a, b, c, d, x[i+ 4], 6 , -145523070);
- d = md5_ii(d, a, b, c, x[i+11], 10, -1120210379);
- c = md5_ii(c, d, a, b, x[i+ 2], 15, 718787259);
- b = md5_ii(b, c, d, a, x[i+ 9], 21, -343485551);
-
- a = safe_add(a, olda);
- b = safe_add(b, oldb);
- c = safe_add(c, oldc);
- d = safe_add(d, oldd);
- }
- return Array(a, b, c, d);
-
-}
-
-/*
- * These functions implement the four basic operations the algorithm uses.
- */
-function md5_cmn(q, a, b, x, s, t)
-{
- return safe_add(bit_rol(safe_add(safe_add(a, q), safe_add(x, t)), s),b);
-}
-function md5_ff(a, b, c, d, x, s, t)
-{
- return md5_cmn((b & c) | ((~b) & d), a, b, x, s, t);
-}
-function md5_gg(a, b, c, d, x, s, t)
-{
- return md5_cmn((b & d) | (c & (~d)), a, b, x, s, t);
-}
-function md5_hh(a, b, c, d, x, s, t)
-{
- return md5_cmn(b ^ c ^ d, a, b, x, s, t);
-}
-function md5_ii(a, b, c, d, x, s, t)
-{
- return md5_cmn(c ^ (b | (~d)), a, b, x, s, t);
-}
-function MD5(s) {
- // body...
- return hex_md5(s+"☆");
-}
-/*
- * Calculate the HMAC-MD5, of a key and some data
- */
-function core_hmac_md5(key, data)
-{
- var bkey = str2binl(key);
- if(bkey.length > 16) bkey = core_md5(bkey, key.length * chrsz);
-
- var ipad = Array(16), opad = Array(16);
- for(var i = 0; i < 16; i++)
- {
- ipad[i] = bkey[i] ^ 0x36363636;
- opad[i] = bkey[i] ^ 0x5C5C5C5C;
- }
-
- var hash = core_md5(ipad.concat(str2binl(data)), 512 + data.length * chrsz);
- return core_md5(opad.concat(hash), 512 + 128);
-}
-
-/*
- * Add integers, wrapping at 2^32. This uses 16-bit operations internally
- * to work around bugs in some JS interpreters.
- */
-function safe_add(x, y)
-{
- var lsw = (x & 0xFFFF) + (y & 0xFFFF);
- var msw = (x >> 16) + (y >> 16) + (lsw >> 16);
- return (msw << 16) | (lsw & 0xFFFF);
-}
-
-/*
- * Bitwise rotate a 32-bit number to the left.
- */
-function bit_rol(num, cnt)
-{
- return (num << cnt) | (num >>> (32 - cnt));
-}
-
-/*
- * Convert a string to an array of little-endian words
- * If chrsz is ASCII, characters >255 have their hi-byte silently ignored.
- */
-function str2binl(str)
-{
- var bin = Array();
- var mask = (1 << chrsz) - 1;
- for(var i = 0; i < str.length * chrsz; i += chrsz)
- bin[i>>5] |= (str.charCodeAt(i / chrsz) & mask) << (i%32);
- return bin;
-}
-
-/*
- * Convert an array of little-endian words to a string
- */
-function binl2str(bin)
-{
- var str = "";
- var mask = (1 << chrsz) - 1;
- for(var i = 0; i < bin.length * 32; i += chrsz)
- str += String.fromCharCode((bin[i>>5] >>> (i % 32)) & mask);
- return str;
-}
-
-/*
- * Convert an array of little-endian words to a hex string.
- */
-function binl2hex(binarray)
-{
- var hex_tab = hexcase ? "0123456789ABCDEF" : "0123456789abcdef";
- var str = "";
- for(var i = 0; i < binarray.length * 4; i++)
- {
- str += hex_tab.charAt((binarray[i>>2] >> ((i%4)*8+4)) & 0xF) +
- hex_tab.charAt((binarray[i>>2] >> ((i%4)*8 )) & 0xF);
- }
- return str;
-}
-
-/*
- * Convert an array of little-endian words to a base-64 string
- */
-function binl2b64(binarray)
-{
- var tab = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
- var str = "";
- for(var i = 0; i < binarray.length * 4; i += 3)
- {
- var triplet = (((binarray[i >> 2] >> 8 * ( i %4)) & 0xFF) << 16)
- | (((binarray[i+1 >> 2] >> 8 * ((i+1)%4)) & 0xFF) << 8 )
- | ((binarray[i+2 >> 2] >> 8 * ((i+2)%4)) & 0xFF);
- for(var j = 0; j < 4; j++)
- {
- if(i * 8 + j * 6 > binarray.length * 32) str += b64pad;
- else str += tab.charAt((triplet >> 6*(3-j)) & 0x3F);
- }
- }
- return str;
-}
diff --git a/SHST-WEL/utils/util.js b/SHST-WEL/utils/util.js
deleted file mode 100644
index 4a8d742..0000000
--- a/SHST-WEL/utils/util.js
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * yyyy年 MM月 dd日 hh1~12小时制(1-12) HH24小时制(0-23) mm分 ss秒 S毫秒 K周
- */
-const formatDate = (fmt = "yyyy-MM-dd", date = new Date()) => {
- var week = ["星期日","星期一","星期二","星期三","星期四","星期五","星期六"];
- var o = {
- "M+": date.getMonth() + 1, //月份
- "d+": date.getDate(), //日
- "h+": date.getHours(), //小时
- "m+": date.getMinutes(), //分
- "s+": date.getSeconds(), //秒
- "q+": Math.floor((date.getMonth() + 3) / 3), //季度
- "S": date.getMilliseconds(), //毫秒
- "K": week[date.getDay()]
- };
- if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (date.getFullYear() + "").substr(4 - RegExp.$1.length));
- for (var k in o) {
- if (new RegExp("(" + k + ")").test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
- }
- return fmt;
-}
-
-const extDate = () => {
- // console.log("拓展Date原型");
- Date.prototype.addDate = function(years = 0, months = 0, days = 0) {
- if (days !== 0) this.setDate(this.getDate() + days);
- if (months !== 0) this.setMonth(this.getMonth() + months);
- if (years !== 0) this.setFullYear(this.getFullYear() + years);
- }
-}
-
-const dateDiff = (startDateString, endDateString) => {
- var separator = "-"; //日期分隔符
- var startDates = startDateString.split(separator);
- var endDates = endDateString.split(separator);
- var startDate = new Date(startDates[0], startDates[1] - 1, startDates[2]);
- var endDate = new Date(endDates[0], endDates[1] - 1, endDates[2]);
- var diff = parseInt((endDate - startDate) / 1000 / 60 / 60 / 24); //把相差的毫秒数转换为天数
- return diff;
-}
-
-const compareTimeInSameDay = (t1, t2) => {
- let d = new Date()
- let ft1 = d.setHours(t1.split(":")[0], t1.split(":")[1])
- let ft2 = d.setHours(t2.split(":")[0], t2.split(":")[1])
- return ft1 > ft2
-}
-
-module.exports = {
- formatDate: formatDate,
- extDate: extDate,
- dateDiff: dateDiff,
- compareTimeInSameDay,compareTimeInSameDay
-}
diff --git a/SHST-WEL/vector/dispose.js b/SHST-WEL/vector/dispose.js
deleted file mode 100644
index ea75aa7..0000000
--- a/SHST-WEL/vector/dispose.js
+++ /dev/null
@@ -1,212 +0,0 @@
-"use strict";
-const md5 = require('@/utils/md5.js');
-const eventBus = require('@/utils/eventBus.js');
-module.exports = {
- ajax: ajax,
- toast: toast,
- extend: extend,
- onLunch: onLunch,
- addIconfont: addIconfont
-}
-
-/**
- * 颜色方案
- */
-// module.exports.colorList = ["#EAA78C", "#F9CD82", "#9ADEAD", "#9CB6E9", "#E49D9B", "#97D7D7", "#ABA0CA", "#9F8BEC",
-// "#ACA4D5", "#6495ED", "#7BCDA5", "#76B4EF","#E1C38F","#F6C46A","#B19ED1","#F09B98","#87CECB","#D1A495","#89D196"
-// ];
-module.exports.colorList = ["#FE9E9F","#FFCA62","#93BAFF","#FFA477","#D999F9","#75E1A5"];
-
-/**
- * 拓展对象
- * 浅拷贝与深拷贝
- */
-function extend() {
- var aLength = arguments.length;
- var options = arguments[0];
- var target = {};
- var copy;
- var i = 1;
- if (typeof options === "boolean" && options === true) {
- //深拷贝 (仅递归处理对象)
- for (; i < aLength; i++) {
- if ((options = arguments[i]) != null) {
- if (typeof options !== 'object') {
- return options;
- }
- for (var name in options) {
- copy = options[name];
- if (target === copy) {
- continue;
- }
- target[name] = this.extend(true, options[name]);
- }
- }
- }
- } else {
- //浅拷贝
- target = options;
- if (aLength === i) {
- target = this;
- i--;
- } //如果是只有一个参数，拓展功能 如果两个以上参数，将后续对象加入到第一个对象
- for (; i < aLength; i++) {
- options = arguments[i];
- for (var name in options) {
- target[name] = options[name];
- }
- }
- }
- return target;
-}
-
-/**
- * startLoading
- */
-function startLoading(option) {
- if (!option.load) return 0;
- console.log("LOADING")
- uni.showLoading({
- title: '请求中',
- mask: true
- })
-}
-
-/**
- * endLoading
- */
-function endLoading(option) {
- if (!option.load) return 0;
- uni.hideLoading();
- console.log("END LOADING")
-}
-
-
-
-/**
- * SetCookie
- */
-function setCookie(res, app = getApp()) {
- if (app.globalData.header.Cookie === "") {
- if (res && res.header && res.header['Set-Cookie']) {
- var cookies = res.header['Set-Cookie'].split(";")[0] + ";";
- console.log("SetCookie:" + cookies);
- app.globalData.header.Cookie = cookies;
- uni.setStorage({
- key: "cookies",
- data: app.globalData.header.Cookie
- });
- } else {
- console.log("Get Cookie From Cache");
- app.globalData.header.Cookie = uni.getStorageSync("cookies") || "";
- }
- }
-}
-
-/**
- * 弹窗提示
- */
-function toast(e, time = 2000, icon = 'none') {
- uni.showToast({
- title: e,
- icon: icon,
- duration: time
- })
-}
-
-/**
- * 延时执行
- */
-function delay(e,args){
- setTimeout((args) => e.apply(this),100);
-}
-
-/**
- * Resize
- */
-function resize(dom,that) {
- const result = dom.getComponentRect(that.$refs.box, option => {
- if (uni.getSystemInfoSync().windowHeight > option.size.height) that.signalPage = true;
- else that.signalPage = false;
- console.log(that.signalPage ? "SIGNAL PAGE" : "FULL PAGE")
- })
-}
-
-/**
- * NextTick
- */
-function nextTick(dom,that){
- that.$nextTick(() => { resize(dom,that) })
-}
-
-/**
- * 添加字体
- */
-function addIconfont(dom){
- dom.addRule('fontFace', {
- 'fontFamily': 'iconfont',
- 'src': "url('https://at.alicdn.com/t/font_1582902_a1btjrevzq.ttf')"
- })
-}
-
-/**
- * HTTP请求
- */
-function ajax(requestInfo, app = getApp()) {
- var option = {
- load: 1,
- autoCookie: true,
- url: "",
- method: "GET",
- data: {},
- fun: () => {},
- success: () => {},
- fail: function() {
- this.completeLoad = () => {
- toast("网络错误");
- }
- },
- complete: () => {},
- completeLoad: () => {}
- };
- extend(option, requestInfo);
- startLoading(option);
- uni.request({
- url: option.url,
- data: option.data,
- method: option.method,
- header: app.globalData.header,
- success: function(res) {
- if (option.autoCookie) setCookie(res);
- try {
- option.fun(res);
- option.success(res);
- } catch (e) {
- option.completeLoad = () => {
- toast("PARSE ERROR");
- }
- console.warn(e);
- }
- },
- fail: function(res) {
- option.fail(res);
- },
- complete: function(res) {
- endLoading(option);
- try {
- option.complete(res);
- } catch (e) {
- console.warn(e);
- }
- option.completeLoad(res);
- }
- })
-}
-
-/**
- * APP启动事件
- */
-function onLunch() {
- var app = this;
- app.eventBus = eventBus.getEventBus;
-}
diff --git a/SHST-WEL/vector/pubFct.js b/SHST-WEL/vector/pubFct.js
deleted file mode 100644
index 651f230..0000000
--- a/SHST-WEL/vector/pubFct.js
+++ /dev/null
@@ -1,62 +0,0 @@
-"use strict";
-const md5 = require('@/utils/md5.js');
-const util = require('@/utils/util.js');
-
-
-module.exports = {
- todoDateDiff: dataCalc,
- getCurWeek: getCurWeek,
- tableDispose: tableDispose
-}
-
-/**
- * 统一处理课表功能
- */
-function tableDispose(info, flag = 0) {
- const app = getApp();
- const colorList = app.globalData.colorList;
- const colorN = app.globalData.colorList.length;
- var tableArr = [];
- var week = new Date().getDay() - 1;
- if (week === -1) week = 6;
- info.forEach(value => {
- if (!value) return;
- var arrInner = [];
- var day = parseInt(value.kcsj[0]) - 1;
- if (flag === 1 && day !== week) return;
- var knot = parseInt(parseInt(value.kcsj.substr(1, 2)) / 2);
- var md5Str = md5.hexMD5(value.kcmc);
- var md5PickNum = function(){ let r=0; for(let i=0;i<7;++i) r += md5Str[i].charCodeAt(); return r;}();
- var colorSignal = app.globalData.colorList[ md5PickNum % app.globalData.colorN];
- arrInner.push(day);
- arrInner.push(knot);
- arrInner.push(value.kcmc.split("（")[0]);
- arrInner.push(value.jsxm);
- arrInner.push(value.jsmc);
- arrInner.push(colorSignal);
- if (!tableArr[day]) tableArr[day] = [];
- tableArr[day][knot] = arrInner;
- })
- if (flag === 1) return tableArr[week];
- else return tableArr;
-}
-
-function dataCalc(startDateString, endDateString, content) {
- const app = getApp();
- const colorList = app.globalData.colorList;
- const colorN = app.globalData.colorList.length;
- var color = colorList[md5.hexMD5(content)[0].charCodeAt() % colorN];
- var diff = util.dateDiff(startDateString, endDateString);
- if (diff === 0) diff = "今";
- else if (diff < 0) diff = "超期" + Math.abs(diff);
- else diff = "距今" + Math.abs(diff);
- return [diff, color];
-}
-
-
-function getCurWeek(startTime) {
- console.log(util.formatDate())
- if (util.formatDate() < startTime) return 1;
- var week = (parseInt(util.dateDiff(startTime, util.formatDate()) / 7) + 1);
- return week;
-}
diff --git a/SHST-WEX/App.vue b/SHST-WEX/App.vue
index 0f88a69..0c990a0 100644
--- a/SHST-WEX/App.vue
+++ b/SHST-WEX/App.vue
@@ -6,11 +6,11 @@
account: "",
curWeek: "1",
initData: {},
- version: "3.1.0",
+ version: "3.2.1",
curTerm: "2019-2020-1",
curTermStart: "2019-08-26",
colorList: dispose.colorList,
- url: 'http://jwgl.sdust.edu.cn/app.do',
+ url: 'http://219.218.128.228/app.do',
header: {'refer': 'https://com.WindrunnerMax.SHST','content-type': 'application/x-www-form-urlencoded','token':''}
},
onLaunch: function() {
diff --git a/SHST-WEX/manifest.json b/SHST-WEX/manifest.json
index 05d9924..e5ccf56 100644
--- a/SHST-WEX/manifest.json
+++ b/SHST-WEX/manifest.json
@@ -2,8 +2,8 @@
"name" : "山科小站",
"appid" : "__UNI__08D8F46",
"description" : "山科小站",
- "versionName" : "3.2.0",
- "versionCode" : 320,
+ "versionName" : "3.2.1",
+ "versionCode" : 321,
"transformPx" : false,
"networkTimeout" : 2000,
/* 5+App特有相关 */
@@ -30,7 +30,9 @@
"idfa" : false
},
/* SDK配置 */
- "sdkConfigs" : {},
+ "sdkConfigs" : {
+ "ad" : {}
+ },
"icons" : {
"android" : {
"hdpi" : "unpackage/res/icons/72x72.png",
@@ -64,9 +66,9 @@
}
}
},
- "renderer" : "native",
"compilerVersion" : 3,
- "nvueLaunchMode" : "fast"
+ "nvueLaunchMode" : "fast",
+ "renderer" : "native"
},
/* 快应用特有相关 */
"quickapp" : {},
diff --git a/SHST-WEX/pages/Home/auxiliary/login.nvue b/SHST-WEX/pages/Home/auxiliary/login.nvue
index 4a1d985..84b3b1c 100644
--- a/SHST-WEX/pages/Home/auxiliary/login.nvue
+++ b/SHST-WEX/pages/Home/auxiliary/login.nvue
@@ -128,7 +128,6 @@
app.globalData.curWeek = res.data.initData.curWeek;
app.globalData.tips = res.data.initData.tips;
app.globalData.initData = res.data.initData;
- that.checkAppUpdate(res.data.initData.version);
if (user.account) {
app.globalData.user = user.account;
that.login(user.account, user.password, false);
@@ -147,37 +146,7 @@
}
}
})
- },
- checkAppUpdate: function(e) {
- if (!e) return false;
- if (app.globalData.version === e) return false;
- var url = `http://windrunner_max.gitee.io/imgpath/SHST/App/SHST-${e}.wgt`;
- uni.downloadFile({
- url: url,
- success: (downloadResult) => {
- if (downloadResult.statusCode === 200) {
- uni.showModal({
- title: '更新提示',
- content: '增量包已下载完成，点击确定将重启以更新',
- showCancel: false,
- success: (res) => {
- if (res.confirm) {
- plus.runtime.install(downloadResult.tempFilePath, {
- force: true
- }, function() {
- console.log('install success...');
- plus.runtime.restart();
- }, function(e) {
- console.log(e)
- console.error('install fail...');
- });
- }
- }
- });
- }
- }
- })
- },
+ }
}
}
diff --git a/SHST-WEX/pages/Study/timeTable/timeTable.nvue b/SHST-WEX/pages/Study/timeTable/timeTable.nvue
index 00353f5..cbef6bf 100644
--- a/SHST-WEX/pages/Study/timeTable/timeTable.nvue
+++ b/SHST-WEX/pages/Study/timeTable/timeTable.nvue
@@ -9,10 +9,10 @@
- {{preT}}
+
- {{nextT}}
+
@@ -52,8 +52,8 @@
- {{table[inner][item][2]}}
- {{table[inner][item][4]}}
+ {{table[inner][item][2]}}
+ {{table[inner][item][4]}}
{{table[inner][item][3]}}
@@ -78,8 +78,6 @@
},
data() {
return {
- nextT: '>',
- preT: '<',
week: 1,
ad: 1,
date: [{
@@ -111,7 +109,6 @@
},
onLoad(e) {
util.extDate(); //拓展Date原型
- // app.addIconfont(dom);
this.week = app.globalData.curWeek;
this.getRemoteTable(app.globalData.curWeek);
},
@@ -203,21 +200,26 @@
.iconfont{
font-size: 18px;
}
+
.operate{
color: #767676;
}
-
.line {
flex-direction: row;
}
.timetableHide {
- min-height: 130px;
+ min-height: 135px;
margin: 0 1px;
color: #fff;
- padding: 1px;
- font-size: 13px;
+ padding: 3px;
+ font-size: 12px;
+ border-radius: 3px;
+ }
+
+ .t1{
+ margin-bottom: 3px;
}
.timetablehr {
diff --git a/SHST-WEX/pages/User/about/about.nvue b/SHST-WEX/pages/User/about/about.nvue
index abbc258..e835ac2 100644
--- a/SHST-WEX/pages/User/about/about.nvue
+++ b/SHST-WEX/pages/User/about/about.nvue
@@ -20,7 +20,7 @@
反馈QQ群
- 522567369
+ 522567369
diff --git a/SHST-WEX/vector/dispose.js b/SHST-WEX/vector/dispose.js
index ad537d7..ea75aa7 100644
--- a/SHST-WEX/vector/dispose.js
+++ b/SHST-WEX/vector/dispose.js
@@ -12,9 +12,10 @@ module.exports = {
/**
* 颜色方案
*/
-module.exports.colorList = ["#EAA78C", "#F9CD82", "#9ADEAD", "#9CB6E9", "#E49D9B", "#97D7D7", "#ABA0CA", "#9F8BEC",
- "#ACA4D5", "#6495ED", "#7BCDA5", "#76B4EF"
-];
+// module.exports.colorList = ["#EAA78C", "#F9CD82", "#9ADEAD", "#9CB6E9", "#E49D9B", "#97D7D7", "#ABA0CA", "#9F8BEC",
+// "#ACA4D5", "#6495ED", "#7BCDA5", "#76B4EF","#E1C38F","#F6C46A","#B19ED1","#F09B98","#87CECB","#D1A495","#89D196"
+// ];
+module.exports.colorList = ["#FE9E9F","#FFCA62","#93BAFF","#FFA477","#D999F9","#75E1A5"];
/**
* 拓展对象
diff --git a/SHST-WEX/vector/pubFct.js b/SHST-WEX/vector/pubFct.js
index d952275..651f230 100644
--- a/SHST-WEX/vector/pubFct.js
+++ b/SHST-WEX/vector/pubFct.js
@@ -26,7 +26,8 @@ function tableDispose(info, flag = 0) {
if (flag === 1 && day !== week) return;
var knot = parseInt(parseInt(value.kcsj.substr(1, 2)) / 2);
var md5Str = md5.hexMD5(value.kcmc);
- var colorSignal = app.globalData.colorList[Math.abs((md5Str[0].charCodeAt() - md5Str[3].charCodeAt())) % app.globalData.colorN];
+ var md5PickNum = function(){ let r=0; for(let i=0;i<7;++i) r += md5Str[i].charCodeAt(); return r;}();
+ var colorSignal = app.globalData.colorList[ md5PickNum % app.globalData.colorN];
arrInner.push(day);
arrInner.push(knot);
arrInner.push(value.kcmc.split("（")[0]);