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-16 21:35:20 +08:00
parent 8927a5944e
commit 466d38d792
48 changed files with 581 additions and 536 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/request.ts
View File

@ -6,5 +6,5 @@ export const domain = 'https://www.carboner.cn/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 = develop export const baseUrl = Url

62
common/globalFont.js
View File

@ -1,36 +1,36 @@
export const getFonts =()=>{ export const getFonts =()=>{
//首页 //首页
uni.loadFontFace({ // uni.loadFontFace({
family: 'ZhongShanFonts', // family: 'ZhongShanFonts',
source: `url("https://carbon2.obs.cn-north-4.myhuaweicloud.com/fonts/ZhongShanFonts.ttf")`, // source: `url("https://carbon2.obs.cn-north-4.myhuaweicloud.com/fonts/ZhongShanFonts.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);
} // }
}) // })
//其他页面 // //其他页面
uni.loadFontFace({ // uni.loadFontFace({
family: 'FangZhengFonts', // family: 'FangZhengFonts',
source: `url("https://carbon2.obs.cn-north-4.myhuaweicloud.com/fonts/FangZhengFonts.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);
} // }
}) // })
uni.loadFontFace({ // uni.loadFontFace({
family: 'FangZhengXiaoZhuan', // family: 'FangZhengXiaoZhuan',
source: `url("https://carbon2.obs.cn-north-4.myhuaweicloud.com/fonts/FangZhengXiaoZhuan.ttf")`, // source: `url("https://carbon2.obs.cn-north-4.myhuaweicloud.com/fonts/FangZhengXiaoZhuan.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);
} // }
}) // })
} }

8
common/globalImagesUrl.js
View File

@ -1,4 +1,4 @@
export const bookUrl = 'https://carbon2.obs.cn-north-4.myhuaweicloud.com/feiyi/miniProgram/book' export const bookUrl = 'http://123.249.108.160:8888/api/file/downloadFile?objectKey=feiyi/miniProgram/book'
export const couponUrl = 'https://carbon2.obs.cn-north-4.myhuaweicloud.com/feiyi/miniProgram/coupon' export const couponUrl = 'http://123.249.108.160:8888/api/file/downloadFile?objectKey=feiyi/miniProgram/coupon'
export const workshopUrl = 'https://carbon2.obs.cn-north-4.myhuaweicloud.com/feiyi/miniProgram/workshop' export const workshopUrl = 'http://123.249.108.160:8888/api/file/downloadFile?objectKey=feiyi/miniProgram/workshop'
export const myOrderUrl = 'https://carbon2.obs.cn-north-4.myhuaweicloud.com/feiyi/miniProgram/my-order' export const myOrderUrl = 'http://123.249.108.160:8888/api/file/downloadFile?objectKey=feiyi/miniProgram/my-order'

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

@ -20,17 +20,17 @@
src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FxSHTnKhk-close.png" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FxSHTnKhk-close.png"
@click="close()" /> @click="close()" />
<view class="flex-row self-stretch mt-104"> <view class="flex-row self-stretch mt-104">
<view class="flex-col justify-start items-center image-wrapper_2"> <view class="flex-col justify-start items-center image-wrapper_2" @click="decrease">
<image class="image_3" <image class="image_3"
src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FFXJDkHOz-jian.png" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FFXJDkHOz-jian.png"
@click="decrease" /> />
</view> </view>
<view class="ml-2 flex-col justify-start items-center text-wrapper"><text <view class="ml-2 flex-col justify-start items-center text-wrapper"><text
class="text_5">{{ quantity }}</text></view> class="text_5">{{ quantity }}</text></view>
<view class="ml-2 flex-col justify-start items-center image-wrapper_3"> <view class="ml-2 flex-col justify-start items-center image-wrapper_3" @click="increase">
<image class="image_3" <image class="image_3"
src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FYvlxXoMs-jia.png" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FYvlxXoMs-jia.png"
@click="increase" /> />
</view> </view>
</view> </view>
</view> </view>
@ -201,14 +201,14 @@
.text_3 { .text_3 {
color: #000000; color: #000000;
font-size: 28.13rpx; font-size: 28.13rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
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: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 24.34rpx; line-height: 24.34rpx;
} }
@ -240,7 +240,7 @@
.text_5 { .text_5 {
color: #000000; color: #000000;
font-size: 30rpx; font-size: 30rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 21.41rpx; line-height: 21.41rpx;
} }

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

@ -32,14 +32,14 @@
<textarea class="section_2 ml-12" v-model="addressParam.detailAddress" placeholder="输入详细地址" auto-height="true"/> <textarea class="section_2 ml-12" v-model="addressParam.detailAddress" placeholder="输入详细地址" auto-height="true"/>
</view> </view>
<view class="flex-row justify-between items-center group_7"> <view class="flex-row justify-between items-center group_7">
<checkbox-group @change="defaultAddress"> <radio-group @change="defaultAddress">
<text class="font_2" style="margin-right: 400rpx;">设为默认收货地址</text> <text class="font_2" style="margin-right: 400rpx;">设为默认收货地址</text>
<!-- <image <!-- <image
class="image_2" class="image_2"
:src="selected" :src="selected"
/> --> /> -->
<checkbox class="round red radius" value="1" /> <radio @click="changeState" class="radius" color="#C35C5D" value="1" :checked="isSelected"/>
</checkbox-group> </radio-group>
</view> </view>
</view> </view>
</view> </view>
@ -55,6 +55,7 @@ import { testUrl , baseUrl , suiUrl } from '../../../api/request';
import { onLoad, onShow } from '@dcloudio/uni-app'; 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';
const isSelected = ref(false)
const addressParam = ref({ const addressParam = ref({
name: "", name: "",
phone: "", phone: "",
@ -63,11 +64,17 @@ const addressParam = ref({
isDefault: 0 isDefault: 0
}) })
const isAdd = ref(false) const isAdd = ref(false)
const changeState = () => {
isSelected.value = !isSelected.value
addressParam.value.isDefault = isSelected.value ? 1 : 0
}
//接受编辑按钮传来的地址信息 //接受编辑按钮传来的地址信息
onLoad((options)=>{ onLoad((options)=>{
getFonts() getFonts()
if(JSON.stringify(options) != '{}') { if(JSON.stringify(options) != '{}') {
addressParam.value = JSON.parse(options.editInfo) //将原来的地址信息赋值给原来的addressParam addressParam.value = JSON.parse(options.editInfo) //将原来的地址信息赋值给原来的addressParam
isSelected.value = addressParam.value.isDefault == 1
} else { } else {
isAdd.value = true isAdd.value = true
} }
@ -93,8 +100,6 @@ const defaultAddress =(event)=>{
} }
//发送添加新增地址的请求 //发送添加新增地址的请求
const newAddress = async () =>{ const newAddress = async () =>{
// console.log(addressParam.value);
// addressParam.value.userId = userInfo.value.id
const values = Object.values(addressParam.value); const values = Object.values(addressParam.value);
// 使用some()方法来检查是否有任何值为空 // 使用some()方法来检查是否有任何值为空
if (values.some(value => value === null || value === undefined || value === '')) { if (values.some(value => value === null || value === undefined || value === '')) {
@ -131,6 +136,7 @@ const newAddress = async () =>{
} }
const sucRes =(res)=>{ //请求成功执行的方法 const sucRes =(res)=>{ //请求成功执行的方法
if(res === 1) { if(res === 1) {
emitter.emit('updateAddressList')
uni.navigateBack({ //返回上一页 uni.navigateBack({ //返回上一页
}) })
@ -186,7 +192,7 @@ const bindTimeChange = (e) => { //picker省市区选择
} }
.font_2 { .font_2 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 24.34rpx; line-height: 24.34rpx;
color: #323232; color: #323232;
} }
@ -196,14 +202,12 @@ const bindTimeChange = (e) => { //picker省市区选择
.section { .section {
margin-left: 2.85rpx; margin-left: 2.85rpx;
margin-right: 14.1rpx; margin-right: 14.1rpx;
padding-left: 20.49rpx; padding: 10rpx 15.13rpx 10rpx 20.49rpx;
padding-right: 15.13rpx;
background-color: #ffffff; background-color: #ffffff;
border-radius: 9.38rpx; border-radius: 9.38rpx;
// border: solid 1.88rpx #818181;
} }
.group_2 { .group_2 {
padding: 24.24rpx 4.65rpx 12.19rpx; padding: 14.24rpx 4.65rpx 12.19rpx;
border-bottom: solid 1.88rpx #efefef; border-bottom: solid 1.88rpx #efefef;
} }
.text-wrapper { .text-wrapper {
@ -282,7 +286,7 @@ const bindTimeChange = (e) => { //picker省市区选择
.text_8 { .text_8 {
color: #C35C5D; color: #C35C5D;
font-size: 30rpx; font-size: 30rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 27.9rpx; line-height: 27.9rpx;
} }
.zujian{ //地址组件样式 .zujian{ //地址组件样式

22
pages/Shopping-cart/productmain/productmain.vue
View File

@ -391,7 +391,7 @@ const changeState =()=>{ //修改购物车订单方法
} }
.font { .font {
font-size: 30rpx; font-size: 30rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 27.69rpx; line-height: 27.69rpx;
color: #323232; color: #323232;
} }
@ -449,7 +449,7 @@ const changeState =()=>{ //修改购物车订单方法
} }
.font_2 { .font_2 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 24.43rpx; line-height: 24.43rpx;
color: #323232; color: #323232;
} }
@ -458,7 +458,7 @@ const changeState =()=>{ //修改购物车订单方法
} }
.font_3 { .font_3 {
font-size: 33.75rpx; font-size: 33.75rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 24.43rpx; line-height: 24.43rpx;
font-weight: 600; font-weight: 600;
color: #fb8b05; color: #fb8b05;
@ -474,7 +474,7 @@ const changeState =()=>{ //修改购物车订单方法
} }
.font_4 { .font_4 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 19.29rpx; line-height: 19.29rpx;
font-weight: 600; font-weight: 600;
color: #fb8b05; color: #fb8b05;
@ -499,7 +499,7 @@ const changeState =()=>{ //修改购物车订单方法
} }
.font_5 { .font_5 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 19.29rpx; line-height: 19.29rpx;
color: #323232; color: #323232;
} }
@ -529,7 +529,7 @@ const changeState =()=>{ //修改购物车订单方法
} }
.font_6 { .font_6 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 31.88rpx; line-height: 31.88rpx;
color: #323233; color: #323233;
} }
@ -541,13 +541,13 @@ const changeState =()=>{ //修改购物车订单方法
} }
.font_7 { .font_7 {
font-size: 22.5rpx; font-size: 22.5rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 22.5rpx; line-height: 22.5rpx;
color: #6b6e72; color: #6b6e72;
} }
.font_8 { .font_8 {
font-size: 22.5rpx; font-size: 22.5rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 19.29rpx; line-height: 19.29rpx;
color: #6b6e72; color: #6b6e72;
} }
@ -594,7 +594,7 @@ const changeState =()=>{ //修改购物车订单方法
.text_10 { .text_10 {
color: #ffffff; color: #ffffff;
font-size: 33.75rpx; font-size: 33.75rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 30.97rpx; line-height: 30.97rpx;
} }
.mt-569 { .mt-569 {
@ -614,7 +614,7 @@ const changeState =()=>{ //修改购物车订单方法
} }
.font { .font {
font-size: 30rpx; font-size: 30rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 27.54rpx; line-height: 27.54rpx;
color: #323232; color: #323232;
} }
@ -642,7 +642,7 @@ const changeState =()=>{ //修改购物车订单方法
.text_11 { .text_11 {
color: #ffffff; color: #ffffff;
font-size: 33.75rpx; font-size: 33.75rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 31.48rpx; line-height: 31.48rpx;
} }
@import url(../../../common/css/global.css); @import url(../../../common/css/global.css);

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

@ -467,6 +467,9 @@
}) })
} }
} }
let editOrCompleteTimer = null
const changeState = () => { //修改购物车订单方法 const changeState = () => { //修改购物车订单方法
if (stateText.value.topBtn === '编辑') { if (stateText.value.topBtn === '编辑') {
stateText.value.topBtn = '完成', stateText.value.topBtn = '完成',
@ -475,6 +478,11 @@
stateText.value.topBtn = '编辑', stateText.value.topBtn = '编辑',
stateText.value.bottomBtn = '去结算' stateText.value.bottomBtn = '去结算'
} }
clearTimeout(editOrCompleteTimer)
showLoading()
editOrCompleteTimer = setTimeout(async () => {
hideLoading()
}, 1000)
} }
const productSearch = () => { //搜索框方法 const productSearch = () => { //搜索框方法
var arr = [] var arr = []
@ -649,7 +657,7 @@
.font { .font {
font-size: 30rpx; font-size: 30rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 27.77rpx; line-height: 27.77rpx;
color: #c35c5d; color: #c35c5d;
} }
@ -696,7 +704,7 @@
.font_2 { .font_2 {
font-size: 30rpx; font-size: 30rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 27.77rpx; line-height: 27.77rpx;
color: #323232; color: #323232;
} }
@ -757,7 +765,7 @@
.font_3 { .font_3 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 25.01rpx; line-height: 25.01rpx;
color: #323232; color: #323232;
} }
@ -768,7 +776,7 @@
.font_4 { .font_4 {
font-size: 33.75rpx; font-size: 33.75rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 22.07rpx; line-height: 22.07rpx;
color: #e79ea1; color: #e79ea1;
} }
@ -787,7 +795,7 @@
.font_5 { .font_5 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 18.73rpx; line-height: 18.73rpx;
color: #e79ea1; color: #e79ea1;
} }
@ -817,7 +825,7 @@
.font_6 { .font_6 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 18.73rpx; line-height: 18.73rpx;
color: #323232; color: #323232;
} }
@ -854,7 +862,7 @@
.font_7 { .font_7 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 31.88rpx; line-height: 31.88rpx;
color: #323233; color: #323233;
} }
@ -862,13 +870,13 @@
.section_7 { .section_7 {
margin-right: 8.63rpx; margin-right: 8.63rpx;
padding: 11.1rpx 10.14rpx 14.25rpx; padding: 11.1rpx 10.14rpx 14.25rpx;
background-color: #fbdedf; background-color: #fff;
border-radius: 9.38rpx; border-radius: 9.38rpx;
} }
.font_8 { .font_8 {
font-size: 22.5rpx; font-size: 26.5rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 22.07rpx; line-height: 22.07rpx;
color: #6b6e72; color: #6b6e72;
} }
@ -889,7 +897,7 @@
.font_9 { .font_9 {
font-size: 33.75rpx; font-size: 33.75rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 25.01rpx; line-height: 25.01rpx;
font-weight: 600; font-weight: 600;
color: #e79ea1; color: #e79ea1;
@ -909,7 +917,7 @@
.font_10 { .font_10 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 18.73rpx; line-height: 18.73rpx;
font-weight: 600; font-weight: 600;
color: #e79ea1; color: #e79ea1;

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

@ -266,7 +266,7 @@
} }
.font { .font {
font-size: 37.5rpx; font-size: 37.5rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
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: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
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: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
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: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
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: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
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: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
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: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
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: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
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: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
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: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
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: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
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: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 41.72rpx; line-height: 41.72rpx;
} }
.font { .font {
font-size: 30.97rpx; font-size: 30.97rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
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: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
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: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 35.41rpx; line-height: 35.41rpx;
} }
.text_2 { .text_2 {

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

@ -187,7 +187,7 @@
} }
.font { .font {
font-size: 45rpx; font-size: 45rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
color: #000000; color: #000000;
} }
.text { .text {
@ -199,7 +199,7 @@
} }
.font_2 { .font_2 {
font-size: 37.5rpx; font-size: 37.5rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 36.34rpx; line-height: 36.34rpx;
color: #000000; color: #000000;
} }
@ -220,7 +220,7 @@
} }
.font_3 { .font_3 {
font-size: 30rpx; font-size: 30rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 27.3rpx; line-height: 27.3rpx;
color: #000000; color: #000000;
} }

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

