Merge branch 'test' of https://e.coding.net/g-cphe0354/duanju/video_app into gaohao
This commit is contained in:
@@ -356,8 +356,13 @@
|
|||||||
}
|
}
|
||||||
this.$Request.getT('app/cash/selectPayDetails', data).then(res => {
|
this.$Request.getT('app/cash/selectPayDetails', data).then(res => {
|
||||||
this.totalCount = res.data.totalCount;
|
this.totalCount = res.data.totalCount;
|
||||||
|
|
||||||
if (res.data.list.length > 0) {
|
if (res.data.list.length > 0) {
|
||||||
this.list = [...this.list, ...res.data.list];
|
if(this.page==1){
|
||||||
|
this.list = res.data.list
|
||||||
|
}else{
|
||||||
|
this.list = [...this.list, ...res.data.list];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -399,9 +399,9 @@
|
|||||||
getDataList() {
|
getDataList() {
|
||||||
let data = {
|
let data = {
|
||||||
page: this.page,
|
page: this.page,
|
||||||
limit: this.limit
|
limit: this.limit,
|
||||||
// token: uni.getStorageSync('token') ? uni.getStorageSync('token') : '',
|
// token: uni.getStorageSync('token') ? uni.getStorageSync('token') : '',
|
||||||
// randomNum: this.randomNum
|
randomNum: this.randomNum
|
||||||
};
|
};
|
||||||
console.log("getDataList")
|
console.log("getDataList")
|
||||||
httpsRequest.getT('/app/course/selectCourseDetailsList', data).then(res => {
|
httpsRequest.getT('/app/course/selectCourseDetailsList', data).then(res => {
|
||||||
|
|||||||
@@ -700,9 +700,9 @@
|
|||||||
getDataList() {
|
getDataList() {
|
||||||
let data = {
|
let data = {
|
||||||
page: this.page,
|
page: this.page,
|
||||||
limit: this.limit
|
limit: this.limit,
|
||||||
// token: uni.getStorageSync('token') ? uni.getStorageSync('token') : '',
|
// token: uni.getStorageSync('token') ? uni.getStorageSync('token') : '',
|
||||||
// randomNum: this.randomNum
|
randomNum: this.randomNum
|
||||||
}
|
}
|
||||||
// #ifdef MP-WEIXIN
|
// #ifdef MP-WEIXIN
|
||||||
data.wxShow = 1
|
data.wxShow = 1
|
||||||
|
|||||||
Reference in New Issue
Block a user