diff --git a/App.vue b/App.vue index b9bfc6e..cfb81bb 100644 --- a/App.vue +++ b/App.vue @@ -103,7 +103,17 @@ export default { /* .wx-checkbox-input.wx-checkbox-input-checked { border: none !important; } */ - + radio .wx-radio-input { + transform: scale(0.6); + border-radius: 50% !important; + /* color: #ffffff !important; */ + } + + radio .wx-radio-input.wx-radio-input-checked { + color: #fff; + background: #FDBF68; + border-color: #FDBF68 !important; + } /* #endif */ diff --git a/api/diandeng.js b/api/diandeng.js new file mode 100644 index 0000000..6802616 --- /dev/null +++ b/api/diandeng.js @@ -0,0 +1,57 @@ +import request from "@/utils/request"; + +/** + * 获取祈福灯列表 + */ +export function getLightList(data) { + return request.post("/BlessingLamp/listBlessingLamp", data); +} + +/** + * 获取祈福灯广场 + */ +export function blessingList(data) { + return request.get("/Blessing/blessingList?type="+data); +} + +/** + * 获取我的祈福灯 + */ +export function myBlessings(data) { + return request.get("/Blessing/myBlessings"); +} + +/** + * 为他人祈福 + */ +export function blessingOthers(data) { + return request.post("/Blessing/blessingOthers",data); +} + +/** + * 获取祈福灯详情 + */ +export function blessingLampDetail(data) { + return request.get("/BlessingLamp/blessingLampDetail?id=" + data); +} + +/** + * 点灯 + */ +export function addBlessing(data) { + return request.post("/Blessing/addBlessing", data); +} + +/** + * 万年历 + */ +export function getWanniali(data) { + return request.get("/Wannianli/getWanniali?date", data); +} + +/** + * 点灯开关 + */ +export function getBlessingFlag(data) { + return request.get("/getBlessingFlag", data); +} \ No newline at end of file diff --git a/api/user.js b/api/user.js index b3119ab..885a438 100644 --- a/api/user.js +++ b/api/user.js @@ -447,4 +447,17 @@ export function getMyCourseList(q) { * */ export function getStudyList(q) { return request.get('/StudyList/getStudyListByMemberId?type='+q) -} \ No newline at end of file +} + +/* + * 获取签到状态 + * */ +export function integral(q) { + return request.post('/user/integral') +} +/* + * 签到 + * */ +export function signIntegral(q) { + return request.post('/sign/integral') +} diff --git a/assets/css/base.less b/assets/css/base.less index a24722f..76017af 100644 --- a/assets/css/base.less +++ b/assets/css/base.less @@ -4,17 +4,17 @@ */ .font-color-red { - color: #E5270F !important; + color: #F99C10 !important; } .bg-color-red { - background-color: #E5270F !important; + background-color: #F99C10 !important; } .icon-color { - color: #E5270F; + color: #F99C10; } .cart-color { - color: #E5270F !important; - border: 1px solid #E5270F !important; + color: #F99C10 !important; + border: 1px solid #F99C10 !important; } /* padding20 */ .padding20 { diff --git a/components/CitySelect.vue b/components/CitySelect.vue index 8d4e887..007458d 100644 --- a/components/CitySelect.vue +++ b/components/CitySelect.vue @@ -250,8 +250,8 @@ export default { text-overflow: ellipsis; max-width: 40%; &.active { - color: #f23030 !important; - border-bottom: 1rpx solid #f23030; + color: #F99C10 !important; + border-bottom: 1rpx solid #F99C10; } } } diff --git a/components/OrderGoods.vue b/components/OrderGoods.vue index b2f141a..3dbb08b 100644 --- a/components/OrderGoods.vue +++ b/components/OrderGoods.vue @@ -1,6 +1,6 @@