diff --git a/.drone.yml b/.drone.yml index e975b00..785cb02 100644 --- a/.drone.yml +++ b/.drone.yml @@ -84,18 +84,15 @@ steps: # - cat .tags - name: 代码构建 pull: if-not-exists - # image: registry.k8s.1000my.com/library/node:16.15.0-slim - image: registry.cn-hangzhou.aliyuncs.com/qmiot/init:node-14-slim-python2_3 + image: registry.k8s.1000my.com/library/node:16.15.0-slim volumes: - name: node path: /drone/src/node_modules settings: mirror: https://docker.mirrors.ustc.edu.cn commands: - - ln -s /usr/bin/python2 /usr/bin/python - - python --version - - npm config set registry https://registry.npm.taobao.org - - npm config set sass_binary_site https://npm.taobao.org/mirrors/node-sass/ + - npm config set registry https://registry.npmmirror.com/ + - npm config set sass_binary_site https://cdn.npmmirror.com/binaries/node-sass - cd ./src/qmmap - npm install - cd ../../ diff --git a/package.json b/package.json index 46cd9d8..93cb18e 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,6 @@ "axios": "^0.21.1", "graphql": "^15.5.0", "node-sass": "^8.0.0", - "qmmap": "git+https://git.1000my.com/common/base_mobile_map_sdk.git", "qrcodejs2": "^0.0.2", "react": "^17.0.1", "react-dom": "^17.0.1", diff --git a/src/pages/Index/Index.js b/src/pages/Index/Index.js index 8d95048..c6c2322 100644 --- a/src/pages/Index/Index.js +++ b/src/pages/Index/Index.js @@ -74,6 +74,8 @@ const Index = () => { return; } + if (endId.includes(" ") && mall.code === "project-oaja40x1eujdl8ohn6v-ja") + endId = endId.replaceAll(" ", "+"); if (mall.mcShopIDHouseNumMap && mall.mcShopIDHouseNumMap[endId]) endId = mall.mcShopIDHouseNumMap[endId]; const shop = map.getShopByHouseNum(endId); diff --git a/src/qmmap b/src/qmmap index 4b3ee2c..3629b8a 160000 --- a/src/qmmap +++ b/src/qmmap @@ -1 +1 @@ -Subproject commit 4b3ee2c866953ff8c7d586a3ab24768f88a945ae +Subproject commit 3629b8a0e2ac8e04665608db47b653e36eda3896