zhangsijie vor 1 Jahr
Ursprung
Commit
80af6166a6
100 geänderte Dateien mit 4183 neuen und 108 gelöschten Zeilen
  1. 175 10
      pages.json
  2. 2 2
      pages/afterSale/addafter.vue
  3. 1 1
      pages/cb/zjxydetail/photolist.vue
  4. 3 3
      pages/cb/zjxydetail/thxydetail.vue
  5. 394 0
      pages/discernRecord/discernRecord.vue
  6. 1 1
      pages/expertDiagnosis/postmessage.vue
  7. 1 1
      pages/fourBase/addbase.vue
  8. 1 1
      pages/fourBase/modification.vue
  9. 252 0
      pages/guidance/guidance.vue
  10. 341 0
      pages/identifyPest/cerealPlant/cerealPlant.vue
  11. 439 0
      pages/identifyPest/collect/collect.vue
  12. 189 0
      pages/identifyPest/detailsWorn/detailsWorn.vue
  13. 321 0
      pages/identifyPest/economicsPlant/economicsPlant.vue
  14. 328 0
      pages/identifyPest/fruitsPlant/fruitsPlant.vue
  15. 430 0
      pages/identifyPest/identifyPest.vue
  16. 126 0
      pages/identifyPest/recognizeFail/recognizeFail.vue
  17. 138 0
      pages/identifyPest/recognizeSucceed/recognizeSucceed.vue
  18. 142 0
      pages/identifyPest/recognizeSucceedWorn/recognizeSucceedWorn.vue
  19. 452 0
      pages/identifyPest/repository/repository.vue
  20. 355 0
      pages/identifyPest/vegetablesPlant/vegetablesPlant.vue
  21. 14 11
      pages/index/index.vue
  22. 1 1
      pages/my/user-info/user-info.vue
  23. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  24. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map
  25. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
  26. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/components/bazaar-city_list/index.js.map
  27. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/components/equip-item/equip-item.js.map
  28. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/components/ksp-image-cutter/ksp-image-cutter.js.map
  29. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/components/multiple-select.js.map
  30. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/components/uni-icons/uni-icons.js.map
  31. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/components/uni-nav-bar/uni-nav-bar.js.map
  32. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/components/uni-status-bar/uni-status-bar.js.map
  33. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/afterSale/addafter.js.map
  34. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/afterSale/index.js.map
  35. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/afterSale/search.js.map
  36. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/bzy/equip-set/bzyhistoryile.js.map
  37. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/bzy/equip-set/equip-set.js.map
  38. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/cbd/equip-set/addimg.js.map
  39. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/cbd/equip-set/analyse.js.map
  40. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/cbd/equip-set/equip-set.js.map
  41. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/cbd/equip-set/historyfile.js.map
  42. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/cbd/equip-set/imgpage.js.map
  43. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/cbd/equip-set/manualinput.js.map
  44. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/cbd/equip-set/note.js.map
  45. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/cbd/equip-set/results.js.map
  46. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/cbd/equip-set/statistics.js.map
  47. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/equip-detail/equip-detail.js.map
  48. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/index/index.js.map
  49. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/index/search.js.map
  50. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/sim/sim.js.map
  51. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/thxydetail/photolist.js.map
  52. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/thxydetail/thxydetail.js.map
  53. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/thxydetail/thxyhisdata.js.map
  54. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/thxydetail/thxyset.js.map
  55. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/xctdetail/analyse.js.map
  56. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/xctdetail/photolist.js.map
  57. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/xctdetail/xctdetail.js.map
  58. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/xctdetail/xctset.js.map
  59. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/xy/equip-set/equip-set.js.map
  60. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/xy/equip-set/xyhistoryile.js.map
  61. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/xy2.0/historydatas.js.map
  62. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/xy2.0/particulars.js.map
  63. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cbqxyj/addressbook.js.map
  64. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cbqxyj/basemap.js.map
  65. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cbqxyj/cbwarn.js.map
  66. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cbqxyj/warnset.js.map
  67. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/disandpests/index.js.map
  68. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/disease/cmb.js.map
  69. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/disease/forecastResult.js.map
  70. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/distribution/index.js.map
  71. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/environment/contros.js.map
  72. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/environment/equipment.js.map
  73. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/environment/gsequipment.js.map
  74. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/environment/gshistory.js.map
  75. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/environment/history.js.map
  76. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/environment/index.js.map
  77. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/environment/onedaythedata.js.map
  78. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/environment/search.js.map
  79. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/environment/sim.js.map
  80. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/equipList/index.js.map
  81. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/equipList/seabox/modification.js.map
  82. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/equipList/seabox/search.js.map
  83. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/equipMange/index/addusers.js.map
  84. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/equipMange/index/assignment.js.map
  85. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/equipMange/index/changepasswold.js.map
  86. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/equipMange/index/index.js.map
  87. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/equipMange/index/useroperation.js.map
  88. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/expertDiagnosis/exchangeShare.js.map
  89. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/expertDiagnosis/index.js.map
  90. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/expertDiagnosis/introduce.js.map
  91. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/expertDiagnosis/particulars.js.map
  92. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/expertDiagnosis/postmessage.js.map
  93. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/expertDiagnosis/wormcase.js.map
  94. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/fourBase/addbase.js.map
  95. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/fourBase/allocation.js.map
  96. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/fourBase/basefacility.js.map
  97. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/fourBase/index.js.map
  98. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/fourBase/modification.js.map
  99. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
  100. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/irrigate/index.js.map

+ 175 - 10
pages.json

@@ -50,6 +50,106 @@
 			}
 
 		}
+		// ,
+		// {
+		// 	"path": "pages/identifyPest/economicsPlant/economicsPlant",
+		// 	"style": {
+		// 		"navigationBarTitleText": "选择经济作物",
+		// 		"enablePullDownRefresh": false
+		// 	}
+
+		// }, 
+		// {
+		// 	"path": "pages/identifyPest/fruitsPlant/fruitsPlant",
+		// 	"style": {
+		// 		"navigationBarTitleText": "选择水果作物",
+		// 		"enablePullDownRefresh": false
+		// 	}
+
+		// }, 
+		// {
+		// 	"path": "pages/identifyPest/vegetablesPlant/vegetablesPlant",
+		// 	"style": {
+		// 		"navigationBarTitleText": "选择蔬菜作物",
+		// 		"enablePullDownRefresh": false
+		// 	}
+
+		// }, 
+		// {
+		// 	"path": "pages/identifyPest/cerealPlant/cerealPlant",
+		// 	"style": {
+		// 		"navigationBarTitleText": "选择粮食作物",
+		// 		"enablePullDownRefresh": false
+		// 	}
+
+		// },
+		// {
+		//           "path" : "pages/repository/repository",
+		//           "style" :                                                                                    
+		//           {
+		//               "navigationBarTitleText": "知识库",
+		//               "enablePullDownRefresh": true
+		//           }
+
+		//       },{
+		//           "path" : "pages/discernRecord/discernRecord",
+		//           "style" :                                                                                    
+		//           {
+		//               "navigationBarTitleText": "识别记录",
+		//               "enablePullDownRefresh": true
+		//           }
+
+		//       },{
+		//           "path" : "pages/collect/collect",
+		//           "style" :                                                                                    
+		//           {
+		//               "navigationBarTitleText": "我的收藏",
+		//               "enablePullDownRefresh": true
+		//           }
+
+		//       },
+		// {
+		//     "path" : "pages/guidance/guidance",
+		//     "style" :                                                                                    
+		//     {
+		//         "navigationBarTitleText": "拍照指南",
+		//         "enablePullDownRefresh": false
+		//     }
+
+		// },
+		// {
+		// 	"path": "pages/identifyPest/recognizeSucceed/recognizeSucceed",
+		// 	"style": {
+		// 		"navigationBarTitleText": "识别结果",
+		// 		"enablePullDownRefresh": false
+		// 	}
+
+		// }, {
+		// 	"path": "pages/identifyPest/recognizeFail/recognizeFail",
+		// 	"style": {
+		// 		"navigationBarTitleText": "识别结果",
+		// 		"enablePullDownRefresh": false
+		// 	}
+
+		// }
+		// ,{
+		//           "path" : "pages/recognizeSucceedWorn/recognizeSucceedWorn",
+		//           "style" :                                                                                    
+		//           {
+		//               "navigationBarTitleText": "识别结果",
+		//               "enablePullDownRefresh": false
+		//           }
+
+		//       }
+		// ,{
+		//           "path" : "pages/detailsWorn/detailsWorn",
+		//           "style" :                                                                                    
+		//           {
+		//               "navigationBarTitleText": "识别结果",
+		//               "enablePullDownRefresh": false
+		//           }
+
+		//       }
 	],
 	"subPackages": [{
 			"root": "pages/disandpests",
@@ -137,12 +237,10 @@
 		},
 		{
 			"root": "pages/cb/xylps",
-			"pages": [
-			{
-				"path" : "detail/detail",
-				"style" : 
-				{
-					"navigationBarTitleText" : "数据详情",
+			"pages": [{
+				"path": "detail/detail",
+				"style": {
+					"navigationBarTitleText": "数据详情",
 					"enablePullDownRefresh": false
 				}
 			}]
@@ -308,14 +406,14 @@
 						"enablePullDownRefresh": false,
 						"navigationStyle": "custom"
 					}
-		
+
 				}, {
 					"path": "thxyset",
 					"style": {
 						"navigationBarTitleText": "设备控制",
 						"enablePullDownRefresh": false
 					}
-		
+
 				},
 				{
 					"path": "thxyhisdata",
@@ -323,7 +421,7 @@
 						"navigationBarTitleText": "历史数据",
 						"enablePullDownRefresh": false
 					}
-		
+
 				}
 			]
 		},
@@ -439,7 +537,8 @@
 						"navigationStyle": "custom"
 					}
 
-				}, {
+				},
+				{
 					"path": "wormcase",
 					"style": {
 						"navigationBarTitleText": "虫情百科",
@@ -934,7 +1033,73 @@
 				}
 
 			}]
+		},
+		{
+			"root": "pages/identifyPest",
+			"pages": [{
+					"path": "identifyPest",
+					"style": {
+						"navigationBarTitleText": "田间随识"
+					}
+				},
+				{
+					"path": "economicsPlant/economicsPlant",
+					"style": {
+						"navigationBarTitleText": "选择经济作物",
+						"enablePullDownRefresh": false
+					}
+
+				},
+				{
+					"path": "fruitsPlant/fruitsPlant",
+					"style": {
+						"navigationBarTitleText": "选择水果作物",
+						"enablePullDownRefresh": false
+					}
+
+				},
+				{
+					"path": "vegetablesPlant/vegetablesPlant",
+					"style": {
+						"navigationBarTitleText": "选择蔬菜作物",
+						"enablePullDownRefresh": false
+					}
+
+				},
+				{
+					"path": "cerealPlant/cerealPlant",
+					"style": {
+						"navigationBarTitleText": "选择粮食作物",
+						"enablePullDownRefresh": false
+					}
+
+				},
+				{
+					"path": "recognizeSucceed/recognizeSucceed",
+					"style": {
+						"navigationBarTitleText": "识别结果",
+						"enablePullDownRefresh": false
+					}
+
+				}, {
+					"path": "recognizeFail/recognizeFail",
+					"style": {
+						"navigationBarTitleText": "识别结果",
+						"enablePullDownRefresh": false
+					}
+
+				}
+				// , {
+				// 	"path": "recognizeSucceedWorn/recognizeSucceedWorn",
+				// 	"style": {
+				// 		"navigationBarTitleText": "识别结果",
+				// 		"enablePullDownRefresh": false
+				// 	}
+
+				// }
+			]
 		}
