Browse Source

feat:拍照指南地址

zhb 1 year ago
parent
commit
ea98cfa6b0
100 changed files with 2373 additions and 2100 deletions
  1. 1 1
      .gitignore
  2. 702 584
      components/ksp-image-cutter/ksp-image-cutter.vue
  3. 8 0
      pages.json
  4. 344 280
      pages/identifyPest/economicsPlant/economicsPlant.vue
  5. 406 405
      pages/identifyPest/identifyPest.vue
  6. 819 737
      pages/index/index.vue
  7. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  8. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map
  9. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
  10. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/components/bazaar-city_list/index.js.map
  11. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/components/equip-item/equip-item.js.map
  12. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/components/ksp-image-cutter/ksp-image-cutter.js.map
  13. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/components/multiple-select.js.map
  14. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/components/uni-icons/uni-icons.js.map
  15. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/components/uni-nav-bar/uni-nav-bar.js.map
  16. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/components/uni-status-bar/uni-status-bar.js.map
  17. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/afterSale/addafter.js.map
  18. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/afterSale/index.js.map
  19. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/afterSale/search.js.map
  20. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/bzy/equip-set/bzyhistoryile.js.map
  21. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/bzy/equip-set/equip-set.js.map
  22. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/cbd/equip-set/addimg.js.map
  23. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/cbd/equip-set/analyse.js.map
  24. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/cbd/equip-set/equip-set.js.map
  25. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/cbd/equip-set/historyfile.js.map
  26. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/cbd/equip-set/imgpage.js.map
  27. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/cbd/equip-set/manualinput.js.map
  28. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/cbd/equip-set/note.js.map
  29. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/cbd/equip-set/results.js.map
  30. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/cbd/equip-set/statistics.js.map
  31. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/equip-detail/equip-detail.js.map
  32. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/index/index.js.map
  33. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/index/search.js.map
  34. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/sim/sim.js.map
  35. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/thxydetail/photolist.js.map
  36. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/thxydetail/thxydetail.js.map
  37. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/thxydetail/thxyhisdata.js.map
  38. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/thxydetail/thxyset.js.map
  39. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/xctdetail/analyse.js.map
  40. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/xctdetail/photolist.js.map
  41. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/xctdetail/xctdetail.js.map
  42. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/xctdetail/xctset.js.map
  43. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/xy/equip-set/equip-set.js.map
  44. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/xy/equip-set/xyhistoryile.js.map
  45. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/xy2.0/historydatas.js.map
  46. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/xy2.0/particulars.js.map
  47. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cbqxyj/addressbook.js.map
  48. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cbqxyj/basemap.js.map
  49. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cbqxyj/cbwarn.js.map
  50. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cbqxyj/warnset.js.map
  51. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/disandpests/index.js.map
  52. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/disease/cmb.js.map
  53. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/disease/forecastResult.js.map
  54. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/distribution/index.js.map
  55. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/environment/contros.js.map
  56. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/environment/equipment.js.map
  57. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/environment/gsequipment.js.map
  58. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/environment/gshistory.js.map
  59. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/environment/history.js.map
  60. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/environment/index.js.map
  61. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/environment/onedaythedata.js.map
  62. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/environment/search.js.map
  63. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/environment/sim.js.map
  64. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/equipList/index.js.map
  65. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/equipList/seabox/modification.js.map
  66. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/equipList/seabox/search.js.map
  67. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/equipMange/index/addusers.js.map
  68. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/equipMange/index/assignment.js.map
  69. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/equipMange/index/changepasswold.js.map
  70. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/equipMange/index/index.js.map
  71. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/equipMange/index/useroperation.js.map
  72. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/expertDiagnosis/exchangeShare.js.map
  73. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/expertDiagnosis/index.js.map
  74. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/expertDiagnosis/introduce.js.map
  75. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/expertDiagnosis/particulars.js.map
  76. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/expertDiagnosis/postmessage.js.map
  77. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/expertDiagnosis/wormcase.js.map
  78. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/fourBase/addbase.js.map
  79. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/fourBase/allocation.js.map
  80. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/fourBase/basefacility.js.map
  81. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/fourBase/city.js.map
  82. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/fourBase/index.js.map
  83. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/fourBase/modification.js.map
  84. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
  85. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/irrigate/index.js.map
  86. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/irrigate/irrmap.js.map
  87. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/irrigate/realtimedata.js.map
  88. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/irrigate/search.js.map
  89. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/irrigate/weathdata.js.map
  90. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map
  91. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/monitor/index.js.map
  92. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/monitor/sim.js.map
  93. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/about/about.js.map
  94. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/index/index.js.map
  95. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/record/record.js.map
  96. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/user-info/user-info.js.map
  97. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/prevention/control.js.map
  98. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/prevention/equipmentdetails.js.map
  99. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/prevention/index.js.map
  100. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/prevention/search.js.map

