x 5 years ago
parent
commit
78583ea3fa
6 changed files with 35 additions and 18 deletions
  1. 1 1
      .env
  2. 9 17
      build.sh
  3. 5 0
      package-lock.json
  4. 1 0
      package.json
  5. 1 0
      version.json
  6. 18 0
      vue.config.js

+ 1 - 1
.env

@@ -1,3 +1,3 @@
 VUE_APP_API_URL=https://twongd.shotshock.shop/api
-VUE_APP_WS_URL=
+VUE_APP_WS_URL=wss:twongd.shotshock.shop
 VUE_APP_NAME=美天旺

+ 9 - 17
build.sh

@@ -1,4 +1,4 @@
-# /bin/sh
+#!/bin/sh
 
 # build resources
 echo "------- begin build vue project -------"
@@ -7,21 +7,13 @@ echo "------- vue project build over  -------"
 
 # build app
 
-if [ -n "$1" ]; then
-    if [ $1 == "app" ]
-    then
-        echo "------- begin build android project -------"
-        # enter cordova project
-        cd cordova
-        # del tem file
-        rm -rf www/cordova.js
-        # build android package
-        cordova build android --release -- --keystore="../config/release.keystore" --alias=tianwang --storePassword=wanbits --password=wanbits
-        echo "------- android project build over  -------"
-        # copy android apk
-        cp platforms/android/app/build/outputs/apk/release/app-release.apk ../web/test/app-release.apk
-        echo "-------        copy   file          -------"
-    fi
-fi
+echo "------- begin build android project -------"
+# enter cordova project
+cd cordova
+# del tem file
+rm -rf www/cordova.js
+# build android package
+cordova build android --release -- --keystore="../config/release.keystore" --alias=tianwang --storePassword=wanbits --password=wanbits
+echo "------- android project build over  -------"
 
 echo "-------      all    done        -------"

+ 5 - 0
package-lock.json

@@ -4637,6 +4637,11 @@
         }
       }
     },
+    "dom-to-image": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npm.taobao.org/dom-to-image/download/dom-to-image-2.6.0.tgz",
+      "integrity": "sha1-ilA2CAiMh7HCL5A0rgMuGJiVWGc="
+    },
     "dom7": {
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/dom7/-/dom7-2.1.3.tgz",

+ 1 - 0
package.json

@@ -14,6 +14,7 @@
     "clipboard": "^2.0.6",
     "core-js": "^2.6.11",
     "dayjs": "^1.8.36",
+    "dom-to-image": "^2.6.0",
     "echarts": "^4.9.0",
     "emoji-awesome": "0.0.2",
     "html2canvas": "^1.0.0-rc.7",

+ 1 - 0
version.json

@@ -0,0 +1 @@
+{"download": "http://qndownload.shotshock.shop/twong-1.1.4.apk", "version": "1.1.4"}

+ 18 - 0
vue.config.js

@@ -45,5 +45,23 @@ module.exports = {
       args[0].VUE_APP_NAME = "美天旺";
       return args;
     });
+  },
+  devServer: {
+    host: "localhost", //target host
+    port: 8080,
+    //proxy:{'/api':{}},代理器中设置/api,项目中请求路径为/api的替换为target
+    proxy: {
+      "/api": {
+        target: "http://twong.h", //代理地址,这里设置的地址会代替axios中设置的baseURL
+        changeOrigin: true, // 如果接口跨域,需要进行这个参数配置
+        //ws: true, // proxy websockets
+        //pathRewrite方法重写url
+        pathRewrite: {
+          "^/api": "/api"
+          //pathRewrite: {'^/api': '/'} 重写之后url为 http://192.168.1.16:8085/xxxx
+          //pathRewrite: {'^/api': '/api'} 重写之后url为 http://192.168.1.16:8085/api/xxxx
+        }
+      }
+    }
   }
 };