apply-clients 7.1.35 → 7.1.36

package/build/webpack.devandroid.conf.js

@@ -0,0 +1,34 @@
+var webpack = require('webpack')
+var merge = require('webpack-merge')
+var baseConfig = require('./webpack.baseandroid.conf')
+var HtmlWebpackPlugin = require('html-webpack-plugin')
+
+// add hot-reload related code to entry chunks
+Object.keys(baseConfig.entry).forEach(function (name) {
+  baseConfig.entry[name] = ['./build/dev-client'].concat(baseConfig.entry[name])
+})
+
+module.exports = merge(baseConfig, {
+  // eval-source-map is faster for development
+  devtool: 'source-map',
+  //devtool: '#eval-source-map',
+  output: {
+    // necessary for the html plugin to work properly
+    // when serving the html from in-memory
+    publicPath: '/'
+  },
+  plugins: [
+    // https://github.com/glenjamin/webpack-hot-middleware#installation--usage
+    new webpack.optimize.OccurenceOrderPlugin(),
+    new webpack.HotModuleReplacementPlugin(),
+    new webpack.NoErrorsPlugin(),
+    // https://github.com/ampedandwired/html-webpack-plugin
+    //plugin trick
+    new HtmlWebpackPlugin({
+      filename: 'android.html',
+      template: 'android.html',
+      inject: true,
+      chunks: ['android-app']
+    })
+  ]
+})

package/build/webpack.example.conf.js

@@ -0,0 +1,49 @@
+var fs = require('fs')
+var webpack = require('webpack')
+var merge = require('webpack-merge')
+var baseConfig = require('./webpack.base.conf')
+var HtmlWebpackPlugin = require('html-webpack-plugin')
+
+// add hot-reload related code to entry chunks
+Object.keys(baseConfig.entry).forEach(function (name) {
+  baseConfig.entry[name] = ['./build/dev-client'].concat(baseConfig.entry[name])
+})
+
+// 把examples下所有index.html转换成测试例子.html
+fs.readdirSync('./examples').forEach((file) => {
+  baseConfig.plugins.push(
+    // https://github.com/ampedandwired/html-webpack-plugin
+    new HtmlWebpackPlugin({
+      filename: file + '.html',
+      template: `examples/${file}/index.html`,
+      inject: false
+    })
+  )
+})
+
+// 把examples下子目录里的main.js打包成对应组件名的App.js
+fs.readdirSync('./examples').forEach((file) => {
+  baseConfig.entry[file + 'App'] = `./examples/${file}/main.js`
+})
+
+module.exports = merge(baseConfig, {
+  // eval-source-map is faster for development
+  devtool: '#eval-source-map',
+  output: {
+    // necessary for the html plugin to work properly
+    // when serving the html from in-memory
+    publicPath: '/'
+  },
+  plugins: [
+    // https://github.com/glenjamin/webpack-hot-middleware#installation--usage
+    new webpack.optimize.OccurenceOrderPlugin(),
+    new webpack.HotModuleReplacementPlugin(),
+    new webpack.NoErrorsPlugin(),
+    // https://github.com/ampedandwired/html-webpack-plugin
+    new HtmlWebpackPlugin({
+      filename: 'index.html',
+      template: 'index.html',
+      inject: true
+    })
+  ]
+})

package/build/webpack.prod.conf.js

@@ -0,0 +1,60 @@
+var webpack = require('webpack')
+var merge = require('webpack-merge')
+var baseConfig = require('./webpack.base.conf')
+var cssLoaders = require('./css-loaders')
+var ExtractTextPlugin = require('extract-text-webpack-plugin')
+var HtmlWebpackPlugin = require('html-webpack-plugin')
+
+// whether to generate source map for production files.
+// disabling this can speed up the build.
+var SOURCE_MAP = false
+
+module.exports = merge(baseConfig, {
+  stats: {
+    children: false
+  },
+  devtool: SOURCE_MAP ? '#source-map' : false,
+  output: {
+    // naming output files with hashes for better caching.
+    // dist/index.html will be auto-generated with correct URLs.
+    filename: '[name][chunkhash].js',
+    chunkFilename: '[id].[chunkhash].js'
+  },
+  vue: {
+    loaders: cssLoaders({
+      sourceMap: SOURCE_MAP,
+      extract: true
+    })
+  },
+  plugins: [
+    // http://vuejs.github.io/vue-loader/workflow/production.html
+    new webpack.DefinePlugin({
+      'process.env': {
+        NODE_ENV: '"production"'
+      }
+    }),
+    new webpack.optimize.UglifyJsPlugin({
+      compress: {
+        warnings: false
+      }
+    }),
+    new webpack.optimize.OccurenceOrderPlugin(),
+    // extract css into its own file
+    new ExtractTextPlugin('[name].css'),
+    // generate dist index.html with correct asset hash for caching.
+    // you can customize output by editing /index.html
+    // see https://github.com/ampedandwired/html-webpack-plugin
+    new HtmlWebpackPlugin({
+      filename: '../index.html',
+      template: 'index.html',
+      inject: true,
+      minify: {
+        removeComments: true,
+        collapseWhitespace: true,
+        removeAttributeQuotes: true
+        // more options:
+        // https://github.com/kangax/html-minifier#options-quick-reference
+      }
+    })
+  ]
+})

