diff --git a/common/globalFont.js b/common/globalFont.js new file mode 100644 index 0000000..4cc493a --- /dev/null +++ b/common/globalFont.js @@ -0,0 +1,24 @@ +export const getFonts =()=>{ + //首页 + uni.loadFontFace({ + family: 'ZhongShanFonts', + source: `url("https://carbon2.obs.cn-north-4.myhuaweicloud.com/fonts/ZhongShanFonts.ttf")`, + success:(res) =>{ + console.log('success',res); + }, + fail:(err) => { + console.log('err',err); + } + }) + //其他页面 + uni.loadFontFace({ + family: 'FangZhengFonts', + source: `url("https://carbon2.obs.cn-north-4.myhuaweicloud.com/fonts/FangZhengFonts.TTF")`, + success:(res) =>{ + console.log('success',res); + }, + fail:(err) => { + console.log('err',err); + } + }) +} \ No newline at end of file diff --git a/pages.json b/pages.json index 28746b6..cb92871 100644 --- a/pages.json +++ b/pages.json @@ -101,27 +101,6 @@ "navigationBarTitleText" : "" } }, - { - "path" : "pages/booking/AppointmentHome", - "style" : - { - "navigationBarTitleText" : "" - } - }, - { - "path" : "pages/booking/ContactInformation", - "style" : - { - "navigationBarTitleText" : "联系人信息" - } - }, - { - "path" : "pages/booking/date", - "style" : - { - "navigationBarTitleText" : "" - } - }, { "path" : "pages/store-home/ProductDetails/ProductDetails", "style" : @@ -136,27 +115,6 @@ "navigationBarTitleText" : "" } }, - { - "path" : "pages/booking/BillingOfFees/BillingOfFees", - "style" : - { - "navigationBarTitleText" : "" - } - }, - { - "path" : "pages/booking/ReservationInstructions/ReservationInstructions", - "style" : - { - "navigationBarTitleText" : "" - } - }, - { - "path" : "pages/booking/respectable/respectable", - "style" : - { - "navigationBarTitleText" : "" - } - }, { "path" : "pages/Shopping-cart/newaddress_Info/newaddress_Info", "style" : @@ -171,19 +129,6 @@ "navigationBarTitleText" : "" } }, - { - "path": "pages/booking/Simple/Simple", - "style": { - "navigationBarTitleText": "" - } - }, - { - "path" : "pages/booking/bookingpay/bookingpay", - "style" : - { - "navigationBarTitleText" : "" - } - }, { "path" : "pages/login/login", "style" : @@ -205,20 +150,6 @@ "navigationBarTitleText" : "" } }, - { - "path" : "pages/booking/CostumeDisplay/CostumeDisplay", - "style" : - { - "navigationBarTitleText" : "" - } - }, - { - "path" : "pages/booking/CostumeDetails/CostumeDetails", - "style" : - { - "navigationBarTitleText" : "" - } - }, { "path" : "pages/mine/Contact/Contact", "style" : diff --git a/pages/Shopping-cart/productmain/testproductmain.vue b/pages/Shopping-cart/productmain/testproductmain.vue index 1d74532..de6c299 100644 --- a/pages/Shopping-cart/productmain/testproductmain.vue +++ b/pages/Shopping-cart/productmain/testproductmain.vue @@ -11,8 +11,14 @@ - 商品类 - 服务类 + + 商品类 + + + + 服务类 + + @@ -109,6 +115,8 @@ + + @@ -139,6 +147,7 @@ onLoad(() => { getProductCart() //再获取一次 getFonts() + // console.log(current.value) }) //获取实体类商品信息 const getEntityPro = async () => { @@ -207,17 +216,27 @@ }) } } + const isShowLine = ref(true) //更改实体商品和服务类方法 const changeType = async (num) => { + if (num == 1) { + if (!isShowLine.value) { + isShowLine.value = true + } + } else { + if (isShowLine.value) { + isShowLine.value = false + } + } current.value = num; console.log('current状态--->',current.value); getProductCart() totalPrice.value = 0 } - //更改下划线 - const getTextStyle = (num) => ({ - 'border-bottom': current.value === num ? '2px solid orange' : '2px solid #ffffff' - }); + // //更改下划线 + // const getTextStyle = (num) => ({ + // 'border-bottom': current.value === num ? '2px solid orange' : '2px solid #ffffff' + // }); //复选框绑定方法 const checkBoxChange = (event) => { console.log('服务类打印出来是---->', event); //选中后是数组下标 @@ -638,7 +657,7 @@ } .group { - padding: 27.06rpx 4.33rpx 23.08rpx 10.89rpx; + padding: 20.06rpx 4.33rpx 0 4.33rpx; z-index: 1; } diff --git a/pages/book/component/bookingSelected.vue b/pages/book/component/bookingSelected.vue index 0f0b497..01a62a5 100644 --- a/pages/book/component/bookingSelected.vue +++ b/pages/book/component/bookingSelected.vue @@ -5,7 +5,7 @@ 请选择拍摄人数和场地 @@ -19,24 +19,24 @@ {{ number }} 人 @@ -48,9 +48,9 @@ - + 室内 @@ -59,9 +59,9 @@ - + 室外 @@ -93,11 +93,18 @@ import {nextTick, onMounted, ref} from 'vue' import emitter from '../../../utils/emitter'; import feeTipsVue from './feeTips.vue'; + import { bookUrl } from '../../../common/globalImagesUrl'; const number = ref(1) - const field = ref('室内') + const field = ref('') const feeTips = ref(null) const obj = ref('') const totalPrice = ref(0) + const shotScene = ref('') + const disabled1 = ref(false) + const disabled2 = ref(false) + const checked1 = ref(false) + const checked2 = ref(false) + const type = ref('') onMounted(() => { emitter.on('closeFeeTips', () => { @@ -108,15 +115,31 @@ }) }) + emitter.on('getProductsType', (val:any) => { + type.value = val + console.log('=================================================>', type.value) + }) + emitter.on('getProductObj', (val:any) => { obj.value = val - totalPrice.value = val.price + totalPrice.value = val.price * val.minNumber + number.value = obj.value.minNumber + shotScene.value = obj.value.shotScene + if (shotScene.value === '室内') { + disabled1.value = true + checked2.value = true + field.value = '室内' + } else { + disabled2.value = true + checked1.value = true + field.value = '室外' + } console.log(totalPrice.value) }) }) const sub = () => { - if (number.value > 1) { + if (number.value > obj.value.minNumber) { number.value -- totalPrice.value = number.value * obj.value.price } @@ -142,8 +165,15 @@ } const jumpToOrder = () => { + if (field.value === '' || field.value === undefined || field.value === null) { + uni.showToast({ + title: '请选择场地', + icon: 'error' + }) + return ; + } uni.navigateTo({ - url: '/pages/book/photoProductsOrder/photoProductsOrder?field=' + field.value + '&number=' + number.value + '&id=' + obj.value.id + url: '/pages/book/photoProductsOrder/photoProductsOrder?field=' + field.value + '&number=' + number.value + '&id=' + obj.value.id + '&type=' + type.value }) } diff --git a/pages/book/component/confirmBookingInfo.vue b/pages/book/component/confirmBookingInfo.vue index 10c132c..74d57b8 100644 --- a/pages/book/component/confirmBookingInfo.vue +++ b/pages/book/component/confirmBookingInfo.vue @@ -19,6 +19,8 @@ const cookie = wx.getStorageSync("cookie") //请求头 const orderObj = ref({}) const isIndoors = ref(0) + const isMakeup = ref(1) + const isPhotography = ref(1) onMounted(() => { emitter.on('getBookingOrderData', (val:any) => { orderObj.value = val @@ -37,6 +39,12 @@ const cookie = wx.getStorageSync("cookie") //请求头 if (orderObj.value.field === '室内') { isIndoors.value = 1 } + if (orderObj.value.type === '妆造') { + isPhotography.value = 0 + + } else if (orderObj.value.type === '摄影') { + isMakeup.value = 0 + } const res = await uni.request({ url: baseUrl + '/advanceOrder/add', method: 'POST', @@ -49,8 +57,8 @@ const cookie = wx.getStorageSync("cookie") //请求头 specificDate: orderObj.value.bookingDate, timePoint: orderObj.value.bookingTime, isIndoors: isIndoors.value, - isMakeup: 1, - isPhotography: 1, + isMakeup: isMakeup.value, + isPhotography: isPhotography.value, quantity: orderObj.value.number } }) diff --git a/pages/book/photoProductDetail/photoProductDetail.vue b/pages/book/photoProductDetail/photoProductDetail.vue index ea599e3..c3abbbc 100644 --- a/pages/book/photoProductDetail/photoProductDetail.vue +++ b/pages/book/photoProductDetail/photoProductDetail.vue @@ -7,28 +7,28 @@ /> {{ obj.name }} - ￥{{ obj.price.toFixed(2) }}起 + ￥{{ obj.totalAmountPrice.toFixed(2) }}起 服务&交付标准 1组造型 1套服装 1种背景 @@ -64,13 +64,20 @@ import emitter from "../../../utils/emitter"; import bookingSelectedVue from "../component/bookingSelected.vue"; import { baseUrl } from "../../../api/request"; + import { bookUrl } from "../../../common/globalImagesUrl"; const cookie = wx.getStorageSync("cookie") //请求头 const id = ref({}) const bookingSelected = ref(null) const obj = ref({}) + const type = ref('') + const bookingDateVOList =ref([]) + onLoad((options) => { console.log(options) id.value = options.id + if (options.type) { + type.value = options.type + } getPhotoProductsById() }) @@ -99,11 +106,22 @@ }) console.log(res.data.data) obj.value = res.data.data + obj.value.totalAmountPrice = obj.value.minNumber * obj.value.price + bookingDateVOList.value = res.data.data.bookingDateVOList } const openBookingPopup = () => { + if (bookingDateVOList.value.length === 0) { + uni.showModal({ + title: '提示', + content: '当前写真产品的所有时段已约满', + showCancel: false + }) + return ; + } emitter.emit('getProductObj', obj.value) + emitter.emit('getProductsType', type.value) bookingSelected.value.open('bottom') } @@ -122,7 +140,7 @@ } .page { background-color: #ffffff; - background-image: url('https://ide.code.fun/api/image?token=67be7f674ae84d0012275313&name=8a8617bd8ea20ecda3f731825ed1b080.png'); + background-image: url(https://carbon2.obs.cn-north-4.myhuaweicloud.com/feiyi/miniProgram/book/photoProductDetail/bkg.png); background-size: 100% 100%; background-repeat: no-repeat; width: 100%; @@ -131,7 +149,7 @@ height: 100%; } .section { - background-image: url('https://ide.code.fun/api/image?token=67be7f674ae84d0012275313&name=8a8617bd8ea20ecda3f731825ed1b080.png'); + background-image: url(https://carbon2.obs.cn-north-4.myhuaweicloud.com/feiyi/miniProgram/book/photoProductDetail/bkg.png); background-size: 100% 100%; background-repeat: no-repeat; width: 750rpx; diff --git a/pages/book/photoProducts/photoProducts.vue b/pages/book/photoProducts/photoProducts.vue index 56614e5..0ffbb89 100644 --- a/pages/book/photoProducts/photoProducts.vue +++ b/pages/book/photoProducts/photoProducts.vue @@ -5,21 +5,21 @@ 写真专区 - + 摄影服务 - + 妆造服务 @@ -47,7 +47,7 @@ /> {{ item.name }} - {{ item.price.toFixed(2) }}元起 + {{ item.totalAmountPrice.toFixed(2) }}元起 @@ -61,6 +61,7 @@ @@ -138,7 +150,7 @@ margin-top: 24.38rpx; } .page { - background-image: url('https://ide.code.fun/api/image?token=67be7f674ae84d0012275313&name=039df2fe261116bd1bd408f287b060bc.png'); + background-image: url(https://carbon2.obs.cn-north-4.myhuaweicloud.com/feiyi/miniProgram/book/photoProducts/bkg.png); background-size: 100% 100%; background-repeat: no-repeat; width: 100%; @@ -147,7 +159,7 @@ height: 100vh; } .section { - background-image: url('https://ide.code.fun/api/image?token=67be7f674ae84d0012275313&name=039df2fe261116bd1bd408f287b060bc.png'); + background-image: url(https://carbon2.obs.cn-north-4.myhuaweicloud.com/feiyi/miniProgram/book/photoProducts/bkg.png); background-size: 100% 100%; background-repeat: no-repeat; width: 750rpx; diff --git a/pages/book/photoProductsOrder/photoProductsOrder.vue b/pages/book/photoProductsOrder/photoProductsOrder.vue index ebff554..34494a8 100644 --- a/pages/book/photoProductsOrder/photoProductsOrder.vue +++ b/pages/book/photoProductsOrder/photoProductsOrder.vue @@ -4,7 +4,7 @@ 选择联系人 预约须知 @@ -12,14 +12,14 @@ {{ contactTemplateString }} 更换联系人 @@ -67,7 +67,7 @@ 导航 @@ -111,6 +111,7 @@ import contactsComponentVue from '../../order/component/contactsComponent.vue'; import confirmBookingInfoVue from '../component/confirmBookingInfo.vue'; import { onLoad } from "@dcloudio/uni-app"; + import { bookUrl } from '../../../common/globalImagesUrl'; const cookie = wx.getStorageSync("cookie") //请求头 const photoProduct = ref({}) @@ -139,6 +140,7 @@ const isShow = ref(false) let loading = false; + const type = ref('') const contactTemplateString = ref('请选择') @@ -191,7 +193,8 @@ contactId: contactInfo.value.id, name: photoProduct.value.name, bookingDate: bookingDate.value, - bookingTime: bookingTime.value + bookingTime: bookingTime.value, + type: type.value }) confirmBookingInfo.value.open('center') } @@ -201,6 +204,7 @@ field.value = options.field number.value = options.number id.value = options.id + type.value = options.type }) @@ -429,7 +433,7 @@ } .page { background-color: #ffffff; - background-image: url('https://ide.code.fun/api/image?token=67be7f674ae84d0012275313&name=c07af569900e34d63f1e91cbbae55df7.png'); + background-image: url(https://carbon2.obs.cn-north-4.myhuaweicloud.com/feiyi/miniProgram/book/photoProductsOrder/bkg.png); background-size: 100% 100%; background-repeat: no-repeat; width: 100%; @@ -438,7 +442,7 @@ height: 100%; } .section { - background-image: url('https://ide.code.fun/api/image?token=67be7f674ae84d0012275313&name=c07af569900e34d63f1e91cbbae55df7.png'); + background-image: url(https://carbon2.obs.cn-north-4.myhuaweicloud.com/feiyi/miniProgram/book/photoProductsOrder/bkg.png); background-size: 100% 100%; background-repeat: no-repeat; width: 750rpx; diff --git a/pages/book/photoProductsOrderDetail/photoProductsOrderDetail.vue b/pages/book/photoProductsOrderDetail/photoProductsOrderDetail.vue index a4af5cc..b5b3cf1 100644 --- a/pages/book/photoProductsOrderDetail/photoProductsOrderDetail.vue +++ b/pages/book/photoProductsOrderDetail/photoProductsOrderDetail.vue @@ -57,7 +57,7 @@ 到店时间：{{ item.specificDate }} {{ item.timePoint }} @@ -116,11 +116,13 @@ - - \ No newline at end of file diff --git a/pages/booking/BillingOfFees/BillingOfFees.vue b/pages/booking/BillingOfFees/BillingOfFees.vue deleted file mode 100644 index fce6a74..0000000 --- a/pages/booking/BillingOfFees/BillingOfFees.vue +++ /dev/null @@ -1,151 +0,0 @@ - - - - - \ No newline at end of file diff --git a/pages/booking/ContactInformation.vue b/pages/booking/ContactInformation.vue deleted file mode 100644 index 97762b9..0000000 --- a/pages/booking/ContactInformation.vue +++ /dev/null @@ -1,162 +0,0 @@ - - - - - \ No newline at end of file diff --git a/pages/booking/CostumeDetails/CostumeDetails.vue b/pages/booking/CostumeDetails/CostumeDetails.vue deleted file mode 100644 index 10ebd14..0000000 --- a/pages/booking/CostumeDetails/CostumeDetails.vue +++ /dev/null @@ -1,46 +0,0 @@ - - - - - \ No newline at end of file diff --git a/pages/booking/CostumeDisplay/CostumeDisplay.vue b/pages/booking/CostumeDisplay/CostumeDisplay.vue deleted file mode 100644 index b510667..0000000 --- a/pages/booking/CostumeDisplay/CostumeDisplay.vue +++ /dev/null @@ -1,442 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/pages/booking/ReservationInstructions/ReservationInstructions.vue b/pages/booking/ReservationInstructions/ReservationInstructions.vue deleted file mode 100644 index cb195c8..0000000 --- a/pages/booking/ReservationInstructions/ReservationInstructions.vue +++ /dev/null @@ -1,72 +0,0 @@ - - - - - \ No newline at end of file diff --git a/pages/booking/Simple/Simple.vue b/pages/booking/Simple/Simple.vue deleted file mode 100644 index 01844b6..0000000 --- a/pages/booking/Simple/Simple.vue +++ /dev/null @@ -1,250 +0,0 @@ - - - - - \ No newline at end of file diff --git a/pages/booking/bookingpay/bookingpay.vue b/pages/booking/bookingpay/bookingpay.vue deleted file mode 100644 index bf9494d..0000000 --- a/pages/booking/bookingpay/bookingpay.vue +++ /dev/null @@ -1,443 +0,0 @@ - - - - - diff --git a/pages/booking/date.vue b/pages/booking/date.vue deleted file mode 100644 index 1e00935..0000000 --- a/pages/booking/date.vue +++ /dev/null @@ -1,475 +0,0 @@ - - - - - \ No newline at end of file diff --git a/pages/booking/exquisite/exquisite.vue b/pages/booking/exquisite/exquisite.vue deleted file mode 100644 index a3a8ce1..0000000 --- a/pages/booking/exquisite/exquisite.vue +++ /dev/null @@ -1,266 +0,0 @@ - - - - - \ No newline at end of file diff --git a/pages/booking/payOrder.vue b/pages/booking/payOrder.vue deleted file mode 100644 index e8292b1..0000000 --- a/pages/booking/payOrder.vue +++ /dev/null @@ -1,501 +0,0 @@ - - - - - diff --git a/pages/booking/respectable/respectable.vue b/pages/booking/respectable/respectable.vue deleted file mode 100644 index f176a01..0000000 --- a/pages/booking/respectable/respectable.vue +++ /dev/null @@ -1,561 +0,0 @@ - - - - - \ No newline at end of file diff --git a/pages/coupon/CouponMall/CouponMall.vue b/pages/coupon/CouponMall/CouponMall.vue index 07f562f..a67e5c7 100644 --- a/pages/coupon/CouponMall/CouponMall.vue +++ b/pages/coupon/CouponMall/CouponMall.vue @@ -12,7 +12,7 @@ 规则 @@ -52,7 +52,9 @@ import confirmPopupVue from '../component/confirmPopup.vue'; import popupVue from '../../popup.vue'; import emitter from '../../../utils/emitter'; + import { couponUrl } from '../../../common/globalImagesUrl'; const cookie = wx.getStorageSync("cookie") //请求头 + const couponList = ref([]) const points = ref(0) const exchange = ref(null) @@ -175,7 +177,7 @@ } .page { background-color: #ffffff; - background-image: url('https://ide.code.fun/api/image?token=67bd70bf4ae84d0012272c1a&name=776298fdb18de84cb191f66e4d22ba7a.png'); + background-image: url(https://carbon2.obs.cn-north-4.myhuaweicloud.com/feiyi/miniProgram/coupon/CouponMall/bkg.png); background-size: 100% 100%; background-repeat: no-repeat; width: 100%; @@ -184,7 +186,7 @@ height: 100%; } .section { - background-image: url('https://ide.code.fun/api/image?token=67bd70bf4ae84d0012272c1a&name=776298fdb18de84cb191f66e4d22ba7a.png'); + background-image: url(https://carbon2.obs.cn-north-4.myhuaweicloud.com/feiyi/miniProgram/coupon/CouponMall/bkg.png); background-size: 100% 100%; background-repeat: no-repeat; width: 750rpx; diff --git a/pages/coupon/CouponTips/CouponTips.vue b/pages/coupon/CouponTips/CouponTips.vue index 85f3132..d17898f 100644 --- a/pages/coupon/CouponTips/CouponTips.vue +++ b/pages/coupon/CouponTips/CouponTips.vue @@ -27,7 +27,7 @@ diff --git a/pages/mine/Contact/testContact.vue b/pages/mine/Contact/testContact.vue index bfa78bd..d7a6059 100644 --- a/pages/mine/Contact/testContact.vue +++ b/pages/mine/Contact/testContact.vue @@ -188,13 +188,13 @@ .text-wrapper_2 { padding-bottom: 7.5rpx; - background-color: #ffbe55; + background-color: #fbdedf; border-radius: 9.38rpx; width: 71.06rpx; } .text_2 { - color: #ffffff; + color: #c35c5d; font-size: 22.5rpx; font-family: FZSongKeBenXiuKaiS-R-GB; line-height: 18.71rpx; diff --git a/pages/mine/mineorders/mineorders.vue b/pages/mine/mineorders/mineorders.vue index c71d617..e4a297a 100644 --- a/pages/mine/mineorders/mineorders.vue +++ b/pages/mine/mineorders/mineorders.vue @@ -34,10 +34,15 @@ - - 订单编号： - {{order.orderNumber}} - {{ order.orderStatus }} + + + 订单编号： + {{order.orderNumber}} + + + + {{ order.orderStatus }} + @@ -66,7 +71,7 @@ 售后详情 --> - 总 金额： + 总金额： {{order.totalAmount}} @@ -122,7 +127,7 @@