feature:地图更换key

package-lock.json

@@ -3703,6 +3703,44 @@
           "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
           "dev": true
         },
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true,
+          "optional": true
+        },
         "globby": {
           "version": "9.2.0",
           "resolved": "https://registry.npmjs.org/globby/-/globby-9.2.0.tgz",
@@ -3719,6 +3757,13 @@
             "slash": "^2.0.0"
           }
         },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true,
+          "optional": true
+        },
         "hash-sum": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-2.0.0.tgz",
@@ -3731,6 +3776,25 @@
           "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
           "dev": true
         },
+        "json5": {
+          "version": "2.2.3",
+          "resolved": "https://registry.npmmirror.com/json5/-/json5-2.2.3.tgz",
+          "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+          "dev": true,
+          "optional": true
+        },
+        "loader-utils": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-2.0.4.tgz",
+          "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^2.1.2"
+          }
+        },
         "slash": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
@@ -3745,6 +3809,28 @@
           "requires": {
             "minipass": "^3.1.1"
           }
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
+        "vue-loader-v16": {
+          "version": "npm:vue-loader@16.8.3",
+          "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-16.8.3.tgz",
+          "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "chalk": "^4.1.0",
+            "hash-sum": "^2.0.0",
+            "loader-utils": "^2.0.0"
+          }
         }
       }
     },
@@ -20931,101 +21017,6 @@
         "vue-style-loader": "^4.1.0"
       }
     },
