소스 검색

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

north 7 년 전
부모
커밋
661a78032b

+ 1 - 1
www/protected/modules/j/views/default/index.php

@@ -3,7 +3,7 @@
 <!doctype html>
 <html lang="en">
 <head>
-  <title>享颐会</title>
+  <title>家政</title>
   <style>
     * {
       margin: 0;

+ 1 - 1
www/webapp/housekeeping/index.html

@@ -2,7 +2,7 @@
 <html>
   <head>
     <meta charset="utf-8">
-    <title>享月会</title>
+    <title>家政</title>
     <meta charset="UTF-8">
     <meta name="viewport"
           content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">

+ 2 - 3
www/webapp/housekeeping/src/components/Home.vue

@@ -44,9 +44,8 @@
     },
     methods: {
       demand(type){
-        config.ServiceType = null;
-        config.ServiceType = type;
-        console.log(type)
+        config.serviceType = null;
+        config.serviceType = type;
       },
       btnPackage(n) {
 //        console.log(this.packageArray[n - 1])

+ 112 - 22
www/webapp/housekeeping/src/components/reservation.vue

@@ -8,30 +8,23 @@
         <div class="weui-cell">
           <div class="weui-cell__hd"><label class="weui-label">姓名</label></div>
           <div class="weui-cell__bd"><input v-model="userName" class="weui-input" type="text" required="" maxlength="11"
-                                            placeholder="输入你的姓名">
-          </div>
-          <div class="weui-cell__ft"><i class="weui-icon-warn"></i></div>
-        </div>
-        <!--预产期-->
-        <div class="weui-cell">
-          <div class="weui-cell__hd"><label class="weui-label">预产期</label></div>
-          <div class="weui-cell__bd" @click='btn()'>
-            <input class="weui-input select-time" type="button" required=""
-                   :value="time">
+                                            placeholder="输入您的姓名">
           </div>
           <div class="weui-cell__ft"><i class="weui-icon-warn"></i></div>
         </div>
         <!--手机验证-->
         <div class="weui-cell">
           <div class="weui-cell__hd"><label class="weui-label">手机</label></div>
-          <div class="weui-cell__bd"><input class="weui-input" type="tel" v-model="number" required="" pattern="^\d{11}$"
+          <div class="weui-cell__bd"><input class="weui-input" type="tel" v-model="number" required=""
+                                            pattern="^\d{11}$"
                                             maxlength="11"
-                                            placeholder="输入现在的手机号" emptytips="请输入手机号" notmatchtips="请输入正确的手机号"></div>
+                                            placeholder="输入现在的手机号" emptytips="请输入手机号" notmatchtips="请输入正确的手机号"></div>
           <div class="weui-cell__ft"><i class="weui-icon-warn"></i></div>
         </div>
         <div class="weui-cell weui-cell_vcode">
           <div class="weui-cell__hd"><label class="weui-label">验证码</label></div>
-          <div class="weui-cell__bd"><input v-model="iCreateCode" class="weui-input" maxlength="4" type="text" required=""
+          <div class="weui-cell__bd"><input v-model="iCreateCode" class="weui-input" maxlength="4" type="text"
+                                            required=""
                                             pattern="REG_VCODE"
                                             placeholder="点击验证码更换" tips="请输入验证码"></div>
           <div class="weui-cell__ft"><i class="weui-icon-warn"></i>
@@ -46,6 +39,51 @@
             <input @click="getCode()" type="button" class="getCreateCode" value="获取">
           </div>
         </div>
+        <!--服务地址-->
+        <div class="weui-cell">
+          <div class="weui-cell__hd"><label class="weui-label">地址</label></div>
+          <div class="weui-cell__bd"><input v-model="userName" class="weui-input" type="text" required="" maxlength="11"
+                                            placeholder="输入您需要上门服务的地址">
+          </div>
+          <div class="weui-cell__ft"><i class="weui-icon-warn"></i></div>
+        </div>
+        <!--服务形式-->
+        <div class="weui-cell">
+          <div class="weui-cell__hd"><label class="weui-label">服务形式</label></div>
+          <div class="weui-cell__bd">
+            <div class="weui-btn service-form" @click='btnServiceForm'>{{serviceForm}}</div>
+            <!--<input v-model="serviceForm" @click='btnServiceForm' onfocus="this.blur()" class="weui-input" type="text"
+                   required="" maxlength="11" placeholder="输入您需要上门服务的地址">-->
+          </div>
+          <div class="weui-cell__ft"><i class="weui-icon-warn"></i></div>
+        </div>
+        <!--服务时间-->
+
+        <!--预产期-->
+        <div v-if='serviceType == 1' class="weui-cell">
+          <div class="weui-cell__hd"><label class="weui-label">预产期</label></div>
+          <div class="weui-cell__bd" @click='btn()'>
+            <input class="weui-input select-time" type="button" required=""
+                   :value="time">
+          </div>
+          <div class="weui-cell__ft"><i class="weui-icon-warn"></i></div>
+        </div>
+        <!--孩子年龄-->
+        <div v-if="serviceType == 2" class="weui-cell">
+          <div class="weui-cell__hd"><label class="weui-label">姓名</label></div>
+          <div class="weui-cell__bd"><input v-model="userName" class="weui-input" type="text" required="" maxlength="11"
+                                            placeholder="输入您孩子的年龄">
+          </div>
+          <div class="weui-cell__ft"><i class="weui-icon-warn"></i></div>
+        </div>
+        <!--备注-->
+        <div class="weui-cell">
+          <div class="weui-cell__hd"><label class="weui-label">备注</label></div>
+          <div class="weui-cell__bd"><input v-model="userName" class="weui-input" type="text" required="" maxlength="11"
+                                            placeholder="补充您的需求">
+          </div>
+          <div class="weui-cell__ft"><i class="weui-icon-warn"></i></div>
+        </div>
       </div>
       <!--提交-->
       <div class="submit" @click="submit()">提交</div>
@@ -55,6 +93,7 @@
 <script>
   import axios from 'axios'
   import config from '@/config'
+
   export default {
     name: 'userInfo',
     data() {
@@ -62,18 +101,54 @@
         msg: 'this is userInfo',
         userName: '',
         number: '',
-        time: '选择的预产期', // 展示已选择时间
+        time: '选择的预产期', // 展示已选择时间
         resTime: '', // 已选择时间集合
         createCode: '', // 验证码
         iCreateCode: '', // 用户输入的验证码
         Code: '', // 短信验证码
         iCode: '', // 用户输入的短信验证码
+        serviceType: null,
+        serviceForm: '请选择', // 服务形式
       }
     },
     created() {
-      this.createCode = createCode()
+      this.createCode = createCode();
+      this.serviceType = config.serviceType;
     },
     methods: {
+      btnServiceForm() {
+        let that = this;
+        weui.picker([
+          {
+            label: '住家',
+            value: 0,
+          },
+          {
+            label: '做一休一',
+            value: 1
+          },
+          {
+            label: '做五休二',
+            value: 3
+          },
+          {
+            label: '做六休一',
+            value: 4,
+          }
+        ], {
+          className: 'custom-classname',
+          container: 'body',
+          defaultValue: [0],
+          onChange: function (result) {
+//            console.log(result)
+          },
+          onConfirm: function (result) {
+            that.serviceForm = result[0].label
+            console.log(result[0].label);
+          },
+          id: 'singleLinePicker'
+        });
+      },
       btn() {
         let that = this;
         let currentDate = new Date() // Sat Jun 24 2017 10:09:18 GMT+0800 (中国标准时间)
@@ -129,14 +204,14 @@
         let lest = window.location.href;
         // 判断用户来源
         let source = 0;
-        if(lest.indexOf('source')> -1) {
+        if (lest.indexOf('source') > -1) {
           // source
           let w = lest.indexOf('source');
-          source = lest.slice(w+7,w+8); // 1 2
+          source = lest.slice(w + 7, w + 8); // 1 2
         }
 //        用户名判断
         if (!this.userName) {
-          weui.alert('请重新输入的姓名');
+          weui.alert('请重新输入的姓名');
           return
         }
         // 短信验证码判断
@@ -144,7 +219,7 @@
           weui.alert('输入的短信验证码有误,请重新输入');
           return
         }
-        axios.post(config.apiPath + 'moonclub/Reserve/Month1&user_id=' + config.user_id + '&user_name=' + this.userName + '&homeType=1&num='+this.time+'&mobile='+this.number+'&source='+source).then(res=>{
+        axios.post(config.apiPath + 'moonclub/Reserve/Month1&user_id=' + config.user_id + '&user_name=' + this.userName + '&homeType=1&num=' + this.time + '&mobile=' + this.number + '&source=' + source).then(res => {
           // console.log(res)
           if (res.data.success) {
             /*
@@ -152,16 +227,16 @@
             重复提交或提交成功都返回首页
              */
             if (res.data.message === '您已经提交过信息') {
-              weui.alert(res.data.message,function () {
+              weui.alert(res.data.message, function () {
                 that.$router.push({path: '/'})
               });
             } else {
-              weui.alert('提交成功',function () {
+              weui.alert('提交成功', function () {
                 that.$router.push({path: '/'})
               })
             }
           } else {
-            weui.alert('提交失败,请稍后再试!',function () {
+            weui.alert('提交失败,请稍后再试!', function () {
               that.$router.push({path: '/userInfo'})
             })
           }
@@ -214,6 +289,21 @@
       padding: 0 18px;
       margin-top: 5px;
     }
+    /*服务形式*/
+    .service-form {
+      transition: all .1s;
+      cursor: pointer;
+      color: #000;
+      text-align: left;
+      padding-left: 0;
+      &:after {
+        width: 0;
+        height: 0;
+      }
+      &:active {
+        background-color: #dddddd;
+      }
+    }
     .submit {
       background: #61904a;
       color: rgb(255, 255, 255);

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

@@ -2,7 +2,7 @@ let locationHref = location.href;
 let test = true;
 let apiPath = '';
 let userId = '';
-let ServiceType = null; // 服务类型
+let serviceType = null; // 服务类型
 if (locationHref.indexOf('common.yiguanjia.me') > -1) {
   test = false
 }
@@ -116,5 +116,5 @@ export default {
   checkID: checkID,
   isAndroid: isAndroid,
   isiOS: isiOS,
-  ServiceType: ServiceType
+  serviceType: serviceType
 }