接口地址更换

common/globalJs/globalJs.js

@@ -1,8 +1,9 @@
 // 请求时接口的公用部分
 // #ifdef APP-PLUS || MP
 // const baseUrl = "http://116.62.210.143:9002";
-const baseUrl = "http://118.89.79.160:8800/HiatmpPro";
+// const baseUrl = "http://118.89.79.160:8800/HiatmpPro";
-const chatUrl = "http://118.89.79.160:8800/HiatmpPro";
+const baseUrl = "http://219.147.31.25:30001/tht-app-api";
+const chatUrl = "http://219.147.31.25:30001/hitap";
 // #endif
 // #ifdef H5
 const baseUrl = "/HiatmpPro";

manifest.json

@@ -135,7 +135,8 @@
             "https" : false,
             "proxy" : {
                 "/HiatmpPro" : {
-                    "target" : "http://118.89.79.160:8800",
+                    // "target" : "http://118.89.79.160:8800",
+					"target" : "http://219.147.31.25:30001/tht-app-api",
                     "changeOrigin" : true,
                     "secure" : false,
                     "pathRewrite" : {

pages/index/index.vue

@@ -24,12 +24,14 @@
 				</view>
 				<view class="right">
 					<view class="current_mouth Flex Flex_C_S-B blur">
-            <image style="width: 80rpx" mode="widthFix" :src="$.imgSrc + '/mouth.png'" class="video"></image>
+						<image style="width: 80rpx" mode="widthFix" :src="$.imgSrc + '/mouth.png'" class="video">
+						</image>
 						<text class="name">本月上报</text>
 						<text class="number">{{ totalData.MonthReport }}</text>
 					</view>
 					<view class="finish Flex Flex_C_S-B blur">
-            <image style="width: 80rpx" mode="widthFix" :src="$.imgSrc + '/finish.png'" class="video"></image>
+						<image style="width: 80rpx" mode="widthFix" :src="$.imgSrc + '/finish.png'" class="video">
+						</image>
 						<text class="name">已完成</text>
 						<text class="number">{{ totalData.Finished }}</text>
 					</view>
@@ -39,7 +41,8 @@
 		<view class="con" @click="konw">
 			<image class="bg" src="/static/know.png" />
 			<view class="con-box">
-        <text style="font-family: Source Han Sans CN, Source Han Sans CN;color: #363F4D;font-weight: 500;">交通隐患排查知识库</text>
+				<text
+					style="font-family: Source Han Sans CN, Source Han Sans CN;color: #363F4D;font-weight: 500;">交通隐患排查知识库</text>
 				<view class="icon">
 					<uni-icons type="right" size="18" color="#fff" />
 				</view>
@@ -50,8 +53,8 @@
 			<view class="Content MarginAuto BorderBox">
 				<no-data v-if="isEmpty" />
 				<view v-else class="List Width100 BorderBox">
-          <view class="Unit FontBold BorderBox Width100 MarginT_30rpx BG_FFFFFF"
+					<view class="Unit FontBold BorderBox Width100 MarginT_30rpx BG_FFFFFF" v-for="item in list"
-                v-for="item in list" :key='item.id' @click='handleClick(item)'>
+						:key='item.id' @click='handleClick(item)'>
 						<image class="imgleft" :src="item.imgurl || '/static/logo.png'" mode="widthFix"></image>
 						<view class="right">
 							<view class="title">{{ item.name }}</view>
@@ -68,6 +71,7 @@
 						</view>
 					</view>
 				</view>
+				<u-loadmore :status="loadmorestatus" v-show="!isEmpty" />
 			</view>
 		</view>
 	</view>
@@ -97,7 +101,8 @@ export default {
 					MonthReport: 0,
 					Dying: 0,
 					Delay: 0,
-      }
+				},
+				loadmorestatus: 'loading',
 			}
 		},
 		// 页面加载