+
 	],
 	"condition": { //模式配置,仅开发期间生效
 		"current": 3, //当前激活的模式(list 的索引项)

+ 2 - 2
pages/afterSale/addafter.vue

@@ -184,7 +184,7 @@
 				    success:(res)=> {
 						console.log(res)
 						uni.uploadFile({
-						    url: 'https://wx.hnyfwlw.com/api/api_gateway?method=after_sale.after_sale_manage.video_upload', //仅为示例,非真实的接口地址
+						    url: 'http://192.168.2.183:8006/api/api_gateway?method=after_sale.after_sale_manage.video_upload', //仅为示例,非真实的接口地址
 						    filePath: res.tempFilePath,
 						    name: 'upload',
 							fileType:"video",
@@ -334,7 +334,7 @@
 			},
 			onok(ev){
 				uni.uploadFile({
-				    url: 'https://wx.hnyfwlw.com/api/api_gateway?method=base.bases.base_photo', //仅为示例,非真实的接口地址
+				    url: 'http://192.168.2.183:8006/api/api_gateway?method=base.bases.base_photo', //仅为示例,非真实的接口地址
 					filePath: ev.path,
 				    name: 'img_file',
 				    formData: {

+ 1 - 1
pages/cb/zjxydetail/photolist.vue

@@ -89,7 +89,7 @@
 				const res = await this.$myRequest({
 					url: '/api/api_gateway?method=forecast.forecast_system.device_photo_list',
 					data: {
-						cmd: "xy_three",
+						cmd: "zjxy",
 						device_id: this.device_id,
 						page: this.page,
 						page_number: "12",

+ 3 - 3
pages/cb/zjxydetail/thxydetail.vue

@@ -43,13 +43,13 @@
 		</u-popup>
 		<u-calendar v-model="tiemshow" mode="date" :max-date="date" @change="tiemchange"></u-calendar>
 		<view class="caobox">
-			<!-- <view class="caobox_item" v-if="$QueryPermission(200)" @click="tophoto">
+			<view class="caobox_item" v-if="$QueryPermission(336)" @click="tophoto">
 				<image src="https://www.hnyfwlw.com:8006/bigdata_app/image/cb/1.png" mode="widthFix"></image>
 				<view class="">
 					查看图片
 				</view>
 			</view>
-			<view class="caobox_item" v-if="$QueryPermission(248)" @click="toset">
+			<!-- <view class="caobox_item" v-if="$QueryPermission(248)" @click="toset">
 				<image src="https://www.hnyfwlw.com:8006/bigdata_app/image/cb/4.png" mode="widthFix"></image>
 				<view class="">
 					设备控制
@@ -61,7 +61,7 @@
 					SIM卡
 				</view>
 			</view> -->
-			<view class="caobox_item" v-if="$QueryPermission(199)" @click="tohis">
+			<view class="caobox_item" v-if="$QueryPermission(335)" @click="tohis">
 				<image src="https://www.hnyfwlw.com:8006/bigdata_app/image/cb/2.png" mode="widthFix"></image>
 				<view class="">
 					历史数据

+ 394 - 0
pages/discernRecord/discernRecord.vue

@@ -0,0 +1,394 @@
+<template>
+	<view>
+		<!-- tab切换 -->
+		<view class="inv-h-w">
+			<view :class="['inv-h',Inv==0?'inv-h-se':'']" @click="Inv=0">虫害</view>
+			<view :class="['inv-h',Inv==1?'inv-h-se':'']" @click="Inv=1">病害</view>
+		</view>
+
+		<view v-if="isShow">
+			<!-- 虫害 -->
+			<view class="plant_ul" v-show="Inv == 0">
+				<view class="plant_li" v-for="(item, index) in insectArr" :key="index">
+					<u-image width="320rpx" height="200rpx"  class="plant_li_img" :src=" 'http://web.hnyfwlw.com:58003/bigservers/' + item.img"></u-image>
+
+					<view class="plant_liBox">
+						<view class="plant_liBox_top">{{ item.name == '' ? '识别失败' : item.name }}</view>
+						<view class="plant_liBox_center">识别日期:{{ item.time }}</view>
+						<view class="plant_liBox_bottom">
+							<u-button @click="details(item.id)" v-if='item.name !== ""' size="mini" shape="circle" :ripple="true" ripple-bg-color="#909399" type="success">详情</u-button>
+							<u-button @click="delData(item.id, index)" size="mini" shape="circle" :ripple="true" ripple-bg-color="#909399"
+							 type="error">删除</u-button>
+						</view>
+					</view>
+				</view>
+			</view>
+			<!-- 病害 -->
+			<view class="plant_ul" v-show="Inv == 1">
+				<view class="plant_li" v-for="(item, index) in plantArr" :key="index">
+					<u-image width="320rpx" height="200rpx"  class="plant_li_img" :src=" 'http://web.hnyfwlw.com:58003/bigservers/' + item.img"></u-image>
+
+					<view class="plant_liBox">
+						<view class="plant_liBox_top">{{ item.name == '' ? '识别失败' : item.name }}</view>
+						<view class="plant_liBox_center">识别日期:{{ item.time }}</view>
+						<view class="plant_liBox_bottom">
+							<u-button @click="details(item.id)" v-if='item.name !== ""' size="mini" shape="circle" :ripple="true"
+							 ripple-bg-color="#909399" type="success">详情</u-button>
+							<u-button size="mini" shape="circle" @click="delData(item.id, index)" :ripple="true" ripple-bg-color="#909399"
+							 type="error">删除</u-button>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<!-- 暂无 -->
+		<view class="notDataBox" v-else>
+			<image :src="'http://web.hnyfwlw.com:58003/bigservers/' + 'images/detail_11.png'" class="notDataBox_img" mode=""></image>
+		</view>
+
+		<!-- 返回顶部 -->
+		<u-back-top :scroll-top="scrollTop" top="600"></u-back-top>
+
+		<!-- 删除框 -->
+		<u-modal :show-cancel-button="true" @confirm="confirm" @cancel="cancel" v-model="show" :content="content"></u-modal>
+
+		<!-- 提示框 -->
+		<u-top-tips ref="uTips"></u-top-tips>
+
+		<view class="isOver" v-if="flag">
+			---- 我是有底线的 ----
+		</view>
+		
+		<!--loading-->
+		<ourLoading v-show="loadingShow" isFullScreen active text="加载中..." />
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				Inv: 0,
+				scrollTop: 0, //返回顶部
+				isShow: true, //暂无
+				insectArr: [], //害虫
+				plantArr: [], //病害
+				dataNum: null, //列表总条数
+				pageIndex: 1, //当前页数
+				pagination: null, //总页码
+				numData: 10, //固定每页显示多少条
+				content: '是否确定删除该条数据?',
+				show: false,
+				idData: null, //数据id
+				indexData: null, //数据下标
+				flag: false,
+				listLangth: null, //每次请求数据条数
+				loadingShow: true, //加载
+			}
+		},
+		watch: {
+			Inv(val) {
+				this.dataNum = null //清空
+				// console.log(this.pageIndex)
+				this.pageIndex = 1 //清空
+				this.pagination = null //清空
+				this.listLength = null
+				this.flag = false
+				if (val == 0) {
+					//虫害
+					this.listData('2')
+					this.insectArr = []
+				} else if (val == 1) {
+					//病害
+					this.listData('1')
+					this.plantArr = []
+				}
+			},
+			insectArr(val) {
+				if (val.length == 0) {
+					this.isShow = false
+				}
+			},
+			plantArr(val) {
+				if (val.length == 0) {
+					this.isShow = false
+				}
+			},
+		},
+		methods: {
+			changeTab(Inv) {
+				that.navIdx = Inv;
+			},
+
+			// 列表数据
+			listData(types) {
+				var that = this
+				uni.request({
+					url: 'check_record',
+					method: 'POST',
+					data: {
+						page: this.pageIndex,
+						types,
+					},
+					header: {
+						"Content-Type": "application/x-www-form-urlencoded"
+					},
+					dataType: 'json',
+					success(res) {
+						if (res.data.num !== 0) {
+							that.dataNum = res.data.num
+							if (types == '1') {
+								that.plantArr = [...that.plantArr, ...res.data.dat]
+							} else {
+								that.insectArr = [...that.insectArr, ...res.data.dat]
+							}
+							that.isShow = true
+						} else {
+							that.isShow = false
+						}
+						console.log(that.plantArr)
+						that.listLength = res.data.dat.length
+						that.loadingShow = false
+					},
+					fail(err) {
+						console.log(err)
+					},
+				})
+			},
+
+			// 删除
+			delData(id, index) {
+				this.idData = id
+				this.indexData = index
+				this.show = true;
+			},
+
+			// 删除确定
+			confirm() {
+				var that = this
+				var index = that.indexData
+				uni.request({
+					url: 'del_record',
+					method: 'POST',
+					data: {
+						id: that.idData,
+					},
+					header: {
+						"Content-Type": "application/x-www-form-urlencoded"
+					},
+					dataType: 'json',
+					success(res) {
+						if (res.data == 0) {
+							that.$refs.uTips.show({
+								title: '删除成功',
+								type: 'success',
+								duration: '2000'
+							})
+							if (that.Inv == 0) {
+								// 虫害
+								that.insectArr.splice(index, 1)
+							} else {
+								//病害
+								that.plantArr.splice(index, 1)
+							}
+						} else {
+							that.$refs.uTips.show({
+								title: '删除失败',
+								type: 'error',
+								duration: '2000'
+							})
+						}
+					},
+					fail(err) {
+						that.$refs.uTips.show({
+							title: '删除失败',
+							type: 'error',
+							duration: '2000'
+						})
+					},
+				})
+			},
+			// 删除取消
+			cancel() {
+				this.show = false
+				this.id = null
+			},
+
+			// 详情
+			details(id) {
+				uni.navigateTo({
+					url: '/pages/detailsB/detailsB?id=' + id
+				})
+				
+				// uni.navigateTo({
+				// 	url: '/pages/detailsB/detailsB'
+				// })
+			},
+		},
+		onLoad() {
+			this.listData('2')
+		},
+		// 滚动到底翻页
+		onReachBottom() {
+			if (this.dataNum !== 0 || this.dataNum !== null) {
+				if (this.pagination == null) {
+					var a = this.dataNum
+					var b = this.numData
+					var c = a / b
+					console.log(a)
+					console.log(b)
+					this.pagination = Math.ceil(c)
+				}
+				this.pagination--
+				// if (this.pagination !== 0) {
+				// if (this.listLength == 10) {
+				// 	if (this.pagination >= 1) {
+				// 		this.pageIndex++
+				// 		if (this.Inv == 0) {
+				// 			this.listData('2')
+				// 		} else if (this.Inv == 1) {
+				// 			this.listData('1')
+				// 		}
+				// 	} else {
+				// 		this.flag = true
+				// 	}
+
+				// } else if (this.listLength < 10) {
+				// 	this.flag = true
+				// }
+
+				if (this.listLength == 10) {
+					console.log(this.listLength + '_______每次获取到数据的长度-true______')
+					if (this.pagination >= 1) {
+						console.log(this.pagination + '_______总页码-true______')
+						this.pageIndex++
+						if (this.Inv == 0) {
+							console.log('_______虫害-true______')
+							this.listData('2')
+						} else if (this.Inv == 1) {
+							console.log('_______病害-false______')
+							this.listData('1')
+						}
+					} else {
+						console.log(this.pagination + '_______总页码-false______')
+						this.flag = true
+					}
+				} else if (this.listLength < 10) {
+					console.log(this.listLength + '_______每次获取到数据的长度-false______')
+					this.flag = true
+				}
+			} else {
+				this.flag = true
+			}
+		},
+		
+		 // 监听下拉动作
+		 onPullDownRefresh() {
+		 	setTimeout(() => {
+				this.insectArr = []
+				this.plantArr = []
+		 		if (this.Inv == 0) {
+		 			this.listData('2')
+		 		} else if (this.Inv == 1) {
+		 			this.listData('1')
+		 		}
+		 		uni.stopPullDownRefresh()
+		 	},2000)
+		 },
+		
+		// 监听获取滚动条位置
+		onPageScroll(e) {
+			this.scrollTop = e.scrollTop;
+		},
+	}
+</script>
+
+<style lang="scss">
+	// tab切换
+	page {
+		background-color: #f7f8fc;
+	}
+
+	.inv-h-w {
+		background-color: #FFFFFF;
+		height: 100upx;
+		display: flex;
+	}
+
+	.inv-h {
+		font-size: 30upx;
+		flex: 1;
+		text-align: center;
+		color: #C9C9C9;
+		height: 100upx;
+		line-height: 100upx;
+	}
+
+	.inv-h-se {
+		color: #20c7a1;
+		border-bottom: 4upx solid #20c7a1;
+	}
+
+	// 内容列表
+	.plant_ul {
+		.plant_li {
+			border-radius: 6px;
+			background: #fff;
+			box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+			display: flex;
+			justify-content: space-between;
+			width: 720rpx;
+			margin: 15rpx auto;
+			padding: 15rpx 20rpx 15rpx 20rpx;
+
+			.plant_li_img {
+				width: 320rpx;
+				height: 200rpx;
+				border-radius: 5px;
+			}
+
+			.plant_liBox {
+				// border: 1px solid #007AFF;
+				padding: 25rpx 0 15rpx 0;
+
+				.plant_liBox_top {
+					font-weight: 550;
+					font-size: 17px;
+					margin-bottom: 10rpx;
+				}
+
+				.plant_liBox_center {
+					color: #9d9d9d;
+					font-size: 12px;
+					margin-bottom: 20rpx;
+				}
+
+				.plant_liBox_bottom {
+					button {
+						margin: 0 15rpx 0 0;
+					}
+				}
+			}
+		}
+	}
+
+	// 暂无数据
+	.notDataBox {
+		.notDataBox_img {
+			display: block;
+			margin: 300rpx auto;
+			width: 300rpx;
+			height: 300rpx;
+		}
+	}
+
+	.isOver {
+		width: 100%;
+		height: 50px;
+		line-height: 50px;
+		text-align: center;
+		// background: #fff;
+		font-size: 28rpx;
+	}
+</style>

+ 1 - 1
pages/expertDiagnosis/postmessage.vue

@@ -104,7 +104,7 @@
 			onok(ev){
 				console.log(ev)
 				uni.uploadFile({
-				    url: 'https://wx.hnyfwlw.com/api/api_gateway?method=pest.pests.pests_img', //仅为示例,非真实的接口地址
+				    url: 'http://192.168.2.183:8006/api/api_gateway?method=pest.pests.pests_img', //仅为示例,非真实的接口地址
 					filePath: ev.path,
 				    name: 'img_file',
 				    formData: {

+ 1 - 1
pages/fourBase/addbase.vue

@@ -221,7 +221,7 @@
 			},
 			onok(ev){
 				uni.uploadFile({
-					url: 'https://wx.hnyfwlw.com/api/api_gateway?method=base.bases.base_photo', //仅为示例,非真实的接口地址
+					url: 'http://192.168.2.183:8006/api/api_gateway?method=base.bases.base_photo', //仅为示例,非真实的接口地址
 					filePath: ev.path,
 					name: 'img_file',
 					formData: {

+ 1 - 1
pages/fourBase/modification.vue

@@ -240,7 +240,7 @@
 			},
 			onok(ev){
 				uni.uploadFile({
-					url: 'https://wx.hnyfwlw.com/api/api_gateway?method=base.bases.base_photo', //仅为示例,非真实的接口地址
+					url: 'http://192.168.2.183:8006/api/api_gateway?method=base.bases.base_photo', //仅为示例,非真实的接口地址
 					filePath: ev.path,
 					name: 'img_file',
 					formData: {

+ 252 - 0
pages/guidance/guidance.vue

@@ -0,0 +1,252 @@
+<template>
+	<view>
+		<!-- 列表 -->
+		<view class="fingerpost_ul">
+			<view class="fingerpost_li">
+				<!-- 标题 -->
+				<view class="fingerpost_tltBox">
+					<image :src="'http://web.hnyfwlw.com:58003/bigservers/' + 'images/Photoguide_1.png'" mode=""></image>
+					<view class="fingerpost_tltBox_div">
+						<view class="fingerpost_tltBox_divtlt">
+							作物分类
+						</view>
+						<view class="fingerpost_tltBox_divdefail">
+							拍摄的照片需以所选作物为场景
+						</view>
+					</view>
+				</view>
+				
+				<!-- 提示 -->
+				<view class="fingerpost_hint">
+					例: 当选择作物【葡萄】时
+				</view>
+				
+				<!-- 例图 -->
+				<view class="fingerpost_illustration">
+					<view class="illustration_true">
+						<image :src="'http://web.hnyfwlw.com:58003/bigservers/' + 'images/Photoguide_4.png'" class="illustration_true_img" mode=""></image>
+						<view class="illustration_true_div">
+							<image :src="'http://web.hnyfwlw.com:58003/bigservers/' + 'images/detail_4.png'" class="illustration_true_divIcon" mode=""></image>
+							<view class="illustration_true_divTxt">
+								正确
+							</view>
+						</view>
+					</view>
+					
+					<view class="illustration_true">
+						<image :src="'http://web.hnyfwlw.com:58003/bigservers/' + 'images/Photoguide_5.png'" class="illustration_true_img" mode=""></image>
+						<view class="illustration_true_div">
+							<image style="width: 40rpx; height: 40rpx; margin: 10rpx 0 0 0;" :src=" 'http://web.hnyfwlw.com:58003/bigservers/' + 'images/detail_3.png'" class="illustration_true_divIcon" mode=""></image>
+							<view class="illustration_true_divTxt">
+								错误
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			
+			<view class="fingerpost_li">
+				<!-- 标题 -->
+				<view class="fingerpost_tltBox">
+					<image :src="'http://web.hnyfwlw.com:58003/bigservers/' + 'images/Photoguide_2.png'" mode=""></image>
+					<view class="fingerpost_tltBox_div">
+						<view class="fingerpost_tltBox_divtlt">
+							拍摄清晰
+						</view>
+						<view class="fingerpost_tltBox_divdefail">
+							确保所拍作物或虫体清晰完整
+						</view>
+					</view>
+				</view>
+				
+				<!-- 提示 -->
+				<view class="fingerpost_hint">
+					例: 当选择作物【葡萄】时
+				</view>
+				
+				<!-- 例图 -->
+				<view class="fingerpost_illustration">
+					<view class="illustration_true">
+						<image :src="'http://web.hnyfwlw.com:58003/bigservers/' + 'images/Photoguide_4.png'" class="illustration_true_img" mode=""></image>
+						<view class="illustration_true_div">
+							<image :src="'http://web.hnyfwlw.com:58003/bigservers/' + 'images/detail_4.png'" class="illustration_true_divIcon" mode=""></image>
+							<view class="illustration_true_divTxt">
+								正确
+							</view>
+						</view>
+					</view>
+					
+					<view class="illustration_true">
+						<image :src="'http://web.hnyfwlw.com:58003/bigservers/' + 'images/Photoguide_6.png'" class="illustration_true_img" mode=""></image>
+						<view class="illustration_true_div">
+							<image style="width: 40rpx; height: 40rpx; margin: 10rpx 0 0 0;" :src=" 'http://web.hnyfwlw.com:58003/bigservers/' + 'images/detail_3.png'" class="illustration_true_divIcon" mode=""></image>
+							<view class="illustration_true_divTxt">
+								错误
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			
+			<view class="fingerpost_li">
+				<!-- 标题 -->
+				<view class="fingerpost_tltBox">
+					<image :src="'http://web.hnyfwlw.com:58003/bigservers/' + 'images/Photoguide_3.png'" mode=""></image>
+					<view class="fingerpost_tltBox_div">
+						<view class="fingerpost_tltBox_divtlt">
+							适当距离
+						</view>
+						<view class="fingerpost_tltBox_divdefail">
+							确保所拍作物或虫体清晰完整,保持适当距离,不要太远也不要太近
+						</view>
+					</view>
+				</view>
+				
+				<!-- 提示 -->
+				<view class="fingerpost_hint">
+					例: 当选择作物【葡萄】时
+				</view>
+				
+				<!-- 例图 -->
+				<view class="fingerpost_illustration">
+					<view class="illustration_true">
+						<image :src="'http://web.hnyfwlw.com:58003/bigservers/' + 'images/Photoguide_4.png'" class="illustration_true_img" mode=""></image>
+						<view class="illustration_true_div">
+							<image :src="'http://web.hnyfwlw.com:58003/bigservers/' + 'images/detail_4.png'" class="illustration_true_divIcon" mode=""></image>
+							<view class="illustration_true_divTxt">
+								正确
+							</view>
+						</view>
+					</view>
+					
+					<view class="illustration_true">
+						<image :src="'http://web.hnyfwlw.com:58003/bigservers/' + 'images/Photoguide_7.png'" class="illustration_true_img" mode=""></image>
+						<view class="illustration_true_div">
+							<image style="width: 40rpx; height: 40rpx; margin: 10rpx 0 0 0;" :src=" 'http://web.hnyfwlw.com:58003/bigservers/' + 'images/detail_3.png'" class="illustration_true_divIcon" mode=""></image>
+							<view class="illustration_true_divTxt">
+								错误
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		
+		<!-- 参考 -->
+		<view class="referenceBox">
+			<view class="referenceBtn">
+				参考图片
+			</view>
+			<image :src="'http://web.hnyfwlw.com:58003/bigservers/' + 'images/Photoguide_8.png'" class="referenceIcon" mode=""></image>
+			<image :src="'http://web.hnyfwlw.com:58003/bigservers/' + 'images/Photoguide_9.png'" class="referenceIcon" mode=""></image>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style lang="scss">
+	// 列表
+	.fingerpost_ul {
+		padding-top: 25rpx;
+		.fingerpost_li {
+			// border: 1px solid #007AFF;
+			width: 660rpx;
+			margin: 25rpx auto;
+			// 标题
+			.fingerpost_tltBox {
+				display: flex;
+				image {
+					width: 70rpx;
+					height: 70rpx;
+				}
+				.fingerpost_tltBox_div {
+					// border: 1px solid #19BE6B;
+					margin: 0 0 0 15rpx;
+					width: 550rpx;
+					.fingerpost_tltBox_divtlt {
+						font-weight: 550;
+						font-size: 18px;
+					}
+					.fingerpost_tltBox_divdefail {
+						font-size: 13px;
+						color: #7a7a7a;
+						line-height: 35rpx;
+					}
+				}
+			}
+		
+			// 提示
+			.fingerpost_hint {
+				// border: 1px solid #000;
+				text-align: center;
+				font-size: 13px;
+				color: #45c785;
+				font-weight: 550;
+				padding: 10rpx;
+			}
+		
+			// 例图
+			.fingerpost_illustration {
+				// border: 1px solid #000;
+				display: flex;
+				justify-content: space-around;
+				.illustration_true {
+					width: 300rpx;
+					.illustration_true_img {
+						width: 300rpx;
+						height: 350rpx;
+					}
+					.illustration_true_div {
+						// border: 1px solid #000;
+						display: flex;
+						width: 150rpx;
+						margin: 0 auto;
+						.illustration_true_divIcon {
+							width: 63rpx;
+							height: 60rpx;
+							display: block;
+							vertical-align: middle;
+						}
+						.illustration_true_divTxt {
+							font-size: 16px;
+							font-weight: 550;
+							color: #464646;
+							line-height: 60rpx;
+							margin: 0 0 0 15rpx;
+						}
+					}
+				}
+			}
+		}
+	}
+	
+	// 参考
+	.referenceBox {
+		padding-bottom: 20rpx;
+		.referenceBtn {
+			background: #45c785;
+			color: #fff;
+			text-align: center;
+			width: 350rpx;
+			margin: 0 auto;
+			padding: 10rpx 0 10rpx 0;
+			font-size: 18px;
+		}
+		image {
+			margin: 15rpx auto;
+			display: block;
+		}
+	}
+</style>

+ 341 - 0
pages/identifyPest/cerealPlant/cerealPlant.vue

@@ -0,0 +1,341 @@
+<template>
+	<view>
+		<!-- 搜索 -->
+		<!-- <u-search :disabled="true" margin="15rpx auto" :input-style="{width: '20rpx'}" input-align="center" :animation="true" placeholder="搜索作物名称"
+		 shape="square" :show-action="false" v-model="keyword"></u-search> -->
+
+		<!-- 作物列表 -->
+		<view class="plantList_ul">
+
+			<!-- 上次定位 -->
+			<view class="plantList_li" v-if="lastTimeShow">
+				<view class="plantList_tlt">
+					上次选择
+				</view>
+
+				<view class="plantList_li_ul">
+					<view class="plantList_li_List" @click="recognizeData(allPlantData[lastTimeIndex].num, allPlantData[lastTimeIndex].name, lastTimeIndex)">
+						<image :lazy-load="true" :src=" 'http://web.hnyfwlw.com:58003/bigservers/' + allPlantData[lastTimeIndex].img" mode=""></image>
+						<view class="">
+							{{ allPlantData[lastTimeIndex].name }}
+						</view>
+					</view>
+				</view>
+			</view>
+
+			<!-- 全部 -->
+			<view class="plantList_li">
+				<view class="plantList_tlt">
+					全部
+				</view>
+
+				<view class="plantList_li_ul">
+					<view @click="recognizeData(item.num, item.name, index)" class="plantList_li_List" v-for="(item, index) in allPlantData" :key="index">
+						<image :src=" 'http://web.hnyfwlw.com:58003/bigservers/' + item.img" mode=""></image>
+						<view class="">
+							{{ item.name }}
+						</view>
+					</view>
+				</view>
+			</view>
+
+			<!-- 其他 -->
+			<!-- <view class="plantList_li">
+				<view class="plantList_tlt">
+					其他
+					<text>(此项目开发中,结果可能会有误差)</text>
+				</view>
+
+				<view class="plantList_li_ul">
+					<view class="plantList_li_List" @click="restsData()">
+						<image :src="'http://web.hnyfwlw.com:58003/bigservers/' + 'images/detail_9.png'" mode=""></image>
+						<view class="">
+							其他
+						</view>
+					</view>
+				</view>
+			</view> -->
+		</view>
+		
+		<!-- 裁剪组件 -->
+		<kps-image-cutter @ok="axiosData" @cancel="oncancle" :url="url" :fixed="false" :blob="false" :maxWidth="500" :maxHeight="500"></kps-image-cutter>
+			
+		<!-- 弹框 -->
+		<u-modal :mask-close-able="true" @cancel="insectData('1')" @confirm="insectData('2')" confirm-text="虫害" cancel-text="病害" v-model="show" :show-cancel-button="true" :content="content"></u-modal>
+		
+		<!--loading-->
+		<ourLoading v-show="loadingShow" isFullScreen active text="识别中..." />
+	</view>
+</template>
+
+<script>
+	import kpsImageCutter from "@/components/ksp-image-cutter/ksp-image-cutter.vue"; //裁剪图片
+	export default {
+		data() {
+			return {
+				keyword: '', //搜索
+				show: false,
+				content: '请选择测试虫害还是病害',
+				allPlantData: [{
+						'name': '水稻',
+						'img': 'images/plant_16.jpg',
+						'num': '12',
+					},
+					{
+						'name': '小麦',
+						'img': 'images/plant_19.jpg',
+						'num': '11',
+					},
+					{
+						'name': '玉米',
+						'img': 'images/plant_17.jpg',
+						'num': '14',
+					},
+					// {
+					// 	'name': '甘薯',
+					// 	'img': 'images/plant_18.jpg',
+					// 	'num': '13',
+					// }
+				],
+				url: "", //裁剪
+				serialNum: '', //获取到作物序号码
+				urlData: {}, //图片全部信息
+				urlName: '', //识别失败作物名称
+				insectNum: '', //区别病虫害  1虫 2病
+				lastTimeShow: false, //是否显示上次选择
+				lastTimeIndex: null, //上次选择下标
+				loadingShow: false, //加载
+			}
+		},
+		methods: {
+			recognizeData(num, name, index) {
+				uni.setStorage({
+				    key: 'lastTimeB',
+				    data: index,
+				    success: function () {
+				        console.log('success');
+				    }
+				});
+				this.urlName = name
+				this.insectNum = ''
+				this.serialNum = num
+				uni.chooseImage({
+					count: 1,
+					success: (res) => {
+						// 设置url的值,显示控件
+						// console.log(res)
+						this.urlData = res
+						this.url = res.tempFilePaths[0];
+						this.urlFile = res.tempFilePaths[0]; //失败跳转显示的图片
+					}
+				});
+			},
+			
+			
+			// 取消上传
+			oncancle() {
+				this.url = '';
+			},
+			
+			// 确定上传
+			axiosData(ev) {
+				uni.showLoading({
+					title: '识别中。。。'
+				});
+				let that = this
+				if (that.serialNum == '' && that.insectNum !== '') {
+					// 老接口
+					var url = 'other_discern'
+					var num = that.insectNum
+				} else if (that.serialNum !== '' && that.insectNum == '') {
+					//新接口
+					var url = 'discern'
+					var num = that.serialNum
+				}
+				
+				uni.uploadFile({
+					url: 'https://wx.hnyfwlw.com/bigservers/'+ url + '?type=' + num,
+					fileType: 'image',
+					file: this.urlData.tempFiles[0],
+					filePath: this.urlData.tempFiles[0].path,
+					name: 'img_addr',
+					success(res) {
+						uni.hideLoading();
+						that.url = '';
+						if (res.statusCode !== 500) {
+							var data = JSON.parse(res.data)
+							// 判断是否识别成功 -新接口
+							if (data.returnResult.returnStatus == 1) {
+								// 成功
+								console.log(data.data)
+								var img = []
+								img.push(that.urlFile)
+								if (that.urlName == '其他') {
+									var f = JSON.parse(res.data)
+									if (f.data == null || f.data[0].prevention == "[防治方法] null") {
+										console.log('失败')
+										uni.navigateTo({
+											url: '/pages/identifyPest/recognizeFail/recognizeFail?data=' + img + '&name=' + that.urlName
+										})
+									} else {
+										uni.navigateTo({
+											url: '/pages/identifyPest/recognizeSucceedWorn/recognizeSucceedWorn?data=' + JSON.stringify(data.data) + '&name=' + that.urlName + '&img=' + img
+										})
+										console.log('成功')
+									}
+								} else {
+									uni.navigateTo({
+										url: '/pages/identifyPest/recognizeSucceed/recognizeSucceed?data=' + JSON.stringify(data.returnResult)
+									})
+								}
+								
+								// uni.navigateTo({
+								//     url: '/pages/recognizeSucceed/recognizeSucceed?data=' + JSON.stringify(data.data)
+								// })
+							} else if (data.code !== 200) {
+								//失败
+								var img = []
+								img.push(that.urlFile)
+								uni.navigateTo({
+								    url: '/pages/identifyPest/recognizeFail/recognizeFail?data=' + img + '&name=' + that.urlName
+								})
+							}
+						} else {
+							//失败
+							var img = []
+							img.push(that.urlFile)
+							uni.navigateTo({
+							    url: '/pages/identifyPest/recognizeFail/recognizeFail?data=' + img + '&name=' + that.urlName
+							})
+						}
+						
+					},
+					fail(err) {
+						var img = []
+						img.push(that.urlFile)
+						uni.navigateTo({
+						    url: '/pages/recognizeFail/recognizeFail?data=' + img + '&name=' + that.urlName
+						})
+					},
+					complete(com) {
+						that.loadingShow = false
+					}
+				})
+			},
+			
+			// 其他--老识别接口
+			restsData() {
+				this.show = true;
+			},
+			// 确定
+			insectData(num) {
+				this.urlName = '其他'
+				this.serialNum = ''
+				this.insectNum = num
+				uni.chooseImage({
+					count: 1,
+					success: (res) => {
+						// 设置url的值,显示控件
+						this.urlData = res
+						this.url = res.tempFilePaths[0];
+						this.urlFile = res.tempFilePaths[0]; //失败跳转显示的图片
+					}
+				});
+			},
+			
+			// 上次选择
+			lastListData() {
+				var that = this
+				uni.request({
+					url: 'https://wx.hnyfwlw.com/bigservers/user_record',
+					method: 'get',
+					header: {
+						"Content-Type": "application/x-www-form-urlencoded"
+					},
+					dataType: 'json',
+					data: {
+						
+					},
+					success(res) {
+						console.log(res.data)
+					},
+					fail(err) {
+						console.log(err)
+					}
+				})
+			},
+		},
+		components: {
+			kpsImageCutter
+		},
+		onShow() {
+			var that = this
+			uni.getStorage({
+			    key: 'lastTimeB',
+			    success: function (res) {
+					that.lastTimeShow = true
+			        console.log(res.data);
+					that.lastTimeIndex = res.data
+			    },
+				fail: function (err) {
+					that.lastTimeShow = false
+					console.log(err)
+				}
+			});
+			
+			// 上次选择
+			this.lastListData()
+		},
+	}
+</script>
+
+<style lang="scss">
+	// 搜索
+	// uni-view,
+	// uni-text {
+	// 	width: 740rpx;
+	// 	margin: 0 auto;
+	// }
+
+	// 作物选择
+	.plantList_ul {
+		.plantList_li {
+			margin: 55rpx 0 55rpx 0;
+			.plantList_tlt {
+				font-weight: 550;
+				font-size: 16px;
+				width: 700rpx;
+				margin: 0 auto;
+
+				text {
+					color: #7e7e7e;
+					font-size: 12px;
+				}
+			}
+			.plantList_li_ul {
+				display: flex;
+				flex-wrap: wrap;
+				margin-top: 10rpx;
+				.plantList_li_List {
+					margin: 10rpx 0 0 18rpx;
+					width: 150rpx;
+					image {
+						width: 130rpx;
+						height: 130rpx;
+						border-radius: 55px;
+						margin: 0 auto;
+						display: block;
+						box-shadow: 0 2px 4px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04);
+					}
+					view {
+						width: 150rpx;
+						color: #646464;
+						text-align: center;
+						margin: 10rpx 0 0 0;
+						font-size: 13px;
+					}
+				}
+			}
+		}
+	}
+</style>

+ 439 - 0
pages/identifyPest/collect/collect.vue

@@ -0,0 +1,439 @@
+<template>
+	<view>
+		<!-- tab切换 -->
+		<view class="inv-h-w">
+			<view :class="['inv-h',Inv==0?'inv-h-se':'']" @click="Inv=0">虫害</view>
+			<view :class="['inv-h',Inv==1?'inv-h-se':'']" @click="Inv=1">病害</view>
+		</view>
+
+		<view class="" v-if="isShow">
+			<!-- 虫害 -->
+			<view class="plant_ul" v-show="Inv == 0">
+				<view class="plant_li" v-for="(item, index) in insectArr">
+					<u-image shape="square" border-radius="10" width="250rpx" height="200rpx" class="plant_li_img" :src="item.img"></u-image>
+
+					<view class="">
+						<view class="plant_liBox">
+							<view class="plant_liBox_top">{{ item.name }}</view>
+							<view class="plant_liBox_center">所属作物:{{ item.host == "" ? '暂未收录' : item.host }}</view>
+							<view class="plant_liBox_bottom">收藏日期:{{ item.time }}</view>
+						</view>
+
+						<view class="plant_btmHandle">
+							<view class="plant_btmHandle_cancel" @click="noCollect(index, item.id)">
+								<image :src="'http://web.hnyfwlw.com:58003/bigservers/' + 'images/starA.png'" mode="" class="plant_btmHandle_cancelImg"></image>
+								<text class="plant_btmHandle_cancelTxt">取消收藏</text>
+							</view>
+							<view class="plant_btmHandle_record" @click="defail(item.id)">
+								<image :src="'http://web.hnyfwlw.com:58003/bigservers/' + 'images/detail_8.png'" class="plant_btmHandle_recordImg" mode=""></image>
+								<text class="plant_btmHandle_recordTxt">查看详情</text>
+							</view>
+						</view>
+					</view>
+
+				</view>
+			</view>
+
+			<!-- 病害 -->
+			<view class="plant_ul" v-show="Inv == 1">
+				<view class="plant_li" v-for="(item, index) in plantArr">
+					<u-image shape="square" border-radius="10" width="250rpx" height="200rpx" class="plant_li_img" :src="item.img"></u-image>
+
+					<view>
+						<view class="plant_liBox">
+							<view class="plant_liBox_top">{{ item.name }}</view>
+							<view class="plant_liBox_center">所属作物:{{ item.host == "" ? '暂未收录' : item.host }}</view>
+							<view class="plant_liBox_bottom">收藏日期:{{ item.time }}</view>
+						</view>
+
+						<view class="plant_btmHandle">
+							<view class="plant_btmHandle_cancel"  @click="noCollect(index, item.id)">
+								<image :src="'http://web.hnyfwlw.com:58003/bigservers/' + 'images/starA.png'" mode="" class="plant_btmHandle_cancelImg"></image>
+								<text class="plant_btmHandle_cancelTxt">取消收藏</text>
+							</view>
+							<view class="plant_btmHandle_record" @click="defail(item.id)">
+								<image :src="'http://web.hnyfwlw.com:58003/bigservers/' + 'images/detail_8.png'" class="plant_btmHandle_recordImg" mode=""></image>
+								<text class="plant_btmHandle_recordTxt">查看详情</text>
+							</view>
+						</view>
+					</view>
+
+				</view>
+			</view>
+		</view>
+
+		<!-- 暂无 -->
+		<view class="notDataBox" v-else>
+			<image :src="'http://web.hnyfwlw.com:58003/bigservers/' + 'images/detail_11.png'" class="notDataBox_img" mode=""></image>
+		</view>
+
+
+		<!-- 返回顶部 -->
+		<u-back-top :scroll-top="scrollTop" top="600"></u-back-top>
+
+		<!-- 弹框提示 -->
+		<u-top-tips ref="uTips"></u-top-tips>
+
+		<view class="isOver" v-if="flag">
+			---- 我是有底线的 ----
+		</view>
+
+		<!--loading-->
+		<ourLoading v-show="loadingShow" isFullScreen active text="加载中..." />
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				Inv: 0,
+				scrollTop: 0, //返回顶部
+				insectArr: [], //病虫害列表
+				plantArr: [],
+				isShow: true,
+				dataNum: null, //列表总条数
+				pageIndex: 1, //当前页数
+				pagination: null, //总页码
+				numData: 10, //固定每页显示多少条
+				listLangth: null, //每次请求数据条数
+				flag: false,
+				loadingShow: true, //加载
+			}
+		},
+		watch: {
+			Inv(val) {
+				this.dataNum = null //清空
+				console.log(this.pageIndex)
+				this.pageIndex = 1 //清空
+				this.pagination = null //清空
+				this.listLength = null
+				this.flag = false
+				if (val == 0) {
+					//虫害
+					this.listData(2)
+					this.insectArr = []
+				} else {
+					//病害
+					this.listData(1)
+					this.plantArr = []
+				}
+			},
+			insectArr(val) {
+				console.log(val)
+				if (val.length == 0) {
+					this.isShow = false
+				}
+			},
+			plantArr(val) {
+				if (val.length == 0) {
+					this.isShow = false
+				}
+			},
+		},
+		methods: {
+			changeTab(Inv) {
+				that.navIdx = Inv;
+			},
+
+			// 列表数据
+			listData(numDat) {
+				var that = this
+				uni.request({
+					url: 'user_collect',
+					method: 'get',
+					data: {
+						page: this.pageIndex,
+						ret: numDat
+					},
+					header: {
+						"Content-Type": "application/x-www-form-urlencoded"
+					},
+					dataType: 'json',
+					success(res) {
+						if (res.data.code !== "10011") {
+							that.dataNum = res.data.nums
+							if (numDat == '1') {
+								that.plantArr = [...that.plantArr, ...res.data.dat]
+								var arrayData = that.plantArr
+							} else {
+								that.insectArr = [...that.insectArr, ...res.data.dat]
+								var arrayData = that.insectArr
+							}
+							// that.insectArr = res.data.dat
+							for (var i = 0; i < arrayData.length; i++) {
+								let Adata = new Array();
+								Adata = arrayData[i].img_urls.split("#");
+								arrayData[i].img = Adata[0]
+							}
+							that.isShow = true
+							that.listLength = res.data.dat.length
+						} else {
+							that.isShow = false
+						}
+						that.loadingShow = false
+					},
+					fail(err) {
+						console.log(err)
+						that.loadingShow = false
+					},
+					complete(com) {
+						// console.log(com)
+					}
+				})
+			},
+
+			defail(id) {
+				uni.navigateTo({
+					url: '/pages/details/details?id=' + id + '&signboard=1'
+				})
+			},
+
+			noCollect(index, id) {
+				var that = this
+				let postData = ({
+					id: id,
+					ret: 'move'
+				})
+				uni.request({
+					url: 'user_collect',
+					method: 'post',
+					data: postData,
+					header: {
+						"Content-Type": "application/x-www-form-urlencoded"
+					},
+					success(res) {
+						if (res.data.code == 200) {
+							that.$refs.uTips.show({
+								title: '取消收藏成功',
+								type: 'success',
+								duration: '1500'
+							})
+							if (that.Inv == 0) {
+								//虫害
+								that.insectArr.splice(index, 1)
+							} else {
+								that.plantArr.splice(index, 1)
+							}
+						}
+					},
+					fail(err) {
+						that.$refs.uTips.show({
+							title: '取消收藏失败',
+							type: 'error',
+							duration: '1500'
+						})
+					}
+				})
+			},
+		},
+		onLoad() {
+			this.listData(2)
+		},
+		// 滚动到底翻页
+		onReachBottom() {
+			if (this.dataNum !== 0 || this.dataNum !== null) {
+				if (this.pagination == null) {
+					var a = this.dataNum
+					var b = this.numData
+					var c = a / b
+					this.pagination = Math.ceil(c)
+				}
+				this.pagination--
+				// if (this.pagination !== 0) {
+				// 	this.pageIndex++
+				// 	console.log(this.pageIndex)
+				// 	if (this.Inv == 0) {
+				// 		this.listData(2)
+				// 	} else if (this.Inv == 1) {
+				// 		this.listData(1)
+				// 	}
+				// } else {
+				// 	this.flag = true
+				// }
+
+				if (this.listLength == 10) {
+					console.log(this.listLength + '_______每次获取到数据的长度-true______')
+					if (this.pagination >= 1) {
+						console.log(this.pagination + '_______总页码-true______')
+						this.pageIndex++
+						if (this.Inv == 0) {
+							console.log('_______虫害-true______')
+							this.listData('2')
+						} else if (this.Inv == 1) {
+							console.log('_______病害-false______')
+							this.listData('1')
+						}
+					} else {
+						console.log(this.pagination + '_______总页码-false______')
+						this.flag = true
+					}
+				} else if (this.listLength < 10) {
+					console.log(this.listLength + '_______每次获取到数据的长度-false______')
+					this.flag = true
+				}
+
+			} else {
+				this.flag = false
+			}
+		},
+		
+		// 监听下拉动作
+		onPullDownRefresh() {
+			setTimeout(() => {
+						this.insectArr = []
+						this.plantArr = []
+				if (this.Inv == 0) {
+					this.listData('2')
+				} else if (this.Inv == 1) {
+					this.listData('1')
+				}
+				uni.stopPullDownRefresh()
+			},2000)
+		},
+		
+		// 监听获取滚动条位置
+		onPageScroll(e) {
+			this.scrollTop = e.scrollTop;
+		},
+	}
+</script>
+
+<style lang="scss">
+	// tab切换
+	page {
+		background-color: #f7f8fc;
+	}
+
+	.inv-h-w {
+		background-color: #FFFFFF;
+		height: 100upx;
+		display: flex;
+	}
+
+	.inv-h {
+		font-size: 30upx;
+		flex: 1;
+		text-align: center;
+		color: #C9C9C9;
+		height: 100upx;
+		line-height: 100upx;
+	}
+
+	.inv-h-se {
+		color: #20c7a1;
+		border-bottom: 4upx solid #20c7a1;
+	}
+
+	// 内容列表
+	.plant_ul {
+		.plant_li {
+			border-radius: 6px;
+			background: #fff;
+			box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+			display: flex;
+			width: 720rpx;
+			margin: 15rpx auto;
+			padding: 15rpx 20rpx 15rpx 20rpx;
+
+			.plant_li_img {
+				width: 250rpx;
+				height: 200rpx;
+				border-radius: 5px;
+			}
+
+			.plant_liBox {
+				// border: 1px solid #007AFF;
+				padding: 5rpx 0 15rpx 0;
+				margin: 0 0 0 35rpx;
+
+				.plant_liBox_top {
+					font-weight: 550;
+					font-size: 17px;
+					margin-bottom: 10rpx;
+				}
+
+				.plant_liBox_center {
+					color: #9d9d9d;
+					font-size: 12px;
+					margin-bottom: 10rpx;
+					width: 350rpx;
+					height: 50rpx;
+					white-space: nowrap;
+					text-overflow: ellipsis;
+					overflow: hidden;
+				}
+
+				.plant_liBox_bottom {
+					color: #9d9d9d;
+					font-size: 12px;
+				}
+			}
+
+			// 取消收藏and查看详情
+			.plant_btmHandle {
+				border-top: 1px solid #f2f2f2;
+				padding: 5rpx 0 15rpx 0;
+				margin: 0 0 0 35rpx;
+				display: flex;
+				justify-content: center;
+
+				.plant_btmHandle_cancel {
+					border-right: 1px solid #f2f2f2;
+					padding: 0 20rpx 0 0;
+					margin: 10rpx 0 0 0;
+
+					.plant_btmHandle_cancelImg {
+						width: 35rpx;
+						height: 35rpx;
+						margin: -5rpx 0 0 0;
+						vertical-align: middle;
+					}
+
+					.plant_btmHandle_cancelTxt {
+						color: #999999;
+						font-size: 13px;
+						margin: 0 0 0 5rpx;
+					}
+				}
+
+				.plant_btmHandle_record {
+					padding: 0 0 0 20rpx;
+					margin: 10rpx 0 0 0;
+
+					.plant_btmHandle_recordImg {
+						width: 30rpx;
+						height: 30rpx;
+						margin: -5rpx 0 0 0;
+						vertical-align: middle;
+					}
+
+					.plant_btmHandle_recordTxt {
+						color: #999999;
+						font-size: 13px;
+						margin: 0 0 0 5rpx;
+					}
+				}
+			}
+		}
+	}
+
+	// 暂无数据
+	.notDataBox {
+		.notDataBox_img {
+			display: block;
+			margin: 300rpx auto;
+			width: 300rpx;
+			height: 300rpx;
+		}
+	}
+
+	.isOver {
+		width: 100%;
+		height: 50px;
+		line-height: 50px;
+		text-align: center;
+		// background: #fff;
+		font-size: 28rpx;
+	}
+</style>

+ 189 - 0
pages/identifyPest/detailsWorn/detailsWorn.vue

@@ -0,0 +1,189 @@
+<template>
+	<view>
+		<!-- 图片及其他 -->
+		<view class="imgAndOther">
+			<view class="wrap">
+				<u-swiper @click="upImg" height="450" :effect3d="true" :list="imgArr"></u-swiper>
+			</view>
+		
+		
+			<!-- 其他 -->
+			<view class="other_box">
+				<view class="other_boxLeft">
+					<view class="other_boxLeft_name">
+						{{ redata.name }}
+					</view>
+				</view>
+			</view>
+		</view>
+		
+		<!-- 详情列表 -->
+		<view class="details_ul">
+			<view class="details_list" v-if="item !== ''" v-for="item in redata.list">
+				<view class="details_txtBox">
+					<view class="details_txtBox_main">
+						{{ item }}
+					</view>
+				</view>
+			</view>
+		
+		</view>
+			
+		<!-- 弹框提示 -->
+		<u-top-tips ref="uTips"></u-top-tips>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				redata: {},
+				txtArr: [], //内容
+				imgArr: [],
+			}
+		},
+		methods: {
+			information() {
+				var centerTxt = this.redata.prevention
+				var b = centerTxt.replace(/]/g, ":")
+				var Adata = new Array();
+				Adata = b.split("[");
+				var arr = []
+				for (var i = 0; i < Adata.length; i++) {
+					if (Adata[i] !== '') {
+						var obj = {}
+						var index = Adata[i].lastIndexOf(':')
+						obj['title']= Adata[i].substring(0, index)
+						obj['txt']= Adata[i].substring(index + 1, obj.length)
+						arr.push(obj)
+					}
+				}
+				this.txtArr = arr
+			},
+			// 轮播图点击事件
+			upImg(index) {
+				var img = []
+				img.push(this.imgArr[index])
+				uni.previewImage({
+					urls: img,
+				})
+			},
+		},
+		onLoad(options) {
+			var data = JSON.parse(options.data)
+			this.imgArr.push(data.img_ulrs)
+			this.redata = data
+			console.log(data)
+			// this.information() //详情数据处理
+			
+		},
+	}
+</script>
+
+<style lang="scss">
+page {
+		background: #f7f8fc;
+		padding: 25rpx 0 25rpx 0;
+	}
+
+	// 顶部导航左图标
+	.navTopLeftIcon {
+		width: 50rpx;
+		height: 50rpx;
+		margin: 0 0 0 25rpx;
+	}
+
+	// 顶部导航右
+	.navRight {
+		position: absolute;
+		top: 23rpx;
+		right: 18rpx;
+
+		.navTopRigthIcon {
+			width: 40rpx;
+			height: 40rpx;
+		}
+
+		text {
+			width: 100rpx;
+			font-size: 13px;
+			color: #fff;
+			display: inline-block;
+			text-overflow: ellipsis;
+		}
+	}
+
+	// 图片及其他
+	.imgAndOther {
+		background: #fff;
+		margin: -26rpx 0 0 0;
+
+		// 图片
+		.imgAndOther_img {
+			display: block;
+			margin: 0 auto;
+			width: 730rpx;
+			height: 450rpx;
+			border-radius: 5px;
+		}
+	}
+
+	// 其他
+	.other_box {
+		display: flex;
+		justify-content: space-between;
+		padding-bottom: 25rpx;
+		width: 730rpx;
+		margin: 25rpx auto;
+
+		.other_boxLeft {
+			display: flex;
+
+			.other_boxLeft_name {
+				font-size: 18px;
+				font-weight: 550;
+				color: #545454;
+			}
+
+			.other_boxLeft_subject {
+				color: #9f9f9f;
+				font-size: 13px;
+				line-height: 52rpx;
+				margin: 0 0 0 15rpx;
+			}
+		}
+
+		.other_boxRight {
+			button {
+				margin: 0 5rpx 0 15rpx;
+			}
+		}
+	}
+
+	// 详情列表
+	.details_ul {
+
+		// border: 1px solid #000;
+		.details_list {
+			background: #fff;
+			padding: 15rpx;
+			margin: 15rpx 0 0 0;
+
+			.details_txtBox {
+				.details_txtBox_tlt {
+					font-size: 16px;
+					font-weight: 550;
+					margin: 0 0 10rpx 0;
+				}
+
+				.details_txtBox_main {
+					color: #868686;
+					font-size: 13px;
+					font-weight: 530;
+					line-height: 40rpx;
+				}
+			}
+		}
+	}
+</style>

+ 321 - 0
pages/identifyPest/economicsPlant/economicsPlant.vue

@@ -0,0 +1,321 @@
+<template>
+	<view>
+		<!-- 搜索 -->
+		<!-- <u-search :disabled="true" margin="15rpx auto" :input-style="{width: '20rpx'}" input-align="center" :animation="true"
+		 placeholder="搜索作物名称" shape="square" :show-action="false" v-model="keyword"></u-search> -->
+
+		<!-- 作物列表 -->
+		<view class="plantList_ul">
+
+			<!-- 上次定位 -->
+			<view class="plantList_li" v-if="lastTimeShow">
+				<view class="plantList_tlt">
+					上次选择
+				</view>
+
+				<view class="plantList_li_ul">
+					<view class="plantList_li_List" @click="recognizeData(allPlantData[lastTimeIndex].num, allPlantData[lastTimeIndex].name, lastTimeIndex)">
+						<image :src=" 'http://web.hnyfwlw.com:58003/bigservers/' + allPlantData[lastTimeIndex].img" mode=""></image>
+						<view class="">
+							{{ allPlantData[lastTimeIndex].name }}
+						</view>
+					</view>
+				</view>
+			</view>
+
+			<!-- 全部 -->
+			<view class="plantList_li">
+				<view class="plantList_tlt">
+					全部
+				</view>
+
+				<view class="plantList_li_ul">
+					<view @click="recognizeData(item.num, item.name, index)" class="plantList_li_List" v-for="(item, index) in allPlantData"
+					 :key="index">
+						<image :src=" 'http://web.hnyfwlw.com:58003/bigservers/' + item.img" mode=""></image>
+						<view class="">
+							{{ item.name }}
+						</view>
+					</view>
+				</view>
+			</view>
+
+			<!-- 其他 -->
+			<!-- <view class="plantList_li">
+				<view class="plantList_tlt">
+					其他
+					<text>(此项目开发中,结果可能会有误差)</text>
+				</view>
+
+				<view class="plantList_li_ul">
+					<view class="plantList_li_List" @click="restsData()">
+						<image :src="'http://web.hnyfwlw.com:58003/bigservers/' + 'images/detail_9.png'" mode=""></image>
+						<view class="">
+							其他
+						</view>
+					</view>
+				</view>
+			</view> -->
+		</view>
+
+		<!-- 裁剪组件 -->
+		<kps-image-cutter @ok="axiosData" @cancel="oncancle" :url="url" :fixed="false" :blob="false" :maxWidth="500"
+		 :maxHeight="500"></kps-image-cutter>
+
+		<!-- 弹框 -->
+		<u-modal :mask-close-able="true" @cancel="insectData('1')" @confirm="insectData('2')" confirm-text="虫害" cancel-text="病害" v-model="show"
+		 :show-cancel-button="true" :content="content"></u-modal>
+		 
+		 <!--loading-->
+		 <ourLoading v-show="loadingShow" isFullScreen active text="识别中..." />
+	</view>
+</template>
+
+<script>
+	import kpsImageCutter from "@/components/ksp-image-cutter/ksp-image-cutter.vue"; //裁剪图片
+	export default {
+		data() {
+			return {
+				keyword: '', //搜索
+				show: false,
+				content: '请选择测试虫害还是病害',
+				allPlantData: [
+					// {
+					// 	'name': '棉花',
+					// 	'img': 'images/plant_2.jpg',
+					// 	'num': '21'
+					// },
+					// {
+					// 	'name': '茶',
+					// 	'img': 'images/plant_1.jpg',
+					// 	'num': '22'
+					// },
+					{
+						'name': '油菜',
+						'img': 'images/plant_3.jpg',
+						'num': '13'
+					}
+				],
+				url: "", //裁剪
+				serialNum: '', //获取到作物序号码
+				urlData: {}, //图片全部信息
+				urlName: '', //识别失败作物名称
+				insectNum: '', //区别病虫害  1病 2虫
+				lastTimeShow: false, //是否显示上次选择
+				lastTimeIndex: null, //上次选择下标
+				loadingShow: false, //加载
+			}
+		},
+		methods: {
+			recognizeData(num, name, index) {
+				console.log(index)
+				uni.setStorage({
+				    key: 'lastTime',
+				    data: index,
+				    success: function () {
+				        console.log('success');
+				    }
+				});
+				this.urlName = name
+				this.insectNum = ''
+				this.serialNum = num
+				uni.chooseImage({
+					count: 1,
+					sourceType: ['camera', 'album'], //从相册选择
+					success: (res) => {
+						// 设置url的值,显示控件
+						console.log(res.tempFiles)
+						this.urlData = res
+						this.url = res.tempFilePaths[0];
+						this.urlFile = res.tempFilePaths[0]; //失败跳转显示的图片
+					}
+				});
+			},
+			
+			// 取消上传
+			oncancle() {
+				this.url = '';
+			},
+
+			// 确定上传
+			axiosData(ev) {
+				uni.showLoading({
+					title: '识别中。。。'
+				});
+				let that = this
+				if (that.serialNum == '' && that.insectNum !== '') {
+					// 老接口
+					var url = 'other_discern'
+					var num = that.insectNum
+				} else if (that.serialNum !== '' && that.insectNum == '') {
+					//新接口
+					var url = 'discern'
+					var num = that.serialNum
+				}
+
+				uni.uploadFile({
+					url: 'https://wx.hnyfwlw.com/bigservers/' + url + '?type=' + num,
+					fileType: 'image',
+					file: this.urlData.tempFiles[0],
+					filePath: this.urlData.tempFiles[0].path,
+					name: 'img_addr',
+					success(res) {
+						uni.hideLoading();
+						that.url = '';
+						// 判断是否识别成功 -新接口
+						// if (data.code == 200) {
+						if (res.statusCode !== 500) {
+							var data = JSON.parse(res.data)
+							if (data.returnResult.returnStatus == 1) {
+								// 成功
+								var img = []
+								img.push(that.urlFile)
+								if (that.urlName == '其他') {
+									var f = JSON.parse(res.data)
+									if (f.data == null || f.data[0].prevention == "[防治方法] null") {
+										console.log('失败')
+										uni.navigateTo({
+											url: '/pages/identifyPest/recognizeFail/recognizeFail?data=' + img + '&name=' + that.urlName
+										})
+									} else {
+										uni.navigateTo({
+											url: '/pages/identifyPest/recognizeSucceedWorn/recognizeSucceedWorn?data=' + JSON.stringify(data.data) + '&name=' + that.urlName + '&img=' + img
+										})
+										console.log('成功')
+									}
+									console.log('老接口')
+								} else {
+									uni.navigateTo({
+										url: '/pages/identifyPest/recognizeSucceed/recognizeSucceed?data=' + JSON.stringify(data.returnResult)
+									})
+									console.log('新接口')
+								}
+								
+							} else if (data.code !== 200) {
+								//失败
+								var img = []
+								img.push(that.urlFile)
+								uni.navigateTo({
+									url: '/pages/identifyPest/recognizeFail/recognizeFail?data=' + img + '&name=' + that.urlName
+								})
+							}
+						} else {
+							//失败
+							var img = []
+							img.push(that.urlFile)
+							uni.navigateTo({
+								url: '/pages/identifyPest/recognizeFail/recognizeFail?data=' + img + '&name=' + that.urlName
+							})
+						}
+
+					},
+					fail(err) {
+						var img = []
+						img.push(that.urlFile)
+						uni.navigateTo({
+							url: '/pages/identifyPest/recognizeFail/recognizeFail?data=' + img + '&name=' + that.urlName
+						})
+					},
+					complete(com) {
+						that.loadingShow = false
+					}
+				})
+			},
+
+			// 其他--老识别接口
+			restsData() {
+				this.show = true;
+			},
+			// 确定
+			insectData(num) {
+				this.urlName = '其他'
+				this.serialNum = ''
+				this.insectNum = num
+				uni.chooseImage({
+					count: 1,
+					success: (res) => {
+						// 设置url的值,显示控件
+						this.urlData = res
+						this.url = res.tempFilePaths[0];
+						this.urlFile = res.tempFilePaths[0]; //失败跳转显示的图片
+					}
+				});
+			},
+		},
+		components: {
+			kpsImageCutter
+		},
+		
+		onShow() {
+			var that = this
+			uni.getStorage({
+			    key: 'lastTime',
+			    success: function (res) {
+					that.lastTimeShow = true
+			        console.log(res.data);
+					that.lastTimeIndex = res.data
+			    },
+				fail: function (err) {
+					that.lastTimeShow = false
+					console.log(err)
+				}
+			});
+		},
+	}
+</script>
+
+<style lang="scss">
+	// 搜索
+	uni-view,
+	uni-text {
+		// width: 740rpx;
+		// margin: 0 auto;
+	}
+
+	// 作物选择
+	.plantList_ul {
+		.plantList_li {
+			margin: 55rpx 0 55rpx 0;
+
+			.plantList_tlt {
+				font-weight: 550;
+				font-size: 16px;
+				width: 700rpx;
+				margin: 0 auto;
+
+				text {
+					color: #7e7e7e;
+					font-size: 12px;
+				}
+			}
+
+			.plantList_li_ul {
+				display: flex;
+				flex-wrap: wrap;
+				margin-top: 10rpx;
+
+				.plantList_li_List {
+					margin: 10rpx 0 0 18rpx;
+					width: 150rpx;
+
+					image {
+						width: 130rpx;
+						height: 130rpx;
+						border-radius: 55px;
+						margin: 0 auto;
+						display: block;
+						box-shadow: 0 2px 4px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04);
+					}
+
+					view {
+						width: 150rpx;
+						color: #646464;
+						text-align: center;
+						margin: 10rpx 0 0 0;
+						font-size: 13px;
+					}
+				}
+			}
+		}
+	}
+</style>

+ 328 - 0
pages/identifyPest/fruitsPlant/fruitsPlant.vue

@@ -0,0 +1,328 @@
+<template>
+	<view>
+		<!-- 搜索 -->
+		<!-- <u-search :disabled="true" margin="15rpx auto" :input-style="{width: '20rpx'}" input-align="center" :animation="true"
+		 placeholder="搜索作物名称" shape="square" :show-action="false" v-model="keyword"></u-search> -->
+
+		<!-- 作物列表 -->
+		<view class="plantList_ul">
+			<!-- 上次定位 -->
+			<view class="plantList_li" v-if="lastTimeShow">
+				<view class="plantList_tlt">
+					上次选择
+				</view>
+
+				<view class="plantList_li_ul">
+					<view class="plantList_li_List" @click="recognizeData(allPlantData[lastTimeIndex].num, allPlantData[lastTimeIndex].name, lastTimeIndex)">
+						<image :src="'http://web.hnyfwlw.com:58003/bigservers/' + allPlantData[lastTimeIndex].img" mode=""></image>
+						<view class="">
+							{{ allPlantData[lastTimeIndex].name }}
+						</view>
+					</view>
+				</view>
+			</view>
+
+			<!-- 全部 -->
+			<view class="plantList_li">
+				<view class="plantList_tlt">
+					该模型开发中。。。
+				</view>
+
+				<view class="plantList_li_ul">
+					<view @click="recognizeData(item.num, item.name, index)" class="plantList_li_List" v-for="(item, index) in allPlantData"
+					 :key="index">
+						<image :src="'http://web.hnyfwlw.com:58003/bigservers/' + item.img" mode=""></image>
+						<view class="">
+							{{ item.name }}
+						</view>
+					</view>
+				</view>
+			</view>
+
+			<!-- 其他 -->
+			<!-- <view class="plantList_li">
+				<view class="plantList_tlt">
+					其他
+					<text>(此项目开发中,结果可能会有误差)</text>
+				</view>
+
+				<view class="plantList_li_ul">
+					<view class="plantList_li_List" @click="restsData()">
+						<image :src="'http://web.hnyfwlw.com:58003/bigservers/' + 'images/detail_9.png'" mode=""></image>
+						<view class="">
+							其他
+						</view>
+					</view>
+				</view>
+			</view> -->
+
+			<!-- 裁剪组件 -->
+			<kps-image-cutter @ok="axiosData" @cancel="oncancle" :url="url" :fixed="false" :blob="false" :maxWidth="500"
+			 :maxHeight="500"></kps-image-cutter>
+
+			<!-- 弹框 -->
+			<u-modal :mask-close-able="true" @cancel="insectData('1')" @confirm="insectData('2')" confirm-text="虫害" cancel-text="病害" v-model="show"
+			 :show-cancel-button="true" :content="content"></u-modal>
+			 
+			 <!--loading-->
+			 <ourLoading v-show="loadingShow" isFullScreen active text="识别中..." />
+		</view>
+	</view>
+</template>
+
+<script>
+	import kpsImageCutter from "@/components/ksp-image-cutter/ksp-image-cutter.vue"; //裁剪图片
+	export default {
+		data() {
+			return {
+				keyword: '', //搜索
+				show: false,
+				content: '请选择测试虫害还是病害',
+				allPlantData: [
+					// {
+					// 	'name': '梨',
+					// 	'img': 'images/plant_5.jpg',
+					// 	'num': '7'
+					// },
+					// {
+					// 	'name': '柑橘',
+					// 	'img': 'images/plant_6.jpg',
+					// 	'num': '27'
+					// },
+					// {
+					// 	'name': '葡萄',
+					// 	'img': 'images/plant_7.jpg',
+					// 	'num': '26'
+					// },
+					// {
+					// 	'name': '苹果',
+					// 	'img': 'images/plant_8.jpg',
+					// 	'num': '28'
+					// },
+					// {
+					// 	'name': '桃',
+					// 	'img': 'images/plant_4.jpg',
+					// 	'num': '20'
+					// }
+				],
+				url: "", //裁剪
+				serialNum: '', //获取到作物序号码
+				urlData: {}, //图片全部信息
+				insectNum: '', //区别病虫害  1虫 2病
+				urlFile: '', //识别失败作物名称
+				lastTimeShow: false, //是否显示上次选择
+				lastTimeIndex: null, //上次选择下标
+				loadingShow: false, //加载
+			}
+		},
+		methods: {
+			recognizeData(num, name, index) {
+				uni.setStorage({
+				    key: 'lastTimeA',
+				    data: index,
+				    success: function () {
+				        console.log('success');
+				    }
+				});
+				this.insectNum = ''
+				this.urlName = name
+				this.serialNum = num
+				uni.chooseImage({
+					count: 1,
+					success: (res) => {
+						// 设置url的值,显示控件
+						// console.log(res)
+						this.urlData = res
+						console.log(res.tempFilePaths[0])
+						this.url = res.tempFilePaths[0];
+						this.urlFile = res.tempFilePaths[0]; //失败跳转显示的图片
+					}
+				});
+			},
+
+
+			// 取消上传
+			oncancle() {
+				this.url = '';
+			},
+
+			// 确定上传
+			axiosData(ev) {
+				let that = this
+				that.loadingShow = true
+				if (that.serialNum == '' && that.insectNum !== '') {
+					// 老接口
+					var url = 'other_discern'
+					var num = that.insectNum
+				} else if (that.serialNum !== '' && that.insectNum == '') {
+					//新接口
+					var url = 'discern'
+					var num = that.serialNum
+				}
+				
+				console.log(this.urlData.tempFiles[0])
+				console.log(this.urlData.tempFiles[0].path)
+				
+				uni.uploadFile({
+					url: 'https://wx.hnyfwlw.com/bigservers/' + url + '?type=' + num,
+					fileType: 'image',
+					file: this.urlData.tempFiles[0],
+					filePath: this.urlData.tempFiles[0].path,
+					name: 'img_addr',
+					success(res) {
+						that.url = '';
+						if (res.statusCode !== 500) {
+							var data = JSON.parse(res.data)
+							// 判断是否识别成功 -新接口
+							if (data.code == 200) {
+								// 成功
+								console.log(data.data)
+								var img = []
+								img.push(that.urlFile)
+								if (that.urlName == '其他') {
+									var f = JSON.parse(res.data)
+									if (f.data == null || f.data[0].prevention == "[防治方法] null") {
+										console.log('失败')
+										uni.navigateTo({
+											url: '/pages/recognizeFail/recognizeFail?data=' + img + '&name=' + that.urlName
+										})
+									} else {
+										uni.navigateTo({
+											url: '/pages/recognizeSucceedWorn/recognizeSucceedWorn?data=' + JSON.stringify(data.data) + '&name=' +
+												that.urlName + '&img=' + img
+										})
+										console.log('成功')
+									}
+								} else {
+									uni.navigateTo({
+										url: '/pages/recognizeSucceed/recognizeSucceed?data=' + JSON.stringify(data.data)
+									})
+								}
+							} else if (data.code !== 200) {
+								//失败
+								var img = []
+								img.push(that.urlFile)
+								uni.navigateTo({
+									url: '/pages/recognizeFail/recognizeFail?data=' + img + '&name=' + that.urlName
+								})
+							}
+						} else {
+							//失败
+							var img = []
+							img.push(that.urlFile)
+							uni.navigateTo({
+								url: '/pages/recognizeFail/recognizeFail?data=' + img + '&name=' + that.urlName
+							})
+						}
+					},
+					fail(err) {
+						var img = []
+						img.push(that.urlFile)
+						uni.navigateTo({
+							url: '/pages/recognizeFail/recognizeFail?data=' + img + '&name=' + that.urlName
+						})
+					},
+					complete(com) {
+						that.loadingShow = false
+					}
+				})
+			},
+
+			// 其他--老识别接口
+			restsData() {
+				this.show = true;
+			},
+			// 确定
+			insectData(num) {
+				this.urlName = '其他'
+				this.serialNum = ''
+				this.insectNum = num
+				uni.chooseImage({
+					count: 1,
+					success: (res) => {
+						// 设置url的值,显示控件
+						this.urlData = res
+						this.url = res.tempFilePaths[0];
+						this.urlFile = res.tempFilePaths[0]; //失败跳转显示的图片
+					}
+				});
+			},
+		},
+		components: {
+			kpsImageCutter
+		},
+		onShow() {
+			var that = this
+			uni.getStorage({
+			    key: 'lastTimeA',
+			    success: function (res) {
+					that.lastTimeShow = true
+			        console.log(res.data);
+					that.lastTimeIndex = res.data
+			    },
+				fail: function (err) {
+					that.lastTimeShow = false
+					console.log(err)
+				}
+			});
+		},
+	}
+</script>
+
+<style lang="scss">
+	// 搜索
+	// uni-view,
+	// uni-text {
+	// 	width: 740rpx;
+	// 	margin: 0 auto;
+	// }
+
+	// 作物选择
+	.plantList_ul {
+		.plantList_li {
+			margin: 55rpx 0 55rpx 0;
+
+			.plantList_tlt {
+				font-weight: 550;
+				font-size: 16px;
+				width: 700rpx;
+				margin: 0 auto;
+
+				text {
+					color: #7e7e7e;
+					font-size: 12px;
+				}
+			}
+
+			.plantList_li_ul {
+				display: flex;
+				flex-wrap: wrap;
+				margin-top: 10rpx;
+
+				.plantList_li_List {
+					margin: 10rpx 0 0 18rpx;
+					// border: 1px solid #366092;
+					width: 150rpx;
+
+					image {
+						width: 130rpx;
+						height: 130rpx;
+						border-radius: 55px;
+						margin: 0 auto;
+						display: block;
+						box-shadow: 0 2px 4px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04);
+					}
+
+					view {
+						width: 150rpx;
+						color: #646464;
+						text-align: center;
+						// border: 1px solid #000000;
+						margin: 10rpx 0 0 0;
+						font-size: 13px;
+					}
+				}
+			}
+		}
+	}
+</style>

+ 430 - 0
pages/identifyPest/identifyPest.vue

@@ -0,0 +1,430 @@
+<template>
+	<view>
+		<!-- 拍照识别 -->
+		<view class="photograph_box">
+			<!-- 标题 -->
+			<view class="photograph_div">
+				<view class="photograph_tit"></view>
+				<text class="photograph_txt">田间随识</text>
+			</view>
+
+			<!-- 列表 -->
+			<view class="photograph_ul">
+				<view @click="selectPlant(item.dat)" class="photograph_list" v-for="(item, index) in photArr" :key="index">
+					<image :src="'http://web.hnyfwlw.com:58003/bigservers/' + item.url" mode="" class="photograph_list_img"></image>
+				</view>
+			</view>
+		</view>
+
+		<!-- 拍照指南 -->
+		<!-- <image :src="'http://web.hnyfwlw.com:58003/bigservers/' + 'images/home_5.png'" @click="photoGuide('/pages/guidance/guidance')"
+		 class="photo_img" mode=""></image> -->
+
+		<!-- 更多操作 -->
+		<!-- <view class="operation_box">
+			<view class="operation_div">
+				<view class="operation_tit"></view>
+				<text class="operation_txt">更多操作</text>
+			</view>
+			<view class="operation_ul">
+				<image @click="photoGuide('/pages/repository/repository')" :src="'http://web.hnyfwlw.com:58003/bigservers/' + 'images/home_6.png'"
+				 class="operation_left" mode=""></image>
+				<view class="operation_list">
+					<image @click="photoGuide('/pages/discernRecord/discernRecord')" :src="'http://web.hnyfwlw.com:58003/bigservers/' + 'images/home_7.png'"
+					 class="operation_rightTop" mode=""></image>
+					<image @click="photoGuide('/pages/collect/collect')" :src="'http://web.hnyfwlw.com:58003/bigservers/' + 'images/home_8.png'"
+					 class="operation_rightBottom" mode=""></image>
+				</view>
+			</view>
+		</view> -->
+
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				searchVal: '', //测试
+				photArr: [{
+						'url': 'images/home_1.png',
+						'dat': '/pages/identifyPest/economicsPlant/economicsPlant',
+						'name': '经济作物'
+					},
+					{
+						'url': 'images/home_2.png',
+						'dat': '/pages/identifyPest/fruitsPlant/fruitsPlant',
+						'name': '水果作物'
+					},
+					{
+						'url': 'images/home_3.png',
+						'dat': '/pages/identifyPest/vegetablesPlant/vegetablesPlant',
+						'name': '蔬菜作物'
+					},
+					{
+						'url': 'images/home_4.png',
+						'dat': '/pages/identifyPest/cerealPlant/cerealPlant',
+						'name': '粮食作物'
+					},
+				], //拍照识别图片列表
+			}
+		},
+		methods: {
+			// 拍照识别跳转
+			selectPlant(url) {
+				// console.log(url)
+				uni.navigateTo({
+					url: url
+				})
+			},
+
+			// 拍照指南、知识库、识别记录、我的收藏跳转
+			photoGuide(url) {
+				uni.navigateTo({
+					url
+				})
+			},
+
+			//左侧边弹框点击事件
+			defails(url) {
+				uni.navigateTo({
+					url
+				})
+			},
+
+			// 点击右上角进入城市列表
+			// cityList() {
+			// 	uni.navigateTo({
+			// 		url: '/pages/cityList/cityList'
+			// 	})
+			// },
+			onShow: function() {
+				// var that = this
+				// uni.getStorage({
+				// 	key: 'location',
+				// 	success: function(res) {
+				// 		console.log('有')
+				// 	},
+				// 	fail: function(err) {
+				// 		console.log('没有,去请求')
+				// 		if (that.searchVal == '') {
+				// 			that.getLocation() //位置信息
+				// 		}
+				// 	}
+				// })
+
+				// this.weatherData() //天气
+				// this.userAxios() //个人信息数据
+
+				// console.log(mphone)
+				// that.phoneNum = mphone
+			},
+
+			onLoad() {
+				// if (this.searchVal == '') {
+				// 	this.getLocation() //位置信息
+				// }
+				// var that = this
+				// uni.getStorage({
+				// 	key: 'location',
+				// 	success: function(res) {
+				// 		console.log('有')
+				// 	},
+				// 	fail: function(err) {
+				// 		console.log('没有,去请求')
+				// 		if (that.searchVal == '') {
+				// 			that.getLocation() //位置信息
+				// 		}
+				// 	}
+				// })
+			},
+		},
+	}
+</script>
+
+<style lang="scss">
+	// 顶部导航左图标
+	.navTopLeftIcon {
+		width: 38rpx;
+		height: 35rpx;
+		margin: 0 0 0 25rpx;
+	}
+
+	// 顶部导航右
+	.navRight {
+		position: absolute;
+		top: 28rpx;
+		right: 18rpx;
+
+		.navTopRigthIcon {
+			width: 23rpx;
+			height: 30rpx;
+			vertical-align: top;
+		}
+
+		text {
+			width: 95rpx;
+			height: 50rpx;
+			font-size: 13px;
+			color: #fff;
+			text-align: center;
+			display: inline-block;
+			white-space: nowrap;
+			text-overflow: ellipsis;
+			overflow: hidden;
+		}
+	}
+
+	// 个人资料
+	.userBox {
+		// border: 1px solid #000;
+		display: flex;
+		padding: 50rpx 50rpx 50rpx 30rpx;
+
+		.userBox_image {
+			width: 120rpx;
+			height: 120rpx;
+			border-radius: 55px;
+		}
+
+		.userDiv {
+			// border: 1px solid #000;
+			padding-top: 10rpx;
+			margin-left: 30rpx;
+
+			.userDiv_name {
+				font-weight: 550;
+				font-size: 23px;
+				text-align: left;
+			}
+
+			.userDiv_phone {
+				color: #9a9a9a;
+				text-align: left;
+			}
+
+		}
+	}
+
+	// 操作列表
+	.operation_ulA {
+
+		// border: 1px solid #000;
+		.operation_list {
+			display: flex;
+			justify-content: space-between;
+			width: 90%;
+			margin: 65rpx auto;
+
+			.operation_listDiv {
+				.operation_listDivIcon {
+					width: 40rpx;
+					height: 40rpx;
+					vertical-align: bottom;
+				}
+
+				text {
+					color: #5a5a5a;
+					margin: 10rpx 0 0 20rpx;
+					text-align: left;
+					font-size: 17px;
+				}
+			}
+
+			.operation_listRight {
+				width: 40rpx;
+				height: 40rpx;
+				vertical-align: bottom;
+			}
+		}
+	}
+
+	// 拍照识别
+	.photograph_box {
+
+		// 标题
+		.photograph_div {
+			width: 700rpx;
+			margin: 15rpx auto;
+			display: flex;
+
+			.photograph_tit {
+				border: 1px solid #45c785;
+				width: 10rpx;
+				height: 40rpx;
+				background: #45c785;
+			}
+
+			.photograph_txt {
+				color: #333333;
+				margin-left: 20rpx;
+				font-weight: 550;
+				font-size: 17px;
+				line-height: 35rpx;
+			}
+		}
+
+		// 图片列表
+		.photograph_ul {
+			display: flex;
+			flex-wrap: wrap;
+
+			.photograph_list {
+				width: 370rpx;
+				margin: 10rpx auto;
+
+				.photograph_list_img {
+					width: 370rpx;
+					height: 200rpx;
+				}
+			}
+		}
+	}
+
+	// 拍照指南
+	.photo_img {
+		width: 720rpx;
+		height: 190rpx;
+		margin: 0 auto;
+	}
+
+	// 更多操作
+	.operation_box {
+
+		// 标题
+		.operation_div {
+			width: 700rpx;
+			margin: 15rpx auto;
+			display: flex;
+
+			.operation_tit {
+				border: 1px solid #45c785;
+				width: 10rpx;
+				height: 40rpx;
+				background: #45c785;
+			}
+
+			.operation_txt {
+				color: #333333;
+				margin-left: 20rpx;
+				font-weight: 550;
+				font-size: 17px;
+				line-height: 35rpx;
+			}
+		}
+
+		// 列表
+		.operation_ul {
+			display: flex;
+			justify-content: center;
+			margin-left: -50rpx;
+
+			.operation_left {
+				width: 420rpx;
+				height: 260rpx;
+				// margin-top: 8rpx;
+				// border: 1px solid #000;
+			}
+
+			.operation_list {
+				width: 250rpx;
+
+				.operation_rightTop {
+					width: 250rpx;
+					height: 128rpx;
+					display: block;
+					// border: 1px solid #000;
+				}
+
+				.operation_rightBottom {
+					width: 250rpx;
+					height: 128rpx;
+					display: block;
+					// border: 1px solid #000;
+				}
+			}
+		}
+	}
+
+	// 天气
+	.weather_box {
+
+		// 标题
+		.weather_div {
+			width: 700rpx;
+			margin: 15rpx auto;
+			display: flex;
+
+			.weather_tit {
+				border: 1px solid #45c785;
+				width: 10rpx;
+				height: 40rpx;
+				background: #45c785;
+			}
+
+			.weather_txt {
+				color: #333333;
+				margin-left: 20rpx;
+				font-weight: 550;
+				font-size: 17px;
+				line-height: 35rpx;
+			}
+		}
+
+		// 内容
+		.weather_ul {
+			width: 93%;
+			margin: 0 auto;
+			box-shadow: 0 2px 4px rgba(0, 0, 0, .12),
+				0 0 6px rgba(0, 0, 0, .04); // 地址
+			border-radius: 2px;
+
+			.weather_site {
+				margin: 0 auto;
+				padding: 10rpx 10rpx 10rpx 0;
+
+				.weather_siteImg {
+					width: 40rpx;
+					height: 45rpx;
+					vertical-align: middle;
+				}
+
+				text {
+					line-height: 28rpx;
+					color: #777777;
+					font-size: 12px;
+				}
+			}
+
+			// 天气数据
+			.weather_dataBox {
+				display: flex;
+
+				.weather_dataList {
+					background: #fbfbfb;
+					width: 250rpx;
+					padding: 18rpx 0 18rpx 0;
+
+					image {
+						width: 84rpx;
+						height: 84rpx;
+						margin: 0 auto;
+						display: block;
+					}
+
+					.weather_temperature {
+						text-align: center;
+						font-size: 15px;
+						color: #4a4a4a;
+					}
+
+					.weather_time {
+						text-align: center;
+						font-size: 11px;
+						color: #838383;
+					}
+				}
+			}
+		}
+	}
+</style>

+ 126 - 0
pages/identifyPest/recognizeFail/recognizeFail.vue

@@ -0,0 +1,126 @@
+<template>
+	<view>
+		<!-- <image src="../../static/Photoguide/9.png" class="failImg" mode=""></image> -->
+		<image v-for="(item,index) in imgArr" class="failImg" :src="item"></image>
+
+		<view class="failTxtBox">
+			<view class="failBox_top">
+				识别失败,正在努力开发中
+			</view>
+			<view class="failBox_centre">
+				您选择的作物是【{{ urlData }}】
+			</view>
+			<view class="failBox_bottom">
+				请确认拍摄的是否为此作物病虫害
+			</view>
+		</view>
+
+		<view class="failTxt_ul">
+			<view class="failTxt_list">
+				<view class="failTxt_listTop">
+					您的照片
+				</view>
+				<image v-for="(item,index) in imgArr"  class="failTxt_listImg" :src="item" mode=""></image>
+				<view class="failTxt_listBtnBox">
+					<u-button type="warning" @click="photographGuide" shape="circle" size="medium">查看拍照指南</u-button>
+				</view>
+			</view>
+
+			<view class="failTxt_list">
+				<view class="failTxt_listTop">
+					示例照片
+				</view>
+				<image class="failTxt_listImg" :src=" 'http://web.hnyfwlw.com:58003/bigservers/' + 'images/Photoguide_4.png'" mode=""></image>
+				<view class="failTxt_listBtnBox">
+					<u-button @click="returnInterface" class="failTxt_listBtn" type="success" shape="circle" size="medium">再拍一张</u-button>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				imgArr: [], //失败图片
+				urlData: '', //作物名称
+			}
+		},
+		methods: {
+			// 跳转到拍照指南
+			photographGuide() {
+				uni.navigateTo({
+				    url: '/pages/guidance/guidance'
+				})
+			},
+			// 返回上一页
+			returnInterface() {
+				uni.navigateBack()
+			},
+		},
+		onLoad(options) {
+			console.log(options)
+			this.imgArr.push(options.data) 
+			this.urlData = options.name
+			console.log(this.imgArr)
+		}
+	}
+</script>
+
+<style lang="scss">
+	.failImg {
+		width: 750rpx;
+		height: 550rpx;
+		margin-top: -1rpx;
+	}
+
+	.failTxtBox {
+		margin: 55rpx 0 0 0;
+
+		.failBox_top {
+			text-align: center;
+			// border: 1px solid #007AFF;
+			font-size: 17px;
+			font-weight: 550;
+		}
+
+		.failBox_centre {
+			margin-top: 30rpx;
+			text-align: center;
+			// border: 1px solid #18B566;
+			color: #858585;
+		}
+
+		.failBox_bottom {
+			margin-top: 10rpx;
+			text-align: center;
+			// border: 1px solid #2C405Aq;
+			color: #858585;
+		}
+	}
+
+	.failTxt_ul {
+		width: 680rpx;
+		margin: 55rpx auto;
+		display: flex;
+		justify-content: space-between;
+
+		.failTxt_list {
+			.failTxt_listTop {}
+
+			.failTxt_listImg {
+				width: 300rpx;
+				height: 350rpx;
+			}
+
+			.failTxt_listBtnBox {
+				margin-top: 25rpx;
+			}
+
+			.failTxt_listBtn {
+				width: 310rpx;
+			}
+		}
+	}
+</style>

+ 138 - 0
pages/identifyPest/recognizeSucceed/recognizeSucceed.vue

@@ -0,0 +1,138 @@
+<template>
+	<view>
+		<image :src="redata.returnImageUrl" class="successImg" mode=""></image>
+		
+		<!-- <scroll-view class="scroll-view_H" scroll-x="true" @scroll="scroll" scroll-left="120"> -->
+		
+		<view class="successBox_flex">
+			<!-- <view class="successBox" v-for="(item, index) in redata.returnArray" :key="index">
+				<view class="successName">
+					{{ item.name }}
+				</view>
+				
+				<view class="success_ul">
+					<view class="successName_list">
+						<view class="successName_listCircle">
+							<image :src="item.img_urls[0]" mode="" class="successName_listCircle_img"></image>
+						</view>
+					</view>
+				</view>
+				<view class="success_btn">
+					<u-button @click="examineData(index)" size="medium" type="success" shape="circle" :ripple="true" ripple-bg-color="#909399">查看详情</u-button>
+				</view>
+			</view> -->
+			<u-cell-group>
+				<u-cell-item icon="tags" :title="item[0]" v-for="(item, index) in redata.returnArray" :value="`${item[1]}(${item[2]})`" :key="index" :arrow="false"></u-cell-item>
+			</u-cell-group>
+		</view>
+		
+		
+		<!-- </scroll-view> -->
+
+		<!-- 查看详情 -->
+		<!-- <view class="success_btn">
+			<u-button @click="examineData()" size="medium" type="success" shape="circle" :ripple="true" ripple-bg-color="#909399">查看详情</u-button>
+		</view> -->
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				redata: {}, //数据
+				old: {
+					scrollTop: 0
+				},
+			}
+		},
+		methods: {
+			// 点击放大图片
+			examine() {
+				var img = []
+				//没有更换头像
+				img.push(this.redata.image_url)
+				uni.previewImage({
+					urls: img
+				})
+			},
+			
+			// 滑动
+			scroll(e) {
+				console.log(e)
+				this.old.scrollTop = e.detail.scrollTop
+			},
+			
+			// 查看详情
+			examineData(index) {
+				var dat = this.redata.list[index]
+				uni.navigateTo({
+					url: '/pages/detailsA/detailsA?data=' + JSON.stringify(dat)
+				})
+			},
+		},
+		onLoad(options) {
+			this.redata = JSON.parse(options.data)
+			// 处理图片
+			// var dat = this.redata.list
+			// for (var i = 0; i < dat.length; i++) {
+			// 	var b = dat[i].img_urls.replace(/#/g, ",")
+			// 	var Adata = new Array();
+			// 	Adata = b.split(",");
+			// 	dat[i].img_urls = Adata
+			// }
+		},
+	}
+</script>
+
+<style lang="scss">
+	.successImg {
+		width: 750rpx;
+		height: 550rpx;
+		margin-top: -1rpx;
+	}
+
+	.successName {
+		text-align: center;
+		font-size: 20px;
+		font-weight: 550;
+		margin-top: 65rpx;
+	}
+
+	.success_ul {
+		margin-top: 65rpx;
+
+		.successName_list {
+			width: 420rpx;
+			height: 420rpx;
+			margin: 0 auto;
+			border-radius: 150px;
+			border: 2px dashed #59ab49;
+
+			.successName_listCircle {
+				.successName_listCircle_img {
+					display: block;
+					margin: 18rpx auto;
+					border-radius: 150px;
+					width: 380rpx;
+					height: 380rpx;
+				}
+			}
+		}
+	}
+
+	.success_btn {
+		width: 270rpx;
+		margin: 65rpx auto;
+	}
+	
+	// 结果轮播
+	.successBox_flex {
+		// display: flex;
+	}
+	.successBox {
+		width: 750rpx;
+		// margin: 0 0 0 165rpx;
+	}
+</style>

