1.对接权益活动

2.修改交易记录查询条件
3.打包上线
huipay-master
杨杰 1 year ago
parent 916f738682
commit 8935ee7973
  1. 8
      App.vue
  2. 31
      Utils/Api.js
  3. 54
      pages.json
  4. 208
      pages/index/collectNotes/collectNotes.vue
  5. 234
      pages/index/equity-activities-details/equity-activities-details.vue
  6. 130
      pages/index/equity-activities/equity-activities.vue
  7. 90
      pages/index/equity-activity-review/equity-activity-review.vue
  8. 17
      pages/index/merchant-details/merchant-details.vue
  9. 6
      pages/index/merchant-incoming-parts/merchant-incoming-parts.vue
  10. 13
      pages/index/merchant-management/merchant-management.vue
  11. 70
      pages/index/order-list-details/order-list-details.vue
  12. 21
      pages/index/review-Settlement/review-Settlement.vue
  13. 34
      pages/tabBar/home/home.vue
  14. 40
      pages/welcome/welcome.vue
  15. BIN
      static/img/alipay.png
  16. BIN
      static/img/home5.png
  17. BIN
      static/img/wechat.png
  18. 2
      unpackage/dist/build/h5/index.html

@ -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: '',

@ -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);
}

@ -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": {

@ -1,19 +1,70 @@
<template>
<view>
<view class="headsearch width94 mart15 paddtop5 paddbotm10 fotct">
<view class="mart10 width90 alijusstart">
<view class="fcorfff font14 margleri10 width60 fotlt">开始时间 :</view>
<picker mode="date" :value="startdate" :start="startDate" :end="endDate" @change="bindDateChange">
<view class="datetim fcorfff">{{startdate}}<i class="down"></i></view>
</picker>
</view>
<view class="mart10 width90 alijusstart">
<view class="fcorfff font14 margleri10 width60 fotlt">结束时间 :</view>
<picker mode="date" :value="enddate" :start="startDate" :end="endDate" @change="bindDateChange1">
<view class="datetim fcorfff">{{enddate}}<i class="down"></i></view>
</picker>
</view>
<view class="input-box">
<view class="icon search"></view>
<input placeholder="请输入订单编号" v-model="orderNo" placeholder-style="color:#c0c0c0;" @input="toSearch()" />
</view>
</view>
<view class="width100 height90 backcorfff marb5 mart15" style="border-radius: 22px 0 22px 0;">
<view class="width100 fotct height40p alijus font20 fcor333">
<view class="width50">
{{totalPrice}}
</view>
<view class="width50 ">
{{totalNum}}
</view>
<!-- <view style="width: 1px;" class="height80 backcor6"></view> -->
</view>
<view class="width100 fotct height40p alijus font14 fcor333">
<view class="width50 ">
交易金额
</view>
<view class="width50">
交易笔数
</view>
</view>
</view>
<view v-if="notesList == ''" class="mart60 fotct font14 fcor666">
<image mode="widthFix" style="width: 70vw;" src="../../../static/img/noorder.png"></image>
</view>
<view class="height90 width94 backcorfff mart20" v-for="(item,index) in notesList" :key="index">
<view class="font24 fcor333 paddtop10 padleft15">¥ <text
class="font306adb fontwig6 margle font28">{{item.tradeAmount}}</text>
<text class="stus font15 fcoreb5"
v-if="item.status == 1 || item.status == 5 || item.status == 4 || item.status == 6">{{statusList[item.status]}}</text>
<text class="stus font15 fcor41c"
v-if="item.status == 2 || item.status == 3">{{statusList[item.status]}}</text>
</view>
<view class="mart10 fcor666 padleft15 font15">{{item.createTime | timeFormat('yyyy-mm-dd')}}
{{item.createTime | timeFormat('hh:mm')}}
<view class="width100 backcorfff" v-for="(item,index) in notesList" :key="index" @click="jumpOderlist()">
<view class="width94 height70 alijusstart bor-botm1">
<view class="width15">
<image src="../../../static/img/wechat.png" mode="widthFix" class="iconw40"
v-if="item.payMode == 'WECHAT'"></image>
<image src="../../../static/img/alipay.png" mode="widthFix" class="iconw40"
v-if="item.payMode == 'ALIPAY'"></image>
</view>
<view class="width85">
<view class="alijusstart font15 fcor333">
<view class="width50 font15 fcor333">扫一扫</view>
<view class="width50 fotrt">¥ {{item.tradeAmount}}</view>
</view>
<view class="alijusstart font15 paddtop5 fcor999">
<view class="width70">{{item.createTime | timeFormat('yyyy-mm-dd hh:mm:ss')}}
</view>
<view class="width30 fotrt">{{statusList[item.status]}}</view>
</view>
</view>
</view>
</view>
</view>
</template>
@ -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'
// })
}
}
}
</script>
@ -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;
}
</style>
.headsearch {
border-radius: 8px;
background-color: #4c7fe6;
}
.datetim {
width: 130px;
height: 30px;
line-height: 30px;
text-align: right;
border-radius: 15px;
}
</style>

