diff --git a/api/apiT.js b/api/apiT.js index ac73032..891ffd5 100644 --- a/api/apiT.js +++ b/api/apiT.js @@ -1,9 +1,9 @@ - // const baseUrl = "http://219.157.255.213:9007/"; //这里放置url域名32044 + const baseUrl = "http://219.157.255.213:9006/"; //这里放置url域名32044 // const baseUrl = "http://api.crm.hnxinyouhe.com/"; //这里放置url域名32044 // const baseUrl = "http://192.168.50.9:8787/"; //这里放置url域名32044 // const baseUrl = "https://api.fcrm.hnxinyouhe.com/"; //这里放置url域名32044 - const baseUrl = "https://crm-server.smt.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; diff --git a/common/locales/en.js b/common/locales/en.js index adceb27..fc2e40b 100644 --- a/common/locales/en.js +++ b/common/locales/en.js @@ -160,7 +160,7 @@ export default { Confirmpassword:'Confirm password', Confirmbtn:'Confirm modification', edtbtn:'edit', - zh:'Chinese', + zh:'中文', en:'English', ru:'Russian', subsuccess:'Successful', @@ -200,6 +200,7 @@ export default { versionmsg:'It is already the latest version！', receiveOrder:'Collect Order', loading:'loading', + imgloading:'Image uploading in progress!', 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?', diff --git a/common/locales/ru.js b/common/locales/ru.js index cc343cc..d8e09d1 100644 --- a/common/locales/ru.js +++ b/common/locales/ru.js @@ -159,9 +159,9 @@ export default { Confirmpassword: "Подтвердите пароль", Confirmbtn: "Подтвердить изменение", edtbtn: "Редактировать данные", - zh: "Китайский", - en: "Английский", - ru: "Русский", + zh:'中文', + en:'English', + ru:'Russian', subsuccess: "Успешно отправлено", onedaygj: "Через 1 день", threedaygj: "Через 3 дня", @@ -199,6 +199,7 @@ export default { versionmsg: "Уже последняя версия!", receiveOrder: "Принять заказ", loading: "Загрузка", + imgloading:'Идёт загрузка изображения!', downmp:'Скачать визитку', downmpmsg:'Вы уверены в загрузке текущей карты?', callmsg:'Вы уверены, что хотите совершить звонок?', diff --git a/common/locales/zh.js b/common/locales/zh.js index eea2363..1532f80 100644 --- a/common/locales/zh.js +++ b/common/locales/zh.js @@ -87,7 +87,7 @@ export default { Versionup:'版本更新', Privacy:'隐私政策', UserAgreement:'用户协议', - copyright:'© 2024 powered by 河南晋海科技环保有限公司', + copyright:'© 2024 powered by 河南新友合科技有限公司', logoff:'账户注销', logoffmsg:'以下信息将被清空无法找回', logoffts1:'身份、账号信息', @@ -160,8 +160,8 @@ export default { Confirmbtn:'确认修改', edtbtn:'编辑资料', zh:'中文', - en:'英语', - ru:'俄语', + en:'English', + ru:'Russian', subsuccess:'提交成功', onedaygj:'1天后', threedaygj:'3天后', @@ -199,6 +199,7 @@ export default { versionmsg:'已是最新版本！', receiveOrder:'领单', loading:'加载中', + imgloading:'图片上传中!', downmp:'下载名片', downmpmsg:'确定下载当前名片图吗?', callmsg:'确定拨打电话吗?', diff --git a/pages/customer/followup.vue b/pages/customer/followup.vue index a3c0a04..3b38ed0 100644 --- a/pages/customer/followup.vue +++ b/pages/customer/followup.vue @@ -442,15 +442,20 @@ }, uploadfn(imgUrl,name){ var that = this; + uni.showLoading({ + title:this.$t('imgloading') + }); uni.uploadFile({ // url: 'http://api.crm.hnxinyouhe.com/upload', // url: 'https://api.fcrm.hnxinyouhe.com/upload/uploadImage', - url: 'https://crm-server.smt.hnxinyouhe.com/upload/uploadImage', + // url: 'https://crm-server.smt.hnxinyouhe.com/upload/uploadImage', + url: 'http://219.157.255.213:9006/upload/uploadImage', filePath: imgUrl, name: 'files', header:{'Authorization': 'Bearer ' + uni.getStorageSync('token')}, success: (uploadFileRes) => { const path=JSON.parse(uploadFileRes.data) + uni.hideLoading(); if(path.code==0){ that.form[name] = path.data.path }else{ diff --git a/pages/login/agreement.vue b/pages/login/agreement.vue index 4aba954..ddfc355 100644 --- a/pages/login/agreement.vue +++ b/pages/login/agreement.vue @@ -1,7 +1,8 @@ diff --git a/pages/login/agreementuser.vue b/pages/login/agreementuser.vue index aa8a5e8..eb2778c 100644 --- a/pages/login/agreementuser.vue +++ b/pages/login/agreementuser.vue @@ -1,7 +1,8 @@ diff --git a/pages/mine/about.vue b/pages/mine/about.vue index d7f4def..712d608 100644 --- a/pages/mine/about.vue +++ b/pages/mine/about.vue @@ -20,7 +20,7 @@ - {{$t('mine.copyright')}} + © 2024 powered by 河南新友合科技有限公司 diff --git a/pages/mine/changinfo.vue b/pages/mine/changinfo.vue index 92c388e..d9fc9f9 100644 --- a/pages/mine/changinfo.vue +++ b/pages/mine/changinfo.vue @@ -231,7 +231,8 @@ var that = this; uni.uploadFile({ // url: 'https://api.fcrm.hnxinyouhe.com/upload/uploadImage', - url: 'https://crm-server.smt.hnxinyouhe.com/upload/uploadImage', + // url: 'https://crm-server.smt.hnxinyouhe.com/upload/uploadImage', + url: 'http://219.157.255.213:9006/upload/uploadImage', filePath: imgUrl, name: 'files', header:{'Authorization': 'Bearer ' + uni.getStorageSync('token')},