admin1/jiangchengfeiyi-xiaochengxu
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

合完了

Browse Source
This commit is contained in:
chen-xin-zhi 2025-03-19 15:16:09 +08:00
parent 4da939b708
commit 6cced560ec
53 changed files with 616 additions and 852 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api/request.ts
View File

@ -2,9 +2,8 @@ export const Url = 'http://localhost:9092/api' //后端接口文档
export const testUrl = 'http://123.249.108.160:8888/api' //自己组的服务器接口地址 export const testUrl = 'http://123.249.108.160:8888/api' //自己组的服务器接口地址
export const develop = 'http://154.8.193.216:9092/api' //隋宇霏的接口地址（开发环境） export const develop = 'http://154.8.193.216:9092/api' //隋宇霏的接口地址（开发环境）
export const test = 'http://154.8.193.216:9093/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 myIp = 'http://8.130.119.119:9092/api'
export const nwct = 'https://winning-mouse-internally.ngrok-free.app/api' export const nwct = 'https://winning-mouse-internally.ngrok-free.app/api'
export const suiUrl = '' export const suiUrl = ''
export const baseUrl = Url export const baseUrl = domain

73
common/globalFont.js
View File

@ -1,36 +1,43 @@
export const getFonts =()=>{ 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({ uni.loadFontFace({
// family: 'FangZhengXiaoZhuan', family: 'FangZhengFonts',
// source: `url("https://carbon2.obs.cn-north-4.myhuaweicloud.com/fonts/FangZhengXiaoZhuan.ttf")`, source: `url("https://carbon2.obs.cn-north-4.myhuaweicloud.com/fonts/FangZhengFonts.ttf")`,
// success:(res) =>{ success:(res) =>{
// console.log('success',res); console.log('success',res);
// }, },
// fail:(err) => { fail:(err) => {
// console.log('err',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);
}
})
}

1
common/globalFunction.js
View File

@ -12,7 +12,6 @@ export const dealResult = (res) => {
} }
export const JudgeIsNullity = (val) => { export const JudgeIsNullity = (val) => {
if (val === null || val === undefined || val === '') return true if (val === null || val === undefined || val === '') return true
return false return false

2
common/globalImagesUrl.js
View File

@ -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' const subPath = 'feiyi/miniProgram'

7
common/setFonts.js
View File

@ -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');
}

33
pages.json
View File

@ -5,7 +5,7 @@
"style" : "style" :
{ {
"navigationBarTitleText" : "首页", "navigationBarTitleText" : "首页",
"enablePullDownRefresh":true, //开启下拉刷新 // "enablePullDownRefresh":true, //开启下拉刷新
"navigationBarBackgroundColor": "#ede8e7" "navigationBarBackgroundColor": "#ede8e7"
} }
}, },
@ -13,21 +13,24 @@
"path" : "pages/my-order/myGeneralOrderDetail/myGeneralOrderDetail", "path" : "pages/my-order/myGeneralOrderDetail/myGeneralOrderDetail",
"style" : "style" :
{ {
"navigationBarTitleText" : "" "navigationBarTitleText" : "",
"enablePullDownRefresh":true //开启下拉刷新
} }
}, },
{ {
"path" : "pages/my-order/myServiceOrderDetail/myServiceOrderDetail", "path" : "pages/my-order/myServiceOrderDetail/myServiceOrderDetail",
"style" : "style" :
{ {
"navigationBarTitleText" : "" "navigationBarTitleText" : "",
"enablePullDownRefresh":true //开启下拉刷新
} }
}, },
{ {
"path" : "pages/my-order/myOrderList/myOrderList", "path" : "pages/my-order/myOrderList/myOrderList",
"style" : "style" :
{ {
"navigationBarTitleText" : "" "navigationBarTitleText" : "",
"enablePullDownRefresh":true //开启下拉刷新
} }
}, },
{ {
@ -120,7 +123,7 @@
"path" : "pages/store-home/ProductDetails/ProductDetails", "path" : "pages/store-home/ProductDetails/ProductDetails",
"style" : "style" :
{ {
"navigationBarTitleText" : "泠泷水月阁工作室" "navigationBarTitleText" : "泠珑水月阁工作室"
} }
}, },
{ {
@ -155,14 +158,8 @@
"path" : "pages/workshop/index/index", "path" : "pages/workshop/index/index",
"style" : "style" :
{ {
"navigationBarTitleText" : "" "navigationBarTitleText" : "",
} "enablePullDownRefresh":true //开启下拉刷新
},
{
"path" : "pages/mine/Contact/Contact",
"style" :
{
"navigationBarTitleText" : ""
} }
}, },
{ {
@ -191,7 +188,8 @@
"path" : "pages/Shopping-cart/productmain/testproductmain", "path" : "pages/Shopping-cart/productmain/testproductmain",
"style" : "style" :
{ {
"navigationBarTitleText" : "" "navigationBarTitleText" : "",
"enablePullDownRefresh":true //开启下拉刷新
} }
}, },
{ {
@ -256,6 +254,13 @@
{ {
"navigationBarTitleText" : "" "navigationBarTitleText" : ""
} }
},
{
"path" : "pages/activity/activityMain/activityMain",
"style" :
{
"navigationBarTitleText" : ""
}
} }
], ],
"plugins" : { "plugins" : {

13
pages/Shopping-cart/component/addProduct.vue
View File

@ -2,8 +2,8 @@
<view class="flex-col page"> <view class="flex-col page">
<view class="flex-row group"> <view class="flex-row group">
<view class=" "> <view class=" ">
<image class="flex-col justify-start items-end shrink-0 self-start image-wrapper" <image class="flex-col justify-start items-end shrink-0 self-start image-wrapper" mode="aspectFill"
:src="productBrief.goodImg.split(';')[0]" /> :src="publicPath + productBrief.goodImg.split(';')[0]" />
</view> </view>
<view class="flex-row flex-1 ml-23"> <view class="flex-row flex-1 ml-23">
<view class="flex-col flex-1 self-start group_2"> <view class="flex-col flex-1 self-start group_2">
@ -57,6 +57,7 @@
baseUrl baseUrl
} from '../../../api/request'; } from '../../../api/request';
import { dealResult } from '../../../common/globalFunction'; import { dealResult } from '../../../common/globalFunction';
import { publicPath } from '../../../common/globalImagesUrl';
const productBrief = ref({}) //商品简要对象 const productBrief = ref({}) //商品简要对象
const quantity = ref(1) const quantity = ref(1)
const userInfo = ref({}) const userInfo = ref({})
@ -149,7 +150,7 @@
.page { .page {
padding: 0 31.88rpx 31.88rpx 45rpx; padding: 0 31.88rpx 31.88rpx 45rpx;
background-color: #fffef8; background-color: #fff;
border-radius: 37.5rpx 37.5rpx 0rpx 0rpx; border-radius: 37.5rpx 37.5rpx 0rpx 0rpx;
width: 100%; width: 100%;
overflow-y: auto; overflow-y: auto;
@ -202,14 +203,14 @@
.text_3 { .text_3 {
color: #000000; color: #000000;
font-size: 28.13rpx; font-size: 28.13rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 26.21rpx; line-height: 26.21rpx;
} }
.text_4 { .text_4 {
color: #000000; color: #000000;
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 24.34rpx; line-height: 24.34rpx;
} }
@ -241,7 +242,7 @@
.text_5 { .text_5 {
color: #000000; color: #000000;
font-size: 30rpx; font-size: 30rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 21.41rpx; line-height: 21.41rpx;
} }

15
pages/Shopping-cart/component/addressSelected.vue
View File

@ -57,11 +57,18 @@ import { shoppingCartUrl } from '../../../common/globalImagesUrl';
} }
} }
const updateAddressInfoHandler = (val) => {
if (addressInfo.value.id === val.id) {
addressInfo.value = val
}
}
onMounted(() => { onMounted(() => {
emitter.on('getAddressInfo', getAddressInfoHandler) emitter.on('getAddressInfo', getAddressInfoHandler)
emitter.on('delAddressById', delAddressByIdHandler) emitter.on('delAddressById', delAddressByIdHandler)
emitter.on('updateAddressInfo', updateAddressInfoHandler)
}) })
onUnmounted(() => { onUnmounted(() => {
@ -69,6 +76,8 @@ import { shoppingCartUrl } from '../../../common/globalImagesUrl';
emitter.off('getAddressInfo', getAddressInfoHandler) emitter.off('getAddressInfo', getAddressInfoHandler)
emitter.off('delAddressById', delAddressByIdHandler) emitter.off('delAddressById', delAddressByIdHandler)
emitter.off('updateAddressInfo', updateAddressInfoHandler)
}) })
</script> </script>
@ -97,7 +106,7 @@ import { shoppingCartUrl } from '../../../common/globalImagesUrl';
} }
.font { .font {
font-size: 30rpx; font-size: 30rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 25.54rpx; line-height: 25.54rpx;
} }
.text { .text {
@ -107,12 +116,12 @@ import { shoppingCartUrl } from '../../../common/globalImagesUrl';
.text_2 { .text_2 {
color: #323232; color: #323232;
font-size: 30rpx; font-size: 30rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 20.04rpx; line-height: 20.04rpx;
} }
.font_2 { .font_2 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 25.54rpx; line-height: 25.54rpx;
color: #323232; color: #323232;
} }

8
pages/Shopping-cart/newaddress_Info/newaddress_Info.vue
View File

@ -112,7 +112,7 @@ const newAddress = async () =>{
return; return;
} }
console.log(addressParam.value); console.log(addressParam.value);
if(addressParam.value.id != undefined) { if(addressParam.value.id !== undefined) {
const res = await uni.request({ const res = await uni.request({
url: baseUrl + '/address/update', url: baseUrl + '/address/update',
method: 'POST', method: 'POST',
@ -122,6 +122,8 @@ const newAddress = async () =>{
data: { ...addressParam.value } data: { ...addressParam.value }
}) })
console.log('res1==>',res.data); console.log('res1==>',res.data);
emitter.emit('updateAddress', addressParam.value)
emitter.emit('updateAddressInfo', addressParam.value)
sucRes(res.data.code) sucRes(res.data.code)
} else { } else {
const res = await uni.request({ const res = await uni.request({
@ -193,7 +195,7 @@ const bindTimeChange = (e) => { //picker省市区选择
} }
.font_2 { .font_2 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 24.34rpx; line-height: 24.34rpx;
color: #323232; color: #323232;
} }
@ -287,7 +289,7 @@ const bindTimeChange = (e) => { //picker省市区选择
.text_8 { .text_8 {
color: #C35C5D; color: #C35C5D;
font-size: 30rpx; font-size: 30rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 27.9rpx; line-height: 27.9rpx;
} }
.zujian{ //地址组件样式 .zujian{ //地址组件样式

35
pages/Shopping-cart/productmain/testproductmain.vue
View File

@ -29,7 +29,7 @@
<!-- 多选框 --> <!-- 多选框 -->
<checkbox class="shrink-0 self-center image_3 round red" :value="index" :checked="item.checked" /> <checkbox class="shrink-0 self-center image_3 round red" :value="index" :checked="item.checked" />
<view class="flex-row items-end flex-1 self-center ml-22"> <view class="flex-row items-end flex-1 self-center ml-22">
<image class="shrink-0 image_2" :src="item.cartGoodVO.goodImg.split(';')[0]" mode="aspectFill" <image class="shrink-0 image_2" :src="publicPath + item.cartGoodVO.goodImg.split(';')[0]" mode="aspectFill"
@click="jump_product(item.goodId)" :style="{ pointerEvents: isLoading ? 'none' : 'auto' }"/> @click="jump_product(item.goodId)" :style="{ pointerEvents: isLoading ? 'none' : 'auto' }"/>
<view class="flex-col flex-1 group_2"> <view class="flex-col flex-1 group_2">
<view class="flex-row justify-center group_3" :style="{ pointerEvents: isLoading ? 'none' : 'auto' }"> <view class="flex-row justify-center group_3" :style="{ pointerEvents: isLoading ? 'none' : 'auto' }">
@ -61,7 +61,7 @@
<view class="flex-row"> <view class="flex-row">
<!-- 按钮 --> <!-- 按钮 -->
<checkbox class="shrink-0 self-center image_3 round red" :value="index" :checked="item.checked" /> <checkbox class="shrink-0 self-center image_3 round red" :value="index" :checked="item.checked" />
<image class="shrink-0 image_7" :src="item.cartExperienceGoodVO.goodImg.split(';')[0]" /> <image class="shrink-0 image_7" :src="publicPath + item.cartExperienceGoodVO.goodImg.split(';')[0]" mode="aspectFill" />
<view class="flex_1"> <view class="flex_1">
<view class="flex-col flex-1 group_5"> <view class="flex-col flex-1 group_5">
<text class="font_7">{{ item.cartExperienceGoodVO.name }}</text> <text class="font_7">{{ item.cartExperienceGoodVO.name }}</text>
@ -128,6 +128,7 @@
import { baseUrl, testUrl, suiUrl } from '../../../api/request'; import { baseUrl, testUrl, suiUrl } from '../../../api/request';
import * as math from 'mathjs' import * as math from 'mathjs'
import { shoppingCartUrl } from '../../../common/globalImagesUrl'; import { shoppingCartUrl } from '../../../common/globalImagesUrl';
import { publicPath } from '../../../common/globalImagesUrl';
const bkgUrl = ref(shoppingCartUrl + '/productmain/bkg.png') const bkgUrl = ref(shoppingCartUrl + '/productmain/bkg.png')
const products = ref([]) const products = ref([])
const current = ref(1) //用于判断是实体类商品还是服务类商品 const current = ref(1) //用于判断是实体类商品还是服务类商品
@ -151,6 +152,16 @@
getFonts() getFonts()
getProductCart() //再获取一次 getProductCart() //再获取一次
}) })
onPullDownRefresh( async ()=>{ //下拉刷新
getProductCart() //再获取一次
setTimeout(()=>{
uni.stopPullDownRefresh() //停止下拉刷新
},1000)
})
//获取实体类商品信息 //获取实体类商品信息
const getEntityPro = async () => { const getEntityPro = async () => {
const res = await uni.request({ const res = await uni.request({
@ -658,7 +669,7 @@
.font { .font {
font-size: 30rpx; font-size: 30rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 27.77rpx; line-height: 27.77rpx;
color: #c35c5d; color: #c35c5d;
} }
@ -705,7 +716,7 @@
.font_2 { .font_2 {
font-size: 30rpx; font-size: 30rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 27.77rpx; line-height: 27.77rpx;
color: #323232; color: #323232;
} }
@ -766,7 +777,7 @@
.font_3 { .font_3 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 25.01rpx; line-height: 25.01rpx;
color: #323232; color: #323232;
} }
@ -777,7 +788,7 @@
.font_4 { .font_4 {
font-size: 33.75rpx; font-size: 33.75rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 22.07rpx; line-height: 22.07rpx;
color: #e79ea1; color: #e79ea1;
} }
@ -796,7 +807,7 @@
.font_5 { .font_5 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 18.73rpx; line-height: 18.73rpx;
color: #e79ea1; color: #e79ea1;
} }
@ -826,7 +837,7 @@
.font_6 { .font_6 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 18.73rpx; line-height: 18.73rpx;
color: #323232; color: #323232;
} }
@ -863,7 +874,7 @@
.font_7 { .font_7 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 31.88rpx; line-height: 31.88rpx;
color: #323233; color: #323233;
} }
@ -877,7 +888,7 @@
.font_8 { .font_8 {
font-size: 26.5rpx; font-size: 26.5rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 22.07rpx; line-height: 22.07rpx;
color: #6b6e72; color: #6b6e72;
} }
@ -898,7 +909,7 @@
.font_9 { .font_9 {
font-size: 33.75rpx; font-size: 33.75rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 25.01rpx; line-height: 25.01rpx;
font-weight: 600; font-weight: 600;
color: #e79ea1; color: #e79ea1;
@ -918,7 +929,7 @@
.font_10 { .font_10 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 18.73rpx; line-height: 18.73rpx;
font-weight: 600; font-weight: 600;
color: #e79ea1; color: #e79ea1;

9
pages/activity/activityHome/activityHome.vue
View File

@ -1,9 +1,14 @@
<template> <template>
<web-view src="https://mp.weixin.qq.com/s?__biz=Mzk0NTYyNDIwMw==&mid=2247484925&idx=1&sn=1548a0df724a25d55b46c067fecb4b57&chksm=c313c019f464490fa00790f4a36f569e02ffae23df0fa871c3703fe4ca12c893add30d483ca8#rd"></web-view> <web-view :src="url"></web-view>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import {ref} from 'vue'
import { onLoad } from "@dcloudio/uni-app";
const url = ref('')
onLoad((options) => {
url.value = options.url
})
</script> </script>
<style lang="scss"> <style lang="scss">

120
pages/activity/activityMain/activityMain.vue Normal file
View File

@ -0,0 +1,120 @@
<template>
<view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }">
<view class="section"></view>
<text class="text pos">公众号动态</text>
<view class="flex-col pos_2">
<view class="flex-row items-center mt-12 list-item" v-for="(item, index) in articleList" :key="index" @click="goToActicle(item)">
<view class="flex-col flex-1">
<text class="self-stretch font">{{ item.title }}</text>
<text class="self-start font_2 mt-13">{{ item.publishTime }}</text>
</view>
<image
class="shrink-0 image ml-17" mode="aspectFill"
:src="publicPath + item.image"
/>
</view>
</view>
</view>
</template>
<script setup>
import {onMounted, ref} from 'vue'
import { homeUrl } from '../../../common/globalImagesUrl';
import { baseUrl } from '../../../api/request';
import { publicPath } from '../../../common/globalImagesUrl';
const bkgUrl = ref(homeUrl + '/bkg.png')
const articleList = ref([])
const cookie = wx.getStorageSync('cookie')
onMounted(() => {
getArticle()
})
const getArticle = async () => {
const res = await uni.request({
url: baseUrl + '/article/query',
method: 'GET',
header: {
cookie
}
})
articleList.value = res.data.data
}
const goToActicle = (item) => {
uni.navigateTo({
url: '../activityHome/activityHome?url=' + item.url
})
}
</script>
<style scoped lang="scss">
.mt-13 {
margin-top: 24.38rpx;
}
.ml-17 {
margin-left: 31.88rpx;
}
.page {
background-color: #ffffff;
background-size: 100% 100%;
background-repeat: no-repeat;
width: 100%;
overflow-y: auto;
overflow-x: hidden;
height: 100vh;
}
// .section {
// background-image: url('https://ide.code.fun/api/image?token=67d8b4914ae84d001229d9b4&name=0b6e7fe8316ba6563829f8a04827cf17.png');
// background-size: 100% 100%;
// background-repeat: no-repeat;
// width: 750rpx;
// height: 1490.63rpx;
// }
.text {
color: #9d2624;
font-size: 37.5rpx;
font-family: FangZhengFonts;
line-height: 35.89rpx;
}
.pos {
position: absolute;
left: 21.81rpx;
top: 49.28rpx;
}
.pos_2 {
position: absolute;
left: 20.63rpx;
right: 16.88rpx;
top: 123.75rpx;
padding-bottom: 40rpx;
}
.list-item {
padding: 22.5rpx 26.25rpx;
background-color: #ffffff;
border-radius: 18.75rpx;
}
.list-item:first-child {
margin-top: 0;
}
.font {
font-size: 30rpx;
font-family: FangZhengFonts;
line-height: 35.63rpx;
color: #323232;
}
.font_2 {
font-size: 28.13rpx;
font-family: FangZhengFonts;
line-height: 27.47rpx;
color: #929292;
}
.image {
border-radius: 9.38rpx;
width: 151.88rpx;
height: 114.38rpx;
}
@import url(../../../common/css/global.css);
</style>

12
pages/book/component/bookingSelected.vue
View File

@ -266,7 +266,7 @@
} }
.font { .font {
font-size: 37.5rpx; font-size: 37.5rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 33.99rpx; line-height: 33.99rpx;
color: #000000; color: #000000;
} }
@ -312,7 +312,7 @@
} }
.text_4 { .text_4 {
color: #323232b3; color: #323232b3;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 35.04rpx; line-height: 35.04rpx;
} }
.image_6 { .image_6 {
@ -325,7 +325,7 @@
margin-left: 22.5rpx; margin-left: 22.5rpx;
color: #000000; color: #000000;
font-size: 30rpx; font-size: 30rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 26.4rpx; line-height: 26.4rpx;
} }
.image_3 { .image_3 {
@ -382,7 +382,7 @@
} }
.font_2 { .font_2 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 24.21rpx; line-height: 24.21rpx;
color: #000000; color: #000000;
} }
@ -413,7 +413,7 @@
} }
.font_3 { .font_3 {
font-size: 22.5rpx; font-size: 22.5rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 26.25rpx; line-height: 26.25rpx;
color: #ffffff; color: #ffffff;
} }
@ -434,7 +434,7 @@
.text_9 { .text_9 {
color: #ffffff; color: #ffffff;
font-size: 30rpx; font-size: 30rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 28.01rpx; line-height: 28.01rpx;
} }
@import url(../../../common/css/global.css); @import url(../../../common/css/global.css);

