服务编辑

src/main.js

 import "babel-polyfill";
 
-import Vue from "vue";
-
-import Vuex from "vuex";
-Vue.use(Vuex);
-
 import store from "@/store";
-store.install(Vuex);
+
+import Vue from 'vue'
 
 import VueResource from "vue-resource";
 Vue.use(VueResource);

src/pages/serviceDetail.vue

@@ -156,13 +156,13 @@ export default {
             {
               prop:'cjms',
               label:'场景描述',
-              minWidth:'20%',
+              minWidth:'40%',
               align:'left',
             },
             {
               prop:'sqsj',
               label:'申请调用时间',
-              minWidth:'150px',
+              width:'160px',
               align:'right',
             },
         ],
@@ -233,7 +233,7 @@ export default {
       }
   },
   mounted(){
-      
+      console.log(this.$store.state.role);
   },
   methods:{
       getData() {
@@ -255,6 +255,7 @@ export default {
 .detail_contain{
     width: 100%;
     padding: 0 20px;
+    margin-bottom: 20px;
 }
 .info_contain{
     padding: 25px 20px;

src/pages/serviceEdit.vue

@@ -5,14 +5,14 @@
       <span>服务编辑</span>
     </p>
     <div class="info_contain">
-      <el-form ref="form" :model="form" label-width="0px">
+      <el-form ref="form" :rules="rules" :model="form" label-width="0px">
         <el-form-item>
           <p class="formname">服务名称：</p>
           <el-input v-model="form.name"></el-input>
         </el-form-item>
-        <el-form-item>
+        <el-form-item prop="desc">
           <p class="formname">服务描述：</p>
-          <el-input v-model="form.desc"></el-input>
+          <el-input type="textarea" v-model="form.desc"></el-input>
         </el-form-item>
         <el-form-item>
           <p class="formname">服务领域：</p>
@@ -48,8 +48,8 @@
         </el-form-item>
         
         <el-form-item>
-          <el-button>取消</el-button>
-          <el-button type="primary" @click="onSubmit">保存</el-button>
+          <el-button type="primary" @click="onSubmit" class="right">保存</el-button>
+          <el-button class="right">取消</el-button>
         </el-form-item>
       </el-form>
     </div>
@@ -72,8 +72,14 @@ export default {
           origin:'',
           code:'',
           resource: '',
+          fileList:''
         },
         imgList: [],
+        rules:{
+          desc:[
+            { max: 200, message: '长度小于200个字符', trigger: 'blur' }
+          ]
+        }
     };
   },
   watch: {},
@@ -86,6 +92,11 @@ export default {
       },
       getNewList(val) {
         console.log(val);
+        this.form.fileList = ""
+        this.form.fileList = url.map((v,k)=>{
+          return v.url
+        }).join(';')
+        console.log(this.form.fileList)
       }
   }
 };
@@ -96,12 +107,16 @@ export default {
 .info_contain .el-input__inner{
   background-color: #f7f8f9;
 }
+.info_contain .el-textarea__inner{
+  background-color: #f7f8f9;
+}
 </style>
 
 <style scoped>
 .detail_contain {
   width: 100%;
   padding: 0 20px;
+  margin-bottom: 20px;
 }
 .info_contain {
   padding: 25px 20px;
@@ -120,4 +135,8 @@ export default {
 .formname{
   color: #58617a;
 }
+.right{
+  float: right;
+  margin-left: 20px;
+}
 </style>

src/store/index.js

-var store = {
-  install: function(Vuex) {
-    store.namespace = new Vuex.Store({
-      state: {
-        userInfo: null, // 用户信息
-        ssType: "全部",
-        ssPrams: {
-          firstId: "", // int 一级分类 0全部
-          secondId: "", // int 二级分类 0全部
-          type: 0, // int 0 附近 1评价
-          search: "", // string 按名称搜索
-          fifteen: 0
-        }, // 设施列表参数 for ssHeader组件
-        name: "",
-        //进行相关操作和请求接口时，调用函数同步更改，页面的初始化使用state里面的值进行绑定
-        selectedFacility: {
-          //选中的poi，点击地图上的点或者在列表中选中时更新状态
-          name: "", //poi的名称
-          id: "", //poi的id
-          distance: "", //poi离用户的距离
-          evaluation: "", //poi的评分
-          evaluation_num: "", //poi的评价次数
-          address: "", //poi的详细地址
-          discribe: "", //poi的描述信息
-          lat: "", //poi的经纬度
-          lng: "",
-          type: "" ,//poi的类型
-          detail_type: "" ,//poi的类型
-          tertiary_type:[]//停车场的具体类型，地下1，地面2，路边3
-        },
-        // selectID:"",
-        // selectTag: "",
-        currentPosition: {
-          lng: 112.546184,
-          lat: 28.281588
-        },
-        mapState: "showAll", //"showAll","showSelectTag","showSelectedFacility",
-        isPullUp: false//是否上拉，为true时，地图的浮窗将会隐藏
-      },
-      mutations: {
-        updateSstype(state, payload) {
-          state.ssType = payload;
-        },
-        upDateSsParams(state, payload) {
-          Object.assign(state.ssPrams, payload);
-        },
-        change(state, name) {
-          state.name = name;
-          sessionStorage.setItem("name", name);
-        },
-        updateFullDetail(state, detail) {
-          Object.assign(state.selectedFacility, detail);
-        },
-        updateMapState(state, payload) {
-          state.mapState = payload;
-        },
-        updatecurrentPosition(state, payload) {
-          state.currentPosition = payload;
-        },
-        upDateIsPullUp(state, value) {
-          state.isPullUp = value;
-        }
-        /* updateselectTag(state, payload) {
-          state.selectTag = payload;
-        },
-        updateselectID(state, payload) {
-          state.selectID = payload;
-        }, */
-      }
-    });
-  }
-};
+import Vuex from 'vuex'
+import Vue from 'vue'
+Vue.use(Vuex);
 
-module.exports = store;
+
+const store = new Vuex.Store({
+  state: {
+    role:1,//0：普通用户，1：组织管理员，2：超级管理员
+  },
+  modules: {
+  },
+  mutations: {
+    rolefun(state, newValue) {
+      state.role = newValue;
+    },
+  },
+});
+
+export default store
\ No newline at end of file

src/utils/common.js

+function getRole(){
+    return new Promise((resolve,reject)=>{
+        if(true){
+            resolve(1)
+        }else{
+            reject('error')
+        }
+    })
+}
+
+export{
+    getRole
+}
\ No newline at end of file