Merge branch 'develop' into 'test'

package.json

@@ -33,7 +33,7 @@
     "nprogress": "^0.2.0",
     "popmotion": "^8.1.22",
     "qiniu-js": "^2.2.0",
-    "rym-element-ui": "^0.1.46",
+    "rym-element-ui": "^0.1.50",
     "vue-qr": "^1.2.8",
     "vuedraggable": "^2.16.0",
     "wangeditor": "^3.1.1"

src/api/base/index.js

@@ -21,7 +21,7 @@ export const fetchSelectList = req =>
 //获取服务类型
 export const fetchServiceList = req =>
   fetch({
-    url: path + '/baseData/get/service',
+    url: path + '/dcxy/api/base/service/all/about/service',
     method: 'get',
     ...req,
   });

src/components/input/ServiceTypeSelect/ServiceTypeSelect.vue

@@ -8,8 +8,8 @@
     <el-option
       v-for="(item, index) in serviceTypeLists[ServiceType]"
       :key="index"
-      :value="item.value"
-      :label="item.name"
+      :value="item.id"
+      :label="item.serviceName"
     ></el-option>
   </el-select>
 </template>

src/components/input/ServiceTypeSelect/mixin.js

@@ -24,7 +24,6 @@ export default {
       let item = this.serviceTypeLists[this.ServiceType].find(
         ServiceType => ServiceType.id === id
       );
-
       return item ? item.serviceName : '';
     },
   },

src/components/input/ServiceTypeSelect/serviceTypeStore.js

@@ -27,10 +27,8 @@ const actions = {
     return fetchServiceList({
       params: { serviceType },
     }).then(res => {
-      console.log(res);
-
-      const { data } = res;
-      commit(SERVICE_TYPE_LIST, { list: data, index: serviceType });
+      const { selfService } = res;
+      commit(SERVICE_TYPE_LIST, { list: selfService, index: serviceType });
       commit(FETCH_STATE, { value: false, index: serviceType });
     });
   },
@@ -38,8 +36,6 @@ const actions = {
 
 const mutations = {
   [SERVICE_TYPE_LIST](state, { list, index }) {
-    console.log(index, list);
-
     state.lists[index] = list;
   },
   [FETCH_STATE](state, { value, index }) {