提交

discern/config/index.js

@@ -12,14 +12,14 @@ module.exports = {
     assetsPublicPath: '/',
     proxyTable: {
       //测试跨域
-      '/log': {
+      '/academysciences': {
         target: 'http://47.99.110.100:8080',  //目标接口域名
         changeOrigin: true,  //是否跨域
         pathRewrite: {
-          '^/log': ''   //重写接口
+          '^/academysciences': ''   //重写接口
         }
       },
-       '/': {
+       '/bigservers': {
         // target: 'http://47.104.218.216:8000',  //目标接口域名
         // target: 'http://127.0.0.1:8000',  //目标接口域名
         // target: 'http://192.168.1.11:8000',  //目标接口域名
@@ -28,7 +28,7 @@ module.exports = {
         changeOrigin: true,  //是否跨域
         pathRewrite: {
           // '^/api': ''   //重写接口
-          '^/api': ''   //重写接口
+          '^/bigservers': ''   //重写接口
         }
       },
     },

discern/package-lock.json

@@ -13379,11 +13379,25 @@
         "markdown-it": "^8.4.0"
       }
     },
+    "vue-class-component": {
+      "version": "6.3.2",
+      "resolved": "https://registry.npmjs.org/vue-class-component/-/vue-class-component-6.3.2.tgz",
+      "integrity": "sha512-cH208IoM+jgZyEf/g7mnFyofwPDJTM/QvBNhYMjqGB8fCsRyTf68rH2ISw/G20tJv+5mIThQ3upKwoL4jLTr1A=="
+    },
     "vue-cropper": {
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/vue-cropper/-/vue-cropper-0.5.2.tgz",
       "integrity": "sha512-51lj/7s3ok6pVvceibc/dM4zFccrx3020CX7i/k6Kl9K3M9ot8NXRvXf813ME2Dwwa3Eb/TeSM87+zu5ZcXAZA=="
     },
+    "vue-easyrefresh": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/vue-easyrefresh/-/vue-easyrefresh-1.0.6.tgz",
+      "integrity": "sha512-AgfJz/qbQiBeqXySoIPUivX+BA1T1QgZ5sCHMgpjRFRvNPTTsja8uE6H4oI7r+wuudU0B5rL0bNEYC3q0466ew==",
+      "requires": {
+        "vue-class-component": "^6.3.2",
+        "vue-property-decorator": "^7.3.0"
+      }
+    },
     "vue-hot-reload-api": {
       "version": "2.3.4",
       "resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz",
@@ -13488,6 +13502,14 @@
         "photoswipe": "^4.1.2"
       }
     },
+    "vue-property-decorator": {
+      "version": "7.3.0",
+      "resolved": "https://registry.npmjs.org/vue-property-decorator/-/vue-property-decorator-7.3.0.tgz",
+      "integrity": "sha512-HarXfTQ/Nxm4s/APpAaGIGHq5ZzslApImQy8ZrtkfGamw8rUFAVgMS5C50/AQ80+wfw3Wpnf4bNzbmj75m/k2Q==",
+      "requires": {
+        "vue-class-component": "^6.2.0"
+      }
+    },
     "vue-resource": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/vue-resource/-/vue-resource-1.5.1.tgz",
@@ -13540,6 +13562,12 @@
         "rollup-plugin-node-resolve": "^2.0.0"
       }
     },