@ -177,8 +177,8 @@
//获取字体 //获取字体
const getFonts =()=>{ const getFonts =()=>{
uni.loadFontFace({ uni.loadFontFace({
family: 'FangZhengFonts', family: 'FZSongKeBenXiuKaiS-R-GB',
source: `url("https://carbon2.obs.cn-north-4.myhuaweicloud.com/fonts/FangZhengFonts.TTF")`, source: `url("https://carbon2.obs.cn-north-4.myhuaweicloud.com/fonts/FZSongKeBenXiuKaiS-R-GB.TTF")`,
success:(res) =>{ success:(res) =>{
console.log('success',res); console.log('success',res);
}, },
@ -226,7 +226,7 @@
} }
.font { .font {
font-size: 30rpx; font-size: 30rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 28.71rpx; line-height: 28.71rpx;
color: #323232; color: #323232;
} }
@ -281,7 +281,7 @@
} }
.font_2 { .font_2 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 25.16rpx; line-height: 25.16rpx;
color: #000000; color: #000000;
} }
@ -339,7 +339,7 @@
} }
.font_3 { .font_3 {
font-size: 18.75rpx; font-size: 18.75rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 17.14rpx; line-height: 17.14rpx;
color: #ffffff; color: #ffffff;
} }

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

@ -417,19 +417,6 @@
//获取字体
const getFonts =()=>{
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);
}
})
}
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@ -502,7 +489,7 @@
} }
.font { .font {
font-size: 37.5rpx; font-size: 37.5rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 35.01rpx; line-height: 35.01rpx;
color: #000000; color: #000000;
} }
@ -525,7 +512,7 @@
} }
.font_2 { .font_2 {
font-size: 30rpx; font-size: 30rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 28.01rpx; line-height: 28.01rpx;
color: #000000; color: #000000;
} }
@ -567,7 +554,7 @@
} }
.font_3 { .font_3 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 24.3rpx; line-height: 24.3rpx;
color: #8b8b8b; color: #8b8b8b;
} }
@ -625,7 +612,7 @@
} }
.font_4 { .font_4 {
font-size: 30rpx; font-size: 30rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 20.04rpx; line-height: 20.04rpx;
color: #8b8b8b; color: #8b8b8b;
} }
@ -664,7 +651,7 @@
} }
.font_5 { .font_5 {
font-size: 30rpx; font-size: 30rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 20.04rpx; line-height: 20.04rpx;
color: #323232; color: #323232;
} }
@ -694,7 +681,7 @@
} }
.font_6 { .font_6 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 24.3rpx; line-height: 24.3rpx;
color: #000000; color: #000000;
} }
@ -713,7 +700,7 @@
.text_11 { .text_11 {
color: #000000; color: #000000;
font-size: 22.5rpx; font-size: 22.5rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 21.09rpx; line-height: 21.09rpx;
} }
.section_6 { .section_6 {

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

@ -218,7 +218,7 @@
} }
.font { .font {
font-size: 30rpx; font-size: 30rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 28.09rpx; line-height: 28.09rpx;
color: #818181; color: #818181;
} }
@ -239,13 +239,13 @@
.text_2 { .text_2 {
color: #000000; color: #000000;
font-size: 30rpx; font-size: 30rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 25.78rpx; line-height: 25.78rpx;
} }
.text_3 { .text_3 {
color: #c35c5d; color: #c35c5d;
font-size: 60rpx; font-size: 60rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 40.09rpx; line-height: 40.09rpx;
} }
.group { .group {
@ -259,7 +259,7 @@
.text_4 { .text_4 {
color: #000000; color: #000000;
font-size: 24.38rpx; font-size: 24.38rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 21.34rpx; line-height: 21.34rpx;
} }
.pos_3 { .pos_3 {
@ -279,7 +279,7 @@
} }
.font_2 { .font_2 {
font-size: 33.75rpx; font-size: 33.75rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 32.83rpx; line-height: 32.83rpx;
color: #000000; color: #000000;
} }
@ -297,7 +297,7 @@
} }
.font_3 { .font_3 {
font-size: 30rpx; font-size: 30rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 28.09rpx; line-height: 28.09rpx;
color: #ffffff; color: #ffffff;
} }
@ -306,7 +306,7 @@
} }
.font_4 { .font_4 {
font-size: 33.75rpx; font-size: 33.75rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 28.09rpx; line-height: 28.09rpx;
color: #c35c5d; color: #c35c5d;
} }

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

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

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

@ -112,7 +112,7 @@
} }
.font_2 { .font_2 {
font-size: 37.5rpx; font-size: 37.5rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 29.42rpx; line-height: 29.42rpx;
color: #c35c5c; color: #c35c5c;
} }
@ -155,7 +155,7 @@
} }
.font_3 { .font_3 {
font-size: 60rpx; font-size: 60rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 40.09rpx; line-height: 40.09rpx;
color: #c35c5c; color: #c35c5c;
} }
@ -164,7 +164,7 @@
} }
.font { .font {
font-size: 30rpx; font-size: 30rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 29.42rpx; line-height: 29.42rpx;
color: #000000; color: #000000;
} }
@ -173,7 +173,7 @@
} }
.font_4 { .font_4 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 24.62rpx; line-height: 24.62rpx;
color: #000000; color: #000000;
} }
@ -183,13 +183,13 @@
} }
.font_5 { .font_5 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
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: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 31.88rpx; line-height: 31.88rpx;
color: #818181; color: #818181;
} }

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

