From 6cced560ec717fa5c2c3a7540b9c3c9bc32c8f29 Mon Sep 17 00:00:00 2001 From: chen-xin-zhi <3588068430@qq.com> Date: Wed, 19 Mar 2025 15:16:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=AE=8C=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/request.ts | 5 +- common/globalFont.js | 75 +-- common/globalFunction.js | 1 - common/globalImagesUrl.js | 2 +- common/setFonts.js | 7 - pages.json | 33 +- pages/Shopping-cart/component/addProduct.vue | 13 +- .../component/addressSelected.vue | 15 +- .../newaddress_Info/newaddress_Info.vue | 10 +- .../productmain/testproductmain.vue | 35 +- pages/activity/activityHome/activityHome.vue | 9 +- pages/activity/activityMain/activityMain.vue | 120 +++++ pages/book/component/bookingSelected.vue | 12 +- pages/book/component/bookingTips.vue | 6 +- pages/book/component/cancelOrder.vue | 4 +- pages/book/component/confirmBookingInfo.vue | 4 +- pages/book/component/deleteOrder.vue | 4 +- .../photoProductDetail/photoProductDetail.vue | 17 +- pages/book/photoProducts/photoProducts.vue | 15 +- .../photoProductsOrder/photoProductsOrder.vue | 19 +- .../photoProductsOrderDetail.vue | 5 +- pages/coupon/CouponMall/CouponMall.vue | 14 +- pages/coupon/CouponTips/CouponTips.vue | 6 +- pages/coupon/MyCoupon/MyCoupon.vue | 12 +- pages/coupon/OverDueCoupon/OverDueCoupon.vue | 12 +- pages/coupon/component/confirmPopup.vue | 4 +- pages/coupon/component/couponPopup.vue | 18 +- pages/home/home.vue | 12 +- pages/login/login.vue | 10 +- pages/mine/Contact/Contact.vue | 448 ------------------ pages/mine/Contact/testContact.vue | 8 +- pages/mine/addressList/addressList.vue | 8 +- pages/mine/component/contactPop.vue | 103 ++-- pages/mine/main/main.vue | 5 +- pages/my-order/component/nav.vue | 2 +- .../myGeneralOrderDetail.vue | 25 +- pages/my-order/myOrderList/myOrderList.vue | 31 +- .../myServiceOrderDetail.vue | 29 +- pages/order/component/addressComponent.vue | 10 +- pages/order/component/contactsComponent.vue | 18 +- .../order/product-waitpay/product-waitpay.vue | 40 +- pages/order/serviceWaitPay/serviceWaitPay.vue | 42 +- .../order/singleGoodOrder/singleGoodOrder.vue | 40 +- .../singleServiceWait/singleServiceWait.vue | 49 +- .../ProductDetails/ProductDetails.vue | 37 +- pages/store-home/main/testMain.vue | 23 +- pages/testPage/testPage.vue | 1 + pages/workshop/component/timeSelect.vue | 11 +- pages/workshop/component/tip.vue | 2 +- pages/workshop/index/index.vue | 14 +- pages/workshop/productmain/productmain.vue | 13 +- pages/workshop/searchGood/searchGood.vue | 2 +- pages/workshop/searchResult/searchResult.vue | 8 +- 53 files changed, 616 insertions(+), 852 deletions(-) delete mode 100644 common/setFonts.js create mode 100644 pages/activity/activityMain/activityMain.vue delete mode 100644 pages/mine/Contact/Contact.vue diff --git a/api/request.ts b/api/request.ts index d3aee80..e4616ea 100644 --- a/api/request.ts +++ b/api/request.ts @@ -2,9 +2,8 @@ export const Url = 'http://localhost:9092/api' //后端接口文档 export const testUrl = 'http://123.249.108.160:8888/api' //自己组的服务器接口地址 export const develop = 'http://154.8.193.216:9092/api' //隋宇霏的接口地址（开发环境） export const test = 'http://154.8.193.216:9093/api' //隋宇霏的接口地址（测试环境） -export const domain = 'https://www.carboner.cn/api' +export const domain = 'https://www.carboner.cn:8888/api' export const myIp = 'http://8.130.119.119:9092/api' export const nwct = 'https://winning-mouse-internally.ngrok-free.app/api' export const suiUrl = '' -export const baseUrl = Url - \ No newline at end of file +export const baseUrl = domain diff --git a/common/globalFont.js b/common/globalFont.js index b4c8a00..baf7e4f 100644 --- a/common/globalFont.js +++ b/common/globalFont.js @@ -1,36 +1,43 @@ 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); - // } - // }) - - // uni.loadFontFace({ - // family: 'FangZhengXiaoZhuan', - // source: `url("https://carbon2.obs.cn-north-4.myhuaweicloud.com/fonts/FangZhengXiaoZhuan.ttf")`, - // success:(res) =>{ - // console.log('success',res); - // }, - // fail:(err) => { - // console.log('err',err); - // } - // }) -} \ No newline at end of file + //其他页面 + 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); + } + }) +} + + +export const getZSFont = () => { + 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); + } + }) +} + +//欢迎页 +export const getFZXZFont = () => { + uni.loadFontFace({ + family: 'FangZhengXiaoZhuan', + source: `url("https://carbon2.obs.cn-north-4.myhuaweicloud.com/fonts/FangZhengXiaoZhuan.ttf")`, + success:(res) =>{ + console.log('success',res); + }, + fail:(err) => { + console.log('err',err); + } + }) +} + diff --git a/common/globalFunction.js b/common/globalFunction.js index 73f6150..724ed4e 100644 --- a/common/globalFunction.js +++ b/common/globalFunction.js @@ -12,7 +12,6 @@ export const dealResult = (res) => { } - export const JudgeIsNullity = (val) => { if (val === null || val === undefined || val === '') return true return false diff --git a/common/globalImagesUrl.js b/common/globalImagesUrl.js index e16b462..152e28a 100644 --- a/common/globalImagesUrl.js +++ b/common/globalImagesUrl.js @@ -1,4 +1,4 @@ -const publicPath = 'https://123.249.108.160:8888/api/file/downloadFile?objectKey=' +export const publicPath = 'https://www.carboner.cn:8888/api/file/downloadFile?objectKey=' const subPath = 'feiyi/miniProgram' diff --git a/common/setFonts.js b/common/setFonts.js deleted file mode 100644 index b657a89..0000000 --- a/common/setFonts.js +++ /dev/null @@ -1,7 +0,0 @@ -export const loadFontFaceFromLocal =()=> { - uni.loadFontFace({ - family: 'ZhongShanFonts', - source: `url("${'https://carbon2.obs.cn-north-4.myhuaweicloud.com/fonts/ZhongShanFonts.ttf'}")` - }) - console.log('success'); -} \ No newline at end of file diff --git a/pages.json b/pages.json index 8fc055c..133d312 100644 --- a/pages.json +++ b/pages.json @@ -5,7 +5,7 @@ "style" : { "navigationBarTitleText" : "首页", - "enablePullDownRefresh":true, //开启下拉刷新 + // "enablePullDownRefresh":true, //开启下拉刷新 "navigationBarBackgroundColor": "#ede8e7" } }, @@ -13,21 +13,24 @@ "path" : "pages/my-order/myGeneralOrderDetail/myGeneralOrderDetail", "style" : { - "navigationBarTitleText" : "" + "navigationBarTitleText" : "", + "enablePullDownRefresh":true //开启下拉刷新 } }, { "path" : "pages/my-order/myServiceOrderDetail/myServiceOrderDetail", "style" : { - "navigationBarTitleText" : "" + "navigationBarTitleText" : "", + "enablePullDownRefresh":true //开启下拉刷新 } }, { "path" : "pages/my-order/myOrderList/myOrderList", "style" : { - "navigationBarTitleText" : "" + "navigationBarTitleText" : "", + "enablePullDownRefresh":true //开启下拉刷新 } }, { @@ -120,7 +123,7 @@ "path" : "pages/store-home/ProductDetails/ProductDetails", "style" : { - "navigationBarTitleText" : "泠泷水月阁工作室" + "navigationBarTitleText" : "泠珑水月阁工作室" } }, { @@ -155,14 +158,8 @@ "path" : "pages/workshop/index/index", "style" : { - "navigationBarTitleText" : "" - } - }, - { - "path" : "pages/mine/Contact/Contact", - "style" : - { - "navigationBarTitleText" : "" + "navigationBarTitleText" : "", + "enablePullDownRefresh":true //开启下拉刷新 } }, { @@ -191,7 +188,8 @@ "path" : "pages/Shopping-cart/productmain/testproductmain", "style" : { - "navigationBarTitleText" : "" + "navigationBarTitleText" : "", + "enablePullDownRefresh":true //开启下拉刷新 } }, { @@ -256,6 +254,13 @@ { "navigationBarTitleText" : "" } + }, + { + "path" : "pages/activity/activityMain/activityMain", + "style" : + { + "navigationBarTitleText" : "" + } } ], "plugins" : { diff --git a/pages/Shopping-cart/component/addProduct.vue b/pages/Shopping-cart/component/addProduct.vue index b435209..31a48b9 100644 --- a/pages/Shopping-cart/component/addProduct.vue +++ b/pages/Shopping-cart/component/addProduct.vue @@ -2,8 +2,8 @@ - + @@ -57,6 +57,7 @@ baseUrl } from '../../../api/request'; import { dealResult } from '../../../common/globalFunction'; + import { publicPath } from '../../../common/globalImagesUrl'; const productBrief = ref({}) //商品简要对象 const quantity = ref(1) const userInfo = ref({}) @@ -149,7 +150,7 @@ .page { padding: 0 31.88rpx 31.88rpx 45rpx; - background-color: #fffef8; + background-color: #fff; border-radius: 37.5rpx 37.5rpx 0rpx 0rpx; width: 100%; overflow-y: auto; @@ -202,14 +203,14 @@ .text_3 { color: #000000; font-size: 28.13rpx; - font-family: FZSongKeBenXiuKaiS-R-GB; + font-family: FangZhengFonts; line-height: 26.21rpx; } .text_4 { color: #000000; font-size: 26.25rpx; - font-family: FZSongKeBenXiuKaiS-R-GB; + font-family: FangZhengFonts; line-height: 24.34rpx; } @@ -241,7 +242,7 @@ .text_5 { color: #000000; font-size: 30rpx; - font-family: FZSongKeBenXiuKaiS-R-GB; + font-family: FangZhengFonts; line-height: 21.41rpx; } diff --git a/pages/Shopping-cart/component/addressSelected.vue b/pages/Shopping-cart/component/addressSelected.vue index e6e19bf..c4daaa0 100644 --- a/pages/Shopping-cart/component/addressSelected.vue +++ b/pages/Shopping-cart/component/addressSelected.vue @@ -57,11 +57,18 @@ import { shoppingCartUrl } from '../../../common/globalImagesUrl'; } } + const updateAddressInfoHandler = (val) => { + if (addressInfo.value.id === val.id) { + addressInfo.value = val + } + } onMounted(() => { emitter.on('getAddressInfo', getAddressInfoHandler) emitter.on('delAddressById', delAddressByIdHandler) + + emitter.on('updateAddressInfo', updateAddressInfoHandler) }) onUnmounted(() => { @@ -69,6 +76,8 @@ import { shoppingCartUrl } from '../../../common/globalImagesUrl'; emitter.off('getAddressInfo', getAddressInfoHandler) emitter.off('delAddressById', delAddressByIdHandler) + + emitter.off('updateAddressInfo', updateAddressInfoHandler) }) @@ -97,7 +106,7 @@ import { shoppingCartUrl } from '../../../common/globalImagesUrl'; } .font { font-size: 30rpx; - font-family: FZSongKeBenXiuKaiS-R-GB; + font-family: FangZhengFonts; line-height: 25.54rpx; } .text { @@ -107,12 +116,12 @@ import { shoppingCartUrl } from '../../../common/globalImagesUrl'; .text_2 { color: #323232; font-size: 30rpx; - font-family: FZSongKeBenXiuKaiS-R-GB; + font-family: FangZhengFonts; line-height: 20.04rpx; } .font_2 { font-size: 26.25rpx; - font-family: FZSongKeBenXiuKaiS-R-GB; + font-family: FangZhengFonts; line-height: 25.54rpx; color: #323232; } diff --git a/pages/Shopping-cart/newaddress_Info/newaddress_Info.vue b/pages/Shopping-cart/newaddress_Info/newaddress_Info.vue index 8c5b7bc..a3198fd 100644 --- a/pages/Shopping-cart/newaddress_Info/newaddress_Info.vue +++ b/pages/Shopping-cart/newaddress_Info/newaddress_Info.vue @@ -101,7 +101,7 @@ const defaultAddress =(event)=>{ event.detail.value[0] ? addressParam.value.isDefault = 1 : addressParam.value.isDefault = 0 } //发送添加新增地址的请求 -const newAddress = async () =>{ +const newAddress = async () => { const values = Object.values(addressParam.value); // 使用some()方法来检查是否有任何值为空 if (values.some(value => value === null || value === undefined || value === '')) { @@ -112,7 +112,7 @@ const newAddress = async () =>{ return; } console.log(addressParam.value); - if(addressParam.value.id != undefined) { + if(addressParam.value.id !== undefined) { const res = await uni.request({ url: baseUrl + '/address/update', method: 'POST', @@ -122,6 +122,8 @@ const newAddress = async () =>{ data: { ...addressParam.value } }) console.log('res1==>',res.data); + emitter.emit('updateAddress', addressParam.value) + emitter.emit('updateAddressInfo', addressParam.value) sucRes(res.data.code) } else { const res = await uni.request({ @@ -193,7 +195,7 @@ const bindTimeChange = (e) => { //picker省市区选择 } .font_2 { font-size: 26.25rpx; - font-family: FZSongKeBenXiuKaiS-R-GB; + font-family: FangZhengFonts; line-height: 24.34rpx; color: #323232; } @@ -287,7 +289,7 @@ const bindTimeChange = (e) => { //picker省市区选择 .text_8 { color: #C35C5D; font-size: 30rpx; - font-family: FZSongKeBenXiuKaiS-R-GB; + font-family: FangZhengFonts; line-height: 27.9rpx; } .zujian{ //地址组件样式 diff --git a/pages/Shopping-cart/productmain/testproductmain.vue b/pages/Shopping-cart/productmain/testproductmain.vue index d6a78ab..ff93ceb 100644 --- a/pages/Shopping-cart/productmain/testproductmain.vue +++ b/pages/Shopping-cart/productmain/testproductmain.vue @@ -29,7 +29,7 @@ - @@ -61,7 +61,7 @@ - + {{ item.cartExperienceGoodVO.name }} @@ -128,6 +128,7 @@ import { baseUrl, testUrl, suiUrl } from '../../../api/request'; import * as math from 'mathjs' import { shoppingCartUrl } from '../../../common/globalImagesUrl'; + import { publicPath } from '../../../common/globalImagesUrl'; const bkgUrl = ref(shoppingCartUrl + '/productmain/bkg.png') const products = ref([]) const current = ref(1) //用于判断是实体类商品还是服务类商品 @@ -151,6 +152,16 @@ getFonts() getProductCart() //再获取一次 }) + + + onPullDownRefresh( async ()=>{ //下拉刷新 + getProductCart() //再获取一次 + setTimeout(()=>{ + uni.stopPullDownRefresh() //停止下拉刷新 + },1000) + }) + + //获取实体类商品信息 const getEntityPro = async () => { const res = await uni.request({ @@ -658,7 +669,7 @@ .font { font-size: 30rpx; - font-family: FZSongKeBenXiuKaiS-R-GB; + font-family: FangZhengFonts; line-height: 27.77rpx; color: #c35c5d; } @@ -705,7 +716,7 @@ .font_2 { font-size: 30rpx; - font-family: FZSongKeBenXiuKaiS-R-GB; + font-family: FangZhengFonts; line-height: 27.77rpx; color: #323232; } @@ -766,7 +777,7 @@ .font_3 { font-size: 26.25rpx; - font-family: FZSongKeBenXiuKaiS-R-GB; + font-family: FangZhengFonts; line-height: 25.01rpx; color: #323232; } @@ -777,7 +788,7 @@ .font_4 { font-size: 33.75rpx; - font-family: FZSongKeBenXiuKaiS-R-GB; + font-family: FangZhengFonts; line-height: 22.07rpx; color: #e79ea1; } @@ -796,7 +807,7 @@ .font_5 { font-size: 26.25rpx; - font-family: FZSongKeBenXiuKaiS-R-GB; + font-family: FangZhengFonts; line-height: 18.73rpx; color: #e79ea1; } @@ -826,7 +837,7 @@ .font_6 { font-size: 26.25rpx; - font-family: FZSongKeBenXiuKaiS-R-GB; + font-family: FangZhengFonts; line-height: 18.73rpx; color: #323232; } @@ -863,7 +874,7 @@ .font_7 { font-size: 26.25rpx; - font-family: FZSongKeBenXiuKaiS-R-GB; + font-family: FangZhengFonts; line-height: 31.88rpx; color: #323233; } @@ -877,7 +888,7 @@ .font_8 { font-size: 26.5rpx; - font-family: FZSongKeBenXiuKaiS-R-GB; + font-family: FangZhengFonts; line-height: 22.07rpx; color: #6b6e72; } @@ -898,7 +909,7 @@ .font_9 { font-size: 33.75rpx; - font-family: FZSongKeBenXiuKaiS-R-GB; + font-family: FangZhengFonts; line-height: 25.01rpx; font-weight: 600; color: #e79ea1; @@ -918,7 +929,7 @@ .font_10 { font-size: 26.25rpx; - font-family: FZSongKeBenXiuKaiS-R-GB; + font-family: FangZhengFonts; line-height: 18.73rpx; font-weight: 600; color: #e79ea1; diff --git a/pages/activity/activityHome/activityHome.vue b/pages/activity/activityHome/activityHome.vue index bae887c..19b1ae3 100644 --- a/pages/activity/activityHome/activityHome.vue +++ b/pages/activity/activityHome/activityHome.vue @@ -1,9 +1,14 @@ diff --git a/pages/book/component/bookingSelected.vue b/pages/book/component/bookingSelected.vue index 9430088..548aa2b 100644 --- a/pages/book/component/bookingSelected.vue +++ b/pages/book/component/bookingSelected.vue @@ -266,7 +266,7 @@ } .font { font-size: 37.5rpx; - font-family: FZSongKeBenXiuKaiS-R-GB; + font-family: FangZhengFonts; line-height: 33.99rpx; color: #000000; } @@ -312,7 +312,7 @@ } .text_4 { color: #323232b3; - font-family: FZSongKeBenXiuKaiS-R-GB; + font-family: FangZhengFonts; line-height: 35.04rpx; } .image_6 { @@ -325,7 +325,7 @@ margin-left: 22.5rpx; color: #000000; font-size: 30rpx; - font-family: FZSongKeBenXiuKaiS-R-GB; + font-family: FangZhengFonts; line-height: 26.4rpx; } .image_3 { @@ -382,7 +382,7 @@ } .font_2 { font-size: 26.25rpx; - font-family: FZSongKeBenXiuKaiS-R-GB; + font-family: FangZhengFonts; line-height: 24.21rpx; color: #000000; } @@ -413,7 +413,7 @@ } .font_3 { font-size: 22.5rpx; - font-family: FZSongKeBenXiuKaiS-R-GB; + font-family: FangZhengFonts; line-height: 26.25rpx; color: #ffffff; } @@ -434,7 +434,7 @@ .text_9 { color: #ffffff; font-size: 30rpx; - font-family: FZSongKeBenXiuKaiS-R-GB; + font-family: FangZhengFonts; line-height: 28.01rpx; } @import url(../../../common/css/global.css); diff --git a/pages/book/component/bookingTips.vue b/pages/book/component/bookingTips.vue index 3697ec6..980ccc0 100644 --- a/pages/book/component/bookingTips.vue +++ b/pages/book/component/bookingTips.vue @@ -46,7 +46,7 @@ import { onLoad } from "@dcloudio/uni-app"; .text { color: #000000; font-size: 37.5rpx; - font-family: FZSongKeBenXiuKaiS-R-GB; + font-family: FangZhengFonts; line-height: 34.42rpx; } .group { @@ -54,7 +54,7 @@ import { onLoad } from "@dcloudio/uni-app"; } .font { font-size: 29.17rpx; - font-family: FZSongKeBenXiuKaiS-R-GB; + font-family: FangZhengFonts; line-height: 35.42rpx; color: #323232; } @@ -67,7 +67,7 @@ import { onLoad } from "@dcloudio/uni-app"; .text_2 { color: #ffffff; font-size: 33.33rpx; - font-family: FZSongKeBenXiuKaiS-R-GB; + font-family: FangZhengFonts; line-height: 32.17rpx; } @import url(../../../common/css/global.css); diff --git a/pages/book/component/cancelOrder.vue b/pages/book/component/cancelOrder.vue index e0ebb7c..3a1210c 100644 --- a/pages/book/component/cancelOrder.vue +++ b/pages/book/component/cancelOrder.vue @@ -74,7 +74,7 @@ import { onLoad } from "@dcloudio/uni-app"; .text { color: #000000; font-size: 37.32rpx; - font-family: FZSongKeBenXiuKaiS-R-GB; + font-family: FangZhengFonts; line-height: 41.66rpx; } .text-wrapper { @@ -87,7 +87,7 @@ import { onLoad } from "@dcloudio/uni-app"; } .font { font-size: 37.62rpx; - font-family: FZSongKeBenXiuKaiS-R-GB; + font-family: FangZhengFonts; line-height: 35.41rpx; } .text_2 { diff --git a/pages/book/component/confirmBookingInfo.vue b/pages/book/component/confirmBookingInfo.vue index b5fa187..1f31564 100644 --- a/pages/book/component/confirmBookingInfo.vue +++ b/pages/book/component/confirmBookingInfo.vue @@ -151,12 +151,12 @@ const cookie = wx.getStorageSync("cookie") //请求头 .text { color: #000000; font-size: 37.72rpx; - font-family: FZSongKeBenXiuKaiS-R-GB; + font-family: FangZhengFonts; line-height: 41.72rpx; } .font { font-size: 30.97rpx; - font-family: FZSongKeBenXiuKaiS-R-GB; + font-family: FangZhengFonts; line-height: 35.46rpx; color: #000000; } diff --git a/pages/book/component/deleteOrder.vue b/pages/book/component/deleteOrder.vue index 958d2a2..40b13cf 100644 --- a/pages/book/component/deleteOrder.vue +++ b/pages/book/component/deleteOrder.vue @@ -75,7 +75,7 @@ import { getFonts } from '../../../common/globalFont'; .text { color: #000000; font-size: 37.32rpx; - font-family: FZSongKeBenXiuKaiS-R-GB; + font-family: FangZhengFonts; line-height: 41.66rpx; } .text-wrapper { @@ -88,7 +88,7 @@ import { getFonts } from '../../../common/globalFont'; } .font { font-size: 37.62rpx; - font-family: FZSongKeBenXiuKaiS-R-GB; + font-family: FangZhengFonts; line-height: 35.41rpx; } .text_2 { diff --git a/pages/book/photoProductDetail/photoProductDetail.vue b/pages/book/photoProductDetail/photoProductDetail.vue index 8923ba1..d1e127a 100644 --- a/pages/book/photoProductDetail/photoProductDetail.vue +++ b/pages/book/photoProductDetail/photoProductDetail.vue @@ -2,8 +2,8 @@ {{ obj.name }} @@ -40,8 +40,8 @@ 产品详情 服务说明 @@ -58,7 +58,7 @@ - - - diff --git a/pages/mine/Contact/testContact.vue b/pages/mine/Contact/testContact.vue index b163d17..dbc44bf 100644 --- a/pages/mine/Contact/testContact.vue +++ b/pages/mine/Contact/testContact.vue @@ -163,7 +163,7 @@ .text { color: #000000; font-size: 37.5rpx; - font-family: FZSongKeBenXiuKaiS-R-GB; + font-family: FangZhengFonts; line-height: 36.47rpx; } @@ -192,14 +192,14 @@ .font { font-size: 30rpx; - font-family: FZSongKeBenXiuKaiS-R-GB; + font-family: FangZhengFonts; line-height: 25.89rpx; color: #323232; } .font_2 { font-size: 30rpx; - font-family: FZSongKeBenXiuKaiS-R-GB; + font-family: FangZhengFonts; line-height: 20.04rpx; color: #323232; } @@ -214,7 +214,7 @@ .text_2 { color: #c35c5d; font-size: 22.5rpx; - font-family: FZSongKeBenXiuKaiS-R-GB; + font-family: FangZhengFonts; line-height: 18.71rpx; margin-top: 8rpx; } diff --git a/pages/mine/addressList/addressList.vue b/pages/mine/addressList/addressList.vue index 8815c42..ec6140e 100644 --- a/pages/mine/addressList/addressList.vue +++ b/pages/mine/addressList/addressList.vue @@ -133,13 +133,13 @@ const jump_newAddress =()=> { } .font { font-size: 30rpx; - font-family: FZSongKeBenXiuKaiS-R-GB; + font-family: FangZhengFonts; line-height: 25.89rpx; color: #323232; } .font_2 { font-size: 30rpx; - font-family: FZSongKeBenXiuKaiS-R-GB; + font-family: FangZhengFonts; line-height: 20.04rpx; color: #323232; } @@ -157,7 +157,7 @@ const jump_newAddress =()=> { .text_2 { color: #c35c5d; font-size: 22.5rpx; - font-family: FZSongKeBenXiuKaiS-R-GB; + font-family: FangZhengFonts; // line-height: 18.71rpx; } .image { @@ -167,7 +167,7 @@ const jump_newAddress =()=> { } .font_3 { font-size: 26.25rpx; - font-family: FZSongKeBenXiuKaiS-R-GB; + font-family: FangZhengFonts; line-height: 31.88rpx; color: #818181; } diff --git a/pages/mine/component/contactPop.vue b/pages/mine/component/contactPop.vue index 44c0e31..292a6ee 100644 --- a/pages/mine/component/contactPop.vue +++ b/pages/mine/component/contactPop.vue @@ -1,22 +1,22 @@