diff --git a/src/apps/AppAskForm/AppAskForm.vue b/src/apps/AppAskForm/AppAskForm.vue
index 02a77d27..69879023 100644
--- a/src/apps/AppAskForm/AppAskForm.vue
+++ b/src/apps/AppAskForm/AppAskForm.vue
@@ -14,7 +14,7 @@
export default {
name: 'AppAskForm',
- appName: '问卷表单',
+ appName: '问卷表单管理',
data () {
return {
diff --git a/src/apps/AppAskForm/askForm.vue b/src/apps/AppAskForm/AppForm.vue
similarity index 62%
rename from src/apps/AppAskForm/askForm.vue
rename to src/apps/AppAskForm/AppForm.vue
index 304ca182..05765c36 100644
--- a/src/apps/AppAskForm/askForm.vue
+++ b/src/apps/AppAskForm/AppForm.vue
@@ -1,11 +1,8 @@
@@ -14,22 +11,16 @@
import AiLoading from "../../components/AiLoading";
import {mapState} from "vuex";
import FormDetail from "./formDetail";
-import FormList from "./formList";
export default {
name: "askForm",
- components: {FormList, FormDetail, AiLoading},
+ appName: "问卷表单",
+ components: {FormDetail, AiLoading},
computed: {
...mapState(['openUser', 'user']),
showDetail() {
return !!this.$route.query?.id
},
- isManager() {
- let {hash, query: {preview}} = this.$route
- if (preview) return false
- else if (hash == "#dev") return true
- else return hash != '#form' && !!this.user.id
- }
},
data() {
return {
diff --git a/src/apps/AppAskForm/formDetail.vue b/src/apps/AppAskForm/formDetail.vue
index 17d30fd3..d95fe105 100644
--- a/src/apps/AppAskForm/formDetail.vue
+++ b/src/apps/AppAskForm/formDetail.vue
@@ -65,14 +65,10 @@
-
-
diff --git a/src/pages/login.vue b/src/pages/login.vue
index f33ed748..5bff50df 100644
--- a/src/pages/login.vue
+++ b/src/pages/login.vue
@@ -37,14 +37,17 @@ export default {
...mapActions(['getToken']),
...mapMutations(['login']),
handleLogin() {
- this.$refs.loginForm.validate().then(v => {
+ this.$refs.loginForm.validate(v => {
if (v) {
this.getToken(this.form).then(() => {
uni.navigateBack({})
}).catch(() => 0)
}
})
- }
+ },
+ },
+ mounted() {
+ this.$refs.loginForm.setRules(this.rules)
}
}
diff --git a/src/store/index.js b/src/store/index.js
index 56a0f2c0..d9799c35 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -14,7 +14,7 @@ const store = new Vuex.Store({
openUser: {},
dicts: [],
user: {},
- config:{}
+ config: {}
},
mutations: {
login(state, token) {
@@ -162,7 +162,7 @@ const store = new Vuex.Store({
actions: {
getToken(state, params) {
const encryptByDES = password => {
- let isIos = wx.getSystemInfoSync().system.toUpperCase === 'ios'
+ let isIos = uni.getSystemInfoSync().system.toUpperCase == 'ios'
let key = "thanks,villcloud"
let iv = CryptoJS.enc.Latin1.parse(key)
let encrypted = CryptoJS.AES.encrypt(password, iv, {
@@ -322,7 +322,7 @@ const store = new Vuex.Store({
}, 500)
})
},
- selectEnterpriseContact(state,params) {
+ selectEnterpriseContact(state, params) {
return new Promise(resolve => {
state.dispatch("injectJWeixin", "selectEnterpriseContact").then(() => {
setTimeout(() => {