Merge branch 'igirl-web' of gitlab.gongsibao.com:jiangyong/zhichan into igirl-web

igirl-web/app/base/controller/impl/userCtl.js

@@ -183,6 +183,7 @@ class UserCtl extends CtlBase {
   async loginByMobile(pobj, obj, req) {
   async loginByMobile(pobj, obj, req) {
     const cid = req.companyid;
     const cid = req.companyid;
     obj.u.cid = cid;
     obj.u.cid = cid;
+    var company = await this.companyS.findById(req.companyid);
     var existedUser = await this.service.getUserByMobile(obj.u);
     var existedUser = await this.service.getUserByMobile(obj.u);
     if (existedUser != null) {
     if (existedUser != null) {
       req.session.user = existedUser;
       req.session.user = existedUser;
@@ -192,7 +193,8 @@ class UserCtl extends CtlBase {
         mobile: obj.u.mobile,
         mobile: obj.u.mobile,
         userName: obj.u.mobile,
         userName: obj.u.mobile,
         nickName: obj.u.mobile,
         nickName: obj.u.mobile,
-        company_id: obj.u.cid
+        company_id: obj.u.cid,
+        themename:company.siteTheme
       };
       };
       var result = await this.service.create(params);
       var result = await this.service.create(params);
       req.session.user = result;
       req.session.user = result;

igirl-web/app/base/service/impl/moneyjourneySve.js

@@ -47,7 +47,7 @@ class MoneyJourneyService extends ServiceBase {
         } else {
         } else {
           var b = year + "-" + i;
           var b = year + "-" + i;
         }
         }
-        a.push({ name: b, receive: 0, pay: 0 });
+        a.push({ month: b, receive: 0, pay: 0 });
       }
       }
     } else {
     } else {
       var b = month;
       var b = month;