Merge branch 'bugfix/会员体系时间控件调整' into dev

# Conflicts:
#	dist/index.html
#	dist/static/js/31.35a63d5da2112a12c4aa.js
#	dist/static/js/31.7a2d3c119bafba7c628a.js
#	dist/static/js/31.8357340bca71b3619149.js
#	dist/static/js/32.6e1035bcc8bab3787127.js
#	dist/static/js/32.d49003d17452bc78e445.js
#	dist/static/js/32.fb81c47e965fac12a2b5.js
#	dist/static/js/36.8638479df13c9528f19d.js
#	dist/static/js/36.91fa9488365c82e00a79.js
#	dist/static/js/40.aa1deef176b420fd3ccb.js
#	package-lock.json

build/webpack.dev.conf.js

@@ -45,7 +45,7 @@ const devWebpackConfig = merge(baseWebpackConfig, {
     },
     before(app) {
       app.get('/', (req, res) => {
-        res.redirect('/gic-clique/');
+        res.redirect(config.dev.assetsPublicPath);
       })
     },
   },
@@ -88,7 +88,7 @@ module.exports = new Promise((resolve, reject) => {
       // Add FriendlyErrorsPlugin
       devWebpackConfig.plugins.push(new FriendlyErrorsPlugin({
         compilationSuccessInfo: {
-          messages: [`Your application is running here: http://${devWebpackConfig.devServer.host}:${port}`],
+          messages: [`Your application is running here: http://${devWebpackConfig.devServer.host}:${port}${config.dev.assetsPublicPath}`],
         },
         onErrors: config.dev.notifyOnErrors
         ? utils.createNotifierCallback()

config/index.js

@@ -9,7 +9,7 @@ module.exports = {
 
     // Paths
     assetsSubDirectory: 'static',
-    assetsPublicPath: '/gic-clique',
+    assetsPublicPath: '/gic-clique/',
     proxyTable: {},//proxyConfig.proxyList,
 
     // Various Dev Server settings

dist/index.html

@@ -3,4 +3,8 @@
         var host = window.location.host;
         host = host.indexOf('localhost') > -1 || host.indexOf('192.168') > -1 ? 'gicdev.demogic.com' : host;
         document.write('<script src="//'+ host + src +'"><\/script>')
-      })()</script><script type=text/javascript src=./static/js/manifest.17fb78ae88aa94ea6436.js></script><script type=text/javascript src=./static/js/vendor.e011c3c397f470572c3c.js></script><script type=text/javascript src=./static/js/main.1a1feee074ef464c78a9.js></script></body></html>
+<<<<<<< HEAD
\ No newline at end of file
+      })()</script><script type=text/javascript src=./static/js/manifest.17fb78ae88aa94ea6436.js></script><script type=text/javascript src=./static/js/vendor.e011c3c397f470572c3c.js></script><script type=text/javascript src=./static/js/main.1a1feee074ef464c78a9.js></script></body></html>
+=======
+      })()</script><script type=text/javascript src=./static/js/manifest.c821342ee438f8e1a6ca.js></script><script type=text/javascript src=./static/js/vendor.e011c3c397f470572c3c.js></script><script type=text/javascript src=./static/js/main.1a1feee074ef464c78a9.js></script></body></html>
+>>>>>>> bugfix/会员体系时间控件调整

dist/static/js/manifest.c821342ee438f8e1a6ca.js

