|
|
|
@ -402,12 +402,12 @@ export default {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
setTimeout(() => {
|
|
|
|
setTimeout(() => {
|
|
|
|
let _notice = uni.getStorageSync("miniApp-info").notice || '愿祖国繁荣富强,山河锦绣如画;盼华夏儿女同心,共筑盛世中华!';
|
|
|
|
let _notice = (uni.getStorageSync("miniApp-info") || {}).notice || '愿祖国繁荣富强,山河锦绣如画;盼华夏儿女同心,共筑盛世中华!';
|
|
|
|
if (_notice) {
|
|
|
|
if (_notice) {
|
|
|
|
var reg = /[\r\n]/g;
|
|
|
|
var reg = /[\r\n]/g;
|
|
|
|
_notice = _notice.replace(reg, "");
|
|
|
|
_notice = _notice.replace(reg, "");
|
|
|
|
that.noticList = [_notice];
|
|
|
|
that.noticList = [_notice];
|
|
|
|
that.noticeColor = uni.getStorageSync("miniApp-info").noticeColor;
|
|
|
|
that.noticeColor = (uni.getStorageSync("miniApp-info") || {}).noticeColor;
|
|
|
|
that.showNotic = "play";
|
|
|
|
that.showNotic = "play";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}, 100);
|
|
|
|
}, 100);
|
|
|
|
@ -590,6 +590,7 @@ export default {
|
|
|
|
},
|
|
|
|
},
|
|
|
|
methods: {
|
|
|
|
methods: {
|
|
|
|
themeColorRgba(alpha) {
|
|
|
|
themeColorRgba(alpha) {
|
|
|
|
|
|
|
|
if (!this.themeColor) return `rgba(0,0,0,${alpha})`;
|
|
|
|
let hex = this.themeColor.replace('#', '');
|
|
|
|
let hex = this.themeColor.replace('#', '');
|
|
|
|
if (hex.length === 3) hex = hex.split('').map(c => c + c).join('');
|
|
|
|
if (hex.length === 3) hex = hex.split('').map(c => c + c).join('');
|
|
|
|
let r = parseInt(hex.substring(0, 2), 16);
|
|
|
|
let r = parseInt(hex.substring(0, 2), 16);
|
|
|
|
@ -1036,7 +1037,7 @@ export default {
|
|
|
|
that.query.list = [];
|
|
|
|
that.query.list = [];
|
|
|
|
uni.setStorageSync("lin-liu", 0);
|
|
|
|
uni.setStorageSync("lin-liu", 0);
|
|
|
|
uni.setStorageSync("lin-bao", 0);
|
|
|
|
uni.setStorageSync("lin-bao", 0);
|
|
|
|
that.query.list = resData.recordList.map((item, index) => {
|
|
|
|
that.query.list = (resData.recordList || []).map((item, index) => {
|
|
|
|
item.liuNum = uni.getStorageSync("lin-liu") ? uni.getStorageSync("lin-liu") : Math.floor(Math.random() * 1000);
|
|
|
|
item.liuNum = uni.getStorageSync("lin-liu") ? uni.getStorageSync("lin-liu") : Math.floor(Math.random() * 1000);
|
|
|
|
|
|
|
|
|
|
|
|
return {
|
|
|
|
return {
|
|
|
|
@ -1131,7 +1132,7 @@ export default {
|
|
|
|
);
|
|
|
|
);
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
that.query.list = that.query.list.concat(
|
|
|
|
that.query.list = that.query.list.concat(
|
|
|
|
resData.recordList.map((item, index) => {
|
|
|
|
(resData.recordList || []).map((item, index) => {
|
|
|
|
return {
|
|
|
|
return {
|
|
|
|
...item,
|
|
|
|
...item,
|
|
|
|
liuNum: item.liuNum,
|
|
|
|
liuNum: item.liuNum,
|
|
|
|
@ -1151,8 +1152,8 @@ export default {
|
|
|
|
);
|
|
|
|
);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
that.speed = resData.recordCount;
|
|
|
|
that.speed = resData.recordCount || 0;
|
|
|
|
that.query.isFinish = resData.recordList.length;
|
|
|
|
that.query.isFinish = (resData.recordList || []).length;
|
|
|
|
resolve();
|
|
|
|
resolve();
|
|
|
|
});
|
|
|
|
});
|
|
|
|
// console.log("resData.recordList", resData.recordList);
|
|
|
|
// console.log("resData.recordList", resData.recordList);
|
|
|
|
@ -1307,11 +1308,10 @@ export default {
|
|
|
|
});
|
|
|
|
});
|
|
|
|
},
|
|
|
|
},
|
|
|
|
getSearch(e) {
|
|
|
|
getSearch(e) {
|
|
|
|
// console.log(e);
|
|
|
|
|
|
|
|
this.speed = -1;
|
|
|
|
this.speed = -1;
|
|
|
|
|
|
|
|
this.isshowskit = false;
|
|
|
|
this.keyword = e || "";
|
|
|
|
this.keyword = e || "";
|
|
|
|
this.query.page = 1;
|
|
|
|
this.query.page = 1;
|
|
|
|
// console.log(this.whichPage);
|
|
|
|
|
|
|
|
this.getList();
|
|
|
|
this.getList();
|
|
|
|
},
|
|
|
|
},
|
|
|
|
restoreActiveTab() {
|
|
|
|
restoreActiveTab() {
|
|
|
|
|