Merge remote-tracking branch 'origin/master'

miniapp/app/pages/bookService/index.js

@@ -28,7 +28,8 @@ new $.Page({
                 banner: res.data.photo || '',
                 fields,
                 options,
-                api: res.data.api
+                api: res.data.api,
+                type: res.data.type
             });
         });
     },
@@ -39,7 +40,8 @@ new $.Page({
             address,
             notes,
             options,
-            api
+            api,
+            type
         } = this.data;
         if (!name || !phone || !address) {
             return $.wx.showToast({
@@ -58,7 +60,8 @@ new $.Page({
             contact: name,
             phone,
             address,
-            notes
+            notes,
+            type
         }
         for (let option of options) {
             data[`${option.key}`] = option.value;

miniapp/app/pages/yuesao/index.js

@@ -28,7 +28,8 @@ new $.Page({
                 banner: res.data.photo || '',
                 fields,
                 options,
-                api: res.data.api
+                api: res.data.api,
+                type: res.data.type
             });
         });
     },
@@ -40,7 +41,8 @@ new $.Page({
             notes,
             expectedDate,
             serviceDate,
-            options
+            options,
+            type
         } = this.data;
         if (!name || !phone || !address || !expectedDate || !serviceDate) {
             return $.wx.showToast({
@@ -61,7 +63,8 @@ new $.Page({
             server_time: serviceDate,
             address,
             contact: name,
-            phone
+            phone,
+            type
         };
         for (let option of options) {
             data[`${option.key}`] = option.value;