+!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,r,t){for(var f,b,o,i=0,u=[];i<a.length;i++)b=a[i],d[b]&&u.push(d[b][0]),d[b]=0;for(f in r)Object.prototype.hasOwnProperty.call(r,f)&&(e[f]=r[f]);for(c&&c(a,r,t);u.length;)u.shift()();if(t)for(i=0;i<t.length;i++)o=n(n.s=t[i]);return o};var a={},d={45:0};function n(c){if(a[c])return a[c].exports;var d=a[c]={i:c,l:!1,exports:{}};return e[c].call(d.exports,d,d.exports,n),d.l=!0,d.exports}n.e=function(e){var c=d[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,n){c=d[e]=[a,n]});c[2]=a;var r=document.getElementsByTagName("head")[0],t=document.createElement("script");t.type="text/javascript",t.charset="utf-8",t.async=!0,t.timeout=12e4,n.nc&&t.setAttribute("nonce",n.nc),t.src=n.p+"static/js/"+e+"."+{0:"88da6cef2a2da8c0ac06",1:"9cecaa6c9806ca9799db",2:"bd54b86536f9ccb82ea1",3:"352b3a449f18f3dc371f",4:"bd18c193a76e95f60c61",5:"d892507275e671fe1b89",6:"ed71e83671dc2f418cb9",7:"b2353d2b7c6bf726c5b8",8:"d8cb261aca329da89fe3",9:"bf8e3eb725c3154ba875",10:"02dadea2c0df360875aa",11:"cdab50c05de12f0acd5c",12:"6ae940f15c49a8d205cc",13:"50b507e105bb906536f2",14:"2b52995fbfb41757b1f3",15:"b7fcf12561ddbad1c6e2",16:"d8a723c35c4c4225d75a",17:"9c719afe7f83470ebe7f",18:"78bfec0525c6541b0eb5",19:"aa120c7146645c889848",20:"47c60a96fc93b5d6717d",21:"15289d643d1f5ee8fa91",22:"d1d677ace66bb814db71",23:"91c7caee7e3f7129b4ab",24:"e3a59206748460761206",25:"934d520206709e5845fc",26:"c4536db0d3dcff9e72ee",27:"267c39d7e6bf0f2508df",28:"1e2f2e764ac7e168b3ba",29:"4cd969a8b6bd320244b8",30:"353aca40331bb767bbfd",31:"35a63d5da2112a12c4aa",32:"d49003d17452bc78e445",33:"5075d3c43adc30caed4d",34:"a6aa953460e246b74104",35:"b82c23248198463a02eb",36:"91fa9488365c82e00a79",37:"add3071bfdfb6abc436c",38:"78a7decc9907c49d4361",39:"08493a5747c586c620cf",40:"8040edbcddb7ddd87b3c",41:"923a33964ec43360c6a7",42:"967aaf73197d36304ecc"}[e]+".js";var f=setTimeout(b,12e4);function b(){t.onerror=t.onload=null,clearTimeout(f);var c=d[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),d[e]=void 0)}return t.onerror=t.onload=b,r.appendChild(t),a},n.m=e,n.c=a,n.d=function(e,c,a){n.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},n.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(c,"a",c),c},n.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},n.p="./",n.oe=function(e){throw console.error(e),e}}([]);
+//# sourceMappingURL=manifest.c821342ee438f8e1a6ca.js.map
\ No newline at end of file

dist/static/js/manifest.c821342ee438f8e1a6ca.js.map

