Merge branch 'test'

src/api/Order/pay.ts

@@ -19,6 +19,9 @@ type Params = {
   smaproPrepayConfigId: number;
   // 预付配置id
 
+  smaproPrepayConfigIds?: number[];
+  // 预付配置id集合,serviceId为30或者31时才需传
+
   areaId: number;
   // 区域id
 

src/api/device.ts

@@ -54,9 +54,18 @@ type SmaproPrepayConfig = {
   id: number;
   // 会员id
 
+  isMajor: number;
+  // 是否主要功能 1：主要功能；2：附加功能
+
   isOpen: number;
   // 是否开启
 
+  isShowRate: number;
+  // 是否显示费率 0：否；1：是。默认1
+
+  name: string;
+  // 名称
+
   operateId: number;
   // 运营商id
 
@@ -77,6 +86,8 @@ type SmaproPrepayConfig = {
 
   updateAt: string;
   // 更新时间
+
+  duration: number;
 };
 type ResponseData = {
   deviceInfoResponse: DeviceInfoResponse;

src/app.tsx

@@ -35,6 +35,9 @@ class App extends Component {
       navigationBarTitleText: 'WeChat',
       navigationBarTextStyle: 'black',
     },
+    networkTimeout: {
+      connectSocket: 600000,
+    },
   };
 
   // 在 App 类中的 render() 函数没有实际作用

src/constants/index.js

@@ -4,4 +4,4 @@ export const NotRegisterCode = 1005;
 
 export const BASE_SERVER_URL = 'https://dcxy-smapro-app.dcrym.com';
 export const SOCKET_URL = 'wss://shower-wss1.dcrym.com:9443/ws';
-export const DRY_SOCKET_URL = 'wss://share-device-manager.dcrym.com:9443';
+export const DRY_SOCKET_URL = 'wss://share-device-wss1.dcrym.com:9443';

src/pages/connect/connect.scss

 .Connect {
+  .state {
+    height: 0;
+    overflow: hidden;
+  }
+  .Connect-title {
+    font-size: 34rpx;
+    height: 102rpx;
+    line-height: 102rpx;
+    text-align: center;
+    border-bottom: 1rpx dotted #f8f8f8;
+  }
+  .Connect-Pay {
+    border-top: 20rpx solid #f8f8f8;
+    padding: 0 35rpx;
+    .Connect-Pay-title {
+      padding: 40rpx 0 30rpx;
+      font-size: 34rpx;
+      border-bottom: 1rpx solid #e8e8e8;
+    }
+    .Connect-Pay-titleTip {
+      color: #999;
+    }
+    .Connect-Pay-content {
+      padding: 10rpx 0;
+    }
+    .Connect-Pay-item {
+      display: flex;
+      align-items: center;
+      height: 80rpx;
+      font-size: 28rpx;
+      .Connect-Pay-itemName {
+        flex: 1;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+      }
+      .Connect-Pay-itemTime {
+        width: 170rpx;
+        text-align: right;
+        color: #999;
+      }
+      .Connect-Pay-itemPrice {
+        width: 175rpx;
+        text-align: right;
+      }
+      .Connect-Pay-itemSelect {
+        margin-left: 50rpx;
+        width: 40rpx;
+        height: 40rpx;
+        .Connect-Pay-itemSelecticon {
+          width: 40rpx;
+          height: 40rpx;
+        }
+      }
+    }
+  }
   .Connect-info {
     padding: 40px 32px;
     font-size: 28px;
@@ -47,6 +103,11 @@
     border-radius: 30px;
     vertical-align: middle;
   }
+  .Connect-tip3 {
+    padding: 26rpx 48rpx;
+    font-size: 26rpx;
+    color: #ff4b4b;
+  }
   .Connect-money {
     display: flex;
     flex-wrap: wrap;
@@ -54,6 +115,7 @@
     margin: 0 auto;
     .Connect-money-item {
       display: flex;
+      flex-direction: column;
       justify-content: center;
       align-items: center;
       text-align: center;
@@ -64,6 +126,12 @@
       border: 1px solid #ccc;
       margin-bottom: 16px;
       margin-right: 16px;
+      .time {
+        font-size: 30px;
+      }
+      .money {
+        font-size: 36px;
+      }
       &.seleted {
         border-color: #6180f4;
         color: #6180f4;

src/types/Order/Order.ts

@@ -5,9 +5,18 @@ export type PrepayConfig = {
   id: number;
   // 会员id
 
+  isMajor: number;
+  // 是否主要功能 1：主要功能；2：附加功能
+
   isOpen: number;
   // 是否开启
 
+  isShowRate: number;
+  // 是否显示费率 0：否；1：是。默认1
+
+  name: string;
+  // 名称
+
   operateId: number;
   // 运营商id
 
@@ -28,6 +37,8 @@ export type PrepayConfig = {
 
   updateAt: string;
   // 更新时间
+
+  duration: number;
 };
 
 export default PrepayConfig;