[Fix 0000]IP配置选择之后闪退bug修改

.hbuilderx/launch.json

@@ -2,7 +2,7 @@
     "version" : "1.0",
     "configurations" : [
         {
-            "playground" : "custom",
+            "playground" : "standard",
             "type" : "uni-app:app-android"
         },
         {

common/service/service.js

@@ -42,7 +42,6 @@ http.interceptor.request((config, cancel) => {
   console.log(config, "config---");
   config.baseUrl = "";
   config.url = uni.getStorageSync("apiUrl") + config.url;
-  console.log(config, "config11111111111");
   config.header = {
     ...config.header,
     "X-Access-Token": getTokenStorage(),

pages/gasreport/components/gasImgIdentify.vue

@@ -127,7 +127,7 @@
 import api from "@/api/api";
 import moment from 'moment'
 import configService from '@/common/service/config.service.js'
-import { RHFselcet } from '@/uni_modules/fz-media-selcet';
+// import { RHFselcet } from '@/uni_modules/fz-media-selcet';
 import helangCompress from '@/components/helang-compress/helang-compress';
 export default {
     name: 'gasFill',

pages/index/index.vue

@@ -25,14 +25,14 @@
         background: '#000',
       }"
     ></iframe>
-   <Device
-     v-show="PageCur == 'device'"
-     :style="{ marginTop: wvTop + 20 + 'px' }"
-   ></Device>
-   <filecenter :cur="PageCur" v-show="PageCur == 'filecenter'"></filecenter>
-   <warndata v-show="PageCur == 'warndata'" :cur="PageCur"></warndata>
-   <gasreport :cur="PageCur" v-show="PageCur == 'gasreport'"></gasreport>
-   <user :cur="PageCur" v-show="PageCur == 'user'"></user>
+    <Device
+      v-show="PageCur == 'device'"
+      :style="{ marginTop: wvTop + 20 + 'px' }"
+    ></Device>
+    <filecenter :cur="PageCur" v-show="PageCur == 'filecenter'"></filecenter>
+    <warndata v-show="PageCur == 'warndata'" :cur="PageCur"></warndata>
+    <gasreport :cur="PageCur" v-show="PageCur == 'gasreport'"></gasreport>
+    <user :cur="PageCur" v-show="PageCur == 'user'"></user>
     <u-tabbar
       :value="PageCur"
       @change="NavChange"
@@ -40,27 +40,31 @@
       :placeholder="true"
       :safeAreaInsetBottom="true"
     >
-     <u-tabbar-item v-show="menus.device != null"
-       text="设备中心"
-       name="device"
-       icon="calendar"
-     ></u-tabbar-item>
-     <u-tabbar-item v-show="menus.warndata != null"
-       text="预警分析"
-       name="warndata"
-       icon="plus-circle"
-     ></u-tabbar-item>
-     <u-tabbar-item v-show="menus.filecenter != null"
-       text="文件共享"
-       name="filecenter"
-       icon="file-text"
-     ></u-tabbar-item>
-     <u-tabbar-item v-show="menus.gasreport != null"
-       text="瓦斯日报"
-       name="gasreport"
-       icon="bell"
-     ></u-tabbar-item>
-     <u-tabbar-item text="我的" name="user" icon="bell"></u-tabbar-item>
+      <u-tabbar-item
+        v-show="menus.device != null"
+        text="设备中心"
+        name="device"
+        icon="calendar"
+      ></u-tabbar-item>
+      <u-tabbar-item
+        v-show="menus.warndata != null"
+        text="预警分析"
+        name="warndata"
+        icon="plus-circle"
+      ></u-tabbar-item>
+      <u-tabbar-item
+        v-show="menus.filecenter != null"
+        text="文件共享"
+        name="filecenter"
+        icon="file-text"
+      ></u-tabbar-item>
+      <u-tabbar-item
+        v-show="menus.gasreport != null"
+        text="瓦斯日报"
+        name="gasreport"
+        icon="bell"
+      ></u-tabbar-item>
+      <u-tabbar-item text="我的" name="user" icon="bell"></u-tabbar-item>
     </u-tabbar>
   </view>
 </template>
@@ -81,15 +85,14 @@ export default {
       wvWidth: getApp().globalData.windowWidth,
       wvTop: 0,
       iframeloading: false,
-	  menus:{}
+      menus: {},
     };
   },
   computed: {
     permission: function () {
       var data = uni.getStorageSync("menuPermission");
-      console.log(JSON.stringify(data));
-      if (data == null || data == "" || data.length == 0) 
-	  {
+      console.log(JSON.stringify(data), "data");
+      if (data == null || data == "" || data.length == 0) {
         data = [
           {
             redirect: null,
@@ -157,9 +160,9 @@ export default {
           },
         ];
       }
-	  for(var i=0;i<data.length;i++){
-		  this.menus[data[i].component] = data[i].component
-	  }
+      for (var i = 0; i < data.length; i++) {
+        this.menus[data[i].component] = data[i].component;
+      }
       return data;
     },
   },
@@ -170,8 +173,8 @@ export default {
         if (newV != null && newV != "") this.PageCur = newV[0].component;
       },
       immediate: true,
-  }
-},
+    },
+  },
   onLoad() {
     this.changeWV();
   },

pages/ipConfig/ipConfig.vue

@@ -47,6 +47,7 @@ export default {
           { label: "石圪台", value: "http://10.246.191.13:9999" },
           { label: "榆家梁", value: "http://10.248.143.211:9999" },
           { label: "开发", value: "http://182.92.126.35:9999" },
+          { label: "测试", value: "http://182.92.126.35:9998" },
         ],
       ],
       fromSetting: false, // 是否来自设置页
@@ -67,6 +68,7 @@ export default {
       configService.apiUrl = fullURL;
       uni.setStorageSync("selectedIP", true);
       uni.setStorageSync("apiUrl", fullURL);
+      uni.setStorageSync("savedIP", true);
       // uni.showModal({
       //   title: "提示",
       //   content: fullURL,

pages/login/login.vue

@@ -117,16 +117,21 @@ export default {
       IPSet: "",
       IpConfig: [
         [
-          { label: "布尔台", value: "http://10.246.95.4:9999" },
           { label: "大柳塔井", value: "http://10.248.135.10:9999" },
           { label: "活鸡兔井", value: "http://10.248.135.121:9999" },
-          { label: "寸草塔二矿", value: "http://10.246.63.125:9999" },
+          { label: "寸草塔二矿", value: "http://10.246.63.5:9999" },
           { label: "乌兰木伦", value: "http://10.246.183.35:9999" },
-          { label: "察哈素", value: "http://10.120.120.164:9999" },
+          { label: "哈拉沟煤矿", value: "http://10.248.223.12:9999" },
+          { label: "布尔台", value: "http://10.246.95.4:9999" },
           { label: "上湾", value: "http://10.246.167.205:9999" },
-          { label: "元子沟", value: "http://172.30.157.9:9999" },
+          { label: "锦界", value: "http://10.248.151.42:9999" },
+          { label: "补连塔", value: "http://10.246.175.16:9999" },
+          { label: "寸草塔", value: "http://10.246.23.171:9999" },
+          { label: "柳塔", value: "http://10.246.87.121:9999" },
+          { label: "石圪台", value: "http://10.246.191.13:9999" },
+          { label: "榆家梁", value: "http://10.248.143.211:9999" },
           { label: "开发", value: "http://182.92.126.35:9999" },
-          { label: "测试", value: "http://192.168.183.151:9999" },
+          { label: "测试", value: "http://182.92.126.35:9998" },
         ],
       ],
     };
@@ -452,7 +457,7 @@ export default {
       setTimeout(() => {
         uni.getStorageSync("apiUrl");
       }, 100);
-      uni.reLaunch({ url: "/pages/login/login" });
+      uni.navigateTo({ url: "/pages/login/login" });
     },
   },
   beforeDestroy() {