+{"version":3,"sources":["webpack:///webpack/bootstrap bcb67bd6e06c686eafc3"],"names":["parentJsonpFunction","window","chunkIds","moreModules","executeModules","moduleId","chunkId","result","i","resolves","length","installedChunks","push","Object","prototype","hasOwnProperty","call","modules","shift","__webpack_require__","s","installedModules","45","exports","module","l","e","installedChunkData","Promise","resolve","promise","reject","head","document","getElementsByTagName","script","createElement","type","charset","async","timeout","nc","setAttribute","src","p","0","1","2","3","4","5","6","7","8","9","10","11","12","13","14","15","16","17","18","19","20","21","22","23","24","25","26","27","28","29","30","31","32","33","34","35","36","37","38","39","40","41","42","setTimeout","onScriptComplete","onerror","onload","clearTimeout","chunk","Error","undefined","appendChild","m","c","d","name","getter","o","defineProperty","configurable","enumerable","get","n","__esModule","object","property","oe","err","console","error"],"mappings":"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","file":"static/js/manifest.c821342ee438f8e1a6ca.js","sourcesContent":[" \t// install a JSONP callback for chunk loading\n \tvar parentJsonpFunction = window[\"webpackJsonp\"];\n \twindow[\"webpackJsonp\"] = function webpackJsonpCallback(chunkIds, moreModules, executeModules) {\n \t\t// add \"moreModules\" to the modules object,\n \t\t// then flag all \"chunkIds\" as loaded and fire callback\n \t\tvar moduleId, chunkId, i = 0, resolves = [], result;\n \t\tfor(;i < chunkIds.length; i++) {\n \t\t\tchunkId = chunkIds[i];\n \t\t\tif(installedChunks[chunkId]) {\n \t\t\t\tresolves.push(installedChunks[chunkId][0]);\n \t\t\t}\n \t\t\tinstalledChunks[chunkId] = 0;\n \t\t}\n \t\tfor(moduleId in moreModules) {\n \t\t\tif(Object.prototype.hasOwnProperty.call(moreModules, moduleId)) {\n \t\t\t\tmodules[moduleId] = moreModules[moduleId];\n \t\t\t}\n \t\t}\n \t\tif(parentJsonpFunction) parentJsonpFunction(chunkIds, moreModules, executeModules);\n \t\twhile(resolves.length) {\n \t\t\tresolves.shift()();\n \t\t}\n \t\tif(executeModules) {\n \t\t\tfor(i=0; i < executeModules.length; i++) {\n \t\t\t\tresult = __webpack_require__(__webpack_require__.s = executeModules[i]);\n \t\t\t}\n \t\t}\n \t\treturn result;\n \t};\n\n \t// The module cache\n \tvar installedModules = {};\n\n \t// objects to store loaded and loading chunks\n \tvar installedChunks = {\n \t\t45: 0\n \t};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId]) {\n \t\t\treturn installedModules[moduleId].exports;\n \t\t}\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n \t// This file contains only the entry chunk.\n \t// The chunk loading function for additional chunks\n \t__webpack_require__.e = function requireEnsure(chunkId) {\n \t\tvar installedChunkData = installedChunks[chunkId];\n \t\tif(installedChunkData === 0) {\n \t\t\treturn new Promise(function(resolve) { resolve(); });\n \t\t}\n\n \t\t// a Promise means \"currently loading\".\n \t\tif(installedChunkData) {\n \t\t\treturn installedChunkData[2];\n \t\t}\n\n \t\t// setup Promise in chunk cache\n \t\tvar promise = new Promise(function(resolve, reject) {\n \t\t\tinstalledChunkData = installedChunks[chunkId] = [resolve, reject];\n \t\t});\n \t\tinstalledChunkData[2] = promise;\n\n \t\t// start chunk loading\n \t\tvar head = document.getElementsByTagName('head')[0];\n \t\tvar script = document.createElement('script');\n \t\tscript.type = \"text/javascript\";\n \t\tscript.charset = 'utf-8';\n \t\tscript.async = true;\n \t\tscript.timeout = 120000;\n\n \t\tif (__webpack_require__.nc) {\n \t\t\tscript.setAttribute(\"nonce\", __webpack_require__.nc);\n \t\t}\n \t\tscript.src = __webpack_require__.p + \"static/js/\" + chunkId + \".\" + {\"0\":\"88da6cef2a2da8c0ac06\",\"1\":\"9cecaa6c9806ca9799db\",\"2\":\"bd54b86536f9ccb82ea1\",\"3\":\"352b3a449f18f3dc371f\",\"4\":\"bd18c193a76e95f60c61\",\"5\":\"d892507275e671fe1b89\",\"6\":\"ed71e83671dc2f418cb9\",\"7\":\"b2353d2b7c6bf726c5b8\",\"8\":\"d8cb261aca329da89fe3\",\"9\":\"bf8e3eb725c3154ba875\",\"10\":\"02dadea2c0df360875aa\",\"11\":\"cdab50c05de12f0acd5c\",\"12\":\"6ae940f15c49a8d205cc\",\"13\":\"50b507e105bb906536f2\",\"14\":\"2b52995fbfb41757b1f3\",\"15\":\"b7fcf12561ddbad1c6e2\",\"16\":\"d8a723c35c4c4225d75a\",\"17\":\"9c719afe7f83470ebe7f\",\"18\":\"78bfec0525c6541b0eb5\",\"19\":\"aa120c7146645c889848\",\"20\":\"47c60a96fc93b5d6717d\",\"21\":\"15289d643d1f5ee8fa91\",\"22\":\"d1d677ace66bb814db71\",\"23\":\"91c7caee7e3f7129b4ab\",\"24\":\"e3a59206748460761206\",\"25\":\"934d520206709e5845fc\",\"26\":\"c4536db0d3dcff9e72ee\",\"27\":\"267c39d7e6bf0f2508df\",\"28\":\"1e2f2e764ac7e168b3ba\",\"29\":\"4cd969a8b6bd320244b8\",\"30\":\"353aca40331bb767bbfd\",\"31\":\"35a63d5da2112a12c4aa\",\"32\":\"d49003d17452bc78e445\",\"33\":\"5075d3c43adc30caed4d\",\"34\":\"a6aa953460e246b74104\",\"35\":\"b82c23248198463a02eb\",\"36\":\"91fa9488365c82e00a79\",\"37\":\"add3071bfdfb6abc436c\",\"38\":\"78a7decc9907c49d4361\",\"39\":\"08493a5747c586c620cf\",\"40\":\"8040edbcddb7ddd87b3c\",\"41\":\"923a33964ec43360c6a7\",\"42\":\"967aaf73197d36304ecc\"}[chunkId] + \".js\";\n \t\tvar timeout = setTimeout(onScriptComplete, 120000);\n \t\tscript.onerror = script.onload = onScriptComplete;\n \t\tfunction onScriptComplete() {\n \t\t\t// avoid mem leaks in IE.\n \t\t\tscript.onerror = script.onload = null;\n \t\t\tclearTimeout(timeout);\n \t\t\tvar chunk = installedChunks[chunkId];\n \t\t\tif(chunk !== 0) {\n \t\t\t\tif(chunk) {\n \t\t\t\t\tchunk[1](new Error('Loading chunk ' + chunkId + ' failed.'));\n \t\t\t\t}\n \t\t\t\tinstalledChunks[chunkId] = undefined;\n \t\t\t}\n \t\t};\n \t\thead.appendChild(script);\n\n \t\treturn promise;\n \t};\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, {\n \t\t\t\tconfigurable: false,\n \t\t\t\tenumerable: true,\n \t\t\t\tget: getter\n \t\t\t});\n \t\t}\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"./\";\n\n \t// on error function for async loading\n \t__webpack_require__.oe = function(err) { console.error(err); throw err; };\n\n\n\n// WEBPACK FOOTER //\n// webpack/bootstrap bcb67bd6e06c686eafc3"],"sourceRoot":""}
\ No newline at end of file

