diff --git a/config.js b/config.js index 70fffdb..3faa5b5 100644 --- a/config.js +++ b/config.js @@ -1,9 +1,10 @@ -import { host, hosts, iMServiceHost } from './utils/domain.js' +import { host, hosts, iMServiceHost , admin, base} from './utils/domain.js' var config = { service: { host, iMServiceHost, + addLog:`${base}/admin/log/addLoginCount`, getStage:`${host}/customer/getStage`, //验证toen verify:`${host}/user/verify`, diff --git a/manifest.json b/manifest.json index 0c0f252..b79d324 100644 --- a/manifest.json +++ b/manifest.json @@ -1,7 +1,7 @@ { "name" : "AI营销辅助", "appid" : "__UNI__D88F14A", - "description" : "智控管家", + "description" : "AI销管", "versionName" : "1.1.0", "versionCode" : "100", "transformPx" : false, diff --git a/pages.json b/pages.json index 92ce75f..79cf150 100644 --- a/pages.json +++ b/pages.json @@ -14,7 +14,7 @@ { "path": "pages/index/index", "style": { - "navigationBarTitleText": "智控管家", + "navigationBarTitleText": "AI销管", "navigationBarBackgroundColor": "#2671E2", "navigationBarTextStyle": "white" } diff --git a/pages/index/customer.vue b/pages/index/customer.vue index 5d5b10a..b390764 100644 --- a/pages/index/customer.vue +++ b/pages/index/customer.vue @@ -66,7 +66,7 @@ {{item.agentName}} - 自动结束 18:12 + 自动结束 @@ -182,7 +182,15 @@ onLoad() { uni.hideTabBar(); }, - + computed:{ + timestamp(){ + return (e)=>{ + let totalTime = new Date(e).getTime()/1000 + 60*60*2 + let nowTime = new Date().getTime()/1000 + return totalTime - nowTime + } + } + }, onShow() { this.buildingID = uni.getStorageSync('buildingID').id; let newmenulist = uni.getStorageSync('weapp_session_Menu_data'); @@ -203,7 +211,7 @@ methods: { reshCustom() { this.init() - }, + }, tapThevisiting(item) { if (this.permissions.commonly1 != true) { return diff --git a/pages/index/index.vue b/pages/index/index.vue index 6776a77..4ab285d 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -436,8 +436,26 @@ } this.initworkThisWeek() this.initrealTimeStatistics() + this.sendLog() }, methods: { + sendLog(){ + uni.request({ + url: config.service.addLog, + method: "POST", + header: { + 'content-type': 'application/json', + 'Authorization': 'Bearer ' + uni.getStorageSync('weapp_session_login_data').token + }, + data: { + houseId: this.buildingID, + serviceId:"test" + }, + success: (data) => { + console.log(data) + } + }) + }, //时间选择 tabtimetap(index,str){ this.timeshow=false; diff --git a/pages/index/personal.vue b/pages/index/personal.vue index e6650b9..7af3a16 100644 --- a/pages/index/personal.vue +++ b/pages/index/personal.vue @@ -15,15 +15,15 @@ - + + 消息 - + --> @@ -126,7 +126,7 @@ success: function(result) { var data = result.data; //console.log("登陆信息", data); if (data.data == true) { - app.Closewebsocke() + // app.Closewebsocke() uni.clearStorageSync(); //清除缓存 uni.showToast({ icon: "none", diff --git a/pages/login/Verification.vue b/pages/login/Verification.vue index c49d503..0c2ef96 100644 --- a/pages/login/Verification.vue +++ b/pages/login/Verification.vue @@ -9,7 +9,7 @@ 您好， - 欢迎登录智控管家～ + 欢迎登录AI销管～ diff --git a/pages/login/index.vue b/pages/login/index.vue index 61074cd..04c5c77 100644 --- a/pages/login/index.vue +++ b/pages/login/index.vue @@ -9,7 +9,7 @@ 您好， - 欢迎登录智控管家～ + 欢迎登录AI销管～ diff --git a/pages/mine/details2.vue b/pages/mine/details2.vue index 3488eaf..a649c2e 100644 --- a/pages/mine/details2.vue +++ b/pages/mine/details2.vue @@ -102,7 +102,25 @@ - {{conversionTiame(item.bg/1000)}} + + A + B + C + D + E + F + G + H + I + J + K + L + M + N + O + P + {{conversionTiame(item.bg/1000)}} + @@ -128,7 +146,6 @@ - @@ -2350,6 +2367,30 @@ } + + + .scroll-Y .text[data-speaker="2"], + .scroll-Y .text[data-speaker="4"], + .scroll-Y .text[data-speaker="6"] { + .contentInfo{ + .info{ + .AudioUserName{ + margin-left: 10rpx; + } + display: flex; + flex-direction: row-reverse; + } + } + } + .scroll-Y .text{ + .contentInfo{ + .info{ + .AudioUserName{ + margin-right: 10rpx; + } + } + } + } .scroll-Y .text .avatar { width: 64upx; diff --git a/pages/mine/messageList.vue b/pages/mine/messageList.vue index df3ac71..8c859d6 100644 --- a/pages/mine/messageList.vue +++ b/pages/mine/messageList.vue @@ -100,7 +100,7 @@ - 智控管家（2022-01-22）升级公告 + （2022-01-22）升级公告 2021-01-12 12：23：01 @@ -109,7 +109,7 @@ - 智控管家（2022-01-11）升级公告 + （2022-01-11）升级公告 2021-01-12 12：23：01 diff --git a/utils/domain.js b/utils/domain.js index d5ecabf..e78e51b 100644 --- a/utils/domain.js +++ b/utils/domain.js @@ -1,8 +1,8 @@ // const base = 'http://39.97.167.65' ;// 测试站 // const base = 'http://8kdmng.natappfree.cc' ;// 佳豪 // const base = 'http://192.168.31.134:9999' ;// 佳豪 -// const base = 'http://192.168.31.167:9999' // 长龙 -const base = 'https://zanyong.hfju.com';// 正式 +const base = 'http://192.168.31.167:9999' // 长龙 +// const base = 'https://zanyong.hfju.com';// 正式 // http.js使用 const baseUrl = `${base}/autoSR/api`; @@ -10,11 +10,14 @@ const baseUrl = `${base}/autoSR/api`; const host = `${base}/autoSR/api`; const hosts = `${base}/`; +const admin = "http://192.168.31.167:9999"; const iMServiceHost = 'https://im.quhouse.com/'; //IM的后端地址正式 export { baseUrl, host, hosts, - iMServiceHost + admin, + iMServiceHost, + base } \ No newline at end of file