Merge branch 'master' of http://47.100.37.243:10080/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/WeiXinCorpController.java

@@ -2801,7 +2801,7 @@ public class WeiXinCorpController {
                 }
                 wxOrder.setEditionId(orderDetail.getString("edition_id"));
                 wxOrder.setEditionName(orderDetail.getString("edition_name"));
-                wxOrder.setPrice(orderDetail.getInteger("price"));
+                wxOrder.setPrice(orderDetail.getDouble("price"));
                 wxOrder.setUserCount(orderDetail.getInteger("user_count"));
                 wxOrder.setOrderPeriod(orderDetail.getInteger("order_period"));
                 LocalDateTime order_time =LocalDateTime.ofEpochSecond(orderDetail.getLong("order_time"),0,ZoneOffset.ofHours(8));
@@ -2820,9 +2820,9 @@ public class WeiXinCorpController {
                 }
                 wxOrder.setOrderFrom(orderDetail.getInteger("order_from"));
                 wxOrder.setOperatorCorpid(orderDetail.getString("operator_corpid"));
-                wxOrder.setServiceShareAmount(orderDetail.getInteger("service_share_amount"));
-                wxOrder.setPlatformShareAmount(orderDetail.getInteger("platform_share_amount"));
-                wxOrder.setDealerShareAmount(orderDetail.getInteger("dealer_share_amount"));
+                wxOrder.setServiceShareAmount(orderDetail.getString("service_share_amount"));
+                wxOrder.setPlatformShareAmount(orderDetail.getString("platform_share_amount"));
+                wxOrder.setDealerShareAmount(orderDetail.getString("dealer_share_amount"));
                 if (orderDetail.containsKey("dealer_corp_info")){
                     JSONObject dealer_corp_info = orderDetail.getJSONObject("dealer_corp_info");
                     wxOrder.setDealerCorpid(dealer_corp_info.getString("corpid"));

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/util/MessageUtils.java

@@ -4,6 +4,8 @@ package com.management.platform.util;
 import org.springframework.context.MessageSource;
 import org.springframework.context.i18n.LocaleContextHolder;
 
+import java.util.Locale;
+
 /**
  * 获取i18n资源文件
  *
@@ -18,7 +20,9 @@ public class MessageUtils {
      */
     public static String message(String code, Object... args) {
         MessageSource messageSource = SpringUtils.getBean(MessageSource.class);
-        return messageSource.getMessage(code, args, LocaleContextHolder.getLocale());
+        Locale locale = LocaleContextHolder.getLocale();
+//        System.out.println("本地为:" +locale.getDisplayName()+", code="+code);
+        return messageSource.getMessage(code, args, locale);
     }
 
 }

fhKeeper/formulahousekeeper/timesheet_h5/src/components/Footer.vue

@@ -1,30 +1,32 @@
 <template>
-    <ul class="footer flex jc-sa w100pc fixed bott0 bg-fff aic footer">
-        <li class="item">
-            <router-link to="/index" class="flex2 aic f20 yellow" active-class="active">
-                <i class="icon-home iconfont f18 text"></i>
-                <p class="mt-5 f12 text">首页</p>
-            </router-link>
-        </li>
-        <li class="item" v-if="reportsCompany || this.user.manageDeptId != 0 || reportsDept">
-            <router-link to="/count" class="flex2 aic f20 text" active-class="active">
-                <van-icon class="text" name="bar-chart-o" />
-                <p class="mt-5 text f12">填报统计</p>
-            </router-link>
-        </li>
-        <li class="item" v-if="cost">
-            <router-link to="/cost" class="flex2 aic f20 text" active-class="active">
-                <van-icon class="text" name="after-sale" />
-                <p class="mt-5 text f12">成本统计</p>
-            </router-link>
-        </li>
-        <li class="item">
-            <router-link to="/my" class="flex2 aic f20 text" active-class="active">
-                <van-icon class="text" name="user-o"></van-icon>
-                <p class="mt-5 text f12">我的</p>
-            </router-link>
-        </li>
-  </ul>
+    <div>
+        <ul class="footer flex jc-sa w100pc fixed bott0 bg-fff aic footer">
+            <li class="item">
+                <router-link to="/index" class="flex2 aic f20 yellow" active-class="active">
+                    <i class="icon-home iconfont f18 text"></i>
+                    <p class="mt-5 f12 text">首页</p>
+                </router-link>
+            </li>
+            <li class="item" v-if="reportsCompany || this.user.manageDeptId != 0 || reportsDept">
+                <router-link to="/count" class="flex2 aic f20 text" active-class="active">
+                    <van-icon class="text" name="bar-chart-o" />
+                    <p class="mt-5 text f12">填报统计</p>
+                </router-link>
+            </li>
+            <li class="item" v-if="cost">
+                <router-link to="/cost" class="flex2 aic f20 text" active-class="active">
+                    <van-icon class="text" name="after-sale" />
+                    <p class="mt-5 text f12">成本统计</p>
+                </router-link>
+            </li>
+            <li class="item">
+                <router-link to="/my" class="flex2 aic f20 text" active-class="active">
+                    <van-icon class="text" name="user-o"></van-icon>
+                    <p class="mt-5 text f12">我的</p>
+                </router-link>
+            </li>
+    </ul>
+  </div>
 </template>
 
 <script>