+ 142 - 0
pages/identifyPest/recognizeSucceedWorn/recognizeSucceedWorn.vue

@@ -0,0 +1,142 @@
+<template>
+	<view>
+		<image @click.stop="examine()" :src="redata.img_ulr" class="successImg" mode=""></image>
+
+		<scroll-view class="scroll-view_H" scroll-x="true" @scroll="scroll" scroll-left="120">
+
+			<view class="successBox_flex">
+				<view class="successBox">
+					<view class="successName">
+						{{ redata.name }}
+					</view>
+
+
+					<view class="success_ul">
+						<view class="successName_list">
+							<view class="successName_listCircle">
+								<image :src="redata.img_ulrs" mode="" class="successName_listCircle_img"></image>
+							</view>
+						</view>
+					</view>
+					<!-- 查看详情 -->
+					<view class="success_btn">
+						<u-button @click="examineData()" size="medium" type="success" shape="circle" :ripple="true" ripple-bg-color="#909399">查看详情</u-button>
+					</view>
+				</view>
+			</view>
+		</scroll-view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				redata: {}, //数据
+				old: {
+					scrollTop: 0
+				},
+			}
+		},
+		methods: {
+			// 点击放大图片
+			examine() {
+				var img = []
+				//没有更换头像
+				img.push(this.redata.img_ulr)
+				console.log(img)
+				uni.previewImage({
+					urls: img
+				})
+			},
+
+			// 滑动
+			scroll(e) {
+				console.log(e)
+				this.old.scrollTop = e.detail.scrollTop
+			},
+
+			// 查看详情
+			examineData() {
+				uni.navigateTo({
+					url: '/pages/detailsWorn/detailsWorn?data=' + JSON.stringify(this.redata)
+				})
+			},
+		},
+		onLoad(options) {
+			//老接口
+			console.log(options)
+			console.log(options)
+			// var data = JSON.parse(options.data)
+			var data = options.data !== null ? JSON.parse(options.data) : null
+			if (data !== null) {
+				var Adata = data[0].prevention
+				var obj = {}
+				var a = Adata.replace(/]/g, ":");
+				let Bdata = new Array();
+				Bdata = a.split("[");
+				obj['img_ulrs'] = data[0].img_urls
+				obj['img_ulr'] = options.img
+				obj['list'] = Bdata
+				obj['name'] = data[0].name
+				this.redata = obj
+				console.log(this.redata)
+				console.log(this.redata)
+			} else {
+				console.log(options)
+			}
+		},
+	}
+</script>
+
+<style lang="scss">
+	.successImg {
+		width: 750rpx;
+		height: 550rpx;
+		margin-top: -1rpx;
+	}
+
+	.successName {
+		text-align: center;
+		font-size: 20px;
+		font-weight: 550;
+		margin-top: 65rpx;
+	}
+
+	.success_ul {
+		margin-top: 65rpx;
+
+		.successName_list {
+			width: 420rpx;
+			height: 420rpx;
+			margin: 0 auto;
+			border-radius: 150px;
+			border: 2px dashed #59ab49;
+
+			.successName_listCircle {
+				.successName_listCircle_img {
+					display: block;
+					margin: 18rpx auto;
+					border-radius: 150px;
+					width: 380rpx;
+					height: 380rpx;
+				}
+			}
+		}
+	}
+
+	.success_btn {
+		width: 270rpx;
+		margin: 65rpx auto;
+	}
+
+	// 结果轮播
+	.successBox_flex {
+		display: flex;
+	}
+
+	.successBox {
+		width: 750rpx;
+		// margin: 0 0 0 165rpx;
+	}
+</style>

