diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json index 1b8d0f6..8ae452a 100644 --- a/.hbuilderx/launch.json +++ b/.hbuilderx/launch.json @@ -2,7 +2,7 @@ "version" : "1.0", "configurations" : [ { - "playground" : "custom", + "playground" : "standard", "type" : "uni-app:app-android" } ] diff --git a/App.vue b/App.vue index 96a7a46..01387a1 100644 --- a/App.vue +++ b/App.vue @@ -1,9 +1,9 @@ diff --git a/api/login/login.js b/api/login/login.js index ad323a6..f1f4109 100644 --- a/api/login/login.js +++ b/api/login/login.js @@ -41,3 +41,13 @@ export const forgetPwd = (data) => { }) } +/** + * 绑定 + */ +export const bind = (data) => { + return http.request({ + url: '/Login/registerCode', + method: 'POST', + params: data + }) +} \ No newline at end of file diff --git a/api/me/me.js b/api/me/me.js index 3da06c2..72d2b8e 100644 --- a/api/me/me.js +++ b/api/me/me.js @@ -9,4 +9,67 @@ export const selectByUserId = (data) => { data: data, method: 'GET' }) +} + +/** + * 获取客服微信 + */ +export const commonType = (type) => { + return http.request({ + url: `/common/type/${type}`, + method: 'GET' + }) +} + +/** + * 金币明细 + */ +export const queryUserMoneyDetails = (data) => { + return http.request({ + url: '/moneyDetails/queryUserMoneyDetails', + method: 'GET', + data: data + }) +} + +/** + * 意见反馈 + */ +export const sendMessage = (data) => { + return http.request({ + url: '/message/sendMessage', + method: 'POST', + data: data + }) +} + +/** + * 帮助中心 + */ +export const selectHelpList = (data) => { + return http.request({ + url: '/helpWord/selectHelpList', + method: 'GET', + data: data + }) +} + +/** + * 个人中心数据 + */ +export const collectVideoSummary = () => { + return http.request({ + url: '/courseCollect/collectVideoSummary', + method: 'GET' + }) +} + +/** + * 金币 + */ +export const selectUserMoney = () => { + return http.request({ + url: '/moneyDetails/selectUserMoney', + method: 'GET' + }) } \ No newline at end of file diff --git a/api/me/message.js b/api/me/message.js new file mode 100644 index 0000000..c670391 --- /dev/null +++ b/api/me/message.js @@ -0,0 +1,11 @@ +import http from '@/http/http.js' + +/** + * 获取消息列表 + */ +export const selectMessageByUserId = (data) => { + return http.request({ + url: '/message/selectMessageByUserId', + data: data, + }) +} \ No newline at end of file diff --git a/api/me/withdraw.js b/api/me/withdraw.js new file mode 100644 index 0000000..425201a --- /dev/null +++ b/api/me/withdraw.js @@ -0,0 +1,71 @@ +import http from '@/http/http.js' + +/** + * 获取提现金额 + */ +export const selectUserMoney = (data) => { + return http.request({ + url: '/moneyDetails/selectUserMoney', + }) +} + +/** + * 获取提现记录 + */ +export const selectPayDetails = (data) => { + return http.request({ + url: '/cash/selectPayDetails', + data: data + }) +} + +/** + * 红包明细记录 + */ +export const queryUserMoneyDetails = (data) => { + return http.request({ + url: '/moneyDetails/queryUserMoneyDetails', + data: data + }) +} + + +/** + * 修改提现账号 + */ +export const updateUser = (data) => { + return http.request({ + url: '/user/updateUser', + params: data + }) +} + +/** + * 获取看广告状态 + */ +export const canCash = (data) => { + return http.request({ + url: '/cash/canCash', + }) +} + +/** + * 广告状态修改 + */ +export const state = (data) => { + return http.request({ + url: '/ad/state', + data: data, + }) +} + +/** + * 广告状态修改 + */ +export const withdraw = (data) => { + return http.request({ + url: '/cash/withdraw', + data: data, + }) +} + diff --git a/api/share/index.js b/api/share/index.js new file mode 100644 index 0000000..a36b9bd --- /dev/null +++ b/api/share/index.js @@ -0,0 +1,32 @@ +import http from '@/http/http.js' + +/** + * 获取已邀请列表 + */ +export const selectInviteByUserIdLists = (data) => { + return http.request({ + url: '/invite/selectInviteByUserIdLists', + data: data, + }) +} + +/** + * 获取邀请战绩 + */ +export const selectInviteMoney = (data) => { + return http.request({ + url: '/invite/selectInviteMoney', + data: data, + }) +} + +/** + * 获取海报数据 + */ +export const selectBannerList = (data) => { + return http.request({ + url: '/banner/selectBannerList', + data: data, + }) +} + diff --git a/api/user/user.js b/api/user/user.js index 0f89981..93846b2 100644 --- a/api/user/user.js +++ b/api/user/user.js @@ -8,4 +8,15 @@ export const selectUserById = (data) => { url: '/user/selectUserById', data: data }) -} \ No newline at end of file +} + +/** + * 修改用户信息 + */ +export const updateUsers = (data) => { + return http.request({ + url: '/user/updateUsers', + method: 'POST', + data: data, + }) +} diff --git a/http/http.js b/http/http.js index 041d67f..653ab23 100644 --- a/http/http.js +++ b/http/http.js @@ -162,7 +162,7 @@ function request(args) { result += encodeURIComponent(key) + '=' + encodeURIComponent(params[key]) + "&" } }) - url = url+'?'+result + url = url+'?'+(result.slice(0,result.length-1)) params = null } let headerObject = {} diff --git a/manifest.json b/manifest.json index 175630e..4bf0cc6 100644 --- a/manifest.json +++ b/manifest.json @@ -3,7 +3,7 @@ "appid" : "__UNI__E0B05B1", "description" : "", "versionName" : "1.0.0", - "versionCode" : "100", + "versionCode" : 100, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/pages.json b/pages.json index a1e3eea..794f373 100644 --- a/pages.json +++ b/pages.json @@ -28,7 +28,7 @@ "navigationBarTitleText": "", "navigationStyle": "custom" } - }, + }, { "path": "pages/task/index", "style": { @@ -42,13 +42,47 @@ "enablePullDownRefresh": true } }, { - "path": "pages/watching_history/watching_history" + "path": "pages/watching_history/watching_history", + "style": { + "enablePullDownRefresh": true + } }, { "path": "pages/me/index", "style": { "navigationBarTitleText": "", "navigationStyle": "custom" } + }, { + "path": "pages/me/contact", + "style": { + "navigationBarTitleText": "联系客服" + } + }, { + "path": "pages/me/gold_record", + "style": { + "navigationBarTitleText": "金币明细", + "enablePullDownRefresh": true + } + }, { + "path": "pages/me/feedback", + "style": { + "navigationBarTitleText": "意见反馈" + } + }, { + "path": "pages/me/help_center", + "style": { + "navigationBarTitleText": "帮助中心" + } + }, { + "path": "pages/me/setting", + "style": { + "navigationBarTitleText": "设置" + } + }, { + "path": "pages/me/help_center_detail", + "style": { + "navigationBarTitleText": "" + } }, { "path": "pages/login/login", "style": { @@ -61,6 +95,11 @@ "navigationBarTitleText": "注册", "navigationStyle": "custom" } + }, { + "path": "pages/login/bind", + "style": { + "navigationBarTitleText": "修改手机号" + } }, { "path": "pages/login/registerApp", "style": { @@ -73,6 +112,11 @@ "navigationBarTitleText": "忘记密码", "navigationStyle": "custom" } + }, { + "path": "pages/login/download", + "style": { + "navigationBarTitleText": "下载" + } }, { "path": "pages/me/userInfo", "style": { @@ -88,6 +132,37 @@ "style": { "navigationBarTitleText": "服务协议" } + }, { + "path": "pages/me/message", + "style": { + "navigationBarTitleText": "消息中心" + } + }, { + "path": "pages/me/withdraw/index", + "style": { + "navigationBarTitleText": "申请提现", + "navigationStyle": "custom" + } + }, { + "path": "pages/me/withdraw/realName", + "style": { + "navigationBarTitleText": "实名认证" + } + }, { + "path": "pages/me/withdraw/alipay", + "style": { + "navigationBarTitleText": "提现账号" + } + }, { + "path": "pages/me/withdraw/moneyList", + "style": { + "navigationBarTitleText": "红包明细" + } + }, { + "path": "pages/share/index", + "style": { + "navigationBarTitleText": "分享" + } }, { "path": "pages/index/search/index", diff --git a/pages/chasingDrama/index.vue b/pages/chasingDrama/index.vue index 33a131c..190d722 100644 --- a/pages/chasingDrama/index.vue +++ b/pages/chasingDrama/index.vue @@ -53,12 +53,15 @@ import { onLoad, onPullDownRefresh, onReachBottom } from '@dcloudio/uni-app'; async function selectByUserIdAjax() { try { const res1 = await selectByUserId({ page: 1, limit: 6, classify: 3 }); - const res2 = await selectByUserId({ page: 1, limit: 6, classify: 6 }); + const res2 = await selectByUserId({ page: 1, limit: 6, classify: 1 }); data.list1 = res1.records; data.list2 = res2.records; } catch (error) { console.log(error); } + setTimeout(() => { + uni.stopPullDownRefresh(); + }, 500); } const data = reactive({ diff --git a/pages/login/appEq.vue b/pages/login/appEq.vue deleted file mode 100644 index d2e05f4..0000000 --- a/pages/login/appEq.vue +++ /dev/null @@ -1,303 +0,0 @@ - - - - \ No newline at end of file diff --git a/pages/login/bind.vue b/pages/login/bind.vue index 7d8245a..1e25199 100644 --- a/pages/login/bind.vue +++ b/pages/login/bind.vue @@ -1,27 +1,26 @@ - - \ No newline at end of file diff --git a/pages/login/download.vue b/pages/login/download.vue new file mode 100644 index 0000000..410dc30 --- /dev/null +++ b/pages/login/download.vue @@ -0,0 +1,149 @@ + + + + + \ No newline at end of file diff --git a/pages/login/forgetPwd.vue b/pages/login/forgetPwd.vue index 3be07f2..e0f2e11 100644 --- a/pages/login/forgetPwd.vue +++ b/pages/login/forgetPwd.vue @@ -1,5 +1,6 @@