From 97f1ddce6eef329897995004edafd22f93a508f7 Mon Sep 17 00:00:00 2001 From: huliyong <2783385703@qq.com> Date: Tue, 10 Sep 2024 13:03:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/api.js | 78 ++++++++++++++++++--------- api/http.js | 5 +- {static/image/center => centerSvgIcon}/1.png | Bin pages.json | 6 +++ pages/auth/login.vue | 32 ++++++++--- pages/index/center.vue | 4 +- pages/publish/actorDetail.vue | 1 - pages/publish/competition.vue | 38 ++++++++++--- store/store.js | 6 +++ 9 files changed, 125 insertions(+), 45 deletions(-) rename {static/image/center => centerSvgIcon}/1.png (100%) diff --git a/api/api.js b/api/api.js index 5a56e45..e431edb 100644 --- a/api/api.js +++ b/api/api.js @@ -31,17 +31,20 @@ const config = { //获取动态列表带分页 indexGetTrendsPage: { url: '/api/index/getTrendsPage', - method: 'GET' + method: 'GET', + showLoading : true, }, - //获取动态列表带分页 + //获取演员列表带分页 indexGetActorSetPage: { url: '/api/index/getActorSetPage', - method: 'GET' + method: 'GET', + showLoading : true, }, //获取动态详情 indexGetTrendsDetail: { url: '/api/index/getTrendsDetail', - method: 'GET' + method: 'GET', + showLoading : true, }, //获取投诉原因 indexGetComplaintReason: { @@ -53,10 +56,11 @@ const config = { url: '/api/index/getWorkPage', method: 'GET' }, - //获取投诉原因 + //获取置顶列表 indexTopPayList: { url: '/api/index/getTopPayList', - method: 'GET' + method: 'GET', + showLoading : true, }, @@ -68,14 +72,15 @@ const config = { method: 'GET', auth: true, limit : 1500, + showLoading : true, }, - //发布动态 infoReleaseTrends: { url: '/api/info/releaseTrends', method: 'POST', auth: true, limit : 1000, + showLoading : true, }, //发布演员接口 publishActor: { @@ -83,30 +88,35 @@ const config = { method: 'POST', auth: true, limit : 1000, + showLoading : true, }, //获取银行卡列表带分页 infoGetBankCardPage: { url: '/api/info/getBankCardPage', method: 'GET', - auth: true + auth: true, + showLoading : true, }, // 获取个人认证信息 infoGetCertification: { url: '/api/info/getCertification', method: 'GET', - auth: true + auth: true, + showLoading : true, }, //获取企业认证信息 infoGetCompanyCertification: { url: '/api/info/getCompanyCertification', method: 'GET', - auth: true + auth: true, + showLoading : true, }, // 获取收益记录带分页 infoGetIncomePage: { url: '/api/info/getIncomePage', method: 'GET', - auth: true + auth: true, + showLoading : true, }, // 获取个人信息接口 infoGetInfo: { @@ -118,67 +128,78 @@ const config = { infoGetMyReleaseDetail: { url: '/api/info/getMyReleaseDetail', method: 'GET', - auth: true + auth: true, + showLoading : true, }, // 获取我的发布列表 infoGetMyReleasePage: { url: '/api/info/getMyReleasePage', method: 'GET', - auth: true + auth: true, + showLoading : true, }, // 获取推广记录详情 infoGetPromotionDetail: { url: '/api/info/getPromotionDetail', method: 'GET', - auth: true + auth: true, + showLoading : true, }, // 确认推广 ConfirmPromotion: { url: '/api/info/confirmPromotion', method: 'POST', - auth: true + auth: true, + showLoading : true, }, // 获取推广记录列表 infoGetPromotionPage: { url: '/api/info/getPromotionPage', method: 'GET', - auth: true + auth: true, + showLoading : true, }, // 获取提现记录带分页 infoGetWithdrawPage: { url: '/api/info/getWithdrawPage', method: 'GET', - auth: true + auth: true, + showLoading : true, }, // 个人认证提交 infoSubmitCertification: { url: '/api/info/submitCertification', method: 'GET', - auth: true, + auth: true, + showLoading : true, }, // 企业认证提交 infoSubmitCompanyCertification: { url: '/api/info/submitCompanyCertification', method: 'GET', - auth: true + auth: true, + showLoading : true, }, // 修改个人信息接口 infoUpdateInfo: { url: '/api/info/updateInfo', method: 'POST', - auth: true + auth: true, + showLoading : true, }, // 用户提现 infoWithdraw: { url: '/api/info/withdraw', method: 'POST', - auth: true + auth: true, + showLoading : true, }, // 获取用户平台数据 infoGetInfoMoney: { url: '/api/info/getInfoMoney', method: 'GET', - auth: true + auth: true, + showLoading : true, }, @@ -188,24 +209,28 @@ const config = { loginBindPhone: { url: '/api/login/bindPhone', method: 'GET', - auth: true + auth: true, + showLoading : true, }, // 找回密码接口 loginForget: { url: '/api/login/forget', method: 'GET', - auth: true + auth: true, + showLoading : true, }, // 登录接口 loginLogin: { url: '/api/login/login', - method: 'GET', + method: 'GET', + showLoading : true, }, // 退出接口 loginLogout: { url: '/api/login/logout', method: 'GET', - auth: true + auth: true, + showLoading : true, }, // 注册接口 loginRegister: { @@ -216,6 +241,7 @@ const config = { loginSendcode: { url: '/api/login/sendCode', method: 'GET', + showLoading : true, }, } diff --git a/api/http.js b/api/http.js index ac4fc81..be3147e 100644 --- a/api/http.js +++ b/api/http.js @@ -6,7 +6,7 @@ function http(uri, data, callback, method = 'GET', showLoading, title) { if(showLoading){ uni.showLoading({ - title: title || '正在提交...' + title: title || '加载中...' }); } @@ -26,7 +26,8 @@ function http(uri, data, callback, method = 'GET', showLoading, title) { if(res.statusCode == 401 || res.data.code == 401 || - res.data.message == '操作失败，token非法无效!'){ + res.data.message == '操作失败，token非法无效!' || + res.data.message == '操作失败，用户不存在!'){ uni.removeStorageSync('token') console.error('登录过期'); uni.navigateTo({ diff --git a/static/image/center/1.png b/centerSvgIcon/1.png similarity index 100% rename from static/image/center/1.png rename to centerSvgIcon/1.png diff --git a/pages.json b/pages.json index 88087cb..8faaa54 100644 --- a/pages.json +++ b/pages.json @@ -164,6 +164,12 @@ "style": { "navigationBarTitleText": "" } + }, + { + "path": "mine/updateUserInfo", + "style": { + "navigationBarTitleText": "" + } } ] }], diff --git a/pages/auth/login.vue b/pages/auth/login.vue index 890b1f3..6b633a6 100644 --- a/pages/auth/login.vue +++ b/pages/auth/login.vue @@ -6,18 +6,18 @@ 欢迎登录真视界 - + - - 微信授权手机号登录 + + 微信授权登录 - + @@ -33,20 +33,23 @@ size="30rpx" :name="1" > - 阅读并同意我们的“服务协议与隐私条款” + 阅读并同意我们的“服务协议与隐私条款” - 以及个人信息保护指引 + 以及个人信息保护指引 + diff --git a/pages/index/center.vue b/pages/index/center.vue index d5fc2e3..3285127 100644 --- a/pages/index/center.vue +++ b/pages/index/center.vue @@ -53,7 +53,7 @@ - {{ item.title }} + {{ item.title }} @@ -69,7 +69,7 @@ - {{ item.title }} + {{ item.title }} diff --git a/pages/publish/actorDetail.vue b/pages/publish/actorDetail.vue index 1cb3106..1dcb6cf 100644 --- a/pages/publish/actorDetail.vue +++ b/pages/publish/actorDetail.vue @@ -53,7 +53,6 @@ v-for="(t, index) in item.isImage && item.isImage.split(',')" :key="index"> - diff --git a/pages/publish/competition.vue b/pages/publish/competition.vue index 693510e..3be92f6 100644 --- a/pages/publish/competition.vue +++ b/pages/publish/competition.vue @@ -53,22 +53,22 @@ - + - 作品名称 + {{ item.title }} - 发布人：小飞作品名称作品名称作品名称作品名称 + 发布人：{{ item.createBy }} - 发布时间：2024-03-03 + 发布时间：{{ item.createTime }} @@ -98,11 +98,37 @@ export default { data() { return { - list : [] + list : [], + total : 0, + queryParams: { + pageNo: 1, + pageSize: 10 + }, + } + }, + onLoad() { + // this.$route.query的参数 + this.getList() + }, + //滚动到屏幕底部 + onReachBottom() { + if(this.queryParams.pageSize < this.total){ + this.queryParams.pageSize += 10 + this.getList() } }, methods: { - + getList(){ + this.$api('indexGetGetWorkPage', { + token : uni.getStorageSync('token'), + ...this.queryParams + }, res => { + if(res.code == 200){ + this.list = res.result.records + this.total = res.result.total + } + }) + } } } diff --git a/store/store.js b/store/store.js index 9b503bd..da90e9e 100644 --- a/store/store.js +++ b/store/store.js @@ -29,6 +29,9 @@ const store = new Vuex.Store({ }) }, login(state){ + uni.showLoading({ + title: '登录中...' + }) uni.login({ success(res) { if(res.errMsg != "login:ok"){ @@ -38,6 +41,9 @@ const store = new Vuex.Store({ api('loginLogin', { code : res.code }, res => { + + uni.hideLoading() + if(res.code != 200){ return }