6
pages/book/component/bookingTips.vue
View File

@ -46,7 +46,7 @@ import { onLoad } from "@dcloudio/uni-app";
.text { .text {
color: #000000; color: #000000;
font-size: 37.5rpx; font-size: 37.5rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 34.42rpx; line-height: 34.42rpx;
} }
.group { .group {
@ -54,7 +54,7 @@ import { onLoad } from "@dcloudio/uni-app";
} }
.font { .font {
font-size: 29.17rpx; font-size: 29.17rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 35.42rpx; line-height: 35.42rpx;
color: #323232; color: #323232;
} }
@ -67,7 +67,7 @@ import { onLoad } from "@dcloudio/uni-app";
.text_2 { .text_2 {
color: #ffffff; color: #ffffff;
font-size: 33.33rpx; font-size: 33.33rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 32.17rpx; line-height: 32.17rpx;
} }
@import url(../../../common/css/global.css); @import url(../../../common/css/global.css);

4
pages/book/component/cancelOrder.vue
View File

@ -74,7 +74,7 @@ import { onLoad } from "@dcloudio/uni-app";
.text { .text {
color: #000000; color: #000000;
font-size: 37.32rpx; font-size: 37.32rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 41.66rpx; line-height: 41.66rpx;
} }
.text-wrapper { .text-wrapper {
@ -87,7 +87,7 @@ import { onLoad } from "@dcloudio/uni-app";
} }
.font { .font {
font-size: 37.62rpx; font-size: 37.62rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 35.41rpx; line-height: 35.41rpx;
} }
.text_2 { .text_2 {

4
pages/book/component/confirmBookingInfo.vue
View File

@ -151,12 +151,12 @@ const cookie = wx.getStorageSync("cookie") //请求头
.text { .text {
color: #000000; color: #000000;
font-size: 37.72rpx; font-size: 37.72rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 41.72rpx; line-height: 41.72rpx;
} }
.font { .font {
font-size: 30.97rpx; font-size: 30.97rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 35.46rpx; line-height: 35.46rpx;
color: #000000; color: #000000;
} }

4
pages/book/component/deleteOrder.vue
View File

@ -75,7 +75,7 @@ import { getFonts } from '../../../common/globalFont';
.text { .text {
color: #000000; color: #000000;
font-size: 37.32rpx; font-size: 37.32rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 41.66rpx; line-height: 41.66rpx;
} }
.text-wrapper { .text-wrapper {
@ -88,7 +88,7 @@ import { getFonts } from '../../../common/globalFont';
} }
.font { .font {
font-size: 37.62rpx; font-size: 37.62rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 35.41rpx; line-height: 35.41rpx;
} }
.text_2 { .text_2 {

17
pages/book/photoProductDetail/photoProductDetail.vue
View File

@ -2,8 +2,8 @@
<view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgUrl + ')'}"> <view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgUrl + ')'}">
<view class="section" :style="{ backgroundImage: 'url(' + bkgUrl + ')'}"></view> <view class="section" :style="{ backgroundImage: 'url(' + bkgUrl + ')'}"></view>
<image <image
class="image pos" class="image pos" mode="aspectFill"
:src="obj.introImg" :src="publicPath + obj.introImg"
/> />
<view class="flex-col items-start section_2 pos_2"> <view class="flex-col items-start section_2 pos_2">
<text class="font text">{{ obj.name }}</text> <text class="font text">{{ obj.name }}</text>
@ -40,8 +40,8 @@
<text class="font_2 text_3 pos_5">产品详情</text> <text class="font_2 text_3 pos_5">产品详情</text>
<text class="font_2 text_4 pos_6">服务说明</text> <text class="font_2 text_4 pos_6">服务说明</text>
<image <image
class="image_4 pos_7" class="image_4 pos_7" mode="aspectFill"
:src="obj.detailImg" :src="publicPath + obj.detailImg"
/> />
<view class="flex-col justify-start items-end section_3 pos_8"> <view class="flex-col justify-start items-end section_3 pos_8">
<view class="flex-col justify-start items-center text-wrapper" @click="openBookingPopup"> <view class="flex-col justify-start items-center text-wrapper" @click="openBookingPopup">
@ -58,7 +58,7 @@
</template> </template>
<script setup lang="ts"> <script setup>
import { onLoad } from "@dcloudio/uni-app"; import { onLoad } from "@dcloudio/uni-app";
import {nextTick, onMounted, onUnmounted, ref} from 'vue' import {nextTick, onMounted, onUnmounted, ref} from 'vue'
import emitter from "../../../utils/emitter"; import emitter from "../../../utils/emitter";
@ -66,6 +66,7 @@
import { baseUrl } from "../../../api/request"; import { baseUrl } from "../../../api/request";
import { bookUrl } from "../../../common/globalImagesUrl"; import { bookUrl } from "../../../common/globalImagesUrl";
import { getFonts } from '../../../common/globalFont'; import { getFonts } from '../../../common/globalFont';
import { publicPath } from "../../../common/globalImagesUrl";
const cookie = wx.getStorageSync("cookie") //请求头 const cookie = wx.getStorageSync("cookie") //请求头
const id = ref({}) const id = ref({})
const bookingSelected = ref(null) const bookingSelected = ref(null)
@ -186,7 +187,7 @@
} }
.font { .font {
font-size: 45rpx; font-size: 45rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
color: #000000; color: #000000;
} }
.text { .text {
@ -198,7 +199,7 @@
} }
.font_2 { .font_2 {
font-size: 37.5rpx; font-size: 37.5rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 36.34rpx; line-height: 36.34rpx;
color: #000000; color: #000000;
} }
@ -219,7 +220,7 @@
} }
.font_3 { .font_3 {
font-size: 30rpx; font-size: 30rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 27.3rpx; line-height: 27.3rpx;
color: #000000; color: #000000;
} }

15
pages/book/photoProducts/photoProducts.vue
View File

@ -42,8 +42,8 @@
v-for="(item, index) in photoProducts" :key="index"> v-for="(item, index) in photoProducts" :key="index">
<view class="flex-row self-center"> <view class="flex-row self-center">
<image <image
class="image_2" class="image_2" mode="aspectFill"
:src="item.introImg" :src="publicPath + item.introImg"
/> />
<view class="flex-col items-start ml-12"> <view class="flex-col items-start ml-12">
<text class="font_2 text_3">{{ item.name }}</text> <text class="font_2 text_3">{{ item.name }}</text>
@ -64,6 +64,7 @@
import { bookUrl } from '../../../common/globalImagesUrl'; import { bookUrl } from '../../../common/globalImagesUrl';
import { onLoad } from "@dcloudio/uni-app"; import { onLoad } from "@dcloudio/uni-app";
import { getFonts } from '../../../common/globalFont'; import { getFonts } from '../../../common/globalFont';
import { publicPath } from '../../../common/globalImagesUrl';
const cookie = wx.getStorageSync("cookie") //请求头 const cookie = wx.getStorageSync("cookie") //请求头
const categoryList = ref([]) const categoryList = ref([])
@ -178,8 +179,8 @@
//获取字体 //获取字体
const getFonts =()=>{ const getFonts =()=>{
uni.loadFontFace({ uni.loadFontFace({
family: 'FZSongKeBenXiuKaiS-R-GB', family: 'FangZhengFonts',
source: `url("https://carbon2.obs.cn-north-4.myhuaweicloud.com/fonts/FZSongKeBenXiuKaiS-R-GB.TTF")`, source: `url("https://carbon2.obs.cn-north-4.myhuaweicloud.com/fonts/FangZhengFonts.TTF")`,
success:(res) =>{ success:(res) =>{
console.log('success',res); console.log('success',res);
}, },
@ -225,7 +226,7 @@
} }
.font { .font {
font-size: 30rpx; font-size: 30rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 28.71rpx; line-height: 28.71rpx;
color: #323232; color: #323232;
} }
@ -280,7 +281,7 @@
} }
.font_2 { .font_2 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 25.16rpx; line-height: 25.16rpx;
color: #000000; color: #000000;
} }
@ -338,7 +339,7 @@
} }
.font_3 { .font_3 {
font-size: 18.75rpx; font-size: 18.75rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 17.14rpx; line-height: 17.14rpx;
color: #ffffff; color: #ffffff;
} }

19
pages/book/photoProductsOrder/photoProductsOrder.vue
View File

