Merge remote-tracking branch 'origin/master'

miniapp/app/app.wxss

@@ -31,6 +31,7 @@ button:after {
     font-size: 30rpx;
     color: #666666;
     line-height: 1;
+    overflow: hidden;
 }
 
 .mod-hd .dot {

miniapp/app/pages/bookService/index.js

@@ -2,25 +2,33 @@ const WxParse = require('../../wxParse/wxParse.js')
 const $ = global
 
 new $.Page({
+    data: {
+        options: [],
+        api: ''
+    },
     onLoad(options) {
         if (!options.id) {
             return $.wx.showToast({
                 title: '找不到对应id'
             });
         }
-        $.request(`server_info/${options.id}`, 'GET', {}).then((res) => {
+        $.request(`classify/${options.id}`, 'GET', {}).then((res) => {
             var article = res.data && res.data.content || '';
             const fields = res.data.fields || [];
             const options = [];
             WxParse.wxParse('article', 'html', article, this, 5);
             for (let item of fields) {
                 const group = item.input_group;
-                options.push(group[0].value || '');
+                options.push({
+                    value: group[0].value || '',
+                    key: item.name
+                });
             }
             this.setData({
                 banner: res.data.photo || '',
                 fields,
-                options
+                options,
+                api: res.data.api
             });
         });
     },
@@ -29,7 +37,8 @@ new $.Page({
             name,
             phone,
             address,
-            notes
+            notes,
+            options
         } = this.data;
         if (!name || !phone || !address) {
             return $.wx.showToast({
@@ -44,17 +53,16 @@ new $.Page({
         $.wx.showToast({
             title: '加载中'
         }, 'loading');
-        $.request('housekeeper_order/store', 'POST', {
-            contents: '保洁服务',
-            people_num: '1-2人',
-            notes,
-            server_time: '白天',
-            address,
-            rest: '晚上',
-            area: '60-120平',
+        const data = {
             contact: name,
-            phone
-        }).then((res) => {
+            phone,
+            address,
+            notes
+        }
+        for (let option of options) {
+            data[`${option.key}`] = option.value;
+        }
+        $.request(api, 'POST', data).then((res) => {
             $.wx.hideToast('loading');
             $.router.goto({
                 path: '/pages/order/index',
@@ -72,7 +80,7 @@ new $.Page({
         const {
             options
         } = this.data;
-        options[index] = value;
+        options[index].value = value;
         this.setData({
             options
         });

miniapp/app/pages/bookService/index.wxml

@@ -1,7 +1,7 @@
 <import src="/wxParse/wxParse.wxml" />
 <view class="page">
     <view class="page-hd">
-        <image class="hero" src="/img/demo/banner.jpg"></image>
+        <image class="hero" src="{{banner}}"></image>
     </view>
     <view class="page-bd">
         <view class="mod">

miniapp/app/pages/yuesao/index.js

@@ -3,7 +3,8 @@ const $ = global
 
 new $.Page({
     data: {
-        options: []
+        options: [],
+        api: ''
     },
     onLoad(options) {
         if (!options.id) {
@@ -11,19 +12,23 @@ new $.Page({
                 title: '找不到对应id'
             });
         }
-        $.request(`server_info/${options.id}`, 'GET', {}).then((res) => {
+        $.request(`classify/${options.id}`, 'GET', {}).then((res) => {
             var article = res.data && res.data.content || '';
             const fields = res.data.fields || [];
             const options = [];
             WxParse.wxParse('article', 'html', article, this, 5);
             for (let item of fields) {
                 const group = item.input_group;
-                options.push(group[0].value || '');
+                options.push({
+                    value: group[0].value || '',
+                    key: item.name
+                });
             }
             this.setData({
                 banner: res.data.photo || '',
                 fields,
-                options
+                options,
+                api: res.data.api
             });
         });
     },
@@ -34,7 +39,8 @@ new $.Page({
             address,
             notes,
             expectedDate,
-            serviceDate
+            serviceDate,
+            options
         } = this.data;
         if (!name || !phone || !address || !expectedDate || !serviceDate) {
             return $.wx.showToast({
@@ -49,15 +55,18 @@ new $.Page({
         $.wx.showToast({
             title: '加载中'
         }, 'loading');
-        $.request('maternity_matron_order/store', 'POST', {
-            level: '金牌月嫂',
+        const data = {
             expected_date: expectedDate,
-            special_demand: notes || '特殊需求',
+            special_demand: notes,
             server_time: serviceDate,
             address,
             contact: name,
             phone
-        }).then((res) => {
+        };
+        for (let option of options) {
+            data[`${option.key}`] = option.value;
+        }
+        $.request(this.data.api, 'POST', data).then((res) => {
             $.wx.hideToast('loading');
             $.router.goto({
                 path: '/pages/order/index',
@@ -75,7 +84,7 @@ new $.Page({
         const {
             options
         } = this.data;
-        options[index] = value;
+        options[index].value = value;
         this.setData({
             options
         });