sale-client 4.2.62 → 4.2.64

package/build/dev-server.js

@@ -1,68 +1,90 @@
-var path = require('path')
-var checkVersion = require('./versionCheck.js')
-checkVersion()
-const [ serverRul, localUrl ] = ['http://121.36.106.17:31467/', 'http://121.36.106.17:31467/']
-var merge = require('webpack-merge')
-var baseConfig = require('./webpack.dev.conf')
-var devConfig = {
-  devServer: {
-    contentBase: path.join(__dirname, 'src'),
-    hot: true,
-    publicPath: baseConfig.output.publicPath,
-    historyApiFallback: true,
-    host: '127.0.0.1',
-    port: 8089,
-    open: false,
-    stats: {
-      colors: false, // 配置控制台输出彩色日志
-      chunks: false, // 不输出构建 chunk 信息
-      children: false // 不输出子模块构建信息
-    },
-    proxy: {
-    // '/api/af-revenue/batchdeduction/all': {
-    //   pathRewrite: {
-    //     '/api/af-revenue/batchdeduction/all': '/batchdeduction/all'
-    //   },
-    //   target: localUrl
-    // },
-    //   '/api/af-revenue/logic': {
-    //     pathRewrite: {
-    //       '/api/af-revenue/logic': '/logic'
-    //     },
-    //     target: localUrl
-    //   },
-      // '/api/af-revenue/file': {
-      //   // pathRewrite: {
-      //   //   '/api/af-revenue/file': '/file'
-      //   // },
-      //   target: localUrl
-      // },
-      // '/weixin2/rs':{
-      //
-      //   target: 'http://410663id1ia4.vicp.fun'
-      // },
-      // '/api/af-revenue/sql': {
-      //   pathRewrite: {
-      //     '/api/af-revenue/sql': '/sql'
-      //   },
-      //   target: localUrl
-      // },
-      '/rs/pay': {
-        target: 'http://localhost:8080'
-      },
-      // '/api/af-revenue': {
-      //   pathRewrite: {
-      //     '/api/af-revenue': '/af-revenue'
-      //   },
-      //   target: "http://localhost:8080"
-      // },
-      '/api': {
-        target: serverRul
-      },
-      '/rs': {
-        target: serverRul
-      }
-    }
-  }
-}
-module.exports = merge(baseConfig, devConfig)
+var path = require('path')
+var checkVersion = require('./versionCheck.js')
+checkVersion()
+const [ serverRul, localUrl ] = ['http://123.180.154.5:31467/', 'http://127.0.0.1:9026']
+var merge = require('webpack-merge')
+var baseConfig = require('./webpack.dev.conf')
+var devConfig = {
+  devServer: {
+    contentBase: path.join(__dirname, 'src'),
+    hot: true,
+    publicPath: baseConfig.output.publicPath,
+    historyApiFallback: true,
+    host: '127.0.0.1',
+    port: 8089,
+    open: false,
+    stats: {
+      colors: false, // 配置控制台输出彩色日志
+      chunks: false, // 不输出构建 chunk 信息
+      children: false // 不输出子模块构建信息
+    },
+    proxy: {
+      // '/api/af-revenue/logic/depositCharge': {
+      //   pathRewrite: {
+      //     '/api/af-revenue/logic': '/logic'
+      //   },
+      //   target: 'http://127.0.0.1:9026',
+      //   changeOrigin: true
+      // },
+      // '/api/af-revenue/logic': {
+      //   pathRewrite: {
+      //     '/api/af-revenue/logic': '/logic'
+      //   },
+      //   target: localUrl,
+      //   changeOrigin: true
+      // },
+      // '/api/af-revenue/file': {
+      //   pathRewrite: {
+      //     '/api/af-revenue/file': '/file'
+      //   },
+      //   target: localUrl,
+      //   changeOrigin: true
+      // },
+      // 'api/af-revenue/entity/save': {
+      //   pathRewrite: {
+      //     '/api/af-revenue/entity/save': '/entity/save'
+      //   },
+      //   target: localUrl,
+      //   changeOrigin: true
+      // },
+      // '/singlepage': {
+      //   // pathRewrite: {
+      //   //   '/weixin2/rs': '/rs'
+      //   // },
+      //   target: localUrl,
+      //   changeOrigin: true
+      // },
+      // '/weixin2/rs': {
+      //   pathRewrite: {
+      //     '/weixin2/rs': '/singlepage/weixin2/rs'
+      //   },
+      //   target: localUrl,
+      //   changeOrigin: true
+      // },
+      // '/api/af-revenue/sql': {
+      //   pathRewrite: {
+      //     '/api/af-revenue/sql': '/sql'
+      //   },
+      //   target: localUrl,
+      //   changeOrigin: true
+      // },
+      // '/rs/pay': {
+      //   target: serverRul,
+      //   changeOrigin: true
+      // },
+      '/api': {
+        target: serverRul,
+        changeOrigin: true
+      },
+      '/resource': {
+        target: serverRul,
+        changeOrigin: true
+      },
+      '/rs': {
+        target: serverRul,
+        changeOrigin: true
+      }
+    }
+  }
+}
+module.exports = merge(baseConfig, devConfig)

package/index.html

@@ -12,8 +12,13 @@
       body{width: 100%;background:#7f8eaf  no-repeat center bottom; background-size: cover;}
       body .loginbg{ width:100%; height:100%; background:url(./static/loginbg.jpg) no-repeat center top;}
     </style>
-    <script src="https://webapi.amap.com/maps?v=1.4.2&key=4889f1e58df01cb40415536c8907bf64"></script>
-    <!--引入UI组件库（1.1版本） -->
+    <!--引入高德地图组件-->
+    <script type="text/javascript">
+      window._AMapSecurityConfig = {
+        securityJsCode: '91ebf08ec12862005c9ce8bbb888420f'
+      }
+    </script>
+    <script src="https://webapi.amap.com/maps?v=1.4.2&key=98e5146f671e38ea4d61bd37f5d064d8"></script>
     <script src="https://webapi.amap.com/ui/1.1/main.js?v=1.1.1"></script>
   </head>
   <body id="bodymain" class="themeOne">

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "4.2.62",
+  "version": "4.2.64",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/App.vue

@@ -10,7 +10,7 @@
 </template>
 
 <script>
-import Vue from 'vue'
+// import Vue from 'vue'
 
 export default {
   ready () {