Merge branch 'dev' of hlm/hlm_pl_mall into master

plugins/payments/wxpay_jsapi/wxpay_jsapi.php

@@ -51,7 +51,7 @@ class wxpay_jsapi {
         } elseif ($order_info['order_type'] == 'pd_order') {
             $url = config('ds_config.h5_site_url').'/pages/member/recharge/RechargeList';
         } elseif ($order_info['order_type'] == 'sj_order') {
-            $url = config('ds_config.h5_site_url').'/pages/seller/index/Index';
+            $url = config('ds_config.h5_site_url').'/pages/member/index/Index';
         }