@ -54,8 +54,8 @@
<view class="flex-row justify-between items-center section_5 pos_8"> <view class="flex-row justify-between items-center section_5 pos_8">
<view class="flex-row items-center"> <view class="flex-row items-center">
<image <image
class="image_4" class="image_4" mode="aspectFill"
:src="photoProduct.introImg" :src="publicPath + photoProduct.introImg"
/> />
<view class="flex-col items-start ml-11"> <view class="flex-col items-start ml-11">
<text class="font_2 text_8">{{ photoProduct.name }}</text> <text class="font_2 text_8">{{ photoProduct.name }}</text>
@ -113,6 +113,7 @@
import { onLoad } from "@dcloudio/uni-app"; import { onLoad } from "@dcloudio/uni-app";
import { bookUrl } from '../../../common/globalImagesUrl'; import { bookUrl } from '../../../common/globalImagesUrl';
import { getFonts } from '../../../common/globalFont'; import { getFonts } from '../../../common/globalFont';
import { publicPath } from '../../../common/globalImagesUrl';
const cookie = wx.getStorageSync("cookie") //请求头 const cookie = wx.getStorageSync("cookie") //请求头
@ -487,7 +488,7 @@
} }
.font { .font {
font-size: 37.5rpx; font-size: 37.5rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 35.01rpx; line-height: 35.01rpx;
color: #000000; color: #000000;
} }
@ -510,7 +511,7 @@
} }
.font_2 { .font_2 {
font-size: 30rpx; font-size: 30rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 28.01rpx; line-height: 28.01rpx;
color: #000000; color: #000000;
} }
@ -552,7 +553,7 @@
} }
.font_3 { .font_3 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 24.3rpx; line-height: 24.3rpx;
color: #8b8b8b; color: #8b8b8b;
} }
@ -610,7 +611,7 @@
} }
.font_4 { .font_4 {
font-size: 30rpx; font-size: 30rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 20.04rpx; line-height: 20.04rpx;
color: #8b8b8b; color: #8b8b8b;
} }
@ -649,7 +650,7 @@
} }
.font_5 { .font_5 {
font-size: 30rpx; font-size: 30rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 20.04rpx; line-height: 20.04rpx;
color: #323232; color: #323232;
} }
@ -679,7 +680,7 @@
} }
.font_6 { .font_6 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 24.3rpx; line-height: 24.3rpx;
color: #000000; color: #000000;
} }
@ -698,7 +699,7 @@
.text_11 { .text_11 {
color: #000000; color: #000000;
font-size: 22.5rpx; font-size: 22.5rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 21.09rpx; line-height: 21.09rpx;
} }
.section_6 { .section_6 {

5
pages/book/photoProductsOrderDetail/photoProductsOrderDetail.vue
View File

@ -39,8 +39,8 @@
</view> </view>
<view class="flex-row group_5"> <view class="flex-row group_5">
<image <image
class="image" class="image" mode="aspectFill"
:src="item.photoProductsSnapshot.introImg" :src="publicPath + item.photoProductsSnapshot.introImg"
/> />
<view class="flex-col items-start flex-1 group_6 ml-19"> <view class="flex-col items-start flex-1 group_6 ml-19">
<text class="font_7 text_8">{{ item.photoProductsSnapshot.name}}</text> <text class="font_7 text_8">{{ item.photoProductsSnapshot.name}}</text>
@ -123,6 +123,7 @@
import { onLoad } from "@dcloudio/uni-app"; import { onLoad } from "@dcloudio/uni-app";
import { baseUrl } from '../../../api/request'; import { baseUrl } from '../../../api/request';
import { getFonts } from '../../../common/globalFont'; import { getFonts } from '../../../common/globalFont';
import { publicPath } from '../../../common/globalImagesUrl';
const cookie = wx.getStorageSync("cookie") //请求头 const cookie = wx.getStorageSync("cookie") //请求头
const isShow = ref([true, false, false]) const isShow = ref([true, false, false])
const cancelBookingOrder = ref(null) const cancelBookingOrder = ref(null)

14
pages/coupon/CouponMall/CouponMall.vue
View File

@ -217,7 +217,7 @@
} }
.font { .font {
font-size: 30rpx; font-size: 30rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 28.09rpx; line-height: 28.09rpx;
color: #818181; color: #818181;
} }
@ -238,13 +238,13 @@
.text_2 { .text_2 {
color: #000000; color: #000000;
font-size: 30rpx; font-size: 30rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 25.78rpx; line-height: 25.78rpx;
} }
.text_3 { .text_3 {
color: #c35c5d; color: #c35c5d;
font-size: 60rpx; font-size: 60rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 40.09rpx; line-height: 40.09rpx;
} }
.group { .group {
@ -258,7 +258,7 @@
.text_4 { .text_4 {
color: #000000; color: #000000;
font-size: 24.38rpx; font-size: 24.38rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 21.34rpx; line-height: 21.34rpx;
} }
.pos_3 { .pos_3 {
@ -278,7 +278,7 @@
} }
.font_2 { .font_2 {
font-size: 33.75rpx; font-size: 33.75rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 32.83rpx; line-height: 32.83rpx;
color: #000000; color: #000000;
} }
@ -296,7 +296,7 @@
} }
.font_3 { .font_3 {
font-size: 30rpx; font-size: 30rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 28.09rpx; line-height: 28.09rpx;
color: #ffffff; color: #ffffff;
} }
@ -305,7 +305,7 @@
} }
.font_4 { .font_4 {
font-size: 33.75rpx; font-size: 33.75rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 28.09rpx; line-height: 28.09rpx;
color: #c35c5d; color: #c35c5d;
} }

6
pages/coupon/CouponTips/CouponTips.vue
View File

@ -64,7 +64,7 @@
} }
.font { .font {
font-size: 30rpx; font-size: 30rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 35.63rpx; line-height: 35.63rpx;
color: #000000; color: #000000;
} }
@ -84,7 +84,7 @@
} }
.font_2 { .font_2 {
font-size: 33.75rpx; font-size: 33.75rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 32.44rpx; line-height: 32.44rpx;
color: #000000; color: #000000;
} }
@ -106,7 +106,7 @@
} }
.font_3 { .font_3 {
font-size: 30rpx; font-size: 30rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 28.95rpx; line-height: 28.95rpx;
color: #000000; color: #000000;
} }

12
pages/coupon/MyCoupon/MyCoupon.vue
View File

@ -111,7 +111,7 @@
} }
.font_2 { .font_2 {
font-size: 37.5rpx; font-size: 37.5rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 29.42rpx; line-height: 29.42rpx;
color: #c35c5c; color: #c35c5c;
} }
@ -154,7 +154,7 @@
} }
.font_3 { .font_3 {
font-size: 60rpx; font-size: 60rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 40.09rpx; line-height: 40.09rpx;
color: #c35c5c; color: #c35c5c;
} }
@ -163,7 +163,7 @@
} }
.font { .font {
font-size: 30rpx; font-size: 30rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 29.42rpx; line-height: 29.42rpx;
color: #000000; color: #000000;
} }
@ -172,7 +172,7 @@
} }
.font_4 { .font_4 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 24.62rpx; line-height: 24.62rpx;
color: #000000; color: #000000;
} }
@ -182,13 +182,13 @@
} }
.font_5 { .font_5 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 24.62rpx; line-height: 24.62rpx;
color: #818181; color: #818181;
} }
.font_6 { .font_6 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 31.88rpx; line-height: 31.88rpx;
color: #818181; color: #818181;
} }

12
pages/coupon/OverDueCoupon/OverDueCoupon.vue
View File

@ -102,7 +102,7 @@
} }
.font { .font {
font-size: 30rpx; font-size: 30rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 29.42rpx; line-height: 29.42rpx;
color: #000000; color: #000000;
} }
@ -111,7 +111,7 @@
} }
.font_2 { .font_2 {
font-size: 37.5rpx; font-size: 37.5rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 29.42rpx; line-height: 29.42rpx;
color: #818181; color: #818181;
} }
@ -153,7 +153,7 @@
} }
.font_3 { .font_3 {
font-size: 60rpx; font-size: 60rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 40.09rpx; line-height: 40.09rpx;
color: #818181; color: #818181;
} }
@ -162,13 +162,13 @@
} }
.font_4 { .font_4 {
font-size: 30rpx; font-size: 30rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 29.42rpx; line-height: 29.42rpx;
color: #818181; color: #818181;
} }
.font_5 { .font_5 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 24.62rpx; line-height: 24.62rpx;
color: #818181; color: #818181;
} }
@ -178,7 +178,7 @@
} }
.font_6 { .font_6 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 31.88rpx; line-height: 31.88rpx;
color: #818181; color: #818181;
} }

4
pages/coupon/component/confirmPopup.vue
View File

