Merge branch 'master' of git.oschina.net:yiguanjia/php

www/webapp/housekeeping/src/components/houseKeeping/edit.vue

@@ -377,7 +377,7 @@ export default {
               this.worksType.arrStr += `${this.worksType.arr[i].label} `;
             }
           }
-          console.log(this.worksType.arr);
+          // console.log(this.worksType.arr);
           // 技能
           if (this.skills.numberArr != null) {
             this.skills.arr = this.uSort(this.skills.numberArr, 1);
@@ -409,7 +409,7 @@ export default {
         }
 
         // 答题次数
-        console.log(self.uInfo.degree);
+        // console.log(self.uInfo.degree);
         if (self.uInfo.degree === 0) {
           self.Answer.whether = false;
         }
@@ -432,14 +432,14 @@ export default {
     },
     workTypePartF(list) {
       let self = this;
-      console.log(list);
-      for (let i = 0; i < list.length; i++) {
-        console.log(`start:${list[i].start}--end:${list[i].end}`);
-      }
+      // console.log(list);
+      // for (let i = 0; i < list.length; i++) {
+      //   console.log(`start:${list[i].start}--end:${list[i].end}`);
+      // }
       self.partTimeWorkersShow();
       self.partTimeWorkers.arr = [];
       self.partTimeWorkers.arr = list;
-      console.log(self.partTimeWorkers.arr);
+      // console.log(self.partTimeWorkers.arr);
       self.partTimeWorkers.arrStr = self.str(self.partTimeWorkers.arr);
     },
     // 提交
@@ -845,9 +845,9 @@ export default {
         onConfirm() {
           // 积分计算
           let correct = 0;
-          console.log(self.Answer.listSelect);
+          // console.log(self.Answer.listSelect);
           Object.keys(self.Answer.list).forEach(key => {
-            console.log(self.Answer.list[key].correct);
+            // console.log(self.Answer.list[key].correct);
             if (self.Answer.list[key].correct == self.Answer.listSelect[key]) {
               self.Answer.integral += 1;
               correct++;
@@ -866,7 +866,7 @@ export default {
               score: self.Answer.integral,
             },
             function(r) {
-              console.log(r.data.rows);
+              // console.log(r.data.rows);
             }
           );
 
@@ -874,7 +874,7 @@ export default {
           self.uInfo.score =
             Number.parseInt(self.uInfo.score) + self.Answer.integral;
           self.Answer.End = true;
-          console.log(self.Answer.integral);
+          // console.log(self.Answer.integral);
           return;
         },
         onCancel() {},

www/webapp/housekeeping/src/components/management/employee.vue

@@ -348,7 +348,7 @@
                 // 如果结果为空,将不再刷新
                 if (res.data.rows.length == 0) {
                   self.pageNext = false;
-                  self.$refs.scroller.finishPullToRefresh();
+                  // self.$refs.scroller.finishPullToRefresh();
                 }
                 // 如果搜索结果为空,分页设置=>第二页
                 if (self.searchList.length == 0) {
@@ -369,8 +369,8 @@
                 self.filter.show = false;
                 loading.hide();
               } else {
-                self.$refs.scroller.finishPullToRefresh();
-                self.$refs.scroller.finishInfinite(false);
+                // self.$refs.scroller.finishPullToRefresh();
+                // self.$refs.scroller.finishInfinite(false);
               }
             }
           );

www/webapp/housekeeping/src/components/management/homeClerkDetails.vue

@@ -78,6 +78,23 @@
           </div>
         </div>
 
+        <div class="info">
+          <div>
+            <span>积分:</span>
+          </div>
+          <div>{{info.score}}</div>
+        </div>
+
+        <div class="info">
+          <div>
+            <span>排名:</span>
+          </div>
+          <div>
+            <span v-if="isNaN(info.ranking)">{{info.ranking}}</span>
+            <span v-else>第&nbsp;&nbsp;{{info.ranking}}&nbsp;&nbsp;名</span>
+          </div>
+        </div>
+
       </div>
     </div>
 

www/webapp/housekeeping/src/config/globalVariables.js

@@ -45,7 +45,7 @@ if (locationHref.indexOf('80') > -1) {
   // apiPath = 'http://127.0.0.1:3000/cros/?url=http://common.yiguanjia.me/index.php?r=',
   // 张工
   // userId = '59e41443fb48a7552f8b459e'; // 管理员\门店老师
-  // userId = '5acb042a9f5160bc048b6b1b'; // master
+  userId = '5acb042a9f5160bc048b6b1b'; // master
   // userId = '5a603956fb48a70c768b4575'; // test
 
   // 前端
@@ -60,7 +60,7 @@ if (locationHref.indexOf('80') > -1) {
   // userId = '57fe2dc59f5160a1048b4591'  // 未注册
   // 家政人员
   // userId = '57fa51649f5160c4048b4948'; // 我喂自己袋盐
-  userId = '5acd6a449f51607d228b47fc'; // 史国芳
+  // userId = '5acd6a449f51607d228b47fc'; // 史国芳
   // userId = '5acebf789f5160b3048b708c'; // 侯玉翠
   // userId = '5823fe35a84ea0c13e8b461c'; // 我喂自己袋盐2
   /* 真.巾帼家政 */