Merge branch 'developer' of https://gitlab.com/Arisono/SkWeiChat-Baidu into developer

WeiChat/src/main/java/com/xzjmyk/pm/activity/CaptureResultActivity.java

@@ -13,6 +13,7 @@ import android.webkit.WebView;
 import android.webkit.WebViewClient;
 
 import com.alibaba.fastjson.JSON;
+import com.common.LogUtil;
 import com.common.data.JSONUtil;
 import com.common.data.StringUtil;
 import com.common.file.DownloadUtil;
@@ -163,9 +164,12 @@ public class CaptureResultActivity extends Activity {
 //        url = "http://192.168.253.63:8080/ERP/"+"common/checkQrcodeScan.action";
         String em_code = CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_username");
         String sob = CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_master");
+        String password = CommonUtil.getSharedPreferences(MyApplication.getInstance(), "user_password");
         Intent intent_web = new Intent("com.modular.main.WebViewCommActivity");
-        intent_web.putExtra("url",url + "?em_code=" + em_code + "&sob=" + sob + "&clientId=" + clientId);
-        intent_web.putExtra("title", "UAS网页登录");
+        url = url + "?em_code=" + em_code + "&sob=" + sob + "&clientId=" + clientId + "&password=" + password;
+        intent_web.putExtra("url",url);
+        LogUtil.i("flh",url);
+        intent_web.putExtra("title", "扫码登录");
         intent_web.putExtra("cookie", true);
         startActivity(intent_web);
         finish();