+ 1 - 1
.gitignore

@@ -8,7 +8,7 @@ pnpm-debug.log*
 lerna-debug.log*
 
 node_modules
-dist
+dist*-
 dist-ssr
 *.local
 

File diff suppressed because it is too large
+ 702 - 584
components/ksp-image-cutter/ksp-image-cutter.vue


+ 8 - 0
pages.json

@@ -49,6 +49,14 @@
 				"enablePullDownRefresh": false
 			}
 
+		},
+		{
+			"path": "pages/guidance/guidance",
+			"style": {
+				"navigationBarTitleText": "拍照指南",
+				"enablePullDownRefresh": false
+			}
+		
 		}
 		// ,
 		// {

+ 344 - 280
pages/identifyPest/economicsPlant/economicsPlant.vue

@@ -1,47 +1,64 @@
 <template>
-	<view>
-		<!-- 搜索 -->
-		<!-- <u-search :disabled="true" margin="15rpx auto" :input-style="{width: '20rpx'}" input-align="center" :animation="true"
+  <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_ul">
+      <!-- 上次定位 -->
+      <view class="plantList_li" v-if="lastTimeShow">
+        <view class="plantList_tlt"> 上次选择 </view>
 
-			<!-- 上次定位 -->
-			<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_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">
-				<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_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_li">
 				<view class="plantList_tlt">
 					其他
 					<text>(此项目开发中,结果可能会有误差)</text>
@@ -56,266 +73,313 @@
 					</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>
+    <!-- 裁剪组件 -->
+    <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>
+    <!-- 弹框 -->
+    <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 = '';
-			},
+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;
+      console.log('-------------------------------- recogonization');
+      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]; //失败跳转显示的图片
+        },
+        fail(err) {
+          console.log(err, '------------------------ choose image');
+        },
+      });
+    },
+
+    // 取消上传
+    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
-				}
+    // 确定上传
+    axiosData(ev) {
+      setTimeout(() => {
+        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
-							})
-						}
+      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;
+		  uni.hideLoading()
+        },
+      });
+    },
 
-					},
-					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,
+  },
 
-			// 其他--老识别接口
-			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)
-				}
-			});
-		},
-	}
+  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;
-	}
+// 搜索
+uni-view,
+uni-text {
+  // width: 740rpx;
+  // margin: 0 auto;
+}
 
-	// 作物选择
-	.plantList_ul {
-		.plantList_li {
-			margin: 55rpx 0 55rpx 0;
+// 作物选择
+.plantList_ul {
+  .plantList_li {
+    margin: 55rpx 0 55rpx 0;
 
-			.plantList_tlt {
-				font-weight: 550;
-				font-size: 16px;
-				width: 700rpx;
-				margin: 0 auto;
+    .plantList_tlt {
+      font-weight: 550;
+      font-size: 16px;
+      width: 700rpx;
+      margin: 0 auto;
 
-				text {
-					color: #7e7e7e;
-					font-size: 12px;
-				}
-			}
+      text {
+        color: #7e7e7e;
+        font-size: 12px;
+      }
+    }
 
-			.plantList_li_ul {
-				display: flex;
-				flex-wrap: wrap;
-				margin-top: 10rpx;
+    .plantList_li_ul {
+      display: flex;
+      flex-wrap: wrap;
+      margin-top: 10rpx;
 
-				.plantList_li_List {
-					margin: 10rpx 0 0 18rpx;
-					width: 150rpx;
+      .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);
-					}
+        image {
+          width: 130rpx;
+          height: 130rpx;
+          border-radius: 55px;
+          margin: 0 auto;
+          display: block;
+          box-shadow: 0 2px 4px rgba(0, 0, 0, 0.12), 0 0 6px rgba(0, 0, 0, 0.04);
+        }
 
-					view {
-						width: 150rpx;
-						color: #646464;
-						text-align: center;
-						margin: 10rpx 0 0 0;
-						font-size: 13px;
-					}
-				}
-			}
-		}
-	}
+        view {
+          width: 150rpx;
+          color: #646464;
+          text-align: center;
+          margin: 10rpx 0 0 0;
+          font-size: 13px;
+        }
+      }
+    }
+  }
+}
 </style>