+    "vue-waterfall-easy": {
+      "version": "2.4.4",
+      "resolved": "https://registry.npmjs.org/vue-waterfall-easy/-/vue-waterfall-easy-2.4.4.tgz",
+      "integrity": "sha512-5OkpT2FPNC3rHBy858zk/nmJxqdPaGmj/KVbmA6dgcvtsovKMa+zuf/Z7F+S2NnObeavpIBztTWgcH3S42ZD+g==",
+      "dev": true
+    },
     "vue-waterfall2": {
       "version": "1.9.6",
       "resolved": "https://registry.npmjs.org/vue-waterfall2/-/vue-waterfall2-1.9.6.tgz",

discern/package.json

@@ -30,6 +30,7 @@
     "vue-awesome-mui": "^1.7.3",
     "vue-baidu-map": "^0.21.22",
     "vue-cropper": "^0.5.2",
+    "vue-easyrefresh": "^1.0.6",
     "vue-photo-preview": "^1.1.3",
     "vue-preview": "^1.1.3",
     "vue-router": "^3.0.1",
@@ -79,6 +80,7 @@
     "vue-loader": "^13.3.0",
     "vue-style-loader": "^3.0.1",
     "vue-template-compiler": "^2.5.2",
+    "vue-waterfall-easy": "^2.4.4",
     "webpack": "^3.6.0",
     "webpack-bundle-analyzer": "^2.9.0",
     "webpack-dev-server": "^2.9.1",

discern/src/App.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="app">
-    <keep-alive exclude="show">
+    <keep-alive include="show">
       <router-view v-if="$route.meta.keepAlive"></router-view>
     </keep-alive>
     <router-view v-if="!$route.meta.keepAlive"></router-view>

discern/src/assets/scss/field_details.scss

@@ -354,7 +354,7 @@
   left: 0;
   bottom: 0;
   background: #fff;
-  z-index: 100000;
+  // z-index: 100000;
 }
 
 .Ipt {

discern/src/components/addData/addData.vue

@@ -209,7 +209,7 @@ export default {
           .then(() => {
             this.$axios({
               method: "post",
-              url: "del_insect_photo",
+              url: "bigservers/del_insect_photo",
               data: postData
             })
               .then(res => {
@@ -245,7 +245,7 @@ export default {
           .then(() => {
             this.$axios({
               method: "post",
-              url: "del_person_img",
+              url: "bigservers/del_person_img",
               data: postData
             })
               .then(res => {
@@ -292,7 +292,7 @@ export default {
         _this
           .$axios({
             method: "post",
-            url: "/upload_photos",
+            url: "bigservers/upload_photos",
             anync: true,
             data: form,
             headers: {
@@ -313,7 +313,7 @@ export default {
         _this
           .$axios({
             method: "post",
-            url: "/person_harm_img",
+            url: "bigservers/person_harm_img",
             anync: true,
             data: form,
             headers: {
@@ -392,7 +392,7 @@ export default {
               _this
                 .$axios({
                   method: "post",
-                  url: "/make_data",
+                  url: "bigservers/make_data",
                   data: postData
                 })
                 .then(res => {
@@ -452,7 +452,7 @@ export default {
               _this
                 .$axios({
                   method: "post",
-                  url: "/save_disease",
+                  url: "bigservers/save_disease",
                   data: postData
                 })
                 .then(res => {

discern/src/components/addData_details/addData_details.vue

@@ -14,7 +14,7 @@
             <img
               preview="1"
               @click="imgShow(item)"
-              v-lazy=" 'http://120.27.222.26:5555/' + item"
+              v-lazy=" 'bigservers/' + item"
               alt
               class="lunboImg"
             />
@@ -131,7 +131,7 @@ export default {
       _this
         .$axios({
           method: "post",
-          url: "see_disease",
+          url: "bigservers/see_disease",
           data: postData
         })
         .then(res => {

discern/src/components/addMeg/addMeg.vue

@@ -106,7 +106,7 @@ export default {
         _this
           .$axios({
             method: "post",
-            url: "/user_leaving",
+            url: "bigservers/user_leaving",
             data: postData,
             headers: {
               "Content-Type": "multipart/form-data"

discern/src/components/collect/collect.vue

@@ -33,7 +33,7 @@
             <!-- 图片 -->
             <div class="collect_li_div">
               <img
-                v-lazy=" item.img_url !== '' ? item.img_url : 'http://120.27.222.26:5555/' + item.img"
+                v-lazy=" item.img_url !== '' ? item.img_url : 'bigservers/' + item.img"
                 alt
                 class="collect_li_img"
               />
@@ -215,7 +215,7 @@ export default {
       });
       this.$axios({
         method: "post",
-        url: "/check_collect",
+        url: "bigservers/check_collect",
         data: postData
       })
         .then(res => {
@@ -237,7 +237,7 @@ export default {
             });
             this.$axios({
               method: "post",
-              url: "/check_collect",
+              url: "bigservers/check_collect",
               data: postData
             })
               .then(res => {
@@ -324,7 +324,7 @@ export default {
       _this
         .$axios({
           method: "post",
-          url: "/check_collect",
+          url: "bigservers/check_collect",
           data: postData,
           headers: {
             "Content-Type": "multipart/form-data"
@@ -357,7 +357,7 @@ export default {
       _this
         .$axios({
           method: "post",
-          url: "/check_collect",
+          url: "bigservers/check_collect",
           data: postData,
           headers: {
             "Content-Type": "multipart/form-data"
@@ -387,7 +387,7 @@ export default {
       _this
         .$axios({
           method: "post",
-          url: "/check_collect",
+          url: "bigservers/check_collect",
           data: postData,
           headers: {
             "Content-Type": "multipart/form-data"

discern/src/components/details/details.vue

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

discern/src/components/enroll/enroll.vue

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

discern/src/components/field_details/field_details.vue

@@ -11,7 +11,7 @@
       <div class="field_details_NameBox_boxA">
         <div class="field_details_NameBox_box">
           <img
-            :src=" 'http://120.27.222.26:5555/' + this.redata.photo"
+            :src=" 'bigservers/' + this.redata.photo"
             alt
             class="field_details_NameBox_image"
           />
@@ -29,7 +29,7 @@
           <el-carousel-item v-for="item in imageData" :key="item">
             <img
               preview="1"
-              v-lazy=" 'http://120.27.222.26:5555/'  + item"
+              v-lazy=" 'bigservers/'  + item"
               alt
               class="lunboImg"
             />
@@ -77,7 +77,7 @@
               <div class="criticOne_profile">
                 <!-- 头像和名称 -->
                 <div class="profile_box">
-                  <img :src=" 'http://120.27.222.26:5555/' + item.photo" alt class="profile_img" />
+                  <img :src=" 'bigservers/' + item.photo" alt class="profile_img" />
                   <div
                     class="profile_name"
                   >{{ item.user_remark === '' || item.user_remark === null ? item.username : item.user_remark }}</div>
@@ -125,7 +125,7 @@
                 <!-- 头像和名称 -->
                 <div class="criticTwo_profile">
                   <img
-                    :src=" 'http://120.27.222.26:5555/' + itemA.photo"
+                    :src=" 'bigservers/' + itemA.photo"
                     alt
                     class="profileTwo_img"
                   />
@@ -282,7 +282,7 @@ export default {
       _this
         .$axios({
           method: "post",
-          url: "user_farm_show",
+          url: "bigservers/user_farm_show",
           data: postData
         })
         .then(res => {
@@ -355,7 +355,7 @@ export default {
         _this
           .$axios({
             method: "post",
-            url: "/farm_answer",
+            url: "bigservers/farm_answer",
             data: postData
           })
           .then(res => {
@@ -398,7 +398,7 @@ export default {
         _this
           .$axios({
             method: "post",
-            url: "/farm_likes",
+            url: "bigservers/farm_likes",
             data: postData
           })
           .then(res => {
@@ -446,7 +446,7 @@ export default {
         _this
           .$axios({
             method: "post",
-            url: "/farm_likes",
+            url: "bigservers/farm_likes",
             data: postData
           })
           .then(res => {
@@ -489,7 +489,7 @@ export default {
       _this
         .$axios({
           method: "post",
-          url: "reminder",
+          url: "bigservers/reminder",
           data: postData
         })
         .then(res => {

discern/src/components/fieldsShow/fieldsShow.vue

@@ -254,7 +254,7 @@ export default {
         .then(() => {
           this.$axios({
             method: "post",
-            url: "del_img",
+            url: "bigservers/del_img",
             data: postData
           })
             .then(res => {
@@ -297,7 +297,7 @@ export default {
       _this
         .$axios({
           method: "post",
-          url: "/send_answer_img",
+          url: "bigservers/send_answer_img",
           anync: true,
           data: form,
           headers: {
@@ -353,7 +353,7 @@ export default {
             _this
               .$axios({
                 method: "post",
-                url: "/save_farm_show",
+                url: "bigservers/save_farm_show",
                 data: postData
               })
               .then(res => {

discern/src/components/forget/forget.vue

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

discern/src/components/home/home.vue

@@ -24,7 +24,7 @@
         <!-- 自定义天气插件 -->
         <div class="weather_box" v-loading="loading" v-if="weatherShow">
           <!-- 图标 -->
-          <img :src=" 'http://120.27.222.26:5555/' + this.tianqiData.code_url" class="weather_img" />
+          <img :src=" 'bigservers/' + this.tianqiData.code_url" class="weather_img" />
 
           <!-- 天气情况 -->
           <div class="weather_case">{{this.tianqiData.text}}</div>
@@ -60,9 +60,6 @@
                 </div>
               </div>
               <div class="swiper-pagination swiper-pagination-white" id="swiper-spit"></div>
-              <!-- Add Arrows -->
-              <!-- <div class="swiper-button-next swiper-button-white"></div>
-              <div class="swiper-button-prev swiper-button-white"></div>-->
             </div>
           </div>
           <div style="clear:both;"></div>
@@ -143,7 +140,7 @@
       <div class="dropdown_box" v-if="this.indexData == 0">
         <div class="dropdown_boxdropdown">
           <!-- 筛选框 A-->
-          <el-dropdown trigger="click" @command="handleCommand">
+          <!-- <el-dropdown trigger="click" @command="handleCommand">
             <span class="el-dropdown-link">
               {{this.jiaoliu =='' ? this.wendaDtat : this.jiaoliu}}
               <i
@@ -155,11 +152,11 @@
               <el-dropdown-item command="plant">作物</el-dropdown-item>
               <el-dropdown-item command="insect">昆虫</el-dropdown-item>
             </el-dropdown-menu>
-          </el-dropdown>
+          </el-dropdown>-->
           <!-- 筛选框 A-->
 
           <!-- 筛选框 A-->
-          <el-dropdown trigger="click" @command="handleCommandA">
+          <!-- <el-dropdown trigger="click" @command="handleCommandA">
             <span class="el-dropdown-link">
               {{this.jiaoliu2 =='' ? this.wendaDtatA : this.jiaoliu2}}
               <i
@@ -167,12 +164,35 @@
               ></i>
             </span>
             <el-dropdown-menu slot="dropdown">
-              <!-- <el-dropdown-item command="a">全部交流</el-dropdown-item> -->
               <el-dropdown-item command="b">我发起的</el-dropdown-item>
               <el-dropdown-item command="c">我收藏的</el-dropdown-item>
             </el-dropdown-menu>
-          </el-dropdown>
+          </el-dropdown>-->
           <!-- 筛选框 A-->
+
+          <!-- 测试滑块 -->
+          <div class="about">
+            <div class="idd">
+              <ul class="huakuaiUl">
+                <!-- <li
+                  class="huakuaiLi"
+                  :class="{'active':indexTap == index}"
+                  v-for="(item,index) in lists"
+                  :key="index"
+                  @click="indexTap = index"
+                >{{item}}</li>-->
+                <li
+                  class="huakuaiLi"
+                  :class="{'active':indexTap == index}"
+                  v-for="(item,index) in lists"
+                  :key="index"
+                  @click="indexTap = index, handleCommand(item)"
+                >{{item}}</li>
+              </ul>
+              <!-- <div class="showBox animated bounceInDown" v-if="indexTap == 2">范德萨范德萨</div> -->
+            </div>
+          </div>
+          <!-- 测试滑块 -->
         </div>
 
         <!-- 交流数据 -->
@@ -185,11 +205,7 @@
           >
             <div class="home_question_imageBox">
               <div class="home_question_ulBox_image-box">
-                <img
-                  v-lazy=" 'http://120.27.222.26:5555/' + item.img[0]"
-                  alt
-                  class="home_question_ulBox_image"
-                />
+                <img v-lazy=" 'bigservers/' + item.img[0]" alt class="home_question_ulBox_image" />
               </div>
 
               <!-- 类型标识和描述 -->
@@ -202,11 +218,7 @@
             <!-- 用户头像和用户名 -->
             <div class="home_question_NameBox">
               <div class="home_question_NameBox_box">
-                <img
-                  v-lazy=" 'http://120.27.222.26:5555/' + item.photo"
-                  alt
-                  class="home_question_NameBox_image"
-                />
+                <img v-lazy=" 'bigservers/' + item.photo" alt class="home_question_NameBox_image" />
                 <div
                   class="home_question_NameBox_text"
                 >{{ item.user_remark === '' || item.user_remark === null ? item.username : item.user_remark | ellipsisC }}</div>
@@ -280,13 +292,13 @@
                 :lazy-src="item.img"
                 class="fieldShow_image"
                 v-if="item.img"
-                :src=" 'http://120.27.222.26:5555/' + item.img[0]"
+                :src=" 'bigservers/' + item.img[0]"
                 alt="加载错误"
               />
               <div class="item-body">
                 <div class="item-desc">{{item.problem | ellipsisB}}</div>
                 <div class="item-footer">
-                  <img class="avatar" :src=" 'http://120.27.222.26:5555/' + item.photo" />
+                  <img class="avatar" :src=" 'bigservers/' + item.photo" />
                   <div
                     class="name"
                   >{{item.user_remark === '' || item.user_remark === null ? item.username : item.user_remark}}</div>
@@ -337,7 +349,7 @@
 
       <!-- 手动录入 -->
       <div v-else class>
-        <el-dropdown class="right_box" trigger="click" @command="handleCommandC">
+        <!-- <el-dropdown class="right_box" trigger="click" @command="handleCommandC">
           <span class="el-dropdown-link">
             {{this.shoudong === '' ? this.luruDtat : this.shoudong}}
             <i
@@ -349,9 +361,33 @@
             <el-dropdown-item command="plant">作物</el-dropdown-item>
             <el-dropdown-item command="insect">昆虫</el-dropdown-item>
           </el-dropdown-menu>
-        </el-dropdown>
+        </el-dropdown>-->
         <!-- 筛选框 -->
 
+        <!-- 测试滑块 -->
+        <div class="about">
+          <div class="idd">
+            <ul class="huakuaiUl">
+              <!-- <li
+                  class="huakuaiLi"
+                  :class="{'active':indexTap == index}"
+                  v-for="(item,index) in lists"
+                  :key="index"
+                  @click="indexTap = index"
+              >{{item}}</li>-->
+              <li
+                class="huakuaiLi"
+                :class="{'active':indexTapA == index}"
+                v-for="(item,index) in listsA"
+                :key="index"
+                @click="indexTapA = index, handleCommandC(item)"
+              >{{item}}</li>
+            </ul>
+            <!-- <div class="showBox animated bounceInDown" v-if="indexTap == 2">范德萨范德萨</div> -->
+          </div>
+        </div>
+        <!-- 测试滑块 -->
+
         <!-- 数据列表 -->
         <ul class="manualEntering_ul" v-if="zanwuShow">
           <li
@@ -362,11 +398,7 @@
           >
             <div class="manualEntering_li_box">
               <!-- 图片 -->
-              <img
-                v-lazy=" 'http://120.27.222.26:5555/' + item.img[0]"
-                alt
-                class="manualEntering_li_box_img"
-              />
+              <img v-lazy=" 'bigservers/' + item.img[0]" alt class="manualEntering_li_box_img" />
               <!-- 图片 -->
 
               <!-- 科目和名称 -->
@@ -547,9 +579,9 @@ export default {
       see_disease: [], //手动录入数据
       indexData: localStorage.getItem("homeIndex"), //下标
       lunboImgList: [
-        "http://120.27.222.26:5555/discern_photos/rotation/1.png",
-        "http://120.27.222.26:5555/discern_photos/rotation/2.png",
-        "http://120.27.222.26:5555/discern_photos/rotation/3.png"
+        "bigservers/discern_photos/rotation/1.png",
+        "bigservers/discern_photos/rotation/2.png",
+        "bigservers/discern_photos/rotation/3.png"
       ], //轮播图
       mapShow: false, //地图
       botNav: true, //底部导航
@@ -618,7 +650,15 @@ export default {
       filename: "",
       dialogVisible: false, //选择昆虫还是病害识别
       sHow: false, //预览对象
-      fileA: "" //上传图片
+      fileA: "", //上传图片
+
+      //交流测试滑块
+      indexTap: localStorage.getItem("commandLeiWen"),
+      lists: ["全部", "作物", "昆虫", "我发起的", "我收藏的"],
+
+      //手录测试滑块
+      indexTapA: localStorage.getItem("commandLeiWen"),
+      listsA: ["全部", "作物", "昆虫"]
     };
   },
   beforeRouteEnter(to, from, next) {
@@ -756,7 +796,7 @@ export default {
         form.append("gis", "118.279643#31.221456");
         this.$axios({
           method: "post",
-          url: "log/recognizationSys/api/recognization",
+          url: "academysciences/recognizationSys/api/recognization",
           anync: true,
           data: form,
           headers: {
@@ -830,7 +870,7 @@ export default {
         form.append("gis", "118.279643#31.221456");
         this.$axios({
           method: "post",
-          url: "log/recognizationSys/api/recognization",
+          url: "academysciences/recognizationSys/api/recognization",
           anync: true,
           data: form,
           headers: {
@@ -928,7 +968,7 @@ export default {
         //请求交流数据
         this.$axios({
           method: "get",
-          url: "/user_answer",
+          url: "bigservers/user_answer",
           params: {
             page: this.mescrollUp.page.num,
             ret: localStorage.getItem("commandLeiWenA")
@@ -951,7 +991,7 @@ export default {
             if (this.mescrollUp.page.num <= this.aggregate) {
               this.$axios({
                 method: "get",
-                url: "/user_answer",
+                url: "bigservers/user_answer",
                 params: {
                   page: this.mescrollUp.page.num,
                   ret: localStorage.getItem("commandLeiWenA")
@@ -990,7 +1030,7 @@ export default {
         //请求个人秀数据
         this.$axios({
           method: "get",
-          url: "/user_farm_show",
+          url: "bigservers/user_farm_show",
           params: {
             page: this.mescrollUp.page.num
           }
@@ -1009,7 +1049,7 @@ export default {
             if (this.mescrollUp.page.num <= this.aggregate) {
               this.$axios({
                 method: "get",
-                url: "/user_farm_show",
+                url: "bigservers/user_farm_show",
                 params: {
                   page: this.mescrollUp.page.num
                 }
@@ -1053,7 +1093,7 @@ export default {
         //请求手动录入数据
         this.$axios({
           method: "get",
-          url: "/see_disease",
+          url: "bigservers/see_disease",
           params: {
             page: this.mescrollUp.page.num,
             ret: retA
@@ -1084,7 +1124,7 @@ export default {
             if (this.mescrollUp.page.num <= this.aggregate) {
               this.$axios({
                 method: "get",
-                url: "/see_disease",
+                url: "bigservers/see_disease",
                 params: {
                   page: this.mescrollUp.page.num,
                   ret: retA
@@ -1318,26 +1358,45 @@ export default {
       // this.$router.push("/questions");
     },
 
-    // 下拉筛选框-作物或昆虫
-    handleCommand(command) {
-      if (command === "all") {
-        localStorage.setItem("commandLeiWen", "全部");
+    // 下拉筛选框-作物或昆虫收藏我发起的
+    handleCommand(name) {
+      if (name === "全部") {
+        // localStorage.setItem("commandLeiWen", "全部");
+        localStorage.setItem("commandLeiWen", "0");
         localStorage.setItem("commandLeiWenA", "all");
         this.jiaoliu = "全部";
-      } else if (command === "plant") {
-        localStorage.setItem("commandLeiWen", "作物");
+        this.handleCommandA("all");
+      } else if (name === "作物") {
+        // localStorage.setItem("commandLeiWen", "作物");
+        localStorage.setItem("commandLeiWen", "1");
         localStorage.setItem("commandLeiWenA", "plant");
         this.jiaoliu = "作物";
-      } else if (command === "insect") {
-        localStorage.setItem("commandLeiWen", "昆虫");
+        this.handleCommandA("plant");
+      } else if (name === "昆虫") {
+        // localStorage.setItem("commandLeiWen", "昆虫");
+        localStorage.setItem("commandLeiWen", "2");
         localStorage.setItem("commandLeiWenA", "insect");
         this.jiaoliu = "昆虫";
+        this.handleCommandA("insect");
+      } else if (name === "我发起的") {
+        // localStorage.setItem("commandWen", "我发起的");
+        localStorage.setItem("commandWen", "3");
+        localStorage.setItem("commandWenA", "user");
+        this.jiaoliu2 = "我发起的";
+        this.sponsorQuestions();
+      } else if (name === "我收藏的") {
+        // localStorage.setItem("commandWen", "我收藏的");
+        localStorage.setItem("commandWen", "4");
+        this.jiaoliu2 = "我收藏的";
+        this.questionsCollect();
       }
-      // this.$message("click on item " + command);
-      //请求交流数据
+    },
+
+    // 下拉筛选框-交流
+    handleCommandA(command) {
       this.$axios({
         method: "get",
-        url: "/user_answer",
+        url: "bigservers/user_answer",
         params: {
           page: 1,
           ret: command
@@ -1356,31 +1415,6 @@ export default {
         });
     },
 
-    // 下拉筛选框-交流
-    handleCommandA(command) {
-      // if (command === "a") {
-      //   localStorage.setItem("commandWen", "全部交流");
-      //   localStorage.setItem("commandWenA", "all");
-      //   this.jiaoliu2 = "全部交流";
-      // } else
-      if (command === "b") {
-        localStorage.setItem("commandWen", "我发起的");
-        localStorage.setItem("commandWenA", "user");
-        this.jiaoliu2 = "我发起的";
-      } else if (command === "c") {
-        localStorage.setItem("commandWen", "我收藏的");
-        this.jiaoliu2 = "我收藏的";
-      }
-      // this.$message("click on item " + command);
-      if (command === "c") {
-        //判断是否选择了收藏交流内容
-        this.questionsCollect();
-      } else if (command === "b") {
-        //判断是否选择了我发起的交流内容
-        this.sponsorQuestions();
-      }
-    },
-
     //点击进入交流详情
     details(e, id) {
       let _this = this;
@@ -1402,7 +1436,7 @@ export default {
     questionsCollect() {
       this.$axios({
         method: "get",
-        url: "/answer_praise",
+        url: "bigservers/answer_praise",
         params: {
           page: 1
         }
@@ -1425,7 +1459,7 @@ export default {
       //请求交流数据
       this.$axios({
         method: "get",
-        url: "/user_answer",
+        url: "bigservers/user_answer",
         params: {
           page: 1,
           ret: "all"
@@ -1452,7 +1486,7 @@ export default {
     sponsorQuestions() {
       this.$axios({
         method: "get",
-        url: "/user_answer",
+        url: "bigservers/user_answer",
         params: {
           ret: "user",
           page: 1
@@ -1493,14 +1527,15 @@ export default {
       // console.log(scrollData);
     },
 
-    loadmore(index) {
+    // loadmore(index) {
+    loadmore() {
       this.fieldShowData = this.data.concat(this.fieldShowData);
     },
     //请求个人秀数据
     tianjianxiuAjax() {
       this.$axios({
         method: "get",
-        url: "/user_farm_show",
+        url: "bigservers/user_farm_show",
         params: {
           page: 1
         }
@@ -1558,7 +1593,7 @@ export default {
       _this
         .$axios({
           method: "get",
-          url: "/user_news"
+          url: "bigservers/user_news"
         })
         .then(res => {
           if (res.data.num === 0) {
@@ -1573,19 +1608,22 @@ export default {
     },
 
     //手动录入-病虫害筛选
-    handleCommandC(command) {
-      if (command === "all") {
+    handleCommandC(name) {
+      if (name === "全部") {
         localStorage.setItem("commandLuru", "全部");
-        this.shoudong = "全部";
-      } else if (command === "plant") {
+        localStorage.setItem("commandLuruA", "all");
+        this.shoudong = "all";
+      } else if (name === "作物") {
         localStorage.setItem("commandLuru", "作物");
-        this.shoudong = "作物";
-      } else if (command === "insect") {
+        localStorage.setItem("commandLuruA", "plant");
+        this.shoudong = "plant";
+      } else if (name === "昆虫") {
         localStorage.setItem("commandLuru", "昆虫");
-        this.shoudong = "昆虫";
+        localStorage.setItem("commandLuruA", "insect");
+        this.shoudong = "insect";
       }
-      localStorage.setItem("commandIndex", command);
-      this.manualEntering_ajax(command);
+      localStorage.setItem("commandIndex", this.shoudong);
+      this.manualEntering_ajax(this.shoudong);
     },
 
     //请求手动录入列表数据
@@ -1600,7 +1638,7 @@ export default {
       _this
         .$axios({
           method: "get",
-          url: "/see_disease",
+          url: "bigservers/see_disease",
           params: {
             ret: ret,
             page: 1
@@ -1640,7 +1678,7 @@ export default {
       var b = localStorage.getItem("addrData");
       this.$axios({
         method: "get",
-        url: "/weather",
+        url: "bigservers/weather",
         params: {
           city: b
         }
@@ -1677,7 +1715,7 @@ export default {
         _this
           .$axios({
             method: "post",
-            url: "answer_praise",
+            url: "bigservers/answer_praise",
             data: postData
           })
           .then(res => {
@@ -1720,7 +1758,7 @@ export default {
         _this
           .$axios({
             method: "post",
-            url: "answer_praise",
+            url: "bigservers/answer_praise",
             data: postData
           })
           .then(res => {
@@ -1764,7 +1802,7 @@ export default {
         _this
           .$axios({
             method: "post",
-            url: "farm_likes",
+            url: "bigservers/farm_likes",
             data: postData
           })
           .then(res => {
@@ -1808,7 +1846,7 @@ export default {
         _this
           .$axios({
             method: "post",
-            url: "farm_likes",
+            url: "bigservers/farm_likes",
             data: postData
           })
           .then(res => {
@@ -1901,15 +1939,6 @@ export default {
 
     this.pandui(); //先判断天气插件是否需要更新
 
-    //判断当前是否是再拍一张调用上传文件功能
-    // if (localStorage.getItem('again') == '1' && localStorage.getItem('insect') == '昆虫') {
-    //   //请求昆虫
-    //   _this.upload()
-    // } else if (localStorage.getItem('again') == '1' && localStorage.getItem('plant') == '病害') {
-    //   //请求病害
-    //   _this.uploadA()
-    // }
-
     // 【注意2:】
     // 轮播图 · 初始化设定
     var swiper = new Swiper(".swiper-container", {
@@ -2052,4 +2081,35 @@ export default {
     }
   }
 }
-</style> 
+</style> 
+
+<style lang="scss" scoped>
+.huakuaiUl::-webkit-scrollbar {
+  display: none;
+}
+.active {
+  color: #fff;
+  font-weight: bolder;
+  border: 1px solid #f06084;
+  background: #f06084;
+}
+.idd {
+  width: 100%;
+  overflow: hidden;
+  .huakuaiUl {
+    display: flex;
+    align-items: center;
+    overflow: auto;
+    padding-left: 0;
+    list-style: none;
+    .huakuaiLi {
+      text-align: center;
+      font-size: 15px;
+      -ms-flex-negative: 0;
+      flex-shrink: 0;
+      padding: 10px;
+      margin: 5px;
+    }
+  }
+}
+</style>

discern/src/components/lianxi/lianxi.vue

@@ -1,119 +0,0 @@
-<template>
-  <div>
-    <baidu-map
-      class="bm-view"
-      :center="center"
-      :zoom="zoom"
-      @ready="handler"
-      :scroll-wheel-zoom="true"
-      :mapClick="false"
-      ak="**********"
-    >
-      <!--地图类型-->
-      <bm-map-type
-        :map-types="['BMAP_NORMAL_MAP', 'BMAP_HYBRID_MAP']"
-        anchor="BMAP_ANCHOR_TOP_LEFT"
-      ></bm-map-type>
-      <!--地图缩放-->
-      <bm-navigation anchor="BMAP_ANCHOR_TOP_RIGHT"></bm-navigation>
-      <!--标注点  animation="BMAP_ANIMATION_BOUNCE"-->
-      <div v-for="marker in markers" :key="marker.lng">
-        <bm-marker :position="{lng: marker.lng, lat: marker.lat}" @click="markerClick(marker)"></bm-marker>
-        <bm-label
-          :content="marker.content"
-          :offset="{width:-55,height:-65}"
-          :position="{lng: marker.lng, lat: marker.lat}"
-          :labelStyle="{border:'1px solid #6ea4cd', padding:'8px',fontWeight: '600',fontSize:'14px',cursor: 'pointer'}"
-          :title="marker.content"
-          @click="markerClick(marker)"
-        />
-      </div>
-    </baidu-map>
-  </div>
-</template>
-<script>
-import BaiduMap from "vue-baidu-map/components/map/Map.vue";
-import BmNavigation from "vue-baidu-map/components/controls/Navigation.vue";
-import BmMapType from "vue-baidu-map/components/controls/MapType.vue";
-import BmMarker from "vue-baidu-map/components/overlays/Marker.vue";
-import BmInfoWindow from "vue-baidu-map/components/overlays/InfoWindow.vue";
-import BmOverlay from "vue-baidu-map/components/overlays/Overlay.vue";
-import BmLabel from "vue-baidu-map/components/overlays/Label.vue";
-import { mapGetters } from "vuex";
-export default {
-  data() {
-    return {
-      center: { lng: 0, lat: 0 },
-      zoom: 15,
-      markers: []
-    };
-  },
-  components: {
-    BaiduMap,
-    BmNavigation,
-    BmMapType,
-    BmMarker,
-    BmInfoWindow,
-    BmOverlay,
-    BmLabel
-  },
-  computed: {
-    ...mapGetters(["getCurrentDomainTreeCached"])
-  },
-  mounted() {
-    this.markers = [
-      {
-        lng: 116.404,
-        lat: 39.915,
-        content: "TCL液晶产业园"
-      },
-      {
-        lng: 115.504,
-        lat: 39.915,
-        content: "TCL产业园"
-      }
-    ];
-  },
-  methods: {
-    draw({ el, BMap, map }) {
-      const pixel = map.pointToOverlayPixel(new BMap.Point(116.404, 39.915));
-      el.style.left = pixel.x - 60 + "px";
-      el.style.top = pixel.y - 20 + "px";
-    },
-
-    handler({ BMap, map }) {
-      // 自动获取展示的比例
-      var view = map.getViewport(eval(this.markers));
-      this.zoom = view.zoom;
-      this.center = view.center;
-    },
-    markerClick() {
-      debugger;
-      this.show = true;
-    },
-    infoWindowClose() {
-      this.show = false;
-    }
-  },
-  destroyed() {}
-};
-</script>
-
-<style>
-.bm-view {
-  width: 100%;
-  height: calc(100vh - 100px);
-}
-
-.sample {
-  width: 160px;
-  height: 60px;
-  background: rgba(255, 255, 255, 0.5);
-  overflow: auto;
-  color: #000000;
-  text-align: center;
-  padding: 10px;
-  position: relative;
-}
-</style>
-

discern/src/components/lianxi/lianxiA.vue

@@ -1,52 +1,67 @@
-<!--  -->
 <template>
-<div class=''>
-  <button @click="aaa()">请求接口</button>
-</div>
+  <div class="about">
+    <div class="idd">
+      <ul>
+        <li
+          :class="{'active':indexTap == index}"
+          v-for="(item,index) in lists"
+          :key="index"
+          @click="indexTap = index"
+        >{{item}}</li>
+      </ul>
+      <div class="showBox animated bounceInDown" v-if="indexTap == 2">范德萨范德萨</div>
+    </div>
+  </div>
 </template>
 
 <script>
-//这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）
-//例如：import 《组件名称》 from '《组件路径》';
-
 export default {
-//import引入的组件需要注入到对象中才能使用
-components: {},
-data() {
-//这里存放数据
-return {
-
+  name: "about",
+  data() {
+    return {
+      indexTap: 0,
+      lists: [
+        "title01",
+        "title02",
+        "title03",
+        "title04",
+        "title05",
+        "title06",
+        "title07",
+        "title08",
+        "title09",
+        "title010"
+      ]
+    };
+  }
 };
-},
-//监听属性 类似于data概念
-computed: {},
-//监控data中的数据变化
-watch: {},
-//方法集合
-methods: {
-  aaa() {
-    let _this = this;
-    
-  },
-},
-//生命周期 - 创建完成（可以访问当前this实例）
-created() {
-
-},
-//生命周期 - 挂载完成（可以访问DOM元素）
-mounted() {
-
-},
-beforeCreate() {}, //生命周期 - 创建之前
-beforeMount() {}, //生命周期 - 挂载之前
-beforeUpdate() {}, //生命周期 - 更新之前
-updated() {}, //生命周期 - 更新之后
-beforeDestroy() {}, //生命周期 - 销毁之前
-destroyed() {}, //生命周期 - 销毁完成
-activated() {}, //如果页面有keep-alive缓存功能，这个函数会触发
-}
 </script>
-<style lang='scss' scoped>
-//@import url(); 引入公共css类
 
-</style>
+<style lang="scss" scoped>
+ul::-webkit-scrollbar {
+  display: none;
+}
+.active {
+  color: #cd1845;
+  font-weight: bolder;
+}
+.idd {
+  width: 100%;
+  overflow: hidden;
+  ul {
+    display: flex;
+    align-items: center;
+    overflow: auto;
+    padding-left: 0;
+    list-style: none;
+    li {
+      text-align: center;
+      font-size: 16px;
+      -ms-flex-negative: 0;
+      flex-shrink: 0;
+      padding: 10px;
+      margin: 5px;
+    }
+  }
+}
+</style>

discern/src/components/lianxi/lianxiB.vue

@@ -1,491 +1,65 @@
-<!--  -->
 <template>
-  <div
-    class="scroll"
-    :style="'height:' + fullHeight + 'px'"
-    v-loading="loading"
-    element-loading-text="拼命加载中"
-    element-loading-spinner="el-icon-loading"
-    element-loading-background="rgba(0, 0, 0, 0.8)"
-    :modal-append-to-body="false"
-  >
-    <!-- 点击相机图标弹出选择昆虫或病害窗口 -->
-    <el-dialog :modal-append-to-body="false" title="提示" :visible.sync="dialogVisible" width="60%">
-      <span>请选择识别类型</span>
-      <span slot="footer" class="dialog-footer">
-        <!-- 选择昆虫 -->
-        <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>
-
-    <!-- loading -->
-    <div v-if="loadingShow" class="loading_box" :style="'height:' + fullHeight + 'px'">
-      <!-- <div class="loading_box_del" @click="loadingDel()">X</div> -->
-
-      <div class="loading_box_div">
-        <img src="../../../static/dongh.gif" alt class="loading_gif" />
-        <div class="loading_text">识别中，请稍等...</div>
+  <div class="index">
+    <my-scroll :page="page" :on-refresh="onRefresh" :on-pull="onPull">
+      <div slot="scrollList">
+        <ul>
+          <li v-for="(x,index) in list" :key="index">列表</li>
+        </ul>
       </div>
-    </div>
-
-    <button @click="add">上传</button>
-    <button @click="addA">上aaaa</button>
-
-    <!-- 上传图片 -->
-    <div class="v-simple-cropper">
-      <slot></slot>
-      <div class="v-cropper-layer" ref="layer">
-        <div class="layer-header">
-          <button class="cancel" @click="cancelHandle">取消</button>
-          <button class="confirm" @click="confirmHandle">裁剪</button>
-        </div>
-        <img ref="cropperImg" />
-      </div>
-    </div>
+    </my-scroll>
   </div>
 </template>
-
-<script>
-// 按需引入点聚合
-// 引入marker
-import Cropper from "cropperjs";
-import "cropperjs/dist/cropper.min.css";
-const carList = [{}];
+<script type="text/javascript">
+import myScroll from "../upload/upload.vue";
 export default {
-  //限时数据文本的字数限时
-  filters: {},
-  name: "Bmaptrace",
-  components: {},
   data() {
-    //这里存放数据
-    const self = this;
     return {
-      loadingShow: false,
-      fullHeight: document.documentElement.clientHeight,
-      isClick: true, //点赞开关
-      gerenShow: true, //个人秀暂无判断
-      jiaoliuShow: true, //交流暂无判断
-      zanwuShow: true, //手动录入暂无判断
-      jiaoliu: "", //交流筛选
-      jiaoliu2: "", //交流筛选2
-      shoudong: "", //手动录入筛选
-      menuTree: [],
-      loading: false, //页面加载
-      lunboImgList: [
-        "http://120.27.222.26:5555/discern_photos/rotation/1.png",
-        "http://120.27.222.26:5555/discern_photos/rotation/2.png",
-        "http://120.27.222.26:5555/discern_photos/rotation/3.png"
-      ], //轮播图
-      //上传
-      cropper: null,
-      filename: "",
-      dialogVisible: false, //选择昆虫还是病害识别
-      sHow: false, //预览对象
-      fileA: "" //上传图片
-    };
-  },
-  //监听属性 类似于data概念
-  computed: {},
-  //监控data中的数据变化
-  watch: {
-    fullHeight(val) {
-      //监控浏览器高度变化
-      if (!this.timer) {
-        this.fullHeight = val;
-        this.timer = true;
-        let that = this;
-        setTimeout(function() {
-          //防止过度调用监测事件，导致卡顿
-          that.timer = false;
-        }, 400);
+      list: [],
+      page: {
+        counter: 1,
+        pageStart: 1,
+        pageEnd: 1,
+        total: 10
       }
-    }
+    };
   },
-  //方法集合
   methods: {
-    add() {
-      var _this = this;
-      _this.dialogVisible = true;
-    },
-
-    // 初始化裁剪插件
-    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();
-    },
-    // 选择上传文件
-    uploadChange(e) {
-      let file = e.target.files[0];
-      this.fileA = file; //传递给data中
-      this.filename = file["name"];
-      let URL = window.URL || window.webkitURL;
-      this.$refs["layer"].style.display = "block";
-      this.cropper.replace(URL.createObjectURL(file));
+    onRefresh(mun) {
+      //刷新回调
+      setTimeout(() => {
+        this.$root.$emit("setState", 3);
+      }, 500);
     },
-    // 取消上传
-    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;
-      // 判断用户选择的病害还是昆虫;
-      if (localStorage.getItem("insect") !== null) {
-        //虫害
-        var form = new FormData();
-        form.append("imageFile", _this.fileA);
-        form.append("imageType", "1");
-        form.append("uniqueKey", "84e6eb40f3a616dd14b1fefc75425006");
-        form.append("username", "yunfei");
-        form.append("gis", "118.279643#31.221456");
-        this.$axios({
-          method: "post",
-          url: "log/recognizationSys/api/recognization",
-          anync: true,
-          data: form,
-          headers: {
-            "Content-Type": "multipart/form-data"
-          }
-        })
-          .then(res => {
-            console.log(res.data);
-          })
-          .catch(error => {
-            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: "/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 = "";
-          });
-      }
-    },
-
-    //点击版本查看是否有新版
-    addA() {
-      let _this = this;
-      _this
-        .$axios({
-          method: "get",
-          url: "/edition"
-        })
-        .then(res => {
-          let num = "113";
-          var data = res.data.edition_num;
-          var a = data.replace(/\./g, "");
-          if (num == a) {
-            console.log("当前已经是最新版本");
-            // this.$message({
-            //   showClose: true,
-            //   message: "当前已经是最新版本"
-            // });
-          } else if (num < a) {
-            _this.new = "1"; //添加标识
-            this.$confirm("检测到有最新版本, 是否更新?", "提示", {
-              confirmButtonText: "确定",
-              cancelButtonText: "取消",
-              type: "warning"
-            })
-              .then(() => {
-                _this.new = "0"; //取消标识
-                window.location.href =
-                  "http://120.27.222.26:5555/down_app/deity.apk";
-                // this.$message({
-                //   type: "success",
-                //   message: "更新成功!"
-                // });
-              })
-              .catch(() => {
-                _this.new = "1"; //如果用户进行取消就给列表添加个醒目的标识
-                this.$message({
-                  type: "info",
-                  message: "取消更新"
-                });
-              });
+    onPull(mun) {
+      //加载回调
+      if (this.page.counter <= this.page.total) {
+        setTimeout(() => {
+          this.page.counter++;
+          this.$root.$emit("setState", 5);
+          for (let i = 0; i < 10; i++) {
+            this.listdata.push({});
           }
-          // console.log(res.data);
-        })
-        .catch(err => {
-          console.log(err);
-        });
-    },
-
-    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图片
-          localStorage.setItem("ba64dataA", base64);
-        };
+        }, 500);
+      } else {
+        this.$root.$emit("setState", 7);
       }
     }
   },
-  //生命周期 - 创建完成（可以访问当前this实例）
+  components: {
+    myScroll
+  },
   created() {},
-  //生命周期 - 挂载完成（可以访问DOM元素）
   mounted() {
-    this.init(); //图片剪切
+    for (let i = 0; i < 1 * 50; i++) {
+      this.list.push({});
+    }
   }
 };
 </script>
-<style lang="scss">
-@import "../../assets/scss/bus.scss";
-@import "../../assets/scss/home.scss";
-
-//自定义天气插件显示样式
-.home_box_mescroll {
-  width: 100%;
-  height: 100%;
-  overflow-y: auto;
+<style lang="scss" scoped>
+.index {
 }
-.weather_box {
-  position: relative;
-  // position: absolute;
-  // left: 0.05rem;
-  // top: 0.52rem;
-  left: 0.05rem;
-  top: -1.48rem;
-  border: 1px solid #ecf0f2;
-  width: 38%;
-  height: 1.8rem;
-  border-radius: 15px;
-  background: #ecf0f2;
-}
-
-.dizhiBox {
-  display: flex;
-  justify-content: space-evenly;
-  padding-top: 0.7rem;
-}
-
-//天气情况
-.weather_case {
-  font-size: 15px;
-  margin: 0.1rem 0 -0.3rem 1.7rem;
-}
-
-.weather_area {
-  font-size: 18px;
-  font-weight: 600;
-}
-
-.weather_temp {
-  font-size: 20px;
-}
-
-.weather_img {
-  position: absolute;
-  top: -0.6rem;
-  left: 0.1rem;
-  width: 1.6rem;
-  height: 1.6rem;
-}
-</style>
-
-<style>
-/* @import "./css/lovecircle.css"; */
-/* 轮播图 */
-.bannerWrap {
-  /* margin: 1.5rem 0 0.5rem 0; */
-  margin: -1.8rem 0 0.5rem 0;
-}
-.swiper-container {
-  width: 100%;
-  height: 100%;
-}
-.swiper-slide {
-  background-position: center;
-  background-size: cover;
-}
-.bannerWrap_img {
-  width: 100%;
-  height: 100%;
-}
-</style>
-
-
-<style lang="less">
-.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;
-    }
-  }
+li {
+  color: #000;
 }
-</style> 
+</style>

discern/src/components/login/login.vue

@@ -344,7 +344,7 @@ export default {
           .$axios({
             method: "post",
             // url: "/check_tourist",
-            url: "/check_tourist",
+            url: "bigservers/check_tourist",
             data: postData
           })
           .then(res => {
@@ -360,7 +360,7 @@ export default {
             } else if (res.data === 2) {
               this.$axios({
                 method: "get",
-                url: "/tourist_in"
+                url: "bigservers/tourist_in"
               })
                 .then(res => {
                   this.redata = res.data;
@@ -421,7 +421,7 @@ export default {
         _this
           .$axios({
             method: "post",
-            url: "/land_in",
+            url: "bigservers/land_in",
             data: postData,
             headers: {
               "Content-Type": "multipart/form-data"
@@ -510,7 +510,7 @@ export default {
         var data = this.redataName
       }
       window.location.href =
-        "http://120.27.222.26:5555/down_app/" + data;
+        "bigservers/down_app/" + data;
       this.scheduleShow = true;
       const timer = setInterval(() => {
         this.percentage += 10;
@@ -572,7 +572,7 @@ export default {
       _this
         .$axios({
           method: "post",
-          url: "/tourist_in",
+          url: "bigservers/tourist_in",
           data: postData
         })
         .then(res => {
@@ -806,7 +806,7 @@ export default {
     _this
       .$axios({
         method: "get",
-        url: "edition"
+        url: "bigservers/edition"
       })
       .then(res => {
         let num = "114";
@@ -836,7 +836,7 @@ export default {
     _this
       .$axios({
         method: "post",
-        url: "/check_tourist",
+        url: "bigservers/check_tourist",
         data: postData
       })
       .then(res => {
@@ -853,7 +853,7 @@ export default {
         } else if (res.data === 2) {
           this.$axios({
             method: "get",
-            url: "/tourist_in"
+            url: "bigservers/tourist_in"
           })
             .then(res => {
               this.redata = res.data;

discern/src/components/mapShow/mapShow.vue

@@ -367,7 +367,7 @@ export default {
   created() {
     this.$axios({
       method: "get",
-      url: "/insect_map?page=1"
+      url: "bigservers/insect_map?page=1"
     })
       .then(res => {
         this.redata = res.data;
@@ -392,7 +392,7 @@ export default {
     _this
       .$axios({
         method: "get",
-        url: "see_user"
+        url: "bigservers/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=" 'http://120.27.222.26:5555/' + this.redata.user_photo" alt class="main_user_img" />
+          <img :src=" 'bigservers/' + 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: "/check_leaving",
+          url: "bigservers/check_leaving",
           data: postData,
           headers: {
             "Content-Type": "multipart/form-data"
@@ -174,7 +174,7 @@ export default {
       _this
         .$axios({
           method: "post",
-          url: "/see_leaving",
+          url: "bigservers/see_leaving",
           data: postData,
           headers: {
             "Content-Type": "multipart/form-data"
@@ -213,7 +213,7 @@ export default {
     });
     this.$axios({
       method: "post",
-      url: "/check_leaving",
+      url: "bigservers/check_leaving",
       data: postData,
       headers: {
         "Content-Type": "multipart/form-data"

discern/src/components/memory/memory.vue

@@ -35,7 +35,7 @@
             <!-- 图片 -->
             <div class="memory_li_div">
               <img
-                v-lazy="item.img_url !== '' ? item.img_url : 'http://120.27.222.26:5555/' + item.img"
+                v-lazy="item.img_url !== '' ? item.img_url : 'bigservers/' + item.img"
                 alt
                 class="memory_li_img"
               />
@@ -239,7 +239,7 @@ export default {
       });
       this.$axios({
         method: "post",
-        url: "/check_record",
+        url: "bigservers/check_record",
         data: postData
       })
         .then(res => {
@@ -261,7 +261,7 @@ export default {
             });
             this.$axios({
               method: "post",
-              url: "/check_record",
+              url: "bigservers/check_record",
               data: postData
             })
               .then(res => {
@@ -375,7 +375,7 @@ export default {
       _this
         .$axios({
           method: "post",
-          url: "/check_record",
+          url: "bigservers/check_record",
           data: postData,
           headers: {
             "Content-Type": "multipart/form-data"
@@ -412,7 +412,7 @@ export default {
       _this
         .$axios({
           method: "post",
-          url: "/check_record",
+          url: "bigservers/check_record",
           data: postData,
           headers: {
             "Content-Type": "multipart/form-data"
@@ -449,7 +449,7 @@ export default {
       _this
         .$axios({
           method: "post",
-          url: "/check_record",
+          url: "bigservers/check_record",
           data: postData,
           headers: {
             "Content-Type": "multipart/form-data"
@@ -492,7 +492,7 @@ export default {
       _this
         .$axios({
           method: "post",
-          url: "/del_record",
+          url: "bigservers/del_record",
           data: postData,
           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: "/check_leaving",
+        url: "bigservers/check_leaving",
         params: {
           page: _this.mescrollUp.page.num
         }

discern/src/components/message_list/message_list.vue

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

discern/src/components/mine/mine.vue

@@ -33,13 +33,13 @@
           <div class="portrait_img_box">
             <img
               preview="1"
-              :src=" 'http://120.27.222.26:5555/' + this.redata.user_photo"
+              :src=" 'bigservers/' + this.redata.user_photo"
               alt
               class="portrait_img"
             />
             <!-- 
             <img
-              :src=" 'http://120.27.222.26:5555/' + this.redata.user_photo"
+              :src=" 'bigservers/' + this.redata.user_photo"
               alt
               class="portrait_img"
             />-->
@@ -205,7 +205,7 @@ export default {
       _this
         .$axios({
           method: "post",
-          url: "/alter_head",
+          url: "bigservers/alter_head",
           anync: true,
           data: form,
           headers: {
@@ -272,7 +272,7 @@ export default {
         _this
           .$axios({
             method: "post",
-            url: "/alter_remark",
+            url: "bigservers/alter_remark",
             data: postData,
             headers: {
               "Content-Type": "multipart/form-data"
@@ -333,7 +333,7 @@ export default {
     _this
       .$axios({
         method: "get",
-        url: "/see_user"
+        url: "bigservers/see_user"
       })
       .then(res => {
         _this.redata = res.data[0];

discern/src/components/modification/modification.vue

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

discern/src/components/person/person.vue

@@ -30,7 +30,7 @@
       <div class="person_head_imageBox">
         <img
           preview="1"
-          :src=" 'http://120.27.222.26:5555/' + this.redata.user_photo"
+          :src=" 'bigservers/' + this.redata.user_photo"
           alt
           class="person_head_imageBox_img"
         />
@@ -158,7 +158,7 @@ export default {
       _this
         .$axios({
           method: "get",
-          url: "/see_user "
+          url: "bigservers/see_user "
         })
         .then(res => {
           _this.loading = false;
@@ -221,7 +221,7 @@ export default {
         _this
           .$axios({
             method: "get",
-            url: "/edition"
+            url: "bigservers/edition"
           })
           .then(res => {
             let num = "114";
@@ -244,7 +244,7 @@ export default {
                 .then(() => {
                   _this.new = "0"; //取消标识
                   window.location.href =
-                    "http://120.27.222.26:5555/down_app/deity.apk";
+                    "bigservers/down_app/deity.apk";
                   // this.$message({
                   //   type: "success",
                   //   message: "更新成功!"
@@ -276,7 +276,7 @@ export default {
       _this
         .$axios({
           method: "get",
-          url: "/edition"
+          url: "bigservers/edition"
         })
         .then(res => {
           let num = "114";
@@ -298,7 +298,7 @@ export default {
               .then(() => {
                 _this.new = "0"; //取消标识
                 window.location.href =
-                  "http://120.27.222.26:5555/down_app/deity.apk";
+                  "bigservers/down_app/deity.apk";
                 // this.$message({
                 //   type: "success",
                 //   message: "更新成功!"
@@ -334,7 +334,7 @@ export default {
         .then(() => {
           this.$axios({
             method: "get",
-            url: "/out_land"
+            url: "bigservers/out_land"
           })
             .then(res => {
               if (res.data === 0) {

discern/src/components/questions/questions.vue

@@ -529,7 +529,7 @@ export default {
         .then(() => {
           this.$axios({
             method: "post",
-            url: "del_img",
+            url: "bigservers/del_img",
             data: postData
           })
             .then(res => {
@@ -572,7 +572,7 @@ export default {
       _this
         .$axios({
           method: "post",
-          url: "/send_answer_img",
+          url: "bigservers/send_answer_img",
           anync: true,
           data: form,
           headers: {
@@ -672,7 +672,7 @@ export default {
           _this
             .$axios({
               method: "post",
-              url: "/save_answer",
+              url: "bigservers/save_answer",
               data: postData
             })
             .then(res => {

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=" 'http://120.27.222.26:5555/' + item"
+              v-lazy=" 'bigservers/' + item"
               alt
               class="lunboImg"
             />
@@ -37,7 +37,7 @@
         <div class="questions_details_NameBox">
           <div class="questions_details_NameBox_box">
             <img
-              :src=" 'http://120.27.222.26:5555/' + this.redata.photo"
+              :src=" 'bigservers/' + this.redata.photo"
               alt
               class="questions_details_NameBox_image"
             />
@@ -93,7 +93,7 @@
               <div class="criticOne_profile">
                 <!-- 头像和名称 -->
                 <div class="profile_box">
-                  <img :src=" 'http://120.27.222.26:5555/' + item.photo" alt class="profile_img" />
+                  <img :src=" 'bigservers/' + item.photo" 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=" 'http://120.27.222.26:5555/' + itemA.photo"
+                    :src=" 'bigservers/' + itemA.photo"
                     alt
                     class="profileTwo_img"
                   />
@@ -340,7 +340,7 @@ export default {
       _this
         .$axios({
           method: "post",
-          url: "user_answer",
+          url: "bigservers/user_answer",
           data: postData
         })
         .then(res => {
@@ -416,7 +416,7 @@ export default {
         _this
           .$axios({
             method: "post",
-            url: "/user_reply",
+            url: "bigservers/user_reply",
             data: postData
           })
           .then(res => {
@@ -460,7 +460,7 @@ export default {
         _this
           .$axios({
             method: "post",
-            url: "/answer_praise",
+            url: "bigservers/answer_praise",
             data: postData
           })
           .then(res => {
@@ -507,7 +507,7 @@ export default {
         _this
           .$axios({
             method: "post",
-            url: "/answer_praise",
+            url: "bigservers/answer_praise",
             data: postData
           })
           .then(res => {
@@ -554,7 +554,7 @@ export default {
         _this
           .$axios({
             method: "post",
-            url: "answer_praise",
+            url: "bigservers/answer_praise",
             data: postData
           })
           .then(res => {
@@ -596,7 +596,7 @@ export default {
         _this
           .$axios({
             method: "post",
-            url: "answer_praise",
+            url: "bigservers/answer_praise",
             data: postData
           })
           .then(res => {
@@ -635,7 +635,7 @@ export default {
       _this
         .$axios({
           method: "post",
-          url: "reminder",
+          url: "bigservers/reminder",
           data: postData
         })
         .then(res => {

discern/src/components/record/record.vue

@@ -215,7 +215,7 @@ export default {
         _this
           .$axios({
             method: "post",
-            url: "/collect",
+            url: "bigservers/collect",
             data: postData,
             headers: {
               "Content-Type": "multipart/form-data"
@@ -275,7 +275,7 @@ export default {
         _this
           .$axios({
             method: "post",
-            url: "/collect",
+            url: "bigservers/collect",
             data: postData,
             headers: {
               "Content-Type": "multipart/form-data"
@@ -324,7 +324,7 @@ export default {
         _this
           .$axios({
             method: "post",
-            url: "/see_details",
+            url: "bigservers/see_details",
             data: postData,
             headers: {
               "Content-Type": "multipart/form-data"
@@ -376,7 +376,7 @@ export default {
         _this
           .$axios({
             method: "post",
-            url: "/dase_list",
+            url: "bigservers/dase_list",
             data: postData,
             headers: {
               "Content-Type": "multipart/form-data"
@@ -417,7 +417,7 @@ export default {
       _this
         .$axios({
           method: "post",
-          url: "/see_details",
+          url: "bigservers/see_details",
           data: postData,
           headers: {
             "Content-Type": "multipart/form-data"

discern/src/components/repository/repository.vue

@@ -251,7 +251,7 @@ export default {
       });
       this.$axios({
         method: "post",
-        url: "/see_dase",
+        url: "bigservers/see_dase",
         data: postData
       })
         .then(res => {
@@ -272,7 +272,7 @@ export default {
             });
             this.$axios({
               method: "post",
-              url: "/see_dase",
+              url: "bigservers/see_dase",
               data: postData
             })
               .then(res => {
@@ -372,7 +372,7 @@ export default {
       _this
         .$axios({
           method: "post",
-          url: "/see_dase",
+          url: "bigservers/see_dase",
           data: postData,
           headers: {
             "Content-Type": "multipart/form-data"
@@ -415,7 +415,7 @@ export default {
       _this
         .$axios({
           method: "post",
-          url: "/see_dase",
+          url: "bigservers/see_dase",
           data: postData,
           headers: {
             "Content-Type": "multipart/form-data"
@@ -458,7 +458,7 @@ export default {
       _this
         .$axios({
           method: "post",
-          url: "/see_dase",
+          url: "bigservers/see_dase",
           data: postData,
           headers: {
             "Content-Type": "multipart/form-data"

discern/src/components/seek/seek.vue

@@ -172,7 +172,7 @@ export default {
       _this
         .$axios({
           method: "get",
-          url: "/del_history"
+          url: "bigservers/del_history"
         })
         .then(res => {
           this.$message({
@@ -202,7 +202,7 @@ export default {
     _this
       .$axios({
         method: "get",
-        url: "/see_record",
+        url: "bigservers/see_record",
         params: {
           page: "1"
         }

discern/src/components/seek_data/seek_data.vue

@@ -176,7 +176,7 @@ export default {
       });
       this.$axios({
         method: "post",
-        url: "/search",
+        url: "bigservers/search",
         data: postData
       })
         .then(res => {
@@ -197,7 +197,7 @@ export default {
             });
             this.$axios({
               method: "post",
-              url: "/search",
+              url: "bigservers/search",
               data: postData
             })
               .then(res => {

discern/src/components/show/show.vue

@@ -202,7 +202,7 @@ export default {
           _this
             .$axios({
               method: "post",
-              url: "/record",
+              url: "bigservers/record",
               data: form,
               headers: {
                 "Content-Type": "multipart/form-data"
@@ -239,7 +239,7 @@ export default {
           _this
             .$axios({
               method: "post",
-              url: "/record",
+              url: "bigservers/record",
               data: form,
               headers: {
                 "Content-Type": "multipart/form-data"
@@ -272,7 +272,6 @@ export default {
   created() {
     let _this = this;
     this.fetchData();
-    alert(2222)
   },
   //生命周期 - 挂载完成（可以访问DOM元素）
   mounted() {
@@ -280,13 +279,10 @@ export default {
     this.ceshi();
   },
 
-  //测试是否销毁
-  destroy() {
-    alert('销毁111')
-  },
-  beforedestroy() {
-    alert('销毁222')
-  }
+  // //测试是否销毁
+  // activated() {
+  //   alert('没销毁')
+  // }
 };
 </script>
 <style lang='scss'>

discern/src/components/tourist/tourist.vue

@@ -222,7 +222,7 @@ export default {
       });
       this.$axios({
         method: "post",
-        url: "/detect_number",
+        url: "bigservers/detect_number",
         data: postData
       })
         .then(res => {
@@ -289,7 +289,7 @@ export default {
         form.append("img_addr", _this.fileA);
         this.$axios({
           method: "post",
-          url: "/app_insect",
+          url: "bigservers/app_insect",
           anync: true,
           data: form,
           headers: {
@@ -354,7 +354,7 @@ export default {
         form.append("img_addr", _this.fileA);
         this.$axios({
           method: "post",
-          url: "/app_plant",
+          url: "bigservers/app_plant",
           anync: true,
           data: form,
           headers: {

discern/src/components/upload/upload.vue

@@ -0,0 +1,217 @@
+<template>
+  <div
+    class="my-scroll"
+    ref="myScroll"
+    @touchstart="touchStart($event)"
+    @touchmove="touchMove($event)"
+    @touchend="touchEnd($event)"
+  >
+    <div class="scroll-top" :style="{height:top+'px'}">
+      <div v-if="aspect==2">
+        <p v-if="state==6">下拉刷新</p>
+        <p v-if="state==1">
+          <i>
+            <img :src="Load" />
+          </i>
+          <br />刷新中
+        </p>
+        <p v-if="state==2">松开刷新</p>
+        <p v-if="state==3">
+          <i>
+            <img :src="Load" class="loadImg" />
+          </i>
+          <br />刷新完成
+        </p>
+      </div>
+    </div>
+    <!-- top -->
+    <div class="scroll-list" :style="{ transform: 'translate3d(0, ' + top + 'px, 0)'}">
+      <slot name="scrollList"></slot>
+      <div class="scroll-bottom">
+        <div v-if="state==4">加载中</div>
+        <div v-if="state==5">加载完成</div>
+        <div v-if="state==7">没有更多</div>
+      </div>
+    </div>
+  </div>
+</template>
+<script type="text/javascript">
+import Load from "../../assets/image/shot.gif";
+export default {
+  name: "myScroll",
+  props: {
+    page: {
+      type: Object, //counter:当前页  pageStart:开始页数  pageEnd:结束页数  total:总页数
+      require: true
+    },
+    onRefresh: {
+      //刷新回调
+      type: Function,
+      require: true
+    },
+    onPull: {
+      //加载回调
+      type: Function,
+      require: true
+    },
+    getScrollTop: {
+      //获取滚动条位置
+      type: Function
+    },
+    setScrollPage: {
+      //改变滚动条位置
+      type: Function
+    }
+  },
+  data() {
+    return {
+      Load,
+      pageX: 0,
+      pageY: 0,
+      state: 0,
+      scrollPosition: 0,
+      myScroll: null,
+      myScrollList: null,
+      top: 0,
+      aspect: 0, //1:向下 2:向上
+      listHeight: 0
+    };
+  },
+  created() {
+    this.$root.$on("setState", index => {
+      //修改状态
+      this.state = index;
+      if (index == 5 || index == 3) {
+        setTimeout(() => {
+          this.state = 0;
+          this.top = 0;
+        }, 300);
+      }
+    });
+    this.$root.$on("ScrollTop", top => {
+      //修改滚动条位置
+      this.myScroll.scrollTop = top;
+    });
+  },
+  methods: {
+    touchStart(e) {
+      //触摸事件
+      this.pageX = e.targetTouches[0].pageX;
+      this.pageY = e.targetTouches[0].pageY;
+    },
+    touchMove(e) {
+      //触摸滑动事件
+      this.scrollPosition = this.myScroll.scrollTop; //获取滚动条位置
+      if (e.targetTouches[0].pageY > this.pageY) {
+        //向上滑动
+        this.aspect = 2;
+        if (this.myScroll.scrollTop == 0) {
+          let diff =
+            e.targetTouches[0].pageY - this.pageY - this.scrollPosition;
+          this.top = Math.pow(diff, 0.9);
+          let ranget = (diff / document.body.clientHeight) * 100; //计算在屏幕上滑动了多少
+          if (ranget > 20) {
+            this.state = 2;
+          } else if (ranget < 15) {
+            this.state = 6;
+          }
+          e.preventDefault();
+        }
+      } else if (this.state != 4) {
+        //向上滑动
+        this.aspect = 1;
+      }
+    },
+    touchEnd(e) {
+      if ((this.aspect == 2 && this.state == 2) || this.state == 1) {
+        //上拉处理
+        this.top = 100;
+        this.state = 1;
+        this.topCallback();
+      } else if (this.aspect == 2) {
+        this.state = 0;
+        this.top = 0;
+      }
+    },
+    topCallback() {
+      //刷新回调
+      this.onRefresh(this.state);
+    },
+    bottomCallback() {
+      //加载回调
+      this.state = 4;
+      this.onPull(this.state);
+    }
+  },
+  mounted() {
+    this.myScroll = this.$refs.myScroll; //获取滑条dom
+    this.myScrollList = this.myScroll.children[1]; //获取列表dom
+
+    this.myScroll.addEventListener("scroll", e => {
+      //监听滚动条事件
+      let listHeight = this.myScrollList.offsetHeight; //列表总高度
+      let listScrollTop = e.target.scrollTop + this.myScroll.offsetHeight; //当前滚动条位置
+
+      if (this.state == 0 && listHeight - listScrollTop < 100) {
+        this.bottomCallback();
+      }
+
+      if (this.getScrollTop) this.getScrollTop(e.target.scrollTop); //返回X，Y
+    });
+  }
+};
+</script>
+<style lang="scss" scoped>
+.my-scroll {
+  color: #fff;
+  max-width: 100%;
+  max-height: 100%;
+  height: 100%;
+  overflow: hidden;
+  overflow-y: scroll;
+  -webkit-overflow-scrolling: touch;
+  will-change: transform;
+  transition: all 450ms;
+  backface-visibility: hidden;
+  perspective: 1000;
+  position: relative;
+  .scroll-top {
+    text-align: center;
+    display: flex;
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    div {
+      display: flex;
+      height: auto;
+      width: 100%;
+      justify-content: center;
+      align-items: center;
+      flex-wrap: wrap;
+      i {
+        flex: 1 0 100%;
+        display: block;
+        height: 0.4rem;
+      }
+      img {
+        width: 0.8rem;
+      }
+      p {
+        flex: 1 0 100%;
+      }
+    }
+  }
+  .scroll-list {
+    overflow: hidden;
+  }
+  .scroll-bottom {
+    text-align: center;
+    line-height: 40px;
+  }
+}
+.loadImg {
+  width: 1rem;
+  height: 1rem;
+}
+</style>

discern/src/components/versions_updateHistory/versions_updateHistory.vue

@@ -165,66 +165,11 @@ export default {
       this.mescroll = mescroll; // 如果this.mescroll对象没有使用到,则mescrollInit可以不用配置
     },
 
-    // 上拉回调 page = {num:1, size:10}; num:当前页 ,默认从1开始; size:每页数据条数,默认10
-    // upCallback(page, mescroll) {
-    //   var _this = this;
-    //   this.$axios({
-    //     method: "get",
-    //     url: "/edition_all",
-    //     params: {
-    //       page: this.mescrollUp.page.num
-    //     }
-    //   })
-    //     .then(res => {
-    //       //判断data中的变量是否为空 ，为空的话存后端发来的总条数
-    //       if (this.aggregate === "") {
-    //         //存变量
-    //         this.aggregate = res.data.num;
-    //         var b = "10";
-    //         this.aggregate = this.aggregate / b;
-    //         this.aggregate = Math.ceil(this.aggregate); //将小数点转换为整数
-    //       }
-
-    //       //删除了默认的每页条数后判断数是否大于页码
-    //       if (this.mescrollUp.page.num <= this.aggregate) {
-    //         let arr = res.data.dat;
-    //         if (page.num === 1) this.redata = [];
-    //         // 把请求到的数据添加到列表
-    //         this.redata = this.redata.concat(arr);
-    //         this.$nextTick(() => {
-    //           mescroll.endSuccess(arr.length);
-    //         });
-    //         this.redataShow = true;
-    //         // this.redata = res.data.dat;
-    //         // }
-    //         _this.loading = false;
-    //         // 数据渲染成功后,隐藏下拉刷新的状态
-    //       } else if (this.mescrollUp.page.num > this.aggregate) {
-    //         this.redataShow = false;
-
-    //         // 数据渲染成功后,隐藏下拉刷新的状态
-    //         this.$nextTick(() => {
-    //           mescroll.endSuccess(this.aggregate);
-    //         });
-    //       }
-
-    //       if (res.data.dat.length === 0) {
-    //         this.redataShow = false;
-    //       } else if (res.data.dat.length !== 0) {
-    //         this.redataShow = true;
-    //         this.redata = res.data.dat;
-    //       }
-    //     })
-    //     .catch(error => {
-    //       mescroll.endErr();
-    //     });
-    // },
-
     upCallback(page, mescroll) {
       let _this = this;
       this.$axios({
         method: "get",
-        url: "/edition_all",
+        url: "bigservers/edition_all",
         params: {
           page: _this.mescrollUp.page.num
         }
@@ -282,7 +227,7 @@ export default {
       _this
         .$axios({
           method: "get",
-          url: "/edition_all",
+          url: "bigservers/edition_all",
           params: {
             page: 1
           }
@@ -311,7 +256,7 @@ export default {
       _this
         .$axios({
           method: "post",
-          url: "/edition_all",
+          url: "bigservers/edition_all",
           data: postData
         })
         .then(res => {

discern/src/main.js

@@ -19,11 +19,16 @@ import clipper from '../static/clipper'
 import MeScroll from 'mescroll.js'
 import 'mescroll.js/mescroll.min.css'
 import waterfall from 'vue-waterfall2'//瀑布流插件
+
+//瀑布流加上拉加载
+
+//瀑布流加上拉加载
+
+
 import Vant from 'vant'
 import 'vant/lib/index.css'
 
 
-
 import VueAwesomeSwiper from 'vue-awesome-swiper'
 import 'swiper/css/swiper.min.css'
 Vue.use(VueAwesomeSwiper)
@@ -82,6 +87,9 @@ Vue.prototype.$axios = axios //使用aixos
 // axios.defaults.baseURL = 'http://192.168.1.11:8000' //配置全部接口的api前缀
 
 
+// axios.defaults.baseURL = 'http://47.99.110.100:8080' //配置全部接口的api前缀-中科院
+
+
 // axios.defaults.baseURL = '/api' //配置全部接口的api前缀
 // axios.defaults.headers.post['Content-Type'] = 'application/json';
 

discern/src/router/index.js

@@ -35,8 +35,6 @@ import share from '@/components/share/share'
 import help from '@/components/help/help'
 import tourist from '@/components/tourist/tourist'
 
-
-
 Vue.use(Router)
 
 export default new Router({
@@ -72,6 +70,7 @@ export default new Router({
       meta: {
         title: '识别',
         type: 'login',
+        keepAlive: false, //不需要被缓存的组件
       },
       component: show
     },
@@ -85,6 +84,7 @@ export default new Router({
       meta: {
         title: '昆虫病害档案',
         type: 'login',
+        keepAlive: false, //不需要被缓存的组件
       },
       component: record
     },