Compare commits

...

11 Commits

  1. 8
      App.vue
  2. 49
      Utils/Api.js
  3. 45
      pages.json
  4. 172
      pages/index/collectNotes/collectNotes.vue
  5. 68
      pages/index/merchant-details/merchant-details.vue
  6. 4
      pages/index/merchant-incoming-parts/merchant-incoming-parts.vue
  7. 100
      pages/index/mineService/mineService.vue
  8. 205
      pages/index/modifyRate/modifyRate.vue
  9. 160
      pages/index/normal-Merchant/normal-Merchant.vue
  10. 4
      pages/index/open-Divide_accounts/open-Divide_accounts.vue
  11. 98
      pages/index/order-list-details/order-list-details.vue
  12. 175
      pages/index/rateReview/rateReview.vue
  13. 16
      pages/index/review-Settlement/review-Settlement.vue
  14. 13
      pages/index/settlement_details/settlement_details.vue
  15. 38
      pages/index/updateSettlement/updateSettlement.vue
  16. 15
      pages/tabBar/home/home.vue
  17. 44
      pages/welcome/welcome.vue

@ -4,11 +4,11 @@
// url: 'http://192.168.3.4:9301/crest', // url: 'http://192.168.3.4:9301/crest',
// imgUrl: 'https://192.168.3.4:9301/filesystem/', // imgUrl: 'https://192.168.3.4:9301/filesystem/',
// //
url: 'https://pay.dctpay.com/crest', // url: 'https://pay.dctpay.com/crest',
imgUrl: 'https://gratia-pay.obs.cn-southwest-2.myhuaweicloud.com', // imgUrl: 'https://gratia-pay.obs.cn-southwest-2.myhuaweicloud.com',
// //
// url: 'https://gratia-pay.dctpay.com/crest', url: 'https://gratia-pay.dctpay.com/crest',
// imgUrl: 'https://gratia-pay-test.obs.cn-east-3.myhuaweicloud.com', imgUrl: 'https://gratia-pay-test.obs.cn-east-3.myhuaweicloud.com',
userInfo: "", userInfo: "",
openId: '', openId: '',
h5code: '', h5code: '',

