修改UI

src/app.tsx

@@ -35,11 +35,10 @@ class App extends Component {
    */
   config: Config = {
     pages: [
-      'pages/index',
+      'pages/login/index',
       'pages/home/device/index',
       'pages/home/tempaltes/index',
       'pages/home/film/index',
-      'pages/login/index',
       'pages/agreement/index',
       'pages/home/device/device_detail/index',
       'pages/home/device/shop_device_detail/index',

src/common/bluetooth.ts

@@ -244,15 +244,15 @@ class Bluetooth {
     await bluetooth.notifyBLECharacteristicValueChange({
       deviceId,
       state: true,
-      serviceId: BLE_SERVICE_ID,
-      characteristicId: DEVICE_TOKEN_TOKEN
-    })
-    await bluetooth.notifyBLECharacteristicValueChange({
-      deviceId,
-      state: true,
       serviceId: BLE_DEVICE_SERVICE_ID,
       characteristicId: DEVICE_TOKEN_ID
     })
+    await bluetooth.writeBLECharacteristicValue({
+      deviceId,
+      serviceId: BLE_SERVICE_ID,
+      value: strToAb(id, pass),
+      characteristicId: POST_WIFI_PASS_ID
+    })
     return bluetooth.writeBLECharacteristicValue({
       deviceId,
       serviceId: BLE_SERVICE_ID,

src/conpoments/film_list_item/index.scss

@@ -46,10 +46,10 @@
     &-name {
       font-size: 32px;
       color: #333;
-      margin-bottom: 15px;
+      margin-bottom: 13px;
       font-weight: bold;
       overflow: hidden;
-      height: 35px;
+      height: 40px;
       word-break: break-all;
       text-overflow: ellipsis;
       white-space: nowrap;

src/pages/home/device/group_detail/index.tsx

@@ -97,13 +97,13 @@ class DeviceGroup extends Component {
     const { text } = info
     const { equipmentId } = item
     const { id } = this.$router.params
-    if (text === '删除') {
-      Taro.showModal({ content: '确定要删除？' }).then(async ({ confirm }) => {
+    if (text === '移除') {
+      Taro.showModal({ content: '确定要移除？' }).then(async ({ confirm }) => {
         if (confirm) {
           try {
             await api.common.deleteGroupDevice(id, equipmentId)
             this.getDate()
-            showMyToast({ title: '删除成功~' })
+            showMyToast({ title: '移除成功~' })
           } catch (error) {
             console.error(error)
             showMyToast({ result: error, title: '失败~' })
@@ -151,7 +151,7 @@ class DeviceGroup extends Component {
                 onClick={info => this.handleItem(item, info)}
                 options={[
                   {
-                    text: '删除',
+                    text: '移除',
                     style: {
                       backgroundColor: '#F32B2B'
                     }

src/pages/home/film/film_list/index.scss

@@ -29,7 +29,7 @@
         // width: 50%;
         // display: inline-block;
         // text-align: center;
-        padding: 0 80px;
+        padding: 0 42px;
         position: relative;
       }
 

src/pages/home/film/schedule_add/components/device/index.scss

@@ -229,6 +229,7 @@
     .device-tab-item-word {
       position: relative;
       padding-right: 40px;
+      font-weight: 500;
       display: inline-block;
     }
 

src/pages/home/film/schedule_add/components/films/index.scss

@@ -61,7 +61,7 @@
       color: #969799;
 
       .type-tab-item {
-        padding: 0 80px;
+        padding: 0 42px;
         position: relative;
       }
 

src/pages/home/tempaltes/index.tsx

@@ -129,7 +129,9 @@ class Tempaltes extends Component {
     this.getData()
   }
   getData(showTempalte2?) {
-    Taro.showLoading()
+    Taro.showLoading({
+      title: '数据加载中'
+    })
     const { page, showTempalte } = this.state
     // this.props.getTempListData(page)
     Api.tempalte

src/pages/home/tempaltes/scss/index.scss

@@ -30,7 +30,7 @@
       margin-bottom: 10px;
 
       .type-tab-item {
-        padding: 0 40px;
+        padding: 0 42px;
         position: relative;
       }
 
@@ -113,7 +113,7 @@
     color: #969799;
 
     .type-tab-item {
-      padding: 0 20px;
+      padding: 0 42px;
     }
 
     .type-tab-item-active {