auto commit

gitPush.sh

+#!/bin/bash
+hasGit=`which git` # 判断是否存在git
+msg=${1:-'auto commit'} # 获取终端输入的第一个参数，若为空则为auto commit
+if [ ! $hasGit ];then
+  echo 'Please download git first!';
+  exit 1;
+else
+  git fetch --all
+  result=`git symbolic-ref --short -q HEAD` # 获取分支名
+  current_id=`git log -n 1 release --pretty=format:"%H"`
+  git reset --soft $current_id
+  git add .
+  git commit -m "$msg"
+  echo "curBranch $result"
+  git push origin  -f $result # 提交代码到github(修改了远程项目名)
+fi

package.json

@@ -13,7 +13,8 @@
     "build:test": "cross-env BUILD_ENV=test node build/build.js",
     "build:test2": "cross-env BUILD_ENV=test2 node build/build.js",
     "build:uat": "cross-env BUILD_ENV=uat node build/build.js",
-    "build:pro": "cross-env BUILD_ENV=pro node build/build.js"
+    "build:pro": "cross-env BUILD_ENV=pro node build/build.js",
+    "push": "bash gitPush.sh"
   },
   "dependencies": {
     "@babel/polyfill": "^7.2.5",

src/style/common.scss

@@ -218,6 +218,7 @@ html,body{
     border: 1px solid #449284 !important;
     opacity: 0.5;
 }
+
 // .el-button--default:focus, .el-button--default:hover {
 //     color: #449284 !important;
 //     border-color: #449284 !important;

src/utils/base/baseApi.js

@@ -41,3 +41,11 @@ export const getTowns = (params) => {
     params: params,
   });
 };
+
+// /*获取机构地址*/
+export const getDetectTowns = (params) => {
+  return fetch({
+    url: getBaseUrl(`store/detect/address/province/city/${params.storeId || 0}/${params.addressId || 0}`),
+    method: "get",
+  });
+};