@ -40,7 +40,7 @@
.text { .text {
color: #000000; color: #000000;
font-size: 42.32rpx; font-size: 42.32rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 41.17rpx; line-height: 41.17rpx;
} }
.text-wrapper { .text-wrapper {
@ -53,7 +53,7 @@
} }
.font { .font {
font-size: 37.62rpx; font-size: 37.62rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 35.41rpx; line-height: 35.41rpx;
} }
.text_2 { .text_2 {

18
pages/coupon/component/couponPopup.vue
View File

@ -44,8 +44,7 @@
<text class="self-stretch font_5 text_6 mt-11">{{item.couponVO.startTime.substr(0, 16)}}至{{item.couponVO.endTime.substr(0, 16)}}</text> <text class="self-stretch font_5 text_6 mt-11">{{item.couponVO.startTime.substr(0, 16)}}至{{item.couponVO.endTime.substr(0, 16)}}</text>
</view> </view>
<!-- <view class="ml-22 shrink-0 section_4"></view> --> <!-- <view class="ml-22 shrink-0 section_4"></view> -->
<radio class="ml-22 shrink-0 section_4" :value="index" :checked="checkedArr[index]" <radio class="ml-22 shrink-0 section_4" :value="index" :checked="checkedArr[index]" color="#FFB5B8" v-show="isShow"></radio>
color="#FFB5B8" v-show="isShow"></radio>
<view class="ml-22 shrink-0 section_4" v-show="!isShow"></view> <view class="ml-22 shrink-0 section_4" v-show="!isShow"></view>
</view> </view>
</view> </view>
@ -134,6 +133,7 @@
} }
const selectOne = (val:any) => { const selectOne = (val:any) => {
if (!isShow.value) return
idx.value = val idx.value = val
for (var i = 0; i < checkedArr.value.length; i ++ ) { for (var i = 0; i < checkedArr.value.length; i ++ ) {
if (i == val) { if (i == val) {
@ -251,7 +251,7 @@
.text { .text {
color: #323232; color: #323232;
font-size: 33.75rpx; font-size: 33.75rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 31.18rpx; line-height: 31.18rpx;
} }
.image { .image {
@ -269,7 +269,7 @@
} }
.font { .font {
font-size: 30rpx; font-size: 30rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 25.65rpx; line-height: 25.65rpx;
color: #323232; color: #323232;
} }
@ -324,7 +324,7 @@
} }
.font_3 { .font_3 {
font-size: 45rpx; font-size: 45rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 33.81rpx; line-height: 33.81rpx;
font-weight: 600; font-weight: 600;
color: #c35c5d; color: #c35c5d;
@ -334,7 +334,7 @@
} }
.font_4 { .font_4 {
font-size: 30rpx; font-size: 30rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 21.64rpx; line-height: 21.64rpx;
color: #c35c5d; color: #c35c5d;
} }
@ -353,7 +353,7 @@
} }
.font_5 { .font_5 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 30rpx; line-height: 30rpx;
color: #000000; color: #000000;
} }
@ -368,7 +368,7 @@
} }
.font_2 { .font_2 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 25.65rpx; line-height: 25.65rpx;
color: #323232; color: #323232;
} }
@ -398,7 +398,7 @@
} }
.font_6 { .font_6 {
font-size: 30rpx; font-size: 30rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
color: #ffffff; color: #ffffff;
} }
.text_8 { .text_8 {

12
pages/home/home.vue
View File

@ -55,6 +55,7 @@ import {inject, ref} from 'vue'
import { baseUrl, testUrl , suiUrl} from '@/api/request'; import { baseUrl, testUrl , suiUrl} from '@/api/request';
import { onShow,onLoad } from "@dcloudio/uni-app"; import { onShow,onLoad } from "@dcloudio/uni-app";
import { getFonts } from '../../common/globalFont'; import { getFonts } from '../../common/globalFont';
import { getZSFont } from '../../common/globalFont';
import { homeUrl } from '../../common/globalImagesUrl'; import { homeUrl } from '../../common/globalImagesUrl';
const bkgUrl = ref(homeUrl + '/bkg.png') const bkgUrl = ref(homeUrl + '/bkg.png')
onShow(() => { onShow(() => {
@ -63,6 +64,7 @@ onShow(() => {
}) })
onLoad(()=>{ onLoad(()=>{
getFonts() getFonts()
getZSFont()
}) })
const getMyUser = async () =>{ const getMyUser = async () =>{
const res = await uni.request({ const res = await uni.request({
@ -102,7 +104,7 @@ const jump_store =()=>{
const jumpToActivity = () => { const jumpToActivity = () => {
uni.navigateTo({ uni.navigateTo({
url: '../activity/activityHome/activityHome' url: '../activity/activityMain/activityMain'
}) })
} }
@ -147,7 +149,7 @@ const showStop =()=>{
.text { .text {
color: #C35C5D; color: #C35C5D;
font-size: 37.5rpx; font-size: 37.5rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 36.92rpx; line-height: 36.92rpx;
} }
.pos_6 { .pos_6 {
@ -158,7 +160,7 @@ const showStop =()=>{
} }
.font { .font {
font-size: 168.75rpx; font-size: 168.75rpx;
font-family: Sun Yat-sen Hsingshu; font-family: ZhongShanFonts;
line-height: 202.5rpx; line-height: 202.5rpx;
color: #C35C5D; color: #C35C5D;
} }
@ -212,7 +214,7 @@ const showStop =()=>{
} }
.font_2 { .font_2 {
font-size: 28.13rpx; font-size: 28.13rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 26.47rpx; line-height: 26.47rpx;
color: #323232; color: #323232;
} }
@ -245,7 +247,7 @@ const showStop =()=>{
} }
.font_3 { .font_3 {
font-size: 18.75rpx; font-size: 18.75rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 17.29rpx; line-height: 17.29rpx;
color: #faddde; color: #faddde;
} }

10
pages/login/login.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<view class="flex-col items-start relative page" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }"> <view class="flex-col items-start relative page" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }">
<view class="section_2" :style="{ backgroundImage: 'url(' + bkgUrl + ')'}"></view> <view class="section_2"></view>
<image <image
class="image" class="image"
:src="loginUrl + '/flower.png'" :src="loginUrl + '/flower.png'"
@ -25,9 +25,13 @@ import { onMounted } from 'vue';
import { onLoad } from "@dcloudio/uni-app"; import { onLoad } from "@dcloudio/uni-app";
import { getFonts } from '../../common/globalFont'; import { getFonts } from '../../common/globalFont';
import { loginUrl } from '../../common/globalImagesUrl'; import { loginUrl } from '../../common/globalImagesUrl';
import { getFZXZFont } from '../../common/globalFont';
import { getZSFont } from '../../common/globalFont';
const bkgUrl = ref(loginUrl + '/bkg.png') const bkgUrl = ref(loginUrl + '/bkg.png')
onLoad(() => { onLoad(() => {
getFonts() getFonts()
getFZXZFont()
getZSFont()
}) })
const login = () => { const login = () => {
uni.login({ uni.login({
@ -101,7 +105,7 @@ const loginUser = async ( code ) =>{
} }
.font { .font {
font-size: 240rpx; font-size: 240rpx;
font-family: FZXiaoZhuanTi-S13T; font-family: FangZhengXiaoZhuan;
line-height: 288.75rpx; line-height: 288.75rpx;
color: #9d2624; color: #9d2624;
} }
@ -142,7 +146,7 @@ const loginUser = async ( code ) =>{
.text { .text {
color: #000000; color: #000000;
font-size: 30rpx; font-size: 30rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 28.01rpx; line-height: 28.01rpx;
text-transform: capitalize; text-transform: capitalize;
} }

448
pages/mine/Contact/Contact.vue
View File

@ -1,448 +0,0 @@
<template>
<uni-popup ref="popup" :mask-click="false" background-color="white" borderRadius="10px" class="pop">
<view style="height: 250px; width: 300px; padding: 15px; box-sizing: border-box; display: flex; flex-direction:column; justify-content: space-between; align-items: center;" class="popup-content">
<input placeholder="联系人姓名" v-model="newContacts.name" style="width: 100%; padding: 5px; border: 1px solid #ccc; border-radius: 5px;" />
<input placeholder="联系方式" v-model="newContacts.phone" style="width: 100%; padding: 5px; border: 1px solid #ccc; border-radius: 5px;" />
<checkbox @click="handleIsDefaultChanges()" :key="newContacts.id" style="width: auto; margin-top: 10px;">设置为默认联系人</checkbox>
<view style="width: 100%; display: flex; justify-content: space-between;">
<button @click="addContact" style="flex: 1; padding: 8px 0; background-color: #007aff; color: white; border: none; border-radius: 5px; margin-right: 5px;">添加</button>
<button @click="close" style="flex: 1; padding: 8px 0; background-color: #ccc; color: #333; border: none; border-radius: 5px; margin-left: 5px;">取消</button>
</view>
</view>
</uni-popup>
<uni-popup ref="popup1" :mask-click="false" background-color="white" borderRadius="10px" class="pop">
<view style="height: 250px; width: 300px; padding: 15px; box-sizing: border-box; display: flex; flex-direction:column; justify-content: space-between; align-items: center;" class="popup-content">
<input placeholder="联系人姓名" v-model="newContact.name" style="width: 100%; padding: 5px; border: 1px solid #ccc; border-radius: 5px;" />
<input placeholder="联系方式" v-model="newContact.phone" style="width: 100%; padding: 5px; border: 1px solid #ccc; border-radius: 5px;" />
<checkbox @click="handleIsDefaultChanges()" :key="newContacts.id" :checked="newContact.isDefault === 1" style="width: auto; margin-top: 10px;">设置为默认联系人</checkbox>
<view style="width: 100%; display: flex; justify-content: space-between;">
<button @click="saveModifiedContact" style="flex: 1; padding: 8px 0; background-color: #007aff; color: white; border: none; border-radius: 5px; margin-right: 5px;">保存</button>
<button @click="close1" style="flex: 1; padding: 8px 0; background-color: #ccc; color: #333; border: none; border-radius: 5px; margin-left: 5px;">取消</button>
</view>
</view>
</uni-popup>
<view class="flex-col page">
<view class="flex-col">
<view class="flex-row justify-center items-center relative group">
<text class="text">联系人信息</text>
<image class="image pos"
:src="mineUrl + '/Contact/cha.png'" />
</view>
<view class="mt-16 flex-col">
<view class="flex-row justify-between items-center list-item mt-5"
v-for="(item, index) in filteredContacts" :key="index">
<view class="flex-row items-center">
<text class="font ml-9">{{item.name}}</text>
<text class="font_2 ml-9">{{item.phone}}</text>
</view>
<text v-if="item.isDefault === 1" class="font_3 ml-12">默认联系人</text>
<view class="flex-row group_2">
<image class="image_2"
:src="mineUrl + '/Contact/edit.png'"
@click="editContact(index)" />
<image class="ml-12 image_2"
:src="mineUrl + '/Contact/delete.png'"
@click="deleteContact(index)" />
</view>
</view>
</view>
</view>
<view class="flex-col justify-start items-center section mt-431" @click="open">
<view class="flex-col justify-start items-center text-wrapper"><text class="text_2">添加新联系人</text></view>
</view>
</view>
</template>
<script setup>
import { ref, onMounted, watch } from 'vue'
import { baseUrl } from '../../../api/request'
import { onLoad } from "@dcloudio/uni-app";
import { getFonts } from '../../../common/globalFont';
import { mineUrl } from '../../../common/globalImagesUrl';
onLoad(() => {
getFonts()
})
onMounted(() => {
getContacts()
})
const newContact = ref({
name: '',
phone: '',
isDefault: 0,
id: 0
})
const newContacts = ref({
name: '',
phone: '',
isDefault: 0,
id: 0
})
const editContact = async (index) => {
popup1.value.open('center');
const contact = filteredContacts.value[index];
newContact.value = {
name: contact.name,
id: contact.id,
phone: contact.phone,
isDefault: contact.isDefault
};
}
const handleIsDefaultChanges = (e) => {
let currentValue = newContact.value.isDefault;
let updatedValue = currentValue === 0? 1 : 0;
newContact.value.isDefault = updatedValue;
console.log(updatedValue);
}
const handleIsDefaultChange = (e) => {
//console.log(newContact.value.isDefault)
let currentValue = newContact.value.isDefault;
let updatedValue = currentValue === 0? 1 : 0;
newContact.value.isDefault = updatedValue;
console.log(updatedValue);
}
// 获取联系人列表
const getContacts = async () => {
const res = await uni.request({
url: baseUrl + '/contacts/list',
method: 'POST',
header: {
cookie: wx.getStorageSync('cookie')
}
});
// console.log(res)
if (res.data.code === 1) {
const correctContacts = [];
let defaultContact = null;
res.data.data.forEach((contact) => {
if (contact.isDefault === 1) {
if (!defaultContact) {
defaultContact = contact;
} else {
contact.isDefault = 0;
}
}
correctContacts.push(contact);
});
filteredContacts.value = correctContacts;
if (defaultContact) {
const index = filteredContacts.value.findIndex(
c => c.id === defaultContact.id
);
if (index!== -1) {
filteredContacts.value[index].isDefault = 1;
}
}
} else {
uni.showToast({
icon: 'error',
title: '获取失败'
});
}
}
const searchText = ref('');
const filteredContacts = ref([]);
watch(searchText, () => {
if (searchText.value === '') {
filteredContacts.value = contacts.value;
} else {
filteredContacts.value = contacts.value.filter(contact => {
return contact.name.includes(searchText.value) || contact.phone.includes(
searchText.value)
});
}
});
// 添加联系人
const addContact = async () => {
popup.value.close();
// 清除之前默认联系人
if (newContacts.value.isDefault) {
for (let i = 0; i < filteredContacts.value.length; i++) {
if (filteredContacts.value[i].isDefault === 1) {
filteredContacts.value[i].isDefault = 0;
}
}
}
const res = await uni.request({
url: baseUrl + '/contacts/add',
method: 'POST',
header: {
cookie: wx.getStorageSync('cookie')
},
data: {
name: newContacts.value.name,
phone: newContacts.value.phone,
isDefault: newContacts.value.isDefault
}
});
if (res.data.code === 1) {
console.log('添加成功');
newContacts.value = {
name: '',
phone: '',
isDefault: 0,
id: 0
};
} else {
uni.showToast({
icon: 'error',
title: '添加失败'
});
}
getContacts();
}
// 删除联系人
const deleteContact = async (index) => {
const res = await uni.request({
url: baseUrl + '/contacts/delete',
method: 'POST',
header: {
cookie: wx.getStorageSync('cookie')
},
data: {
id: filteredContacts.value[index].id,
}
});
console.log(res, '1111111111111');
if (res.data.code === 1) {
console.log('删除成功');
} else {
uni.showToast({
icon: 'error',
title: '删除失败'
});
}
getContacts();
}
const contactToModify = ref({});
const indexToModify = ref(null);
// 更新联系人
const saveModifiedContact = async () => {
popup1.value.close();
if (!newContact.value.name ||!newContact.value.phone) {
uni.showToast({
icon: 'error',
title: '不能为空'
});
return;
}
if (newContact.value.isDefault) {
for (let i = 0; i < filteredContacts.value.length; i++) {
if (filteredContacts.value[i].isDefault === 1) {
filteredContacts.value[i].isDefault = 0;
}
}
}
const res = await uni.request({
url: baseUrl + '/contacts/update',
method: 'POST',
header: {
cookie: wx.getStorageSync('cookie')
},
data: {
name: newContact.value.name,
phone: newContact.value.phone,
id: newContact.value.id,
isDefault: newContact.value.isDefault
}
});
if (res.data.code === 1) {
console.log('更新成功');
console.log(newContact.value.isDefault, '000000000000000000000000 ');
} else {
uni.showToast({
icon: 'error',
title: '更新失败'
});
}
getContacts();
}
const popup = ref(null);
const popup1 = ref(null);
const open = () => {
popup.value.open('center');
}
const open1 = () => {
popup1.value.open('center');
}
const close = () => {
popup.value.close();
}
const close1 = () => {
popup1.value.close();
}
</script>
<style lang="scss" scoped>
.font_3 {
color: #007aff;
font-size: 14px;
}
.mt-5 {
margin-top: 9.38rpx;
}
.ml-9 {
margin-left: 16.88rpx;
}
.mt-431 {
margin-top: 808.13rpx;
}
.page {
padding-top: 18.75rpx;
background-color: #f5f5dc;
border-radius: 28.13rpx 28.13rpx 0rpx 0rpx;
width: 100%;
overflow-y: auto;
overflow-x: hidden;
height: 100%;
}
.group {
padding: 11.25rpx 24.38rpx 7.5rpx;
}
.text {
color: #323232;
font-size: 37.5rpx;
font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 35.21rpx;
}
.image {
width: 52.5rpx;
height: 52.5rpx;
}
.pos {
position: absolute;
right: 24.38rpx;
top: 50%;
transform: translateY(-50%);
}
.list-item {
padding: 52.5rpx 15rpx;
background-color: #fffef8;
border-bottom: solid 1.88rpx #c8c8c8;
}
.list-item:first-child {
margin-top: 0;
}
.image_3 {
width: 33.75rpx;
height: 33.75rpx;
}
.font {
font-size: 30rpx;
font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 27.19rpx;
color: #323232;
}
.font_2 {
font-size: 30rpx;
font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 22.05rpx;
color: #323232;
}
.group_2 {
margin-right: 11.25rpx;
}
.image_2 {
width: 39.38rpx;
height: 39.38rpx;
}
.section {
margin-left: 16.88rpx;
padding: 22.5rpx 0 15rpx;
background-color: #fffef8;
}
.text-wrapper {
padding: 30rpx 0;
background-color: #fbb612;
border-radius: 75rpx;
width: 639.38rpx;
}
.text_2 {
color: #ffffff;
font-size: 33.75rpx;
font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 31.22rpx;
}
// .pop{
// height: 300px;
// width: 400px;
// padding: 20px;
// /* 输入框的通用样式 */
// input {
// margin-left: 10%;
// width: 80%; // 占满弹窗宽度，可按需调整
// margin-bottom: 15px;
// padding: 10px;
// border: 1px solid #ccc;
// border-radius: 5px;
// }
// /* 复选框的通用样式 */
// checkbox {
// margin-bottom: 15px;
// }
// /* 按钮的通用样式 */
// button {
// width: 45%; // 按钮宽度占比，可根据实际调整布局
// padding: 8px 0;
// border: none;
// border-radius: 5px;
// font-size: 14px;
// cursor: pointer;
// transition: background-color 0.3s ease;
// }
// }
// /* 第一个弹窗添加联系人的特定按钮样式 */
// .pop:first-child button:first-child {
// background-color: #007aff;
// color: white;
// }
// .pop:first-child button:last-child {
// background-color: #ccc;
// color: #333;
// }
// /* 第二个弹窗修改联系人的特定按钮样式 */
// .pop:last-child button:first-child {
// background-color: #4caf50;
// color: white;
// }
// .pop:last-child button:last-child {
// background-color: #ccc;
// color: #333;
// }
@import url(/common/css/global.css);
</style>

8
pages/mine/Contact/testContact.vue
View File

@ -163,7 +163,7 @@
.text { .text {
color: #000000; color: #000000;
font-size: 37.5rpx; font-size: 37.5rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 36.47rpx; line-height: 36.47rpx;
} }
@ -192,14 +192,14 @@
.font { .font {
font-size: 30rpx; font-size: 30rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 25.89rpx; line-height: 25.89rpx;
color: #323232; color: #323232;
} }
.font_2 { .font_2 {
font-size: 30rpx; font-size: 30rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 20.04rpx; line-height: 20.04rpx;
color: #323232; color: #323232;
} }
@ -214,7 +214,7 @@
.text_2 { .text_2 {
color: #c35c5d; color: #c35c5d;
font-size: 22.5rpx; font-size: 22.5rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 18.71rpx; line-height: 18.71rpx;
margin-top: 8rpx; margin-top: 8rpx;
} }

8
pages/mine/addressList/addressList.vue
View File

@ -133,13 +133,13 @@ const jump_newAddress =()=> {
} }
.font { .font {
font-size: 30rpx; font-size: 30rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 25.89rpx; line-height: 25.89rpx;
color: #323232; color: #323232;
} }
.font_2 { .font_2 {
font-size: 30rpx; font-size: 30rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 20.04rpx; line-height: 20.04rpx;
color: #323232; color: #323232;
} }
@ -157,7 +157,7 @@ const jump_newAddress =()=> {
.text_2 { .text_2 {
color: #c35c5d; color: #c35c5d;
font-size: 22.5rpx; font-size: 22.5rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
// line-height: 18.71rpx; // line-height: 18.71rpx;
} }
.image { .image {
@ -167,7 +167,7 @@ const jump_newAddress =()=> {
} }
.font_3 { .font_3 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 31.88rpx; line-height: 31.88rpx;
color: #818181; color: #818181;
} }

101
pages/mine/component/contactPop.vue
View File

@ -1,22 +1,22 @@
<template> <template>
<!-- 添加联系人页面 --> <!-- 添加联系人页面 -->
<view class="flex-row relative page" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }"> <view class="flex-row relative page" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }">
<text class="text pos_2">添加联系人</text> <text class="text pos_2">{{ templateString }}</text>
<image class="image pos" :src="mineUrl + '/component/cha.png'" @click="closePop()"/> <image class="image pos" :src="mineUrl + '/component/cha.png'" @click="closePop()"/>
<view class="flex-col section_2 pos_3"> <view class="flex-col section_2 pos_3">
<view class="flex-row items-center group"> <view class="flex-row items-center group">
<text class="font_2 text_2">姓名</text> <text class="font_2 text_2">姓名&emsp;&emsp;</text>
<input class="section_1 ml-44" placeholder="请输入姓名" v-model="contactParam.name"/> <input class="section_1 ml-20" placeholder="请输入姓名" v-model="contactParam.name"/>
</view> </view>
<view class="flex-row items-center group_1"> <view class="flex-row items-center group_1">
<text class="font_2">手机号码</text> <text class="font_2">手机号码</text>
<input class="view_2 ml-13" placeholder="输入手机号码" v-model="contactParam.phone"/> <input class="view_2 ml-20" placeholder="输入手机号码" v-model="contactParam.phone"/>
</view> </view>
<view class="flex-row justify-between items-center group_2"> <view class="flex-row justify-between items-center group_2">
<checkbox-group @change="defaultAddress"> <text class="font_2 text_5">设为默认联系人</text>
<text class="font_2 text_5" style="margin-right: 400rpx;">设为默认联系人</text> <radio-group>
<checkbox class="round red radius" value="1" :checked="checked"/> <radio @click="changeState" class="radius" color="#E79EA1" :checked="checked"/>
</checkbox-group> </radio-group>
</view> </view>
</view> </view>
<view class="flex-col justify-start items-center text-wrapper_2 pos_4" @click="newContact"><text class="text_6">保存联系人</text></view> <view class="flex-col justify-start items-center text-wrapper_2 pos_4" @click="newContact"><text class="text_6">保存联系人</text></view>
@ -30,50 +30,50 @@ import { onLoad, onShow } from '@dcloudio/uni-app';
import { getFonts } from '../../../common/globalFont'; import { getFonts } from '../../../common/globalFont';
import emitter from '../../../utils/emitter'; import emitter from '../../../utils/emitter';
import { mineUrl } from '../../../common/globalImagesUrl'; import { mineUrl } from '../../../common/globalImagesUrl';
const bkgUrl = ref(mineUrl + '/component/bkg.png') import { JudgeIsNullity } from '../../../common/globalFunction';
onLoad(() => { onLoad(() => {
getFonts() getFonts()
}) })
const bkgUrl = ref(mineUrl + '/component/bkg.png')
const isUpdate = ref(false)
const templateString = ref('')
const checked = ref(false)
const contactParam = ref({})
const contactParam = ref({
name: "", const changeState = () => {
phone: "", console.log(checked.value)
isDefault: 0 checked.value = !checked.value
}) }
const checked = ref(false) //是否选中
const contactInfoHandler = (val) => { const contactInfoHandler = (val) => {
console.log('当前编辑的联系人信息',val); if (val === null) {
if(val != null) { templateString.value = '添加联系人'
contactParam.value.id = val.id checked.value = false
contactParam.value.name = val.name contactParam.value = {}
contactParam.value.phone = val.phone isUpdate.value = false
contactParam.value.isDefault = val.isDefault } else {
val.isDefault ? checked.value = true : checked.value = false templateString.value = '编辑联系人'
contactParam.value = JSON.parse(JSON.stringify(val))
console.log(contactParam.value)
checked.value = val.isDefault === 0 ? false : true
isUpdate.value = true
} }
console.log(isUpdate.value)
} }
onMounted(()=>{ onMounted(()=>{
emitter.on('contactInfo', contactInfoHandler) emitter.on('contactInfo', contactInfoHandler)
defaultAddress()
}) })
onUnmounted(() => { onUnmounted(() => {
emitter.off('contactInfo', contactInfoHandler) emitter.off('contactInfo', contactInfoHandler)
}) })
//勾选默认联系人的选项
const defaultAddress =(event)=>{
event.detail.value[0] ? contactParam.value.isDefault = 1 : contactParam.value.isDefault = 0
event.detail.value[0] ? checked.value = true : checked.value = false
console.log('event--->',event);
}
//发送添加新增联系人的请求 //发送添加新增联系人的请求
const newContact = async () => { const newContact = async () => {
// console.log('按钮联系人信息--->',contactParam.value);
if(contactParam.value.id === "")
delete contactParam.value.id
const values = Object.values(contactParam.value); const values = Object.values(contactParam.value);
// 使用some()方法来检查是否有任何值为空 // 使用some()方法来检查是否有任何值为空
if (values.some(value => value === null || value === undefined || value === '')) { if (values.some(value => value === null || value === undefined || value === '')) {
@ -83,8 +83,9 @@ const newContact = async () =>{
}) })
return; return;
} }
// console.log(contactParam.value); contactParam.value.isDefault = checked.value ? 1 : 0
if(contactParam.value.id != undefined) { console.log(contactParam.value)
if(isUpdate.value) {
const res = await uni.request({ const res = await uni.request({
url: baseUrl + '/contacts/update', url: baseUrl + '/contacts/update',
method: 'POST', method: 'POST',
@ -93,7 +94,6 @@ const newContact = async () =>{
}, },
data: { ...contactParam.value } data: { ...contactParam.value }
}) })
// console.log('res1==>',res.data);
sucRes(res.data.code) sucRes(res.data.code)
} else { } else {
const res = await uni.request({ const res = await uni.request({
@ -102,20 +102,18 @@ const newContact = async () =>{
header: { header: {
'cookie': wx.getStorageSync('cookie') 'cookie': wx.getStorageSync('cookie')
}, },
data: { data: { ...contactParam.value }
name: contactParam.value.name,
phone: contactParam.value.phone,
isDefault: contactParam.value.isDefault
}
}) })
// console.log('res2==>',res.data);
sucRes(res.data.code) sucRes(res.data.code)
} }
} }
const sucRes =(res)=>{ //请求成功执行的方法 const sucRes =(res)=>{ //请求成功执行的方法
if(res === 1) { if(res === 1) {
closePop() if (isUpdate.value) {
emitter.emit('updateContactObj', contactParam.value)
}
emitter.emit('updateInfo') emitter.emit('updateInfo')
emitter.emit('closeContactPop')
} else { } else {
uni.showToast({ uni.showToast({
icon: 'error', icon: 'error',
@ -124,16 +122,17 @@ const sucRes =(res)=>{ //请求成功执行的方法
return; return;
} }
} }
const closePop = () =>{ //关闭弹窗方法 // const closePop = () =>{ //关闭弹窗方法
contactParam.value.name = "" // contactParam.value.name = ""
contactParam.value.phone = "" // contactParam.value.phone = ""
contactParam.value.isDefault = 0 // contactParam.value.isDefault = 0
emitter.emit('closeContactPop') // emitter.emit('closeContactPop')
} // }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.ml-13 { .ml-13 {
margin-left: 24.38rpx; margin-left: 24.38rpx;
} }
@ -150,7 +149,7 @@ const closePop = () =>{ //关闭弹窗方法
.text { .text {
color: #323232; color: #323232;
font-size: 37.5rpx; font-size: 37.5rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 36.47rpx; line-height: 36.47rpx;
} }
.pos_2 { .pos_2 {
@ -184,7 +183,7 @@ const closePop = () =>{ //关闭弹窗方法
} }
.font_2 { .font_2 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 24.62rpx; line-height: 24.62rpx;
color: #323232; color: #323232;
} }
@ -229,7 +228,7 @@ const closePop = () =>{ //关闭弹窗方法
.text_6 { .text_6 {
color: #ffffff; color: #ffffff;
font-size: 33.75rpx; font-size: 33.75rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 32.83rpx; line-height: 32.83rpx;
} }
.radius { .radius {

5
pages/mine/main/main.vue
View File

@ -7,7 +7,7 @@
<view class="flex-col group"> <view class="flex-col group">
<view class="flex-row items-center group_2"> <view class="flex-row items-center group_2">
<button class="avatar_button" open-type="chooseAvatar" @chooseavatar="onChooseAvatar"> <button class="avatar_button" open-type="chooseAvatar" @chooseavatar="onChooseAvatar">
<image class="avatar_son" mode="aspectFill" :src="myAvatar" /> <image class="avatar_son" mode="aspectFill" :src="publicPath + myAvatar" />
</button> </button>
@ -120,6 +120,7 @@ import {
import { baseUrl } from '../../../api/request'; import { baseUrl } from '../../../api/request';
import { getFonts } from '../../../common/globalFont'; import { getFonts } from '../../../common/globalFont';
import { mineUrl } from '../../../common/globalImagesUrl'; import { mineUrl } from '../../../common/globalImagesUrl';
import { publicPath } from '../../../common/globalImagesUrl';
const bkgUrl = ref(mineUrl + '/main/bkg.png') const bkgUrl = ref(mineUrl + '/main/bkg.png')
onLoad(() => { onLoad(() => {
getFonts() //启动使从服务器下载字体 getFonts() //启动使从服务器下载字体
@ -202,7 +203,7 @@ const onChooseAvatar = (e) => {
tempFile = e.detail.avatarUrl tempFile = e.detail.avatarUrl
console.log(tempFile) console.log(tempFile)
uni.uploadFile({ uni.uploadFile({
url: baseUrl + 'file/uploadFile', url: baseUrl + '/file/uploadFile',
filePath: tempFile, filePath: tempFile,
name: 'file', name: 'file',
header: { header: {

2
pages/my-order/component/nav.vue
View File

@ -27,7 +27,7 @@
} }
.font { .font {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 25.84rpx; line-height: 25.84rpx;
color: #e79ea1; color: #e79ea1;
} }

25
pages/my-order/myGeneralOrderDetail/myGeneralOrderDetail.vue
View File

@ -26,8 +26,8 @@
<view class="flex-row justify-between mt-8 list-item" v-for="(item, index) in order.orderItemList" :key="index"> <view class="flex-row justify-between mt-8 list-item" v-for="(item, index) in order.orderItemList" :key="index">
<view class="flex-row"> <view class="flex-row">
<image <image
class="image_3" class="image_3" mode="aspectFill"
:src="item.goodSnapshot.goodImg.split(';')[0]" :src="publicPath + item.goodSnapshot.goodImg.split(';')[0]"
/> />
<view class="flex-col items-start ml-11"> <view class="flex-col items-start ml-11">
<text class="font text_5">{{ item.goodSnapshot.name }}</text> <text class="font text_5">{{ item.goodSnapshot.name }}</text>
@ -135,6 +135,7 @@
import { getFonts } from '../../../common/globalFont'; import { getFonts } from '../../../common/globalFont';
import emitter from '../../../utils/emitter'; import emitter from '../../../utils/emitter';
import { myOrderUrl } from '../../../common/globalImagesUrl.js'; import { myOrderUrl } from '../../../common/globalImagesUrl.js';
import { publicPath } from '../../../common/globalImagesUrl.js';
const bkgUrl = ref(myOrderUrl + '/myGeneralOrderDetail/bkg.png') const bkgUrl = ref(myOrderUrl + '/myGeneralOrderDetail/bkg.png')
const order = ref({}) const order = ref({})
const cookie = wx.getStorageSync('cookie') const cookie = wx.getStorageSync('cookie')
@ -438,7 +439,7 @@ button::after{
} }
.font { .font {
font-size: 28.13rpx; font-size: 28.13rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 29.18rpx; line-height: 29.18rpx;
color: #323232; color: #323232;
} }
@ -448,7 +449,7 @@ button::after{
} }
.font_2 { .font_2 {
font-size: 24.38rpx; font-size: 24.38rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 29.18rpx; line-height: 29.18rpx;
color: #818181; color: #818181;
} }
@ -504,7 +505,7 @@ button::after{
} }
.font_3 { .font_3 {
font-size: 28.13rpx; font-size: 28.13rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 22.18rpx; line-height: 22.18rpx;
color: #323232; color: #323232;
} }
@ -513,7 +514,7 @@ button::after{
} }
.font_4 { .font_4 {
font-size: 28.13rpx; font-size: 28.13rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 18.73rpx; line-height: 18.73rpx;
color: #323232; color: #323232;
} }
@ -524,7 +525,7 @@ button::after{
} }
.font_5 { .font_5 {
font-size: 28.13rpx; font-size: 28.13rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 29.18rpx; line-height: 29.18rpx;
color: #818181; color: #818181;
} }
@ -533,7 +534,7 @@ button::after{
} }
.font_6 { .font_6 {
font-size: 28.13rpx; font-size: 28.13rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 20.79rpx; line-height: 20.79rpx;
color: #323232; color: #323232;
} }
@ -560,7 +561,7 @@ button::after{
.text_12 { .text_12 {
color: #ffaaa5; color: #ffaaa5;
font-size: 28.13rpx; font-size: 28.13rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
font-weight: 700; font-weight: 700;
line-height: 20.76rpx; line-height: 20.76rpx;
} }
@ -572,7 +573,7 @@ button::after{
} }
.font_7 { .font_7 {
font-size: 28.13rpx; font-size: 28.13rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 26.47rpx; line-height: 26.47rpx;
color: #818181; color: #818181;
} }
@ -621,7 +622,7 @@ button::after{
} }
.font_8 { .font_8 {
font-size: 22.5rpx; font-size: 22.5rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 20.83rpx; line-height: 20.83rpx;
color: #323232; color: #323232;
} }
@ -668,7 +669,7 @@ button::after{
} }
.font_9 { .font_9 {
font-size: 33.75rpx; font-size: 33.75rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
color: #ffaaa5; color: #ffaaa5;
} }
.text_22 { .text_22 {

31
pages/my-order/myOrderList/myOrderList.vue
View File

@ -54,8 +54,8 @@
<view class="flex-row justify-between list-item_2 group_6" v-for="(subItem, index) in item.orderItemList" :key="index"> <view class="flex-row justify-between list-item_2 group_6" v-for="(subItem, index) in item.orderItemList" :key="index">
<view class="flex-row"> <view class="flex-row">
<image <image
class="image_2" class="image_2" mode="aspectFill"
:src="subItem.goodSnapshot.goodImg.split(';')[0]" :src="publicPath + subItem.goodSnapshot.goodImg.split(';')[0]"
/> />
<view class="flex-col items-start group_19 ml-11"> <view class="flex-col items-start group_19 ml-11">
<text class="font_2">{{ subItem.goodSnapshot.name }}</text> <text class="font_2">{{ subItem.goodSnapshot.name }}</text>
@ -132,6 +132,7 @@
import emitter from '../../../utils/emitter'; import emitter from '../../../utils/emitter';
import { getFonts } from '../../../common/globalFont'; import { getFonts } from '../../../common/globalFont';
import { myOrderUrl } from '../../../common/globalImagesUrl'; import { myOrderUrl } from '../../../common/globalImagesUrl';
import { publicPath } from '../../../common/globalImagesUrl';
const color = ref(new Array(5).fill('#323232')) const color = ref(new Array(5).fill('#323232'))
const point = ref(0) const point = ref(0)
const isShowUnderLine = ref([true, false, false, false, false]) const isShowUnderLine = ref([true, false, false, false, false])
@ -596,7 +597,7 @@
.appointmentDate { .appointmentDate {
margin-top: 20.63rpx; margin-top: 20.63rpx;
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 24.51rpx; line-height: 24.51rpx;
color: #818181; color: #818181;
margin-left: 3.75rpx; margin-left: 3.75rpx;
@ -604,7 +605,7 @@
.timeSlot { .timeSlot {
margin-top: 20.63rpx; margin-top: 20.63rpx;
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 17.53rpx; line-height: 17.53rpx;
color: #818181; color: #818181;
margin-left: 3.75rpx; margin-left: 3.75rpx;
@ -648,7 +649,7 @@
} }
.font { .font {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 25.84rpx; line-height: 25.84rpx;
color: #ffaaa5; color: #ffaaa5;
} }
@ -661,7 +662,7 @@
} }
.font_2 { .font_2 {
font-size: 30rpx; font-size: 30rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 29.18rpx; line-height: 29.18rpx;
color: #323232; color: #323232;
} }
@ -703,7 +704,7 @@
} }
.font_3 { .font_3 {
font-size: 30rpx; font-size: 30rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 18.73rpx; line-height: 18.73rpx;
color: #ffaaa5; color: #ffaaa5;
} }
@ -720,13 +721,13 @@
} }
.font_4 { .font_4 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 25.84rpx; line-height: 25.84rpx;
color: #818181; color: #818181;
} }
.font_5 { .font_5 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 18.73rpx; line-height: 18.73rpx;
color: #818181; color: #818181;
} }
@ -749,7 +750,7 @@
} }
.font_6 { .font_6 {
font-size: 30rpx; font-size: 30rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 22.18rpx; line-height: 22.18rpx;
color: #323232; color: #323232;
} }
@ -758,7 +759,7 @@
} }
.font_7 { .font_7 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 18.73rpx; line-height: 18.73rpx;
color: #323232; color: #323232;
} }
@ -783,7 +784,7 @@
} }
.font_8 { .font_8 {
font-size: 30rpx; font-size: 30rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 25.84rpx; line-height: 25.84rpx;
color: #000000; color: #000000;
} }
@ -801,7 +802,7 @@
} }
.font_9 { .font_9 {
font-size: 30rpx; font-size: 30rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 22.18rpx; line-height: 22.18rpx;
font-weight: 600; font-weight: 600;
color: #ffaaa5; color: #ffaaa5;
@ -826,7 +827,7 @@
} }
.font_10 { .font_10 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 25.84rpx; line-height: 25.84rpx;
color: #e79ea1; color: #e79ea1;
} }
@ -839,7 +840,7 @@
} }
.font_11 { .font_11 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 25.84rpx; line-height: 25.84rpx;
color: #ffffff; color: #ffffff;
} }

29
pages/my-order/myServiceOrderDetail/myServiceOrderDetail.vue
View File

@ -22,8 +22,8 @@
<view class="flex-col"> <view class="flex-col">
<view class="flex-row list-item mt-12" v-for="(item, index) in order.orderItemList" :key="index"> <view class="flex-row list-item mt-12" v-for="(item, index) in order.orderItemList" :key="index">
<image <image
class="shrink-0 image_3" class="shrink-0 image_3" mode="aspectFill"
:src="item.goodSnapshot.goodImg" :src="publicPath + item.goodSnapshot.goodImg"
/> />
<view class="flex-col items-start flex-1 group_2 ml-20"> <view class="flex-col items-start flex-1 group_2 ml-20">
<text class="font"> {{ item.goodSnapshot.name }}</text> <text class="font"> {{ item.goodSnapshot.name }}</text>
@ -117,6 +117,7 @@
import emitter from '../../../utils/emitter'; import emitter from '../../../utils/emitter';
import { getFonts } from '../../../common/globalFont'; import { getFonts } from '../../../common/globalFont';
import { myOrderUrl } from '../../../common/globalImagesUrl'; import { myOrderUrl } from '../../../common/globalImagesUrl';
import { publicPath } from '../../../common/globalImagesUrl';
const bkgUrl = ref(myOrderUrl + '/photoProductDetail/bkg.png') const bkgUrl = ref(myOrderUrl + '/photoProductDetail/bkg.png')
const cookie = wx.getStorageSync('cookie') const cookie = wx.getStorageSync('cookie')
let orderId = '' let orderId = ''
@ -380,7 +381,7 @@ button::after{
} }
.font { .font {
font-size: 30rpx; font-size: 30rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 29.18rpx; line-height: 29.18rpx;
color: #323232; color: #323232;
} }
@ -391,7 +392,7 @@ button::after{
} }
.font_2 { .font_2 {
font-size: 24.38rpx; font-size: 24.38rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
} }
.text_2 { .text_2 {
color: #6b6e72; color: #6b6e72;
@ -414,7 +415,7 @@ button::after{
} }
.font_3 { .font_3 {
font-size: 30rpx; font-size: 30rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 24.51rpx; line-height: 24.51rpx;
color: #818181; color: #818181;
} }
@ -450,7 +451,7 @@ button::after{
} }
.font_4 { .font_4 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 24.51rpx; line-height: 24.51rpx;
color: #818181; color: #818181;
} }
@ -460,7 +461,7 @@ button::after{
} }
.font_5 { .font_5 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 17.53rpx; line-height: 17.53rpx;
color: #818181; color: #818181;
} }
@ -470,7 +471,7 @@ button::after{
} }
.font_6 { .font_6 {
font-size: 30rpx; font-size: 30rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 21.41rpx; line-height: 21.41rpx;
color: #323232; color: #323232;
} }
@ -500,7 +501,7 @@ button::after{
} }
.font_7 { .font_7 {
font-size: 30rpx; font-size: 30rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 29.18rpx; line-height: 29.18rpx;
color: #818181; color: #818181;
} }
@ -532,7 +533,7 @@ button::after{
.text_13 { .text_13 {
color: #ffaaa5; color: #ffaaa5;
font-size: 28.13rpx; font-size: 28.13rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
font-weight: 700; font-weight: 700;
line-height: 20.76rpx; line-height: 20.76rpx;
} }
@ -544,7 +545,7 @@ button::after{
} }
.font_8 { .font_8 {
font-size: 30rpx; font-size: 30rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 26.47rpx; line-height: 26.47rpx;
color: #818181; color: #818181;
} }
@ -572,7 +573,7 @@ button::after{
} }
.font_9 { .font_9 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
color: #323232; color: #323232;
} }
.text_17 { .text_17 {
@ -601,7 +602,7 @@ button::after{
.text_20 { .text_20 {
color: #323232; color: #323232;
font-size: 22.5rpx; font-size: 22.5rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 20.83rpx; line-height: 20.83rpx;
} }
.group_9 { .group_9 {
@ -634,7 +635,7 @@ button::after{
} }
.font_10 { .font_10 {
font-size: 33.75rpx; font-size: 33.75rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 24.51rpx; line-height: 24.51rpx;
color: #ffaaa5; color: #ffaaa5;
} }

10
pages/order/component/addressComponent.vue
View File

@ -179,7 +179,7 @@ const closeWindow =()=> {
.text { .text {
color: #323232; color: #323232;
font-size: 37.41rpx; font-size: 37.41rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 35.95rpx; line-height: 35.95rpx;
} }
.image { .image {
@ -215,13 +215,13 @@ const closeWindow =()=> {
} }
.font { .font {
font-size: 29.93rpx; font-size: 29.93rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 25.83rpx; line-height: 25.83rpx;
color: #323232; color: #323232;
} }
.font_2 { .font_2 {
font-size: 29.93rpx; font-size: 29.93rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 19.99rpx; line-height: 19.99rpx;
color: #323232; color: #323232;
} }
@ -234,7 +234,7 @@ const closeWindow =()=> {
} }
.font_3 { .font_3 {
font-size: 26.18rpx; font-size: 26.18rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 31.8rpx; line-height: 31.8rpx;
color: #818181; color: #818181;
} }
@ -252,7 +252,7 @@ const closeWindow =()=> {
.text_3 { .text_3 {
color: #ffffff; color: #ffffff;
font-size: 33.67rpx; font-size: 33.67rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 31.57rpx; line-height: 31.57rpx;
} }
@import url(../../../common/css/global.css); @import url(../../../common/css/global.css);

12
pages/order/component/contactsComponent.vue
View File

@ -132,13 +132,13 @@
}) })
} }
const loadPop = () => { //联系人弹窗 const loadPop = () => { //联系人弹窗
emitter.emit('contactInfo', null)
popup.value.open('bottom') //从底部弹出 popup.value.open('bottom') //从底部弹出
} }
//编辑联系人方法 //编辑联系人方法
const editContact = ( value )=>{ const editContact = ( value )=>{
console.log('联系人信息--->',value);
emitter.emit('contactInfo', value) //把联系人信息传入组件中 emitter.emit('contactInfo', value) //把联系人信息传入组件中
loadPop() //弹出联系人弹窗 popup.value.open('bottom')
} }
//选项改变时 //选项改变时
const radioChange = ( event ) => { const radioChange = ( event ) => {
@ -194,7 +194,7 @@
margin-bottom: 2.53rpx; margin-bottom: 2.53rpx;
color: #323232; color: #323232;
font-size: 37.5rpx; font-size: 37.5rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 36.47rpx; line-height: 36.47rpx;
} }
.image { .image {
@ -219,13 +219,13 @@
} }
.font { .font {
font-size: 30rpx; font-size: 30rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 25.89rpx; line-height: 25.89rpx;
color: #323232; color: #323232;
} }
.font_2 { .font_2 {
font-size: 30rpx; font-size: 30rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 20.04rpx; line-height: 20.04rpx;
color: #323232; color: #323232;
} }
@ -250,7 +250,7 @@
.text_2 { .text_2 {
color: #ffffff; color: #ffffff;
font-size: 33.75rpx; font-size: 33.75rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 32.83rpx; line-height: 32.83rpx;
} }
.radius { .radius {

40
pages/order/product-waitpay/product-waitpay.vue
View File

@ -12,7 +12,7 @@
<view class="flex-row items-end flex-1 group_19"> <view class="flex-row items-end flex-1 group_19">
<image <image
class="shrink-0 image_3 image_4" mode="aspectFill" class="shrink-0 image_3 image_4" mode="aspectFill"
:src="item.cartGoodVO.goodImg.split(';')[0]" :src="publicPath + item.cartGoodVO.goodImg.split(';')[0]"
/> />
<view class="flex-col flex-1 ml-17"> <view class="flex-col flex-1 ml-17">
<view class="flex-row"> <view class="flex-row">
@ -67,7 +67,7 @@
<text class="font_8" :style="{color: textColor}"> {{ templateString }}</text> <text class="font_8" :style="{color: textColor}"> {{ templateString }}</text>
<image <image
class="shrink-0 image_7 ml-3" class="shrink-0 image_7 ml-3"
src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FTrywtERT-right.png" :src="orderUrl + '/product-waitpay/yjt2.png'"
/> />
</view> </view>
</view> </view>
@ -128,6 +128,7 @@ import * as math from 'mathjs'
import { dealResult } from '../../../common/globalFunction'; import { dealResult } from '../../../common/globalFunction';
import addressSelectedVue from '../../Shopping-cart/component/addressSelected.vue'; import addressSelectedVue from '../../Shopping-cart/component/addressSelected.vue';
import { orderUrl } from '../../../common/globalImagesUrl'; import { orderUrl } from '../../../common/globalImagesUrl';
import { publicPath } from '../../../common/globalImagesUrl';
const bkgUrl = ref(orderUrl + '/product-waitpay/bkg.png') const bkgUrl = ref(orderUrl + '/product-waitpay/bkg.png')
//一些暂时变量 //一些暂时变量
const sumprice = ref(0) //总价格 const sumprice = ref(0) //总价格
@ -198,6 +199,13 @@ const getCouponObjHandler = (val) => {
console.log(val) console.log(val)
} }
const updateAddressHandler = (val) => {
if (addressRealInfo.value.id === val.id) {
addressRealInfo.value = val
}
}
onMounted(() => { onMounted(() => {
getDefaultAddress() getDefaultAddress()
//将关闭弹窗方法传入弹窗页面，绑定弹窗按钮可关闭弹窗 //将关闭弹窗方法传入弹窗页面，绑定弹窗按钮可关闭弹窗
@ -213,6 +221,8 @@ onMounted(() => {
emitter.on('delMyAddress', delMyAddressHandler) emitter.on('delMyAddress', delMyAddressHandler)
emitter.on('updateAddress', updateAddressHandler)
}) })
onUnmounted(() => { onUnmounted(() => {
@ -228,6 +238,8 @@ onUnmounted(() => {
emitter.off('getCouponObj', getCouponObjHandler) emitter.off('getCouponObj', getCouponObjHandler)
emitter.off('delMyAddress', delMyAddressHandler) emitter.off('delMyAddress', delMyAddressHandler)
emitter.off('updateAddress', updateAddressHandler)
}) })
@ -556,7 +568,7 @@ const wxPay = async( oid )=> { //传入订单id
} }
.font { .font {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 25.54rpx; line-height: 25.54rpx;
color: #323232; color: #323232;
} }
@ -570,7 +582,7 @@ const wxPay = async( oid )=> { //传入订单id
} }
.font_2 { .font_2 {
font-size: 22.5rpx; font-size: 22.5rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 22.54rpx; line-height: 22.54rpx;
color: #818181; color: #818181;
} }
@ -582,7 +594,7 @@ const wxPay = async( oid )=> { //传入订单id
} }
.font_3 { .font_3 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 25.54rpx; line-height: 25.54rpx;
color: #ffaaa5; color: #ffaaa5;
} }
@ -637,13 +649,13 @@ const wxPay = async( oid )=> { //传入订单id
} }
.font_4 { .font_4 {
font-size: 33.75rpx; font-size: 33.75rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 22.54rpx; line-height: 22.54rpx;
color: #323232; color: #323232;
} }
.font_6 { .font_6 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 17.23rpx; line-height: 17.23rpx;
color: #323232; color: #323232;
} }
@ -663,7 +675,7 @@ const wxPay = async( oid )=> { //传入订单id
} }
.font_5 { .font_5 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 17.23rpx; line-height: 17.23rpx;
color: #ffffff; color: #ffffff;
} }
@ -698,7 +710,7 @@ const wxPay = async( oid )=> { //传入订单id
} }
.font_7 { .font_7 {
font-size: 30rpx; font-size: 30rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 29.18rpx; line-height: 29.18rpx;
color: #323232; color: #323232;
} }
@ -707,7 +719,7 @@ const wxPay = async( oid )=> { //传入订单id
} }
.font_8 { .font_8 {
font-size: 30rpx; font-size: 30rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 29.18rpx; line-height: 29.18rpx;
color: #818181; color: #818181;
} }
@ -717,7 +729,7 @@ const wxPay = async( oid )=> { //传入订单id
} }
.font_9 { .font_9 {
font-size: 30rpx; font-size: 30rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 20.04rpx; line-height: 20.04rpx;
color: #323232; color: #323232;
} }
@ -788,20 +800,20 @@ const wxPay = async( oid )=> { //传入订单id
// margin-left: -119.06rpx; // margin-left: -119.06rpx;
color: #000000; color: #000000;
font-size: 30rpx; font-size: 30rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 26.49rpx; line-height: 26.49rpx;
} }
.text_22 { .text_22 {
color: #ffaaa5; color: #ffaaa5;
font-size: 37.5rpx; font-size: 37.5rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
font-weight: 700; font-weight: 700;
line-height: 27.62rpx; line-height: 27.62rpx;
} }
.text_24 { .text_24 {
color: #ffaaa5; color: #ffaaa5;
font-size: 30rpx; font-size: 30rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
font-weight: 700; font-weight: 700;
line-height: 22.05rpx; line-height: 22.05rpx;
} }