@ -0,0 +1,234 @@
<template>
<view>
<view class="width94 font20 fontwig6 fcor333 mart15 fotct">{{activitydetails.activityName}}</view>
<view class="width94 font16 fcor666 mart10 fotct">{{activitydetails.comments}}</view>
<view class="width90 font13 fcoreb5 mart15 alijusstart">
活动时间:
{{activitydetails.effectiveStart | timeFormat('yyyy-mm-dd')}} -
{{activitydetails.effectiveEnd | timeFormat('yyyy-mm-dd')}}
</view>
<view class="width90 font13 fcoreb5 alijusstart">
报名时间: {{activitydetails.registrationStart | timeFormat('yyyy-mm-dd')}} -
{{activitydetails.registrationEnd | timeFormat('yyyy-mm-dd')}}
</view>
<view class="width90 fcoreb5 font14 fontwig6 mart5" v-if="activitydetails.bankActivityRoster !=null">已报名
</view>
<view class="width90 fcor666 font14 fontwig6 mart5" v-else>未报名</view>
<view class="width100 backcor6 mart5" style="height: 1px;"></view>
<view class="width90 mart20">
<rich-text :nodes="activitydetails.details"></rich-text>
</view>
<view class="width90 mart20 marb15 fcor333 fontwig6 font16" v-if="activitydetails.bankActivityRoster !=null">
选择周期费率
<text class="fcoreb5" v-if="activitydetails.bankActivityRoster.bankActivityRosterRateList[0].status == 1">(已生效)</text>
<text class="fcoreb5" v-if="activitydetails.bankActivityRoster.bankActivityRosterRateList[0].status == 2">(未配置)</text>
</view>
<view class="username" v-for="(item,index) in activityList" :key="index">
<view class="namecont">
{{item.startTime | timeFormat('yyyy-mm-dd')}} {{item.endTime | timeFormat('yyyy-mm-dd')}}
</view>
<picker mode="selector" style="width: 30%;" :range="item.rateArray" @change="changefeil"
@click="changefeilvalue(item)">
<!-- <view class="fotrt text1" style="padding: 0 25rpx;"></view> -->
<input disabled="true" v-model="item.ext1" />
</picker>
<image class="flright iconw" mode="widthFix" src="../../../static/img/downj.png"></image>
</view>
<button class="btns" @click="enrollActivity" v-if="activitydetails.bankActivityRoster ==null">提交审核</button>
<button class="btns" @click="configRosterRate" v-else>提交费率</button>
<view class="height60"></view>
</view>
</template>
<script>
import {
queryActivityDetail,
enrollActivity,
configRosterRate
} from '../../../Utils/Api.js';
export default {
data() {
return {
activitydetails: '', //
detailsid: '', // id
merId: '', //id
activityList: [], //
changeValue: '' //
}
},
onLoad(options) {
this.detailsid = options.id;
this.merId = options.merid;
this.queryActivityDetail();
},
methods: {
//
changefeil(e) {
let query = e.target.value;
if (this.changeValue) {
for (var i = 0; i < this.activityList.length; i++) {
if (this.changeValue.id == this.activityList[i].id) {
this.activityList[i].ext1 = this.activityList[i].rateArray[query];
}
}
}
},
changefeilvalue(item) {
this.changeValue = item;
},
//
queryActivityDetail() {
uni.showLoading({
title: '加载中'
})
let datas = {
bankActivityId: this.detailsid,
merId: this.merId
}
queryActivityDetail(datas).then(res => {
uni.hideLoading();
if (res.return_code == '000000') {
this.activitydetails = res.return_data;
this.activityList = res.return_data.bankActivityRoster
.bankActivityRosterRateList
} else {
uni.showToast({
title: res.return_msg,
duration: 2000,
icon: 'none'
})
}
})
},
//
enrollActivity() {
let that = this;
uni.showModal({
title: '报名申请',
content: '是否提交报名审核',
success: (res) => {
if (res.confirm) {
uni.showLoading({
title: '提交审核中...'
})
let datas = {
bankActivityId: that.detailsid,
merId: that.merId
}
enrollActivity(datas).then(res => {
uni.hideLoading();
if (res.return_code == '000000') {
uni.showToast({
title: res.return_data,
duration: 2000,
icon: 'none'
})
that.queryActivityDetail();
} else {
uni.showToast({
title: res.return_msg,
duration: 2000,
icon: 'none'
})
}
})
} else if (res.cancel) {
console.log('用户点击取消');
}
}
});
},
//
configRosterRate() {
let that = this;
uni.showModal({
title: '费率提交',
content: '是否提交当前费率',
success: (res) => {
if (res.confirm) {
uni.showLoading({
title: '加载中'
})
let rateDatas = [];
for (var i = 0; i < that.activityList.length; i++) {
if (that.activityList[i].ext1) {
let datas = {
"rateId": that.activityList[i].id,
"preferentialRates": that.activityList[i].ext1
}
rateDatas.push(datas);
}
}
let datas = {
"bankActivityId": that.detailsid,
"merId": that.merId,
"rateList": rateDatas
}
configRosterRate(datas).then(res => {
uni.hideLoading();
if (res.return_code == '000000') {
uni.showToast({
title: res.return_data,
duration: 2000,
icon: 'none'
})
uni.navigateBack();
} else {
uni.showToast({
title: res.return_msg,
duration: 2000,
icon: 'none'
})
}
})
} else if (res.cancel) {
console.log('用户点击取消');
}
}
});
}
}
}
</script>
<style lang="scss">
.btns {
margin-top: 80rpx;
width: 80%;
margin-left: 10%;
height: 50px;
line-height: 50px;
background-color: #0083f5;
color: #FFFFFF;
font-weight: bold;
}
.username {
width: calc(100% - 90upx);
height: 40px;
display: flex;
align-items: center;
background-color: rgba($color: #ffffff, $alpha: 0.1);
border-bottom: 1px solid #f6f6f6;
padding: 5px 20px;
input {
// width: 50%;
// height: 50upx;
// font-size: 16px;
// color: #333333;
// font-weight: blod;
text-align: right;
padding-right: 10px;
}
.namecont {
color: #666666;
width: 80%;
}
}
</style>

@ -0,0 +1,130 @@
<template>
<view>
<!-- <view class=" mart10 marb20 alijus">
<view class="font16 fcor333 paddtop5 paddbotm5 margle20 marRight20" v-for="(item,index) in status"
@click="switchid(item)" :class="[statusid == item.id ? 'fcor089 borbtom fontwig6' : '']" :key="index">
{{item.title}}
</view>
</view> -->
<view class="mart20 width100">
<view v-if="activityList == '' " class="mart60 fotct font14 fcor666">
<image mode="widthFix" style="width: 70vw;" src="../../../static/img/noorder.png"></image>
</view>
<view class="width94 backcorfff border-r mart15" v-for="(item,index) in activityList" :key="index"
@click="jumpactivitydetails(item.id)">
<view class="notes">
<view class="width100 margle">
<view class="font18 fcor333 fontwig6">{{item.activityName}}</view>
<view class="font14 fcor666 text2 paddtop5">{{item.comments}}</view>
<!-- {{item.payTime | timeFormat('yyyy-mm-dd hh:mm:ss')}} -->
<view class="font13 width80p fcoreb5 mart5">活动开始时间:
{{item.effectiveStart | timeFormat('yyyy-mm-dd hh:mm:ss')}}
</view>
<view class="font13 width80p fcoreb5 mart5 paddbotm10">活动结束时间:
{{item.effectiveEnd | timeFormat('yyyy-mm-dd hh:mm:ss')}}
</view>
<view class="otstatucs fcorFD7 font16" v-if="item.bankActivityRoster != null">已报名</view>
<view class="otstatucs fcor999 font16" v-else>未报名</view>
</view>
</view>
</view>
</view>
</view>
</view>
</template>
<script>
import {
queryActivityList
} from '../../../Utils/Api.js';
export default {
data() {
return {
status: [{
id: 1,
title: '未报名'
},
{
id: 2,
title: '审核中'
}, {
id: 3,
title: '审核驳回'
}, {
id: 4,
title: '已报名'
}
], //
activityList: [], //
pageNum: 1,
pagesize: 15,
statusid: 1, //
isLoadMore: false, //
merId: '' // id
}
},
onLoad(options) {
this.merId = options.id;
this.queryActivityList();
},
methods: {
//id
switchid(item) {
this.statusid = item.id;
this.pageNum = 1;
},
//
queryActivityList() {
uni.showLoading({
title: '加载中'
})
let datas = {
"merId": this.merId
}
queryActivityList(datas).then(res => {
uni.hideLoading();
if (res.return_code == '000000') {
this.activityList = res.return_data;
} else {
uni.showToast({
title: res.return_msg,
duration: 2000,
icon: 'none'
})
}
})
},
//
jumpactivitydetails(item) {
uni.navigateTo({
url: '/pages/index/equity-activities-details/equity-activities-details?id=' + item +
'&merid=' + this.merId
})
}
}
}
</script>
<style lang="scss">
.borbtom {
border-bottom: 3px solid #089bf5;
}
page {
background-color: #f6f6f6;
}
.notes {
width: calc(100% - 40rpx);
display: flex;
align-items: center;
padding: 18px 18px 9px 18px;
}
.otstatucs {
width: 60px;
}
</style>

@ -0,0 +1,90 @@
<template>
<view>
<view class=" mart10 marb20 alijus">
<view class="font16 fcor333 paddtop5 paddbotm5 margle20 marRight40" v-for="(item,index) in reviewStatus"
@click="switchid(item)" :class="[rviewtyid == item.id ? 'fcor089 borbtom fontwig6' : '']" :key="index">
{{item.title}}
</view>
</view>
<view v-if="rviewList == ''" class="mart60 fotct font14 fcor666">
<image mode="widthFix" style="width: 70vw;" src="../../../static/img/noorder.png"></image>
</view>
<view class="mart20 width100">
<view class="width94 backcorfff border-r mart15" v-for="(item,index) in rviewList" :key="index"
@click="jumpRviewSettdetails">
<view class="notes" style="padding-bottom: 0px;">
<view class="width80p">
<view class="font15 fcor333">活动名称名称名称</view>
<!-- {{item.createTime | timeFormat('yyyy-mm-dd hh:mm:ss')}} -->
<view class="font14 fcor999 paddtop5">
提交时间: 2023-12-23 12:12:12
</view>
</view>
</view>
<view class="notes">
<view class="width30 fcor999 font14">提交人</view>
<view class="width30 fcor999 font14">发反反复复</view>
</view>
</view>
</view>
</view>
</template>
<script>
export default {
data() {
return {
reviewStatus: [{
id: 1,
title: '待审核'
},
{
id: 2,
title: '审核通过'
},
{
id: 3,
title: '审核驳回'
},
], //
rviewtyid: 1, //
rviewList: [1, 2, 3, 4, 5], //
pageNum: 1,
pagesize: 15,
isLoadMore: false, //
}
},
methods: {
//id
switchid(item) {
this.rviewtyid = item.id;
this.pageNum = 1;
this.rviewList = [];
},
//
jumpRviewSettdetails() {
uni.navigateTo({
url: '/pages/index/equity-activities-details/equity-activities-details'
})
}
}
}
</script>
<style lang="scss">
.borbtom {
border-bottom: 3px solid #089bf5;
}
page {
background-color: #f6f6f6;
}
.notes {
width: calc(100% - 40upx);
display: flex;
align-items: center;
padding: 20upx 0 20upx 20upx;
}
</style>

@ -16,11 +16,12 @@
<view class="notes">
<view class="fcor666 width25">商户ID</view>
<view class="font14 fcor333 text2 width75 fotrt">{{merDesInfo.merNo}}</view>
</view>
<view class="notes">
<view class="fcor666 width25">商户名称</view>
<view class="font14 fcor333 text2 width75 fotrt">{{merDesInfo.merName}}</view>
</view>
<view class="notes">
<view class="fcor666 width25">手机号</view>
<view class="font14 fcor333 text2 width75 fotrt">{{merDesInfo.regPhone}}</view>
</view>
<view class="notes">
<view class="fcor666 width25">商户状态</view>
<view class="font14 fcor333 text2 width75 fotrt" v-if="merDesInfo.account.status == 1">正常</view>
@ -29,11 +30,15 @@
<view class="notes">
<view class="fcor666 width25">联系人</view>
<view class="font14 fcor333 text2 width75 fotrt">{{merDesInfo.account.userName}}</view>
</view>
<view class="notes">
<view class="fcor666 width25">手机号</view>
<view class="font14 fcor333 text2 width75 fotrt">{{merDesInfo.regPhone}}</view>
</view>
<view class="notes">
<!-- <view class="notes">
<view class="fcor666 width25">身份证号</view>
<view class="font14 fcor333 text2 width75 fotrt">-</view>
</view>
</view> -->
<view class="notes">
<view class="fcor666 width25">银行卡号</view>
<view class="font14 fcor333 text2 width75 fotrt">{{merDesInfo.merSettleAcct.bankCardNo}}</view>

@ -350,8 +350,8 @@
<image src="../../../static/img/jtg.png" mode="widthFix" class="iconw"></image>
</view>
<!-- 非法人结算 -->
<!-- <view class="titlename fcor666" v-if="lementId == 3">非法人结算授权书</view> -->
<!-- <view class="width94 displ" v-if="lementId == 3">
<view class="titlename fcor666" v-if="lementId == 3">非法人结算授权书</view>
<view class="width94 displ" v-if="lementId == 3">
<image :src="uncorporsettelimg" v-if="uncorporsettelimg" @click="upload(10)" mode="widthFix"
class="width45">
</image>
@ -363,7 +363,7 @@
<view class="notes font13" style="color: #eb5823;border-bottom: 1px solid #f6f6f6;" v-if="lementId == 3">
<image mode="widthFix" class="iconw" src="../../../static/img/gth.png"></image>
<text class="width90p">请预览并保存授权书到本地打印填写完整并签字后拍照上传图片需清晰完整以免审核失败</text>
</view> -->
</view>
<view class="notes font16" style="border-bottom: 0px;" v-if="lementId == 3">
<view class="width70 aliitem fcor666">
非法人身份证照片

@ -14,8 +14,8 @@
@click="jumpmerdes(item.id)">
<view class="notes">
<image src="../../../static/img/merchantstu.png" mode="widthFix" class="iconw40"></image>
<view class="width60 margle">
<view class="font14 fcor333">{{item.regPhone}}</view>
<view class="width70 margle">
<view class="font14 fcor333">{{item.merName}}</view>
<view class="font12 fcor999">
{{item.createTime | timeFormat('yyyy-mm-dd')}}
{{item.createTime | timeFormat('hh:mm')}}
@ -35,6 +35,7 @@
<view class="height45 width100 paddbotm10" v-if="item.merStatus == 1">
<button class="btns mart10 margle10" @click.stop="openAccounts(item.id)">开通分账</button>
<button class="btns mart10 margle10" @click.stop="bindMerchants(item.id)">分账接收方</button>
<button class="btns mart10 margle10" @click.stop="jumpEquityActivity(item.id)">权益活动</button>
</view>
</view>
</view>
@ -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
})
}
}
}

