提交

weiqingting
Commit 73ea83ab5b03166e090e534ff83b32051968c125 1 parent 31017dcb
Showing 4 changed files with 4 additions and 8 deletions
code/apps/common/interfaces/login.js
code/static/js.jquery/module/goods/price.Change.js
server/interfaces/common.login.js
server/libs/Interfacer.js
--- a/code/apps/common/interfaces/login.js
View file @73ea83a
+++ b/code/apps/common/interfaces/login.js
View file @73ea83a
@@ -86,9 +86,10 @@ module.exports = {
             var errcallback = function (err) { 
                 return callback(err, result);
             }
+            //promise.all(Ilogin,allRight,sessionAsync).then(a,b,c);
+
             common.Ilogin(user, password).allRight().sessionAsync(user, password).done(function (IloginRes,allRes,sesRes) {
                 var userData = IloginRes.data, cookie = sesRes.caseless.dict["set-cookie"];
-                
                 userInfo = { auth: userData, uid: userData.pid, name: userData.truename, right: {},shopList:[]};
                 allRes.data.forEach(function (data) {
                     if (data.platform_id == Iaccount.WEBSITE) {
--- a/code/static/js.jquery/module/goods/price.Change.js
View file @73ea83a
+++ b/code/static/js.jquery/module/goods/price.Change.js
View file @73ea83a
@@ -387,11 +387,6 @@ var p = new common.grid({
             return newPriceHtml + '<p style="color: #ccc;">' + item.oldProductPriceBo.vip2_price + '</p>';
         }
     }, {
-        display: '返币金额',
-        render: function(item) {
-            return item.newProductPriceBo.return_coin + '<p style="color: #ccc;">' + item.oldProductPriceBo.return_coin + '</p>';
-        }
-    }, {
         display: '操作',
         render: function(item) {
             return '<a class="btn btn-info delete-btn" data-index="' + item.__index + '" href="javascript:;">删除</a>';
--- a/server/interfaces/common.login.js
View file @73ea83a
+++ b/server/interfaces/common.login.js
View file @73ea83a
@@ -86,9 +86,10 @@ module.exports = {
             var errcallback = function (err) { 
                 return callback(err, result);
             }
+            //promise.all(Ilogin,allRight,sessionAsync).then(a,b,c);
+
             common.Ilogin(user, password).allRight().sessionAsync(user, password).done(function (IloginRes,allRes,sesRes) {
                 var userData = IloginRes.data, cookie = sesRes.caseless.dict["set-cookie"];
-                
                 userInfo = { auth: userData, uid: userData.pid, name: userData.truename, right: {},shopList:[]};
                 allRes.data.forEach(function (data) {
                     if (data.platform_id == Iaccount.WEBSITE) {
--- a/server/libs/Interfacer.js
View file @73ea83a
+++ b/server/libs/Interfacer.js
View file @73ea83a
@@ -386,5 +386,4 @@ function __sendRequest(options, success, fail,wlen,i,args) {
     });
 }
-
 module.exports = Interfacer;