seam 7 年之前
父节点
当前提交
7af4282ad7

文件差异内容过多而无法显示
+ 0 - 0
www/webapp/housekeeping/home/static/css/app.css


文件差异内容过多而无法显示
+ 0 - 0
www/webapp/housekeeping/home/static/js/app.js


文件差异内容过多而无法显示
+ 0 - 0
www/webapp/housekeeping/home/static/js/app.js.map


文件差异内容过多而无法显示
+ 0 - 0
www/webapp/housekeeping/home/static/js/manifest.js.map


+ 8 - 9
www/webapp/housekeeping/src/components/houseKeeping/edit.vue

@@ -21,8 +21,8 @@
             <!--</div>-->
             <!--</div>-->
             <div v-if="partTimeWorkers.show != true" style="font-size: 14px;">
             <div v-if="partTimeWorkers.show != true" style="font-size: 14px;">
               <span v-if="partTimeWorkers.arrStr[0] != '请'">
               <span v-if="partTimeWorkers.arrStr[0] != '请'">
-              <span  style="margin-right: 5px;font-weight: 100;"
-                     v-for="item in partTimeWorkers.arrStr">{{item}};</span>
+              <span style="margin-right: 5px;font-weight: 100;"
+                    v-for="item in partTimeWorkers.arrStr">{{item}};</span>
               </span>
               </span>
 
 
               <span v-else="partTimeWorkers.arrStr[0] == '请'">请选择时间</span>
               <span v-else="partTimeWorkers.arrStr[0] == '请'">请选择时间</span>
@@ -39,8 +39,7 @@
               <!--内容区域-->
               <!--内容区域-->
               <div class="contents" @click="partTimeWorkers.popup = true">
               <div class="contents" @click="partTimeWorkers.popup = true">
                 <span v-if="partTimeWorkers.arrStr[0] != '请'">
                 <span v-if="partTimeWorkers.arrStr[0] != '请'">
-              <span  style="font-size: 17px;"
-                     v-for="item in partTimeWorkers.arrStr">{{item}};</span>
+              <span v-for="item in partTimeWorkers.arrStr">{{item}};</span>
               </span>
               </span>
 
 
                 <span v-else="partTimeWorkers.arrStr[0] == '请'">请选择时间</span>
                 <span v-else="partTimeWorkers.arrStr[0] == '请'">请选择时间</span>
@@ -119,7 +118,7 @@
                   <span style="min-height: 24px;display: block;" v-if="addressEdit == false"
                   <span style="min-height: 24px;display: block;" v-if="addressEdit == false"
                         v-model="userInfo.address1"
                         v-model="userInfo.address1"
                         @click="addressEdit = true">{{userInfo.address1}}</span>
                         @click="addressEdit = true">{{userInfo.address1}}</span>
-                  <input style="width: 60%; color: #ffb433" v-if="addressEdit" class="weui-input" type="text"
+                  <input style="width: 60%; color: #ffb433;font-weight: bolder" v-if="addressEdit" class="weui-input" type="text"
                          v-model="userInfo.address1"
                          v-model="userInfo.address1"
                          placeholder="请输入您的地址">
                          placeholder="请输入您的地址">
                 </label>
                 </label>
@@ -135,7 +134,7 @@
                     <span style="min-height: 24px;display: block;" v-if="readmeEdit == false"
                     <span style="min-height: 24px;display: block;" v-if="readmeEdit == false"
                           v-model="userInfo.readme"
                           v-model="userInfo.readme"
                           @click="readmeEdit = true">{{userInfo.readme}}</span>
                           @click="readmeEdit = true">{{userInfo.readme}}</span>
-                      <input style="width: 60%;" v-if="readmeEdit" class="weui-input" type="text"
+                      <input style="font-weight: bolder;" v-if="readmeEdit" class="weui-input" type="text"
                              v-model="userInfo.readme"
                              v-model="userInfo.readme"
                              placeholder="请输入您对自己的评价">
                              placeholder="请输入您对自己的评价">
 
 