42
pages/order/serviceWaitPay/serviceWaitPay.vue
View File

@ -21,8 +21,8 @@
<view class="flex-col"> <view class="flex-col">
<view class="flex-row items-end list-item mt-13" v-for="(item, index) in productArr" :key="index"> <view class="flex-row items-end list-item mt-13" v-for="(item, index) in productArr" :key="index">
<image <image
class="shrink-0 image_3" class="shrink-0 image_3" mode="aspectFill"
:src="item.cartExperienceGoodVO.goodImg" :src="publicPath + item.cartExperienceGoodVO.goodImg"
/> />
<view class="flex-col flex-1 group_5"> <view class="flex-col flex-1 group_5">
<view class="flex-row self-stretch group_3"> <view class="flex-row self-stretch group_3">
@ -152,6 +152,7 @@
import * as math from 'mathjs' import * as math from 'mathjs'
import { dealResult } from '../../../common/globalFunction'; import { dealResult } from '../../../common/globalFunction';
import { orderUrl } from '../../../common/globalImagesUrl'; import { orderUrl } from '../../../common/globalImagesUrl';
import { publicPath } from '../../../common/globalImagesUrl';
const bkgUrl = ref(orderUrl + '/serviceWaitPay/bkg.png') const bkgUrl = ref(orderUrl + '/serviceWaitPay/bkg.png')
//一些暂时变量 //一些暂时变量
const sumprice = ref(0) //总价格 const sumprice = ref(0) //总价格
@ -242,6 +243,11 @@
await getMyCouponList() await getMyCouponList()
}) })
const updateContactObjHandler = (val) => {
if (contactRealInfo.value.id === val.id) {
contactRealInfo.value = val
}
}
onMounted(() => { onMounted(() => {
//将关闭弹窗方法传入弹窗页面，绑定弹窗按钮可关闭弹窗 //将关闭弹窗方法传入弹窗页面，绑定弹窗按钮可关闭弹窗
@ -256,6 +262,8 @@
emitter.on('getCouponObj', getCouponObjHandler) emitter.on('getCouponObj', getCouponObjHandler)
emitter.on('delContactById', delContactByIdHandler) emitter.on('delContactById', delContactByIdHandler)
emitter.on('updateContactObj', updateContactObjHandler)
}) })
onUnmounted(() => { onUnmounted(() => {
@ -271,6 +279,8 @@
emitter.off('getCouponObj', getCouponObjHandler) emitter.off('getCouponObj', getCouponObjHandler)
emitter.off('delContactById', delContactByIdHandler) emitter.off('delContactById', delContactByIdHandler)
emitter.off('updateContactObj', updateContactObjHandler)
}) })
@ -583,7 +593,7 @@
.text { .text {
color: #818181; color: #818181;
font-size: 37.5rpx; font-size: 37.5rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 32.38rpx; line-height: 32.38rpx;
} }
.group { .group {
@ -596,7 +606,7 @@
} }
.font { .font {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 25.54rpx; line-height: 25.54rpx;
color: #323232; color: #323232;
} }
@ -630,7 +640,7 @@
} }
.font_2 { .font_2 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 25.54rpx; line-height: 25.54rpx;
color: #818181; color: #818181;
} }
@ -640,7 +650,7 @@
} }
.font_3 { .font_3 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 17.53rpx; line-height: 17.53rpx;
color: #818181; color: #818181;
} }
@ -653,13 +663,13 @@
} }
.font_5 { .font_5 {
font-size: 33.75rpx; font-size: 33.75rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 22.54rpx; line-height: 22.54rpx;
color: #323232; color: #323232;
} }
.font_6 { .font_6 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 17.53rpx; line-height: 17.53rpx;
color: #323232; color: #323232;
} }
@ -680,7 +690,7 @@
} }
.font_4 { .font_4 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 17.53rpx; line-height: 17.53rpx;
color: #ffffff; color: #ffffff;
} }
@ -701,7 +711,7 @@
} }
.font_7 { .font_7 {
font-size: 22.5rpx; font-size: 22.5rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 22.54rpx; line-height: 22.54rpx;
color: #818181; color: #818181;
} }
@ -724,7 +734,7 @@
} }
.font_8 { .font_8 {
font-size: 30rpx; font-size: 30rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 29.18rpx; line-height: 29.18rpx;
color: #323232; color: #323232;
} }
@ -733,7 +743,7 @@
} }
.font_9 { .font_9 {
font-size: 30rpx; font-size: 30rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 29.18rpx; line-height: 29.18rpx;
color: #818181; color: #818181;
} }
@ -746,7 +756,7 @@
} }
.font_10 { .font_10 {
font-size: 30rpx; font-size: 30rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 20.04rpx; line-height: 20.04rpx;
color: #323232; color: #323232;
} }
@ -802,21 +812,21 @@
// margin-left: -119.06rpx; // margin-left: -119.06rpx;
color: #000000; color: #000000;
font-size: 30rpx; font-size: 30rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 26.49rpx; line-height: 26.49rpx;
} }
.text_18 { .text_18 {
// margin-left: 28.5rpx; // margin-left: 28.5rpx;
color: #ffaaa5; color: #ffaaa5;
font-size: 37.5rpx; font-size: 37.5rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
font-weight: 700; font-weight: 700;
line-height: 27.62rpx; line-height: 27.62rpx;
} }
.text_20 { .text_20 {
color: #ffaaa5; color: #ffaaa5;
font-size: 30rpx; font-size: 30rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
font-weight: 700; font-weight: 700;
line-height: 22.05rpx; line-height: 22.05rpx;
} }