@ -101,7 +101,7 @@
} }
.font { .font {
font-size: 30rpx; font-size: 30rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 29.42rpx; line-height: 29.42rpx;
color: #000000; color: #000000;
} }
@ -110,7 +110,7 @@
} }
.font_2 { .font_2 {
font-size: 37.5rpx; font-size: 37.5rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 29.42rpx; line-height: 29.42rpx;
color: #818181; color: #818181;
} }
@ -152,7 +152,7 @@
} }
.font_3 { .font_3 {
font-size: 60rpx; font-size: 60rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 40.09rpx; line-height: 40.09rpx;
color: #818181; color: #818181;
} }
@ -161,13 +161,13 @@
} }
.font_4 { .font_4 {
font-size: 30rpx; font-size: 30rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
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: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 24.62rpx; line-height: 24.62rpx;
color: #818181; color: #818181;
} }
@ -177,7 +177,7 @@
} }
.font_6 { .font_6 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
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: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
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: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 35.41rpx; line-height: 35.41rpx;
} }
.text_2 { .text_2 {

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

@ -251,7 +251,7 @@
.text { .text {
color: #323232; color: #323232;
font-size: 33.75rpx; font-size: 33.75rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 31.18rpx; line-height: 31.18rpx;
} }
.image { .image {
@ -269,7 +269,7 @@
} }
.font { .font {
font-size: 30rpx; font-size: 30rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
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: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
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: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
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: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
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: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
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: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
color: #ffffff; color: #ffffff;
} }
.text_8 { .text_8 {

35
pages/home/home.vue
View File

@ -24,7 +24,7 @@
src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FKLEsLGUY-secondicon.png" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FKLEsLGUY-secondicon.png"
/> />
<view class="flex-col items-center flex-1 ml-7"> <view class="flex-col items-center flex-1 ml-7">
<text class="font_2">手作材包</text> <text class="font_2">技艺体验</text>
<text class="mt-14 font_3">朴物良社，匠心手作</text> <text class="mt-14 font_3">朴物良社，匠心手作</text>
</view> </view>
</view> </view>
@ -127,41 +127,36 @@ const showStop =()=>{
width: 100%; width: 100%;
overflow-y: auto; overflow-y: auto;
overflow-x: hidden; overflow-x: hidden;
height: 100%; height: 100vh;
} }
.section { .section {
background-image: url('https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FQfLHXSAU-feiyigongfangbeijin.png'); // height: 1415.63rpx;
background-size: 100% 100%;
background-repeat: no-repeat;
width: 750rpx;
height: 1415.63rpx;
} }
.image { .image {
opacity: 0.35; opacity: 0.35;
width: 96vw; width: 86vw;
height: 137.5vw; height: 127.5vw;
} }
.pos { .pos {
position: absolute; position: absolute;
left: 0; left: 0;
right: 30rpx;
top: 0; top: 0;
} }
.text { .text {
color: #C35C5D; color: #C35C5D;
font-size: 37.5rpx; font-size: 37.5rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 36.92rpx; line-height: 36.92rpx;
} }
.pos_6 { .pos_6 {
position: absolute; position: absolute;
left: 50%; left: 50%;
bottom: 435.51rpx; bottom: 30%;
transform: translateX(-50%); transform: translateX(-50%);
} }
.font { .font {
font-size: 168.75rpx; font-size: 168.75rpx;
font-family: ZhongShanFonts; font-family: Sun Yat-sen Hsingshu;
line-height: 202.5rpx; line-height: 202.5rpx;
color: #C35C5D; color: #C35C5D;
} }
@ -183,7 +178,7 @@ const showStop =()=>{
.pos_5 { .pos_5 {
position: absolute; position: absolute;
right: 114.81rpx; right: 114.81rpx;
bottom: 543.26rpx; top: 676.8rpx;
} }
.grid { .grid {
width: 646.88rpx; width: 646.88rpx;
@ -196,8 +191,10 @@ const showStop =()=>{
} }
.pos_7 { .pos_7 {
position: absolute; position: absolute;
left: 45rpx; left: 0;
top: 1059.38rpx; right: 0;
bottom: 50rpx;
margin: 0 auto;
} }
.grid-item { .grid-item {
padding: 22.5rpx 11.25rpx 22.5rpx 18.75rpx; padding: 22.5rpx 11.25rpx 22.5rpx 18.75rpx;
@ -213,9 +210,9 @@ const showStop =()=>{
} }
.font_2 { .font_2 {
font-size: 28.13rpx; font-size: 28.13rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 26.47rpx; line-height: 26.47rpx;
color: #000000; color: #323232;
} }
.text_2 { .text_2 {
line-height: 27.36rpx; line-height: 27.36rpx;
@ -246,7 +243,7 @@ const showStop =()=>{
} }
.font_3 { .font_3 {
font-size: 18.75rpx; font-size: 18.75rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 17.29rpx; line-height: 17.29rpx;
color: #faddde; color: #faddde;
} }

26
pages/login/login.vue
View File

@ -5,8 +5,10 @@
class="image" class="image"
src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FRAQucIRR-flower.png" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FRAQucIRR-flower.png"
/> />
<text class="font pos_2">泠</text> <text class="font pos_2">泠</text>
<text class="font pos_4">珑</text> <text class="font pos_4">珑</text>
<view class="section_3 pos_5"></view> <view class="section_3 pos_5"></view>
<view class="flex-col justify-start items-center text-wrapper pos_6" @click="login"> <view class="flex-col justify-start items-center text-wrapper pos_6" @click="login">
<text class="text">微信登陆</text> <text class="text">微信登陆</text>
@ -72,8 +74,8 @@ const loginUser = async ( code ) =>{
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.page { .page {
padding-left: 118.13rpx;
background-image: url('https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FQfLHXSAU-feiyigongfangbeijin.png'); background-image: url('https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FQfLHXSAU-feiyigongfangbeijin.png');
background-size: 100% 100%; background-size: 100% 100%;
background-repeat: no-repeat; background-repeat: no-repeat;
@ -81,18 +83,21 @@ const loginUser = async ( code ) =>{
overflow-y: auto; overflow-y: auto;
overflow-x: hidden; overflow-x: hidden;
height: 100vh; height: 100vh;
position: relative
} }
.section_2 { .section_2 {
margin-left: 256.88rpx; margin: 0 auto;
background-color: #9d2624; background-color: #9d2624;
width: 1.88rpx; width: 1.88rpx;
height: 388.13rpx; height: 25vh;
} }
.image { .image {
margin-top: 136.88rpx;
opacity: 0.35; opacity: 0.35;
width: 631.88rpx; width: 631.88rpx;
height: 907.5rpx; height: 907.5rpx;
position: absolute;
right: 0;
bottom: 0;
} }
.font { .font {
font-size: 240rpx; font-size: 240rpx;
@ -102,24 +107,25 @@ const loginUser = async ( code ) =>{
} }
.pos_2 { .pos_2 {
position: absolute; position: absolute;
right: 257.56rpx; right: 50%;
top: 462.19rpx; top: 30vh;
transform: translateX(50%);
} }
.pos_4 { .pos_4 {
position: absolute; position: absolute;
left: 50%; left: 50%;
bottom: 414.38rpx; bottom: 30vh;
transform: translateX(-50%); transform: translateX(-50%);
} }
.section_3 { .section_3 {
background-color: #9d2624; background-color: #9d2624;
width: 1.88rpx; width: 1.88rpx;
height: 418.13rpx; height: 25vh;
} }
.pos_5 { .pos_5 {
position: absolute; position: absolute;
left: 50%; left: 50%;
top: 1014.38rpx; bottom: 0;
transform: translateX(-50%); transform: translateX(-50%);
} }
.text-wrapper { .text-wrapper {
@ -136,7 +142,7 @@ const loginUser = async ( code ) =>{
.text { .text {
color: #000000; color: #000000;
font-size: 30rpx; font-size: 30rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 28.01rpx; line-height: 28.01rpx;
text-transform: capitalize; text-transform: capitalize;
} }

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

@ -318,7 +318,7 @@ const close1 = () => {
.text { .text {
color: #323232; color: #323232;
font-size: 37.5rpx; font-size: 37.5rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 35.21rpx; line-height: 35.21rpx;
} }
@ -351,14 +351,14 @@ const close1 = () => {
.font { .font {
font-size: 30rpx; font-size: 30rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 27.19rpx; line-height: 27.19rpx;
color: #323232; color: #323232;
} }
.font_2 { .font_2 {
font-size: 30rpx; font-size: 30rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 22.05rpx; line-height: 22.05rpx;
color: #323232; color: #323232;
} }
@ -388,7 +388,7 @@ const close1 = () => {
.text_2 { .text_2 {
color: #ffffff; color: #ffffff;
font-size: 33.75rpx; font-size: 33.75rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 31.22rpx; line-height: 31.22rpx;
} }
// .pop{ // .pop{

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: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 36.47rpx; line-height: 36.47rpx;
} }
@ -192,14 +192,14 @@
.font { .font {
font-size: 30rpx; font-size: 30rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 25.89rpx; line-height: 25.89rpx;
color: #323232; color: #323232;
} }
.font_2 { .font_2 {
font-size: 30rpx; font-size: 30rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
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: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
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: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 25.89rpx; line-height: 25.89rpx;
color: #323232; color: #323232;
} }
.font_2 { .font_2 {
font-size: 30rpx; font-size: 30rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
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: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
// 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: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 31.88rpx; line-height: 31.88rpx;
color: #818181; color: #818181;
} }

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

@ -150,7 +150,7 @@ const closePop = () =>{ //关闭弹窗方法
.text { .text {
color: #323232; color: #323232;
font-size: 37.5rpx; font-size: 37.5rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 36.47rpx; line-height: 36.47rpx;
} }
.pos_2 { .pos_2 {
@ -184,7 +184,7 @@ const closePop = () =>{ //关闭弹窗方法
} }
.font_2 { .font_2 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 24.62rpx; line-height: 24.62rpx;
color: #323232; color: #323232;
} }
@ -229,7 +229,7 @@ const closePop = () =>{ //关闭弹窗方法
.text_6 { .text_6 {
color: #ffffff; color: #ffffff;
font-size: 33.75rpx; font-size: 33.75rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 32.83rpx; line-height: 32.83rpx;
} }
.radius { .radius {

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

@ -1,5 +1,9 @@
<template> <template>
<view class="flex-col page"> <view class="flex-col page">
<image class="imgPos_1" src="./mh.png" />
<image class="imgPos_2" src="./hb.png" />
<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">
@ -278,6 +282,21 @@ const getMyUser = async () => {
overflow-y: hidden; overflow-y: hidden;
overflow-x: hidden; overflow-x: hidden;
height: 100vh; height: 100vh;
position: relative;
}
.imgPos_1 {
position: absolute;
top: -80rpx;
right: 0;
opacity: 0.3;
}
.imgPos_2 {
position: absolute;
bottom: -160rpx;
right: 0;
opacity: 0.3;
} }
.group { .group {

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: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 25.84rpx; line-height: 25.84rpx;
color: #e79ea1; color: #e79ea1;
} }

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

@ -7,8 +7,8 @@
:src="orderStatusObj.img" :src="orderStatusObj.img"
/> />
<view class="ml-6 flex-col items-start flex-1 self-start group"> <view class="ml-6 flex-col items-start flex-1 self-start group">
<text class="font text">{{ orderStatusObj.msg }}</text> <text class="font text" :style="{ marginTop: offset }">{{ orderStatusObj.msg }}</text>
<text class="mt-6 font_2 text_2">{{ orderStatusObj.tips }}</text> <text class="mt-6 font_2 text_2" v-if="isShowText">{{ orderStatusObj.tips }}</text>
</view> </view>
</view> </view>
<view class="flex-row items-center section_3 pos_2"> <view class="flex-row items-center section_3 pos_2">
@ -147,6 +147,8 @@
let loading = false; let loading = false;
let isLoading = ref(false) let isLoading = ref(false)
let isShow = ref(false) let isShow = ref(false)
const isShowText = ref(true)
const offset = ref('0')
onLoad((options) => { onLoad((options) => {
getFonts() getFonts()
@ -194,6 +196,8 @@
order.value.operationList = [false, true, false, false] order.value.operationList = [false, true, false, false]
orderStatusObj.value = stateList[3] orderStatusObj.value = stateList[3]
} }
isShowText.value = order.value.orderStatus !== '已退款' && order.value.orderStatus !== '交易关闭'
offset.value = isShowText.value ? '0' : '18rpx'
} }
@ -434,7 +438,7 @@ button::after{
} }
.font { .font {
font-size: 28.13rpx; font-size: 28.13rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 29.18rpx; line-height: 29.18rpx;
color: #323232; color: #323232;
} }
@ -444,7 +448,7 @@ button::after{
} }
.font_2 { .font_2 {
font-size: 24.38rpx; font-size: 24.38rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 29.18rpx; line-height: 29.18rpx;
color: #818181; color: #818181;
} }
@ -500,7 +504,7 @@ button::after{
} }
.font_3 { .font_3 {
font-size: 28.13rpx; font-size: 28.13rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 22.18rpx; line-height: 22.18rpx;
color: #323232; color: #323232;
} }
@ -509,7 +513,7 @@ button::after{
} }
.font_4 { .font_4 {
font-size: 28.13rpx; font-size: 28.13rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 18.73rpx; line-height: 18.73rpx;
color: #323232; color: #323232;
} }
@ -520,7 +524,7 @@ button::after{
} }
.font_5 { .font_5 {
font-size: 28.13rpx; font-size: 28.13rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 29.18rpx; line-height: 29.18rpx;
color: #818181; color: #818181;
} }
@ -529,7 +533,7 @@ button::after{
} }
.font_6 { .font_6 {
font-size: 28.13rpx; font-size: 28.13rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 20.79rpx; line-height: 20.79rpx;
color: #323232; color: #323232;
} }
@ -556,7 +560,7 @@ button::after{
.text_12 { .text_12 {
color: #ffaaa5; color: #ffaaa5;
font-size: 28.13rpx; font-size: 28.13rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
font-weight: 700; font-weight: 700;
line-height: 20.76rpx; line-height: 20.76rpx;
} }
@ -568,7 +572,7 @@ button::after{
} }
.font_7 { .font_7 {
font-size: 28.13rpx; font-size: 28.13rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 26.47rpx; line-height: 26.47rpx;
color: #818181; color: #818181;
} }
@ -617,7 +621,7 @@ button::after{
} }
.font_8 { .font_8 {
font-size: 22.5rpx; font-size: 22.5rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 20.83rpx; line-height: 20.83rpx;
color: #323232; color: #323232;
} }
@ -664,7 +668,7 @@ button::after{
} }
.font_9 { .font_9 {
font-size: 33.75rpx; font-size: 33.75rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
color: #ffaaa5; color: #ffaaa5;
} }
.text_22 { .text_22 {

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

@ -584,7 +584,7 @@
.appointmentDate { .appointmentDate {
margin-top: 20.63rpx; margin-top: 20.63rpx;
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 24.51rpx; line-height: 24.51rpx;
color: #818181; color: #818181;
margin-left: 3.75rpx; margin-left: 3.75rpx;
@ -592,7 +592,7 @@
.timeSlot { .timeSlot {
margin-top: 20.63rpx; margin-top: 20.63rpx;
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 17.53rpx; line-height: 17.53rpx;
color: #818181; color: #818181;
margin-left: 3.75rpx; margin-left: 3.75rpx;
@ -645,7 +645,7 @@
} }
.font { .font {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 25.84rpx; line-height: 25.84rpx;
color: #ffaaa5; color: #ffaaa5;
} }
@ -658,7 +658,7 @@
} }
.font_2 { .font_2 {
font-size: 30rpx; font-size: 30rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 29.18rpx; line-height: 29.18rpx;
color: #323232; color: #323232;
} }
@ -700,7 +700,7 @@
} }
.font_3 { .font_3 {
font-size: 30rpx; font-size: 30rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 18.73rpx; line-height: 18.73rpx;
color: #ffaaa5; color: #ffaaa5;
} }
@ -717,13 +717,13 @@
} }
.font_4 { .font_4 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
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: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 18.73rpx; line-height: 18.73rpx;
color: #818181; color: #818181;
} }
@ -746,7 +746,7 @@
} }
.font_6 { .font_6 {
font-size: 30rpx; font-size: 30rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 22.18rpx; line-height: 22.18rpx;
color: #323232; color: #323232;
} }
@ -755,7 +755,7 @@
} }
.font_7 { .font_7 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 18.73rpx; line-height: 18.73rpx;
color: #323232; color: #323232;
} }
@ -780,7 +780,7 @@
} }
.font_8 { .font_8 {
font-size: 30rpx; font-size: 30rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 25.84rpx; line-height: 25.84rpx;
color: #000000; color: #000000;
} }
@ -798,7 +798,7 @@
} }
.font_9 { .font_9 {
font-size: 30rpx; font-size: 30rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 22.18rpx; line-height: 22.18rpx;
font-weight: 600; font-weight: 600;
color: #ffaaa5; color: #ffaaa5;
@ -823,7 +823,7 @@
} }
.font_10 { .font_10 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 25.84rpx; line-height: 25.84rpx;
color: #e79ea1; color: #e79ea1;
} }
@ -836,7 +836,7 @@
} }
.font_11 { .font_11 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 25.84rpx; line-height: 25.84rpx;
color: #ffffff; color: #ffffff;
} }

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

