system-phone 1.2.85 → 1.2.89-yihua

package/.eslintrc.js

@@ -1,16 +1,16 @@
-module.exports = {
-  root: true,
-  // https://github.com/feross/standard/blob/master/RULES.md#javascript-standard-style
-  extends: 'standard',
-  // required to lint *.vue files
-  plugins: [
-    'eslint-plugin-html'
-  ],
-  // add your custom rules here
-  'rules': {
-    // allow paren-less arrow functions
-    'arrow-parens': 0,
-    // allow debugger during development
-    'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0
-  }
-}
+// module.exports = {
+//   root: true,
+//   // https://github.com/feross/standard/blob/master/RULES.md#javascript-standard-style
+//   extends: 'standard',
+//   // required to lint *.vue files
+//   plugins: [
+//     'eslint-plugin-html'
+//   ],
+//   // add your custom rules here
+//   'rules': {
+//     // allow paren-less arrow functions
+//     'arrow-parens': 0,
+//     // allow debugger during development
+//     'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0
+//   }
+// }

package/SystemPhone.iml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="SystemPhone" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

package/build/dev-server.js

@@ -1,121 +1,141 @@
-var express = require('express')
-var webpack = require('webpack')
-var config = require('./webpack.dev.conf')
-var proxyMiddleware = require('http-proxy-middleware')
-// var httpProxy = require('http-proxy')
-
-var app = express()
-var compiler = webpack(config)
-// var proxy = httpProxy.createProxyServer()
-
-// Define HTTP proxies to your custom API backend
-// https://github.com/chimurai/http-proxy-middleware
-var proxyTable = {
-  // '/rs/weixin': {
-  //   target: 'http://121.36.106.17:8400/'
-  // },
-  '/phone/rs/vue': {
-    target: 'http://121.36.106.17:8400/'
-  },
-  // '/materials': {
-  //   target: 'http://121.36.106.17:8400/'
-  //   // target: 'http://192.168.2.77:8081'
-  // },
-  // '/umaterials': {
-  //   // target: 'http://192.168.50.202:8081'
-  //   target: 'http://121.36.106.17:8400/'
-  // },
-  // // 取图片的地址
-  // '/images': {
-  //   target: 'http://121.36.106.17:8400/'
-  //   // target: 'http://192.168.20.249:8081'
-  // },
-  // 'phone/rs/dir2': {
-  //   target: 'http://121.36.106.17:8400/'
-  //   // target: 'http://192.168.20.249:8081'
-  // },
-  // '/excel': {
-  //   // target: 'http://127.0.0.1:8082'
-  //   target: 'http://121.36.106.17:8400/'
-  // },
-  // '/SaleRest/rs': {
-  //    // target: 'http://127.0.0.1:8081'
-  //   target: 'http://121.36.106.17:8400/'
-  // },
-  // 呼叫系统主数据服务
-  '/rs': {
-    // target: 'http://127.0.0.1:8082'
-    target: 'http://121.36.106.17:8400'
-  },
-  // 文字客服
-  // '/Dual': {
-  //   'target': 'http://127.0.0.1:8081/RestWork/rs'
-  // },
-  // // 安卓测试转发地址
-  // '/AndroidRest/rs': {
-  //   'target': 'http://192.168.50.199:8300'
-  // }
-}
-var devMiddleware = require('webpack-dev-middleware')(compiler, {
-  publicPath: config.output.publicPath,
-  stats: {
-    colors: true,
-    chunks: false
-  }
-})
-
-var hotMiddleware = require('webpack-hot-middleware')(compiler)
-// force page reload when html-webpack-plugin template changes
-compiler.plugin('compilation', function (compilation) {
-  compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
-    hotMiddleware.publish({ action: 'reload' })
-    cb()
-  })
-})
-
-// proxy api requests
-Object.keys(proxyTable).forEach(function (context) {
-  var options = proxyTable[context]
-  if (typeof options === 'string') {
-    options = { target: options }
-  }
-  // 改变源实现跨域
-  // options.changeOrigin = true
-  Object.assign(options, {
-    onProxyRes (proxyRes, req, res) {
-      // res.header('Access-Control-Allow-Origin', '*')
-      // res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
-    }
-  })
-  app.use(proxyMiddleware(context, options))
-})
-
-// handle fallback for HTML5 history API
-app.use(require('connect-history-api-fallback')())
-// app.use(function (req, res, next) {
-//   res.header('Access-Control-Allow-Origin', '*')
-//   res.header('Access-Control-Allow-Headers', 'X-Requested-With')
-//   res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
-//   res.header('X-Powered-By', '3,2,1')
-//   res.header('Access-Control-Allow-Credentials', 'true')
-//   res.header('Content-Type', 'application/json;charset=utf-8')
-//   next()
-// })
-
-// serve webpack bundle output
-app.use(devMiddleware)
-
-// enable hot-reload and state-preserving
-// compilation error display
-app.use(hotMiddleware)
-
-// serve pure static assets
-app.use('/static', express.static('./static'))
-
-module.exports = app.listen(8083, function (err) {
-  if (err) {
-    console.log(err)
-    return
-  }
-  console.log('Listening at http://localhost:8083')
-})
+var express = require('express')
+var webpack = require('webpack')
+var config = require('./webpack.dev.conf')
+var proxyMiddleware = require('http-proxy-middleware')
+// var httpProxy = require('http-proxy')
+
+var app = express()
+var compiler = webpack(config)
+// var proxy = httpProxy.createProxyServer()
+
+// Define HTTP proxies to your custom API backend
+// https://github.com/chimurai/http-proxy-middleware
+var proxyTable = {
+  // '/rs/weixin': {
+  //   target: 'http://121.36.106.17:8400/'
+  // },
+  '/phone/rs/vue': {
+    target: 'http://117.33.132.196:6300'
+  },
+  // '/materials': {
+  //   target: 'http://121.36.106.17:8400/'
+  //   // target: 'http://192.168.2.77:8081'
+  // },
+  // '/umaterials': {
+  //   // target: 'http://192.168.50.202:8081'
+  //   target: 'http://121.36.106.17:8400/'
+  // },
+  // // 取图片的地址
+  // '/images': {
+  //   target: 'http://121.36.106.17:8400/'
+  //   // target: 'http://192.168.20.249:8081'
+  // },
+  // 'phone/rs/dir2': {
+  //   target: 'http://121.36.106.17:8400/'
+  //   // target: 'http://192.168.20.249:8081'
+  // },
+  // '/excel': {
+  //   // target: 'http://127.0.0.1:8082'
+  //   target: 'http://121.36.106.17:8400/'
+  // },
+  '/rs/sql/getUserByMeter': {
+     // target: 'http://127.0.0.1:8081'
+    target: 'http://117.33.132.196:6300'
+  },
+  '/rs/logic/againOpenAccount': {
+    // target: 'http://127.0.0.1:8081'
+    target: 'http://117.33.132.196:6300'
+  },
+  '/rs/logic/againSendInstruct': {
+    // target: 'http://127.0.0.1:8081'
+    target: 'http://117.33.132.196:6300'
+  },
+  '/rs/logic/cancelSendInstruct': {
+    // target: 'http://127.0.0.1:8081'
+    target: 'http://117.33.132.196:6300'
+  },
+  '/rs/sql/iot_singleTable_OrderBy': {
+    // target: 'http://127.0.0.1:8081'
+    target: 'http://117.33.132.196:6300'
+  },
+  // 呼叫系统主数据服务
+  '/rs': {
+    // target: 'http://127.0.0.1:8082'
+    target: 'http://117.33.132.196:6300'
+  },
+  '/wx': {
+    // target: 'http://127.0.0.1:8082'
+    target: 'http://117.33.132.196:6300'
+  },
+  // 文字客服
+  // '/Dual': {
+  //   'target': 'http://127.0.0.1:8081/RestWork/rs'
+  // },
+  // // 安卓测试转发地址
+  // '/AndroidRest/rs': {
+  //   'target': 'http://192.168.50.199:8300'
+  // }
+}
+var devMiddleware = require('webpack-dev-middleware')(compiler, {
+  publicPath: config.output.publicPath,
+  stats: {
+    colors: true,
+    chunks: false
+  }
+})
+
+var hotMiddleware = require('webpack-hot-middleware')(compiler)
+// force page reload when html-webpack-plugin template changes
+compiler.plugin('compilation', function (compilation) {
+  compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
+    hotMiddleware.publish({ action: 'reload' })
+    cb()
+  })
+})
+
+// proxy api requests
+Object.keys(proxyTable).forEach(function (context) {
+  var options = proxyTable[context]
+  if (typeof options === 'string') {
+    options = { target: options }
+  }
+  // 改变源实现跨域
+  // options.changeOrigin = true
+  Object.assign(options, {
+    onProxyRes (proxyRes, req, res) {
+      // res.header('Access-Control-Allow-Origin', '*')
+      // res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
+    }
+  })
+  app.use(proxyMiddleware(context, options))
+})
+
+// handle fallback for HTML5 history API
+app.use(require('connect-history-api-fallback')())
+// app.use(function (req, res, next) {
+//   res.header('Access-Control-Allow-Origin', '*')
+//   res.header('Access-Control-Allow-Headers', 'X-Requested-With')
+//   res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
+//   res.header('X-Powered-By', '3,2,1')
+//   res.header('Access-Control-Allow-Credentials', 'true')
+//   res.header('Content-Type', 'application/json;charset=utf-8')
+//   next()
+// })
+
+// serve webpack bundle output
+app.use(devMiddleware)
+
+// enable hot-reload and state-preserving
+// compilation error display
+app.use(hotMiddleware)
+
+// serve pure static assets
+app.use('/static', express.static('./static'))
+
+module.exports = app.listen(8083, function (err) {
+  if (err) {
+    console.log(err)
+    return
+  }
+  console.log('Listening at http://localhost:8083')
+})