-    "vue-loader-v16": {
-      "version": "npm:vue-loader@16.8.3",
-      "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-16.8.3.tgz",
-      "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "chalk": "^4.1.0",
-        "hash-sum": "^2.0.0",
-        "loader-utils": "^2.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true,
-          "optional": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true,
-          "optional": true
-        },
-        "hash-sum": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmmirror.com/hash-sum/-/hash-sum-2.0.0.tgz",
-          "integrity": "sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg==",
-          "dev": true,
-          "optional": true
-        },
-        "json5": {
-          "version": "2.2.3",
-          "resolved": "https://registry.npmmirror.com/json5/-/json5-2.2.3.tgz",
-          "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
-          "dev": true,
-          "optional": true
-        },
-        "loader-utils": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-2.0.4.tgz",
-          "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^3.0.0",
-            "json5": "^2.1.2"
-          }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
     "vue-style-loader": {
       "version": "4.1.3",
       "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.3.tgz",

src/App.vue

@@ -74,7 +74,11 @@ export default {
     menuRight: "",
   },
   onLaunch() {
-      if (localStorage.getItem('debug')==='true') {
+      const url = window.location.href;
+      const urlObj = new URL(url);
+      const params = new URLSearchParams(urlObj.search);
+      const isDebugMode = params.has('debug') && params.get('debug') === 'true';
+      if (isDebugMode) {
         new Vconsole();
       }
   },

src/api/control.js

@@ -5,35 +5,44 @@ import zlbApi from '@/api/zlbApi';
 // 服务和门牌搜索 '/doorplateInfoApp/searchDoorplateOrIntegrationAppList'
 export const search = (data) => {
     const url = zlbApi.searchDoorplateOrIntegrationAppList; // '/doorplateInfoApp/searchDoorplateOrIntegrationAppList'
-    return myFetch(url, 'post', data);
+    return myFetch(url, 'post', data,'json');
 }
 
 // 门牌绑定微信 '/doorplateInfoApp/doorplateBindWxAndValid'
 export const bindOpenidAndDoor = (data) => {
     const url = zlbApi.doorplateBindWxAndValid; // '/doorplateInfoApp/doorplateBindWxAndValid'
-    return myFetch(url, 'post', data);
+    return myFetch(url, 'post', data,'json');
 }
 
 // 所有门牌服务列表 '/doorplateInfoApp/getAllIntegrationAppList'
 export const getServiceList = (data) => {
     const url = zlbApi.getAllIntegrationAppList; // '/doorplateInfoApp/getAllIntegrationAppList'
-    return myFetch(url, 'post', data);
+    return myFetch(url, 'post', data,'json');
 }
 
 // 获取门牌信息 '/doorplateInfoApp/getHomePageOneDoorplateFullInfo'
 export const getDoorplateInfo = (data) => {
     const url = zlbApi.getHomePageOneDoorplateFullInfo; // '/doorplateInfoApp/getHomePageOneDoorplateFullInfo'
-    return myFetch(url, 'post', data);
+    return myFetch(url, 'post', data,'json');
 }
 
 // 获取企业门牌的处罚、失信、经营异常列表 '/doorplateInfoApp/getCorpCfSxYcListByDoorplateAndTyshxydm'
 export const getCropRiskList = (data) => {
     const url = zlbApi.getCorpCfSxYcListByDoorplateAndTyshxydm; // '/doorplateInfoApp/getCorpCfSxYcListByDoorplateAndTyshxydm'
-    return myFetch(url, 'post', data);
+    return myFetch(url, 'post', data,'json');
 }
 
 // 门牌户主信息申请 '/doorplateInfoApp/hzInfoApply'
 export const saveHzInfo = (data) => {
     const url = zlbApi.hzInfoApply; // '/doorplateInfoApp/hzInfoApply'
-    return myFetch(url, 'post', data);
+    return myFetch(url, 'post', data,'json');
+}
+
+/**
+ * 新接口 获取门牌详情
+ * get /business/applet-house-number/appletHouseNumberInfo
+ */
+export const getDoorplateInfoNew=(data)=>{
+    const url = zlbApi.getDoorplateInfoNew;
+    return myFetch(url, 'get', data, 'json');
 }

src/api/map.js

@@ -3,7 +3,8 @@ import {  myFetch } from "../utils/fetch";
 const amapFile = require("@/libs/amap-wx.130.js");
 // 高德地图微信组件
 const myAmapFun = new amapFile.AMapWX({
-  key: "dc4bf920c8c1ef8b6f316f4ebcf0a9e2",
+//  key: "5d8515c6bf9f852b092fb8c297036a9c",
+  key: "6c10de64f2a22f25eebc3b03b7e2fc69",
 });
 const mapKey = "8ad6b1c0f18f26a721871ca50e751ef9"; // 高德地图web api
 const API = {

src/common/js/baseUrl.js

@@ -3,7 +3,7 @@ let doorplateImgUrl='';//  门牌二维码图片地址
 //根据运行时版本设置请求url
 function setFetchUrlByEnv(env) {
 //  httpApi = "http://192.168.31.51:9080"; //公司测试
-  httpApi = "http://122.247.77.37:9080"; //线上测试
+  httpApi = "https://fhszmp.fh.gov.cn:9080"; //线上测试
 //  httpApi = "https://fhszmp.fh.gov.cn:8080"; //线上正式
   doorplateImgUrl='https://fhszmp.fh.gov.cn:8090/digital-doorplateAddrUrl'
 

src/pages.json

@@ -260,12 +260,6 @@
           }
         },
         {
-          "path": "pages/commitment/enterpriseCommitment/index",
-          "style": {
-            "navigationBarTitleText": "企业经营承诺"
-          }
-        },
-        {
           "path": "pages/commitment/home/index",
           "style": {
             "navigationBarTitleText": "经营承诺"

src/pages/blank/blank.vue

@@ -247,24 +247,24 @@ export default {
       const res = await dd.getAuthCode({
         corpId: '50329019'
       })
-      console.log("免登",res)
       if(res) {
         try{
           const exemptionRes  =  await exemption({
             code: res.code
           })
-          console.log('exemption',res)
-          if(exemptionRes.success) {
-            const userInfo = exemptionRes.userInfo
+          if(exemptionRes.code === 0) {
+            console.log('用户信息',exemptionRes.data)
             storageUserInfo({
-              nickName: userInfo.realName,
-              avatarUrl: userInfo.headUrl,
-              phoneNumber: userInfo.mobile,
-              phoneWx: userInfo.mobile,
-              username: userInfo.username,
-              uuid: userInfo.id,
+              ...exemptionRes.data.userInfo,
+              nickName: exemptionRes.data.userInfo.realName,
+              avatarUrl: exemptionRes.data.userInfo.headPicture,
+              phoneNumber: exemptionRes.data.userInfo.phoneWx,
+              phoneWx: exemptionRes.data.userInfo.phoneWx,
+              username: exemptionRes.data.userInfo.username,
+              openId: exemptionRes.data.userInfo.id,
+              uuid: exemptionRes.data.userInfo.id,
             });
-            app.globalData.openid = userInfo.id;
+            app.globalData.openid = exemptionRes.data.userInfo.id;
             uni.reLaunch({
               url: "/subPages/pages/scanCode/scanCode",
             });

src/pages/home/home.vue

@@ -10,7 +10,7 @@
         </view> -->
         <view class="user-address">
           <view class="user-address__detail">
-            {{ userInfo.doorName }}
+            {{ userInfo.address }}
           </view>
           <view class="user-address__area">
             {{ userInfo.address }}
@@ -189,6 +189,8 @@ import { storageUserInfo } from "@/utils/index";
 import { splitArr, getPlatformEnv } from "@/utils";
 import { maskPhoneCall, getPointResByLabel } from "@/utils";
 import {getVillageLink} from "@/api/system";
+import dd from "gdt-jsapi";
+import openLink from "gdt-jsapi/openLink";
 
 const app = getApp();
 export default {
@@ -275,6 +277,7 @@ export default {
      } */
     this.getServiceList();
     this.getNoticeList();
+
   },
   onShow: function () {
     const userInfo = uni.getStorageSync(USER_INFO) || {};
@@ -294,6 +297,7 @@ export default {
       this.getUserInfo();
     }
     this.getServiceList(); //以防设置长辈版，重新分配
+    this.getDoorplateInfo();
   },
   destroyed() {
     console.log("homeview destoryed");
@@ -410,7 +414,6 @@ export default {
       if (this.userInfo.avatarUrl && this.userInfo.phoneWx) {
         this.hasBaseInfo = true;
       }
-      this.getDoorplateInfo();
     },
     isPhoneNumberPass() {
       const phoneNumber = uni.getStorageSync(USER_INFO).phoneWx;
@@ -803,15 +806,9 @@ export default {
               url: "/pages/home/webView",
             });
           } else {
-            ZWJSBridge.openLink({
-              url: app.globalData.jumpUrl,
-            })
-                .then((result) => {
-                  console.log("打开新页面成功", result);
-                })
-                .catch((error) => {
-                  console.log("打开新页面失败", error);
-                });
+            uni.navigateTo({
+              url: "/pages/home/webView",
+            });
           }
 
           // #endif
@@ -851,9 +848,16 @@ export default {
           });
           break;
         case JUMP_TYPE.INSIDE.VALUE:
-          uni.navigateTo({
-            url: item.jumpUrl,
-          });
+          if(item.jumpUrl === '/subPages/pages/commitment/list/index') {
+           /* 浙政钉端的企业承诺首页是这个 */
+            uni.navigateTo({
+              url: "/subPages/pages/commitment/home/index",
+            });
+          }else{
+            uni.navigateTo({
+              url: item.jumpUrl,
+            });
+          }
           break;
         default:
           break;

src/subPages/pages/scanCode/scanCode.vue

@@ -49,12 +49,12 @@ export default {
   },
   onLoad(options) {
     // console.log(options);
-    ZWJSBridge.getLocation({}).then(res => {
-      console.log(res)
-      this.getVicinity(res);
-    }).catch(err => {
-      console.log(err)
-    })
+//    ZWJSBridge.getLocation({}).then(res => {
+//      console.log(res)
+//      this.getVicinity(res);
+//    }).catch(err => {
+//      console.log(err)
+//    })
     // wx.getLocation().then(res => {
     //   // console.log(res);
     //   this.getVicinity(res);

src/utils/fetch/index.js

@@ -77,6 +77,7 @@ function handleMgop(url, type, data, dataType, resolve, reject) {
         type: type,
         data: data,
         appKey: zlbConfig.appKey, // 必填
+        appId:zlbConfig.appId,
         header: {
             "Content-Type":
                 dataType === "form"
@@ -201,7 +202,8 @@ export const myFetch = async (url, type = "get", data = {}, dataType) => {
         timeout: 60000,
         header: {
             'content-type': 'application/json',
-            Token: '1'
+            Token: '1',
+            appId:'2002407848',
         },
     }