@ -380,7 +380,7 @@ button::after{
} }
.font { .font {
font-size: 30rpx; font-size: 30rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 29.18rpx; line-height: 29.18rpx;
color: #323232; color: #323232;
} }
@ -391,7 +391,7 @@ button::after{
} }
.font_2 { .font_2 {
font-size: 24.38rpx; font-size: 24.38rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
} }
.text_2 { .text_2 {
color: #6b6e72; color: #6b6e72;
@ -414,7 +414,7 @@ button::after{
} }
.font_3 { .font_3 {
font-size: 30rpx; font-size: 30rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 24.51rpx; line-height: 24.51rpx;
color: #818181; color: #818181;
} }
@ -450,7 +450,7 @@ button::after{
} }
.font_4 { .font_4 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 24.51rpx; line-height: 24.51rpx;
color: #818181; color: #818181;
} }
@ -460,7 +460,7 @@ button::after{
} }
.font_5 { .font_5 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 17.53rpx; line-height: 17.53rpx;
color: #818181; color: #818181;
} }
@ -470,7 +470,7 @@ button::after{
} }
.font_6 { .font_6 {
font-size: 30rpx; font-size: 30rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 21.41rpx; line-height: 21.41rpx;
color: #323232; color: #323232;
} }
@ -500,7 +500,7 @@ button::after{
} }
.font_7 { .font_7 {
font-size: 30rpx; font-size: 30rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 29.18rpx; line-height: 29.18rpx;
color: #818181; color: #818181;
} }
@ -532,7 +532,7 @@ button::after{
.text_13 { .text_13 {
color: #ffaaa5; color: #ffaaa5;
font-size: 28.13rpx; font-size: 28.13rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
font-weight: 700; font-weight: 700;
line-height: 20.76rpx; line-height: 20.76rpx;
} }
@ -544,7 +544,7 @@ button::after{
} }
.font_8 { .font_8 {
font-size: 30rpx; font-size: 30rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 26.47rpx; line-height: 26.47rpx;
color: #818181; color: #818181;
} }
@ -572,7 +572,7 @@ button::after{
} }
.font_9 { .font_9 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
color: #323232; color: #323232;
} }
.text_17 { .text_17 {
@ -601,7 +601,7 @@ button::after{
.text_20 { .text_20 {
color: #323232; color: #323232;
font-size: 22.5rpx; font-size: 22.5rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 20.83rpx; line-height: 20.83rpx;
} }
.group_9 { .group_9 {
@ -634,7 +634,7 @@ button::after{
} }
.font_10 { .font_10 {
font-size: 33.75rpx; font-size: 33.75rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 24.51rpx; line-height: 24.51rpx;
color: #ffaaa5; color: #ffaaa5;
} }

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

@ -10,10 +10,10 @@
</view> </view>
<view class="flex-col self-stretch list"> <view class="flex-col self-stretch list">
<radio-group @change="radioChange"> <radio-group @change="radioChange">
<view class="flex-col list-item mt-10" v-for="(item, index) in addressList" :key="index"> <view class="flex-col list-item mt-10" v-for="(item, index) in addressList" :key="item.id">
<view class="flex-row justify-between items-center self-stretch"> <view class="flex-row justify-between items-center self-stretch">
<view class="flex-row items-center"> <view class="flex-row items-center">
<radio color="#E79EA1" :value="index" :checked="item.isDefault === 1"></radio> <radio color="#E79EA1" :value="index"></radio>
<text class="font ml-8">{{ item.name }}</text> <text class="font ml-8">{{ item.name }}</text>
<text class="font_2 ml-8">{{ item.phone }}</text> <text class="font_2 ml-8">{{ item.phone }}</text>
</view> </view>
@ -41,7 +41,7 @@
</template> </template>
<script setup> <script setup>
import {nextTick, onMounted , ref } from 'vue' import {nextTick, onMounted , onUnmounted, ref } from 'vue'
import emitter from '../../../utils/emitter' import emitter from '../../../utils/emitter'
import { testUrl , baseUrl , suiUrl } from '../../../api/request'; import { testUrl , baseUrl , suiUrl } from '../../../api/request';
import { onShow, onLoad } from "@dcloudio/uni-app"; import { onShow, onLoad } from "@dcloudio/uni-app";
@ -50,16 +50,30 @@ const addressList = ref([])
const userInfo = wx.getStorageSync('userInfo') const userInfo = wx.getStorageSync('userInfo')
//页面跳转回来之后，刷新一次地址列表 onShow就是在页面显示后执行 //页面跳转回来之后，刷新一次地址列表 onShow就是在页面显示后执行
const updateAddresssListHandler = () => {
getAddressList()
}
onLoad(() => { onLoad(() => {
getFonts() getFonts()
}) })
onMounted(() => { onMounted(() => {
getAddressList() getAddressList()
emitter.on('updateAddressList', updateAddresssListHandler)
}) })
onShow(() => {
getAddressList()
onUnmounted(() => {
emitter.off('updateAddressList', updateAddresssListHandler)
}) })
//根据登录用户获取地址列表 //根据登录用户获取地址列表
const getAddressList = async () =>{ const getAddressList = async () =>{
const res = await uni.request({ const res = await uni.request({
@ -75,8 +89,9 @@ const getAddressList = async () =>{
//当选项发生改变时 //当选项发生改变时
const radioChange = ( event ) => { const radioChange = ( event ) => {
const index = event.detail.value const index = event.detail.value
console.log(index)
const temp = addressList.value[index] //通过emitter传入暂时的地址信息 const temp = addressList.value[index] //通过emitter传入暂时的地址信息
// console.log('temp',temp); emitter.emit('getAddressInfo', temp)
emitter.emit('addressInfo', temp) emitter.emit('addressInfo', temp)
emitter.emit('closeAddress') emitter.emit('closeAddress')
} }
@ -117,8 +132,9 @@ const deleteAddress = async( id ) =>{
}) })
// console.log(res.data); // console.log(res.data);
if( res.data.code === 1 ) { if( res.data.code === 1 ) {
getAddressList() await getAddressList()
// console.log("删除地址成功"); emitter.emit('delAddressById', id)
emitter.emit('delMyAddress', id)
} }
} }
//关闭按钮 //关闭按钮
@ -163,7 +179,7 @@ const closeWindow =()=> {
.text { .text {
color: #323232; color: #323232;
font-size: 37.41rpx; font-size: 37.41rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 35.95rpx; line-height: 35.95rpx;
} }
.image { .image {
@ -199,13 +215,13 @@ const closeWindow =()=> {
} }
.font { .font {
font-size: 29.93rpx; font-size: 29.93rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
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: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 19.99rpx; line-height: 19.99rpx;
color: #323232; color: #323232;
} }
@ -218,7 +234,7 @@ const closeWindow =()=> {
} }
.font_3 { .font_3 {
font-size: 26.18rpx; font-size: 26.18rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 31.8rpx; line-height: 31.8rpx;
color: #818181; color: #818181;
} }
@ -236,7 +252,7 @@ const closeWindow =()=> {
.text_3 { .text_3 {
color: #ffffff; color: #ffffff;
font-size: 33.67rpx; font-size: 33.67rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 31.57rpx; line-height: 31.57rpx;
} }
@import url(../../../common/css/global.css); @import url(../../../common/css/global.css);

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

@ -14,10 +14,10 @@
<view <view
class="flex-row justify-between items-center section list-item mt-8" class="flex-row justify-between items-center section list-item mt-8"
v-for="(item, index) in ContactArr" v-for="(item, index) in ContactArr"
:key="index" :key="item.id"
> >
<view class="flex-row items-center"> <view class="flex-row items-center">
<radio color="#E79EA1" :value="index" :checked="item.isDefault === 1"></radio> <radio color="#E79EA1" :value="index"></radio>
<text class="font ml-9">{{ item.name }}</text> <text class="font ml-9">{{ item.name }}</text>
<text class="font_2 ml-9">{{ item.phone }}</text> <text class="font_2 ml-9">{{ item.phone }}</text>
</view> </view>
@ -40,7 +40,7 @@
<text class="text_2">添加联系人</text> <text class="text_2">添加联系人</text>
</view> </view>
</view> </view>
<uni-popup ref="popup" background-color="#fff" :mask-click="false"> <uni-popup ref="popup" background-color="#fff">
<view class="popup-content"> <view class="popup-content">
<contactPopVue></contactPopVue> <contactPopVue></contactPopVue>
</view> </view>
@ -81,9 +81,6 @@
onShow(()=>{
getContactInfo() //获取联系人信息
})
onLoad(()=>{ onLoad(()=>{
getFonts() getFonts()
getContactInfo() getContactInfo()
@ -96,7 +93,6 @@
cookie: wx.getStorageSync('cookie') cookie: wx.getStorageSync('cookie')
} }
}) })
// console.log('联系人信息---->', res.data.data);
if (res.data.code === 1) { if (res.data.code === 1) {
ContactArr.value = res.data.data ContactArr.value = res.data.data
} else { } else {
@ -117,6 +113,7 @@
}) })
if (res.data.code === 1) { if (res.data.code === 1) {
getContactInfo() getContactInfo()
emitter.emit('delContactById', cid)
} }
} }
const showModal = (cid) => { //提示弹窗 const showModal = (cid) => { //提示弹窗
@ -159,6 +156,9 @@
const closeWindow =()=> { //关闭新增/更新联系人弹窗 const closeWindow =()=> { //关闭新增/更新联系人弹窗
emitter.emit('close') emitter.emit('close')
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@ -192,7 +192,7 @@
margin-bottom: 2.53rpx; margin-bottom: 2.53rpx;
color: #323232; color: #323232;
font-size: 37.5rpx; font-size: 37.5rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 36.47rpx; line-height: 36.47rpx;
} }
.image { .image {
@ -217,13 +217,13 @@
} }
.font { .font {
font-size: 30rpx; font-size: 30rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 25.89rpx; line-height: 25.89rpx;
color: #323232; color: #323232;
} }
.font_2 { .font_2 {
font-size: 30rpx; font-size: 30rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 20.04rpx; line-height: 20.04rpx;
color: #323232; color: #323232;
} }
@ -248,7 +248,7 @@
.text_2 { .text_2 {
color: #ffffff; color: #ffffff;
font-size: 33.75rpx; font-size: 33.75rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 32.83rpx; line-height: 32.83rpx;
} }
.radius { .radius {

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

@ -2,30 +2,8 @@
<view class="flex-col justify-start relative page"> <view class="flex-col justify-start relative page">
<view class="flex-col group_1"> <view class="flex-col group_1">
<!-- 地址信息 --> <!-- 地址信息 -->
<view class="flex-col section_2"> <view @click="loadPop" :style="{ pointerEvents: isLoading ? 'none' : 'auto' }">
<view class="flex-row justify-between"> <addressSelectedVue></addressSelectedVue>
<view class="flex-col">
<text class="self-center font text my-text-wrap">{{ addressRealInfo.region }}</text>
<view class="flex-row items-center self-stretch">
<image
class="shrink-0 image"
src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FXZHjzkRH-dingwei.png"
/>
<text class="font_2 text_2 ml-8 my-text-wrap">{{ addressRealInfo.detailAddress }}</text>
</view>
</view>
<view class="flex-row self-start group" @click="loadPop" :style="{ pointerEvents: isLoading ? 'none' : 'auto' }">
<text class="font_3 text_3">更换地址</text>
<image
class="shrink-0 image_2"
src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FfhDZdkOK-rightpink.png"
/>
</view>
</view>
<view class="flex-row items-center group_2 mt-4">
<text class="font_2 text_4">{{ addressRealInfo.name }}</text>
<text class="font_2 text_5">手机:{{ addressRealInfo.phone }}</text>
</view>
</view> </view>
<!-- 商品信息 --> <!-- 商品信息 -->
<view class="flex-col section_3"> <view class="flex-col section_3">
@ -66,16 +44,7 @@
</view> </view>
</view> </view>
</view> </view>
<!-- <view class="flex-row items-center self-center mt-48" style="margin-top: 56rpx;">
<view class="group_9">
<text class="font_2 text_12">注：购买商品均视为同意</text>
<text class="font_2 text_13">用户须知</text>
</view>
<image
class="shrink-0 image_8 ml-2"
src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FXjPffNQe-question.png"
/>
</view> -->
</view> </view>
<view class="flex-col section_5"> <view class="flex-col section_5">
<view class="flex-row justify-between items-center group_14"> <view class="flex-row justify-between items-center group_14">
@ -162,15 +131,12 @@ import couponPopupVue from '../../coupon/component/couponPopup.vue';
import { stateMap } from '../../../common/global'; import { stateMap } from '../../../common/global';
import * as math from 'mathjs' import * as math from 'mathjs'
import { dealResult } from '../../../common/globalFunction'; import { dealResult } from '../../../common/globalFunction';
import addressSelectedVue from '../../Shopping-cart/component/addressSelected.vue';
//一些暂时变量 //一些暂时变量
const sumprice = ref(0) //总价格 const sumprice = ref(0) //总价格
//11.4开发 不应该删掉的 //11.4开发 不应该删掉的
const popup = ref(null) //弹窗对象 const popup = ref(null) //弹窗对象
const addressRealInfo = ref({ const addressRealInfo = ref({})
phone: '',
region: '请选择',
detailAddress: '地址'
}) //地址页 选择地址传过来的值 进入页面首先是默认地址，若无默认地址，则为空
const productArr = ref([]) //商品对象 const productArr = ref([]) //商品对象
const labelList = ref([]) //老套路，商品标签 const labelList = ref([]) //老套路，商品标签
const userInfo = wx.getStorageSync('userInfo') //用户信息 const userInfo = wx.getStorageSync('userInfo') //用户信息
@ -189,8 +155,7 @@ const coupon = ref(null)
const conditionAmount = ref(0) const conditionAmount = ref(0)
const closeAddressHandler = () => {
const closeHandler = () => {
nextTick(() => { nextTick(() => {
if (popup.value) { if (popup.value) {
popup.value.close() popup.value.close()
@ -202,6 +167,15 @@ const addressInfoHandler = (val) => {
addressRealInfo.value = val addressRealInfo.value = val
} }
const delMyAddressHandler = (val) => {
if (addressRealInfo.value.id === val) {
addressRealInfo.value = {}
}
}
const closeCouponHandler = () => { const closeCouponHandler = () => {
nextTick(() => { nextTick(() => {
if (coupon.value) { if (coupon.value) {
@ -228,8 +202,9 @@ const getCouponObjHandler = (val) => {
} }
onMounted(() => { onMounted(() => {
getDefaultAddress()
//将关闭弹窗方法传入弹窗页面，绑定弹窗按钮可关闭弹窗 //将关闭弹窗方法传入弹窗页面，绑定弹窗按钮可关闭弹窗
emitter.on('closeAddress', closeHandler) emitter.on('closeAddress', closeAddressHandler)
//获取地址信息 //获取地址信息
emitter.on('addressInfo', addressInfoHandler) emitter.on('addressInfo', addressInfoHandler)
@ -239,11 +214,13 @@ onMounted(() => {
emitter.on('getCouponObj', getCouponObjHandler) emitter.on('getCouponObj', getCouponObjHandler)
emitter.on('delMyAddress', delMyAddressHandler)
}) })
onUnmounted(() => { onUnmounted(() => {
//将关闭弹窗方法传入弹窗页面，绑定弹窗按钮可关闭弹窗 //将关闭弹窗方法传入弹窗页面，绑定弹窗按钮可关闭弹窗
emitter.off('closeAddress', closeHandler) emitter.off('closeAddress', closeAddressHandler)
//获取地址信息 //获取地址信息
emitter.off('addressInfo', addressInfoHandler) emitter.off('addressInfo', addressInfoHandler)
@ -252,22 +229,18 @@ onUnmounted(() => {
emitter.off('cancelCoupon', cancelCouponHandler) emitter.off('cancelCoupon', cancelCouponHandler)
emitter.off('getCouponObj', getCouponObjHandler) emitter.off('getCouponObj', getCouponObjHandler)
emitter.off('delMyAddress', delMyAddressHandler)
}) })
onLoad( async (options)=>{ onLoad( async (options)=>{
getFonts() getFonts()
totalInfo.value = JSON.parse(options.cartInfo) totalInfo.value = JSON.parse(options.cartInfo)
console.log('options.cartInfo-->',JSON.parse(options.cartInfo));
console.log('totalInfo.value-->',toRaw(totalInfo.value) );
await getProduct() await getProduct()
await getMyCouponList() await getMyCouponList()
}) })
onShow(()=>{
userInfo.value = wx.getStorageSync('userInfo') //从微信缓存中获取用户信息
getDefaultAddress()
// computed()
})
//加载弹窗。默认从底部弹出 //加载弹窗。默认从底部弹出
const loadPop =() =>{ const loadPop =() =>{
@ -283,11 +256,13 @@ const getDefaultAddress = async () =>{
} }
}) })
//根据for循环遍历默认地址 //根据for循环遍历默认地址
for(let key in res.data.data) { let addArr = res.data.data
if(res.data.data[key].isDefault === 1) { for(let key in addArr) {
addressRealInfo.value = res.data.data[key] if(addArr[key].isDefault === 1) {
addressRealInfo.value = addArr[key]
} }
} }
emitter.emit('getAddressInfo', addressRealInfo.value)
} }
const createOrder = async () => { //购物车的购买方法 const createOrder = async () => { //购物车的购买方法
console.log('地址信息-->',addressRealInfo.value); console.log('地址信息-->',addressRealInfo.value);
@ -303,8 +278,7 @@ const createOrder = async () => { //购物车的购买方法
orderType: productArr.value[0].cartGoodVO.type === '服务类' ? 'service' : 'product', orderType: productArr.value[0].cartGoodVO.type === '服务类' ? 'service' : 'product',
userName: userInfo.userName, userName: userInfo.userName,
addressId: addressRealInfo.value.id, //地址信息id addressId: addressRealInfo.value.id, //地址信息id
contactsId: useCouponId.value, //联系人信息id couponId: useCouponId.value, //优惠卷id
couponId: null, //优惠卷id
note: note.value, note: note.value,
cartOrderItemAddRequestList: toRaw(postCartArr.value) cartOrderItemAddRequestList: toRaw(postCartArr.value)
} }
@ -586,7 +560,7 @@ const wxPay = async( oid )=> { //传入订单id
} }
.font { .font {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 25.54rpx; line-height: 25.54rpx;
color: #323232; color: #323232;
} }
@ -600,7 +574,7 @@ const wxPay = async( oid )=> { //传入订单id
} }
.font_2 { .font_2 {
font-size: 22.5rpx; font-size: 22.5rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 22.54rpx; line-height: 22.54rpx;
color: #818181; color: #818181;
} }
@ -612,7 +586,7 @@ const wxPay = async( oid )=> { //传入订单id
} }
.font_3 { .font_3 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 25.54rpx; line-height: 25.54rpx;
color: #ffaaa5; color: #ffaaa5;
} }
@ -665,13 +639,13 @@ const wxPay = async( oid )=> { //传入订单id
} }
.font_4 { .font_4 {
font-size: 33.75rpx; font-size: 33.75rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
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: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 17.23rpx; line-height: 17.23rpx;
color: #323232; color: #323232;
} }
@ -691,7 +665,7 @@ const wxPay = async( oid )=> { //传入订单id
} }
.font_5 { .font_5 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 17.23rpx; line-height: 17.23rpx;
color: #ffffff; color: #ffffff;
} }
@ -726,7 +700,7 @@ const wxPay = async( oid )=> { //传入订单id
} }
.font_7 { .font_7 {
font-size: 30rpx; font-size: 30rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 29.18rpx; line-height: 29.18rpx;
color: #323232; color: #323232;
} }
@ -735,7 +709,7 @@ const wxPay = async( oid )=> { //传入订单id
} }
.font_8 { .font_8 {
font-size: 30rpx; font-size: 30rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 29.18rpx; line-height: 29.18rpx;
color: #818181; color: #818181;
} }
@ -745,7 +719,7 @@ const wxPay = async( oid )=> { //传入订单id
} }
.font_9 { .font_9 {
font-size: 30rpx; font-size: 30rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 20.04rpx; line-height: 20.04rpx;
color: #323232; color: #323232;
} }
@ -816,21 +790,21 @@ 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: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 26.49rpx; line-height: 26.49rpx;
} }
.text_22 { .text_22 {
margin-left: 28.5rpx; margin-left: 28.5rpx;
color: #ffaaa5; color: #ffaaa5;
font-size: 37.5rpx; font-size: 37.5rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
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: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
font-weight: 700; font-weight: 700;
line-height: 22.05rpx; line-height: 22.05rpx;
} }

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

@ -562,7 +562,7 @@ import { dealResult } from '../../../common/globalFunction';
.text { .text {
color: #818181; color: #818181;
font-size: 37.5rpx; font-size: 37.5rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 32.38rpx; line-height: 32.38rpx;
} }
.group { .group {
@ -575,7 +575,7 @@ import { dealResult } from '../../../common/globalFunction';
} }
.font { .font {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 25.54rpx; line-height: 25.54rpx;
color: #323232; color: #323232;
} }
@ -609,7 +609,7 @@ import { dealResult } from '../../../common/globalFunction';
} }
.font_2 { .font_2 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 25.54rpx; line-height: 25.54rpx;
color: #818181; color: #818181;
} }
@ -619,7 +619,7 @@ import { dealResult } from '../../../common/globalFunction';
} }
.font_3 { .font_3 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 17.53rpx; line-height: 17.53rpx;
color: #818181; color: #818181;
} }
@ -632,13 +632,13 @@ import { dealResult } from '../../../common/globalFunction';
} }
.font_5 { .font_5 {
font-size: 33.75rpx; font-size: 33.75rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
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: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 17.53rpx; line-height: 17.53rpx;
color: #323232; color: #323232;
} }
@ -659,7 +659,7 @@ import { dealResult } from '../../../common/globalFunction';
} }
.font_4 { .font_4 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 17.53rpx; line-height: 17.53rpx;
color: #ffffff; color: #ffffff;
} }
@ -680,7 +680,7 @@ import { dealResult } from '../../../common/globalFunction';
} }
.font_7 { .font_7 {
font-size: 22.5rpx; font-size: 22.5rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 22.54rpx; line-height: 22.54rpx;
color: #818181; color: #818181;
} }
@ -703,7 +703,7 @@ import { dealResult } from '../../../common/globalFunction';
} }
.font_8 { .font_8 {
font-size: 30rpx; font-size: 30rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 29.18rpx; line-height: 29.18rpx;
color: #323232; color: #323232;
} }
@ -712,7 +712,7 @@ import { dealResult } from '../../../common/globalFunction';
} }
.font_9 { .font_9 {
font-size: 30rpx; font-size: 30rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 29.18rpx; line-height: 29.18rpx;
color: #818181; color: #818181;
} }
@ -725,7 +725,7 @@ import { dealResult } from '../../../common/globalFunction';
} }
.font_10 { .font_10 {
font-size: 30rpx; font-size: 30rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 20.04rpx; line-height: 20.04rpx;
color: #323232; color: #323232;
} }
@ -781,21 +781,21 @@ import { dealResult } from '../../../common/globalFunction';
margin-left: -119.06rpx; margin-left: -119.06rpx;
color: #000000; color: #000000;
font-size: 30rpx; font-size: 30rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
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: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
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: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
font-weight: 700; font-weight: 700;
line-height: 22.05rpx; line-height: 22.05rpx;
} }

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

