Merge branch 'master' of http://192.168.4.246:3000/zhangs/surveyMaker

src/components/HeaderEdit.vue

@@ -49,7 +49,7 @@
       </form>
     </div> -->
     <!-- 分享设置 -->
-    <ShareSetting v-show="isShareSetting" :close="closeShare"></ShareSetting>
+    <ShareSetting v-show="isShareSetting" :close="closeShare" :currItem="1"></ShareSetting>
   </header>
 </template>
 
@@ -279,7 +279,12 @@ export default {
   color: #646b81;
   margin-top: 60px;
   position: relative;
+  display: flex;
+  flex-direction: row;
   .reset-btn {
+    position: absolute;
+    left: 0px;
+    top: 0px;
     height: 100%;
     padding: 0 50px;
     cursor: pointer;
@@ -297,15 +302,13 @@ export default {
     flex-direction: row-reverse;
   }
   .tools {
-    position: absolute;
-    display: inline-block;
-    margin-left: 33%;
-    width: 300px;
+    width: 100%;
     height: 60px;
     .next_return {
       display: flex;
       flex-direction: row;
       align-items: center;
+      justify-content: center;
       height: 100%;
       .return {
         display: flex;

src/components/ShareSetting.vue

@@ -18,7 +18,7 @@
           </el-input>
         </div>
         <div class="content">
-          <el-input class="input" type="textarea" :rows="3" placeholder="请输入内容" v-model="textarea" maxlength="30"
+          <el-input class="input" type="textarea" :rows="3" placeholder="请输入内容" v-model="currItem.name" maxlength="30"
             show-word-limit>
           </el-input>
           <img class="cover" src="" alt="" @click="closeBtn">