ZhangBin
/
datang-ui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

添加加载中

master
song 3 years ago
parent
ab538b2251
commit
2ec807e91b
7 changed files with 88 additions and 67 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. BIN
      dist.zip
  2. 64
      package-lock.json
  3. 3
      package.json
  4. 2
      src/plugins/ant-design-vue.js
  5. 10
      src/views/CompanyProfile/CompanyProfile.vue
  6. 22
      src/views/NewPages/NewPages.vue
  7. 30
      yarn.lock

BIN
dist.zip
View File

Binary file not shown.

64
package-lock.json
View File

@ -47,7 +47,7 @@
"stylus": "^0.54.5",
"stylus-loader": "^3.0.2",
"svg-sprite-loader": "^5.0.0",
"swiper": "^8.0.6",
"swiper": "^5.4.5",
"vue-cli-plugin-ant-design": "^1.0.1",
"vue-cli-plugin-axios": "^0.0.4",
"vue-template-compiler": "^2.6.11"
@ -6256,12 +6256,12 @@
]
},
"node_modules/dom7": {
"version": "4.0.4",
"resolved": "https://registry.npmjs.org/dom7/-/dom7-4.0.4.tgz",
"integrity": "sha512-DSSgBzQ4rJWQp1u6o+3FVwMNnT5bzQbMb+o31TjYYeRi05uAcpF8koxdfzeoe5ElzPmua7W7N28YJhF7iEKqIw==",
"version": "2.1.5",
"resolved": "https://registry.npmjs.org/dom7/-/dom7-2.1.5.tgz",
"integrity": "sha512-xnhwVgyOh3eD++/XGtH+5qBwYTgCm0aW91GFgPJ3XG+jlsRLyJivnbP0QmUBFhI+Oaz9FV0s7cxgXHezwOEBYA==",
"dev": true,
"dependencies": {
"ssr-window": "^4.0.0"
"ssr-window": "^2.0.0"
}
},
"node_modules/domain-browser": {
@ -13661,9 +13661,9 @@
}
},
"node_modules/ssr-window": {
"version": "4.0.2",
"resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-4.0.2.tgz",
"integrity": "sha512-ISv/Ch+ig7SOtw7G2+qkwfVASzazUnvlDTwypdLoPoySv+6MqlOV10VwPSE6EWkGjhW50lUmghPmpYZXMu/+AQ==",
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-2.0.0.tgz",
"integrity": "sha512-NXzN+/HPObKAx191H3zKlYomE5WrVIkoCB5IaSdvKokxTpjBdWfr0RaP+1Z5KOfDT0ZVz+2tdtiBkhsEQ9p+0A==",
"dev": true
},
"node_modules/ssri": {
@ -14405,27 +14405,21 @@
}
},
"node_modules/swiper": {
"version": "8.0.6",
"resolved": "https://registry.npmjs.org/swiper/-/swiper-8.0.6.tgz",
"integrity": "sha512-Ssyu1+FeNATF/G8e84QG+ZUNtUOAZ5vngdgxzczh0oWZPhGUVgkdv+BoePUuaCXLAFXnwVpNjgLIcGnxMdmWPA==",
"version": "5.4.5",
"resolved": "https://registry.npmjs.org/swiper/-/swiper-5.4.5.tgz",
"integrity": "sha512-7QjA0XpdOmiMoClfaZ2lYN6ICHcMm72LXiY+NF4fQLFidigameaofvpjEEiTQuw3xm5eksG5hzkaRsjQX57vtA==",
"dev": true,
"funding": [
{
"type": "patreon",
"url": "https://www.patreon.com/swiperjs"
},
{
"type": "open_collective",
"url": "http://opencollective.com/swiper"
}
],
"hasInstallScript": true,
"dependencies": {
"dom7": "^4.0.4",
"ssr-window": "^4.0.2"
"dom7": "^2.1.5",
"ssr-window": "^2.0.0"
},
"engines": {
"node": ">= 4.7.0"
},
"funding": {
"type": "patreon",
"url": "https://www.patreon.com/vladimirkharlampidi"
}
},
"node_modules/table": {
@ -21847,12 +21841,12 @@
}
},
"dom7": {
"version": "4.0.4",
"resolved": "https://registry.npmjs.org/dom7/-/dom7-4.0.4.tgz",
"integrity": "sha512-DSSgBzQ4rJWQp1u6o+3FVwMNnT5bzQbMb+o31TjYYeRi05uAcpF8koxdfzeoe5ElzPmua7W7N28YJhF7iEKqIw==",
"version": "2.1.5",
"resolved": "https://registry.npmjs.org/dom7/-/dom7-2.1.5.tgz",
"integrity": "sha512-xnhwVgyOh3eD++/XGtH+5qBwYTgCm0aW91GFgPJ3XG+jlsRLyJivnbP0QmUBFhI+Oaz9FV0s7cxgXHezwOEBYA==",
"dev": true,
"requires": {
"ssr-window": "^4.0.0"
"ssr-window": "^2.0.0"
}
},
"domain-browser": {
@ -27863,9 +27857,9 @@
}
},
"ssr-window": {
"version": "4.0.2",
"resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-4.0.2.tgz",
"integrity": "sha512-ISv/Ch+ig7SOtw7G2+qkwfVASzazUnvlDTwypdLoPoySv+6MqlOV10VwPSE6EWkGjhW50lUmghPmpYZXMu/+AQ==",
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-2.0.0.tgz",
"integrity": "sha512-NXzN+/HPObKAx191H3zKlYomE5WrVIkoCB5IaSdvKokxTpjBdWfr0RaP+1Z5KOfDT0ZVz+2tdtiBkhsEQ9p+0A==",
"dev": true
},
"ssri": {
@ -28470,13 +28464,13 @@
}
},
"swiper": {
"version": "8.0.6",
"resolved": "https://registry.npmjs.org/swiper/-/swiper-8.0.6.tgz",
"integrity": "sha512-Ssyu1+FeNATF/G8e84QG+ZUNtUOAZ5vngdgxzczh0oWZPhGUVgkdv+BoePUuaCXLAFXnwVpNjgLIcGnxMdmWPA==",
"version": "5.4.5",
"resolved": "https://registry.npmjs.org/swiper/-/swiper-5.4.5.tgz",
"integrity": "sha512-7QjA0XpdOmiMoClfaZ2lYN6ICHcMm72LXiY+NF4fQLFidigameaofvpjEEiTQuw3xm5eksG5hzkaRsjQX57vtA==",
"dev": true,
"requires": {
"dom7": "^4.0.4",
"ssr-window": "^4.0.2"
"dom7": "^2.1.5",
"ssr-window": "^2.0.0"
}
},
"table": {

3
package.json
View File

@ -18,7 +18,6 @@
"quill": "^1.3.7",
"register-service-worker": "^1.7.1",
"stylus": "^0.54.8",
"swiper": "^5.4.5",
"vue": "^2.6.11",
"vue-baidu-map": "^0.21.22",
"vue-dompurify-html": "^2.5.0",
@ -49,7 +48,7 @@
"stylus": "^0.54.5",
"stylus-loader": "^3.0.2",
"svg-sprite-loader": "^5.0.0",
"swiper": "^8.0.6",
"swiper": "^5.4.5",
"vue-cli-plugin-ant-design": "^1.0.1",
"vue-cli-plugin-axios": "^0.0.4",
"vue-template-compiler": "^2.6.11"

2
src/plugins/ant-design-vue.js
View File

@ -44,6 +44,7 @@ import {
Skeleton,
AutoComplete,
InputNumber,
Spin,
} from 'ant-design-vue';
import { ConfigProvider } from 'ant-design-vue';
Vue.component(ConfigProvider.name, ConfigProvider);
@ -82,6 +83,7 @@ Vue.use(Card);
Vue.use(Skeleton);
Vue.use(AutoComplete);
Vue.use(InputNumber);
Vue.use(Spin);
Vue.prototype.$message = message;
Vue.prototype.$notification = notification;

10
src/views/CompanyProfile/CompanyProfile.vue
View File

@ -7,7 +7,9 @@
<div class="flex-1 flex-column">
<Location :title="defaultTitle" />
<div class="content-detail p-4" :style="{ 'min-height': list.children.length * 56 + 'px' }">
<a-spin tip="拼命加载中..." :spinning="showLoading">
<RichText :rich-obj="content" />
</a-spin>
</div>
</div>
</div>
@ -54,6 +56,7 @@ export default {
],
},
content: {},
showLoading: true
};
},
watch: {
@ -77,13 +80,18 @@ export default {
...mapActions('home', ['getDetail']),
async getData(showPage) {
try {
this.showLoading = true;
const param = {
showPage,
introId: '',
};
const data = await this.getDetail(param);
this.showLoading = false;
this.content = data || {};
} catch (error) {}
} catch (error) {
this.showLoading = false;
console.error('error: ', error);
}
},
chanegCode(code) {
this.code = code;

22
src/views/NewPages/NewPages.vue
View File

@ -8,6 +8,7 @@
<Location :title="defaultTitle" />
<div class="content-detail p-4" :style="{ 'min-height': list.children.length * 56 + 'px' }">
<template v-if="!introId">
<a-spin tip="拼命加载中..." :spinning="showLoading">
<template v-if="code !== '0204'">
<ListPage :code="code" @changeYear="changeYear" :content="content" @getData="getData" />
</template>
@ -19,8 +20,13 @@
<div class="list-title mb-2">公司</div>
<ListPage :code="code" @changeYear="changeYear" :content="content3" @getData="getData" />
</template>
</a-spin>
</template>
<template v-else>
<a-spin tip="拼命加载中..." :spinning="showLoading">
<RichText :rich-obj="introContent" />
</a-spin>
</template>
<RichText v-else :rich-obj="introContent" />
</div>
<div v-if="introContent.relations && introContent.relations.length" class="content-detail p-4">
<Relevant :data="introContent" />
@ -100,6 +106,7 @@ export default {
introId: '',
introContent: {},
showType: '0',
showLoading: true
};
},
watch: {
@ -157,6 +164,7 @@ export default {
},
async getContentData(showPage) {
try {
this.showLoading = true;
let param = {
showPage: showPage || this.code,
year: this.year,
@ -172,30 +180,40 @@ export default {
param.pageSize = 16;
if (showPage === '0201') {
data1 = await this.getContentImg(param);
this.showLoading = false;
this.content1 = data1;
} else if (showPage === '0202') {
data2 = await this.getContentImg(param);
this.showLoading = false;
this.content2 = data2;
} else if (showPage === '0203') {
data3 = await this.getContentImg(param);
this.showLoading = false;
this.content3 = data3;
}
} else {
data = await this.getContent(param);
this.showLoading = false;
this.content = data;
}
} catch (error) {}
} catch (error) {
this.showLoading = false;
console.error('error: ', error);
}
},
// 获取文章信息
async getIntroContent() {
try {
this.showLoading = true;
const param = {
showPage: '',
introId: this.introId,
};
const data = await this.getDetail(param);
this.showLoading = false;
this.introContent = data || {};
} catch (error) {
this.showLoading = false;
console.error('error: ', error);
}
},

30
yarn.lock
View File

@ -3598,12 +3598,12 @@
"domelementtype" "^2.0.1"
"entities" "^2.0.0"
"dom7@^4.0.4":
"integrity" "sha512-DSSgBzQ4rJWQp1u6o+3FVwMNnT5bzQbMb+o31TjYYeRi05uAcpF8koxdfzeoe5ElzPmua7W7N28YJhF7iEKqIw=="
"resolved" "https://registry.npmjs.org/dom7/-/dom7-4.0.4.tgz"
"version" "4.0.4"
"dom7@^2.1.5":
"integrity" "sha512-xnhwVgyOh3eD++/XGtH+5qBwYTgCm0aW91GFgPJ3XG+jlsRLyJivnbP0QmUBFhI+Oaz9FV0s7cxgXHezwOEBYA=="
"resolved" "https://registry.npmjs.org/dom7/-/dom7-2.1.5.tgz"
"version" "2.1.5"
dependencies:
"ssr-window" "^4.0.0"
"ssr-window" "^2.0.0"
"domain-browser@^1.1.1":
"integrity" "sha1-PTH1AZGmdJ3RN1p/Ui6CPULlTto="
@ -8572,10 +8572,10 @@
"safer-buffer" "^2.0.2"
"tweetnacl" "~0.14.0"
"ssr-window@^4.0.0", "ssr-window@^4.0.2":
"integrity" "sha512-ISv/Ch+ig7SOtw7G2+qkwfVASzazUnvlDTwypdLoPoySv+6MqlOV10VwPSE6EWkGjhW50lUmghPmpYZXMu/+AQ=="
"resolved" "https://registry.npmjs.org/ssr-window/-/ssr-window-4.0.2.tgz"
"version" "4.0.2"
"ssr-window@^2.0.0":
"integrity" "sha512-NXzN+/HPObKAx191H3zKlYomE5WrVIkoCB5IaSdvKokxTpjBdWfr0RaP+1Z5KOfDT0ZVz+2tdtiBkhsEQ9p+0A=="
"resolved" "https://registry.npmjs.org/ssr-window/-/ssr-window-2.0.0.tgz"
"version" "2.0.0"
"ssri@^6.0.1":
"integrity" "sha1-KjxBso3UW2K2Nnbst0ABJlrp7dg="
@ -8943,13 +8943,13 @@
"unquote" "~1.1.1"
"util.promisify" "~1.0.0"
"swiper@^8.0.6":
"integrity" "sha512-Ssyu1+FeNATF/G8e84QG+ZUNtUOAZ5vngdgxzczh0oWZPhGUVgkdv+BoePUuaCXLAFXnwVpNjgLIcGnxMdmWPA=="
"resolved" "https://registry.npmjs.org/swiper/-/swiper-8.0.6.tgz"
"version" "8.0.6"
"swiper@^5.4.5":
"integrity" "sha512-7QjA0XpdOmiMoClfaZ2lYN6ICHcMm72LXiY+NF4fQLFidigameaofvpjEEiTQuw3xm5eksG5hzkaRsjQX57vtA=="
"resolved" "https://registry.npmjs.org/swiper/-/swiper-5.4.5.tgz"
"version" "5.4.5"
dependencies:
"dom7" "^4.0.4"
"ssr-window" "^4.0.2"
"dom7" "^2.1.5"
"ssr-window" "^2.0.0"
"table@^5.2.3":
"integrity" "sha1-EpLRlQDOP4YFOwXw6Ofko7shB54="

Write Preview
Loading…
Cancel
Save