Merge branch 'test'

package.json

 {
 	"name": "wx-school-app-public",
-	"version": "1.0.7",
+	"version": "1.0.8",
 	"private": true,
 	"description": "",
 	"scripts": {

src/api/Order/pay.ts

@@ -18,6 +18,12 @@ type Params = {
 
   smaproPrepayConfigId: number;
   // 预付配置id
+
+  areaId: number;
+  // 区域id
+
+  areaName: string;
+  // 区域名称
 };
 type ResponseData = {
   outTradeNo: string;

src/api/device.ts

@@ -31,8 +31,14 @@ type DeviceInfoResponse = {
   // 位置id
   rates: RateInfoResponse[];
 
-  //是否纯蓝牙设备 1：是，0：否
+  // 是否纯蓝牙设备 1：是，0：否
   isOnlyBluetooth: number;
+
+  // 区域id
+  areaId: number;
+
+  // 区域名称
+  areaName: string;
 };
 type RateInfoResponse = {
   mark: string;

src/pages/pay/pay.tsx

@@ -736,6 +736,8 @@ class Pay extends Component {
         serviceId: device.serviceId,
         smaproCustomerId: customerId,
         smaproPrepayConfigId: payId,
+        areaId: device.areaId,
+        areaName: device.areaName,
       })
         .then(res => {
           console.log('res: ', res);

src/store/rootReducers/device.ts

@@ -18,6 +18,8 @@ export const INITIAL_STATE = {
   serviceId: 0,
   serviceName: '',
   isOnlyBluetooth: 0,
+  areaId: 0,
+  areaName: '',
 };
 
 export const updateDeviceData = (entity: DeviceState): Action => ({

src/types/Device/Device.ts

@@ -21,4 +21,6 @@ export type Device = {
   serviceId: number;
   serviceName: string;
   isOnlyBluetooth: number;
+  areaId: number;
+  areaName: string;
 };