Skip to content

S
site-uniapp
提交 d0039dc9 作者: wk
操作

正式环境配置调试

父级 6e06c67a
正在显示 包含 141 行增加 和 26 行删除
common/config.js
...@@ -4,12 +4,16 @@ const $config = { ...@@ -4,12 +4,16 @@ const $config = {
systemCode: "buildingSite", systemCode: "buildingSite",
// authCode: "477A0661-EF04-11F7-9D69-0BDD73F06500", // authCode: "477A0661-EF04-11F7-9D69-0BDD73F06500",
// authCode: "07EC0FDA-0249-6DB3-7422-0AFFF34E0E90", //测试 // authCode: "07EC0FDA-0249-6DB3-7422-0AFFF34E0E90", //测试
authCode:"D0539533-E169-5338-8ED7-3FAD554F4F62", //正式 authCode: "D0539533-E169-5338-8ED7-3FAD554F4F62", //正式
pageSize: 20, pageSize: 20,
isPage: 1, isPage: 1,
smsCfg: "industry", smsCfg: "industry",
// base: "https://test-console-api.hzdingmao.com" // base: "https://test-console-api.hzdingmao.com",
// base: "https://dev-console-api.hzdingmao.com" // base: "https://dev-console-api.hzdingmao.com",
base:"https://console-api.hibuilding.cn" base: "https://console-api.hibuilding.cn",
// gtrBase:"https://cwcd-h5.huizhucloud.com",//测试
gtrBase: "https://gdt-front-mobile.hibuilding.cn", //生产
// jyxyBase: "https://edu.huizhucloud.com", //测试
jyxyBase: "https://wlxy.cnzgc.com" //生产
} }
export default $config export default $config
components/ls-swiper/ls-swiper.vue
...@@ -7,8 +7,7 @@ ...@@ -7,8 +7,7 @@
<view v-if="list && list.length>0" class="item" <view v-if="list && list.length>0" class="item"
:class="[!crown ? '' : current==index ? 'crown-active':'crown']"> :class="[!crown ? '' : current==index ? 'crown-active':'crown']">
<image v-if="!slots" class="item-img" :class="[imgShadow?'imgShadow':'']" <image v-if="!slots" class="item-img" :class="[imgShadow?'imgShadow':'']"
:src="httpToHttps(item[imgKey])" :style="{ borderRadius: imgRadius + 'px',width:imgWidth}" :src="httpToHttps(item[imgKey])" :style="{width:imgWidth}" mode="aspectFill"></image>
mode=""></image>
<slot v-else :data='item'></slot> <slot v-else :data='item'></slot>
</view> </view>
</swiper-item> </swiper-item>
...@@ -132,8 +131,8 @@ ...@@ -132,8 +131,8 @@
.wrap { .wrap {
position: relative; position: relative;
border-radius: 30rpx; border-radius: 30rpx;
margin: 62px 30rpx 0 30rpx; margin: 72px 30rpx 0 30rpx;
background-color: #3B73FE; // background-color: #3B73FE;
.swiper { .swiper {
border-radius: 30rpx; border-radius: 30rpx;
...@@ -145,6 +144,7 @@ ...@@ -145,6 +144,7 @@
.item { .item {
height: 100%; height: 100%;
width: 100%;
transition: 1.2s; transition: 1.2s;
border-radius: 30rpx; border-radius: 30rpx;
} }
......
pages.json
...@@ -537,6 +537,15 @@ ...@@ -537,6 +537,15 @@
} }
} }
,{
"path" : "pages/gallery/outPage/gdtPage/gdtPage",
"style" :
{
"navigationBarTitleText": "",
"enablePullDownRefresh": false
}
}
], ],
"globalStyle": { "globalStyle": {
"navigationBarTextStyle": "white", "navigationBarTextStyle": "white",
......
pages/gallery/gallery.vue
...@@ -190,7 +190,25 @@ ...@@ -190,7 +190,25 @@
url: `/pages/gallery/app/modeFormList/modeFormList?check_tpl_id=${model.source_id}&business_type=${result.data.business_type}&title=${result.data.tpl_name}&showCfg=${JSON.stringify(this.models[0].show_cfg)}` url: `/pages/gallery/app/modeFormList/modeFormList?check_tpl_id=${model.source_id}&business_type=${result.data.business_type}&title=${result.data.tpl_name}&showCfg=${JSON.stringify(this.models[0].show_cfg)}`
}) })
} else if (result.data.business_type == 5) { } else if (result.data.business_type == 5) {
var source = "1"
if (this.role == 'PM') {
source = 1
} else if (this.role == 'VISITOR') {
source = 9
}
if ("63e1e639e7025e13c471a9d2" == result.data.check_tpl_id) { //建筑工人沟通日
uni.navigateTo({
url: "/pages/gallery/outPage/gdtPage/gdtPage?url=" +
`${this.$config.gtrBase}/#/loginByToken&projectId=${this.project_id}&source=${source}&token=${uni.getStorageSync("token")}&to=jzgrgtr`
})
} else if ("63e1f98420836820ca5e3c02" == result.data.check_tpl_id) {
uni.navigateTo({
url: "/pages/gallery/outPage/gdtPage/gdtPage?url=" +
`${this.$config.jyxyBase}/dologin/workSite&workSiteToken=${uni.getStorageSync("token")}&to=jypx`
})
} else {
this.toOutPage(result.data.tpl_config[0]) this.toOutPage(result.data.tpl_config[0])
}
// 汇筑工地通H5：https://cwcd-h5.huizhucloud.com/#/loginByToken?projectId=${projectId}&source=${source}&JG-AUTH=${token} // 汇筑工地通H5：https://cwcd-h5.huizhucloud.com/#/loginByToken?projectId=${projectId}&source=${source}&JG-AUTH=${token}
// 网络学院H5: https: //edu.huizhucloud.com/dologin/workSite?workSiteToken=${token} // 网络学院H5: https: //edu.huizhucloud.com/dologin/workSite?workSiteToken=${token}
// token: 一点通小程序端登录成功之后的值 // token: 一点通小程序端登录成功之后的值
...@@ -288,6 +306,7 @@ ...@@ -288,6 +306,7 @@
data: { data: {
"pageNum": 1, "pageNum": 1,
"pageSize": 5, "pageSize": 5,
"msgType": 0
} }
}).then((result) => { }).then((result) => {
console.log("消息列表", result); console.log("消息列表", result);
......
pages/gallery/message/message.vue
...@@ -6,10 +6,10 @@ ...@@ -6,10 +6,10 @@
<view v-for="(item,index) in list" :key="index" class="list-item" @click="itemClick(index,item)"> <view v-for="(item,index) in list" :key="index" class="list-item" @click="itemClick(index,item)">
<view class="red-dot" v-if="!item.readStatus"></view> <view class="red-dot" v-if="!item.readStatus"></view>
<view class="item-content "> <view class="item-content ">
<view class="title">塔机告警</view> <view class="title">{{item.resource||""}}</view>
<view class="desc-content"> <view class="desc-content">
<view class="desc">限位告警提示</view> <view class="desc">{{item.content}}</view>
<view class="time">2022/12/13 15:39:56</view> <view class="time">{{item.msgTime}}</view>
</view> </view>
<view class="line"></view> <view class="line"></view>
</view> </view>
...@@ -51,9 +51,12 @@ ...@@ -51,9 +51,12 @@
item.readStatus = true item.readStatus = true
this.$set(this.list, index, item) this.$set(this.list, index, item)
this.setRead(item) this.setRead(item)
// uni.navigateTo({
// url: "/pages/gallery/messageDetail/messageDetail?message=" + JSON.stringify(item)
// })
}, },
setRead(item) { setRead(item) {
Api.setMessage({ Api.setMessageRead({
data: item data: item
}).then((result) => { }).then((result) => {
uni.navigateTo({ uni.navigateTo({
......
pages/gallery/messageDetail/messageDetail.vue
...@@ -10,11 +10,11 @@ ...@@ -10,11 +10,11 @@
<view class="title">消息来源：</view> <view class="title">消息来源：</view>
<view class="value">{{message.resource}}</view> <view class="value">{{message.resource}}</view>
</view> </view>
<view class="item"> <view class="item" v-if="message.msgType==1">
<view class="title">风险类型：</view> <view class="title">风险类型：</view>
<view class="value">{{message.warnType}}</view> <view class="value">{{message.warnType}}</view>
</view> </view>
<view class="item"> <view class="item" v-if="message.msgType==1">
<view class="title">风险数据：</view> <view class="title">风险数据：</view>
<view class="value">{{message.warnData}}</view> <view class="value">{{message.warnData}}</view>
</view> </view>
......
pages/gallery/outPage/gdtPage/gdtPage.vue 0 → 100644
<template>
<view>
<web-view :src="webUrl">
</web-view>
</view>
</template>
<script>
export default {
data() {
return {
webUrl: ""
}
},
onLoad(options) {
if ('jzgrgtr' == options.to) {
this.webUrl =
`${options.url}?projectId=${options.project_id}&source=${options.source}&JG-AUTH=${options.token}`
} else if ('jypx' == options.to) {
this.webUrl = `${options.url}?workSiteToken=${options.workSiteToken}`
}
console.log("外部链接", this.webUrl);
},
methods: {
}
}
</script>
<style>
</style>
pages/index/index.vue
...@@ -590,7 +590,7 @@ ...@@ -590,7 +590,7 @@
uni.setStorageSync("org_no", this.userInfo.user.org_no) uni.setStorageSync("org_no", this.userInfo.user.org_no)
var currentProject = this.userInfo.currentProject var currentProject = this.userInfo.currentProject
uni.setStorageSync("org_name", currentProject.projectName) uni.setStorageSync("org_name", currentProject.projectName)
this.city = currentProject.city this.city = currentProject.city || '杭州市'
this.address = currentProject.province + currentProject.city + currentProject.area this.address = currentProject.province + currentProject.city + currentProject.area
} }
this.getNews() this.getNews()
...@@ -755,7 +755,25 @@ ...@@ -755,7 +755,25 @@
url: `/pages/gallery/app/modeFormList/modeFormList?check_tpl_id=${model.source_id}&business_type=${result.data.business_type}&title=${result.data.tpl_name}&showCfg=${JSON.stringify(this.models[0].show_cfg)}` url: `/pages/gallery/app/modeFormList/modeFormList?check_tpl_id=${model.source_id}&business_type=${result.data.business_type}&title=${result.data.tpl_name}&showCfg=${JSON.stringify(this.models[0].show_cfg)}`
}) })
} else if (result.data.business_type == 5) { } else if (result.data.business_type == 5) {
var source = "1"
if (this.role == 'PM') {
source = 1
} else if (this.role == 'VISITOR') {
source = 9
}
if ("63e1e639e7025e13c471a9d2" == result.data.check_tpl_id) { //建筑工人沟通日
uni.navigateTo({
url: "/pages/gallery/outPage/gdtPage/gdtPage?url=" +
`${this.$config.gtrBase}/#/loginByToken&projectId=${this.project_id}&source=${source}&token=${uni.getStorageSync("token")}&to=jzgrgtr`
})
} else if ("63e1f98420836820ca5e3c02" == result.data.check_tpl_id) {
uni.navigateTo({
url: "/pages/gallery/outPage/gdtPage/gdtPage?url=" +
`${this.$config.jyxyBase}/dologin/workSite&workSiteToken=${uni.getStorageSync("token")}&to=jypx`
})
} else {
this.toOutPage(result.data.tpl_config[0]) this.toOutPage(result.data.tpl_config[0])
}
} else { //之前的默认 } else { //之前的默认
uni.navigateTo({ uni.navigateTo({
url: `/pages/gallery/app/originalIndex/originalIndex?check_tpl_id=${model.source_id}&title=${result.data.tpl_name}` url: `/pages/gallery/app/originalIndex/originalIndex?check_tpl_id=${model.source_id}&title=${result.data.tpl_name}`
......
pages/index/newDetail/newDetail.vue
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<titleBar :title="clientId==1?'新闻详情':'头条详情'"></titleBar> <titleBar :title="clientId==1?'新闻详情':'头条详情'"></titleBar>
<view class="new-content"> <view class="new-content">
<view class="title-content"> <view class="title-content">
<text class="text">{{dealTitle(newDetail.title) }}</text> <text class="text">{{newDetail.title}}</text>
</view> </view>
<view class="author-content"> <view class="author-content">
<text class="text">{{newDetail.createdUserName}}</text> <text class="text">{{newDetail.createdUserName}}</text>
...@@ -132,6 +132,7 @@ ...@@ -132,6 +132,7 @@
.content { .content {
display: flex; display: flex;
padding-bottom: 30rpx;
flex-direction: column; flex-direction: column;
.new-content { .new-content {
...@@ -150,7 +151,13 @@ ...@@ -150,7 +151,13 @@
text { text {
font-weight: 600; font-weight: 600;
font-size: 28rpx; font-size: 28rpx;
width: 500rpx; display: -webkit-box;
overflow: hidden;
text-overflow: ellipsis;
word-wrap: break-word;
white-space: normal !important;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
text-align: center; text-align: center;
color: #333; color: #333;
} }
......
pages/index/siteNewList/siteNewList.vue
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<view class="list-content"> <view class="list-content">
<view v-for="(item,index) in list" :key="index" class="list-item" @click="toLinkDetail(item)"> <view v-for="(item,index) in list" :key="index" class="list-item" @click="toLinkDetail(item)">
<view class="new-content"> <view class="new-content">
<view class="title">{{item.title}}</view> <view :class="item.coverImg?'title':'no-image'">{{item.title}}</view>
<view class="user">{{item.createdUserName}} {{timeChange(item.createdAt)}}</view> <view class="user">{{item.createdUserName}} {{timeChange(item.createdAt)}}</view>
</view> </view>
<image class="image" :src="httpToHttps(item.coverImg)"></image> <image class="image" :src="httpToHttps(item.coverImg)"></image>
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
this.projectId = option.projectId this.projectId = option.projectId
this.getNews() this.getNews()
if (this.clientId == 1) { if (this.clientId == 1) {
this.title = "banner新闻" this.title = "新闻公告"
} else { } else {
this.title = "工地头条" this.title = "工地头条"
} }
...@@ -181,6 +181,17 @@ ...@@ -181,6 +181,17 @@
.title { .title {
font-weight: 600; font-weight: 600;
font-size: 28rpx; font-size: 28rpx;
width: 420rpx;
color: #333;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.no-image {
width: 630rpx;
font-weight: 600;
font-size: 28rpx;
color: #333; color: #333;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
......
pages/index/weather/weather.vue
...@@ -36,9 +36,9 @@ ...@@ -36,9 +36,9 @@
return '../../../static/sun-ic.png' return '../../../static/sun-ic.png'
} else if (img == 1 || img == 2) { } else if (img == 1 || img == 2) {
return '../../../static/sun-cloudy-ic.png' return '../../../static/sun-cloudy-ic.png'
} else if (img == 7) { } else if (img == 7 || img == 3) {
return '../../../static/light-rain-ic.png' return '../../../static/light-rain-ic.png'
} else if (img == 21) { } else if (img == 21 || img == 8) {
return '../../../static/moderate-rain-ic.png' return '../../../static/moderate-rain-ic.png'
} else if (img == 13) { } else if (img == 13) {
return '../../../static/light-snow-ic.png' return '../../../static/light-snow-ic.png'
......
pages/mine/changeOrg/changeOrg.vue
...@@ -80,11 +80,15 @@ ...@@ -80,11 +80,15 @@
if (result.code == 0) { if (result.code == 0) {
var list = result.data.list var list = result.data.list
if (list && list.length > 0) { if (list && list.length > 0) {
// if (list[0].no == '001') { if (getApp().globalData.userInfo.user.dept_type == 2) { //项目级
this.trees = list[0].children_list this.trees = list[0].children_list
// } else { } else {
// this.trees = list if (list[0].no == '001') {
// } this.trees = list[0].children_list
} else {
this.trees = list
}
}
this.temp = list[0].children_list this.temp = list[0].children_list
} }
} }
......
pages/mine/mine.vue
...@@ -269,10 +269,18 @@ ...@@ -269,10 +269,18 @@
position: absolute; position: absolute;
font-weight: 400; font-weight: 400;
font-size: 28rpx; font-size: 28rpx;
width: 630rpx;
left: 72rpx; left: 72rpx;
top: 245rpx; top: 245rpx;
text-align: center; text-align: left;
color: #333; color: #333;
display: -webkit-box;
overflow: hidden;
text-overflow: ellipsis;
word-wrap: break-word;
white-space: normal !important;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
} }
.avatar { .avatar {
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
Please register or to comment