diff --git a/src/pages.json b/src/pages.json index bd83d54..60bd538 100644 --- a/src/pages.json +++ b/src/pages.json @@ -714,6 +714,41 @@ ] }, { + "root": "subpackage/wallet", + "pages": [ + { + "path": "pages/index/index", + "style" : { + "navigationBarTitleText": "钱包&提现" + } + }, + { + "path": "pages/douyin_withdraw/index", + "style" : { + "navigationBarTitleText": "抖音提现" + } + }, + { + "path": "pages/douyin_withdraw/apply", + "style" : { + "navigationBarTitleText": "申请提现" + } + }, + { + "path": "pages/douyin_withdraw/record", + "style" : { + "navigationBarTitleText": "提现记录" + } + }, + { + "path": "pages/baofu_withdraw/index", + "style" : { + "navigationBarTitleText": "新宝付提现" + } + } + ] + }, + { "root": "subpackage/party", "pages": [ { diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index 2123cef..11e5583 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -36,7 +36,7 @@ - + @@ -138,18 +138,12 @@ path: '/subpackage/retail/pages/index/index', serverKey: 1011 // 后端对应权限编号 }, - { - id: 8, - name: '课程管理', - path: '/subpackage/course/pages/index/index', - serverKey: 1013 // 后端对应权限编号 1013 - }, - {//需求要求更改ICON位置 - id: 11, - name: '系统工具', - path: '/subpackage/party/pages/index/index', - serverKey: 1015 // 后端对应权限编号 1015 - }, + // { + // id: 8, + // name: '课程管理', + // path: '/subpackage/course/pages/index/index', + // serverKey: 1013 // 后端对应权限编号 1013 + // }, { id: 9, name: '储值卡管理', @@ -162,7 +156,19 @@ path: '/subpackage/blacklist/pages/abnormal_list/abnormal_list', serverKey: 1015 // 后端对应权限编号 1015 }, - + { + id: 11, + name: '钱包提现', + path: '/subpackage/wallet/pages/index/index', + serverKey: 1017 // 后端对应权限编号 1017 + }, + + {//需求要求更改ICON位置 + id: 12, + name: '系统工具', + path: '/subpackage/party/pages/index/index', + serverKey: 1016 // 后端对应权限编号 1016 + }, ]; const app = getApp(); @@ -244,8 +250,10 @@ brandInfo: indexData&&indexData.brand ? indexData.brand : null, }); } - if(tabInfo.id === 10)return util.routeTo(tabInfo.path + `?brand_id=${indexData.brand.id}`,'nT'); - if(tabInfo.id === 11){ + + if(tabInfo.id === 10 || tabInfo.id === 11)return util.routeTo(tabInfo.path + `?brand_id=${indexData.brand.id}`,'nT'); + + if(tabInfo.id === 12){ // if(!indexData.brand.mini_wechat_appid)return util.showNone('暂无appid!') let url = tabInfo.path + `?appid=${indexData.brand.mini_wechat_appid}` console.log(222,url) diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue index 7c458a3..c7b5177 100644 --- a/src/pages/login/login.vue +++ b/src/pages/login/login.vue @@ -189,7 +189,7 @@ export default { } }, toWebView(){ - util.routeTo(`/pages/web_view/web_view`,'rL'); + util.routeTo(`/pages/web_view/web_view?src=${encodeURIComponent("https://www.ouxuanzhineng.cn")}`,'rL'); } }, } diff --git a/src/pages/merchant_login/merchant_login.vue b/src/pages/merchant_login/merchant_login.vue index a88b4d6..c8f7a1c 100644 --- a/src/pages/merchant_login/merchant_login.vue +++ b/src/pages/merchant_login/merchant_login.vue @@ -12,7 +12,7 @@ import util from '../../utils/util' export default { methods: { toWebView(){ - util.routeTo(`/pages/web_view/web_view`,'rL'); + util.routeTo(`/pages/web_view/web_view?src=${encodeURIComponent("https://www.ouxuanzhineng.cn")}`,'rL'); } } } diff --git a/src/pages/web_view/web_view.vue b/src/pages/web_view/web_view.vue index d05babe..5b8a040 100644 --- a/src/pages/web_view/web_view.vue +++ b/src/pages/web_view/web_view.vue @@ -1,10 +1,16 @@ \ No newline at end of file diff --git a/src/static/images/icon/index/tab_11.png b/src/static/images/icon/index/tab_11.png index 1860a67..3f4f05c 100644 Binary files a/src/static/images/icon/index/tab_11.png and b/src/static/images/icon/index/tab_11.png differ diff --git a/src/static/images/icon/index/tab_12.png b/src/static/images/icon/index/tab_12.png new file mode 100644 index 0000000..1860a67 Binary files /dev/null and b/src/static/images/icon/index/tab_12.png differ diff --git a/src/store/index.js b/src/store/index.js index 2c39274..d4726fb 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -40,9 +40,10 @@ export default new Vuex.Store({ '1009': '场地管理', '1010': '设备管理', '1011': '商品零售', - '1013': '课程管理', + // '1013': '课程管理', '1014': '储值卡管理', '1015': '进场人数异常', + '1017': '钱包提现' }, // 场地占用提交页面信息 occupyInfo: { diff --git a/src/subpackage/order/pages/value_card/detail/detail.vue b/src/subpackage/order/pages/value_card/detail/detail.vue index 8f47c33..a3c8c8e 100644 --- a/src/subpackage/order/pages/value_card/detail/detail.vue +++ b/src/subpackage/order/pages/value_card/detail/detail.vue @@ -109,7 +109,7 @@ - + diff --git a/src/subpackage/party/pages/login/regist.vue b/src/subpackage/party/pages/login/regist.vue index b7b759b..244d14c 100644 --- a/src/subpackage/party/pages/login/regist.vue +++ b/src/subpackage/party/pages/login/regist.vue @@ -557,9 +557,14 @@ this.submitData.mailing_address = res.Response.Address; this.submitData.extension.legal_person_name = res.Response.Person; this.submitData.agency_code = res.Response.RegNum; - const t = this.company_types.find(item => item.label === res.Response.Type); - if(t&&t.value)this.submitData.extension.company_type = t.value; //设置企业类型 +// <<<<<<< HEAD +// const t = this.company_types.find(item => item.label === res.Response.Type); +// if(t&&t.value)this.submitData.extension.company_type = t.value; //设置企业类型 +// ======= + // const t = this.company_types.find(item => item.label === res.Response.Type); + // this.submitData.extension.company_type = t.value; +// >>>>>>> dev if (res.Response.Capital) { const num = res.Response.Capital.split('元')[0] this.submitData.extension.registered_capital = this.chineseToNumber(num) @@ -588,12 +593,25 @@ return item } }); - if(t&&t.value){ +// <<<<<<< HEAD +// if(t&&t.value){ +// this.submitData.extension.company_type = t.value +// this.company_type_index = _index +// this.company_type_show = this.company_types_arr[_index] +// } + +// ======= + // console.log("t", t) + if(t){ this.submitData.extension.company_type = t.value this.company_type_index = _index this.company_type_show = this.company_types_arr[_index] + util.showNone("信息已填充,请二次确认证件信息") + }else{ + console.log("OCR对应的企业类型无法匹配:",this.company_types, res.Response.Type) + util.showNone("请手动选择[企业类型],并二次确认证件信息") } - +// >>>>>>> dev } } else { this.submitData.extension.business_id_card = res.Response.IdNum diff --git a/src/subpackage/wallet/components/bf_withdraw.vue b/src/subpackage/wallet/components/bf_withdraw.vue new file mode 100644 index 0000000..05763e5 --- /dev/null +++ b/src/subpackage/wallet/components/bf_withdraw.vue @@ -0,0 +1,219 @@ + + + + + \ No newline at end of file diff --git a/src/subpackage/wallet/components/filtrate_bar.vue b/src/subpackage/wallet/components/filtrate_bar.vue new file mode 100644 index 0000000..62eb787 --- /dev/null +++ b/src/subpackage/wallet/components/filtrate_bar.vue @@ -0,0 +1,132 @@ + + + + + \ No newline at end of file diff --git a/src/subpackage/wallet/components/record_line.vue b/src/subpackage/wallet/components/record_line.vue new file mode 100644 index 0000000..1a6ff88 --- /dev/null +++ b/src/subpackage/wallet/components/record_line.vue @@ -0,0 +1,47 @@ + + + + + \ No newline at end of file diff --git a/src/subpackage/wallet/components/wallet_mask.vue b/src/subpackage/wallet/components/wallet_mask.vue new file mode 100644 index 0000000..d926835 --- /dev/null +++ b/src/subpackage/wallet/components/wallet_mask.vue @@ -0,0 +1,22 @@ + + + + + \ No newline at end of file diff --git a/src/subpackage/wallet/components/wallet_modal.vue b/src/subpackage/wallet/components/wallet_modal.vue new file mode 100644 index 0000000..7c99e3e --- /dev/null +++ b/src/subpackage/wallet/components/wallet_modal.vue @@ -0,0 +1,63 @@ + + + + + \ No newline at end of file diff --git a/src/subpackage/wallet/components/wallet_modal_success.vue b/src/subpackage/wallet/components/wallet_modal_success.vue new file mode 100644 index 0000000..b881ce6 --- /dev/null +++ b/src/subpackage/wallet/components/wallet_modal_success.vue @@ -0,0 +1,68 @@ + + + + + \ No newline at end of file diff --git a/src/subpackage/wallet/components/wm_button.vue b/src/subpackage/wallet/components/wm_button.vue new file mode 100644 index 0000000..7ad9cf0 --- /dev/null +++ b/src/subpackage/wallet/components/wm_button.vue @@ -0,0 +1,31 @@ + + + + + \ No newline at end of file diff --git a/src/subpackage/wallet/js/api.js b/src/subpackage/wallet/js/api.js new file mode 100644 index 0000000..4ff0fc2 --- /dev/null +++ b/src/subpackage/wallet/js/api.js @@ -0,0 +1,13 @@ +import { ORIGIN } from '../../../js/api'; + +export const WALLET_API = { + walletBalance:`${ORIGIN}/admin/merchantwallet/balance`, // 获取商户钱包余额 + withdrawalOfDouyinOrg_totalAmount:`${ORIGIN}/admin/financialReconciliation/withdrawalOfDouyinOrg/totalAmount`, // 可提现总额 抖音 + withdrawalOfDouyinOrg_edit:`${ORIGIN}/admin/financialReconciliation/withdrawalOfDouyinOrg/edit`, // 申请提现-编辑 抖音 + withdrawalOfDouyinOrg_list:`${ORIGIN}/admin/financialReconciliation/withdrawalOfDouyinOrg/list`, // 提现申请-列表 抖音 + // 宝付 + getPayAssureConfigs:`${ORIGIN}/admin/pay/assure/getPayAssureConfigs`, // 查看可选择的支付账户列表 + baofuV2Gateway:`${ORIGIN}/admin/pay/assure/baofuV2/gateway`, // 宝付v2获取金额信息 +} + +export default WALLET_API; \ No newline at end of file diff --git a/src/subpackage/wallet/js/bank.js b/src/subpackage/wallet/js/bank.js new file mode 100644 index 0000000..81830f4 --- /dev/null +++ b/src/subpackage/wallet/js/bank.js @@ -0,0 +1 @@ +export default ['中国工商银行', '中国建设银行', '中国银行', '中国农业银行', '中国邮政储蓄银行', '招商银行', '交通银行', '上海浦东发展银行', '中信银行', '中国光大银行', '华夏银行', '中国民生银行', '广东发展银行', '兴业银行', '平安银行', '浙商银行', '恒丰银行', '渤海银行', '上海银行', '北京银行', '杭州银行', '常熟农商银行', '青岛银行', '徽商银行', '南京银行', '张家口银行', '天津滨海农村商业银行', '天津银行', '深圳农村商业银行', '宁夏银行', '石嘴山银行', '海南省农村信用社联合社', '海南银行', '陕西省农村信用社联合社', '长安银行', '青海农村信用社联合社', '青海银行', '宁波通商银行', '鄞州银行', '宁波东海银行', '宁波银行', '江南农村商业银行', '江苏省农村信用社联合社', '江苏长江商业银行', '江阴农商银行', '昆山农村商业银行', '苏州银行', '太仓农村商业银行', '无锡农村商业银行', '吴江农村商业银行', '张家港农商行', '重庆农村商业银行', '重庆三峡银行', '重庆银行', '大同银行', '晋城银行', '晋商银行', '晋中市商业银行', '长治市商业银行', '阳泉商业银行', '德州银行', '东营银行', '烟台银行', '济宁银行', '莱商银行', '临商银行', '齐鲁银行', '齐商银行', '日照银行', '枣庄银行', '泰安银行', '威海市商业银行', '潍坊银行', '江西银行', '江西省农村信用社联合社', '九江银行', '赣州银行', '上饶银行', '甘肃省农村信用社联合社', '甘肃银行', '兰州银行', '鄂尔多斯银行', '内蒙古农村信用社联合社', '内蒙古银行', '乌海银行', '汉口银行', '湖北省农村信用社联合社', '湖北银行', '武汉农村商业银行', '鞍山银行', '本溪商业银行', '朝阳银行', '丹东银行', '阜新银行', '葫芦岛银行', '锦州银行', '辽宁省农村信用社', '辽阳银行', '盘锦商行', '盛京银行', '铁岭银行', '营口沿海银行', '营口银行', '东莞农村商业银行', '东莞银行', '广东华兴银行', '广东南粤银行', '广东省农村信用社联合社', '广州农村商业银行', '广州银行', '顺德农商银行', '珠海华润银行', '长沙银行', '湖南三湘银行', '成都农商银行', '达州市商业银行', '长城华西银行', '乐山商业银行', '凉山商业银行', '泸州市商业银行', '绵阳市商业银行', '四川天府银行', '攀枝花市商业银行', '四川省农村信用社联合社', '遂宁银行', '雅安市商业银行', '宜宾市商业银行', '自贡银行', '广西北部湾银行', '广西壮族自治区农村信用社联合社', '柳州银行', '上海农村商业银行', '贵阳银行', '贵州省农村信用社联合社', '贵州银行', '台州银行', '温州银行', '浙江民泰商业银行', '浙江泰隆商业银行', '湖州银行', '嘉兴银行', '金华银行', '绍兴银行', '浙江稠州商业银行', '浙商银行', '哈尔滨银行', '黑龙江省农村信用社联合社', '龙江银行', '吉林省农村信用社联合社', '吉林银行', '大连银行', '大连农商行', '富滇银行', '曲靖市商业银行', '云南红塔银行', '云南省农村信用社联合社', '哈密市商业银行', '库尔勒市商业银行', '昆仑银行', '乌鲁木齐银行', '新疆汇和银行', '新疆农村信用社联合社', '新疆银行', '厦门国际银行', '厦门银行', '福建省海峡银行', '泉州银行', '保定银行', '沧州银行', '承德银行', '邯郸银行', '河北省农村信用社联合社', '河北银行', '衡水银行', '廊坊银行', '秦皇岛市商业银行', '唐山银行', '邢台银行', '河南省农村信用社联合社', '焦作中旅银行', '洛阳银行', '平顶山银行', '郑州银行', '中原银行', '玉山银行', '西藏银行', '华侨永亨银行', '辽宁辰州汇通村镇银行', '佛山农村商业银行', '东港农村商业银行', '浙江东阳农村商业银行', '东莞农村商业银行'] diff --git a/src/subpackage/wallet/js/server.js b/src/subpackage/wallet/js/server.js new file mode 100644 index 0000000..08c25b3 --- /dev/null +++ b/src/subpackage/wallet/js/server.js @@ -0,0 +1,10 @@ +import { Server } from '../../../js/server'; + +class WalletServer extends Server { + constructor(props){ + super(props) + } +} + + +export default new WalletServer(); \ No newline at end of file diff --git a/src/subpackage/wallet/pages/baofu_withdraw/index.vue b/src/subpackage/wallet/pages/baofu_withdraw/index.vue new file mode 100644 index 0000000..9fe989e --- /dev/null +++ b/src/subpackage/wallet/pages/baofu_withdraw/index.vue @@ -0,0 +1,122 @@ + + + + + \ No newline at end of file diff --git a/src/subpackage/wallet/pages/baofu_withdraw/modules/baofu_item.vue b/src/subpackage/wallet/pages/baofu_withdraw/modules/baofu_item.vue new file mode 100644 index 0000000..ddb0db0 --- /dev/null +++ b/src/subpackage/wallet/pages/baofu_withdraw/modules/baofu_item.vue @@ -0,0 +1,246 @@ + + + + + \ No newline at end of file diff --git a/src/subpackage/wallet/pages/douyin_withdraw/apply.vue b/src/subpackage/wallet/pages/douyin_withdraw/apply.vue new file mode 100644 index 0000000..f6a84ce --- /dev/null +++ b/src/subpackage/wallet/pages/douyin_withdraw/apply.vue @@ -0,0 +1,324 @@ + + + + + \ No newline at end of file diff --git a/src/subpackage/wallet/pages/douyin_withdraw/index.vue b/src/subpackage/wallet/pages/douyin_withdraw/index.vue new file mode 100644 index 0000000..a5ec2cc --- /dev/null +++ b/src/subpackage/wallet/pages/douyin_withdraw/index.vue @@ -0,0 +1,114 @@ + + + + + \ No newline at end of file diff --git a/src/subpackage/wallet/pages/douyin_withdraw/record.vue b/src/subpackage/wallet/pages/douyin_withdraw/record.vue new file mode 100644 index 0000000..01941e7 --- /dev/null +++ b/src/subpackage/wallet/pages/douyin_withdraw/record.vue @@ -0,0 +1,151 @@ + + + + + \ No newline at end of file diff --git a/src/subpackage/wallet/pages/index/index.vue b/src/subpackage/wallet/pages/index/index.vue new file mode 100644 index 0000000..7dd37cd --- /dev/null +++ b/src/subpackage/wallet/pages/index/index.vue @@ -0,0 +1,110 @@ + + + + + \ No newline at end of file diff --git a/src/subpackage/wallet/pages/index/modules/wallet_info.vue b/src/subpackage/wallet/pages/index/modules/wallet_info.vue new file mode 100644 index 0000000..807e312 --- /dev/null +++ b/src/subpackage/wallet/pages/index/modules/wallet_info.vue @@ -0,0 +1,139 @@ + + + + + \ No newline at end of file diff --git a/src/subpackage/wallet/static/images/arrow_b2.png b/src/subpackage/wallet/static/images/arrow_b2.png new file mode 100644 index 0000000..54df2b3 Binary files /dev/null and b/src/subpackage/wallet/static/images/arrow_b2.png differ diff --git a/src/subpackage/wallet/static/images/arrow_c33.png b/src/subpackage/wallet/static/images/arrow_c33.png new file mode 100644 index 0000000..50fd024 Binary files /dev/null and b/src/subpackage/wallet/static/images/arrow_c33.png differ diff --git a/src/subpackage/wallet/static/images/close.png b/src/subpackage/wallet/static/images/close.png new file mode 100644 index 0000000..d8cc22a Binary files /dev/null and b/src/subpackage/wallet/static/images/close.png differ diff --git a/src/subpackage/wallet/static/images/dy_logo.png b/src/subpackage/wallet/static/images/dy_logo.png new file mode 100644 index 0000000..5b27412 Binary files /dev/null and b/src/subpackage/wallet/static/images/dy_logo.png differ diff --git a/src/subpackage/wallet/static/images/filter.png b/src/subpackage/wallet/static/images/filter.png new file mode 100644 index 0000000..fc030b3 Binary files /dev/null and b/src/subpackage/wallet/static/images/filter.png differ diff --git a/src/subpackage/wallet/static/images/question_mark.png b/src/subpackage/wallet/static/images/question_mark.png new file mode 100644 index 0000000..0502dd6 Binary files /dev/null and b/src/subpackage/wallet/static/images/question_mark.png differ diff --git a/src/subpackage/wallet/static/images/success_tip.png b/src/subpackage/wallet/static/images/success_tip.png new file mode 100644 index 0000000..e621534 Binary files /dev/null and b/src/subpackage/wallet/static/images/success_tip.png differ diff --git a/src/utils/util.js b/src/utils/util.js index 259e57b..8af92c5 100644 --- a/src/utils/util.js +++ b/src/utils/util.js @@ -50,7 +50,7 @@ export const routeTo = (url,type) => { } } -function showNone(txt,duration=1500){ +export function showNone(txt,duration=1500){ uni.hideToast(); uni.hideLoading(); uni.showToast({ @@ -61,16 +61,17 @@ function showNone(txt,duration=1500){ }) } -function showLoad(title='加载中', mask=true){ +export function showLoad(title='加载中', mask=true){ uni.showLoading({ mask, title, }) } -function hideLoad(){ +export function hideLoad(){ uni.hideLoading() } -function showModal({ + +export function showModal({ title='提示', content='', showCancel=false, @@ -117,7 +118,8 @@ function showModalMsg(_content='加载中', _mshowCancel=true){ }) } -function debounce(func, wait, immediate) { +export function debounce(func, wait, immediate) { + let timeout, args, context, timestamp, result; const later = function() { // 据上一次触发时间间隔