Merge branch 'dev_2.2' into test

@@ -28,7 +28,7 @@ module.exports={
             title: "获得单个变价详情",
             title: "获得单个变价详情",
             url: "/product/getProductPrice",
             url: "/product/getProductPrice",
             params: [
             params: [
-                {name: 'param',type: 'Number'}
+                {name: 'product_skn',type: 'Number'}
             ]
             ]
         },
         },
         updateProductPrice:{
         updateProductPrice:{

@@ -49,7 +49,7 @@
 
 
 <div class="footpanel" style="text-align: center;">
 <div class="footpanel" style="text-align: center;">
     <a id="saveAllInfo" href="javascript:;" class="btn btn-primary btn-lg">保存</a>
     <a id="saveAllInfo" href="javascript:;" class="btn btn-primary btn-lg">保存</a>
-    <a id="backBtn" href="javascript:;" onclick="history.go(-1)" class="btn btn-default btn-lg">返回</a>
+    <a id="backBtn" href="javascript:;" onclick="history.go(-1)" class="btn btn-default btn-lg">取消</a>
 </div>
 </div>
 
 
 <div class="floatnav">
 <div class="floatnav">

@@ -158,7 +158,7 @@ $(document).on('click', '.modify-btn', function() {
 
 
         common.util.__ajax({
         common.util.__ajax({
             url:'/product/getProductPrice',
             url:'/product/getProductPrice',
-            data: {param: skn}
+            data: {product_skn: skn}
         },function(rs){
         },function(rs){
             var data = rs.data;
             var data = rs.data;
             parentTr.next('.product-detail').html($(common.util.__template($("#template").html(), data)));
             parentTr.next('.product-detail').html($(common.util.__template($("#template").html(), data)));