From 8d8c14ec66c90e8485d6da985e6c108752b1cb7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=94=90=E6=98=8E=E6=98=8E?= <970899069@qq.com> Date: Mon, 13 Feb 2023 11:58:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 3 +- .hbuilderx/launch.json | 2 +- App.vue | 8 +- apis/index.js | 3 +- apis/interfaces/index.js | 8 +- apis/interfaces/order.js | 13 ++- apis/interfaces/pay.js | 47 +++++++- apis/interfaces/user.js | 27 ++++- manifest.json | 4 +- pages.json | 17 ++- pages/account/integral.vue | 1 + pages/auth/auth.vue | 1 + pages/auth/registered.vue | 2 + pages/auth/resetPassword.vue | 1 + pages/college/answer.vue | 1 + pages/college/test.vue | 15 ++- pages/index/free.vue | 72 +++++++----- pages/index/index.vue | 83 +++++++++++++- pages/pay/pay.vue | 149 ++++++++++++++++++++++-- pages/transfers/lists.vue | 5 +- pages/user/certification.vue | 5 +- pages/user/index.vue | 213 ++++++++++++++++++++++++++++++++++- pages/user/team.vue | 91 +++++++++++---- pages/work/available.vue | 34 +++++- pages/work/confirmScheme.vue | 1 + pages/work/generate.vue | 20 ++++ pages/work/index.vue | 2 +- pages/work/orderLog.vue | 132 ++++++++++++++++++++++ pages/work/orders.vue | 6 +- pages/work/perfectChoose.vue | 1 + static/icons/pay_ali.png | Bin 0 -> 6001 bytes static/icons/user_nav_07.png | Bin 0 -> 5375 bytes store/index.js | 2 +- 33 files changed, 879 insertions(+), 90 deletions(-) create mode 100644 pages/work/orderLog.vue create mode 100644 static/icons/pay_ali.png create mode 100644 static/icons/user_nav_07.png diff --git a/.env b/.env index 1279948..870a9ca 100644 --- a/.env +++ b/.env @@ -1,2 +1,3 @@ -HAST_URL = '' +VUE_APP_SIGN_URL = '' +VUE_APP_USER_URL = '' diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json index 9b0d791..4ccd172 100644 --- a/.hbuilderx/launch.json +++ b/.hbuilderx/launch.json @@ -13,7 +13,7 @@ "type" : "uniCloud" }, { - "playground" : "standard", + "playground" : "custom", "type" : "uni-app:app-android" } ] diff --git a/App.vue b/App.vue index 01129aa..f562823 100644 --- a/App.vue +++ b/App.vue @@ -56,7 +56,13 @@ }) }) //#endif - } + }, + globalData:{ + signUrl: "https://web.douhuofalv.com/app/e-sign?sign_type=order", + // https://web.douhuotest.douhuofalv.com/app/e-sign?sign_type=order 测试环境 + certificationUrl: 'http://web.douhuofalv.com/app/e-sign?sign_type=personal', + // 'https://web.douhuotest.douhuofalv.com/app/e-sign?sign_type=personal' 测试环境 + } } diff --git a/apis/index.js b/apis/index.js index 41b2d81..0a6a8ca 100644 --- a/apis/index.js +++ b/apis/index.js @@ -11,6 +11,7 @@ import router from '../router' // 基础配置 const config = { apiUrl : 'https://douhuo.douhuofalv.com/api/', + // apiUrl : 'https://api.douhuotest.douhuofalv.com/api/', //测试环境 timeout : 60000 } @@ -50,7 +51,6 @@ const request = (parameter, hideLoding = true) => { updateToken('token', res.header.Authorization) } if(res.statusCode === 200){ - uni.hideLoading() const resolveData = res.data if(resolveData.status_code === 200) { resolve(resolveData.data) @@ -146,6 +146,7 @@ const loginHint = () => { if( loginHintState ) return if(!loginHintState) loginHintState = true updateToken('') + uni.hideLoading() uni.showModal({ title: '登录提示', content: '您的登录信息已过期，请重新登录', diff --git a/apis/interfaces/index.js b/apis/interfaces/index.js index 7b9901c..d61fc2b 100644 --- a/apis/interfaces/index.js +++ b/apis/interfaces/index.js @@ -33,21 +33,21 @@ const zf = (data) =>{ }) } -// 自由服务包详情 +// 自由服务包详情 const recharge = () =>{ return request({ url: "app/services/recharge" }) } -// // 自由服务包支付 +// 自由服务包支付 const zyPay = (id) =>{ return request({ - url: "app/services/recharge/"+id+"/pay", + url: "app/services/recharge/" + id + "/pay", method:'post' }) } -// 服务包详情 +// 服务包详情 const fwbDetail = (service) =>{ return request({ url: "app/services/" + service diff --git a/apis/interfaces/order.js b/apis/interfaces/order.js index fe0dacb..6a34cf8 100644 --- a/apis/interfaces/order.js +++ b/apis/interfaces/order.js @@ -190,6 +190,16 @@ const orderCancel = id => { }) } +// 操作记录 +const orderLog = (id, page) => { + return request({ + url: 'business/' + id + '/do_logs', + data: { + page + } + }) +} + // 支付订单 export { lists, @@ -214,5 +224,6 @@ export { getConfirmScheme, getConfirmSchemeInfo, sbuConfirmScheme, - orderCancel + orderCancel, + orderLog } diff --git a/apis/interfaces/pay.js b/apis/interfaces/pay.js index 07fa977..71dcf40 100644 --- a/apis/interfaces/pay.js +++ b/apis/interfaces/pay.js @@ -22,7 +22,52 @@ const diffCoinPay = orderId => { }) } +// ❤️银联支付 +const umsPay = (orderId, data) => { + return request({ + url : 'pay/order/' + orderId + '/ums', + data + }) +} + +// 银联支付补差价 +const diffUmsPay = (orderId, data) => { + return request({ + url: 'pay/diff/' + orderId + '/ums', + data + }) +} + +// ️银联支付查询支付结果 +const umsState = (trade_id) => { + return request({ + url : 'payments/query/' + trade_id, + }) +} + +// 自由服务包订单信息 +const umsFreeInfo = (service) => { + return request({ + url : 'app/services/recharge/' + service + '/order', + method: 'POST' + }) +} + +// 自由服务包支付 +const umsFree = (orderNo, type) => { + return request({ + url : 'app/services/recharge/' + orderNo + '/ums', + data : { type }, + method: 'POST' + }) +} + export { coinPay, - diffCoinPay + diffCoinPay, + umsPay, + diffUmsPay, + umsState, + umsFree, + umsFreeInfo } \ No newline at end of file diff --git a/apis/interfaces/user.js b/apis/interfaces/user.js index 03e66fd..94c1df1 100644 --- a/apis/interfaces/user.js +++ b/apis/interfaces/user.js @@ -110,6 +110,29 @@ const getRegion = id => { }) } +// 确认绑定关系 +const relationsVerify = (invite, type) => { + return request({ + url: 'user/relations/verify', + data: { + type, + invite + } + }) +} + +// 绑定分享关系 +const relationsBind = (invite, type) => { + return request({ + url: 'user/relations/bind', + data: { + type, + invite + }, + method: 'POST' + }) +} + export { relations, code, @@ -123,5 +146,7 @@ export { userInfoBase, userInfoBanks, userInfoBank, - getRegion + getRegion, + relationsVerify, + relationsBind } diff --git a/manifest.json b/manifest.json index 5d66c79..321f66e 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "抖火", "appid" : "__UNI__C305C03", "description" : "纵有疾风起，人生不言弃", - "versionName" : "1.1.9", - "versionCode" : 101, + "versionName" : "1.2.8", + "versionCode" : 102, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/pages.json b/pages.json index db9f41c..50b0034 100644 --- a/pages.json +++ b/pages.json @@ -527,11 +527,20 @@ "navigationBarBackgroundColor": "#f8f8f8" } }, { - "path": "pages/account/withdraws", - "auth": true, + "path": "pages/account/withdraws", + "auth": true, "name": "Withdraws", "style": { "navigationBarTitleText": "申请提现", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#FFFFFF" + } + }, { + "path": "pages/work/orderLog", + "auth": true, + "name": "OrderLog", + "style": { + "navigationBarTitleText": "记录", "enablePullDownRefresh": false, "navigationBarBackgroundColor": "#FFFFFF" } @@ -555,8 +564,8 @@ }, { "iconPath": "static/icons/tabs_icon_01.png", "selectedIconPath": "static/icons/tabs_show_01.png", - "pagePath": "pages/college/index", - "text": "商学院" + "pagePath": "pages/college/test", + "text": "业务考试" }, { "iconPath": "static/icons/tabs_icon_02.png", "selectedIconPath": "static/icons/tabs_show_02.png", diff --git a/pages/account/integral.vue b/pages/account/integral.vue index 5632f46..9b7fdb7 100644 --- a/pages/account/integral.vue +++ b/pages/account/integral.vue @@ -32,6 +32,7 @@ score().then(res => { this.score = res.score this.logs = res.logs + uni.hideLoading() }).catch(err => { uni.showToast({ title: err.message, diff --git a/pages/auth/auth.vue b/pages/auth/auth.vue index d5082c5..8af1609 100644 --- a/pages/auth/auth.vue +++ b/pages/auth/auth.vue @@ -56,6 +56,7 @@ username: this.phone, password: this.password }).then(res => { + uni.hideLoading() // 存储登录凭证 this.$store.commit('setToken', res.token_type + ' ' + res.access_token); this.onBack() diff --git a/pages/auth/registered.vue b/pages/auth/registered.vue index 0494c2a..c508375 100644 --- a/pages/auth/registered.vue +++ b/pages/auth/registered.vue @@ -107,6 +107,7 @@ } catch (err){ this.$Router.replaceAll({name: 'Index'}) } + uni.hideLoading() }).catch(err => { uni.showToast({ title: err.message, @@ -125,6 +126,7 @@ this.captchaImg = img this.captchaKey = key this.captchaShow = true + uni.hideLoading() }).catch(err => { uni.showToast({ title: err.message, diff --git a/pages/auth/resetPassword.vue b/pages/auth/resetPassword.vue index 9c8c87b..7b06b3f 100644 --- a/pages/auth/resetPassword.vue +++ b/pages/auth/resetPassword.vue @@ -118,6 +118,7 @@ this.captchaImg = img this.captchaKey = key this.captchaShow = true + uni.hideLoading() }).catch(err => { uni.showToast({ title: err.message, diff --git a/pages/college/answer.vue b/pages/college/answer.vue index f5722ff..6d66f92 100644 --- a/pages/college/answer.vue +++ b/pages/college/answer.vue @@ -173,6 +173,7 @@ type : 2, answers: this.answerArr }).then(res => { + uni.hideLoading() this.$Router.replace({ name: 'CollegeResults', params: { diff --git a/pages/college/test.vue b/pages/college/test.vue index a84ea34..67005a7 100644 --- a/pages/college/test.vue +++ b/pages/college/test.vue @@ -14,7 +14,7 @@ ·倒计时结束后系统将提示交卷 - + @@ -41,6 +41,19 @@ }) }, methods: { + onCollegeResults(id){ + if(id == 0){ + uni.showToast({ + title: '非考试成员无成绩记录', + icon : 'none' + }) + return + } + this.$Router.push({ + name: 'CollegeResults', + params: {id}, + }) + }, onAnswer(id, isTo){ if(!isTo){ uni.showModal({ diff --git a/pages/index/free.vue b/pages/index/free.vue index d2fc93a..6be361a 100644 --- a/pages/index/free.vue +++ b/pages/index/free.vue @@ -1,20 +1,25 @@ @@ -227,6 +274,38 @@ background-color: white; padding-top: 20rpx; } + // ad弹窗广告 + .ad-lay{ + width: 70vw; + position: relative; + .ad-down{ + position: absolute; + top: 20rpx; + right: 20rpx; + z-index: 1; + background: rgba(0, 0, 0, .5); + font-size: 20rpx; + padding: 10rpx 20rpx; + line-height: 30rpx; + border-radius: 24rpx; + color: white; + .ad-down-u{ + display: inline-block; + line-height: 30rpx; + } + } + .ad-img{ + width: 70vw; + border-radius: 20rpx; + } + .ad-btn{ + text-align: center; + margin-top: 30rpx; + .ad-btn-icon{ + display: inline-block; + } + } + } // 轮播图 .banner{ position: relative; diff --git a/pages/pay/pay.vue b/pages/pay/pay.vue index 3d364b3..fd1d29b 100644 --- a/pages/pay/pay.vue +++ b/pages/pay/pay.vue @@ -8,15 +8,15 @@ - - @@ -41,23 +48,86 @@ @@ -100,10 +135,13 @@ border-radius: 20rpx; height: 40rpx; line-height: 36rpx; - padding: 0 10rpx; + padding: 0 15rpx; font-size: 24rpx; border:solid 1rpx #000; box-sizing: border-box; + &:first-child{ + margin-left: 0; + } &.identity-2{ background: #ECF0FF; border-color: #443DE2; @@ -119,6 +157,17 @@ border-color: #FEAD45; color: #FEAD45; } + &.certification-y{ + background: #FFF7EC; + border-color: #FEAD45; + color: #FEAD45; + image{ + width: 32rpx; + height: 32rpx; + vertical-align: middle; + margin-bottom: 5rpx; + } + } } } .mobile{ diff --git a/pages/work/available.vue b/pages/work/available.vue index db6f902..ee58433 100644 --- a/pages/work/available.vue +++ b/pages/work/available.vue @@ -42,6 +42,8 @@ + + @@ -65,10 +67,15 @@ return { isSearch : false, users : [], - pages : {}, searchValue : '', searchResults : [], - searchText : '输入姓名或姓名搜索' + searchText : '输入姓名或姓名搜索', + page : { + current : 1, + has_more: false, + }, + pagesShow : false, + status : false, }; }, created() { @@ -82,10 +89,15 @@ title: '加载中...', mask : true }) - relations().then(res => { + relations({ + page : this.page.current, + certification : 1 + }).then(res => { let { users } = res; - this.users = users.data - this.pages = users.page + let atList = users.page.current == 1 ? [] : this.users + this.users = atList.concat(users.data) + this.page = users.page + this.pagesShow = false uni.hideLoading() }).catch(err => { uni.showToast({ @@ -123,6 +135,16 @@ this.$store.commit('setUser', userInfo) this.$Router.back() } + }, + onReachBottom() { + this.pagesShow = true; + if(this.page.has_more){ + this.status = 'loading'; + this.page.current++ + this.getUsers() + return + } + this.status = 'nomore'; } } @@ -146,11 +168,11 @@ justify-content: space-between; align-items: center; background: white; - .cover{ width: 88rpx; height: 88rpx; border-radius: $radius; + background: #f8f8f8; } .text{ width: calc(100% - 168rpx); diff --git a/pages/work/confirmScheme.vue b/pages/work/confirmScheme.vue index dea0f8c..cdb848e 100644 --- a/pages/work/confirmScheme.vue +++ b/pages/work/confirmScheme.vue @@ -84,6 +84,7 @@ this.list = atList.concat(data) this.page = page this.pagesShow = false + uni.hideLoading() }).catch(err => { uni.showToast({ title: err.message, diff --git a/pages/work/generate.vue b/pages/work/generate.vue index 6dcb844..72dc250 100644 --- a/pages/work/generate.vue +++ b/pages/work/generate.vue @@ -83,6 +83,16 @@ v-model="item.subVal[formItem.key]" > + + + + + + @@ -140,6 +150,7 @@ forms.then(val => { this.servicePush( val, institutionArr, businessTitle, businessId ) }) + uni.hideLoading() }).catch(err => { uni.showToast({ title: err.message, @@ -400,6 +411,15 @@ width: 64rpx; text-align: right; } + .text-input{ + background: #F6F6F6; + height: 84rpx; + line-height: 84rpx; + border-radius: 10rpx; + padding: 0 30rpx 0 30rpx; + font-size: 30rpx; + box-sizing: border-box; + } } // radio .radio-flex{ diff --git a/pages/work/index.vue b/pages/work/index.vue index f409ed1..3c602bd 100644 --- a/pages/work/index.vue +++ b/pages/work/index.vue @@ -41,7 +41,7 @@ 通过业务员考试 通过线上考试即可完成 - + diff --git a/pages/work/orderLog.vue b/pages/work/orderLog.vue new file mode 100644 index 0000000..4041afb --- /dev/null +++ b/pages/work/orderLog.vue @@ -0,0 +1,132 @@ + + + + + diff --git a/pages/work/orders.vue b/pages/work/orders.vue index 1276725..6a96f68 100644 --- a/pages/work/orders.vue +++ b/pages/work/orders.vue @@ -78,6 +78,7 @@ 完善 查看资料 + 查看记录 去确认 查看 @@ -206,7 +207,7 @@ import modal from 'uview-ui/libs/config/props/modal'; data.map(val => { val.is_show_type = false }) - let atList = page.current == 1 ? [] : this.orders + let atList = page.current == 1 ? [] : this.orders this.orders = atList.concat(data) this.page = page this.pagesShow = false @@ -280,7 +281,8 @@ import modal from 'uview-ui/libs/config/props/modal'; mask : true }) orderSign(id, { - app_scheme: "doufire://" + app_scheme: "doufire://", + redirect_url: getApp().globalData.signUrl }).then(res => { this.$store.commit('setOrderId', id) this.getSignState = true diff --git a/pages/work/perfectChoose.vue b/pages/work/perfectChoose.vue index 83ad259..10f9c09 100644 --- a/pages/work/perfectChoose.vue +++ b/pages/work/perfectChoose.vue @@ -73,6 +73,7 @@ if(is_finish == 1 && this.$Route.query.type == 'perfect'){ this.$store.commit('setOrderId', this.$Route.query.orderId) } + uni.hideLoading() }).catch(err => { uni.showToast({ title: err.message, diff --git a/static/icons/pay_ali.png b/static/icons/pay_ali.png new file mode 100644 index 0000000000000000000000000000000000000000..0e96bc665291dd0ebfa80e09217f1c2040560cf1 GIT binary patch literal 6001 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 literal 0 HcmV?d00001 diff --git a/static/icons/user_nav_07.png b/static/icons/user_nav_07.png new file mode 100644 index 0000000000000000000000000000000000000000..55a6322fc7cf7dbab935cb8823606f7097752523 GIT binary patch literal 5375 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 literal 0 HcmV?d00001 diff --git a/store/index.js b/store/index.js index 43fec03..23c75b5 100644 --- a/store/index.js +++ b/store/index.js @@ -43,6 +43,6 @@ export default new Vuex.Store({ }, setOrderId(state, value) { state.orderId = value - } + } } })