+ 452 - 0
pages/identifyPest/repository/repository.vue

@@ -0,0 +1,452 @@
+<template>
+	<view>
+		<!-- 搜索 -->
+		<u-search maxlength="20" @search="seek" bg-color="#fff" margin="15rpx auto" :input-style="{width: '20rpx'}"
+		 input-align="center" :animation="true" placeholder="搜索虫害或病害名称(按回车键或搜索进行查询)" shape="square" :show-action="false"
+		 v-model="keyword"></u-search>
+
+		<!-- tab切换 -->
+		<view class="inv-h-w">
+			<view :class="['inv-h',Inv==0?'inv-h-se':'']" @click="Inv=0">虫害</view>
+			<view :class="['inv-h',Inv==1?'inv-h-se':'']" @click="Inv=1">病害</view>
+		</view>
+
+		<view v-if="searchShow">
+			<view v-if="isShow">
+				<!-- 虫害 -->
+				<view class="" v-show="Inv == 0">
+					<view class="repository_ul">
+						<view class="repository_list" @click="defails(item.id)" v-for="(item, index) in insectArr" :key="index">
+							<u-image width="320rpx" height="230rpx" class="repository_listImg" :src="item.thumb"></u-image>
+							<view class="">
+								{{ item.name }}
+							</view>
+						</view>
+					</view>
+				</view>
+
+				<!-- 病害 -->
+				<view class="" v-show="Inv == 1">
+					<view class="repository_ul">
+						<view class="repository_list" @click="defails(item.id)" v-for="(item, index) in plantArr" :key="index">
+							<!-- <image :src="item.thumb" mode=""></image> -->
+							<u-image width="320rpx" height="230rpx" class="repository_listImg" :src="item.thumb"></u-image>
+							<view class="">
+								{{ item.name }}
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<!-- 暂无 -->
+			<view class="notDataBox" v-else>
+				<image :src="'http://web.hnyfwlw.com:58003/bigservers/' + 'images/detail_11.png'" class="notDataBox_img" mode=""></image>
+			</view>
+
+			<!--  -->
+			<view class="isOver" v-show="flag">
+				---- 我是有底线的 ----
+			</view>
+		</view>
+
+		<!-- 搜索 -->
+		<view class="searchBox" v-else>
+			<!-- <image class="searchBox_img" :src="'http://web.hnyfwlw.com:58003/bigservers/' + 'images/search.gif'" mode=""></image> -->
+			<view v-if="isShow">
+				<!-- 虫害 -->
+				<view class="" v-show="Inv == 0">
+					<view class="repository_ul">
+						<view class="repository_list" @click="defails(item.id)" v-for="(item, index) in insectArrA" :key="index">
+							<u-image width="320rpx" height="230rpx" class="repository_listImg" :src="item.thumb"></u-image>
+							<view class="">
+								{{ item.name }}
+							</view>
+						</view>
+					</view>
+				</view>
+
+				<!-- 病害 -->
+				<view class="" v-show="Inv == 1">
+					<view class="repository_ul">
+						<view class="repository_list" @click="defails(item.id)" v-for="(item, index) in plantArrA" :key="index">
+							<!-- <image :src="item.thumb" mode=""></image> -->
+							<u-image width="320rpx" height="230rpx" class="repository_listImg" :src="item.thumb"></u-image>
+							<view class="">
+								{{ item.name }}
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<!-- 暂无 -->
+			<view class="notDataBox" v-else>
+				<image :src="'http://web.hnyfwlw.com:58003/bigservers/' + 'images/detail_11.png'" class="notDataBox_img" mode=""></image>
+			</view>
+
+			<!--  -->
+			<view class="isOver" v-show="flag">
+				---- 我是有底线的 ----
+			</view>
+		</view>
+
+		<!-- 返回顶部 -->
+		<u-back-top :scroll-top="scrollTop" top="600"></u-back-top>
+
+		<!--loading-->
+		<ourLoading v-show="loadingShow" isFullScreen active text="加载中..." />
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				searchShow: true, //搜索
+				keyword: '', //搜索
+				Inv: 0,
+				insectArr: [],
+				plantArr: [],
+				insectArrA: [], //搜索
+				plantArrA: [], //搜索
+				dataNum: null, //列表总条数
+				pageIndex: 1, //当前页数
+				flag: false,
+				numData: 10, //固定每页显示多少条
+				pagination: null, //总页码
+				scrollTop: 0, //返回顶部
+				isShow: true, //暂无
+				listLangth: null, //每次请求数据条数
+				loadingShow: true, //加载
+				listLength: null, //数据长度
+			}
+		},
+		// 监听data中的变化
+		watch: {
+			Inv(val) {
+				this.dataNum = null //清空
+				this.scrollTop = 0
+				this.pageIndex = 1 //清空
+				this.pagination = null //清空
+				this.insectArr = []
+				this.plantArr = []
+				this.insectArrA = []
+				this.plantArrA = []
+				this.listLength = null
+				this.flag = false
+				this.keyword = ''
+				this.scrollTop = 0
+				this.listData()
+				uni.pageScrollTo({
+					scrollTop: 0
+				})
+			},
+			keyword(val) {
+				if (val == '') {
+					this.dataNum = null //清空
+					this.pageIndex = 1 //清空
+					this.pagination = null //清空
+					this.listLength = null
+					this.searchShow = true
+					this.flag = false
+					this.insectArrA = []
+					this.plantArrA = []
+					this.listData()
+				} else if (val !== '') {
+					this.dataNum = null //清空
+					this.pageIndex = 1 //清空
+					this.pagination = null //清空
+					this.listLength = null
+				}
+			}
+		},
+		methods: {
+			changeTab(Inv) {
+				that.navIdx = Inv;
+			},
+
+			// 列表数据请求
+			listData() {
+				if (this.Inv == 0) {
+					var ret = '2'
+				} else if (this.Inv == 1) {
+					var ret = '1'
+				}
+				let postData = ({
+					ret: ret,
+					page: this.pageIndex,
+				});
+				// console.log(this.pageIndex)
+				let that = this;
+				var pages = that.pageIndex
+				uni.request({
+					url: 'see_dase',
+					data: postData,
+					method: 'POST',
+					header: {
+						"Content-Type": "application/x-www-form-urlencoded"
+					},
+					dataType: 'json',
+					success(res) {
+						that.dataNum = res.data.num
+						if (res.data.dat.length !== 0) {
+							if (ret == '1') {
+								if (postData.page == 1 && that.plantArr.length == 10 ) {
+									
+								} else {
+									that.plantArr = [...that.plantArr, ...res.data.dat]
+								}
+							} else {
+								// console.log(that.insectArr)
+								if (postData.page == 1 && that.insectArr.length == 10) {
+								} else {
+									that.insectArr = [...that.insectArr, ...res.data.dat]
+								}
+								// console.log(that.insectArr)
+							}
+							// console.log(that.insectArr)
+							that.isShow = true
+							that.listLength = res.data.dat.length
+							that.loadingShow = false
+						} else {
+							that.isShow = false
+						}
+					},
+					fail(err) {
+						console.log(err)
+					},
+					complete(com) {}
+				})
+			},
+
+			// 点击进入详情
+			defails(id) {
+				uni.navigateTo({
+					url: '/pages/details/details?id=' + id + '&signboard=1'
+				})
+			},
+
+			// 搜索
+			seek() {
+				var that = this
+				that.searchShow = false
+				// 判断
+				if (that.Inv == 0) {
+					var ret = '2'
+				} else if (that.Inv == 1) {
+					var ret = '1'
+				}
+				uni.request({
+					url: 'search',
+					data: {
+						name: that.keyword,
+						ret, //1病  2虫
+						page: that.pageIndex
+					},
+					method: 'POST',
+					header: {
+						"Content-Type": "application/x-www-form-urlencoded"
+					},
+					dataType: 'json',
+					success(res) {
+						that.dataNum = res.data.num
+						if (res.data.dat.length !== 0) {
+							if (ret == '1') {
+								that.plantArrA = [...that.plantArrA, ...res.data.dat]
+							} else {
+								that.insectArrA = [...that.insectArrA, ...res.data.dat]
+							}
+							that.isShow = true
+							that.listLength = res.data.dat.length
+							that.loadingShow = false
+						} else {
+							that.isShow = false
+						}
+					},
+					fail(err) {
+						console.log(err)
+					},
+					complete(com) {
+						that.searchShow = false
+					}
+				})
+			},
+		},
+
+		// 初始化
+		onLoad() {
+			this.listData()
+		},
+		// 滚动到底翻页
+		onReachBottom() {
+			if (this.dataNum !== 0 || this.dataNum !== null) {
+				if (this.pagination == null) {
+					var a = this.dataNum
+					var b = this.numData
+					var c = a / b
+					this.pagination = Math.ceil(c)
+				}
+				this.pagination--
+				if (this.keyword !== '') {
+					// 搜索数据
+					if (this.listLength == 10) {
+						if (this.pagination >= 1) {
+							this.pageIndex++
+							this.seek()
+						} else {
+							this.flag = true
+						}
+					} else if (this.listLength < 10) {
+						this.flag = true
+					}
+				} else if (this.keyword == '') {
+					// 列表数据
+					if (this.listLength == 10) {
+						if (this.pagination >= 1) {
+							this.pageIndex++
+							this.listData()
+						} else {
+							this.flag = true
+						}
+					} else if (this.listLength < 10) {
+						this.flag = true
+					}
+				}
+			} else {
+				this.flag = true
+			}
+		},
+
+		// 监听下拉动作
+		onPullDownRefresh() {
+			setTimeout(() => {
+				// console.log(this.insectArrA)
+				this.insectArr = [],
+					this.plantArr = [],
+					this.plantArrA = [],
+					this.insectArrA = [],
+					// console.log(this.insectArrA)
+					this.pageIndex = 1
+				this.pagination = null
+				this.keyword = ''
+				this.flag = false
+				this.listData()
+				uni.stopPullDownRefresh()
+			}, 2000)
+		},
+
+		// 监听获取滚动条位置
+		onPageScroll(e) {
+			this.scrollTop = e.scrollTop;
+		},
+	}
+</script>
+
+<style lang="scss">
+	// 搜索
+	// uni-view,
+	// uni-text {
+	// 	width: 740rpx;
+	// 	margin: 0 auto;
+	// }
+
+
+	// tab切换
+	.inv-h-w {
+		background-color: #FFFFFF;
+		height: 100upx;
+		display: flex;
+	}
+
+	.inv-h {
+		font-size: 30upx;
+		flex: 1;
+		text-align: center;
+		color: #C9C9C9;
+		height: 100upx;
+		line-height: 100upx;
+	}
+
+	.inv-h-se {
+		color: #20c7a1;
+		border-bottom: 4upx solid #20c7a1;
+	}
+
+	page {
+		background-color: #f7f8fc;
+	}
+
+
+	// 内容
+	.repository_ul {
+		// border: 1px solid #000;
+		display: flex;
+		flex-wrap: wrap;
+		justify-content: space-between;
+		// width: 750rpx;
+		margin: 15rpx 17rpx 15rpx 17rpx;
+
+		.repository_list {
+			box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+			width: 350rpx;
+			padding: 10rpx 0 0 0;
+			background: #fff;
+			margin-bottom: 15rpx;
+			border-radius: 5px;
+
+			// image {
+			// 	width: 320rpx;
+			// 	height: 230rpx;
+			// 	display: block;
+			// 	margin: 0 auto;
+			// }
+
+			.repository_listImg {
+				width: 320rpx;
+				height: 230rpx;
+				display: block;
+				margin: 0 auto;
+			}
+
+			view {
+				color: #5e5e5e;
+				text-align: left;
+				margin-left: 12rpx;
+				padding: 5rpx 0 5rpx 0;
+			}
+		}
+	}
+
+	// .repository_ul:after {
+	// 	content: "";
+	// 	flex: auto;
+	// }
+
+	.isOver {
+		width: 100%;
+		height: 50px;
+		line-height: 50px;
+		text-align: center;
+		// background: #fff;
+		font-size: 28rpx;
+	}
+
+	// 暂无数据
+	.notDataBox {
+		.notDataBox_img {
+			display: block;
+			margin: 300rpx auto;
+			width: 300rpx;
+			height: 300rpx;
+		}
+	}
+
+	// 搜索动画
+	.searchBox {
+		.searchBox_img {
+			margin: 0 auto;
+			display: block;
+			width: 350rpx;
+			height: 350rpx;
+		}
+	}
+</style>

