1. 登录完成 / 进游戏 / 支付完成之前 显示 加载中页面 2. 游戏 微信支付 关闭了当前窗口 3. data 传递给wcfml base64加密

README.md

@@ -263,3 +263,5 @@ appid
 ## 8.23
 
 -   [x] 注册 先提示验证账号是否存在
+-   [x] 游戏 微信支付 关闭了当前窗口
+-   [x] 登录完成 / 进游戏 / 支付完成之前 显示 加载中页面

build/utils.js

@@ -4,104 +4,105 @@ const config = require('../config')
 const ExtractTextPlugin = require('extract-text-webpack-plugin')
 const packageConfig = require('../package.json')
 
-exports.assetsPath = function (_path) {
-  const assetsSubDirectory = process.env.NODE_ENV === 'production'
-    ? config.build.assetsSubDirectory
-    : config.dev.assetsSubDirectory
+exports.assetsPath = function(_path) {
+    const assetsSubDirectory = process.env.NODE_ENV === 'production' ?
+        config.build.assetsSubDirectory :
+        config.dev.assetsSubDirectory
 
-  return path.posix.join(assetsSubDirectory, _path)
+    return path.posix.join(assetsSubDirectory, _path)
 }
 
-exports.cssLoaders = function (options) {
-  options = options || {}
+exports.cssLoaders = function(options) {
+    options = options || {}
 
-  const cssLoader = {
-    loader: 'css-loader',
-    options: {
-      sourceMap: options.sourceMap
+    const cssLoader = {
+        loader: 'css-loader',
+        options: {
+            sourceMap: options.sourceMap
+        }
     }
-  }
 
-  const postcssLoader = {
-    loader: 'postcss-loader',
-    options: {
-      sourceMap: options.sourceMap
+    const postcssLoader = {
+        loader: 'postcss-loader',
+        options: {
+            sourceMap: options.sourceMap
+        }
     }
-  }
 
-  // generate loader string to be used with extract text plugin
-  function generateLoaders (loader, loaderOptions) {
-    const loaders = options.usePostCSS ? [cssLoader, postcssLoader] : [cssLoader]
+    // generate loader string to be used with extract text plugin
+    function generateLoaders(loader, loaderOptions) {
+        const loaders = options.usePostCSS ? [cssLoader, postcssLoader] : [cssLoader]
+
+        if (loader) {
+            loaders.push({
+                loader: loader + '-loader',
+                options: Object.assign({}, loaderOptions, {
+                    sourceMap: options.sourceMap
+                })
+            })
+        }
 
-    if (loader) {
-      loaders.push({
-        loader: loader + '-loader',
-        options: Object.assign({}, loaderOptions, {
-          sourceMap: options.sourceMap
-        })
-      })
+        // Extract CSS when that option is specified
+        // (which is the case during production build)
+        if (options.extract) {
+            return ExtractTextPlugin.extract({
+                use: loaders,
+                fallback: 'vue-style-loader',
+                publicPath: "../../"
+            })
+        } else {
+            return ['vue-style-loader'].concat(loaders)
+        }
     }
 
-    // Extract CSS when that option is specified
-    // (which is the case during production build)
-    if (options.extract) {
-      return ExtractTextPlugin.extract({
-        use: loaders,
-        fallback: 'vue-style-loader'
-      })
-    } else {
-      return ['vue-style-loader'].concat(loaders)
+    // https://vue-loader.vuejs.org/en/configurations/extract-css.html
+    return {
+        css: generateLoaders(),
+        postcss: generateLoaders(),
+        // less: generateLoaders('less'),
+        less: generateLoaders('less').concat({
+            loader: 'sass-resources-loader',
+            options: {
+                resources: path.resolve(__dirname, '../src/assets/css/config.less') // 此处为你需要全局引入的less文件地址
+            }
+        }),
+        sass: generateLoaders('sass', { indentedSyntax: true }),
+        scss: generateLoaders('sass'),
+        stylus: generateLoaders('stylus'),
+        styl: generateLoaders('stylus')
     }
-  }
-
-  // https://vue-loader.vuejs.org/en/configurations/extract-css.html
-  return {
-    css: generateLoaders(),
-    postcss: generateLoaders(),
-    // less: generateLoaders('less'),
-    less: generateLoaders('less').concat({
-        loader: 'sass-resources-loader',
-        options: {
-          resources: path.resolve(__dirname, '../src/assets/css/config.less') // 此处为你需要全局引入的less文件地址
-        }
-    }),
-    sass: generateLoaders('sass', { indentedSyntax: true }),
-    scss: generateLoaders('sass'),
-    stylus: generateLoaders('stylus'),
-    styl: generateLoaders('stylus')
-  }
 }
 
 // Generate loaders for standalone style files (outside of .vue)
-exports.styleLoaders = function (options) {
-  const output = []
-  const loaders = exports.cssLoaders(options)
-
-  for (const extension in loaders) {
-    const loader = loaders[extension]
-    output.push({
-      test: new RegExp('\\.' + extension + '$'),
-      use: loader
-    })
-  }
-
-  return output
+exports.styleLoaders = function(options) {
+    const output = []
+    const loaders = exports.cssLoaders(options)
+
+    for (const extension in loaders) {
+        const loader = loaders[extension]
+        output.push({
+            test: new RegExp('\\.' + extension + '$'),
+            use: loader
+        })
+    }
+
+    return output
 }
 
 exports.createNotifierCallback = () => {
-  const notifier = require('node-notifier')
+    const notifier = require('node-notifier')
 
-  return (severity, errors) => {
-    if (severity !== 'error') return
+    return (severity, errors) => {
+        if (severity !== 'error') return
 
-    const error = errors[0]
-    const filename = error.file && error.file.split('!').pop()
+        const error = errors[0]
+        const filename = error.file && error.file.split('!').pop()
 
-    notifier.notify({
-      title: packageConfig.name,
-      message: severity + ': ' + error.name,
-      subtitle: filename || '',
-      icon: path.join(__dirname, 'logo.png')
-    })
-  }
-}
+        notifier.notify({
+            title: packageConfig.name,
+            message: severity + ': ' + error.name,
+            subtitle: filename || '',
+            icon: path.join(__dirname, 'logo.png')
+        })
+    }
+}

index.html

@@ -32,9 +32,9 @@
     <title>关注惊鸿游戏公众号领福利</title>
 
 </head>
-<!-- <script src="https://cdn.bootcss.com/vConsole/3.2.0/vconsole.min.js"></script> -->
+<script src="https://cdn.bootcss.com/vConsole/3.2.0/vconsole.min.js"></script>
 <script>
-    // var vConsole = new VConsole();
+    var vConsole = new VConsole();
 </script>
 
 <body>

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "vue-demo",
-    "version": "1.0.0",
+    "version": "v1.0.4",
     "lockfileVersion": 1,
     "requires": true,
     "dependencies": {
@@ -5041,6 +5041,14 @@
                         "js-base64": "^2.1.9",
                         "source-map": "^0.5.6",
                         "supports-color": "^3.2.3"
+                    },
+                    "dependencies": {
+                        "js-base64": {
+                            "version": "2.6.4",
+                            "resolved": "https://registry.nlark.com/js-base64/download/js-base64-2.6.4.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fjs-base64%2Fdownload%2Fjs-base64-2.6.4.tgz",
+                            "integrity": "sha1-9OaGxd4eofhn28rT1G2WlCjfmMQ=",
+                            "dev": true
+                        }
                     }
                 },
                 "source-map": {
@@ -5217,6 +5225,14 @@
                         "js-base64": "^2.1.9",
                         "source-map": "^0.5.6",
                         "supports-color": "^3.2.3"
+                    },
+                    "dependencies": {
+                        "js-base64": {
+                            "version": "2.6.4",
+                            "resolved": "https://registry.nlark.com/js-base64/download/js-base64-2.6.4.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fjs-base64%2Fdownload%2Fjs-base64-2.6.4.tgz",
+                            "integrity": "sha1-9OaGxd4eofhn28rT1G2WlCjfmMQ=",
+                            "dev": true
+                        }
                     }
                 },
                 "source-map": {
@@ -8902,10 +8918,9 @@
             }
         },
         "js-base64": {
-            "version": "2.6.4",
-            "resolved": "https://registry.npm.taobao.org/js-base64/download/js-base64-2.6.4.tgz?cache=0&sync_timestamp=1604450326544&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjs-base64%2Fdownload%2Fjs-base64-2.6.4.tgz",
-            "integrity": "sha1-9OaGxd4eofhn28rT1G2WlCjfmMQ=",
-            "dev": true
+            "version": "3.6.1",
+            "resolved": "https://registry.nlark.com/js-base64/download/js-base64-3.6.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fjs-base64%2Fdownload%2Fjs-base64-3.6.1.tgz",
+            "integrity": "sha1-VVquOYt0aUtAN68filpiCdFw774="
         },
         "js-binary-schema-parser": {
             "version": "2.0.2",
@@ -10759,6 +10774,14 @@
                         "js-base64": "^2.1.9",
                         "source-map": "^0.5.6",
                         "supports-color": "^3.2.3"
+                    },
+                    "dependencies": {
+                        "js-base64": {
+                            "version": "2.6.4",
+                            "resolved": "https://registry.nlark.com/js-base64/download/js-base64-2.6.4.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fjs-base64%2Fdownload%2Fjs-base64-2.6.4.tgz",
+                            "integrity": "sha1-9OaGxd4eofhn28rT1G2WlCjfmMQ=",
+                            "dev": true
+                        }
                     }
                 },
                 "source-map": {
@@ -10832,6 +10855,14 @@
                         "js-base64": "^2.1.9",
                         "source-map": "^0.5.6",
                         "supports-color": "^3.2.3"
+                    },
+                    "dependencies": {
+                        "js-base64": {
+                            "version": "2.6.4",
+                            "resolved": "https://registry.nlark.com/js-base64/download/js-base64-2.6.4.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fjs-base64%2Fdownload%2Fjs-base64-2.6.4.tgz",
+                            "integrity": "sha1-9OaGxd4eofhn28rT1G2WlCjfmMQ=",
+                            "dev": true
+                        }
                     }
                 },
                 "source-map": {
@@ -10904,6 +10935,14 @@
                         "js-base64": "^2.1.9",
                         "source-map": "^0.5.6",
                         "supports-color": "^3.2.3"
+                    },
+                    "dependencies": {
+                        "js-base64": {
+                            "version": "2.6.4",
+                            "resolved": "https://registry.nlark.com/js-base64/download/js-base64-2.6.4.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fjs-base64%2Fdownload%2Fjs-base64-2.6.4.tgz",
+                            "integrity": "sha1-9OaGxd4eofhn28rT1G2WlCjfmMQ=",
+                            "dev": true
+                        }
                     }
                 },
                 "source-map": {
@@ -10975,6 +11014,14 @@
                         "js-base64": "^2.1.9",
                         "source-map": "^0.5.6",
                         "supports-color": "^3.2.3"
+                    },
+                    "dependencies": {
+                        "js-base64": {
+                            "version": "2.6.4",
+                            "resolved": "https://registry.nlark.com/js-base64/download/js-base64-2.6.4.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fjs-base64%2Fdownload%2Fjs-base64-2.6.4.tgz",
+                            "integrity": "sha1-9OaGxd4eofhn28rT1G2WlCjfmMQ=",
+                            "dev": true
+                        }
                     }
                 },
                 "source-map": {
@@ -11046,6 +11093,14 @@
                         "js-base64": "^2.1.9",
                         "source-map": "^0.5.6",
                         "supports-color": "^3.2.3"
+                    },
+                    "dependencies": {
+                        "js-base64": {
+                            "version": "2.6.4",
+                            "resolved": "https://registry.nlark.com/js-base64/download/js-base64-2.6.4.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fjs-base64%2Fdownload%2Fjs-base64-2.6.4.tgz",
+                            "integrity": "sha1-9OaGxd4eofhn28rT1G2WlCjfmMQ=",
+                            "dev": true
+                        }
                     }
                 },
                 "source-map": {
@@ -11117,6 +11172,14 @@
                         "js-base64": "^2.1.9",
                         "source-map": "^0.5.6",
                         "supports-color": "^3.2.3"
+                    },
+                    "dependencies": {
+                        "js-base64": {
+                            "version": "2.6.4",
+                            "resolved": "https://registry.nlark.com/js-base64/download/js-base64-2.6.4.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fjs-base64%2Fdownload%2Fjs-base64-2.6.4.tgz",
+                            "integrity": "sha1-9OaGxd4eofhn28rT1G2WlCjfmMQ=",
+                            "dev": true
+                        }
                     }
                 },
                 "source-map": {
@@ -11188,6 +11251,14 @@
                         "js-base64": "^2.1.9",
                         "source-map": "^0.5.6",
                         "supports-color": "^3.2.3"
+                    },
+                    "dependencies": {
+                        "js-base64": {
+                            "version": "2.6.4",
+                            "resolved": "https://registry.nlark.com/js-base64/download/js-base64-2.6.4.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fjs-base64%2Fdownload%2Fjs-base64-2.6.4.tgz",
+                            "integrity": "sha1-9OaGxd4eofhn28rT1G2WlCjfmMQ=",
+                            "dev": true
+                        }
                     }
                 },
                 "source-map": {
@@ -11260,6 +11331,14 @@
                         "js-base64": "^2.1.9",
                         "source-map": "^0.5.6",
                         "supports-color": "^3.2.3"
+                    },
+                    "dependencies": {
+                        "js-base64": {
+                            "version": "2.6.4",
+                            "resolved": "https://registry.nlark.com/js-base64/download/js-base64-2.6.4.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fjs-base64%2Fdownload%2Fjs-base64-2.6.4.tgz",
+                            "integrity": "sha1-9OaGxd4eofhn28rT1G2WlCjfmMQ=",
+                            "dev": true
+                        }
                     }
                 },
                 "source-map": {
@@ -11331,6 +11410,14 @@
                         "js-base64": "^2.1.9",
                         "source-map": "^0.5.6",
                         "supports-color": "^3.2.3"
+                    },
+                    "dependencies": {
+                        "js-base64": {
+                            "version": "2.6.4",
+                            "resolved": "https://registry.nlark.com/js-base64/download/js-base64-2.6.4.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fjs-base64%2Fdownload%2Fjs-base64-2.6.4.tgz",
+                            "integrity": "sha1-9OaGxd4eofhn28rT1G2WlCjfmMQ=",
+                            "dev": true
+                        }
                     }
                 },
                 "source-map": {
@@ -11546,6 +11633,14 @@
                         "js-base64": "^2.1.9",
                         "source-map": "^0.5.6",
                         "supports-color": "^3.2.3"
+                    },
+                    "dependencies": {
+                        "js-base64": {
+                            "version": "2.6.4",
+                            "resolved": "https://registry.nlark.com/js-base64/download/js-base64-2.6.4.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fjs-base64%2Fdownload%2Fjs-base64-2.6.4.tgz",
+                            "integrity": "sha1-9OaGxd4eofhn28rT1G2WlCjfmMQ=",
+                            "dev": true
+                        }
                     }
                 },
                 "source-map": {
@@ -11617,6 +11712,14 @@
                         "js-base64": "^2.1.9",
                         "source-map": "^0.5.6",
                         "supports-color": "^3.2.3"
+                    },
+                    "dependencies": {
+                        "js-base64": {
+                            "version": "2.6.4",
+                            "resolved": "https://registry.nlark.com/js-base64/download/js-base64-2.6.4.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fjs-base64%2Fdownload%2Fjs-base64-2.6.4.tgz",
+                            "integrity": "sha1-9OaGxd4eofhn28rT1G2WlCjfmMQ=",
+                            "dev": true
+                        }
                     }
                 },
                 "source-map": {
@@ -11702,6 +11805,14 @@
                         "js-base64": "^2.1.9",
                         "source-map": "^0.5.6",
                         "supports-color": "^3.2.3"
+                    },
+                    "dependencies": {
+                        "js-base64": {
+                            "version": "2.6.4",
+                            "resolved": "https://registry.nlark.com/js-base64/download/js-base64-2.6.4.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fjs-base64%2Fdownload%2Fjs-base64-2.6.4.tgz",
+                            "integrity": "sha1-9OaGxd4eofhn28rT1G2WlCjfmMQ=",
+                            "dev": true
+                        }
                     }
                 },
                 "source-map": {
@@ -11781,6 +11892,14 @@
                         "js-base64": "^2.1.9",
                         "source-map": "^0.5.6",
                         "supports-color": "^3.2.3"
+                    },
+                    "dependencies": {
+                        "js-base64": {
+                            "version": "2.6.4",
+                            "resolved": "https://registry.nlark.com/js-base64/download/js-base64-2.6.4.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fjs-base64%2Fdownload%2Fjs-base64-2.6.4.tgz",
+                            "integrity": "sha1-9OaGxd4eofhn28rT1G2WlCjfmMQ=",
+                            "dev": true
+                        }
                     }
                 },
                 "source-map": {
@@ -11853,6 +11972,14 @@
                         "js-base64": "^2.1.9",
                         "source-map": "^0.5.6",
                         "supports-color": "^3.2.3"
+                    },
+                    "dependencies": {
+                        "js-base64": {
+                            "version": "2.6.4",
+                            "resolved": "https://registry.nlark.com/js-base64/download/js-base64-2.6.4.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fjs-base64%2Fdownload%2Fjs-base64-2.6.4.tgz",
+                            "integrity": "sha1-9OaGxd4eofhn28rT1G2WlCjfmMQ=",
+                            "dev": true
+                        }
                     }
                 },
                 "source-map": {
@@ -11927,6 +12054,14 @@
                         "js-base64": "^2.1.9",
                         "source-map": "^0.5.6",
                         "supports-color": "^3.2.3"
+                    },
+                    "dependencies": {
+                        "js-base64": {
+                            "version": "2.6.4",
+                            "resolved": "https://registry.nlark.com/js-base64/download/js-base64-2.6.4.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fjs-base64%2Fdownload%2Fjs-base64-2.6.4.tgz",
+                            "integrity": "sha1-9OaGxd4eofhn28rT1G2WlCjfmMQ=",
+                            "dev": true
+                        }
                     }
                 },
                 "source-map": {
@@ -12001,6 +12136,14 @@
                         "js-base64": "^2.1.9",
                         "source-map": "^0.5.6",
                         "supports-color": "^3.2.3"
+                    },
+                    "dependencies": {
+                        "js-base64": {
+                            "version": "2.6.4",
+                            "resolved": "https://registry.nlark.com/js-base64/download/js-base64-2.6.4.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fjs-base64%2Fdownload%2Fjs-base64-2.6.4.tgz",
+                            "integrity": "sha1-9OaGxd4eofhn28rT1G2WlCjfmMQ=",
+                            "dev": true
+                        }
                     }
                 },
                 "source-map": {
@@ -12111,6 +12254,14 @@
                         "js-base64": "^2.1.9",
                         "source-map": "^0.5.6",
                         "supports-color": "^3.2.3"
+                    },
+                    "dependencies": {
+                        "js-base64": {
+                            "version": "2.6.4",
+                            "resolved": "https://registry.nlark.com/js-base64/download/js-base64-2.6.4.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fjs-base64%2Fdownload%2Fjs-base64-2.6.4.tgz",
+                            "integrity": "sha1-9OaGxd4eofhn28rT1G2WlCjfmMQ=",
+                            "dev": true
+                        }
                     }
                 },
                 "source-map": {
@@ -12397,6 +12548,14 @@
                         "js-base64": "^2.1.9",
                         "source-map": "^0.5.6",
                         "supports-color": "^3.2.3"
+                    },
+                    "dependencies": {
+                        "js-base64": {
+                            "version": "2.6.4",
+                            "resolved": "https://registry.nlark.com/js-base64/download/js-base64-2.6.4.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fjs-base64%2Fdownload%2Fjs-base64-2.6.4.tgz",
+                            "integrity": "sha1-9OaGxd4eofhn28rT1G2WlCjfmMQ=",
+                            "dev": true
+                        }
                     }
                 },
                 "source-map": {
@@ -12501,6 +12660,14 @@
                         "js-base64": "^2.1.9",
                         "source-map": "^0.5.6",
                         "supports-color": "^3.2.3"
+                    },
+                    "dependencies": {
+                        "js-base64": {
+                            "version": "2.6.4",
+                            "resolved": "https://registry.nlark.com/js-base64/download/js-base64-2.6.4.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fjs-base64%2Fdownload%2Fjs-base64-2.6.4.tgz",
+                            "integrity": "sha1-9OaGxd4eofhn28rT1G2WlCjfmMQ=",
+                            "dev": true
+                        }
                     }
                 },
                 "source-map": {
@@ -12573,6 +12740,14 @@
                         "js-base64": "^2.1.9",
                         "source-map": "^0.5.6",
                         "supports-color": "^3.2.3"
+                    },
+                    "dependencies": {
+                        "js-base64": {
+                            "version": "2.6.4",
+                            "resolved": "https://registry.nlark.com/js-base64/download/js-base64-2.6.4.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fjs-base64%2Fdownload%2Fjs-base64-2.6.4.tgz",
+                            "integrity": "sha1-9OaGxd4eofhn28rT1G2WlCjfmMQ=",
+                            "dev": true
+                        }
                     }
                 },
                 "source-map": {
@@ -12644,6 +12819,14 @@
                         "js-base64": "^2.1.9",
                         "source-map": "^0.5.6",
                         "supports-color": "^3.2.3"
+                    },
+                    "dependencies": {
+                        "js-base64": {
+                            "version": "2.6.4",
+                            "resolved": "https://registry.nlark.com/js-base64/download/js-base64-2.6.4.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fjs-base64%2Fdownload%2Fjs-base64-2.6.4.tgz",
+                            "integrity": "sha1-9OaGxd4eofhn28rT1G2WlCjfmMQ=",
+                            "dev": true
+                        }
                     }
                 },
                 "source-map": {
@@ -12717,6 +12900,14 @@
                         "js-base64": "^2.1.9",
                         "source-map": "^0.5.6",
                         "supports-color": "^3.2.3"
+                    },
+                    "dependencies": {
+                        "js-base64": {
+                            "version": "2.6.4",
+                            "resolved": "https://registry.nlark.com/js-base64/download/js-base64-2.6.4.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fjs-base64%2Fdownload%2Fjs-base64-2.6.4.tgz",
+                            "integrity": "sha1-9OaGxd4eofhn28rT1G2WlCjfmMQ=",
+                            "dev": true
+                        }
                     }
                 },
                 "source-map": {
@@ -12802,6 +12993,14 @@
                         "js-base64": "^2.1.9",
                         "source-map": "^0.5.6",
                         "supports-color": "^3.2.3"
+                    },
+                    "dependencies": {
+                        "js-base64": {
+                            "version": "2.6.4",
+                            "resolved": "https://registry.nlark.com/js-base64/download/js-base64-2.6.4.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fjs-base64%2Fdownload%2Fjs-base64-2.6.4.tgz",
+                            "integrity": "sha1-9OaGxd4eofhn28rT1G2WlCjfmMQ=",
+                            "dev": true
+                        }
                     }
                 },
                 "source-map": {
@@ -12875,6 +13074,14 @@
                         "js-base64": "^2.1.9",
                         "source-map": "^0.5.6",
                         "supports-color": "^3.2.3"
+                    },
+                    "dependencies": {
+                        "js-base64": {
+                            "version": "2.6.4",
+                            "resolved": "https://registry.nlark.com/js-base64/download/js-base64-2.6.4.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fjs-base64%2Fdownload%2Fjs-base64-2.6.4.tgz",
+                            "integrity": "sha1-9OaGxd4eofhn28rT1G2WlCjfmMQ=",
+                            "dev": true
+                        }
                     }
                 },
                 "source-map": {
@@ -12967,6 +13174,14 @@
                         "js-base64": "^2.1.9",
                         "source-map": "^0.5.6",
                         "supports-color": "^3.2.3"
+                    },
+                    "dependencies": {
+                        "js-base64": {
+                            "version": "2.6.4",
+                            "resolved": "https://registry.nlark.com/js-base64/download/js-base64-2.6.4.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fjs-base64%2Fdownload%2Fjs-base64-2.6.4.tgz",
+                            "integrity": "sha1-9OaGxd4eofhn28rT1G2WlCjfmMQ=",
+                            "dev": true
+                        }
                     }
                 },
                 "source-map": {
@@ -13979,6 +14194,12 @@
                 "source-map": "^0.4.2"
             },
             "dependencies": {
+                "js-base64": {
+                    "version": "2.6.4",
+                    "resolved": "https://registry.nlark.com/js-base64/download/js-base64-2.6.4.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fjs-base64%2Fdownload%2Fjs-base64-2.6.4.tgz",
+                    "integrity": "sha1-9OaGxd4eofhn28rT1G2WlCjfmMQ=",
+                    "dev": true
+                },
                 "source-map": {
                     "version": "0.4.4",
                     "resolved": "https://registry.nlark.com/source-map/download/source-map-0.4.4.tgz",

package.json

@@ -1,6 +1,6 @@
 {
     "name": "vue-demo",
-    "version": "1.0.0",
+    "version": "v1.0.6",
     "private": true,
     "description": "h5SDK",
     "author": "",
@@ -18,6 +18,7 @@
         "clipboard": "^2.0.6",
         "crypto-js": "^4.0.0",
         "es6-promise": "^4.2.8",
+        "js-base64": "^3.6.1",
         "js-md5": "^0.7.3",
         "jwt-decode": "^3.1.2",
         "mobile-detect": "^1.4.4",

src/App.vue

@@ -2,6 +2,7 @@
   <div id="app">
     <MenuService v-if="showServiceInline" />
     <router-view />
+    <div class="version">{{ $packageJson.version }}</div>
   </div>
 </template>
 
@@ -141,7 +142,6 @@ export default {
       const { appid } = this;
       const returnUrlLeft =
         window.location.origin + window.location.pathname + "#/counter?";
-      const allQuery = this.$utils.getAllQueryString();
       // 2. 将需要的参数拼接
       const queryString = this.$utils.queryStringUtil({
         amount,
@@ -237,7 +237,9 @@ export default {
       const _payUrl = `${this.$CONFIG.redirectUrl}${encodeURIComponent(
         payUrl
       )}`;
-      const savedata = decodeURIComponent(this.$utils.getQueryString("data"));
+      const savedata = encodeURIComponent(this.$utils.getQueryString("data"));
+      // 跳转loading
+      this.routeLink("Loading");
       window.location.href = `${
         this.$CONFIG.wcfmlPayUrl
       }?data=${savedata}&jump=${encodeURIComponent(_payUrl)}`;
@@ -318,6 +320,13 @@ export default {
   //   color: #eee;
   color: #555555;
   font-size: 28 / @rem;
+
+  .version {
+    position: fixed;
+    bottom: 20 / @rem;
+    right: 20 / @rem;
+    color: #555555;
+  }
 }
 /**横屏 */
 @media screen and (orientation: landscape),

src/components/Inner/Back.vue

@@ -19,7 +19,8 @@ export default {
   methods: {
     // 关闭
     back() {
-      window.location.href = `${this.$CONFIG.wcfmlCloseUrl}?uid=&data=`;
+      this.$utils.closePage("");
+      //   window.location.href = `${this.$CONFIG.wcfmlCloseUrl}?uid=&data=`;
     },
   },
 };

src/main.js

@@ -12,8 +12,10 @@ import "./plugins/nutui";
 import "./assets/font/iconfont.css";
 import Clipboard from "clipboard";
 import CONFIG from "./config"
+import packageJson from '../package.json'
 
 Vue.prototype.$utils = utils;
+Vue.prototype.$packageJson = packageJson;
 Vue.prototype.$CONFIG = CONFIG;
 Vue.prototype.$api = api;
 Vue.prototype.$clipboard = Clipboard

src/router/index.js

@@ -67,6 +67,18 @@ const router = new Router({
             // }
         },
 
+        // loading
+        {
+            path: '/loading',
+            name: 'Loading',
+            component: () =>
+                import ("@/views/Loading/Loading"),
+            // meta: {
+            //     isLogin: true
+            // }
+        },
+
+
         // // 红包活动
         // {
         //     path: '/activity_hb',

src/utils/utils.js

@@ -1,6 +1,7 @@
 import querystring from "querystring"
 import _this from "../main"
 import $CONFIG from "../config"
+import { Base64 } from "js-base64"
 var CryptoJS = require('crypto-js');
 var Md5 = require("js-md5");
 
@@ -285,7 +286,10 @@ const utils = {
         const platform = this.getQueryString("platform");
         // 忘川伏魔录
         if (platform == "wcfml") {
-            let data = JSON.parse(decodeURI(decodeURIComponent(this.getQueryString('data')))) || {}
+            // 解密 data
+            const urlData = this.getQueryString('data')
+            const decodeUrlData = decodeURIComponent(this.base64Decode(urlData));
+            let data = urlData ? JSON.parse(decodeUrlData) : {}
             return localStorage.getItem(keyName) || data[keyName];
         }
     },
@@ -297,10 +301,12 @@ const utils = {
         if (platform == "wcfml") {
             localStorage.setItem(keyName, value);
             const query = this.getAllQueryString();
-            let data = decodeURI(decodeURIComponent(query.data));
-            query.data = data ? JSON.parse(data) : {}
+            let data = decodeURIComponent(query.data);
+            const dataUrl = decodeURIComponent(this.base64Decode(data))
+            query.data = data ? JSON.parse(dataUrl) : {}
             query.data[keyName] = value;
-            query.data = JSON.stringify(query.data)
+            // 加密传递给wcfml
+            query.data = this.base64Encode(JSON.stringify(query.data))
             this.routeLink("", query, "", _this)
             return
         }
@@ -360,8 +366,10 @@ const utils = {
     closePage(uid) {
         // 忘川伏魔录
         const platform = this.getQueryString("platform");
-        const data = this.getQueryString("data");
+        const data = encodeURIComponent(this.getQueryString("data"));
         if (platform == "wcfml") {
+            // 跳转loading
+            this.routeLink("Loading");
             window.location.href = `${$CONFIG.wcfmlCloseUrl}?uid=${uid}&data=${data}`
             return
         }
@@ -386,6 +394,9 @@ const utils = {
             uid: data.uid,
             data: encodeURIComponent(savedata),
         });
+        // 跳转loading
+        this.routeLink("Loading");
+
         window.location.href = `${$CONFIG.wcfmlLoginUrl}?${query}`;
     },
 
@@ -411,5 +422,17 @@ const utils = {
             second
         }
     },
+
+    // base64 加密
+    base64Encode(string) {
+        const str = encodeURIComponent(string)
+        return Base64.encode(str)
+    },
+
+    // 解密
+    base64Decode(string) {
+        const str = decodeURIComponent(string)
+        return Base64.decode(str)
+    }
 };
 export default utils;

src/views/GamePay/GamePay.vue

@@ -83,7 +83,14 @@ export default {
 
     // 关闭当前支付
     closePage() {
-      this.$utils.closePage(this.userInfo.uid);
+      const { showGameInner } = this;
+      // 当前支付
+      if (!showGameInner) {
+        this.$utils.closePage(this.userInfo.uid);
+        return;
+      }
+      // 其他
+      this.close();
     },
   },
 };

src/views/GamePay/GamePayH5.vue

@@ -150,7 +150,7 @@ export default {
         extra,
       }).then(() => {
         this.canPay = true;
-        this.back();
+        // this.back();
       });
     },
 

src/views/Loading/Loading.vue

@@ -0,0 +1,43 @@
+<template>
+  <!-- 所有跳转游戏方之后都跳转到这里来 -->
+  <div class="loading inner_box" @click="close">
+    <img src="@/assets/image/loading.gif" alt="" />
+  </div>
+</template>
+
+<script>
+import { mapState } from "vuex";
+export default {
+  name: "Loading",
+  components: {},
+  data() {
+    return {};
+  },
+  computed: {
+    ...mapState(["userInfo"]),
+  },
+  watch: {},
+  created() {},
+  mounted() {},
+  methods: {
+    // 关闭
+    close() {
+      this.$utils.closePage(this.userInfo);
+    },
+  },
+};
+</script>
+
+<style lang='less' scoped>
+.loading {
+  img {
+    width: 200 / @rem;
+    height: 200 / @rem;
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    margin-left: -100 / @rem;
+    margin-top: -100 / @rem;
+  }
+}
+</style>

src/views/Login/LoginBox.vue

@@ -117,14 +117,7 @@ export default {
       //   this.routeLink("ActivityHb");
 
       // 需要保存的数据
-      const savedata = decodeURIComponent(this.$utils.getQueryString("data"));
-      // 跳转对应登录链接
-      const query = this.$utils.queryStringUtil({
-        uid: data.uid,
-        data: encodeURIComponent(savedata),
-      });
-      // window.open(`${this.$CONFIG.wcfmlLoginUrl}?${query}`);  这个没法
-      window.location.href = `${this.$CONFIG.wcfmlLoginUrl}?${query}`;
+      this.$utils.wcfmlLoginUtils(data);
     },
   },
 };

src/views/Visitor/Visitor.vue

@@ -82,17 +82,10 @@ export default {
         if (platform === "wcfml") {
           // 跳转对应登录链接
           const { userInfo } = this.$route.params;
-          const data = this.$utils.getQueryString("data");
-          const query = this.$utils.queryStringUtil({
-            uid: userInfo.uid,
-            data: encodeURIComponent(data),
-          });
-
           // 1. 返回登录页, 因为游戏内点击返回是返回到原来的url
           this.routeLink("Login");
-
           // 2. 调用wcfml的登录
-          window.location.href = `${this.$CONFIG.wcfmlLoginUrl}?${query}`;
+          this.$utils.wcfmlLoginUtils(userInfo);
         }
       });
     },