diff --git a/app.json b/app.json index ac7e029..a64b4b7 100644 --- a/app.json +++ b/app.json @@ -42,9 +42,6 @@ "pages/agent/result/index", "pages/bank/vindex/index", "pages/bank/create/index", - "pages/bank/bill/index", - "pages/bank/bill-detail/index", - "pages/bank/edit/index", "pages/withdrawal/balance/index", "pages/withdrawal/vcheckout/index", "pages/withdrawal/payment/index", @@ -64,6 +61,8 @@ "pages/home/mobile/index", "pages/home/password/index", "pages/home/enterprise/index", + "pages/home/bill/index", + "pages/home/bill-detail/index", "pages/html/personal/index", "pages/html/logistics/index", "pages/html/service/index", diff --git a/pages/bank/bill-detail/index.wxss b/pages/bank/bill-detail/index.wxss deleted file mode 100644 index 878c227..0000000 --- a/pages/bank/bill-detail/index.wxss +++ /dev/null @@ -1 +0,0 @@ -/* pages/bank/bill-detail/index.wxss */ \ No newline at end of file diff --git a/pages/bank/create/index.js b/pages/bank/create/index.js index 4f2c842..e3a96e5 100644 --- a/pages/bank/create/index.js +++ b/pages/bank/create/index.js @@ -1,4 +1,3 @@ -// pages/bank/edit/index.js import { getBankcardInfo, ocrBankcard, verifyBankcard } from "../../../api/payment" import { postCaptcha } from "../../../api/user" import { getBaseInfo } from "../../../api/ztb" diff --git a/pages/bank/create/index.wxml b/pages/bank/create/index.wxml index 41a50bb..ef3021b 100644 --- a/pages/bank/create/index.wxml +++ b/pages/bank/create/index.wxml @@ -1,4 +1,3 @@ - 添加银行卡 diff --git a/pages/bank/create/index.wxss b/pages/bank/create/index.wxss index e5aa667..e69de29 100644 --- a/pages/bank/create/index.wxss +++ b/pages/bank/create/index.wxss @@ -1 +0,0 @@ -/* pages/bank/edit/index.wxss */ \ No newline at end of file diff --git a/pages/bank/edit/index.js b/pages/bank/edit/index.js deleted file mode 100644 index 9b28f94..0000000 --- a/pages/bank/edit/index.js +++ /dev/null @@ -1,188 +0,0 @@ -// pages/bank/edit/index.js -import { checkBankcard, sendVerifyCode, addBankCard } from "../../../api/saas" -const util = require('../../../utils/util') -import { $wuxCountDown } from '../../../components/index' - -Page({ - /** - * 页面的初始数据 - */ - data: { - form: { - cardMobile: null, //银行卡预留手机号 - cardName: null, //银行名称 - cardNo: null, //卡号 - openingBank: null, - cardType: null, //银行卡类型 - idNumber: null, //身份证号 - ownerName: null, //持卡人姓名 - verificationCode: null, //验证码 - isExist: 0, //查询银行卡是否重复1重复0不重复 - }, - bankName: null, - cardType: null, - second: null, - codeEnable: true, - }, - - /** - * 生命周期函数--监听页面初次渲染完成 - */ - bindForm: function (e) { - // var form_data = 'form.' + e.target.id - this.data.form[e.target.id] = e.detail.value - if (e.target.id == 'cardNo') { - this.setData({ - ['form.cardName']: null, - bankName: null, - ['form.cardType']: null, - cardType: null - }) - } - }, - inputBlur: function (e) { - if (e.target.id == 'idNumber' && !util.isEmpty(e.detail.value)) { - var result = util.checkId(e.detail.value) - if (result.status == 0) { - util.showToast(result.msg) - } - } else if (e.target.id == 'cardNo' && !util.isEmpty(e.detail.value)) { - if (!util.isEmpty(e.detail.value)) { - checkBankcard(e.detail.value).then(result => { - if (result.data.isExist == 1) { - util.showToast('该银行卡已存在！') - } else { - this.setData({ - ['form.cardName']: result.data.bank, - bankName: result.data.bankName, - ['form.cardType']: result.data.cardType, - cardType: this.getCardType(result.data.cardType) - }) - } - }).catch(error => { - util.showToast(error) - }) - } - } - }, - getCardType: function(type){ - if('DC' == type){ - return '储蓄卡' - } - if('CC' == type){ - return '信用卡' - } - if('SCC' == type){ - return '准贷记卡' - } - if('PC' == type){ - return '预付费卡' - } - return '' - }, - fetchCode: function () { - if (util.isEmpty(this.data.form.ownerName)) { - util.showToast('请输入持卡人姓名') - return - } - if (util.isEmpty(this.data.form.cardNo)) { - util.showToast('请输入银行卡卡号') - return - } - if (util.isEmpty(this.data.form.idNumber)) { - util.showToast('请输入身份证号码') - return - } - if (util.checkId(this.data.form.idNumber).status == 0) { - util.showToast('身份证号码有误') - return - } - if (util.isEmpty(this.data.form.cardName)) { - util.showToast('请检查银行卡卡号是否正确') - return - } - if (util.isEmpty(this.data.form.openingBank)) { - util.showToast('请输入开户行网点') - return - } - if (util.isEmpty(this.data.form.cardMobile)) { - util.showToast('请输入手机号码') - return - } - if (!(/^1\d{10}$/.test(this.data.form.cardMobile)) || this.data.form.cardMobile.length < 11) { - util.showToast('请输入11位手机号码') - return - } - wx.showLoading({ title: '处理中', mask: true }) - sendVerifyCode({ phone: this.data.form.cardMobile, codeType: '6', type: 'yzmjc' }).then(result => { - wx.hideLoading() - this.setData({ codeEnable: false }) - util.showToast('验证码已经发送') - this.second = new $wuxCountDown({ - date: +(new Date) + 60000, - onEnd() { - this.setData({ - second: '重新获取验证码', - codeEnable: true - }) - }, - render(date) { - const sec = this.leadingZeros(date.sec, 2) + ' 秒 ' - date.sec !== 0 && this.setData({ - second: sec, - }) - }, - }) - }).catch(error => { - wx.hideLoading() - util.showToast(error) - }) - }, - submitForm: function(){ - if (util.isEmpty(this.data.form.ownerName)) { - util.showToast('请输入持卡人姓名') - return - } - if (util.isEmpty(this.data.form.cardNo)) { - util.showToast('请输入银行卡卡号') - return - } - if (util.isEmpty(this.data.form.idNumber)) { - util.showToast('请输入身份证号码') - return - } - if (util.checkId(this.data.form.idNumber).status == 0) { - util.showToast('身份证号码有误') - return - } - if (util.isEmpty(this.data.form.cardName)) { - util.showToast('请检查银行卡卡号是否正确') - return - } - if (util.isEmpty(this.data.form.openingBank)) { - util.showToast('请输入开户行网点') - return - } - if (util.isEmpty(this.data.form.cardMobile)) { - util.showToast('请输入手机号码') - return - } - if (!(/^1\d{10}$/.test(this.data.form.cardMobile)) || this.data.form.cardMobile.length < 11) { - util.showToast('请输入11位手机号码') - return - } - if (util.isEmpty(this.data.form.verificationCode)) { - util.showToast('请输入验证码') - return - } - wx.showLoading({ title: '处理中', mask: true }) - addBankCard(this.data.form).then(res => { - wx.hideLoading() - util.showBackToast('添加成功') - }).catch(error => { - wx.hideLoading() - util.showToast(error) - }) - } - -}) \ No newline at end of file diff --git a/pages/bank/edit/index.json b/pages/bank/edit/index.json deleted file mode 100644 index 353a2e4..0000000 --- a/pages/bank/edit/index.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "usingComponents": { - "wux-button": "/components/button/index" - } -} \ No newline at end of file diff --git a/pages/bank/edit/index.wxml b/pages/bank/edit/index.wxml deleted file mode 100644 index 830f957..0000000 --- a/pages/bank/edit/index.wxml +++ /dev/null @@ -1,66 +0,0 @@ - - - 添加银行卡 - - - - - - 持卡人姓名： - - - - - - 银行卡卡号： - - - - - - 身份证号码： - - - - - - - - - 银行： - - - - - - 银行卡类型： - - - - - - 开户行网点： - - - - - - - - - 手机号： - - - - - - 验证码： - - - {{ second || '获取验证码' }} - - - - - 提交 - \ No newline at end of file diff --git a/pages/bank/edit/index.wxss b/pages/bank/edit/index.wxss deleted file mode 100644 index e5aa667..0000000 --- a/pages/bank/edit/index.wxss +++ /dev/null @@ -1 +0,0 @@ -/* pages/bank/edit/index.wxss */ \ No newline at end of file diff --git a/pages/home/index/index.js b/pages/home/index/index.js index a86c8cc..8a7c664 100644 --- a/pages/home/index/index.js +++ b/pages/home/index/index.js @@ -118,7 +118,7 @@ Component({ } else if (e.currentTarget.id == 'qnLogistic') { util.navigateTo('/submodel/pages/html/logistics/index') } else if (e.currentTarget.id == 'toMyMoney') { - util.navigateTo('/pages/bank/bill/index') + util.navigateTo('/submodel/pages/home/bill/index') } else if (e.currentTarget.id == 'agent50') { util.navigateTo('/pages/agent/order/index?status=50&tabIndex=1') } else if (e.currentTarget.id == 'agent51') { diff --git a/pages/html/message/index.js b/pages/html/message/index.js index 957b2b3..0435b90 100644 --- a/pages/html/message/index.js +++ b/pages/html/message/index.js @@ -152,7 +152,7 @@ Page({ } else if(redirect.targetView == 'storeIndex'){// 店铺首页 storeIndex wx.navigateTo({ url: '/pages/shop/detail/index?storeId=' + redirect.params.id }) } else if(redirect.targetView == 'personalBillDetail'){// 账单详情页 personalBillDetail - wx.navigateTo({ url: '/pages/bank/bill-detail/index?id=' + redirect.params.id }) + wx.navigateTo({ url: '/submodel/pages/home/bill-detail/index?id=' + redirect.params.id }) } else if(redirect.targetView == 'member'){// 会员页 member wx.navigateTo({ url: '/pages/ztbvip/index' }) } else if(redirect.targetView == 'proxySellSellerOrderDetail'||redirect.targetView == 'proxyOrderDetail'){// 代卖详情proxySellSellerOrderDetail diff --git a/pages/shop/bill/index.js b/pages/shop/bill/index.js index ad988f3..1beec6b 100644 --- a/pages/shop/bill/index.js +++ b/pages/shop/bill/index.js @@ -1,4 +1,3 @@ -// pages/bank/bill/index.js import { getStoreWater } from "../../../api/ztb" const util = require('../../../utils/util') const app = getApp() @@ -94,7 +93,7 @@ Page({ lookItem: function (e) { // var item = this.data.orderList[e.currentTarget.dataset.page][e.currentTarget.dataset.index] // wx.navigateTo({ - // url: '/pages/bank/bill-detail/index?id=' + item.id + // url: '/submodelpages/home/bill-detail/index?id=' + item.id // }) } }) \ No newline at end of file diff --git a/pages/shop/bill/index.wxml b/pages/shop/bill/index.wxml index 22f433b..207bfab 100644 --- a/pages/shop/bill/index.wxml +++ b/pages/shop/bill/index.wxml @@ -1,4 +1,3 @@ - 店铺收入 diff --git a/pages/shop/bill/index.wxss b/pages/shop/bill/index.wxss index 9955d4e..e0ecedb 100644 --- a/pages/shop/bill/index.wxss +++ b/pages/shop/bill/index.wxss @@ -1,4 +1,3 @@ -/* pages/bank/bill/index.wxss */ .item-content { background-color: white; padding: 18rpx 24rpx; diff --git a/pages/bank/bill-detail/index.js b/submodel/pages/home/bill-detail/index.js similarity index 79% rename from pages/bank/bill-detail/index.js rename to submodel/pages/home/bill-detail/index.js index ff7d593..7fa7c52 100644 --- a/pages/bank/bill-detail/index.js +++ b/submodel/pages/home/bill-detail/index.js @@ -1,6 +1,5 @@ -// pages/bank/bill-detail/index.js -import { getBillDetail } from "../../../api/ztb" -const util = require('../../../utils/util') +import { getBillDetail } from "../../../../api/ztb" +const util = require('../../../../utils/util') Page({ /** diff --git a/pages/bank/bill-detail/index.json b/submodel/pages/home/bill-detail/index.json similarity index 100% rename from pages/bank/bill-detail/index.json rename to submodel/pages/home/bill-detail/index.json diff --git a/pages/bank/bill-detail/index.wxml b/submodel/pages/home/bill-detail/index.wxml similarity index 96% rename from pages/bank/bill-detail/index.wxml rename to submodel/pages/home/bill-detail/index.wxml index 896632d..48ee894 100644 --- a/pages/bank/bill-detail/index.wxml +++ b/submodel/pages/home/bill-detail/index.wxml @@ -1,4 +1,3 @@ - 账单详情 diff --git a/submodel/pages/home/bill-detail/index.wxss b/submodel/pages/home/bill-detail/index.wxss new file mode 100644 index 0000000..e69de29 diff --git a/pages/bank/bill/index.js b/submodel/pages/home/bill/index.js similarity index 91% rename from pages/bank/bill/index.js rename to submodel/pages/home/bill/index.js index 0aa19cc..c42a322 100644 --- a/pages/bank/bill/index.js +++ b/submodel/pages/home/bill/index.js @@ -1,6 +1,5 @@ -// pages/bank/bill/index.js -import { getBillList } from "../../../api/ztb" -const util = require('../../../utils/util') +import { getBillList } from "../../../../api/ztb" +const util = require('../../../../utils/util') const app = getApp() Page({ @@ -79,7 +78,7 @@ Page({ lookItem: function (e) { // var item = this.data.orderList[e.currentTarget.dataset.page][e.currentTarget.dataset.index] // wx.navigateTo({ - // url: '/pages/bank/bill-detail/index?id=' + item.id + // url: '/submodel/pages/home/bill-detail/index?id=' + item.id // }) } }) \ No newline at end of file diff --git a/pages/bank/bill/index.json b/submodel/pages/home/bill/index.json similarity index 100% rename from pages/bank/bill/index.json rename to submodel/pages/home/bill/index.json diff --git a/pages/bank/bill/index.wxml b/submodel/pages/home/bill/index.wxml similarity index 97% rename from pages/bank/bill/index.wxml rename to submodel/pages/home/bill/index.wxml index 93c5deb..8af8715 100644 --- a/pages/bank/bill/index.wxml +++ b/submodel/pages/home/bill/index.wxml @@ -1,4 +1,3 @@ - 账单 diff --git a/pages/bank/bill/index.wxss b/submodel/pages/home/bill/index.wxss similarity index 85% rename from pages/bank/bill/index.wxss rename to submodel/pages/home/bill/index.wxss index f34f878..03f38cc 100644 --- a/pages/bank/bill/index.wxss +++ b/submodel/pages/home/bill/index.wxss @@ -1,4 +1,3 @@ -/* pages/bank/bill/index.wxss */ .item-content { background-color: white; padding: 24rpx; diff --git a/utils/util.js b/utils/util.js index 1fd9f75..59d86fc 100644 --- a/utils/util.js +++ b/utils/util.js @@ -183,7 +183,7 @@ const tokenList = [ '/pages/article/feedback/index', 'pages/agent/edit/index', '/pages/agent/ability/index', - '/pages/bank/bill/index' + '/submodel/pages/home/bill/index' ] function navigateTo(url){ @@ -235,7 +235,7 @@ function navigateTarget(redirectInfo){ } else if(redirectInfo.targetView == 'myBankCard'){ navigateTo('/pages/bank/vindex/index') } else if(redirectInfo.targetView == 'personalBillDetail'){ - navigateTo('/pages/bank/bill/index') + navigateTo('/submodel/pages/home/bill/index') } else if(redirectInfo.targetView == 'myScore'){ navigateTo('/pages/html/integral/index') } else if(redirectInfo.targetView == 'myBalance'){