diff --git a/components/newArchives/banquetBirthday.vue b/components/newArchives/banquetBirthday.vue new file mode 100644 index 0000000..0a47d65 --- /dev/null +++ b/components/newArchives/banquetBirthday.vue @@ -0,0 +1,157 @@ + + + + + + \ No newline at end of file diff --git a/components/newArchives/banquetFullMoon.vue b/components/newArchives/banquetFullMoon.vue new file mode 100644 index 0000000..9f21599 --- /dev/null +++ b/components/newArchives/banquetFullMoon.vue @@ -0,0 +1,157 @@ + + + + + + \ No newline at end of file diff --git a/components/newArchives/banquetFuneral.vue b/components/newArchives/banquetFuneral.vue new file mode 100644 index 0000000..dcbc40b --- /dev/null +++ b/components/newArchives/banquetFuneral.vue @@ -0,0 +1,170 @@ + + + + + + \ No newline at end of file diff --git a/components/newArchives/banquetMarry.vue b/components/newArchives/banquetMarry.vue new file mode 100644 index 0000000..2e69180 --- /dev/null +++ b/components/newArchives/banquetMarry.vue @@ -0,0 +1,165 @@ + + + + + + \ No newline at end of file diff --git a/components/newArchives/banquetOther.vue b/components/newArchives/banquetOther.vue new file mode 100644 index 0000000..b3e1b2d --- /dev/null +++ b/components/newArchives/banquetOther.vue @@ -0,0 +1,160 @@ + + + + + + \ No newline at end of file diff --git a/components/newArchives/deepProcessing.vue b/components/newArchives/deepProcessing.vue new file mode 100644 index 0000000..2224e9e --- /dev/null +++ b/components/newArchives/deepProcessing.vue @@ -0,0 +1,263 @@ + + + + + + \ No newline at end of file diff --git a/components/newArchives/houseDecoration.vue b/components/newArchives/houseDecoration.vue new file mode 100644 index 0000000..ea6f20a --- /dev/null +++ b/components/newArchives/houseDecoration.vue @@ -0,0 +1,137 @@ + + + + + \ No newline at end of file diff --git a/components/newArchives/houseRenovate.vue b/components/newArchives/houseRenovate.vue new file mode 100644 index 0000000..97f51a1 --- /dev/null +++ b/components/newArchives/houseRenovate.vue @@ -0,0 +1,127 @@ + + + + + \ No newline at end of file diff --git a/components/newArchives/houseRepair.vue b/components/newArchives/houseRepair.vue new file mode 100644 index 0000000..c7a3787 --- /dev/null +++ b/components/newArchives/houseRepair.vue @@ -0,0 +1,162 @@ + + + + + \ No newline at end of file diff --git a/components/newArchives/houseTransaction.vue b/components/newArchives/houseTransaction.vue new file mode 100644 index 0000000..370e05c --- /dev/null +++ b/components/newArchives/houseTransaction.vue @@ -0,0 +1,153 @@ + + + + + \ No newline at end of file diff --git a/components/newArchives/store.vue b/components/newArchives/store.vue index e587e3a..08bc6e4 100644 --- a/components/newArchives/store.vue +++ b/components/newArchives/store.vue @@ -1,89 +1,88 @@ @@ -92,14 +91,12 @@ export default { data() { return { - storeTypeList: ['超市','生鲜','饭店','五金','杂货','服装','文具','其他'], - formData: [ - { - shop_front:'',//有无门面 - } - ], + storeTypeList: ['超市', '生鲜', '饭店', '五金', '杂货', '服装', '文具', '其他'], + formData: { + shop_front: '', //有无门面 + }, rules: { - + } } }, @@ -108,41 +105,31 @@ }, methods: { // 初始化校验 - initRules(){ - let arr = Object.keys(this.formData[0]); - arr.forEach(key=>{ + initRules() { + let arr = Object.keys(this.formData); + arr.forEach(key => { this.rules[key] = { - validator: (rule, value, callback )=>{ - if(Array.isArray(this.$refs.breedingForm)) for(let i = 0;i { + this.$refs.breedingForm.clearValidate(rule.field); + value.trim() !== '' ? callback() : callback('不能为空'); }, trigger: ['change', 'blur'] } }) }, // 校验 - async validate(){ - let flag = true; - if(Array.isArray(this.$refs.breedingForm)) for(let i = 0;i + + + + + \ No newline at end of file diff --git a/subpkg/newArchives/newArchives.vue b/subpkg/newArchives/newArchives.vue index 54636cb..4790848 100644 --- a/subpkg/newArchives/newArchives.vue +++ b/subpkg/newArchives/newArchives.vue @@ -56,9 +56,27 @@ + + + + + + + + + + + + + + + + + + @@ -79,8 +97,19 @@ import residents from "@/components/newArchives/residents.vue" // 常住人口 import breeding from "@/components/newArchives/breeding.vue" // 种养殖 import store from "@/components/newArchives/store.vue" // 开设店铺 + import deepProcessing from "@/components/newArchives/deepProcessing.vue" // 深加工 + import thickProcessing from "@/components/newArchives/thickProcessing.vue" // 粗加工 + import houseRepair from "@/components/newArchives/houseRepair.vue" // 修房 + import houseDecoration from "@/components/newArchives/houseDecoration.vue" // 装房 + import houseRenovate from "@/components/newArchives/houseRenovate.vue" // 翻新 + import houseTransaction from "@/components/newArchives/houseTransaction.vue" // 买卖房子 + import banquetMarry from "@/components/newArchives/banquetMarry.vue" // 婚宴 + import banquetBirthday from "@/components/newArchives/banquetBirthday.vue" // 寿宴 + import banquetFullMoon from "@/components/newArchives/banquetFullMoon.vue" // 满月酒 + import banquetOther from "@/components/newArchives/banquetOther.vue" // 其他庆祝宴 + import banquetFuneral from "@/components/newArchives/banquetFuneral.vue" // 白事 export default { - components: { districtSelector, residents, breeding, store }, + components: { districtSelector, residents, breeding, store, deepProcessing, thickProcessing, houseRepair, houseDecoration, houseRenovate,houseTransaction, banquetMarry, banquetBirthday,banquetFullMoon, banquetOther, banquetFuneral }, data() { return { demandShow: false, @@ -231,12 +260,17 @@ category_id: e.indexs[0], category_child: e.indexs[1], }) - console.log(this.showDemandList); + // console.log(this.showDemandList); this.demandShow = false; }, // 删除需求 removeShowDemand(index){ - this.showDemandList.splice(index, 1); + uni.showModal({ + title:'确定删除这一部分内容吗', + success: (res) => { + if(res.confirm)this.showDemandList.splice(index, 1); + } + }) } }, onPullDownRefresh() {