Merge branch 'final' of http://120.77.240.215:9701/Maple/tostumi.git into final

src/pages/UserManagement/ServiceProviderManagement/AccoutingContent.tsx

@@ -39,7 +39,7 @@ const AccoutingContent = (props: {
     confirm({
       title: 'Warning',
       icon: <ExclamationCircleOutlined />,
-      content: 'Are you sure want to write off?',
+      content: 'Are you sure want to Delete?',
       onOk() {
         setLoading(true);
         dispatch({ type: 'ServiceProvider/DelServiceProvider', playload: { id } });
@@ -100,12 +100,12 @@ const AccoutingContent = (props: {
                 danger
                 onClick={handleClick.bind(this, SaveChooseData.id)}
               >
-                Write Off
+                Delete
               </Button>
             </div>
           ) : (
-            <div />
-          )}
+              <div />
+            )}
 
           <div className={styles.box1}>
             <div className={styles.box1item1}>Company Name</div>
@@ -142,8 +142,8 @@ const AccoutingContent = (props: {
           </div>
         </Spin>
       ) : (
-        <></>
-      )}
+          <></>
+        )}
     </div>
   );
 };

src/pages/UserManagement/ServiceProviderManagement/Detail.tsx

@@ -85,7 +85,7 @@ const Detail = (props: any) => {
     confirm({
       title: 'Warning',
       icon: <ExclamationCircleOutlined />,
-      content: 'Are you sure want to write off?',
+      content: 'Are you sure want to Delete?',
       onOk() {
         setLoding(true);
         dispatch({ type: 'ServiceProvider/DelServiceProvider', playload: { id } });
@@ -126,12 +126,12 @@ const Detail = (props: any) => {
                   danger
                   onClick={handleClick.bind(this, SaveChooseData.id)}
                 >
-                  Write Off
+                  Delete
                 </Button>
               </div>
             ) : (
-              <div />
-            )}
+                <div />
+              )}
             <div className={styles.bigbox}>
               <div className={styles.box0}>
                 {/* <div className={styles.box0item1}></div> */}
@@ -171,8 +171,8 @@ const Detail = (props: any) => {
               {SaveChooseData.serviceCommunityList != null ? (
                 <ShowOptions list={SaveChooseData.serviceCommunityList} defaultValue={'Close'} />
               ) : (
-                <></>
-              )}
+                  <></>
+                )}
             </div>
 
             <div className={styles.box7}>