diff --git a/client/js/basegoods/batch.js b/client/js/basegoods/batch.js
index a7bea2c..f716235 100644
--- a/client/js/basegoods/batch.js
+++ b/client/js/basegoods/batch.js
@@ -77,3 +77,19 @@ $(document).on("change","#brandId",function(){
     }
 });
 
+
+function __ajaxExeclById(unquid){
+    var fn=arguments.callee;
+    common.util.__ajax({
+        url:'',
+        data:{unquid:unquid}
+    },function(res){
+        if(res.data){
+            $("#message").html('');
+            //成功操作
+
+        }else{
+            fn.call(null,unquid);
+        }
+    });
+}
diff --git a/client/js/basegoods/edit.js b/client/js/basegoods/edit.js
index 32a19e4..212fdf7 100644
--- a/client/js/basegoods/edit.js
+++ b/client/js/basegoods/edit.js
@@ -530,8 +530,13 @@ e.on("validate",function(){
 
 
 $(document).on("click","#btnReview",function(){
+	$("#btnReview").prop("disabled",true);
+
 	if(e.validate()){
 		common.dialog.confirm("温馨提示","<p>你确定提交吗？</p>",function(){
+			setTimeout(function(){
+				$("#btnReview").prop("disabled",false);
+			},3000);
 			e.submit($("#basicForm").attr("action"),function(option){
 				var select=tabTree.getAddress();
 
diff --git a/server/config/common.js b/server/config/common.js
index 01c8679..e82f4fe 100644
--- a/server/config/common.js
+++ b/server/config/common.js
@@ -17,13 +17,13 @@ var config = {
         // domain:'http://172.16.6.240:8088/platform',//   王书生
         // domain: 'http://172.16.6.124:8088/platform',//陈超
         //http://172.16.6.124:8088/platform/product/queryAllProductAttr
-        domain: 'http://172.16.6.227:8088/platform', //玛丽
+        // domain: 'http://172.16.6.227:8088/platform', //玛丽
         // domain: 'http://192.168.102.202:8088/platform',
         //domain:'http://172.16.6.197:8080/yohobuy-platform-web',//葛超
         // domain: 'http://192.168.102.202:8088/platform',
         // domain: 'http://192.168.102.202:8088/platform',
         //domain:'http://172.16.9.8:8080/yohobuy-platform-web',//葛超
-        // domain: 'http://192.168.102.202:8088/platform',
+        domain: 'http://192.168.102.202:8088/platform',
         //domain: 'http://172.16.6.239:8080', //孙杰翔
         loggers: {
             api: {
diff --git a/server/interface/guang.js b/server/interface/guang.js
index 0c09e8a..360b7f3 100644
--- a/server/interface/guang.js
+++ b/server/interface/guang.js
@@ -520,9 +520,13 @@ exports.res = [
         params: [
             {name: 'status', type: 'Number'},
         ]
-
     },
-
+    {
+        route:'/guang/article/contentEdit',
+        method:'GET',
+        view:'pages/guang/contentEdit',
+        src:'/guang/contentEdit'
+    }
 ];
 
 
diff --git a/server/stub/config/login.js b/server/stub/config/login.js
index 4ae6f60..b04a07b 100644
--- a/server/stub/config/login.js
+++ b/server/stub/config/login.js
@@ -75,7 +75,7 @@ module.exports = {
         authService.callLogin(user,password,res);
     },
     '/ajax/upload':function(req,res){
-        uploader.uploadFile(req,res);
+         uploader.uploadFile(req,res);
     },
     '/ajax/down':function(req,res){
         down.downFile(req,res);
diff --git a/server/stub/service/upload.js b/server/stub/service/upload.js
index 9acd0a7..fdf043d 100644
--- a/server/stub/service/upload.js
+++ b/server/stub/service/upload.js
@@ -51,9 +51,13 @@ exports.uploadFile = function(req, res) {
                 headers: headers,
                 timeout: 300000
             }, function optionalCallback(error, httpResponse, body) {
+                if (error) {
+                    return console.error('upload failed:', error);
+                }
                 if (!error && httpResponse.statusCode == 200) {
                     var json = JSON.parse(body);
                     json.status = true;
+                    // console.log(json);
                     res.json(json);
                 } else {
                     res.json(errBackMsg);