Преглед изворни кода

fix:任务详情页面表格增加loading效果

刘恒 пре 1 година
родитељ
комит
10b2a76942

+ 2 - 2
src/components/menu/SideMenu.vue

@@ -32,7 +32,7 @@
                 src="@/assets/img/new_logo.png"
                 style="width: 20px; height: 20px"
               />
-              <h1 style="font-size: 18px; margin-left: 5px">掌柜科技</h1>
+              <h1 style="font-size: 18px; margin-left: 5px">掌柜核心系统</h1>
             </div>
           </a-menu-item>
           <a-menu-item>
@@ -219,7 +219,7 @@ export default {
   box-shadow: inset 0px 0px 4px 0px rgba(0, 0, 0, 0.1);
   border-radius: 4px;
 }
-/deep/.el-drawer__body{
+/deep/.el-drawer__body {
   padding: 0 20px;
   box-sizing: border-box;
 }

+ 46 - 40
src/pages/index/index.vue

@@ -3,49 +3,56 @@
     <div class="header">
       <div>
         <div :class="['logo']">
-      <a-dropdown>
-        <div class="header-avatar" style="cursor: pointer">
-          <!-- <router-link to="/agreement/agreement"> -->
-          <div class="logo-title">
-            <img
-              src="@/assets/img/title.png"
-              style="width: 30px; height: 30px"
-            />
-            <h1 style="font-size: 18px; margin-right: 5px">晋掌柜控制台</h1>
-            <a-icon type="caret-down" />
-          </div>
-          <!-- </router-link> -->
-        </div>
-        <a-menu :class="['avatar-menu']" slot="overlay">
-          切换到
-          <a-menu-item>
-            <div
-              style="display: flex; align-items: center"
-              @click="toShopkeeper"
-            >
-              <img
-                src="@/assets/img/new_logo.png"
-                style="width: 20px; height: 20px"
-              />
-              <h1 style="font-size: 18px; margin-left: 5px">掌柜科技</h1>
-            </div>
-          </a-menu-item>
-          <a-menu-item>
-            <div style="display: flex; align-items: center" @click="toIndex">
-              <img
-                src="@/assets/img/title.png"
-                style="width: 20px; height: 20px"
-              />
-              <h1 style="font-size: 18px; margin-left: 5px">晋掌柜控制台</h1>
+          <a-dropdown>
+            <div class="header-avatar" style="cursor: pointer">
+              <!-- <router-link to="/agreement/agreement"> -->
+              <div class="logo-title">
+                <img
+                  src="@/assets/img/title.png"
+                  style="width: 30px; height: 30px"
+                />
+                <h1 style="font-size: 18px; margin-right: 5px">晋掌柜控制台</h1>
+                <a-icon type="caret-down" />
+              </div>
+              <!-- </router-link> -->
             </div>
-          </a-menu-item>
-          <!-- <a-menu-item @click="Back">
+            <a-menu :class="['avatar-menu']" slot="overlay">
+              切换到
+              <a-menu-item>
+                <div
+                  style="display: flex; align-items: center"
+                  @click="toShopkeeper"
+                >
+                  <img
+                    src="@/assets/img/new_logo.png"
+                    style="width: 20px; height: 20px"
+                  />
+                  <h1 style="font-size: 18px; margin-left: 5px">
+                    掌柜核心系统
+                  </h1>
+                </div>
+              </a-menu-item>
+              <a-menu-item>
+                <div
+                  style="display: flex; align-items: center"
+                  @click="toIndex"
+                >
+                  <img
+                    src="@/assets/img/title.png"
+                    style="width: 20px; height: 20px"
+                  />
+                  <h1 style="font-size: 18px; margin-left: 5px">
+                    晋掌柜控制台
+                  </h1>
+                </div>
+              </a-menu-item>
+              <!-- <a-menu-item @click="Back">
         <a-icon style="margin-right: 8px" type="poweroff" />
         <span>返回掌柜</span>
       </a-menu-item> -->
-        </a-menu>
-      </a-dropdown>
-    </div>
+            </a-menu>
+          </a-dropdown>
+        </div>
       </div>
       <div>
         <HeaderExpand class="header-item"></HeaderExpand>
@@ -117,7 +124,6 @@ export default {
         "合伙人数据",
       ],
       process: process.env.VUE_APP_BASE_URL,
-
     };
   },
   created() {},

+ 8 - 3
src/pages/task/agent.vue

@@ -75,7 +75,7 @@
 
         <a-form-item label="管理人" :labelCol="{ span: 5 }" :colon="false">
           <a-cascader
-              change-on-select
+            change-on-select
             style="width: 300px"
             placeholder="请选择管理人"
             v-model="formState.leaderId"
@@ -210,7 +210,7 @@
           :dataSource="detailList"
           :pagination="pageInfo"
           @change="detailsChange"
-          :loading="loading"
+          :loading="detailLoadding"
           :scroll="{ x: 2200 }"
         >
           <div slot="qutationCount" slot-scope="{ text }">
