Commit 918e5c15 by golton_gao

update: 代码优化

parent d2b4cb48
...@@ -7,7 +7,7 @@ module.exports = { ...@@ -7,7 +7,7 @@ module.exports = {
index: path.resolve(__dirname, '../../dist/index.html'), index: path.resolve(__dirname, '../../dist/index.html'),
assetsRoot: path.resolve(__dirname, '../../dist'), assetsRoot: path.resolve(__dirname, '../../dist'),
assetsSubDirectory: 'static', assetsSubDirectory: 'static',
assetsPublicPath: '', assetsPublicPath: '/',
productionSourceMap: false, productionSourceMap: false,
appConfFile: 'CubeModule.json', appConfFile: 'CubeModule.json',
eslint: false, eslint: false,
......
...@@ -18,9 +18,6 @@ ...@@ -18,9 +18,6 @@
"babel-polyfill": "^6.26.0", "babel-polyfill": "^6.26.0",
"better-scroll": "^1.12.6", "better-scroll": "^1.12.6",
"clipboard": "^1.7.1", "clipboard": "^1.7.1",
"cordova-android": "^8.1.0",
"cordova-ios": "^5.1.1",
"cordova-plugin-whitelist": "1",
"crypto-js": "^3.1.9-1", "crypto-js": "^3.1.9-1",
"echarts": "^3.6.1", "echarts": "^3.6.1",
"element-ui": "^1.3.4", "element-ui": "^1.3.4",
......
...@@ -270,7 +270,23 @@ export default { ...@@ -270,7 +270,23 @@ export default {
totalData: {}, totalData: {},
listData: [], listData: [],
showDate: "", showDate: "",
progressData: {}, progressData: {
signData: {
totalRate: 0
}, //累计签约
toalData: {
totalRate: 0
}, //合计
deliverData: {
totalRate: 0
}, //交房
signNoSteelframeData: {
totalRate: 0
}, //累计签约(不含钢架结构)
removeData: {
totalRate: 0
}, //拆平
},
progressChartDataArea: { progressChartDataArea: {
xData: [], xData: [],
monthData: [], monthData: [],
...@@ -622,16 +638,25 @@ export default { ...@@ -622,16 +638,25 @@ export default {
this.$mas this.$mas
.proxy("hs.mobile.getContractStatisticsArea", data) .proxy("hs.mobile.getContractStatisticsArea", data)
.then((res) => { .then((res) => {
this.progressData = res.data.data; this.progressData = Object.assign({
signData: {
totalRate: 0
}, //累计签约
toalData: {
totalRate: 0
}, //合计
deliverData: {
totalRate: 0
}, //交房
signNoSteelframeData: {
totalRate: 0
}, //累计签约(不含钢架结构)
removeData: {
totalRate: 0
}, //拆平
}, res.data.data);
this.progressDataTotal = this.progressData.toalData; this.progressDataTotal = this.progressData.toalData;
this.isShowSignNoSteelframe = this.progressData.isShowSignNoSteelframe; this.isShowSignNoSteelframe = this.progressData.isShowSignNoSteelframe;
// console.log(
// this.progressData,
// " this.progressData=======================>>>>>>>>>>>>>>>>>>>>>>>"
// );
let currentSign = "";
let monthSign = "";
let yearSign = "";
}) })
.catch((err) => { .catch((err) => {
console.log(err, "报错"); console.log(err, "报错");
......
...@@ -88,9 +88,9 @@ export default { ...@@ -88,9 +88,9 @@ export default {
return this.$store.state.shareStore.authObj.showReport; return this.$store.state.shareStore.authObj.showReport;
}, },
}, },
async beforeCreate() { beforeCreate() {
// 初始化 token // 初始化 token
await SetToken(this); // await SetToken(this);
// 修改导航条颜色 // 修改导航条颜色
this.$nativeApi.system.statusBarColor([11, 20, 29, 1]); this.$nativeApi.system.statusBarColor([11, 20, 29, 1]);
......
// The Vue build version to load with the `import` command // The Vue build version to load with the `import` command
// (runtime-only or standalone) has been set in webpack.base.conf with an alias. // (runtime-only or standalone) has been set in webpack.base.conf with an alias.
import '../libraries/polyfill/index' import '../libraries/polyfill/index'
import { SetToken } from './api.js'
import Vue from 'vue' import Vue from 'vue'
import router from './router' import router from './router'
import App from './app.vue' import App from './app.vue'
...@@ -17,8 +18,7 @@ router.afterEach((to, from, next) => { ...@@ -17,8 +18,7 @@ router.afterEach((to, from, next) => {
}) })
/* eslint-disable no-new */ /* eslint-disable no-new */
new Vue({ const vm = new Vue({
el: '#app',
store, store,
router, router,
plugin, plugin,
...@@ -27,3 +27,7 @@ new Vue({ ...@@ -27,3 +27,7 @@ new Vue({
App App
} }
}) })
qing.ready(async () => {
await SetToken(vm)
vm.$mount('#app')
})
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment