1/6 代码更新

manifest.json

@@ -157,6 +157,13 @@
             "treeShaking" : {
                 "enable" : false
             }
+        },
+        "sdkConfigs" : {
+            "maps" : {
+                "qqmap" : {
+                    "key" : "XGQBZ-MSGW6-KNDSO-MVOIJ-OM6LO-JXBKB"
+                }
+            }
         }
     }
 }

pages/cb/bzy/equip-set/bzyhistoryile.vue

@@ -37,7 +37,7 @@
 							<td class="td">{{items.d_h_t.ah}}</td>
 							<td class="td">{{items.d_h_t.set_temp}}</td>
 							<td class="td">{{items.d_h_t.pre_temp}}</td>
-							<td class="td">{{items.d_h_t.bat_sta==0?"正常":"欠压"}}</td>
+							<td class="td">{{items.d_h_t.batStatus==0?"正常":"欠压"}}</td>
 							<td class="td">{{items.d_h_t.rps==0?"正常":"雨控"}}</td>
 							<td class="td">{{items.d_h_t.usb_sta==0?"正常":"异常"}}</td>
 							<td class="td">{{items.d_h_t.csq}}</td>

pages/expertDiagnosis/exchangeShare.vue

@@ -97,7 +97,7 @@
 			},
 			particulars(items) { //详情页
 				uni.navigateTo({
-					url: "particulars?items=" + JSON.stringify(items)
+					url: "particulars?items=" + items.id
 				})
 			},
 			postmessage() { //发帖
@@ -192,7 +192,7 @@
 		width: 100%;
 		position: relative;
 		top: 88rpx;
-
+		margin-bottom: 50px;
 		.invitations_item {
 			width: 90%;
 			margin: 0 auto;

pages/expertDiagnosis/particulars.vue

@@ -1,22 +1,25 @@
 <template>
 	<view>
 		<view class="status_bar"></view>
-		<view style="position: relative;top: 40px;">
-			<view style="position: fixed;z-index: 100;top: 40px;">
-				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="详情"></uni-nav-bar>
-			</view>
-			<!-- <u-swiper :list="list" height="428" @click="examine(list)"></u-swiper> -->
+		<view style="position: fixed;top: 40px;background-color: #fff;z-index: 99;">
+			<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="详情"></uni-nav-bar>
+		</view>
+		<view style="position: relative;top: 90px;">
 			<view class="partitlteimg">
-				<image :src="list" mode="" class="img" @click="examine(list)"></image>
+				<!-- <image :src="list" mode="" class="" @click="examine(list)"></image> -->
+				<u-swiper :list="list" height='428' @click="examine(list)"></u-swiper>
 			</view>
 			<view class="quiz">
 				<view class="quiz_username">
-					<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/expertDiagnosis/6940a11a251770f1b0d8b7b10ebdf9b.png'" mode="" v-if="Number(quizdata.heat)==1"></image>
+					<image
+						:src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/expertDiagnosis/6940a11a251770f1b0d8b7b10ebdf9b.png'"
+						mode="" v-if="Number(quizdata.heat)==1"></image>
 					<span>{{quizdata.title}}</span>
 				</view>
 				<view class="quiz_usertime">
 					<view style="display: flex;align-items: center;">
-						<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/fourMoodBase/touxiang.png'" mode=""></image>
+						<image :src="quizdata.image?quizdata.image:'http://www.hnyfwlw.com:8006/bigdata_app/image/fourMoodBase/touxiang.png'"
+							mode=""></image>
 						<span>{{quizdata.username}}</span>
 					</view>
 					<view>
@@ -48,8 +51,8 @@
 		</view>
 		<view class="issue_box" :style="{position: 'fixed',bottom: height+'px'}">
 			<view class="issue">
-				<input type="text" v-model="issuedata" @focus="focus" :auto-blur="true" :adjust-position='false' @blur="blur"
-				 @confirm="confirm" />
+				<input type="text" v-model="issuedata" @focus="focus" :auto-blur="true" :adjust-position='false'
+					@blur="blur" @confirm="confirm" />
 				<p @click="issue">发布</p>
 			</view>
 		</view>
@@ -60,7 +63,7 @@
 	export default {
 		data() {
 			return {
-				list: [{}],
+				list: [],
 				quizdata: {},
 				commentdata: [],
 				issuedata: '',
@@ -70,7 +73,7 @@
 			}
 		},
 		methods: { //
-			async getParticulars(datas) {//获取评论列表
+			async getParticulars(datas) { //获取评论列表
 				const res = await this.$myRequest({
 					url: '/api/api_gateway?method=pest.pests.pests_answers_list',
 					data: {
@@ -82,7 +85,7 @@
 				this.commentdata = this.commentdata.concat(res.data)
 				console.log(res.data)
 			},
-			async getDiscuss(data) {//发布评论
+			async getDiscuss(data) { //发布评论
 				const res = await this.$myRequest({
 					url: '/api/api_gateway?method=pest.pests.pests_new_idea',
 					data: {
@@ -90,7 +93,7 @@
 						content: data.content,
 					}
 				})
-				if(res.code==200){
+				if (res.code == 200) {
 					this.commentdata = []
 					this.page = 1
 					this.getParticulars(this.quizdata.lower)
@@ -124,27 +127,65 @@
 				this.page++
 				this.getParticulars(this.quizdata.lower)
 			},
-			examine(list){
+			examine(list) {
 				console.log(list)
-				var imgarr =[]
-				// for(var i=0;i<list.length;i++){
-					imgarr.unshift(list)
-				// }
+				var imgarr = []
+				for(var i=0;i<list.length;i++){
+					imgarr.unshift(list[0].image)
+				}
 				console.log(imgarr)
 				uni.previewImage({
 					urls: imgarr
 				});
+			},
+			async getInvitation(id) { //获取点击的帖子详细内容
+				const res = await this.$myRequest({
+					url: '/api/api_gateway?method=pest.pests.pests_answers_list',
+					data: {
+						d_id: id,
+						page: this.page,
+						page_size: 10
+					}
+				})
+				console.log(res)
+				this.quizdata = res.data[0]
+				console.log(this.quizdata)
+				var index2 = this.quizdata.content.indexOf('http')
+				this.recursion(index2)
+				if(!(index2+1)){
+					var obj = {
+						image: this.quizdata.img_urls
+					}
+					this.list.push(obj)
+				}
+				// if (this.quizdata.image == '' || this.quizdata.image == null) {
+				// 	this.list = 'http://www.hnyfwlw.com:8006/projectimg' + this.defaultimg
+				// } else {
+				// 	this.list = this.quizdata.image
+				// }
+				this.quizdata.content=this.quizdata.content.replace(/src/g,"none")
+				this.quizdata.content=this.quizdata.content.replace(/width/g,"none")
+				this.quizdata.content=this.quizdata.content.replace(/height/g,"none")
+				this.getParticulars(this.quizdata.lower)
+			},
+			recursion(index) {//提取图片链接 递归方法
+				if (index + 1) {
+					var src = this.quizdata.content.slice(index, this.quizdata.content.indexOf('"', index))
+					var length = src.length
+					var obj = {
+						image: src
+					}
+					this.list.push(obj)
+					console.log(src)
+					var index3 = this.quizdata.content.indexOf('http', index + length)
+					console.log(index3)
+					this.recursion(index3)
+				}
 			}
 		},
 		onLoad(option) {
-			this.quizdata = JSON.parse(option.items)
-			console.log(this.quizdata.lower)
-			if (this.quizdata.img_urls == '' || this.quizdata.img_urls == null) {
-				this.list = 'http://www.hnyfwlw.com:8006/projectimg' + this.defaultimg
-			} else {
-				this.list = this.quizdata.img_urls
-			}
-			this.getParticulars(this.quizdata.lower)
+			console.log(option.items)
+			this.getInvitation(option.items)
 		}
 	}
 </script>
@@ -153,20 +194,26 @@
 	// 	width: 95%;
 	// 	margin: 20rpx auto;
 	// }
-	.partitlteimg{
+	.partitlteimg {
 		width: 95%;
-		margin: 80rpx auto 20rpx;
+		margin: 0 auto 20rpx;
 		height: 428rpx;
-		.img{
-			width: 100%;
-			height: 428rpx;
+		image {
+			max-width: 100%;
+			max-height: 100%;
 		}
 	}
+
 	.quiz {
 		width: 95%;
 		margin: 20rpx auto;
 		border-bottom: 4rpx dashed #E8E8E8;
-
+		.quiz_title{
+			width: 100%;
+			font-size: 36rpx;
+			font-weight: 700;
+			text-align: center;
+		}
 		.quiz_username {
 			width: 100%;
 
@@ -193,6 +240,7 @@
 				width: 50rpx;
 				height: 50rpx;
 				margin-right: 20rpx;
+				border-radius: 50%;
 			}
 
 			span {
@@ -205,6 +253,30 @@
 		.quiz_usercontert {
 			padding: 20rpx;
 			margin-bottom: 20rpx;
+			overflow: hidden;
+			rich-text{
+				// display: none;
+				color: red;
+				image{
+					width: 0 !important;
+				}
+				img{
+					width: 0 !important;
+				}
+				/deep/p{
+					color: red;
+				}
+				/deep/image{
+					width: 0 !important;
+					height: 0 !important;
+					display: none;
+				}
+				/deep/img{
+					width: 0 !important;
+					height: 0 !important;
+					display: none;
+				}
+			}
 		}
 	}
 
@@ -218,8 +290,8 @@
 		}
 
 		.scroll-view_H {
-			margin-top: 20rpx;
 			height: 600rpx;
+			padding-bottom: 100rpx;
 		}
 
 		.comment_unit {

pages/prevention/control.vue

@@ -28,14 +28,14 @@
 					</view>
 					<u-action-sheet :list="options1" v-model="show1" @click="actionSheetCallback"></u-action-sheet>
 				</view>
-				<view class="control_time" v-if="condatas.timctrl== 0">
+				<view class="control_time" v-if="condatas.timctrl == 0">
 					<p class="title_p">定时时长(h)</p>
 					<view class="control_off_off" @click="show2 = !show2">
 						<p>{{condatas.tt==0?'常亮':condatas.tt}}</p>
 						<u-icon name="arrow-down-fill" size="12" color="#7F8082"></u-icon>
 					</view>
 				</view>
-				<view class="control_time" v-else>
+				<view class="control_time" v-if="condatas.timctrl == 1">
 					<p class="title_p">开始结束时间</p>
 					<view class="control_off_off" @click="show3 = !show3">
 						<p>开始时间：{{condatas.st?condatas.st:"00"}}:00</p>
@@ -167,6 +167,7 @@
 				})
 				console.log(res)
 				this.condatas = res
+				this.condatas.timctrl = Number(res.ts)
 				if (this.condatas.ds == 1) {
 					this.checked1 = true
 				} else {

pages/prevention/equipmentdetails.vue

@@ -107,11 +107,11 @@
 					}, {
 						icon: '/image/cb/icon08.png',
 						txt: '环境温度(℃)',
-						value: this.olddata.new_tem == "" ? "--" : this.olddata.new_tem
+						value: this.olddata.at == "" ? "--" : this.olddata.at
 					}, {
 						icon: '/image/cb/icon07.png',
 						txt: '环境湿度(%)',
-						value: this.olddata.new_hum == "" ? "--" : this.olddata.new_hum
+						value: this.olddata.ah == "" ? "--" : this.olddata.ah
 					}, {
 						icon: '/image/prevention/icon16.png',
 						txt: '信号强度',

pages/prevention/ucharts.vue

@@ -65,8 +65,8 @@
 							<td class="td">{{items.d_h_t.dps==0?"正常":"保护"}}</td>
 							<td class="td">{{items.d_h_t.tt}}</td>
 							<td class="td">{{items.d_h_t.ct}}</td>
-							<td class="td">{{items.d_h_t.new_tem==""?"--":items.d_h_t.new_tem}}</td>
-							<td class="td">{{items.d_h_t.new_hum==""?"--":items.d_h_t.new_hum}}</td>
+							<td class="td">{{items.d_h_t.at==""?"--":items.d_h_t.at}}</td>
+							<td class="td">{{items.d_h_t.ah==""?"--":items.d_h_t.ah}}</td>
 							<td class="td">{{items.d_h_t.cv}}</td>
 							<td class="td">{{items.d_h_t.bv}}</td>
 						</tr>

unpackage/dist/dev/mp-weixin/pages/expertDiagnosis/exchangeShare.wxss

@@ -35,6 +35,7 @@
   width: 100%;
   position: relative;
   top: 88rpx;
+  margin-bottom: 50px;
 }
 .invitations .invitations_item {
   width: 90%;

unpackage/dist/dev/mp-weixin/pages/expertDiagnosis/particulars.json

@@ -3,6 +3,7 @@
   "enablePullDownRefresh": false,
   "navigationStyle": "custom",
   "usingComponents": {
-    "uni-nav-bar": "/components/uni-nav-bar/uni-nav-bar"
+    "uni-nav-bar": "/components/uni-nav-bar/uni-nav-bar",
+    "u-swiper": "/uview-ui/components/u-swiper/u-swiper"
   }
 }

unpackage/dist/dev/mp-weixin/pages/expertDiagnosis/particulars.wxss

@@ -26,18 +26,24 @@
 /* 文章场景相关 */
 .partitlteimg {
   width: 95%;
-  margin: 80rpx auto 20rpx;
+  margin: 0 auto 20rpx;
   height: 428rpx;
 }
-.partitlteimg .img {
-  width: 100%;
-  height: 428rpx;
+.partitlteimg image {
+  max-width: 100%;
+  max-height: 100%;
 }
 .quiz {
   width: 95%;
   margin: 20rpx auto;
   border-bottom: 4rpx dashed #E8E8E8;
 }
+.quiz .quiz_title {
+  width: 100%;
+  font-size: 36rpx;
+  font-weight: 700;
+  text-align: center;
+}
 .quiz .quiz_username {
   width: 100%;
 }
@@ -65,6 +71,7 @@
   width: 50rpx;
   height: 50rpx;
   margin-right: 20rpx;
+  border-radius: 50%;
 }
 .quiz .quiz_usertime ._span {
   font-size: 24rpx;
@@ -74,6 +81,29 @@
 .quiz .quiz_usercontert {
   padding: 20rpx;
   margin-bottom: 20rpx;
+  overflow: hidden;
+}
+.quiz .quiz_usercontert rich-text {
+  color: red;
+}
+.quiz .quiz_usercontert rich-text image {
+  width: 0 !important;
+}
+.quiz .quiz_usercontert rich-text ._img {
+  width: 0 !important;
+}
+.quiz .quiz_usercontert rich-text ._p {
+  color: red;
+}
+.quiz .quiz_usercontert rich-text image {
+  width: 0 !important;
+  height: 0 !important;
+  display: none;
+}
+.quiz .quiz_usercontert rich-text ._img {
+  width: 0 !important;
+  height: 0 !important;
+  display: none;
 }
 .comment {
   width: 95%;
@@ -84,8 +114,8 @@
   font-size: 32rpx;
 }
 .comment .scroll-view_H {
-  margin-top: 20rpx;
   height: 600rpx;
+  padding-bottom: 100rpx;
 }
 .comment .comment_unit .comment_unit_user {
   display: -webkit-box;

unpackage/dist/dev/mp-weixin/project.config.json

@@ -5,9 +5,40 @@
   },
   "setting": {
     "urlCheck": false,
-    "minified": true,
+    "es6": true,
+    "enhance": false,
     "postcss": false,
-    "es6": true
+    "preloadBackgroundData": false,
+    "minified": true,
+    "newFeature": false,
+    "coverView": true,
+    "nodeModules": false,
+    "autoAudits": false,
+    "showShadowRootInWxmlPanel": true,
+    "scopeDataCheck": false,
+    "uglifyFileName": false,
+    "checkInvalidKey": true,
+    "checkSiteMap": true,
+    "uploadWithSourceMap": true,
+    "compileHotReLoad": false,
+    "useMultiFrameRuntime": false,
+    "useApiHook": false,
+    "useApiHostProcess": false,
+    "babelSetting": {
+      "ignore": [],
+      "disablePlugins": [],
+      "outputPath": ""
+    },
+    "enableEngineNative": false,
+    "useIsolateContext": false,
+    "userConfirmedBundleSwitch": false,
+    "packNpmManually": false,
+    "packNpmRelationList": [],
+    "minifyWXSS": true,
+    "disableUseStrict": false,
+    "showES6CompileOption": false,
+    "useCompilerPlugins": false,
+    "minifyWXML": true
   },
   "compileType": "miniprogram",
   "libVersion": "",
@@ -15,19 +46,15 @@
   "projectname": "云飞智控",
   "condition": {
     "search": {
-      "current": -1,
       "list": []
     },
     "conversation": {
-      "current": -1,
       "list": []
     },
     "game": {
-      "current": -1,
       "list": []
     },
     "miniprogram": {
-      "current": 3,
       "list": [
         {
           "name": "about",