diff --git a/api/other.js b/api/other.js index 7fbc362..47307b9 100644 --- a/api/other.js +++ b/api/other.js @@ -1,3 +1,6 @@ +import request from "@/utils/request"; +import {host} from "@/config/host"; + /** * 阿里云文件上传STS * @param {Object} data diff --git a/api/pet.js b/api/pet.js index 537ae03..989e7cc 100644 --- a/api/pet.js +++ b/api/pet.js @@ -45,4 +45,16 @@ export function feedLog(pet_id){ pet_id } }) +} +/** + * 新增/修改宠物 + * @param data + * @returns {Promise} + */ +export function editPet(data){ + return request({ + url:'user/pet-upinfo', + method:'post', + data:data + }) } \ No newline at end of file diff --git a/components/PetPage/index.vue b/components/PetPage/index.vue index 72edd22..a1d834e 100644 --- a/components/PetPage/index.vue +++ b/components/PetPage/index.vue @@ -1,64 +1,179 @@ diff --git a/pages.json b/pages.json index 803c86a..5af8c8e 100644 --- a/pages.json +++ b/pages.json @@ -84,6 +84,12 @@ "style": { "navigationBarTitleText": "登录" } + }, + { + "path": "pages/Pet/create", + "style": { + "navigationBarTitleText": "创建修改萌宠" + } } ], "globalStyle": { diff --git a/pages/OrderPage/index.vue b/pages/OrderPage/index.vue index cb4bb39..46b2b05 100644 --- a/pages/OrderPage/index.vue +++ b/pages/OrderPage/index.vue @@ -62,22 +62,25 @@ - + 增值服务 - + - 洗澡{{i}} + {{item.name}} - + + + + - + @@ -86,8 +89,11 @@ 选择优惠 - - 58元优惠券 + + {{coupons.title}} + + + @@ -218,7 +224,17 @@ 1、文字占位文字占位文字占位文字占位文字占位文字占位文字占位 2、文字占位文字占位文字占位文字占位文字占位文字占位文 - + + + + + + + 增值服务 + + + + - + - + - + @@ -328,31 +345,48 @@ limit:10 }, addServiceChecked:[], + coupons:{}, } }, onLoad(options) { this.id = options.id; - this.getCardDetail(); }, onShow(){ this.getDefaultAddress(); + this.getUserCoupons(); }, methods: { - serverBottomLower(){ - console.log(123123) + getUserCoupons(){ + let cacheCoupons = uni.getStorageSync('userCoupons'); + if (cacheCoupons) { + this.coupons = cacheCoupons; + uni.removeStorage({key:'userCoupons'}); + } }, showAddServicePopup(){ this.$refs.addServicePopup.open(); }, - selectAddService(item){ - if(!this.addServiceChecked.indexOf(item.id)){ - this.addServiceChecked.push.apply(item.id); - } - console.log(this.addServiceChecked) + selectAddService(index){ + this.addServiceList[index].checked = !this.addServiceList[index].checked; + }, + addServiceConfirm(){ + this.addServiceList.map(item => { + if(item.checked){ + this.addServiceChecked.push(item); + } + }) + this.$refs.addServicePopup.close(); + }, + delAddService(index){ + this.addServiceChecked.splice(index,1); }, getStoreServiceList(){ getStoreService({address_id: this.address.id}).then(res => { - this.addServiceList = res.data.add_service; + this.addServiceList = res.data.add_service.map(item => { + item.checked = false; + return item; + }); + console.log(this.addServiceList) this.basicServiceList = res.data.basic_service; }); }, @@ -390,13 +424,6 @@ url:url }) }, - getCardDetail(){ - cardDetail({ - id:this.id - }).then((res) => { - console.log(res) - }) - }, sectionChange(index) { this.curNow = index; }, diff --git a/pages/Pet/components/create.scss b/pages/Pet/components/create.scss new file mode 100644 index 0000000..52cbfee --- /dev/null +++ b/pages/Pet/components/create.scss @@ -0,0 +1,106 @@ +.order-item.pet-page-item{ + padding:{ + left:0 !important; + right:0 !important; + } + border-bottom: none !important; +} +.pet-page-group{ + margin-top:20rpx; + padding:0 20rpx; + background:{ + color:#F3FDFC; + } + border-radius: 20rpx; +} +.pet-page-button{ + width: 100%; + text-align: center; + padding:55rpx 0 15rpx 0; + justify-content: center; +} +.order-item { + padding: 25rpx 10rpx; + align-items: center; + border-bottom: 1rpx solid #BBB; + box-sizing: border-box; + &:last-child { + border-bottom: none; + } + .item-content { + justify-content: flex-end; + box-sizing: border-box; + } +} +.detail-container{ + position: relative; + box-sizing: border-box; + .detail-background-container{ + box-sizing: border-box; + padding:0 10rpx; + position: absolute; + top:0rpx; + left:0; + width:100%; + height:100%; + .detail-background{ + position: relative; + // top:10rpx; + left:0; + width:100%; + height:100%; + z-index: 1; + background-color: #fff; + border: 2rpx solid #262626; + box-shadow: 1rpx 4rpx 6rpx 0rpx rgba(103,131,131,0.3); + border-radius: 50rpx; + } + } + .detail-content-container{ + position: relative; + z-index: 2; + padding:15rpx 0; + .detail-content{ + border: 2rpx solid #262626; + border-radius: 50rpx; + background-color:#fff; + padding:40rpx; + } + } + .detail-container{ + position: relative; + box-sizing: border-box; + .detail-background-container{ + box-sizing: border-box; + padding:0 10rpx; + position: absolute; + top:0rpx; + left:0; + width:100%; + height:100%; + .detail-background{ + position: relative; + // top:10rpx; + left:0; + width:100%; + height:100%; + z-index: 1; + background-color: #fff; + border: 2rpx solid #262626; + box-shadow: 1rpx 4rpx 6rpx 0rpx rgba(103,131,131,0.3); + border-radius: 50rpx; + } + } + .detail-content-container{ + position: relative; + z-index: 2; + padding:15rpx 0; + .detail-content{ + border: 2rpx solid #262626; + border-radius: 50rpx; + background-color:#fff; + padding:40rpx; + } + } + } +} \ No newline at end of file diff --git a/pages/Pet/create.vue b/pages/Pet/create.vue new file mode 100644 index 0000000..b7dd93a --- /dev/null +++ b/pages/Pet/create.vue @@ -0,0 +1,127 @@ + + + + + \ No newline at end of file diff --git a/pages/Pet/index.vue b/pages/Pet/index.vue index 5b52086..ab2c0fa 100644 --- a/pages/Pet/index.vue +++ b/pages/Pet/index.vue @@ -44,7 +44,7 @@ - + diff --git a/pages/UserCoupons/index.vue b/pages/UserCoupons/index.vue index f8b484a..75dfece 100644 --- a/pages/UserCoupons/index.vue +++ b/pages/UserCoupons/index.vue @@ -4,7 +4,7 @@ backgroundImage:'url('+staticImage.wallpaperBgImage+')' }"> - + 省点银子 @@ -37,16 +37,18 @@ 查看使用规则 - + @@ -118,13 +120,22 @@ cause: '满0.01使用', time: '有效期至2023.08.02', is_timeout: false, - }, ] + }, ], + type:'lists', } }, - onLoad() { - + onLoad(option) { + this.type = option.type||'lists' + console.log(this.type) }, methods: { + clickCoupons(item){ + if(!item.is_timeout){ + uni.setStorageSync('userCoupons',item); + uni.navigateBack(); + } + + }, navTo(url){ uni.navigateTo({ url:url @@ -140,7 +151,7 @@ title:row.title, time: '有效期至 '+row.end_time, cause:'满'+parseFloat(row.min_price)+'使用', - is_timeout: (row.status == 2), + is_timeout: (row.status === 2), } }) })