@ -3,30 +3,8 @@
<view class="flex-col justify-start relative page"> <view class="flex-col justify-start relative page">
<view class="flex-col group_1"> <view class="flex-col group_1">
<!-- 地址信息 --> <!-- 地址信息 -->
<view class="flex-col section_2" @click="loadPop" :style="{ pointerEvents: isLoading ? 'none' : 'auto' }"> <view @click="loadPop" :style="{ pointerEvents: isLoading ? 'none' : 'auto' }">
<view class="flex-row justify-between"> <addressSelectedVue></addressSelectedVue>
<view class="flex-col">
<text class="self-center font text my-text-wrap">{{ addressRealInfo.region }}</text>
<view class="flex-row items-center self-stretch">
<image
class="shrink-0 image"
src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FXZHjzkRH-dingwei.png"
/>
<text class="font_2 text_2 ml-8 my-text-wrap">{{ addressRealInfo.detailAddress }}</text>
</view>
</view>
<view class="flex-row self-start group">
<text class="font_3 text_3">更换地址</text>
<image
class="shrink-0 image_2"
src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FfhDZdkOK-rightpink.png"
/>
</view>
</view>
<view class="flex-row items-center group_2 mt-4">
<text class="font_2 text_4">{{ addressRealInfo.name }}</text>
<text class="font_2 text_5">手机:{{ addressRealInfo.phone }}</text>
</view>
</view> </view>
<!-- 商品信息 --> <!-- 商品信息 -->
<view class="flex-col section_3"> <view class="flex-col section_3">
@ -37,8 +15,8 @@
class="shrink-0 image_3 image_4" class="shrink-0 image_3 image_4"
:src="productObject.goodImg.split(';')[0]" :src="productObject.goodImg.split(';')[0]"
/> />
<view class="flex-col flex-1 ml-17"> <view class="flex-col ml-17" style="position: relative;">
<view class="flex-row"> <view class="flex-row" style="position: absolute; top: -35rpx;">
<text class="font">{{ productObject.name }}</text> <text class="font">{{ productObject.name }}</text>
<text class="font text_1">【{{ productObject.type }}】</text> <text class="font text_1">【{{ productObject.type }}】</text>
</view> </view>
@ -67,16 +45,6 @@
</view> </view>
</view> </view>
</view> </view>
<!-- <view class="flex-row items-center self-center mt-48" style="margin-top: 56rpx;">
<view class="group_9">
<text class="font_2 text_12">注：购买商品均视为同意</text>
<text class="font_2 text_13">用户须知</text>
</view>
<image
class="shrink-0 image_8 ml-2"
src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FXjPffNQe-question.png"
/>
</view> -->
</view> </view>
<view class="flex-col section_5"> <view class="flex-col section_5">
<view class="flex-row justify-between items-center group_14"> <view class="flex-row justify-between items-center group_14">
@ -155,7 +123,7 @@
</template> </template>
<script setup lang="ts"> <script setup>
import {nextTick, onMounted, onUnmounted, ref, toRaw} from 'vue' import {nextTick, onMounted, onUnmounted, ref, toRaw} from 'vue'
import emitter from '../../../utils/emitter' import emitter from '../../../utils/emitter'
import { onLoad , onShow } from "@dcloudio/uni-app"; import { onLoad , onShow } from "@dcloudio/uni-app";
@ -164,17 +132,15 @@ import { baseUrl } from '../../../api/request';
import addressComponentVue from '../component/addressComponent.vue';//导入组件 import addressComponentVue from '../component/addressComponent.vue';//导入组件
import couponPopupVue from '../../coupon/component/couponPopup.vue'; import couponPopupVue from '../../coupon/component/couponPopup.vue';
import { stateMap } from '../../../common/global'; import { stateMap } from '../../../common/global';
import { myOrderUrl } from '../../../common/globalImagesUrl';
import * as math from 'mathjs' import * as math from 'mathjs'
import { dealResult } from '../../../common/globalFunction'; import { JudgeIsNullity, dealResult } from '../../../common/globalFunction';
import addressSelectedVue from '../../Shopping-cart/component/addressSelected.vue';
//一些暂时变量 //一些暂时变量
const sumprice = ref(0) //总价格 const sumprice = ref(0) //总价格
//11.4开发 不应该删掉的 //11.4开发 不应该删掉的
const popup = ref(null) //弹窗对象 const popup = ref(null) //弹窗对象
const addressRealInfo = ref({ const addressRealInfo = ref({}) //地址页 选择地址传过来的值 进入页面首先是默认地址，若无默认地址，则为空
phone: '',
region: '请选择',
detailAddress: '地址'
}) //地址页 选择地址传过来的值 进入页面首先是默认地址，若无默认地址，则为空
const productObject = ref({}) //商品对象 const productObject = ref({}) //商品对象
const labelList = ref([]) //老套路，商品标签 const labelList = ref([]) //老套路，商品标签
const userInfo = wx.getStorageSync('userInfo') //用户信息 const userInfo = wx.getStorageSync('userInfo') //用户信息
@ -197,9 +163,6 @@ const cookie = wx.getStorageSync("cookie") //请求头
const useCouponId = ref(null) const useCouponId = ref(null)
const textColor = ref('') const textColor = ref('')
const closeAddressHandler = () => { const closeAddressHandler = () => {
nextTick(() => { nextTick(() => {
if (popup.value) { if (popup.value) {
@ -220,6 +183,13 @@ const addressInfoHandler = (val) => {
addressRealInfo.value = val addressRealInfo.value = val
} }
const delMyAddressHandler = (val) => {
if (addressRealInfo.value.id === val) {
addressRealInfo.value = {}
}
}
const cancelCouponHandler = () => { const cancelCouponHandler = () => {
templateString.value = myCouponList.value.length + '张优惠券可用' templateString.value = myCouponList.value.length + '张优惠券可用'
sfAmount.value = sumprice.value sfAmount.value = sumprice.value
@ -238,9 +208,12 @@ const getCouponObjHandler = (val) => {
} }
onMounted(() => { onMounted(() => {
getDefaultAddress()
// 将关闭弹窗方法传入弹窗页面，绑定弹窗按钮可关闭弹窗 // 将关闭弹窗方法传入弹窗页面，绑定弹窗按钮可关闭弹窗
emitter.on('closeAddress', closeAddressHandler) emitter.on('closeAddress', closeAddressHandler)
emitter.on('closeCoupon', closeCouponHandler) emitter.on('closeCoupon', closeCouponHandler)
emitter.on('addressInfo', addressInfoHandler) emitter.on('addressInfo', addressInfoHandler)
@ -248,10 +221,14 @@ const getCouponObjHandler = (val) => {
emitter.on('cancelCoupon', cancelCouponHandler) emitter.on('cancelCoupon', cancelCouponHandler)
emitter.on('getCouponObj', getCouponObjHandler) emitter.on('getCouponObj', getCouponObjHandler)
emitter.on('delMyAddress', delMyAddressHandler)
}) })
onUnmounted(() => { onUnmounted(() => {
emitter.off('closeAddress', closeAddressHandler) emitter.off('closeAddress', closeAddressHandler)
emitter.off('closeCoupon', closeCouponHandler) emitter.off('closeCoupon', closeCouponHandler)
emitter.off('addressInfo', addressInfoHandler) emitter.off('addressInfo', addressInfoHandler)
@ -259,6 +236,8 @@ const getCouponObjHandler = (val) => {
emitter.off('cancelCoupon', cancelCouponHandler) emitter.off('cancelCoupon', cancelCouponHandler)
emitter.off('getCouponObj', getCouponObjHandler) emitter.off('getCouponObj', getCouponObjHandler)
emitter.off('delMyAddress', delMyAddressHandler)
}) })
onLoad( async (options)=>{ onLoad( async (options)=>{
@ -267,10 +246,7 @@ const getCouponObjHandler = (val) => {
await getProduct() await getProduct()
await getMyCouponList() await getMyCouponList()
}) })
onShow(()=>{
userInfo.value = wx.getStorageSync('userInfo') //从微信缓存中获取用户信息
getDefaultAddress()
})
@ -399,10 +375,10 @@ const getCouponObjHandler = (val) => {
//加载弹窗。默认从底部弹出 //加载弹窗。默认从底部弹出
const loadPop =() =>{ const loadPop =() =>{
popup.value.open('bottom') popup.value.open('bottom')
} }
//获取用户默认地址 //获取用户默认地址
const getDefaultAddress = async () =>{ const getDefaultAddress = async () =>{
@ -413,13 +389,13 @@ const getDefaultAddress = async () =>{
cookie: wx.getStorageSync('cookie') cookie: wx.getStorageSync('cookie')
} }
}) })
//根据for循环遍历默认地址 let addArr = res.data.data
for(let key in res.data.data) { for(let key in addArr) {
if(res.data.data[key].isDefault === 1) { if(addArr[key].isDefault === 1) {
addressRealInfo.value = res.data.data[key] addressRealInfo.value = addArr[key]
} }
} }
console.log('==================>', addressRealInfo.value) emitter.emit('getAddressInfo', addressRealInfo.value)
} }
const createOrder = async () => { //创建单个商品订单的方法 const createOrder = async () => { //创建单个商品订单的方法
console.log('地址信息-->',addressRealInfo.value); console.log('地址信息-->',addressRealInfo.value);
@ -435,7 +411,6 @@ const createOrder = async () => { //创建单个商品订单的方法
orderType: productObject.value.type === '服务类' ? 'service' : 'product', orderType: productObject.value.type === '服务类' ? 'service' : 'product',
userName: userInfo.userName, userName: userInfo.userName,
addressId: addressRealInfo.value.id, //地址信息id addressId: addressRealInfo.value.id, //地址信息id
// contactsId: null, //联系人信息id
couponId: useCouponId.value, //优惠卷id couponId: useCouponId.value, //优惠卷id
note: note.value, note: note.value,
orderItemMainInfoAddRequestList: toRaw(postCartArr.value) orderItemMainInfoAddRequestList: toRaw(postCartArr.value)
@ -527,19 +502,7 @@ const wxPay = async ( oid )=> { //传入订单id
}) })
} }
} }
//获取字体
const getFonts =()=>{
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);
}
})
}
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@ -606,14 +569,15 @@ const getFonts =()=>{
padding: 18.75rpx 15rpx 247.5rpx 16.88rpx; padding: 18.75rpx 15rpx 247.5rpx 16.88rpx;
} }
.section_2 { .section_2 {
padding: 21.07rpx 18.75rpx 18.51rpx 20.63rpx; padding: 25.07rpx 18.75rpx 28.07rpx 20.63rpx;
background-color: #ffffff; background-color: #ffffff;
border-radius: 18.75rpx; border-radius: 18.75rpx;
position: relative;
} }
.font { .font {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 25.54rpx; line-height: 26.25rpx;
color: #323232; color: #323232;
} }
.text { .text {
@ -623,22 +587,29 @@ const getFonts =()=>{
.image { .image {
width: 43.13rpx; width: 43.13rpx;
height: 43.13rpx; height: 43.13rpx;
position: absolute;
top: 35%;
} }
.font_2 { .font_2 {
font-size: 22.5rpx; font-size: 26.25rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 22.54rpx; line-height: 22.54rpx;
color: #818181; color: #818181;
} }
.text_2 { .text_2 {
line-height: 22.07rpx; line-height: 26.25rpx;
margin-left: 54rpx;
margin-top: 15rpx;
} }
.group { .group {
margin-top: 36.54rpx; // margin-top: 36.54rpx;
position: absolute;
top: 40%;
right: 20rpx;
} }
.font_3 { .font_3 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 25.54rpx; line-height: 25.54rpx;
color: #ffaaa5; color: #ffaaa5;
} }
@ -650,7 +621,9 @@ const getFonts =()=>{
height: 24.38rpx; height: 24.38rpx;
} }
.group_2 { .group_2 {
padding: 0 59.23rpx; // padding: 0 59.23rpx;
margin-left: 54rpx;
margin-top: 15rpx;
} }
.text_4 { .text_4 {
color: #5a5a5a; color: #5a5a5a;
@ -662,14 +635,13 @@ const getFonts =()=>{
} }
.section_3 { .section_3 {
margin-top: 16.88rpx; margin-top: 16.88rpx;
padding: 22.5rpx 0 35.63rpx; padding: 22.5rpx 0 22.63rpx;
background-color: #ffffff; background-color: #ffffff;
border-radius: 18.75rpx; border-radius: 18.75rpx;
} }
.group_18 { .group_18 {
padding-left: 26.27rpx; padding-left: 26.27rpx;
padding-right: 24.36rpx; padding-right: 24.36rpx;
margin-bottom: 20rpx;
} }
.group_19 { .group_19 {
margin-bottom: 3.75rpx; margin-bottom: 3.75rpx;
@ -680,7 +652,7 @@ const getFonts =()=>{
height: 165rpx; height: 165rpx;
} }
.image_4 { .image_4 {
margin-bottom: 9.38rpx; // margin-bottom: 9.38rpx;
} }
.text_1 { .text_1 {
line-height: 25.01rpx; line-height: 25.01rpx;
@ -691,18 +663,19 @@ const getFonts =()=>{
} }
.font_4 { .font_4 {
font-size: 33.75rpx; font-size: 33.75rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
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: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 17.23rpx; line-height: 17.23rpx;
color: #323232; color: #323232;
} }
.text_27 { .text_27 {
line-height: 17.53rpx; line-height: 17.53rpx;
margin-left: 54rpx;
} }
.image_5 { .image_5 {
border-radius: 9.38rpx 0rpx 0rpx 9.38rpx; border-radius: 9.38rpx 0rpx 0rpx 9.38rpx;
@ -717,7 +690,7 @@ const getFonts =()=>{
} }
.font_5 { .font_5 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 17.23rpx; line-height: 17.23rpx;
color: #ffffff; color: #ffffff;
} }
@ -752,7 +725,7 @@ const getFonts =()=>{
} }
.font_7 { .font_7 {
font-size: 30rpx; font-size: 30rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 29.18rpx; line-height: 29.18rpx;
color: #323232; color: #323232;
} }
@ -761,7 +734,7 @@ const getFonts =()=>{
} }
.font_8 { .font_8 {
font-size: 30rpx; font-size: 30rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 29.18rpx; line-height: 29.18rpx;
color: #818181; color: #818181;
} }
@ -771,7 +744,7 @@ const getFonts =()=>{
} }
.font_9 { .font_9 {
font-size: 30rpx; font-size: 30rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 20.04rpx; line-height: 20.04rpx;
color: #323232; color: #323232;
} }
@ -842,21 +815,21 @@ const getFonts =()=>{
margin-left: -119.06rpx; margin-left: -119.06rpx;
color: #000000; color: #000000;
font-size: 30rpx; font-size: 30rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 26.49rpx; line-height: 26.49rpx;
} }
.text_22 { .text_22 {
margin-left: 28.5rpx; margin-left: 28.5rpx;
color: #ffaaa5; color: #ffaaa5;
font-size: 37.5rpx; font-size: 37.5rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
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: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
font-weight: 700; font-weight: 700;
line-height: 22.05rpx; line-height: 22.05rpx;
} }

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

