1.功能调整

2.修改绑定设备方式
huipay-master
杨杰 3 years ago
parent 942ed4cb03
commit cb1ec4fab7
  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

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

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

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

@ -74,7 +74,10 @@
<image src="../../../static/img/store/store10.png" mode="widthFix" class="iconw"></image>
<view class="margle10 font14 fcor999 width90p">{{item.storeRegion.address}}</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>
</view>
@ -165,9 +168,9 @@
})
},
//
jumpService(item) {
jumpService(item, items) {
uni.navigateTo({
url: '../serviceBuild/serviceBuild?id=2&storeid=' + item
url: '../serviceBuild/serviceBuild?storeid=' + item + '&type=' + items
})
}
}
@ -210,13 +213,14 @@
.btns {
width: 25%;
margin-left: 68%;
float: right;
height: 35px;
line-height: 35px;
background-color: #0083f5;
color: #FFFFFF;
font-weight: bold;
font-size: 14px;
padding: 0px;
}
.lin10 {

@ -97,7 +97,7 @@
</view>
<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>
<text class="width90p">若营业执照上无名称请填写个体户XXX(XXX为营业执照上经营者姓名)</text>
<text class="width90p">若营业执照上无名称请填写个体工商户XXX(XXX为营业执照上经营者姓名)</text>
</view>
<view class="username" v-if="merchantId != 3">
<view class="namecont">营业执照号</view>
@ -332,17 +332,19 @@
<image src="../../../static/img/jtg.png" mode="widthFix" class="iconw"></image>
</view>
<!-- 非法人结算 -->
<!-- <view class="titlename fcor666">非法人结算授权书</view>
<view class="width94 displ">
<image src="../../../static/img/businesslic7.png" mode="widthFix" class="width45"
<view class="titlename fcor666" v-if="lementId == 3">非法人结算授权书</view>
<view class="width94 displ" v-if="lementId == 3">
<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>
<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 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="width70 aliitem fcor666">
非法人身份证照片
@ -427,11 +429,11 @@
<input placeholder="请输入开户行号" v-model="openingbankNo" style="width: 70%;"
placeholder-style="color: #bfbfbf;font-size:14px;padding-top:2px;" />
</view> -->
<view class="username">
<!-- <view class="username">
<view class="namecont">所属支行</view>
<input placeholder="请输入所属支行" v-model="belongbranch" style="width: 70%;"
placeholder-style="color: #bfbfbf;font-size:14px;padding-top:2px;" />
</view>
</view> -->
<view class="username">
<view class="namecont">银行卡号</view>
<input placeholder="请输入银行卡号" v-model="bankNo" style="width: 70%;"
@ -452,10 +454,13 @@
电子协议
</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"
:src="imgsUrl+electronicProtocolimg" v-if="electronicProtocolimg" @click="upload(9)"></image>
<image src="../../../static/img/businesslic12.png" mode="widthFix" class="width100" v-else
:src="imgsUrl+item"></image>
</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>
</view>
<!-- <view class="username">
@ -546,11 +551,11 @@
<!--第四步 未录入门店信息 -->
<view class="width100 mart10 backcorfff" v-if="merchart == 4">
<view class="username">
<!-- <view class="username">
<view class="namecont">门店账号</view>
<input placeholder="请输入6-20位门店账号" maxlength="20" v-model="storeaccount" style="width: 70%;"
placeholder-style="color: #bfbfbf;font-size:14px;padding-top:2px;" />
</view>
</view> -->
<view class="username">
<view class="namecont">门店名称</view>
<input placeholder="请输入门店名称" v-model="storename" style="width: 70%;"
@ -730,12 +735,12 @@
uncorporsettelimg: '', //
settleimg: '', //
accopenperimg: '', //
electronicProtocolimg:'', //
electronicProtocolimg: [], //
// openingbankNo: '', //
bankNo: '', //
bankName: '', //
belongbank: '', //
belongbranch: '', //
// belongbranch: '', //
// clearbankNo: '', //
storeaccount: '', //
storename: '', //
@ -753,6 +758,7 @@
mccno: '', //mcc
defaultRegion: ['北京市', '市辖区', '东城区'], //
defaultRegionCode: '110101', //
regionName:'',
businessLicenselist: [], //
bankCardlist: [], //
idCardzm: [], //
@ -772,12 +778,12 @@
endDate() {
return this.getDate('end');
},
//
regionName() {
//
this.areaCode = this.region.map(item => item.code)[2];
return this.region.map(item => item.name).join('-');
}
// //
// regionName() {
// //
// this.areaCode = this.region.map(item => item.code)[2];
// this.regionName = this.region.map(item => item.name).join('-');
// }
},
onLoad(options) {
this.merId = options.id;
@ -822,6 +828,8 @@
//
handleGetRegion(region) {
this.region = region;
this.areaCode = this.region.map(item => item.code)[2];
this.regionName = this.region.map(item => item.name).join('-');
},
//
showjob() {
@ -1004,8 +1012,12 @@
that.storeimg3 = JSON.parse(uploadFileRes.data).return_data[0];
}
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) {
uni.showLoading({
@ -1216,6 +1232,8 @@
this.companyname = res.return_data.blisName;
this.businnum = res.return_data.blisNo
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) {
this.start_date = res.return_data.blisPeriodStart;
}
@ -1257,13 +1275,15 @@
}
this.lementId = res.return_data.merSettleAcct.settleType;
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.bankName = res.return_data.merSettleAcct.bankCardHolder;
this.openingbankNo = res.return_data.merSettleAcct.openningBankCode;
this.belongbank = res.return_data.merSettleAcct.bankName;
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;
if (this.merchart == 3) {
this.idcardname = res.return_data.merSettleAcct.settleIdCardName;
@ -1599,6 +1619,16 @@
return;
}
}
if (that.lementId == 3) {
if (!that.uncorporsettelimg) {
uni.showToast({
title: '请上授权书',
icon: "none",
duration: 2000
});
return;
}
}
if (that.lementId == 3) {
if (!that.idcardposimg) {
uni.showToast({
@ -1661,14 +1691,14 @@
// return;
// }
if (!that.belongbranch) {
uni.showToast({
title: '请填写所属支行',
icon: "none",
duration: 2000
});
return;
}
// if (!that.belongbranch) {
// uni.showToast({
// title: '',
// icon: "none",
// duration: 2000
// });
// return;
// }
if (!that.bankNo) {
uni.showToast({
title: '请填写银行卡号',
@ -1725,6 +1755,7 @@
that.cardend_date = '长期有效'
}
}
let imgsqes = that.electronicProtocolimg.join(';');
uni.showLoading({
title: '提交中...'
})
@ -1732,16 +1763,17 @@
"merId": that.merId,
"settleType": that.lementId, // 1 2 3,
"bankCardImg": that.settleimg, //"",
"openningBankName": that.belongbranch, //"",
// "openningBankName": that.belongbranch, //"",
"bankCardNo": that.bankNo, //"",
"bankCardHolder": that.bankName, //"",
// "openningBankCode": that.openingbankNo, //"",
"bankName": that.belongbank, //"",
"openningBankLicenseUrl": that.accopenperimg, //"",
"electronicPact":that.electronicProtocolimg, //
"electronicPact":imgsqes, //
// "clearingBankCode": that.clearbankNo, //"",
"settleIdCardName": that.idcardname, //
"settleIdCardNo": that.idcard, //
"commissionImg":that.uncorporsettelimg, //
"settleIdPeriodType": that.idcardtime, // 1 2,
"settleIdCardPortraitImg": that.idcardposimg, //"",
"settleIdCardNationalEmblemImg": that.idcardsideimg, //"",
@ -1775,14 +1807,14 @@
//
submitsotre() {
let that = this;
if (!that.storeaccount) {
uni.showToast({
title: '请填写门店账号',
icon: "none",
duration: 2000
});
return;
}
// if (!that.storeaccount) {
// uni.showToast({
// title: '',
// icon: "none",
// duration: 2000
// });
// return;
// }
if (!that.storename) {
uni.showToast({
title: '请填写门店名称',
@ -1833,9 +1865,9 @@
})
let datas = {
"merId": that.merId,
"account": {
"loginName": that.storeaccount
},
// "account": {
// "loginName": that.storeaccount
// },
"name": that.storename,
"telephone": that.storephone,
"doorHeadImg": that.storeimg1,
@ -1905,6 +1937,11 @@
}
}
.chachaimg{
width: 20px;
float: right;
}
.lineh {
width: 13.3%;
height: 1px;

@ -48,13 +48,13 @@
},
data() {
return {
tabs: ["正常", "编辑中", "审核中", "审核失败", "违规"],
tabs: ["编辑中", "审核中", "审核失败", "违规","正常"],
current: 0, // tabs
merchantlist: [],
pageNum: 1,
pagesize: 10,
isLoadMore: false, //
merstu: 1 // 1 2 4 5 6
merstu: 2 // 2 3 4 5 1
}
},
onLoad() {
@ -96,26 +96,40 @@
change(index) {
this.$refs.tabs.setFinishCurrent(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.pageNum = 1;
this.getMerListBySalesman();
},
//
jumpmerdes(ids) {
if (this.current == 1 || this.current == 3) {
if (this.merstu == 2 || this.merstu == 4) {
uni.navigateTo({
url: '../merchant-incoming-parts/merchant-incoming-parts?id=' + ids
})
}
if (this.current == 2) {
if (this.merstu == 3) {
uni.showToast({
title: '审核中',
duration: 2000,
icon: 'none'
})
}
if (this.current == 0 || this.current == 4) {
if (this.merstu == 1 || this.merstu == 5) {
uni.navigateTo({
url: '../merchant-details/merchant-details?id=' + ids
})

@ -1,23 +1,30 @@
<template>
<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>
</view>
<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="mart10 fcor666 padleft15 font14">绑定时间: {{item.createTime | timeFormat('yyyy-mm-dd')}}
{{item.createTime | timeFormat('hh:mm')}}
<view class="mart10 fcor666 padleft15 font14">绑定时间: {{item.storeBindTime | timeFormat('yyyy-mm-dd')}}
{{item.storeBindTime | timeFormat('hh:mm')}}
</view>
<button class="btns" @click="delStoreDevice(item.id)">删除设备</button>
<button class="btns" @click="bindStoreDevice(item.id)" v-if="typeId == 1">绑定设备</button>
</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>
</template>
<script>
import {
getSalesmanDeviceList,
getStoreDeviceList,
delStoreDevice
bindStoreDevice
} from '../../../Utils/Api.js';
let app = getApp();
export default {
@ -29,70 +36,127 @@
isLoadMore: false, //
userInfo: app.globalData.userInfo, //
typeId: '', //
storeId:'' //id
storeId: '', //id
deviceSn: '' //
}
},
onReachBottom() { //
if (!this.isLoadMore) { //
this.isLoadMore = true
this.pageNum += 1
this.getStoreDeviceList()
if(this.typeId == 2){
this.getStoreDeviceList();
}else{
this.getSalesmanDeviceList();
}
}
},
onLoad(options) {
this.typeId = options.id;
if(options.id == 1){
this.storeId = this.userInfo.store.id
}else{
this.typeId = options.type;
this.storeId = options.storeid;
}
},
onShow() {
this.serviceList = [];
if (options.type == 2) {
this.getStoreDeviceList();
} else {
this.getSalesmanDeviceList();
}
},
methods: {
//
jumpaddService() {
uni.navigateTo({
url: '../addService/addService?storeId='+this.storeId
})
// jumpaddService() {
// uni.navigateTo({
// 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() {
uni.showLoading({
title: '加载中...'
})
if (this.isNoMoreData) {
uni.hideLoading()
return false;
}
let pagenum = this.pageNum;
let params = {
pageNum: this.pageNum,
pageNum: pagenum,
pageSize: this.pagesize,
deviceSn: this.deviceSn,
storeId: this.storeId
}
getStoreDeviceList(params).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.pages == this.pageNum) {
if (res.return_data.total == (this.pageNum * this.pageSize)) {
this.isLoadMore = true;
}
this.pageNum = res.return_data.list.length == this.pageSize ? ++pagenum : pagenum;
} 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 {
this.serviceList = [];
this.isLoadMore = true
}
});
},
//
delStoreDevice(item) {
//
bindStoreDevice(item) {
let that = this;
uni.showModal({
title: '删除设备',
content: '是否删除当前设备呢。',
title: '绑定设备',
content: '是否绑定当前设备。',
success: (res) => {
if (res.confirm) {
uni.showLoading({
title: '提交中...'
})
let params = {
id: item
"deviceId": item,
"storeId": that.storeId
}
delStoreDevice(params).then(res => {
bindStoreDevice(params).then(res => {
uni.hideLoading();
if (res.return_code == '000000') {
uni.showToast({
@ -101,10 +165,7 @@
duration: 2000,
success() {
setTimeout(() => {
that.serviceList = [];
that.pageNum = 1;
that.isLoadMore = false;
that.getStoreDeviceList();
uni.navigateBack({})
}, 1000);
}
})
@ -121,7 +182,7 @@
}
}
});
}
},
}
}
</script>
@ -131,6 +192,37 @@
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 {
color: #306adb;
}
@ -151,5 +243,6 @@
color: #FFFFFF;
font-weight: bold;
font-size: 14px;
padding: 0px;
}
</style>

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

@ -2,7 +2,15 @@
<view>
<image mode="widthFix" class="width100 headimg" src="../../../static/img/head.png"></image>
<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>
</view>
<!-- 业务员 -->
@ -25,7 +33,7 @@
</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="width100">收款笔数</view>
<view class="width100 mart15 font22">{{auditnum.tradeSum}}</view>
@ -108,12 +116,13 @@
title: '收款记录',
url: '../../index/collectNotes/collectNotes',
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;
}
@ -186,6 +195,12 @@
url: item
})
},
//
jumpaudt() {
uni.navigateTo({
url: '../../index/collectNotes/collectNotes'
})
},
//
jumpmescon() {
uni.navigateTo({

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

@ -1,2 +1,2 @@
<!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>炫支付</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/cweb/static/index.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>

File diff suppressed because one or more lines are too long

Binary file not shown.
Loading…
Cancel
Save