1

.env.development

@@ -2,6 +2,6 @@
 ENV = 'development'
 
 # base api
-#VUE_APP_BASE_API = https://sstt.115.langye.net
+VUE_APP_BASE_API = https://sstt.115.langye.net
-VUE_APP_BASE_API = http://sstt.ali251.langye.net/
+#VUE_APP_BASE_API = http://sstt.ali251.langye.net/
 VUE_APP_UPLOAD_API = http://sstt.ali251.langye.net/api/admin/upload-file

src/api/dashboard.js

@@ -24,3 +24,17 @@ export function getChartsHome(params) {
   })
 }
 
+export function getBusinessData(params) {
+  return request({
+    url: '/api/admin/chart/business_data',
+    method: 'get',
+    params: params
+  })
+}
+export function getOrderData(params) {
+  return request({
+    url: '/api/admin/chart/order_data',
+    method: 'get',
+    params: params
+  })
+}

src/api/user.js

@@ -4,7 +4,8 @@ export function login(data) {
   return request({
     url: '/api/admin/auth/login',
     method: 'post',
-    data
+    data,
+    isLoading: false
   })
 }
 
@@ -12,7 +13,8 @@ export function getInfo(token) {
   return request({
     url: '/api/admin/auth/me',
     method: 'post',
-    params: { token }
+    params: { token },
+    isLoading: false
   })
 }
 
@@ -27,6 +29,7 @@ export function getAuthMenu(token) {
   return request({
     url: '/api/admin/auth/permissions',
     method: 'get',
-    params: { token }
+    params: { token },
+    isLoading: false
   })
 }

src/views/dashboard/index.vue

@@ -30,7 +30,7 @@
   import echarts from "echarts"
   import PanelGroup from './components/PanelGroup'
   import {
-    getChartsHome
+    getChartsHome,getBusinessData,getOrderData
   } from "../../api/dashboard.js"
   import draw from './components/draw.vue'
   export default {
@@ -82,15 +82,19 @@
     },
     methods: {
       async loadData() {
-        await getChartsHome({
+
+        await Promise.all([getChartsHome({
+          month: this.month
+        }),getOrderData({
+          month: this.month
+        }),getBusinessData({
           month: this.month
-        }).then((res) => {
+        })]).then((res) => {
-          console.log(res);
+          this.list = res[0].list;
-          this.list = res.list;
           this.chartData = res;
           let _business_data = [];
           let _collect_data = [];
-          res.business_data.map(item => {
+          res[2].business_data.map(item => {
             _business_data.push(item.server_money_total)
             _collect_data.push(item.collect_money)
           })
@@ -99,7 +103,7 @@
           let _customerArr = [];
           let _orderArr = [];
 
-          res.order_data.map(item => {
+          res[1].order_data.map(item => {
             _customerArr.push(item.active_customer)
             _orderArr.push(item.order_total)
           })

src/views/finance/component/addScheduleListLog.vue

@@ -9,7 +9,7 @@
             经度 ：
           </div>
           <div class="xy-table-item-content">
-            <el-input readonly v-model="form.lat " clearable placeholder="请输入经度 " style="width: 300px;" />
+            <el-input v-model="form.lat " clearable placeholder="请输入经度 " style="width: 300px;" />
           </div>
         </div>
       </template>
@@ -19,7 +19,7 @@
             纬度 ：
           </div>
           <div class="xy-table-item-content">
-            <el-input readonly v-model="form.lng " clearable placeholder="请输入纬度 " style="width: 300px;" />
+            <el-input v-model="form.lng " clearable placeholder="请输入纬度 " style="width: 300px;" />
           </div>
         </div>
       </template>

src/views/product/sku.vue

@@ -92,7 +92,10 @@ export default {
   },
   methods: {
     async getTypes(){
-      const res = await getTypes({},false)
+      const res = await getTypes({
+        page: 1,
+        page_size: 999
+      },false)
       this.types = res.data
     },
 

vue.config.js

@@ -7,7 +7,7 @@ function resolve(dir) {
 }
 
 const name = defaultSettings.title || '四世同堂业务管理系统' // page title
-
+const timeStamp = new Date().getTime()
 // If your port is set to 80,
 // use administrator privileges to execute the command line.
 // For example, Mac: sudo npm run
@@ -25,7 +25,7 @@ module.exports = {
    * Detail: https://cli.vuejs.org/config/#publicpath
    */
   publicPath: '/admin/',
-  outputDir: '/Users/mac/Documents/Work/c-常州四世同堂/code/shishitongtang-service/public/admin',
+  outputDir: './dist',
   assetsDir: 'static',
   css: {
     loaderOptions: { // 向 CSS 相关的 loader 传递选项