@ -1,7 +1,7 @@
<template> <template>
<!-- 批量服务类商品购买 --> <!-- 批量服务类商品购买 -->
<view class="flex-col page"> <view class="flex-col page">
<view class="flex-row justify-between items-center section_2"> <view class="flex-row justify-between items-center section_2" @click="loadPop" >
<view class="flex-row items-center"> <view class="flex-row items-center">
<image <image
class="shrink-0 image" class="shrink-0 image"
@ -9,7 +9,7 @@
/> />
<text class="text ml-10" style="font-size: 30rpx;">{{ contactRealInfo.name }} {{ contactRealInfo.phone }}</text> <text class="text ml-10" style="font-size: 30rpx;">{{ contactRealInfo.name }} {{ contactRealInfo.phone }}</text>
</view> </view>
<view class="flex-row items-center group" @click="loadPop" :style="{ pointerEvents: isLoading ? 'none' : 'auto' }"> <view class="flex-row items-center group" :style="{ pointerEvents: isLoading ? 'none' : 'auto' }">
<image <image
class="image_2" class="image_2"
src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FKgDGnwlb-right.png" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FKgDGnwlb-right.png"
@ -121,7 +121,7 @@
<view class="flex-col justify-start items-center text-wrapper_3" @click="wxPayFd" :style="{ pointerEvents: isLoading ? 'none' : 'auto' }"><text class="font_8 text_19">微信支付</text></view> <view class="flex-col justify-start items-center text-wrapper_3" @click="wxPayFd" :style="{ pointerEvents: isLoading ? 'none' : 'auto' }"><text class="font_8 text_19">微信支付</text></view>
</view> </view>
</view> </view>
<uni-popup ref="popup" background-color="#fff" :mask-click="false"> <uni-popup ref="popup" background-color="#fff">
<view class="popup-content"> <view class="popup-content">
<contactsComponentVue></contactsComponentVue> <contactsComponentVue></contactsComponentVue>
</view> </view>
@ -148,12 +148,10 @@
import contactsComponentVue from '../component/contactsComponent.vue'; //联系人弹窗\ import contactsComponentVue from '../component/contactsComponent.vue'; //联系人弹窗\
import contactPopVue from '../../mine/component/contactPop.vue'; //新增联系人弹窗 import contactPopVue from '../../mine/component/contactPop.vue'; //新增联系人弹窗
import couponPopupVue from '../../coupon/component/couponPopup.vue'; import couponPopupVue from '../../coupon/component/couponPopup.vue';
import { dealResult } from '../../../common/globalFunction'; import { JudgeIsNullity, dealResult } from '../../../common/globalFunction';
const sumprice = ref(0) //总价格 const sumprice = ref(0) //总价格
const popup = ref(null) //弹窗对象 const popup = ref(null) //弹窗对象
const contactRealInfo = ref({ const contactRealInfo = ref({}) //地址页 选择地址传过来的值 进入页面首先是默认地址，若无默认地址，则为空
name: '请选择联系人'
}) //地址页 选择地址传过来的值 进入页面首先是默认地址，若无默认地址，则为空
const userInfo = wx.getStorageSync('userInfo') //用户信息 const userInfo = wx.getStorageSync('userInfo') //用户信息
const totalInfo = ref([]) //购物车传过来的批量商品 const totalInfo = ref([]) //购物车传过来的批量商品
const note = ref('') const note = ref('')
@ -176,6 +174,16 @@
const useCouponId = ref(null) const useCouponId = ref(null)
const textColor = ref('') const textColor = ref('')
const delContactByIdHandler = (val) => {
console.log('===============>', val)
if (contactRealInfo.value.id === val) {
console.log(3333)
contactRealInfo.value = {}
contactRealInfo.value.name = '请选择联系人'
}
}
const closeHandler = () => { const closeHandler = () => {
close() close()
} }
@ -211,6 +219,7 @@
onMounted(() => { onMounted(() => {
contactRealInfo.value.name = '请选择联系人'
//将关闭弹窗方法传入弹窗页面，绑定弹窗按钮可关闭弹窗 //将关闭弹窗方法传入弹窗页面，绑定弹窗按钮可关闭弹窗
emitter.on('close', closeHandler) emitter.on('close', closeHandler)
//获取联系人信息 //获取联系人信息
@ -221,6 +230,8 @@
emitter.on('cancelCoupon', cancelCouponHandler) emitter.on('cancelCoupon', cancelCouponHandler)
emitter.on('getCouponObj', getCouponObjHandler) emitter.on('getCouponObj', getCouponObjHandler)
emitter.on('delContactById', delContactByIdHandler)
}) })
@ -234,6 +245,8 @@
emitter.off('cancelCoupon', cancelCouponHandler) emitter.off('cancelCoupon', cancelCouponHandler)
emitter.off('getCouponObj', getCouponObjHandler) emitter.off('getCouponObj', getCouponObjHandler)
emitter.off('delContactById', delContactByIdHandler)
}) })
onLoad((options)=>{ onLoad((options)=>{
@ -252,11 +265,7 @@
console.log('剩余人数---->',restNumber.value); console.log('剩余人数---->',restNumber.value);
getMyCouponList() getMyCouponList()
}) })
onShow(()=>{
userInfo.value = wx.getStorageSync('userInfo') //从微信缓存中获取用户信息
getDefaultContact()
// computed()
})
//关闭弹窗 //关闭弹窗
const close = () => { const close = () => {
nextTick(() => { nextTick(() => {
@ -282,11 +291,15 @@
console.log('联系人数组---->',res.data.data); console.log('联系人数组---->',res.data.data);
} }
//根据for循环遍历默认地址 //根据for循环遍历默认地址
for(let key in res.data.data) { let contactArr = res.data.data
if(res.data.data[key].isDefault === 1) { for(let key in contactArr) {
contactRealInfo.value = res.data.data[key] if(contactArr[key].isDefault === 1) {
contactRealInfo.value = contactArr[key]
} }
} }
if (JudgeIsNullity(contactRealInfo.value.name)) {
contactRealInfo.value.name = '请选择联系人'
}
} }
const createOrder = async () => { //单个服务类的购买方法 const createOrder = async () => { //单个服务类的购买方法
console.log('联系人信息-->',contactRealInfo.value); console.log('联系人信息-->',contactRealInfo.value);
@ -542,7 +555,7 @@
.text { .text {
color: #818181; color: #818181;
font-size: 37.5rpx; font-size: 37.5rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 32.38rpx; line-height: 32.38rpx;
} }
.group { .group {
@ -555,7 +568,7 @@
} }
.font { .font {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 25.54rpx; line-height: 25.54rpx;
color: #323232; color: #323232;
} }
@ -589,7 +602,7 @@
} }
.font_2 { .font_2 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 25.54rpx; line-height: 25.54rpx;
color: #818181; color: #818181;
} }
@ -599,7 +612,7 @@
} }
.font_3 { .font_3 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 17.53rpx; line-height: 17.53rpx;
color: #818181; color: #818181;
} }
@ -612,13 +625,13 @@
} }
.font_5 { .font_5 {
font-size: 33.75rpx; font-size: 33.75rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
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: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 17.53rpx; line-height: 17.53rpx;
color: #323232; color: #323232;
} }
@ -639,7 +652,7 @@
} }
.font_4 { .font_4 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 17.53rpx; line-height: 17.53rpx;
color: #ffffff; color: #ffffff;
} }
@ -660,7 +673,7 @@
} }
.font_7 { .font_7 {
font-size: 25.5rpx; font-size: 25.5rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 22.54rpx; line-height: 22.54rpx;
color: #818181; color: #818181;
} }
@ -683,7 +696,7 @@
} }
.font_8 { .font_8 {
font-size: 30rpx; font-size: 30rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 29.18rpx; line-height: 29.18rpx;
color: #323232; color: #323232;
} }
@ -692,7 +705,7 @@
} }
.font_9 { .font_9 {
font-size: 30rpx; font-size: 30rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 29.18rpx; line-height: 29.18rpx;
color: #818181; color: #818181;
} }
@ -705,7 +718,7 @@
} }
.font_10 { .font_10 {
font-size: 30rpx; font-size: 30rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 20.04rpx; line-height: 20.04rpx;
color: #323232; color: #323232;
} }
@ -761,21 +774,21 @@
margin-left: -119.06rpx; margin-left: -119.06rpx;
color: #000000; color: #000000;
font-size: 30rpx; font-size: 30rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
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: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
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: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
font-weight: 700; font-weight: 700;
line-height: 22.05rpx; line-height: 22.05rpx;
} }

