From bb9f67d3f8231e7b972c8e9a63222bc8c80cc618 Mon Sep 17 00:00:00 2001 From: wenfp Date: Tue, 30 Nov 2021 16:54:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E6=94=AF=E4=BB=98=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 8 + package.json | 3 +- src/api/index.js | 6 +- src/assets/scss/common.scss | 1 - src/components/buddha-process/index.vue | 6 +- src/components/fixed-bottom/index.vue | 1 + src/components/merit-desire/index.vue | 22 +- src/components/merit-goods/index.vue | 6 +- src/components/order/index.vue | 18 +- src/components/uploader/index.vue | 2 +- src/main.js | 9 +- src/pages/everyday-donation/index.vue | 57 +- src/pages/fill-name/index.vue | 4 +- .../components/fill-information.vue | 9 +- .../goods-detail/components/select-spec.vue | 1 - src/pages/goods-detail/index.vue | 58 +- src/pages/home.vue | 28 +- src/pages/merit-box/index.vue | 42 +- src/pages/pay/index.vue | 8 +- src/pages/temple-home/index.vue | 23 +- src/pages/temple-list/index.vue | 16 +- src/pages/user/approve/index.vue | 23 +- src/router/index.js | 6 + src/util/index.js | 9 + wap/js/app.js | 1077 +++++++++-------- yarn.lock | 34 +- 26 files changed, 879 insertions(+), 598 deletions(-) diff --git a/README.md b/README.md index b0c0864..75c1b9d 100644 --- a/README.md +++ b/README.md @@ -22,3 +22,11 @@ yarn lint ### Customize configuration See [Configuration Reference](https://cli.vuejs.org/config/). + +IE 11 无兼容 +日历选中当日 +快捷选中高亮 +本周选中自然周 +任意日期可以选择 + +科技质量 样式问题 \ No newline at end of file diff --git a/package.json b/package.json index be32010..ccb4dc2 100644 --- a/package.json +++ b/package.json @@ -15,11 +15,12 @@ "core-js": "^3.6.5", "dayjs": "^1.10.7", "delay": "^5.0.0", + "mescroll.js": "^1.4.2", "qs": "^6.10.1", "swiper": "5", "vant": "^2.12.30", "vue": "^2.6.11", - "vue-awesome-swiper": "2.6.7", + "vue-awesome-swiper": "3.1.3", "vue-router": "^3.5.3" }, "devDependencies": { diff --git a/src/api/index.js b/src/api/index.js index 2a386ac..7ec9cc4 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -99,7 +99,7 @@ const getRandMoney = () => service.get(`/api/order/get-rand-money`) const postCount = (course_id, data) => service.put(`/api/course/count/${course_id}`, data); // 功德箱 -const getMeritBox = (temple_id, type, page, size = 10) => service.get(`/api/temple/get-merit-box?temple_id=${temple_id}&type=${type}&page=${page}&size=${size}`,) +const getMeritBox = (temple_id = '', type, page, size = 10) => service.get(`/api/temple/get-merit-box?temple_id=${temple_id}&type=${type}&page=${page}&size=${size}`,) // 添加功德箱订单 const createMeritBoxOrder = data => service.post(`/api/order/create-merit-box`, data) @@ -108,10 +108,10 @@ const createMeritBoxOrder = data => service.post(`/api/order/create-merit-box`, const getDynamicData = (page = 1, goods_id = '', size = 10) => service.get(`/api/dynamic/get-page?page=${page}&size=${size}&goods_id=${goods_id}`); // 获取动态(佛事)详情 -const getDynamicDetail = (dynamic_id) => service.get(`/api/dynamic/detail?id=${dynamic_id}`); +const getDynamicDetail = (dynamic_id = '') => service.get(`/api/dynamic/detail?id=${dynamic_id}`); // 通用商品列表(功德无量) -const getCommonGoods = (temple_id, page, size = 10) => service.get(`/api/common/get-list?temple_id=${temple_id}&page=${page}&size=${size}`); +const getCommonGoods = (temple_id = '', page, size = 10) => service.get(`/api/common/get-list?temple_id=${temple_id}&page=${page}&size=${size}`); // 获取订单榜 const getOrderCompare = (temple_id = '1', type = '', goods_id = '', goods_type = '') => service.get(`/api/order/get-compare?temple_id=${temple_id}&type=${type}&goods_id=${goods_id}&goods_type=${goods_type}`); diff --git a/src/assets/scss/common.scss b/src/assets/scss/common.scss index c99e37f..65b2b71 100644 --- a/src/assets/scss/common.scss +++ b/src/assets/scss/common.scss @@ -45,7 +45,6 @@ display: -webkit-box; .merit-group { display: flex; flex-wrap: nowrap; - margin-bottom: .91rem; margin: 0 .4rem; } } diff --git a/src/components/buddha-process/index.vue b/src/components/buddha-process/index.vue index 5c78951..dae4611 100644 --- a/src/components/buddha-process/index.vue +++ b/src/components/buddha-process/index.vue @@ -1,5 +1,5 @@