Merge branch 'master' into test6.9.11

# Conflicts:
#	web/src/main/webapp/ueditor/dialogs/yohoLink/yohoLink.html

@@ -121,7 +121,6 @@
             }
             }
             return url;
             return url;
         }
         }
-
         function handleDialogOk(){
         function handleDialogOk(){
             var href =$G('href').value.replace(/^\s+|\s+$/g, '');
             var href =$G('href').value.replace(/^\s+|\s+$/g, '');
             if (!domainValidate(href)) {
             if (!domainValidate(href)) {
@@ -202,7 +201,7 @@
             }
             }
 
 
             else if (action == "go.productDetail") {
             else if (action == "go.productDetail") {
-                params.params = {product_skn: href.match(/product\/(\d+).html/)[1]}
+                params.params =  hrefParams;
             }
             }
             else if (action == "go.shop") {
             else if (action == "go.shop") {
                 params.params = {
                 params.params = {