From 7e7858cc8c7ee5e4391af71896d36f9b04031ee4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B5=85=E5=BF=B5?= Date: Mon, 9 Jun 2025 17:58:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=89=93=E5=8D=B0=20?= =?UTF-8?q?=E5=92=8C=E6=94=B9=E6=8E=A5=E5=8F=A3=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 14 ++----- api/apiT.js | 7 ++-- common/locales/en.js | 1 + common/locales/ru.js | 1 + common/locales/zh.js | 1 + main.js | 2 +- pages/customer/add.vue | 7 ---- pages/customer/detile.vue | 4 -- pages/customer/editdetile.vue | 7 ---- pages/customer/followsuccess.vue | 4 -- pages/customer/followup.vue | 41 ++++++++----------- pages/customer/map.nvue | 8 ++-- pages/customer/maph5.vue | 34 +++++++-------- pages/customer/tagcustomer.vue | 34 +++++++++------ pages/index/customer.vue | 37 ++++++++++------- pages/index/highseas.vue | 2 - pages/index/index.vue | 32 ++++++++++----- pages/index/mine.vue | 34 ++++++++++----- pages/index/webview.vue | 13 +++--- pages/login/agreement.vue | 3 +- pages/login/agreementuser.vue | 3 +- pages/login/index.vue | 2 +- pages/login/register.vue | 4 +- pages/mine/businesscard.vue | 6 +-- pages/mine/changinfo.vue | 10 +---- pages/mine/recyclebin.vue | 1 - pages/mine/resetPwd.vue | 2 - pages/mine/workreport.vue | 1 - pages/mine/workreportdetil.vue | 1 - .../components/z-paging/js/modules/i18n.js | 4 +- 30 files changed, 156 insertions(+), 164 deletions(-) diff --git a/App.vue b/App.vue index a9f1466..c51bc45 100644 --- a/App.vue +++ b/App.vue @@ -12,15 +12,9 @@ export default { onLaunch: function() { // #ifdef H5 - console.log( - `%c hello uniapp %c v${version} `, - 'background:#35495e ; padding: 1px; border-radius: 3px 0 0 3px; color: #fff', - 'background:#007aff ;padding: 1px; border-radius: 0 3px 3px 0; color: #fff; font-weight: bold;' - ) // #endif // 线上示例使用 // console.log('%c uni-app官方团队诚邀优秀前 端工程师加盟，一起打造更卓越的uni-app & uniCloud，欢迎投递简历到 hr2013@dcloud.io', 'color: red'); - console.log('App Launch'); // #ifdef APP-PLUS // App平台检测升级，服务端代码是通过uniCloud的云函数实现的，详情可参考：https://ext.dcloud.net.cn/plugin?id=4542 if (plus.runtime.appid !== 'HBuilder') { // 真机运行不需要检查更新，真机运行时appid固定为'HBuilder'，这是调试基座的appid @@ -33,22 +27,22 @@ success: (res) => { // 成功 this.setUniverifyErrorMsg(); - console.log("preLogin success: ", res); + // console.log("preLogin success: ", res); }, fail: (res) => { this.setUniverifyLogin(false); this.setUniverifyErrorMsg(res.errMsg); // 失败 - console.log("preLogin fail res: ", res); + // console.log("preLogin fail res: ", res); } }) // #endif }, onShow: function() { - console.log('App Show') + // console.log('App Show') }, onHide: function() { - console.log('App Hide') + // console.log('App Hide') }, globalData: { test: '' diff --git a/api/apiT.js b/api/apiT.js index 8f94a8f..ac73032 100644 --- a/api/apiT.js +++ b/api/apiT.js @@ -1,8 +1,9 @@ - const baseUrl = "http://219.157.255.213:9007/"; //这里放置url域名32044 + // const baseUrl = "http://219.157.255.213:9007/"; //这里放置url域名32044 // const baseUrl = "http://api.crm.hnxinyouhe.com/"; //这里放置url域名32044 // const baseUrl = "http://192.168.50.9:8787/"; //这里放置url域名32044 - // const baseUrl = "http://219.157.255.213:25329/"; //这里放置url域名32044 + // const baseUrl = "https://api.fcrm.hnxinyouhe.com/"; //这里放置url域名32044 + const baseUrl = "https://crm-server.smt.hnxinyouhe.com/"; //这里放置url域名32044 // const baseUrl = "/api/"; //这里放置url域名32044 export function request(options){//封装的requset let { url,data,method } = options; @@ -35,7 +36,7 @@ export function request(options){//封装的requset }, complete: (data)=>{ - console.log(data.code) + // console.log(data.code) uni.hideLoading(); } }); diff --git a/common/locales/en.js b/common/locales/en.js index 6ce2f39..e544d36 100644 --- a/common/locales/en.js +++ b/common/locales/en.js @@ -201,4 +201,5 @@ export default { loading:'loading', downmp:'Download business card', downmpmsg:'Are you sure to download the current business card image?', + callmsg:'Are you sure you want to make the call?', } \ No newline at end of file diff --git a/common/locales/ru.js b/common/locales/ru.js index ca13317..448e5bb 100644 --- a/common/locales/ru.js +++ b/common/locales/ru.js @@ -199,4 +199,5 @@ export default { loading: "Загрузка", downmp:'Скачать визитку', downmpmsg:'Вы уверены в загрузке текущей карты?', + callmsg:'Вы уверены, что хотите совершить звонок?', } \ No newline at end of file diff --git a/common/locales/zh.js b/common/locales/zh.js index 73b1c5b..3dc1230 100644 --- a/common/locales/zh.js +++ b/common/locales/zh.js @@ -199,4 +199,5 @@ export default { loading:'加载中', downmp:'下载名片', downmpmsg:'确定下载当前名片图吗?', + callmsg:'确定拨打电话吗?', } \ No newline at end of file diff --git a/main.js b/main.js index 35f7bf3..5b7a349 100644 --- a/main.js +++ b/main.js @@ -23,7 +23,7 @@ import Eyu from '@/common/locales/ru.js'; // 引入并使用vue-i18n import VueI18n from 'vue-i18n' Vue.use(VueI18n) -console.log(uni.getLocale()) +// console.log(uni.getLocale()) let i18nConfig = { locale: uni.getStorageSync('i18locale')?uni.getStorageSync('i18locale'):uni.getLocale(),// 获取已设置的语言 messages: { diff --git a/pages/customer/add.vue b/pages/customer/add.vue index e47ccc9..4011b14 100644 --- a/pages/customer/add.vue +++ b/pages/customer/add.vue @@ -208,13 +208,11 @@ this.area() }, onShow() { - console.log(uni.getStorageSync('location')) if(uni.getStorageSync('location')){ this.location = JSON.parse(uni.getStorageSync('location')) this.form.address = this.location.address this.form.lng = this.location.lng this.form.lat = this.location.lat - console.log(this.location) } }, mounted() { @@ -331,11 +329,9 @@ // 国家搜索处理函数 handleSearch() { if (this.searchKeyword) { - console.log(this.searchKeyword) this.filteredOptions = this.areaList.filter((item) => item.name.includes(this.searchKeyword) ); - console.log(this.filteredOptions) } else { // 如果搜索框为空，显示全部数据 this.filteredOptions = this.areaList; @@ -345,8 +341,6 @@ handleSelect(item) { this.selectedLabel = item.name; // 回显选中的值 this.actives = item.id - console.log("选中的值:", item.id); - console.log("选中的值:", item.name); }, arerfn(){ this.showarea = false; // 关闭弹窗 @@ -368,7 +362,6 @@ }); return false } - console.log(this.form) request({ url:'customer/save', method:'post', diff --git a/pages/customer/detile.vue b/pages/customer/detile.vue index 4eeb4f3..67f3cb8 100644 --- a/pages/customer/detile.vue +++ b/pages/customer/detile.vue @@ -162,7 +162,6 @@ } }, onLoad(options) { - console.log(options); this.id = options.id; var that = this this.getGrade() @@ -176,7 +175,6 @@ this.form.address = this.location.address this.form.lng = this.location.lng this.form.lat = this.location.lat - console.log(this.location) } this.followlistfn() }, @@ -234,7 +232,6 @@ } }).then(res => { this.followList = res.data.data - console.log(res.data.data) }) }, //添加跟进 @@ -314,7 +311,6 @@ tagSelect(item) { // 如果已选中则取消，否则设置选中 this.$set(this.activeMap, item.group_id, this.activeMap[item.group_id] === item.id ? '' : item.id); - console.log(this.activeMap) request({ url:'tagGroup/updatePivot', method:'post', diff --git a/pages/customer/editdetile.vue b/pages/customer/editdetile.vue index 804e9f7..9fc9b9d 100644 --- a/pages/customer/editdetile.vue +++ b/pages/customer/editdetile.vue @@ -192,7 +192,6 @@ } }, onLoad(options) { - console.log(options); this.id = options.id; var that = this this.getChannel() @@ -208,7 +207,6 @@ this.form.address = this.location.address this.form.lng = this.location.lng this.form.lat = this.location.lat - console.log(this.location) } this.followlistfn() }, @@ -276,7 +274,6 @@ } }).then(res => { this.followList = res.data.data - console.log(res.data.data) }) }, //添加跟进 @@ -381,11 +378,9 @@ // 搜索处理函数 handleSearch() { if (this.searchKeyword) { - console.log(this.searchKeyword) this.filteredOptions = this.areaList1.filter((item) => item.name.includes(this.searchKeyword) ); - console.log(this.filteredOptions) } else { // 如果搜索框为空，显示全部数据 this.filteredOptions = this.areaList1; @@ -397,8 +392,6 @@ // this.searchKeyword = item.name this.actives = item.id // this.showPicker = false; // 关闭弹窗 - console.log("选中的值:", item.id); - console.log("选中的值:", item.name); }, arerfn(){ this.showarea = false; // 关闭弹窗 diff --git a/pages/customer/followsuccess.vue b/pages/customer/followsuccess.vue index f772be4..6b15555 100644 --- a/pages/customer/followsuccess.vue +++ b/pages/customer/followsuccess.vue @@ -64,7 +64,6 @@ } }, onLoad(options) { - console.log(options); this.id = options.id; }, methods: { @@ -72,7 +71,6 @@ uni.navigateBack({}) }, active(item){ - console.log(item) if(item=='auto'){ this.shownexttime = true } @@ -100,7 +98,6 @@ this.shownexttime = false this.nexttime = e.value this.time = this.result(e.value, e.mode) - console.log(this.nexttime) }, getLaterDate(dayNum, dateTime = null) { // 如果为null,则格式化当前时间为时间戳 @@ -138,7 +135,6 @@ if(this.actives==7){ nexttime = this.getLaterDate(7) } - console.log(nexttime) request({ url:'customer/followNext', method:'post', diff --git a/pages/customer/followup.vue b/pages/customer/followup.vue index d16a609..956d3ee 100644 --- a/pages/customer/followup.vue +++ b/pages/customer/followup.vue @@ -199,7 +199,6 @@ } }, onLoad(options) { - console.log(options); this.getlocahost() this.id = options.id; this.form.customer_id = options.id; @@ -292,13 +291,13 @@ success: (res) => { if (res.data.results && res.data.results.length > 0) { this.form.address = res.data.results[0].formatted_address; // 获取格式化地址 - console.log(res.data.results[0].formatted_address) + // console.log(res.data.results[0].formatted_address) } else { - console.error('未找到地址'); + // console.error('未找到地址'); } }, fail: (err) => { - console.error('请求失败：', err); + // console.error('请求失败：', err); }, }); }, @@ -307,17 +306,15 @@ uni.getLocation({ type: 'wgs84', // 默认为 wgs84 坐标系，可选 gcj02 success: function (res) { - console.log('当前位置的经度：' + res.longitude); - console.log('当前位置的纬度：' + res.latitude); that.getarrd(res.longitude,res.latitude) // 如果需要将经纬度转换为具体地址，可以使用逆地理编码 // 这里调用 uni.chooseLocation 或第三方地图服务（如高德、腾讯地图） }, fail: function (err) { - console.log('获取位置失败：', err); + // console.log('获取位置失败：', err); }, complete: function () { - console.log('获取位置完成'); + // console.log('获取位置完成'); } }); }, @@ -325,11 +322,11 @@ if (navigator.geolocation) { navigator.geolocation.getCurrentPosition( (position) => { - console.log('当前位置的经度：' + position.coords.longitude); - console.log('当前位置的纬度：' + position.coords.latitude); + // console.log('当前位置的经度：' + position.coords.longitude); + // console.log('当前位置的纬度：' + position.coords.latitude); this.getarrd(position.coords.longitude,position.coords.latitude) this.error = ''; - console.log("获取位置成功：", position); + // console.log("获取位置成功：", position); }, (error) => { this.unigetLocation() @@ -338,7 +335,7 @@ // title: this.error, // icon: 'none' // }); - console.error("获取位置失败：", error); + // console.error("获取位置失败：", error); }, { enableHighAccuracy: true, @@ -353,7 +350,7 @@ // title: this.error, // icon: 'none' // }); - console.error("浏览器不支持 Geolocation API"); + // console.error("浏览器不支持 Geolocation API"); } }, getErrorMessage(error) { @@ -379,7 +376,7 @@ }).then(res => { this.datas = res.data.data this.followList = res.data.data - console.log(res.data.data) + // console.log(res.data.data) }) }, //保存跟进 @@ -421,7 +418,6 @@ confirm(e) { this.show = false this.form.firstFollowtime = this.result(e.value, e.mode) - console.log(this.result(e.value, e.mode)) }, cancelnext() { this.shownexttime = false @@ -429,7 +425,6 @@ confirmnext(e) { this.shownexttime = false this.nexttime = this.result(e.value, e.mode) - console.log(this.nexttime) request({ url:'customer/followNext', method:'post', @@ -451,18 +446,17 @@ }, change(e) { - // console.log('change', e) }, delfn(name){ - console.log(name) that.carinfo[name] ='' }, uploadfn(imgUrl,name){ var that = this; uni.uploadFile({ // url: 'http://api.crm.hnxinyouhe.com/upload', - url: 'http://219.157.255.213:9007/upload/uploadImage', + // url: 'https://api.fcrm.hnxinyouhe.com/upload/uploadImage', + url: 'https://crm-server.smt.hnxinyouhe.com/upload/uploadImage', filePath: imgUrl, name: 'files', header:{'Authorization': 'Bearer ' + uni.getStorageSync('token')}, @@ -470,7 +464,6 @@ const path=JSON.parse(uploadFileRes.data) if(path.code==0){ that.form[name] = path.data.path - console.log(that.form) }else{ uni.showToast({ title: path.message, @@ -503,10 +496,10 @@ options.engine = 'baidu'; that.form.audio_text = ""; plus.speech.startRecognize(options, function (s) { - console.log(s); + // console.log(s); that.form.audio_text += s; }, function (e) { - console.log("语音识别失败：" + e.message); + // console.log("语音识别失败：" + e.message); }); }, async startRecognize () { @@ -524,12 +517,12 @@ options.punctuation = false; // 是否需要标点符号 options.timeout = 10 * 1000; //语音录入持续时长 plus.speech.startRecognize(options, function(s) { - console.log(s); + // console.log(s); that.form.remark += s; // 关闭语音 plus.speech.stopRecognize(); }, function (e) { - console.log("语音识别失败：" + e.message); + // console.log("语音识别失败：" + e.message); }); }, // #ifdef APP-PLUS diff --git a/pages/customer/map.nvue b/pages/customer/map.nvue index 57ff5bc..44274c2 100644 --- a/pages/customer/map.nvue +++ b/pages/customer/map.nvue @@ -21,7 +21,7 @@ export default { postMessagefn(e){ uni.setStorageSync('location', e.detail.data); uni.navigateBack({}) - console.log(JSON.parse(e.detail.data)) + // console.log(JSON.parse(e.detail.data)) }, leftClick(){ uni.navigateBack({}) @@ -37,16 +37,16 @@ export default { obj.lat=res.latitude var arr=[] arr.push(obj) - console.log(arr) + // console.log(arr) // that.src = 'http://dap?arr='+encodeURIComponent(JSON.stringify(arr)) that.src = 'http://219.157.255.213:8082?arr='+encodeURIComponent(JSON.stringify(arr)) }, fail: function (err) { - console.log('获取位置失败：', err); + // console.log('获取位置失败：', err); }, complete: function () { - console.log('获取位置完成'); + // console.log('获取位置完成'); } }) }, diff --git a/pages/customer/maph5.vue b/pages/customer/maph5.vue index e547d60..6cef98c 100644 --- a/pages/customer/maph5.vue +++ b/pages/customer/maph5.vue @@ -50,7 +50,7 @@ export default { this.center.lat = e.lat this.center.lng = e.lng } - console.log(e) + // console.log(e) this.initMap() }, methods:{ @@ -76,15 +76,15 @@ export default { confirm(item){ var that = this // var latlng = JSON.parse(JSON.stringify(place.geometry.location)) - console.log("place===", item.description) + // console.log("place===", item.description) that.value = item.description that.cityInfo.address=item.description var geocoder = new google.maps.Geocoder(); // var address = document.getElementById("address").value; geocoder.geocode( { 'address': item.description}, function(results, status) { - console.log(results) + // console.log(results) var latlng = JSON.parse(JSON.stringify(results[0].geometry.location)) - console.log(latlng) + // console.log(latlng) // // 将地图中心点指向用户所选位置，并设置标记 that.map.setCenter(latlng); that.cityInfo.lat=latlng.lat @@ -140,13 +140,13 @@ export default { const geocoder = new google.maps.Geocoder(); geocoder.geocode({ location: position }, (results, status) => { if (status === 'OK' && results[0]) { - console.log(results) - console.log(position) + // console.log(results) + // console.log(position) that.cityInfo.address = results[0].formatted_address; that.cityInfo.lat = position.lat(); that.cityInfo.lng = position.lng(); that.value = results[0].formatted_address; - console.log(that.cityInfo) + // console.log(that.cityInfo) } else { alert('无法获取地址信息'); } @@ -158,17 +158,17 @@ export default { uni.getLocation({ type: 'wgs84', // 默认为 wgs84 坐标系，可选 gcj02 success: function (res) { - console.log('当前位置的经度：' + res.longitude); - console.log('当前位置的纬度：' + res.latitude); + // console.log('当前位置的经度：' + res.longitude); + // console.log('当前位置的纬度：' + res.latitude); that.addmapmarkfn(res.latitude,res.longitude) // 如果需要将经纬度转换为具体地址，可以使用逆地理编码 // 这里调用 uni.chooseLocation 或第三方地图服务（如高德、腾讯地图） }, fail: function (err) { - console.log('获取位置失败：', err); + // console.log('获取位置失败：', err); }, complete: function () { - console.log('获取位置完成'); + // console.log('获取位置完成'); } }); }, @@ -183,11 +183,11 @@ export default { if (navigator.geolocation) { navigator.geolocation.getCurrentPosition( (position) => { - console.log('当前位置的经度：' + position.coords.longitude); - console.log('当前位置的纬度：' + position.coords.latitude); + // console.log('当前位置的经度：' + position.coords.longitude); + // console.log('当前位置的纬度：' + position.coords.latitude); that.addmapmarkfn(position.coords.latitude,position.coords.longitude) this.error = ''; - console.log("获取位置成功：", position); + // console.log("获取位置成功：", position); }, (error) => { that.unigetLocation() @@ -196,7 +196,7 @@ export default { // title: this.error, // icon: 'none' // }); - console.error("获取位置失败：", error); + // console.error("获取位置失败：", error); }, { enableHighAccuracy: true, @@ -211,14 +211,14 @@ export default { // title: this.error, // icon: 'none' // }); - console.error("浏览器不支持 Geolocation API"); + // console.error("浏览器不支持 Geolocation API"); } } }) .catch((e) => { - console.log(e) + // console.log(e) }) } }, diff --git a/pages/customer/tagcustomer.vue b/pages/customer/tagcustomer.vue index 715ee98..b51b67d 100644 --- a/pages/customer/tagcustomer.vue +++ b/pages/customer/tagcustomer.vue @@ -49,7 +49,6 @@ } }, onLoad(e) { - console.log(e) this.tag_id = e.tag_id this.tag_name = e.name }, @@ -69,7 +68,6 @@ per_page:10, } }).then(res => { - console.log(res.data) if(res.data.code ==0){ var datas = res.data.data.list; this.$refs.paging.complete(datas); @@ -81,7 +79,6 @@ }) }, godetile(item){ - console.log(item) uni.navigateTo({ url: '/pages/customer/detile?id='+item.id }); @@ -96,16 +93,27 @@ }); return; } - - uni.makePhoneCall({ - phoneNumber: phoneNumber, - success: () => { - console.log('拨打电话成功'); - }, - fail: (err) => { - console.log('拨打电话失败', err); - }, - }); + uni.showModal ({ + title: this.$t('prompt'), + content: this.$t('callmsg'), + cancelText: this.$t('cancel'), + confirmText: this.$t('confirm'), + success: function (res) { + if (res.confirm) { + uni.makePhoneCall({ + phoneNumber: phoneNumber, + success: () => { + // console.log('拨打电话成功'); + }, + fail: (err) => { + // console.log('拨打电话失败', err); + }, + }); + } else if (res.cancel) { + // console.log('用户点击取消'); + } + } + }); }, editClick(item){ uni.navigateTo({ diff --git a/pages/index/customer.vue b/pages/index/customer.vue index 37e95dc..f59f6c6 100644 --- a/pages/index/customer.vue +++ b/pages/index/customer.vue @@ -99,7 +99,6 @@ } }, onLoad(e) { - console.log(e) if(e.tab){ this.follow=e.tab - 1 this.current = e.tab @@ -178,7 +177,6 @@ this.show= false }, confirm(e) { - console.log(e) this.follow_last = e.value[0].id this.show = false this.queryList(1, 10) @@ -188,7 +186,6 @@ }, //tab标签切换 tabclick(e){ - console.log(e) if(e.id=='all'){ this.follow='' }else{ @@ -211,7 +208,6 @@ follow_last:this.follow_last, } }).then(res => { - console.log(res.data) if(res.data.code ==0){ var datas = res.data.data.list; this.$refs.paging.complete(datas); @@ -223,7 +219,6 @@ }) }, godetile(item){ - console.log(item) uni.navigateTo({ url: '/pages/customer/detile?id='+item.id }); @@ -238,16 +233,28 @@ }); return; } - - uni.makePhoneCall({ - phoneNumber: phoneNumber, - success: () => { - console.log('拨打电话成功'); - }, - fail: (err) => { - console.log('拨打电话失败', err); - }, - }); + uni.showModal ({ + title: this.$t('prompt'), + content: this.$t('callmsg'), + cancelText: this.$t('cancel'), + confirmText: this.$t('confirm'), + success: function (res) { + if (res.confirm) { + uni.makePhoneCall({ + phoneNumber: phoneNumber, + success: () => { + // console.log('拨打电话成功'); + }, + fail: (err) => { + // console.log('拨打电话失败', err); + }, + }); + } else if (res.cancel) { + // console.log('用户点击取消'); + } + } + }); + }, editClick(item){ uni.navigateTo({ diff --git a/pages/index/highseas.vue b/pages/index/highseas.vue index 782c04f..c68d62b 100644 --- a/pages/index/highseas.vue +++ b/pages/index/highseas.vue @@ -76,7 +76,6 @@ } }, onLoad(e) { - console.log(e) }, onShow() { this.queryList(1, 10) @@ -110,7 +109,6 @@ per_page:10, } }).then(res => { - console.log(res.data) if(res.data.code ==0){ var datas = res.data.data.list; this.$refs.paging.complete(datas); diff --git a/pages/index/index.vue b/pages/index/index.vue index b6be6ab..677b955 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -199,7 +199,6 @@ this.$i18n.locale = e.value[0].id uni.setStorageSync('i18locale', e.value[0].id); this.showlang = false - console.log(uni.getLocale()) this.columns =[ [{ label: this.$t('zh'), @@ -326,16 +325,27 @@ }); return; } - - uni.makePhoneCall({ - phoneNumber: phoneNumber, - success: () => { - console.log('拨打电话成功'); - }, - fail: (err) => { - console.log('拨打电话失败', err); - }, - }); + uni.showModal ({ + title: this.$t('prompt'), + content: this.$t('callmsg'), + cancelText: this.$t('cancel'), + confirmText: this.$t('confirm'), + success: function (res) { + if (res.confirm) { + uni.makePhoneCall({ + phoneNumber: phoneNumber, + success: () => { + // console.log('拨打电话成功'); + }, + fail: (err) => { + // console.log('拨打电话失败', err); + }, + }); + } else if (res.cancel) { + // console.log('用户点击取消'); + } + } + }); }, editClick(item){ uni.navigateTo({ diff --git a/pages/index/mine.vue b/pages/index/mine.vue index ccf471a..8b5497c 100644 --- a/pages/index/mine.vue +++ b/pages/index/mine.vue @@ -33,11 +33,11 @@ --> - + {{$t('mine.cpassword')}} @@ -178,15 +178,27 @@ }); return; } - uni.makePhoneCall({ - phoneNumber: phoneNumber, - success: () => { - console.log('拨打电话成功'); - }, - fail: (err) => { - console.log('拨打电话失败', err); - }, - }); + uni.showModal ({ + title: this.$t('prompt'), + content: this.$t('callmsg'), + cancelText: this.$t('cancel'), + confirmText: this.$t('confirm'), + success: function (res) { + if (res.confirm) { + uni.makePhoneCall({ + phoneNumber: phoneNumber, + success: () => { + // console.log('拨打电话成功'); + }, + fail: (err) => { + // console.log('拨打电话失败', err); + }, + }); + } else if (res.cancel) { + // console.log('用户点击取消'); + } + } + }); }, //退出登录 logout(){ diff --git a/pages/index/webview.vue b/pages/index/webview.vue index 7292774..a2246f0 100644 --- a/pages/index/webview.vue +++ b/pages/index/webview.vue @@ -14,7 +14,6 @@ } }, onLoad(options) { - console.log(options) this.getCode(options.code,options.state) }, methods: { @@ -28,10 +27,8 @@ }, getCode(code,state) { // var code = this.getUrlParam('code'); - console.log(code) var code_url = ''; if (code == null || code == '' || !code) { - console.log(2222222) request({ url:'feishu/getinfo', method:'post', @@ -43,7 +40,7 @@ if(res.data.code ==0){ var data = res.data.data; this.datas = data - console.log(data) + // console.log(data) code_url += 'https://open.feishu.cn/open-apis/authen/v1/authorize' code_url += '?app_id=' + data.app_id @@ -51,7 +48,7 @@ code_url += '&scope=' + data.scope code_url += '&state=' + data.state; - console.log(code_url) + // console.log(code_url) // return; window.location.href = code_url; }else{ @@ -96,16 +93,16 @@ const route = currentPage.route; // 页面路径 const options = currentPage.options; // 页面参数 const fullUrl = `${route}?${Object.keys(options).map(key => `${key}=${options[key]}`).join('&')}`; - console.log('当前页面完整 URL:', fullUrl); + // console.log('当前页面完整 URL:', fullUrl); request({ url:'feishu/getinfo', method:'post', }).then(res => { var data = res.data.data; var urls = data.url+fullUrl - console.log(data) + // console.log(data) this.webUrl = 'https://open.feishu.cn/open-apis/authen/v1/authorize?app_id='+data.app_id+'&redirect_uri='+urls+'&scope='+data.scope+'&state='+data.state - console.log(this.webUrl) + // console.log(this.webUrl) }) }, } diff --git a/pages/login/agreement.vue b/pages/login/agreement.vue index fb0f3b1..4aba954 100644 --- a/pages/login/agreement.vue +++ b/pages/login/agreement.vue @@ -1,6 +1,7 @@ diff --git a/pages/login/agreementuser.vue b/pages/login/agreementuser.vue index e7eb05e..aa8a5e8 100644 --- a/pages/login/agreementuser.vue +++ b/pages/login/agreementuser.vue @@ -1,6 +1,7 @@ diff --git a/pages/login/index.vue b/pages/login/index.vue index 057165b..7a4a2b3 100644 --- a/pages/login/index.vue +++ b/pages/login/index.vue @@ -62,7 +62,7 @@ {{$t('agreeMsg')}}{{$t('UserAgreement')}}{{$t('and')}}{{$t('Privacy')}} - © 2024 powered by 河南晋海科技环保有限公司 + © 2024 powered by 河南新友合科技有限公司 diff --git a/pages/login/register.vue b/pages/login/register.vue index bc933b9..1f1e759 100644 --- a/pages/login/register.vue +++ b/pages/login/register.vue @@ -124,7 +124,7 @@ code: this.code, } }).then(res => { - console.log(res.data.data) + // console.log(res.data.data) uni.showToast({ title: res.data.message, icon: 'none' @@ -170,7 +170,7 @@ email: this.email, } }).then(res => { - console.log(res.data.data) + // console.log(res.data.data) uni.showToast({ title:res.data.message, icon: 'none' diff --git a/pages/mine/businesscard.vue b/pages/mine/businesscard.vue index 3b13bcd..1951151 100644 --- a/pages/mine/businesscard.vue +++ b/pages/mine/businesscard.vue @@ -101,7 +101,7 @@ }); // 2. 返回临时路径（可直接用于 显示） - console.log('下载成功，临时路径:', tempFilePath); + // console.log('下载成功，临时路径:', tempFilePath); if(item =='imageSrc'){ this.imageSrc = tempFilePath; }else{ @@ -109,7 +109,7 @@ } } catch (err) { - console.error('下载失败:', err); + // console.error('下载失败:', err); throw new Error('图片下载失败'); } }, @@ -156,7 +156,7 @@ if (res.confirm) { that.downloadImage(baseImg,canvas); } else if (res.cancel) { - console.log('用户点击取消'); + // console.log('用户点击取消'); } } }); diff --git a/pages/mine/changinfo.vue b/pages/mine/changinfo.vue index 94ce5e1..92c388e 100644 --- a/pages/mine/changinfo.vue +++ b/pages/mine/changinfo.vue @@ -155,10 +155,7 @@ handleSearch() { var that = this if (this.searchKeyword) { - console.log(this.searchKeyword) this.filteredOptions = this.areaList1.filter((item) => item.name.includes(this.searchKeyword)); - - console.log(this.filteredOptions) } else { // 如果搜索框为空，显示全部数据 this.filteredOptions = this.areaList1; @@ -170,8 +167,6 @@ // this.searchKeyword = item.name this.actives = item.id // this.showPicker = false; // 关闭弹窗 - console.log("选中的值:", item.id); - console.log("选中的值:", item.name); }, arerfn(){ this.showPicker = false; // 关闭弹窗 @@ -235,7 +230,8 @@ uploadfn(imgUrl,name,name1){ var that = this; uni.uploadFile({ - url: 'http://219.157.255.213:9007/upload/uploadImage', + // url: 'https://api.fcrm.hnxinyouhe.com/upload/uploadImage', + url: 'https://crm-server.smt.hnxinyouhe.com/upload/uploadImage', filePath: imgUrl, name: 'files', header:{'Authorization': 'Bearer ' + uni.getStorageSync('token')}, @@ -249,7 +245,6 @@ }else{ that.userinfo[name1] = path.data.image_url that.userinfo[name] = path.data.path - console.log(that.form) } } }); @@ -277,7 +272,6 @@ uni.navigateBack({}) }, bcFn(){ - console.log(this.userinfo) request({ url:'user/save', method:'POST', diff --git a/pages/mine/recyclebin.vue b/pages/mine/recyclebin.vue index 6f62715..7141460 100644 --- a/pages/mine/recyclebin.vue +++ b/pages/mine/recyclebin.vue @@ -41,7 +41,6 @@ recycle:'recycle' } }).then(res => { - console.log(res.data) if(res.data.code ==0){ var datas = res.data.data.list; this.$refs.paging.complete(datas); diff --git a/pages/mine/resetPwd.vue b/pages/mine/resetPwd.vue index 7da1fb7..5e2ee68 100644 --- a/pages/mine/resetPwd.vue +++ b/pages/mine/resetPwd.vue @@ -130,7 +130,6 @@ }) }, getVcode() { - console.log(this.email) if(this.email==''){ uni.showToast({ title:this.$t('emailerr'), @@ -161,7 +160,6 @@ email: this.email, } }).then(res => { - console.log(res.data.data) uni.showToast({ title:res.data.message, icon: 'none' diff --git a/pages/mine/workreport.vue b/pages/mine/workreport.vue index bb34711..ddc08b8 100644 --- a/pages/mine/workreport.vue +++ b/pages/mine/workreport.vue @@ -41,7 +41,6 @@ per_page:10, } }).then(res => { - console.log(res.data) if(res.data.code ==0){ var datas = res.data.data.data; this.$refs.paging.complete(datas); diff --git a/pages/mine/workreportdetil.vue b/pages/mine/workreportdetil.vue index cd85f1d..721d624 100644 --- a/pages/mine/workreportdetil.vue +++ b/pages/mine/workreportdetil.vue @@ -77,7 +77,6 @@ uni.navigateBack({}) }, bcFn(){ - console.log(this.userinfo) request({ url:'daily/save', method:'POST', diff --git a/uni_modules/z-paging/components/z-paging/js/modules/i18n.js b/uni_modules/z-paging/components/z-paging/js/modules/i18n.js index 3c782d7..cde8de8 100644 --- a/uni_modules/z-paging/components/z-paging/js/modules/i18n.js +++ b/uni_modules/z-paging/components/z-paging/js/modules/i18n.js @@ -8,7 +8,7 @@ import c from '.././z-paging-constant' import interceptor from '../z-paging-interceptor' const language = uni.getStorageSync('i18locale')?uni.getStorageSync('i18locale'):uni.getLocale(); -console.log(uni.getLocale()) +// console.log(uni.getLocale()) export default { data() { return { @@ -95,7 +95,7 @@ export default { }, // 获取国际化转换后的文本 _getI18nText(key, value) { - console.log(this.finalLanguage) + // console.log(this.finalLanguage) const dataType = Object.prototype.toString.call(value); if (dataType === '[object Object]') { const nextValue = value[this.finalLanguage];