+ 355 - 0
pages/identifyPest/vegetablesPlant/vegetablesPlant.vue

@@ -0,0 +1,355 @@
+<template>
+	<view>
+		<!-- 搜索 -->
+		<!-- <u-search :disabled="true" margin="15rpx auto" :input-style="{width: '20rpx'}" input-align="center" :animation="true" placeholder="搜索作物名称"
+		 shape="square" :show-action="false" v-model="keyword"></u-search> -->
+
+		<!-- 作物列表 -->
+		<view class="plantList_ul">
+
+			<!-- 上次定位 -->
+			<view class="plantList_li" v-if="lastTimeShow">
+				<view class="plantList_tlt">
+					上次选择
+				</view>
+
+				<view class="plantList_li_ul">
+					<view class="plantList_li_List" @click="recognizeData(allPlantData[lastTimeIndex].num, allPlantData[lastTimeIndex].name, lastTimeIndex)">
+						<image :src=" 'http://web.hnyfwlw.com:58003/bigservers/' + allPlantData[lastTimeIndex].img" mode=""></image>
+						<view class="">
+							{{ allPlantData[lastTimeIndex].name }}
+						</view>
+					</view>
+				</view>
+			</view>
+
+			<!-- 全部 -->
+			<view class="plantList_li">
+				<view class="plantList_tlt">
+					该模型开发中。。。
+				</view>
+
+				<view class="plantList_li_ul">
+					<view @click="recognizeData(item.num, item.name, index)" class="plantList_li_List" v-for="(item, index) in allPlantData" :key="index">
+						<image :src=" 'http://web.hnyfwlw.com:58003/bigservers/' + item.img" mode=""></image>
+						<view class="">
+							{{ item.name }}
+						</view>
+					</view>
+				</view>
+			</view>
+
+			<!-- 其他 -->
+			<!-- <view class="plantList_li">
+				<view class="plantList_tlt">
+					其他
+					<text>(此项目开发中,结果可能会有误差)</text>
+				</view>
+
+				<view class="plantList_li_ul">
+					<view class="plantList_li_List" @click="restsData()">
+						<image :src="'http://web.hnyfwlw.com:58003/bigservers/' + 'images/detail_9.png'" mode=""></image>
+						<view class="">
+							其他
+						</view>
+					</view>
+				</view>
+			</view> -->
+		</view>
+		
+		<!-- 裁剪组件 -->
+		<kps-image-cutter @ok="axiosData" @cancel="oncancle" :url="url" :fixed="false" :blob="false" :maxWidth="500" :maxHeight="500"></kps-image-cutter>
+			
+		<!-- 弹框 -->
+		<u-modal :mask-close-able="true" @cancel="insectData('1')" @confirm="insectData('2')" confirm-text="虫害" cancel-text="病害" v-model="show" :show-cancel-button="true" :content="content"></u-modal>
+		
+		<!--loading-->
+		<ourLoading v-show="loadingShow" isFullScreen active text="识别中..." />
+	</view>
+</template>
+
+<script>
+	import kpsImageCutter from "@/components/ksp-image-cutter/ksp-image-cutter.vue"; //裁剪图片
+	export default {
+		data() {
+			return {
+				keyword: '', //搜索
+				show: false,
+				content: '请选择测试虫害还是病害',
+				allPlantData: [
+					// {
+					// 	'name': '黄瓜',
+					// 	'img': 'images/plant_10.jpg',
+					// 	'num': '8',
+					// },
+					// {
+					// 	'name': '番茄',
+					// 	'img': 'images/plant_11.jpg',
+					// 	'num': '17',
+					// },
+					// {
+					// 	'name': '南瓜',
+					// 	'img': 'images/plant_12.jpg',
+					// 	'num': '18',
+					// },
+					// {
+					// 	'name': '辣椒',
+					// 	'img': 'images/plant_10.jpg',
+					// 	'num': '19',
+					// },
+					// {
+					// 	'name': '白菜',
+					// 	'img': 'images/plant_14.jpg',
+					// 	'num': '24',
+					// },
+					// {
+					// 	'name': '马铃薯',
+					// 	'img': 'images/plant_15.jpg',
+					// 	'num': '25',
+					// },
+					// {
+					// 	'name': '萝卜',
+					// 	'img': 'images/plant_9.jpg',
+					// 	'num': '6',
+					// }
+				],
+				url: "", //裁剪
+				serialNum: '', //获取到作物序号码
+				urlData: {}, //图片全部信息
+				urlName: '', //识别失败作物名称
+				insectNum: '', //区别病虫害  1虫 2病
+				lastTimeShow: false, //是否显示上次选择
+				lastTimeIndex: null, //上次选择下标
+				loadingShow: false, //加载
+			}
+		},
+		methods: {
+			recognizeData(num, name, index) {
+				uni.setStorage({
+				    key: 'lastTimeC',
+				    data: index,
+				    success: function () {
+				        console.log('success');
+				    }
+				});
+				this.insectNum = ''
+				this.urlName = name
+				this.serialNum = num
+				uni.chooseImage({
+					count: 1,
+					success: (res) => {
+						// 设置url的值,显示控件
+						// console.log(res)
+						this.urlData = res
+						this.url = res.tempFilePaths[0];
+						this.urlFile = res.tempFilePaths[0]; //失败跳转显示的图片
+					}
+				});
+			},
+			
+			// 将base64转换为blob
+			// dataURLtoFile(dataURI, type) {
+			// 	let binary = atob(dataURI.split(",")[1]);
+			// 	let array = [];
+			// 	for (let i = 0; i < binary.length; i++) {
+			// 		array.push(binary.charCodeAt(i));
+			// 	}
+			// 	return new Blob([new Uint8Array(array)], {
+			// 		type: type
+			// 	});
+			// },
+			// 图片提交事件。把bold格式转为formData格式进行提交。
+			// submitPic(fileData) {
+			// 	let form = new FormData();
+			// 	// let fileOfBlob = new File([fileData], 'plantinsect.jpg'); // 重命名了
+			// 	let fileOfBlob = new File([fileData], this.serialNum); // 重命名了
+			// 	// console.log(this.fileA);
+			// 	form.append("file", fileOfBlob);
+			// 	return form;
+			// },
+			
+			// 取消上传
+			oncancle() {
+				this.url = '';
+			},
+			
+			// 确定上传
+			axiosData(ev) {
+				let that = this
+				that.loadingShow = true
+				// let blob = that.dataURLtoFile(ev.path, 'image/jpeg'); //将base64转换为blob
+				// let data = that.submitPic(blob); //再将blob转换为file
+				// var img = data.get("file");
+				if (that.serialNum == '' && that.insectNum !== '') {
+					// 老接口
+					var url = 'other_discern'
+					var num = that.insectNum
+				} else if (that.serialNum !== '' && that.insectNum == '') {
+					//新接口
+					var url = 'discern'
+					var num = that.serialNum
+				}
+				
+				uni.uploadFile({
+					url: 'https://wx.hnyfwlw.com/bigservers/'+ url + '?type=' + num,
+					fileType: 'image',
+					file: this.urlData.tempFiles[0],
+					filePath: this.urlData.tempFiles[0].path,
+					name: 'img_addr',
+					success(res) {
+						that.url = '';
+						if (res.statusCode !== 500) {
+							var data = JSON.parse(res.data)
+							// 判断是否识别成功 -新接口
+							if (data.returnResult.returnStatus == 1) {
+								// 成功
+								var img = []
+								img.push(that.urlFile)
+								if (that.urlName == '其他') {
+									var f = JSON.parse(res.data)
+									if (f.data == null || f.data[0].prevention == "[防治方法] null") {
+										console.log('失败')
+										uni.navigateTo({
+											url: '/pages/recognizeFail/recognizeFail?data=' + img + '&name=' + that.urlName
+										})
+									} else {
+										uni.navigateTo({
+											url: '/pages/recognizeSucceedWorn/recognizeSucceedWorn?data=' + JSON.stringify(data.data) + '&name=' + that.urlName + '&img=' + img
+										})
+										console.log('成功')
+									}
+								} else {
+									uni.navigateTo({
+										url: '/pages/recognizeSucceed/recognizeSucceed?data=' + (data.returnResult.returnImageUrl)
+									})
+								}
+								
+								// uni.navigateTo({
+								//     url: '/pages/recognizeSucceed/recognizeSucceed?data=' + JSON.stringify(data.data)
+								// })
+							} else if (data.code !== 200) {
+								//失败
+								var img = []
+								img.push(that.urlFile)
+								uni.navigateTo({
+								    url: '/pages/recognizeFail/recognizeFail?data=' + img + '&name=' + that.urlName
+								})
+							}
+						} else {
+							//失败
+							var img = []
+							img.push(that.urlFile)
+							uni.navigateTo({
+							    url: '/pages/recognizeFail/recognizeFail?data=' + img + '&name=' + that.urlName
+							})
+						}
+						
+						
+					},
+					fail(err) {
+						//失败
+						var img = []
+						img.push(that.urlFile)
+						uni.navigateTo({
+						    url: '/pages/recognizeFail/recognizeFail?data=' + img + '&name=' + that.urlName
+						})
+					},
+					complete(com) {
+						that.loadingShow = false
+					}
+				})
+			},
+			
+			// 其他--老识别接口
+			restsData() {
+				this.show = true;
+			},
+			// 确定
+			insectData(num) {
+				this.urlName = '其他'
+				this.serialNum = ''
+				this.insectNum = num
+				uni.chooseImage({
+					count: 1,
+					success: (res) => {
+						// 设置url的值,显示控件
+						this.urlData = res
+						this.url = res.tempFilePaths[0];
+						this.urlFile = res.tempFilePaths[0]; //失败跳转显示的图片
+					}
+				});
+			},
+		},
+		components: {
+			kpsImageCutter
+		},
+		onShow() {
+			var that = this
+			uni.getStorage({
+			    key: 'lastTimeC',
+			    success: function (res) {
+					that.lastTimeShow = true
+			        console.log(res.data);
+					that.lastTimeIndex = res.data
+			    },
+				fail: function (err) {
+					that.lastTimeShow = false
+					console.log(err)
+				}
+			});
+		},
+	}
+</script>
+
+<style lang="scss">
+	// 搜索
+	// uni-view,
+	// uni-text {
+	// 	width: 740rpx;
+	// 	margin: 0 auto;
+	// }
+
+	// 作物选择
+	.plantList_ul {
+		.plantList_li {
+			margin: 55rpx 0 55rpx 0;
+
+			.plantList_tlt {
+				font-weight: 550;
+				font-size: 16px;
+				width: 700rpx;
+				margin: 0 auto;
+				text {
+					color: #7e7e7e;
+					font-size: 12px;
+				}
+			}
+			.plantList_li_ul {
+				display: flex;
+				flex-wrap: wrap;
+				margin-top: 10rpx;
+
+				.plantList_li_List {
+					margin: 10rpx 0 0 18rpx;
+					width: 150rpx;
+					image {
+						width: 130rpx;
+						height: 130rpx;
+						border-radius: 55px;
+						margin: 0 auto;
+						display: block;
+						box-shadow: 0 2px 4px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04);
+					}
+
+					view {
+						width: 150rpx;
+						color: #646464;
+						text-align: center;
+						margin: 10rpx 0 0 0;
+						font-size: 13px;
+					}
+				}
+			}
+		}
+	}
+</style>