@ -0,0 +1,70 @@
<template>
<view>
<view class="mart15 width100 backcorfff">
<view class="notes">
<view class="fcor666 width25">账号</view>
<view class="font14 fcor333 text2 width75 fotrt">账号名称</view>
</view>
<view class="notes">
<view class="fcor666 width25">账号</view>
<view class="font14 fcor333 text2 width75 fotrt">账号名称</view>
</view>
<view class="notes">
<view class="fcor666 width25">账号</view>
<view class="font14 fcor333 text2 width75 fotrt">账号名称</view>
</view>
<view class="notes">
<view class="fcor666 width25">账号</view>
<view class="font14 fcor333 text2 width75 fotrt">账号名称</view>
</view>
<view class="notes">
<view class="fcor666 width25">账号</view>
<view class="font14 fcor333 text2 width75 fotrt">账号名称</view>
</view>
<view class="notes">
<view class="fcor666 width25">账号</view>
<view class="font14 fcor333 text2 width75 fotrt">账号名称</view>
</view>
<view class="notes">
<view class="fcor666 width25">账号</view>
<view class="font14 fcor333 text2 width75 fotrt">账号名称</view>
</view>
<view class="notes">
<view class="fcor666 width25">账号</view>
<view class="font14 fcor333 text2 width75 fotrt">账号名称</view>
</view>
<view class="notes">
<view class="fcor666 width25">账号</view>
<view class="font14 fcor333 text2 width75 fotrt">账号名称</view>
</view>
</view>
</view>
</template>
<script>
export default {
data() {
return {
}
},
methods: {
}
}
</script>
<style lang="scss">
page {
background-color: #f6f6f6;
}
.notes {
width: calc(100% - 40rpx);
display: flex;
align-items: center;
padding: 30rpx 0 30rpx 20rpx;
border-bottom: 1px solid #f6f6f6;
}
</style>

