From 647d1999397114238273fc264a7f4f53546dac70 Mon Sep 17 00:00:00 2001 From: Tuzki <1720599558@qq.com> Date: Wed, 23 Aug 2023 15:36:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=88=AA=E6=B5=81=EF=BC=8C?= =?UTF-8?q?=E6=98=B5=E7=A7=B0=E8=A1=A8=E6=83=85=E5=A4=84=E7=90=86=EF=BC=8C?= =?UTF-8?q?=E6=8A=95=E8=AF=89=E5=88=B7=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/util.js | 213 +++++++++++------- .../personcenter/EditProfile/EditProfile.vue | 51 +++-- pages/personcenter/personcenter.vue | 208 +++++++---------- .../scenic/subscribe/yuyue/yue_form_js.vue | 18 +- sunPackIndex/suggest/sug_list.vue | 4 +- 5 files changed, 257 insertions(+), 237 deletions(-) diff --git a/common/util.js b/common/util.js index 157ec71..5034c7a 100644 --- a/common/util.js +++ b/common/util.js @@ -21,21 +21,21 @@ module.exports = { // }) this.gpsObject = null; }, - getNetworkType:function(successCallbck,failCallback){ + getNetworkType: function(successCallbck, failCallback) { uni.getNetworkType({ - success: function (res) { + success: function(res) { if (successCallbck) { successCallbck(res); } - }, - fail:function(){ - if (failCallback) { - failCallback(res); - } + }, + fail: function() { + if (failCallback) { + failCallback(res); + } } }); }, - hideLoadingByTime:function(){ + hideLoadingByTime: function() { setTimeout(function() { uni.hideLoading(); }, 10000); @@ -60,9 +60,9 @@ module.exports = { param.clng = param.lng; if (this.gpsObject) { uni.showToast({ - title:"为了您的良好体验请打开GPS功能", - icon:"none", - duration:2000 + title: "为了您的良好体验请打开GPS功能", + icon: "none", + duration: 2000 }) this.gpsObject.callGpsFail(); } @@ -83,16 +83,16 @@ module.exports = { if (this.gpsObject) { uni.showToast({ - title:"为了您的良好体验请打开GPS功能", - icon:"none", - duration:2000 + title: "为了您的良好体验请打开GPS功能", + icon: "none", + duration: 2000 }) this.gpsObject.callGpsFail(); } } }, //获取安卓内容 - getAndroidData: function(code,mes,type,data){ + getAndroidData: function(code, mes, type, data) { /* mes += "---------"+type+"-------"+code+"------"+data; uni.showModal({ title:"提示", @@ -102,7 +102,7 @@ module.exports = { } }) */ if (code == "200") { - if(type == "WxUserInfo"){ + if (type == "WxUserInfo") { var wx_data = JSON.parse(data); // var unionid = "oaxUrw1nI4vDQ1ihKWlrDWIXHea0"; // uni.setStorageSync("unionid","oaxUrw1nI4vDQ1ihKWlrDWIXHea0"); @@ -111,54 +111,54 @@ module.exports = { // uni.setStorageSync("headimgurl","http://thirdwx.qlogo.cn/mmopen/vi_32/0sUibCSJ47ia4mjIib7Xs2MTVxdMyr7jhq1kj0PDnuHOd5vUbibn7MrGekMqfFjUWXLGPZurvRlKRyZc5awpA1Sa7g/132"); var unionid = wx_data.unionid; var url = wx_data.headimgurl; - url = url.substring(url.indexOf(":")+1); - uni.setStorageSync("oauthTime",new Date().getTime()) - uni.setStorageSync("unionid",aes.aesMinEncrypt(unionid)); - uni.setStorageSync("openid",aes.aesMinEncrypt(wx_data.openid)); - uni.setStorageSync("nickname",aes.aesMinEncrypt(wx_data.nickname)); - uni.setStorageSync("headimgurl",aes.aesMinEncrypt(url)); + url = url.substring(url.indexOf(":") + 1); + uni.setStorageSync("oauthTime", new Date().getTime()) + uni.setStorageSync("unionid", aes.aesMinEncrypt(unionid)); + uni.setStorageSync("openid", aes.aesMinEncrypt(wx_data.openid)); + uni.setStorageSync("nickname", aes.aesMinEncrypt(wx_data.nickname)); + uni.setStorageSync("headimgurl", aes.aesMinEncrypt(url)); var that = this.gpsObject; wx_data.headimgurl = url; data = JSON.stringify(wx_data); //Android // this.getUserInfo(that,unionid,function(){ - that.$util.saveWxUser(that,data); - that.callBackMethod(); + that.$util.saveWxUser(that, data); + that.callBackMethod(); // }); - }else if(type == "DEVICEID"){ + } else if (type == "DEVICEID") { this.gpsObject.imgPushTest(data); - }else if(type == "GetVersionInfo"){ + } else if (type == "GetVersionInfo") { this.gpsObject.version = data; - }else if(type == "QRCODE"){ - if(data.indexOf("userid") == 1){ + } else if (type == "QRCODE") { + if (data.indexOf("userid") == 1) { uni.showToast({ - title:"二维码错误", - mask:true, - icon:"none" + title: "二维码错误", + mask: true, + icon: "none" }) return; } var map = JSON.parse(data); - var userid= map.userid; + var userid = map.userid; //扫码结果 uni.navigateTo({ - url:"/sunPackIndex/scenic/subscribe/qrcode/reserve_detail_2?userid="+userid + url: "/sunPackIndex/scenic/subscribe/qrcode/reserve_detail_2?userid=" + userid }) } - }else if(code == "0" && mes == "未安装微信_小程序跳转"){ + } else if (code == "0" && mes == "未安装微信_小程序跳转") { uni.navigateTo({ - url:"/sunPackIndex/scenic/subscribe/yuyue/yue_list_js" + url: "/sunPackIndex/scenic/subscribe/yuyue/yue_list_js" }) - }else if(code == "0" && mes == "未安装微信_授权登陆"){ + } else if (code == "0" && mes == "未安装微信_授权登陆") { uni.navigateTo({ - url:"/pages/index/an_login/an_login" + url: "/pages/index/an_login/an_login" }) - }else{ - if(!mes == '失败'){ + } else { + if (!mes == '失败') { uni.showToast({ - title:mes, - icon:"none", - duration:2000 + title: mes, + icon: "none", + duration: 2000 }) } } @@ -224,7 +224,7 @@ module.exports = { break; case 'ios': console.log('运行iOS上') - window.location.href="https://www.baidu.com"; + window.location.href = "https://www.baidu.com"; break; default: @@ -232,28 +232,28 @@ module.exports = { } } }, - getUser: function(that,obj,value,guid){ - console.log(obj,) - var url = that.$config.getOauthWxUser + "?type="+obj+"&value="+value+"&guid="+guid; + getUser: function(that, obj, value, guid) { + console.log(obj, ) + var url = that.$config.getOauthWxUser + "?type=" + obj + "&value=" + value + "&guid=" + guid; console.log(url) - window.location.href= url; + window.location.href = url; }, - getUserInfo: function(that,unionid,successCallMethod){ + getUserInfo: function(that, unionid, successCallMethod) { var method = "LoginUN"; var sendData = { - "api_token":that.$md5.hexMD5("API"+method+"lvyou"), - "unionid":unionid + "api_token": that.$md5.hexMD5("API" + method + "lvyou"), + "unionid": unionid } var data = { - "data":JSON.stringify(sendData), + "data": JSON.stringify(sendData), "url": that.$config.LoginUN } - that.$Request.post(that.$config.getAittoData,data).then(res => { - if(res.code == 0){ - uni.setStorageSync("user_token",aes.aesMinEncrypt(res.data.user_token)); - uni.setStorageSync("user_info",res.data.userInfo); + that.$Request.post(that.$config.getAittoData, data).then(res => { + if (res.code == 0) { + uni.setStorageSync("user_token", aes.aesMinEncrypt(res.data.user_token)); + uni.setStorageSync("user_info", res.data.userInfo); successCallMethod(); - }else{ + } else { uni.showToast({ icon: "none", title: res.msg @@ -261,26 +261,26 @@ module.exports = { } }) }, - saveWxUser: function(that,obj){ + saveWxUser: function(that, obj) { var data = { "data": obj, - userkey:that.$param.userkey + userkey: that.$param.userkey } - that.$Request.post(that.$config.saveUser,data).then(res => { + that.$Request.post(that.$config.saveUser, data).then(res => { var flag = that.$util.isSuccess(res); if (!flag) { return; } var userid = res.data; - uni.setStorageSync("userid",aes.aesMinEncrypt(userid)); + uni.setStorageSync("userid", aes.aesMinEncrypt(userid)); }) }, - pay:function(obj,successCallbck){ + pay: function(obj, successCallbck) { //是否在微信 if (wechat.isWechat()) { - wechat.pay(obj,successCallbck); + wechat.pay(obj, successCallbck); } else { - + } }, setLocation: function(lng, lat) { @@ -307,9 +307,9 @@ module.exports = { }, getCurrentTime3: function() { let yyyy = new Date().getFullYear(); - let mm = new Date().getMonth() + 1 < 10? '0' + (new Date().getMonth()+ 1) : new Date().getMonth()+ 1; - let dd = new Date().getDate() < 10? '0' + new Date().getDate() : new Date().getDate(); - let hh = new Date().getHours() < 10? '0' + new Date().getHours() : new Date().getHours(); + let mm = new Date().getMonth() + 1 < 10 ? '0' + (new Date().getMonth() + 1) : new Date().getMonth() + 1; + let dd = new Date().getDate() < 10 ? '0' + new Date().getDate() : new Date().getDate(); + let hh = new Date().getHours() < 10 ? '0' + new Date().getHours() : new Date().getHours(); let mf = new Date().getMinutes() < 10 ? '0' + new Date().getMinutes() : new Date().getMinutes(); let ss = new Date().getSeconds() < 10 ? '0' + new Date().getSeconds() : new Date().getSeconds(); return yyyy + '-' + mm + '-' + dd + ' ' + hh + ':' + mf; @@ -328,7 +328,7 @@ module.exports = { case 'ios': console.log('运行iOS上'); // successCallbck(""); - window.location.href="https://www.baidu.com"; + window.location.href = "https://www.baidu.com"; // this.$bridge.callHandler('getLocation', {}, function(response) { // console.log('运行iOS上11'); // log('JS got response', response); @@ -440,22 +440,22 @@ module.exports = { let dd = new Date().getDate(); return yyyy + '-' + mm + '-' + dd; }, - isBlack: function(obj){ + isBlack: function(obj) { return obj == undefined || obj == null || obj == ""; }, - isSuccess: function(res){ - if(res.status == 200){ + isSuccess: function(res) { + if (res.status == 200) { return true; - }else if(res.status == 400){ + } else if (res.status == 400) { uni.showToast({ - title:res.msg, - icon:"none" + title: res.msg, + icon: "none" }) return false; - }else if(res.status == 500){ + } else if (res.status == 500) { uni.showToast({ - title:res.msg, - icon:"none" + title: res.msg, + icon: "none" }) return false; } @@ -473,20 +473,20 @@ module.exports = { 美食 如果usertype=SCENIC等其他值时，usefun为：对应数据的主键id */ - saveOperatorLog: function(that,usertype,usefun){ + saveOperatorLog: function(that, usertype, usefun) { var data = { - "unionid":aes.aesDecrypt(uni.getStorageSync("unionid")), - "userkey":that.$param.userkey, + "unionid": aes.aesDecrypt(uni.getStorageSync("unionid")), + "userkey": that.$param.userkey, "usertype": usertype, - "usefun":usefun + "usefun": usefun } - that.$Request.post(that.$config.saveOperatorLog,data).then(res => { - if(res.code == 200){ + that.$Request.post(that.$config.saveOperatorLog, data).then(res => { + if (res.code == 200) { console.log("保存日志成功") } }) }, - convertDateFromString: function (dateString) { + convertDateFromString: function(dateString) { var ddd = new Date(dateString); return ddd; }, @@ -496,5 +496,50 @@ module.exports = { return true; } return false; + }, + // 表情转码 + utf16toEntities(str) { + const patt = /[\ud800-\udbff][\udc00-\udfff]/g; // 检测utf16字符正则 + str = str.replace(patt, (char) => { + let H; + let L; + let code; + let s; + + if (char.length === 2) { + H = char.charCodeAt(0); // 取出高位 + L = char.charCodeAt(1); // 取出低位 + code = (H - 0xD800) * 0x400 + 0x10000 + L - 0xDC00; // 转换算法 + s = `&#${code};`; + } else { + s = char; + } + + return s; + }); + + return str; + }, + // 表情解码 + entitiestoUtf16(strObj) { + const patt = /&#\d+;/g; + const arr = strObj.match(patt) || []; + + let H; + let L; + let code; + + for (let i = 0; i < arr.length; i += 1) { + code = arr[i]; + code = code.replace('&#', '').replace(';', ''); + // 高位 + H = Math.floor((code - 0x10000) / 0x400) + 0xD800; + // 低位 + L = ((code - 0x10000) % 0x400) + 0xDC00; + code = `&#${code};`; + const s = String.fromCharCode(H, L); + strObj = strObj.replace(code, s); + } + return strObj; } -} +} \ No newline at end of file diff --git a/pages/personcenter/EditProfile/EditProfile.vue b/pages/personcenter/EditProfile/EditProfile.vue index 4ca4660..ca1e656 100644 --- a/pages/personcenter/EditProfile/EditProfile.vue +++ b/pages/personcenter/EditProfile/EditProfile.vue @@ -13,7 +13,7 @@ 昵称 - + @@ -26,19 +26,21 @@ export default { data() { return { username: '', + usernames: '', url: '', - pic:'', + pic: '' }; }, onShow() { let this_ = this; console.log(uni.getStorageSync('nickname'), uni.getStorageSync('headimgurl')); this_.username = uni.getStorageSync('nickname'); + this_.usernames = this_.$util.entitiestoUtf16(this_.username); this_.url = uni.getStorageSync('headimgurl'); }, methods: { onChooseAvatar(e) { - console.log(e) + console.log(e); let this_ = this; const avatarUrl = e.detail.avatarUrl; this_.url = avatarUrl; @@ -47,7 +49,7 @@ export default { filePath: avatarUrl, name: 'file', success(res) { - console.log(res,'山川了') + console.log(res, '山川了'); if (res.statusCode != 200) { uni.showToast({ title: '上传失败', @@ -60,11 +62,11 @@ export default { return; } obj = obj.data; - this_.pic = obj.path - console.log(this_.pic,';') + this_.pic = this_.$config.ROOTPATH + obj.path; + console.log(this_.pic, ';'); }, fail(res) { - console.log('失败了',res) + console.log('失败了', res); uni.showToast({ title: '上传失败', icon: 'none' @@ -74,33 +76,37 @@ export default { }, blurname(e) { let this_ = this; - this_.username = e.detail.value; + this_.username = this_.$util.utf16toEntities(e.detail.value); + this_.usernames = e.detail.value; + console.log(this_.username, this_.usernames); }, saveProfile() { let this_ = this; - if(this_.pic&&this_.pi!=''){ - uni.setStorageSync('headimgurl', this_.$config.ROOTPATH+this_.pic); + if (this_.pic && this_.pic != '') { + uni.setStorageSync('headimgurl', this_.pic); + } else { + this_.pic = uni.getStorageSync('headimgurl'); } uni.setStorageSync('nickname', this_.username); uni.setStorageSync('oauthTime', new Date().getTime()); const obj = { - headimgurl:this_.$config.ROOTPATH+this_.pic, - openid:uni.getStorageSync('unionid'), - nickname:this_.username - } - console.log(obj,'请求参数') + headimgurl: this_.pic, + openid: uni.getStorageSync('unionid'), + nickname: this_.username + }; + console.log(obj, '请求参数'); var data = { - "data": JSON.stringify(obj), - userkey:this_.$param.userkey - } - this_.$Request.post(this_.$config.saveUser,data).then(res => { + data: JSON.stringify(obj), + userkey: this_.$param.userkey + }; + this_.$Request.post(this_.$config.saveUser, data).then((res) => { var flag = this_.$util.isSuccess(res); if (!flag) { return; } var userid = res.data; - console.log(userid,'保存返回') - }) + console.log(userid, '保存返回'); + }); uni.showToast({ icon: 'success', title: '保存成功！', @@ -141,6 +147,9 @@ export default { .saveBtn { width: 70%; margin: 30rpx auto; + position: fixed; + bottom: 3vh; + left: 15%; } .nickname { text-align: right; diff --git a/pages/personcenter/personcenter.vue b/pages/personcenter/personcenter.vue index 14c4f36..32fbcc7 100644 --- a/pages/personcenter/personcenter.vue +++ b/pages/personcenter/personcenter.vue @@ -15,13 +15,11 @@ --> - + - {{ nickname }} - - + {{ nicknames }} @@ -66,40 +64,7 @@ - - - - + @@ -115,10 +80,11 @@ export default { that = this; return { avatarUrl: '', - url:'', - username:'', - headimgurl: '../../static/images/adm_img.png', + url: '', + username: '', + headimgurl: '', nickname: '点击授权', + nicknames: '点击授权', isUpdate: true, isLogin: false, isShowOnlinets: 'NO', @@ -142,11 +108,12 @@ export default { onShow() { if (!uni.getStorageSync('unionid') || uni.getStorageSync('unionid') == '' || uni.getStorageSync('unionid') == null) { this.isLogin = false; - this.headimgurl = '' - }else{ - this.nickname = uni.getStorageSync('nickname') - this.headimgurl = uni.getStorageSync('headimgurl') - this.isLogin = true + this.headimgurl = ''; + } else { + this.nickname = uni.getStorageSync('nickname'); + this.nicknames = this.$util.entitiestoUtf16(this.nickname); + this.headimgurl = uni.getStorageSync('headimgurl'); + this.isLogin = true; } }, onLoad(options) { @@ -158,19 +125,6 @@ export default { } }, methods: { - conserved(e){ - console.log(e,'难定') - let this_ = this; - - setTimeout(() => { - this_.headimgurl = this_.url; - this_.nickname = this_.username; - uni.setStorageSync('nickname', this_.username); - uni.setStorageSync('headimgurl', this_.url); - uni.setStorageSync('oauthTime', new Date().getTime()); - this.$refs.popup.close() - }, 1000) - }, changean(type) { let this_ = this; if (!uni.getStorageSync('unionid') || uni.getStorageSync('unionid') == '' || uni.getStorageSync('unionid') == null) { @@ -181,8 +135,8 @@ export default { return; } else { uni.navigateTo({ - url:'/pages/personcenter/EditProfile/EditProfile' - }) + url: '/pages/personcenter/EditProfile/EditProfile' + }); // this.type = type // this_.url = this.headimgurl // this_.username = this.nickname @@ -206,7 +160,7 @@ export default { blurname(e) { let this_ = this; console.log(e); - this_.username = e.detail.value + this_.username = e.detail.value; }, saveLoginLog: function (unionid) { var that = this; @@ -259,26 +213,28 @@ export default { const obj = JSON.parse(res.data.msg); this_.isLogin = true; const da = { - userkey:this_.$param.userkey, - openid:obj.openid - } - this_.$Request.post(this_.$config.getUser,da).then((res)=>{ - if(res.data == null){ + userkey: this_.$param.userkey, + openid: obj.openid + }; + this_.$Request.post(this_.$config.getUser, da).then((res) => { + if (res.data == null) { uni.setStorageSync('nickname', '微信用户'); uni.setStorageSync('headimgurl', 'https://www.lbgjtoa.com/appImg/icon-person-01.png'); uni.setStorageSync('oauthTime', new Date().getTime()); this_.nickname = '微信用户'; this_.headimgurl = 'https://www.lbgjtoa.com/appImg/icon-person-01.png'; this_.$forceUpdate(); - }else{ + this_.saveProfile(); + } else { uni.setStorageSync('nickname', res.data.wxNickname); uni.setStorageSync('headimgurl', res.data.wxHeadimgurl); uni.setStorageSync('oauthTime', new Date().getTime()); this_.nickname = res.data.wxNickname; + this_.nicknames = this_.$util.entitiestoUtf16(this_.nickname); this_.headimgurl = res.data.wxHeadimgurl; this_.$forceUpdate(); } - }) + }); uni.setStorageSync('unionid', obj.openid); }, fail: function (err) { @@ -301,8 +257,8 @@ export default { // #endif }, - saveProfile:function(){ - let this_ = this + saveProfile: function () { + let this_ = this; // wx.getUserInfo({ // provider: 'weixin', // success: (res) => { @@ -312,28 +268,28 @@ export default { // this_.nickname = '微信用户'; // this_.headimgurl = 'https://www.lbgjtoa.com/appImg/icon-person-01.png'; // this_.$forceUpdate(); - const obj = { - headimgurl:this_.headimgurl, - openid:uni.getStorageSync('unionid'), - nickname:this_.nickname - } - console.log(obj,'请求参数') - var data = { - "data": JSON.stringify(obj), - userkey:this_.$param.userkey - } - this_.$Request.post(this_.$config.saveUser,data).then(res => { - var flag = this_.$util.isSuccess(res); - if (!flag) { - return; - } - var userid = res.data; - console.log(userid,'保存返回') - }) - // }, - // fail: function (error) { - // console.log('login failed ' + error); - // } + const obj = { + headimgurl: this_.headimgurl, + openid: uni.getStorageSync('unionid'), + nickname: this_.nickname + }; + console.log(obj, '请求参数'); + var data = { + data: JSON.stringify(obj), + userkey: this_.$param.userkey + }; + this_.$Request.post(this_.$config.saveUser, data).then((res) => { + var flag = this_.$util.isSuccess(res); + if (!flag) { + return; + } + var userid = res.data; + console.log(userid, '保存返回'); + }); + // }, + // fail: function (error) { + // console.log('login failed ' + error); + // } // }); // uni.showToast({ // title:"授权失败,点击"+that.nickname+"重新授权", @@ -341,16 +297,7 @@ export default { // duration: 1500 // }) }, - callBackMethod: function () { - // clearTimeout(timer); - this.isLogin = true; - that.nickname = aes.aesDecrypt(uni.getStorageSync('nickname')); - that.headimgurl = aes.aesDecrypt(uni.getStorageSync('headimgurl')); - that.getUserInterest(); //回显兴趣定制数据 - that.getAndroidUserKey(); //推送 - uni.hideLoading(); - that.saveLoginLog(uni.getStorageSync('unionid')); - }, + jump: function (obj) { if (obj == 'aboutus') { uni.navigateTo({ @@ -409,17 +356,6 @@ export default { uni.removeStorageSync('adminId'); this.adminId = ''; this.isAdminLogin = false; - } else if (obj == 'logoutWechat') { - if (!uni.getStorageSync('unionid') || uni.getStorageSync('unionid') == '' || uni.getStorageSync('unionid') == null) { - uni.removeStorageSync('nickname'); - uni.removeStorageSync('headimgurl'); - uni.removeStorageSync('oauthTime'); - uni.removeStorageSync('openid'); - uni.removeStorageSync('unionid'); - this.nickname = '点击授权'; - this.headimgurl = '../../static/images/adm_img.png'; - this.isLogin = false; - } } else if (obj == 'myComment') { if (!uni.getStorageSync('unionid') || uni.getStorageSync('unionid') == '' || uni.getStorageSync('unionid') == null) { uni.showToast({ @@ -447,7 +383,7 @@ export default { uni.removeStorageSync('oauthTime'); uni.removeStorageSync('openid'); uni.removeStorageSync('unionid'); - that.nickname = '点击授权'; + that.nicknames = '点击授权'; that.headimgurl = 'https://www.lbgjtoa.com/appImg/icon-person-01.png'; that.isLogin = false; } else if (res.cancel) { @@ -534,7 +470,7 @@ export default { } } } -} +}; diff --git a/sunPackIndex/scenic/subscribe/yuyue/yue_form_js.vue b/sunPackIndex/scenic/subscribe/yuyue/yue_form_js.vue index 00a1450..0d05485 100644 --- a/sunPackIndex/scenic/subscribe/yuyue/yue_form_js.vue +++ b/sunPackIndex/scenic/subscribe/yuyue/yue_form_js.vue @@ -191,8 +191,14 @@ }, //预约按钮 saveReserve: function() { + let that = this + if(this.agreementChecked==true){ + uni.showLoading({ + mask:true, + title:'加载中...' + }) let promise = new Promise(function(resolve, reject) { that.dynamicLists.map((item, index) => { that.$refs.form[index].validate().then(res => { @@ -205,6 +211,7 @@ resolve('success'); }, 1000); }) + promise.then(value => { let reState = that.dynamicLists.every((item, index) => { return item.state == '1' @@ -212,7 +219,11 @@ console.log("asd",reState) if (reState == true) { console.log("asd",reState) + this.postReserve() + + }else{ + uni.hideLoading() } })} }, @@ -264,6 +275,7 @@ }, success: function(result) { if (result.data.status == 200) { + uni.hideLoading() uni.showModal({ title: "提示", content: '预约成功', @@ -285,7 +297,11 @@ //succ.call(self, result.data) }, fail: function(e) { - //error.call(self, e) + uni.hideLoading() + uni.showToast({ + icon:'none', + title:'预约失败' + }) } }) }, diff --git a/sunPackIndex/suggest/sug_list.vue b/sunPackIndex/suggest/sug_list.vue index 300b454..57187ea 100644 --- a/sunPackIndex/suggest/sug_list.vue +++ b/sunPackIndex/suggest/sug_list.vue @@ -213,6 +213,7 @@ return; } var data = res.data; + let arr = [] if(data != null && data.length > 0){ for(var i = 0;i < data.length;i++){ var item = { @@ -225,8 +226,9 @@ "showHideType":"zhed_gao", "upDownType":"down_touj" } - that.controlList.push(item); + arr.push(item) } + that.controlList = arr }else{ that.loadType = false; }