@@ -472,6 +472,7 @@ export default {
       },
       detailsObj: {},
       detailList: [],
+      detailLoadding: false,
     };
   },
   watch: {
@@ -503,6 +504,8 @@ export default {
       this.getDetailsList(item);
     },
     getDetailsList(item) {
+      this.detailLoadding = true;
+
       this.detailList = [];
       this.$API.task
         .getChannelAgentDetails({
@@ -512,10 +515,12 @@ export default {
           beginDate: this.formState.beginDate,
           endDate: this.formState.endDate,
           days: this.formState.days,
-          managementSource:item.managementSource
+          managementSource: item.managementSource,
         })
         .then((res) => {
           if (res.data.code === 200) {
+            this.detailLoadding = false;
+
             this.detailList = res.data.data.records;
             this.pageInfo = {
               current: res.data.data.current,

+ 7 - 4
src/pages/task/channel.vue

@@ -84,14 +84,12 @@
           <a-form-item label="管理人" :labelCol="{ span: 5 }" :colon="false">
             <a-cascader
               change-on-select
-             
               style="width: 300px"
               placeholder="请选择管理人"
               v-model="formState.leaderId"
               allowClear
               :options="manageList"
               :display-render="displayRender"
-              
             >
             </a-cascader>
           </a-form-item>
@@ -123,7 +121,7 @@
         :dataSource="tableList"
         :pagination="pagination"
         @change="onChange"
-        :loading="loading"
+        :loading="detailLoadding"
         :scroll="{ x: 2200, y: 600 }"
       >
         <div slot="qutationCount" slot-scope="{ text }">
@@ -487,6 +485,7 @@ export default {
       },
       detailsObj: {},
       detailList: [],
+      detailLoadding: false,
     };
   },
   watch: {
@@ -518,6 +517,8 @@ export default {
       this.getDetailsList(item);
     },
     getDetailsList(item) {
+      this.detailLoadding = true;
+
       this.detailList = [];
       this.$API.task
         .getChannelAgentDetails({
@@ -525,12 +526,14 @@ export default {
           pageSize: this.pageInfo.defaultPageSize,
           userId: item.userId,
           beginDate: this.formState.beginDate,
-          managementSource:item.managementSource,
+          managementSource: item.managementSource,
           endDate: this.formState.endDate,
           days: this.formState.days,
         })
         .then((res) => {
           if (res.data.code === 200) {
+            this.detailLoadding = false;
+
             this.detailList = res.data.data.records;
             this.pageInfo = {
               current: res.data.data.current,

+ 4 - 1
src/pages/task/dianxiao.vue

@@ -223,7 +223,7 @@
           :dataSource="detailList"
           :pagination="pageInfo"
           @change="detailsChange"
-          :loading="loading"
+          :loading="detailLoadding"
           :scroll="{ x: 2200 }"
         >
           <div slot="qutationCount" slot-scope="{ text }">
@@ -485,6 +485,7 @@ export default {
       },
       detailsObj: {},
       detailList: [],
+      detailLoadding: false,
     };
   },
   watch: {
@@ -516,6 +517,7 @@ export default {
       this.getDetailsList(item);
     },
     getDetailsList(item) {
+      this.detailLoadding = true;
       this.detailList = [];
       this.$API.task
         .getChannelAgentDetails({
@@ -528,6 +530,7 @@ export default {
         })
         .then((res) => {
           if (res.data.code === 200) {
+            this.detailLoadding = false;
             this.detailList = res.data.data.records;
             this.pageInfo = {
               current: res.data.data.current,

+ 9 - 9
src/store/modules/app.js

@@ -1,30 +1,30 @@
 export default {
     state: {
-        appName: "掌柜科技",  // 应用名称
-        themeColor: '#D42426' ,
+        appName: "掌柜核心系统",  // 应用名称
+        themeColor: '#D42426',
         eldthemeColor: "#428BCA",  // 上一次主题颜色
         oldThemeColor: "#428BCA",   // 上上一次主题颜色
-        collapse:false,  // 导航栏收缩状态
-        menuRouteLoaded:false    // 菜单和路由是否已经加载
+        collapse: false,  // 导航栏收缩状态
+        menuRouteLoaded: false    // 菜单和路由是否已经加载
     },
     getters: {
-        collapse(state){// 对应着上面state
+        collapse(state) {// 对应着上面state
             return state.collapse
         }
     },
     mutations: {
-        onCollapse(state){  // 改变收缩状态
+        onCollapse(state) {  // 改变收缩状态
             state.collapse = !state.collapse
         },
-        setThemeColor(state, themeColor){  // 改变主题颜色
+        setThemeColor(state, themeColor) {  // 改变主题颜色
             state.oldThemeColor = state.themeColor
             state.themeColor = themeColor
         },
-        menuRouteLoaded(state, menuRouteLoaded){  // 改变菜单和路由的加载状态
+        menuRouteLoaded(state, menuRouteLoaded) {  // 改变菜单和路由的加载状态
             state.menuRouteLoaded = menuRouteLoaded;
         }
     },
     actions: {
-        
+
     }
 }