@@ -347,7 +346,7 @@
       workTypePartF(list) {
       workTypePartF(list) {
         let self = this;
         let self = this;
         console.log(list);
         console.log(list);
-        for( let i=0;i<list.length;i++){
+        for (let i = 0; i < list.length; i++) {
           console.log(`start:${list[i].start}--end:${list[i].end}`);
           console.log(`start:${list[i].start}--end:${list[i].end}`);
         }
         }
         self.partTimeWorkersShow();
         self.partTimeWorkersShow();
@@ -909,7 +908,7 @@
               border: 1px solid #c1c1c1;
               border: 1px solid #c1c1c1;
               border-top: 0;
               border-top: 0;
               border-bottom: 0;
               border-bottom: 0;
-              padding: 5px;
+              padding: 10px 15px;
               label {
               label {
                 /*font-size: 15px;*/
                 /*font-size: 15px;*/
                 /*padding: 5px 0;*/
                 /*padding: 5px 0;*/
@@ -917,7 +916,7 @@
                 /*border-bottom: 1px solid rgba(0, 0, 0, 0.1);*/
                 /*border-bottom: 1px solid rgba(0, 0, 0, 0.1);*/
                 display: flex;
                 display: flex;
                 align-items: center;
                 align-items: center;
-                font-size: .8rem;
+                /*font-size: .8rem;*/
 
 
                 &:last-child {
                 &:last-child {
                   border-bottom: 0;
                   border-bottom: 0;

+ 3 - 0
www/webapp/housekeeping/src/components/public/selectTime.vue

@@ -71,6 +71,7 @@
           for (let j in self.show.arr) {
           for (let j in self.show.arr) {
             if (self.times[i].start >= self.show.arr[j].start && self.times[i].end <= self.show.arr[j].end) {
             if (self.times[i].start >= self.show.arr[j].start && self.times[i].end <= self.show.arr[j].end) {
               self.times[i].color = true
               self.times[i].color = true
+              self.btnTimes.push(self.times[i])
             }
             }
           }
           }
         }
         }
@@ -83,6 +84,7 @@
         item.color = !item.color;
         item.color = !item.color;
         if (item.color) {
         if (item.color) {
           self.btnTimes.push(item);
           self.btnTimes.push(item);
+          console.log(self.btnTimes)
         } else {
         } else {
           let indexOf = self.btnTimes.indexOf(item);
           let indexOf = self.btnTimes.indexOf(item);
           // console.log(indexOf)
           // console.log(indexOf)
@@ -147,6 +149,7 @@
             }
             }
           }
           }
         }
         }
+
         self.workTypePart = work_type_part;
         self.workTypePart = work_type_part;
         // console.log(self.workTypePart)
         // console.log(self.workTypePart)
         self.$emit('workTypePart', self.workTypePart);
         self.$emit('workTypePart', self.workTypePart);

+ 2 - 2
www/webapp/housekeeping/src/config/globalVariables.js

@@ -50,7 +50,7 @@ if (locationHref.indexOf('http://localhost:80') > -1) {
   apiPath = 'http://commontest.yiguanjia.me/index.php?r=';
   apiPath = 'http://commontest.yiguanjia.me/index.php?r=';
   // userId = '57fe2dc59f5160a1048b4591' // 享月会
   // userId = '57fe2dc59f5160a1048b4591' // 享月会
   // userId = '582405cea84ea02e3e8b4611' // 养老院
   // userId = '582405cea84ea02e3e8b4611' // 养老院
-  userId = '59e41443fb48a7552f8b459e'; // 管理员\门店老师
+  // userId = '59e41443fb48a7552f8b459e'; // 管理员\门店老师
   // 张工
   // 张工
   // userId = '582849af9f5160c2048b55dc';
   // userId = '582849af9f5160c2048b55dc';
 
 
@@ -65,7 +65,7 @@ if (locationHref.indexOf('http://localhost:80') > -1) {
   // userId = '5a5eeaf3fb48a770708b456b' // 已注册
   // userId = '5a5eeaf3fb48a770708b456b' // 已注册
   // userId = '5870c935a84ea0417e8b456f'  // 未注册
   // userId = '5870c935a84ea0417e8b456f'  // 未注册
   // 家政人员
   // 家政人员
-  // userId = '57fa51649f5160c4048b4948'; // 我喂自己袋盐
+  userId = '57fa51649f5160c4048b4948'; // 我喂自己袋盐
   // userId = '5823fe35a84ea0c13e8b461c'; // 我喂自己袋盐2
   // userId = '5823fe35a84ea0c13e8b461c'; // 我喂自己袋盐2
 } else if (locationHref.indexOf('admin.yiguanjiadev.me') > -1) {
 } else if (locationHref.indexOf('admin.yiguanjiadev.me') > -1) {
   apiPath = 'http://admin.yiguanjiadev.me/index.php?r=';
   apiPath = 'http://admin.yiguanjiadev.me/index.php?r=';

部分文件因为文件数量过多而无法显示