diff --git a/common/config.js b/common/config.js index 3426f42..7fb9858 100644 --- a/common/config.js +++ b/common/config.js @@ -1,11 +1,11 @@ // const ROOTPATH3 = "wss://192.168.2.22:8187/wss/chatSocket/"; -// const ROOTPATH = "http://192.168.2.22:8187/sqx_fast"; -// const ROOTPATH1 = "http://192.168.2.22:8187/sqx_fast"; +const ROOTPATH = "http://192.168.2.22:8187/sqx_fast"; +const ROOTPATH1 = "http://192.168.2.22:8187/sqx_fast"; //生产环境 -const ROOTPATH = "https://admin.sjajk.com/sqx_fast";//生产需替换 -const ROOTPATH1 = "https://admin.sjajk.com/sqx_fast";//生产需替换 +// const ROOTPATH = "https://admin.sjajk.com/sqx_fast";//生产需替换 +// const ROOTPATH1 = "https://admin.sjajk.com/sqx_fast";//生产需替换 const ROOTPATH3 = "wss://admin.sjajk.com/wss/chatSocket/"; //联系客服//生产需替换 //上传地址 diff --git a/index.html b/index.html index 223e938..96d5c1e 100644 --- a/index.html +++ b/index.html @@ -21,7 +21,6 @@ window._AMapSecurityConfig = { //securityJsCode: "js秘钥", serviceHost: 'https://wx.sjajk.com/_AMapService', - // serviceHost: 'http://sauser.blxinchuang.com/_AMapService', //serviceHost: 'http://120.46.52.165/_AMapService', // serviceHost: 'http://192.168.2.222:8187/_AMapService', }; diff --git a/manifest.json b/manifest.json index 1f25fa6..bcdba61 100644 --- a/manifest.json +++ b/manifest.json @@ -1,5 +1,5 @@ { - "name" : "盛安到家", + "name" : "盛安小象", "appid" : "__UNI__0A81F4F", "description" : "", "versionName" : "1.0.1", @@ -174,7 +174,6 @@ "proxy" : { // 可代理多个 "/TencentGet" : { - // "target" : "http://sauser.blxinchuang.com/", // 腾讯地图逆地址解析 "target" : "http://admin.sjajk.com/", // 腾讯地图逆地址解析 "changeOrigin" : true, "secure" : false, @@ -189,7 +188,6 @@ "amap" : { "key" : "32c22db939160ba44394eb187f7897ae", "securityJsCode" : "260614bdf77a5961d4379530363dc5c0", - // "serviceHost" : "http://sauser.blxinchuang.com/_AMapService" "serviceHost" : "http://admin.sjajk.com/_AMapService" } } diff --git a/my/hongbao/youhuijuanList.vue b/my/hongbao/youhuijuanList.vue index faea08f..d7c274c 100644 --- a/my/hongbao/youhuijuanList.vue +++ b/my/hongbao/youhuijuanList.vue @@ -158,7 +158,7 @@ status:this.tabIndex, minMoney:this.priceDd } - this.$Request.getT('/app/coupon/selectUserCouponList',data).then(res => { + this.$Request.get('/app/coupon/selectUserCouponList',data).then(res => { if (res.code == 0) { if (res.data) { if (this.page == 1) this.hongbao = []; //如果是第一页需手动制空列表 diff --git a/my/order/feedback.vue b/my/order/feedback.vue index 346b42f..1774090 100644 --- a/my/order/feedback.vue +++ b/my/order/feedback.vue @@ -1,7 +1,7 @@ @@ -123,25 +128,28 @@ return { url: '', avatar: '', - listData:[], + listData: [], haibaoImg: null, haibaoShow: false, modalName: '', - backgroundImage:'', + backgroundImage: '', erweimapath: '', invitationCode: '', tuiguang: '', - + url2: '', haibaoImg2: null, haibaoShow2: false, modalName2: '', - backgroundImage2:'', + backgroundImage2: '', erweimapath2: '', + configInfo: {}, + isExpired:false,//是否过期 } }, - onLoad() { + async onLoad() { this.avatar = uni.getStorageSync('avatar') + this.configInfo = await this.getConfigInfo() this.getData(); this.getBackImageList(); this.getBackImageList2(); @@ -179,7 +187,43 @@ imageUrl: this.bgImg } }, - methods:{ + methods: { + expired(row) { + if (this.configInfo.fxmLimit == 1) return false; + else { + console.log(111, row.createTime) + const createTime = new Date(row.createTime.replace(' ', + 'T')); // Assuming ISO format with space separator + + const expireDate = new Date(createTime); + expireDate.setDate(createTime.getDate() + this.configInfo.fxmLimitDays); + + const now = new Date(); // Get current date and time + + return expireDate < now; + } + }, + addDaysToDate(createTimeStr, daysToAdd) { + // 将字符串解析为Date对象 + let date = new Date(createTimeStr.replace(' ', 'T')); + + // 添加天数 + date.setDate(date.getDate() + daysToAdd); + + // 格式化输出 + let year = date.getFullYear(); + let month = String(date.getMonth() + 1).padStart(2, '0'); + let day = String(date.getDate()).padStart(2, '0'); + let hours = String(date.getHours()).padStart(2, '0'); + let minutes = String(date.getMinutes()).padStart(2, '0'); + let seconds = String(date.getSeconds()).padStart(2, '0'); + + return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`; + }, + calcDqsj(row) { + if (this.configInfo.fxmLimit == 1) return '永久' + else return this.addDaysToDate(row.createTime, this.configInfo.fxmLimitDays) + }, getUserInfo() { this.$Request.get("/app/user/selectUserById").then(res => { if (res.code == 0) { @@ -202,8 +246,10 @@ // .invitationCode+"&flag=2"; // this.url2 = this.$queue.publicYuMingApp() + '/?invitation=' + this // .invitationCode+"&flag=1"; - this.url = this.$queue.publicYuMingApp() + '/pages/public/login?blFxyCode=' + this.invitationCode; - this.url2 = this.$queue.publicYuMingApp() + '/pages/public/login?blFxyCode=' + this.invitationCode; + this.url = this.$queue.publicYuMingApp() + + '/pages/public/login?blFxyCode=' + this.invitationCode; + this.url2 = this.$queue.publicYuMingApp() + + '/pages/public/login?blFxyCode=' + this.invitationCode; } } }); @@ -216,7 +262,7 @@ this.$Request.get("/app/commission/fxy/poster").then(res => { uni.hideLoading(); if (res.code == 0) { - this.backgroundImage2=res.data.userImage + this.backgroundImage2 = res.data.userImage } }); }, @@ -226,7 +272,7 @@ this.$Request.get("/app/commission/fxy/poster").then(res => { uni.hideLoading(); if (res.code == 0) { - this.backgroundImage = res.data.fxyImage; + this.backgroundImage = res.data.fxyImage; } }); }, @@ -268,39 +314,55 @@ this.modalName = 'Image'; } }, - goNav(link){ + goNav(link) { uni.navigateTo({ - url:link+'?navName='+'分销员' + url: link + '?navName=' + '分销员' }) }, - getData(){ + getData() { this.$Request.get("/app/commission/fxy/myFxy").then(res => { console.log("res.data--->", res.data); if (res.code == 0) { - this.listData=res.data + this.listData = res.data + this.isExpired = this.expired(res.data) } }); + }, + getConfigInfo() { + return new Promise((resolve, reject) => { + this.$Request.get("/app/commission/fxy/fxyConfig") + .then(({ + data + }) => { + return resolve(data) + }).catch(error => { + resolve({}); + }); + }); } } } \ No newline at end of file diff --git a/pages/therapist/therapist.vue b/pages/therapist/therapist.vue index 2b985b9..87d1c46 100644 --- a/pages/therapist/therapist.vue +++ b/pages/therapist/therapist.vue @@ -632,7 +632,7 @@ } else { uni.showModal({ title: '定位服务已关闭', - content: "您需要打开定位权限，否则我们将无法获得到您附近的项目服务，导致我们无法为您提供服务，请到>设置>隐私>定位服务>中开启【盛安到家】定位权限", + content: "您需要打开定位权限，否则我们将无法获得到您附近的项目服务，导致我们无法为您提供服务，请到>设置>隐私>定位服务>中开启【盛安小象】定位权限", confirmText: "设置", success: function(res) { if (res.confirm) { diff --git a/pages/therapist/therapist1.vue b/pages/therapist/therapist1.vue index 66ca418..c536008 100644 --- a/pages/therapist/therapist1.vue +++ b/pages/therapist/therapist1.vue @@ -637,7 +637,7 @@ import permision from "@/components/permission.js"; } else { uni.showModal({ title: '定位服务已关闭', - content: "您需要打开定位权限，否则我们将无法获得到您附近的项目服务，导致我们无法为您提供服务，请到>设置>隐私>定位服务>中开启【盛安到家】定位权限", + content: "您需要打开定位权限，否则我们将无法获得到您附近的项目服务，导致我们无法为您提供服务，请到>设置>隐私>定位服务>中开启【盛安小象】定位权限", confirmText: "设置", success: function(res) { if (res.confirm) { diff --git a/pages/therapist/therapistDingdan.vue b/pages/therapist/therapistDingdan.vue index 672a8d7..3993e73 100644 --- a/pages/therapist/therapistDingdan.vue +++ b/pages/therapist/therapistDingdan.vue @@ -373,10 +373,10 @@ } .touxiang-frame{ position: absolute; - width: 190rpx; - height: 190rpx; - top:-6rpx; - left:6rpx; + width: 160rpx; + height: 55rpx; + top:110rpx; + left:15rpx; } .dituList{ width: 85%; @@ -619,7 +619,7 @@ .touxiang-left-content-img{ width: 150rpx; height: 150rpx; - border-radius:120rpx; + border-radius:100rpx; margin: 14rpx 22rpx; } .touxiang-left-view{ diff --git a/pages/therapist/therapistList.vue b/pages/therapist/therapistList.vue index 165f4ee..451d475 100644 --- a/pages/therapist/therapistList.vue +++ b/pages/therapist/therapistList.vue @@ -576,7 +576,7 @@ import permision from "@/components/permission.js"; } else { uni.showModal({ title: '定位服务已关闭', - content: "您需要打开定位权限，否则我们将无法获得到您附近的项目服务，导致我们无法为您提供服务，请到>设置>隐私>定位服务>中开启【盛安到家】定位权限", + content: "您需要打开定位权限，否则我们将无法获得到您附近的项目服务，导致我们无法为您提供服务，请到>设置>隐私>定位服务>中开启【盛安小象】定位权限", confirmText: "设置", success: function(res) { if (res.confirm) { diff --git a/pages/therapist/therapistShou.vue b/pages/therapist/therapistShou.vue index 367c2ab..2a0fdd2 100644 --- a/pages/therapist/therapistShou.vue +++ b/pages/therapist/therapistShou.vue @@ -531,7 +531,7 @@ import permision from "@/components/permission.js"; } else { uni.showModal({ title: '定位服务已关闭', - content: "您需要打开定位权限，否则我们将无法获得到您附近的项目服务，导致我们无法为您提供服务，请到>设置>隐私>定位服务>中开启【盛安到家】定位权限", + content: "您需要打开定位权限，否则我们将无法获得到您附近的项目服务，导致我们无法为您提供服务，请到>设置>隐私>定位服务>中开启【盛安小象】定位权限", confirmText: "设置", success: function(res) { if (res.confirm) {