@ -275,3 +275,52 @@ export const reconsider = params => {
export const getSettleAcctByMer = params => { export const getSettleAcctByMer = params => {
return POST('GET', `${base}/merSettleAcct/getSettleAcctByMer`, params).then(res => res.data); return POST('GET', `${base}/merSettleAcct/getSettleAcctByMer`, params).then(res => res.data);
} }
// 查询商户渠道平台列表
export const getMerPlatformList = params => {
return POST('GET', `${base}/merPlatform/getMerPlatformList`, params).then(res => res.data);
}
// 查询商户
export const getMerList = params => {
return POST('GET', `${base}/mer/getMerList`, params).then(res => res.data);
}
// 查询业务员
export const querySalesmanList = params => {
return POST('GET', `${base}/salesman/querySalesmanList`, params).then(res => res.data);
}
//查询订单详情
export const getOrderByOutTradeOrder = params => {
return POST('GET', `${base}/tradeOrder/getOrderByOutTradeOrder`, params).then(res => res.data);
}
// #根据商户查询费率
export const getRateByMer = params => {
return POST('GET', `${base}/merRate/getRateByMer`, params).then(res => res.data);
}
// #编辑费率申请
export const editRateApply = params => {
return POST('POST', `${base}/merRate/editRateApply`, params).then(res => res.data);
}
// #查询最新申请信息
export const getNewRateApplyDetail = params => {
return POST('GET', `${base}/merRate/getNewRateApplyDetail`, params).then(res => res.data);
}
//#查询费率申请详情
export const getRateApplyDetail = params => {
return POST('GET', `${base}/merRate/getRateApplyDetail`, params).then(res => res.data);
}
// # 设备绑定门店
export const devicebindStore = params => {
return POST('POST', `${base}/device/bindStore`, params).then(res => res.data);
}
//# 设备解绑门店
export const unbindStore = params => {
return POST('POST', `${base}/device/unbindStore`, params).then(res => res.data);
}

@ -481,6 +481,51 @@
} }
} }
,{
"path" : "pages/index/normal-Merchant/normal-Merchant",
"style" :
{
"navigationBarTitleText": "商户",
"navigationBarTextStyle": "white",
"enablePullDownRefresh": false,
"onReachBottomDistance": 50,
"app-plus": {
"titleNView": false, //
"softinputNavBar": "none"
}
}
}
,{
"path" : "pages/index/modifyRate/modifyRate",
"style" :
{
"navigationBarTitleText": "修改费率",
"navigationBarTextStyle": "white",
"enablePullDownRefresh": false,
"onReachBottomDistance": 50,
"app-plus": {
"titleNView": false, //
"softinputNavBar": "none"
}
}
}
,{
"path" : "pages/index/rateReview/rateReview",
"style" :
{
"navigationBarTitleText": "审核费率",
"navigationBarTextStyle": "white",
"enablePullDownRefresh": false,
"onReachBottomDistance": 50,
"app-plus": {
"titleNView": false, //
"softinputNavBar": "none"
}
}
}
], ],
"subpackages": [{ "subpackages": [{
"root": "subPages", "root": "subPages",

@ -15,6 +15,35 @@
<view class="datetim fcorfff">{{enddate}}<i class="down"></i></view> <view class="datetim fcorfff">{{enddate}}<i class="down"></i></view>
</picker> </picker>
</view> </view>
<view class="mart15 width90 alijusstart" v-if="userInfo.secUser.objectType == 2">
<view class="fcorfff font14 margleri10 width25 fotlt">业务员 :</view>
<picker mode="selector" class="width75" :range="salesmanList" range-key="name"
@change="bindDateChange4">
<view class="fcorfff fotrt font14" v-if="salesmanname">{{salesmanname}}<i class="down"></i></view>
<view class="fcorfff fotrt font14" v-else>请选择<i class="down"></i></view>
</picker>
</view>
<view class="mart15 width90 alijusstart"
v-if="userInfo.secUser.objectType == 2 || userInfo.secUser.objectType == 3">
<view class="fcorfff font14 margleri10 width25 fotlt">商户 :</view>
<picker mode="selector" class="width75" :range="merList" range-key="merName" @change="bindDateChange2">
<view class="fcorfff fotrt font14" v-if="merName">{{merName}}<i class="down"></i></view>
<view class="fcorfff fotrt font14" v-else>请选择<i class="down"></i></view>
</picker>
</view>
<view class="mart15 width90 alijusstart"
v-if="userInfo.secUser.objectType == 2 || userInfo.secUser.objectType == 3 || userInfo.secUser.objectType == 4">
<view class="fcorfff font14 margleri10 width25 fotlt">门店 :</view>
<picker mode="selector" class="width75" :range="storeListByMer" range-key="name"
@change="bindDateChange3">
<view class="fcorfff fotrt font14" v-if="storename">{{storename}}<i class="down"></i></view>
<view class="fcorfff fotrt font14" v-else>请选择<i class="down"></i></view>
</picker>
</view>
<view class="input-box"> <view class="input-box">
<view class="icon search"></view> <view class="icon search"></view>
<input placeholder="请输入订单编号" v-model="orderNo" placeholder-style="color:#c0c0c0;" @input="toSearch()" /> <input placeholder="请输入订单编号" v-model="orderNo" placeholder-style="color:#c0c0c0;" @input="toSearch()" />
@ -44,24 +73,33 @@
<view v-if="notesList == ''" class="mart60 fotct font14 fcor666"> <view v-if="notesList == ''" class="mart60 fotct font14 fcor666">
<image mode="widthFix" style="width: 70vw;" src="../../../static/img/noorder.png"></image> <image mode="widthFix" style="width: 70vw;" src="../../../static/img/noorder.png"></image>
</view> </view>
<view class="width100 backcorfff" v-for="(item,index) in notesList" :key="index" @click="jumpOderlist()"> <view class="width100 backcorfff" v-for="(item,index) in notesList" :key="index"
<view class="width94 height70 alijusstart bor-botm1"> @click="jumpOderdetails(item.outTradeNo)">
<view class="width94 paddtop10 paddbotm10 alijusstart bor-botm1">
<view class="width15"> <view class="width15">
<image src="../../../static/img/wechat.png" mode="widthFix" class="iconw40" <image src="../../../static/img/wechat.png" mode="widthFix" class="iconw40"
v-if="item.payMode == 'WECHAT'"></image> v-if="item.payMode == 'WECHAT'"></image>
<image src="../../../static/img/alipay.png" mode="widthFix" class="iconw40" <image src="../../../static/img/alipay.png" mode="widthFix" class="iconw40"
v-if="item.payMode == 'ALIPAY'"></image> v-if="item.payMode == 'ALIPAY'"></image>
</view> </view>
<view class="width85"> <view class="width85">
<view class="alijusstart font15 fcor333"> <view class="font15 fcor666 width100">{{item.outTradeNo}}</view>
<view class="width50 font15 fcor333">扫一扫</view> <view class="alijusstart font14 fcor999">
<view class="width50 fotrt">¥ {{item.tradeAmount}}</view> <view class="width50 text1">扫一扫</view>
<view class="width50 fotrt">{{statusList[item.status]}}</view>
</view>
<view class="alijusstart font14 paddtop5 fcor999">
<view class="width15 text1" v-if="userInfo.secUser.objectType == 2">{{item.salesmanName}}</view>
<view class="width85 text1" v-if="userInfo.secUser.objectType != 2">{{item.storeName}}</view>
<view class="width85 fotrt" v-if="userInfo.secUser.objectType == 2">{{item.storeName}}</view>
</view> </view>
<view class="alijusstart font15 paddtop5 fcor999"> <view class="alijusstart font14 paddtop5 fcor999">
<view class="width70">{{item.createTime | timeFormat('yyyy-mm-dd hh:mm:ss')}} <view class="width70">{{item.createTime | timeFormat('yyyy-mm-dd hh:mm:ss')}}
</view> </view>
<view class="width30 fotrt">{{statusList[item.status]}}</view> <view class="width30 fotrt">¥ {{item.tradeAmount}}</view>
</view> </view>
</view> </view>
</view> </view>
@ -71,8 +109,12 @@
<script> <script>
import { import {
getTradeOrderList getTradeOrderList,
getMerList,
getStoreListByMer,
querySalesmanList
} from '../../../Utils/Api.js'; } from '../../../Utils/Api.js';
let app = getApp();
export default { export default {
data() { data() {
const currentDate = this.getDate({ const currentDate = this.getDate({
@ -96,6 +138,16 @@
orderNo: '', // orderNo: '', //
totalPrice: 0, // totalPrice: 0, //
totalNum: 0, // totalNum: 0, //
userInfo: app.globalData.userInfo, //
merList: [], //
merno: '', //
merName: '', //
storeListByMer: [], //
storeno: '', //
storename: '', //,
salesmanList: [], //
salesmanid: '', //id
salesmanname: '', //
} }
}, },
computed: { computed: {
@ -107,6 +159,18 @@
} }
}, },
onLoad() { onLoad() {
//
if (this.userInfo.secUser.objectType == 2) {
this.querySalesmanList();
}
//
if (this.userInfo.secUser.objectType == 3) {
this.getMerList(this.userInfo.salesman.id);
}
//
if (this.userInfo.secUser.objectType == 4) {
this.getStoreListByMer(this.userInfo.mer.id);
}
this.getTradeOrderList(); this.getTradeOrderList();
}, },
onReachBottom() { onReachBottom() {
@ -114,6 +178,54 @@
}, },
methods: { methods: {
//
querySalesmanList() {
let datas = {
pageNum: 1,
pageSize: 9999,
agentId: this.userInfo.agent.id
}
querySalesmanList(datas).then(res => {
if (res.return_code == '000000' && res.return_data.list != '') {
this.salesmanList = res.return_data.list;
// this.salesmanid = res.return_data.list[0].id;
// this.getStoreListByMer(res.return_data.list[0].id);
// this.salesmanname = res.return_data.list[0].name;
}
})
},
//
getMerList(item) {
let datas = {
pageNum: 1,
pageSize: 9999,
merStatus:1,
salesmanId: item
}
getMerList(datas).then(res => {
if (res.return_code == '000000' && res.return_data.list != '') {
this.merList = res.return_data.list;
// this.merno = res.return_data.list[0].id;
// this.getStoreListByMer(res.return_data.list[0].id);
// this.merName = res.return_data.list[0].merName;
}
})
},
//
getStoreListByMer(item) {
let datas = {
pageNum: 1,
pageSize: 9999,
merId: item
}
getStoreListByMer(datas).then(res => {
if (res.return_code == '000000' && res.return_data.list != '') {
this.storeListByMer = res.return_data.list;
// this.storeno = res.return_data.list[0].id;
// this.storename = res.return_data.list[0].name;
}
})
},
// //
getDate(type) { getDate(type) {
const date = new Date(); const date = new Date();
@ -145,7 +257,37 @@
this.isNoMoreData = false; this.isNoMoreData = false;
this.getTradeOrderList(); this.getTradeOrderList();
}, },
toSearch(){ //
bindDateChange4(e) {
this.salesmanid = this.salesmanList[e.target.value].id;
this.salesmanname = this.salesmanList[e.target.value].name;
this.getMerList(this.salesmanList[e.target.value].id);
this.pageNum = 1;
this.notesList = [];
this.isNoMoreData = false;
this.getTradeOrderList();
},
//
bindDateChange2(e) {
this.merno = this.merList[e.target.value].id;
this.merName = this.merList[e.target.value].merName;
this.getStoreListByMer(this.merList[e.target.value].id);
this.pageNum = 1;
this.notesList = [];
this.isNoMoreData = false;
this.getTradeOrderList();
},
//
bindDateChange3(e) {
this.storeno = this.storeListByMer[e.target.value].id;
this.storename = this.storeListByMer[e.target.value].name;
this.pageNum = 1;
this.notesList = [];
this.isNoMoreData = false;
this.getTradeOrderList();
},
toSearch() {
this.pageNum = 1; this.pageNum = 1;
this.notesList = []; this.notesList = [];
this.isNoMoreData = false; this.isNoMoreData = false;
@ -160,7 +302,6 @@
uni.hideLoading() uni.hideLoading()
return false; return false;
} }
console.log('1111111111');
let a = new Date(this.startdate).getTime(); let a = new Date(this.startdate).getTime();
let b = new Date(this.enddate).getTime(); let b = new Date(this.enddate).getTime();
let startTime = a - 28800000; let startTime = a - 28800000;
@ -172,6 +313,9 @@
payTimeE: endTime, payTimeE: endTime,
outTradeNo: this.orderNo, outTradeNo: this.orderNo,
pageNum: pagenum, pageNum: pagenum,
salesmanId:this.salesmanid,
merId: this.merno,
storeId: this.storeno,
pageSize: this.pageSize pageSize: this.pageSize
} }
getTradeOrderList(datas).then(res => { getTradeOrderList(datas).then(res => {
@ -196,10 +340,10 @@
}) })
}, },
// //
jumpOderlist() { jumpOderdetails(item) {
// uni.navigateTo({ uni.navigateTo({
// url: '/pages/index/order-list-details/order-list-details' url: '/pages/index/order-list-details/order-list-details?orderid=' + item
// }) })
} }
} }
} }

@ -3,7 +3,7 @@
<!-- tabs栏 --> <!-- tabs栏 -->
<view class="backcorfff width100"> <view class="backcorfff width100">
<QSTabs ref="tabs" :tabs="tabs" animationMode="line2" :current="current" @change="change" <QSTabs ref="tabs" :tabs="tabs" animationMode="line2" :current="current" @change="change"
activeColor="#089bf5" lineColor="#089bf5" minWidth="374"> activeColor="#089bf5" lineColor="#089bf5" minWidth="220">
</QSTabs> </QSTabs>
</view> </view>
@ -50,7 +50,7 @@
</view> </view>
<!-- 门店信息 --> <!-- 门店信息 -->
<view class="mart15 width100" v-else> <view class="mart15 width100" v-if="current == 1">
<view class="width94 backcorfff border-r mart15" v-for="(item,index) in storeList" :key="index" <view class="width94 backcorfff border-r mart15" v-for="(item,index) in storeList" :key="index"
@click="jumpstoredes(item.id)"> @click="jumpstoredes(item.id)">
<view class="notes" style="border-bottom: 0px;"> <view class="notes" style="border-bottom: 0px;">
@ -92,13 +92,29 @@
<view class="height45 width100"> <view class="height45 width100">
<button class="btns mart10 margle10" @click.stop="jumpBindScan(item.id,1)">绑定二维码</button> <button class="btns mart10 margle10" @click.stop="jumpBindScan(item.id,1)">绑定二维码</button>
<button class="btns mart10 margle10" @click.stop="jumpBindScan(item.id,2)">二维码列表</button> <button class="btns mart10 margle10" @click.stop="jumpBindScan(item.id,2)">二维码列表</button>
<!-- <button class="btns mart10 marRight10" @click.stop="jumpService(item.id,1)">绑定设备</button> --> <button class="btns mart10 margle10" @click.stop="jumpService(item.id)">绑定设备</button>
<!-- <button class="btns mart10 marRight10" @click.stop="jumpService(item.id,2)">设备列表</button> --> <!-- <button class="btns mart10 marRight10" @click.stop="jumpService(item.id,2)">设备列表</button> -->
</view> </view>
<view class="lin10"></view> <view class="lin10"></view>
</view> </view>
</view> </view>
<view class="subbtn" @tap="updateFigMerBasis()" v-if="current == 0">修改结算</view> <!-- 渠道列表 -->
<view class="mart15 width100" v-if="current == 2">
<!-- v-for="(item,indexplt) in merPlatformList" :key="indexplt" -->
<view class="width94 backcorfff border-r mart15" v-for="(item,indexplt) in merPlatformList" :key="indexplt">
<view class="notes" style="border-bottom: 0px;">
<view class="width100 margle">
<view class="font16 fcor333" v-if="item.platformType == 1">渠道名称: 拉卡拉</view>
<view class="font14 fcor999 mart5">商户号: {{item.cupNo}}</view>
<view class="font14 fcor999 mart5">终端号: {{item.merPlatformTerm.termNo}}</view>
</view>
</view>
</view>
</view>
<view class="width94 alijus" v-if="current == 0">
<view class="subbtn" @tap="updateFigMerBasis()">修改结算</view>
<view class="subbtn" @tap="updatemodifyRate()">修改费率</view>
</view>
</view> </view>
</template> </template>
@ -106,7 +122,8 @@
import QSTabs from '../../../components/QS-tabs/QS-tabs.vue'; import QSTabs from '../../../components/QS-tabs/QS-tabs.vue';
import { import {
getMerDetail, getMerDetail,
getStoreListByMer getStoreListByMer,
getMerPlatformList
} from '../../../Utils/Api.js'; } from '../../../Utils/Api.js';
export default { export default {
components: { components: {
@ -114,11 +131,12 @@
}, },
data() { data() {
return { return {
tabs: ["商户信息", "门店信息"], tabs: ["商户信息", "门店信息", "渠道列表"],
current: 0, // tabs current: 0, // tabs
storeList: [], // storeList: [], //
merid: '', // id merid: '', // id
merDesInfo: '' // merDesInfo: '', //
merPlatformList: '' //
} }
}, },
@ -134,6 +152,9 @@
if (index == 1) { if (index == 1) {
this.getStoreListByMer(); this.getStoreListByMer();
} }
if (index == 2) {
this.getMerPlatformList();
}
}, },
// //
getMerDetail(item) { getMerDetail(item) {
@ -179,6 +200,27 @@
} }
}) })
}, },
//
getMerPlatformList() {
uni.showLoading({
title: '加载中...'
})
let datas = {
merId: this.merid
}
getMerPlatformList(datas).then(res => {
uni.hideLoading();
if (res.return_code == '000000' && res.return_data) {
this.merPlatformList = res.return_data;
} else {
uni.showToast({
title: res.return_msg,
duration: 2000,
icon: 'none'
})
}
})
},
// //
jumpstoredes(item) { jumpstoredes(item) {
uni.navigateTo({ uni.navigateTo({
@ -186,9 +228,9 @@
}) })
}, },
// //
jumpService(item, items) { jumpService(item) {
uni.navigateTo({ uni.navigateTo({
url: '../serviceBuild/serviceBuild?storeid=' + item + '&type=' + items url: '/pages/index/mineService/mineService?id=6' + '&storeid=' + item
}) })
}, },
// //
@ -197,6 +239,12 @@
url: '/pages/index/updateSettlement/updateSettlement?id=' + this.merid url: '/pages/index/updateSettlement/updateSettlement?id=' + this.merid
}) })
}, },
//
updatemodifyRate() {
uni.navigateTo({
url: '/pages/index/modifyRate/modifyRate?id=' + this.merid
})
},
// //
jumpBindScan(item, items) { jumpBindScan(item, items) {
uni.navigateTo({ uni.navigateTo({
@ -256,7 +304,7 @@
.subbtn { .subbtn {
color: #FFFFFF; color: #FFFFFF;
background-color: #0083f5; background-color: #0083f5;
width: 90%; width: 40%;
margin-left: 5%; margin-left: 5%;
margin-top: 80rpx; margin-top: 80rpx;
margin-bottom: 50rpx; margin-bottom: 50rpx;

@ -1601,7 +1601,7 @@
let rateDatas = []; let rateDatas = [];
for (var i = 0; i < res.return_data.merSettleAcct.merRateList for (var i = 0; i < res.return_data.merSettleAcct.merRateList
.length; i++) { .length; i++) {
if (res.return_data.merSettleAcct.merRateList[i].ratePct) { // if (res.return_data.merSettleAcct.merRateList[i].ratePct) {
let datas = { let datas = {
codeName: res.return_data.merSettleAcct.merRateList[i] codeName: res.return_data.merSettleAcct.merRateList[i]
.rateTypeName, .rateTypeName,
@ -1611,7 +1611,7 @@
.ratePct .ratePct
} }
rateDatas.push(datas); rateDatas.push(datas);
} // }
} }
this.rateCodeList = rateDatas; this.rateCodeList = rateDatas;
} else { } else {

@ -9,7 +9,7 @@
<image mode="widthFix" style="width: 70vw;" src="../../../static/img/noorder.png"></image> <image mode="widthFix" style="width: 70vw;" src="../../../static/img/noorder.png"></image>
</view> </view>
<view class="width94 serlist border-r mart15" v-for="(item,index) in serviceList" :key="index" <view class="width94 serlist border-r mart15" v-for="(item,index) in serviceList" :key="index"
@click="assignOrder(item.deviceNo)"> @click="assignOrder(item.deviceNo,item.bindStatus)">
<view class="notes"> <view class="notes">
<view class="width75 margle"> <view class="width75 margle">
<view class="font18 fcor333 fontwig6">编号: {{item.deviceNo}}</view> <view class="font18 fcor333 fontwig6">编号: {{item.deviceNo}}</view>
@ -24,6 +24,13 @@
未绑定 未绑定
</view> </view>
</view> </view>
<view class="conts" v-if="item.bindStatus">
<view class="margle10 font13 fcor999">商户名称: {{item.merName}}</view>
</view>
<view class="conts" v-if="item.bindStatus">
<view class="margle10 font13 fcor999">名店名称: {{item.storeName}}</view>
</view>
<view class="conts"> <view class="conts">
<view class="margle10 font13 fcor999">设备类型: {{item.deviceType | toFilter()}}</view> <view class="margle10 font13 fcor999">设备类型: {{item.deviceType | toFilter()}}</view>
</view> </view>
@ -36,7 +43,9 @@
import { import {
getDeviceList, getDeviceList,
assignOrder, assignOrder,
replace replace,
devicebindStore,
unbindStore
} from '../../../Utils/Api.js'; } from '../../../Utils/Api.js';
let app = getApp(); let app = getApp();
export default { export default {
@ -48,7 +57,7 @@
buildStatus: false, // buildStatus: false, //
deviceNo: '', // deviceNo: '', //
assderid: '', //id assderid: '', //id
storeid:'', //id storeid: '', //id
pageNum: 1, pageNum: 1,
pagesize: 10, pagesize: 10,
isLoadMore: false, // isLoadMore: false, //
@ -82,7 +91,7 @@
this.buildStatus = true; this.buildStatus = true;
this.getDeviceList(); this.getDeviceList();
} }
if (this.sourceId == 2 || this.sourceId == 4) { if (this.sourceId == 2 || this.sourceId == 4 || this.sourceId == 6) {
this.buildStatus = false; this.buildStatus = false;
this.getDeviceList(); this.getDeviceList();
} }
@ -94,12 +103,18 @@
methods: { methods: {
// //
getDeviceList() { getDeviceList() {
let storeno;
if (this.sourceId == 6) {
storeno = '';
} else {
storeno = this.storeid;
}
let datas = { let datas = {
pageNum: this.pageNum, pageNum: this.pageNum,
pageSize: this.pagesize, pageSize: this.pagesize,
buildStatus: this.buildStatus, buildStatus: this.buildStatus,
deviceNo: this.deviceNo, deviceNo: this.deviceNo,
storeId: this.storeid storeId: storeno
} }
getDeviceList(datas).then(res => { getDeviceList(datas).then(res => {
if (res.return_code == '000000' && res.return_data.list != '') { if (res.return_code == '000000' && res.return_data.list != '') {
@ -122,7 +137,7 @@
this.getDeviceList(); this.getDeviceList();
}, },
// //
assignOrder(item) { assignOrder(item, item1) {
if (this.sourceId == 2) { if (this.sourceId == 2) {
uni.showModal({ uni.showModal({
title: '温馨提示', title: '温馨提示',
@ -160,6 +175,75 @@
}); });
} }
if (this.sourceId == 6) {
uni.showModal({
title: '温馨提示',
content: '是否分配当前设备',
success: (res) => {
if (res.confirm) {
uni.showLoading({
title: '加载中'
})
let datas = {
"storeId": this.storeid,
"deviceNo": item
}
devicebindStore(datas).then(res => {
uni.hideLoading();
if (res.return_code == '000000') {
uni.showToast({
title: '分配成功',
duration: 2000,
icon: 'none'
})
uni.navigateBack({})
} else {
uni.showToast({
title: res.return_msg,
duration: 2000,
icon: 'none'
})
}
})
} else if (res.cancel) {}
}
});
}
if (this.sourceId == 3 && item1) {
uni.showModal({
title: '温馨提示',
content: '是否解除当前设备',
success: (res) => {
if (res.confirm) {
uni.showLoading({
title: '加载中'
})
let datas = {
"deviceNo": item
}
unbindStore(datas).then(res => {
uni.hideLoading();
if (res.return_code == '000000') {
uni.showToast({
title: '解除成功',
duration: 2000,
icon: 'none'
})
uni.navigateBack({})
} else {
uni.showToast({
title: res.return_msg,
duration: 2000,
icon: 'none'
})
}
})
} else if (res.cancel) {}
}
});
}
if (this.sourceId == 4) { if (this.sourceId == 4) {
uni.showModal({ uni.showModal({
title: '温馨提示', title: '温馨提示',
@ -264,8 +348,8 @@
width: calc(100% - 60rpx); width: calc(100% - 60rpx);
display: flex; display: flex;
align-items: center; align-items: center;
margin-bottom: 10px; margin-bottom: 4px;
padding: 0 0rpx 30rpx 14rpx; padding: 0 0rpx 2rpx 6rpx;
} }
.xfimg { .xfimg {

@ -0,0 +1,205 @@
<template>
<view>
<view class="width100 backcorfff">
<!-- 审核状态回馈 -->
<view class="width100 height100p" style="background-color: #eb6a53;"
v-if="modifyDetails && (modifyDetails.status == 2 || modifyDetails.status == 4 || modifyDetails.status == 6)">
<view class="font18 fcorfff paading10 aliitem"
v-if="modifyDetails.status == 4 || modifyDetails.status == 6">
<image src='../../../static/img/error.png' mode="widthFix" class="iconw25 marglerig"></image>审核驳回
</view>
<view class="font14 fcorfff paading10" v-if="modifyDetails.status == 4 || modifyDetails.status == 6">
{{modifyDetails.rejectReason}}
</view>
<view class="font18 fcorfff paddtop35 fotct"
v-if="modifyDetails.status == 2 || modifyDetails.status == 5">
审核中
</view>
</view>
<view class="titlename font18 fontwig6 fcor333" v-if="rateCodeList">修改商户费率</view>
<view class="username" v-for="(item,index) in rateCodeList" :key="index">
<view class="namecont">{{item.rateTypeName}}</view>
<input placeholder="请输入" type="digit" v-model="item.ratePct" style="padding-left: 2%;width: 28%;"
placeholder-style="color: #bfbfbf;font-size:14px;padding-top:2px;" />
<view style="width: 40%;">(单位: 百分之一)</view>
</view>
</view>
<view class="btn" @click="updatemodifyRate()" v-if="!modifyDetails || modifyDetails.status == 4 || modifyDetails.status == 6">提交审核</view>
</view>
</template>
<script>
import {
getRateByMer,
editRateApply,
getNewRateApplyDetail
} from '../../../Utils/Api.js';
let app = getApp();
export default {
data() {
return {
merId: '', //id
rateCodeList: [], //
merRateList: [], //
modifystatus: '' ,//
modifyDetails:''//
}
},
onLoad(options) {
this.merId = options.id;
this.getNewRateApplyDetail();
},
methods: {
//
getNewRateApplyDetail() {
let datas = {
merId: this.merId
}
getNewRateApplyDetail(datas).then(res => {
if (res.return_code == '000000' && res.return_data != null) {
this.modifyDetails = res.return_data;
this.modifystatus = res.return_data.status;
if (res.return_data.status == 1 || res.return_data.status == 3 || res.return_data.status ==
4 || res.return_data.status == 6) {
this.getRateByMer();
} else {
this.rateCodeList = res.return_data.merRateApplyDetailList;
}
} else {
this.getRateByMer();
}
})
},
//
getRateByMer() {
let datas = {
merId: this.merId
}
getRateByMer(datas).then(res => {
if (res.return_code == '000000') {
this.rateCodeList = res.return_data;
}
})
},
//
updatemodifyRate() {
uni.showModal({
title: '提交审核',
content: '确认信息是否正确。',
success: (res) => {
if (res.confirm) {
uni.showLoading({
title: '提交审核中...'
})
let rateDatas = [];
for (var i = 0; i < this.rateCodeList.length; i++) {
if (this.rateCodeList[i].ratePct) {
let datas = {
rateTypeCode: this.rateCodeList[i].rateTypeCode,
ratePct: this.rateCodeList[i].ratePct
}
rateDatas.push(datas);
}
}
this.merRateList = rateDatas;
let datas = {
"merId": this.merId,
"rate": this.merRateList
}
editRateApply(datas).then(res => {
uni.hideLoading();
if (res.return_code == '000000') {
uni.showToast({
title: '提交成功',
icon: 'none',
duration: 2000
})
uni.navigateBack();
}
})
}
}
})
}
},
}
</script>
<style lang="scss">
page {
background-color: #f7f5f6;
}
.titlename {
width: calc(100% - 90upx);
height: 100upx;
display: flex;
align-items: center;
background-color: rgba($color: #ffffff, $alpha: 0.1);
padding: 0 45upx;
}
.username {
width: calc(100% - 90upx);
height: 100upx;
display: flex;
align-items: center;
background-color: rgba($color: #ffffff, $alpha: 0.1);
border-bottom: 1px solid #f6f6f6;
padding: 8upx 45upx;
input {
width: 50%;
height: 50upx;
font-size: 16px;
color: #333333;
font-weight: blod;
}
.get-code {
position: absolute;
display: flex;
align-items: center;
justify-content: center;
right: 7px;
z-index: 3;
border: 1px solid #bfbfbf;
width: 25%;
padding: 3px 5px;
border-radius: 22px;
&:after {
content: " ";
width: 1upx;
height: 50upx;
position: absolute;
z-index: 3;
margin-right: 100%;
left: 0;
top: 20upx;
}
}
.namecont {
color: #666666;
width: 28%;
}
}
.btn {
color: #FFFFFF;
background-color: #0083f5;
width: 90%;
margin-left: 5%;
margin-top: 80rpx;
margin-bottom: 50rpx;
height: 90rpx;
display: flex;
justify-content: center;
align-items: center;
border-radius: 10rpx;
font-size: 40rpx;
}
</style>

@ -0,0 +1,160 @@
<template>
<view>
<view class="mart20 width100">
<view v-if="merchantlist == '' " 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 merchantlist" :key="index"
@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.merName}}</view>
<view class="font12 fcor999">
{{item.createTime | timeFormat('yyyy-mm-dd')}}
{{item.createTime | timeFormat('hh:mm')}}
</view>
</view>
<!-- <view class="statucs font14">正常</view> -->
</view>
<view class="notes">
<view class="width30 fcor333 font15">联系人</view>
<view class="width30 fcor999 font15" v-if="item.regName">{{item.regName}}</view>
<view class="width30 fcor999 font15" v-else>-</view>
</view>
<view class="height45 width100 paddbotm10">
<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>
</view>
</template>
<script>
import {
getMerListBySalesman,
getMerLedgerApply
} from '../../../Utils/Api.js';
export default {
data() {
return {
merchantlist: [],
pageNum: 1,
pagesize: 10,
isLoadMore: false, //
}
},
onShow() {
this.merchantlist = [];
this.pageNum = 1;
this.getMerListBySalesman();
},
onReachBottom() { //
if (!this.isLoadMore) { //
this.isLoadMore = true
this.pageNum += 1
this.getMerListBySalesman()
}
},
methods: {
//
getMerListBySalesman() {
uni.showLoading({
title: '加载中'
})
let datas = {
merStatus: 1,
pageNum: this.pageNum,
pageSize: this.pagesize,
}
getMerListBySalesman(datas).then(res => {
uni.hideLoading();
if (res.return_code == '000000' && res.return_data.list) {
this.merchantlist = this.merchantlist.concat(res.return_data.list);
if (res.return_data.pages == this.pageNum) {
this.isLoadMore = true;
} else {
this.isLoadMore = false
}
} else {
this.isLoadMore = true
}
});
},
//
jumpmerdes(ids) {
uni.navigateTo({
url: '/pages/index/merchant-details/merchant-details?id=' + ids
})
}, //
openAccounts(item) {
uni.navigateTo({
url: '/pages/index/open-Divide_accounts/open-Divide_accounts?id=' + item
})
},
//
bindMerchants(item) {
//
let datas = {
merId: item,
platformType: 1
}
getMerLedgerApply(datas).then(res => {
if (res.return_code == '000000') {
uni.navigateTo({
url: '/pages/index/bindMerchants/bindMerchants?id=' + res.return_data.id +
'&merId=' + item
})
} else {
uni.showToast({
title: res.return_msg,
duration: 2000,
icon: 'none'
})
}
})
},
//
jumpEquityActivity(item) {
uni.navigateTo({
url: '/pages/index/equity-activities/equity-activities?id=' + item
})
}
}
}
</script>
<style lang="scss">
page {
background-color: #f6f6f6;
}
.notes {
width: calc(100% - 40upx);
display: flex;
align-items: center;
padding: 20upx 0 20upx 20upx;
}
//
.statucs {
background-color: #e9f9e5;
color: #84b878;
text-align: center;
padding: 2px 5px;
}
.btns {
width: 21%;
float: left;
height: 35px;
line-height: 35px;
background-color: #0083f5;
color: #FFFFFF;
font-weight: bold;
font-size: 12px;
padding: 0px;
}
</style>

@ -124,7 +124,7 @@
'base64File': imgURL 'base64File': imgURL
}, },
success: function(uploadFileRes) { success: function(uploadFileRes) {
that.powerofattorney = JSON.parse(uploadFileRes.data).return_data; that.powerofattorney = JSON.parse(uploadFileRes.data).return_data[0];
} }
}); });
}) })
@ -188,7 +188,7 @@
"merId": this.merId, "merId": this.merId,
"platformType": 1, "platformType": 1,
"splitLowestRatio": this.splitLowestRatio, "splitLowestRatio": this.splitLowestRatio,
"splitEntrustFilePath": this.powerofattorney[0] "splitEntrustFilePath": this.powerofattorney
} }
merLedgerApply(datas).then(res => { merLedgerApply(datas).then(res => {
uni.hideLoading(); uni.hideLoading();

@ -1,41 +1,67 @@
<template> <template>
<view> <view>
<view class="mart15 width100 backcorfff"> <view class="mart5 width100 backcorfff">
<view class="notes"> <view class="notes">
<view class="fcor666 width25">账号</view> <view class="fcor666 width25">商户名称</view>
<view class="font14 fcor333 text2 width75 fotrt">账号名称</view> <view class="font14 fcor333 text2 width75 fotrt">{{orderByOutTradeOrder.merName}}</view>
</view> </view>
<view class="notes"> <view class="notes">
<view class="fcor666 width25">账号</view> <view class="fcor666 width25">门店名称</view>
<view class="font14 fcor333 text2 width75 fotrt">账号名称</view> <view class="font14 fcor333 text2 width75 fotrt">{{orderByOutTradeOrder.storeName}}</view>
</view> </view>
<view class="notes"> <view class="notes">
<view class="fcor666 width25">账号</view> <view class="fcor666 width25">交易模式</view>
<view class="font14 fcor333 text2 width75 fotrt">账号名称</view> <view class="font14 fcor333 text2 width75 fotrt" v-if="orderByOutTradeOrder.payMode == 'ALIPAY' ">支付宝</view>
<view class="font14 fcor333 text2 width75 fotrt" v-if="orderByOutTradeOrder.payMode == 'WECHAT' ">微信</view>
</view> </view>
<view class="notes"> <view class="notes">
<view class="fcor666 width25">账号</view> <view class="fcor666 width25">支付时间</view>
<view class="font14 fcor333 text2 width75 fotrt">账号名称</view> <view class="font14 fcor333 text2 width75 fotrt">{{orderByOutTradeOrder.payTime | timeFormat('yyyy-mm-dd hh:mm:ss')}}</view>
</view> </view>
<view class="notes"> <view class="notes">
<view class="fcor666 width25"></view> <view class="fcor666 width25">商户交易单</view>
<view class="font14 fcor333 text2 width75 fotrt">账号名称</view> <view class="font14 fcor333 text2 width75 fotrt">{{orderByOutTradeOrder.outTradeNo}}</view>
</view> </view>
<view class="notes"> <view class="notes">
<view class="fcor666 width25">账号</view> <view class="fcor666 width25">户端交易单</view>
<view class="font14 fcor333 text2 width75 fotrt">账号名称</view> <view class="font14 fcor333 text2 width75 fotrt">{{orderByOutTradeOrder.accTradeNo}}</view>
</view> </view>
<view class="notes"> <view class="notes">
<view class="fcor666 width25">账号</view> <view class="fcor666 width25">交易状态</view>
<view class="font14 fcor333 text2 width75 fotrt">账号名称</view> <view class="font14 fcor333 text2 width75 fotrt">{{statusList[orderByOutTradeOrder.status]}}</view>
</view> </view>
<view class="notes"> <view class="notes">
<view class="fcor666 width25">账号</view> <view class="fcor666 width25">交易金额</view>
<view class="font14 fcor333 text2 width75 fotrt">账号名称</view> <view class="font14 fcor333 text2 width75 fotrt">¥ {{orderByOutTradeOrder.tradeAmount}}</view>
</view>
<view class="notes" v-if="orderByOutTradeOrder.storeDiscountPrice">
<view class="fcor666 width25">门店优惠</view>
<view class="font14 fcor333 text2 width75 fotrt">{{orderByOutTradeOrder.storeDiscountPrice}}</view>
</view>
<view class="notes" v-if="orderByOutTradeOrder.userPhone">
<view class="fcor666 width25">客户手机号</view>
<view class="font14 fcor333 text2 width75 fotrt">{{orderByOutTradeOrder.userPhone}}</view>
</view>
<view class="notes" v-if="orderByOutTradeOrder.userDiscountPrice">
<view class="fcor666 width25">客户优惠券优惠</view>
<view class="font14 fcor333 text2 width75 fotrt">{{orderByOutTradeOrder.userDiscountPrice}}</view>
</view> </view>
<view class="notes"> <view class="notes">
<view class="fcor666 width25">账号</view> <view class="fcor666 width25">交易实际金额</view>
<view class="font14 fcor333 text2 width75 fotrt">账号名称</view> <view class="font14 fcor333 text2 width75 fotrt">{{orderByOutTradeOrder.tradeActualAmount}}</view>
</view>
<view class="notes" v-if="orderByOutTradeOrder.feeRate">
<view class="fcor666 width25">交易费率</view>
<view class="font14 fcor333 text2 width75 fotrt">{{orderByOutTradeOrder.feeRate}}</view>
</view>
<view class="notes">
<view class="fcor666 width25">交易创建方式</view>
<view class="font14 fcor333 text2 width75 fotrt">扫一扫</view>
</view>
<view class="notes" v-if="orderByOutTradeOrder.platformMerNo">
<view class="fcor666 width25">平台商户号</view>
<view class="font14 fcor333 text2 width75 fotrt">{{orderByOutTradeOrder.platformMerNo}}</view>
</view> </view>
</view> </view>
@ -43,14 +69,44 @@
</template> </template>
<script> <script>
import {
getOrderByOutTradeOrder
} from '../../../Utils/Api.js';
export default { export default {
data() { data() {
return { return {
statusList: {
1: "待支付",
2: "支付中",
3: "支付成功",
4: "支付失败",
5: "已取消",
6: "已退款"
},
orderid: '', //
orderByOutTradeOrder: '' //
} }
}, },
onLoad(options) {
this.orderid = options.orderid;
this.getOrderByOutTradeOrder();
},
methods: { methods: {
//
getOrderByOutTradeOrder() {
uni.showLoading({
title: '加载中...'
})
let datas = {
outTradeOrder: this.orderid
}
getOrderByOutTradeOrder(datas).then(res => {
if (res.return_code == '000000') {
this.orderByOutTradeOrder = res.return_data.order;
}
uni.hideLoading();
})
}
} }
} }
</script> </script>

@ -0,0 +1,175 @@
<template>
<view>
<view class="width100 height100p" style="background-color: #eb6a53;" v-if="RateApplyDetail.status == 5">
<view class="font18 fcorfff paddtop35 fotct">
渠道审核中
</view>
</view>
<view class="titlename width100 font18 fontwig6 fcor333">费率信息审核</view>
<view class="width100 backcorfff">
<view class="notes" v-for="(item,index) in RateApplyDetail.merRateApplyDetailList" :key="index">
<view class="fcor666 width25">{{item.rateTypeName}}</view>
<view class="font14 fcor333 text2 width75 fotrt">{{item.ratePct}} (单位: 百分之一)</view>
</view>
</view>
<view class="titlename width100 font18 fontwig6 fcor333"
v-if="RateApplyDetail.status == 2 || RateApplyDetail.status == 4 || RateApplyDetail.status == 6">驳回信息</view>
<textarea class="width100 backcorfff" v-model="rejectReason" v-if="RateApplyDetail.status == 2"
style="padding: 15px;" placeholder="请填写审核驳回内容"></textarea>
<textarea class="width100 backcorfff" :value="RateApplyDetail.rejectReason" disabled="true"
v-if="RateApplyDetail.status == 4 || RateApplyDetail.status == 6" style="padding: 15px;"></textarea>
<view class="alijusstart" v-if="RateApplyDetail.status == 2">
<button class="btns mart40 backcor008" @click="approve()">通过</button>
<button class="btns mart40 backcorlr" @click="reject()">驳回</button>
</view>
</view>
</template>
<script>
import {
reject,
approve,
getRateApplyDetail
} from '../../../Utils/Api.js';
export default {
data() {
return {
auditNo: '', //
rateApplyId: '', //id
rejectReason: '', //
RateApplyDetail: '' //
}
},
onLoad(options) {
this.rateApplyId = options.id;
this.auditNo = options.auditid;
this.getRateApplyDetail();
},
methods: {
//
getRateApplyDetail() {
let datas = {
rateApplyId: this.rateApplyId
}
getRateApplyDetail(datas).then(res => {
if (res.return_code == '000000') {
this.RateApplyDetail = res.return_data.rateApply;
}
})
},
//
approve() {
uni.showModal({
title: '通过审核',
content: '是否通过当前审核',
success: (res) => {
if (res.confirm) {
uni.showLoading({
title: '提交中'
})
let datas = {
auditNo: this.auditNo
}
approve(datas).then(res => {
uni.hideLoading();
if (res.return_code == '000000') {
uni.showToast({
title: '提交成功',
icon: "none",
duration: 2000
});
uni.navigateBack();
} else {
uni.showToast({
title: res.return_msg,
icon: "none",
duration: 2000
});
}
})
} else if (res.cancel) {
console.log('用户点击取消');
}
}
});
},
//
reject() {
if (!this.rejectReason) {
uni.showToast({
title: '请填写驳回理由',
icon: "none",
duration: 2000
});
return;
}
uni.showModal({
title: '驳回审核',
content: '是否驳回当前审核',
success: (res) => {
if (res.confirm) {
uni.showLoading({
title: '提交中'
})
let datas = {
auditNo: this.auditNo,
"rejectReason": this.rejectReason
}
reject(datas).then(res => {
uni.hideLoading();
if (res.return_code == '000000') {
uni.showToast({
title: '提交成功',
icon: "none",
duration: 2000
});
uni.navigateBack();
} else {
uni.showToast({
title: res.return_msg,
icon: "none",
duration: 2000
});
}
})
} else if (res.cancel) {
console.log('用户点击取消');
}
}
});
}
}
}
</script>
<style lang="scss">
page {
background-color: #f6f6f6;
}
.titlename {
align-items: center;
padding: 30rpx 0 30rpx 20rpx;
background-color: #ffffff;
border-bottom: 1px solid #f6f6f6;
}
.notes {
width: calc(100% - 40rpx);
display: flex;
align-items: center;
padding: 30rpx 0 30rpx 20rpx;
border-bottom: 1px solid #f6f6f6;
}
.btns {
width: 40%;
height: 50px;
line-height: 50px;
color: #FFFFFF;
font-weight: bold;
}
</style>

@ -12,12 +12,13 @@
<view class="mart20 width100"> <view class="mart20 width100">
<view class="width94 backcorfff border-r mart15" v-for="(item,index) in rviewList" :key="index" <view class="width94 backcorfff border-r mart15" v-for="(item,index) in rviewList" :key="index"
@click="jumpRviewSettdetails(item.auditNo)"> @click="jumpRviewSettdetails(item)">
<view class="notes" style="padding-bottom: 0px;"> <view class="notes" style="padding-bottom: 0px;">
<!-- <image src="../../../static/img/merchantstu.png" mode="widthFix" class="iconw40"></image> --> <!-- <image src="../../../static/img/merchantstu.png" mode="widthFix" class="iconw40"></image> -->
<view class="width80p"> <view class="width80p">
<view class="font15 fcor333">{{item.auditObjectName}}</view> <view class="font15 fcor333">{{item.auditObjectName}}</view>
<view class="font14 fcor999 paddtop5"> <view class="font14 fcor999 mart5">审核类型: {{item.vocationalWorkTypeName}}</view>
<view class="font14 fcor999 ">
提交时间: {{item.createTime | timeFormat('yyyy-mm-dd hh:mm:ss')}} 提交时间: {{item.createTime | timeFormat('yyyy-mm-dd hh:mm:ss')}}
</view> </view>
</view> </view>
@ -105,12 +106,20 @@
}, },
// //
jumpRviewSettdetails(item) { jumpRviewSettdetails(item) {
if (item.vocationalWorkType == 1) {
uni.navigateTo({ uni.navigateTo({
url: '/pages/index/settlement_details/settlement_details?id=' + item url: '/pages/index/settlement_details/settlement_details?id=' + item.auditNo
})
}
if (item.vocationalWorkType == 2) {
uni.navigateTo({
url: '/pages/index/rateReview/rateReview?id=' + item.auditObjectId + '&auditid=' + item
.auditNo
}) })
} }
} }
} }
}
</script> </script>
<style lang="scss"> <style lang="scss">
@ -128,5 +137,4 @@
align-items: center; align-items: center;
padding: 20upx 0 20upx 20upx; padding: 20upx 0 20upx 20upx;
} }
</style> </style>

@ -51,10 +51,10 @@
<view class="fcor666 width25">身份证号码</view> <view class="fcor666 width25">身份证号码</view>
<view class="font14 fcor333 text2 width75 fotrt">{{auditDetail.settleIdCardNo}}</view> <view class="font14 fcor333 text2 width75 fotrt">{{auditDetail.settleIdCardNo}}</view>
</view> </view>
<view class="notes"> <!-- <view class="notes">
<view class="fcor666 width25">身份证号码</view> <view class="fcor666 width25">身份证号码</view>
<view class="font14 fcor333 text2 width75 fotrt">{{auditDetail.settleIdCardNo}}</view> <view class="font14 fcor333 text2 width75 fotrt">{{auditDetail.settleIdCardNo}}</view>
</view> </view> -->
<view class="notes"> <view class="notes">
<view class="fcor666 width25">身份证地址</view> <view class="fcor666 width25">身份证地址</view>
<view class="font14 fcor333 text2 width75 fotrt">{{auditDetail.settleIdCardAddress}}</view> <view class="font14 fcor333 text2 width75 fotrt">{{auditDetail.settleIdCardAddress}}</view>
@ -67,6 +67,8 @@
</view> </view>
</view> </view>
</view> </view>
<view class="titlename width100 font18 fontwig6 fcor333" v-if="auditDetail.settleType == 3">非法人授权书</view>
<image class="width90 " mode="widthFix" :src="uncorporsettelimg" v-if="auditDetail.settleType == 3"></image>
<view class="titlename width100 font18 fontwig6 fcor333" v-if="auditDetail.settleType == 3">非法人身份证图片</view> <view class="titlename width100 font18 fontwig6 fcor333" v-if="auditDetail.settleType == 3">非法人身份证图片</view>
<image class="width90 " mode="widthFix" :src="idcardposimg" v-if="auditDetail.settleType == 3"></image> <image class="width90 " mode="widthFix" :src="idcardposimg" v-if="auditDetail.settleType == 3"></image>
<image class="width90 " mode="widthFix" :src="idcardsideimg" v-if="auditDetail.settleType == 3"></image> <image class="width90 " mode="widthFix" :src="idcardsideimg" v-if="auditDetail.settleType == 3"></image>
@ -103,6 +105,7 @@
rejectReason: '', // rejectReason: '', //
accopenperimg: '', // accopenperimg: '', //
settleimg: '', // settleimg: '', //
uncorporsettelimg:'', //
idcardposimg: '', // idcardposimg: '', //
idcardsideimg: '' // idcardsideimg: '' //
} }
@ -128,6 +131,9 @@
if (res.return_data.auditObject.bankCardImg) { if (res.return_data.auditObject.bankCardImg) {
this.getImgSignedUrl(4, res.return_data.auditObject.bankCardImg); this.getImgSignedUrl(4, res.return_data.auditObject.bankCardImg);
} }
if (res.return_data.auditObject.commissionImg) {
this.getImgSignedUrl(10, res.return_data.auditObject.commissionImg);
}
if (res.return_data.auditObject.settleType == 3) { if (res.return_data.auditObject.settleType == 3) {
this.getImgSignedUrl(2, res.return_data.auditObject.settleIdCardPortraitImg); this.getImgSignedUrl(2, res.return_data.auditObject.settleIdCardPortraitImg);
this.getImgSignedUrl(3, res.return_data.auditObject this.getImgSignedUrl(3, res.return_data.auditObject
@ -156,6 +162,9 @@
if (item == 3) { if (item == 3) {
this.idcardsideimg = res.return_data; this.idcardsideimg = res.return_data;
} }
if (item == 10) {
this.uncorporsettelimg = res.return_data;
}
} }
}) })
}, },

@ -3,12 +3,15 @@
<!-- 审核状态回馈 --> <!-- 审核状态回馈 -->
<view class="width100 height100p" style="background-color: #eb6a53;" <view class="width100 height100p" style="background-color: #eb6a53;"
v-if="applyByMerList && (applyByMerList.status == 2 || applyByMerList.status == 4 || applyByMerList.status == 6)"> v-if="applyByMerList && (applyByMerList.status == 2 || applyByMerList.status == 4 || applyByMerList.status == 6)">
<view class="font18 fcorfff paading10 aliitem" v-if="applyByMerList.status == 4 || applyByMerList.status == 6"> <view class="font18 fcorfff paading10 aliitem"
v-if="applyByMerList.status == 4 || applyByMerList.status == 6">
<image src='../../../static/img/error.png' mode="widthFix" class="iconw25 marglerig"></image>审核驳回 <image src='../../../static/img/error.png' mode="widthFix" class="iconw25 marglerig"></image>审核驳回
</view> </view>
<view class="font14 fcorfff paading10" v-if="applyByMerList.status == 4 || applyByMerList.status == 6">{{applyByMerList.rejectReason}} <view class="font14 fcorfff paading10" v-if="applyByMerList.status == 4 || applyByMerList.status == 6">
{{applyByMerList.rejectReason}}
</view> </view>
<view class="font18 fcorfff paddtop35 fotct" v-if="applyByMerList.status == 2 || applyByMerList.status == 5"> <view class="font18 fcorfff paddtop35 fotct"
v-if="applyByMerList.status == 2 || applyByMerList.status == 5">
审核中 审核中
</view> </view>
</view> </view>
@ -22,6 +25,20 @@
placeholder-style="color: #bfbfbf;font-size:14px;padding-top:2px;" @click="showPopup()" /> placeholder-style="color: #bfbfbf;font-size:14px;padding-top:2px;" @click="showPopup()" />
<image src="../../../static/img/jtg.png" mode="widthFix" class="iconw"></image> <image src="../../../static/img/jtg.png" mode="widthFix" class="iconw"></image>
</view> </view>
<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>
<image src="../../../static/img/businesslic7.png" v-else mode="widthFix" @click="upload(10)"
class="width45" style="margin-left: 3%;"></image>
<image src="../../../static/img/businesslic8.png" mode="widthFix" class="width45"
style="margin-left: 3%;" @click="perImage('../../../static/img/businesslic8.png')"></image>
</view>
<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 class="notes font16" style="border-bottom: 0px;" v-if="lementId == 3"> <view class="notes font16" style="border-bottom: 0px;" v-if="lementId == 3">
<view class="width70 aliitem fcor666"> <view class="width70 aliitem fcor666">
非法人身份证照片 非法人身份证照片
@ -187,7 +204,8 @@
</view> </view>
</view> </view>
</wybPopup> </wybPopup>
<view class="btn" @tap="submitsotre" v-if="!applyByMerList || applyByMerList.status == 4 || applyByMerList.status == 6">提交审核</view> <view class="btn" @tap="submitsotre"
v-if="!applyByMerList || applyByMerList.status == 4 || applyByMerList.status == 6">提交审核</view>
<view class="height60"></view> <view class="height60"></view>
</view> </view>
</template> </template>
@ -224,6 +242,8 @@
idcardname: '', // idcardname: '', //
idcard: '', // idcard: '', //
larIdCardAddress: '', // larIdCardAddress: '', //
uncorporsettelimg: '', //
uploaduncorporsettelimg: '', //
settleimg: '', // settleimg: '', //
uploadsettleimg: '', // uploadsettleimg: '', //
accopenperimg: '', // accopenperimg: '', //
@ -324,6 +344,10 @@
if (res.return_data.openningBankLicenseUrl) { if (res.return_data.openningBankLicenseUrl) {
this.getImgSignedUrl(5, res.return_data.openningBankLicenseUrl, 2); this.getImgSignedUrl(5, res.return_data.openningBankLicenseUrl, 2);
} }
if (res.return_data.commissionImg) {
this.getImgSignedUrl(10, res.return_data.commissionImg, 2);
}
if (res.return_data.electronicPact) { if (res.return_data.electronicPact) {
this.electronicProtocolimg = res.return_data.electronicPact this.electronicProtocolimg = res.return_data.electronicPact
.split( .split(
@ -351,6 +375,7 @@
this.idcard = res.return_data.settleIdCardNo; this.idcard = res.return_data.settleIdCardNo;
this.timetype = res.return_data.settleIdPeriodType; this.timetype = res.return_data.settleIdPeriodType;
this.bankareaCode = res.return_data.openningBankAreaCode; this.bankareaCode = res.return_data.openningBankAreaCode;
this.larIdCardAddress = res.return_data.settleIdCardAddress;
this.idcardposimg = res.return_data.settleIdCardPortraitImg; this.idcardposimg = res.return_data.settleIdCardPortraitImg;
this.uploadidcardposimg = res.return_data.settleIdCardPortraitImg; this.uploadidcardposimg = res.return_data.settleIdCardPortraitImg;
this.idcardsideimg = res.return_data.settleIdCardNationalEmblemImg; this.idcardsideimg = res.return_data.settleIdCardNationalEmblemImg;
@ -506,6 +531,10 @@
this.accopenperimg = res.return_data; this.accopenperimg = res.return_data;
} }
} }
if (item == 10) {
this.uploaduncorporsettelimg = item1;
this.uncorporsettelimg = res.return_data;
}
} }
}) })
}, },
@ -789,6 +818,7 @@
"openningBankName": that.belongbranch, //"", "openningBankName": that.belongbranch, //"",
"bankCardNo": that.bankNo, //"", "bankCardNo": that.bankNo, //"",
"openningBankAreaCode": that.bankareaCode, // "openningBankAreaCode": that.bankareaCode, //
"commissionImg": that.uploaduncorporsettelimg, //
"bankCardHolder": that.bankName, //"", "bankCardHolder": that.bankName, //"",
"openningBankCode": that.openingbankNo, //"", "openningBankCode": that.openingbankNo, //"",
"bankName": that.belongbank, //"", "bankName": that.belongbank, //"",