+ 14 - 11
pages/index/index.vue

@@ -54,7 +54,7 @@
 				<view class="functionbox_text_item" @click="tabfunction(1)">
 					<image src="https://www.hnyfwlw.com:8006/bigdata_app/newindex/worm.png" mode="" class="itemimg"></image>
 					<view class="">
-						病虫识别
+						田间随识
 					</view>
 				</view>
 				<view class="functionbox_text_item" v-if="jurisdiction.zjtf" @click="tabfunction(2)">
@@ -144,7 +144,7 @@
 					<u-icon name="arrow-right"></u-icon>
 				</view>
 			</view>
-			<view class="insectattack_listbox">
+			<!-- <view class="insectattack_listbox">
 				<view class="insectattack_list">
 					<view class="list_box list_box1" @click="introduce(79,'虫情百科')">
 						<view class="list_boxbg">
@@ -219,7 +219,7 @@
 						</view>
 					</view>
 				</view>
-			</view>
+			</view> -->
 		</view>
 		<view class="insectattack">
 			<view class="insectattack_title" @click="virus">
@@ -230,7 +230,7 @@
 					<u-icon name="arrow-right"></u-icon>
 				</view>
 			</view>
-			<view class="insectattack_listbox">
+			<!-- <view class="insectattack_listbox">
 				<view class="insectattack_list">
 					<view class="list_box list_box5" @click="introduce(267,'病害百科')">
 						<view class="list_boxbg">