40
pages/order/singleGoodOrder/singleGoodOrder.vue
View File

@ -12,9 +12,8 @@
<view class="flex-row items-end group_18"> <view class="flex-row items-end group_18">
<view class="flex-row items-end flex-1 group_19"> <view class="flex-row items-end flex-1 group_19">
<image <image
class="shrink-0 image_3 image_4" class="shrink-0 image_3 image_4" mode="aspectFill"
:src="productObject.goodImg.split(';')[0]" :src="publicPath + productObject.goodImg.split(';')[0]"
mode="aspectFill"
/> />
<view class="flex-col ml-17"> <view class="flex-col ml-17">
<view class="flex-row"> <view class="flex-row">
@ -135,6 +134,7 @@ import * as math from 'mathjs'
import { JudgeIsNullity, dealResult } from '../../../common/globalFunction'; import { JudgeIsNullity, dealResult } from '../../../common/globalFunction';
import addressSelectedVue from '../../Shopping-cart/component/addressSelected.vue'; import addressSelectedVue from '../../Shopping-cart/component/addressSelected.vue';
import { orderUrl } from '../../../common/globalImagesUrl'; import { orderUrl } from '../../../common/globalImagesUrl';
import { publicPath } from '../../../common/globalImagesUrl';
const bkgUrl = ref(orderUrl + '/singleGoodOrder/bkg.png') const bkgUrl = ref(orderUrl + '/singleGoodOrder/bkg.png')
//一些暂时变量 //一些暂时变量
const sumprice = ref(0) //总价格 const sumprice = ref(0) //总价格
@ -207,6 +207,12 @@ const getCouponObjHandler = (val) => {
console.log(val) console.log(val)
} }
const updateAddressHandler = (val) => {
if (addressRealInfo.value.id === val.id) {
addressRealInfo.value = val
}
}
onMounted(() => { onMounted(() => {
@ -223,6 +229,8 @@ const getCouponObjHandler = (val) => {
emitter.on('getCouponObj', getCouponObjHandler) emitter.on('getCouponObj', getCouponObjHandler)
emitter.on('delMyAddress', delMyAddressHandler) emitter.on('delMyAddress', delMyAddressHandler)
emitter.on('updateAddress', updateAddressHandler)
}) })
onUnmounted(() => { onUnmounted(() => {
@ -238,6 +246,8 @@ const getCouponObjHandler = (val) => {
emitter.off('getCouponObj', getCouponObjHandler) emitter.off('getCouponObj', getCouponObjHandler)
emitter.off('delMyAddress', delMyAddressHandler) emitter.off('delMyAddress', delMyAddressHandler)
emitter.off('updateAddress', updateAddressHandler)
}) })
onLoad( async (options)=>{ onLoad( async (options)=>{
@ -575,7 +585,7 @@ const wxPay = async ( oid )=> { //传入订单id
} }
.font { .font {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 26.25rpx; line-height: 26.25rpx;
color: #323232; color: #323232;
} }
@ -591,7 +601,7 @@ const wxPay = async ( oid )=> { //传入订单id
} }
.font_2 { .font_2 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 22.54rpx; line-height: 22.54rpx;
color: #818181; color: #818181;
} }
@ -608,7 +618,7 @@ const wxPay = async ( oid )=> { //传入订单id
} }
.font_3 { .font_3 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 25.54rpx; line-height: 25.54rpx;
color: #ffaaa5; color: #ffaaa5;
} }
@ -664,13 +674,13 @@ const wxPay = async ( oid )=> { //传入订单id
} }
.font_4 { .font_4 {
font-size: 33.75rpx; font-size: 33.75rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 22.54rpx; line-height: 22.54rpx;
color: #323232; color: #323232;
} }
.font_6 { .font_6 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 17.23rpx; line-height: 17.23rpx;
color: #323232; color: #323232;
} }
@ -691,7 +701,7 @@ const wxPay = async ( oid )=> { //传入订单id
} }
.font_5 { .font_5 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 17.23rpx; line-height: 17.23rpx;
color: #ffffff; color: #ffffff;
} }
@ -726,7 +736,7 @@ const wxPay = async ( oid )=> { //传入订单id
} }
.font_7 { .font_7 {
font-size: 30rpx; font-size: 30rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 29.18rpx; line-height: 29.18rpx;
color: #323232; color: #323232;
} }
@ -735,7 +745,7 @@ const wxPay = async ( oid )=> { //传入订单id
} }
.font_8 { .font_8 {
font-size: 30rpx; font-size: 30rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 29.18rpx; line-height: 29.18rpx;
color: #818181; color: #818181;
} }
@ -745,7 +755,7 @@ const wxPay = async ( oid )=> { //传入订单id
} }
.font_9 { .font_9 {
font-size: 30rpx; font-size: 30rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 20.04rpx; line-height: 20.04rpx;
color: #323232; color: #323232;
} }
@ -816,20 +826,20 @@ const wxPay = async ( oid )=> { //传入订单id
// margin-left: -119.06rpx; // margin-left: -119.06rpx;
color: #000000; color: #000000;
font-size: 30rpx; font-size: 30rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 26.49rpx; line-height: 26.49rpx;
} }
.text_22 { .text_22 {
color: #ffaaa5; color: #ffaaa5;
font-size: 37.5rpx; font-size: 37.5rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
font-weight: 700; font-weight: 700;
line-height: 27.62rpx; line-height: 27.62rpx;
} }
.text_24 { .text_24 {
color: #ffaaa5; color: #ffaaa5;
font-size: 30rpx; font-size: 30rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
font-weight: 700; font-weight: 700;
line-height: 22.05rpx; line-height: 22.05rpx;
} }

