Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev

examples/router/axios.js

@@ -3,7 +3,7 @@ import {Message} from 'element-ui'
 
 let baseURLs = {
   production: "/",
-  development: '/saas'
+  development: '/lan'
 }
 instance.defaults.baseURL = baseURLs[process.env.NODE_ENV]
 instance.interceptors.request.use(config => {

examples/store/index.js

@@ -1,14 +1,12 @@
 import Vue from 'vue'
 import Vuex from 'vuex'
 import preState from 'vuex-persistedstate'
-import request from '../router/axios'
 import * as modules from "dvcp-ui/lib/js/modules"
 
 Vue.use(Vuex)
 
 export default new Vuex.Store({
   state: {
-    dicts: [],
     apps: []
   },
   mutations: {
@@ -17,12 +15,7 @@ export default new Vuex.Store({
     },
     cleanApps(state) {
       state.apps = []
-    },
+    }
-    setFinanceUser(state) {
-      request.post("appfinancialorganizationuser/checkUser").then(res => {
-        state.user.financeUser = res.data
-      })
-    },
   },
   modules,
   plugins: [preState()]

project/sass/apps/Announce/AppAnnounceStatistics/AppAnnounceStatistics.vue

@@ -46,7 +46,7 @@
                     </div>
                     <div class="flex-between">
                       <div class="item-info">群发类型：<span>{{$dict.getLabel('mstSendType', item.sendType) || ''}}</span></div>
-                      <span class="item-btn" @click="$router.push({name: '357e228ba8e64008ace90d095a7a0dd7', params: { id: item.id }})">详情{{item.sendType}}</span>
+                      <span class="item-btn" @click="$router.push({name: '357e228ba8e64008ace90d095a7a0dd7', params: { id: item.id }})">详情</span>
                     </div>
                   </el-card>
                 </el-timeline-item>