6
pages/popup.vue
View File

@ -21,7 +21,7 @@
const conform = async () => { const conform = async () => {
emitter.emit('delAddress') emitter.emit('delAddressAfter')
emitter.emit('popClose') emitter.emit('popClose')
} }
@ -39,12 +39,12 @@
.text { .text {
color: #000000; color: #000000;
font-size: 33.75rpx; font-size: 33.75rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 32.85rpx; line-height: 32.85rpx;
} }
.font { .font {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 25.43rpx; line-height: 25.43rpx;
} }
.text_2 { .text_2 {

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

@ -41,7 +41,14 @@
</view> </view>
</view> </view>
</view> </view>
<view class="flex-col self-stretch section_3">
<view>
<rich-text :nodes="richTextcontent"></rich-text>
</view>
<!-- <view class="flex-col self-stretch section_3">
<text class="self-start font_4 text_10">用户须知</text> <text class="self-start font_4 text_10">用户须知</text>
<text class="self-start font text_11">1.发货后不接受退货、不接受7天无理由退货</text> <text class="self-start font text_11">1.发货后不接受退货、不接受7天无理由退货</text>
<text class="self-start font text_12">2.商品购买后无法自主退款，需联系客服进行退款处理</text> <text class="self-start font text_12">2.商品购买后无法自主退款，需联系客服进行退款处理</text>
@ -51,11 +58,11 @@
<text class="self-start font text_14">4.商品售罄后的款式也可以重新预定，需等待并联系客服</text> <text class="self-start font text_14">4.商品售罄后的款式也可以重新预定，需等待并联系客服</text>
<text class="self-start font text_15">5.定制商品的具体发货日期根据制作团队制作情况而定</text> <text class="self-start font text_15">5.定制商品的具体发货日期根据制作团队制作情况而定</text>
<text class="self-start font text_16">6.只售后邮寄破损</text> <text class="self-start font text_16">6.只售后邮寄破损</text>
</view> </view> -->
<image <!-- <image
class="self-start image_3" class="self-start image_3"
:src="goodObject.detailImg" :src="goodObject.detailImg"
/> /> -->
<view class="flex-row items-center self-stretch section_4"> <view class="flex-row items-center self-stretch section_4">
<button class="flex-col items-center" style="background-color: #ffffff;" open-type="contact" bindcontact="handleContact" session-from="sessionFrom"> <button class="flex-col items-center" style="background-color: #ffffff;" open-type="contact" bindcontact="handleContact" session-from="sessionFrom">
<image <image
@ -97,6 +104,7 @@ const labelList = ref([]) //标签
const imgArr = ref([]) //商品图片数组 const imgArr = ref([]) //商品图片数组
const coupon = ref(0) //当前商品可用的优惠卷 const coupon = ref(0) //当前商品可用的优惠卷
const cookie = wx.getStorageSync('cookie') const cookie = wx.getStorageSync('cookie')
const richTextcontent = ref('')
//转换上一页面传来的商品 //转换上一页面传来的商品
onLoad((options) => { onLoad((options) => {
getFonts() getFonts()
@ -130,8 +138,9 @@ const getProduct = async (gid) =>{ //根据商品获取商品信息
console.log('请求请求--->',res.data); console.log('请求请求--->',res.data);
if(res.data.code === 1) { if(res.data.code === 1) {
goodObject.value = res.data.data goodObject.value = res.data.data
richTextcontent.value = goodObject.value.richText
console.log(richTextcontent.value)
imgArr.value = res.data.data.goodImg.split(';') //将后端传来的图片字符串转为图片数组 imgArr.value = res.data.data.goodImg.split(';') //将后端传来的图片字符串转为图片数组
// console.log(imgArr.value);
labelList.value = goodObject.value.label.split(';') //分割字符串，生成标签数组 labelList.value = goodObject.value.label.split(';') //分割字符串，生成标签数组
labelList.value = labelList.value.filter((s)=>{ //使用filter将最后一个空值去掉 labelList.value = labelList.value.filter((s)=>{ //使用filter将最后一个空值去掉
return s return s
@ -235,7 +244,7 @@ button::after {
} }
.font { .font {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: 'FangZhengFonts'; font-family: 'FZSongKeBenXiuKaiS-R-GB';
line-height: 25.84rpx; line-height: 25.84rpx;
color: #323232; color: #323232;
} }
@ -246,7 +255,7 @@ button::after {
.text { .text {
color: #ff0000; color: #ff0000;
font-size: 45rpx; font-size: 45rpx;
font-family: 'FangZhengFonts'; font-family: 'FZSongKeBenXiuKaiS-R-GB';
line-height: 30.06rpx; line-height: 30.06rpx;
} }
.group_2 { .group_2 {
@ -255,7 +264,7 @@ button::after {
.text_4 { .text_4 {
color: #323232; color: #323232;
font-size: 33.75rpx; font-size: 33.75rpx;
font-family: 'FangZhengFonts'; font-family: 'FZSongKeBenXiuKaiS-R-GB';
line-height: 32.7rpx; line-height: 32.7rpx;
} }
.group_3 { .group_3 {
@ -282,7 +291,7 @@ button::after {
} }
.font_2 { .font_2 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: 'FangZhengFonts'; font-family: 'FZSongKeBenXiuKaiS-R-GB';
line-height: 31.88rpx; line-height: 31.88rpx;
color: #323232; color: #323232;
} }
@ -305,7 +314,7 @@ button::after {
} }
.font_3 { .font_3 {
font-size: 22.5rpx; font-size: 22.5rpx;
font-family: 'FangZhengFonts'; font-family: 'FZSongKeBenXiuKaiS-R-GB';
line-height: 21.71rpx; line-height: 21.71rpx;
color: #323232; color: #323232;
} }
@ -350,7 +359,7 @@ button::after {
} }
.font_4 { .font_4 {
font-size: 30rpx; font-size: 30rpx;
font-family: 'FangZhengFonts'; font-family: 'FZSongKeBenXiuKaiS-R-GB';
color: #ffffff; color: #ffffff;
} }
.text_10 { .text_10 {
@ -435,7 +444,7 @@ button::after {
.discountsText { .discountsText {
color: #ff0000; color: #ff0000;
font-size: 25rpx; font-size: 25rpx;
font-family: 'FangZhengFonts'; font-family: 'FZSongKeBenXiuKaiS-R-GB';
line-height: 30.06rpx; line-height: 30.06rpx;
margin-left: 20rpx margin-left: 20rpx
} }

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

@ -1,13 +1,15 @@
<template> <template>
<view class="flex-row relative page"> <view class="flex-row relative page">
<view class="flex-row justify-between items-center section_2 pos"> <view class="flex-row justify-between items-center section_2 pos">
<text class="text">商品</text> <!-- <text class="text" style="color: #E79EA1;">商品</text> -->
<view class="flex-row items-center section_3" @click="goToSearch"> <view class="flex-row items-center section_3" @click="goToSearch">
<image <image
mode="aspectFit"
class="image" class="image"
src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FODjBDedI-sousuo.png" :src="workshopUrl + '/searchGood/search.png'"
/> />
<input class="text-wrapper" placeholder="搜索商品" disabled /> <!-- <input class="text-wrapper" placeholder="搜索商品" disabled /> -->
<text class="text-wrapper font" style="color: #B1B1B1;">搜索商品</text>
</view> </view>
</view> </view>
@ -59,7 +61,6 @@
</view> </view>
</view> </view>
</view> </view>
<text class="font text_3 pos_4">{{ product_type.type }}</text>
</view> </view>
</template> </template>
@ -69,7 +70,7 @@ import { baseUrl, testUrl , suiUrl} from '@/api/request';
import { onLoad,onPullDownRefresh } from '@dcloudio/uni-app'; import { onLoad,onPullDownRefresh } from '@dcloudio/uni-app';
import { getFonts } from '../../../common/globalFont'; 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';
const currentColor = ref(0); const currentColor = ref(0);
const sort =ref([{}]) //商品类别对象数组 const sort =ref([{}]) //商品类别对象数组
const headerList = ref([{}]) //类别标题和介绍 const headerList = ref([{}]) //类别标题和介绍
@ -213,7 +214,7 @@ const imgList = ref([{
<style lang="scss" scoped> <style lang="scss" scoped>
input { input {
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
} }
::-webkit-scrollbar { ::-webkit-scrollbar {
@ -222,12 +223,14 @@ input {
.good-list { .good-list {
overflow: auto; overflow: auto;
height: 750rpx; height: 60vh;
padding-bottom: 80rpx;
} }
.my-aside { .my-aside {
overflow: auto; overflow: auto;
height: 800rpx; height: 60vh;
padding-bottom: 40rpx;
} }
.mt-9 { .mt-9 {
@ -244,7 +247,7 @@ input {
} }
.section_2 { .section_2 {
padding: 20rpx 35.41rpx 23.75rpx; padding: 20rpx 35.41rpx 23.75rpx;
background-color: #ebe7e4; background-color: #fbdedf;
} }
.pos { .pos {
position: absolute; position: absolute;
@ -255,16 +258,15 @@ input {
.text { .text {
color: #000000; color: #000000;
font-size: 35rpx; font-size: 35rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 35.66rpx; line-height: 35.66rpx;
} }
.section_3 { .section_3 {
margin-right: 38.96rpx;
padding: 5.49rpx 12.99rpx 5.76rpx; padding: 5.49rpx 12.99rpx 5.76rpx;
background-color: #f2eeeb; margin: 0 auto;
background-color: #fff;
height: 70rpx; height: 70rpx;
width: 550rpx; width: 580rpx;
border: solid 1.88rpx #fffef8;
border-radius: 28.13rpx; border-radius: 28.13rpx;
} }
.image { .image {
@ -272,7 +274,8 @@ input {
height: 45rpx; height: 45rpx;
} }
.text-wrapper { .text-wrapper {
padding: 0 10rpx 0; padding: 0;
margin-left: -5rpx;
} }
.image_2 { .image_2 {
// width: 100vw; // width: 100vw;
@ -286,7 +289,8 @@ input {
} }
.section_4 { .section_4 {
padding: 7.5rpx 0 0rpx; padding: 7.5rpx 0 0rpx;
background-color: #f4f3f1; background-color: #fff;
border-radius: 0 15.38rpx 15.38rpx 0;
width: 119.75rpx; width: 119.75rpx;
} }
.pos_3 { .pos_3 {
@ -306,7 +310,7 @@ input {
} }
.font_2 { .font_2 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 24.41rpx; line-height: 24.41rpx;
color: #000000; color: #000000;
} }
@ -318,7 +322,7 @@ input {
.pos_5 { .pos_5 {
position: absolute; position: absolute;
right: 34.63rpx; right: 34.63rpx;
top: 628.13rpx; top: 570.13rpx;
} }
.list-item { .list-item {
width: 580rpx; width: 580rpx;
@ -339,13 +343,13 @@ input {
} }
.font { .font {
font-size: 30rpx; font-size: 30rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 28.95rpx; line-height: 30rpx;
color: #000000; color: #000000;
} }
.font_3 { .font_3 {
font-size: 22.5rpx; font-size: 22.5rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 21.88rpx; line-height: 21.88rpx;
color: #727272; color: #727272;
width: 180px; width: 180px;
@ -353,7 +357,7 @@ input {
} }
.font_4 { .font_4 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 17.53rpx; line-height: 17.53rpx;
color: #ff0000; color: #ff0000;
} }

58
pages/testPage/testPage.vue
View File

@ -1,20 +1,50 @@
<template> <template>
<!-- <feeTipsVue></feeTipsVue> --> <!-- <addressSelectedVue></addressSelectedVue> -->
<!-- <bookingTipsVue></bookingTipsVue> -->
<!-- <confirmBookingInfoVue></confirmBookingInfoVue> -->
<cancelOrderVue></cancelOrderVue>
</template> </template>
<script setup lang="ts"> <script setup>
// import timeSelectVue from '../workshop/component/timeSelect.vue'; import { onMounted } from 'vue';
// import tipVue from '../workshop/component/tip.vue'; onMounted(() => {
// import couponPopupVue from '../coupon/component/couponPopup.vue'; getUrl()
// import confirmPopupVue from '../coupon/component/confirmPopup.vue'; })
// import bookingSelectedVue from '../book/component/bookingSelected.vue';
// import feeTipsVue from '../book/component/feeTips.vue'; const getUrl = async () => {
// import bookingTipsVue from '../book/component/bookingTips.vue'; const res = await uni.request({
// import confirmBookingInfoVue from '../book/component/confirmBookingInfo.vue'; url: 'http://123.249.108.160:8888/api/file/downloadFile',
import cancelOrderVue from '../book/component/cancelOrder.vue'; method: 'GET',
data: {
objectKey: 'feiyi/test/2/ZFdyLLBg-VCG211334705187.png'
}
})
console.log(base64Data)
}
// import { onMounted } from 'vue';
// import addressSelectedVue from '../Shopping-cart/component/addressSelected.vue';
// onMounted(() => {
// console.log(Decode64(Encode64(`<p style="text-align: center;">富文本测试</p>`)))
// })
// /**
// * 编码base64
// */
// function Encode64(str) {
// return btoa(encodeURIComponent(str).replace(/%([0-9A-F]{2})/g,
// function toSolidBytes(match, p1) {
// return String.fromCharCode('0x' + p1);
// }));
// }
// /**
// * 解码base64
// */
// function Decode64(str) {
// return decodeURIComponent(atob(str).split('').map(function (c) {
// return '%' + ('00' + c.charCodeAt(0).toString(16)).slice(-2);
// }).join(''));
// }
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">

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

@ -24,7 +24,7 @@
<view class="flex-row items-center group_3" @click="openyyxzTip()"> <view class="flex-row items-center group_3" @click="openyyxzTip()">
<image <image
class="shrink-0 image" class="shrink-0 image"
:src="workshopUrl + '/component/yyxz.png'" :src="bookUrl + '/photoProductsOrder/yyxz.png'"
/> />
<text class="font text_4 ml-3">预约须知</text> <text class="font text_4 ml-3">预约须知</text>
</view> </view>
@ -86,6 +86,7 @@
import { dealResult } from '../../../common/globalFunction'; import { dealResult } from '../../../common/globalFunction';
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';
let selectObj = ref([]) let selectObj = ref([])
let fontColor = ref([]) let fontColor = ref([])
@ -394,12 +395,12 @@
margin-left: 6.92rpx; margin-left: 6.92rpx;
color: #c35c5d; color: #c35c5d;
font-size: 37.5rpx; font-size: 37.5rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 27.52rpx; line-height: 27.52rpx;
} }
.font { .font {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 23.94rpx; line-height: 23.94rpx;
color: #323233; color: #323233;
} }
@ -408,7 +409,7 @@
} }
.font_2 { .font_2 {
font-size: 30rpx; font-size: 30rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 27.71rpx; line-height: 27.71rpx;
color: #323233; color: #323233;
} }
@ -453,7 +454,7 @@
} }
.font_3 { .font_3 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
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: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
} }
.text { .text {
color: #323233; color: #323233;

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

@ -155,7 +155,7 @@ const imgList = ref([{
} }
.font { .font {
font-size: 24.38rpx; font-size: 24.38rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
color: #000000; color: #000000;
} }
.text { .text {

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

@ -230,7 +230,7 @@ const loadPopBook = ()=> {
} }
.font { .font {
font-size: 30rpx; font-size: 30rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 29.7rpx; line-height: 29.7rpx;
} }
.text { .text {
@ -261,7 +261,7 @@ const loadPopBook = ()=> {
} }
.font_2 { .font_2 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 31.88rpx; line-height: 31.88rpx;
color: #323232; color: #323232;
} }
@ -272,7 +272,7 @@ const loadPopBook = ()=> {
.text_2 { .text_2 {
color: #ff0000; color: #ff0000;
font-size: 45rpx; font-size: 45rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 29.7rpx; line-height: 29.7rpx;
} }
.text_4 { .text_4 {
@ -289,7 +289,7 @@ const loadPopBook = ()=> {
} }
.font_3 { .font_3 {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FangZhengFonts; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 24.92rpx; line-height: 24.92rpx;
color: #000000; color: #000000;
} }

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

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

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

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