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

www/protected/modules/j/controllers/WebController.php

@@ -118,4 +118,11 @@ class WebController extends JBaseController {
 		));
 	}
 
+	// 服务介绍
+	public function actionServiceIntroduction()
+	{
+
+		$this->renderpartial('serviceIntroduction');
+	}
+
 }

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

@@ -0,0 +1,34 @@
+<template>
+  <div class="attention">
+    <div class="title">
+      请长按二维码,关注巾帼家政公众号
+    </div>
+    <img src="http://odulvej8l.bkt.clouddn.com/qrcode_for_gh_dee5737b8b45_1280.jpg" alt="">
+  </div>
+</template>
+
+<script>
+  export default {
+    name: "attention",
+    data() {
+      return {}
+    },
+    created() {
+
+    },
+    methods: {}
+  }
+</script>
+
+<style scoped lang="less">
+  .attention {
+    .title {
+      margin: 15% 0;
+      text-align: center;
+    }
+    img{
+      width: 100%;
+    }
+
+  }
+</style>

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

@@ -108,7 +108,7 @@
                   <span @click="skillsTypeShow">{{skills.arrStr}}</span>
                 </label>
 
-                <label @click="readmeEdit = false">
+                <label @click="descEdit = false,readmeEdit = false">
                   <span>住址</span>
                   <!--<span><input type="text" class="weui-input"
                                v-model="userInfo.address2"
@@ -117,8 +117,9 @@
 
                   <span style="min-height: 24px;display: block;" v-if="addressEdit == false"
                         v-model="userInfo.address1"
-                        @click="addressEdit = true">{{userInfo.address1}}</span>
-                  <input style="width: 60%; color: #ffb433;font-weight: bolder" v-if="addressEdit" class="weui-input" type="text"
+                        @click="addressEdit = true">{{userInfo.address1  == ''?'请输入您的地址':userInfo.address1}}</span>
+                  <input style="width: 60%; color: #ffb433;font-weight: bolder" v-if="addressEdit" class="weui-input"
+                         type="text"
                          v-model="userInfo.address1"
                          placeholder="请输入您的地址">
                 </label>
@@ -126,20 +127,33 @@
                   <span>户籍住址</span>
                   <span><input type="text" v-model="userInfo.address2" placeholder="请输入您的户籍地址"></span>
                 </label>-->
-                <label @click="addressEdit = false">
+                <label @click="addressEdit = false,descEdit = false">
                   <span>自述：</span>
                   <span>
                       <!--<span v-if="userInfo.readme ==''" class="fontColorBlack"
                             style="color: blue">{{userInfo.readme}}</span>-->
                     <span style="min-height: 24px;display: block;" v-if="readmeEdit == false"
                           v-model="userInfo.readme"
-                          @click="readmeEdit = true">{{userInfo.readme}}</span>
+                          @click="readmeEdit = true">{{userInfo.readme == ''?'请输入您对自己的评价':userInfo.readme}}</span>
                       <input style="font-weight: bolder;" v-if="readmeEdit" class="weui-input" type="text"
                              v-model="userInfo.readme"
                              placeholder="请输入您对自己的评价">
 
                     </span>
                 </label>
+                <label @click="addressEdit = false,readmeEdit = false">
+                  <!--<span>希望服务区域：</span>-->
+                  <span>希望服务区域"：</span>
+                  <span>
+                    <span style="min-height: 24px;display: block;" v-if="descEdit == false"
+                          v-model="userInfo.desc"
+                          @click="descEdit = true">{{userInfo.desc == ''?'请输入您希望服务的区域':userInfo.desc}}</span>
+
+                      <input style="font-weight: bolder;" v-if="descEdit" class="weui-input" type="text"
+                             v-model="userInfo.desc"
+                             placeholder="请输入您希望服务的区域">
+                    </span>
+                </label>
               </div>
               <!--按钮区域-->
               <div class="btnBox">
@@ -184,6 +198,8 @@
         addressEdit: false,
         // 自述编辑
         readmeEdit: false,