package/build/webpack.prodandroid.conf.js

@@ -0,0 +1,60 @@
+var webpack = require('webpack')
+var merge = require('webpack-merge')
+var baseConfig = require('./webpack.baseandroid.conf')
+var cssLoaders = require('./css-loaders')
+var ExtractTextPlugin = require('extract-text-webpack-plugin')
+var HtmlWebpackPlugin = require('html-webpack-plugin')
+
+// whether to generate source map for production files.
+// disabling this can speed up the build.
+var SOURCE_MAP = false
+
+module.exports = merge(baseConfig, {
+  stats: {
+    children: false
+  },
+  devtool: SOURCE_MAP ? '#source-map' : false,
+  output: {
+    // naming output files with hashes for better caching.
+    // dist/index.html will be auto-generated with correct URLs.
+    filename: '[name][chunkhash].js',
+    chunkFilename: '[id].[chunkhash].js'
+  },
+  vue: {
+    loaders: cssLoaders({
+      sourceMap: SOURCE_MAP,
+      extract: true
+    })
+  },
+  plugins: [
+    // http://vuejs.github.io/vue-loader/workflow/production.html
+    new webpack.DefinePlugin({
+      'process.env': {
+        NODE_ENV: '"production"'
+      }
+    }),
+    new webpack.optimize.UglifyJsPlugin({
+      compress: {
+        warnings: false
+      }
+    }),
+    new webpack.optimize.OccurenceOrderPlugin(),
+    // extract css into its own file
+    new ExtractTextPlugin('[name].css'),
+    // generate dist index.html with correct asset hash for caching.
+    // you can customize output by editing /index.html
+    // see https://github.com/ampedandwired/html-webpack-plugin
+    new HtmlWebpackPlugin({
+      filename: '../index.html',
+      template: 'android.html',
+      inject: true,
+      minify: {
+        removeComments: true,
+        collapseWhitespace: true,
+        removeAttributeQuotes: true
+        // more options:
+        // https://github.com/kangax/html-minifier#options-quick-reference
+      }
+    })
+  ]
+})

package/index.html

@@ -6,7 +6,10 @@
   <META HTTP-EQUIV="pragma" CONTENT="no-cache">
   <META HTTP-EQUIV="Cache-Control" CONTENT="no-cache, must-revalidate">
   <META HTTP-EQUIV="expires" CONTENT="0">
