fix bug

src/common/index.ts

 export const FETCH_TIME_OUT = 5000
-export const BASE_URL = 'https://server.bdideal.com'
-export const WEBVIEW_URL = 'https://visual.bdideal.com'
-// export const BASE_URL = 'https://dev-server.bdideal.com'
-// export const WEBVIEW_URL = 'https://dev-visual.bdideal.com'
+// export const BASE_URL = 'https://server.bdideal.com'
+// export const WEBVIEW_URL = 'https://visual.bdideal.com'
+export const BASE_URL = 'https://dev-server.bdideal.com'
+export const WEBVIEW_URL = 'https://dev-visual.bdideal.com'
 
 /** 蓝牙的服务 uuid */
 export const BLE_SERVICE_ID = '000088A0-0000-1000-8000-00805F9B34FB'

src/conpoments/film_list_item/index.scss

@@ -11,6 +11,7 @@
     background: $bgColor;
     text-align: center;
     position: relative;
+    border-radius: 6px;
 
     .films-item-img-bg {
       width: 261px;
@@ -23,6 +24,7 @@
     .films-item-img {
       width: 100%;
       height: 158px;
+      border-radius: 6px;
     }
 
     .films-item-img2 {
@@ -44,11 +46,12 @@
     }
 
     &-detail {
-      height: 55px;
+      height: 65px;
       overflow: hidden;
       font-size: 22px;
       color: #666;
-      margin-bottom: 15px;
+      word-break: break-all;
+      margin-bottom: 5px;
     }
 
     &-count {

src/pages/home/device/device_list/index.scss

@@ -5,9 +5,11 @@
   width: 100%;
   height: 100%;
   position: relative;
-  display: flex;
-  flex-direction: column;
+  // display: flex;
+  // flex-direction: column;
   background: $bgColor;
+  padding-bottom: 0;
+  min-height: 100vh;
 
   .device-item-container {
     margin: 25px;

src/pages/home/device/group_list/index.scss

@@ -5,25 +5,32 @@
   height: 100%;
   position: relative;
   background: $bgColor;
-  display: flex;
-  flex-direction: column;
+  // display: flex;
+  // flex-direction: column;
 
   &-add-btn {
-    // right: 30px;
-    // bottom: 200px;
+    right: 0;
+    left: 0;
+    bottom: 100px;
     width: 108px;
     height: 108px;
     margin: 0 auto;
-    line-height: 100px;
+    line-height: 108px;
     display: flex;
     color: white;
     font-size: 50px;
-    // position: absolute;
+    position: absolute;
     border-radius: 60px;
     align-items: center;
     justify-content: center;
     background-color: $bgColor;
     background-image: linear-gradient(176deg, #ffab20 0%, #ff720e 97%);
+    box-shadow: 0 8px 10px 0 rgba(226, 124, 64, 0.2);
+
+    .icon {
+      width: 38px;
+      height: 38px;
+    }
   }
 
   .group-item-container {

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

@@ -3,7 +3,7 @@ import { ComponentClass } from 'react'
 import { AtSwipeAction } from 'taro-ui'
 import ListView from '@/conpoments/list_view'
 import Taro, { Component } from '@tarojs/taro'
-import { View, Text, Input } from '@tarojs/components'
+import { View, Text, Input, Image } from '@tarojs/components'
 import Modal from '@/conpoments/modal'
 import { showMyToast } from '@/common/utils'
 
@@ -195,7 +195,7 @@ class DeviceGroup extends Component {
       <View className="device-list">
         <ListView
           count={count}
-          height={height - 108}
+          height={height}
           dataListLength={list.length}
           pullingUp={done => this.pullingUp(done)}
           pullingDown={done => this.pullingDown(done)}
@@ -234,7 +234,10 @@ class DeviceGroup extends Component {
           ))}
         </ListView>
         <View className="device-list-add-btn" onClick={this.AddGroup}>
-          <Text className="icon">+</Text>
+          <Image
+            className="icon"
+            src="https://visual-clouds.oss-cn-beijing.aliyuncs.com/miniprogram/create.png"
+          />
         </View>
         {/* <AtModal isOpened>
           <AtModalContent>

src/pages/home/device/index.tsx

@@ -29,7 +29,7 @@ interface Device {
 const tabList = [{ title: '我的设备' }, { title: '设备组' }, { title: '设备商城' }]
 class Device extends Component {
   config: Config = {
-    navigationBarTitleText: '',
+    navigationBarTitleText: '设备',
     navigationStyle: process.env.TARO_ENV === 'rn' ? 'custom' : 'default'
   }
   constructor(props) {
@@ -38,7 +38,7 @@ class Device extends Component {
     const { windowHeight } = Taro.getSystemInfoSync()
     this.state = {
       current: 0,
-      windowHeight: windowHeight - 43
+      windowHeight: windowHeight - 45
     }
   }
 
@@ -53,17 +53,17 @@ class Device extends Component {
         <AtTabsPane current={current} index={0}>
           <View style={{ height: `${windowHeight}px` }}>
             <View className="hui" />
-            <DeviceList height={windowHeight - 10} />
+            <DeviceList height={windowHeight} />
           </View>
         </AtTabsPane>
         <AtTabsPane className="at-tabs-page" current={current} index={1}>
-          <View style={{ height: `${windowHeight}px` }}>
+          <View style={{ height: `${windowHeight}px`, background: '#f7f7f7' }}>
             <View className="hui" />
             <DeviceGroup height={windowHeight - 10} />
           </View>
         </AtTabsPane>
         <AtTabsPane className="at-tabs-page" current={current} index={2}>
-          <View style={{ height: `${windowHeight}px` }}>
+          <View style={{ height: `${windowHeight}px`, background: '#f7f7f7' }}>
             <View className="hui" />
             <ShopList height={windowHeight - 10} />
           </View>

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

@@ -117,7 +117,7 @@ class Films extends Component {
             isOpened: true,
             chooseItem: item
           })
-        }, 500)
+        }, 100)
       })
     } else {
       this.setState({
@@ -212,7 +212,7 @@ class Films extends Component {
             >
               竖版
             </Text>
-            <Text
+            {/* <Text
               onClick={() => {
                 this.typeChange('OTHER')
               }}
@@ -221,7 +221,7 @@ class Films extends Component {
               }
             >
               异形屏
-            </Text>
+            </Text> */}
           </View>
         </View>
         <View className="hui" />

src/pages/home/film/index.tsx

@@ -28,7 +28,7 @@ interface Device {
 const tabList = [{ title: '我的作品' }, { title: '日程列表' }]
 class Device extends Component {
   config: Config = {
-    navigationBarTitleText: '',
+    navigationBarTitleText: '作品',
     navigationStyle: process.env.TARO_ENV === 'rn' ? 'custom' : 'default'
   }
   constructor(props) {

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

@@ -237,7 +237,7 @@ class Films extends Component {
             >
               竖版
             </Text>
-            <Text
+            {/* <Text
               onClick={() => {
                 this.typeChange('OTHER')
               }}
@@ -246,7 +246,7 @@ class Films extends Component {
               }
             >
               异形屏
-            </Text>
+            </Text> */}
           </View>
         </View>
         <ListView

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

@@ -45,7 +45,7 @@
   .schedule-list-add-btn {
     right: 0;
     left: 0;
-    bottom: 30px;
+    bottom: 50px;
     width: 106px;
     height: 106px;
     margin: 0 auto;
@@ -59,5 +59,10 @@
     background-color: $bgColor;
     background-image: linear-gradient(176deg, #ffab20 0%, #ff720e 97%);
     box-shadow: 0 8px 10px 0 rgba(226, 124, 64, 0.2);
+
+    .icon {
+      width: 38px;
+      height: 38px;
+    }
   }
 }

src/pages/home/film/schedule_list/index.tsx

 import api from '@/api/index'
 import { ComponentClass } from 'react'
-import { View, Text, Icon } from '@tarojs/components'
+import { View, Text, Image } from '@tarojs/components'
 import { showMyToast } from '@/common/utils'
 import ListView from '@/conpoments/list_view'
 import Taro, { Component, Config } from '@tarojs/taro'
-import { AtList, AtListItem, AtSwipeAction } from 'taro-ui'
+import { AtSwipeAction } from 'taro-ui'
 
 import './index.scss'
 
@@ -43,7 +43,8 @@ interface Schedule {
 
 class Schedule extends Component {
   config: Config = {
-    navigationBarTitleText: ''
+    navigationBarTitleText: '日程',
+    navigationStyle: process.env.TARO_ENV === 'rn' ? 'custom' : 'default'
   }
   protected page = 1
 
@@ -188,9 +189,10 @@ class Schedule extends Component {
           ))}
         </ListView>
         <View className="schedule-list-add-btn">
-          <Text className="icon" onClick={this.addSchedule}>
-            +
-          </Text>
+          <Image
+            className="icon"
+            src="https://visual-clouds.oss-cn-beijing.aliyuncs.com/miniprogram/create.png"
+          />
         </View>
       </View>
     )

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

@@ -34,11 +34,13 @@
   width: 100%;
   height: 187px;
   background-color: #ccc;
+  border-radius: 6px;
 }
 
 .temp-img2 {
   width: 100%;
   height: 613px;
+  border-radius: 6px;
 }
 
 .temp-name-container {

src/pages/home/tempaltes/film_edit_info.tsx

@@ -119,14 +119,14 @@ class FilmDetail extends Component {
     return (
       <View className="film-detail">
         <View className="film-modal">
-          <Text className="film-modal-text">作品名称</Text>
+          <Text className="film-modal-text">作品名称:</Text>
           <Input
             placeholder="请输入作品名称"
             className="film-modal-input"
             value={filmInfo.templateName}
             onInput={this.changeFilmName}
           />
-          <Text className="film-modal-text">作品描述</Text>
+          <Text className="film-modal-text">作品描述:</Text>
           <Input
             placeholder="请输入作品描述"
             className="film-modal-input"
@@ -134,16 +134,17 @@ class FilmDetail extends Component {
             onInput={this.changeDescribeName}
           />
         </View>
-        <Button
-          className="btn-max"
-          type="primary"
-          size="default"
-          onClick={() => {
-            this.inputConfirm()
-          }}
-        >
-          确定
-        </Button>
+        <View className="bottom-btn-container">
+          <Button
+            className="btn-max bottom-btn"
+            size="default"
+            onClick={() => {
+              this.inputConfirm()
+            }}
+          >
+            确定
+          </Button>
+        </View>
       </View>
     )
   }

src/pages/home/tempaltes/scss/film_detail.scss

 @import '@styles/var.scss';
+@import '@styles/common.scss';
 
 .film-detail {
   width: 100%;
   height: 100%;
   display: flex;
   flex-direction: column;
-  background-color: white;
+  background-color: $bgColor;
 
   .btn-max {
     display: block;
@@ -53,18 +54,27 @@
 }
 
 .film-modal {
-  padding: 20px 50px;
+  padding: 20px 27px;
+  display: flex;
+  flex-direction: column;
 
   &-text {
+    padding: 15px 0 24px;
     font-size: 28px;
+    font-family: PingFangSC-Medium, PingFang SC;
+    font-weight: 500;
+    color: rgba(153, 153, 153, 1);
+    margin-bottom: 0;
   }
 
   &-input {
-    padding: 10px;
-    font-size: 28px;
-    border-radius: 6px;
-    margin: 15px 0 20px;
-    color: $input-color;
-    border: 1px solid $border-color;
+    box-sizing: border-box;
+    padding: 10px 20px;
+    width: 100%;
+    height: 88px;
+    background: rgba(255, 255, 255, 1);
+    border-radius: 5px;
+    color: #000;
+    font-size: 30px;
   }
 }

src/pages/home/tempaltes/scss/temp-type.scss

@@ -19,7 +19,7 @@
 
   .type-item {
     padding: 20px;
-    // padding-right: 10px;
+    padding-right: 10px;
 
     &-title {
       padding-top: 54px;

src/pages/home/tempaltes/template_type.tsx

@@ -56,8 +56,9 @@ class TemplateTypeDetail extends Component {
   }
 
   goTypeDetail(tagId, typeId, typeName) {
+    console.log(typeId, typeName)
     Taro.navigateTo({
-      url: `/pages/home/tempaltes/template_type_detail?typeId=${typeId}&typeName=${typeName}`
+      url: `/pages/home/tempaltes/template_type_detail?typeId=${typeId}&typeName=${typeName}&tagId=${tagId}`
     })
   }