+ 406 - 405
pages/identifyPest/identifyPest.vue

@@ -1,27 +1,36 @@
 <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')"
+  <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_box">
 			<view class="operation_div">
 				<view class="operation_tit"></view>
 				<text class="operation_txt">更多操作</text>
@@ -37,394 +46,386 @@
 				</view>
 			</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() //位置信息
-				// 		}
-				// 	}
-				// })
-			},
-		},
-	}
+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;
-					}
-				}
-			}
-		}
-	}
+// 顶部导航左图标
+.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, 0.12), 0 0 6px rgba(0, 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>

File diff suppressed because it is too large
+ 819 - 737
pages/index/index.vue


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/components/bazaar-city_list/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/components/equip-item/equip-item.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/components/ksp-image-cutter/ksp-image-cutter.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/components/multiple-select.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/components/uni-icons/uni-icons.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/components/uni-nav-bar/uni-nav-bar.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/components/uni-status-bar/uni-status-bar.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/afterSale/addafter.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/afterSale/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/afterSale/search.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/bzy/equip-set/bzyhistoryile.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/bzy/equip-set/equip-set.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/cbd/equip-set/addimg.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/cbd/equip-set/analyse.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/cbd/equip-set/equip-set.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/cbd/equip-set/historyfile.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/cbd/equip-set/imgpage.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/cbd/equip-set/manualinput.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/cbd/equip-set/note.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/cbd/equip-set/results.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/cbd/equip-set/statistics.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/equip-detail/equip-detail.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/index/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/index/search.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/sim/sim.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/thxydetail/photolist.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/thxydetail/thxydetail.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/thxydetail/thxyhisdata.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/thxydetail/thxyset.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/xctdetail/analyse.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/xctdetail/photolist.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/xctdetail/xctdetail.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/xctdetail/xctset.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/xy/equip-set/equip-set.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/xy/equip-set/xyhistoryile.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/xy2.0/historydatas.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/xy2.0/particulars.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cbqxyj/addressbook.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cbqxyj/basemap.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cbqxyj/cbwarn.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cbqxyj/warnset.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/disandpests/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/disease/cmb.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/disease/forecastResult.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/distribution/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/environment/contros.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/environment/equipment.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/environment/gsequipment.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/environment/gshistory.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/environment/history.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/environment/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/environment/onedaythedata.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/environment/search.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/environment/sim.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/equipList/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/equipList/seabox/modification.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/equipList/seabox/search.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/equipMange/index/addusers.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/equipMange/index/assignment.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/equipMange/index/changepasswold.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/equipMange/index/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/equipMange/index/useroperation.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/expertDiagnosis/exchangeShare.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/expertDiagnosis/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/expertDiagnosis/introduce.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/expertDiagnosis/particulars.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/expertDiagnosis/postmessage.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/expertDiagnosis/wormcase.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/fourBase/addbase.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/fourBase/allocation.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/fourBase/basefacility.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/fourBase/city.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/fourBase/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/fourBase/modification.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/irrigate/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/irrigate/irrmap.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/irrigate/realtimedata.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/irrigate/search.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/irrigate/weathdata.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/monitor/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/monitor/sim.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/about/about.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/index/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/record/record.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/user-info/user-info.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/prevention/control.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/prevention/equipmentdetails.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/prevention/index.js.map


+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/prevention/search.js.map


Some files were not shown because too many files changed in this diff