49
pages/order/singleServiceWait/singleServiceWait.vue
View File

@ -21,9 +21,8 @@
<view class="flex-col"> <view class="flex-col">
<view class="flex-row items-end list-item mt-13"> <view class="flex-row items-end list-item mt-13">
<image <image
class="shrink-0 image_3" class="shrink-0 image_3" mode="aspectFill"
:src="singleService.goodImg" :src="publicPath + singleService.goodImg"
mode="aspectFill"
/> />
<view class="flex-col flex-1 group_5"> <view class="flex-col flex-1 group_5">
<view class="flex-row self-stretch group_3"> <view class="flex-row self-stretch group_3">
@ -151,6 +150,7 @@
import couponPopupVue from '../../coupon/component/couponPopup.vue'; import couponPopupVue from '../../coupon/component/couponPopup.vue';
import { JudgeIsNullity, dealResult } from '../../../common/globalFunction'; import { JudgeIsNullity, dealResult } from '../../../common/globalFunction';
import { orderUrl } from '../../../common/globalImagesUrl'; import { orderUrl } from '../../../common/globalImagesUrl';
import { publicPath } from '../../../common/globalImagesUrl';
const bkgUrl = ref(orderUrl + '/singleServiceWait/bkg.png') const bkgUrl = ref(orderUrl + '/singleServiceWait/bkg.png')
const sumprice = ref(0) //总价格 const sumprice = ref(0) //总价格
const popup = ref(null) //弹窗对象 const popup = ref(null) //弹窗对象
@ -222,7 +222,11 @@
} }
const updateContactObjHandler = (val) => {
if (contactRealInfo.value.id === val.id) {
contactRealInfo.value = val
}
}
@ -243,7 +247,7 @@
onMounted(() => { onMounted(() => {
contactRealInfo.value.name = '请选择联系人' getDefaultContact()
//将关闭弹窗方法传入弹窗页面，绑定弹窗按钮可关闭弹窗 //将关闭弹窗方法传入弹窗页面，绑定弹窗按钮可关闭弹窗
emitter.on('close', closeHandler) emitter.on('close', closeHandler)
//获取联系人信息 //获取联系人信息
@ -256,6 +260,8 @@
emitter.on('getCouponObj', getCouponObjHandler) emitter.on('getCouponObj', getCouponObjHandler)
emitter.on('delContactById', delContactByIdHandler) emitter.on('delContactById', delContactByIdHandler)
emitter.on('updateContactObj', updateContactObjHandler)
}) })
@ -271,6 +277,8 @@
emitter.off('getCouponObj', getCouponObjHandler) emitter.off('getCouponObj', getCouponObjHandler)
emitter.off('delContactById', delContactByIdHandler) emitter.off('delContactById', delContactByIdHandler)
emitter.off('updateContactObj', updateContactObjHandler)
}) })
@ -579,7 +587,7 @@
.text { .text {
color: #818181; color: #818181;
font-size: 37.5rpx; font-size: 37.5rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 32.38rpx; line-height: 32.38rpx;
} }
.group { .group {
@ -592,7 +600,7 @@
} }
.font { .font {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 25.54rpx; line-height: 25.54rpx;
color: #323232; color: #323232;
} }
@ -626,7 +634,7 @@
} }
.font_2 { .font_2 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 25.54rpx; line-height: 25.54rpx;
color: #818181; color: #818181;
} }
@ -636,7 +644,7 @@
} }
.font_3 { .font_3 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 17.53rpx; line-height: 17.53rpx;
color: #818181; color: #818181;
} }
@ -649,13 +657,13 @@
} }
.font_5 { .font_5 {
font-size: 33.75rpx; font-size: 33.75rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 22.54rpx; line-height: 22.54rpx;
color: #323232; color: #323232;
} }
.font_6 { .font_6 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 17.53rpx; line-height: 17.53rpx;
color: #323232; color: #323232;
} }
@ -669,19 +677,18 @@
margin-right: 5.63rpx; margin-right: 5.63rpx;
} }
.text-wrapper { .text-wrapper {
padding: 11.31rpx 0 16.46rpx;
background-color: #ffaaa5; background-color: #ffaaa5;
width: 58.13rpx; width: 58.13rpx;
height: 45rpx; height: 45rpx;
} }
.font_4 { .font_4 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 17.53rpx; line-height: 17.53rpx;
color: #ffffff; color: #ffffff;
} }
.text_6 { .text_6 {
line-height: 17.23rpx; line-height: 45rpx;
} }
.image_5 { .image_5 {
border-radius: 0rpx 9.38rpx 9.38rpx 0rpx; border-radius: 0rpx 9.38rpx 9.38rpx 0rpx;
@ -697,7 +704,7 @@
} }
.font_7 { .font_7 {
font-size: 25.5rpx; font-size: 25.5rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 22.54rpx; line-height: 22.54rpx;
color: #818181; color: #818181;
} }
@ -720,7 +727,7 @@
} }
.font_8 { .font_8 {
font-size: 30rpx; font-size: 30rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 29.18rpx; line-height: 29.18rpx;
color: #323232; color: #323232;
} }
@ -729,7 +736,7 @@
} }
.font_9 { .font_9 {
font-size: 30rpx; font-size: 30rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 29.18rpx; line-height: 29.18rpx;
color: #818181; color: #818181;
} }
@ -742,7 +749,7 @@
} }
.font_10 { .font_10 {
font-size: 30rpx; font-size: 30rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 20.04rpx; line-height: 20.04rpx;
color: #323232; color: #323232;
} }
@ -798,21 +805,21 @@
// margin-left: -119.06rpx; // margin-left: -119.06rpx;
color: #000000; color: #000000;
font-size: 30rpx; font-size: 30rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 26.49rpx; line-height: 26.49rpx;
} }
.text_18 { .text_18 {
// margin-left: 28.5rpx; // margin-left: 28.5rpx;
color: #ffaaa5; color: #ffaaa5;
font-size: 37.5rpx; font-size: 37.5rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
font-weight: 700; font-weight: 700;
line-height: 27.62rpx; line-height: 27.62rpx;
} }
.text_20 { .text_20 {
color: #ffaaa5; color: #ffaaa5;
font-size: 30rpx; font-size: 30rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
font-weight: 700; font-weight: 700;
line-height: 22.05rpx; line-height: 22.05rpx;
} }

37
pages/store-home/ProductDetails/ProductDetails.vue
View File

