diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index aba950566..b8bf92901 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="9830c5da-176a-4c72-a301-9f6ce98c82fe" name="Default Changelist" comment="" />
+    <list default="true" id="9830c5da-176a-4c72-a301-9f6ce98c82fe" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/forge/Main/CoderRootDirectory.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Main/CoderRootDirectory.js" afterDir="false" />
+    </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -10,47 +13,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/forge/Settings/Setting.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="144">
-              <caret line="145" column="58" selection-start-line="145" selection-start-column="58" selection-end-line="145" selection-end-column="58" />
-              <folding>
-                <element signature="e#0#42#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/forge/Order/Milepost.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-513">
-              <caret line="97" selection-start-line="97" selection-end-line="97" />
-              <folding>
-                <element signature="e#0#40#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/forge/Settings/Collaborator.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="253">
-              <caret line="17" column="37" lean-forward="true" selection-start-line="17" selection-start-column="37" selection-end-line="17" selection-end-column="37" />
-              <folding>
-                <element signature="e#0#42#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/forge/Main/CoderRootDirectory.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="177">
-              <caret line="65" column="28" lean-forward="true" selection-start-line="65" selection-start-column="28" selection-end-line="65" selection-end-column="28" />
+            <state relative-caret-position="-3676">
+              <caret line="15" column="26" selection-start-line="15" selection-start-column="26" selection-end-line="15" selection-end-column="26" />
               <folding>
                 <element signature="e#0#42#0" expanded="true" />
               </folding>
@@ -59,70 +26,10 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/forge/Main/CoderRootFileDetail.js">
+        <entry file="file://$PROJECT_DIR$/src/forge/Main/CoderRootDirectorytext.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="98">
-              <caret line="110" column="77" selection-start-line="110" selection-start-column="67" selection-end-line="110" selection-end-column="77" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/forge/New/Index.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="199">
-              <caret line="245" column="59" lean-forward="true" selection-start-line="245" selection-start-column="59" selection-end-line="245" selection-end-column="59" />
-              <folding>
-                <element signature="e#0#42#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/forge/Version/version.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="61">
-              <caret line="91" column="34" selection-start-line="91" selection-start-column="34" selection-end-line="91" selection-end-column="34" />
-              <folding>
-                <element signature="e#0#42#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/forge/Order/order.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="2193">
-              <caret line="352" column="14" selection-start-line="352" selection-start-column="14" selection-end-line="352" selection-end-column="14" />
-              <folding>
-                <element signature="e#0#42#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/forge/Order/OrderItem.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="461">
-              <caret line="41" column="22" selection-start-line="41" selection-start-column="22" selection-end-line="41" selection-end-column="22" />
-              <folding>
-                <element signature="e#0#42#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/forge/Order/Detail.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="246">
-              <caret line="504" column="20" selection-start-line="504" selection-start-column="20" selection-end-line="504" selection-end-column="20" />
-              <folding>
-                <element signature="e#0#40#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="596">
+              <caret line="237" column="13" selection-start-line="237" selection-start-column="13" selection-end-line="237" selection-end-column="13" />
             </state>
           </provider>
         </entry>
