From 1aa634071fa932854f8255e86c41413ce24de582 Mon Sep 17 00:00:00 2001 From: "3321822538@qq.com" <3321822538@qq.com> Date: Fri, 2 Aug 2024 18:00:50 +0800 Subject: [PATCH] 1.0.9 --- page_components/bindsz.vue | 2 +- page_components/fuwu/index.vue | 417 +++++++++--------- page_components/miyao.vue | 9 +- page_components/newtaocan.vue | 20 +- page_fenbao/HM-dragSorts/HM-dragSorts.vue | 3 +- page_fenbao/statulist/fault/yichang/index.vue | 114 ++--- page_fenbao/statulist/merchant/index.vue | 25 +- .../statulist/myshop/editshop/index.vue | 35 +- .../statulist/myshop/shopdetail/index.vue | 6 +- page_fenbao/statulist/myshop/shopxx/index.vue | 14 +- .../statulist/taocanlist/addtaocan/index.vue | 60 ++- page_fenbao/statulist/taocanlist/index.vue | 12 +- page_user/Feedback.vue | 34 +- page_user/HM-dragSorts/HM-dragSorts.vue | 2 +- page_user/sbdetail.vue | 18 +- page_user/setting.vue | 20 +- page_user/switchs.vue | 2 +- page_user/upload.vue | 4 +- page_user/yetx.vue | 32 +- pages/index/index.vue | 115 ++--- pages/my.vue | 2 +- pages/shouye/index.vue | 84 +--- pages/tj.vue | 22 - 23 files changed, 525 insertions(+), 527 deletions(-) diff --git a/page_components/bindsz.vue b/page_components/bindsz.vue index 2aadd32..ffe5f45 100644 --- a/page_components/bindsz.vue +++ b/page_components/bindsz.vue @@ -583,7 +583,7 @@ let that = this uni.showModal({ title: '提示', - content: '当前未创建店铺，是否去创建店铺？', + content: '未创建店铺，是否去创建店铺？', success: function(res) { if (res.confirm) { uni.navigateTo({ diff --git a/page_components/fuwu/index.vue b/page_components/fuwu/index.vue index d0f10ad..f9c9993 100644 --- a/page_components/fuwu/index.vue +++ b/page_components/fuwu/index.vue @@ -69,7 +69,7 @@ ￥{{item.price}} - + 该设备暂无套餐... @@ -100,7 +100,6 @@ 立即支付 - @@ -136,190 +135,118 @@ dingobj: {}, suitTimeUnit:'', zfflag:true, - prices:'' + prices:'', + sceneValue:'' } }, onLoad(option) { - this.$u.get("/app/user/userInfo").then((res) => { - if (res.code == 200) { - if (option.q) { - function getQueryParam(url, paramName) { - let regex = new RegExp(`[?&]${paramName}=([^&]*)`); - let results = regex.exec(url); - return results ? decodeURIComponent(results[1].replace(/\+/g, ' ')) : null; - } - let sceneValue = option.q - let decodedValue = decodeURIComponent(sceneValue); - this.id = getQueryParam(decodedValue, 's') - - let that = this - let data = { - deviceNo: that.id - } - that.$u.get(`/app/device/isBind?deviceNo=${that.id}`).then(res => { - if (res.data == 2) { - that.$u.get(`/app/device/${that.id}/withSuitList`).then((res) => { - if (res.code == 200) { - that.$u.get(`/app/device/${that.id}/bySn`).then((res) => { - if (res.code == 200) { - that.mac = 'CTKG-' + res.data.mac - that.onlineStatus = res.data.onlineStatus - if (that.onlineStatus == 0) { - // 一开始搜索设备 - xBlufi.initXBlufi(1) - xBlufi.listenDeviceMsgEvent(true, that.funListenDeviceMsgEvent); - xBlufi.notifyStartDiscoverBle({ - 'isStart': true - }) - setTimeout(() => { - xBlufi.notifyStartDiscoverBle({ - 'isStart': false - }) - if (that.devicesList.length > 0) { - xBlufi.notifyConnectBle({ - isStart: true, - deviceId: that.deviceId, - name: that.name - }) - } - }, 2000) - } - } - }) - } - }) - } else if (res.data == 1) { - console.log(111); - uni.showModal({ - title: '提示', - content: '该设备未绑定,你需进行绑定吗？', - success: function(res) { - if (res.confirm) { - that.$u.put("/app/device/bind", data).then(res => { - if(res.code == 200){ - that.$u.get(`/app/device/${that.id}/bySn`).then((res) => { - if (res.code == 200) { - uni.navigateTo({ - url: '/page_components/bindsz?id=' + res.data.deviceId - }) - } - }) - } - }) - } else if (res.cancel) { - - } - } - }) - } else if (res.data == 0) { - uni.showModal({ - title: '提示', - content: '该设备未录入,你需进行录入吗？', - success: function(res) { - if (res.confirm) { - uni.navigateTo({ - url: '/page_fenbao/zhuce?sn=' + that.id - }) - } else if (res.cancel) { - - } - } - }) - } - }) - - this.startTimer() - this.gettaoc() - // this.getmac() - - } else { - this.id = option.id - - let that = this - let data = { - deviceNo: that.id - } - that.$u.get(`/app/device/isBind?deviceNo=${that.id}`).then(res => { - if (res.data == 2) { - that.$u.get(`/app/device/${that.id}/withSuitList`).then((res) => { - if (res.code == 200) { - that.$u.get(`/app/device/${that.id}/bySn`).then((res) => { - if (res.code == 200) { - that.mac = 'CTKG-' + res.data.mac - that.onlineStatus = res.data.onlineStatus - if (that.onlineStatus == 0) { - // 一开始搜索设备 - xBlufi.initXBlufi(1) - xBlufi.listenDeviceMsgEvent(true, that.funListenDeviceMsgEvent); - xBlufi.notifyStartDiscoverBle({ - 'isStart': true - }) - setTimeout(() => { - xBlufi.notifyStartDiscoverBle({ - 'isStart': false - }) - if (that.devicesList.length > 0) { - xBlufi.notifyConnectBle({ - isStart: true, - deviceId: that.deviceId, - name: that.name - }) - } - }, 2000) - } - } - }) - } - }) - } else if (res.data == 1) { - console.log(222); - uni.showModal({ - title: '提示', - content: '该设备未绑定,你需进行绑定吗？', - success: function(res) { - if (res.confirm) { - that.$u.put("/app/device/bind", data).then(res => { - if(res.code == 200){ - that.$u.get(`/app/device/${that.id}/bySn`).then((res) => { - if (res.code == 200) { - uni.navigateTo({ - url: '/page_components/bindsz?id=' + res.data.deviceId - }) - } - }) - } - }) - } else if (res.cancel) { - - } - } - }) - } else if (res.data == 0) { - uni.showModal({ - title: '提示', - content: '该设备未录入,你需进行录入吗？', - success: function(res) { - if (res.confirm) { - uni.navigateTo({ - url: '/page_fenbao/zhuce?sn=' + that.id - }) - } else if (res.cancel) { - - } - } - }) - } - }) - this.startTimer() - this.gettaoc() - // this.getmac() - } - } else { - uni.reLaunch({ - url: '/pages/login/login?id=' + 1 - }) + if (option.q) { + function getQueryParam(url, paramName) { + let regex = new RegExp(`[?&]${paramName}=([^&]*)`); + let results = regex.exec(url); + return results ? decodeURIComponent(results[1].replace(/\+/g, ' ')) : null } - }) + this.sceneValue = option.q + let decodedValue = decodeURIComponent(this.sceneValue); + this.id = getQueryParam(decodedValue, 's') + // this.$u.get("/app/user/userInfo").then((res) => { + // if (res.code == 200) { + // this.getone() + // } else { + // uni.navigateTo({ + // url: '/pages/login/login?id=' + 1 + // }) + // } + // }) + } else { + this.id = option.id + // this.$u.get("/app/user/userInfo").then((res) => { + // if (res.code == 200) { + // this.getone() + // } else { + // uni.navigateTo({ + // url: '/pages/login/login?id=' + 1 + // }) + // } + // }) + // let that = this + // let data = { + // deviceNo: that.id + // } + // that.$u.get(`/app/device/isBind?deviceNo=${that.id}`).then(res => { + // if (res.data == 2) { + // that.$u.get(`/app/device/${that.id}/withSuitList`).then((res) => { + // if (res.code == 200) { + // that.$u.get(`/app/device/${that.id}/bySn`).then((res) => { + // if (res.code == 200) { + // that.mac = 'CTKG-' + res.data.mac + // that.onlineStatus = res.data.onlineStatus + // if (that.onlineStatus == 0) { + // // 一开始搜索设备 + // xBlufi.initXBlufi(1) + // xBlufi.listenDeviceMsgEvent(true, that.funListenDeviceMsgEvent); + // xBlufi.notifyStartDiscoverBle({ + // 'isStart': true + // }) + // setTimeout(() => { + // xBlufi.notifyStartDiscoverBle({ + // 'isStart': false + // }) + // if (that.devicesList.length > 0) { + // xBlufi.notifyConnectBle({ + // isStart: true, + // deviceId: that.deviceId, + // name: that.name + // }) + // } + // }, 2000) + // } + // } + // }) + // } + // }) + // } else if (res.data == 1) { + // console.log(222); + // uni.showModal({ + // title: '提示', + // content: '该设备未绑定,你需进行绑定吗？', + // success: function(res) { + // if (res.confirm) { + // that.$u.put("/app/device/bind", data).then(res => { + // if(res.code == 200){ + // that.$u.get(`/app/device/${that.id}/bySn`).then((res) => { + // if (res.code == 200) { + // uni.navigateTo({ + // url: '/page_components/bindsz?id=' + res.data.deviceId + // }) + // } + // }) + // } + // }) + // } else if (res.cancel) { + + // } + // } + // }) + // } else if (res.data == 0) { + // uni.showModal({ + // title: '提示', + // content: '该设备未录入,你需进行录入吗？', + // success: function(res) { + // if (res.confirm) { + // uni.navigateTo({ + // url: '/page_fenbao/zhuce?sn=' + that.id + // }) + // } else if (res.cancel) { + + // } + // } + // }) + // } + // }) + // this.gettaoc() + } + }, computed: { @@ -343,9 +270,19 @@ }, onShow() { // this.getuserinfo() - if (this.orderno) { - // this.gethuidaio() - } + setTimeout(()=>{ + if (this.id != '') { + this.$u.get("/app/user/userInfo").then((res) => { + if (res.code == 200) { + this.getone() + } else { + uni.navigateTo({ + url: '/pages/login/login?id=' + 1 + }) + } + }) + } + },1) }, onUnload: function() { if (this.timer) { @@ -370,6 +307,87 @@ }); }, methods: { + getone(){ + let that = this + let data = { + deviceNo: that.id + } + that.$u.get(`/app/device/isBind?deviceNo=${that.id}`).then(res => { + if (res.data == 2) { + that.$u.get(`/app/device/${that.id}/withSuitList`).then((res) => { + if (res.code == 200) { + that.$u.get(`/app/device/${that.id}/bySn`).then((res) => { + if (res.code == 200) { + that.mac = 'CTKG-' + res.data.mac + that.onlineStatus = res.data.onlineStatus + if (that.onlineStatus == 0) { + // 一开始搜索设备 + xBlufi.initXBlufi(1) + xBlufi.listenDeviceMsgEvent(true, that.funListenDeviceMsgEvent); + xBlufi.notifyStartDiscoverBle({ + 'isStart': true + }) + setTimeout(() => { + xBlufi.notifyStartDiscoverBle({ + 'isStart': false + }) + if (that.devicesList.length > 0) { + xBlufi.notifyConnectBle({ + isStart: true, + deviceId: that.deviceId, + name: that.name + }) + } + }, 2000) + } + } + }) + } + }) + } else if (res.data == 1) { + console.log(111); + uni.showModal({ + title: '提示', + content: '该设备未绑定,你需进行绑定吗？', + success: function(res) { + if (res.confirm) { + that.$u.put("/app/device/bind", data).then(res => { + if(res.code == 200){ + that.$u.get(`/app/device/${that.id}/bySn`).then((res) => { + if (res.code == 200) { + uni.navigateTo({ + url: '/page_components/bindsz?id=' + res.data.deviceId + }) + } + }) + } + }) + } else if (res.cancel) { + + } + } + }) + } else if (res.data == 0) { + uni.showModal({ + title: '提示', + content: '该设备未录入,你需进行录入吗？', + success: function(res) { + if (res.confirm) { + uni.navigateTo({ + url: '/page_fenbao/zhuce?sn=' + that.id + }) + } else if (res.cancel) { + + } + } + }) + } + }) + this.gettaoc() + }, + + + btnshouye(){ uni.reLaunch({ url:'/pages/shouye/index' @@ -415,7 +433,6 @@ }) } }) - }, gettrue() { @@ -438,11 +455,6 @@ } }) }, - startTimer() { - this.timer = setInterval(() => { - // this.gettaoc(); - }, 30000); - }, getmac() { this.$u.get(`/app/device/${this.id}/bySn`).then((res) => { if (res.code == 200) { @@ -455,15 +467,7 @@ this.$u.get(`/app/device/${this.id}/withSuitList`).then((res) => { if (res.code == 200) { this.deviceobj = res.data; - // this.indexactive = res.data.suitList[0].suitId; this.zfobj = res.data.suitList[0] - // let targetDateStr = this.deviceobj.expireTime - // let targetParts = targetDateStr.split(/[- :]/); - // let targetDate = new Date(targetParts[0], targetParts[1] - 1, targetParts[2], targetParts[3], targetParts[4], targetParts[5]); - // let now = new Date(); - // let differenceInMs = targetDate - now; - // let differenceInMinutes = Math.floor(differenceInMs / (1000 * 60)); - // this.expireTimeStr = parseInt(differenceInMinutes) <= 0 ? '0' : differenceInMinutes let targetDateStr = this.deviceobj.expireTime; let targetParts = targetDateStr.split(/[- :]/); let targetDate = new Date(targetParts[0], targetParts[1] - 1, targetParts[2], targetParts[3], targetParts[4], targetParts[5]); @@ -503,7 +507,7 @@ that.$u.post('/app/bill/recharge', data).then((res) => { if (res.code == 200) { that.orderno = res.data - console.log(this.prices); + // console.log(this.prices); if(this.prices == 0){ that.$u.put(`/app/bill/${that.orderno}/refreshPayResult`).then(res => {}) // 支付成功逻辑 @@ -512,7 +516,7 @@ }) uni.setStorageSync('time', that.expireTimeStr) }else{ - console.log('不是0元购'); + // console.log('不是0元购'); that.$u.get(`/app/pay/wx/${that.orderno}`).then((res) => { if (res.code == 200) { uni.requestPayment({ @@ -524,7 +528,7 @@ paySign: res.data.paySign, success: (res) => { this.zhifuflag = true - console.log(res, '支付成功'); + // console.log(res, '支付成功'); if (that.timer) { clearInterval(this.timer); that.timer = null; @@ -607,9 +611,9 @@ x if(this.prices == 0){ that.$u.get('/app/bill/recharge/device/fail/list').then(res => { if (res.code == 200) { - console.log('获取订单状态',res); + // console.log('获取订单状态',res); let dingobj = res.data[0].billNo - console.log(dingobj,'订单号'); + // console.log(dingobj,'订单号'); uni.getNetworkType({ success(res) { if (res.networkType !== 'none') { @@ -661,7 +665,6 @@ x clearInterval(this.timer); that.timer = null; } - // 111111111111111111111111 that.$u.get(`/app/pay/result/${this.orderno}`).then(res =>{ if(res.code == 200){ @@ -704,7 +707,6 @@ x }) } }) - // 支付成功逻辑 uni.setStorageSync('time', that.expireTimeStr) }, @@ -725,7 +727,6 @@ x } }) } - } else if (res.code == 401) { uni.reLaunch({ url: '/pages/login/login' @@ -735,7 +736,6 @@ x } }) } - } }, //选择套餐 @@ -786,7 +786,6 @@ x // }) } }) - } break; case xBlufi.XBLUFI_TYPE.TYPE_CONNECTED: diff --git a/page_components/miyao.vue b/page_components/miyao.vue index 8550bdc..ccccd8b 100644 --- a/page_components/miyao.vue +++ b/page_components/miyao.vue @@ -57,7 +57,7 @@ - + @@ -66,6 +66,7 @@ export default { data() { return { + btnmsk:false, bgc: { backgroundColor: "#8883f0", }, @@ -95,6 +96,7 @@ this.maskflag = false }, btnsq(){ + this.btnmsk = true this.$u.post(`/app/access`).then(res => { if (res.code == 200) { uni.showToast({ @@ -102,6 +104,7 @@ icon: 'success', duration: 2000 }) + this.btnmsk = false this.getcha() } else { uni.showToast({ @@ -109,13 +112,16 @@ icon: 'none', duration: 2000 }) + this.btnmsk = false } }) }, btncz(){ + this.btnmsk = true this.$u.put(`/app/access/${this.accessId}/reset`).then(res =>{ if(res.code == 200){ this.maskflag = true + this.btnmsk = false this.miyao = res.data }else{ uni.showToast({ @@ -123,6 +129,7 @@ icon: 'none', duration: 2000 }) + this.btnmsk = false } }) }, diff --git a/page_components/newtaocan.vue b/page_components/newtaocan.vue index 7c6d364..6d26f4c 100644 --- a/page_components/newtaocan.vue +++ b/page_components/newtaocan.vue @@ -22,7 +22,7 @@ :listBackgroundColor='F7FAFE'> - + 该设备暂无套餐 @@ -31,7 +31,7 @@ - + @@ -45,6 +45,7 @@ }, data() { return { + btnmsk:false, list: [], loading:false, disabled: false, @@ -61,7 +62,8 @@ backgroundColor: "#8883f0", }, newobj:[], - tcidlist:'' + tcidlist:'', + listflag:false }; }, onLoad(option) { @@ -69,6 +71,7 @@ this.deviceId = option.id }, onShow() { + this.btnmsk = false this.tcidlist = [] this.list = [] this.newobj = [] @@ -135,8 +138,11 @@ // isActive: false // })) this.newobj = this.list - console.log(this.list); - this.loading = true + if(this.list.length > 0){ + this.listflag = false + }else{ + this.listflag = true + } } }) }, @@ -169,6 +175,7 @@ }) }, btnadd(){ + this.btnmsk = true uni.navigateTo({ url:'/page_fenbao/statulist/taocanlist/addtaocan/index?id=' + this.deviceId }) @@ -207,13 +214,14 @@ .page { width: 750rpx; - padding-bottom: 400rpx; + padding-bottom: 220rpx; .box { width: 750rpx; height:100%; background: #F4F5F7; border-radius: 0rpx 0rpx 0rpx 0rpx; padding: 50rpx; + padding-top: 30rpx !important; .anniu{ position: fixed; bottom: 0; diff --git a/page_fenbao/HM-dragSorts/HM-dragSorts.vue b/page_fenbao/HM-dragSorts/HM-dragSorts.vue index d6c02db..e000731 100644 --- a/page_fenbao/HM-dragSorts/HM-dragSorts.vue +++ b/page_fenbao/HM-dragSorts/HM-dragSorts.vue @@ -227,7 +227,7 @@ // 是否开启长按拖动 longTouch: { value: Boolean, - default: false + default: true }, autoScroll: { value: Boolean, @@ -369,7 +369,6 @@ this.pushWxsData('lastInitTime', (new Date()).valueOf()); }, loadShadowRow(e) { - this.shadowRow = this.getMoveRow(e.rowSort); }, diff --git a/page_fenbao/statulist/fault/yichang/index.vue b/page_fenbao/statulist/fault/yichang/index.vue index f9864243..699895c 100644 --- a/page_fenbao/statulist/fault/yichang/index.vue +++ b/page_fenbao/statulist/fault/yichang/index.vue @@ -52,6 +52,7 @@ 上报 + @@ -59,6 +60,7 @@ export default { data() { return { + btnmsk:false, yuanyi:'', name:'', phone:'', @@ -109,61 +111,65 @@ }, btnshangb(){ - let data = { - deviceNo:this.deviceNo, - content:this.yuanyi, - name:this.name, - mobile:this.phone, - address:this.dizhi - } - this.$u.post('/app/abnormal/submit',data).then(res => { - if(this.deviceNo == ''){ - uni.showToast({ - title: '设备编号不能为空', - icon: 'none', - duration: 1000 - }); - }else if(this.yuanyi == ''){ - uni.showToast({ - title: '故障原因不能为空', - icon: 'none', - duration: 1000 - }); - }else if(this.name == ''){ - uni.showToast({ - title: '姓名不能为空', - icon: 'none', - duration: 1000 - }); - }else if(this.dizhi == ''){ - uni.showToast({ - title: '地址不能为空', - icon: 'none', - duration: 1000 - }); - }else { - if (res.code == 200) { - uni.showToast({ - title: '上报成功', - icon: 'success', - duration: 1000 - }) - setTimeout(()=>{ - uni.navigateBack() - },1000) - } else if (res.code == 401) { - uni.reLaunch({ - url:'/pages/login/login' - }) - }else if(res.code == 500){ - uni.showToast({ - title: res.msg, - icon: 'none', - duration: 1000 - }); - } + if(this.deviceNo == ''){ + uni.showToast({ + title: '设备编号不能为空', + icon: 'none', + duration: 1000 + }); + }else if(this.yuanyi == ''){ + uni.showToast({ + title: '故障原因不能为空', + icon: 'none', + duration: 1000 + }); + }else if(this.name == ''){ + uni.showToast({ + title: '姓名不能为空', + icon: 'none', + duration: 1000 + }); + }else if(this.dizhi == ''){ + uni.showToast({ + title: '地址不能为空', + icon: 'none', + duration: 1000 + }); + }else { + this.btnmsk = true + let data = { + deviceNo:this.deviceNo, + content:this.yuanyi, + name:this.name, + mobile:this.phone, + address:this.dizhi } - }) + this.$u.post('/app/abnormal/submit',data).then(res => { + if (res.code == 200) { + uni.showToast({ + title: '上报成功', + icon: 'success', + duration: 1000 + }) + setTimeout(()=>{ + this.btnmsk = false + uni.navigateBack() + },1000) + } else if (res.code == 401) { + uni.reLaunch({ + url:'/pages/login/login' + }) + this.btnmsk = false + }else if(res.code == 500){ + uni.showToast({ + title: res.msg, + icon: 'none', + duration: 1000 + }) + this.btnmsk = false + } + }) + } } } } diff --git a/page_fenbao/statulist/merchant/index.vue b/page_fenbao/statulist/merchant/index.vue index a7a017a..45b716d 100644 --- a/page_fenbao/statulist/merchant/index.vue +++ b/page_fenbao/statulist/merchant/index.vue @@ -3,7 +3,7 @@ - 请输入您的真实有效信息，我们将在第一时间联系您 + 请您输入真实有效信息，我们将在第一时间联系您！ @@ -21,10 +21,15 @@ - 请填写真实信息，感谢您的配合！ + - - + + 审核通过后，即可创建店铺，店铺中的设备可在地图中被发现！ + + + 提交申请 + + 提交申请 @@ -38,7 +43,8 @@ return { name:'', phone:'', - cont:'' + cont:'', + tjflag:true } }, // 分享到好友（会话） @@ -87,6 +93,7 @@ duration: 1000 }); }else{ + this.tjflag = false let data = { name:this.name, mobile:this.phone, @@ -97,25 +104,31 @@ uni.reLaunch({ url:'/pages/login/login' }) + this.tjflag = true }else if(res.msg == '商家不允许重复申请') { uni.showToast({ title: '商家不允许重复申请', icon: 'none', duration: 1000 }) + setTimeout(()=>{ + this.tjflag = true + },1000) }else if(res.code == 500){ uni.showToast({ title: res.msg, icon: 'none', duration: 1000 }) + this.tjflag = true }else{ uni.showToast({ title: '申请成功', icon: 'success', duration: 1000 - }); + }) setTimeout(()=>{ + this.tjflag = true uni.navigateBack() },1000) } diff --git a/page_fenbao/statulist/myshop/editshop/index.vue b/page_fenbao/statulist/myshop/editshop/index.vue index a7ec512..2f37dd8 100644 --- a/page_fenbao/statulist/myshop/editshop/index.vue +++ b/page_fenbao/statulist/myshop/editshop/index.vue @@ -87,7 +87,9 @@ - + + + @@ -96,6 +98,7 @@ export default { data() { return { + btnmsk:false, checked:false, params: { hour: true, @@ -173,6 +176,7 @@ this.checked = this.listobj.show if (this.selectorvalue == 1) { this.selectortext = '商场' + this.updateTime = this.listobj.updateTime } else if (this.selectorvalue == 2) { this.selectortext = '学校' } else if (this.selectorvalue == 3) { @@ -252,62 +256,63 @@ title: '请输入店铺名称', icon: 'none', duration: 1000 - }); + }) } else if (this.selectortext == '请选择商铺类型') { uni.showToast({ title: '请选择商铺类型', icon: 'none', duration: 1000 - }); + }) } else if (this.ksyy == '开始营业时间') { uni.showToast({ title: '请选择开始营业时间', icon: 'none', duration: 2000 - }); + }) } else if (this.jsyy == '结束营业时间') { uni.showToast({ title: '请选择结束营业时间', icon: 'none', duration: 2000 - }); + }) } else if (this.regiontext == '请选择省市区') { uni.showToast({ title: '请选择省市区', icon: 'none', duration: 1000 - }); + }) } else if (this.lxname == '') { uni.showToast({ title: '请输入联系人', icon: 'none', duration: 1000 - }); + }) } else if (this.lxphone == '') { uni.showToast({ title: '请输入联系电话', icon: 'none', duration: 1000 - }); + }) }else if (this.longitude == '请输入经度') { uni.showToast({ title: '请点击地图图标选择地址', icon: 'none', duration: 1000 - }); + }) } else if (this.xqdz == '') { uni.showToast({ title: '请输入详细地址', icon: 'none', duration: 1000 - }); + }) } else if (this.imglist == '') { uni.showToast({ title: '请上传一张商铺门面照', icon: 'none', duration: 1000 - }); + }) } else { + this.btnmsk = true let data = { name: this.shopname, picture: this.imglist, @@ -333,6 +338,7 @@ icon: 'success', duration: 1000 }) + this.btnmsk = false } else { uni.showToast({ title: '修改成功', @@ -340,6 +346,7 @@ duration: 1000 }) setTimeout(() => { + this.btnmsk = false uni.navigateBack({ delta: 2 }) @@ -384,7 +391,7 @@ }); } } - }); + }) }, @@ -393,7 +400,7 @@ if (res.code == 200) { this.token = res.token } - }); + }) }, btn() { let _this = this @@ -418,7 +425,7 @@ _this.imglist = _this.userImgs _this.imgflag = false } - }); + }) } }) }, diff --git a/page_fenbao/statulist/myshop/shopdetail/index.vue b/page_fenbao/statulist/myshop/shopdetail/index.vue index bd3bb98..1b8f3d3 100644 --- a/page_fenbao/statulist/myshop/shopdetail/index.vue +++ b/page_fenbao/statulist/myshop/shopdetail/index.vue @@ -37,7 +37,7 @@ - + @@ -46,6 +46,7 @@ export default { data() { return { + btnmsk:false, list: [{ value: '1', label: '扫码添加' @@ -147,6 +148,7 @@ content: '你确定要注销这个店铺吗？', success: function(res) { if (res.confirm) { + this.btnmsk = true vm.$u.delete("/app/store/" + vm.storeId).then(res => { if (res.code == 200) { uni.showToast({ @@ -155,6 +157,7 @@ duration: 1000 }) setTimeout(() => { + this.btnmsk = false uni.navigateBack() }, 1500) } else if (res.code == 500) { @@ -163,6 +166,7 @@ icon: 'success', duration: 1000 }) + this.btnmsk = false } }) } else if (res.cancel) { diff --git a/page_fenbao/statulist/myshop/shopxx/index.vue b/page_fenbao/statulist/myshop/shopxx/index.vue index 4b46957..211876f 100644 --- a/page_fenbao/statulist/myshop/shopxx/index.vue +++ b/page_fenbao/statulist/myshop/shopxx/index.vue @@ -90,7 +90,9 @@ - + + + @@ -99,6 +101,7 @@ export default { data() { return { + btnmsk:false, checked:true, params: { hour: true, @@ -274,6 +277,7 @@ duration: 1000 }); } else { + this.btnmsk = true let data = { name: this.shopname, picture: this.imglist, @@ -300,7 +304,15 @@ }) setTimeout(()=>{ uni.navigateBack() + this.btnmsk = false },1000) + }else{ + uni.showToast({ + title: res.msg, + icon: 'none', + duration: 1000 + }) + this.btnmsk = false } }) } diff --git a/page_fenbao/statulist/taocanlist/addtaocan/index.vue b/page_fenbao/statulist/taocanlist/addtaocan/index.vue index 5553365..799d8de 100644 --- a/page_fenbao/statulist/taocanlist/addtaocan/index.vue +++ b/page_fenbao/statulist/taocanlist/addtaocan/index.vue @@ -48,7 +48,7 @@ 详细说明 -