Merge branch 'master' into plus

app/Http/Controllers/APIs/V2/PurchaseController.php

@@ -22,7 +22,7 @@
 
 use Illuminate\Http\Request;
 use Zhiyi\Plus\Models\PaidNode as PaidNodeModel;
-// use Zhiyi\Plus\Http\Middleware\VerifyUserPassword;
+use Zhiyi\Plus\Http\Middleware\VerifyUserPassword;
 use Zhiyi\Plus\Models\WalletCharge as WalletChargeModel;
 use Illuminate\Contracts\Cache\Repository as CacheContract;
 use Zhiyi\Plus\Packages\Currency\Processes\User as UserProcess;
@@ -35,9 +35,9 @@ class PurchaseController extends Controller
      */
     public function __construct()
     {
-        // $this
-        //     ->middleware(VerifyUserPassword::class)
-        //     ->only(['pay', 'payByCurrency']);
+        $this
+            ->middleware(VerifyUserPassword::class)
+            ->only(['pay', 'payByCurrency']);
     }
 
     /**

packages/slimkit-plus-feed/assets/mix-manifest.json

@@ -1,3 +1,3 @@
 {
-  "/admin.js": "/admin.1be0fdcf.js"
+  "/admin.js": "/admin.js"
 }

packages/slimkit-plus-feed/webpack.config.babel.js

@@ -111,7 +111,7 @@ const webpackConfig = {
 
   output: {
     path: outPath,
-    filename: !isProd ? '[name].js' : '[name].[hash:8].js'
+    filename: !isProd ? '[name].js' : '[name].js'
   },
 
   /*

packages/slimkit-plus-news/resource/assets/mix-manifest.json

@@ -1,6 +1,6 @@
 {
-  "/js/vendor.js": "/js/33bab093f0a0559968bc.js",
-  "/js/index.js": "/js/7b334df94bb380807655.js",
-  "/css/index.css": "/css/7b334df94bb380807655.css",
-  "/js/manifest.js": "/js/33de36bc66a2ff996ba3.js"
+  "/js/vendor.js": "/js/vendor.js",
+  "/js/index.js": "/js/index.js",
+  "/css/index.css": "/css/index.css",
+  "/js/manifest.js": "/js/manifest.js"
 }

packages/slimkit-plus-news/webpack.config.babel.js

@@ -104,7 +104,7 @@ const webpackConfig = {
     output: {
         path: BuildRoot,
         publicPath: '../',
-        filename: isProd ? 'js/[chunkhash].js' : 'js/[name].js',
+        filename: isProd ? 'js/[name].js' : 'js/[name].js',
     },
     resolve: {
         extensions: ['.js', '.vue', '.json'],
@@ -142,15 +142,15 @@ const webpackConfig = {
                 loader: 'url-loader',
                 query: {
                     limit: 10000,
-                    name: isProd ? 'images/[hash].[ext]' : `images/[name].[ext]`
+                    name: isProd ? 'images/[name].[ext]' : `images/[name].[ext]`
                 }
             },
             {
                 test: /\.(woff2?|eot|ttf|otf)(\?.*)?$/,
                 loader: 'url-loader',
                 query: {
                     limit: 10000,
-                    name: isProd ? 'fonts/[hash].[ext]' : `fonts/[name].[ext]`
+                    name: isProd ? 'fonts/[name].[ext]' : `fonts/[name].[ext]`
                 }
             }
         ]
@@ -163,7 +163,7 @@ const webpackConfig = {
         }),
         // extract css into its own file
         new ExtractTextPlugin({
-            filename: isProd ? 'css/[chunkhash].css' : 'css/[name].css'
+            filename: isProd ? 'css/[name].css' : 'css/[name].css'
         }),
 
         // split vendor js into its own file

resources/assets/admin/component/user/Register.vue

@@ -25,12 +25,12 @@
 							    <label class="radio-inline">
 							    	<input type="radio" name="type" checked="checked" value="all" v-model="type" /> 开放注册
 							    </label>
-									<!-- <label class="radio-inline">
+									<label class="radio-inline">
 							    	<input type="radio" name="type" disabled="disabled" value="invited" v-model="type" /> 仅邀请注册
-							    </label> -->
-<!-- 							    <label class="radio-inline">
+							    </label>
+							    <label class="radio-inline">
 							    	<input type="radio" name="type" disabled="disabled" value="thirdPart" v-model="type" /> 仅第三方绑定
-							    </label> -->
+							    </label>
 							</div>
 						</div>
 				      </div>
@@ -50,7 +50,7 @@
 								    	<input type="radio" name="method" value="mail-only" v-model="method" /> 仅邮箱
 								    </label>
 								    <label class="radio-inline">
-								    	<input type="radio" name="method" value="all" v-model="method" /> 手机和邮箱
+								    	<input type="radio" name="method" value="all" v-model="method" /> 手机或邮箱或第三方
 								    </label>
 								</div>
 							</div>