diff --git a/yun-min-program-plugin-master/host.js b/yun-min-program-plugin-master/host.js index 349c8e5..016cbae 100644 --- a/yun-min-program-plugin-master/host.js +++ b/yun-min-program-plugin-master/host.js @@ -1,6 +1,7 @@ // var host = 'https://gl.cdwwzc.com/',uniacid = '115'; // var host = 'https://ht.cdwwzc.com/',uniacid = '1';// wx27de59c2d28d5a5f -var host = 'https://jank.cdlfjy.com/',uniacid = '30'; +// var host = 'https://jank.cdlfjy.com/',uniacid = '30'; +var host = 'https://jank.test.cdlfjy.com/',uniacid = '30'; module.exports = {host, uniacid}; // 获取第三方配置信息 覆盖当前配置信息 let config = wx.getExtConfigSync() || {}; diff --git a/yun-min-program-plugin-master/packageA/member/withdrawal/withdrawal.js b/yun-min-program-plugin-master/packageA/member/withdrawal/withdrawal.js index 44315a9..29a5a84 100644 --- a/yun-min-program-plugin-master/packageA/member/withdrawal/withdrawal.js +++ b/yun-min-program-plugin-master/packageA/member/withdrawal/withdrawal.js @@ -101,7 +101,26 @@ Page({ setAlipay: false, setinWX: '', setinAlipay: '', - setinAlipayName: '' + setinAlipayName: '', + // 第三方代发相关信息 + staff: { + name: '', + tel: '', + card_type: '1',// 卡类型:1=对私,2=对公 + bank_sub_name: '',// 开户银行支行名称:对公必填 + bank_act_name: '',//银行卡持有人姓名 + card_num: '',// 银行卡卡号 + account_id: '',// 银行卡持有人身份证号码 + account_id_start: '',// 证件有效期开始时间,格式:YYYYMMDD + mer_type: '3',// 商户类型:1=个体户,3=个人 + }, + third_party_show: false, + date_time_show: false, + minDate: new Date(2000, 0, 1).getTime(), + selected_time: 0, + is_show_signing: false, + signing_url: '', + }, /** @@ -755,6 +774,9 @@ Page({ } else if (manual.manual_type == 3) { title = `${manual.name}-支付宝`; tips = `通过审核后将由工作人员将打款到您的支付宝!`; + } else if (manual.manual_type == 4) { + title = `${manual.name}-第三方代发`; + tips = `通过审核后将第三方代发到您的银行卡!`; } console.log(title); this.setData({ @@ -1070,20 +1092,11 @@ Page({ // let routerPath = ""; let that = this; switch (manual_type) { - case "bank": - msg = "请先填写银行卡信息"; - // routerPath = "/packageA/member/memberBank/memberBank"; - break; - case "wechat": - msg = "请先填写微信信息"; - // routerPath = "/packageA/member/info/info"; - break; - case "alipay": - msg = "请先填写支付宝信息"; - // routerPath = "/packageA/member/info/info"; - break; - default: - break; + case "bank":msg = "请先填写银行卡信息";break; + case "third_party":msg = "请先完善相关信息";break; + case "wechat":msg = "请先填写微信信息";break; + case "alipay":msg = "请先填写支付宝信息";break; + default:break; } // let that = this; wx.showModal({ @@ -1093,6 +1106,8 @@ Page({ if (res.confirm) { if (manual_type == 'bank') { that.getBankCard(); + }else if (manual_type == 'third_party') { + that.thirdPartyBankCardInfo(); } else if (manual_type == 'wechat') { // 微信 that.setData({ @@ -1510,6 +1525,11 @@ Page({ setAlipay: false }); }, + createCardClose(){ + this.setData({ + createCardShow: false + }); + }, payTypebtn(e) { let val = e.detail; this.setData({ @@ -1634,4 +1654,175 @@ Page({ // Do something when catch error } }, + /****** 第三方代发相关操作 ********************/ + // 获取第三方银行卡配置信息 + thirdPartyBankCardInfo(){ + let _this = this; + let defaultStaff = this.data.staff; + app._postNetWork({ + url: app.getNetAddresss("plugin.use-staff.api.index.getInfo"), + success: function (response) { + let res = response.data; + _this.setData({ + staff: Object.values(res.data).length > 0 ? res.data : defaultStaff, + third_party_show: true, + }); + // 处理时间 + if(res.data.account_id_start){ + let start = res.data.account_id_start; + let year = start.slice(0,4); + let month = parseInt(start.slice(4,6)) - 1; + let day = start.slice(6,8); + _this.setData({ + selected_time: new Date(year, month, day).getTime() + }); + } + }, + fail: function (res) { + console.log(res.msg); + } + }); + }, + // 关闭第三方配置弹出框 + thirdPartyPopupClose(){ + this.setData({ + third_party_show: false + }); + }, + // 配置信息改变 + thirdPartyConfigChange(e) { + let key = e.currentTarget.dataset.key; + let value = e.detail; + this.setData({ + ['staff.' + key]: value + }); + }, + // 显示时间选择器 + showDateTime(){ + this.setData({ + date_time_show: true, + }); + }, + // 隐藏时间选择器 + closeDateTime(){ + this.setData({ + date_time_show: false, + }); + }, + // 身份证有效期开始时间改变 + datetimePickerChange(e){ + let value = e.detail; + this.setData({ + selected_time: value, + }); + }, + // 确认改变时间 + confirmChangeDatetime(){ + let datetime = this.data.selected_time; + let time = new Date(datetime); + let year = time.getFullYear() + ""; + let month = time.getMonth() + 1; + let day = time.getDate(); + month = month < 10 ? "0" + month : month; + day = day < 10 ? "0" + day : day; + let date = year + month + day; + this.setData({ + ['staff.account_id_start']: date, + date_time_show: false, + }); + }, + // 提交第三方配置信息 + thirdPartySubmitEdit(){ + let _this = this; + let staff = _this.data.staff; + let tips = ''; + // 判断信息是否完善 + console.log(staff); + if (app._isTextEmpty(staff.name)) tips = '请输入联系人姓名'; + else if (app._isTextEmpty(staff.tel)) tips = '请输入联系人电话'; + else if (staff.card_type == 2 && app._isTextEmpty(staff.bank_sub_name)) tips = '请输入开户银行支行名称'; + else if (app._isTextEmpty(staff.bank_act_name)) tips = '请输入银行卡持有人姓名'; + else if (app._isTextEmpty(staff.card_num)) tips = '请输入银行卡卡号'; + else if (app._isTextEmpty(staff.account_id)) tips = '请输入银行卡持有人身份证号码'; + else if (app._isTextEmpty(staff.account_id_start)) tips = '请选择银行卡持有人身份证有效期开始时间'; + if (!app._isTextEmpty(tips)){ + wx.showModal({ + showCancel: false, + content: tips, + success() {} + }); + return; + } + app._postNetWork({ + url: app.getNetAddresss("plugin.use-staff.api.index.applyToJoin"), + data:{ + info: staff + }, + success: function (response) { + let res = response.data; + if(parseInt(res.result) === 1){ + wx.showModal({ + showCancel: false, + content: '提交成功,审核开户中...!', + success() { + _this.thirdPartyBankCardInfo(); + } + }); + } + else{ + wx.showModal({ + showCancel: false, + content: res.msg, + success() { + _this.thirdPartyBankCardInfo(); + } + }); + } + }, + fail: function (res) { + console.log('请求失败:',res.msg); + } + }); + }, + // 获取签约合同信息 + goToSigning(){ + let _this = this; + wx.showLoading({ + title: "加载中..." + }); + app._postNetWork({ + url: app.getNetAddresss("plugin.use-staff.api.index.getContractInfo"), + success: function (response) { + let res = response.data; + wx.hideLoading(); + if(parseInt(res.result) === 1){ + _this.setData({ + is_show_signing: true, + signing_url: res.data.sign_url, + }); + } + else{ + wx.showModal({ + showCancel: false, + content: res.msg, + success() { + _this.thirdPartyBankCardInfo(); + } + }); + } + }, + fail: function (res) { + console.log(res.msg); + } + }); + }, + // 关闭签约弹框 + closeSigning(){ + console.log("点击关闭"); + this.setData({ + is_show_signing: false, + }); + }, + + }); \ No newline at end of file diff --git a/yun-min-program-plugin-master/packageA/member/withdrawal/withdrawal.json b/yun-min-program-plugin-master/packageA/member/withdrawal/withdrawal.json index 3614255..359c3f5 100644 --- a/yun-min-program-plugin-master/packageA/member/withdrawal/withdrawal.json +++ b/yun-min-program-plugin-master/packageA/member/withdrawal/withdrawal.json @@ -9,6 +9,7 @@ "van-radio": "../../../dist/radio/index", "van-radio-group": "../../../dist/radio-group/index", "van-icon": "../../../dist/icon/index", + "van-datetime-picker": "../../../dist/datetime-picker/index", "van-field":"/dist/field/index", "van-picker":"/dist/picker/index", "van-sticky":"/dist/sticky/index", diff --git a/yun-min-program-plugin-master/packageA/member/withdrawal/withdrawal.wxml b/yun-min-program-plugin-master/packageA/member/withdrawal/withdrawal.wxml index 4af3c57..15584fa 100644 --- a/yun-min-program-plugin-master/packageA/member/withdrawal/withdrawal.wxml +++ b/yun-min-program-plugin-master/packageA/member/withdrawal/withdrawal.wxml @@ -59,7 +59,7 @@ - + {{ withTypeTipsTitle }} @@ -238,16 +238,16 @@ {{ manual.other_name }}-银行卡 {{ manual.other_name }}-微信 {{ manual.other_name }}-支付宝 - - 通过审核后将由工作人员打款到您的{{ manual.manual_type == 1 ? "银行卡" : manual.manual_type == 2 ? "微信" : "支付宝" }}! + {{ manual.other_name }}-第三方代发 + 通过审核后将由工作人员打款到您的{{ manual.manual_type == 1 ? "银行卡" : manual.manual_type == 2 ? "微信" : "支付宝" }}! + 通过审核后将第三方代发到您的银行卡 + + {{ manual.member_name }} {{ manual.bank_card }} + 修改信息 - - - {{ manual.member_name }} {{ manual.bank_card }} - - - 修改信息 - + + {{ manual.use_staff_name }} {{ manual.use_staff_card_num }} + 修改信息 @@ -259,11 +259,11 @@ - + 填写银行卡 - + 开户行: @@ -605,3 +605,121 @@ --> + + + + + 完善信息 + + + + 联系人: + + + + + + 联系人电话: + + + + + + 银行卡类型: + + + + 对私 + 对公 + + + + + + 开户银行支行: + + + + + + 持有人姓名: + + + + + + 卡号: + + + + + + 身份证号码: + + + + + + 身份证有效期: + + + + + + 商户类型: + + + + 个体户 + 个人 + + + + + + + + 去签约 + 提交修改 + + 提交保存 + + 待审核开户中... + + 开户失败,请检查信息是否填写错误 + + 签约失败 + + + + + + + + + 身份证有效期开始时间 + + + + 确认 + + + + + + + + + + + + + diff --git a/yun-min-program-plugin-master/packageA/member/withdrawal/withdrawal.wxss b/yun-min-program-plugin-master/packageA/member/withdrawal/withdrawal.wxss index 65cd3e3..ef3bc1b 100644 --- a/yun-min-program-plugin-master/packageA/member/withdrawal/withdrawal.wxss +++ b/yun-min-program-plugin-master/packageA/member/withdrawal/withdrawal.wxss @@ -845,3 +845,21 @@ } /* ------------------ */ +.ruleRightContent{ + width: calc(100% - (var(--cell-horizontal-padding,16px) * 2)); + display: inline-flex!important; + flex-direction: row; + flex-wrap: wrap; + padding: 0 var(--cell-horizontal-padding,16px); +} +.ruleRightContent .ruleRightContentRadio:not(:first-child){ + margin-left: var(--cell-horizontal-padding,16px); +} +.status-tips{ + width: 100%; + text-align: center; + height: 50rpx; + line-height: 50rpx; + font-size: 28rpx; + color: #eb6f6f; +} \ No newline at end of file diff --git a/yun-min-program-plugin-master/packageC/redPacket/daily_red/daily_red.wxml b/yun-min-program-plugin-master/packageC/redPacket/daily_red/daily_red.wxml index 392ea67..6541c55 100644 --- a/yun-min-program-plugin-master/packageC/redPacket/daily_red/daily_red.wxml +++ b/yun-min-program-plugin-master/packageC/redPacket/daily_red/daily_red.wxml @@ -3,7 +3,7 @@ 领取记录 - 我的额度 + 今日红包 {{type_status.receive_amounts}} @@ -19,10 +19,10 @@ 立即领取 - + 今日红包总量 {{link.is_red_packet_all_total == 1?'****':(amount?amount.number_sum : 0.00)}} @@ -32,11 +32,11 @@ {{redData.surplus_num}} - 个人额度 - + + + @@ -69,7 +69,7 @@ - + - + -->