Merge remote-tracking branch 'origin/gzb' into wzl

src/views/layout.vue

@@ -53,7 +53,7 @@ body {
   justify-content: space-between;
   align-items: center;
   margin: 0 auto;
-  width: 1200px;
+  width: 80%;
   font-size: 16px;
   line-height: 50px;
   font-weight: bold;
@@ -75,6 +75,6 @@ body {
 }
 .layout_main {
   margin: 0 auto;
-  width: 1200px;
+  width: 80%;
 }
 </style>

src/views/service/index.vue

@@ -49,45 +49,48 @@
         <FormItem label="服务案例" prop="scname">
           <Input v-model="add_form.scname" placeholder="请输入服务案例" />
         </FormItem>
-        <FormItem label="序号" prop="scorder">
+        <FormItem label="序号">
           <Input v-model="add_form.scorder" number placeholder="请输入序号" />
         </FormItem>
-        <div class="upload">
-          <Upload
-            action
-            class="file_left_up"
-            accept=".jpg,.jpeg,.png"
-            :before-upload="
-              (file) => {
-                handleUpload(file);
-                return false;
-              }
-            "
-          >
-            <div
-              class="upload-img"
-              v-if="!this.add_form.scpic"
-              style="padding-top: 10px"
+        <div class="uploadimg">
+          <div class="uploadimg_title">图片</div>
+          <div class="upload">
+            <Upload
+              action
+              class="file_left_up"
+              accept=".jpg,.jpeg,.png"
+              :before-upload="
+                (file) => {
+                  handleUpload(file);
+                  return false;
+                }
+              "
             >
-              <Icon
-                type="ivu-icon ivu-icon- iconfont icon-shangchuan"
-                size="42"
-                color="#e6e6e6"
-              />
-              <p
-                class="shangchuan_btn"
-                style="margin-top: 10px; font-size: 14px; text-align: center"
-              >
-                上传图片
-              </p>
-            </div>
-            <div v-else>
-              <img
+              <div
                 class="upload-img"
-                :src="$api.showImageUrl + add_form.scpic"
-              />
-            </div>
-          </Upload>
+                v-if="!this.add_form.scpic"
+                style="padding-top: 10px"
+              >
+                <Icon
+                  type="ivu-icon ivu-icon- iconfont icon-shangchuan"
+                  size="42"
+                  color="#e6e6e6"
+                />
+                <p
+                  class="shangchuan_btn"
+                  style="margin-top: 10px; font-size: 14px; text-align: center"
+                >
+                  上传图片
+                </p>
+              </div>
+              <div v-else>
+                <img
+                  class="upload-img"
+                  :src="$api.showImageUrl + add_form.scpic"
+                />
+              </div>
+            </Upload>
+          </div>
         </div>
       </Form>
       <div slot="footer" style="text-align: right">
@@ -276,6 +279,7 @@ export default {
               this.add_form.show = false;
               this.add_form.scname = "";
               this.add_form.scpic = "";
+              this.init();
             } else {
               this.$Message.error(res.msg);
             }
@@ -315,11 +319,13 @@ export default {
             that.init();
           } else {
             that.$Message.error("图片上传失败");
+            console.log(1);
           }
         })
         .catch(() => {
           that.showLoading = false;
           that.$Message.error("图片上传失败");
+          console.log(2);
         });
     },
     changePage(page) {
@@ -348,7 +354,6 @@ export default {
   margin-top: 5px;
 }
 .upload {
-  margin-left: 90px;
   width: 200px;
   height: 100px;
   border: 1px solid #dcdee2;
@@ -369,4 +374,12 @@ export default {
     object-fit: cover;
   }
 }
+.uploadimg {
+  display: flex;
+  .uploadimg_title {
+    width: 90px;
+    text-align: right;
+    padding-right: 10px;
+  }
+}
 </style>