From b7f1640c6f7f10311f5d6746781f117c810dc55c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Sat, 26 Oct 2024 16:43:55 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=9B=E5=AE=89=E6=96=B0=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BC=98=E5=8C=96-1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/config.js | 2 ++ components/h-timePicker/h-timePicker.vue | 10 +++--- components/h-timePicker/h-timePickerEnd.vue | 3 +- my/renzheng/index.vue | 39 ++++++++++++++------- pages/index/previousPoints.vue | 4 +-- pages/my/index.vue | 2 +- pages/my/mangshi.vue | 11 +++--- pages/my/userinfo.vue | 7 ++-- utils/websocketUtils.js | 4 +++ uview-ui/libs/request/index.js | 4 +-- 10 files changed, 55 insertions(+), 31 deletions(-) diff --git a/common/config.js b/common/config.js index 0d48dad..c669e64 100644 --- a/common/config.js +++ b/common/config.js @@ -39,6 +39,7 @@ const ROOTPATH1 = (checkdomain(ROOTHOST) ? "https://" : "http://") + ROOTHOST + const ROOTPATH2 = "wss://" + ROOTHOST + "/wss/chatSocket/"; //联系客服 const WEBSOCKETADDRESS = "wss://" + ROOTHOST + "/wss/chatSocket/"; //退出软件后台后将用户状态置为离线 const UPLOAD_PATH = ROOTPATH1 + '/alioss/upload'; +const UPLOAD_AVATAR = ROOTPATH1 + '/alioss/uploadAvatar'; // const ROOTPATH = "http://192.168.0.131:8187/sqx_fast"; // const ROOTPATH1 = "http://192.168.0.131:8187/sqx_fast"; @@ -68,6 +69,7 @@ module.exports = { APIHOST1: ROOTPATH1, WSHOST: ROOTPATH2, UPLOAD_PATH, + UPLOAD_AVATAR, // WSHOST1: ROOTPATH3, TX_MAP_KEY, WS_BASE_PATH, diff --git a/components/h-timePicker/h-timePicker.vue b/components/h-timePicker/h-timePicker.vue index 245d982..3cf7b1d 100644 --- a/components/h-timePicker/h-timePicker.vue +++ b/components/h-timePicker/h-timePicker.vue @@ -80,8 +80,9 @@ export default { let eT = +this.cTime; if (sT <= eT) { - let h = date1.getHours() < sT ? sT : date1.getHours(); - h = h + parseInt(this.timeNum); + // let h = date1.getHours() < sT ? sT : date1.getHours(); + // h = h + parseInt(this.timeNum); + let h = sT; if (h > eT || this.sDayNum > 0) { this.sDayNum = this.sDayNum <= 0 ? parseInt(this.sDay) + 1 : parseInt(this.sDay); for (let i = sT; i <= eT; i++) { @@ -93,8 +94,9 @@ export default { } } } else { - let h = date1.getHours() < sT ? sT : date1.getHours(); - h = h + parseInt(this.timeNum); + // let h = date1.getHours() < sT ? sT : date1.getHours(); + // h = h + parseInt(this.timeNum); + let h = sT; if ((h > eT && h < sT) || h > 23 || this.sDayNum > 0) { this.sDayNum = this.sDayNum <= 0 ? parseInt(this.sDay) + 1 : parseInt(this.sDay); for (let i = 0; i <= 23; i++) { diff --git a/components/h-timePicker/h-timePickerEnd.vue b/components/h-timePicker/h-timePickerEnd.vue index a713648..656f18b 100644 --- a/components/h-timePicker/h-timePickerEnd.vue +++ b/components/h-timePicker/h-timePickerEnd.vue @@ -69,7 +69,7 @@ export default { }, pickerTap: function() { let date = new Date(); - date.setDate(date.getDate() + 1); + //date.setDate(date.getDate() + 1); let monthDay = []; let hours = []; let minute = []; @@ -202,7 +202,6 @@ export default { } }, bindStartMultiPickerChange(e) { - console.log(e); this.multiIndex = e.detail.value; let da = this.multiArray; let di = e.detail.value; diff --git a/my/renzheng/index.vue b/my/renzheng/index.vue index 5f75b76..3f5374f 100644 --- a/my/renzheng/index.vue +++ b/my/renzheng/index.vue @@ -49,10 +49,19 @@ - + 请选择认证类型 - + {{item.value}} + + + + + 已认证类型 + + {{item.value}} @@ -136,8 +145,8 @@ - + 持有资质证书（可多张） @@ -397,15 +406,16 @@ return `${year}-${month}-${day}`; }, gukeBtn(item) { - var index = this.selected.indexOf(item); + console.log(this.selected); + var index = this.selected.indexOf(item.id); if (index === -1) { - this.selected.push(item); + this.selected.push(item.id); } else { this.selected.splice(index, 1); } var data = []; for (var i = 0; i < this.selected.length; i++) { - data.push(this.selected[i].id) + data.push(this.selected[i]) } this.typeId = data.join(",") console.log("this.typeId", this.typeId) @@ -734,6 +744,13 @@ if (res.data.status == 2) { this.form.remek = res.data.remek ? res.data.remek : '' } + if (res.data.classifyId) { + let classifyIds = res.data.classifyId.split(','); + for (let i = 0; i < classifyIds.length; i++) { + let id = classifyIds[i]; + this.selected.push(Number(id)); + } + } } }); }, @@ -803,24 +820,21 @@ onok(ev) { var that = this; this.url = ""; - // that.form.headImg = ev.path; var url = null; if (ev.path) { that.$queue.showLoading("上传中..."); // 图片小于等于2MB + that.urlUol = ev.path; uni.uploadFile({ // 上传接口 - url: websocketUtils.uploadFileUrl(), //真实的接口地址 + url: websocketUtils.uploadAvatarUrl(), //真实的接口地址 filePath: that.urlUol, name: 'file', success: (uploadFileRes) => { that.form.headImg = JSON.parse(uploadFileRes.data).data - console.log(that.form.headImg) uni.hideLoading(); - } }); } - console.log("asdasdasdasd", this.avatar) }, oncancel() { // url设置为空，隐藏控件 @@ -1064,7 +1078,6 @@ } }, setPayment(name, order) { - console.log(777777777, name, order) uni.requestPayment({ provider: name, orderInfo: order, //微信、支付宝订单数据 diff --git a/pages/index/previousPoints.vue b/pages/index/previousPoints.vue index c30e31b..d0bd896 100644 --- a/pages/index/previousPoints.vue +++ b/pages/index/previousPoints.vue @@ -79,8 +79,8 @@ 项目金额 : ￥{{item.priceTotal}} - 本单收益: - ￥{{item.artificerMoneyTotal}} + 本单积分: + {{item.jifen}} diff --git a/pages/my/index.vue b/pages/my/index.vue index 2a0dbd2..f6581e4 100644 --- a/pages/my/index.vue +++ b/pages/my/index.vue @@ -23,7 +23,7 @@ - 5.0 + {{ordersScore}} {{ creditScore }} diff --git a/pages/my/mangshi.vue b/pages/my/mangshi.vue index e5c322d..ffbfa4a 100644 --- a/pages/my/mangshi.vue +++ b/pages/my/mangshi.vue @@ -6,7 +6,7 @@ - 选择接单时问 + 选择接单时间 @@ -18,7 +18,6 @@ 结束时间 - 次日 {{endTime}} @@ -378,7 +377,7 @@ multiSelector: '', isTrue: true, starTime:'00:00', - endTime: '00:00', + endTime: '23:59', appointTime:[], disableTimeSlot:[], newmsList: [], @@ -558,7 +557,11 @@ this.msList=time; }, sub() { - this.saveMangShi(); + if(this.endTime>=this.starTime){ + this.saveMangShi(); + }else{ + this.$queue.showToast('开始时间需早于结束时间！'); + } // if (this.msList.length == 0) { // if(this.yearsDate === ''){ // this.$queue.showToast('请先添加待选时间！'); diff --git a/pages/my/userinfo.vue b/pages/my/userinfo.vue index 7879318..a930bf6 100644 --- a/pages/my/userinfo.vue +++ b/pages/my/userinfo.vue @@ -15,7 +15,7 @@ - + @@ -187,7 +187,7 @@ }); let userId = uni.getStorageSync('userId'); uni.uploadFile({ - url: websocketUtils.uploadFileUrl(), //真实的接口地址 + url: websocketUtils.uploadAvatarUrl(), //真实的接口地址 filePath: e.detail.avatarUrl, header: { token: token @@ -214,8 +214,9 @@ }); let token = uni.getStorageSync('token'); let userId = uni.getStorageSync('userId'); + that.upUrl = ev.path; uni.uploadFile({ - url: websocketUtils.uploadFileUrl(), //真实的接口地址 + url: websocketUtils.uploadAvatarUrl(), //真实的接口地址 filePath:that.upUrl, header: { token: token diff --git a/utils/websocketUtils.js b/utils/websocketUtils.js index 9fa6d98..ca407cd 100644 --- a/utils/websocketUtils.js +++ b/utils/websocketUtils.js @@ -596,6 +596,10 @@ export function uploadFileUrl() { return config('UPLOAD_PATH'); } +export function uploadAvatarUrl() { + return config('UPLOAD_AVATAR'); +} + export function getWsBaseUrl() { return config('WSHOST'); } diff --git a/uview-ui/libs/request/index.js b/uview-ui/libs/request/index.js index 3e39668..da20628 100644 --- a/uview-ui/libs/request/index.js +++ b/uview-ui/libs/request/index.js @@ -101,9 +101,9 @@ class Request { constructor() { this.config = { - // baseUrl: 'https://admin.sjajk.com/', // 请求的根域名//生产需替换 + baseUrl: 'https://admin.sjajk.com/', // 请求的根域名//生产需替换 // baseUrl: 'http://192.168.2.222:8187/', // 请求的根域名 - baseUrl: 'https://sausers.blxinchuang.com', // 请求的根域名 + // baseUrl: 'https://sausers.blxinchuang.com', // 请求的根域名 // 默认的请求头 header: {}, method: 'POST',