@@ -111,7 +116,9 @@ export default {
 		methods: {
 			getData() {
 				const data = this.$.getData('token')
-      this.$request.globalRequest('/hiddenDanger/highDanger/getHighDangerStatusNum', { nuserid: data }, 'GET').then(res => {
+				this.$request.globalRequest('/hiddenDanger/highDanger/getHighDangerStatusNum', {
+					nuserid: data
+				}, 'GET').then(res => {
 					if (res.code === 200) {
 						res.result.forEach(item => {
 							this.totalData[item.status] = item.count
@@ -126,7 +133,11 @@ export default {
 					nuserid: this.$.getData('token'),
 					status: '0',
 				}
-      this.$request.globalRequest(`/hiddenDanger/highDanger/getHigDangerDealt?pageNum=${this.page}&pageSize=${10}`, datas, 'POST').then(res => {
+				this.loadmorestatus = 'loading'
+				this.$request.globalRequest(
+						`/hiddenDanger/highDanger/getHigDangerDealt?pageNum=${this.page}&pageSize=${10}`, datas, 'POST')
+					.then(res => {
+						this.loadmorestatus = 'loadmore'
 						if (res.code === 200) {
 							if (res.result.total === 0) {
 								this.isEmpty = true;
@@ -135,10 +146,13 @@ export default {
 							this.list.push(...res.result.list)
 							if (this.list.length >= res.result.total) {
 								this.isMore = false
+								this.loadmorestatus = 'nomore'
 							}
 						} else {
 							this.$.toast(res.message)
 						}
+					}).catch((err) => {
+						this.loadmorestatus = 'nomore'
 					})
 			},
 			handleClick(row) {
@@ -188,6 +202,7 @@ page {
 		height: 500rpx;
 		color: #FFFFFF;
 		padding: calc(var(--status-bar-height) + 40rpx) 20rpx 20rpx;
+
 		.title {
 			font-family: Tensentype MeiHeiJ, Tensentype MeiHeiJ;
 			font-weight: bold;
@@ -199,22 +214,27 @@ page {
 			font-style: normal;
 			text-transform: none;
 		}
+
 		.desc {
 			margin-top: 20rpx;
 			font-family: Source Han Sans CN, Source Han Sans CN;
 		}
+
 		.total {
 			margin-top: 40rpx;
+
 			.number {
 				font-size: 20px;
 				font-weight: bold;
 				color: #363F4D;
 			}
+
 			.name {
 				font-size: 16px;
 				color: #363F4D;
 				font-weight: bold;
 			}
+
 			.left {
 				width: 40%;
 				height: 100%;
@@ -222,17 +242,21 @@ page {
 				border-radius: 10rpx;
 				background: linear-gradient(180deg, #F0D9B4 0%, #F6F6F6 100%);
 				overflow: hidden;
+
 				.info {
 					padding-left: 20rpx;
 					padding-top: 20rpx;
 					flex: 1;
+
 					.number {
 						font-size: 20px;
 					}
+
 					.name {
 						font-size: 18px;
 					}
 				}
+
 				.bottom {
 					bottom: 0;
 					border-radius: 0 0 10rpx 10px;
@@ -245,6 +269,7 @@ page {
 					color: #363F4D;
 				}
 			}
+
 			.right {
 				flex: 1;
 				padding: 0 20rpx;
@@ -253,10 +278,13 @@ page {
 				flex-direction: column;
 				justify-content: center;
 				align-items: center;
+
 				.current_mouth {
 					margin-bottom: 20rpx;
 				}
-      .current_mouth,.finish {
+
+				.current_mouth,
+				.finish {
 					flex: 1;
 					border-radius: 10rpx;
 					padding: 20rpx;
@@ -272,6 +300,7 @@ page {
 		height: 40rpx;
 		margin-left: 30rpx;
 	}
+
 	.trapezoidal {
 		position: relative;
 		display: inline-block;
@@ -305,9 +334,12 @@ page {
 		background-color: #FF1111;
 		border-left: 0 none;
 	}
-.lin::before,.lin::after {
+
+	.lin::before,
+	.lin::after {
 		background-color: #E68A0B;
 	}
+
 	.list_title {
 		font-size: 20px;
 		background: linear-gradient(180deg, #FFFFFF 0%, rgba(255, 255, 255, 0) 100%);
@@ -329,6 +361,7 @@ page {
 			align-items: center;
 			position: relative;
 			box-shadow: 1px 1px 3px #ccc;
+
 			.trapezoidal {
 				position: absolute;
 				top: 0px;
@@ -338,19 +371,24 @@ page {
 				font-weight: normal;
 				z-index: 1;
 			}
+
 			image {
 				width: 200rpx;
 			}
+
 			.right {
 				flex: 1;
 				padding-left: 30rpx;
+
 				.title {
 					font-size: 16px;
 				}
+
 				.type {
 					font-size: 14px;
 					color: #666;
 					font-weight: normal;
+
 					text {
 						margin-right: 20rpx;
 					}
@@ -358,6 +396,7 @@ page {
 			}
 		}
 	}
+
 	.con {
 		width: 100%;
 		height: 240rpx;
@@ -368,6 +407,7 @@ page {
 		background-size: 100% 100%;
 		display: flex;
 		align-items: center;
+
 		.bg {
 			position: absolute;
 			top: 0;
@@ -375,6 +415,7 @@ page {
 			width: 100%;
 			height: 100%;
 		}
+
 		.con-box {
 			width: 100%;
 			padding: 0 20rpx;
@@ -386,6 +427,7 @@ page {
 			border-radius: 8rpx;
 			display: flex;
 			align-items: center;
+
 			.icon {
 				display: flex;
 				justify-content: center;