diff --git a/App.vue b/App.vue index 8941b45..de77746 100644 --- a/App.vue +++ b/App.vue @@ -4,11 +4,11 @@ // url: 'http://192.168.3.4:9301/crest', // imgUrl: 'https://192.168.3.4:9301/filesystem/', //正式 - url: 'https://pay.dctpay.com/crest', - imgUrl: 'https://gratia-pay.obs.cn-southwest-2.myhuaweicloud.com', + // url: 'https://pay.dctpay.com/crest', + // imgUrl: 'https://gratia-pay.obs.cn-southwest-2.myhuaweicloud.com', //测试 - // url: 'https://gratia-pay.dctpay.com/crest', - // imgUrl: 'https://gratia-pay-test.obs.cn-east-3.myhuaweicloud.com', + url: 'https://gratia-pay.dctpay.com/crest', + imgUrl: 'https://gratia-pay-test.obs.cn-east-3.myhuaweicloud.com', userInfo: "", openId: '', h5code: '', diff --git a/Utils/Api.js b/Utils/Api.js index 85731c1..7f5db62 100644 --- a/Utils/Api.js +++ b/Utils/Api.js @@ -115,20 +115,20 @@ export const getLastApplyByMer = params => { export const getAuditList = params => { return POST('GET', `${base}/audit/getAuditList`, params).then(res => res.data); } -//通过审核 +//通过审核 export const approve = params => { return POST('POST', `${base}/audit/approve`, params).then(res => res.data); } -//驳回审核 +//驳回审核 export const reject = params => { return POST('POST', `${base}/audit/reject`, params).then(res => res.data); -} -//审核详情 +} +//审核详情 export const getAuditDetail = params => { return POST('GET', `${base}/audit/getAuditDetail`, params).then(res => res.data); -} - - +} + + @@ -247,4 +247,21 @@ export const merLedgerReceiverDelApply = params => { //查询接收方详情 export const getLedgerReceiverById = params => { return POST('GET', `${base}/merLedger/getLedgerReceiverById`, params).then(res => res.data); +} + +//查询活动列表 +export const queryActivityList = params => { + return POST('GET', `${base}/bankActivity/queryActivityList`, params).then(res => res.data); +} +//查询活动详情 +export const queryActivityDetail = params => { + return POST('GET', `${base}/bankActivity/queryActivityDetail`, params).then(res => res.data); +} +//报名活动 +export const enrollActivity = params => { + return POST('POST', `${base}/bankActivity/enrollActivity`, params).then(res => res.data); +} +// 配置费率 +export const configRosterRate = params => { + return POST('POST', `${base}/bankActivity/configRosterRate`, params).then(res => res.data); } \ No newline at end of file diff --git a/pages.json b/pages.json index 706fd87..b64deb2 100644 --- a/pages.json +++ b/pages.json @@ -398,12 +398,62 @@ } } + }, { + "path": "pages/index/table_CodeList/table_CodeList", + "style": { + "navigationBarTitleText": "分配桌码", + "navigationBarTextStyle": "white", + "enablePullDownRefresh": false, + "app-plus": { + "titleNView": false, //禁用原生导航栏 + "softinputNavBar": "none" + } + } + + }, { + "path": "pages/index/equity-activities/equity-activities", + "style": { + "navigationBarTitleText": "权益活动", + "navigationBarTextStyle": "white", + "enablePullDownRefresh": false, + "app-plus": { + "titleNView": false, //禁用原生导航栏 + "softinputNavBar": "none" + } + } + + }, { + "path": "pages/index/equity-activities-details/equity-activities-details", + "style": { + "navigationBarTitleText": "活动详情", + "navigationBarTextStyle": "white", + "enablePullDownRefresh": false, + "app-plus": { + "titleNView": false, //禁用原生导航栏 + "softinputNavBar": "none" + } + } + } ,{ - "path" : "pages/index/table_CodeList/table_CodeList", + "path" : "pages/index/equity-activity-review/equity-activity-review", + "style" : + { + "navigationBarTitleText": "活动审核", + "navigationBarTextStyle": "white", + "enablePullDownRefresh": false, + "app-plus": { + "titleNView": false, //禁用原生导航栏 + "softinputNavBar": "none" + } + } + + } + ,{ + "path" : "pages/index/order-list-details/order-list-details", "style" : { - "navigationBarTitleText": "分配桌码", + "navigationBarTitleText": "订单详情", "navigationBarTextStyle": "white", "enablePullDownRefresh": false, "app-plus": { diff --git a/pages/index/collectNotes/collectNotes.vue b/pages/index/collectNotes/collectNotes.vue index 3668209..a4b04c5 100644 --- a/pages/index/collectNotes/collectNotes.vue +++ b/pages/index/collectNotes/collectNotes.vue @@ -1,19 +1,70 @@ @@ -24,7 +75,12 @@ } from '../../../Utils/Api.js'; export default { data() { + const currentDate = this.getDate({ + format: true + }) return { + startdate: currentDate, + enddate: currentDate, notesList: [], statusList: { 1: "待支付", @@ -37,6 +93,17 @@ pageNum: 1, pageSize: 10, isNoMoreData: false, //是否加载中 + orderNo: '', //订单编号 + totalPrice: 0, //总价格 + totalNum: 0, //总笔数 + } + }, + computed: { + startDate() { + return this.getDate('start'); + }, + endDate() { + return this.getDate('end'); } }, onLoad() { @@ -45,24 +112,73 @@ onReachBottom() { this.getTradeOrderList(); }, + methods: { - getTradeOrderList() { + //时间修改 + getDate(type) { + const date = new Date(); + let year = date.getFullYear(); + let month = date.getMonth() + 1; + let day = date.getDate(); + + if (type === 'start') { + year = year - 60; + } else if (type === 'end') { + year = year + 2; + } + month = month > 9 ? month : '0' + month;; + day = day > 9 ? day : '0' + day; + return `${year}-${month}-${day}`; + }, + //选择时间 + bindDateChange(e) { + this.startdate = e.target.value; + this.pageNum = 1; + this.notesList = []; + this.isNoMoreData = false; + this.getTradeOrderList(); + }, + bindDateChange1(e) { + this.enddate = e.target.value; + this.pageNum = 1; + this.notesList = []; + this.isNoMoreData = false; + this.getTradeOrderList(); + }, + toSearch(){ + this.pageNum = 1; + this.notesList = []; + this.isNoMoreData = false; + this.getTradeOrderList(); + }, + //查询列表 + getTradeOrderList() { uni.showLoading({ title: '加载中...' }) if (this.isNoMoreData) { uni.hideLoading() return false; - } + } + console.log('1111111111'); + let a = new Date(this.startdate).getTime(); + let b = new Date(this.enddate).getTime(); + let startTime = a - 28800000; + let endTime = b + 57599000; let pagenum = this.pageNum; let datas = { + status: 3, + payTimeS: startTime, + payTimeE: endTime, + outTradeNo: this.orderNo, pageNum: pagenum, pageSize: this.pageSize } - getTradeOrderList(datas).then(res => { uni.hideLoading(); if (res.return_code == '000000' && res.return_data.pageInfo.list) { + this.totalPrice = res.return_data.totalPrice; + this.totalNum = res.return_data.totalNum; this.isNoMoreData = res.return_data.pageInfo.list.length == this.pageSize ? false : true; this.notesList = this.notesList.concat(res.return_data.pageInfo.list); if (res.return_data.pageInfo.total == (this.pageNum * this.pageSize)) { @@ -79,6 +195,12 @@ } }) }, + //跳转详情 + jumpOderlist() { + // uni.navigateTo({ + // url: '/pages/index/order-list-details/order-list-details' + // }) + } } } @@ -88,6 +210,51 @@ background-color: #f8f9f9; } + .input-box { + width: 90%; + margin-left: 5%; + margin-top: 15px; + margin-bottom: 15px; + height: 70rpx; + background-color: #f5f5f5; + border-radius: 10rpx; + position: relative; + display: flex; + align-items: center; + + .icon { + display: flex; + align-items: center; + position: absolute; + top: 2px; + left: 5px; + width: 60upx; + height: 60upx; + font-size: 34upx; + color: #c0c0c0; + } + + input { + padding-left: 50upx; + height: 28upx; + font-size: 28upx; + width: 100%; + } + } + + i { + border: solid #ffffff; + border-width: 0 2px 2px 0; + display: inline-block; + padding: 4px; + margin-left: 10px; + vertical-align: 3px; + } + + .down { + -webkit-transform: rotate(45deg); + } + .font306adb { color: #306adb; } @@ -96,4 +263,17 @@ float: right; margin-right: 20px; } - + + .headsearch { + border-radius: 8px; + background-color: #4c7fe6; + } + + .datetim { + width: 130px; + height: 30px; + line-height: 30px; + text-align: right; + border-radius: 15px; + } + \ No newline at end of file diff --git a/pages/index/equity-activities-details/equity-activities-details.vue b/pages/index/equity-activities-details/equity-activities-details.vue new file mode 100644 index 0000000..f3127aa --- /dev/null +++ b/pages/index/equity-activities-details/equity-activities-details.vue @@ -0,0 +1,234 @@ + + + + + \ No newline at end of file diff --git a/pages/index/equity-activities/equity-activities.vue b/pages/index/equity-activities/equity-activities.vue new file mode 100644 index 0000000..7886d67 --- /dev/null +++ b/pages/index/equity-activities/equity-activities.vue @@ -0,0 +1,130 @@ + + + + + \ No newline at end of file diff --git a/pages/index/equity-activity-review/equity-activity-review.vue b/pages/index/equity-activity-review/equity-activity-review.vue new file mode 100644 index 0000000..1e3047f --- /dev/null +++ b/pages/index/equity-activity-review/equity-activity-review.vue @@ -0,0 +1,90 @@ + + + + + \ No newline at end of file diff --git a/pages/index/merchant-details/merchant-details.vue b/pages/index/merchant-details/merchant-details.vue index 79374bc..0848af4 100644 --- a/pages/index/merchant-details/merchant-details.vue +++ b/pages/index/merchant-details/merchant-details.vue @@ -16,11 +16,12 @@ 商户ID {{merDesInfo.merNo}} + + + 商户名称 + {{merDesInfo.merName}} - - 手机号 - {{merDesInfo.regPhone}} - + 商户状态 正常 @@ -29,11 +30,15 @@ 联系人 {{merDesInfo.account.userName}} + + + 手机号 + {{merDesInfo.regPhone}} - + 银行卡号 {{merDesInfo.merSettleAcct.bankCardNo}} diff --git a/pages/index/merchant-incoming-parts/merchant-incoming-parts.vue b/pages/index/merchant-incoming-parts/merchant-incoming-parts.vue index 1fbcf1d..163de2d 100644 --- a/pages/index/merchant-incoming-parts/merchant-incoming-parts.vue +++ b/pages/index/merchant-incoming-parts/merchant-incoming-parts.vue @@ -350,8 +350,8 @@ - - + 非法人身份证照片 diff --git a/pages/index/merchant-management/merchant-management.vue b/pages/index/merchant-management/merchant-management.vue index 9aa0ac2..55a874e 100644 --- a/pages/index/merchant-management/merchant-management.vue +++ b/pages/index/merchant-management/merchant-management.vue @@ -14,8 +14,8 @@ @click="jumpmerdes(item.id)"> - - {{item.regPhone}} + + {{item.merName}} {{item.createTime | timeFormat('yyyy-mm-dd')}} {{item.createTime | timeFormat('hh:mm')}} @@ -35,6 +35,7 @@ + @@ -69,7 +70,7 @@ if (!this.isLoadMore) { //此处判断，上锁，防止重复请求 this.isLoadMore = true this.pageNum += 1 - this.getCmsContentNEWS() + this.getMerListBySalesman() } }, methods: { @@ -167,6 +168,12 @@ }) } }) + }, + //跳转权益活动 + jumpEquityActivity(item) { + uni.navigateTo({ + url: '/pages/index/equity-activities/equity-activities?id=' + item + }) } } } diff --git a/pages/index/order-list-details/order-list-details.vue b/pages/index/order-list-details/order-list-details.vue new file mode 100644 index 0000000..279178d --- /dev/null +++ b/pages/index/order-list-details/order-list-details.vue @@ -0,0 +1,70 @@ + + + + + \ No newline at end of file diff --git a/pages/index/review-Settlement/review-Settlement.vue b/pages/index/review-Settlement/review-Settlement.vue index 29b7700..9c438bb 100644 --- a/pages/index/review-Settlement/review-Settlement.vue +++ b/pages/index/review-Settlement/review-Settlement.vue @@ -21,12 +21,6 @@ 提交时间: {{item.createTime | timeFormat('yyyy-mm-dd hh:mm:ss')}} - - 提交人 @@ -135,19 +129,4 @@ padding: 20upx 0 20upx 20upx; } - //正常状态 - .statucs { - background-color: #e9f9e5; - color: #84b878; - text-align: center; - padding: 2px 5px; - } - - //其他状态 - .otstatucs { - background-color: #fbeee4; - color: #db8c73; - text-align: center; - padding: 2px 5px; - } \ No newline at end of file diff --git a/pages/tabBar/home/home.vue b/pages/tabBar/home/home.vue index b94c698..385637c 100644 --- a/pages/tabBar/home/home.vue +++ b/pages/tabBar/home/home.vue @@ -9,10 +9,10 @@ {{userInfo.mer.merAbbreviate}} - - - {{userInfo.agent.name}} - + + + {{userInfo.agent.name}} + {{userInfo.store.name}} @@ -147,16 +147,20 @@ } ] return; - } - //代理商 - if (this.userInfo.secUser.objectType == 2) { - this.funcList = [{ - title: '结算审核', - url: '../../index/review-Settlement/review-Settlement', - img: '../../../static/img/home1.png' - } - ] - return; + } + //代理商 + if (this.userInfo.secUser.objectType == 2) { + this.funcList = [{ + title: '结算审核', + url: '../../index/review-Settlement/review-Settlement', + img: '../../../static/img/home1.png' + }] + // , { + // title: '权益活动', + // url: '../../index/equity-activity-review/equity-activity-review', + // img: '../../../static/img/home5.png' + // } + return; } }, @@ -292,4 +296,4 @@ padding-top: 15px; } } - + \ No newline at end of file diff --git a/pages/welcome/welcome.vue b/pages/welcome/welcome.vue index 9c93c9d..8565a0a 100644 --- a/pages/welcome/welcome.vue +++ b/pages/welcome/welcome.vue @@ -17,28 +17,28 @@ }, onLoad(options) { let that = this; - // uni.reLaunch({ - // url: '../tabBar/home/home' - // }) + uni.reLaunch({ + url: '../tabBar/home/home' + }) // #ifdef H5 - let arr1 = window.location.href; - let arr2 = arr1.split('='); - if (arr2[2]) { - var arr3 = arr2[2].split('&'); - if (arr3[0] != undefined && arr3[0]) { - app.globalData.h5code = arr3[0]; - uni.setStorage({ - key: "h5code", - data: arr3[0] - }) - } - } else { + // let arr1 = window.location.href; + // let arr2 = arr1.split('='); + // if (arr2[2]) { + // var arr3 = arr2[2].split('&'); + // if (arr3[0] != undefined && arr3[0]) { + // app.globalData.h5code = arr3[0]; + // uni.setStorage({ + // key: "h5code", + // data: arr3[0] + // }) + // } + // } else { // 获取openid - that.jumpcdx(); - } - if (app.globalData.h5code) { - that.getAccessToken(); - } + // that.jumpcdx(); + // } + // if (app.globalData.h5code) { + // that.getAccessToken(); + // } // #endif }, methods: { diff --git a/static/img/alipay.png b/static/img/alipay.png new file mode 100644 index 0000000..a678033 Binary files /dev/null and b/static/img/alipay.png differ diff --git a/static/img/home5.png b/static/img/home5.png new file mode 100644 index 0000000..e1a982a Binary files /dev/null and b/static/img/home5.png differ diff --git a/static/img/wechat.png b/static/img/wechat.png new file mode 100644 index 0000000..261ea5d Binary files /dev/null and b/static/img/wechat.png differ diff --git a/unpackage/dist/build/h5/index.html b/unpackage/dist/build/h5/index.html index eba0065..3d0445c 100644 --- a/unpackage/dist/build/h5/index.html +++ b/unpackage/dist/build/h5/index.html @@ -1,2 +1,2 @@ 惠支付
\ No newline at end of file + document.write('')
\ No newline at end of file