Compare commits

..

No commits in common. '55730706acfa931ddd3720a727ea9c7b71d800c2' and '96c32f7a9a772e1e34ff41c7a32b94f8b234384f' have entirely different histories.

  1. 12
      Utils/Api.js
  2. 6
      pages/index/merchant-details/merchant-details.vue
  3. 98
      pages/index/mineService/mineService.vue
  4. 2
      pages/index/rateReview/rateReview.vue
  5. 2
      pages/tabBar/home/home.vue

@ -318,17 +318,5 @@ export const getNewRateApplyDetail = params => {
export const getRateApplyDetail = params => { export const getRateApplyDetail = params => {
return POST('GET', `${base}/merRate/getRateApplyDetail`, params).then(res => res.data); 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);
}

@ -92,7 +92,7 @@
<view class="height45 width100"> <view class="height45 width100">
<button class="btns mart10 margle10" @click.stop="jumpBindScan(item,1)">绑定二维码</button> <button class="btns mart10 margle10" @click.stop="jumpBindScan(item,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 margle10" @click.stop="jumpService(item.id)">绑定设备</button> <!-- <button class="btns mart10 marRight10" @click.stop="jumpService(item.id,1)">绑定设备</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>
@ -228,9 +228,9 @@
}) })
}, },
// //
jumpService(item) { jumpService(item, items) {
uni.navigateTo({ uni.navigateTo({
url: '/pages/index/mineService/mineService?id=6' + '&storeid=' + item url: '../serviceBuild/serviceBuild?storeid=' + item + '&type=' + items
}) })
}, },
// //

@ -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,item.bindStatus)"> @click="assignOrder(item.deviceNo)">
<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,13 +24,6 @@
未绑定 未绑定
</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>
@ -43,9 +36,7 @@
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 {
@ -91,7 +82,7 @@
this.buildStatus = true; this.buildStatus = true;
this.getDeviceList(); this.getDeviceList();
} }
if (this.sourceId == 2 || this.sourceId == 4 || this.sourceId == 6) { if (this.sourceId == 2 || this.sourceId == 4) {
this.buildStatus = false; this.buildStatus = false;
this.getDeviceList(); this.getDeviceList();
} }
@ -103,18 +94,12 @@
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: storeno storeId: this.storeid
} }
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 != '') {
@ -137,7 +122,7 @@
this.getDeviceList(); this.getDeviceList();
}, },
// //
assignOrder(item, item1) { assignOrder(item) {
if (this.sourceId == 2) { if (this.sourceId == 2) {
uni.showModal({ uni.showModal({
title: '温馨提示', title: '温馨提示',
@ -175,75 +160,6 @@
}); });
} }
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: '温馨提示',
@ -348,8 +264,8 @@
width: calc(100% - 60rpx); width: calc(100% - 60rpx);
display: flex; display: flex;
align-items: center; align-items: center;
margin-bottom: 4px; margin-bottom: 10px;
padding: 0 0rpx 2rpx 6rpx; padding: 0 0rpx 30rpx 14rpx;
} }
.xfimg { .xfimg {

@ -8,7 +8,7 @@
<view class="titlename width100 font18 fontwig6 fcor333">费率信息审核</view> <view class="titlename width100 font18 fontwig6 fcor333">费率信息审核</view>
<view class="width100 backcorfff"> <view class="width100 backcorfff">
<view class="notes" v-for="(item,index) in RateApplyDetail.merRateApplyDetailList" :key="index"> <view class="notes" v-for="(item,index) in RateApplyDetail.merRateApplyDetailList">
<view class="fcor666 width25">{{item.rateTypeName}}</view> <view class="fcor666 width25">{{item.rateTypeName}}</view>
<view class="font14 fcor333 text2 width75 fotrt">{{item.ratePct}} (单位: 百分之一)</view> <view class="font14 fcor333 text2 width75 fotrt">{{item.ratePct}} (单位: 百分之一)</view>
</view> </view>

@ -232,7 +232,7 @@
}, },
{ {
title: '我的设备', title: '我的设备',
url: '../../index/mineService/mineService?id=1&storeid=', url: '../../index/mineService/mineService?id=1',
img: '../../../static/img/casihr.png' img: '../../../static/img/casihr.png'
}, },
{ {

Loading…
Cancel
Save