-  <title>陕西榆林中燃天然气</title>
+  <title>报建系统</title>
+  <script  src="https://webapi.amap.com/maps?v=1.4.2&key=4889f1e58df01cb40415536c8907bf64"></script>
+  <!--引入UI组件库（1.1版本） -->
+  <script src="https://webapi.amap.com/ui/1.1/main.js?v=1.1.1"></script>
   <style media="screen">
     /*url(./static/newmainbg.jpg)*/
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apply-clients",
-  "version": "7.1.35",
+  "version": "7.1.36",
   "description": "报建前端模块",
   "main": "src/index.js",
   "directories": {
@@ -13,9 +13,9 @@
     "dev": "node build/dev-server.js",
     "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
     "build": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prod.conf.js",
+    "buildandroid": "rimraf dist-android && mkdirp dist-android && ncp static dist-android/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prodandroid.conf.js",
     "e2e": "node test/e2e/runner.js",
-    "release": "bash build/release.sh",
-    "make": "rimraf dist-android && mkdirp dist-android && ncp static dist-android/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prodandroid.conf.js"
+    "release": "bash build/release.sh"
   },
   "repository": {
     "type": "git",
@@ -29,11 +29,13 @@
   "dependencies": {
     "@logicflow/core": "^0.4.3",
     "co": "4.6.0",
-    "jsencrypt": "^3.0.0-rc.1",
+    "happypack": "^5.0.1",
+    "jsencrypt": "3.0.0-rc.1",
     "less": "^2.7.1",
     "less-loader": "^2.2.3",
     "lib-flexible": "^0.3.2",
     "px2rem-loader": "^0.1.9",
+    "qrcodejs2": "0.0.2",
     "vue": "^1.0.17",
     "vue-bubble": "^1.0.3"
   },
@@ -60,6 +62,7 @@
     "eventsource-polyfill": "^0.9.6",
     "express": "^4.17.0",
     "extract-text-webpack-plugin": "^1.0.1",
+    "fadada-clients": "1.0.5",
     "file-loader": "^0.8.4",
     "form-create": "^1.6.6",
     "function-bind": "^1.0.2",
@@ -92,9 +95,9 @@
     "style": "0.0.3",
     "style-loader": "^0.20.3",
     "system-clients": "3.1.87",
-    "system-phone": "1.1.18",
+    "system-phone": "1.2.87",
     "url-loader": "^0.5.7",
-    "vue-client": "1.23.10",
+    "vue-client": "1.24.45",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",
     "vue-loader": "^8.2.1",
@@ -108,6 +111,7 @@
     "webpack-dev-middleware": "^1.4.0",
     "webpack-hot-middleware": "^2.6.0",
     "webpack-merge": "^0.8.3",
-    "weixin-js-sdk": "^1.2.0"
+    "weixin-js-sdk": "^1.2.0",
+    "weixin-manage-client": "1.0.56"
   }
 }

package/src/AndroidApp.vue

@@ -2,27 +2,34 @@
   <!-- <app-base> -->
   <div id="android-app">
     <article>
-      <route :comp="{name: 'login-app'}" name="root"></route>
-      <!--<route :comp="{name: 'apply_app'}" name="root"></route>-->
-      <!--<route :comp="{name: 'applytodolist'}" name="root"></route>-->
-      <!--<route :comp="{name: 'paper-state-noncivil'}" name="root"></route>-->
+<!--      <route :comp="{name: 'build-tsak'}" name="root"></route>-->
+      <!--      <route :comp="{name: 'app-process-supervisory'}" name="root"></route>-->
+      <!--      <route :comp="{name: 'apply-reserve'}" name="root"></route>-->
+      <!--      <route :comp="{name: 'task-graph'}" name="root"></route>-->
+      <!--      <route :comp="{name: 'app-istall-function'}" name="root"></route>-->
+            <route :comp="{name: 'login-app'}" name="root"></route>
     </article>
     <time-out></time-out>
-    <message-box>
-    </message-box>
+    <message-box></message-box>
+    <alert-box></alert-box>
+    <alert-box-batch></alert-box-batch>
   </div>
 </template>
 
 <script>
 
-  export default {
-    ready () {
-      if(!window.onerror) {
-        window.onerror = function (message, file, line, col, error) {
-          // HostApp.alert("Error occured: " + error.message)
-          return false
-        }
+import AlertBox from "vue-client/src/components/AlertBox";
+import AlertBoxBatch from "vue-client/src/components/AlertBoxBatch";
+
+export default {
+  ready () {
+    if(!window.onerror) {
+      window.onerror = function (message, file, line, col, error) {
+        // HostApp.alert("Error occured: " + error.message)
+        return false
       }
     }
-  }
+  },
+  components: { AlertBox, AlertBoxBatch }
+}
 </script>

package/src/App.vue

@@ -1,20 +1,18 @@
-<template>
-  <div>
-    <app-base class="bg">
-      <div class='flex'>
-        <article>
-          <route :comp="{name: 'login'}"></route>
-        </article>
-      </div>
-    </app-base>
-  </div>
-</template>
-
-<script>
-
-
-  export default {
-
-
-  }
-</script>
+<template>
+  <div>
+    <app-base class="bg">
+      <div class='flex'>
+        <article>
+          <route :comp="{name: 'login'}"></route>
+<!--          <route :comp="{name: 'public-order-apply'}"></route>-->
+<!--          <route :comp="{name: 'public-history-apply'}"></route>-->
+        </article>
+      </div>
+    </app-base>
+  </div>
+</template>
+
+<script>
+export default {
+}
+</script>