feat: 兼容七宝领展广场铺位号 #6

Merged
huangmh merged 8 commits from dev into test 2 years ago
  1. 9
      .drone.yml
  2. 1
      package.json
  3. 2
      src/pages/Index/Index.js
  4. 2
      src/qmmap

9
.drone.yml

@ -84,18 +84,15 @@ steps:
# - cat .tags # - cat .tags
- name: 代码构建 - name: 代码构建
pull: if-not-exists 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: volumes:
- name: node - name: node
path: /drone/src/node_modules path: /drone/src/node_modules
settings: settings:
mirror: https://docker.mirrors.ustc.edu.cn mirror: https://docker.mirrors.ustc.edu.cn
commands: 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 - cd ./src/qmmap
- npm install - npm install
- cd ../../ - cd ../../

1
package.json

@ -11,7 +11,6 @@
"axios": "^0.21.1", "axios": "^0.21.1",
"graphql": "^15.5.0", "graphql": "^15.5.0",
"node-sass": "^8.0.0", "node-sass": "^8.0.0",
"qmmap": "git+https://git.1000my.com/common/base_mobile_map_sdk.git",
"qrcodejs2": "^0.0.2", "qrcodejs2": "^0.0.2",
"react": "^17.0.1", "react": "^17.0.1",
"react-dom": "^17.0.1", "react-dom": "^17.0.1",

2
src/pages/Index/Index.js

@ -74,6 +74,8 @@ const Index = () => {
return; return;
} }
if (endId.includes(" ") && mall.code === "project-oaja40x1eujdl8ohn6v-ja")
endId = endId.replaceAll(" ", "+");
if (mall.mcShopIDHouseNumMap && mall.mcShopIDHouseNumMap[endId]) if (mall.mcShopIDHouseNumMap && mall.mcShopIDHouseNumMap[endId])
endId = mall.mcShopIDHouseNumMap[endId]; endId = mall.mcShopIDHouseNumMap[endId];
const shop = map.getShopByHouseNum(endId); const shop = map.getShopByHouseNum(endId);

2
src/qmmap

@ -1 +1 @@
Subproject commit 4b3ee2c866953ff8c7d586a3ab24768f88a945ae
Subproject commit 3629b8a0e2ac8e04665608db47b653e36eda3896
Loading…
Cancel
Save