package/build/webpack.base.conf.js

@@ -51,6 +51,10 @@ module.exports = {
         test: /\.html$/,
         loader: 'vue-html'
       },
+      {
+        test: /\.css$/,
+        loader: 'style!css'
+      },
       {
         test: /\.less$/,
         loader: 'style!css!less'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "system-phone",
-  "version": "1.2.85",
+  "version": "1.2.89-yihua",
   "description": "手机模块 前端组件",
   "author": "何宁社 <524395609@qq.com>",
   "license": "ISC",
@@ -27,6 +27,7 @@
     "vue": "^1.0.17"
   },
   "devDependencies": {
+    "qrcodejs2": "^0.0.2",
     "babel-core": "^6.26.0",
     "babel-loader": "^6.0.0",
     "babel-plugin-transform-runtime": "^6.0.0",

package/src/App.vue

@@ -1,26 +1,25 @@
-<template>
-  <!-- <app-base> -->
-  <div id="android-app">
-    <article>
-      <!--<route :comp="{name: 'login-app'}"></route>-->
-      <route :comp="{name: 'iot-monitoring-main'}"></route>
-    </article>
-    <time-out></time-out>
-    <message-box>
-    </message-box>
-  </div>
-  <!-- </app-base> -->
-</template>
-
-<script>
-  export default {
-    ready () {
-      if (!window.onerror) {
-        window.onerror = function (message, file, line, col, error) {
-          // HostApp.alert("网络故障，加载组件有误")
-          return false
-        }
-      }
-    }
-  }
-</script>
+<template>
+  <!-- <app-base> -->
+  <div id="android-app">
+    <article>
+      <route :comp="{name: 'login-app'}"></route>
+    </article>
+    <time-out></time-out>
+    <message-box>
+    </message-box>
+  </div>
+  <!-- </app-base> -->
+</template>
+
+<script>
+  export default {
+    ready () {
+      if (!window.onerror) {
+        window.onerror = function (message, file, line, col, error) {
+          // HostApp.alert("网络故障，加载组件有误")
+          return false
+        }
+      }
+    }
+  }
+</script>