2020-11-3

discern/build/utils.js

@@ -47,7 +47,7 @@ exports.cssLoaders = function (options) {
     if (options.extract) {
       return ExtractTextPlugin.extract({
         use: loaders,
-        // publicPath: '../../',     
+        publicPath: '../../',     
         fallback: 'vue-style-loader'
       })
     } else {

discern/config/index.js

@@ -9,7 +9,7 @@ module.exports = {
 
     // Paths
     assetsSubDirectory: 'static',
-    assetsPublicPath: '/',
+    assetsPublicPath: './',
     proxyTable: {
       //测试跨域
       '/academysciences': {
@@ -60,7 +60,7 @@ module.exports = {
     // Paths
     assetsRoot: path.resolve(__dirname, '../dist'),
     assetsSubDirectory: 'static',
-    assetsPublicPath: '/',
+    assetsPublicPath: './',
 
     /** 
      * Source Maps

discern/src/assets/scss/collect.scss

@@ -57,7 +57,7 @@
   margin: 0 .5rem 0 .5rem;
 }
 
-.navlist .activeT {
+.collect_box-main .navlist .activeT {
   border-bottom: 1px solid #1ec8a1;
   color: #1ec8a1;
 }

discern/src/assets/scss/help.scss

@@ -48,7 +48,7 @@
   justify-content: space-between;
 }
 
-.navlist .activeT {
+.help_box-main .navlist .activeT {
   border-bottom: 1px solid #1ec8a1;
   color: #1ec8a1;
 }

discern/src/assets/scss/home.scss

@@ -135,7 +135,7 @@
 .home_box_main, .swiper-container-autoheight, .swiper-container-autoheight .swiper-slide {
   height: 100%;
 }
-.navlist {
+.home_box_main .navlist {
   background: #fff;
 }
 .home_box_main .navlist ul {
@@ -144,7 +144,7 @@
   justify-content: space-between;
 }
 
-.navlist .activeT {
+.home_box_main .navlist .activeT {
   border-bottom: 1px solid #1ec8a1;
   color: #1ec8a1;
 }

discern/src/assets/scss/memory.scss

@@ -55,7 +55,7 @@
   margin: 0 .5rem 0 .5rem;
 }
 
-.navlist .activeT {
+.memory_box-main .navlist .activeT {
   border-bottom: 1px solid #1ec8a1;
   color: #1ec8a1;
 }

discern/src/assets/scss/repository.scss

@@ -47,7 +47,7 @@
   margin: 0 .5rem 0 .5rem;
 }
 
-.navlist .activeT {
+.repository_box-main .navlist .activeT {
   border-bottom: 1px solid #1ec8a1;
   color: #1ec8a1;
 }

discern/src/components/addData/addData.vue

@@ -210,7 +210,7 @@ export default {
           .then(() => {
             this.$axios({
               method: "post",
-              url: "bigservers/del_insect_photo",
+              url: "http://192.168.1.8:8002/del_insect_photo",
               data: postData
             })
               .then(res => {
@@ -252,7 +252,7 @@ export default {
           .then(() => {
             this.$axios({
               method: "post",
-              url: "bigservers/del_person_img",
+              url: "http://192.168.1.8:8002/del_person_img",
               data: postData
             })
               .then(res => {
@@ -301,7 +301,7 @@ export default {
         _this
           .$axios({
             method: "post",
-            url: "bigservers/upload_photos",
+            url: "http://192.168.1.8:8002/upload_photos",
             anync: true,
             data: form,
             headers: {
@@ -322,7 +322,7 @@ export default {
         _this
           .$axios({
             method: "post",
-            url: "bigservers/person_harm_img",
+            url: "http://192.168.1.8:8002/person_harm_img",
             anync: true,
             data: form,
             headers: {
@@ -399,7 +399,7 @@ export default {
             _this
               .$axios({
                 method: "post",
-                url: "bigservers/make_data",
+                url: "http://192.168.1.8:8002/make_data",
                 data: postData
               })
               .then(res => {
@@ -424,9 +424,9 @@ export default {
                     localStorage.setItem("commandLuru", "全部");
                     this.$router.replace("/home");
                   }
-                  const timeA = setInterval(() => {
-                    location.reload();
-                  }, 1500);
+                  // const timeA = setInterval(() => {
+                  //   location.reload();
+                  // }, 1500);
                 } else if (res.data === 1) {
                   this.$notify.error({
                     title: "错误",
@@ -453,7 +453,7 @@ export default {
             _this
               .$axios({
                 method: "post",
-                url: "bigservers/save_disease",
+                url: "http://192.168.1.8:8002/save_disease",
                 data: postData
               })
               .then(res => {
@@ -479,9 +479,9 @@ export default {
                     localStorage.setItem("commandLuru", "全部");
                     this.$router.replace("/home");
                   }
-                  const timeA = setInterval(() => {
-                    location.reload();
-                  }, 1500);
+                  // const timeA = setInterval(() => {
+                  //   location.reload();
+                  // }, 1500);
                 } else if (res.data === 1) {
                   this.$notify.error({
                     title: "错误",

discern/src/components/addData_details/addData_details.vue

@@ -22,7 +22,7 @@
           <el-carousel-item v-for="item in redata.img" :key="item">
             <img
               preview="1"
-              v-lazy="'bigservers/' + item"
+              v-lazy="'http://192.168.1.8:8002/' + item"
               alt
               class="addData_details_box_imgBox-img"
             />
@@ -34,7 +34,7 @@
         <div class="addData_details_box_divBox_div1">
           <img
             preview="1"
-            v-lazy="'/bigservers' + redata.photo"
+            v-lazy="'http://192.168.1.8:8002/' + redata.photo"
             alt=""
             class="addData_details_box_divBox_div1_img"
           />
@@ -66,7 +66,7 @@
         <div class="addData_details_box_divBoxDiv1">
           <img
             preview="1"
-            v-lazy="'/bigservers' + redata.photo"
+            v-lazy="'http://192.168.1.8:8002/' + redata.photo"
             alt=""
             class="addData_details_box_divBox_div1_img"
           />
@@ -113,7 +113,7 @@
             <div class="addData_details_commentList-div1">
               <img
                 preview="1"
-                v-lazy="'/bigservers' + item.photo"
+                v-lazy="'http://192.168.1.8:8002/' + item.photo"
                 alt=""
                 class="addData_details_commentList_img1"
               />
@@ -248,7 +248,7 @@ export default {
       that
         .$axios({
           method: "post",
-          url: "bigservers/user_answer",
+          url: "http://192.168.1.8:8002/user_answer",
           data: form,
           headers: {
             "Content-Type": "multipart/form-data",
@@ -337,7 +337,7 @@ export default {
         that
           .$axios({
             method: "post",
-            url: "bigservers/user_reply",
+            url: "http://192.168.1.8:8002/user_reply",
             data: form,
             headers: {
               "Content-Type": "multipart/form-data",

discern/src/components/addMeg/addMeg.vue

@@ -106,7 +106,7 @@ export default {
         _this
           .$axios({
             method: "post",
-            url: "bigservers/user_leaving",
+            url: "http://192.168.1.8:8002/user_leaving",
             data: postData,
             headers: {
               "Content-Type": "multipart/form-data"
@@ -122,9 +122,9 @@ export default {
               _this.textarea1 = "";
               _this.input2 = "";
               _this.$router.replace("/message");
-              const timeA = setInterval(() => {
-                location.reload();
-              }, 1500);
+              // const timeA = setInterval(() => {
+              //   location.reload();
+              // }, 1500);
             } else if (res.data === 1) {
               this.$message({
                 message: "手机号码格式不正确",

discern/src/components/authenticate/authenticate.vue

@@ -50,7 +50,7 @@
             <div class="authenticate_box-main-authenticateList-box1">
               <img
                 preview="1"
-                v-lazy="'/bigservers' + item.img[0]"
+                v-lazy="'http://192.168.1.8:8002/' + item.img[0]"
                 alt
                 class="authenticate_box-main-authenticateList-box1-img"
               />
@@ -63,7 +63,7 @@
               <div class="authenticate_box-main-authenticateList-box3">
                 <img
                   preview="1"
-                  v-lazy="'/bigservers' + item.photo"
+                  v-lazy="'http://192.168.1.8:8002/' + item.photo"
                   alt
                   class="authenticate_box-main-authenticateList-box3-img"
                 />
@@ -154,18 +154,36 @@ export default {
     };
   },
   beforeRouteEnter(to, from, next) {
+    if (from.name === "addData_details") {
+      to.meta.isBack = true;
+    }
     // 如果没有配置顶部按钮或isBounce,则beforeRouteEnter不用写
     next((vm) => {
-      // 滚动到原来的列表位置,恢复顶部按钮和isBounce的配置
-      vm.$refs.mescroll && vm.$refs.mescroll.beforeRouteEnter();
+      if (from.name === "addData_details") {
+        // 滚动到原来的列表位置,恢复顶部按钮和isBounce的配置
+        vm.$refs.mescroll && vm.$refs.mescroll.beforeRouteEnter();
+      }
     });
   },
   beforeRouteLeave(to, from, next) {
-    // 如果没有配置顶部按钮或isBounce,则beforeRouteLeave不用写
-    // 记录列表滚动的位置,隐藏顶部按钮和isBounce的配置
-    this.$refs.mescroll && this.$refs.mescroll.beforeRouteLeave();
+    if (to.name !== "addData_details") {
+      to.meta.isBack = false;
+    } else {
+      to.meta.isBack = true;
+      // 如果没有配置顶部按钮或isBounce,则beforeRouteLeave不用写
+      // 记录列表滚动的位置,隐藏顶部按钮和isBounce的配置
+      this.$refs.mescroll && this.$refs.mescroll.beforeRouteLeave();
+    }
     next();
   },
+  activated() {
+    if (!this.$route.meta.isBack) {
+      // 如果isBack是false，表明需要获取新数据，否则就不再请求，直接使用缓存的数据
+      this.mescroll.resetUpScroll(); // 刷新列表数据
+    }
+    // 恢复成默认的false，避免isBack一直是true，导致下次无法获取数据
+    this.$route.meta.isBack = false;
+  },
   //监听属性 类似于data概念
   computed: {},
   //监控data中的数据变化
@@ -206,7 +224,7 @@ export default {
       that
         .$axios({
           method: "get",
-          url: "bigservers/user_answer",
+          url: "http://192.168.1.8:8002/user_answer",
           params: {
             page: that.mescrollUp.page.num,
             ret: "all", //区别是全部还是个人
@@ -299,7 +317,7 @@ export default {
     //   that
     //     .$axios({
     //       method: "get",
-    //       url: "bigservers/user_answer",
+    //       url: "http://192.168.1.8:8002/user_answer",
     //       params: {
     //         page: 1,
     //         ret: "all", //区别是全部还是个人
@@ -344,7 +362,13 @@ export default {
     //点击进入新建鉴定页面
     newAuthenticate() {
       this.drawer = false;
-      this.$router.push("/fieldsShow");
+      // this.$router.push("/fieldsShow");
+      this.$router.push({
+        name: 'fieldsShow',
+        query: {
+          ret: '2'
+        }
+      });
     },
 
     //点击轮播图片进行放大
@@ -416,7 +440,7 @@ export default {
 .swiper-container-autoheight .swiper-slide {
   height: 100%;
 }
-.navlist {
+.authenticate_box_main .navlist {
   background: #fff;
 }
 .authenticate_box_main .navlist ul {
@@ -425,7 +449,7 @@ export default {
   justify-content: space-between;
 }
 
-.navlist .activeT {
+.authenticate_box_main .navlist .activeT {
   border-bottom: 1px solid #1ec8a1;
   color: #1ec8a1;
 }

discern/src/components/collect/collect.vue

@@ -138,6 +138,7 @@ import Swiper from "swiper";
 import "../../../swiper/css/swiper.min.css";
 
 export default {
+  name: "collect",
   //import引入的组件需要注入到对象中才能使用
   components: {
     MescrollVue,
@@ -192,18 +193,37 @@ export default {
     };
   },
   beforeRouteEnter(to, from, next) {
+    if (from.name === "record") {
+      to.meta.isBack = true;
+    }
     // 如果没有配置顶部按钮或isBounce,则beforeRouteEnter不用写
     next((vm) => {
-      // 滚动到原来的列表位置,恢复顶部按钮和isBounce的配置
-      vm.$refs.mescroll && vm.$refs.mescroll.beforeRouteEnter();
+      if (from.name === "record") {
+        // 滚动到原来的列表位置,恢复顶部按钮和isBounce的配置
+        vm.$refs.mescroll && vm.$refs.mescroll.beforeRouteEnter();
+      }
     });
   },
   beforeRouteLeave(to, from, next) {
-    // 如果没有配置顶部按钮或isBounce,则beforeRouteLeave不用写
-    // 记录列表滚动的位置,隐藏顶部按钮和isBounce的配置
-    this.$refs.mescroll && this.$refs.mescroll.beforeRouteLeave();
+    if (to.name !== "record") {
+      to.meta.isBack = false;
+    } else {
+      to.meta.isBack = true;
+      // 如果没有配置顶部按钮或isBounce,则beforeRouteLeave不用写
+      // 记录列表滚动的位置,隐藏顶部按钮和isBounce的配置
+      this.$refs.mescroll && this.$refs.mescroll.beforeRouteLeave();
+    }
+
     next();
   },
+  activated() {
+    if (!this.$route.meta.isBack) {
+      // 如果isBack是false，表明需要获取新数据，否则就不再请求，直接使用缓存的数据
+      this.mescroll.resetUpScroll(); // 刷新列表数据
+    }
+    // 恢复成默认的false，避免isBack一直是true，导致下次无法获取数据
+    this.$route.meta.isBack = false;
+  },
   //监听属性 类似于data概念
   computed: {},
   //监控data中的数据变化
@@ -253,7 +273,7 @@ export default {
       that
         .$axios({
           method: "get",
-          url: "bigservers/user_collect",
+          url: "http://192.168.1.8:8002/user_collect",
           params: {
             ret: ret,
             page: that.mescrollUp.page.num,
@@ -348,7 +368,7 @@ export default {
       that
         .$axios({
           method: "get",
-          url: "bigservers/user_collect",
+          url: "http://192.168.1.8:8002/user_collect",
           params: {
             ret: ret,
             // page: 1

discern/src/components/conversion/conversion.vue

@@ -178,7 +178,7 @@ export default {
       that
         .$axios({
           method: "post",
-          url: "bigservers/user_prize",
+          url: "http://192.168.1.8:8002/user_prize",
           data: form,
           headers: {
             "Content-Type": "multipart/form-data",

discern/src/components/conversionList/conversionList.vue

@@ -223,18 +223,37 @@ export default {
     };
   },
   beforeRouteEnter(to, from, next) {
+    if (from.name === "conversionListDetails") {
+      to.meta.isBack = true;
+    }
+
     // 如果没有配置顶部按钮或isBounce,则beforeRouteEnter不用写
     next((vm) => {
-      // 滚动到原来的列表位置,恢复顶部按钮和isBounce的配置
-      vm.$refs.mescroll && vm.$refs.mescroll.beforeRouteEnter();
+      if (from.name === "conversionListDetails") {
+        // 滚动到原来的列表位置,恢复顶部按钮和isBounce的配置
+        vm.$refs.mescroll && vm.$refs.mescroll.beforeRouteEnter();
+      }
     });
   },
   beforeRouteLeave(to, from, next) {
-    // 如果没有配置顶部按钮或isBounce,则beforeRouteLeave不用写
-    // 记录列表滚动的位置,隐藏顶部按钮和isBounce的配置
-    this.$refs.mescroll && this.$refs.mescroll.beforeRouteLeave();
+    if (to.name !== "conversionListDetails") {
+      to.meta.isBack = false;
+    } else {
+      to.meta.isBack = true;
+      // 如果没有配置顶部按钮或isBounce,则beforeRouteLeave不用写
+      // 记录列表滚动的位置,隐藏顶部按钮和isBounce的配置
+      this.$refs.mescroll && this.$refs.mescroll.beforeRouteLeave();
+    }
     next();
   },
+  activated() {
+    if (!this.$route.meta.isBack) {
+      // 如果isBack是false，表明需要获取新数据，否则就不再请求，直接使用缓存的数据
+      this.mescroll.resetUpScroll(); // 刷新列表数据
+    }
+    // 恢复成默认的false，避免isBack一直是true，导致下次无法获取数据
+    this.$route.meta.isBack = false;
+  },
   //监听属性 类似于data概念
   computed: {},
   //监控data中的数据变化
@@ -282,7 +301,7 @@ export default {
       that
         .$axios({
           method: "get",
-          url: "bigservers/user_prize_list",
+          url: "http://192.168.1.8:8002/user_prize_list",
           params: {
             page: that.mescrollUp.page.num,
             prize: prize,
@@ -373,7 +392,7 @@ export default {
       that
         .$axios({
           method: "get",
-          url: "bigservers/user_prize_list",
+          url: "http://192.168.1.8:8002/user_prize_list",
           params: {
             page: 1,
             prize: prize,
@@ -441,7 +460,7 @@ export default {
   z-index: 100;
 }
 
-.navlist {
+.conversionList_box-mainB .navlist {
   padding: 1.1rem 0 0 0;
 }
 
@@ -489,7 +508,7 @@ export default {
   margin: 0 0.5rem 0 0.5rem;
 }
 
-.navlist .activeT {
+.conversionList_box-main .navlist .activeT {
   border-bottom: 1px solid #1ec8a1;
   color: #1ec8a1;
 }

discern/src/components/conversionListDetails/conversionListDetails.vue

@@ -179,7 +179,7 @@ export default {
       //   that
       //     .$axios({
       //       method: "post",
-      //       url: "bigservers/user_prize_list",
+      //       url: "http://192.168.1.8:8002/user_prize_list",
       //       data: form,
       //       headers: {
       //         "Content-Type": "multipart/form-data",

discern/src/components/details/details.vue

@@ -125,7 +125,7 @@ export default {
     _this
       .$axios({
         method: "post",
-        url: "bigservers/dase_list",
+        url: "http://192.168.1.8:8002/dase_list",
         data: postData,
         headers: {
           "Content-Type": "multipart/form-data"

discern/src/components/enroll/enroll.vue

@@ -260,7 +260,7 @@ export default {
         _this
           .$axios({
             method: "post",
-            url: "bigservers/prove_code",
+            url: "http://192.168.1.8:8002/prove_code",
             data: postData,
             headers: {
               "Content-Type": "multipart/form-data"
@@ -349,7 +349,7 @@ export default {
 
       this.$axios({
         method: "post",
-        url: "bigservers/prove_code",
+        url: "http://192.168.1.8:8002/prove_code",
         data: postData,
         headers: {
           "Content-Type": "multipart/form-data"
@@ -371,7 +371,7 @@ export default {
                 //删除验证码
                 this.$axios({
                   method: "post",
-                  url: "bigservers/out_land"
+                  url: "http://192.168.1.8:8002/out_land"
                 })
                   .then(res => {
                     // console.log(res.data);

discern/src/components/exchange/exchange.vue

@@ -54,7 +54,7 @@
             <div class="exchange_box_main-listA-userBox">
               <img
                 preview="1"
-                v-lazy="'/bigservers' + item.photo"
+                v-lazy="'http://192.168.1.8:8002/' + item.photo"
                 alt
                 class="exchange_box_main-listA-userBox-img"
               />
@@ -87,7 +87,7 @@
                   preview="1"
                 >
                   <img
-                    v-lazy="'/bigservers' + itemA"
+                    v-lazy="'http://192.168.1.8:8002/' + itemA"
                     alt
                     class="exchange_box_main-listA-imageList"
                   />
@@ -199,8 +199,8 @@ export default {
           offset: 500, //列表滚动1000px才显示回到顶部按钮
         },
         onScroll: function (mescroll, y, isUp) {
-          console.log(y)
-          console.log(isUp)
+          // console.log(y);
+          // console.log(isUp);
           //吸顶
           // if (y > 500) {
           //   self.navBarFixed = true;
@@ -223,32 +223,29 @@ export default {
     }
     // 如果没有配置顶部按钮或isBounce,则beforeRouteEnter不用写
     next((vm) => {
-      // 滚动到原来的列表位置,恢复顶部按钮和isBounce的配置
-      vm.$refs.mescroll && vm.$refs.mescroll.beforeRouteEnter();
+      if (from.name === "field_details") {
+        // 滚动到原来的列表位置,恢复顶部按钮和isBounce的配置
+        vm.$refs.mescroll && vm.$refs.mescroll.beforeRouteEnter();
+      }
+      // // 滚动到原来的列表位置,恢复顶部按钮和isBounce的配置
+      // vm.$refs.mescroll && vm.$refs.mescroll.beforeRouteEnter();
     });
   },
   beforeRouteLeave(to, from, next) {
-    console.log(to.name);
-    if (to.name !== "home") {
+    if (to.name !== "field_details") {
+      to.meta.isBack = false;
+    } else {
+      to.meta.isBack = true;
       // 如果没有配置顶部按钮或isBounce,则beforeRouteLeave不用写
       // 记录列表滚动的位置,隐藏顶部按钮和isBounce的配置
       this.$refs.mescroll && this.$refs.mescroll.beforeRouteLeave();
-    } else {
-      // alert("返回");
-      // this.mescroll.destroy();
-      console.log(this.mescroll)
-      // this.mescrollUp.onScroll(this.mescroll, 0, false)
     }
-    // // // 如果没有配置顶部按钮或isBounce,则beforeRouteLeave不用写
-    // // 记录列表滚动的位置,隐藏顶部按钮和isBounce的配置
-    // this.$refs.mescroll && this.$refs.mescroll.beforeRouteLeave();
     next();
   },
   activated() {
     if (!this.$route.meta.isBack) {
       // 如果isBack是false，表明需要获取新数据，否则就不再请求，直接使用缓存的数据
-      // this.interflowData(); // ajax获取数据方法
-      this.mescroll.resetUpScroll() // 刷新列表数据  
+      this.mescroll.resetUpScroll(); // 刷新列表数据
     }
     // 恢复成默认的false，避免isBack一直是true，导致下次无法获取数据
     this.$route.meta.isBack = false;
@@ -293,7 +290,7 @@ export default {
       that
         .$axios({
           method: "get",
-          url: "bigservers/user_answer",
+          url: "http://192.168.1.8:8002/user_answer",
           params: {
             page: that.mescrollUp.page.num,
             ret: "all", //区别是全部还是个人
@@ -402,7 +399,7 @@ export default {
       that
         .$axios({
           method: "get",
-          url: "bigservers/user_answer",
+          url: "http://192.168.1.8:8002/user_answer",
           params: {
             page: 1,
             ret: "all", //区别是全部还是个人
@@ -429,7 +426,7 @@ export default {
     },
     // 交流点赞
     like(id, index) {
-      this.mescrollUp.onScroll(this.mescroll, 0, false)
+      this.mescrollUp.onScroll(this.mescroll, 0, false);
       var that = this;
       var isClick = that.isClick;
       var form = new FormData();
@@ -441,7 +438,7 @@ export default {
         that
           .$axios({
             method: "post",
-            url: "bigservers/answer_praise",
+            url: "http://192.168.1.8:8002/answer_praise",
             data: form,
             headers: {
               "Content-Type": "multipart/form-data",
@@ -486,7 +483,7 @@ export default {
         that
           .$axios({
             method: "post",
-            url: "bigservers/answer_praise",
+            url: "http://192.168.1.8:8002/answer_praise",
             data: form,
             headers: {
               "Content-Type": "multipart/form-data",
@@ -628,7 +625,7 @@ export default {
 .swiper-container-autoheight .swiper-slide {
   height: 100%;
 }
-.navlist {
+.exchange_box_main .navlist {
   background: #fff;
 }
 .exchange_box_main .navlist ul {
@@ -637,7 +634,7 @@ export default {
   justify-content: space-between;
 }
 
-.navlist .activeT {
+.exchange_box_main .navlist .activeT {
   border-bottom: 1px solid #1ec8a1;
   color: #1ec8a1;
 }

discern/src/components/field_details/field_details.vue

@@ -23,7 +23,7 @@
             <div class="field_details_box_main-listA-userBox">
               <img
                 preview="1"
-                v-lazy="'/bigservers' + photo"
+                v-lazy="'http://192.168.1.8:8002/' + photo"
                 alt
                 class="field_details_box_main-listA-userBox-img"
               />
@@ -53,7 +53,7 @@
                 >
                   <img
                     preview="1"
-                    v-lazy="'/bigservers' + item"
+                    v-lazy="'http://192.168.1.8:8002/' + item"
                     alt
                     class="field_details_box_main-listA-imageList"
                   />
@@ -121,7 +121,7 @@
           <div class="field_details_commentList-div1">
             <img
               preview="1"
-              v-lazy="'/bigservers' + item.photo"
+              v-lazy="'http://192.168.1.8:8002/' + item.photo"
               alt=""
               class="field_details_commentList_img1"
             />
@@ -273,7 +273,7 @@ export default {
       that
         .$axios({
           method: "post",
-          url: "bigservers/user_answer",
+          url: "http://192.168.1.8:8002/user_answer",
           data: form,
           headers: {
             "Content-Type": "multipart/form-data",
@@ -358,7 +358,7 @@ export default {
         that
           .$axios({
             method: "post",
-            url: "bigservers/answer_praise",
+            url: "http://192.168.1.8:8002/answer_praise",
             data: form,
           })
           .then((res) => {
@@ -399,7 +399,7 @@ export default {
         that
           .$axios({
             method: "post",
-            url: "bigservers/answer_praise",
+            url: "http://192.168.1.8:8002/answer_praise",
             data: form,
           })
           .then((res) => {
@@ -441,7 +441,7 @@ export default {
         that
           .$axios({
             method: "post",
-            url: "bigservers/answer_praise",
+            url: "http://192.168.1.8:8002/answer_praise",
             data: form,
           })
           .then((res) => {
@@ -488,7 +488,7 @@ export default {
         that
           .$axios({
             method: "post",
-            url: "bigservers/answer_praise",
+            url: "http://192.168.1.8:8002/answer_praise",
             data: form,
           })
           .then((res) => {
@@ -545,7 +545,7 @@ export default {
         that
           .$axios({
             method: "post",
-            url: "bigservers/user_reply",
+            url: "http://192.168.1.8:8002/user_reply",
             data: form,
             headers: {
               "Content-Type": "multipart/form-data",
@@ -595,6 +595,7 @@ export default {
     that.id = that.$route.query.id;
     that.photo = that.$route.query.photo;
     that.ret = that.$route.query.ret;
+    console.log(that.like)
     that.get_boderHeight(); //动态获取浏览器高度
     that.fieldDetailsData(); //详情数据接口
 

discern/src/components/fieldsShow/fieldsShow.vue

@@ -209,6 +209,9 @@ export default {
       organizationData: [],
       jgName: "",
       jgNum: "",
+      ret: '',
+      img: '',
+      errorShow: null,
     };
   },
   //监听属性 类似于data概念
@@ -258,7 +261,18 @@ export default {
     // 返回
     goBack() {
       var that = this;
-      that.$router.replace("/authenticate");
+      var ret = that.ret
+      if (ret == '1') {
+        that.$router.replace({
+          name: 'show',
+          query: {
+            errorShow: that.errorShow
+          }
+        })
+      } else if (ret == '2') {
+        that.$router.replace("/authenticate");
+      }
+      localStorage.removeItem('add')
     },
 
     //上传图片-删除
@@ -276,7 +290,7 @@ export default {
         .then(() => {
           this.$axios({
             method: "post",
-            url: "bigservers/del_img",
+            url: "http://192.168.1.8:8002/del_img",
             data: postData,
           })
             .then((res) => {
@@ -321,7 +335,7 @@ export default {
       _this
         .$axios({
           method: "post",
-          url: "bigservers/send_answer_img",
+          url: "http://192.168.1.8:8002/send_answer_img",
           anync: true,
           data: form,
           headers: {
@@ -377,7 +391,7 @@ export default {
           _this
             .$axios({
               method: "post",
-              url: "bigservers/save_answer",
+              url: "http://192.168.1.8:8002/save_answer",
               data: form,
               headers: {
                 "Content-Type": "multipart/form-data",
@@ -392,9 +406,9 @@ export default {
                   duration: 1500,
                 });
                 this.$router.replace("/authenticate");
-                const timeA = setInterval(() => {
-                  location.reload();
-                }, 1500);
+                // const timeA = setInterval(() => {
+                //   location.reload();
+                // }, 1500);
               } else {
                 this.$notify.error({
                   title: "错误",
@@ -535,6 +549,17 @@ export default {
       _this.loading = false;
     }, 1500);
 
+    _this.ret = _this.$route.query.ret
+    _this.img = _this.$route.query.img
+    _this.errorShow = _this.$route.query.errorShow
+    // 判断是否有图片
+    // if (_this.img !== undefined) {
+    //   _this.dialogImageUrl = _this.img
+    //   var arr = []
+    //   arr.push(_this.img)
+    //   localStorage.setItem('add', arr)
+    // }
+
     // window.onresize监听页面高度的变化
     window.onresize = () => {
       return (() => {

discern/src/components/followUp/followUp.vue

@@ -37,7 +37,7 @@
             <div class="followUp_main-list-div1">
               <img
                 preview="1"
-                v-lazy="'/bigservers' + item.user_picture"
+                v-lazy="'http://192.168.1.8:8002/' + item.user_picture"
                 alt=""
                 class="followUp_main-list-div1Img"
               />
@@ -181,7 +181,7 @@ export default {
       that
         .$axios({
           method: "get",
-          url: "bigservers/reply_list",
+          url: "http://192.168.1.8:8002/reply_list",
           params: {
             page: that.mescrollUp.page.num,
           },
@@ -231,7 +231,7 @@ export default {
       that
         .$axios({
           method: "get",
-          url: "bigservers/reply_list",
+          url: "http://192.168.1.8:8002/reply_list",
           parsm: {
             page: 1,
           },
@@ -255,7 +255,7 @@ export default {
           that
             .$axios({
               method: "get",
-              url: "bigservers/user_reply",
+              url: "http://192.168.1.8:8002/user_reply",
               params: {
                 id: id,
                 ret: "reply",

discern/src/components/forget/forget.vue

@@ -258,7 +258,7 @@ export default {
         _this
           .$axios({
             method: "post",
-            url: "bigservers/reset_password",
+            url: "http://192.168.1.8:8002/reset_password",
             data: postData,
             headers: {
               "Content-Type": "multipart/form-data"
@@ -340,7 +340,7 @@ export default {
 
       this.$axios({
         method: "post",
-        url: "bigservers/reset_password",
+        url: "http://192.168.1.8:8002/reset_password",
         data: postData,
         headers: {
           "Content-Type": "multipart/form-data"

discern/src/components/help/help.vue

@@ -17,7 +17,7 @@
       <div class="help_box-headBox">
         <img
           preview="1"
-          v-lazy="'/bigservers' + img"
+          v-lazy="'http://192.168.1.8:8002/' + img"
           alt=""
           class="help_box-headImg"
         />
@@ -73,7 +73,7 @@
                   <div class="help_box-main-listA-userBox">
                     <img
                       preview="1"
-                      v-lazy="'/bigservers' + item.photo"
+                      v-lazy="'http://192.168.1.8:8002/' + item.photo"
                       alt
                       class="help_box-main-listA-userBox-img"
                     />
@@ -115,7 +115,7 @@
                         preview="1"
                       >
                         <img
-                          v-lazy="'/bigservers' + itemA"
+                          v-lazy="'http://192.168.1.8:8002/' + itemA"
                           alt
                           class="help_box-main-listA-imageList"
                         />
@@ -203,7 +203,7 @@
                   <div class="help_box-main-authenticateList-box1">
                     <img
                       preview="1"
-                      v-lazy="'/bigservers' + itemA.img[0]"
+                      v-lazy="'http://192.168.1.8:8002/' + itemA.img[0]"
                       alt
                       class="help_box-main-authenticateList-box1-img"
                     />
@@ -216,7 +216,7 @@
                     <div class="help_box-main-authenticateList-box3">
                       <img
                         preview="1"
-                        v-lazy="'/bigservers' + itemA.photo"
+                        v-lazy="'http://192.168.1.8:8002/' + itemA.photo"
                         alt
                         class="help_box-main-authenticateList-box3-img"
                       />
@@ -321,18 +321,37 @@ export default {
     };
   },
   beforeRouteEnter(to, from, next) {
+    if (from.name === "field_details") {
+      to.meta.isBack = true;
+    }
     // 如果没有配置顶部按钮或isBounce,则beforeRouteEnter不用写
     next((vm) => {
-      // 滚动到原来的列表位置,恢复顶部按钮和isBounce的配置
-      vm.$refs.mescroll && vm.$refs.mescroll.beforeRouteEnter();
+      if (from.name === "field_details") {
+        // 滚动到原来的列表位置,恢复顶部按钮和isBounce的配置
+        vm.$refs.mescroll && vm.$refs.mescroll.beforeRouteEnter();
+      }
     });
   },
   beforeRouteLeave(to, from, next) {
-    // 如果没有配置顶部按钮或isBounce,则beforeRouteLeave不用写
-    // 记录列表滚动的位置,隐藏顶部按钮和isBounce的配置
-    this.$refs.mescroll && this.$refs.mescroll.beforeRouteLeave();
+    if (to.name !== "field_details") {
+      to.meta.isBack = false;
+    } else {
+      to.meta.isBack = true;
+      // 如果没有配置顶部按钮或isBounce,则beforeRouteLeave不用写
+      // 记录列表滚动的位置,隐藏顶部按钮和isBounce的配置
+      this.$refs.mescroll && this.$refs.mescroll.beforeRouteLeave();
+    }
+
     next();
   },
+  activated() {
+    if (!this.$route.meta.isBack) {
+      // 如果isBack是false，表明需要获取新数据，否则就不再请求，直接使用缓存的数据
+      this.mescroll.resetUpScroll(); // 刷新列表数据
+    }
+    // 恢复成默认的false，避免isBack一直是true，导致下次无法获取数据
+    this.$route.meta.isBack = false;
+  },
   //监听属性 类似于data概念
   computed: {},
   //监控data中的数据变化
@@ -388,7 +407,7 @@ export default {
       that
         .$axios({
           method: "get",
-          url: "bigservers/user_answer",
+          url: "http://192.168.1.8:8002/user_answer",
           params: {
             page: that.mescrollUp.page.num,
             ret: "user",
@@ -502,7 +521,7 @@ export default {
       that
         .$axios({
           method: "get",
-          url: "bigservers/user_answer",
+          url: "http://192.168.1.8:8002/user_answer",
           params: {
             page: 1,
             ret: "user",
@@ -594,7 +613,7 @@ export default {
         that
           .$axios({
             method: "post",
-            url: "bigservers/farm_likes",
+            url: "http://192.168.1.8:8002/farm_likes",
             data: postData,
           })
           .then((res) => {
@@ -637,7 +656,7 @@ export default {
         that
           .$axios({
             method: "post",
-            url: "bigservers/farm_likes",
+            url: "http://192.168.1.8:8002/farm_likes",
             data: postData,
           })
           .then((res) => {
@@ -683,7 +702,7 @@ export default {
           that
             .$axios({
               method: "get",
-              url: "bigservers/user_reply",
+              url: "http://192.168.1.8:8002/user_reply",
               params: {
                 id: id,
                 ret: "anwers",

discern/src/components/home/css/home1.scss

@@ -49,7 +49,7 @@
     justify-content: space-between;
   }
   
-  .navlist .activeT {
+  .home1_box_main .navlist .activeT {
     border-bottom: 1px solid #1ec8a1;
     color: #1ec8a1;
   }

discern/src/components/home/home.vue

@@ -133,7 +133,7 @@
 
             <div class="home_box_div1_listBox_article2_div">
               <img
-                v-lazy="'/bigservers' + item.imgArr[0]"
+                v-lazy="'http://192.168.1.8:8002/' + item.imgArr[0]"
                 alt=""
                 class="home_box_div1_listBox_article2_div_img"
               />
@@ -178,14 +178,14 @@ export default {
   data() {
     //这里存放数据
     return {
-      userAxios: {}, //获取用户个人信息 
+      userAxios: {}, //获取用户个人信息
       fullHeight: document.documentElement.clientHeight, //自适应高度
       activeName: "second", //tab切换交流、鉴定、方案
       botNav: true, //底部导航
       lunboImgList: [
-        "bigservers/discern_photos/rotation/1.png",
-        "bigservers/discern_photos/rotation/2.png",
-        "bigservers/discern_photos/rotation/3.png",
+        "http://192.168.1.8:8002/discern_photos/rotation/1.png",
+        "http://192.168.1.8:8002/discern_photos/rotation/2.png",
+        "http://192.168.1.8:8002/discern_photos/rotation/3.png",
       ], //轮播图
       schemeArr: [], //方案数据数组
       loading: true,
@@ -228,18 +228,37 @@ export default {
     };
   },
   beforeRouteEnter(to, from, next) {
+    if (from.name === "schemeDetails") {
+      to.meta.isBack = true;
+    }
     // 如果没有配置顶部按钮或isBounce,则beforeRouteEnter不用写
     next((vm) => {
-      // 滚动到原来的列表位置,恢复顶部按钮和isBounce的配置
-      vm.$refs.mescroll && vm.$refs.mescroll.beforeRouteEnter();
+      if (from.name === "schemeDetails") {
+        // 滚动到原来的列表位置,恢复顶部按钮和isBounce的配置
+        vm.$refs.mescroll && vm.$refs.mescroll.beforeRouteEnter();
+      }
     });
   },
   beforeRouteLeave(to, from, next) {
-    // 如果没有配置顶部按钮或isBounce,则beforeRouteLeave不用写
-    // 记录列表滚动的位置,隐藏顶部按钮和isBounce的配置
-    this.$refs.mescroll && this.$refs.mescroll.beforeRouteLeave();
+    if (to.name !== "schemeDetails") {
+      to.meta.isBack = false;
+    } else {
+      to.meta.isBack = true;
+      // 如果没有配置顶部按钮或isBounce,则beforeRouteLeave不用写
+      // 记录列表滚动的位置,隐藏顶部按钮和isBounce的配置
+      this.$refs.mescroll && this.$refs.mescroll.beforeRouteLeave();
+    }
+    // this.$refs.mescroll && this.$refs.mescroll.beforeRouteLeave();
     next();
   },
+  activated() {
+    if (!this.$route.meta.isBack) {
+      // 如果isBack是false，表明需要获取新数据，否则就不再请求，直接使用缓存的数据
+      this.mescroll.resetUpScroll(); // 刷新列表数据
+    }
+    // 恢复成默认的false，避免isBack一直是true，导致下次无法获取数据
+    this.$route.meta.isBack = false;
+  },
 
   //监听属性 类似于data概念
   computed: {},
@@ -294,7 +313,7 @@ export default {
       that
         .$axios({
           method: "get",
-          url: "bigservers/save_news",
+          url: "http://192.168.1.8:8002/save_news",
           params: {
             page: that.mescrollUp.page.num,
           },
@@ -322,7 +341,6 @@ export default {
               arr[i]["newTime"] = r;
               arr[i]["imgArr"] = result;
             }
-            console.log(arr);
             // that.schemeArr = arr;
 
             // 如果是第一页需手动置空列表
@@ -335,7 +353,6 @@ export default {
               mescroll.endSuccess(arr.length);
             });
           } else {
-            console.log("暂无数据");
             var arr = [];
             this.$nextTick(() => {
               mescroll.endSuccess(arr.length);
@@ -385,7 +402,7 @@ export default {
     //   that
     //     .$axios({
     //       method: "get",
-    //       url: "bigservers/save_news",
+    //       url: "http://192.168.1.8:8002/save_news",
     //       params: {
     //         page: 1,
     //       },
@@ -436,7 +453,7 @@ export default {
       that
         .$axios({
           method: "get",
-          url: "bigservers/see_user",
+          url: "http://192.168.1.8:8002/see_user",
         })
         .then((res) => {
           that.userAxios = res.data;
@@ -474,13 +491,6 @@ export default {
       },
     });
   },
-
-  // activated() {
-  //   console.log("有的");
-  // }, //如果页面有keep-alive缓存功能，这个函数会触发
-  // deactivated() {
-  //   console.log("嗯哼");
-  // },
 };
 </script>
 <style lang='scss'>

discern/src/components/home/home1.vue

@@ -59,7 +59,7 @@
                 <div class="home1_box_main-listA-userBox">
                   <img
                     preview="1"
-                    v-lazy="'/bigservers' + item.photo"
+                    v-lazy="'http://192.168.1.8:8002/' + item.photo"
                     alt
                     class="home1_box_main-listA-userBox-img"
                   />
@@ -94,7 +94,7 @@
                       preview="1"
                     >
                       <img
-                        v-lazy="'/bigservers' + itemA"
+                        v-lazy="'http://192.168.1.8:8002/' + itemA"
                         alt
                         class="home1_box_main-listA-imageList"
                       />
@@ -174,7 +174,7 @@
                 <div class="home1_box-main-authenticateList-box1">
                   <img
                     preview="1"
-                    v-lazy="'/bigservers' + item.img[0]"
+                    v-lazy="'http://192.168.1.8:8002/' + item.img[0]"
                     alt
                     class="home1_box-main-authenticateList-box1-img"
                   />
@@ -187,7 +187,7 @@
                   <div class="home1_box-main-authenticateList-box3">
                     <img
                       preview="1"
-                      v-lazy="'/bigservers' + item.photo"
+                      v-lazy="'http://192.168.1.8:8002/' + item.photo"
                       alt
                       class="home1_box-main-authenticateList-box3-img"
                     />
@@ -423,7 +423,7 @@ export default {
       that
         .$axios({
           method: "get",
-          url: "bigservers/user_answer",
+          url: "http://192.168.1.8:8002/user_answer",
           params: {
             page: 1,
             ret: "all", //区别是全部还是个人
@@ -466,7 +466,7 @@ export default {
         that
           .$axios({
             method: "post",
-            url: "bigservers/answer_praise",
+            url: "http://192.168.1.8:8002/answer_praise",
             data: form,
             headers: {
               "Content-Type": "multipart/form-data",
@@ -511,7 +511,7 @@ export default {
         that
           .$axios({
             method: "post",
-            url: "bigservers/answer_praise",
+            url: "http://192.168.1.8:8002/answer_praise",
             data: form,
             headers: {
               "Content-Type": "multipart/form-data",

discern/src/components/lianxi/lianxi.vue

@@ -211,7 +211,7 @@ export default {
       that
         .$axios({
           method: "post",
-          url: "bigservers/see_dase",
+          url: "http://192.168.1.8:8002/see_dase",
           data: postData,
           headers: {
             "Content-Type": "multipart/form-data",
@@ -299,7 +299,7 @@ export default {
       that
         .$axios({
           method: "post",
-          url: "bigservers/see_dase",
+          url: "http://192.168.1.8:8002/see_dase",
           data: postData,
           headers: {
             "Content-Type": "multipart/form-data",
@@ -350,7 +350,7 @@ export default {
         that
           .$axios({
             method: "post",
-            url: "bigservers/search",
+            url: "http://192.168.1.8:8002/search",
             data: form,
             headers: {
               "Content-Type": "multipart/form-data",

discern/src/components/login/login.vue

@@ -391,7 +391,7 @@ export default {
           .$axios({
             method: "post",
             // url: "/check_tourist",
-            url: "bigservers/check_tourist",
+            url: "http://192.168.1.8:8002/check_tourist",
             data: postData,
           })
           .then((res) => {
@@ -407,7 +407,7 @@ export default {
             } else if (res.data === 2) {
               this.$axios({
                 method: "get",
-                url: "bigservers/tourist_in",
+                url: "http://192.168.1.8:8002/tourist_in",
               })
                 .then((res) => {
                   this.redata = res.data;
@@ -468,7 +468,7 @@ export default {
         _this
           .$axios({
             method: "post",
-            url: "bigservers/land_in",
+            url: "http://192.168.1.8:8002/land_in",
             data: postData,
             headers: {
               "Content-Type": "multipart/form-data",
@@ -501,7 +501,7 @@ export default {
               localStorage.setItem("accountName", res.data[0].username); //用户名称
               sessionStorage.setItem("login", this.ruleForm.username); //登录状态标识
               _this.$router.replace("/home");
-              location.reload();
+              // location.reload();
               //判断是否是管理员账号
               if (
                 res.data[0].is_active === true &&
@@ -560,7 +560,7 @@ export default {
       var wait = plus.nativeUI.showWaiting("下载更新中，请勿关闭");
       //创建一个下载任务
       var dtask = plus.downloader.createDownload(
-        "bigservers/down_app/" + data,
+        "http://192.168.1.8:8002/down_app/" + data,
         {
           method: "GET",
         },
@@ -578,7 +578,7 @@ export default {
       //开始下载
       dtask.start();
 
-      // window.location.href = "bigservers/down_app/" + data;
+      // window.location.href = "http://192.168.1.8:8002/down_app/" + data;
       // this.scheduleShow = true;
       // const timer = setInterval(() => {
       //   this.percentage += 10;
@@ -640,7 +640,7 @@ export default {
       _this
         .$axios({
           method: "post",
-          url: "bigservers/tourist_in",
+          url: "http://192.168.1.8:8002/tourist_in",
           data: postData,
         })
         .then((res) => {
@@ -662,7 +662,7 @@ export default {
             if (res.data[0].ret === "user") {
               //账号登录
               _this.$router.replace("/home");
-              location.reload();
+              // location.reload();
             } else if (res.data[0].ret === "tourist") {
               //游客登录
               _this.$router.replace("/tourist");
@@ -872,7 +872,7 @@ export default {
     _this
       .$axios({
         method: "get",
-        url: "bigservers/edition"
+        url: "http://192.168.1.8:8002/edition"
       })
       .then(res => {
         let num = "115";
@@ -902,7 +902,7 @@ export default {
     _this
       .$axios({
         method: "post",
-        url: "bigservers/check_tourist",
+        url: "http://192.168.1.8:8002/check_tourist",
         data: postData,
       })
       .then((res) => {
@@ -919,7 +919,7 @@ export default {
         } else if (res.data === 2) {
           this.$axios({
             method: "get",
-            url: "bigservers/tourist_in",
+            url: "http://192.168.1.8:8002/tourist_in",
           })
             .then((res) => {
               this.redata = res.data;

discern/src/components/mapShow/mapShow.vue

@@ -380,7 +380,7 @@ export default {
   created() {
     this.$axios({
       method: "get",
-      url: "bigservers/insect_map?page=1",
+      url: "http://192.168.1.8:8002/insect_map?page=1",
     })
       .then((res) => {
         this.redata = res.data;
@@ -405,7 +405,7 @@ export default {
     _this
       .$axios({
         method: "get",
-        url: "bigservers/see_user",
+        url: "http://192.168.1.8:8002/see_user",
       })
       .then((res) => {
         _this.redata = res.data[0];

discern/src/components/megXq/megXq.vue

@@ -25,7 +25,7 @@
       <div class="megXq_main_user">
         <!-- 头像 -->
         <div class="main_user_img_box">
-          <img :src=" 'bigservers/' + this.redata.user_photo" alt class="main_user_img" />
+          <img :src=" 'http://192.168.1.8:8002/' + this.redata.user_photo" alt class="main_user_img" />
         </div>
 
         <div class="main_user_box">
@@ -138,7 +138,7 @@ export default {
       _this
         .$axios({
           method: "post",
-          url: "bigservers/check_leaving",
+          url: "http://192.168.1.8:8002/check_leaving",
           data: postData,
           headers: {
             "Content-Type": "multipart/form-data"
@@ -151,9 +151,9 @@ export default {
             duration: 1000
           });
           _this.$router.replace("/message");
-           const timeA = setInterval(() => {
-              location.reload();
-            }, 1500);
+          //  const timeA = setInterval(() => {
+          //     location.reload();
+          //   }, 1500);
         })
         .catch(error => {
           this.$message({
@@ -174,7 +174,7 @@ export default {
       _this
         .$axios({
           method: "post",
-          url: "bigservers/see_leaving",
+          url: "http://192.168.1.8:8002/see_leaving",
           data: postData,
           headers: {
             "Content-Type": "multipart/form-data"
@@ -189,9 +189,9 @@ export default {
           _this.textarea = "";
           // _this.$router.push("/message");
           _this.$router.replace("/message");
-           const timeA = setInterval(() => {
-              location.reload();
-            }, 1500);
+          //  const timeA = setInterval(() => {
+          //     location.reload();
+          //   }, 1500);
         })
         .catch(error => {
           this.$message({
@@ -213,7 +213,7 @@ export default {
     });
     this.$axios({
       method: "post",
-      url: "bigservers/check_leaving",
+      url: "http://192.168.1.8:8002/check_leaving",
       data: postData,
       headers: {
         "Content-Type": "multipart/form-data"

discern/src/components/memory/memory.vue

@@ -44,7 +44,7 @@
                     preview="1"
                     v-lazy="
                       item.img_urls == null
-                        ? 'bigservers/' + item.img
+                        ? 'http://192.168.1.8:8002/' + item.img
                         : item.img_urls
                     "
                     alt
@@ -134,18 +134,36 @@ export default {
     };
   },
   beforeRouteEnter(to, from, next) {
+    if (from.name === "record") {
+      to.meta.isBack = true;
+    }
     // 如果没有配置顶部按钮或isBounce,则beforeRouteEnter不用写
     next((vm) => {
-      // 滚动到原来的列表位置,恢复顶部按钮和isBounce的配置
-      vm.$refs.mescroll && vm.$refs.mescroll.beforeRouteEnter();
+      if (from.name === "record") {
+        // 滚动到原来的列表位置,恢复顶部按钮和isBounce的配置
+        vm.$refs.mescroll && vm.$refs.mescroll.beforeRouteEnter();
+      }
     });
   },
   beforeRouteLeave(to, from, next) {
-    // 如果没有配置顶部按钮或isBounce,则beforeRouteLeave不用写
-    // 记录列表滚动的位置,隐藏顶部按钮和isBounce的配置
-    this.$refs.mescroll && this.$refs.mescroll.beforeRouteLeave();
+    if (to.name !== "record") {
+      to.meta.isBack = false;
+    } else {
+      to.meta.isBack = true;
+      // 如果没有配置顶部按钮或isBounce,则beforeRouteLeave不用写
+      // 记录列表滚动的位置,隐藏顶部按钮和isBounce的配置
+      this.$refs.mescroll && this.$refs.mescroll.beforeRouteLeave();
+    }
     next();
   },
+  activated() {
+    if (!this.$route.meta.isBack) {
+      // 如果isBack是false，表明需要获取新数据，否则就不再请求，直接使用缓存的数据
+      this.mescroll.resetUpScroll(); // 刷新列表数据
+    }
+    // 恢复成默认的false，避免isBack一直是true，导致下次无法获取数据
+    this.$route.meta.isBack = false;
+  },
   //监听属性 类似于data概念
   computed: {},
   //监控data中的数据变化
@@ -194,7 +212,7 @@ export default {
       that
         .$axios({
           method: "post",
-          url: "bigservers/check_record",
+          url: "http://192.168.1.8:8002/check_record",
           data: form,
           headers: {
             "Content-Type": "multipart/form-data",
@@ -275,7 +293,7 @@ export default {
     //   that
     //     .$axios({
     //       method: "post",
-    //       url: "bigservers/check_record",
+    //       url: "http://192.168.1.8:8002/check_record",
     //       data: form,
     //       headers: {
     //         "Content-Type": "multipart/form-data",

discern/src/components/message/message.vue

@@ -168,7 +168,7 @@ export default {
       let _this = this;
       this.$axios({
         method: "get",
-        url: "bigservers/check_leaving",
+        url: "http://192.168.1.8:8002/check_leaving",
         params: {
           page: _this.mescrollUp.page.num
         }

discern/src/components/message_list/message_list.vue

@@ -118,7 +118,7 @@ export default {
       _this
         .$axios({
           method: "post",
-          url: "bigservers/user_news",
+          url: "http://192.168.1.8:8002/user_news",
           data: postData
         })
         .then(res => {
@@ -153,7 +153,7 @@ export default {
     read() {
       this.$axios({
         method: "get",
-        url: "bigservers/del_news",
+        url: "http://192.168.1.8:8002/del_news",
         params: {
           id: "",
           ret: "all"
@@ -180,7 +180,7 @@ export default {
     read_del() {
       this.$axios({
         method: "get",
-        url: "bigservers/del_news",
+        url: "http://192.168.1.8:8002/del_news",
         params: {
           id: "",
           ret: "off"

discern/src/components/mine/mine.vue

@@ -33,7 +33,7 @@
             <img
               v-if="imgShow"
               preview="1"
-              :src=" 'bigservers/' + this.redata.user_photo  + '?' + Math.random() * 10"
+              :src=" 'http://192.168.1.8:8002/' + this.redata.user_photo  + '?' + Math.random() * 10"
               alt
               class="portrait_img"
             />
@@ -208,7 +208,7 @@ export default {
       _this
         .$axios({
           method: "post",
-          url: "bigservers/alter_head",
+          url: "http://192.168.1.8:8002/alter_head",
           anync: true,
           data: form,
           headers: {
@@ -284,7 +284,7 @@ export default {
         _this
           .$axios({
             method: "post",
-            url: "bigservers/alter_remark",
+            url: "http://192.168.1.8:8002/alter_remark",
             data: postData,
             headers: {
               "Content-Type": "multipart/form-data"
@@ -339,7 +339,7 @@ export default {
       _this
         .$axios({
           method: "get",
-          url: "bigservers/see_user"
+          url: "http://192.168.1.8:8002/see_user"
         })
         .then(res => {
           _this.redata = res.data;

discern/src/components/modification/modification.vue

@@ -197,7 +197,7 @@ export default {
       _this
         .$axios({
           method: "post",
-          url: "bigservers/alter_password",
+          url: "http://192.168.1.8:8002/alter_password",
           data: postData,
           headers: {
             "Content-Type": "multipart/form-data",

discern/src/components/newScheme/newScheme.vue

@@ -280,7 +280,7 @@ export default {
         .then(() => {
           this.$axios({
             method: "post",
-            url: "bigservers/del_img",
+            url: "http://192.168.1.8:8002/del_img",
             data: postData,
           })
             .then((res) => {
@@ -325,7 +325,7 @@ export default {
       _this
         .$axios({
           method: "post",
-          url: "bigservers/send_answer_img",
+          url: "http://192.168.1.8:8002/send_answer_img",
           anync: true,
           data: form,
           headers: {
@@ -379,7 +379,7 @@ export default {
           _this
             .$axios({
               method: "post",
-              url: "bigservers/save_news",
+              url: "http://192.168.1.8:8002/save_news",
               data: form,
               headers: {
                 "Content-Type": "multipart/form-data",
@@ -394,9 +394,9 @@ export default {
                   duration: 1500,
                 });
                 this.$router.push("/scheme");
-                const timeA = setInterval(() => {
-                  location.reload();
-                }, 1500);
+                // const timeA = setInterval(() => {
+                //   location.reload();
+                // }, 1500);
               } else {
                 this.$notify.error({
                   title: "错误",

discern/src/components/person/person.vue

@@ -17,7 +17,7 @@
           <div class="person_box-list-box1">
             <img
               preview="1"
-              v-lazy="'/bigservers' + redata.user_photo"
+              v-lazy="'http://192.168.1.8:8002/' + redata.user_photo"
               alt=""
               class="person_box-list-box1-img"
             />
@@ -269,7 +269,7 @@ export default {
       that
         .$axios({
           method: "get",
-          url: "bigservers/see_user",
+          url: "http://192.168.1.8:8002/see_user",
         })
         .then((res) => {
           if (res.data) {
@@ -346,7 +346,7 @@ export default {
         that
           .$axios({
             method: "post",
-            url: "bigservers/itegral_sign",
+            url: "http://192.168.1.8:8002/itegral_sign",
           })
           .then((res) => {
             if (res.data.code == "200") {

discern/src/components/popUp/popUp.vue

@@ -241,7 +241,7 @@ export default {
         form.append("gis", "118.279643#31.221456");
         this.$axios({
           method: "post",
-          url: "academysciences/recognizationSys/api/recognization",
+          url: "http://47.99.110.100:8080/recognizationSys/api/recognization",
           anync: true,
           data: form,
           headers: {
@@ -315,7 +315,7 @@ export default {
         form.append("gis", "118.279643#31.221456");
         this.$axios({
           method: "post",
-          url: "academysciences/recognizationSys/api/recognization",
+          url: "http://47.99.110.100:8080/recognizationSys/api/recognization",
           anync: true,
           data: form,
           headers: {

discern/src/components/questions/questions.vue

@@ -282,7 +282,7 @@ export default {
         .then(() => {
           this.$axios({
             method: "post",
-            url: "bigservers/del_img",
+            url: "http://192.168.1.8:8002/del_img",
             data: postData,
           })
             .then((res) => {
@@ -327,7 +327,7 @@ export default {
       _this
         .$axios({
           method: "post",
-          url: "bigservers/send_answer_img",
+          url: "http://192.168.1.8:8002/send_answer_img",
           anync: true,
           data: form,
           headers: {
@@ -383,7 +383,7 @@ export default {
           _this
             .$axios({
               method: "post",
-              url: "bigservers/save_answer",
+              url: "http://192.168.1.8:8002/save_answer",
               data: form,
               headers: {
                 "Content-Type": "multipart/form-data",

discern/src/components/questions_details/questions_details.vue

@@ -13,7 +13,7 @@
           <el-carousel-item v-for="item in imageData" :key="item">
             <img
               preview="1"
-              v-lazy=" 'bigservers/' + item"
+              v-lazy=" 'http://192.168.1.8:8002/' + item"
               alt
               class="lunboImg"
             />
@@ -37,7 +37,7 @@
         <div class="questions_details_NameBox">
           <div class="questions_details_NameBox_box">
             <img
-              :src=" 'bigservers/' + this.redata.photo + '?' + Math.random() * 10"
+              :src=" 'http://192.168.1.8:8002/' + this.redata.photo + '?' + Math.random() * 10"
               alt
               class="questions_details_NameBox_image"
             />
@@ -93,7 +93,7 @@
               <div class="criticOne_profile">
                 <!-- 头像和名称 -->
                 <div class="profile_box">
-                  <img :src=" 'bigservers/' + item.photo + '?' + Math.random() * 10" alt class="profile_img" />
+                  <img :src=" 'http://192.168.1.8:8002/' + item.photo + '?' + Math.random() * 10" alt class="profile_img" />
                   <!-- <div class="profile_name">{{ item.username }}</div> -->
                   <div
                     class="profile_name"
@@ -142,7 +142,7 @@
                 <!-- 头像和名称 -->
                 <div class="criticTwo_profile">
                   <img
-                    :src=" 'bigservers/' + itemA.photo + '?' + Math.random() * 10"
+                    :src=" 'http://192.168.1.8:8002/' + itemA.photo + '?' + Math.random() * 10"
                     alt
                     class="profileTwo_img"
                   />
@@ -340,7 +340,7 @@ export default {
       _this
         .$axios({
           method: "post",
-          url: "bigservers/user_answer",
+          url: "http://192.168.1.8:8002/user_answer",
           data: postData
         })
         .then(res => {
@@ -416,7 +416,7 @@ export default {
         _this
           .$axios({
             method: "post",
-            url: "bigservers/user_reply",
+            url: "http://192.168.1.8:8002/user_reply",
             data: postData
           })
           .then(res => {
@@ -460,7 +460,7 @@ export default {
         _this
           .$axios({
             method: "post",
-            url: "bigservers/answer_praise",
+            url: "http://192.168.1.8:8002/answer_praise",
             data: postData
           })
           .then(res => {
@@ -507,7 +507,7 @@ export default {
         _this
           .$axios({
             method: "post",
-            url: "bigservers/answer_praise",
+            url: "http://192.168.1.8:8002/answer_praise",
             data: postData
           })
           .then(res => {
@@ -554,7 +554,7 @@ export default {
         _this
           .$axios({
             method: "post",
-            url: "bigservers/answer_praise",
+            url: "http://192.168.1.8:8002/answer_praise",
             data: postData
           })
           .then(res => {
@@ -596,7 +596,7 @@ export default {
         _this
           .$axios({
             method: "post",
-            url: "bigservers/answer_praise",
+            url: "http://192.168.1.8:8002/answer_praise",
             data: postData
           })
           .then(res => {
@@ -635,7 +635,7 @@ export default {
       _this
         .$axios({
           method: "post",
-          url: "bigservers/reminder",
+          url: "http://192.168.1.8:8002/reminder",
           data: postData
         })
         .then(res => {

discern/src/components/record/record.vue

@@ -43,7 +43,7 @@
         <img
           preview="1"
           v-lazy="
-            redata.img_urls == '' ? 'bigservers/' + redata.img : redata.img_urls
+            redata.img_urls == '' ? 'http://192.168.1.8:8002/' + redata.img : redata.img_urls
           "
           alt=""
           class="record_box_imgBox-img"
@@ -185,7 +185,7 @@ export default {
       that
         .$axios({
           method: "post",
-          url: "bigservers/dase_list",
+          url: "http://192.168.1.8:8002/dase_list",
           data: form,
           headers: {
             "Content-Type": "multipart/form-data",
@@ -239,7 +239,7 @@ export default {
       that
         .$axios({
           method: "post",
-          url: "bigservers/see_details",
+          url: "http://192.168.1.8:8002/see_details",
           data: postData,
         })
         .then((res) => {
@@ -295,7 +295,7 @@ export default {
       that
         .$axios({
           method: "post",
-          url: "bigservers/see_details",
+          url: "http://192.168.1.8:8002/see_details",
           data: postData,
         })
         .then((res) => {
@@ -387,7 +387,7 @@ export default {
         that
           .$axios({
             method: "post",
-            url: "bigservers/user_collect",
+            url: "http://192.168.1.8:8002/user_collect",
             data: form,
           })
           .then((res) => {
@@ -426,7 +426,7 @@ export default {
         that
           .$axios({
             method: "post",
-            url: "bigservers/user_collect",
+            url: "http://192.168.1.8:8002/user_collect",
             data: form,
           })
           .then((res) => {

discern/src/components/repository/repository.vue

@@ -209,18 +209,36 @@ export default {
     };
   },
   beforeRouteEnter(to, from, next) {
+    if (from.name === "record") {
+      to.meta.isBack = true;
+    }
     // 如果没有配置顶部按钮或isBounce,则beforeRouteEnter不用写
     next((vm) => {
-      // 滚动到原来的列表位置,恢复顶部按钮和isBounce的配置
-      vm.$refs.mescroll && vm.$refs.mescroll.beforeRouteEnter();
+      if (from.name === "record") {
+        // 滚动到原来的列表位置,恢复顶部按钮和isBounce的配置
+        vm.$refs.mescroll && vm.$refs.mescroll.beforeRouteEnter();
+      }
     });
   },
   beforeRouteLeave(to, from, next) {
-    // 如果没有配置顶部按钮或isBounce,则beforeRouteLeave不用写
-    // 记录列表滚动的位置,隐藏顶部按钮和isBounce的配置
-    this.$refs.mescroll && this.$refs.mescroll.beforeRouteLeave();
+    if (to.name !== "record") {
+      to.meta.isBack = false;
+    } else {
+      to.meta.isBack = true;
+      // 如果没有配置顶部按钮或isBounce,则beforeRouteLeave不用写
+      // 记录列表滚动的位置,隐藏顶部按钮和isBounce的配置
+      this.$refs.mescroll && this.$refs.mescroll.beforeRouteLeave();
+    }
     next();
   },
+  activated() {
+    if (!this.$route.meta.isBack) {
+      // 如果isBack是false，表明需要获取新数据，否则就不再请求，直接使用缓存的数据
+      this.mescroll.resetUpScroll(); // 刷新列表数据
+    }
+    // 恢复成默认的false，避免isBack一直是true，导致下次无法获取数据
+    this.$route.meta.isBack = false;
+  },
   //监听属性 类似于data概念
   computed: {},
   //监控data中的数据变化
@@ -283,7 +301,7 @@ export default {
       that
         .$axios({
           method: "post",
-          url: "bigservers/see_dase",
+          url: "http://192.168.1.8:8002/see_dase",
           data: postData,
           headers: {
             "Content-Type": "multipart/form-data",
@@ -371,7 +389,7 @@ export default {
       that
         .$axios({
           method: "post",
-          url: "bigservers/see_dase",
+          url: "http://192.168.1.8:8002/see_dase",
           data: postData,
           headers: {
             "Content-Type": "multipart/form-data",
@@ -422,7 +440,7 @@ export default {
         that
           .$axios({
             method: "post",
-            url: "bigservers/search",
+            url: "http://192.168.1.8:8002/search",
             data: form,
             headers: {
               "Content-Type": "multipart/form-data",

discern/src/components/scheme/scheme.vue

@@ -42,7 +42,7 @@
             <div class="scheme_box-main-authenticateListA-box1">
               <img
                 preview="1"
-                v-lazy="'/bigservers' + item.imgArr[0]"
+                v-lazy="'http://192.168.1.8:8002/' + item.imgArr[0]"
                 alt
                 class="scheme_box-main-authenticateListA-box1-img"
               />
@@ -130,18 +130,36 @@ export default {
     };
   },
   beforeRouteEnter(to, from, next) {
+    if (from.name === "schemeDetails") {
+      to.meta.isBack = true;
+    }
     // 如果没有配置顶部按钮或isBounce,则beforeRouteEnter不用写
     next((vm) => {
-      // 滚动到原来的列表位置,恢复顶部按钮和isBounce的配置
-      vm.$refs.mescroll && vm.$refs.mescroll.beforeRouteEnter();
+      if (from.name === "schemeDetails") {
+        // 滚动到原来的列表位置,恢复顶部按钮和isBounce的配置
+        vm.$refs.mescroll && vm.$refs.mescroll.beforeRouteEnter();
+      }
     });
   },
   beforeRouteLeave(to, from, next) {
-    // 如果没有配置顶部按钮或isBounce,则beforeRouteLeave不用写
-    // 记录列表滚动的位置,隐藏顶部按钮和isBounce的配置
-    this.$refs.mescroll && this.$refs.mescroll.beforeRouteLeave();
+    if (to.name !== "schemeDetails") {
+      to.meta.isBack = false;
+    } else {
+      to.meta.isBack = true;
+      // 如果没有配置顶部按钮或isBounce,则beforeRouteLeave不用写
+      // 记录列表滚动的位置,隐藏顶部按钮和isBounce的配置
+      this.$refs.mescroll && this.$refs.mescroll.beforeRouteLeave();
+    }
     next();
   },
+  activated() {
+    if (!this.$route.meta.isBack) {
+      // 如果isBack是false，表明需要获取新数据，否则就不再请求，直接使用缓存的数据
+      this.mescroll.resetUpScroll(); // 刷新列表数据
+    }
+    // 恢复成默认的false，避免isBack一直是true，导致下次无法获取数据
+    this.$route.meta.isBack = false;
+  },
   //监听属性 类似于data概念
   computed: {},
   //监控data中的数据变化
@@ -183,7 +201,7 @@ export default {
       that
         .$axios({
           method: "get",
-          url: "bigservers/save_news",
+          url: "http://192.168.1.8:8002/save_news",
           params: {
             page: that.mescrollUp.page.num,
           },
@@ -247,7 +265,7 @@ export default {
     //   that
     //     .$axios({
     //       method: "get",
-    //       url: "bigservers/save_news",
+    //       url: "http://192.168.1.8:8002/save_news",
     //       params: {
     //         page: 1,
     //       },
@@ -376,7 +394,7 @@ export default {
   justify-content: space-between;
 }
 
-.navlist .activeT {
+.scheme_box_main .navlist .activeT {
   border-bottom: 1px solid #1ec8a1;
   color: #1ec8a1;
 }

discern/src/components/schemeDetails/schemeDetails.vue

@@ -31,7 +31,7 @@
         <el-carousel-item v-for="item in redata.imgArr" :key="item">
           <img
             preview="1"
-            v-lazy="'bigservers/' + item"
+            v-lazy="'http://192.168.1.8:8002/' + item"
             alt
             class="schemeDetails_axios_img"
           />
@@ -128,7 +128,7 @@ export default {
       that
         .$axios({
           method: "get",
-          url: "bigservers/save_news",
+          url: "http://192.168.1.8:8002/save_news",
           params: {
             id: that.id,
           },

discern/src/components/seek/seek.vue

@@ -153,7 +153,7 @@ export default {
       } else if (_this.seekData !== "") {
         _this.$router.push("/seek_data");
         localStorage.setItem("seekName", _this.seekData);
-        location.reload();
+        // location.reload();
       }
     },
 
@@ -172,7 +172,7 @@ export default {
       _this
         .$axios({
           method: "get",
-          url: "bigservers/del_history"
+          url: "http://192.168.1.8:8002/del_history"
         })
         .then(res => {
           this.$message({
@@ -200,7 +200,7 @@ export default {
       _this
         .$axios({
           method: "get",
-          url: "bigservers/see_record",
+          url: "http://192.168.1.8:8002/see_record",
           params: {
             page: "1"
           }

discern/src/components/seek_data/seek_data.vue

@@ -176,7 +176,7 @@ export default {
       });
       this.$axios({
         method: "post",
-        url: "bigservers/search",
+        url: "http://192.168.1.8:8002/search",
         data: postData
       })
         .then(res => {
@@ -197,7 +197,7 @@ export default {
             });
             this.$axios({
               method: "post",
-              url: "bigservers/search",
+              url: "http://192.168.1.8:8002/search",
               data: postData
             })
               .then(res => {
@@ -254,7 +254,7 @@ export default {
       let _this = this;
       _this.$router.push("/seek");
       localStorage.removeItem("seek_name");
-      location.reload();
+      // location.reload();
     },
 
     // 返回home页面

discern/src/components/setting/setting.vue

@@ -131,7 +131,7 @@ export default {
         that
           .$axios({
             method: "get",
-            url: "bigservers/edition",
+            url: "http://192.168.1.8:8002/edition",
           })
           .then((res) => {
             console.log(res.data);
@@ -155,7 +155,7 @@ export default {
                 var wait = plus.nativeUI.showWaiting("下载更新中，请勿关闭");
                 //创建一个下载任务
                 var dtask = plus.downloader.createDownload(
-                  "bigservers/down_app/deity.apk",
+                  "http://192.168.1.8:8002/down_app/deity.apk",
                   {
                     method: "GET",
                   },
@@ -199,7 +199,7 @@ export default {
         .then(() => {
           this.$axios({
             method: "get",
-            url: "bigservers/out_land",
+            url: "http://192.168.1.8:8002/out_land",
           })
             .then((res) => {
               if (res.data === 0) {

discern/src/components/share/share.vue

@@ -226,7 +226,7 @@ export default {
       that
         .$axios({
           method: "get",
-          url: "bigservers/user_cashing",
+          url: "http://192.168.1.8:8002/user_cashing",
           params: {
             page: 1,
           },
@@ -265,7 +265,7 @@ export default {
       that
         .$axios({
           method: "get",
-          url: "bigservers/user_prize",
+          url: "http://192.168.1.8:8002/user_prize",
         })
         .then((res) => {
           if (res.data.length !== 0) {
@@ -283,7 +283,7 @@ export default {
       that
         .$axios({
           method: "get",
-          url: "bigservers/itegral_sign_list",
+          url: "http://192.168.1.8:8002/itegral_sign_list",
           params: {
             page: 1,
           },

discern/src/components/show/show.vue

@@ -1,14 +1,23 @@
 <!--  -->
 <template>
-  <div class="show_box" :style="'height:' + fullHeight + 'px'" v-loading="loading">
+  <div
+    class="show_box"
+    :style="'height:' + fullHeight + 'px'"
+    v-loading="loading"
+  >
     <!-- 返回按钮 -->
     <div class="show_box-imgA">
-      <img src="../../assets/image/left.png" alt class="imgA_return" @click="Fan()" />
+      <img
+        src="../../assets/image/left.png"
+        alt
+        class="imgA_return"
+        @click="Fan()"
+      />
     </div>
 
     <!-- 识别图片 -->
     <div class="show_box_picture">
-      <img :src="image"  preview="1" alt class="shibie_picture" />
+      <img :src="image" preview="1" alt class="shibie_picture" />
     </div>
 
     <!-- 识别信息 -->
@@ -19,14 +28,26 @@
           <div class>
             <!-- 标题和文字 -->
             <div class="show_box_meg_boxA">
-              <div class="show_box_meg_title" v-if="axiosShow">{{this.redata.name}}</div>
+              <div class="show_box_meg_title" v-if="axiosShow">
+                {{ this.redata.name }}
+              </div>
             </div>
 
             <!-- 后端发送的照片 -->
             <div class="show_box_meg_boxB" v-if="axiosShow">
-              <img v-if="imageShow" :src="this.redata.img_urls" alt class="show_box_meg_img" />
+              <img
+                v-if="imageShow"
+                :src="this.redata.img_urls"
+                alt
+                class="show_box_meg_img"
+              />
               <!-- <el-image class="show_box_meg_imgA" v-else></el-image> -->
-              <img v-else src="../../assets/image/noimage.png" alt class="show_box_meg_imgA" />
+              <img
+                v-else
+                src="../../assets/image/noimage.png"
+                alt
+                class="show_box_meg_imgA"
+              />
             </div>
 
             <!-- 查看详情按钮 -->
@@ -36,8 +57,9 @@
               size="medium"
               class="meg_box_btn"
               round
-              @click="textShow = !textShow,chakan()"
-            >查看详情</el-button>
+              @click="(textShow = !textShow), chakan()"
+              >查看详情</el-button
+            >
 
             <!-- 识别失败 -->
             <div class="error_box" v-if="errorShow">
@@ -55,7 +77,17 @@
               class="meg_box_btnA"
               @click="again()"
               round
-            >再拍一张</el-button>
+              >再拍一张</el-button
+            >
+            <el-button
+              v-if="appraiserShow"
+              type="success"
+              size="medium"
+              class="meg_box_btnA"
+              @click="authenticate()"
+              round
+              >求鉴定</el-button
+            >
           </div>
         </el-card>
       </div>
@@ -69,6 +101,7 @@ export default {
   data() {
     //这里存放数据
     return {
+      appraiserShow: false, //求鉴定是否显示
       loading: true,
       fullHeight: document.documentElement.clientHeight,
       shanShow: false, //识别详情卡片的显示或隐藏
@@ -79,7 +112,7 @@ export default {
       image: localStorage.getItem("ba64dataA"), //从home页面传来的图片数据
       dataImg: "", //
       errorShow: false, //识别失败返回给用户的错误页面
-      imageShow: false //判断后端传来的图片是否为空
+      imageShow: false, //判断后端传来的图片是否为空
     };
   },
   //监听属性 类似于data概念
@@ -92,15 +125,15 @@ export default {
         this.fullHeight = val;
         this.timer = true;
         let that = this;
-        setTimeout(function() {
+        setTimeout(function () {
           //防止过度调用监测事件，导致卡顿
           that.timer = false;
         }, 400);
       }
     },
-    
+
     //测试页面不更新
-    '$route':'fetchData',
+    $route: "fetchData",
   },
   //方法集合
   methods: {
@@ -118,7 +151,7 @@ export default {
     // 返回到主页
     Fan() {
       let _this = this;
-      var urlName = localStorage.getItem('navName')
+      var urlName = localStorage.getItem("navName");
       //判断当前账号是管理员还是游客
       if (localStorage.getItem("ret") === "user") {
         // _this.$router.replace("/home");
@@ -127,7 +160,7 @@ export default {
       } else if (localStorage.getItem("ret") === "tourist") {
         // _this.$router.push("/tourist");
         _this.$router.replace("/tourist");
-        location.reload()
+        // location.reload();
       }
       localStorage.removeItem("axiosData"); //清除本地中的昆虫病害数据
       localStorage.removeItem("ba64data"); //清除本地中用户选择的图片
@@ -141,11 +174,11 @@ export default {
       localStorage.setItem("showID", "1");
       // _this.$router.push("/record");
       _this.$router.push({
-        name: 'record',
+        name: "record",
         query: {
-          req: '4'
-        }
-      })
+          req: "4",
+        },
+      });
 
       //删除本地存储
       localStorage.removeItem("memoryID");
@@ -210,16 +243,16 @@ export default {
           _this
             .$axios({
               method: "post",
-              url: "bigservers/record",
+              url: "http://192.168.1.8:8002/record",
               data: form,
               headers: {
-                "Content-Type": "multipart/form-data"
-              }
+                "Content-Type": "multipart/form-data",
+              },
             })
-            .then(res => {
+            .then((res) => {
               localStorage.removeItem("recordID");
             })
-            .catch(error => {});
+            .catch((error) => {});
         }
       } else if (localStorage.getItem("axiosData") == null) {
         if (localStorage.getItem("recordID") === "1") {
@@ -247,16 +280,16 @@ export default {
           _this
             .$axios({
               method: "post",
-              url: "bigservers/record",
+              url: "http://192.168.1.8:8002/record",
               data: form,
               headers: {
-                "Content-Type": "multipart/form-data"
-              }
+                "Content-Type": "multipart/form-data",
+              },
             })
-            .then(res => {
+            .then((res) => {
               localStorage.removeItem("recordID");
             })
-            .catch(error => {});
+            .catch((error) => {});
         }
       }
 
@@ -266,14 +299,26 @@ export default {
       } else {
         _this.imageShow = true;
       }
-      this.loading = false
+      this.loading = false;
     },
 
-
     //测试页面不更新
-     fetchData(){
-           console.log('路由发送变化doing...');
-     }
+    fetchData() {
+      console.log("路由发送变化doing...");
+    },
+
+    // 点击进入新建鉴定界面
+    authenticate() {
+      var that = this
+      that.$router.push({
+        name: 'fieldsShow',
+        query: {
+          // img: that.image,
+          ret: '1', //ret== 1是从show界面进入  ret==2是从鉴定界面进入
+          errorShow: that.errorShow,
+        }
+      })
+    },
   },
   //生命周期 - 创建完成（可以访问当前this实例）
   created() {
@@ -282,6 +327,16 @@ export default {
   },
   //生命周期 - 挂载完成（可以访问DOM元素）
   mounted() {
+    if (this.$route.query.errorShow !== undefined) {
+      this.errorShow = this.$route.query.errorShow
+    }
+
+    // 判断当前是否为游客登录状态
+    if (localStorage.getItem('ret') == 'tourist') {
+      this.appraiserShow = false
+    } else {
+      this.appraiserShow = true
+    }
     this.get_boderHeight();
     this.ceshi();
   },

discern/src/components/tourist/tourist.vue

@@ -12,7 +12,12 @@
       <div class="tourist-tltBox">
         <img src="../../../static/touristA.png" alt class="tourist-tlt-img" />
         <div class="tourist-tlt-txt">游客暂只能使用识别功能</div>
-        <img @click="outUser()" src="../../../static/out.png" alt class="xiaoxi_img" />
+        <img
+          @click="outUser()"
+          src="../../../static/out.png"
+          alt
+          class="xiaoxi_img"
+        />
       </div>
 
       <div class="tourist-imgBox">
@@ -21,19 +26,79 @@
       </div>
 
       <div class="tourist-btnBox">
-        <button class="tourist-btnA" @click="dialogVisible = true">去识别</button>
+        <button class="tourist-btnA" @click="dialogVisible = true">
+          去识别
+        </button>
         <button class="tourist-btnB" @click="touristlogin()">去登录</button>
       </div>
     </div>
 
     <!-- 识别功能弹框 -->
     <!-- 点击相机图标弹出选择昆虫或病害窗口 -->
-    <el-dialog :modal-append-to-body="false" title="提示" :visible.sync="dialogVisible" width="60%">
+    <el-dialog
+      :modal-append-to-body="false"
+      title=""
+      :visible.sync="dialogVisible"
+      :show-close="showClo"
+      width="62%"
+      class="home_box-discern-imageTxtBox"
+    >
+      <img
+        src="../../assets/image/558.png"
+        class="home_box-discern-image"
+        alt=""
+      />
+      <div class="home_box-discern-imageTxt">
+        由<span style="color: #59aa21">中科感知</span>提供大数据服务及技术支持
+      </div>
+      <span
+        slot="footer"
+        class="dialog-footer"
+        style="text-align: center; margin: 0 0.5rem 0 0"
+      >
+        <!-- 选择昆虫 -->
+        <div class="home_box_div">
+          <!-- 测试 -->
+          <el-button
+            @click="(dialogVisible = false), upload()"
+            class="kunchongBtn"
+            >虫 害</el-button
+          >
+          <img v-show="sHow" src="../../assets/upload.png" alt id="img" />
+          <input
+            class="hiddenInputA"
+            ref="file"
+            type="file"
+            accept="image/*"
+            @change="uploadChange"
+          />
+        </div>
+
+        <!-- 选择病害 -->
+        <div class="home_box_div">
+          <!-- 测试 -->
+          <el-button
+            @click="(dialogVisible = false), uploadA()"
+            class="binghaiBtn"
+            >病 害</el-button
+          >
+          <img v-show="sHow" src="../../assets/upload.png" alt id="img" />
+          <input
+            class="hiddenInputA"
+            ref="file"
+            type="file"
+            accept="image/*"
+            @change="uploadChange"
+          />
+        </div>
+      </span>
+    </el-dialog>
+    <!-- <el-dialog :modal-append-to-body="false" title="提示" :visible.sync="dialogVisible" width="60%">
       <span>请选择识别类型</span>
       <span slot="footer" class="dialog-footer">
-        <!-- 选择昆虫 -->
+        选择昆虫
         <div class="tourist_box_div">
-          <!-- 测试 -->
+          测试
           <el-button @click="dialogVisible = false, upload()" class="kunchongBtn">昆 虫</el-button>
           <img v-show="sHow" src="../../assets/upload.png" alt id="img" />
           <input
@@ -45,9 +110,9 @@
           />
         </div>
 
-        <!-- 选择病害 -->
+        选择病害
         <div class="tourist_box_div">
-          <!-- 测试 -->
+          测试
           <el-button @click="dialogVisible = false, uploadA()" class="binghaiBtn">病 害</el-button>
           <img v-show="sHow" src="../../assets/upload.png" alt id="img" />
           <input
@@ -59,7 +124,7 @@
           />
         </div>
       </span>
-    </el-dialog>
+    </el-dialog> -->
 
     <!-- 上传图片 -->
     <div class="v-simple-cropper">
@@ -74,7 +139,11 @@
     </div>
 
     <!-- loading -->
-    <div v-if="loadingShow" class="loading_box" :style="'height:' + fullHeight + 'px'">
+    <div
+      v-if="loadingShow"
+      class="loading_boxA"
+      :style="'height:' + fullHeight + 'px'"
+    >
       <div class="loading_box_del" @click="loadingDel()">X</div>
 
       <div class="loading_box_div">
@@ -96,6 +165,7 @@ export default {
   data() {
     //这里存放数据
     return {
+      showClo: false, //右上角关闭按钮隐藏
       loading: true, //页面加载
       sHow: false, //预览对象
       dialogVisible: false, //选择昆虫还是病害识别
@@ -106,7 +176,7 @@ export default {
       filename: "",
       dialogVisible: false, //选择昆虫还是病害识别
       sHow: false, //预览对象
-      fileA: "" //上传图片
+      fileA: "", //上传图片
     };
   },
   //监听属性 类似于data概念
@@ -128,24 +198,24 @@ export default {
     },
 
     // 测试图片剪裁-昆虫
-    change(event) {
-      let image = document.getElementById("img"); //预览对象
-      this.clip(event, {
-        resultObj: image,
-        aspectRatio: 1
-      });
-      this.loadingShow = true;
-    },
+    // change(event) {
+    //   let image = document.getElementById("img"); //预览对象
+    //   this.clip(event, {
+    //     resultObj: image,
+    //     aspectRatio: 1,
+    //   });
+    //   this.loadingShow = true;
+    // },
 
-    // 测试图片剪裁-病害
-    changeA(event) {
-      let image = document.getElementById("img"); //预览对象
-      this.clip(event, {
-        resultObj: image,
-        aspectRatio: 1
-      });
-      this.loadingShow = true;
-    },
+    // // 测试图片剪裁-病害
+    // changeA(event) {
+    //   let image = document.getElementById("img"); //预览对象
+    //   this.clip(event, {
+    //     resultObj: image,
+    //     aspectRatio: 1,
+    //   });
+    //   this.loadingShow = true;
+    // },
 
     //等待动画关闭按钮
     loadingDel() {
@@ -155,7 +225,7 @@ export default {
     //测试游客登录
     touristlogin() {
       this.$router.replace("/");
-      location.reload();
+      // location.reload();
       sessionStorage.removeItem("login");
       localStorage.removeItem("ret");
     },
@@ -164,7 +234,7 @@ export default {
       this.$confirm("即将退出程序, 是否继续?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        type: "warning"
+        type: "warning",
       })
         .then(() => {
           var webview = plus.webview.currentWebview(); //获取当前页面的
@@ -176,17 +246,282 @@ export default {
     },
 
     // 初始化裁剪插件
+    // init() {
+    //   let cropperImg = this.$refs["cropperImg"];
+    //   this.cropper = new Cropper(cropperImg, {
+    //     viewMode: 1,
+    //     dragMode: "none",
+    //     initialAspectRatio: 1,
+    //     aspectRatio: 1,
+    //     preview: ".before",
+    //     background: false,
+    //     autoCropArea: 0.6,
+    //     zoomOnWheel: false,
+    //   });
+    // },
+    // // 点击上传按钮-昆虫
+    // upload() {
+    //   var _this = this;
+    //   localStorage.setItem("insect", "昆虫"); //添加一个昆虫标识在本地
+    //   localStorage.removeItem("plant"); //删除病害标识
+    //   this.$refs["file"].click();
+    // },
+    // // 点击上传按钮-病害
+    // uploadA() {
+    //   var _this = this;
+    //   localStorage.setItem("plant", "病害"); // 添加一个病害标识在本地
+    //   localStorage.removeItem("insect"); //删除昆虫标识
+    //   this.$refs["file"].click();
+    // },
+    // // 取消上传
+    // cancelHandle() {
+    //   this.cropper.reset();
+    //   this.$refs["layer"].style.display = "none";
+    //   this.$refs["file"].value = "";
+    // },
+    // // 选择上传文件
+    // uploadChange(e) {
+    //   let file = e.target.files[0];
+    //   this.fileA = file; //传递给data中
+    //   this.filename = file["name"];
+    //   let URL = window.URL || window.webkitURL;
+    //   //判断当前识别次数是否有
+    //   let postData = this.$qs.parse({
+    //     name: sessionStorage.getItem("login"), //账号名字
+    //     ret: localStorage.getItem("ret"), //账号类型
+    //   });
+    //   this.$axios({
+    //     method: "post",
+    //     url: "http://192.168.1.8:8002/detect_number",
+    //     data: postData,
+    //   })
+    //     .then((res) => {
+    //       if (localStorage.getItem("ret") === "tourist") {
+    //         if (res.data === 0) {
+    //           this.$notify({
+    //             title: "提示",
+    //             message:
+    //               "抱歉，您的体验次数已用完；如果想再次使用，请先注册账号",
+    //             type: "warning",
+    //             duration: 3000,
+    //           });
+    //         }
+    //         if (res.data[0].num == "0") {
+    //           this.$notify({
+    //             title: "提示",
+    //             message: "您的识别体验还剩下最后一次机会",
+    //             type: "warning",
+    //             duration: 3000,
+    //           });
+    //           this.$refs["layer"].style.display = "block";
+    //           this.cropper.replace(URL.createObjectURL(file));
+    //         } else if (res.data[0].num < "5") {
+    //           this.numData = res.data[0].num;
+    //           this.$notify({
+    //             title: "提示",
+    //             message: "您的识别体验还剩" + this.numData + "次",
+    //             type: "warning",
+    //             duration: 2000,
+    //           });
+    //           this.$refs["layer"].style.display = "block";
+    //           this.cropper.replace(URL.createObjectURL(file));
+    //         } else {
+    //           this.$refs["layer"].style.display = "block";
+    //           this.cropper.replace(URL.createObjectURL(file));
+    //         }
+    //       } else if (localStorage.getItem("ret") === "user") {
+    //         if (res.data === 0) {
+    //         } else if (res.data === 1) {
+    //           this.$refs["layer"].style.display = "block";
+    //           this.cropper.replace(URL.createObjectURL(file));
+    //         }
+    //       }
+    //     })
+    //     .catch((error) => {
+    //       console.log(error);
+    //     });
+
+    //   // this.$refs["layer"].style.display = "block";
+    //   // this.cropper.replace(URL.createObjectURL(file));
+    // },
+    // //上传
+    // confirmHandle() {
+    //   let _this = this;
+    //   _this.base();
+    //   //获取图片的ba64编码
+    //   this.cropper.reset();
+    //   this.$refs["layer"].style.display = "none";
+    //   this.loadingShow = true;
+    //   // 判断用户选择的病害还是昆虫;
+    //   if (localStorage.getItem("insect") !== null) {
+    //     //虫害
+    //     let form = new FormData();
+    //     form.append("img_addr", _this.fileA);
+    //     this.$axios({
+    //       method: "post",
+    //       url: "http://192.168.1.8:8002/app_insect",
+    //       anync: true,
+    //       data: form,
+    //       headers: {
+    //         "Content-Type": "multipart/form-data",
+    //       },
+    //     })
+    //       .then((res) => {
+    //         self.botNav = true; //隐藏底部导航
+    //         // window.clearInterval(timer);  //销毁计时器
+    //         if (
+    //           res.data.msg === "识别失败_！" ||
+    //           res.data.msg === "" ||
+    //           res.data.data === null
+    //         ) {
+    //           this.$message({
+    //             type: "error",
+    //             message: "识别失败!",
+    //           });
+
+    //           this.$router.push({
+    //             name: "show",
+    //             params: { data: form.get("img_addr") },
+    //           });
+    //           localStorage.setItem("recordID", "1");
+    //           this.loadingShow = false;
+    //         } else {
+    //           this.$notify({
+    //             title: "成功",
+    //             message: "识别成功",
+    //             type: "success",
+    //           });
+    //           localStorage.setItem(
+    //             "axiosData",
+    //             JSON.stringify(res.data.data[0])
+    //           );
+    //         }
+    //         this.$router.push({
+    //           name: "show",
+    //           params: { data: form.get("img_addr") },
+    //         });
+    //         localStorage.setItem("recordID", "1");
+    //         this.loadingShow = false;
+    //         this.$refs["file"].value = "";
+    //       })
+    //       .catch((error) => {
+    //         // window.clearInterval(timer);  //销毁计时器
+    //         this.$message({
+    //           type: "error",
+    //           message: "识别失败!",
+    //         });
+    //         this.$router.push({
+    //           name: "show",
+    //           params: { data: form.get("img_addr") },
+    //         });
+    //         localStorage.setItem("recordID", "1");
+    //         this.loadingShow = false;
+    //         this.$refs["file"].value = "";
+    //       });
+    //   } else if (localStorage.getItem("plant") !== null) {
+    //     //病害
+    //     let form = new FormData();
+    //     form.append("img_addr", _this.fileA);
+    //     this.$axios({
+    //       method: "post",
+    //       url: "http://192.168.1.8:8002/app_plant",
+    //       anync: true,
+    //       data: form,
+    //       headers: {
+    //         "Content-Type": "multipart/form-data",
+    //       },
+    //     })
+    //       .then((res) => {
+    //         _this.botNav = true; //隐藏底部导航
+    //         if (
+    //           res.data.msg === "识别失败_! " ||
+    //           res.data.msg === "" ||
+    //           res.data.data === null
+    //         ) {
+    //           this.$message({
+    //             type: "error",
+    //             message: "识别失败!",
+    //           });
+    //           _this.botNav = false; //隐藏底部导航
+
+    //           this.$router.push({
+    //             name: "show",
+    //             params: { data: form.get("img_addr") },
+    //           });
+    //           localStorage.setItem("recordID", "1");
+    //         } else {
+    //           this.$notify({
+    //             title: "成功",
+    //             message: "识别成功",
+    //             type: "success",
+    //           });
+    //           localStorage.setItem(
+    //             "axiosData",
+    //             JSON.stringify(res.data.data[0])
+    //           );
+    //         }
+    //         this.$router.push({
+    //           name: "show",
+    //           params: { data: form.get("img_addr") },
+    //         });
+    //         localStorage.setItem("recordID", "1");
+    //         this.loadingShow = false;
+    //         this.$refs["file"].value = "";
+    //       })
+    //       .catch((error) => {
+    //         this.$message({
+    //           type: "error",
+    //           message: "识别失败aaaaaaa!",
+    //         });
+    //         this.$router.push({
+    //           name: "show",
+    //           params: { data: form.get("img_addr") },
+    //         });
+    //         localStorage.setItem("recordID", "1");
+    //         this.loadingShow = false;
+    //         this.$refs["file"].value = "";
+    //       });
+    //   }
+    // },
+    // base() {
+    //   var _this = this;
+    //   var files = _this.fileA;
+    //   if (files) {
+    //     var file = files;
+    //     var reader = new FileReader();
+    //     reader.readAsDataURL(file);
+    //     reader.onload = function () {
+    //       img.src = this.result;
+    //     };
+    //     var img = new Image(),
+    //       width = 1024, //image resize   压缩后的宽
+    //       quality = 0.8, //image quality  压缩质量
+    //       canvas = document.createElement("canvas"),
+    //       drawer = canvas.getContext("2d");
+    //     img.onload = function () {
+    //       canvas.width = width;
+    //       canvas.height = width * (img.height / img.width);
+    //       drawer.drawImage(img, 0, 0, canvas.width, canvas.height);
+    //       var base64 = canvas.toDataURL("image/jpeg", quality); // 这里就拿到了压缩后的base64图片
+    //       console.log(base64);
+    //       localStorage.setItem("ba64dataA", base64);
+    //     };
+    //   }
+    // },
+
+    // 测试测试
+    // 初始化裁剪插件
     init() {
       let cropperImg = this.$refs["cropperImg"];
       this.cropper = new Cropper(cropperImg, {
         viewMode: 1,
         dragMode: "none",
-        initialAspectRatio: 1,
-        aspectRatio: 1,
+        initialAspectRatio: 0,
+        aspectRatio: 0,
         preview: ".before",
         background: false,
         autoCropArea: 0.6,
-        zoomOnWheel: false
+        zoomOnWheel: false,
       });
     },
     // 点击上传按钮-昆虫
@@ -194,111 +529,88 @@ export default {
       var _this = this;
       localStorage.setItem("insect", "昆虫"); //添加一个昆虫标识在本地
       localStorage.removeItem("plant"); //删除病害标识
+      //删除测试
+      localStorage.removeItem("ba64dataA");
+      localStorage.removeItem("axiosData"); //清除本地中的昆虫病害数据
+      localStorage.removeItem("ba64data"); //清除本地中用户选择的图片
+      localStorage.removeItem("memoryID");
+      localStorage.removeItem("memoryDistinction");
+      localStorage.removeItem("collectID");
+      localStorage.removeItem("collectDistinction");
+      localStorage.removeItem("seek_dataID");
+      localStorage.removeItem("Point");
       this.$refs["file"].click();
     },
+
     // 点击上传按钮-病害
     uploadA() {
       var _this = this;
       localStorage.setItem("plant", "病害"); // 添加一个病害标识在本地
       localStorage.removeItem("insect"); //删除昆虫标识
+      //删除测试
+      localStorage.removeItem("ba64dataA");
+      localStorage.removeItem("axiosData"); //清除本地中的昆虫病害数据
+      localStorage.removeItem("ba64data"); //清除本地中用户选择的图片
+      localStorage.removeItem("memoryID");
+      localStorage.removeItem("memoryDistinction");
+      localStorage.removeItem("collectID");
+      localStorage.removeItem("collectDistinction");
+      localStorage.removeItem("seek_dataID");
+      localStorage.removeItem("Point");
       this.$refs["file"].click();
     },
-    // 取消上传
-    cancelHandle() {
-      this.cropper.reset();
-      this.$refs["layer"].style.display = "none";
-      this.$refs["file"].value = "";
-    },
     // 选择上传文件
     uploadChange(e) {
       let file = e.target.files[0];
       this.fileA = file; //传递给data中
       this.filename = file["name"];
       let URL = window.URL || window.webkitURL;
-      //判断当前识别次数是否有
-      let postData = this.$qs.parse({
-        name: sessionStorage.getItem("login"), //账号名字
-        ret: localStorage.getItem("ret") //账号类型
-      });
-      this.$axios({
-        method: "post",
-        url: "bigservers/detect_number",
-        data: postData
-      })
-        .then(res => {
-          if (localStorage.getItem("ret") === "tourist") {
-            if (res.data === 0) {
-              this.$notify({
-                title: "提示",
-                message:
-                  "抱歉，您的体验次数已用完；如果想再次使用，请先注册账号",
-                type: "warning",
-                duration: 3000
-              });
-            }
-            if (res.data[0].num == "0") {
-              this.$notify({
-                title: "提示",
-                message: "您的识别体验还剩下最后一次机会",
-                type: "warning",
-                duration: 3000
-              });
-              this.$refs["layer"].style.display = "block";
-              this.cropper.replace(URL.createObjectURL(file));
-            } else if (res.data[0].num < "5") {
-              this.numData = res.data[0].num;
-              this.$notify({
-                title: "提示",
-                message: "您的识别体验还剩" + this.numData + "次",
-                type: "warning",
-                duration: 2000
-              });
-              this.$refs["layer"].style.display = "block";
-              this.cropper.replace(URL.createObjectURL(file));
-            } else {
-              this.$refs["layer"].style.display = "block";
-              this.cropper.replace(URL.createObjectURL(file));
-            }
-          } else if (localStorage.getItem("ret") === "user") {
-            if (res.data === 0) {
-            } else if (res.data === 1) {
-              this.$refs["layer"].style.display = "block";
-              this.cropper.replace(URL.createObjectURL(file));
-            }
-          }
-        })
-        .catch(error => {
-          console.log(error);
-        });
-
-      // this.$refs["layer"].style.display = "block";
-      // this.cropper.replace(URL.createObjectURL(file));
+      this.$refs["layer"].style.display = "block";
+      this.cropper.replace(URL.createObjectURL(file));
+    },
+    // 取消上传
+    cancelHandle() {
+      this.cropper.reset();
+      this.$refs["layer"].style.display = "none";
+      this.$refs["file"].value = "";
     },
     //上传
     confirmHandle() {
       let _this = this;
-      _this.base();
-      //获取图片的ba64编码
-      this.cropper.reset();
       this.$refs["layer"].style.display = "none";
       this.loadingShow = true;
+      var fileA = this.cropper
+        .getCroppedCanvas({
+          imageSmoothingQuality: "high",
+        })
+        .toDataURL("image/jpeg");
+      localStorage.setItem("ba64dataA", fileA);
+      let blob = _this.dataURLtoFile(fileA, "image/jpeg"); //将base64转换为blob
+      let data = _this.submitPic(blob); //再将blob转换为file
+      var img = data.get("file");
+
       // 判断用户选择的病害还是昆虫;
       if (localStorage.getItem("insect") !== null) {
         //虫害
         let form = new FormData();
-        form.append("img_addr", _this.fileA);
+        form.append("imageFile", img);
+        console.log(form.get("imageFile"));
+
+        form.append("imageType", "1");
+        form.append("uniqueKey", "84e6eb40f3a616dd14b1fefc75425006");
+        form.append("username", "yunfei");
+        form.append("gis", "118.279643#31.221456");
         this.$axios({
           method: "post",
-          url: "bigservers/app_insect",
+          url: "http://47.99.110.100:8080/recognizationSys/api/recognization",
           anync: true,
           data: form,
           headers: {
-            "Content-Type": "multipart/form-data"
-          }
+            "Content-Type": "multipart/form-data",
+          },
         })
-          .then(res => {
+          .then((res) => {
             self.botNav = true; //隐藏底部导航
-            // window.clearInterval(timer);  //销毁计时器
             if (
               res.data.msg === "识别失败_！" ||
               res.data.msg === "" ||
@@ -306,12 +618,12 @@ export default {
             ) {
               this.$message({
                 type: "error",
-                message: "识别失败!"
+                message: "识别失败!",
               });
 
               this.$router.push({
                 name: "show",
-                params: { data: form.get("img_addr") }
+                params: { data: form.get("imageFile") },
               });
               localStorage.setItem("recordID", "1");
               this.loadingShow = false;
@@ -319,30 +631,36 @@ export default {
               this.$notify({
                 title: "成功",
                 message: "识别成功",
-                type: "success"
+                type: "success",
               });
               localStorage.setItem(
                 "axiosData",
                 JSON.stringify(res.data.data[0])
               );
+              this.$router.push({
+                name: "show",
+                params: { data: form.get("imageFile") },
+              });
+              localStorage.setItem("recordID", "1");
+              // console.log(form.get("imageFile"));
             }
             this.$router.push({
               name: "show",
-              params: { data: form.get("img_addr") }
+              params: { data: form.get("imageFile") },
             });
             localStorage.setItem("recordID", "1");
             this.loadingShow = false;
             this.$refs["file"].value = "";
           })
-          .catch(error => {
+          .catch((error) => {
             // window.clearInterval(timer);  //销毁计时器
             this.$message({
               type: "error",
-              message: "识别失败!"
+              message: "识别失败!",
             });
             this.$router.push({
               name: "show",
-              params: { data: form.get("img_addr") }
+              params: { data: form.get("imageFile") },
             });
             localStorage.setItem("recordID", "1");
             this.loadingShow = false;
@@ -351,17 +669,21 @@ export default {
       } else if (localStorage.getItem("plant") !== null) {
         //病害
         let form = new FormData();
-        form.append("img_addr", _this.fileA);
+        form.append("imageFile", img);
+        form.append("imageType", "2");
+        form.append("uniqueKey", "84e6eb40f3a616dd14b1fefc75425006");
+        form.append("username", "yunfei");
+        form.append("gis", "118.279643#31.221456");
         this.$axios({
           method: "post",
-          url: "bigservers/app_plant",
+          url: "http://47.99.110.100:8080/recognizationSys/api/recognization",
           anync: true,
           data: form,
           headers: {
-            "Content-Type": "multipart/form-data"
-          }
+            "Content-Type": "multipart/form-data",
+          },
         })
-          .then(res => {
+          .then((res) => {
             _this.botNav = true; //隐藏底部导航
             if (
               res.data.msg === "识别失败_! " ||
@@ -370,20 +692,20 @@ export default {
             ) {
               this.$message({
                 type: "error",
-                message: "识别失败!"
+                message: "识别失败!",
               });
-              _this.botNav = false; //隐藏底部导航
+              _this.botNav = true; //隐藏底部导航
 
               this.$router.push({
                 name: "show",
-                params: { data: form.get("img_addr") }
+                params: { data: form.get("imageFile") },
               });
               localStorage.setItem("recordID", "1");
             } else {
               this.$notify({
                 title: "成功",
                 message: "识别成功",
-                type: "success"
+                type: "success",
               });
               localStorage.setItem(
                 "axiosData",
@@ -392,20 +714,20 @@ export default {
             }
             this.$router.push({
               name: "show",
-              params: { data: form.get("img_addr") }
+              params: { data: form.get("imageFile") },
             });
             localStorage.setItem("recordID", "1");
             this.loadingShow = false;
             this.$refs["file"].value = "";
           })
-          .catch(error => {
+          .catch((error) => {
             this.$message({
               type: "error",
-              message: "识别失败aaaaaaa!"
+              message: "识别失败aaaaaaa!",
             });
             this.$router.push({
               name: "show",
-              params: { data: form.get("img_addr") }
+              params: { data: form.get("imageFile") },
             });
             localStorage.setItem("recordID", "1");
             this.loadingShow = false;
@@ -413,31 +735,27 @@ export default {
           });
       }
     },
-    base() {
-      var _this = this;
-      var files = _this.fileA;
-      if (files) {
-        var file = files;
-        var reader = new FileReader();
-        reader.readAsDataURL(file);
-        reader.onload = function() {
-          img.src = this.result;
-        };
-        var img = new Image(),
-          width = 1024, //image resize   压缩后的宽
-          quality = 0.8, //image quality  压缩质量
-          canvas = document.createElement("canvas"),
-          drawer = canvas.getContext("2d");
-        img.onload = function() {
-          canvas.width = width;
-          canvas.height = width * (img.height / img.width);
-          drawer.drawImage(img, 0, 0, canvas.width, canvas.height);
-          var base64 = canvas.toDataURL("image/jpeg", quality); // 这里就拿到了压缩后的base64图片
-          console.log(base64);
-          localStorage.setItem("ba64dataA", base64);
-        };
+
+    //base64转为file类型
+    //将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) {
+      console.log(fileData);
+      let form = new FormData();
+      // console.log(form)
+      let fileOfBlob = new File([fileData], this.fileA.name); // 重命名了
+      console.log(this.fileA.name);
+      form.append("file", fileOfBlob);
+      return form;
+    },
   },
   //生命周期 - 创建完成（可以访问当前this实例）
   created() {},
@@ -452,7 +770,7 @@ export default {
   updated() {}, //生命周期 - 更新之后
   beforeDestroy() {}, //生命周期 - 销毁之前
   destroyed() {}, //生命周期 - 销毁完成
-  activated() {} //如果页面有keep-alive缓存功能，这个函数会触发
+  activated() {}, //如果页面有keep-alive缓存功能，这个函数会触发
 };
 </script>
 <style lang='scss'>
@@ -505,4 +823,132 @@ export default {
     }
   }
 }
+
+// 识别弹框样式
+.home_box-discern-imageTxtBox {
+  margin: 2.5rem 0 0 0;
+}
+.home_box-discern-imageTxtBox .el-dialog .el-dialog__body {
+  // margin: 2rem 0 -1rem 0;
+  margin: 0 0 -1rem 0;
+}
+.home_box-discern-image {
+  width: 100%;
+  position: absolute;
+  //   top: -2.8rem;
+  top: -4rem;
+  left: 0;
+}
+.home_box-discern-imageTxt {
+  margin: 0.5rem 0 0 0;
+}
+.home_box_div {
+  display: inline-block;
+}
+//昆虫按钮
+.kunchongBtn span {
+  margin: 0;
+}
+
+//病害按钮
+.binghaiBtn span {
+  margin: 0;
+}
+
+// 上传文件input
+.home_box .hiddenInput,
+.home_box .hiddenInputA {
+  width: 8rem;
+  position: absolute;
+  left: 0;
+  bottom: 1rem;
+  display: none;
+}
+.home_box_div .hiddenInputA {
+  width: 8rem;
+  position: absolute;
+  left: 0;
+  bottom: 1rem;
+  display: none;
+}
+
+// loading
+.loading_boxA {
+  position: absolute;
+  left: 0;
+  // top: -19rem;
+  top: 0;
+  height: 100%;
+  width: 100%;
+  background-color: rgba(0, 0, 0, 0.8);
+  z-index: 25;
+}
+.loading_box_del {
+  font-size: 30px;
+  color: #fff;
+  float: left;
+  margin: 0.5rem 0 0 0.5rem;
+}
+
+.loading_box_div {
+  margin: 60% 0 0 0;
+}
+
+.loading_text {
+  color: #f3f3f3;
+  font-size: 25px;
+}
+// .el-dialog__footer {
+//   text-align: center !important;
+// }
+// loading动画
+.loading_gif {
+  margin: 0 auto;
+  width: 100%;
+}
+
+// 裁剪框
+.v-simple-cropper {
+  .file {
+    display: none;
+  }
+  .v-cropper-layer {
+    position: fixed;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    background: #fff;
+    z-index: 99999;
+    display: none;
+    .layer-header {
+      position: absolute;
+      top: 0;
+      left: 0;
+      z-index: 99999;
+      background: #fff;
+      width: 100%;
+      height: 0.8rem;
+      padding: 0 0.2rem;
+      box-sizing: border-box;
+    }
+    .cancel,
+    .confirm {
+      line-height: 0.8rem;
+      font-size: 0.28rem;
+      background: inherit;
+      border: 0;
+      outline: 0;
+      float: left;
+    }
+    .confirm {
+      float: right;
+    }
+    img {
+      position: inherit !important;
+      border-radius: inherit !important;
+      float: inherit !important;
+    }
+  }
+}
 </style> 

discern/src/components/versions_updateHistory/versions_updateHistory.vue

@@ -198,7 +198,7 @@ export default {
       let _this = this;
       this.$axios({
         method: "get",
-        url: "bigservers/edition_all",
+        url: "http://192.168.1.8:8002/edition_all",
         params: {
           page: _this.mescrollUp.page.num,
         },
@@ -263,7 +263,7 @@ export default {
       _this
         .$axios({
           method: "get",
-          url: "bigservers/edition_all",
+          url: "http://192.168.1.8:8002/edition_all",
           params: {
             page: 1,
           },
@@ -292,7 +292,7 @@ export default {
       _this
         .$axios({
           method: "post",
-          url: "bigservers/edition_all",
+          url: "http://192.168.1.8:8002/edition_all",
           data: postData,
         })
         .then((res) => {

discern/src/router/index.js

@@ -83,6 +83,7 @@ export default new Router({
         title: '首页',
         type: 'login',
         keepAlive: true,
+        isBack: false, //动态使用keep-alive
       },
       component: home
     },
@@ -150,7 +151,8 @@ export default new Router({
       meta: {
         title: '我的收藏',
         type: 'login',
-        keepAlive: true
+        keepAlive: true,
+        isBack: false, //动态使用keep-alive
       },
       component: collect
     },
@@ -160,7 +162,8 @@ export default new Router({
       meta: {
         title: '识别记录',
         type: 'login',
-        keepAlive: true
+        keepAlive: true,
+        isBack: false, //动态使用keep-alive
       },
       component: memory
     },
@@ -440,7 +443,8 @@ export default new Router({
       meta: {
         title: '兑换列表',
         type: 'login',
-        keepAlive: true
+        keepAlive: true,
+        isBack: false, //动态使用keep-alive
       },
       component: conversionList
     },
@@ -480,8 +484,8 @@ export default new Router({
       meta: {
         title: '方案',
         type: 'login',
-        keepAlive: true // 是否需要缓存
-
+        keepAlive: true, // 是否需要缓存
+        isBack: false, //动态使用keep-alive
       },
       component: scheme
     },