diff --git a/src/assets/imgs/login-title.png b/src/assets/imgs/login-title.png index c178069..5704a28 100644 Binary files a/src/assets/imgs/login-title.png and b/src/assets/imgs/login-title.png differ diff --git a/src/assets/logo.png b/src/assets/logo.png index 85da192..3b04f4a 100644 Binary files a/src/assets/logo.png and b/src/assets/logo.png differ diff --git a/src/assets/logo_test.png b/src/assets/logo_test.png index b0054b7..1aef363 100644 Binary files a/src/assets/logo_test.png and b/src/assets/logo_test.png differ diff --git a/src/main.js b/src/main.js index 7441658..feb608e 100644 --- a/src/main.js +++ b/src/main.js @@ -56,6 +56,26 @@ Vue.prototype.$integrateData = (target,value) => { } } window.$router = router; + +// if (window.__POWERED_BY_WUJIE__) { +// let instance; +// window.__WUJIE_MOUNT = () => { +// instance = new Vue({ +// router, +// store, +// render: h => h(App) +// }).$mount("#app") +// }; +// window.__WUJIE_UNMOUNT = () => { +// instance.$destroy(); +// }; +// } else { +// new Vue({ +// router, +// store, +// render: h => h(App) +// }).$mount("#app") +// } new Vue({ el: '#app', router, diff --git a/src/views/contract/contractEdit.vue b/src/views/contract/contractEdit.vue index db4a07d..3496844 100644 --- a/src/views/contract/contractEdit.vue +++ b/src/views/contract/contractEdit.vue @@ -1284,6 +1284,7 @@ export default { hideFormItem () { let hideJSON; try { + if (!this.$route.query.hide_json) return; hideJSON = JSON.parse(this.$route.query.hide_json) if (!hideJSON) return console.log(hideJSON) @@ -1302,6 +1303,7 @@ export default { handleDefaultJSON () { let defaultJSON; try { + if (!this.$route.query.default_json) return; defaultJSON = JSON.parse(this.$route.query.default_json) if (!defaultJSON) return for (let key in defaultJSON) { @@ -1490,8 +1492,8 @@ export default { } else { this.form.contract_plan_links = [] } - this.form.is_purchase = this.flowIds.find(i => i.id == this.form.flow_mod_id)?.type == 2 ? 1 : 0; - this.form.is_contract = this.flowIds.find(i => i.id == this.form.flow_mod_id)?.type == 2 ? 0 : 1; + this.form.is_purchase = this.flowIds?.find(i => i.id == this.form.flow_mod_id)?.type == 2 ? 1 : 0; + this.form.is_contract = this.flowIds?.find(i => i.id == this.form.flow_mod_id)?.type == 2 ? 0 : 1; if (this.type === 'add') { addContrant(this.form,true).then(res => { this.btnLoading = false diff --git a/src/views/contract/contractList.vue b/src/views/contract/contractList.vue index e3e998b..0c53f2a 100644 --- a/src/views/contract/contractList.vue +++ b/src/views/contract/contractList.vue @@ -269,7 +269,7 @@