yangjie
/
xuan-pay-cweb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.功能调整

Browse Source 
2.修改绑定设备方式
huipay-master
杨杰 3 years ago
parent 942ed4cb03
commit cb1ec4fab7
13 changed files with 451 additions and 267 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 15
      Utils/Api.js
  2. 140
      pages/index/addStore/addStore.vue
  3. 33
      pages/index/collectNotes/collectNotes.vue
  4. 12
      pages/index/merchant-details/merchant-details.vue
  5. 133
      pages/index/merchant-incoming-parts/merchant-incoming-parts.vue
  6. 26
      pages/index/merchant-management/merchant-management.vue
  7. 163
      pages/index/serviceBuild/serviceBuild.vue
  8. 6
      pages/index/store-details/store-details.vue
  9. 29
      pages/tabBar/home/home.vue
  10. BIN
      static/img/del.png
  11. 2
      unpackage/dist/build/h5/index.html
  12. 1
      unpackage/dist/build/h5/static/js/pages-index-addStore-addStore.e1c484c6.js
  13. BIN
      unpackage/dist/build/h5/归档.zip

15
Utils/Api.js
Unescape View File

@ -79,17 +79,18 @@ export const configStore = params => {
return POST('POST', `${base}/store/configStore`, params).then(res => res.data); return POST('POST', `${base}/store/configStore`, params).then(res => res.data);
} }
//门店添加设备 //门店添加设备
export const configStoreDevice = params => { export const bindStoreDevice = params => {
return POST('POST', `${base}/storeDevice/configStoreDevice`, params).then(res => res.data); return POST('POST', `${base}/device/bindStoreDevice`, params).then(res => res.data);
} }
//门店删除设备 //业务员查询设备列表
export const delStoreDevice = params => { export const getSalesmanDeviceList = params => {
return POST('POST', `${base}/storeDevice/delStoreDevice`, params).then(res => res.data); return POST('GET', `${base}/device/getSalesmanDeviceList`, params).then(res => res.data);
} }
//门店查看设备列表 //门店查询设备列表
export const getStoreDeviceList = params => { export const getStoreDeviceList = params => {
return POST('GET', `${base}/storeDevice/getStoreDeviceList`, params).then(res => res.data); return POST('GET', `${base}/device/getStoreDeviceList`, params).then(res => res.data);
} }
//业务员查询统计 //业务员查询统计
export const moveHomeCount = params => { export const moveHomeCount = params => {
return POST('POST', `${base}/salesman/moveHomeCount`, params).then(res => res.data); return POST('POST', `${base}/salesman/moveHomeCount`, params).then(res => res.data);

140
pages/index/addStore/addStore.vue
Unescape View File

@ -1,7 +1,7 @@
<template> <template>
<view> <view>
<view class="width100 mart10 backcorfff"> <view class="width100 mart10 backcorfff">
<view class="titlename fcor666">营业执照</view> <!-- <view class="titlename fcor666">营业执照</view>
<view class="width94 displ"> <view class="width94 displ">
<image :src="imgsUrl+businimg" v-if="businimg" mode="widthFix" class="width45" style="margin-left: 3%;" <image :src="imgsUrl+businimg" v-if="businimg" mode="widthFix" class="width45" style="margin-left: 3%;"
@click="upload(1)"></image> @click="upload(1)"></image>
@ -48,7 +48,7 @@
<view class="date">{{end_date}}</view> <view class="date">{{end_date}}</view>
</picker> </picker>
<view class="width40 fotct fcor999" v-if="timetype == '2' ">长期有效</view> <view class="width40 fotct fcor999" v-if="timetype == '2' ">长期有效</view>
</view> </view> -->
<view class="username"> <view class="username">
<view class="namecont">行业类目</view> <view class="namecont">行业类目</view>
<input placeholder="请选择类目" v-model="industrycategory" style="width: 70%;" disabled="true" <input placeholder="请选择类目" v-model="industrycategory" style="width: 70%;" disabled="true"
@ -70,11 +70,11 @@
<input placeholder="请精确到XX路XX号" v-model="detailsaddress" style="width: 70%;" <input placeholder="请精确到XX路XX号" v-model="detailsaddress" style="width: 70%;"
placeholder-style="color: #bfbfbf;font-size:14px;padding-top:2px;" /> placeholder-style="color: #bfbfbf;font-size:14px;padding-top:2px;" />
</view> </view>
<view class="username"> <!-- <view class="username">
<view class="namecont">门店账号</view> <view class="namecont">门店账号</view>
<input placeholder="请输入门店账号" v-model="storeaccount" style="width: 70%;" <input placeholder="请输入门店账号" v-model="storeaccount" style="width: 70%;"
placeholder-style="color: #bfbfbf;font-size:14px;padding-top:2px;" /> placeholder-style="color: #bfbfbf;font-size:14px;padding-top:2px;" />
</view> </view> -->
<view class="username"> <view class="username">
<view class="namecont">门店名称</view> <view class="namecont">门店名称</view>
<input placeholder="请输入门店名称" v-model="storename" style="width: 70%;" <input placeholder="请输入门店名称" v-model="storename" style="width: 70%;"
@ -300,54 +300,54 @@
// 提交门店信息 // 提交门店信息
configStore() { configStore() {
let that = this; let that = this;
if (!that.businimg) { // if (!that.businimg) {
uni.showToast({ // uni.showToast({
title: '请上传营业执照', // title: '请上传营业执照',
icon: "none", // icon: "none",
duration: 2000 // duration: 2000
}); // });
return; // return;
} // }
if (!that.businnum) { // if (!that.businnum) {
uni.showToast({ // uni.showToast({
title: '请填写营业执照号', // title: '请填写营业执照号',
icon: "none", // icon: "none",
duration: 2000 // duration: 2000
}); // });
return; // return;
} // }
if (!that.regaddress) { // if (!that.regaddress) {
uni.showToast({ // uni.showToast({
title: '请填写注册地址', // title: '请填写注册地址',
icon: "none", // icon: "none",
duration: 2000 // duration: 2000
}); // });
return; // return;
} // }
if (!that.start_date) { // if (!that.start_date) {
uni.showToast({ // uni.showToast({
title: '请填写营业执照开始时间', // title: '请填写营业执照开始时间',
icon: "none", // icon: "none",
duration: 2000 // duration: 2000
}); // });
return; // return;
} // }
if (!that.end_date) { // if (!that.end_date) {
uni.showToast({ // uni.showToast({
title: '请填写营业执照结束时间', // title: '请填写营业执照结束时间',
icon: "none", // icon: "none",
duration: 2000 // duration: 2000
}); // });
return; // return;
} // }
if (!that.companyname) { // if (!that.companyname) {
uni.showToast({ // uni.showToast({
title: '请填写公司名称', // title: '请填写公司名称',
icon: "none", // icon: "none",
duration: 2000 // duration: 2000
}); // });
return; // return;
} // }
if (!that.inducateid) { if (!that.inducateid) {
uni.showToast({ uni.showToast({
title: '请选择行业类目', title: '请选择行业类目',
@ -372,14 +372,14 @@
}); });
return; return;
} }
if (!that.storeaccount) { // if (!that.storeaccount) {
uni.showToast({ // uni.showToast({
title: '请填写门店账号', // title: '请填写门店账号',
icon: "none", // icon: "none",
duration: 2000 // duration: 2000
}); // });
return; // return;
} // }
if (!that.storename) { if (!that.storename) {
uni.showToast({ uni.showToast({
title: '请填写门店名称', title: '请填写门店名称',
@ -432,21 +432,21 @@
title: '提交中...' title: '提交中...'
}) })
let datas = { let datas = {
"account": { // "account": {
"loginName": that.storeaccount // "loginName": that.storeaccount
}, // },
"name": that.storename, "name": that.storename,
"telephone": that.storephone, "telephone": that.storephone,
"doorHeadImg": that.storeimg1, "doorHeadImg": that.storeimg1,
"cashRegisterImg": that.storeimg2, "cashRegisterImg": that.storeimg2,
"internalImg": that.storeimg3, "internalImg": that.storeimg3,
"blisUrl": that.businimg, // "blisUrl": that.businimg,
"blisName": that.companyname, // "blisName": that.companyname,
"blisNo": that.businnum, // "blisNo": that.businnum,
"blisPeriodStart": that.start_date, // "blisPeriodStart": that.start_date,
"blisPeriodType": that.timetype, // 营业执照期限类型 1：有效期 2：长期 // "blisPeriodType": that.timetype, // 营业执照期限类型 1：有效期 2：长期
"blisPeriodEnd": that.end_date, // "blisPeriodEnd": that.end_date,
"blisRegAddress": that.regaddress, // "blisRegAddress": that.regaddress,
"merId": that.userInfo.mer.id, "merId": that.userInfo.mer.id,
"storeIndustry": { "storeIndustry": {
"childId": that.inducateid "childId": that.inducateid

33
pages/index/collectNotes/collectNotes.vue
Unescape View File

@ -6,8 +6,10 @@
<view class="height90 width94 backcorfff mart20" v-for="(item,index) in notesList" :key="index"> <view class="height90 width94 backcorfff mart20" v-for="(item,index) in notesList" :key="index">
<view class="font24 fcor333 paddtop10 padleft15">¥ <text <view class="font24 fcor333 paddtop10 padleft15">¥ <text
class="font306adb fontwig6 margle font28">{{item.tradeAmount}}</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 fcoreb5"
<text class="stus font15 fcor41c" v-if="item.status == 2 || item.status == 3">{{statusList[item.status]}}</text> 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>
<view class="mart10 fcor666 padleft15 font15">{{item.createTime | timeFormat('yyyy-mm-dd')}} <view class="mart10 fcor666 padleft15 font15">{{item.createTime | timeFormat('yyyy-mm-dd')}}
{{item.createTime | timeFormat('hh:mm')}} {{item.createTime | timeFormat('hh:mm')}}
@ -31,26 +33,44 @@
4: "支付失败", 4: "支付失败",
5: "已取消", 5: "已取消",
6: "已退款" 6: "已退款"
} },
pageNum: 1,
pageSize: 10,
isNoMoreData: false, //是否加载中
} }
}, },
onLoad() { onLoad() {
this.getTradeOrderList(); this.getTradeOrderList();
}, },
onReachBottom() {
this.getTradeOrderList();
},
methods: { methods: {
getTradeOrderList() { getTradeOrderList() {
uni.showLoading({ uni.showLoading({
title: '加载中...' title: '加载中...'
}) })
if (this.isNoMoreData) {
uni.hideLoading()
return false;
}
let pagenum = this.pageNum;
let datas = { let datas = {
pageNum: 1, pageNum: pagenum,
pageSize: 10 pageSize: this.pageSize
} }
getTradeOrderList(datas).then(res => { getTradeOrderList(datas).then(res => {
uni.hideLoading(); uni.hideLoading();
if (res.return_code == '000000' && res.return_data.pageInfo.list) { if (res.return_code == '000000' && res.return_data.pageInfo.list) {
this.notesList = res.return_data.pageInfo.list; 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)) {
this.isNoMoreData = true;
}
this.pageNum = res.return_data.pageInfo.list.length == this.pageSize ? ++pagenum : pagenum;
} else { } else {
this.notesList = [];
uni.showToast({ uni.showToast({
title: res.return_msg, title: res.return_msg,
duration: 2000, duration: 2000,
@ -71,6 +91,7 @@
.font306adb { .font306adb {
color: #306adb; color: #306adb;
} }
.stus { .stus {
float: right; float: right;
margin-right: 20px; margin-right: 20px;

12
pages/index/merchant-details/merchant-details.vue
Unescape View File

@ -74,7 +74,10 @@
<image src="../../../static/img/store/store10.png" mode="widthFix" class="iconw"></image> <image src="../../../static/img/store/store10.png" mode="widthFix" class="iconw"></image>
<view class="margle10 font14 fcor999 width90p">{{item.storeRegion.address}}</view> <view class="margle10 font14 fcor999 width90p">{{item.storeRegion.address}}</view>
</view> </view>
<button class="btns mart10" @click.stop="jumpService(item.id)">绑定设备</button> <view class="height45 width100">
<button class="btns mart10 marRight20" @click.stop="jumpService(item.id,1)">绑定设备</button>
<button class="btns mart10 marRight20" @click.stop="jumpService(item.id,2)">设备列表</button>
</view>
<view class="lin10"></view> <view class="lin10"></view>
</view> </view>
</view> </view>
@ -165,9 +168,9 @@
}) })
}, },
//跳转设备管理 //跳转设备管理
jumpService(item) { jumpService(item, items) {
uni.navigateTo({ uni.navigateTo({
url: '../serviceBuild/serviceBuild?id=2&storeid=' + item url: '../serviceBuild/serviceBuild?storeid=' + item + '&type=' + items
}) })
} }
} }
@ -210,13 +213,14 @@
.btns { .btns {
width: 25%; width: 25%;
margin-left: 68%; float: right;
height: 35px; height: 35px;
line-height: 35px; line-height: 35px;
background-color: #0083f5; background-color: #0083f5;
color: #FFFFFF; color: #FFFFFF;
font-weight: bold; font-weight: bold;
font-size: 14px; font-size: 14px;
padding: 0px;
} }
.lin10 { .lin10 {

133
pages/index/merchant-incoming-parts/merchant-incoming-parts.vue
Unescape View File

@ -97,7 +97,7 @@
</view> </view>
<view class="notes font13" style="color: #eb5823;border-bottom: 1px solid #f6f6f6;" v-if="merchantId == 1"> <view class="notes font13" style="color: #eb5823;border-bottom: 1px solid #f6f6f6;" v-if="merchantId == 1">
<image mode="widthFix" class="iconw" src="../../../static/img/gth.png"></image> <image mode="widthFix" class="iconw" src="../../../static/img/gth.png"></image>
<text class="width90p">若营业执照上无名称，请填写“个体户XXX”(XXX为营业执照上经营者姓名)</text> <text class="width90p">若营业执照上无名称，请填写“个体工商户XXX”(XXX为营业执照上经营者姓名)</text>
</view> </view>
<view class="username" v-if="merchantId != 3"> <view class="username" v-if="merchantId != 3">
<view class="namecont">营业执照号</view> <view class="namecont">营业执照号</view>
@ -332,17 +332,19 @@
<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">非法人结算授权书</view> <view class="titlename fcor666" v-if="lementId == 3">非法人结算授权书</view>
<view class="width94 displ"> <view class="width94 displ" v-if="lementId == 3">
<image src="../../../static/img/businesslic7.png" mode="widthFix" class="width45" <image :src="imgsUrl+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> style="margin-left: 3%;"></image>
<image src="../../../static/img/businesslic8.png" mode="widthFix" class="width45" <image src="../../../static/img/businesslic8.png" mode="widthFix" class="width45"
style="margin-left: 3%;" @click="perImage('../../../static/img/businesslic10.png')"></image> 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>
<view class="notes font13" style="color: #eb5823;border-bottom: 1px solid #f6f6f6;">
<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">
非法人身份证照片 非法人身份证照片
@ -427,11 +429,11 @@
<input placeholder="请输入开户行号" v-model="openingbankNo" style="width: 70%;" <input placeholder="请输入开户行号" v-model="openingbankNo" style="width: 70%;"
placeholder-style="color: #bfbfbf;font-size:14px;padding-top:2px;" /> placeholder-style="color: #bfbfbf;font-size:14px;padding-top:2px;" />
</view> --> </view> -->
<view class="username"> <!-- <view class="username">
<view class="namecont">所属支行</view> <view class="namecont">所属支行</view>
<input placeholder="请输入所属支行" v-model="belongbranch" style="width: 70%;" <input placeholder="请输入所属支行" v-model="belongbranch" style="width: 70%;"
placeholder-style="color: #bfbfbf;font-size:14px;padding-top:2px;" /> placeholder-style="color: #bfbfbf;font-size:14px;padding-top:2px;" />
</view> </view> -->
<view class="username"> <view class="username">
<view class="namecont">银行卡号</view> <view class="namecont">银行卡号</view>
<input placeholder="请输入银行卡号" v-model="bankNo" style="width: 70%;" <input placeholder="请输入银行卡号" v-model="bankNo" style="width: 70%;"
@ -452,10 +454,13 @@
电子协议 电子协议
</view> </view>
</view> </view>
<view class="width94 displ mart5"> <view class="width94 displ mart5" v-for="(item,index) in electronicProtocolimg">
<image class="chachaimg" mode="widthFix" src="../../../static/img/del.png" @click="listdeleteImg(index)"></image>
<image mode="widthFix" class="width100" <image mode="widthFix" class="width100"
:src="imgsUrl+electronicProtocolimg" v-if="electronicProtocolimg" @click="upload(9)"></image> :src="imgsUrl+item"></image>
<image src="../../../static/img/businesslic12.png" mode="widthFix" class="width100" v-else </view>
<view class="width94 displ mart5" v-if="electronicProtocolimg.length < 5">
<image src="../../../static/img/businesslic12.png" mode="widthFix" class="width100"
@click="upload(9)"></image> @click="upload(9)"></image>
</view> </view>
<!-- <view class="username"> <!-- <view class="username">
@ -546,11 +551,11 @@
<!--第四步 未录入门店信息 --> <!--第四步 未录入门店信息 -->
<view class="width100 mart10 backcorfff" v-if="merchart == 4"> <view class="width100 mart10 backcorfff" v-if="merchart == 4">
<view class="username"> <!-- <view class="username">
<view class="namecont">门店账号</view> <view class="namecont">门店账号</view>
<input placeholder="请输入6-20位门店账号" maxlength="20" v-model="storeaccount" style="width: 70%;" <input placeholder="请输入6-20位门店账号" maxlength="20" v-model="storeaccount" style="width: 70%;"
placeholder-style="color: #bfbfbf;font-size:14px;padding-top:2px;" /> placeholder-style="color: #bfbfbf;font-size:14px;padding-top:2px;" />
</view> </view> -->
<view class="username"> <view class="username">
<view class="namecont">门店名称</view> <view class="namecont">门店名称</view>
<input placeholder="请输入门店名称" v-model="storename" style="width: 70%;" <input placeholder="请输入门店名称" v-model="storename" style="width: 70%;"
@ -730,12 +735,12 @@
uncorporsettelimg: '', //非法人结算授权书 uncorporsettelimg: '', //非法人结算授权书
settleimg: '', //结算人银行卡照片 settleimg: '', //结算人银行卡照片
accopenperimg: '', //开户许可证图片 accopenperimg: '', //开户许可证图片
electronicProtocolimg:'', //商户电子协议 electronicProtocolimg: [], //商户电子协议
// openingbankNo: '', //开户行号 // openingbankNo: '', //开户行号
bankNo: '', // 银行卡号 bankNo: '', // 银行卡号
bankName: '', // 银行卡持有人 bankName: '', // 银行卡持有人
belongbank: '', //所属银行 belongbank: '', //所属银行
belongbranch: '', //所属支行 // belongbranch: '', //所属支行
// clearbankNo: '', //清算行号 // clearbankNo: '', //清算行号
storeaccount: '', //门店账号 storeaccount: '', //门店账号
storename: '', //门店名称 storename: '', //门店名称
@ -753,6 +758,7 @@
mccno: '', //mcc编号 mccno: '', //mcc编号
defaultRegion: ['北京市', '市辖区', '东城区'], //默认地区 defaultRegion: ['北京市', '市辖区', '东城区'], //默认地区
defaultRegionCode: '110101', //区级编号 defaultRegionCode: '110101', //区级编号
regionName:'',
businessLicenselist: [], // 营业执照识别数据 businessLicenselist: [], // 营业执照识别数据
bankCardlist: [], //银行卡识别数据 bankCardlist: [], //银行卡识别数据
idCardzm: [], //身份证正面 idCardzm: [], //身份证正面
@ -772,12 +778,12 @@
endDate() { endDate() {
return this.getDate('end'); return this.getDate('end');
}, },
//地区转换 // //地区转换
regionName() { // regionName() {
// 转为字符串 // // 转为字符串
this.areaCode = this.region.map(item => item.code)[2]; // this.areaCode = this.region.map(item => item.code)[2];
return this.region.map(item => item.name).join('-'); // this.regionName = this.region.map(item => item.name).join('-');
} // }
}, },
onLoad(options) { onLoad(options) {
this.merId = options.id; this.merId = options.id;
@ -822,6 +828,8 @@
//选择地区 //选择地区
handleGetRegion(region) { handleGetRegion(region) {
this.region = region; this.region = region;
this.areaCode = this.region.map(item => item.code)[2];
this.regionName = this.region.map(item => item.name).join('-');
}, },
//选择行业 //选择行业
showjob() { showjob() {
@ -1004,8 +1012,12 @@
that.storeimg3 = JSON.parse(uploadFileRes.data).return_data[0]; that.storeimg3 = JSON.parse(uploadFileRes.data).return_data[0];
} }
if (item == 9) { if (item == 9) {
that.electronicProtocolimg = JSON.parse(uploadFileRes.data).return_data[0]; that.electronicProtocolimg.push(JSON.parse(uploadFileRes.data).return_data[0]);
}
if (item == 10) {
that.uncorporsettelimg = JSON.parse(uploadFileRes.data).return_data[0];
} }
} }
}); });
}, },
@ -1014,6 +1026,10 @@
} }
}); });
}, },
//删除图片
listdeleteImg(e) {
this.electronicProtocolimg.splice(e, 1);
},
//营业执照识别 //营业执照识别
recognizeBusinessLicense(item) { recognizeBusinessLicense(item) {
uni.showLoading({ uni.showLoading({
@ -1216,6 +1232,8 @@
this.companyname = res.return_data.blisName; this.companyname = res.return_data.blisName;
this.businnum = res.return_data.blisNo this.businnum = res.return_data.blisNo
this.regaddress = res.return_data.blisRegAddress; this.regaddress = res.return_data.blisRegAddress;
this.areaCode = res.return_data.merRegion.areaCode;
this.regionName = res.return_data.merRegion.provinceName+'-'+res.return_data.merRegion.cityName+'-'+res.return_data.merRegion.areaName;
if (res.return_data.blisPeriodStart) { if (res.return_data.blisPeriodStart) {
this.start_date = res.return_data.blisPeriodStart; this.start_date = res.return_data.blisPeriodStart;
} }
@ -1257,13 +1275,15 @@
} }
this.lementId = res.return_data.merSettleAcct.settleType; this.lementId = res.return_data.merSettleAcct.settleType;
this.settleimg = res.return_data.merSettleAcct.bankCardImg; this.settleimg = res.return_data.merSettleAcct.bankCardImg;
this.belongbranch = res.return_data.merSettleAcct.openningBankName; // this.belongbranch = res.return_data.merSettleAcct.openningBankName;
this.bankNo = res.return_data.merSettleAcct.bankCardNo; this.bankNo = res.return_data.merSettleAcct.bankCardNo;
this.bankName = res.return_data.merSettleAcct.bankCardHolder; this.bankName = res.return_data.merSettleAcct.bankCardHolder;
this.openingbankNo = res.return_data.merSettleAcct.openningBankCode; this.openingbankNo = res.return_data.merSettleAcct.openningBankCode;
this.belongbank = res.return_data.merSettleAcct.bankName; this.belongbank = res.return_data.merSettleAcct.bankName;
this.accopenperimg = res.return_data.merSettleAcct.openningBankLicenseUrl; this.accopenperimg = res.return_data.merSettleAcct.openningBankLicenseUrl;
this.electronicProtocolimg = res.return_data.merSettleAcct.electronicPact if(res.return_data.merSettleAcct.electronicPact){
this.electronicProtocolimg = res.return_data.merSettleAcct.electronicPact.split(';');
}
this.clearbankNo = res.return_data.merSettleAcct.clearingBankCode; this.clearbankNo = res.return_data.merSettleAcct.clearingBankCode;
if (this.merchart == 3) { if (this.merchart == 3) {
this.idcardname = res.return_data.merSettleAcct.settleIdCardName; this.idcardname = res.return_data.merSettleAcct.settleIdCardName;
@ -1599,6 +1619,16 @@
return; return;
} }
} }
if (that.lementId == 3) {
if (!that.uncorporsettelimg) {
uni.showToast({
title: '请上授权书',
icon: "none",
duration: 2000
});
return;
}
}
if (that.lementId == 3) { if (that.lementId == 3) {
if (!that.idcardposimg) { if (!that.idcardposimg) {
uni.showToast({ uni.showToast({
@ -1661,14 +1691,14 @@
// return; // return;
// } // }
if (!that.belongbranch) { // if (!that.belongbranch) {
uni.showToast({ // uni.showToast({
title: '请填写所属支行', // title: '请填写所属支行',
icon: "none", // icon: "none",
duration: 2000 // duration: 2000
}); // });
return; // return;
} // }
if (!that.bankNo) { if (!that.bankNo) {
uni.showToast({ uni.showToast({
title: '请填写银行卡号', title: '请填写银行卡号',
@ -1725,6 +1755,7 @@
that.cardend_date = '长期有效' that.cardend_date = '长期有效'
} }
} }
let imgsqes = that.electronicProtocolimg.join(';');
uni.showLoading({ uni.showLoading({
title: '提交中...' title: '提交中...'
}) })
@ -1732,16 +1763,17 @@
"merId": that.merId, "merId": that.merId,
"settleType": that.lementId, //结算类型 1：对公结算 2：对私法人结算 3：对私非法人结算, "settleType": that.lementId, //结算类型 1：对公结算 2：对私法人结算 3：对私非法人结算,
"bankCardImg": that.settleimg, //"银行卡照片", "bankCardImg": that.settleimg, //"银行卡照片",
"openningBankName": that.belongbranch, //"银行名称", // "openningBankName": that.belongbranch, //"银行名称",
"bankCardNo": that.bankNo, //"银行卡号", "bankCardNo": that.bankNo, //"银行卡号",
"bankCardHolder": that.bankName, //"银行卡持有人", "bankCardHolder": that.bankName, //"银行卡持有人",
// "openningBankCode": that.openingbankNo, //"开户行号", // "openningBankCode": that.openingbankNo, //"开户行号",
"bankName": that.belongbank, //"开户行名称", "bankName": that.belongbank, //"开户行名称",
"openningBankLicenseUrl": that.accopenperimg, //"开户许可证照片", "openningBankLicenseUrl": that.accopenperimg, //"开户许可证照片",
"electronicPact":that.electronicProtocolimg, //电子协议 "electronicPact":imgsqes, //电子协议
// "clearingBankCode": that.clearbankNo, //"账户清算行号", // "clearingBankCode": that.clearbankNo, //"账户清算行号",
"settleIdCardName": that.idcardname, //身份证名字 "settleIdCardName": that.idcardname, //身份证名字
"settleIdCardNo": that.idcard, //身份证号 "settleIdCardNo": that.idcard, //身份证号
"commissionImg":that.uncorporsettelimg, // 授权书
"settleIdPeriodType": that.idcardtime, //【对私非法人结算】结算人身份证有效期类型 1：有效期 2：长期, "settleIdPeriodType": that.idcardtime, //【对私非法人结算】结算人身份证有效期类型 1：有效期 2：长期,
"settleIdCardPortraitImg": that.idcardposimg, //"【对私非法人结算】结算人身份证人像面图片", "settleIdCardPortraitImg": that.idcardposimg, //"【对私非法人结算】结算人身份证人像面图片",
"settleIdCardNationalEmblemImg": that.idcardsideimg, //"【对私非法人结算】结算人身份证国徽面图片", "settleIdCardNationalEmblemImg": that.idcardsideimg, //"【对私非法人结算】结算人身份证国徽面图片",
@ -1775,14 +1807,14 @@
//提交门店进行审核 //提交门店进行审核
submitsotre() { submitsotre() {
let that = this; let that = this;
if (!that.storeaccount) { // if (!that.storeaccount) {
uni.showToast({ // uni.showToast({
title: '请填写门店账号', // title: '请填写门店账号',
icon: "none", // icon: "none",
duration: 2000 // duration: 2000
}); // });
return; // return;
} // }
if (!that.storename) { if (!that.storename) {
uni.showToast({ uni.showToast({
title: '请填写门店名称', title: '请填写门店名称',
@ -1833,9 +1865,9 @@
}) })
let datas = { let datas = {
"merId": that.merId, "merId": that.merId,
"account": { // "account": {
"loginName": that.storeaccount // "loginName": that.storeaccount
}, // },
"name": that.storename, "name": that.storename,
"telephone": that.storephone, "telephone": that.storephone,
"doorHeadImg": that.storeimg1, "doorHeadImg": that.storeimg1,
@ -1905,6 +1937,11 @@
} }
} }
.chachaimg{
width: 20px;
float: right;
}
.lineh { .lineh {
width: 13.3%; width: 13.3%;
height: 1px; height: 1px;

26
pages/index/merchant-management/merchant-management.vue
Unescape View File

@ -48,13 +48,13 @@
}, },
data() { data() {
return { return {
tabs: ["正常", "编辑中", "审核中", "审核失败", "违规"], tabs: ["编辑中", "审核中", "审核失败", "违规","正常"],
current: 0, // tabs默认值 current: 0, // tabs默认值
merchantlist: [], merchantlist: [],
pageNum: 1, pageNum: 1,
pagesize: 10, pagesize: 10,
isLoadMore: false, //是否加载中 isLoadMore: false, //是否加载中
merstu: 1 //查询当前状态 1：正常 2：编辑中 4：审核中 5：审核失败 6：违规 merstu: 2 //查询当前状态 2：编辑中 3：审核中 4：审核失败 5：违规 1：正常
} }
}, },
onLoad() { onLoad() {
@ -96,26 +96,40 @@
change(index) { change(index) {
this.$refs.tabs.setFinishCurrent(index); this.$refs.tabs.setFinishCurrent(index);
this.current = index; this.current = index;
this.merstu = this.current + 1; if(index == 0){
this.merstu = 2;
}
if(index == 1){
this.merstu = 3;
}
if(index == 2){
this.merstu = 4;
}
if(index == 3){
this.merstu = 5;
}
if(index == 4){
this.merstu = 1;
}
this.merchantlist = []; this.merchantlist = [];
this.pageNum = 1; this.pageNum = 1;
this.getMerListBySalesman(); this.getMerListBySalesman();
}, },
//跳转详情 //跳转详情
jumpmerdes(ids) { jumpmerdes(ids) {
if (this.current == 1 || this.current == 3) { if (this.merstu == 2 || this.merstu == 4) {
uni.navigateTo({ uni.navigateTo({
url: '../merchant-incoming-parts/merchant-incoming-parts?id=' + ids url: '../merchant-incoming-parts/merchant-incoming-parts?id=' + ids
}) })
} }
if (this.current == 2) { if (this.merstu == 3) {
uni.showToast({ uni.showToast({
title: '审核中', title: '审核中',
duration: 2000, duration: 2000,
icon: 'none' icon: 'none'
}) })
} }
if (this.current == 0 || this.current == 4) { if (this.merstu == 1 || this.merstu == 5) {
uni.navigateTo({ uni.navigateTo({
url: '../merchant-details/merchant-details?id=' + ids url: '../merchant-details/merchant-details?id=' + ids
}) })

163
pages/index/serviceBuild/serviceBuild.vue
Unescape View File

@ -1,23 +1,30 @@
<template> <template>
<view> <view>
<view v-if="!serviceList" class="mart60 fotct font14 fcor666">
<view class="input-box">
<view class="icon search"></view>
<input placeholder="输入设备SN号" v-model="deviceSn" placeholder-style="color:#c0c0c0;" @input="toSearch()" />
</view>
<view v-if="serviceList == ''" 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="height110 width94 backcorfff mart20" v-for="(item,index) in serviceList" :key="index"> <view class="height110 width94 backcorfff mart20" v-for="(item,index) in serviceList" :key="index">
<view class="font20 font306adb paddtop10 fontwig6 padleft15">{{item.deviceSn}}</view> <view class="font20 font306adb paddtop10 fontwig6 padleft15">{{item.deviceSn}}</view>
<view class="mart10 fcor666 padleft15 font14">绑定时间: {{item.createTime | timeFormat('yyyy-mm-dd')}} <view class="mart10 fcor666 padleft15 font14">绑定时间: {{item.storeBindTime | timeFormat('yyyy-mm-dd')}}
{{item.createTime | timeFormat('hh:mm')}} {{item.storeBindTime | timeFormat('hh:mm')}}
</view> </view>
<button class="btns" @click="delStoreDevice(item.id)">删除设备</button> <button class="btns" @click="bindStoreDevice(item.id)" v-if="typeId == 1">绑定设备</button>
</view> </view>
<image src="../../../static/img/addser.png" mode="widthFix" class="xfimg" @click="jumpaddService"></image> <!-- <image src="../../../static/img/addser.png" mode="widthFix" class="xfimg" @click="jumpaddService"></image> -->
</view> </view>
</template> </template>
<script> <script>
import { import {
getSalesmanDeviceList,
getStoreDeviceList, getStoreDeviceList,
delStoreDevice bindStoreDevice
} from '../../../Utils/Api.js'; } from '../../../Utils/Api.js';
let app = getApp(); let app = getApp();
export default { export default {
@ -29,70 +36,127 @@
isLoadMore: false, //是否加载中 isLoadMore: false, //是否加载中
userInfo: app.globalData.userInfo, //用户信息 userInfo: app.globalData.userInfo, //用户信息
typeId: '', //类型 typeId: '', //类型
storeId:'' //门店id storeId: '', //门店id
deviceSn: '' // 设备编号
} }
}, },
onReachBottom() { //上拉触底函数 onReachBottom() { //上拉触底函数
if (!this.isLoadMore) { //此处判断，上锁，防止重复请求 if (!this.isLoadMore) { //此处判断，上锁，防止重复请求
this.isLoadMore = true this.isLoadMore = true
this.pageNum += 1 this.pageNum += 1
this.getStoreDeviceList() if(this.typeId == 2){
this.getStoreDeviceList();
}else{
this.getSalesmanDeviceList();
}
} }
}, },
onLoad(options) { onLoad(options) {
this.typeId = options.id; this.typeId = options.type;
if(options.id == 1){
this.storeId = this.userInfo.store.id
}else{
this.storeId = options.storeid; this.storeId = options.storeid;
} if (options.type == 2) {
},
onShow() {
this.serviceList = [];
this.getStoreDeviceList(); this.getStoreDeviceList();
} else {
this.getSalesmanDeviceList();
}
}, },
methods: { methods: {
//跳转设备添加 //跳转设备添加
jumpaddService() { // jumpaddService() {
uni.navigateTo({ // uni.navigateTo({
url: '../addService/addService?storeId='+this.storeId // url: '../addService/addService?storeId=' + this.storeId
}) // })
// },
toSearch() {
this.pageNum = 1;
this.pageSize = 10;
this.isNoMoreData = false;
this.serviceList = [];
if (this.typeId == 2) {
this.getStoreDeviceList();
} else {
this.getSalesmanDeviceList();
}
}, },
//查询列表 //门店查询设备列表
getStoreDeviceList() { getStoreDeviceList() {
uni.showLoading({
title: '加载中...'
})
if (this.isNoMoreData) {
uni.hideLoading()
return false;
}
let pagenum = this.pageNum;
let params = { let params = {
pageNum: this.pageNum, pageNum: pagenum,
pageSize: this.pagesize, pageSize: this.pagesize,
deviceSn: this.deviceSn,
storeId: this.storeId storeId: this.storeId
} }
getStoreDeviceList(params).then(res => { getStoreDeviceList(params).then(res => {
uni.hideLoading();
if (res.return_code == '000000' && res.return_data.list) { if (res.return_code == '000000' && res.return_data.list) {
this.isLoadMore = res.return_data.list.length == this.pageSize ? false : true;
this.serviceList = this.serviceList.concat(res.return_data.list); this.serviceList = this.serviceList.concat(res.return_data.list);
if (res.return_data.pages == this.pageNum) { if (res.return_data.total == (this.pageNum * this.pageSize)) {
this.isLoadMore = true; this.isLoadMore = true;
}
this.pageNum = res.return_data.list.length == this.pageSize ? ++pagenum : pagenum;
} else { } else {
this.isLoadMore = false this.serviceList = [];
this.isLoadMore = true
}
});
},
//业务员查询设备列表
getSalesmanDeviceList() {
uni.showLoading({
title: '加载中...'
})
if (this.isNoMoreData) {
uni.hideLoading()
return false;
}
let pagenum = this.pageNum;
let datas = {
salesmanId: this.userInfo.salesman.id,
isAssignStore: false,
deviceSn: this.deviceSn,
pageNum: pagenum,
pageSize: this.pagesize,
}
getSalesmanDeviceList(datas).then(res => {
uni.hideLoading();
if (res.return_code == '000000' && res.return_data.list) {
this.isLoadMore = res.return_data.list.length == this.pageSize ? false : true;
this.serviceList = this.serviceList.concat(res.return_data.list);
if (res.return_data.total == (this.pageNum * this.pageSize)) {
this.isLoadMore = true;
} }
this.pageNum = res.return_data.list.length == this.pageSize ? ++pagenum : pagenum;
} else { } else {
this.serviceList = [];
this.isLoadMore = true this.isLoadMore = true
} }
}); });
}, },
//删除设备 //绑定设备
delStoreDevice(item) { bindStoreDevice(item) {
let that = this; let that = this;
uni.showModal({ uni.showModal({
title: '删除设备', title: '绑定设备',
content: '是否删除当前设备呢。', content: '是否绑定当前设备。',
success: (res) => { success: (res) => {
if (res.confirm) { if (res.confirm) {
uni.showLoading({ uni.showLoading({
title: '提交中...' title: '提交中...'
}) })
let params = { let params = {
id: item "deviceId": item,
"storeId": that.storeId
} }
delStoreDevice(params).then(res => { bindStoreDevice(params).then(res => {
uni.hideLoading(); uni.hideLoading();
if (res.return_code == '000000') { if (res.return_code == '000000') {
uni.showToast({ uni.showToast({
@ -101,10 +165,7 @@
duration: 2000, duration: 2000,
success() { success() {
setTimeout(() => { setTimeout(() => {
that.serviceList = []; uni.navigateBack({})
that.pageNum = 1;
that.isLoadMore = false;
that.getStoreDeviceList();
}, 1000); }, 1000);
} }
}) })
@ -121,7 +182,7 @@
} }
} }
}); });
} },
} }
} }
</script> </script>
@ -131,6 +192,37 @@
background-color: #f8f9f9; background-color: #f8f9f9;
} }
.input-box {
width: 90%;
margin-left: 5%;
margin-top: 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%;
}
}
.font306adb { .font306adb {
color: #306adb; color: #306adb;
} }
@ -151,5 +243,6 @@
color: #FFFFFF; color: #FFFFFF;
font-weight: bold; font-weight: bold;
font-size: 14px; font-size: 14px;
padding: 0px;
} }
</style> </style>

6
pages/index/store-details/store-details.vue
Unescape View File

@ -28,7 +28,7 @@
<view class="font14 fcor333 text2 width75 fotrt">{{storeDesInfo.storeIndustry.parentName}}-{{storeDesInfo.storeIndustry.childName}} <view class="font14 fcor333 text2 width75 fotrt">{{storeDesInfo.storeIndustry.parentName}}-{{storeDesInfo.storeIndustry.childName}}
</view> </view>
</view> </view>
<view class="width100 line10"></view> <!-- <view class="width100 line10"></view> -->
<view class="storelis"> <view class="storelis">
<view class="namecont">创建时间</view> <view class="namecont">创建时间</view>
<view class="font14 fcor333 text2 width75 fotrt"> <view class="font14 fcor333 text2 width75 fotrt">
@ -36,7 +36,7 @@
{{storeDesInfo.updateTime | timeFormat('hh:mm')}} {{storeDesInfo.updateTime | timeFormat('hh:mm')}}
</view> </view>
</view> </view>
<view class="storelis"> <!-- <view class="storelis">
<view class="namecont">公司名称</view> <view class="namecont">公司名称</view>
<view class="font14 fcor333 text2 width75 fotrt">{{storeDesInfo.blisName}}</view> <view class="font14 fcor333 text2 width75 fotrt">{{storeDesInfo.blisName}}</view>
</view> </view>
@ -47,7 +47,7 @@
<view class="storelis"> <view class="storelis">
<view class="namecont">营业期限</view> <view class="namecont">营业期限</view>
<view class="font14 fcor333 text2 width75 fotrt">{{storeDesInfo.blisPeriodEnd}}</view> <view class="font14 fcor333 text2 width75 fotrt">{{storeDesInfo.blisPeriodEnd}}</view>
</view> </view> -->
<view class="width100 line10"></view> <view class="width100 line10"></view>
<view class="storelis" style="border-bottom: 0px;"> <view class="storelis" style="border-bottom: 0px;">
<view class="namecont">门店照片</view> <view class="namecont">门店照片</view>

29
pages/tabBar/home/home.vue
Unescape View File

@ -2,7 +2,15 @@
<view> <view>
<image mode="widthFix" class="width100 headimg" src="../../../static/img/head.png"></image> <image mode="widthFix" class="width100 headimg" src="../../../static/img/head.png"></image>
<view class="headcont fotct" @click="jumpuserdes('../../tabBar/user/user')"> <view class="headcont fotct" @click="jumpuserdes('../../tabBar/user/user')">
<view class="width94 fcorfff font18 alijus">{{userInfo.secUser.userName}} <view class="width94 fcorfff font18 alijus" v-if="userInfo.secUser.objectType == 3">
{{userInfo.salesman.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 == 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 == 5">{{userInfo.store.name}}
<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>
<!-- 业务员 --> <!-- 业务员 -->
@ -25,7 +33,7 @@
</view> </view>
</view> </view>
<!-- 非业务员 --> <!-- 非业务员 -->
<view class="width94 mart15" v-if="userInfo.secUser.objectType != 3"> <view class="width94 mart15" 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.tradeSum}}</view> <view class="width100 mart15 font22">{{auditnum.tradeSum}}</view>
@ -108,12 +116,13 @@
title: '收款记录', title: '收款记录',
url: '../../index/collectNotes/collectNotes', url: '../../index/collectNotes/collectNotes',
img: '../../../static/img/home1.png' img: '../../../static/img/home1.png'
},
{
title: '绑定设备',
url: '../../index/serviceBuild/serviceBuild',
img: '../../../static/img/home2.png'
} }
// ,
// {
// title: '绑定设备',
// url: '../../index/serviceBuild/serviceBuild',
// img: '../../../static/img/home2.png'
// }
] ]
return; return;
} }
@ -186,6 +195,12 @@
url: item url: item
}) })
}, },
//跳转记录
jumpaudt() {
uni.navigateTo({
url: '../../index/collectNotes/collectNotes'
})
},
//跳转消息中心 //跳转消息中心
jumpmescon() { jumpmescon() {
uni.navigateTo({ uni.navigateTo({

BIN
static/img/del.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

2
unpackage/dist/build/h5/index.html vendored
Unescape View File

@ -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)')) <!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.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/cweb/static/js/chunk-vendors.5a385107.js></script><script src=/cweb/static/js/index.99c0918b.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.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/cweb/static/js/chunk-vendors.5a385107.js></script><script src=/cweb/static/js/index.3ace2746.js></script></body></html>

1
unpackage/dist/build/h5/static/js/pages-index-addStore-addStore.e1c484c6.js vendored
View File

File diff suppressed because one or more lines are too long

BIN
unpackage/dist/build/h5/归档.zip vendored
View File

Binary file not shown.
Write Preview
Loading…
Cancel
Save