@ -21,12 +21,6 @@
提交时间: {{item.createTime | timeFormat('yyyy-mm-dd hh:mm:ss')}}
</view>
</view>
<!-- v-if="item.merStatus == 1" -->
<!-- <view class="statucs font14">正常</view>
<view class="otstatucs font14" v-if="item.merStatus == 2">编辑中</view>
<view class="otstatucs font14" v-if="item.merStatus == 3">审核中</view>
<view class="otstatucs font14" v-if="item.merStatus == 4">审核失败</view>
<view class="otstatucs font14" v-if="item.merStatus == 5">违规</view> -->
</view>
<view class="notes">
<view class="width30 fcor999 font14">提交人</view>
@ -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;
}
</style>

@ -9,10 +9,10 @@
<view class="width94 fcorfff font18 alijus" v-if="userInfo.secUser.objectType == 4">
{{userInfo.mer.merAbbreviate}}
<image mode="widthFix" class="margle iconw" src="../../../static/img/jt.png"></image>
</view>
<view class="width94 fcorfff font18 alijus" v-if="userInfo.secUser.objectType == 2">
{{userInfo.agent.name}}
<image mode="widthFix" class="margle iconw" src="../../../static/img/jt.png"></image>
</view>
<view class="width94 fcorfff font18 alijus" v-if="userInfo.secUser.objectType == 2">
{{userInfo.agent.name}}
<image mode="widthFix" class="margle iconw" src="../../../static/img/jt.png"></image>
</view>
<view class="width94 fcorfff font18 alijus" v-if="userInfo.secUser.objectType == 5">{{userInfo.store.name}}
<image mode="widthFix" class="margle iconw" src="../../../static/img/jt.png"></image>
@ -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;
}
}
</style>
</style>

@ -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: {

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

@ -1,2 +1,2 @@
<!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>惠支付</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/cweb/static/index.63b34199.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/cweb/static/js/chunk-vendors.aaeb720f.js></script><script src=/cweb/static/js/index.834f3655.js></script></body></html>
document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/cweb/static/index.63b34199.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/cweb/static/js/chunk-vendors.aaeb720f.js></script><script src=/cweb/static/js/index.1858b002.js></script></body></html>
Loading…
Cancel
Save