@@ -38,23 +40,29 @@
             }
         },
         mounted() {
-            this.reportsCompany = false
-            this.reportsDept = false
-            this.cost = false
-            for(let i in this.user.functionList){
-                if(this.user.functionList[i].name == '查看全公司工时'){
-                    this.reportsCompany = true
-                }
-                if(this.user.functionList[i].name == '查看本部门工时'){
-                    this.reportsDept = true
+            this.dealWith()
+        },
+        methods: {
+            dealWith() {
+                this.user = JSON.parse(localStorage.userInfo)
+                this.reportsCompany = false
+                this.reportsDept = false
+                this.cost = false
+                for(let i in this.user.functionList){
+                    if(this.user.functionList[i].name == '查看全公司工时'){
+                        this.reportsCompany = true
+                    }
+                    if(this.user.functionList[i].name == '查看本部门工时'){
+                        this.reportsDept = true
+                    }
                 }
-            }
-            for(let i in this.user.moduleList){
-                if(this.user.moduleList[i].name == '工时成本统计'){
-                    this.cost = true
+                for(let i in this.user.moduleList){
+                    if(this.user.moduleList[i].name == '工时成本统计'){
+                        this.cost = true
+                    }
                 }
             }
-        },
+        }
     };
 </script>
 
@@ -65,7 +73,8 @@
         position: fixed;
         bottom: 0;
         width: 100%;
-        bottom: 0;
+        left: 0;
+        z-index: 10;
         .text {
             color: #797d82;
         }

fhKeeper/formulahousekeeper/timesheet_h5/src/views/index/index.vue

@@ -18,7 +18,7 @@
             体验报表统计等更多功能，尽在PC端<br>
             网页用户访问http://worktime.ttkuaiban.com，钉钉用户直接从钉钉PC端进入工时管家
         </div>
-        <Footer page="index"></Footer>
+        <Footer ref="child" :key="key"></Footer>
     </div>
 </template>
 <script>
@@ -37,6 +37,7 @@
                     // require('../../assets/img/index/banner_3.png'),
                 ],
                 routers: [],
+                key: 0
             };
         },
         created() {
@@ -210,8 +211,6 @@
                     userId = loginUserId
                 }
                 if(window.location.href.indexOf('errorMsg') != '-1') {
-                    let err = window.location.href.split('errorMsg=')[1]
-                    let str = err.split('#/')[0]
                     this.$router.push("/login");
                 }
                 this.$axios.get('/user/loginByUserId', {params:{userId: userId}})
@@ -224,8 +223,11 @@
                     } else {
                         localStorage.userInfo = JSON.stringify(res.data);
                         this.user = res.data;
+                        this.$refs.child.dealWith()
+                        this.key++
                         this.getModule()
                         this.getMessage();
+                        this.$forceUpdate()
                         // this.bindIfNessary();
                     } 
                 }).catch(err=> {

fhKeeper/formulahousekeeper/timesheet_h5/src/views/project/edit.vue

@@ -408,7 +408,8 @@ export default {
             .then(res => {
                 if(res.code == "ok") {
                     this.levelList = res.data
-                    this.projectDetail.levelLabel = this.levelList.filter(u => u.id == this.projectDetail.level)[0].label
+                    let list = this.levelList.filter(u => u.id == this.projectDetail.level)
+                    this.projectDetail.levelLabel = list.length != 0 ? list[0].label : ''
                 } else {
                     this.$toast.fail('获取失败');
                 }

fhKeeper/formulahousekeeper/timesheet_h5/src/views/task/index.vue

@@ -231,7 +231,9 @@ export default {
                     this.upLoading = false
                     if(this.listReLoading){
                         this.taskList = res.data.records
-                        document.documentElement.scrollTop = 0
+                        if(document.documentElement){
+                            document.documentElement.scrollTop = 0
+                        }
                     }else{
                         for(let i in res.data.records){
                             this.taskList.push(res.data.records[i])