fstarter 2.10.51 → 2.10.52

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,104 +1,104 @@
1
- {
2
- "name": "fstarter",
3
- "description": "A Vue.js project",
4
- "version": "2.10.51",
5
- "author": "han.zhang <zhanghan810810@163.com>",
6
- "license": "MIT",
7
- "private": false,
8
- "main": "./dist/build.js",
9
- "scripts": {
10
- "dev": "cross-env NODE_ENV=development webpack-dev-server --open --hot",
11
- "build": "cross-env NODE_ENV=production webpack --progress --hide-modules"
12
- },
13
- "dependencies": {
14
- "axios": "^0.18.0",
15
- "better-scroll": "1.10.2",
16
- "fastclick": "^1.0.6",
17
- "js-cookie": "^2.2.0",
18
- "js-md5": "^0.7.3",
19
- "js-model": "^1.6.2",
20
- "lodash": "^4.17.10",
21
- "mockjs": "^1.0.1-beta3",
22
- "pdfh5": "^1.3.19",
23
- "qs": "^6.5.2",
24
- "rxjs": "^5.4.0",
25
- "signature_pad": "^3.0.0-beta.4",
26
- "style-loader": "^0.23.0",
27
- "vant": "2.12.39",
28
- "vconsole": "^3.3.0",
29
- "vue": "^2.6.11",
30
- "vue-bus": "^1.2.0",
31
- "vue-cropper": "^0.5.6",
32
- "vue-i18n": "^8.22.2",
33
- "vue-lazyload": "1.2.3",
34
- "vue-markdown": "^2.2.4",
35
- "vue-mq": "^0.2.1",
36
- "vue-router": "^3.0.1",
37
- "vuelidate": "^0.7.4",
38
- "vuex": "^3.0.1",
39
- "vuex-router-sync": "^5.0.0",
40
- "vux": "^2.9.2",
41
- "weixin-js-sdk": "^1.3.2"
42
- },
43
- "browserslist": [
44
- "> 1%",
45
- "last 2 versions",
46
- "not ie <= 8"
47
- ],
48
- "devDependencies": {
49
- "autoprefixer": "^7.1.2",
50
- "babel-core": "^6.22.1",
51
- "babel-eslint": "8.0.3",
52
- "babel-helper-vue-jsx-merge-props": "^2.0.3",
53
- "babel-jest": "^21.0.2",
54
- "babel-loader": "^7.1.1",
55
- "babel-plugin-dynamic-import-node": "^1.2.0",
56
- "babel-plugin-import": "^1.12.2",
57
- "babel-plugin-syntax-jsx": "^6.18.0",
58
- "babel-plugin-transform-es2015-modules-commonjs": "^6.26.0",
59
- "babel-plugin-transform-runtime": "^6.22.0",
60
- "babel-plugin-transform-vue-jsx": "^3.5.0",
61
- "babel-preset-env": "^1.3.2",
62
- "babel-preset-es2015": "^6.24.1",
63
- "babel-preset-stage-2": "^6.22.0",
64
- "chalk": "^2.0.1",
65
- "copy-webpack-plugin": "^4.0.1",
66
- "cross-env": "^7.0.3",
67
- "css-loader": "^0.28.11",
68
- "eslint": "4.13.1",
69
- "eslint-friendly-formatter": "3.0.0",
70
- "eslint-loader": "1.9.0",
71
- "eslint-plugin-html": "4.0.1",
72
- "extract-text-webpack-plugin": "^3.0.0",
73
- "file-loader": "^1.1.4",
74
- "friendly-errors-webpack-plugin": "^1.6.1",
75
- "html-webpack-plugin": "^2.30.1",
76
- "jest": "^22.0.4",
77
- "jest-serializer-vue": "^0.3.0",
78
- "less": "^3.8.1",
79
- "less-loader": "^4.1.0",
80
- "node-notifier": "^5.1.2",
81
- "normalize.css": "^8.0.0",
82
- "optimize-css-assets-webpack-plugin": "^3.2.0",
83
- "ora": "^1.2.0",
84
- "portfinder": "^1.0.13",
85
- "postcss-import": "^11.0.0",
86
- "postcss-loader": "^2.0.8",
87
- "postcss-url": "^7.2.1",
88
- "rimraf": "^2.6.0",
89
- "semver": "^5.3.0",
90
- "shelljs": "^0.7.6",
91
- "uglifyjs-webpack-plugin": "^1.1.1",
92
- "url-loader": "^0.5.8",
93
- "vconsole": "^3.3.0",
94
- "vue-jest": "^1.0.2",
95
- "vue-loader": "^13.3.0",
96
- "vue-style-loader": "^3.1.2",
97
- "vue-template-compiler": "^2.5.21",
98
- "vux-loader": "^1.2.9",
99
- "webpack": "^3.6.0",
100
- "webpack-bundle-analyzer": "^2.9.0",
101
- "webpack-dev-server": "^2.9.1",
102
- "webpack-merge": "^4.1.0"
103
- }
104
- }
1
+ {
2
+ "name": "fstarter",
3
+ "description": "A Vue.js project",
4
+ "version": "2.10.52",
5
+ "author": "han.zhang <zhanghan810810@163.com>",
6
+ "license": "MIT",
7
+ "private": false,
8
+ "main": "./dist/build.js",
9
+ "scripts": {
10
+ "dev": "cross-env NODE_ENV=development webpack-dev-server --open --hot",
11
+ "build": "cross-env NODE_ENV=production webpack --progress --hide-modules"
12
+ },
13
+ "dependencies": {
14
+ "axios": "^0.18.0",
15
+ "better-scroll": "1.10.2",
16
+ "fastclick": "^1.0.6",
17
+ "js-cookie": "^2.2.0",
18
+ "js-md5": "^0.7.3",
19
+ "js-model": "^1.6.2",
20
+ "lodash": "^4.17.10",
21
+ "mockjs": "^1.0.1-beta3",
22
+ "pdfh5": "^1.3.19",
23
+ "qs": "^6.5.2",
24
+ "rxjs": "^5.4.0",
25
+ "signature_pad": "^3.0.0-beta.4",
26
+ "style-loader": "^0.23.0",
27
+ "vant": "2.12.39",
28
+ "vconsole": "^3.3.0",
29
+ "vue": "^2.6.11",
30
+ "vue-bus": "^1.2.0",
31
+ "vue-cropper": "^0.5.6",
32
+ "vue-i18n": "^8.22.2",
33
+ "vue-lazyload": "1.2.3",
34
+ "vue-markdown": "^2.2.4",
35
+ "vue-mq": "^0.2.1",
36
+ "vue-router": "^3.0.1",
37
+ "vuelidate": "^0.7.4",
38
+ "vuex": "^3.0.1",
39
+ "vuex-router-sync": "^5.0.0",
40
+ "vux": "^2.9.2",
41
+ "weixin-js-sdk": "^1.3.2"
42
+ },
43
+ "browserslist": [
44
+ "> 1%",
45
+ "last 2 versions",
46
+ "not ie <= 8"
47
+ ],
48
+ "devDependencies": {
49
+ "autoprefixer": "^7.1.2",
50
+ "babel-core": "^6.22.1",
51
+ "babel-eslint": "8.0.3",
52
+ "babel-helper-vue-jsx-merge-props": "^2.0.3",
53
+ "babel-jest": "^21.0.2",
54
+ "babel-loader": "^7.1.1",
55
+ "babel-plugin-dynamic-import-node": "^1.2.0",
56
+ "babel-plugin-import": "^1.12.2",
57
+ "babel-plugin-syntax-jsx": "^6.18.0",
58
+ "babel-plugin-transform-es2015-modules-commonjs": "^6.26.0",
59
+ "babel-plugin-transform-runtime": "^6.22.0",
60
+ "babel-plugin-transform-vue-jsx": "^3.5.0",
61
+ "babel-preset-env": "^1.3.2",
62
+ "babel-preset-es2015": "^6.24.1",
63
+ "babel-preset-stage-2": "^6.22.0",
64
+ "chalk": "^2.0.1",
65
+ "copy-webpack-plugin": "^4.0.1",
66
+ "cross-env": "^7.0.3",
67
+ "css-loader": "^0.28.11",
68
+ "eslint": "4.13.1",
69
+ "eslint-friendly-formatter": "3.0.0",
70
+ "eslint-loader": "1.9.0",
71
+ "eslint-plugin-html": "4.0.1",
72
+ "extract-text-webpack-plugin": "^3.0.0",
73
+ "file-loader": "^1.1.4",
74
+ "friendly-errors-webpack-plugin": "^1.6.1",
75
+ "html-webpack-plugin": "^2.30.1",
76
+ "jest": "^22.0.4",
77
+ "jest-serializer-vue": "^0.3.0",
78
+ "less": "^3.8.1",
79
+ "less-loader": "^4.1.0",
80
+ "node-notifier": "^5.1.2",
81
+ "normalize.css": "^8.0.0",
82
+ "optimize-css-assets-webpack-plugin": "^3.2.0",
83
+ "ora": "^1.2.0",
84
+ "portfinder": "^1.0.13",
85
+ "postcss-import": "^11.0.0",
86
+ "postcss-loader": "^2.0.8",
87
+ "postcss-url": "^7.2.1",
88
+ "rimraf": "^2.6.0",
89
+ "semver": "^5.3.0",
90
+ "shelljs": "^0.7.6",
91
+ "uglifyjs-webpack-plugin": "^1.1.1",
92
+ "url-loader": "^0.5.8",
93
+ "vconsole": "^3.3.0",
94
+ "vue-jest": "^1.0.2",
95
+ "vue-loader": "^13.3.0",
96
+ "vue-style-loader": "^3.1.2",
97
+ "vue-template-compiler": "^2.5.21",
98
+ "vux-loader": "^1.2.9",
99
+ "webpack": "^3.6.0",
100
+ "webpack-bundle-analyzer": "^2.9.0",
101
+ "webpack-dev-server": "^2.9.1",
102
+ "webpack-merge": "^4.1.0"
103
+ }
104
+ }
@@ -5,10 +5,15 @@ import {ua} from "../assets/ua";
5
5
 