@ -18,15 +18,14 @@
<image mode="widthFix" class="margle iconw" src="../../../static/img/jt.png"></image> <image mode="widthFix" class="margle iconw" src="../../../static/img/jt.png"></image>
</view> </view>
<!-- 业务员 --> <!-- 业务员 -->
<view class="font28 fcorfff mart20 width94" v-if="userInfo.secUser.objectType == 3">总收益</view> <view class="font28 fcorfff mart20 width94" v-if="userInfo.secUser.objectType == 3"></view>
<view class="font28 fcorfff mart15 width94" v-if="userInfo.secUser.objectType == 3">¥<text <view class="font28 fcorfff mart15 width94" v-if="userInfo.secUser.objectType == 3"></view>
class="margle font40">0.00</text></view>
<!-- 非业务员 --> <!-- 非业务员 -->
<view class="font15 height40 fcorfff mart20 width94" v-if="userInfo.secUser.objectType != 3">今日总收入</view> <view class="font15 height40 fcorfff mart20 width94" v-if="userInfo.secUser.objectType != 3">今日总收入</view>
<view class="font28 fcorfff mart15 width94" v-if="userInfo.secUser.objectType != 3">¥<text <view class="font28 fcorfff mart15 width94" v-if="userInfo.secUser.objectType != 3">¥<text
class="margle font40">{{auditnum.tradePrice}}</text></view> class="margle font40">{{auditnum.tradePrice}}</text></view>
<!-- 业务员 --> <!-- 业务员 -->
<view class="width94 mart15" v-if="userInfo.secUser.objectType == 3"> <view class="width94 mart80" v-if="userInfo.secUser.objectType == 3" @click.stop="jumpaudt">
<view class="width50 fcorfff font14 flleft"> <view class="width50 fcorfff font14 flleft">
<view class="width100">进件成功数量</view> <view class="width100">进件成功数量</view>
<view class="width100 mart15 font22">{{auditnum.contractSuccess}}</view> <view class="width100 mart15 font22">{{auditnum.contractSuccess}}</view>
@ -94,9 +93,13 @@
img: '../../../static/img/home3.png' img: '../../../static/img/home3.png'
}, },
{ {
title: '商户管理', title: '进件管理',
url: '../../index/merchant-management/merchant-management', url: '../../index/merchant-management/merchant-management',
img: '../../../static/img/home4.png' img: '../../../static/img/home4.png'
}, {
title: '商户管理',
url: '../../index/normal-Merchant/normal-Merchant',
img: '../../../static/img/home4.png'
}, { }, {
title: '我的设备', title: '我的设备',
url: '../../index/mineService/mineService?id=3', url: '../../index/mineService/mineService?id=3',
@ -137,7 +140,7 @@
}, },
{ {
title: '我的设备', title: '我的设备',
url: '../../index/mineService/mineService?id=1', url: '../../index/mineService/mineService?id=1&storeid=',
img: '../../../static/img/casihr.png' img: '../../../static/img/casihr.png'
}, },
{ {

@ -17,28 +17,28 @@
}, },
onLoad(options) { onLoad(options) {
let that = this; let that = this;
// uni.reLaunch({ uni.reLaunch({
// url: '../tabBar/home/home' 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]
}) })
} // #ifdef H5
} else { // let arr1 = window.location.href;
// openid // let arr2 = arr1.split('=');
that.jumpcdx(); // if (arr2[2]) {
} // var arr3 = arr2[2].split('&');
if (app.globalData.h5code) { // if (arr3[0] != undefined && arr3[0]) {
that.getAccessToken(); // app.globalData.h5code = arr3[0];
} // uni.setStorage({
// key: "h5code",
// data: arr3[0]
// })
// }
// } else {
// // openid
// that.jumpcdx();
// }
// if (app.globalData.h5code) {
// that.getAccessToken();
// }
// #endif // #endif
}, },
methods: { methods: {
@ -71,7 +71,7 @@
}, },
jumpcdx() { jumpcdx() {
location.href = location.href =
'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxa075e8509802f826&redirect_uri=https://hsg.dctpay.com/wechat_authorize/?redirect_uri=https://pay.dctpay.com/cweb&response_type=code&scope=snsapi_base#wechat_redirect'; 'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxa075e8509802f826&redirect_uri=https://hsg.dctpay.com/wechat_authorize/?redirect_uri=https://gratia-pay.dctpay.com/cweb&response_type=code&scope=snsapi_base#wechat_redirect';
}, },
} }
} }

Loading…
Cancel
Save