diff --git a/apis/interfaces/account.js b/apis/interfaces/account.js index 09803f3..1523f04 100644 --- a/apis/interfaces/account.js +++ b/apis/interfaces/account.js @@ -40,10 +40,37 @@ const balance = data => { }) } +// 奖金提现前置 +const withdrawsCreate = () => { + return request({ + url: 'withdraws/index/create' + }) +} + +// 奖金提现申请 +const withdraws = data => { + return request({ + url: 'withdraws/index', + method: 'POST', + data + }) +} + +// 提现记录 +const withdrawsLog = data => { + return request({ + url: 'withdraws/index', + data + }) +} + export { score, log, cash, - balance + balance, + withdrawsCreate, + withdraws, + withdrawsLog } diff --git a/apis/interfaces/order.js b/apis/interfaces/order.js index 73b021c..fe0dacb 100644 --- a/apis/interfaces/order.js +++ b/apis/interfaces/order.js @@ -182,6 +182,14 @@ const sbuConfirmScheme = (type, business_order_close_scheme_id, data) => { }) } +// 取消订单 +const orderCancel = id => { + return request({ + url: 'business/' + id + '/cancel', + method: 'POST' + }) +} + // 支付订单 export { lists, @@ -205,5 +213,6 @@ export { historyBank, getConfirmScheme, getConfirmSchemeInfo, - sbuConfirmScheme + sbuConfirmScheme, + orderCancel } diff --git a/apis/interfaces/public.js b/apis/interfaces/public.js index 701bd67..0093a38 100644 --- a/apis/interfaces/public.js +++ b/apis/interfaces/public.js @@ -15,6 +15,14 @@ const cms = id => { }) } +// 关注公众号 +const scan = id => { + return request({ + url : 'app/scan/code', + }) +} + export { - cms + cms, + scan } \ No newline at end of file diff --git a/manifest.json b/manifest.json index 9433cfe..5d66c79 100644 --- a/manifest.json +++ b/manifest.json @@ -1,9 +1,9 @@ { "name" : "抖火", "appid" : "__UNI__C305C03", - "description" : "", - "versionName" : "1.1.5", - "versionCode" : "100", + "description" : "纵有疾风起,人生不言弃", + "versionName" : "1.1.9", + "versionCode" : 101, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { @@ -32,8 +32,6 @@ /* android打包配置 */ "android" : { "permissions" : [ - "", - "", "", "", "", @@ -41,13 +39,8 @@ "", "", "", - "", - "", - "", "", - "", - "", - "" + "" ], "schemes" : "doufire" }, diff --git a/pages.json b/pages.json index 9f56c8c..db9f41c 100644 --- a/pages.json +++ b/pages.json @@ -303,18 +303,16 @@ "style": { "navigationBarTitleText": "人脸认证", "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#FFFFFF", - "app-plus": { - "titleNView": { - "buttons": [ - { - "text": "\ue66c", - "float": "left", - "fontSrc": "/static/uniicons.ttf", - "fontSize": "20px" - } - ] - } + "navigationBarBackgroundColor": "#FFFFFF", + "app-plus": { + "titleNView": { + "buttons": [{ + "text": "\ue66c", + "float": "left", + "fontSrc": "/static/uniicons.ttf", + "fontSize": "20px" + }] + } } } }, { @@ -510,16 +508,33 @@ "navigationBarBackgroundColor": "#446EFE" } }, { - "path": "pages/user/salesmanCode", - "auth": true, + "path": "pages/user/salesmanCode", + "auth": true, "name": "SalesmanCode", "style": { "navigationBarTitleText": "业务员邀请码", - "enablePullDownRefresh": false, - "navigationBarTextStyle": "white", + "enablePullDownRefresh": false, + "navigationBarTextStyle": "white", "navigationBarBackgroundColor": "#446EFE" } - + }, { + "path": "pages/user/weChat", + "auth": true, + "name": "WeChat", + "style": { + "navigationBarTitleText": "关注公众号", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#f8f8f8" + } + }, { + "path": "pages/account/withdraws", + "auth": true, + "name": "Withdraws", + "style": { + "navigationBarTitleText": "申请提现", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#FFFFFF" + } }], "globalStyle": { "navigationBarTextStyle": "black", diff --git a/pages/account/bonus.vue b/pages/account/bonus.vue index d11a24a..47f54cc 100644 --- a/pages/account/bonus.vue +++ b/pages/account/bonus.vue @@ -4,9 +4,9 @@ {{total}} - 账户余额 + {{ type === 'balance' ? '账户余额': '已提现总金额'}} - 提现 + 提现 @@ -21,11 +21,21 @@ - - {{item.remark || '-'}} - {{item.created_at}} - - {{item.amount}} + + + {{item.remark || '-'}} + {{item.created_at}} + + {{item.amount}} + + + + [{{item.status.status_text}}]{{item.title || '-'}} + {{item.remark || '-'}} + {{item.created_at}} + + {{item.amount}} + @@ -44,13 +54,14 @@ + + diff --git a/pages/auth/registered.vue b/pages/auth/registered.vue index 8a6a2fb..0494c2a 100644 --- a/pages/auth/registered.vue +++ b/pages/auth/registered.vue @@ -7,13 +7,15 @@ - + - + + - + - + + @@ -62,6 +64,7 @@ captchaShow : false, parentId : '', isDisabled : false, + eyesShow : [ true, true ] }; }, created() { @@ -76,6 +79,10 @@ }) }, methods: { + // 密码显示隐藏 + onEyes(index){ + this.$set(this.eyesShow, index, !this.eyesShow[index]) + }, // 提交注册信息 onRegistered(){ uni.showLoading({ @@ -249,6 +256,18 @@ font-size: 32rpx; } } + .from-password{ + .from-password-eyes{ + width: 38rpx; + height: 38rpx; + } + input{ + width: calc(100% - 260rpx); + height: 100rpx; + line-height: 100rpx; + font-size: 32rpx; + } + } .from-input-phoen{ label{ line-height: 60rpx; diff --git a/pages/auth/resetPassword.vue b/pages/auth/resetPassword.vue index 88160f6..9c8c87b 100644 --- a/pages/auth/resetPassword.vue +++ b/pages/auth/resetPassword.vue @@ -7,13 +7,15 @@ - + - + + - + - + + @@ -56,7 +58,8 @@ captcha : '', captchaImg : '', captchaKey : '', - captchaShow : false + captchaShow : false, + eyesShow : [ true, true ] }; }, created() { @@ -68,6 +71,10 @@ } }, methods: { + // 密码显示隐藏 + onEyes(index){ + this.$set(this.eyesShow, index, !this.eyesShow[index]) + }, // 提交修改信息 onRegistered(){ uni.showLoading({ @@ -241,6 +248,18 @@ font-size: 32rpx; } } + .from-password{ + .from-password-eyes{ + width: 38rpx; + height: 38rpx; + } + input{ + width: calc(100% - 260rpx); + height: 100rpx; + line-height: 100rpx; + font-size: 32rpx; + } + } .from-input-phoen{ label{ line-height: 60rpx; diff --git a/pages/user/index.vue b/pages/user/index.vue index bc44b00..7c5eb8f 100644 --- a/pages/user/index.vue +++ b/pages/user/index.vue @@ -65,6 +65,10 @@ 实名认证 + + 关注公众号 + + 设置 diff --git a/pages/user/weChat.vue b/pages/user/weChat.vue new file mode 100644 index 0000000..3b77522 --- /dev/null +++ b/pages/user/weChat.vue @@ -0,0 +1,95 @@ + + + + + diff --git a/pages/work/confirmScheme.vue b/pages/work/confirmScheme.vue index c22de7e..dea0f8c 100644 --- a/pages/work/confirmScheme.vue +++ b/pages/work/confirmScheme.vue @@ -94,7 +94,13 @@ // 拨打电话 makePhone(phone){ uni.makePhoneCall({ - phoneNumber: phone + phoneNumber: phone, + fail: err => { + uni.showToast({ + title: '拨打电话失败,请检查您的应用权限[电话]保持允许状态', + icon : 'none' + }) + } }) } }, diff --git a/pages/work/modifyOrder.vue b/pages/work/modifyOrder.vue index 8acffaa..d808338 100644 --- a/pages/work/modifyOrder.vue +++ b/pages/work/modifyOrder.vue @@ -74,7 +74,13 @@ // 联系客户 onCallPhone(phone){ uni.makePhoneCall({ - phoneNumber: phone + phoneNumber: phone, + fail: err => { + uni.showToast({ + title: '拨打电话失败,请检查您的应用权限[电话]保持允许状态', + icon : 'none' + }) + } }) }, // 获取订单列表 diff --git a/pages/work/orderInfo.vue b/pages/work/orderInfo.vue index 7388d76..51ee7c2 100644 --- a/pages/work/orderInfo.vue +++ b/pages/work/orderInfo.vue @@ -148,6 +148,12 @@ onCallPhone(phone){ uni.makePhoneCall({ phoneNumber: phone, + fail: err => { + uni.showToast({ + title: '拨打电话失败,请检查您的应用权限[电话]保持允许状态', + icon : 'none' + }) + } }) }, // 复制订单号码 diff --git a/pages/work/orders.vue b/pages/work/orders.vue index 765a559..1276725 100644 --- a/pages/work/orders.vue +++ b/pages/work/orders.vue @@ -70,6 +70,7 @@ {{item.user.nickname}} + 取消 转让 匹配 签约 @@ -108,8 +109,9 @@