From ae9de5d810362112f2abfc264e522aa44e703e8e Mon Sep 17 00:00:00 2001
From: king <2229249788@qq.com>
Date: Mon, 14 Aug 2023 13:55:43 +0800
Subject: [PATCH] =?UTF-8?q?=E7=8E=B0=E5=9C=BA=E4=BC=9A=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/popPut/popPut.tsx              |  5 +--
 .../manage/spotMeeting/spotMeeting.config.ts  |  5 ++-
 .../spotMeeting/spotMeeting.module.scss       | 13 +++++++
 src/pages/manage/spotMeeting/spotMeeting.tsx  | 37 ++++++++++++-------
 src/static/css/module.scss                    |  3 +-
 5 files changed, 44 insertions(+), 19 deletions(-)

diff --git a/src/components/popPut/popPut.tsx b/src/components/popPut/popPut.tsx
index d9f2a0d..ea557ca 100644
--- a/src/components/popPut/popPut.tsx
+++ b/src/components/popPut/popPut.tsx
@@ -1,9 +1,8 @@
 import {FC, ReactNode, useEffect, useState} from "react";
-import {View, Image, Text} from "@tarojs/components";
+import {View, Image} from "@tarojs/components";
 import Icon from "@/components/icon";
 import CustomPageContainer from "@/components/custom-page-container/custom-page-container";
 
-
 interface Props {
   height?: number | string
   title: string
@@ -51,7 +50,7 @@ const PopPut: FC<Props> = ({title, chevron, content, image, isProp, children, sh
           <View>{title}</View>
         </View>
         <View className='card-content'>
-          <Text>{content}</Text>
+          <View>{content}</View>
           {!chevron && <Icon name='chevron-right'/>}
           {image && <Image src={image} mode='scaleToFill' className='image'/>}
         </View>
diff --git a/src/pages/manage/spotMeeting/spotMeeting.config.ts b/src/pages/manage/spotMeeting/spotMeeting.config.ts
index 475c44d..6b0f119 100644
--- a/src/pages/manage/spotMeeting/spotMeeting.config.ts
+++ b/src/pages/manage/spotMeeting/spotMeeting.config.ts
@@ -1,4 +1,7 @@
 export default definePageConfig({
   navigationBarTitleText: '现场会',
-  enableShareAppMessage: true
+  enableShareAppMessage: true,
+  navigationBarBackgroundColor: '#00d6ac',
+  backgroundColor: '#00d6ac',
+  navigationBarTextStyle: 'white',
 })
diff --git a/src/pages/manage/spotMeeting/spotMeeting.module.scss b/src/pages/manage/spotMeeting/spotMeeting.module.scss
index 51ac92e..e0e99f7 100644
--- a/src/pages/manage/spotMeeting/spotMeeting.module.scss
+++ b/src/pages/manage/spotMeeting/spotMeeting.module.scss
@@ -26,6 +26,19 @@
   position: relative;
 }
 
+.empty{
+  position: absolute;
+  left: 0;
+  right: 0;
+  top: 0;
+  bottom: 0;
+  margin: auto;
+  width: 300rpx;
+  height: 40rpx;
+  text-align: center;
+  font-weight: bold;
+}
+
 .failure{
   width: 180rpx;
   height: 180rpx;
diff --git a/src/pages/manage/spotMeeting/spotMeeting.tsx b/src/pages/manage/spotMeeting/spotMeeting.tsx
index f1d4dd4..ed67854 100644
--- a/src/pages/manage/spotMeeting/spotMeeting.tsx
+++ b/src/pages/manage/spotMeeting/spotMeeting.tsx
@@ -1,5 +1,5 @@
 import {FC, useCallback, useEffect, useState} from "react";
-import {Form, Image, Input, Picker, Textarea, View} from "@tarojs/components";
+import {Form, Image, Input, Picker, View} from "@tarojs/components";
 import Taro, {getSetting, authorize} from "@tarojs/taro";
 import {curriculum, Meeting, meetingAPi} from "@/api";
 import {formatDate} from "@/utils/time";
@@ -227,14 +227,23 @@ const SpotMeeting: FC = () => {
     <View className={styles.page}>
 
       <View className={styles.box}>
-        <View>填完信息才能生成二维码</View>
+        <View>现场会</View>
         {process.env.TARO_ENV === 'h5' && <View className='text-center text-muted'>微信公众号，浏览器中请截图保存</View>}
 
         <View className={styles.code}>
           {
             imgUrl
-              ? <Image src={imgUrl} mode='aspectFit' onLoad={imagLoad} onError={imagLoad} fadeIn/>
-              : <Image src={code} mode='aspectFit'/>
+              ? <Image
+                src={imgUrl}
+                mode='aspectFit'
+                style={{width: '150px'}}
+                onLoad={imagLoad}
+                onError={imagLoad}
+                fadeIn/>
+              : <>
+                <View className={styles.empty}>填完写完整信息</View>
+                <Image src={code} mode='aspectFit' style={{width: '150px'}}/>
+              </>
           }
           {status === 2 && <Image src={failure} className={styles.failure}/>}
         </View>
@@ -279,16 +288,16 @@ const SpotMeeting: FC = () => {
               <PopPut title='选择部门' content={manages?.find(x => x.id == depid)?.name}/>
             </Picker>
 
-            <Textarea
-              value={description}
-              className='Textarea'
-              disabled={!!params.id || status === 1}
-              placeholder='请输入描述'
-              maxlength={255}
-              name='description'
-              onInput={(e) => setDescription(e.detail.value)}
-              style={{height: '60px'}}>
-            </Textarea>
+            {/*<Textarea*/}
+            {/*  value={description}*/}
+            {/*  className='Textarea'*/}
+            {/*  disabled={!!params.id || status === 1}*/}
+            {/*  placeholder='请输入描述'*/}
+            {/*  maxlength={255}*/}
+            {/*  name='description'*/}
+            {/*  onInput={(e) => setDescription(e.detail.value)}*/}
+            {/*  style={{height: '60px'}}>*/}
+            {/*</Textarea>*/}
 
             {
               id !== undefined && <>
diff --git a/src/static/css/module.scss b/src/static/css/module.scss
index 1df6bc3..f77d02a 100644
--- a/src/static/css/module.scss
+++ b/src/static/css/module.scss
@@ -49,7 +49,7 @@ taro-button-core::after {
   align-items: center;
   justify-content: space-between;
   border-bottom: 1px solid #F5F8F7;
-  padding: 10px 20rpx;
+  padding: 20rpx;
   font-size: 30rpx;
 
   &-content {
@@ -74,6 +74,7 @@ taro-button-core::after {
   box-sizing: border-box;
   border: 1px solid #ddd;
   height: 200px;
+  text-align: left;
 }
 
 .button {