@@ -305,12 +305,12 @@
 						</view>
 					</view>
 				</view>
-			</view>
+			</view> -->
 		</view>
-		<u-modal v-model="show" :mask-close-able="true" title="病虫害识别" :show-cancel-button="true" confirm-text="拍病害"
+		<!-- <u-modal v-model="show" :mask-close-able="true" title="病虫害识别" :show-cancel-button="true" confirm-text="拍病害"
 			cancel-text="拍虫害" cancel-color="#4BB85F" content="拍照识别病虫害" @confirm="confirm" @cancel="cancel"></u-modal>
 		<kps-image-cutter @ok="onok" @cancel="oncancle" :url="url" :fixed="false" :blob="true" :maxWidth="500"
-			:maxHeight="380" :height="380"></kps-image-cutter>
+			:maxHeight="380" :height="380"></kps-image-cutter> -->
 		<view class="loading" v-if="loadTF" @touchmove.stop.prevent="moveHandle">
 			<u-loading mode="flower" size="100" :show="true"></u-loading>
 		</view>
@@ -476,8 +476,11 @@
 						url: "../fourBase/index"
 					})
 				} else if (index == 1) {
-					var that = this
-					this.show = true
+					// var that = this
+					// this.show = true
+					uni.navigateTo({
+						url: "/pages/identifyPest/identifyPest",
+					})
 				} else if (index == 2) {
 					uni.navigateTo({
 						url: "../expertDiagnosis/index",
@@ -518,7 +521,7 @@
 					// pest.pests.insect_discern 虫害
 					uni.uploadFile({
 						// url: 'http://114.115.147.140:8002/api/api_gateway?method=base.bases.base_photo', //仅为示例,非真实的接口地址
-						url: 'https://wx.hnyfwlw.com/api/api_gateway?method=pest.pests.insect_discern', //仅为示例,非真实的接口地址
+						url: 'http://192.168.2.183:8006/api/api_gateway?method=pest.pests.insect_discern', //仅为示例,非真实的接口地址
 						filePath: ev.path,
 						name: 'img_file',
 						formData: {
@@ -543,7 +546,7 @@
 					// });
 					uni.uploadFile({
 						// url: 'http://114.115.147.140:8002/api/api_gateway?method=base.bases.base_photo', //仅为示例,非真实的接口地址
-						url: 'https://wx.hnyfwlw.com/api/api_gateway?method=pest.pests.plant_discern', //仅为示例,非真实的接口地址
+						url: 'http://192.168.2.183:8006/api/api_gateway?method=pest.pests.plant_discern', //仅为示例,非真实的接口地址
 						filePath: ev.path,
 						name: 'img_file',
 						formData: {

+ 1 - 1
pages/my/user-info/user-info.vue

@@ -67,7 +67,7 @@
 							console.log(JSON.stringify(res))
 							this.userinfos.image2 = JSON.stringify(res)
 							uni.uploadFile({
-								url: 'https://wx.hnyfwlw.com/api/api_gateway?method=base.bases.base_photo', //仅为示例,非真实的接口地址
+								url: 'http://192.168.2.183:8006/api/api_gateway?method=base.bases.base_photo', //仅为示例,非真实的接口地址
 								filePath: res.tempFilePaths[0],
 								name: 'img_file',
 								formData: {

Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/components/bazaar-city_list/index.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/components/equip-item/equip-item.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/components/ksp-image-cutter/ksp-image-cutter.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/components/multiple-select.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/components/uni-icons/uni-icons.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/components/uni-nav-bar/uni-nav-bar.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/components/uni-status-bar/uni-status-bar.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/afterSale/addafter.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/afterSale/index.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/afterSale/search.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/bzy/equip-set/bzyhistoryile.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/bzy/equip-set/equip-set.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/cbd/equip-set/addimg.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/cbd/equip-set/analyse.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/cbd/equip-set/equip-set.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/cbd/equip-set/historyfile.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/cbd/equip-set/imgpage.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/cbd/equip-set/manualinput.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/cbd/equip-set/note.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/cbd/equip-set/results.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/cbd/equip-set/statistics.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/equip-detail/equip-detail.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/index/index.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/index/search.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/sim/sim.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/thxydetail/photolist.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/thxydetail/thxydetail.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/thxydetail/thxyhisdata.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/thxydetail/thxyset.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/xctdetail/analyse.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/xctdetail/photolist.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/xctdetail/xctdetail.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/xctdetail/xctset.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/xy/equip-set/equip-set.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/xy/equip-set/xyhistoryile.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/xy2.0/historydatas.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/xy2.0/particulars.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cbqxyj/addressbook.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cbqxyj/basemap.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cbqxyj/cbwarn.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cbqxyj/warnset.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/disandpests/index.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/disease/cmb.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/disease/forecastResult.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/distribution/index.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/environment/contros.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/environment/equipment.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/environment/gsequipment.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/environment/gshistory.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/environment/history.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/environment/index.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/environment/onedaythedata.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/environment/search.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/environment/sim.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/equipList/index.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/equipList/seabox/modification.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/equipList/seabox/search.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/equipMange/index/addusers.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/equipMange/index/assignment.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/equipMange/index/changepasswold.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/equipMange/index/index.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/equipMange/index/useroperation.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/expertDiagnosis/exchangeShare.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/expertDiagnosis/index.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/expertDiagnosis/introduce.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/expertDiagnosis/particulars.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/expertDiagnosis/postmessage.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/expertDiagnosis/wormcase.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/fourBase/addbase.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/fourBase/allocation.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/fourBase/basefacility.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/fourBase/index.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/fourBase/modification.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map


+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/irrigate/index.js.map


Einige Dateien werden nicht angezeigt, da zu viele Dateien in diesem Diff geändert wurden.