Merge branch 'dev' of cloud.wodcloud.com:apaas/apaas-v3-ui into dev

src/components/table-um.vue

@@ -765,7 +765,7 @@ em {
   width: 66px;
 }
 .table_radius {
-  border-radius: 10px;
+  border-radius: 8px;
 }
 .overlit {
   overflow: hidden;

src/components/upload_file.vue

 <template>
   <div>
-    <div v-if="type != 'copper'">
+    <div v-if="type != 'cropper'">
       <el-upload
         action="ssurl"
         :file-list="fileArray"

src/pages/index.vue

 <template>
   <div class="index_container">
-    <div class="decor" v-if="$route.fullPath == '/workplace'"></div>
+    <div class="decor" v-if="$route.fullPath == '/workplace' || $route.fullPath == '/fwzc/fwcs'"></div>
     <router-view/>
   </div>
 </template>
@@ -20,8 +20,8 @@ export default {
 .index_container {
   margin-top: 84px;
   min-height: 200px;
-  overflow-x: hidden;
-  overflow-y: auto;
+  /* overflow-x: hidden;
+  overflow-y: auto; */
 }
 .decor{
   width: 100%;

src/pages/serviceEdit.vue

@@ -7,35 +7,43 @@
     <div class="info_contain">
       <el-form ref="form" :model="form" label-width="0px">
         <el-form-item>
-          <p>服务名称：</p>
+          <p class="formname">服务名称：</p>
           <el-input v-model="form.name"></el-input>
         </el-form-item>
         <el-form-item>
-          <p>服务描述：</p>
+          <p class="formname">服务描述：</p>
           <el-input v-model="form.desc"></el-input>
         </el-form-item>
         <el-form-item>
-          <p>服务领域：</p>
+          <p class="formname">服务领域：</p>
           <el-input v-model="form.area"></el-input>
         </el-form-item>
         <el-form-item>
-          <p>所属组织：</p>
+          <p class="formname">所属组织：</p>
           <el-input v-model="form.origin"></el-input>
         </el-form-item>
         <el-form-item>
-          <p>服务封面：</p>
-          <el-input v-model="form.name"></el-input>
+          <p class="formname">服务封面：</p>
+          <upload-file
+            :multiple="false"
+            :max="1"
+            type="picture"
+            :readOnly="false"
+            fit="fill"
+            :list="imgList"
+            @getNewList="getNewList"
+          ></upload-file>
         </el-form-item>
         <el-form-item>
-          <p>接口编码：</p>
+          <p class="formname">接口编码：</p>
           <el-input v-model="form.code"></el-input>
         </el-form-item>   
         <el-form-item>
-          <p>开放程度：</p>
+          <p class="formname">开放程度：</p>
           <el-radio-group v-model="form.resource">
-            <el-radio label="线上品牌商赞助"></el-radio>
-            <el-radio label="线下场地免费"></el-radio>
-            <el-radio label="线下场地免费"></el-radio>
+            <el-radio label="共享"></el-radio>
+            <el-radio label="受限"></el-radio>
+            <el-radio label="敏感"></el-radio>
           </el-radio-group>
         </el-form-item>
         
@@ -49,9 +57,12 @@
 </template>
 
 <script>
+import uploadFile from '../components/upload_file'
 export default {
   props: {},
-  components: {},
+  components: {
+    uploadFile
+  },
   data() {
     return {
         form: {
@@ -61,7 +72,8 @@ export default {
           origin:'',
           code:'',
           resource: '',
-        }
+        },
+        imgList: [],
     };
   },
   watch: {},
@@ -71,11 +83,21 @@ export default {
   methods: {
       onSubmit() {
         console.log('submit!');
+      },
+      getNewList(val) {
+        console.log(val);
       }
   }
 };
 </script>
 
+
+<style>
+.info_contain .el-input__inner{
+  background-color: #f7f8f9;
+}
+</style>
+
 <style scoped>
 .detail_contain {
   width: 100%;
@@ -95,4 +117,7 @@ export default {
 .now_page_title span {
   color: #242c43;
 }
+.formname{
+  color: #58617a;
+}
 </style>

src/pages/workPlace.vue

@@ -1395,6 +1395,7 @@ export default {
   width: 1200px;
   margin: 0 auto;
   margin-top: -157px;
+  margin-bottom: 20px;
 }
 .person_info {
   width: 1200px;