src/view/companyGroup/membershipSystem/addIntegralSytem.vue

@@ -219,7 +219,7 @@
                     type="datetimerange"
                     start-placeholder="开始日期"
                     end-placeholder="结束日期"
-                    format="yyyy-MM-dd HH:mm"
+                    format="yyyy-MM-dd HH:mm:ss"
                     value-format="timestamp"
                     :default-time="['00:00:00', '23:59:59']">
                   </el-date-picker>

src/view/companyGroup/membershipSystem/addPointSystem.vue

@@ -160,7 +160,7 @@
                     type="datetimerange"
                     start-placeholder="开始日期"
                     end-placeholder="结束日期"
-                    format="yyyy-MM-dd HH:mm"
+                    format="yyyy-MM-dd HH:mm:ss"
                     value-format="timestamp"
                     :default-time="['00:00:00', '23:59:59']">
                   </el-date-picker>

src/view/companyGroup/membershipSystem/editIntegralSytem.vue

@@ -218,7 +218,7 @@
                     type="datetimerange"
                     start-placeholder="开始日期"
                     end-placeholder="结束日期"
-                    format="yyyy-MM-dd HH:mm"
+                    format="yyyy-MM-dd HH:mm:ss"
                     value-format="timestamp"
                     :default-time="['00:00:00', '23:59:59']"
                   ></el-date-picker>

src/view/companyGroup/membershipSystem/editPointSystem.vue

@@ -350,7 +350,7 @@
                     type="datetimerange"
                     start-placeholder="开始日期"
                     end-placeholder="结束日期"
-                    format="yyyy-MM-dd HH:mm"
+                    format="yyyy-MM-dd HH:mm:ss"
                     value-format="timestamp"
                     :default-time="['00:00:00', '23:59:59']"
                   ></el-date-picker>