6
6
  var faceH5 = {
7
7
  getData(params){
8
+ // facetoken=1的作用:刷新页面
8
9
  let cburl = ak.http.concatParams(window.location.href,'facetoken=1')
9
10
  if(params.cburl){
10
11
  cburl = ak.http.concatParams(params.cburl,'facetoken=1')
11
12
  }
13
+ if(cburl.split('?').length - 1 == 1){
14
+ cburl = `${cburl}?1=1` // 路由中不带参时的特殊处理
15
+ }
16
+
12
17
  return {
13
18
  "requestSource": "YX",
14
19
  "requestType": "H5",
@@ -32,7 +37,7 @@ var faceH5 = {
32
37
 
33
38
  }else if(ua.microMsg){
34
39
  let apiUrl = config.http.gwURL + '/api/v1/hasl/preservation/service/h5CreateOrderPreservation'
35
- return http.post(apiUrl,params,true,true).then((data)=>{
40
+ return http.post(apiUrl,params,false,true).then((data)=>{
36
41
  let _data = JSON.parse(data.result)
37
42
  const objstr = JSON.stringify(Object.assign(params, _data))
38
43
  localStorage.setItem('faceAbout', objstr)
@@ -28,7 +28,7 @@ var getH5FaceResult = {
28
28
 
29
29
  }else if(ua.microMsg){
30
30
  let apiUrl = config.http.gwURL + '/api/v1/hasl/preservation/service/faceResultQueryPreservation'
31
- return http.post(apiUrl,params, true, true).then((res)=>{
31
+ return http.post(apiUrl,params, false, true).then((res)=>{
32
32
  let data = JSON.parse(res.result)
33
33
  console.log(data,'=====腾讯返回的结果========')
34
34
  if(data.resultType == 'SUCCESS') {