@ -7,7 +7,7 @@
/> --> /> -->
<swiper class="swiper-box"> <swiper class="swiper-box">
<swiper-item v-for="(item,index) in imgArr" :key="index" > <swiper-item v-for="(item,index) in imgArr" :key="index" >
<image mode="aspectFit" class="self-stretch image" :src="item" @tap="previewImage(index)"></image> <image mode="aspectFill" class="self-stretch image" :src="publicPath + item" @tap="previewImage(index)"></image>
</swiper-item> </swiper-item>
</swiper> </swiper>
<view class="flex-col self-stretch section_2"> <view class="flex-col self-stretch section_2">
@ -18,12 +18,12 @@
</view> </view>
<view class="flex-row justify-between items-center self-stretch group_2"> <view class="flex-row justify-between items-center self-stretch group_2">
<text class="text_4">{{ goodObject.name }}</text> <text class="text_4">{{ goodObject.name }}</text>
<view class="flex-row items-center group_3" v-if="goodObject.festivalName != null"> <view class="flex-row items-center group_3" v-if="festivalName !== '无'">
<image <image
class="image_2" class="image_2" mode="aspectFill"
:src="storeHomeUrl + '/ProductDetails/jr.png'" :src="publicPath + festivalUrl"
/> />
<text class="font text_3 ml-5">{{ goodObject.festivalName }}限定</text> <text class="font text_3 ml-5">{{ festivalName }}限定</text>
</view> </view>
</view> </view>
<view class="self-stretch divider view"></view> <view class="self-stretch divider view"></view>
@ -97,6 +97,7 @@ import emitter from '../../../utils/emitter'
import addProduct from '../../Shopping-cart/component/addProduct.vue'; import addProduct from '../../Shopping-cart/component/addProduct.vue';
import { dealResult } from '../../../common/globalFunction'; import { dealResult } from '../../../common/globalFunction';
import { storeHomeUrl } from '../../../common/globalImagesUrl'; import { storeHomeUrl } from '../../../common/globalImagesUrl';
import { publicPath } from '../../../common/globalImagesUrl';
const popup = ref(null) //弹窗对象 const popup = ref(null) //弹窗对象
const goodObject = ref({}) //商品对象 const goodObject = ref({}) //商品对象
const idInfo = ref(0) //发送到下一页的商品id const idInfo = ref(0) //发送到下一页的商品id
@ -107,7 +108,8 @@ const coupon = ref(0) //当前商品可用的优惠卷
const cookie = wx.getStorageSync('cookie') const cookie = wx.getStorageSync('cookie')
const richTextcontent = ref('') const richTextcontent = ref('')
const bkgUrl = ref(storeHomeUrl + '/ProductDetails/bkg.png') const bkgUrl = ref(storeHomeUrl + '/ProductDetails/bkg.png')
const festivalName = ref('')
const festivalUrl = ref('')
//转换上一页面传来的商品 //转换上一页面传来的商品
onLoad((options) => { onLoad((options) => {
getFonts() getFonts()
@ -129,6 +131,7 @@ onUnmounted(() => {
emitter.off('close', closeHandler) emitter.off('close', closeHandler)
}) })
const getProduct = async (gid) =>{ //根据商品获取商品信息 const getProduct = async (gid) =>{ //根据商品获取商品信息
const res = await uni.request({ const res = await uni.request({
url: baseUrl + '/goods/getById', url: baseUrl + '/goods/getById',
@ -149,6 +152,9 @@ const getProduct = async (gid) =>{ //根据商品获取商品信息
return s return s
}) })
idInfo.value = goodObject.value.id idInfo.value = goodObject.value.id
festivalName.value = goodObject.value.festivalName.split(';')[0]
festivalUrl.value = goodObject.value.festivalName.split(';')[1]
console.log('=================>', festivalUrl.value)
} }
} }
const loadPop =()=>{ const loadPop =()=>{
@ -246,7 +252,7 @@ button::after {
} }
.font { .font {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: 'FZSongKeBenXiuKaiS-R-GB'; font-family: 'FangZhengFonts';
line-height: 25.84rpx; line-height: 25.84rpx;
color: #323232; color: #323232;
} }
@ -257,7 +263,7 @@ button::after {
.text { .text {
color: #ff0000; color: #ff0000;
font-size: 45rpx; font-size: 45rpx;
font-family: 'FZSongKeBenXiuKaiS-R-GB'; font-family: 'FangZhengFonts';
line-height: 30.06rpx; line-height: 30.06rpx;
} }
.group_2 { .group_2 {
@ -266,15 +272,16 @@ button::after {
.text_4 { .text_4 {
color: #323232; color: #323232;
font-size: 33.75rpx; font-size: 33.75rpx;
font-family: 'FZSongKeBenXiuKaiS-R-GB'; font-family: 'FangZhengFonts';
line-height: 32.7rpx; line-height: 32.7rpx;
} }
.group_3 { .group_3 {
margin-right: 19.63rpx; margin-right: 19.63rpx;
} }
.image_2 { .image_2 {
width: 33.75rpx; width: 43.75rpx;
height: 33.75rpx; height: 43.75rpx;
border-radius: 50%;
} }
.text_3 { .text_3 {
font-size: 28.13rpx; font-size: 28.13rpx;
@ -293,7 +300,7 @@ button::after {
} }
.font_2 { .font_2 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: 'FZSongKeBenXiuKaiS-R-GB'; font-family: 'FangZhengFonts';
line-height: 31.88rpx; line-height: 31.88rpx;
color: #323232; color: #323232;
} }
@ -316,7 +323,7 @@ button::after {
} }
.font_3 { .font_3 {
font-size: 22.5rpx; font-size: 22.5rpx;
font-family: 'FZSongKeBenXiuKaiS-R-GB'; font-family: 'FangZhengFonts';
line-height: 21.71rpx; line-height: 21.71rpx;
color: #323232; color: #323232;
} }
@ -361,7 +368,7 @@ button::after {
} }
.font_4 { .font_4 {
font-size: 30rpx; font-size: 30rpx;
font-family: 'FZSongKeBenXiuKaiS-R-GB'; font-family: 'FangZhengFonts';
color: #ffffff; color: #ffffff;
} }
.text_10 { .text_10 {
@ -446,7 +453,7 @@ button::after {
.discountsText { .discountsText {
color: #ff0000; color: #ff0000;
font-size: 25rpx; font-size: 25rpx;
font-family: 'FZSongKeBenXiuKaiS-R-GB'; font-family: 'FangZhengFonts';
line-height: 30.06rpx; line-height: 30.06rpx;
margin-left: 20rpx margin-left: 20rpx
} }

21
pages/store-home/main/testMain.vue
View File

@ -30,8 +30,8 @@
> >
<image <image
:style="changeImgStyle(index)" :style="changeImgStyle(index)"
class="image_3" class="image_3" mode="aspectFill"
:src="item.imgurl" :src="publicPath + item.imgurl"
/> />
<text class="font_2 text_4" :style="FontsStyle(index)">{{ item.name }}</text> <text class="font_2 text_4" :style="FontsStyle(index)">{{ item.name }}</text>
</view> </view>
@ -43,8 +43,8 @@
<view class="good-list"> <view class="good-list">
<view class="flex-row list-item mt-9" v-for="(item, index) in productList" :key="index" @click="goToProduct(item)"> <view class="flex-row list-item mt-9" v-for="(item, index) in productList" :key="index" @click="goToProduct(item)">
<image <image
class="self-center image_4" class="self-center image_4" mode="aspectFill"
:src="item.goodImg.split(';')[0]" :src="publicPath + item.goodImg.split(';')[0]"
/> />
<view class="flex-col items-start self-center group_1"> <view class="flex-col items-start self-center group_1">
<text class="font">{{ item.name }}</text> <text class="font">{{ item.name }}</text>
@ -72,6 +72,7 @@ import { getFonts } from '../../../common/globalFont';
import carousel from '@/components/vear-carousel/vear-carousel' import carousel from '@/components/vear-carousel/vear-carousel'
import { workshopUrl } from '../../../common/globalImagesUrl'; import { workshopUrl } from '../../../common/globalImagesUrl';
import { storeHomeUrl } from '../../../common/globalImagesUrl'; import { storeHomeUrl } from '../../../common/globalImagesUrl';
import { publicPath } from '../../../common/globalImagesUrl';
const bkgUrl = ref(storeHomeUrl + '/main/bkg.png') const bkgUrl = ref(storeHomeUrl + '/main/bkg.png')
const currentColor = ref(0); const currentColor = ref(0);
const sort =ref([{}]) //商品类别对象数组 const sort =ref([{}]) //商品类别对象数组
@ -216,7 +217,7 @@ const imgList = ref([{
<style lang="scss" scoped> <style lang="scss" scoped>
input { input {
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
} }
::-webkit-scrollbar { ::-webkit-scrollbar {
@ -259,7 +260,7 @@ input {
.text { .text {
color: #000000; color: #000000;
font-size: 35rpx; font-size: 35rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 35.66rpx; line-height: 35.66rpx;
} }
.section_3 { .section_3 {
@ -311,7 +312,7 @@ input {
} }
.font_2 { .font_2 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 24.41rpx; line-height: 24.41rpx;
color: #000000; color: #000000;
} }
@ -344,13 +345,13 @@ input {
} }
.font { .font {
font-size: 30rpx; font-size: 30rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 30rpx; line-height: 30rpx;
color: #000000; color: #000000;
} }
.font_3 { .font_3 {
font-size: 22.5rpx; font-size: 22.5rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 21.88rpx; line-height: 21.88rpx;
color: #727272; color: #727272;
width: 180px; width: 180px;
@ -358,7 +359,7 @@ input {
} }
.font_4 { .font_4 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 17.53rpx; line-height: 17.53rpx;
color: #ff0000; color: #ff0000;
} }

1
pages/testPage/testPage.vue
View File

@ -1,5 +1,6 @@
<template> <template>
<!-- <addressSelectedVue></addressSelectedVue> --> <!-- <addressSelectedVue></addressSelectedVue> -->
<!-- <ContactVue></ContactVue> -->
</template> </template>
<script setup> <script setup>

11
pages/workshop/component/timeSelect.vue
View File

@ -4,7 +4,7 @@
<view class="flex-row self-stretch group_2"> <view class="flex-row self-stretch group_2">
<image <image
class="image_2" class="image_2"
:src="productObject.goodImg" :src="publicPath + productObject.goodImg"
/> />
<view class="flex-col flex-1 self-start ml-15"> <view class="flex-col flex-1 self-start ml-15">
<image <image
@ -87,6 +87,7 @@
import { onLoad } from "@dcloudio/uni-app"; import { onLoad } from "@dcloudio/uni-app";
import { getFonts } from '../../../common/globalFont'; import { getFonts } from '../../../common/globalFont';
import { bookUrl } from '../../../common/globalImagesUrl'; import { bookUrl } from '../../../common/globalImagesUrl';
import { publicPath } from '../../../common/globalImagesUrl';
const bkgUrl = ref(bookUrl + '/component/bkg.png') const bkgUrl = ref(bookUrl + '/component/bkg.png')
let selectObj = ref([]) let selectObj = ref([])
@ -396,12 +397,12 @@
margin-left: 6.92rpx; margin-left: 6.92rpx;
color: #c35c5d; color: #c35c5d;
font-size: 37.5rpx; font-size: 37.5rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 27.52rpx; line-height: 27.52rpx;
} }
.font { .font {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 23.94rpx; line-height: 23.94rpx;
color: #323233; color: #323233;
} }
@ -410,7 +411,7 @@
} }
.font_2 { .font_2 {
font-size: 30rpx; font-size: 30rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 27.71rpx; line-height: 27.71rpx;
color: #323233; color: #323233;
} }
@ -455,7 +456,7 @@
} }
.font_3 { .font_3 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 19.29rpx; line-height: 19.29rpx;
color: #323233; color: #323233;
} }

2
pages/workshop/component/tip.vue
View File

@ -35,7 +35,7 @@
} }
.font { .font {
font-size: 33.39rpx; font-size: 33.39rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
} }
.text { .text {
color: #323233; color: #323233;

10
pages/workshop/index/index.vue
View File

@ -24,8 +24,8 @@
<view class="flex-col grid-item" v-for="(item, index) in products" :key="index" @click="jump_detail(item,index)"> <view class="flex-col grid-item" v-for="(item, index) in products" :key="index" @click="jump_detail(item,index)">
<view class="flex-col"> <view class="flex-col">
<image <image
class="image_1" class="image_1" mode="aspectFill"
:src="item.goodImg" :src="publicPath + item.goodImg"
/> />
<text class="font text_2 mt-1">{{ item.name }}</text> <text class="font text_2 mt-1">{{ item.name }}</text>
</view> </view>
@ -48,6 +48,7 @@ import { baseUrl } from '../../../api/request';
import { onLoad } from "@dcloudio/uni-app"; import { onLoad } from "@dcloudio/uni-app";
import { getFonts } from '../../../common/globalFont'; import { getFonts } from '../../../common/globalFont';
import { workshopUrl } from '../../../common/globalImagesUrl'; import { workshopUrl } from '../../../common/globalImagesUrl';
import { publicPath } from '../../../common/globalImagesUrl';
import carousel from '@/components/vear-carousel/vear-carousel' import carousel from '@/components/vear-carousel/vear-carousel'
const products = ref() const products = ref()
const cookie = wx.getStorageSync("cookie") const cookie = wx.getStorageSync("cookie")
@ -67,11 +68,8 @@ const getProducts = async ()=> {
cookie cookie
} }
}) })
console.log(res.data.data);
if(res.data.code === 1) {
products.value = res.data.data products.value = res.data.data
} }
}
const jump_detail =(item,index)=>{ const jump_detail =(item,index)=>{
// console.log(item.id); // console.log(item.id);
uni.navigateTo({ uni.navigateTo({
@ -155,7 +153,7 @@ const imgList = ref([{
} }
.font { .font {
font-size: 24.38rpx; font-size: 24.38rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
color: #000000; color: #000000;
} }
.text { .text {

13
pages/workshop/productmain/productmain.vue
View File

@ -2,8 +2,8 @@
<view class="flex-col page" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }"> <view class="flex-col page" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }">
<view class="flex-col self-stretch section"> <view class="flex-col self-stretch section">
<image <image
class="image_3" class="image_3" mode="aspectFill"
:src="productObject.goodImg" :src="publicPath + productObject.goodImg"
/> />
<view class="flex-col list"> <view class="flex-col list">
<view class="flex-col section_3"> <view class="flex-col section_3">
@ -79,6 +79,7 @@ import { baseUrl } from '../../../api/request';
import { workshopUrl } from '../../../common/globalImagesUrl'; import { workshopUrl } from '../../../common/globalImagesUrl';
import timeSelectVue from '../component/timeSelect.vue'; import timeSelectVue from '../component/timeSelect.vue';
import emitter from '../../../utils/emitter' //导入emitter传值组件 import emitter from '../../../utils/emitter' //导入emitter传值组件
import { publicPath } from '../../../common/globalImagesUrl';
const pid = ref(0) //商品id const pid = ref(0) //商品id
const cookie = wx.getStorageSync("cookie") //请求头 const cookie = wx.getStorageSync("cookie") //请求头
const productObject = ref({}) const productObject = ref({})
@ -231,7 +232,7 @@ const loadPopBook = ()=> {
} }
.font { .font {
font-size: 30rpx; font-size: 30rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 29.7rpx; line-height: 29.7rpx;
} }
.text { .text {
@ -262,7 +263,7 @@ const loadPopBook = ()=> {
} }
.font_2 { .font_2 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 31.88rpx; line-height: 31.88rpx;
color: #323232; color: #323232;
} }
@ -273,7 +274,7 @@ const loadPopBook = ()=> {
.text_2 { .text_2 {
color: #ff0000; color: #ff0000;
font-size: 45rpx; font-size: 45rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 29.7rpx; line-height: 29.7rpx;
} }
.text_4 { .text_4 {
@ -290,7 +291,7 @@ const loadPopBook = ()=> {
} }
.font_3 { .font_3 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 24.92rpx; line-height: 24.92rpx;
color: #000000; color: #000000;
} }

2
pages/workshop/searchGood/searchGood.vue
View File

@ -91,7 +91,7 @@
} }
.font { .font {
font-size: 24.38rpx; font-size: 24.38rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 22.95rpx; line-height: 22.95rpx;
} }
.text-wrapper { .text-wrapper {

8
pages/workshop/searchResult/searchResult.vue
View File

@ -189,7 +189,7 @@
} }
.font { .font {
font-size: 24.38rpx; font-size: 24.38rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 22.95rpx; line-height: 22.95rpx;
} }
.text-wrapper { .text-wrapper {
@ -242,7 +242,7 @@
} }
.font_2 { .font_2 {
font-size: 30rpx; font-size: 30rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 30rpx; line-height: 30rpx;
color: #000000; color: #000000;
} }
@ -252,7 +252,7 @@
} }
.font_3 { .font_3 {
font-size: 24.38rpx; font-size: 24.38rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 30rpx; line-height: 30rpx;
color: #8a8a8a; color: #8a8a8a;
} }
@ -262,7 +262,7 @@
} }
.font_4 { .font_4 {
font-size: 30rpx; font-size: 30rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FangZhengFonts;
line-height: 20.04rpx; line-height: 20.04rpx;
color: #fb1212; color: #fb1212;
} }