+        // 希望服务区域
+        descEdit: false,
         partTimeWorkers: {
           show: false, // 钟点工时间
           popup: false,
@@ -199,7 +215,8 @@
           show: false, //  个人信息编辑
           address1: "",
           // address2: '',
-          readme: ""
+          readme: "",
+          desc: ""
         },
         worksType: {
           list: [
@@ -338,6 +355,8 @@
         this.addressEdit = false;
         // 自述编辑
         this.readmeEdit = false;
+        // 希望服务区域
+        this.descEdit = false;
       },
       /* 获取钟点工时间 */
       partTimeWorkersShow(popup) {
@@ -553,6 +572,8 @@
             }
             // 本地住址
             this.userInfo.address1 = this.uInfo.address[0];
+            // 希望服务区域
+            this.userInfo.desc = this.uInfo.desc;
             // 户籍地址
             // this.userInfo.address2 = this.uInfo.address[1];
             // 自述
@@ -628,7 +649,8 @@
             skill: self.skills.numberArr,
             work_types: self.worksType.numberArr,
             address1: self.userInfo.address1,
-            readme: self.userInfo.readme
+            readme: self.userInfo.readme,
+            desc: self.userInfo.desc
             // address2: self.userInfo.address2,
             // work_time_part: JSON.stringify(self.partTimeWorkers.arr), // 钟点工时间段
             // work_time: self.home.time
@@ -653,6 +675,8 @@
                   // self.uInfo.address[1] = self.userInfo.address2;
                   // 自述
                   self.uInfo.readme = self.userInfo.readme;
+                  // 希望服务区域
+                  self.uInfo.desc = self.userInfo.desc;
                   // history.go(0)
                   // return;
                   self.$router.push({path: "/houseKeeping/info"});

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

@@ -340,7 +340,7 @@
         }, res => {
           if (res.data.success) {
             weui.alert('注册成功', function () {
-              self.$router.push({path: '/houseKeeping/info'});
+              self.$router.push({path: '/houseKeeping/attention'});
               return
             });
           }

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

@@ -124,7 +124,6 @@
       {{btnSubmintStr}}
       <!--<x-button type="primary" @click.native='btnSubmint'>{{btnSubmintStr}}</x-button>-->
     </div>
-
   </div>
 </template>
 <script>
@@ -329,6 +328,21 @@
       XButton
     },
     methods: {
+      // 给家政员发送短信
+      btnServer() {
+        let self = this;
+        _.$http("/j/HouseKeeping/Server", {
+          user_name: self.tech,
+          servers: self.order.type_str,
+          status_time: ycTime(self.bookingTime),
+          store: self.store.name,
+          address: self.store.address,
+          mobile: self.techMobile,
+          phone: self.store.mobile
+        }, res => {
+          console.log(res.data)
+        })
+      },
       // 选择家政员
       selectF() {
         /*if (this.bookingTime === '请选择日期') {
@@ -399,6 +413,7 @@
               },
               res => {
                 if (res.data.success) {
+                  self.btnServer();
                   weui.alert("提交成功", function () {
                     self.$router.push({path: "/managementList"});
                   });
@@ -443,18 +458,6 @@
                     }
                   }
                 );
-                /*let stitching = `&id=${_.oldOrderInfo.id}&status=4&cancel_cause=${self.showTechAppointmentStatusStr}`;
-                  axios.post(_.apiPath + 'j/HouseKeeping/Edit' + stitching).then(res => {
-                    if (res.data.success) {
-                      weui.alert('提交成功', function () {
-                        self.$router.push({path: '/managementList'});
-                      });
-                      return
-                    } else {
-                      weui.alert('提交失败');
-                      return
-                    }
-                  })*/
                 return;
               }
             });
@@ -474,9 +477,8 @@
                 content: "请勿重复提交"
               });
             } else if (
-              // 时间发生变化
-              ycTime(self.bookingTime) != ycTime(self.order.status_time)
-            ) {
+              // 时间发生变化,但是家政员不变
+            ycTime(self.bookingTime) != ycTime(self.order.status_time)) {
               self.$vux.confirm.show({
                 // title: '提示',
                 content: "提交后将给客户发送预约短信，确认提交吗？",
@@ -495,13 +497,20 @@
                       tech_mobile: self.techMobile
                     },
                     res => {
+                      if (_.oldOrder.tech != self.tech) {
+                        self.btnServer();
+                      }
                       statusF(res.data.success);
                       return;
                     }
                   );
                 }
               });
-            } else {
+            } else if (
+              // 时间发生变化,但是家政员不变
+            ycTime(self.bookingTime) == ycTime(self.order.status_time) &&
+            _.oldOrder.tech != self.tech
+            ) {
               _.$http(
                 "/j/HouseKeeping/Edit",
                 {
@@ -513,6 +522,7 @@
                   tech_mobile: self.techMobile
                 },
                 res => {
+                  self.btnServer();
                   statusF(res.data.success);
                   return;
                 }

www/webapp/housekeeping/src/components/reservation.vue

@@ -421,10 +421,10 @@
       this.createCode = createCode();
       this.serviceType = config.serviceType;
       this.time = this.serviceType == 1 ? "选择您的预产期" : "选择服务日期";
-      for (let i = 6; i < 20; i++) {
+      for (let i = 6; i < 18; i++) {
         this.serviceTimeArrAM.push(i + ":00");
       }
-      for (let i = 7; i < 22; i++) {
+      for (let i = 7; i < 19; i++) {
         this.serviceTimeArrPM.push(i + ":00");
       }
       /*     axios.post(config.apiPath + 'j/HouseKeeping/GetStore').then(res => {

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=';
   // userId = '57fe2dc59f5160a1048b4591' // 享月会
   // userId = '582405cea84ea02e3e8b4611' // 养老院
-  // userId = '59e41443fb48a7552f8b459e'; // 管理员\门店老师
+  userId = '59e41443fb48a7552f8b459e'; // 管理员\门店老师
   // 张工
   // userId = '582849af9f5160c2048b55dc';
 
@@ -60,7 +60,7 @@ if (locationHref.indexOf('http://localhost:80') > -1) {
   // 刘星
   // userId = '5860c5ce9f5160ad048b650f'
   // 立秋:客户
-  userId = '5823fe6ca84ea02e3e8b45cb'
+  // userId = '5823fe6ca84ea02e3e8b45cb'
   // 邓涛
   // userId = '5a5eeaf3fb48a770708b456b' // 已注册
   // userId = '57fe2dc59f5160a1048b4591'  // 未注册

www/webapp/housekeeping/src/router/index.js

@@ -17,6 +17,7 @@ import houseKeepingLogin from '@/components/houseKeeping/login'
 import houseKeepingInfo from '@/components/houseKeeping/info'
 import houseKeepingEdit from '@/components/houseKeeping/edit'
 import houseKeepingIsReg from '@/components/houseKeeping/isreg'
+import houseKeepingAttention from '@/components/houseKeeping/attention'
 
 Vue.use(Router);
 
@@ -82,6 +83,10 @@ export default new Router({
       path: '/houseKeeping/isReg',
       name: 'houseKeeping/isReg',
       component: houseKeepingIsReg
+    },  {
+      path: '/houseKeeping/attention',
+      name: 'houseKeeping/attention',
+      component: houseKeepingAttention
     }
   ]
 })