@@ -131,36 +38,36 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>Educoder</find>
-      <find>title</find>
-      <find>textcount</find>
-      <find>forks</find>
-      <find>commentCtx</find>
-      <find>上传文件</find>
-      <find>subFileType</find>
-      <find>.ide</find>
-      <find>.idea</find>
-      <find>deleteUser</find>
-      <find>axios.delete</find>
-      <find>style=</find>
-      <find>width75f</find>
-      <find>max-width</find>
-      <find>请输入合并</find>
-      <find>journal-list-item</find>
-      <find>issue-tag-show</find>
-      <find>创建</find>
-      <find>.map((item,key)=&gt;{</find>
-      <find>.map((item,key)</find>
-      <find>评论成</find>
-      <find>该合并请求可以进行自动合并操作</find>
-      <find>没有</find>
       <find>创建工单</find>
       <find>可读权限</find>
       <find>sub_entries</find>
-      <find>可读</find>
-      <find>icon-bianji</find>
-      <find>readOnly</find>
       <find>isRe</find>
+      <find>icon-bianji</find>
+      <find>可读</find>
+      <find>journals_count &gt;</find>
+      <find>readOnly</find>
+      <find>Fork</find>
+      <find>forked</find>
+      <find>.OptionsUl</find>
+      <find>tyle=</find>
+      <find>overflo</find>
+      <find>&lt;span className=&quot;span_title&quot;&gt;里程碑&lt;/span&gt;</find>
+      <find>&lt;span className=&quot;span_title&quot;&gt;里程碑</find>
+      <find>分支合并到</find>
+      <find>Input</find>
+      <find>新建标签</find>
+      <find>orderid</find>
+      <find>deletedetail</find>
+      <find>onMouseMove</find>
+      <find>TextArea</find>
+      <find>body</find>
+      <find>该合并请求可以进行自动合并操作</find>
+      <find>title</find>
+      <find>changbodypr</find>
+      <find>&lt;Select</find>
+      <find>commitKey</find>
+      <find>CoderRootDirectorytext</find>
+      <find>CoderRootDirectory</find>
     </findStrings>
     <dirStrings>
       <dir>$PROJECT_DIR$</dir>
@@ -176,10 +83,8 @@
     <option name="CHANGED_PATHS">
       <list>
         <option value="$PROJECT_DIR$/src/AppConfig.js" />
-        <option value="$PROJECT_DIR$/src/forge/Version/NewVersion.js" />
         <option value="$PROJECT_DIR$/src/forge/Order/newMilepost.js" />
         <option value="$PROJECT_DIR$/src/forge/Index.js" />
-        <option value="$PROJECT_DIR$/src/forge/Main/CoderRootFileDetail.js" />
         <option value="$PROJECT_DIR$/src/forge/Order/Tags.js" />
         <option value="$PROJECT_DIR$/src/modules/tpm/NewHeader.js" />
         <option value="$PROJECT_DIR$/src/forge/Order/New.js" />
@@ -187,35 +92,43 @@
         <option value="$PROJECT_DIR$/src/forge/Order/CopyDetail.js" />
         <option value="$PROJECT_DIR$/src/forge/Merge/NewMerge.js" />
         <option value="$PROJECT_DIR$/src/forge/Merge/MergeSubmit.js" />
-        <option value="$PROJECT_DIR$/src/forge/Main/Detail.js" />
-        <option value="$PROJECT_DIR$/src/forge/Main/CoderRootDirectory.js" />
         <option value="$PROJECT_DIR$/src/forge/Settings/Setting.js" />
         <option value="$PROJECT_DIR$/.gitignore" />
         <option value="$PROJECT_DIR$/src/forge/Newfile/UserSubmitComponent.js" />
-        <option value="$PROJECT_DIR$/src/forge/Settings/Collaborator.js" />
-        <option value="$PROJECT_DIR$/src/forge/Merge/merge.js" />
         <option value="$PROJECT_DIR$/src/forge/Activity/Activity.js" />
         <option value="$PROJECT_DIR$/src/forge/Merge/merge.css" />
+        <option value="$PROJECT_DIR$/src/forge/Version/version.js" />
+        <option value="$PROJECT_DIR$/src/forge/Order/Milepost.js" />
+        <option value="$PROJECT_DIR$/src/forge/New/Index.js" />
+        <option value="$PROJECT_DIR$/src/forge/Main/CoderRootFileDetail.js" />
+        <option value="$PROJECT_DIR$/src/forge/Main/Detail.js" />
+        <option value="$PROJECT_DIR$/src/forge/Settings/Collaborator.js" />
+        <option value="$PROJECT_DIR$/src/forge/Settings/setting.css" />
+        <option value="$PROJECT_DIR$/src/forge/Order/OrderItem.js" />
+        <option value="$PROJECT_DIR$/src/forge/Merge/merge.js" />
         <option value="$PROJECT_DIR$/src/forge/Order/order.css" />
         <option value="$PROJECT_DIR$/src/forge/Merge/MergeDetail.js" />
-        <option value="$PROJECT_DIR$/src/forge/Version/version.js" />
-        <option value="$PROJECT_DIR$/src/forge/Merge/MessageCount.js" />
-        <option value="$PROJECT_DIR$/src/forge/Order/Milepost.js" />
         <option value="$PROJECT_DIR$/src/forge/Order/Detail.js" />
-        <option value="$PROJECT_DIR$/src/forge/New/Index.js" />
+        <option value="$PROJECT_DIR$/src/forge/Version/NewVersion.js" />
+        <option value="$PROJECT_DIR$/src/forge/Merge/MergeItem.js" />
+        <option value="$PROJECT_DIR$/src/forge/Version/UpdateVersion.js" />
+        <option value="$PROJECT_DIR$/src/forge/Branch/branch.css" />
+        <option value="$PROJECT_DIR$/src/forge/Merge/MessageCount.js" />
+        <option value="$PROJECT_DIR$/src/forge/Main/CoderRootDirectory.js" />
+        <option value="$PROJECT_DIR$/src/forge/Main/CoderRootDirectorytext.js" />
       </list>
     </option>
   </component>
   <component name="ProjectFrameBounds" fullScreen="true">
+    <option name="y" value="23" />
     <option name="width" value="1440" />
-    <option name="height" value="900" />
+    <option name="height" value="877" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -239,19 +152,13 @@
               <item name="forgeplus-react" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="forge" type="462c0819:PsiDirectoryNode" />
-              <item name="New" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="forgeplus-react" type="b2602c69:ProjectViewProjectNode" />
-              <item name="forgeplus-react" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="forge" type="462c0819:PsiDirectoryNode" />
-              <item name="Settings" type="462c0819:PsiDirectoryNode" />
+              <item name="Main" type="462c0819:PsiDirectoryNode" />
             </path>
           </expand>
           <select />
         </subPane>
       </pane>
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -300,18 +207,19 @@
       <workItem from="1585217705353" duration="104000" />
       <workItem from="1585217834609" duration="4000" />
       <workItem from="1585217980103" duration="3406000" />
-      <workItem from="1585288258489" duration="15174000" />
+      <workItem from="1585288258489" duration="17495000" />
+      <workItem from="1585732642767" duration="11458000" />
+      <workItem from="1585817691582" duration="1461000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="50215000" />
+    <option name="totallyTimeSpent" value="65455000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1440" height="900" extended-state="0" />
-    <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.16881259" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.17095852" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Favorites" order="2" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
@@ -323,8 +231,8 @@
       <window_info anchor="bottom" id="TODO" order="6" />
       <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
       <window_info anchor="bottom" id="Database Changes" order="8" />
-      <window_info anchor="bottom" id="Version Control" order="9" weight="0.4566265" />
-      <window_info anchor="bottom" id="Terminal" order="10" visible="true" weight="0.38795182" />
+      <window_info anchor="bottom" id="Version Control" order="9" weight="0.61566263" />
+      <window_info active="true" anchor="bottom" id="Terminal" order="10" visible="true" weight="0.36506024" />
       <window_info anchor="bottom" id="Event Log" order="11" side_tool="true" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
@@ -370,37 +278,22 @@
         </entry>
       </map>
     </option>
+    <option name="RECENT_FILTERS">
+      <map>
+        <entry key="Branch">
+          <value>
+            <list />
+          </value>
+        </entry>
+        <entry key="User">
+          <value>
+            <list />
+          </value>
+        </entry>
+      </map>
+    </option>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/forge/Version/UpdateVersion.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-755">
-          <folding>
-            <element signature="e#0#42#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Version/NewVersion.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="698">
-          <caret line="67" column="25" lean-forward="true" selection-start-line="67" selection-start-column="25" selection-end-line="67" selection-end-column="25" />
-          <folding>
-            <element signature="e#0#42#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Order/newMilepost.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="87">
-          <caret line="97" column="23" selection-start-line="97" selection-start-column="23" selection-end-line="97" selection-end-column="23" />
-          <folding>
-            <element signature="e#0#40#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/AppConfig.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="281">
@@ -453,17 +346,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Order/Tags.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="337">
-          <caret line="319" column="18" selection-start-line="319" selection-start-column="18" selection-end-line="319" selection-end-column="18" />
-          <folding>
-            <element signature="e#0#40#0" expanded="true" />
-            <element signature="e#6599#6910#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/forge/quillForEditor/index.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="125">
@@ -515,20 +397,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Order/UpdateDetail.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="175">
-          <caret line="137" column="7" selection-start-line="137" selection-start-column="7" selection-end-line="137" selection-end-column="7" />
-          <folding>
-            <element signature="e#1439#2512#0" />
-            <element signature="e#2533#2593#0" />
-            <element signature="e#2616#2676#0" />
-            <element signature="e#2694#2754#0" />
-            <element signature="e#2875#2951#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/index.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="221">
@@ -549,34 +417,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Main/DetailTop.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <folding>
-            <element signature="e#0#42#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Main/Index.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-3990">
-          <folding>
-            <element signature="e#0#42#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Main/Detail.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="4777">
-          <caret line="303" column="11" selection-start-line="303" selection-start-column="11" selection-end-line="303" selection-end-column="11" />
-          <folding>
-            <element signature="e#0#42#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/.idea/workspace.xml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-9766" />
@@ -628,15 +468,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Merge/MergeItem.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-12">
-          <folding>
-            <element signature="e#0#42#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/forge/Merge/NewMerge.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-1216">
@@ -666,43 +497,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Order/order.css">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="204">
-          <caret line="464" column="1" lean-forward="true" selection-start-line="464" selection-start-column="1" selection-end-line="464" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Merge/MergeDetail.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="143">
-          <caret line="244" column="11" selection-start-line="244" selection-start-column="11" selection-end-line="244" selection-end-column="11" />
-          <folding>
-            <element signature="e#0#40#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Merge/MessageCount.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="63">
-          <caret line="580" column="22" selection-start-line="580" selection-start-column="22" selection-end-line="580" selection-end-column="22" />
-          <folding>
-            <element signature="e#0#40#0" expanded="true" />
-            <element signature="e#16273#18539#0" />
-            <element signature="e#17250#18162#0" />
-            <element signature="e#18177#18487#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Merge/merge.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="432">
-          <caret line="299" column="61" selection-start-line="299" selection-start-column="61" selection-end-line="299" selection-end-column="61" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/forge/Order/MilepostDetail.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-3903">
@@ -722,20 +516,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Order/order.js">
+    <entry file="file://$PROJECT_DIR$/src/forge/New/Index.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2193">
-          <caret line="352" column="14" selection-start-line="352" selection-start-column="14" selection-end-line="352" selection-end-column="14" />
-          <folding>
-            <element signature="e#0#42#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Order/OrderItem.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="461">
-          <caret line="41" column="22" selection-start-line="41" selection-start-column="22" selection-end-line="41" selection-end-column="22" />
+        <state relative-caret-position="199">
+          <caret line="245" column="59" selection-start-line="245" selection-start-column="59" selection-end-line="245" selection-end-column="59" />
           <folding>
             <element signature="e#0#42#0" expanded="true" />
           </folding>
@@ -744,24 +528,76 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/forge/Order/Detail.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="246">
-          <caret line="504" column="20" selection-start-line="504" selection-start-column="20" selection-end-line="504" selection-end-column="20" />
+        <state relative-caret-position="235">
+          <caret line="102" column="27" selection-start-line="102" selection-start-column="27" selection-end-line="102" selection-end-column="27" />
           <folding>
             <element signature="e#0#40#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Version/version.js">
+    <entry file="file://$PROJECT_DIR$/src/forge/Main/DetailTop.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="61">
-          <caret line="91" column="34" selection-start-line="91" selection-start-column="34" selection-end-line="91" selection-end-column="34" />
+        <state relative-caret-position="306">
+          <caret line="18" column="10" selection-start-line="18" selection-start-column="10" selection-end-line="18" selection-end-column="10" />
           <folding>
             <element signature="e#0#42#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/forge/Main/Index.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="267">
+          <caret line="188" column="19" selection-start-line="188" selection-start-column="19" selection-end-line="188" selection-end-column="19" />
+          <folding>
+            <element signature="e#0#42#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/forge/Settings/Collaborator.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="109">
+          <caret line="189" column="35" lean-forward="true" selection-start-line="189" selection-start-column="35" selection-end-line="189" selection-end-column="35" />
+          <folding>
+            <element signature="e#0#42#0" expanded="true" />
+            <element signature="e#4421#5690#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/forge/Main/Detail.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="225">
+          <caret line="245" column="39" lean-forward="true" selection-start-line="245" selection-start-column="39" selection-end-line="245" selection-end-column="39" />
+          <folding>
+            <element signature="e#0#42#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/forge/Merge/merge.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="246">
+          <caret line="295" column="142" selection-start-line="295" selection-start-column="142" selection-end-line="295" selection-end-column="142" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/forge/Settings/setting.css">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="85">
+          <caret line="47" column="22" selection-start-line="47" selection-start-column="22" selection-end-line="47" selection-end-column="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/forge/Order/order.css">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="150">
+          <caret line="166" column="16" selection-start-line="166" selection-start-column="16" selection-end-line="166" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/forge/Settings/Setting.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="144">
@@ -772,37 +608,145 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Settings/Collaborator.js">
+    <entry file="file://$PROJECT_DIR$/src/forge/Version/version.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="253">
-          <caret line="17" column="37" lean-forward="true" selection-start-line="17" selection-start-column="37" selection-end-line="17" selection-end-column="37" />
+        <state relative-caret-position="354">
+          <caret line="145" column="6" selection-start-line="145" selection-start-column="6" selection-end-line="145" selection-end-column="6" />
           <folding>
             <element signature="e#0#42#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/forge/Order/Tags.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="284">
+          <caret line="354" column="57" selection-start-line="354" selection-start-column="43" selection-end-line="354" selection-end-column="57" />
+          <folding>
+            <element signature="e#0#40#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/forge/Merge/MergeDetail.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="182">
+          <caret line="257" column="23" selection-start-line="257" selection-start-column="23" selection-end-line="257" selection-end-column="23" />
+          <folding>
+            <element signature="e#0#40#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/forge/Order/order.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="144">
+          <caret line="427" column="36" selection-start-line="427" selection-start-column="36" selection-end-line="427" selection-end-column="36" />
+          <folding>
+            <element signature="e#0#42#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/forge/Order/OrderItem.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-40">
+          <caret line="63" column="21" selection-start-line="63" selection-start-column="21" selection-end-line="63" selection-end-column="21" />
+          <folding>
+            <element signature="e#0#42#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/forge/Merge/MergeItem.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="80" column="26" selection-start-line="80" selection-start-column="26" selection-end-line="80" selection-end-column="26" />
+          <folding>
+            <element signature="e#0#42#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/forge/Version/NewVersion.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="256">
+          <caret line="163" column="58" selection-start-line="163" selection-start-column="44" selection-end-line="163" selection-end-column="58" />
+          <folding>
+            <element signature="e#0#42#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/forge/Version/UpdateVersion.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="115">
+          <caret line="155" column="20" selection-start-line="155" selection-start-column="20" selection-end-line="155" selection-end-column="20" />
+          <folding>
+            <element signature="e#0#42#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/forge/Branch/branch.css">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="291">
+          <caret line="27" column="15" selection-start-line="27" selection-start-column="15" selection-end-line="27" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/forge/Main/CoderRootFileDetail.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="98">
-          <caret line="110" column="77" selection-start-line="110" selection-start-column="67" selection-end-line="110" selection-end-column="77" />
+        <state relative-caret-position="252">
+          <caret line="91" column="17" lean-forward="true" selection-start-line="91" selection-start-column="17" selection-end-line="91" selection-end-column="17" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/New/Index.js">
+    <entry file="file://$PROJECT_DIR$/src/forge/Order/newMilepost.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="199">
-          <caret line="245" column="59" lean-forward="true" selection-start-line="245" selection-start-column="59" selection-end-line="245" selection-end-column="59" />
+        <state relative-caret-position="337">
+          <caret line="179" column="36" lean-forward="true" selection-start-line="179" selection-start-column="36" selection-end-line="179" selection-end-column="36" />
           <folding>
-            <element signature="e#0#42#0" expanded="true" />
+            <element signature="e#0#40#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/forge/Order/UpdateDetail.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="458">
+          <caret line="343" column="18" selection-start-line="343" selection-start-column="18" selection-end-line="343" selection-end-column="18" />
+          <folding>
+            <element signature="e#0#40#0" expanded="true" />
+            <element signature="e#1439#2512#0" />
+            <element signature="e#2533#2593#0" />
+            <element signature="e#2616#2676#0" />
+            <element signature="e#2694#2754#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/forge/Merge/MessageCount.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="342">
+          <caret line="601" column="33" lean-forward="true" selection-start-line="601" selection-start-column="33" selection-end-line="601" selection-end-column="33" />
+          <folding>
+            <element signature="e#0#40#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/forge/Main/CoderRootDirectorytext.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="596">
+          <caret line="237" column="13" selection-start-line="237" selection-start-column="13" selection-end-line="237" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/forge/Main/CoderRootDirectory.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="177">
-          <caret line="65" column="28" lean-forward="true" selection-start-line="65" selection-start-column="28" selection-end-line="65" selection-end-column="28" />
+        <state relative-caret-position="-3676">
+          <caret line="15" column="26" selection-start-line="15" selection-start-column="26" selection-end-line="15" selection-end-column="26" />
           <folding>
             <element signature="e#0#42#0" expanded="true" />
           </folding>
diff --git a/src/App.js b/src/App.js
index 1d4d382b8..c67fac722 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1,6 +1,6 @@
 import React, {Component} from 'react';
 import './public-path';
-import logo from './logo.svg';
+// import logo from './logo.svg';
 import './App.css';
 import {ConfigProvider} from 'antd'
 import zhCN from 'antd/lib/locale-provider/zh_CN';
@@ -21,9 +21,9 @@ import Trialapplicationreview from './modules/user/Trialapplicationreview';
 import Addcourses from "./modules/courses/coursesPublic/Addcourses";
 import AccountProfile from "./modules/user/AccountProfile";
 import Accountnewprofile from './modules/user/Accountnewprofile';
-import Trialapplication from './modules/login/Trialapplication';
+// import Trialapplication from './modules/login/Trialapplication';
 import Certifiedprofessional from './modules/modals/Certifiedprofessional';
-import NotFoundPage from './NotFoundPage'
+// import NotFoundPage from './NotFoundPage'
 
 import Loading from './Loading'
 
@@ -481,7 +481,7 @@ class App extends Component {
 		this.setState({
 			mygetHelmetapi: undefined
 		});
-		document.title = "Forge";
+		// document.title = "Forge";
 		var link = document.createElement('link'),
 			oldLink = document.getElementById('dynamic-favicon');
 		link.id = 'dynamic-favicon';
diff --git a/src/AppConfig.js b/src/AppConfig.js
index 9388b124f..fcbd188e7 100644
--- a/src/AppConfig.js
+++ b/src/AppConfig.js
@@ -3,7 +3,7 @@ import React from "react";
 import axios from 'axios';
 import md5 from 'md5';
 import { requestProxy } from "./indexEduplus2RequestProxy";
-import { broadcastChannelOnmessage ,SetAppModel, isDev, queryString } from 'educoder';
+import { broadcastChannelOnmessage , isDev, queryString } from 'educoder';
 import {  notification } from 'antd';
 import cookie from 'react-cookies';
 import './index.css';
@@ -322,8 +322,7 @@ export function initAxiosInterceptors(props) {
         //   console.log("401401401")
         // }
         if (response.data.status === 403||response.data.status === "403") {
-
-           locationurl('/403');
+          locationurl('/403');
         }
 
         if (response.data.status === 404) {
diff --git a/src/forge/Branch/branch.css b/src/forge/Branch/branch.css
index a8c1deeec..5f9ae58f6 100644
--- a/src/forge/Branch/branch.css
+++ b/src/forge/Branch/branch.css
@@ -17,20 +17,22 @@
   box-shadow: 0px 0px 1px 1px rgba(134, 134, 134, 0.1);
   border-radius: 3px;
   background: #fff;
-  max-height: 200px;
+  max-height: 300px;
 }
 .OptionsUl{
   max-height: 200px;
   overflow-y: auto;
+  margin-top: 10px;
 }
 .OptionsUl li{
-  height: 22px;
-  line-height: 22px;
-  cursor: pointer;;
+  height: 30px;
+  /*line-height: 22px;*/
+  cursor: pointer;
 }
 .OptionsUl li a{
   display: block;
-  padding-left: 2px;
+  padding: 4px;
+  /*padding-left: 2px;*/
 }
 .OptionsInput{
   height: 32px;
diff --git a/src/forge/Main/CoderRootDirectory.js b/src/forge/Main/CoderRootDirectory.js
index 52e858e74..78fee33c4 100644
--- a/src/forge/Main/CoderRootDirectory.js
+++ b/src/forge/Main/CoderRootDirectory.js
@@ -238,7 +238,8 @@ class CoderRootDirectory extends Component{
                 </React.Fragment>
               :""
             }
-            <Link to={``} className="commitKey">{truncateCommitId(branchLastCommit.last_commit.id)}</Link>
+            <span className="commitKey">{truncateCommitId(branchLastCommit.last_commit.id)}</span>
+            {/*<Link to={``} className="commitKey">{truncateCommitId(branchLastCommit.last_commit.id)}</Link>*/}
             <span className="color-blue flex-1 hide-1">{branchLastCommit.last_commit.message}</span>
             <span>{branchLastCommit.last_commit.time_from_now}</span>
           </div>
diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js
index 0d83e1aa5..b33fb1ed1 100644
--- a/src/forge/Main/Detail.js
+++ b/src/forge/Main/Detail.js
@@ -245,19 +245,25 @@ class Detail extends Component{
 			if (result) {
 				if (result.data.status === 0) {
 					this.props.history.push(`/projects/${result.data.id}/coders`);
+          this.props.showNotification(result.data.message);
 				}
 				this.setState({
           isSpin:false
         })
-        this.props.showNotification(result.data.message);
-      }else{
-        this.setState({
-          isSpin:false
-        })
-       
-        this.props.showNotification(`服务器开小差了`);
+			} else {
+        if(result.data.status !== 401){
+          this.props.showNotification(result.data.message);
+        }else{
+          this.setState({
+            isSpin:false
+          })
+          this.props.showNotification(`服务器开小差了`);
+        }
       }
     }).catch(error=>{
+      this.setState({
+        isSpin:false
+      })
       console.log(error);
     })
   }
diff --git a/src/forge/Main/IndexItem.js b/src/forge/Main/IndexItem.js
index 8633928b2..e8d0faf2b 100644
--- a/src/forge/Main/IndexItem.js
+++ b/src/forge/Main/IndexItem.js
@@ -31,7 +31,7 @@ class IndexItem extends Component{
                 <p className="break_word task-hide flex1" style={{maxHeight:"40px",width:"0"}}>{item.description}</p>
                 <span className="p-r-tags">
                   {/* { item.forked_count ? <span><label>Fork</label><span>{ item.forked_count}</span></span>:"" } */}
-                  <span className="pariseTag"><img src={img_parise} alt="" className="pariseImg"/>点赞 ({ item.praises_count })</span>
+                  <span className="pariseTag"><img src={img_parise} alt="" className="pariseImg"/>赞 ({ item.praises_count })</span>
                   { item.language && item.language.id ? <span><label>{ item.language.name }</label></span>:"" }
                 </span>
               </div>
diff --git a/src/forge/Merge/MergeDetail.js b/src/forge/Merge/MergeDetail.js
index 6a6b82a19..3312ba8f1 100644
--- a/src/forge/Merge/MergeDetail.js
+++ b/src/forge/Merge/MergeDetail.js
@@ -255,10 +255,15 @@ class MergeDetail extends Component{
             </div>
           </p>
           <p className="mt15">{ data && data.issue.description}</p>
-          <p className="mt10 color-grey-c">
+          <p className="mt10">
            <div className={data&&data.issue_status==="关闭"?"closedetail":"opendetail"}>{data&&data.issue_status==="关闭"?"关闭中!":"开启中!"} </div>
-           请求从{data && data.pull_request.head}分支合并到{data && pull_request.base}分支
-            {/* 由 { data && data.issue.author_name} 于 { data && data.issue.created_at }创建{ data && data.issue.journals_count && data.issue.journals_count > 0 ?` · ${data.issue.journals_count} 条评论`:""} */}
+            <span className="color-grey-c">
+              由 { data && data.issue.author_name} 于 { data && data.issue.created_at }创建{ data && data.issue.journals_count && data.issue.journals_count > 0 ?` · ${data.issue.journals_count} 条评论`:""}
+            </span>
+
+             <span className="span_title ml10">
+               请求从<strong> {data && data.pull_request.head} </strong>分支合并到<strong> {data && data.pull_request.base} </strong>分支
+             </span>
           </p>
         </div>
       
@@ -314,9 +319,9 @@ class MergeDetail extends Component{
               <span className="span_title">指派给</span>
               <span>{data && data.issue.assign_user_name}</span>
             </p>
-            <p>
+            <p style={{display: "inline-block",'white-space': "nowrap" }}>
               <span className="span_title">里程碑</span>
-              <span>{data&&data.issue.version===null?"未添加里程碑":data&&data.issue.version.length===0?data.issue.version:'未添加里程碑'}</span>
+              <span className="title_overflow">{data&&data.issue.version===null?"未添加里程碑":data&&data.issue.version.length===0?data.issue.version:'未添加里程碑'}</span>
             </p>
           </div>
         </div>
diff --git a/src/forge/Merge/MergeItem.js b/src/forge/Merge/MergeItem.js
index ea55f1bf4..553a4a6d7 100644
--- a/src/forge/Merge/MergeItem.js
+++ b/src/forge/Merge/MergeItem.js
@@ -1,7 +1,29 @@
 import React , { Component } from 'react';
 import { Link } from 'react-router-dom';
+import {Popconfirm} from "antd";
 
 class MergeItem extends Component{
+  constructor(props){
+    super(props);
+    this.state={
+      //显示 隐藏
+      isdisplay:false,
+      orderid:'',
+    }
+  }
+
+  onMouseMove=(type)=>{
+    this.setState({
+      isdisplay:true,
+      orderid:type
+    })
+  }
+
+  onMouseOut=()=>{
+    this.setState({
+      isdisplay:false
+    })
+  }
 
   set_issue_tags =(issue_tags)=>{
     if(issue_tags && issue_tags.length > 0){
@@ -41,12 +63,23 @@ class MergeItem extends Component{
                     }
                   </p>
                 </div>
-                  <ul className="topWrapper_select">
+                  <ul className="topWrapper_select" onMouseMove={()=>this.onMouseMove(item.id)} onMouseOut={()=>this.onMouseOut()}>
                   <li>{this.set_issue_tags(item.issue_tags)}</li>
                   {/*<li>{item.issue_type || "--"}</li>*/}
                   <li>{item.version || "--"}</li>
                   <li>{item.assign_user_name || "--"}</li>
-                  <li>{ item.journals_count ? <span><i className="iconfont icon-pinglun1 mr3 font-16"></i>{item.journals_count}</span> : "" }</li>
+                  <li>
+                    <div className="flex-1">
+                      <p>
+                        { item.journals_count ? <Link to={`/projects/${projectsId}/merge/${item.pull_request_id}/Messagecount`}><i className="iconfont icon-pinglun1 mr3 font-16"></i>{item.journals_count}</Link> : "" }
+                      </p>
+                      <div className="milepostleft" style={{display:this.state.orderid===item.id&&this.state.isdisplay?'flex':'none'}}>
+                        <div className="grid-item mr15 color-grey-9">
+                          <Link to={`/projects/${projectsId}/merge/${item.pull_request_id}/updatemerge`} className="color-grey-9"><i className="iconfont icon-bianji3 font-14 mr5"></i></Link>
+                        </div>
+                      </div>
+                    </div>
+                  </li>
                 </ul>
               </div>
             )
diff --git a/src/forge/Merge/MessageCount.js b/src/forge/Merge/MessageCount.js
index 22c0f4a7e..60743728f 100644
--- a/src/forge/Merge/MessageCount.js
+++ b/src/forge/Merge/MessageCount.js
@@ -11,7 +11,7 @@ import './merge.css';
 import QuillForEditor from '../quillForEditor';
 import MergeSubmit from './MergeSubmit';
 
-// const TextArea = Input.TextArea;
+const TextArea = Input.TextArea;
 
 const options = [
   ['bold', 'italic', 'underline'],
@@ -20,6 +20,7 @@ const options = [
   ['link', 'image'],
   ['formula']
 ];
+
 class MessageCount extends Component{
   constructor(props){
     super(props);
@@ -182,7 +183,7 @@ class MessageCount extends Component{
         project_id:projectsId,
         id:data.pull_request.id,
         do:mergekey,
-        body:JSON.stringify(body),
+        body:body,
         title:title,
       }).then(result=>{
         if(result){
@@ -250,9 +251,9 @@ class MessageCount extends Component{
       })  
     }
 
-    changbodypr=(value)=>{
+    changbodypr=(e)=>{
       this.setState({
-        body:value
+        body:e.target.value
       })
     }
     editdetail=(count,status)=>{
@@ -502,11 +503,13 @@ class MessageCount extends Component{
           }
           <p className="mt10 color-grey-c">
            <span className={data&&data.issue.issue_status==="关闭"?"closedetail":data&&data.pull_request.status===0?"opendetail":"prdetail"}>{data&&data.issue.issue_status==="关闭"?"关闭中":data&&data.pull_request.status===0?"开启中":"已合并"} </span>
-            <span className="ml10 lineH32">
-              请求从{data && data.pull_request.head}分支合并到{data && data.pull_request.base}分支
-           
-              {/* 由 { data && data.issue.author_name} 于 { data && data.issue.created_at }创建{ data && data.issue.journals_count && data.issue.journals_count > 0 ?` · ${data.issue.journals_count} 条评论`:""} */}
+            <span className="color-grey-c ml10">
+              由 { data && data.issue.author_name} 于 { data && data.issue.created_at }创建{ data && data.issue.journals_count && data.issue.journals_count > 0 ?` · ${data.issue.journals_count} 条评论`:""}
             </span>
+
+            <span className="span_title ml10">
+               请求从<strong> {data && data.pull_request.head} </strong>分支合并到<strong> {data && data.pull_request.base} </strong>分支
+             </span>
             <span className="pull-right lineH32">
                {
                  data && data.issue.user_permission ?
@@ -564,21 +567,21 @@ class MessageCount extends Component{
 
                         <div style={{display:this.state.ismesrge,marginTop:15}}>
                           <Input placeholder="标题" value={this.state.title} onChange={this.changtitlepr}/>
-                          <div className="quillContent" style={{marginTop:"20px"}}>
-                            <QuillForEditor
-                              value = {this.state.body}
-                              wrapStyle={{
-                                height: '220px',
-                                opacity:1,
-                              }}
-                              // autoFocus={true}
-                              style={{ height: '170px' }}
-                              placeholder="请输入合并请求描述..."
-                              options={options}
-                              onContentChange={this.changbodypr}
-                            />
-                          </div>
-                          {/* <TextArea placeholder="请输入合并描述..." style={{height:"300px",marginTop:15}} value={this.state.body} onChange={this.changbodypr} /> */}
+                          {/*<div className="quillContent" style={{marginTop:"20px"}}>*/}
+                            {/*<QuillForEditor*/}
+                              {/*value = {this.state.body}*/}
+                              {/*wrapStyle={{*/}
+                                {/*height: '220px',*/}
+                                {/*opacity:1,*/}
+                              {/*}}*/}
+                              {/*// autoFocus={true}*/}
+                              {/*style={{ height: '170px' }}*/}
+                              {/*placeholder="请输入合并请求描述..."*/}
+                              {/*options={options}*/}
+                              {/*onContentChange={this.changbodypr}*/}
+                            {/*/>*/}
+                          {/*</div>*/}
+                           <TextArea placeholder="请输入合并描述..." style={{height:"170px",marginTop:20}} value={this.state.body} onChange={this.changbodypr} />
                         </div>
                         <p className="clearfix mt15" style={{display:this.state.buttonshow}}>
                           <a className="topWrapper_btn " type="submit" onClick={()=>this.prmerge()}>合并请求</a>
@@ -636,9 +639,9 @@ class MessageCount extends Component{
                     data && data.issue.issue_tags ? <span className="issue-tag-show" style={{background: data.issue.issue_tags[0].color}}>{data.issue.issue_tags[0].name}</span> : "--"
                   }</span>
                 </p>
-                <p>
+                <p style={{display: "inline-block",'white-space': "nowrap" }}>
                   <span className="span_title">里程碑</span>
-                  <span>{
+                  <span className="title_overflow">{
                     data && data.issue.version ? data.issue.version : "--"
                   }</span>
                 </p>
diff --git a/src/forge/Order/Detail.js b/src/forge/Order/Detail.js
index 6f2dba645..aa2360656 100644
--- a/src/forge/Order/Detail.js
+++ b/src/forge/Order/Detail.js
@@ -574,9 +574,9 @@ class Detail extends Component{
                 data && data.issue_tags ? <span className="issue-tag-show" style={{background: data.issue_tags[0].color}}>{data.issue_tags[0].name}</span> : "--"
               }</span>
             </p>
-            <p>
+            <p style={{display: "inline-block",'white-space': "nowrap" }}>
               <span className="span_title">里程碑</span>
-              <span>{
+              <span className="title_overflow">{
                 data && data.version ? data.version : "--"
               }</span>
             </p>
diff --git a/src/forge/Order/OrderItem.js b/src/forge/Order/OrderItem.js
index af851218d..ba09be430 100644
--- a/src/forge/Order/OrderItem.js
+++ b/src/forge/Order/OrderItem.js
@@ -77,7 +77,8 @@ class OrderItem extends Component{
                   <li>{item.assign_user_name || "--"}</li>
                   <li><p style={{width:60,height:25,margin:'auto', paddingTop:2,background:item.priority==='高'?'#e67e22':item.priority==='正常'?'#28be6c':item.priority==='低'?'#1abc9c':'#e74c3c',color:'#ffffff',borderRadius:4}}>{item.priority|| "--"}</p></li>
                   <li>{item.done_ratio || "--"}</li>
-                  <li><div className="flex-1">
+                  <li>
+                    <div className="flex-1">
                   <p>
                   { item.journals_count ? <Link to={`/projects/${projectsId}/orders/${item.id}/detail`}><i className="iconfont icon-pinglun1 mr3 font-16"></i>{item.journals_count}</Link> : "" }
                   </p>
@@ -91,7 +92,8 @@ class OrderItem extends Component{
                      </Popconfirm>
                     </div>                                              
                   </div>
-                </div></li>
+                </div>
+                  </li>
                   
 
                 </ul>
diff --git a/src/forge/Order/UpdateDetail.js b/src/forge/Order/UpdateDetail.js
index 438a44ecc..638f5330b 100644
--- a/src/forge/Order/UpdateDetail.js
+++ b/src/forge/Order/UpdateDetail.js
@@ -9,9 +9,7 @@ import{ Modal , Form , Input , Select } from 'antd'
 
 import Attachments from '../Upload/attachment';
 import QuillForEditor from '../quillForEditor';
-import { QuillDeltaToHtmlConverter } from 'quill-delta-to-html'
 
-const TextArea = Input.TextArea;
 const Option = Select.Option;
 
 const options = [
@@ -136,6 +134,51 @@ class UpdateDetail extends Component{
           )
         }
       }
+  
+      // 切换完成度
+      changeRatio=(e)=>{
+        if(e === 0){
+          this.props.form.setFieldsValue({
+            status_id:1
+          })
+          this.setState({
+            status_id:1
+          })
+        }else if(e === 100){
+          this.props.form.setFieldsValue({
+            status_id:3
+          })
+          this.setState({
+            status_id:3
+          })
+        }else{
+          this.props.form.setFieldsValue({
+            status_id:2
+          })
+          this.setState({
+            status_id:2
+          })
+        }
+      }
+      // 切换状态
+      changeStatus=(e)=>{
+        // console.log(e);
+        if(e === 1){
+          this.props.form.setFieldsValue({
+            done_ratio:0
+          })
+          this.setState({
+            done_ratio:0
+          })
+        }else if(e === 3){
+          this.props.form.setFieldsValue({
+            done_ratio:100
+          })
+          this.setState({
+            done_ratio:100
+          })
+        }
+      }
   stringJson=(value) =>{
     let _value = null;
 
@@ -300,7 +343,7 @@ class UpdateDetail extends Component{
                       required: true, message: '请选择完成状态'
                     }],
                   })(
-                    <Select >
+                    <Select onChange={this.changeStatus}>
                       { this.renderSelect(issue_chosen && issue_chosen.issue_status) }
                     </Select>
                   )}
@@ -355,7 +398,7 @@ class UpdateDetail extends Component{
                       required: true, message: '请选择完成度'
                     }],
                   })(
-                    <Select value={done_ratio}>
+                    <Select value={done_ratio} onChange={this.changeRatio}>
                       { this.renderSelect(issue_chosen && issue_chosen.done_ratio) }
                     </Select>
                   )}
diff --git a/src/forge/Order/order.css b/src/forge/Order/order.css
index 6fc05c65b..78b1b22be 100644
--- a/src/forge/Order/order.css
+++ b/src/forge/Order/order.css
@@ -164,6 +164,15 @@
 .topWrapper .ant-btn.ant-input-search-button{
   height: 30px;
 }
+.title_overflow{
+  max-width: 220px;
+  white-space: nowrap;
+  overflow: hidden;
+  display: inline-flex;
+  white-space: nowrap;
+  -o-text-overflow: ellipsis;
+  text-overflow: ellipsis;
+}
 .topWrapper_select li{
   text-align: center;
   cursor: pointer;
diff --git a/src/forge/Settings/Collaborator.js b/src/forge/Settings/Collaborator.js
index d94c5967e..da0ae8b00 100644
--- a/src/forge/Settings/Collaborator.js
+++ b/src/forge/Settings/Collaborator.js
@@ -191,6 +191,16 @@ class Collaborator extends Component{
           <div className="normalBox-title font-16">
             协作者
           </div>
+          <div className="addPanel">
+            <AutoComplete
+              dataSource={source}
+              style={{ width: 200 }}
+              onChange={this.changeInputUser}
+              onSelect={this.selectInputUser}
+              placeholder="搜索用户"
+            />
+            <a className="small_submitBtn ml20" onClick={this.addCollaborator}>增加协作者</a>
+          </div>
           <Spin spinning={isSpin}>
             <div className="collaboratorList">
               {
@@ -224,16 +234,7 @@ class Collaborator extends Component{
 
             </div>
           </Spin>
-          <div className="addPanel">
-            <AutoComplete
-              dataSource={source}
-              style={{ width: 200 }}
-              onChange={this.changeInputUser}
-              onSelect={this.selectInputUser}
-              placeholder="搜索用户"
-            />
-            <a className="small_submitBtn ml20" onClick={this.addCollaborator}>增加协作者</a>
-          </div>
+
         </div>
         {
           total_count && total_count > LIMIT ?
diff --git a/src/forge/Settings/setting.css b/src/forge/Settings/setting.css
index 95b03efec..f0ca416d0 100644
--- a/src/forge/Settings/setting.css
+++ b/src/forge/Settings/setting.css
@@ -62,7 +62,7 @@
 }
 .collaboratorItem{
   display: flex;
-  border-bottom: 1px solid #f4f4f4;
+  border-top: 1px solid #f4f4f4;
   padding:15px;
 }
 .collaboratorItem>span{
diff --git a/src/forge/Version/NewVersion.js b/src/forge/Version/NewVersion.js
index 350a929a4..6cda959cb 100644
--- a/src/forge/Version/NewVersion.js
+++ b/src/forge/Version/NewVersion.js
@@ -145,7 +145,7 @@ class NewVersion extends Component{
           <h5 style={{marginLeft:15}}>版本发布组织项目的版本。</h5>
           <Divider/>
           <div  style={{display:'flex'}}>
-          <Input placeholder="标签名称" style={{width:180,marginLeft:15}} value={tag_name} onChange={this.changmodelname}/>
+          <Input placeholder="标签名称" style={{width:180,marginLeft:15}} value={tag_name} onChange={this.changmodelname} />
            <div style={{marginLeft:20,marginRight:20,lineHeight: '32px'}}>@ </div>
           <Dropdown overlay={this.renderMenu(branches &&branches,'pull')} trigger={['click']} placement="bottomCenter">
           <Button style={{width:180}}>{pull}</Button>
@@ -161,7 +161,7 @@ class NewVersion extends Component{
                       required: true, message: '请输入标题'
                     }],
                   })(
-                    <Input placeholder="标题"/>
+                    <Input placeholder="标题" maxLength="32"/>
                   )}
                 </Form.Item>
               </div>
diff --git a/src/forge/Version/UpdateVersion.js b/src/forge/Version/UpdateVersion.js
index 07c82b3ec..231ef869a 100644
--- a/src/forge/Version/UpdateVersion.js
+++ b/src/forge/Version/UpdateVersion.js
@@ -152,7 +152,7 @@ class NewVersion extends Component{
                     initialValue:this.state.data&&this.state.data.name
                     
                   })(
-                    <Input placeholder="标题"/>
+                    <Input placeholder="标题" maxLength="32"/>
                   )}
                 </Form.Item>
               </div>
@@ -173,14 +173,14 @@ class NewVersion extends Component{
           </div>
           
         <Divider/>
-        <div className="fr">
-        <Checkbox  onChange={this.RedieonChange}>标记为预行版</Checkbox>
-        <p>标记此版本不适合生产使用</p>
+        <div style={{textAlign:"right"}}>
+          <Checkbox  onChange={this.RedieonChange}>标记为预行版</Checkbox>
+          <p className="mt5">标记此版本不适合生产使用</p>
         </div>
         <div className="clearfix mt15" style={{marginTop:5}} >
-        <a className='topWrapper_btn_delete fr' onClick={()=>this.deleteversion()} style={{marginLeft:15}}>删除发布</a>  
-        <a className='topWrapper_btn fr' onClick={()=>this.handleSubmit()} style={{marginRight:15}}>编辑发布信息</a>
-        <Link to={`/projects/${projectsId}/version`} style={{marginRight:30}} className='topWrapper_btn fr'>取消</Link>
+          <a className='topWrapper_btn_delete fr' onClick={()=>this.deleteversion()} style={{marginLeft:15}}>删除发布</a>  
+          <a className='topWrapper_btn fr' onClick={()=>this.handleSubmit()} style={{marginRight:15}}>保存发布信息</a>
+          <Link to={`/projects/${projectsId}/version`} style={{marginRight:30}} className='topWrapper_btn fr'>取消</Link>
         </div>
         </Form>
     </div>
diff --git a/src/modules/tpm/NewHeader.js b/src/modules/tpm/NewHeader.js
index 4f8567b95..8cce393dc 100644
--- a/src/modules/tpm/NewHeader.js
+++ b/src/modules/tpm/NewHeader.js
@@ -691,7 +691,7 @@ submittojoinclass=(value)=>{
 		this.setState({
 			mygetHelmetapi2: undefined
 		});
-		document.title = "Forge";
+		// document.title = "Forge";
 		var link = document.createElement('link'),
 			oldLink = document.getElementById('dynamic-favicon');
 		link.id = 'dynamic-favicon';
diff --git a/src/modules/tpm/TPMIndexHOC.js b/src/modules/tpm/TPMIndexHOC.js
index 60ceab86a..2c17791ec 100644
--- a/src/modules/tpm/TPMIndexHOC.js
+++ b/src/modules/tpm/TPMIndexHOC.js
@@ -1,18 +1,18 @@
 import React, { Component } from 'react';
 
-import PropTypes from 'prop-types';
+// import PropTypes from 'prop-types';
 
 import NewHeader from './NewHeader'
 import NewFooter from './NewFooter'
 import SiderBar from './SiderBar'
-import { getUrl, downloadFile } from 'educoder'
+import {  downloadFile } from 'educoder'
 import axios from 'axios';
 import { Spin } from 'antd';
 import './TPMIndex.css';
 import LoginDialog from '../login/LoginDialog';
 import AccountProfile from '../user/AccountProfile';
 import AccountPhoneemail from '../user/AccountPhoneemail';
-import Trialapplication from "../login/Trialapplication";
+// import Trialapplication from "../login/Trialapplication";
 // import "antd/dist/antd.css";
 // import '../../css/educoder/edu-common.css'
 // import '../../css/educoder/edu-all.css'
@@ -20,9 +20,9 @@ import Trialapplication from "../login/Trialapplication";
 
 const $ = window.$;
 const versionNum = '0001';
-let _url_origin='';
+let _url_origin=''; 
 if(window.location.port === "3007"){
-	_url_origin="https://test-newweb.educoder.net";
+	_url_origin="https://testforgeplus.trustie.net";
 }
 if (!window['indexHOCLoaded']) {
   window.indexHOCLoaded = true;
@@ -128,24 +128,24 @@ export function TPMIndexHOC(WrappedComponent) {
 
 	    componentDidMount() {
 	    	// console.log("TPMIndexHOC========");
-	    	// console.log(this.props);
-        window.addEventListener('keyup', this.keyupListener)
+	    	// console.log("match",this.props);
+        window.addEventListener('keyup', this.keyupListener);
 
-	        if(this.props.match.path==="/"){
-              // document.title="创新源于实践";
-            }else if(this.props.match.path==="/403"){
-	        	 document.title="你没有权限访问";
-            }else if(this.props.match.path==="/nopage"){
-            document.title="没有找到该页面";
-            }else if(this.props.match.path==="/shixuns"){
-	        	 document.title="实训项目";
-            }else if(this.props.match.path==="/paths"){
-            document.title="实践课程";
-            }else if(this.props.match.path==="/courses"){
-						document.title="翻转课堂";
-						}else if(this.props.match.path==="/projects"){
-							document.title="开源项目";
-          }
+				if(this.props.match.path==="/"){
+					document.title="Forge";
+				}else if(this.props.match.path==="/403"){
+					document.title="你没有权限访问";
+				}else if(this.props.match.path==="/nopage"){
+					document.title="没有找到该页面";
+				}else if(this.props.match.path==="/shixuns"){
+					document.title="实训项目";
+				}else if(this.props.match.path==="/paths"){
+					document.title="实践课程";
+				}else if(this.props.match.path==="/courses"){
+					document.title="翻转课堂";
+				}else if(this.props.match.path==="/projects"){
+					document.title="开源项目";
+				}
 
         $.ajaxSetup({
 	        cache: true
@@ -264,7 +264,7 @@ export function TPMIndexHOC(WrappedComponent) {
 				this.setState({
 					mygetHelmetapi: undefined
 				});
-				document.title = "Forge";
+				// document.title = "Forge";
 				var link = document.createElement('link'),
 					oldLink = document.getElementById('dynamic-favicon');
 				link.id = 'dynamic-favicon';