合完了
This commit is contained in:
parent
e95b660761
commit
cf0e5b408e
42
pages.json
42
pages.json
|
|
@ -52,13 +52,6 @@
|
|||
"navigationBarTitleText" : ""
|
||||
}
|
||||
},
|
||||
{
|
||||
"path" : "pages/order/service-paystatus/service-paystatus",
|
||||
"style" :
|
||||
{
|
||||
"navigationBarTitleText" : ""
|
||||
}
|
||||
},
|
||||
{
|
||||
"path" : "pages/book/photoProductsOrderDetail/photoProductsOrderDetail",
|
||||
"style" :
|
||||
|
|
@ -115,13 +108,6 @@
|
|||
"navigationBarTitleText" : ""
|
||||
}
|
||||
},
|
||||
{
|
||||
"path" : "pages/store-home/main/main",
|
||||
"style" :
|
||||
{
|
||||
"navigationBarTitleText" : ""
|
||||
}
|
||||
},
|
||||
|
||||
{
|
||||
"path" : "pages/mine/main/main",
|
||||
|
|
@ -130,13 +116,6 @@
|
|||
"navigationBarTitleText" : ""
|
||||
}
|
||||
},
|
||||
{
|
||||
"path" : "pages/mine/mineorders/mineorders",
|
||||
"style" :
|
||||
{
|
||||
"navigationBarTitleText" : ""
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "pages/Shopping-cart/productmain/productmain",
|
||||
"style" :
|
||||
|
|
@ -151,13 +130,6 @@
|
|||
"navigationBarTitleText" : "泠泷水月阁工作室"
|
||||
}
|
||||
},
|
||||
{
|
||||
"path" : "pages/order/product-paysuccess/product-paysuccess",
|
||||
"style" :
|
||||
{
|
||||
"navigationBarTitleText" : ""
|
||||
}
|
||||
},
|
||||
{
|
||||
"path" : "pages/Shopping-cart/newaddress_Info/newaddress_Info",
|
||||
"style" :
|
||||
|
|
@ -207,13 +179,6 @@
|
|||
"navigationBarTitleText" : ""
|
||||
}
|
||||
},
|
||||
{
|
||||
"path" : "pages/workshop/component/timePopUp",
|
||||
"style" :
|
||||
{
|
||||
"navigationBarTitleText" : ""
|
||||
}
|
||||
},
|
||||
{
|
||||
"path" : "pages/store-home/main/testMain",
|
||||
"style" :
|
||||
|
|
@ -298,13 +263,6 @@
|
|||
{
|
||||
"navigationBarTitleText" : ""
|
||||
}
|
||||
},
|
||||
{
|
||||
"path" : "pages/mine/PersonCenter/PersonCenter",
|
||||
"style" :
|
||||
{
|
||||
"navigationBarTitleText" : ""
|
||||
}
|
||||
}
|
||||
],
|
||||
"plugins" : {
|
||||
|
|
|
|||
|
|
@ -51,6 +51,7 @@
|
|||
onLoad,
|
||||
onShow
|
||||
} from "@dcloudio/uni-app";
|
||||
import { getFonts } from '../../../common/globalFont';
|
||||
import {
|
||||
baseUrl
|
||||
} from '../../../api/request';
|
||||
|
|
@ -63,6 +64,10 @@
|
|||
productBrief.value = val
|
||||
}
|
||||
|
||||
onLoad(() => {
|
||||
getFonts()
|
||||
})
|
||||
|
||||
onMounted(() => {
|
||||
emitter.on('product', productHandler)
|
||||
})
|
||||
|
|
@ -196,14 +201,14 @@
|
|||
.text_3 {
|
||||
color: #000000;
|
||||
font-size: 28.13rpx;
|
||||
font-family: Open Sans;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 26.21rpx;
|
||||
}
|
||||
|
||||
.text_4 {
|
||||
color: #000000;
|
||||
font-size: 26.25rpx;
|
||||
font-family: Open Sans;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 24.34rpx;
|
||||
}
|
||||
|
||||
|
|
@ -235,7 +240,7 @@
|
|||
.text_5 {
|
||||
color: #000000;
|
||||
font-size: 30rpx;
|
||||
font-family: Open Sans;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 21.41rpx;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -53,6 +53,7 @@
|
|||
import {ref , onMounted, onUnmounted} from 'vue'
|
||||
import { testUrl , baseUrl , suiUrl } from '../../../api/request';
|
||||
import { onLoad, onShow } from '@dcloudio/uni-app';
|
||||
import { getFonts } from '../../../common/globalFont';
|
||||
import emitter from '../../../utils/emitter';
|
||||
const addressParam = ref({
|
||||
name: "",
|
||||
|
|
@ -64,6 +65,7 @@ const addressParam = ref({
|
|||
const isAdd = ref(false)
|
||||
//接受编辑按钮传来的地址信息
|
||||
onLoad((options)=>{
|
||||
getFonts()
|
||||
if(JSON.stringify(options) != '{}') {
|
||||
addressParam.value = JSON.parse(options.editInfo) //将原来的地址信息赋值给原来的addressParam
|
||||
} else {
|
||||
|
|
@ -184,7 +186,7 @@ const bindTimeChange = (e) => { //picker省市区选择
|
|||
}
|
||||
.font_2 {
|
||||
font-size: 26.25rpx;
|
||||
font-family: Open Sans;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 24.34rpx;
|
||||
color: #323232;
|
||||
}
|
||||
|
|
@ -280,7 +282,7 @@ const bindTimeChange = (e) => { //picker省市区选择
|
|||
.text_8 {
|
||||
color: #C35C5D;
|
||||
font-size: 30rpx;
|
||||
font-family: Open Sans;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 27.9rpx;
|
||||
}
|
||||
.zujian{ //地址组件样式
|
||||
|
|
|
|||
|
|
@ -133,6 +133,7 @@
|
|||
<script setup>
|
||||
import { ref , onMounted , toRaw} from 'vue'
|
||||
import { onShow , onLoad } from "@dcloudio/uni-app";
|
||||
import { getFonts } from '../../../common/globalFont';
|
||||
import { baseUrl , testUrl ,suiUrl} from '../../../api/request';
|
||||
import * as math from 'mathjs'
|
||||
const products = ref([])
|
||||
|
|
@ -151,6 +152,7 @@ onShow(()=>{
|
|||
getServiceCart() //获取服务类
|
||||
})
|
||||
onLoad(()=>{
|
||||
getFonts()
|
||||
getProductCart() //再获取一次实体类商品的列表
|
||||
getServiceCart() //再获取一次
|
||||
})
|
||||
|
|
@ -389,7 +391,7 @@ const changeState =()=>{ //修改购物车订单方法
|
|||
}
|
||||
.font {
|
||||
font-size: 30rpx;
|
||||
font-family: Open Sans;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 27.69rpx;
|
||||
color: #323232;
|
||||
}
|
||||
|
|
@ -447,7 +449,7 @@ const changeState =()=>{ //修改购物车订单方法
|
|||
}
|
||||
.font_2 {
|
||||
font-size: 26.25rpx;
|
||||
font-family: Open Sans;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 24.43rpx;
|
||||
color: #323232;
|
||||
}
|
||||
|
|
@ -456,7 +458,7 @@ const changeState =()=>{ //修改购物车订单方法
|
|||
}
|
||||
.font_3 {
|
||||
font-size: 33.75rpx;
|
||||
font-family: Open Sans;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 24.43rpx;
|
||||
font-weight: 600;
|
||||
color: #fb8b05;
|
||||
|
|
@ -472,7 +474,7 @@ const changeState =()=>{ //修改购物车订单方法
|
|||
}
|
||||
.font_4 {
|
||||
font-size: 26.25rpx;
|
||||
font-family: Open Sans;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 19.29rpx;
|
||||
font-weight: 600;
|
||||
color: #fb8b05;
|
||||
|
|
@ -497,7 +499,7 @@ const changeState =()=>{ //修改购物车订单方法
|
|||
}
|
||||
.font_5 {
|
||||
font-size: 26.25rpx;
|
||||
font-family: Open Sans;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 19.29rpx;
|
||||
color: #323232;
|
||||
}
|
||||
|
|
@ -527,7 +529,7 @@ const changeState =()=>{ //修改购物车订单方法
|
|||
}
|
||||
.font_6 {
|
||||
font-size: 26.25rpx;
|
||||
font-family: Open Sans;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 31.88rpx;
|
||||
color: #323233;
|
||||
}
|
||||
|
|
@ -539,13 +541,13 @@ const changeState =()=>{ //修改购物车订单方法
|
|||
}
|
||||
.font_7 {
|
||||
font-size: 22.5rpx;
|
||||
font-family: Open Sans;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 22.5rpx;
|
||||
color: #6b6e72;
|
||||
}
|
||||
.font_8 {
|
||||
font-size: 22.5rpx;
|
||||
font-family: Open Sans;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 19.29rpx;
|
||||
color: #6b6e72;
|
||||
}
|
||||
|
|
@ -592,7 +594,7 @@ const changeState =()=>{ //修改购物车订单方法
|
|||
.text_10 {
|
||||
color: #ffffff;
|
||||
font-size: 33.75rpx;
|
||||
font-family: Open Sans;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 30.97rpx;
|
||||
}
|
||||
.mt-569 {
|
||||
|
|
@ -612,7 +614,7 @@ const changeState =()=>{ //修改购物车订单方法
|
|||
}
|
||||
.font {
|
||||
font-size: 30rpx;
|
||||
font-family: Open Sans;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 27.54rpx;
|
||||
color: #323232;
|
||||
}
|
||||
|
|
@ -640,7 +642,7 @@ const changeState =()=>{ //修改购物车订单方法
|
|||
.text_11 {
|
||||
color: #ffffff;
|
||||
font-size: 33.75rpx;
|
||||
font-family: Open Sans;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 31.48rpx;
|
||||
}
|
||||
@import url(../../../common/css/global.css);
|
||||
|
|
|
|||
|
|
@ -124,6 +124,7 @@
|
|||
<script setup>
|
||||
import { ref, onMounted, toRaw } from 'vue'
|
||||
import { onShow, onLoad } from "@dcloudio/uni-app";
|
||||
import { getFonts } from '../../../common/globalFont';
|
||||
import { baseUrl, testUrl, suiUrl } from '../../../api/request';
|
||||
import * as math from 'mathjs'
|
||||
const products = ref([])
|
||||
|
|
@ -145,9 +146,8 @@
|
|||
totalPrice.value = 0 //重置
|
||||
})
|
||||
onLoad(() => {
|
||||
getProductCart() //再获取一次
|
||||
getFonts()
|
||||
// console.log(current.value)
|
||||
getProductCart() //再获取一次
|
||||
})
|
||||
//获取实体类商品信息
|
||||
const getEntityPro = async () => {
|
||||
|
|
@ -499,18 +499,6 @@
|
|||
totalPrice.value = 0
|
||||
}
|
||||
}
|
||||
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);
|
||||
}
|
||||
})
|
||||
}
|
||||
//防抖相关变量
|
||||
let debounceTimer = null;
|
||||
let wxPayTimer = null;
|
||||
|
|
@ -829,7 +817,7 @@
|
|||
|
||||
.font_6 {
|
||||
font-size: 26.25rpx;
|
||||
font-family: Open Sans;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 18.73rpx;
|
||||
color: #323232;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -96,6 +96,9 @@
|
|||
import { bookUrl } from '../../../common/globalImagesUrl';
|
||||
import { baseUrl } from '../../../api/request';
|
||||
import { dealResult } from '../../../common/globalFunction';
|
||||
import { onLoad } from "@dcloudio/uni-app";
|
||||
import { getFonts } from '../../../common/globalFont';
|
||||
|
||||
const number = ref(1)
|
||||
const field = ref('')
|
||||
const feeTips = ref(null)
|
||||
|
|
@ -110,6 +113,10 @@
|
|||
const cookie = wx.getStorageSync('cookie')
|
||||
|
||||
|
||||
onLoad(() => {
|
||||
getFonts()
|
||||
})
|
||||
|
||||
const closeFeeTipsHandler = () => {
|
||||
nextTick(() => {
|
||||
if (feeTips.value) {
|
||||
|
|
@ -141,6 +148,7 @@
|
|||
}
|
||||
|
||||
|
||||
|
||||
onMounted(() => {
|
||||
emitter.on('closeFeeTips', closeFeeTipsHandler)
|
||||
|
||||
|
|
@ -258,7 +266,7 @@
|
|||
}
|
||||
.font {
|
||||
font-size: 37.5rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 33.99rpx;
|
||||
color: #000000;
|
||||
}
|
||||
|
|
@ -304,7 +312,7 @@
|
|||
}
|
||||
.text_4 {
|
||||
color: #323232b3;
|
||||
font-family: Open Sans;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 35.04rpx;
|
||||
}
|
||||
.image_6 {
|
||||
|
|
@ -317,7 +325,7 @@
|
|||
margin-left: 22.5rpx;
|
||||
color: #000000;
|
||||
font-size: 30rpx;
|
||||
font-family: Open Sans;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 26.4rpx;
|
||||
}
|
||||
.image_3 {
|
||||
|
|
@ -374,7 +382,7 @@
|
|||
}
|
||||
.font_2 {
|
||||
font-size: 26.25rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 24.21rpx;
|
||||
color: #000000;
|
||||
}
|
||||
|
|
@ -405,7 +413,7 @@
|
|||
}
|
||||
.font_3 {
|
||||
font-size: 22.5rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 26.25rpx;
|
||||
color: #ffffff;
|
||||
}
|
||||
|
|
@ -426,7 +434,7 @@
|
|||
.text_9 {
|
||||
color: #ffffff;
|
||||
font-size: 30rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 28.01rpx;
|
||||
}
|
||||
@import url(../../../common/css/global.css);
|
||||
|
|
|
|||
|
|
@ -21,6 +21,12 @@
|
|||
|
||||
<script setup lang="ts">
|
||||
import emitter from '../../../utils/emitter';
|
||||
import { onLoad } from "@dcloudio/uni-app";
|
||||
import { getFonts } from '../../../common/globalFont';
|
||||
|
||||
onLoad(() => {
|
||||
getFonts()
|
||||
})
|
||||
const closeBookingTips = () => {
|
||||
emitter.emit('closeBookingTips')
|
||||
}
|
||||
|
|
@ -40,7 +46,7 @@ import emitter from '../../../utils/emitter';
|
|||
.text {
|
||||
color: #000000;
|
||||
font-size: 37.5rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 34.42rpx;
|
||||
}
|
||||
.group {
|
||||
|
|
@ -48,7 +54,7 @@ import emitter from '../../../utils/emitter';
|
|||
}
|
||||
.font {
|
||||
font-size: 29.17rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 35.42rpx;
|
||||
color: #323232;
|
||||
}
|
||||
|
|
@ -61,7 +67,7 @@ import emitter from '../../../utils/emitter';
|
|||
.text_2 {
|
||||
color: #ffffff;
|
||||
font-size: 33.33rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 32.17rpx;
|
||||
}
|
||||
@import url(../../../common/css/global.css);
|
||||
|
|
|
|||
|
|
@ -12,6 +12,12 @@
|
|||
import { onMounted, onUnmounted, ref } from 'vue';
|
||||
import emitter from '../../../utils/emitter';
|
||||
import { baseUrl } from '../../../api/request';
|
||||
import { onLoad } from "@dcloudio/uni-app";
|
||||
import { getFonts } from '../../../common/globalFont';
|
||||
|
||||
onLoad(() => {
|
||||
getFonts()
|
||||
})
|
||||
|
||||
const oid = ref(0)
|
||||
const cookie = wx.getStorageSync("cookie") //请求头
|
||||
|
|
@ -68,7 +74,7 @@ import { baseUrl } from '../../../api/request';
|
|||
.text {
|
||||
color: #000000;
|
||||
font-size: 37.32rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 41.66rpx;
|
||||
}
|
||||
.text-wrapper {
|
||||
|
|
@ -81,7 +87,7 @@ import { baseUrl } from '../../../api/request';
|
|||
}
|
||||
.font {
|
||||
font-size: 37.62rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 35.41rpx;
|
||||
}
|
||||
.text_2 {
|
||||
|
|
|
|||
|
|
@ -16,6 +16,14 @@ import { onMounted, onUnmounted, ref } from 'vue';
|
|||
import emitter from '../../../utils/emitter';
|
||||
import { baseUrl } from '../../../api/request';
|
||||
import { dealResult } from '../../../common/globalFunction';
|
||||
import { onLoad } from "@dcloudio/uni-app";
|
||||
import { getFonts } from '../../../common/globalFont';
|
||||
|
||||
onLoad(() => {
|
||||
getFonts()
|
||||
})
|
||||
|
||||
|
||||
const cookie = wx.getStorageSync("cookie") //请求头
|
||||
|
||||
const orderObj = ref({})
|
||||
|
|
@ -143,12 +151,12 @@ const cookie = wx.getStorageSync("cookie") //请求头
|
|||
.text {
|
||||
color: #000000;
|
||||
font-size: 37.72rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 41.72rpx;
|
||||
}
|
||||
.font {
|
||||
font-size: 30.97rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 35.46rpx;
|
||||
color: #000000;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,6 +12,12 @@
|
|||
import { onMounted, onUnmounted, ref } from 'vue';
|
||||
import emitter from '../../../utils/emitter';
|
||||
import { baseUrl } from '../../../api/request';
|
||||
import { onLoad } from "@dcloudio/uni-app";
|
||||
import { getFonts } from '../../../common/globalFont';
|
||||
|
||||
onLoad(() => {
|
||||
getFonts()
|
||||
})
|
||||
|
||||
const oid = ref(0)
|
||||
const cookie = wx.getStorageSync("cookie") //请求头
|
||||
|
|
@ -69,7 +75,7 @@ import { baseUrl } from '../../../api/request';
|
|||
.text {
|
||||
color: #000000;
|
||||
font-size: 37.32rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 41.66rpx;
|
||||
}
|
||||
.text-wrapper {
|
||||
|
|
@ -82,7 +88,7 @@ import { baseUrl } from '../../../api/request';
|
|||
}
|
||||
.font {
|
||||
font-size: 37.62rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 35.41rpx;
|
||||
}
|
||||
.text_2 {
|
||||
|
|
|
|||
|
|
@ -49,25 +49,17 @@
|
|||
<script setup lang="ts">
|
||||
import { onMounted } from 'vue';
|
||||
import emitter from '../../../utils/emitter';
|
||||
onMounted(()=>{
|
||||
getFonts()
|
||||
})
|
||||
import { onLoad } from "@dcloudio/uni-app";
|
||||
import { getFonts } from '../../../common/globalFont';
|
||||
|
||||
onLoad(() => {
|
||||
getFonts()
|
||||
})
|
||||
|
||||
const closeFeeTips = () => {
|
||||
emitter.emit('closeFeeTips')
|
||||
}
|
||||
//获取字体
|
||||
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>
|
||||
|
||||
<style scoped lang="scss">
|
||||
|
|
|
|||
|
|
@ -65,6 +65,7 @@
|
|||
import bookingSelectedVue from "../component/bookingSelected.vue";
|
||||
import { baseUrl } from "../../../api/request";
|
||||
import { bookUrl } from "../../../common/globalImagesUrl";
|
||||
import { getFonts } from '../../../common/globalFont';
|
||||
const cookie = wx.getStorageSync("cookie") //请求头
|
||||
const id = ref({})
|
||||
const bookingSelected = ref(null)
|
||||
|
|
@ -73,6 +74,7 @@
|
|||
const bookingDateVOList =ref([])
|
||||
|
||||
onLoad((options) => {
|
||||
getFonts()
|
||||
console.log(options)
|
||||
id.value = options.id
|
||||
if (options.type) {
|
||||
|
|
@ -185,7 +187,7 @@
|
|||
}
|
||||
.font {
|
||||
font-size: 45rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
color: #000000;
|
||||
}
|
||||
.text {
|
||||
|
|
@ -197,7 +199,7 @@
|
|||
}
|
||||
.font_2 {
|
||||
font-size: 37.5rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 36.34rpx;
|
||||
color: #000000;
|
||||
}
|
||||
|
|
@ -218,7 +220,7 @@
|
|||
}
|
||||
.font_3 {
|
||||
font-size: 30rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 27.3rpx;
|
||||
color: #000000;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -62,6 +62,8 @@
|
|||
import {onMounted, ref} from 'vue'
|
||||
import { baseUrl } from '../../../api/request';
|
||||
import { bookUrl } from '../../../common/globalImagesUrl';
|
||||
import { onLoad } from "@dcloudio/uni-app";
|
||||
import { getFonts } from '../../../common/globalFont';
|
||||
|
||||
const cookie = wx.getStorageSync("cookie") //请求头
|
||||
const categoryList = ref([])
|
||||
|
|
@ -72,6 +74,10 @@
|
|||
const ids = ref([])
|
||||
const point = ref(0)
|
||||
|
||||
onLoad(() => {
|
||||
getFonts()
|
||||
})
|
||||
|
||||
onMounted( async () => {
|
||||
getFonts()
|
||||
await getAllCategory()
|
||||
|
|
|
|||
|
|
@ -112,6 +112,8 @@
|
|||
import confirmBookingInfoVue from '../component/confirmBookingInfo.vue';
|
||||
import { onLoad } from "@dcloudio/uni-app";
|
||||
import { bookUrl } from '../../../common/globalImagesUrl';
|
||||
import { getFonts } from '../../../common/globalFont';
|
||||
|
||||
|
||||
const cookie = wx.getStorageSync("cookie") //请求头
|
||||
const photoProduct = ref({})
|
||||
|
|
@ -204,6 +206,7 @@
|
|||
}
|
||||
|
||||
onLoad((options) => {
|
||||
getFonts()
|
||||
console.log(options)
|
||||
field.value = options.field
|
||||
number.value = options.number
|
||||
|
|
|
|||
|
|
@ -53,6 +53,11 @@
|
|||
import popupVue from '../../popup.vue';
|
||||
import emitter from '../../../utils/emitter';
|
||||
import { couponUrl } from '../../../common/globalImagesUrl';
|
||||
import { onLoad } from "@dcloudio/uni-app";
|
||||
import { getFonts } from '../../../common/globalFont';
|
||||
onLoad(() => {
|
||||
getFonts()
|
||||
})
|
||||
const cookie = wx.getStorageSync("cookie") //请求头
|
||||
|
||||
const couponList = ref([])
|
||||
|
|
@ -213,7 +218,7 @@
|
|||
}
|
||||
.font {
|
||||
font-size: 30rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 28.09rpx;
|
||||
color: #818181;
|
||||
}
|
||||
|
|
@ -234,13 +239,13 @@
|
|||
.text_2 {
|
||||
color: #000000;
|
||||
font-size: 30rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 25.78rpx;
|
||||
}
|
||||
.text_3 {
|
||||
color: #c35c5d;
|
||||
font-size: 60rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 40.09rpx;
|
||||
}
|
||||
.group {
|
||||
|
|
@ -254,7 +259,7 @@
|
|||
.text_4 {
|
||||
color: #000000;
|
||||
font-size: 24.38rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 21.34rpx;
|
||||
}
|
||||
.pos_3 {
|
||||
|
|
@ -274,7 +279,7 @@
|
|||
}
|
||||
.font_2 {
|
||||
font-size: 33.75rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 32.83rpx;
|
||||
color: #000000;
|
||||
}
|
||||
|
|
@ -292,7 +297,7 @@
|
|||
}
|
||||
.font_3 {
|
||||
font-size: 30rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 28.09rpx;
|
||||
color: #ffffff;
|
||||
}
|
||||
|
|
@ -301,7 +306,7 @@
|
|||
}
|
||||
.font_4 {
|
||||
font-size: 33.75rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 28.09rpx;
|
||||
color: #c35c5d;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,7 +21,11 @@
|
|||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
|
||||
import { onLoad } from "@dcloudio/uni-app";
|
||||
import { getFonts } from '../../../common/globalFont';
|
||||
onLoad(() => {
|
||||
getFonts()
|
||||
})
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
|
|
@ -59,7 +63,7 @@
|
|||
}
|
||||
.font {
|
||||
font-size: 30rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 35.63rpx;
|
||||
color: #000000;
|
||||
}
|
||||
|
|
@ -79,7 +83,7 @@
|
|||
}
|
||||
.font_2 {
|
||||
font-size: 33.75rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 32.44rpx;
|
||||
color: #000000;
|
||||
}
|
||||
|
|
@ -101,7 +105,7 @@
|
|||
}
|
||||
.font_3 {
|
||||
font-size: 30rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 28.95rpx;
|
||||
color: #000000;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -29,8 +29,14 @@
|
|||
<script setup lang="ts">
|
||||
import {onMounted, ref} from 'vue'
|
||||
import { baseUrl } from '../../../api/request';
|
||||
import { onShow } from "@dcloudio/uni-app";
|
||||
import { onShow, onLoad } from "@dcloudio/uni-app";
|
||||
import { getFonts } from '../../../common/globalFont';
|
||||
const cookie = wx.getStorageSync("cookie") //请求头
|
||||
|
||||
onLoad(() => {
|
||||
getFonts()
|
||||
})
|
||||
|
||||
onMounted(() => {
|
||||
getCouponList()
|
||||
})
|
||||
|
|
@ -106,7 +112,7 @@
|
|||
}
|
||||
.font_2 {
|
||||
font-size: 37.5rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 29.42rpx;
|
||||
color: #c35c5c;
|
||||
}
|
||||
|
|
@ -149,7 +155,7 @@
|
|||
}
|
||||
.font_3 {
|
||||
font-size: 60rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 40.09rpx;
|
||||
color: #c35c5c;
|
||||
}
|
||||
|
|
@ -158,7 +164,7 @@
|
|||
}
|
||||
.font {
|
||||
font-size: 30rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 29.42rpx;
|
||||
color: #000000;
|
||||
}
|
||||
|
|
@ -167,7 +173,7 @@
|
|||
}
|
||||
.font_4 {
|
||||
font-size: 26.25rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 24.62rpx;
|
||||
color: #000000;
|
||||
}
|
||||
|
|
@ -177,13 +183,13 @@
|
|||
}
|
||||
.font_5 {
|
||||
font-size: 26.25rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 24.62rpx;
|
||||
color: #818181;
|
||||
}
|
||||
.font_6 {
|
||||
font-size: 26.25rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 31.88rpx;
|
||||
color: #818181;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,6 +28,13 @@
|
|||
<script setup lang="ts">
|
||||
import {onMounted, ref} from 'vue'
|
||||
import { baseUrl } from '../../../api/request';
|
||||
import { onLoad } from "@dcloudio/uni-app";
|
||||
import { getFonts } from '../../../common/globalFont';
|
||||
|
||||
onLoad(() => {
|
||||
getFonts()
|
||||
})
|
||||
|
||||
const cookie = wx.getStorageSync("cookie") //请求头
|
||||
onMounted(() => {
|
||||
getOverDueCouponList()
|
||||
|
|
@ -94,7 +101,7 @@
|
|||
}
|
||||
.font {
|
||||
font-size: 30rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 29.42rpx;
|
||||
color: #000000;
|
||||
}
|
||||
|
|
@ -103,7 +110,7 @@
|
|||
}
|
||||
.font_2 {
|
||||
font-size: 37.5rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 29.42rpx;
|
||||
color: #818181;
|
||||
}
|
||||
|
|
@ -145,7 +152,7 @@
|
|||
}
|
||||
.font_3 {
|
||||
font-size: 60rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 40.09rpx;
|
||||
color: #818181;
|
||||
}
|
||||
|
|
@ -154,13 +161,13 @@
|
|||
}
|
||||
.font_4 {
|
||||
font-size: 30rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 29.42rpx;
|
||||
color: #818181;
|
||||
}
|
||||
.font_5 {
|
||||
font-size: 26.25rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 24.62rpx;
|
||||
color: #818181;
|
||||
}
|
||||
|
|
@ -170,7 +177,7 @@
|
|||
}
|
||||
.font_6 {
|
||||
font-size: 26.25rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 31.88rpx;
|
||||
color: #818181;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,7 +11,11 @@
|
|||
<script setup lang="ts">
|
||||
import {nextTick, onMounted, ref} from 'vue'
|
||||
import emitter from '../../../utils/emitter'
|
||||
|
||||
import { onLoad } from "@dcloudio/uni-app";
|
||||
import { getFonts } from '../../../common/globalFont';
|
||||
onLoad(() => {
|
||||
getFonts()
|
||||
})
|
||||
const cancel = () => {
|
||||
emitter.emit('closeConfirmPopup')
|
||||
}
|
||||
|
|
@ -36,7 +40,7 @@
|
|||
.text {
|
||||
color: #000000;
|
||||
font-size: 42.32rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 41.17rpx;
|
||||
}
|
||||
.text-wrapper {
|
||||
|
|
@ -49,7 +53,7 @@
|
|||
}
|
||||
.font {
|
||||
font-size: 37.62rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 35.41rpx;
|
||||
}
|
||||
.text_2 {
|
||||
|
|
|
|||
|
|
@ -70,6 +70,11 @@
|
|||
import { baseUrl } from '../../../api/request';
|
||||
import { onShow } from "@dcloudio/uni-app";
|
||||
import { couponUrl } from '../../../common/globalImagesUrl';
|
||||
import { onLoad } from "@dcloudio/uni-app";
|
||||
import { getFonts } from '../../../common/globalFont';
|
||||
onLoad(() => {
|
||||
getFonts()
|
||||
})
|
||||
const checkedArr = ref([])
|
||||
const idx = ref(-1)
|
||||
const isShow = ref(true)
|
||||
|
|
|
|||
|
|
@ -54,6 +54,7 @@
|
|||
import {inject, ref} from 'vue'
|
||||
import { baseUrl, testUrl , suiUrl} from '@/api/request';
|
||||
import { onShow,onLoad } from "@dcloudio/uni-app";
|
||||
import { getFonts } from '../../common/globalFont';
|
||||
onShow(() => {
|
||||
uni.removeStorageSync('businessId')
|
||||
getMyUser()
|
||||
|
|
@ -103,28 +104,7 @@ const jumpToActivity = () => {
|
|||
})
|
||||
}
|
||||
|
||||
const getFonts =()=>{
|
||||
uni.loadFontFace({
|
||||
family: 'ZhongShanFonts',
|
||||
source: `url("https://carbon2.obs.cn-north-4.myhuaweicloud.com/fonts/ZhongShanFonts.ttf")`,
|
||||
success:(res) =>{
|
||||
console.log('success',res);
|
||||
},
|
||||
fail:(err) => {
|
||||
console.log('err',err);
|
||||
}
|
||||
})
|
||||
uni.loadFontFace({
|
||||
family: 'FangZhengFonts',
|
||||
source: `url("https://carbon2.obs.cn-north-4.myhuaweicloud.com/fonts/FangZhengFonts.TTF")`,
|
||||
success:(res) =>{
|
||||
console.log('success',res);
|
||||
},
|
||||
fail:(err) => {
|
||||
console.log('err',err);
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
//为了上架的提示框
|
||||
const showTest = ref(false)
|
||||
const showStop =()=>{
|
||||
|
|
|
|||
|
|
@ -20,8 +20,11 @@
|
|||
import { ref } from 'vue'
|
||||
import { baseUrl, testUrl , suiUrl} from '@/api/request';
|
||||
import { onMounted } from 'vue';
|
||||
onMounted(()=>{
|
||||
getFonts() //获取字体
|
||||
import { onLoad } from "@dcloudio/uni-app";
|
||||
import { getFonts } from '../../common/globalFont';
|
||||
|
||||
onLoad(() => {
|
||||
getFonts()
|
||||
})
|
||||
const login = () => {
|
||||
uni.login({
|
||||
|
|
@ -65,28 +68,7 @@ const loginUser = async ( code ) =>{
|
|||
return;
|
||||
}
|
||||
}
|
||||
const getFonts =()=>{ //获取字体
|
||||
uni.loadFontFace({
|
||||
family: 'FangZhengXiaoZhuan',
|
||||
source: `url("https://carbon2.obs.cn-north-4.myhuaweicloud.com/fonts/FangZhengXiaoZhuan.ttf")`,
|
||||
success:(res) =>{
|
||||
console.log('success',res);
|
||||
},
|
||||
fail:(err) => {
|
||||
console.log('err',err);
|
||||
}
|
||||
})
|
||||
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>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
|
|
|
|||
|
|
@ -56,6 +56,12 @@
|
|||
<script setup>
|
||||
import { ref, onMounted, watch } from 'vue'
|
||||
import { baseUrl } from '../../../api/request'
|
||||
import { onLoad } from "@dcloudio/uni-app";
|
||||
import { getFonts } from '../../../common/globalFont';
|
||||
|
||||
onLoad(() => {
|
||||
getFonts()
|
||||
})
|
||||
|
||||
onMounted(() => {
|
||||
getContacts()
|
||||
|
|
@ -312,7 +318,7 @@ const close1 = () => {
|
|||
.text {
|
||||
color: #323232;
|
||||
font-size: 37.5rpx;
|
||||
font-family: Open Sans;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 35.21rpx;
|
||||
}
|
||||
|
||||
|
|
@ -345,14 +351,14 @@ const close1 = () => {
|
|||
|
||||
.font {
|
||||
font-size: 30rpx;
|
||||
font-family: Open Sans;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 27.19rpx;
|
||||
color: #323232;
|
||||
}
|
||||
|
||||
.font_2 {
|
||||
font-size: 30rpx;
|
||||
font-family: Open Sans;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 22.05rpx;
|
||||
color: #323232;
|
||||
}
|
||||
|
|
@ -382,7 +388,7 @@ const close1 = () => {
|
|||
.text_2 {
|
||||
color: #ffffff;
|
||||
font-size: 33.75rpx;
|
||||
font-family: Open Sans;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 31.22rpx;
|
||||
}
|
||||
// .pop{
|
||||
|
|
|
|||
|
|
@ -39,8 +39,14 @@
|
|||
import { ref, onMounted, nextTick, onUnmounted } from 'vue'
|
||||
import { baseUrl } from '../../../api/request'
|
||||
import { onShow, onLoad } from "@dcloudio/uni-app";
|
||||
import { getFonts } from '../../../common/globalFont';
|
||||
import emitter from '../../../utils/emitter';
|
||||
import contactPopVue from '../component/contactPop.vue'; //导入联系人弹窗
|
||||
|
||||
onLoad(() => {
|
||||
getFonts()
|
||||
})
|
||||
|
||||
const ContactArr = ref() //联系人数组
|
||||
const popup = ref(null) //弹窗对象
|
||||
const closeContactPopHandler = () => {
|
||||
|
|
@ -125,19 +131,7 @@
|
|||
}
|
||||
})
|
||||
}
|
||||
//获取字体
|
||||
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>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
<template>
|
||||
<view>
|
||||
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script setup >
|
||||
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
|
||||
</style>
|
||||
|
|
@ -38,11 +38,12 @@
|
|||
<script setup>
|
||||
import { ref, onMounted } from 'vue'
|
||||
import { baseUrl } from '../../../api/request';
|
||||
import { onShow } from '@dcloudio/uni-app';
|
||||
const items = ref([null,null,null,null,null,null,null,null,null])
|
||||
import { onShow, onLoad } from '@dcloudio/uni-app';
|
||||
import { getFonts } from '../../../common/globalFont';
|
||||
const addressArr = ref([]) //地址数组
|
||||
onMounted(()=>{
|
||||
getFonts() //获取字体
|
||||
|
||||
onLoad(() => {
|
||||
getFonts()
|
||||
})
|
||||
onShow(()=>{
|
||||
getAddress()
|
||||
|
|
@ -101,19 +102,7 @@ const jump_newAddress =()=> {
|
|||
url: '/pages/Shopping-cart/newaddress_Info/newaddress_Info'
|
||||
})
|
||||
}
|
||||
//获取字体
|
||||
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>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
|
|
|
|||
|
|
@ -27,7 +27,13 @@
|
|||
import {ref , onMounted, onUnmounted} from 'vue'
|
||||
import { testUrl , baseUrl , suiUrl } from '../../../api/request';
|
||||
import { onLoad, onShow } from '@dcloudio/uni-app';
|
||||
import { getFonts } from '../../../common/globalFont';
|
||||
import emitter from '../../../utils/emitter';
|
||||
|
||||
onLoad(() => {
|
||||
getFonts()
|
||||
})
|
||||
|
||||
const contactParam = ref({
|
||||
name: "",
|
||||
phone: "",
|
||||
|
|
@ -46,8 +52,9 @@ const contactInfoHandler = (val) => {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
onMounted(()=>{
|
||||
getFonts() //获取字体
|
||||
emitter.on('contactInfo', contactInfoHandler)
|
||||
defaultAddress()
|
||||
})
|
||||
|
|
@ -122,19 +129,7 @@ const closePop = () =>{ //关闭弹窗方法
|
|||
contactParam.value.isDefault = 0
|
||||
emitter.emit('closeContactPop')
|
||||
}
|
||||
//获取字体
|
||||
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>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
|
|
|
|||
|
|
@ -115,8 +115,13 @@ import {
|
|||
} from "@dcloudio/uni-app";
|
||||
import { baseUrl } from '../../../api/request';
|
||||
|
||||
onMounted(() => {
|
||||
import { getFonts } from '../../../common/globalFont';
|
||||
|
||||
onLoad(() => {
|
||||
getFonts() //启动使从服务器下载字体
|
||||
})
|
||||
|
||||
onMounted(() => {
|
||||
getMyUser()
|
||||
})
|
||||
|
||||
|
|
@ -148,18 +153,6 @@ const jumpToMyCoupon = () => {
|
|||
})
|
||||
}
|
||||
|
||||
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);
|
||||
}
|
||||
})
|
||||
}
|
||||
const jump_addressList = () => {
|
||||
uni.navigateTo({
|
||||
url: '/pages/mine/addressList/addressList'
|
||||
|
|
|
|||
|
|
@ -1,776 +0,0 @@
|
|||
<template>
|
||||
<view class="flex-row relative page">
|
||||
<view class="flex-row justify-center items-center section_2 pos">
|
||||
<image class="image"
|
||||
src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FVrgKnxCu-sousuo.png" />
|
||||
<text class="font text ml-4">搜索订单</text>
|
||||
</view>
|
||||
<view class="flex-col section_44">
|
||||
<view class="flex-row justify-between self-stretch groupp">
|
||||
<view class="font_22" :class="{ active: orderStatus === '全部', selected: isSelected('全部') }"
|
||||
@click="changeTab('全部')">
|
||||
全部
|
||||
</view>
|
||||
<view class="font_22" :class="{ active: orderStatus === '待支付', selected: isSelected('待支付') }"
|
||||
@click="changeTab('待支付')">
|
||||
待支付
|
||||
</view>
|
||||
<view class="font_22" :class="{ active: orderStatus === '待发货', selected: isSelected('待发货') }"
|
||||
@click="changeTab('待发货')">
|
||||
待发货
|
||||
</view>
|
||||
<view class="font_22" :class="{ active: orderStatus === '待收货', selected: isSelected('待收货') }"
|
||||
@click="changeTab('待收货')">
|
||||
已发货
|
||||
</view>
|
||||
<view class="font_22" :class="{ active: orderStatus === '已退款', selected: isSelected('已退款') }"
|
||||
@click="changeTab('已退款')">
|
||||
售后/退款
|
||||
</view>
|
||||
</view>
|
||||
|
||||
|
||||
<view class="flex-col pos_8">
|
||||
<view class="flex-col section_4 list-item_1 mt-14" v-for="(order, index) in Status.displayedOrders"
|
||||
:key="order.id" @click="goToText(order)">
|
||||
<view class="flex-col">
|
||||
<view class="flex-row items-center self-stretch mt-2" style="display: flex; justify-content: space-between;">
|
||||
<view>
|
||||
<text class="font_4">订单编号：</text>
|
||||
<text class="font_5 ml-5">{{order.orderNumber}}</text>
|
||||
</view>
|
||||
<view style="width: 150rpx; display: flex; justify-content: space-between;">
|
||||
<view><text v-if="order.orderStatus === '待支付'" class="font_status text_5">{{ order.countdown }}</text></view>
|
||||
<view><text class="font_status text_5">{{ order.orderStatus }}</text></view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="flex-col group">
|
||||
<view class="flex-row justify-between list-item group_3" v-for="(item,goodIndex) in order.orderItemList"
|
||||
:key="goodIndex">
|
||||
<view class="flex-row">
|
||||
<image class="image_2" :src="item.goodSnapshot.goodImg.split(';')[0]" />
|
||||
<view class="flex-col self-start group_1 ml-18">
|
||||
<view class="flex-row self-stretch">
|
||||
<text class="font">{{ item.goodSnapshot.name }}</text>
|
||||
<text class="font text_10">【{{ item.goodSnapshot.type }}】</text>
|
||||
</view>
|
||||
<text class="self-start font_7 text_12 mt-36">x{{ item.quantity }}</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="flex-row items-center self-start group_2">
|
||||
￥ {{ item.goodSnapshot.price }}
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="divider view_1"></view>
|
||||
<!-- <view class="flex-row justify-end group_5">
|
||||
<view v-if="order.orderStatus==='待支付'" class="font text_18">去支付</view>
|
||||
<view v-if="order.orderStatus==='待发货'" class="font text_18">取消订单</view>
|
||||
<view v-if="order.orderStatus==='已发货'" class="font text_18">确认收货</view>
|
||||
<view v-if="order.orderStatus==='已退款'" class="font text_18">售后详情</view>
|
||||
</view> -->
|
||||
<view class="flex-row justify-end items-center view">
|
||||
<text class="font_9 text_16">总金额：</text>
|
||||
<image class="image_4 image_5"
|
||||
src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FJmxvlQvD-rmbpink.png" />
|
||||
<text class="font_8 text_17">{{order.totalAmount}}</text>
|
||||
</view>
|
||||
<!-- <view class="flex-row justify-end group_7"> -->
|
||||
<!-- <view class="flex-col justify-start items-center text-wrapper"><text
|
||||
class="font text_18">删除记录</text></view>
|
||||
<view class="flex-col justify-start items-center text-wrapper_2 ml-14" v-if="order.orderStatus==='待支付'">
|
||||
<text class="font_3">去支付</text>
|
||||
</view>
|
||||
<view class="flex-col justify-start items-center text-wrapper_2 ml-14" v-if="order.orderStatus==='待发货'">
|
||||
<text class="font_3">取消订单</text>
|
||||
</view>
|
||||
<view class="flex-col justify-start items-center text-wrapper_2 ml-14" v-if="order.orderStatus==='已发货'">
|
||||
<text class="font_3">确认收货</text>
|
||||
</view>
|
||||
<view class="flex-col justify-start items-center text-wrapper_2 ml-14" v-if="order.orderStatus==='已退款'">
|
||||
<text class="font_3">已退款</text>
|
||||
</view> -->
|
||||
<!-- </view> -->
|
||||
<view @click.stop>
|
||||
<view class="flex-row justify-end group_7" v-if="order.orderStatus==='待支付'">
|
||||
<view class="flex-col justify-start items-center text-wrapper" @click="cancelOrder(order)"><text
|
||||
class="font text_18">取消订单</text></view>
|
||||
<view class="flex-col justify-start items-center text-wrapper_2 ml-14" @click="wxPayFd(order)">
|
||||
<text class="font_3">去支付</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="flex-row justify-end group_7" v-if="order.orderStatus==='待发货'">
|
||||
<view class="flex-col justify-start items-center text-wrapper_2 ml-14">
|
||||
<text class="font_3">联系客服</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="flex-row justify-end group_7" v-if="order.orderStatus==='待收货'">
|
||||
<view class="flex-col justify-start items-center text-wrapper_2 ml-14" @click="viewLogistics(order.id)">
|
||||
<text class="font_3">查看物流</text>
|
||||
</view>
|
||||
<view class="flex-col justify-start items-center text-wrapper ml-14" @click="confirm()">
|
||||
<text class="font">确认收货</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="flex-row justify-end group_7" v-if="order.orderStatus==='已退款' || order.orderStatus === '交易关闭'">
|
||||
<view class="flex-col justify-start items-center text-wrapper" @click="deleteOrder()"><text
|
||||
class="font text_18">删除订单</text></view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<!-- 遮罩层 -->
|
||||
<view v-if="isShow" class="overlay"></view>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { ref,onMounted,toRaw, onBeforeUnmount } from 'vue';
|
||||
import { baseUrl } from '@/api/request';
|
||||
import { onLoad } from "@dcloudio/uni-app";
|
||||
const Status = ref({
|
||||
orderStatus: '全部',
|
||||
orders: [],
|
||||
displayedOrders: [],
|
||||
})
|
||||
const orderStatus = '' //订单状态
|
||||
const currentColor = ref(0);
|
||||
var plugin = requirePlugin('logisticsPlugin') //微信插件
|
||||
let waybillToken = '' //物流信息唯一标识符
|
||||
const isSelected = (tab) => Status.value.orderStatus === tab
|
||||
onMounted(async () => {
|
||||
await Getorder()
|
||||
if (Status.value.orderStatus === '全部') {
|
||||
Status.value.displayedOrders = Status.value.orders;
|
||||
console.log('Status.value.displayedOrders--->',Status.value.displayedOrders);
|
||||
} else {
|
||||
Status.value.displayedOrders = Status.value.orders.filter((order) => {
|
||||
switch (Status.value.orderStatus) {
|
||||
case '待支付':
|
||||
return order.orderStatus === '待支付'
|
||||
case '待发货':
|
||||
return order.orderStatus === '待发货'
|
||||
case '已发货':
|
||||
return order.orderStatus === '待收货'
|
||||
case '待收货':
|
||||
return order.orderStatus === '已退款'
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
})
|
||||
}
|
||||
getFonts()
|
||||
})
|
||||
|
||||
const userInfo = wx.getStorageSync('userInfo')
|
||||
const Getorder = async () => {
|
||||
const res = await uni.request({
|
||||
url: baseUrl + '/order/list',
|
||||
method: 'POST',
|
||||
header: {
|
||||
cookie: wx.getStorageSync('cookie')
|
||||
}
|
||||
})
|
||||
if (res.data.code === 1) {
|
||||
Status.value.orders = res.data.data
|
||||
Status.value.orders.forEach((order) => {
|
||||
startCountdown(order)
|
||||
})
|
||||
// console.log('Status.value.orders--->',Status.value.orders);
|
||||
} else {
|
||||
console.log('没拿到用户数据')
|
||||
}
|
||||
}
|
||||
const zt = ref({
|
||||
tab:''
|
||||
})
|
||||
onLoad((options)=>{
|
||||
zt.value.tab = JSON.parse(options.zt)
|
||||
changeTab(zt.value.tab)
|
||||
})
|
||||
const changeTab = (tab) => {
|
||||
if (tab === '全部') {
|
||||
Status.value.displayedOrders = Status.value.orders;
|
||||
Status.value.orderStatus = '全部';
|
||||
} else {
|
||||
Status.value.displayedOrders = Status.value.orders.filter((order) => {
|
||||
switch (tab) {
|
||||
case '待支付':
|
||||
return order.orderStatus === '待支付';
|
||||
case '待发货':
|
||||
return order.orderStatus === '待发货';
|
||||
case '待收货':
|
||||
return order.orderStatus === '待收货';
|
||||
case '已退款':
|
||||
return order.orderStatus === '已退款';
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
})
|
||||
Status.value.orderStatus = tab
|
||||
}
|
||||
}
|
||||
const goToText = (orderInfo) => {
|
||||
console.log('订单信息--->',orderInfo);
|
||||
if(orderInfo.orderType === 'product') {
|
||||
uni.navigateTo({
|
||||
url: '../../../pages/order/product-paysuccess/product-paysuccess?oid=' + JSON.stringify(orderInfo.id)
|
||||
})
|
||||
} else {
|
||||
uni.navigateTo({
|
||||
url: '../../../pages/order/service-paystatus/service-paystatus?oid=' + JSON.stringify(orderInfo.id)
|
||||
})
|
||||
}
|
||||
}
|
||||
const cancelOrder = async (order) => { //取消订单
|
||||
console.log(order);
|
||||
uni.showModal({
|
||||
title: '提示',
|
||||
content: '确定要取消订单吗?',
|
||||
success:(e) => {
|
||||
if(e.confirm) {
|
||||
postCancelOrder(order)
|
||||
} else if(e.cancel) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
const wxPay = async( oid )=> { //传入订单id
|
||||
try {
|
||||
const res = await uni.request({
|
||||
url: baseUrl + '/wechat/payment/create',
|
||||
method: 'POST',
|
||||
header: {
|
||||
'cookie': wx.getStorageSync("cookie")
|
||||
},
|
||||
data: { id: oid }
|
||||
})
|
||||
const paymentData = res.data.data
|
||||
wx.requestPayment({
|
||||
appid: paymentData.appId,
|
||||
nonceStr: paymentData.nonceStr,
|
||||
package: paymentData.packageVal,
|
||||
paySign: paymentData.paySign,
|
||||
timeStamp: paymentData.timeStamp,
|
||||
signType: paymentData.signType,
|
||||
success(res) {
|
||||
uni.showModal({
|
||||
content: '支付成功',
|
||||
showCancel: false
|
||||
})
|
||||
uni.redirectTo({
|
||||
url: '/pages/order/product-paysuccess/product-paysuccess?oid=' + JSON.stringify(oid)
|
||||
})
|
||||
console.log('支付成功res--->',res);
|
||||
},
|
||||
fail(e) {
|
||||
// uni.showModal({
|
||||
// content: '支付失败，原因为:' + e.errMsg,
|
||||
// showCancel: false
|
||||
// })
|
||||
// console.log('e.errMsg--->',e.errMsg);
|
||||
|
||||
}
|
||||
})
|
||||
}catch(error) {
|
||||
console.error('支付请求失败',error);
|
||||
uni.showModal({
|
||||
content: '支付请求失败,请重试。',
|
||||
showCancel: false
|
||||
})
|
||||
}
|
||||
}
|
||||
const postCancelOrder = async(order)=>{ //向后端发送取消订单请求
|
||||
if(order.addressSnapshot != null) {
|
||||
const res = await uni.request({
|
||||
url: baseUrl + '/order/cancel/id',
|
||||
method: 'POST',
|
||||
header: {
|
||||
cookie: wx.getStorageSync('cookie')
|
||||
},
|
||||
data: { id: order.id }
|
||||
})
|
||||
console.log('取消订单的信息--->',res.data);
|
||||
if(res.data.code === 1) {
|
||||
Getorder() //成功请求后获取订单信息
|
||||
uni.redirectTo({
|
||||
url: '/pages/mine/mineorders/mineorders?zt=' + JSON.stringify(Status.value.orderStatus)
|
||||
})
|
||||
}
|
||||
} else {
|
||||
const res = await uni.request({
|
||||
url: baseUrl + '/order/cancel/service/id',
|
||||
method: 'POST',
|
||||
header: {
|
||||
cookie: wx.getStorageSync('cookie')
|
||||
},
|
||||
data: { id: order.id }
|
||||
})
|
||||
console.log('取消订单的信息--->',res.data);
|
||||
if(res.data.code === 1) {
|
||||
Getorder() //成功请求后获取订单信息
|
||||
uni.redirectTo({
|
||||
url: '/pages/mine/mineorders/mineorders?zt=' + JSON.stringify(Status.value.orderStatus)
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
//查看物流方法
|
||||
const viewLogistics = ( oid )=>{
|
||||
// console.log('订单编号--->',oid);
|
||||
uni.request({
|
||||
url: baseUrl + '/logistics/get/info',
|
||||
method: 'POST',
|
||||
data: {
|
||||
id: oid
|
||||
},
|
||||
header: {
|
||||
'cookie': wx.getStorageSync("cookie")
|
||||
},
|
||||
success: (res) => {
|
||||
console.log(res.data.data)
|
||||
waybillToken = res.data.data.waybill_token
|
||||
plugin.openWaybillTracking({
|
||||
waybillToken: waybillToken
|
||||
})
|
||||
}
|
||||
})
|
||||
}
|
||||
const deleteOrder = async () => { //删除订单方法
|
||||
console.log('删除订单方法');
|
||||
}
|
||||
//获取字体
|
||||
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);
|
||||
}
|
||||
})
|
||||
}
|
||||
const confirm =()=> { //确认收货方法
|
||||
console.log('确认收货方法');
|
||||
}
|
||||
//防抖相关变量
|
||||
let debounceTimer = null;
|
||||
let wxPayTimer = null;
|
||||
let loading = false;
|
||||
let isLoading = ref(false)
|
||||
let isShow = ref(false)
|
||||
const wxPayFd = (order) => { //微信支付按钮防抖
|
||||
clearTimeout(wxPayTimer)
|
||||
showLoading()
|
||||
isShow.value = true //打开遮罩
|
||||
wxPayTimer = setTimeout(async () => {
|
||||
await wxPay(order.id)
|
||||
}, 1000)
|
||||
setTimeout(()=>{
|
||||
hideLoading()
|
||||
isShow.value = false //关闭遮罩
|
||||
},2000)
|
||||
}
|
||||
function showLoading() { //加载弹窗
|
||||
if (!loading) {
|
||||
wx.showLoading({
|
||||
title: '加载中...',
|
||||
});
|
||||
loading = true;
|
||||
isLoading.value = true
|
||||
}
|
||||
}
|
||||
function hideLoading() { //关闭弹窗
|
||||
if (loading) {
|
||||
wx.hideLoading();
|
||||
loading = false;
|
||||
isLoading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
const updateOrderList = async () => {
|
||||
const res = await uni.request({
|
||||
url: baseUrl + '/order/list',
|
||||
method: 'POST',
|
||||
header: {
|
||||
cookie: wx.getStorageSync('cookie')
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
// 时间格式化函数，处理后端返回的时间
|
||||
const parseDate = (dateString) => {
|
||||
const [date, time] = dateString.split(' ');
|
||||
const [year, month, day] = date.split('-').map(Number);
|
||||
const [hour, minute, second] = time.split(':').map(Number);
|
||||
return new Date(year, month - 1, day, hour, minute, second); // JavaScript Date的月份是从0开始的
|
||||
};
|
||||
|
||||
// 给订单创建时间加上30分钟
|
||||
const add30Minutes = (createdTime) => {
|
||||
const date = parseDate(createdTime);
|
||||
date.setMinutes(date.getMinutes() + 2); // 加上30分钟
|
||||
return Math.floor(date.getTime() / 1000); // 返回时间戳（秒）
|
||||
};
|
||||
|
||||
// 启动每个订单的倒计时（仅对待支付订单有效）
|
||||
const startCountdown = (order) => {
|
||||
if (order.orderStatus === '待支付') {
|
||||
order.endTime = add30Minutes(order.createTime); // 设置最终取消时间
|
||||
order.countdownInterval = setInterval(() => {
|
||||
const now = Math.floor(Date.now() / 1000); // 获取当前时间的时间戳（秒）
|
||||
const remainingTime = order.endTime - now;
|
||||
|
||||
if (remainingTime <= 0) {
|
||||
order.countdown = '00:00';
|
||||
clearInterval(order.countdownInterval); // 清除定时器
|
||||
order.orderStatus = '交易关闭'
|
||||
uni.showModal({
|
||||
title: '提示',
|
||||
content: '订单超时未支付，已取消',
|
||||
showCancel: false
|
||||
})
|
||||
} else {
|
||||
const minutes = Math.floor(remainingTime / 60); // 计算剩余分钟
|
||||
const seconds = remainingTime % 60; // 计算剩余秒数
|
||||
order.countdown = `${String(minutes).padStart(2, '0')}:${String(seconds).padStart(2, '0')}`;
|
||||
}
|
||||
}, 1000);
|
||||
}
|
||||
};
|
||||
|
||||
// 在组件挂载时启动待支付订单的倒计时
|
||||
|
||||
|
||||
// 在组件卸载时清除所有定时器，避免内存泄漏
|
||||
onBeforeUnmount(() => {
|
||||
Status.value.orders.forEach(order => {
|
||||
if (order.countdownInterval) {
|
||||
clearInterval(order.countdownInterval);
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.overlay {
|
||||
position: fixed;
|
||||
top: 0;
|
||||
left: 0;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
background-color: rgba(0, 0, 0, 0.4); /* 半透明黑色背景 */
|
||||
z-index: 999;
|
||||
}
|
||||
.groupp {
|
||||
padding: 22.5rpx 0 18.75rpx;
|
||||
}
|
||||
.section_44 {
|
||||
padding-left: 33.75rpx;
|
||||
padding-right: 30rpx;
|
||||
width: 100%;
|
||||
height: 120rpx;
|
||||
margin-top: 80rpx;
|
||||
}
|
||||
.ml-5 {
|
||||
margin-left: 9.38rpx;
|
||||
}
|
||||
.font_22.selected {
|
||||
position: relative;
|
||||
}
|
||||
.font_22.selected::after {
|
||||
content: '';
|
||||
position: absolute;
|
||||
bottom: -5px; // 调整线条距离底部的距离
|
||||
left: 0;
|
||||
right: 0;
|
||||
height: 2px; // 调整线条的粗细
|
||||
background-color: #f6aaa4; // 调整线条颜色
|
||||
transition: all 0.3s ease; // 添加过渡效果
|
||||
}
|
||||
.page {
|
||||
padding: 46.88rpx 22.5rpx 401.25rpx;
|
||||
background-color: #ffffff;
|
||||
background-image: url('https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FQfLHXSAU-feiyigongfangbeijin.png');
|
||||
background-size: 100% 100%;
|
||||
background-repeat: no-repeat;
|
||||
height: 100vh;
|
||||
width: 100%;
|
||||
overflow-y: auto;
|
||||
overflow-x: hidden;
|
||||
}
|
||||
.section_2 {
|
||||
padding: 9.38rpx 0;
|
||||
background-color: #ffffff;
|
||||
border-radius: 75rpx;
|
||||
}
|
||||
.pos {
|
||||
position: absolute;
|
||||
left: 35.63rpx;
|
||||
right: 35.63rpx;
|
||||
top: 46.88rpx;
|
||||
}
|
||||
.image {
|
||||
width: 37.5rpx;
|
||||
height: 37.5rpx;
|
||||
}
|
||||
.font {
|
||||
font-size: 26.25rpx;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 25.54rpx;
|
||||
color: #323232;
|
||||
}
|
||||
.text {
|
||||
color: #c0c0c0;
|
||||
line-height: 25.84rpx;
|
||||
}
|
||||
.font_2 {
|
||||
font-size: 30rpx;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 28.84rpx;
|
||||
color: #323232;
|
||||
}
|
||||
.font_22 {
|
||||
font-size: 30rpx;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 27.81rpx;
|
||||
color: #323232;
|
||||
}
|
||||
.text_2 {
|
||||
line-height: 28.48rpx;
|
||||
}
|
||||
.pos_2 {
|
||||
position: absolute;
|
||||
left: 33.99rpx;
|
||||
top: 146.36rpx;
|
||||
}
|
||||
.text_3 {
|
||||
line-height: 28.24rpx;
|
||||
}
|
||||
.pos_3 {
|
||||
position: absolute;
|
||||
left: 147.66rpx;
|
||||
top: 146.14rpx;
|
||||
}
|
||||
.pos_4 {
|
||||
position: absolute;
|
||||
left: 295.78rpx;
|
||||
top: 145.78rpx;
|
||||
}
|
||||
.pos_5 {
|
||||
position: absolute;
|
||||
right: 214.22rpx;
|
||||
top: 145.78rpx;
|
||||
}
|
||||
.text_4 {
|
||||
line-height: 29.53rpx;
|
||||
}
|
||||
.pos_6 {
|
||||
position: absolute;
|
||||
right: 34.22rpx;
|
||||
top: 147.07rpx;
|
||||
}
|
||||
.section_3 {
|
||||
background-color: #ffaaa5;
|
||||
width: 73.13rpx;
|
||||
height: 5.63rpx;
|
||||
}
|
||||
.pos_7 {
|
||||
position: absolute;
|
||||
left: 30rpx;
|
||||
top: 182.81rpx;
|
||||
}
|
||||
.pos_8 {
|
||||
position: absolute;
|
||||
left: 22.5rpx;
|
||||
right: 30rpx;
|
||||
top: 217.5rpx;
|
||||
}
|
||||
.section_4 {
|
||||
padding: 34.61rpx 31rpx 31.88rpx;
|
||||
background-color: #ffffff;
|
||||
border-radius: 31.88rpx;
|
||||
}
|
||||
.list-item_1:first-child {
|
||||
margin-top: 0;
|
||||
}
|
||||
.list-item_1:last-child {
|
||||
margin-bottom: 30rpx;
|
||||
}
|
||||
.font_status {
|
||||
// font-size: 26.25rpx;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 25.54rpx;
|
||||
color: #ffaaa5;
|
||||
}
|
||||
.font_3 {
|
||||
font-size: 26.25rpx;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 25.54rpx;
|
||||
color: #ffaaa5;
|
||||
}
|
||||
.text_5 {
|
||||
line-height: 24.62rpx;
|
||||
}
|
||||
.font_4 {
|
||||
font-size: 22.5rpx;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 22.14rpx;
|
||||
color: #818181;
|
||||
}
|
||||
.font_5 {
|
||||
font-size: 22.5rpx;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 15.04rpx;
|
||||
color: #818181;
|
||||
}
|
||||
.group {
|
||||
margin-top: 29.21rpx;
|
||||
}
|
||||
.list-item:first-child {
|
||||
margin-top: 0;
|
||||
}
|
||||
.image_2 {
|
||||
border-radius: 9.38rpx;
|
||||
width: 146.25rpx;
|
||||
height: 144.38rpx;
|
||||
}
|
||||
.group_1 {
|
||||
margin-top: 2.33rpx;
|
||||
}
|
||||
.text_10 {
|
||||
line-height: 25.01rpx;
|
||||
}
|
||||
.font_7 {
|
||||
font-size: 26.25rpx;
|
||||
font-family: Open Sans;
|
||||
line-height: 19.29rpx;
|
||||
color: #323232;
|
||||
}
|
||||
.text_12 {
|
||||
margin-left: 5.34rpx;
|
||||
line-height: 18.73rpx;
|
||||
}
|
||||
.group_2 {
|
||||
margin-right: 8.23rpx;
|
||||
margin-top: 89.19rpx;
|
||||
}
|
||||
.font_6 {
|
||||
font-size: 33.75rpx;
|
||||
font-family: Open Sans;
|
||||
line-height: 25.54rpx;
|
||||
font-weight: 600;
|
||||
color: #323232;
|
||||
}
|
||||
.text_11 {
|
||||
margin-left: 25.03rpx;
|
||||
line-height: 24.88rpx;
|
||||
}
|
||||
.image_3 {
|
||||
margin-left: -90.66rpx;
|
||||
width: 30rpx;
|
||||
height: 26.25rpx;
|
||||
}
|
||||
.font_8 {
|
||||
font-size: 26.25rpx;
|
||||
font-family: Open Sans;
|
||||
line-height: 19.29rpx;
|
||||
font-weight: 600;
|
||||
color: #323232;
|
||||
}
|
||||
.text_13 {
|
||||
margin-left: 61.14rpx;
|
||||
}
|
||||
.divider {
|
||||
background-color: #dad2d2;
|
||||
height: 0.81rpx;
|
||||
}
|
||||
.view_1 {
|
||||
margin: 30.43rpx 28.13rpx 0 39.38rpx;
|
||||
}
|
||||
.group_5 {
|
||||
margin-top: 49.41rpx;
|
||||
padding: 0 21.21rpx;
|
||||
color: #ffaaa5;
|
||||
}
|
||||
.font_9 {
|
||||
font-size: 26.25rpx;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 25.54rpx;
|
||||
color: #000000;
|
||||
}
|
||||
.text_14 {
|
||||
line-height: 24.62rpx;
|
||||
}
|
||||
.text_15 {
|
||||
margin-top: 2.17rpx;
|
||||
line-height: 24rpx;
|
||||
}
|
||||
.view {
|
||||
margin-top: 19.93rpx;
|
||||
padding: 0 19.54rpx;
|
||||
}
|
||||
.text_16 {
|
||||
margin-right: 6.99rpx;
|
||||
line-height: 24.3rpx;
|
||||
}
|
||||
.image_4 {
|
||||
width: 31.88rpx;
|
||||
height: 30rpx;
|
||||
}
|
||||
.image_5 {
|
||||
margin-right: -8.29rpx;
|
||||
}
|
||||
.text_17 {
|
||||
color: #ffaaa5;
|
||||
line-height: 19.39rpx;
|
||||
}
|
||||
.group_7 {
|
||||
margin-top: 52.5rpx;
|
||||
padding: 0 9.38rpx;
|
||||
}
|
||||
.text-wrapper {
|
||||
padding: 13.86rpx 0 13.52rpx;
|
||||
background-color: #fffef8;
|
||||
border-radius: 75rpx;
|
||||
width: 155.63rpx;
|
||||
height: 56.25rpx;
|
||||
border: solid 1.88rpx #cbcbcb;
|
||||
}
|
||||
.text_18 {
|
||||
line-height: 25.13rpx;
|
||||
}
|
||||
.text-wrapper_2 {
|
||||
padding: 13.46rpx 0 13.5rpx;
|
||||
background-color: #fffef8;
|
||||
border-radius: 75rpx;
|
||||
width: 155.63rpx;
|
||||
height: 56.25rpx;
|
||||
border: solid 1.88rpx #ffaaa5;
|
||||
}
|
||||
.group_3 {
|
||||
margin-top: 15rpx;
|
||||
}
|
||||
@import url("../../../common/css/global.css");
|
||||
</style>
|
||||
|
|
@ -9,7 +9,12 @@
|
|||
</template>
|
||||
|
||||
<script setup>
|
||||
import { onLoad } from "@dcloudio/uni-app";
|
||||
import { getFonts } from '../../../common/globalFont';
|
||||
|
||||
onLoad(() => {
|
||||
getFonts()
|
||||
})
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
|
|
@ -22,7 +27,7 @@
|
|||
}
|
||||
.font {
|
||||
font-size: 26.25rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 25.84rpx;
|
||||
color: #e79ea1;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -132,6 +132,7 @@
|
|||
import { onLoad } from "@dcloudio/uni-app";
|
||||
import { baseUrl } from '../../../api/request';
|
||||
import { JudgeIsNullity } from '../../../common/globalFunction';
|
||||
import { getFonts } from '../../../common/globalFont';
|
||||
import emitter from '../../../utils/emitter';
|
||||
const order = ref({})
|
||||
const cookie = wx.getStorageSync('cookie')
|
||||
|
|
@ -147,6 +148,7 @@
|
|||
let isShow = ref(false)
|
||||
|
||||
onLoad((options) => {
|
||||
getFonts()
|
||||
orderId = options.id
|
||||
})
|
||||
|
||||
|
|
@ -431,7 +433,7 @@ button::after{
|
|||
}
|
||||
.font {
|
||||
font-size: 28.13rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 29.18rpx;
|
||||
color: #323232;
|
||||
}
|
||||
|
|
@ -441,7 +443,7 @@ button::after{
|
|||
}
|
||||
.font_2 {
|
||||
font-size: 24.38rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 29.18rpx;
|
||||
color: #818181;
|
||||
}
|
||||
|
|
@ -496,7 +498,7 @@ button::after{
|
|||
}
|
||||
.font_3 {
|
||||
font-size: 28.13rpx;
|
||||
font-family: Open Sans;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 22.18rpx;
|
||||
color: #323232;
|
||||
}
|
||||
|
|
@ -505,7 +507,7 @@ button::after{
|
|||
}
|
||||
.font_4 {
|
||||
font-size: 28.13rpx;
|
||||
font-family: Open Sans;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 18.73rpx;
|
||||
color: #323232;
|
||||
}
|
||||
|
|
@ -516,7 +518,7 @@ button::after{
|
|||
}
|
||||
.font_5 {
|
||||
font-size: 28.13rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 29.18rpx;
|
||||
color: #818181;
|
||||
}
|
||||
|
|
@ -525,7 +527,7 @@ button::after{
|
|||
}
|
||||
.font_6 {
|
||||
font-size: 28.13rpx;
|
||||
font-family: Open Sans;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 20.79rpx;
|
||||
color: #323232;
|
||||
}
|
||||
|
|
@ -552,7 +554,7 @@ button::after{
|
|||
.text_12 {
|
||||
color: #ffaaa5;
|
||||
font-size: 28.13rpx;
|
||||
font-family: Open Sans;
|
||||
font-family: FangZhengFonts;
|
||||
font-weight: 700;
|
||||
line-height: 20.76rpx;
|
||||
}
|
||||
|
|
@ -564,7 +566,7 @@ button::after{
|
|||
}
|
||||
.font_7 {
|
||||
font-size: 28.13rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 26.47rpx;
|
||||
color: #818181;
|
||||
}
|
||||
|
|
@ -613,7 +615,7 @@ button::after{
|
|||
}
|
||||
.font_8 {
|
||||
font-size: 22.5rpx;
|
||||
font-family: Open Sans;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 20.83rpx;
|
||||
color: #323232;
|
||||
}
|
||||
|
|
@ -660,7 +662,7 @@ button::after{
|
|||
}
|
||||
.font_9 {
|
||||
font-size: 33.75rpx;
|
||||
font-family: Open Sans;
|
||||
font-family: FangZhengFonts;
|
||||
color: #ffaaa5;
|
||||
}
|
||||
.text_22 {
|
||||
|
|
|
|||
|
|
@ -130,6 +130,7 @@
|
|||
import { JudgeIsNullity } from '../../../common/globalFunction';
|
||||
import navVue from '../component/nav.vue';
|
||||
import emitter from '../../../utils/emitter';
|
||||
import { getFonts } from '../../../common/globalFont';
|
||||
const color = ref(new Array(5).fill('#323232'))
|
||||
const point = ref(0)
|
||||
const isShowUnderLine = ref([true, false, false, false, false])
|
||||
|
|
@ -152,6 +153,7 @@
|
|||
}
|
||||
|
||||
onLoad((options) => {
|
||||
getFonts()
|
||||
orderNumber.value = options.orderNumber
|
||||
if (!JudgeIsNullity(orderNumber.value)) {
|
||||
isHiddenInput.value = false
|
||||
|
|
@ -581,7 +583,7 @@
|
|||
.appointmentDate {
|
||||
margin-top: 20.63rpx;
|
||||
font-size: 26.25rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 24.51rpx;
|
||||
color: #818181;
|
||||
margin-left: 3.75rpx;
|
||||
|
|
@ -589,7 +591,7 @@
|
|||
.timeSlot {
|
||||
margin-top: 20.63rpx;
|
||||
font-size: 26.25rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 17.53rpx;
|
||||
color: #818181;
|
||||
margin-left: 3.75rpx;
|
||||
|
|
@ -642,7 +644,7 @@
|
|||
}
|
||||
.font {
|
||||
font-size: 26.25rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 25.84rpx;
|
||||
color: #ffaaa5;
|
||||
}
|
||||
|
|
@ -655,7 +657,7 @@
|
|||
}
|
||||
.font_2 {
|
||||
font-size: 30rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 29.18rpx;
|
||||
color: #323232;
|
||||
}
|
||||
|
|
@ -697,7 +699,7 @@
|
|||
}
|
||||
.font_3 {
|
||||
font-size: 30rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 18.73rpx;
|
||||
color: #ffaaa5;
|
||||
}
|
||||
|
|
@ -714,13 +716,13 @@
|
|||
}
|
||||
.font_4 {
|
||||
font-size: 26.25rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 25.84rpx;
|
||||
color: #818181;
|
||||
}
|
||||
.font_5 {
|
||||
font-size: 26.25rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 18.73rpx;
|
||||
color: #818181;
|
||||
}
|
||||
|
|
@ -743,7 +745,7 @@
|
|||
}
|
||||
.font_6 {
|
||||
font-size: 30rpx;
|
||||
font-family: Open Sans;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 22.18rpx;
|
||||
color: #323232;
|
||||
}
|
||||
|
|
@ -752,7 +754,7 @@
|
|||
}
|
||||
.font_7 {
|
||||
font-size: 26.25rpx;
|
||||
font-family: Open Sans;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 18.73rpx;
|
||||
color: #323232;
|
||||
}
|
||||
|
|
@ -777,7 +779,7 @@
|
|||
}
|
||||
.font_8 {
|
||||
font-size: 30rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 25.84rpx;
|
||||
color: #000000;
|
||||
}
|
||||
|
|
@ -795,7 +797,7 @@
|
|||
}
|
||||
.font_9 {
|
||||
font-size: 30rpx;
|
||||
font-family: Open Sans;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 22.18rpx;
|
||||
font-weight: 600;
|
||||
color: #ffaaa5;
|
||||
|
|
@ -820,7 +822,7 @@
|
|||
}
|
||||
.font_10 {
|
||||
font-size: 26.25rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 25.84rpx;
|
||||
color: #e79ea1;
|
||||
}
|
||||
|
|
@ -833,7 +835,7 @@
|
|||
}
|
||||
.font_11 {
|
||||
font-size: 26.25rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 25.84rpx;
|
||||
color: #ffffff;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -115,6 +115,7 @@
|
|||
import { JudgeIsNullity } from '../../../common/globalFunction';
|
||||
import { serviceStateList } from '../../../common/global.js'
|
||||
import emitter from '../../../utils/emitter';
|
||||
import { getFonts } from '../../../common/globalFont';
|
||||
const cookie = wx.getStorageSync('cookie')
|
||||
let orderId = ''
|
||||
const order = ref({})
|
||||
|
|
@ -130,6 +131,7 @@
|
|||
|
||||
|
||||
onLoad((options) => {
|
||||
getFonts()
|
||||
orderId = options.id
|
||||
})
|
||||
onMounted(() => {
|
||||
|
|
@ -377,7 +379,7 @@ button::after{
|
|||
}
|
||||
.font {
|
||||
font-size: 30rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 29.18rpx;
|
||||
color: #323232;
|
||||
}
|
||||
|
|
@ -388,7 +390,7 @@ button::after{
|
|||
}
|
||||
.font_2 {
|
||||
font-size: 24.38rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
}
|
||||
.text_2 {
|
||||
color: #6b6e72;
|
||||
|
|
@ -411,7 +413,7 @@ button::after{
|
|||
}
|
||||
.font_3 {
|
||||
font-size: 30rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 24.51rpx;
|
||||
color: #818181;
|
||||
}
|
||||
|
|
@ -447,7 +449,7 @@ button::after{
|
|||
}
|
||||
.font_4 {
|
||||
font-size: 26.25rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 24.51rpx;
|
||||
color: #818181;
|
||||
}
|
||||
|
|
@ -457,7 +459,7 @@ button::after{
|
|||
}
|
||||
.font_5 {
|
||||
font-size: 26.25rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 17.53rpx;
|
||||
color: #818181;
|
||||
}
|
||||
|
|
@ -467,7 +469,7 @@ button::after{
|
|||
}
|
||||
.font_6 {
|
||||
font-size: 30rpx;
|
||||
font-family: Open Sans;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 21.41rpx;
|
||||
color: #323232;
|
||||
}
|
||||
|
|
@ -497,7 +499,7 @@ button::after{
|
|||
}
|
||||
.font_7 {
|
||||
font-size: 30rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 29.18rpx;
|
||||
color: #818181;
|
||||
}
|
||||
|
|
@ -529,7 +531,7 @@ button::after{
|
|||
.text_13 {
|
||||
color: #ffaaa5;
|
||||
font-size: 28.13rpx;
|
||||
font-family: Open Sans;
|
||||
font-family: FangZhengFonts;
|
||||
font-weight: 700;
|
||||
line-height: 20.76rpx;
|
||||
}
|
||||
|
|
@ -541,7 +543,7 @@ button::after{
|
|||
}
|
||||
.font_8 {
|
||||
font-size: 30rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 26.47rpx;
|
||||
color: #818181;
|
||||
}
|
||||
|
|
@ -569,7 +571,7 @@ button::after{
|
|||
}
|
||||
.font_9 {
|
||||
font-size: 26.25rpx;
|
||||
font-family: Open Sans;
|
||||
font-family: FangZhengFonts;
|
||||
color: #323232;
|
||||
}
|
||||
.text_17 {
|
||||
|
|
@ -598,7 +600,7 @@ button::after{
|
|||
.text_20 {
|
||||
color: #323232;
|
||||
font-size: 22.5rpx;
|
||||
font-family: Open Sans;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 20.83rpx;
|
||||
}
|
||||
.group_9 {
|
||||
|
|
@ -631,7 +633,7 @@ button::after{
|
|||
}
|
||||
.font_10 {
|
||||
font-size: 33.75rpx;
|
||||
font-family: Open Sans;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 24.51rpx;
|
||||
color: #ffaaa5;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,6 +15,13 @@
|
|||
|
||||
<script setup>
|
||||
import {ref} from 'vue'
|
||||
import { onLoad } from "@dcloudio/uni-app";
|
||||
import { getFonts } from '../../../common/globalFont';
|
||||
|
||||
onLoad(() => {
|
||||
getFonts()
|
||||
})
|
||||
|
||||
const orderNumber = ref('')
|
||||
const search = () => {
|
||||
if (orderNumber.value === null || orderNumber.value === undefined || orderNumber.value === '') {
|
||||
|
|
|
|||
|
|
@ -44,12 +44,17 @@
|
|||
import {nextTick, onMounted , ref } from 'vue'
|
||||
import emitter from '../../../utils/emitter'
|
||||
import { testUrl , baseUrl , suiUrl } from '../../../api/request';
|
||||
import { onShow } from "@dcloudio/uni-app";
|
||||
import { onShow, onLoad } from "@dcloudio/uni-app";
|
||||
import { getFonts } from '../../../common/globalFont';
|
||||
const addressList = ref([])
|
||||
const userInfo = wx.getStorageSync('userInfo')
|
||||
//页面跳转回来之后，刷新一次地址列表 onShow就是在页面显示后执行
|
||||
|
||||
onLoad(() => {
|
||||
getFonts()
|
||||
})
|
||||
|
||||
onMounted(() => {
|
||||
getFonts() //获取字体
|
||||
getAddressList()
|
||||
})
|
||||
onShow(() => {
|
||||
|
|
@ -120,19 +125,7 @@ const deleteAddress = async( id ) =>{
|
|||
const closeWindow =()=> {
|
||||
emitter.emit('closeAddress')
|
||||
}
|
||||
//获取字体
|
||||
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>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
|
|
@ -170,7 +163,7 @@ const getFonts =()=>{
|
|||
.text {
|
||||
color: #323232;
|
||||
font-size: 37.41rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 35.95rpx;
|
||||
}
|
||||
.image {
|
||||
|
|
@ -206,13 +199,13 @@ const getFonts =()=>{
|
|||
}
|
||||
.font {
|
||||
font-size: 29.93rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 25.83rpx;
|
||||
color: #323232;
|
||||
}
|
||||
.font_2 {
|
||||
font-size: 29.93rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 19.99rpx;
|
||||
color: #323232;
|
||||
}
|
||||
|
|
@ -225,7 +218,7 @@ const getFonts =()=>{
|
|||
}
|
||||
.font_3 {
|
||||
font-size: 26.18rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 31.8rpx;
|
||||
color: #818181;
|
||||
}
|
||||
|
|
@ -243,7 +236,7 @@ const getFonts =()=>{
|
|||
.text_3 {
|
||||
color: #ffffff;
|
||||
font-size: 33.67rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 31.57rpx;
|
||||
}
|
||||
@import url(../../../common/css/global.css);
|
||||
|
|
|
|||
|
|
@ -52,6 +52,7 @@
|
|||
import { baseUrl } from '../../../api/request'
|
||||
import { onShow, onLoad } from "@dcloudio/uni-app";
|
||||
import emitter from '../../../utils/emitter';
|
||||
import { getFonts } from '../../../common/globalFont';
|
||||
import contactPopVue from '../../mine/component/contactPop.vue'; //导入联系人弹窗
|
||||
const ContactArr = ref([]) //联系人数组
|
||||
const popup = ref(null) //弹窗对象
|
||||
|
|
@ -84,6 +85,7 @@
|
|||
getContactInfo() //获取联系人信息
|
||||
})
|
||||
onLoad(()=>{
|
||||
getFonts()
|
||||
getContactInfo()
|
||||
})
|
||||
const getContactInfo = async () => {
|
||||
|
|
@ -190,7 +192,7 @@
|
|||
margin-bottom: 2.53rpx;
|
||||
color: #323232;
|
||||
font-size: 37.5rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 36.47rpx;
|
||||
}
|
||||
.image {
|
||||
|
|
@ -215,13 +217,13 @@
|
|||
}
|
||||
.font {
|
||||
font-size: 30rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 25.89rpx;
|
||||
color: #323232;
|
||||
}
|
||||
.font_2 {
|
||||
font-size: 30rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 20.04rpx;
|
||||
color: #323232;
|
||||
}
|
||||
|
|
@ -246,7 +248,7 @@
|
|||
.text_2 {
|
||||
color: #ffffff;
|
||||
font-size: 33.75rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 32.83rpx;
|
||||
}
|
||||
.radius {
|
||||
|
|
|
|||
|
|
@ -1,605 +0,0 @@
|
|||
<template>
|
||||
<view class="flex-col page">
|
||||
<view class="flex-row items-center section_2">
|
||||
<image
|
||||
class="image"
|
||||
:src="stateObject.img"
|
||||
/>
|
||||
<view class="flex-col items-start flex-1 ml-6">
|
||||
<text class="font text">{{ stateObject.msg }}</text>
|
||||
<text class="text_2 mt-4">{{ stateObject.tips }}</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="flex-row justify-between items-center section_3">
|
||||
<view class="flex-col group">
|
||||
<text class="self-start font text_3">{{ addressInfo.name }} {{ addressInfo.phone }}</text>
|
||||
<view class="flex-row items-center self-stretch">
|
||||
<image
|
||||
class="image_2"
|
||||
src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FXZHjzkRH-dingwei.png"
|
||||
/>
|
||||
<text class="font_2 text_4 ml-9">{{ addressInfo.region }}</text>
|
||||
</view>
|
||||
<text class="self-end font_2 text_6">{{ addressInfo.detailAddress }}</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="flex-col section_4">
|
||||
<view class="flex-col">
|
||||
<view class="flex-row justify-between goodsBox" v-for="(item, index) in productList" :key="index">
|
||||
<view class="flex-row">
|
||||
<image
|
||||
class="image_4"
|
||||
:src="item.goodSnapshot.goodImg.split(';')[0]"
|
||||
/>
|
||||
<view class="flex-col group_2 ml-17">
|
||||
<view class="flex-row">
|
||||
<text class="font">{{ item.goodSnapshot.name }}</text>
|
||||
<text class="font text_11">【{{ item.goodSnapshot.type }}】</text>
|
||||
</view>
|
||||
<view class="flex-row items-center mt-53">
|
||||
<image
|
||||
class="image_5"
|
||||
src="https://ide.code.fun/api/image?token=6764d712797f850011f38d7b&name=2a1f46d015a316fa98edfbdad0f9921f.png"
|
||||
/>
|
||||
<text class="font_3">{{ item.goodSnapshot.price }}</text>
|
||||
<!-- <text class="font_4">00</text> -->
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<text class="self-start font_5 text_8 text_1">×{{ item.quantity }}</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="flex-col group_7 mt-6">
|
||||
<text class="self-start font_6 text_18">买家留言</text>
|
||||
<view class="flex-col justify-start self-stretch relative group_8 mt-5">
|
||||
<view class="group_9"></view>
|
||||
<text class="font_6 text_19 pos_4">
|
||||
{{ orderObject.note }}
|
||||
</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="flex-row justify-between items-center mt-6">
|
||||
<text class="font_6 text_20">订单编号：</text>
|
||||
<view class="flex-row items-center group_11">
|
||||
<view class="flex-col justify-start items-center text-wrapper view" @click="copy(orderObject.orderNumber)">
|
||||
<text class="font_7 text_22">复制</text>
|
||||
</view>
|
||||
<text class="font_4 text_21">{{ orderObject.orderNumber }}</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="flex-row justify-between items-center mt-6">
|
||||
<text class="font_6 text_23">创建时间：</text>
|
||||
<text class="font_4 text_24">{{ orderObject.createTime }}</text>
|
||||
</view>
|
||||
<view class="flex-row justify-between items-baseline group_1 mt-6"
|
||||
v-if="stateObject.state === '已退款'">
|
||||
<text class="font_6 text_25">退款时间：</text>
|
||||
<text class="font_4 text_26">{{ orderObject.updateTime }}</text>
|
||||
</view>
|
||||
<view class="flex-row justify-between group_16 mt-6"
|
||||
v-if="stateObject.state === '待收货'">
|
||||
<text class="font_6 text_27">物流单号：</text>
|
||||
<view class="flex-row items-center group_14">
|
||||
<text class="font_4">{{ orderObject.trackingNumber }}</text>
|
||||
<!-- <view class="flex-col justify-start items-center shrink-0 text-wrapper ml-5">
|
||||
<text class="font_7 text_22">复制</text>
|
||||
</view> -->
|
||||
</view>
|
||||
</view>
|
||||
<view class="flex-row justify-between items-baseline mt-6"
|
||||
v-if="stateObject.state === '交易成功'" >
|
||||
<text class="font_6 text_28">成交时间：</text>
|
||||
<text class="font_4 text_29">{{ orderObject.updateTime }}</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="flex-row justify-between items-center section_5"
|
||||
v-if="stateObject.state != '交易成功'">
|
||||
<view class="flex-row items-center">
|
||||
<text class="font_8 text_30">合计：</text>
|
||||
<image
|
||||
class="shrink-0 image_8"
|
||||
src="https://ide.code.fun/api/image?token=6764d712797f850011f38d7b&name=549b29459342a9a09d24834be40eb53b.png"
|
||||
/>
|
||||
<text class="text_31">￥{{ orderObject.totalAmount }}</text>
|
||||
<!-- <text class="text_33">00</text> -->
|
||||
</view>
|
||||
<view class="flex-col justify-start items-center text-wrapper_2" @click="stateSubmit(orderObject)" v-if="bottomBtn != '联系客服'">
|
||||
<text class="font_8 text_32" >{{ bottomBtn }}</text>
|
||||
</view>
|
||||
<view class="flex-col justify-start items-center text-wrapper_2" @click="confirm()" v-if="bottomBtn === '查看物流'">
|
||||
<text class="font_8 text_32" >确认收货</text>
|
||||
</view>
|
||||
<button class="text-wrapper_3" v-if="bottomBtn === '联系客服'" open-type="contact" bindcontact="handleContact" session-from="sessionFrom">
|
||||
<text class="font_8 text_32">联系客服</text>
|
||||
</button>
|
||||
</view>
|
||||
</view>
|
||||
<!-- 遮罩层 -->
|
||||
<view v-if="isShow" class="overlay"></view>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import { ref } from 'vue';
|
||||
import { onLoad , onShow } from "@dcloudio/uni-app";
|
||||
import { stateMap } from '../../../common/global';
|
||||
import { baseUrl } from '../../../api/request';
|
||||
const orderObject = ref({}) //后端传来的订单对象
|
||||
const addressInfo = ref({}) //地址信息
|
||||
const productList = ref([]) //订单涵盖的商品
|
||||
const stateObject = ref({}) //当前订单状态
|
||||
const bottomBtn = ref('去支付') //底下按钮
|
||||
const oid = ref(0)
|
||||
onLoad((options)=>{
|
||||
oid.value = JSON.parse(options.oid) //获取从上一个页面传来的值
|
||||
console.log('当前订单ID为',oid.value);
|
||||
})
|
||||
onShow( async ()=>{
|
||||
await getOrderItem()
|
||||
await setBottomText()
|
||||
})
|
||||
const getOrderItem = async ()=>{ //获取当前订单详情
|
||||
const res = await uni.request({
|
||||
url: baseUrl + '/order/get/id',
|
||||
method: 'POST',
|
||||
header: {
|
||||
'cookie': wx.getStorageSync("cookie")
|
||||
},
|
||||
data: { id: oid.value }
|
||||
})
|
||||
if(res.data.code === 1) {
|
||||
orderObject.value = res.data.data,
|
||||
addressInfo.value = res.data.data.addressSnapshot,
|
||||
productList.value = res.data.data.orderItemList
|
||||
stateObject.value = stateMap.get(res.data.data.orderStatus)
|
||||
}
|
||||
console.log('地址信息--->',addressInfo.value);
|
||||
console.log('商品信息为--->',productList.value);
|
||||
console.log('此订单信息为',res.data);
|
||||
console.log('订单状态---->',stateObject.value);
|
||||
}
|
||||
const setBottomText =()=>{ //更改按钮的字体
|
||||
switch(stateObject.value.state) {
|
||||
case '待支付': bottomBtn.value = '立即支付';break;
|
||||
case '待发货': bottomBtn.value = '联系客服';break;
|
||||
case '待收货': bottomBtn.value = '查看物流';break;
|
||||
case '已退款': bottomBtn.value = '删除订单';break;
|
||||
case '交易成功': bottomBtn.value = '删除订单';break;
|
||||
default: bottomBtn.value = '删除订单'
|
||||
}
|
||||
}
|
||||
const stateSubmit = (obj) => { //按钮状态改变的方法
|
||||
// console.log('商品obj--->',obj);
|
||||
if(bottomBtn.value === '立即支付') { //重新支付
|
||||
wxPayFd(oid.value)
|
||||
} else if(bottomBtn.value === '删除订单') {
|
||||
console.log('订单被删除');
|
||||
} else if(bottomBtn.value === '查看物流') {
|
||||
viewLogistics(obj.id)
|
||||
}
|
||||
}
|
||||
const confirm =()=> { //确认收货方法
|
||||
console.log('确认收货方法');
|
||||
}
|
||||
const wxPay = async( oid )=> { //传入订单id
|
||||
try {
|
||||
const res = await uni.request({
|
||||
url: baseUrl + '/wechat/payment/create',
|
||||
method: 'POST',
|
||||
header: {
|
||||
'cookie': wx.getStorageSync("cookie")
|
||||
},
|
||||
data: { id: oid }
|
||||
})
|
||||
const paymentData = res.data.data
|
||||
wx.requestPayment({
|
||||
appid: paymentData.appId,
|
||||
nonceStr: paymentData.nonceStr,
|
||||
package: paymentData.packageVal,
|
||||
paySign: paymentData.paySign,
|
||||
timeStamp: paymentData.timeStamp,
|
||||
signType: paymentData.signType,
|
||||
success(res) {
|
||||
uni.showModal({
|
||||
content: '支付成功',
|
||||
showCancel: false
|
||||
})
|
||||
buffer()
|
||||
},
|
||||
fail(e) {
|
||||
// uni.showModal({
|
||||
// content: '支付失败，原因为:' + e.errMsg,
|
||||
// showCancel: false
|
||||
// })
|
||||
}
|
||||
})
|
||||
}catch(error) {
|
||||
console.error('支付请求失败',error);
|
||||
uni.showModal({
|
||||
content: '支付请求失败,请重试。',
|
||||
showCancel: false
|
||||
})
|
||||
}
|
||||
}
|
||||
const buffer = async ()=>{ //缓冲函数
|
||||
await getOrderItem();
|
||||
await setBottomText();
|
||||
}
|
||||
//查看物流方法
|
||||
const viewLogistics = ( oid )=>{
|
||||
// console.log('订单编号--->',oid);
|
||||
uni.request({
|
||||
url: baseUrl + '/logistics/get/info',
|
||||
method: 'POST',
|
||||
data: {
|
||||
id: oid
|
||||
},
|
||||
header: {
|
||||
'cookie': wx.getStorageSync("cookie")
|
||||
},
|
||||
success: (res) => {
|
||||
console.log(res.data.data)
|
||||
waybillToken = res.data.data.waybill_token
|
||||
plugin.openWaybillTracking({
|
||||
waybillToken: waybillToken
|
||||
})
|
||||
}
|
||||
})
|
||||
}
|
||||
//复制到剪切板方法
|
||||
const copy = ( orderNumber ) => {
|
||||
console.log('订单编号为--->',orderNumber);
|
||||
uni.setClipboardData({
|
||||
data: orderNumber,
|
||||
success: () => {
|
||||
uni.showToast({
|
||||
title: '成功复制到剪贴板'
|
||||
})
|
||||
}
|
||||
})
|
||||
}
|
||||
//防抖相关变量
|
||||
let debounceTimer = null;
|
||||
let wxPayTimer = null;
|
||||
let loading = false;
|
||||
let isLoading = ref(false)
|
||||
let isShow = ref(false)
|
||||
const fd = () => { //防抖
|
||||
clearTimeout(debounceTimer)
|
||||
showLoading()
|
||||
debounceTimer = setTimeout(async () => {
|
||||
await getMyCouponList()
|
||||
hideLoading()
|
||||
}, 1000)
|
||||
}
|
||||
const wxPayFd = (oid) => { //微信支付按钮防抖
|
||||
clearTimeout(wxPayTimer)
|
||||
isShow.value = true
|
||||
showLoading()
|
||||
wxPayTimer = setTimeout(async () => {
|
||||
await wxPay(oid)
|
||||
hideLoading()
|
||||
}, 1000)
|
||||
}
|
||||
function showLoading() { //加载弹窗
|
||||
if (!loading) {
|
||||
wx.showLoading({
|
||||
title: '加载中...',
|
||||
});
|
||||
loading = true;
|
||||
isLoading.value = true
|
||||
}
|
||||
}
|
||||
function hideLoading() { //关闭弹窗
|
||||
if (loading) {
|
||||
wx.hideLoading();
|
||||
loading = false;
|
||||
isLoading.value = false
|
||||
isShow.value = false
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.overlay {
|
||||
position: fixed;
|
||||
top: 0;
|
||||
left: 0;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
background-color: rgba(0, 0, 0, 0.4); /* 半透明黑色背景 */
|
||||
z-index: 999;
|
||||
}
|
||||
.goodsBox {
|
||||
margin-bottom: 20rpx;
|
||||
}
|
||||
.ml-9 {
|
||||
margin-left: 16.88rpx;
|
||||
}
|
||||
.mt-53 {
|
||||
margin-top: 99.38rpx;
|
||||
}
|
||||
.ml-17 {
|
||||
margin-left: 31.88rpx;
|
||||
}
|
||||
.mt-5 {
|
||||
margin-top: 9.38rpx;
|
||||
}
|
||||
.ml-5 {
|
||||
margin-left: 9.38rpx;
|
||||
}
|
||||
.page {
|
||||
padding-top: 17.25rpx;
|
||||
background-color: #f8e8c1;
|
||||
background-image: url('https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FQfLHXSAU-feiyigongfangbeijin.png');
|
||||
background-size: 100% 100%;
|
||||
background-repeat: no-repeat;
|
||||
width: 100%;
|
||||
overflow-y: auto;
|
||||
overflow-x: hidden;
|
||||
height: 100vh;
|
||||
}
|
||||
.section_2 {
|
||||
margin-left: 16.88rpx;
|
||||
margin-right: 15rpx;
|
||||
padding: 16.88rpx;
|
||||
background-color: #ffffff;
|
||||
border-radius: 18.75rpx;
|
||||
}
|
||||
.image {
|
||||
width: 75rpx;
|
||||
height: 75rpx;
|
||||
}
|
||||
.font {
|
||||
font-size: 26.25rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
line-height: 25.54rpx;
|
||||
color: #323232;
|
||||
}
|
||||
.text {
|
||||
color: #323233;
|
||||
font-size: 28.13rpx;
|
||||
line-height: 27.58rpx;
|
||||
}
|
||||
.text_2 {
|
||||
color: #6b6e72;
|
||||
font-size: 22.5rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
line-height: 22.14rpx;
|
||||
}
|
||||
.section_3 {
|
||||
margin: 15rpx 15rpx 0 16.88rpx;
|
||||
padding: 24.81rpx 11.25rpx 25.26rpx 20.68rpx;
|
||||
background-color: #ffffff;
|
||||
border-radius: 18.75rpx;
|
||||
}
|
||||
.group {
|
||||
width: 410.31rpx;
|
||||
height: 84.94rpx;
|
||||
}
|
||||
.text_3 {
|
||||
margin-left: 59.89rpx;
|
||||
line-height: 22.67rpx;
|
||||
}
|
||||
.image_2 {
|
||||
width: 43.13rpx;
|
||||
height: 43.13rpx;
|
||||
}
|
||||
.font_2 {
|
||||
font-size: 26.25rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
line-height: 30rpx;
|
||||
color: #818181;
|
||||
}
|
||||
.text_4 {
|
||||
font-size: 24.38rpx;
|
||||
}
|
||||
.text_6 {
|
||||
margin-top: -10.26rpx;
|
||||
font-size: 24.38rpx;
|
||||
}
|
||||
.text_5 {
|
||||
color: #ffaaa5;
|
||||
line-height: 24.41rpx;
|
||||
}
|
||||
.image_3 {
|
||||
width: 24.38rpx;
|
||||
height: 24.38rpx;
|
||||
}
|
||||
.section_4 {
|
||||
margin: 15rpx 15rpx 110rpx 16.88rpx;
|
||||
padding: 22.5rpx 22.63rpx 24.79rpx 24.38rpx;
|
||||
background-color: #ffffff;
|
||||
border-radius: 18.75rpx;
|
||||
}
|
||||
.image_4 {
|
||||
border-radius: 9.38rpx;
|
||||
width: 146.25rpx;
|
||||
height: 165rpx;
|
||||
}
|
||||
.group_2 {
|
||||
margin-top: 4.2rpx;
|
||||
margin-bottom: 5.63rpx;
|
||||
}
|
||||
.text_11 {
|
||||
line-height: 25.01rpx;
|
||||
}
|
||||
.image_5 {
|
||||
width: 30rpx;
|
||||
height: 30rpx;
|
||||
}
|
||||
.font_3 {
|
||||
font-size: 33.75rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
line-height: 22.54rpx;
|
||||
color: #323232;
|
||||
}
|
||||
.font_4 {
|
||||
font-size: 26.25rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
line-height: 17.53rpx;
|
||||
color: #323232;
|
||||
}
|
||||
.font_5 {
|
||||
font-size: 26.25rpx;
|
||||
font-family: Open Sans;
|
||||
line-height: 17.53rpx;
|
||||
color: #323232;
|
||||
}
|
||||
.text_8 {
|
||||
line-height: 18.73rpx;
|
||||
}
|
||||
.text_1 {
|
||||
margin-right: 7.58rpx;
|
||||
margin-top: 133.14rpx;
|
||||
}
|
||||
.font_6 {
|
||||
font-size: 26.25rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
line-height: 25.54rpx;
|
||||
color: #818181;
|
||||
}
|
||||
.group_7 {
|
||||
padding: 29.19rpx 0 16.88rpx;
|
||||
border-top: solid 1.88rpx #dfdfdf;
|
||||
border-bottom: solid 1.88rpx #dfdfdf;
|
||||
}
|
||||
.text_18 {
|
||||
margin-left: 2.36rpx;
|
||||
line-height: 24.71rpx;
|
||||
}
|
||||
.group_8 {
|
||||
margin-right: 3.62rpx;
|
||||
padding-top: 9.86rpx;
|
||||
}
|
||||
.group_9 {
|
||||
border-radius: 9.38rpx;
|
||||
height: 84.38rpx;
|
||||
border: solid 1.88rpx #ffffff;
|
||||
}
|
||||
.text_19 {
|
||||
line-height: 31.88rpx;
|
||||
text-shadow: 0 1.88rpx #ffffff, 0 -1.88rpx #ffffff, 1.88rpx 0 #ffffff, -1.88rpx 0 #ffffff;
|
||||
text-indent: 54.45rpx;
|
||||
}
|
||||
.pos_4 {
|
||||
position: absolute;
|
||||
left: 12.17rpx;
|
||||
right: 25.33rpx;
|
||||
top: 50%;
|
||||
transform: translateY(-50%);
|
||||
}
|
||||
.text_20 {
|
||||
line-height: 25.84rpx;
|
||||
}
|
||||
.group_11 {
|
||||
margin-right: 3.62rpx;
|
||||
width: 368.34rpx;
|
||||
}
|
||||
.text-wrapper {
|
||||
padding-bottom: 2.29rpx;
|
||||
background-color: #ffffff;
|
||||
width: 50.63rpx;
|
||||
height: 22.5rpx;
|
||||
border: solid 0.94rpx #d1d1d1;
|
||||
}
|
||||
.view {
|
||||
margin-left: 317.72rpx;
|
||||
}
|
||||
.font_7 {
|
||||
font-size: 18.75rpx;
|
||||
font-family: Open Sans;
|
||||
line-height: 17.53rpx;
|
||||
color: #323232;
|
||||
}
|
||||
.text_22 {
|
||||
line-height: 17.38rpx;
|
||||
}
|
||||
.text_21 {
|
||||
margin-left: -368.34rpx;
|
||||
}
|
||||
.text_23 {
|
||||
line-height: 24.71rpx;
|
||||
}
|
||||
.text_24 {
|
||||
margin-right: 26.38rpx;
|
||||
}
|
||||
.group_1 {
|
||||
padding: 0 2.38rpx;
|
||||
}
|
||||
.text_25 {
|
||||
line-height: 24.51rpx;
|
||||
}
|
||||
.text_26 {
|
||||
margin-right: 137.49rpx;
|
||||
}
|
||||
.group_16 {
|
||||
padding: 0 3.32rpx;
|
||||
}
|
||||
.text_27 {
|
||||
line-height: 25.84rpx;
|
||||
}
|
||||
.group_14 {
|
||||
margin-right: 28.43rpx;
|
||||
}
|
||||
.text_28 {
|
||||
line-height: 24.51rpx;
|
||||
}
|
||||
.text_29 {
|
||||
margin-right: 139.88rpx;
|
||||
}
|
||||
.section_5 {
|
||||
position: fixed;
|
||||
left: 0;
|
||||
right: 0;
|
||||
bottom: 0;
|
||||
// margin-top: 78.75rpx;
|
||||
padding: 16.88rpx 25.31rpx 15rpx;
|
||||
background-color: #ffffff;
|
||||
}
|
||||
.font_8 {
|
||||
font-size: 30rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
line-height: 27.77rpx;
|
||||
}
|
||||
.text_30 {
|
||||
color: #000000;
|
||||
}
|
||||
.image_8 {
|
||||
width: 33.75rpx;
|
||||
height: 33.75rpx;
|
||||
}
|
||||
.text_31 {
|
||||
color: #ffaaa5;
|
||||
font-size: 37.5rpx;
|
||||
font-family: Open Sans;
|
||||
font-weight: 700;
|
||||
line-height: 27.62rpx;
|
||||
}
|
||||
.text_33 {
|
||||
color: #ffaaa5;
|
||||
font-size: 30rpx;
|
||||
font-family: Open Sans;
|
||||
font-weight: 700;
|
||||
line-height: 22.05rpx;
|
||||
}
|
||||
.text-wrapper_2 {
|
||||
padding: 20.63rpx 0 22.86rpx;
|
||||
background-color: #ffaaa5;
|
||||
border-radius: 75rpx;
|
||||
width: 204.38rpx;
|
||||
height: 71.25rpx;
|
||||
}
|
||||
.text_32 {
|
||||
color: #ffffff;
|
||||
}
|
||||
.text-wrapper_3 {
|
||||
position: relative;
|
||||
left: 140rpx;
|
||||
background-color: #ffaaa5;
|
||||
border-radius: 75rpx;
|
||||
width: 204rpx;
|
||||
// height: 71rpx;
|
||||
font-size: unset;
|
||||
}
|
||||
@import url(../../../common/css/global.css);
|
||||
</style>
|
||||
|
|
@ -5,13 +5,13 @@
|
|||
<view class="flex-col section_2">
|
||||
<view class="flex-row justify-between">
|
||||
<view class="flex-col">
|
||||
<text class="self-center font text" style="word-break: break-all; word-wrap: break-word;">{{ addressRealInfo.region }}</text>
|
||||
<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" style="word-break: break-all; word-wrap: break-word;">{{ addressRealInfo.detailAddress }}</text>
|
||||
<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' }">
|
||||
|
|
@ -155,6 +155,7 @@
|
|||
import {nextTick, onMounted, onUnmounted, ref, toRaw} from 'vue'
|
||||
import emitter from '../../../utils/emitter'
|
||||
import { onLoad , onShow } from "@dcloudio/uni-app";
|
||||
import { getFonts } from '../../../common/globalFont';
|
||||
import { baseUrl } from '../../../api/request';
|
||||
import addressComponentVue from '../component/addressComponent.vue'; //导入组件
|
||||
import couponPopupVue from '../../coupon/component/couponPopup.vue';
|
||||
|
|
@ -189,7 +190,11 @@ const conditionAmount = ref(0)
|
|||
|
||||
|
||||
const closeHandler = () => {
|
||||
close()
|
||||
nextTick(() => {
|
||||
if (popup.value) {
|
||||
popup.value.close()
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
const addressInfoHandler = (val) => {
|
||||
|
|
@ -222,9 +227,9 @@ const getCouponObjHandler = (val) => {
|
|||
}
|
||||
|
||||
onMounted(() => {
|
||||
getFonts()
|
||||
FangZhengFontsts()
|
||||
//将关闭弹窗方法传入弹窗页面，绑定弹窗按钮可关闭弹窗
|
||||
emitter.on('close', closeHandler)
|
||||
emitter.on('closeAddress', closeHandler)
|
||||
//获取地址信息
|
||||
emitter.on('addressInfo', addressInfoHandler)
|
||||
|
||||
|
|
@ -238,7 +243,7 @@ onMounted(() => {
|
|||
|
||||
onUnmounted(() => {
|
||||
//将关闭弹窗方法传入弹窗页面，绑定弹窗按钮可关闭弹窗
|
||||
emitter.off('close', closeHandler)
|
||||
emitter.off('closeAddress', closeHandler)
|
||||
//获取地址信息
|
||||
emitter.off('addressInfo', addressInfoHandler)
|
||||
|
||||
|
|
@ -251,6 +256,7 @@ onUnmounted(() => {
|
|||
|
||||
|
||||
onLoad( async (options)=>{
|
||||
FangZhengFontsts()
|
||||
totalInfo.value = JSON.parse(options.cartInfo)
|
||||
console.log('options.cartInfo-->',JSON.parse(options.cartInfo));
|
||||
console.log('totalInfo.value-->',toRaw(totalInfo.value) );
|
||||
|
|
@ -262,14 +268,7 @@ onShow(()=>{
|
|||
getDefaultAddress()
|
||||
// computed()
|
||||
})
|
||||
//关闭弹窗
|
||||
const close = () => {
|
||||
nextTick(() => {
|
||||
if (popup.value) {
|
||||
popup.value.close()
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
//加载弹窗。默认从底部弹出
|
||||
const loadPop =() =>{
|
||||
popup.value.open('bottom')
|
||||
|
|
@ -417,19 +416,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);
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
//防抖相关变量
|
||||
let debounceTimer = null;
|
||||
let wxPayTimer = null;
|
||||
|
|
@ -524,7 +511,9 @@ const getFonts =()=>{
|
|||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
|
||||
.my-text-wrap {
|
||||
width:480rpx; ;display:inline-block;white-space: pre-wrap; word-wrap: break-word;height: auto;
|
||||
}
|
||||
|
||||
.coupon-popup {
|
||||
height: 1200rpx;
|
||||
|
|
@ -545,10 +534,11 @@ const getFonts =()=>{
|
|||
|
||||
|
||||
.popup-content {
|
||||
height: 300px;
|
||||
height: 400px;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
background-color: #fff;
|
||||
// background-color: #fff;
|
||||
border-radius: 20rpx 20rpx 0 0;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -831,14 +821,14 @@ const getFonts =()=>{
|
|||
margin-left: 28.5rpx;
|
||||
color: #ffaaa5;
|
||||
font-size: 37.5rpx;
|
||||
font-family: Open Sans;
|
||||
font-family: FangZhengFonts;
|
||||
font-weight: 700;
|
||||
line-height: 27.62rpx;
|
||||
}
|
||||
.text_24 {
|
||||
color: #ffaaa5;
|
||||
font-size: 30rpx;
|
||||
font-family: Open Sans;
|
||||
font-family: FangZhengFonts;
|
||||
font-weight: 700;
|
||||
line-height: 22.05rpx;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,685 +0,0 @@
|
|||
<template>
|
||||
<view class="flex-col page">
|
||||
<view class="flex-row items-center section_2">
|
||||
<image
|
||||
class="image"
|
||||
:src="stateObject.img"
|
||||
/>
|
||||
<view class="flex-col items-start flex-1 ml-6">
|
||||
<text class="font text">{{ stateObject.msg }}</text>
|
||||
<text class="text_2 mt-4">{{ stateObject.tips }}</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="flex-row items-center section_3">
|
||||
<image
|
||||
class="image_2"
|
||||
src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FIwOnPxNs-contact.png"
|
||||
/>
|
||||
<text class="text_3 ml-10">{{ contactInfo.name }} {{ contactInfo.phone }}</text>
|
||||
</view>
|
||||
<view class="flex-col section_4">
|
||||
<view class="flex-col">
|
||||
<view class="flex-row items-end list-item group mt-17" v-for="(item, index) in productList" :key="index">
|
||||
<image
|
||||
class="shrink-0 image_3"
|
||||
:src="item.goodSnapshot.goodImg"
|
||||
/>
|
||||
<view class="flex-col flex-1 group_5">
|
||||
<view class="flex-row self-stretch group_3">
|
||||
<text class="font_2">{{ item.goodSnapshot.name }}</text>
|
||||
<text class="font_2 text_8">【{{ item.goodSnapshot.type }}】</text>
|
||||
</view>
|
||||
<text class="self-start font text_9">已选时间：{{ item.reservationDate }}星期二</text>
|
||||
<text class="self-start font_3 text_10">{{ item.timeSlot }}</text>
|
||||
<view class="flex-row items-center self-stretch group_23">
|
||||
<!-- <image
|
||||
class="image_4"
|
||||
src="https://ide.code.fun/api/image?token=67c001c94ae84d0012277299&name=4a3c5c3a5c83be7a7b0551c598ed6037.png"
|
||||
/> -->
|
||||
<text class="font_4 ml-3">￥{{ item.goodSnapshot.price }}</text>
|
||||
<!-- <text class="font_5 ml-3">00</text> -->
|
||||
</view>
|
||||
</view>
|
||||
<text class="font_6 text_11 text_1">×{{ item.quantity }}</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="flex-row justify-between items-center group_8">
|
||||
<text class="font text_16">商品金额</text>
|
||||
<view class="flex-row items-center">
|
||||
<!-- <image
|
||||
class="shrink-0 image_5"
|
||||
src="https://ide.code.fun/api/image?token=67c001c94ae84d0012277299&name=4223cdafed72fca52c442dae885cee9c.png"
|
||||
/> -->
|
||||
<text class="font_7 text_17">￥{{ orderObject.totalAmount }}</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="flex-row justify-between items-center group_9">
|
||||
<text class="font">优惠券</text>
|
||||
<view class="flex-row items-center">
|
||||
<!-- <image
|
||||
class="shrink-0 image_6"
|
||||
src="https://ide.code.fun/api/image?token=67c001c94ae84d0012277299&name=shortmoney.png"
|
||||
/> -->
|
||||
<text class="font_7 text_18">-￥0</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="flex-row justify-end items-center group_10">
|
||||
<view class="flex-row items-center group_11">
|
||||
<!-- <image
|
||||
class="image_5 image_7"
|
||||
src="https://ide.code.fun/api/image?token=67c001c94ae84d0012277299&name=15c19bceb4f8bbcc0ed72958e3788b20.png"
|
||||
/> -->
|
||||
<text class="font_2 text_19">合计：</text>
|
||||
</view>
|
||||
<text class="font_7 text_20">￥{{ orderObject.totalAmount }}</text>
|
||||
</view>
|
||||
<view class="flex-col group_12">
|
||||
<text class="self-start font text_21">买家留言</text>
|
||||
<view class="flex-col justify-start self-stretch relative group_13 mt-5">
|
||||
<view class="group_14" v-if="orderObject.note != ''">
|
||||
<text class="font text_22 pos_4">
|
||||
{{ orderObject.note }}
|
||||
</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="flex-row justify-between items-center group_15">
|
||||
<text class="font text_23">订单编号：</text>
|
||||
<view class="flex-row items-center group_16">
|
||||
<view class="flex-col justify-start items-center text-wrapper" @click="copy(orderObject.orderNumber)"><text class="text_25">复制</text></view>
|
||||
<text class="font_5 text_24">{{ orderObject.orderNumber }}</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="flex-row justify-between items-center group_17">
|
||||
<text class="font text_26">创建时间：</text>
|
||||
<text class="font_5 text_27">{{ orderObject.createTime }}</text>
|
||||
</view>
|
||||
<view class="flex-col group_18">
|
||||
<view class="flex-row justify-between items-baseline group_21"
|
||||
v-if="stateObject.state === '已退款'"
|
||||
>
|
||||
<text class="font text_28">退款时间：</text>
|
||||
<text class="font_5 text_29">{{ orderObject.updateTime }}</text>
|
||||
</view>
|
||||
<view class="flex-row justify-between items-baseline mt-3"
|
||||
v-if="stateObject.state === '已完成'"
|
||||
>
|
||||
<text class="font text_30">完成时间：</text>
|
||||
<text class="font_5 text_31">{{ orderObject.updateTime }}</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="flex-row items-center section_5">
|
||||
<view class="flex-row items-center shrink-0">
|
||||
<text class="font_8 text_32">合计：</text>
|
||||
<!-- <image
|
||||
class="shrink-0 image_8"
|
||||
src="https://ide.code.fun/api/image?token=67c001c94ae84d0012277299&name=549b29459342a9a09d24834be40eb53b.png"
|
||||
/> -->
|
||||
<text class="text_33">￥{{ orderObject.totalAmount }}</text>
|
||||
<!-- <text class="font_6 text_36">00</text> -->
|
||||
</view>
|
||||
<view class="flex-row flexed ml-46" v-if="orderObject.orderStatus == '待支付' ">
|
||||
<view>
|
||||
<button class="text-wrapper_9" open-type="contact" bindcontact="handleContact" session-from="sessionFrom">
|
||||
<text class="font_8 text_64">联系客服</text>
|
||||
</button>
|
||||
</view>
|
||||
<view class="flex-col justify-start items-center text-wrapper_3 ml-6" @click="stateSubmit(orderObject)" >
|
||||
<text class="font_8 text_35">{{ bottomBtn }}</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="flex-row ml-47" v-if="orderObject.orderStatus != '待支付' ">
|
||||
<button class="text-wrapper_9" open-type="contact" bindcontact="handleContact" session-from="sessionFrom">
|
||||
<text class="font_8 text_64">联系客服</text>
|
||||
</button>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 遮罩层 -->
|
||||
<view v-if="isShow" class="overlay"></view>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import { onMounted, ref } from 'vue';
|
||||
import { onLoad , onShow } from "@dcloudio/uni-app";
|
||||
import { serviceStateMap } from '../../../common/global';
|
||||
import { baseUrl } from '../../../api/request';
|
||||
const orderObject = ref({}) //后端传来的订单对象
|
||||
const contactInfo = ref({}) //联系人
|
||||
const productList = ref([]) //订单涵盖的商品
|
||||
const stateObject = ref({}) //当前订单状态
|
||||
const bottomBtn = ref('去支付') //底下按钮
|
||||
const oid = ref(0)
|
||||
onMounted(()=>{
|
||||
getOrderItem()
|
||||
getFonts()
|
||||
})
|
||||
onLoad((options)=>{
|
||||
oid.value = JSON.parse(options.oid) //获取从上一个页面传来的值
|
||||
console.log('当前订单ID为',oid.value);
|
||||
})
|
||||
onShow( async ()=>{
|
||||
await getOrderItem()
|
||||
await setBottomText()
|
||||
})
|
||||
const getOrderItem = async ()=>{ //获取当前订单详情
|
||||
const res = await uni.request({
|
||||
url: baseUrl + '/order/get/id',
|
||||
method: 'POST',
|
||||
header: {
|
||||
'cookie': wx.getStorageSync("cookie")
|
||||
},
|
||||
data: { id: oid.value }
|
||||
})
|
||||
if(res.data.code === 1) {
|
||||
orderObject.value = res.data.data,
|
||||
contactInfo.value = res.data.data.contactsSnapshot,
|
||||
productList.value = res.data.data.orderItemList
|
||||
stateObject.value = serviceStateMap.get(res.data.data.orderStatus)
|
||||
}
|
||||
console.log('联系人--->',contactInfo.value);
|
||||
console.log('商品信息为--->',productList.value);
|
||||
console.log('此订单信息为',res.data);
|
||||
console.log('订单状态---->',stateObject.value);
|
||||
}
|
||||
const setBottomText =()=>{ //更改按钮的字体
|
||||
switch(stateObject.value.state) {
|
||||
case '待支付': bottomBtn.value = '立即支付';break;
|
||||
case '已退款': bottomBtn.value = '删除订单';break;
|
||||
case '交易成功': bottomBtn.value = '删除订单';break;
|
||||
}
|
||||
}
|
||||
const stateSubmit = (obj) => { //按钮状态改变的方法
|
||||
// console.log('商品obj--->',obj);
|
||||
if(bottomBtn.value === '立即支付') { //重新支付
|
||||
wxPayFd(oid.value)
|
||||
} else if(bottomBtn.value === '删除订单') {
|
||||
console.log('订单被删除');
|
||||
}
|
||||
}
|
||||
const confirm =()=> { //确认收货方法
|
||||
console.log('确认收货方法');
|
||||
}
|
||||
const wxPay = async( oid )=> { //传入订单id
|
||||
try {
|
||||
const res = await uni.request({
|
||||
url: baseUrl + '/wechat/payment/create',
|
||||
method: 'POST',
|
||||
header: {
|
||||
'cookie': wx.getStorageSync("cookie")
|
||||
},
|
||||
data: { id: oid }
|
||||
})
|
||||
const paymentData = res.data.data
|
||||
wx.requestPayment({
|
||||
appid: paymentData.appId,
|
||||
nonceStr: paymentData.nonceStr,
|
||||
package: paymentData.packageVal,
|
||||
paySign: paymentData.paySign,
|
||||
timeStamp: paymentData.timeStamp,
|
||||
signType: paymentData.signType,
|
||||
success(res) {
|
||||
uni.showModal({
|
||||
content: '支付成功',
|
||||
showCancel: false
|
||||
})
|
||||
buffer()
|
||||
},
|
||||
fail(e) {
|
||||
// uni.showModal({
|
||||
// content: '支付失败，原因为:' + e.errMsg,
|
||||
// showCancel: false
|
||||
// })
|
||||
}
|
||||
})
|
||||
}catch(error) {
|
||||
console.error('支付请求失败',error);
|
||||
uni.showModal({
|
||||
content: '支付请求失败,请重试。',
|
||||
showCancel: false
|
||||
})
|
||||
}
|
||||
}
|
||||
const buffer = async ()=>{ //缓冲函数
|
||||
await getOrderItem();
|
||||
await setBottomText();
|
||||
}
|
||||
//复制到剪切板方法
|
||||
const copy = ( orderNumber ) => {
|
||||
console.log('订单编号为--->',orderNumber);
|
||||
uni.setClipboardData({
|
||||
data: orderNumber,
|
||||
success: () => {
|
||||
uni.showToast({
|
||||
title: '成功复制到剪贴板'
|
||||
})
|
||||
}
|
||||
})
|
||||
}
|
||||
//防抖相关变量
|
||||
let debounceTimer = null;
|
||||
let wxPayTimer = null;
|
||||
let loading = false;
|
||||
let isLoading = ref(false)
|
||||
let isShow = ref(false)
|
||||
const wxPayFd = (oid) => { //微信支付按钮防抖
|
||||
clearTimeout(wxPayTimer)
|
||||
showLoading()
|
||||
isShow.value = true //打开遮罩
|
||||
wxPayTimer = setTimeout(async () => {
|
||||
await wxPay(oid)
|
||||
}, 1000)
|
||||
setTimeout(()=>{
|
||||
hideLoading()
|
||||
isShow.value = false //关闭遮罩
|
||||
},2000)
|
||||
}
|
||||
function showLoading() { //加载弹窗
|
||||
if (!loading) {
|
||||
wx.showLoading({
|
||||
title: '加载中...',
|
||||
});
|
||||
loading = true;
|
||||
isLoading.value = true
|
||||
}
|
||||
}
|
||||
function hideLoading() { //关闭弹窗
|
||||
if (loading) {
|
||||
wx.hideLoading();
|
||||
loading = false;
|
||||
isLoading.value = false
|
||||
}
|
||||
}
|
||||
//获取字体
|
||||
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>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.overlay {
|
||||
position: fixed;
|
||||
top: 0;
|
||||
left: 0;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
background-color: rgba(0, 0, 0, 0.4); /* 半透明黑色背景 */
|
||||
z-index: 999;
|
||||
}
|
||||
.ml-3 {
|
||||
margin-left: 5.63rpx;
|
||||
}
|
||||
.mt-17 {
|
||||
margin-top: 31.88rpx;
|
||||
}
|
||||
.mt-5 {
|
||||
margin-top: 9.38rpx;
|
||||
}
|
||||
.mt-3 {
|
||||
margin-top: 5.63rpx;
|
||||
}
|
||||
.page {
|
||||
padding-top: 26.25rpx;
|
||||
background-color: #f8e8c1;
|
||||
background-image: url('https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FQfLHXSAU-feiyigongfangbeijin.png');
|
||||
background-size: 100% 100%;
|
||||
background-repeat: no-repeat;
|
||||
width: 100%;
|
||||
overflow-y: auto;
|
||||
overflow-x: hidden;
|
||||
height: 100vh;
|
||||
}
|
||||
.section_2 {
|
||||
margin-left: 16.88rpx;
|
||||
margin-right: 15rpx;
|
||||
padding: 16.88rpx;
|
||||
background-color: #ffffff;
|
||||
border-radius: 18.75rpx;
|
||||
}
|
||||
.image {
|
||||
width: 75rpx;
|
||||
height: 75rpx;
|
||||
}
|
||||
.font {
|
||||
font-size: 26.25rpx;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 25.54rpx;
|
||||
color: #818181;
|
||||
}
|
||||
.text {
|
||||
color: #323233;
|
||||
font-size: 28.13rpx;
|
||||
line-height: 27.58rpx;
|
||||
}
|
||||
.text_2 {
|
||||
color: #6b6e72;
|
||||
font-size: 22.5rpx;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 22.14rpx;
|
||||
}
|
||||
.section_3 {
|
||||
margin: 26.25rpx 15rpx 0 16.88rpx;
|
||||
padding: 20.63rpx 24.38rpx 24.98rpx;
|
||||
background-color: #ffffff;
|
||||
border-radius: 18.75rpx;
|
||||
}
|
||||
.image_2 {
|
||||
width: 65.63rpx;
|
||||
height: 67.5rpx;
|
||||
}
|
||||
.text_3 {
|
||||
color: #818181;
|
||||
font-size: 37.5rpx;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 32.38rpx;
|
||||
}
|
||||
.section_4 {
|
||||
margin: 25.65rpx 15rpx 70px 16.88rpx;
|
||||
padding: 20.63rpx 22.63rpx 9.79rpx 24.38rpx;
|
||||
background-color: #ffffff;
|
||||
border-radius: 18.75rpx;
|
||||
}
|
||||
.list-item {
|
||||
padding: 0 11.25rpx;
|
||||
}
|
||||
.list-item:first-child {
|
||||
margin-top: 0;
|
||||
}
|
||||
.group {
|
||||
padding: 0 7.5rpx;
|
||||
}
|
||||
.image_3 {
|
||||
border-radius: 9.38rpx;
|
||||
width: 142.5rpx;
|
||||
height: 166.88rpx;
|
||||
}
|
||||
.group_5 {
|
||||
margin-left: 30.04rpx;
|
||||
margin-top: 4.2rpx;
|
||||
}
|
||||
.group_3 {
|
||||
padding-left: 3.83rpx;
|
||||
}
|
||||
.font_2 {
|
||||
font-size: 26.25rpx;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 25.54rpx;
|
||||
color: #323232;
|
||||
}
|
||||
.text_8 {
|
||||
line-height: 25.01rpx;
|
||||
}
|
||||
.text_9 {
|
||||
margin-left: 8.01rpx;
|
||||
margin-top: 18.21rpx;
|
||||
line-height: 24.62rpx;
|
||||
}
|
||||
.font_3 {
|
||||
font-size: 26.25rpx;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 17.53rpx;
|
||||
color: #818181;
|
||||
}
|
||||
.text_10 {
|
||||
margin-left: 9.21rpx;
|
||||
margin-top: 19.99rpx;
|
||||
}
|
||||
.group_23 {
|
||||
margin-top: 27.58rpx;
|
||||
}
|
||||
.image_4 {
|
||||
width: 35.63rpx;
|
||||
height: 30rpx;
|
||||
}
|
||||
.font_4 {
|
||||
font-size: 33.75rpx;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 22.54rpx;
|
||||
color: #323232;
|
||||
}
|
||||
.font_5 {
|
||||
font-size: 26.25rpx;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 17.53rpx;
|
||||
color: #323232;
|
||||
}
|
||||
.font_6 {
|
||||
font-size: 30rpx;
|
||||
font-family: Open Sans;
|
||||
line-height: 22.54rpx;
|
||||
color: #323232;
|
||||
}
|
||||
.text_11 {
|
||||
margin-left: 39.99rpx;
|
||||
margin-bottom: 2.66rpx;
|
||||
line-height: 21.41rpx;
|
||||
}
|
||||
.text_1 {
|
||||
margin: 0 7.88rpx 2.66rpx 39.99rpx;
|
||||
}
|
||||
.group_8 {
|
||||
margin-top: 21.71rpx;
|
||||
}
|
||||
.text_16 {
|
||||
line-height: 24.3rpx;
|
||||
}
|
||||
.image_5 {
|
||||
width: 30rpx;
|
||||
height: 30rpx;
|
||||
}
|
||||
.font_7 {
|
||||
font-size: 26.25rpx;
|
||||
font-family: Open Sans;
|
||||
line-height: 17.53rpx;
|
||||
color: #323232;
|
||||
}
|
||||
.text_17 {
|
||||
line-height: 19.41rpx;
|
||||
}
|
||||
.group_9 {
|
||||
margin-top: 13.13rpx;
|
||||
}
|
||||
.image_6 {
|
||||
width: 41.25rpx;
|
||||
height: 30rpx;
|
||||
}
|
||||
.text_18 {
|
||||
line-height: 19.41rpx;
|
||||
}
|
||||
.group_10 {
|
||||
margin-top: 16.88rpx;
|
||||
}
|
||||
.group_11 {
|
||||
width: 102.3rpx;
|
||||
}
|
||||
.image_7 {
|
||||
margin-left: 72.3rpx;
|
||||
}
|
||||
.text_19 {
|
||||
// margin-left: -102.3rpx;
|
||||
line-height: 24.3rpx;
|
||||
}
|
||||
.text_20 {
|
||||
color: #ffaaa5;
|
||||
line-height: 19.41rpx;
|
||||
}
|
||||
.group_12 {
|
||||
margin-top: 15rpx;
|
||||
padding: 29.19rpx 0 16.88rpx;
|
||||
border-top: solid 1.88rpx #dfdfdf;
|
||||
border-bottom: solid 1.88rpx #dfdfdf;
|
||||
}
|
||||
.text_21 {
|
||||
margin-left: 2.36rpx;
|
||||
line-height: 24.71rpx;
|
||||
}
|
||||
.group_13 {
|
||||
margin-right: 3.62rpx;
|
||||
padding-top: 9.86rpx;
|
||||
}
|
||||
.group_14 {
|
||||
border-radius: 9.38rpx;
|
||||
height: 84.38rpx;
|
||||
border: solid 1.88rpx #ffffff;
|
||||
}
|
||||
.text_22 {
|
||||
line-height: 31.88rpx;
|
||||
text-shadow: 0 1.88rpx #ffffff, 0 -1.88rpx #ffffff, 1.88rpx 0 #ffffff, -1.88rpx 0 #ffffff;
|
||||
text-indent: 54.45rpx;
|
||||
}
|
||||
.pos_4 {
|
||||
position: absolute;
|
||||
left: 12.17rpx;
|
||||
right: 25.33rpx;
|
||||
top: 50%;
|
||||
transform: translateY(-50%);
|
||||
}
|
||||
.group_15 {
|
||||
margin-top: 15.36rpx;
|
||||
}
|
||||
.text_23 {
|
||||
line-height: 25.84rpx;
|
||||
}
|
||||
.group_16 {
|
||||
margin-right: 3.62rpx;
|
||||
width: 368.34rpx;
|
||||
}
|
||||
.text-wrapper {
|
||||
margin-left: 317.72rpx;
|
||||
padding-bottom: 2.31rpx;
|
||||
background-color: #ffffff;
|
||||
width: 50.63rpx;
|
||||
height: 22.5rpx;
|
||||
border: solid 0.94rpx #d1d1d1;
|
||||
}
|
||||
.text_25 {
|
||||
color: #323232;
|
||||
font-size: 18.75rpx;
|
||||
font-family: Open Sans;
|
||||
line-height: 17.36rpx;
|
||||
}
|
||||
.text_24 {
|
||||
margin-left: -404.34rpx;
|
||||
}
|
||||
.group_17 {
|
||||
margin-top: 10.24rpx;
|
||||
}
|
||||
.text_26 {
|
||||
line-height: 24.71rpx;
|
||||
}
|
||||
.text_27 {
|
||||
margin-right: 132.38rpx;
|
||||
}
|
||||
.group_18 {
|
||||
margin-top: 11.12rpx;
|
||||
}
|
||||
.group_21 {
|
||||
padding: 0 2.38rpx;
|
||||
}
|
||||
.text_28 {
|
||||
line-height: 24.51rpx;
|
||||
}
|
||||
.text_29 {
|
||||
margin-right: 137.49rpx;
|
||||
}
|
||||
.text_30 {
|
||||
line-height: 24.51rpx;
|
||||
}
|
||||
.text_31 {
|
||||
margin-right: 139.88rpx;
|
||||
}
|
||||
.section_5 {
|
||||
position: fixed;
|
||||
left: 0;
|
||||
right: 0;
|
||||
bottom: 0;
|
||||
// margin-top: 131.25rpx;
|
||||
padding: 16.88rpx 15rpx 15rpx 25.31rpx;
|
||||
background-color: #ffffff;
|
||||
}
|
||||
.font_8 {
|
||||
font-size: 30rpx;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 27.77rpx;
|
||||
}
|
||||
.text_32 {
|
||||
color: #000000;
|
||||
}
|
||||
.image_8 {
|
||||
width: 33.75rpx;
|
||||
height: 33.75rpx;
|
||||
}
|
||||
.text_33 {
|
||||
color: #ffaaa5;
|
||||
font-size: 37.5rpx;
|
||||
font-family: Open Sans;
|
||||
font-weight: 700;
|
||||
line-height: 27.62rpx;
|
||||
}
|
||||
.text_36 {
|
||||
color: #ffaaa5;
|
||||
font-weight: 700;
|
||||
line-height: 22.05rpx;
|
||||
}
|
||||
.text-wrapper_2 {
|
||||
padding: 17.81rpx 0 20.51rpx;
|
||||
flex: 1 1 204.38rpx;
|
||||
background-color: #ffffff;
|
||||
border-radius: 75rpx;
|
||||
height: 71.25rpx;
|
||||
border: solid 1.88rpx #e1e1e1;
|
||||
}
|
||||
.text_34 {
|
||||
color: #ffaaa5;
|
||||
line-height: 29.18rpx;
|
||||
}
|
||||
.text-wrapper_3 {
|
||||
padding: 20.63rpx 0 22.86rpx;
|
||||
// flex: 1 1 204.38rpx;
|
||||
background-color: #ffaaa5;
|
||||
border-radius: 75rpx;
|
||||
height: 71.25rpx;
|
||||
width: 100px;
|
||||
}
|
||||
.text_35 {
|
||||
color: #ffffff;
|
||||
}
|
||||
.text-wrapper_9 {
|
||||
// position: relative;
|
||||
// left: 326rpx;
|
||||
border-radius: 75rpx;
|
||||
width: 200rpx;
|
||||
// height: 71rpx;
|
||||
font-size: unset;
|
||||
background-color: #ffffff;
|
||||
border-radius: 75rpx;
|
||||
border-left: solid 1.88rpx #e79ea1;
|
||||
border-right: solid 1.88rpx #e79ea1;
|
||||
border-top: solid 1.88rpx #e79ea1;
|
||||
border-bottom: solid 1.88rpx #e79ea1;
|
||||
}
|
||||
.ml-46 {
|
||||
margin-left: 107.25rpx;
|
||||
}
|
||||
.ml-47 {
|
||||
margin-left: 280rpx;
|
||||
}
|
||||
.text_64 {
|
||||
color: #ffaaa5;
|
||||
}
|
||||
.flexed {
|
||||
display: flex;
|
||||
}
|
||||
@import url(../../../common/css/global.css);
|
||||
</style>
|
||||
|
|
@ -148,6 +148,7 @@
|
|||
import couponPopupVue from '../../coupon/component/couponPopup.vue';
|
||||
import contactsComponentVue from '../component/contactsComponent.vue'; //联系人弹窗\
|
||||
import contactPopVue from '../../mine/component/contactPop.vue'; //新增联系人弹窗
|
||||
import { getFonts } from '../../../common/globalFont';
|
||||
import * as math from 'mathjs'
|
||||
//一些暂时变量
|
||||
const sumprice = ref(0) //总价格
|
||||
|
|
@ -212,7 +213,6 @@
|
|||
|
||||
|
||||
onMounted(() => {
|
||||
getFonts()
|
||||
//将关闭弹窗方法传入弹窗页面，绑定弹窗按钮可关闭弹窗
|
||||
emitter.on('close', closeHandler)
|
||||
//获取联系人信息
|
||||
|
|
@ -239,6 +239,7 @@
|
|||
})
|
||||
|
||||
onLoad( async (options)=>{
|
||||
getFonts()
|
||||
if(options.cartInfo === undefined) {
|
||||
singleService.value = JSON.parse(options.obj)
|
||||
cnt.value = JSON.parse(options.cnt)
|
||||
|
|
@ -413,19 +414,7 @@
|
|||
})
|
||||
}
|
||||
}
|
||||
//获取字体
|
||||
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);
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
//防抖相关变量
|
||||
let debounceTimer = null;
|
||||
let wxPayTimer = null;
|
||||
|
|
@ -570,7 +559,7 @@
|
|||
.text {
|
||||
color: #818181;
|
||||
font-size: 37.5rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 32.38rpx;
|
||||
}
|
||||
.group {
|
||||
|
|
@ -583,7 +572,7 @@
|
|||
}
|
||||
.font {
|
||||
font-size: 26.25rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 25.54rpx;
|
||||
color: #323232;
|
||||
}
|
||||
|
|
@ -617,7 +606,7 @@
|
|||
}
|
||||
.font_2 {
|
||||
font-size: 26.25rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 25.54rpx;
|
||||
color: #818181;
|
||||
}
|
||||
|
|
@ -627,7 +616,7 @@
|
|||
}
|
||||
.font_3 {
|
||||
font-size: 26.25rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 17.53rpx;
|
||||
color: #818181;
|
||||
}
|
||||
|
|
@ -640,13 +629,13 @@
|
|||
}
|
||||
.font_5 {
|
||||
font-size: 33.75rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 22.54rpx;
|
||||
color: #323232;
|
||||
}
|
||||
.font_6 {
|
||||
font-size: 26.25rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 17.53rpx;
|
||||
color: #323232;
|
||||
}
|
||||
|
|
@ -667,7 +656,7 @@
|
|||
}
|
||||
.font_4 {
|
||||
font-size: 26.25rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 17.53rpx;
|
||||
color: #ffffff;
|
||||
}
|
||||
|
|
@ -688,7 +677,7 @@
|
|||
}
|
||||
.font_7 {
|
||||
font-size: 22.5rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 22.54rpx;
|
||||
color: #818181;
|
||||
}
|
||||
|
|
@ -711,7 +700,7 @@
|
|||
}
|
||||
.font_8 {
|
||||
font-size: 30rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 29.18rpx;
|
||||
color: #323232;
|
||||
}
|
||||
|
|
@ -720,7 +709,7 @@
|
|||
}
|
||||
.font_9 {
|
||||
font-size: 30rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 29.18rpx;
|
||||
color: #818181;
|
||||
}
|
||||
|
|
@ -733,7 +722,7 @@
|
|||
}
|
||||
.font_10 {
|
||||
font-size: 30rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 20.04rpx;
|
||||
color: #323232;
|
||||
}
|
||||
|
|
@ -789,21 +778,21 @@
|
|||
margin-left: -119.06rpx;
|
||||
color: #000000;
|
||||
font-size: 30rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 26.49rpx;
|
||||
}
|
||||
.text_18 {
|
||||
margin-left: 28.5rpx;
|
||||
color: #ffaaa5;
|
||||
font-size: 37.5rpx;
|
||||
font-family: Open Sans;
|
||||
font-family: FangZhengFonts;
|
||||
font-weight: 700;
|
||||
line-height: 27.62rpx;
|
||||
}
|
||||
.text_20 {
|
||||
color: #ffaaa5;
|
||||
font-size: 30rpx;
|
||||
font-family: Open Sans;
|
||||
font-family: FangZhengFonts;
|
||||
font-weight: 700;
|
||||
line-height: 22.05rpx;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
<view class="flex-col section_2" @click="loadPop" :style="{ pointerEvents: isLoading ? 'none' : 'auto' }">
|
||||
<view class="flex-row justify-between">
|
||||
<view class="flex-col">
|
||||
<text class="self-center font text" style="word-break: break-all; word-wrap: break-word;">{{ addressRealInfo.region }}</text>
|
||||
<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" style="word-break: break-all; word-wrap: break-word;">{{ addressRealInfo.detailAddress }}</text>
|
||||
<text class="font_2 text_2 ml-8 my-text-wrap">{{ addressRealInfo.detailAddress }}</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="flex-row self-start group">
|
||||
|
|
@ -159,6 +159,7 @@
|
|||
import {nextTick, onMounted, onUnmounted, ref, toRaw} from 'vue'
|
||||
import emitter from '../../../utils/emitter'
|
||||
import { onLoad , onShow } from "@dcloudio/uni-app";
|
||||
import { getFonts } from '../../../common/globalFont';
|
||||
import { baseUrl } from '../../../api/request';
|
||||
import addressComponentVue from '../component/addressComponent.vue';//导入组件
|
||||
import couponPopupVue from '../../coupon/component/couponPopup.vue';
|
||||
|
|
@ -237,7 +238,6 @@ const getCouponObjHandler = (val) => {
|
|||
|
||||
|
||||
onMounted(() => {
|
||||
getFonts()
|
||||
// 将关闭弹窗方法传入弹窗页面，绑定弹窗按钮可关闭弹窗
|
||||
emitter.on('closeAddress', closeAddressHandler)
|
||||
emitter.on('closeCoupon', closeCouponHandler)
|
||||
|
|
@ -261,6 +261,7 @@ const getCouponObjHandler = (val) => {
|
|||
})
|
||||
|
||||
onLoad( async (options)=>{
|
||||
getFonts()
|
||||
totalInfo.value = JSON.parse(options.cartInfo)
|
||||
await getProduct()
|
||||
await getMyCouponList()
|
||||
|
|
@ -537,8 +538,9 @@ const getFonts =()=>{
|
|||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
|
||||
|
||||
.my-text-wrap {
|
||||
width:480rpx; ;display:inline-block;white-space: pre-wrap; word-wrap: break-word;height: auto;
|
||||
}
|
||||
.overlay {
|
||||
position: fixed;
|
||||
top: 0;
|
||||
|
|
@ -842,14 +844,14 @@ const getFonts =()=>{
|
|||
margin-left: 28.5rpx;
|
||||
color: #ffaaa5;
|
||||
font-size: 37.5rpx;
|
||||
font-family: Open Sans;
|
||||
font-family: FangZhengFonts;
|
||||
font-weight: 700;
|
||||
line-height: 27.62rpx;
|
||||
}
|
||||
.text_24 {
|
||||
color: #ffaaa5;
|
||||
font-size: 30rpx;
|
||||
font-family: Open Sans;
|
||||
font-family: FangZhengFonts;
|
||||
font-weight: 700;
|
||||
line-height: 22.05rpx;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -140,14 +140,15 @@
|
|||
<script setup>
|
||||
import {nextTick, onMounted, onUnmounted, ref, toRaw} from 'vue'
|
||||
import emitter from '../../../utils/emitter'
|
||||
import { onLoad , onShow } from "@dcloudio/uni-app";
|
||||
import { onShow, onLoad } from "@dcloudio/uni-app";
|
||||
import { getFonts } from '../../../common/globalFont';
|
||||
import { baseUrl } from '../../../api/request';
|
||||
import { stateMap } from '../../../common/global';
|
||||
import * as math from 'mathjs'
|
||||
import contactsComponentVue from '../component/contactsComponent.vue'; //联系人弹窗\
|
||||
import contactPopVue from '../../mine/component/contactPop.vue'; //新增联系人弹窗
|
||||
import couponPopupVue from '../../coupon/component/couponPopup.vue';
|
||||
import { dealResult } from '../../../common/globalFunction';
|
||||
import { dealResult } from '../../../common/globalFunction';
|
||||
const sumprice = ref(0) //总价格
|
||||
const popup = ref(null) //弹窗对象
|
||||
const contactRealInfo = ref({
|
||||
|
|
@ -210,7 +211,6 @@ import { dealResult } from '../../../common/globalFunction';
|
|||
|
||||
|
||||
onMounted(() => {
|
||||
getFonts()
|
||||
//将关闭弹窗方法传入弹窗页面，绑定弹窗按钮可关闭弹窗
|
||||
emitter.on('close', closeHandler)
|
||||
//获取联系人信息
|
||||
|
|
@ -237,6 +237,7 @@ import { dealResult } from '../../../common/globalFunction';
|
|||
})
|
||||
|
||||
onLoad((options)=>{
|
||||
getFonts()
|
||||
singleService.value = JSON.parse(options.obj)
|
||||
cnt.value = JSON.parse(options.cnt)
|
||||
restNumber.value = JSON.parse(options.rest)
|
||||
|
|
@ -391,19 +392,7 @@ import { dealResult } from '../../../common/globalFunction';
|
|||
})
|
||||
}
|
||||
}
|
||||
//获取字体
|
||||
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);
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
//防抖相关变量
|
||||
let debounceTimer = null;
|
||||
let wxPayTimer = null;
|
||||
|
|
@ -554,7 +543,7 @@ import { dealResult } from '../../../common/globalFunction';
|
|||
.text {
|
||||
color: #818181;
|
||||
font-size: 37.5rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 32.38rpx;
|
||||
}
|
||||
.group {
|
||||
|
|
@ -567,7 +556,7 @@ import { dealResult } from '../../../common/globalFunction';
|
|||
}
|
||||
.font {
|
||||
font-size: 26.25rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 25.54rpx;
|
||||
color: #323232;
|
||||
}
|
||||
|
|
@ -601,7 +590,7 @@ import { dealResult } from '../../../common/globalFunction';
|
|||
}
|
||||
.font_2 {
|
||||
font-size: 26.25rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 25.54rpx;
|
||||
color: #818181;
|
||||
}
|
||||
|
|
@ -611,7 +600,7 @@ import { dealResult } from '../../../common/globalFunction';
|
|||
}
|
||||
.font_3 {
|
||||
font-size: 26.25rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 17.53rpx;
|
||||
color: #818181;
|
||||
}
|
||||
|
|
@ -624,13 +613,13 @@ import { dealResult } from '../../../common/globalFunction';
|
|||
}
|
||||
.font_5 {
|
||||
font-size: 33.75rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 22.54rpx;
|
||||
color: #323232;
|
||||
}
|
||||
.font_6 {
|
||||
font-size: 26.25rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 17.53rpx;
|
||||
color: #323232;
|
||||
}
|
||||
|
|
@ -651,7 +640,7 @@ import { dealResult } from '../../../common/globalFunction';
|
|||
}
|
||||
.font_4 {
|
||||
font-size: 26.25rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 17.53rpx;
|
||||
color: #ffffff;
|
||||
}
|
||||
|
|
@ -672,7 +661,7 @@ import { dealResult } from '../../../common/globalFunction';
|
|||
}
|
||||
.font_7 {
|
||||
font-size: 25.5rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 22.54rpx;
|
||||
color: #818181;
|
||||
}
|
||||
|
|
@ -695,7 +684,7 @@ import { dealResult } from '../../../common/globalFunction';
|
|||
}
|
||||
.font_8 {
|
||||
font-size: 30rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 29.18rpx;
|
||||
color: #323232;
|
||||
}
|
||||
|
|
@ -704,7 +693,7 @@ import { dealResult } from '../../../common/globalFunction';
|
|||
}
|
||||
.font_9 {
|
||||
font-size: 30rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 29.18rpx;
|
||||
color: #818181;
|
||||
}
|
||||
|
|
@ -717,7 +706,7 @@ import { dealResult } from '../../../common/globalFunction';
|
|||
}
|
||||
.font_10 {
|
||||
font-size: 30rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 20.04rpx;
|
||||
color: #323232;
|
||||
}
|
||||
|
|
@ -773,21 +762,21 @@ import { dealResult } from '../../../common/globalFunction';
|
|||
margin-left: -119.06rpx;
|
||||
color: #000000;
|
||||
font-size: 30rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 26.49rpx;
|
||||
}
|
||||
.text_18 {
|
||||
margin-left: 28.5rpx;
|
||||
color: #ffaaa5;
|
||||
font-size: 37.5rpx;
|
||||
font-family: Open Sans;
|
||||
font-family: FangZhengFonts;
|
||||
font-weight: 700;
|
||||
line-height: 27.62rpx;
|
||||
}
|
||||
.text_20 {
|
||||
color: #ffaaa5;
|
||||
font-size: 30rpx;
|
||||
font-family: Open Sans;
|
||||
font-family: FangZhengFonts;
|
||||
font-weight: 700;
|
||||
line-height: 22.05rpx;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,9 +9,16 @@
|
|||
</view>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
<script setup>
|
||||
import { DomainName } from '../../../common/global';
|
||||
import emitter from '../../../utils/emitter';
|
||||
import { onLoad } from "@dcloudio/uni-app";
|
||||
import { getFonts } from '../../../common/globalFont';
|
||||
|
||||
onLoad(() => {
|
||||
getFonts()
|
||||
})
|
||||
|
||||
const conform = async () => {
|
||||
|
||||
emitter.emit('delAddress')
|
||||
|
|
@ -32,12 +39,12 @@
|
|||
.text {
|
||||
color: #000000;
|
||||
font-size: 33.75rpx;
|
||||
font-family: Microsoft YaHei UI;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 32.85rpx;
|
||||
}
|
||||
.font {
|
||||
font-size: 26.25rpx;
|
||||
font-family: Microsoft YaHei UI;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 25.43rpx;
|
||||
}
|
||||
.text_2 {
|
||||
|
|
|
|||
|
|
@ -84,6 +84,7 @@
|
|||
<script setup >
|
||||
import {nextTick, onMounted, onUnmounted, ref} from 'vue'
|
||||
import { onLoad , onShow } from "@dcloudio/uni-app";
|
||||
import { getFonts } from '../../../common/globalFont';
|
||||
import { baseUrl } from '../../../api/request';
|
||||
import emitter from '../../../utils/emitter'
|
||||
import addProduct from '../../Shopping-cart/component/addProduct.vue';
|
||||
|
|
@ -98,6 +99,7 @@ const coupon = ref(0) //当前商品可用的优惠卷
|
|||
const cookie = wx.getStorageSync('cookie')
|
||||
//转换上一页面传来的商品
|
||||
onLoad((options) => {
|
||||
getFonts()
|
||||
getProduct(JSON.parse(options.gid)) //页面加载的时候获取商品信息
|
||||
})
|
||||
onShow(()=>{
|
||||
|
|
@ -110,7 +112,6 @@ const closeHandler = () => {
|
|||
|
||||
onMounted(()=>{
|
||||
emitter.on('close', closeHandler)
|
||||
getFonts()
|
||||
})
|
||||
|
||||
onUnmounted(() => {
|
||||
|
|
@ -159,19 +160,7 @@ const jump_buy = async ()=> {
|
|||
})
|
||||
}
|
||||
|
||||
//获取字体
|
||||
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);
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
//点击查看图片详情方法
|
||||
const previewImage = (index) => {
|
||||
console.log(index);
|
||||
|
|
|
|||
|
|
@ -1,322 +0,0 @@
|
|||
<template>
|
||||
<view class="flex-row relative page">
|
||||
<view class="flex-row items-center section pos_8">
|
||||
<text class="text">商品</text>
|
||||
<view class="flex-row items-center section_2 ml-15">
|
||||
<image class="image"
|
||||
src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FojVVqfyX-sousuo.png" />
|
||||
<input class="text-wrapper ml-3" placeholder="请输入内容" />
|
||||
</view>
|
||||
</view>
|
||||
<view class="flex-col justify-start items-center image-wrapper pos_1">
|
||||
<image class="shrink-0 image_2"
|
||||
src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FloZarLZD-%E6%B5%8B%E8%AF%95%E6%8F%92%E5%85%A5.jpg" />
|
||||
</view>
|
||||
<!-- 类别列表 -->
|
||||
<view class="flex-col justify-start section_3 pos_9">
|
||||
<scroll-view scroll-y class="scrollable-contentType">
|
||||
<view class="flex-col group">
|
||||
<view class="flex-col items-center list-item mt-5"
|
||||
v-for="(item, index) in sort"
|
||||
:key="index"
|
||||
:style="getBoxStyle(index)"
|
||||
@click="changeTypes(item , index)"
|
||||
>
|
||||
<image class="image_3"
|
||||
:src="item.imgurl" />
|
||||
<text class="font_4 mt-3">{{ item.name }}</text>
|
||||
</view>
|
||||
</view>
|
||||
</scroll-view>
|
||||
</view>
|
||||
<view class="flex-col justify-start section_4 pos_4">
|
||||
<view class="flex-col items-start section_5">
|
||||
<text class="font_2">材料包</text>
|
||||
<text class="font_3 text_3 mt-6">提供材料自行DIY</text>
|
||||
</view>
|
||||
</view>
|
||||
<!-- 根据类别渲染的商品列表 -->
|
||||
<view class="flex-col pos_5">
|
||||
<scroll-view scroll-y class="scrollable-content">
|
||||
<view class="flex-row section_9 list-item_2 mt-5" v-for="(item, index) in productList" :key="index" @click="goToProduct(item)">
|
||||
<image class="self-center image_4"
|
||||
:src="item.goodImg.split(';')[0]" />
|
||||
<view style="width: 220rpx;" class="flex-col items-start self-center group_3">
|
||||
<text class="font_2 text_5">{{ item.name }}</text>
|
||||
<text class="font_3 mt-13">{{ item.intro }}</text>
|
||||
<text class="font mt-13">￥{{ item.price }}</text>
|
||||
</view>
|
||||
<image class="self-start image_5"
|
||||
src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FRcPadqFv-add.png" @click.stop />
|
||||
</view>
|
||||
</scroll-view>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import { ref,onMounted, toRaw } from 'vue';
|
||||
import { baseUrl, testUrl , suiUrl} from '@/api/request';
|
||||
const currentColor = ref(0);
|
||||
const sort =ref([{}]) //商品类别对象数组
|
||||
const headerList = ref([{}]) //类别标题和介绍
|
||||
const productList = ref([{}]) //类别下对应的商品
|
||||
const cookie = wx.getStorageSync("cookie")
|
||||
const product_type = [{
|
||||
type: "材料包",
|
||||
detail: "提供材料自行DIY"
|
||||
}]
|
||||
onMounted( async () => {
|
||||
await Getsort() //获取商品类别
|
||||
await changeTypes( sort.value[0] , 0 ) //首先获取最开始的类别
|
||||
})
|
||||
//获取商品分类
|
||||
const Getsort = async ()=>{
|
||||
const res = await uni.request({
|
||||
url: baseUrl + '/category/list',
|
||||
method:'POST',
|
||||
header: {
|
||||
cookie,
|
||||
}
|
||||
})
|
||||
if(res.data.code === 1){
|
||||
for(let key in res.data.data) {
|
||||
sort.value[key] = {//类别列表
|
||||
name : res.data.data[key].typeName,
|
||||
imgurl : res.data.data[key].typeUrl,
|
||||
id : res.data.data[key].id
|
||||
}//标题列表
|
||||
headerList.value[key] = {
|
||||
name : res.data.data[key].typeName,
|
||||
typeIntro : res.data.data[key].typeIntro
|
||||
}
|
||||
}
|
||||
} else {
|
||||
uni.showToast({ //提示请求错误
|
||||
title: '请求商品分类错误',
|
||||
icon: 'none',
|
||||
duration: 2000
|
||||
})
|
||||
}
|
||||
console.log('获取商品分类==>',res.data);
|
||||
}
|
||||
//更改类别
|
||||
const changeTypes = async (item , index) =>{
|
||||
currentColor.value = index
|
||||
const res = await uni.request({
|
||||
url: baseUrl + '/category/list/type',
|
||||
method: 'POST',
|
||||
data: {
|
||||
id : item.id
|
||||
},
|
||||
header:{
|
||||
cookie,
|
||||
}
|
||||
})
|
||||
console.log('类别下的商品--->',res.data.data);
|
||||
if(res.data.code === 1) {
|
||||
productList.value = res.data.data[item.id]
|
||||
} else {
|
||||
uni.showToast({ //商品请求错误
|
||||
title: '更改类别错误',
|
||||
icon: 'none',
|
||||
duration: 2000
|
||||
})
|
||||
}
|
||||
}
|
||||
//更改box颜色
|
||||
const getBoxStyle = (index) => ({
|
||||
backgroundColor: currentColor.value === index ? 'brown' : '#fffef8'
|
||||
});
|
||||
//跳转商品详情
|
||||
const goToProduct = (item) => {
|
||||
uni.navigateTo({
|
||||
url: '../../../pages/store-home/ProductDetails/ProductDetails?gid=' + JSON.stringify(item.id)
|
||||
})
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.scrollable-contentType {
|
||||
height: 65vh;
|
||||
}
|
||||
.scrollable-content {
|
||||
height: 56vh;
|
||||
/* 100px 是头部和底部的高度之和 */
|
||||
}
|
||||
.ml-15 {
|
||||
margin-left: 28.13rpx;
|
||||
}
|
||||
.ml-3 {
|
||||
margin-left: 5.63rpx;
|
||||
}
|
||||
.mt-3 {
|
||||
margin-top: 5.63rpx;
|
||||
text-align: center;
|
||||
}
|
||||
.mt-13 {
|
||||
margin-top: 17.38rpx;
|
||||
}
|
||||
.mt-5 {
|
||||
margin-top: 9.38rpx;
|
||||
}
|
||||
.page {
|
||||
background-color: #f5f5dc;
|
||||
// height: 1413.75rpx;
|
||||
width: 100%;
|
||||
overflow-y: auto;
|
||||
overflow-x: hidden;
|
||||
height: 100vh;
|
||||
overflow: hidden;
|
||||
}
|
||||
.section {
|
||||
padding: 22.5rpx 39.28rpx 16.88rpx;
|
||||
background-color: #f7de98;
|
||||
}
|
||||
.pos_8 {
|
||||
position: absolute;
|
||||
left: 0;
|
||||
right: 0;
|
||||
top: 0;
|
||||
}
|
||||
.text {
|
||||
color: #c1651a;
|
||||
font-size: 37.5rpx;
|
||||
font-family: STFangsong;
|
||||
line-height: 36.19rpx;
|
||||
}
|
||||
.section_2 {
|
||||
padding: 5.63rpx 15rpx 8.44rpx;
|
||||
background-color: #ffffff;
|
||||
border-radius: 28.13rpx;
|
||||
height: 63.75rpx;
|
||||
width: 500.69rpx;
|
||||
}
|
||||
.image {
|
||||
width: 50.63rpx;
|
||||
height: 50.63rpx;
|
||||
}
|
||||
.text-wrapper {
|
||||
margin-right: 17.42rpx;
|
||||
}
|
||||
.font {
|
||||
font-size: 26.25rpx;
|
||||
font-family: STFangsong;
|
||||
line-height: 18rpx;
|
||||
color: #ff0000;
|
||||
}
|
||||
.image-wrapper {
|
||||
background-color: #ffffff;
|
||||
border-radius: 28.13rpx;
|
||||
overflow: hidden;
|
||||
border: solid 9.38rpx #ffffff;
|
||||
}
|
||||
.pos_1 {
|
||||
position: absolute;
|
||||
left: 22.5rpx;
|
||||
right: 24.38rpx;
|
||||
top: 118.13rpx;
|
||||
}
|
||||
.image_2 {
|
||||
width: 91.25vw;
|
||||
height: 37.5vw;
|
||||
}
|
||||
.section_3 {
|
||||
padding: 8.44rpx 5.63rpx 750rpx;
|
||||
background-color: #f7de98;
|
||||
width: 151.88rpx;
|
||||
}
|
||||
.pos_9 {
|
||||
position: absolute;
|
||||
left: 0;
|
||||
top: 440.63rpx;
|
||||
}
|
||||
.group {
|
||||
margin: auto;
|
||||
width: 137.81rpx;
|
||||
}
|
||||
//类别列表
|
||||
.list-item {
|
||||
padding: 11.25rpx 0 9.94rpx;
|
||||
background-color: #fffef8;
|
||||
border-radius: 9.38rpx;
|
||||
}
|
||||
.list-item:first-child {
|
||||
margin-top: 0;
|
||||
}
|
||||
.image_3 {
|
||||
border-radius: 0rpx 9.38rpx 9.38rpx 0rpx;
|
||||
width: 60rpx;
|
||||
height: 60rpx;
|
||||
}
|
||||
.font_4 {
|
||||
font-size: 25rpx;
|
||||
font-family: STFangsong;
|
||||
line-height: 28.26rpx;
|
||||
color: #c1651a;
|
||||
}
|
||||
.section_4 {
|
||||
padding-bottom: 879.38rpx;
|
||||
background-color: #f8e8c1;
|
||||
border-radius: 0rpx 18.75rpx 0rpx 0rpx;
|
||||
width: 600.13rpx;
|
||||
}
|
||||
.pos_4 {
|
||||
position: absolute;
|
||||
right: 0;
|
||||
top: 440.63rpx;
|
||||
}
|
||||
.section_5 {
|
||||
padding: 18.06rpx 16.24rpx 14.94rpx;
|
||||
background-color: #fffef8;
|
||||
border-radius: 0rpx 18.75rpx 0rpx 0rpx;
|
||||
width: 598.13rpx;
|
||||
}
|
||||
.font_2 {
|
||||
font-size: 30rpx;
|
||||
font-family: STFangsong;
|
||||
line-height: 28.26rpx;
|
||||
color: #000000;
|
||||
}
|
||||
.font_3 {
|
||||
font-size: 22.5rpx;
|
||||
font-family: STFangsong;
|
||||
line-height: 21.56rpx;
|
||||
color: #727272;
|
||||
}
|
||||
.text_3 {
|
||||
line-height: 21.15rpx;
|
||||
}
|
||||
.pos_5 {
|
||||
position: absolute;
|
||||
right: 15rpx;
|
||||
top: 543.75rpx;
|
||||
}
|
||||
.section_9 {
|
||||
padding: 20.63rpx 22.88rpx 22.5rpx;
|
||||
background-color: #fffef8;
|
||||
border-radius: 9.38rpx;
|
||||
right: 13.13rpx;
|
||||
}
|
||||
.list-item_2:first-child {
|
||||
margin-top: 0;
|
||||
}
|
||||
.image_4 {
|
||||
border-radius: 9.38rpx;
|
||||
width: 131.25rpx;
|
||||
height: 131.25rpx;
|
||||
}
|
||||
.group_3 {
|
||||
margin-left: 24.84rpx;
|
||||
}
|
||||
.text_5 {
|
||||
line-height: 28.65rpx;
|
||||
}
|
||||
.image_5 {
|
||||
margin: 75rpx 5.63rpx 0 107.96rpx;
|
||||
border-radius: 9.38rpx;
|
||||
width: 56.25rpx;
|
||||
height: 56.25rpx;
|
||||
}
|
||||
@import url(../../../common/css/global.css);
|
||||
</style>
|
||||
|
|
@ -67,6 +67,7 @@
|
|||
import { ref,onMounted, toRaw } from 'vue';
|
||||
import { baseUrl, testUrl , suiUrl} from '@/api/request';
|
||||
import { onLoad,onPullDownRefresh } from '@dcloudio/uni-app';
|
||||
import { getFonts } from '../../../common/globalFont';
|
||||
import carousel from '@/components/vear-carousel/vear-carousel'
|
||||
|
||||
const currentColor = ref(0);
|
||||
|
|
@ -80,9 +81,9 @@ const product_type = ref({
|
|||
})
|
||||
|
||||
onLoad( async (options)=>{
|
||||
getFonts()
|
||||
await Getsort()
|
||||
await changeTypes( sort.value[0] , 0 ) //首先获取最开始的类别
|
||||
await getFonts() //获取字体
|
||||
})
|
||||
onPullDownRefresh( async ()=>{ //下拉刷新
|
||||
await Getsort()
|
||||
|
|
@ -160,18 +161,7 @@ const goToProduct = (item) => {
|
|||
url: '../../../pages/store-home/ProductDetails/ProductDetails?gid=' + JSON.stringify(item.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);
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,483 +0,0 @@
|
|||
<template>
|
||||
<view class="flex-col page">
|
||||
<view class="flex-col self-stretch">
|
||||
<view class="flex-col self-stretch group">
|
||||
<view class="flex-row justify-between group_2">
|
||||
<view class="flex-row items-end group_3">
|
||||
<image class="image-wrapper" :src="productInfo.goodImg"></image>
|
||||
<view class="flex-col items-start relative group_5 ml-13">
|
||||
<view class="group_6">
|
||||
<text class="font text_2">￥</text>
|
||||
<text class="text">{{ productInfo.price }}</text>
|
||||
</view>
|
||||
<!-- <text class="font_2 text_3">请选择</text> -->
|
||||
<text class="font_2 pos_2">最大人数：0</text>
|
||||
<!-- <text class="font_2 pos">场次</text> -->
|
||||
</view>
|
||||
</view>
|
||||
<view class="flex-col group_4">
|
||||
<image
|
||||
class="self-end image_2"
|
||||
src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FTZQhzAYT-close.png"
|
||||
/>
|
||||
<view class="flex-row self-stretch mt-63">
|
||||
<image
|
||||
class="image_3"
|
||||
src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FnKMzaToH-short.png"
|
||||
@click="short()"
|
||||
/>
|
||||
<view class="flex-col justify-start items-center text-wrapper ml-2"><text class="text_4">{{ classNum }}</text></view>
|
||||
<image
|
||||
class="image_4 ml-2"
|
||||
src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FhvzZoTdm-add.png"
|
||||
@click="add()"
|
||||
/>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="flex-row justify-between items-center section">
|
||||
<text class="font text_5">参加日期：{{ selected.date }}</text>
|
||||
<text class="font_2 text_6">当前预约人数：10</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="self-stretch divider view"></view>
|
||||
<text class="self-start font_3 text_7">选择预约时间</text>
|
||||
<view class="section_1">
|
||||
<scroll-view scroll-x="true">
|
||||
<view class="flex-row items-baseline group_1">
|
||||
<text :style="{ color: item.color }" class="font_4 text_8" v-for="(item, index) in bookTimeList" :key="index" @click="chooseDate(index)">
|
||||
{{ weekDay(item.specificDate) }}{{ item.specificDate.substring(5,10) }}
|
||||
</text>
|
||||
</view>
|
||||
</scroll-view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="flex-row justify-start self-center grid">
|
||||
<!-- 时间段数组小于等于2的情况 -->
|
||||
<view class="flex-1 list_temp" v-if="timeSlotList.length <= 2">
|
||||
<view class="flex-col justify-start relative" v-for="(item, index) in timeSlotList" :key="index" @click="chooseTimeSlot(index)">
|
||||
<view :style="{ backgroundColor: item.color }" class="section_3" ></view>
|
||||
<text class="font_5 text_12 pos_temp3">{{ item.timeSlot }}</text>
|
||||
<text class="font_3 pos_temp5">可预约</text>
|
||||
</view>
|
||||
</view>
|
||||
<!-- 时间段数组大于三才显示 -->
|
||||
<view class="flex-1 list_2" v-if="timeSlotList.length >= 3">
|
||||
<view class="flex-col justify-start relative" v-for="(item, index) in timeSlotList" :key="index" @click="chooseTimeSlot(index)">
|
||||
<view class="section_3" :style="{ backgroundColor: item.color }"></view>
|
||||
<text class="font_5 text_12 pos_3">{{ item.timeSlot }}</text>
|
||||
<!-- 缺当前预约人数 -->
|
||||
<text class="font_3 pos_5">可预约</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="flex-col self-stretch group_7">
|
||||
<view class="flex-row justify-between section_4">
|
||||
<text class="font_3 text_13">预约时间</text>
|
||||
<text class="font_3 text_14">{{ selected.date }} {{ selected.time }}</text>
|
||||
</view>
|
||||
<view class="divider mt-9"></view>
|
||||
</view>
|
||||
<view class="flex-col items-start self-center section_5">
|
||||
<text class="font_6">购买须知：本次课程活动最少需要到达5人才</text>
|
||||
<text class="font_6 text_1">能进行授课</text>
|
||||
</view>
|
||||
<view class="flex-col justify-start items-center self-stretch section_6">
|
||||
<view class="flex-row section_7">
|
||||
<text class="font_4 text_15">加入购物车</text>
|
||||
<!-- <text class="font_4 text_16 ml-21">买</text> -->
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import { onMounted, ref } from 'vue'
|
||||
import { onLoad } from "@dcloudio/uni-app";
|
||||
import { baseUrl } from '../../../api/request';
|
||||
import { weekDay } from '../../../common/global';
|
||||
const cookie = wx.getStorageSync("cookie") //请求头
|
||||
const father = defineProps(['pid'])
|
||||
const pid = ref(0) //商品id
|
||||
const productInfo = ref({}) //商品对象
|
||||
const bookTimeList = ref([]) //日期数组
|
||||
const timeSlotList = ref([]) //时间段数组
|
||||
const selected = ref({ //选中的日期+时间
|
||||
date: '',
|
||||
time: '',
|
||||
minNum: 0,
|
||||
maxNum: 0
|
||||
})
|
||||
const classNum = ref(1) //课程数量
|
||||
const flag = ref(0)
|
||||
onLoad((options)=>{
|
||||
})
|
||||
onMounted( async ()=>{
|
||||
await getProduct()
|
||||
//每次加载都先选第一个
|
||||
await chooseDate(0)
|
||||
await chooseTimeSlot(0)
|
||||
})
|
||||
const chooseDate = (index) => { //选中后要改变颜色和切换日期
|
||||
selected.value.date = bookTimeList.value[index].specificDate
|
||||
selected.value.time = ''
|
||||
classNum.value = 1 //切换了时间就初始化
|
||||
bookTimeList.value.forEach((item)=>{
|
||||
if(item != bookTimeList.value[index]) {
|
||||
item.color = '#000000'
|
||||
} else {
|
||||
bookTimeList.value[index].color = '#C35C5D'
|
||||
}
|
||||
})
|
||||
timeSlotList.value = bookTimeList.value[index].timePeriodVOList //将当前日期下的时间段赋值
|
||||
console.log('选中下日期时间段--->',bookTimeList.value[index].timePeriodVOList);
|
||||
}
|
||||
const chooseTimeSlot =(index) => { //选中后要改变颜色和切换时间段
|
||||
selected.value.time = timeSlotList.value[index].timeSlot
|
||||
selected.value.maxNum = timeSlotList.value[index].maxNumber
|
||||
classNum.value = 1 //切换了时间就初始化
|
||||
timeSlotList.value.forEach((item)=>{
|
||||
if(item != timeSlotList.value[index]) {
|
||||
item.color = '#FFFFFF'
|
||||
} else {
|
||||
item.color = '#FBDEDF'
|
||||
}
|
||||
})
|
||||
}
|
||||
const getProduct = async ()=>{ //获取商品信息
|
||||
pid.value = father.pid //父组件传来的商品id
|
||||
const res = await uni.request({
|
||||
url: baseUrl + '/goods/service/list/id',
|
||||
method: 'POST',
|
||||
data:{ id: pid.value },
|
||||
header: { cookie }
|
||||
})
|
||||
console.log('后端传来的商品信息--->',res.data.data);
|
||||
if(res.data.code === 1 ) {
|
||||
productInfo.value = res.data.data
|
||||
bookTimeList.value = res.data.data.appointmentDateVOList
|
||||
}
|
||||
console.log('商品信息--->',productInfo.value);
|
||||
console.log('日期+时间段信息--->',bookTimeList.value);
|
||||
}
|
||||
const short =()=> { //减少购买课程数量
|
||||
if( selected.value.maxNum === 0 ) {
|
||||
uni.showToast({
|
||||
icon: 'error',
|
||||
title: '请先选择时间段',
|
||||
duration: 1000
|
||||
})
|
||||
return;
|
||||
}
|
||||
if(classNum.value > 1) {
|
||||
classNum.value -= 1
|
||||
}
|
||||
}
|
||||
const add =()=> { //传入当前课程最大人数
|
||||
if( selected.value.maxNum === 0 ) {
|
||||
uni.showToast({
|
||||
icon: 'error',
|
||||
title: '请先选择时间段',
|
||||
duration: 1000
|
||||
})
|
||||
return;
|
||||
}
|
||||
if(classNum.value < selected.value.maxNum) {
|
||||
classNum.value += 1
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.ml-13 {
|
||||
margin-left: 24.38rpx;
|
||||
}
|
||||
.mt-63 {
|
||||
margin-top: 118.13rpx;
|
||||
}
|
||||
.mt-9 {
|
||||
margin-top: 16.88rpx;
|
||||
}
|
||||
.ml-21 {
|
||||
margin-left: 39.38rpx;
|
||||
}
|
||||
.page {
|
||||
padding-top: 28.13rpx;
|
||||
background-color: #ffffff;
|
||||
border-radius: 37.5rpx 37.5rpx 0rpx 0rpx;
|
||||
width: 100%;
|
||||
overflow-y: auto;
|
||||
overflow-x: hidden;
|
||||
height: 100%;
|
||||
}
|
||||
.group {
|
||||
padding-bottom: 9.38rpx;
|
||||
}
|
||||
.group_2 {
|
||||
padding: 0 30rpx;
|
||||
}
|
||||
.group_3 {
|
||||
margin-bottom: 5.01rpx;
|
||||
}
|
||||
.image-wrapper {
|
||||
border-radius: 5.63rpx;
|
||||
// background-image: url('https://ide.code.fun/api/image?token=677b3b47797f850011f57419&name=f41b64b57071affd8eecfaa15a455af2.png');
|
||||
background-size: 100% 100%;
|
||||
background-repeat: no-repeat;
|
||||
width: 195rpx;
|
||||
height: 204.38rpx;
|
||||
}
|
||||
.group_5 {
|
||||
margin-bottom: 5.29rpx;
|
||||
padding-bottom: 48.86rpx;
|
||||
width: 157.8rpx;
|
||||
}
|
||||
.group_6 {
|
||||
margin-left: 17.51rpx;
|
||||
line-height: 29.7rpx;
|
||||
}
|
||||
.font {
|
||||
font-size: 37.5rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
}
|
||||
.text_2 {
|
||||
color: #c35c5d;
|
||||
line-height: 24.17rpx;
|
||||
}
|
||||
.text {
|
||||
color: #c35c5d;
|
||||
font-size: 45rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
line-height: 29.7rpx;
|
||||
}
|
||||
.font_2 {
|
||||
font-size: 26.25rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
line-height: 31.88rpx;
|
||||
color: #818181;
|
||||
}
|
||||
.text_3 {
|
||||
margin-top: 21.26rpx;
|
||||
}
|
||||
.pos_2 {
|
||||
position: absolute;
|
||||
left: 0;
|
||||
bottom: 0;
|
||||
}
|
||||
.pos {
|
||||
position: absolute;
|
||||
right: 0;
|
||||
bottom: 28.03rpx;
|
||||
}
|
||||
.group_4 {
|
||||
margin-top: 5.63rpx;
|
||||
width: 176.25rpx;
|
||||
}
|
||||
.image_2 {
|
||||
margin-right: 20.63rpx;
|
||||
width: 37.5rpx;
|
||||
height: 37.5rpx;
|
||||
}
|
||||
.image_3 {
|
||||
border-radius: 9.38rpx 0rpx 0rpx 9.38rpx;
|
||||
width: 45.21rpx;
|
||||
height: 48.13rpx;
|
||||
}
|
||||
.text-wrapper {
|
||||
padding: 14.74rpx 0 14.66rpx;
|
||||
background-color: #ffffff;
|
||||
width: 58.41rpx;
|
||||
height: 48.13rpx;
|
||||
}
|
||||
.text_4 {
|
||||
color: #323232;
|
||||
font-size: 26.25rpx;
|
||||
font-family: Open Sans;
|
||||
line-height: 18.73rpx;
|
||||
}
|
||||
.image_4 {
|
||||
border-radius: 0rpx 9.38rpx 9.38rpx 0rpx;
|
||||
width: 45.21rpx;
|
||||
height: 48.13rpx;
|
||||
}
|
||||
.section {
|
||||
padding: 30.53rpx 21.86rpx 30.36rpx;
|
||||
background-color: #ffffff;
|
||||
border-radius: 28.13rpx;
|
||||
}
|
||||
.text_5 {
|
||||
color: #000000;
|
||||
line-height: 36.62rpx;
|
||||
}
|
||||
.text_6 {
|
||||
margin-right: 16.14rpx;
|
||||
line-height: 25.43rpx;
|
||||
}
|
||||
.divider {
|
||||
background-color: #d9d9d9;
|
||||
height: 1.88rpx;
|
||||
}
|
||||
.view {
|
||||
margin-left: 20.63rpx;
|
||||
margin-right: 26.27rpx;
|
||||
}
|
||||
.font_3 {
|
||||
font-size: 30rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
line-height: 27.07rpx;
|
||||
color: #000000;
|
||||
}
|
||||
.text_7 {
|
||||
margin-left: 29.31rpx;
|
||||
margin-top: 29.89rpx;
|
||||
line-height: 28.01rpx;
|
||||
}
|
||||
.section_1 {
|
||||
padding: 30rpx 0;
|
||||
background-color: #FBDEDF;
|
||||
border-radius: 10rpx;
|
||||
align-self: stretch;
|
||||
margin: 26.47rpx 28.13rpx 0 28.13rpx;
|
||||
}
|
||||
.group_1 {
|
||||
margin-left: 11.78rpx;
|
||||
margin-right: 14.83rpx;
|
||||
}
|
||||
.font_4 {
|
||||
// font-size: 30rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
line-height: 27.07rpx;
|
||||
color: #000000;
|
||||
}
|
||||
.text_8 {
|
||||
line-height: 27.3rpx;
|
||||
margin-left: 30rpx;
|
||||
}
|
||||
.grid {
|
||||
margin-top: 60rpx;
|
||||
width: 605.63rpx;
|
||||
}
|
||||
.list_2 {
|
||||
height: 228.75rpx;
|
||||
display: grid;
|
||||
grid-template-rows: repeat(2, minmax(0, 1fr));
|
||||
grid-template-columns: repeat(2, minmax(0, 1fr));
|
||||
row-gap: 54rpx;
|
||||
column-gap: 102rpx;
|
||||
overflow-y: auto;
|
||||
overflow-x: hidden;
|
||||
}
|
||||
//处理时间段数组长度小于2的情况
|
||||
.list_temp {
|
||||
height: 105.75rpx;
|
||||
display: grid;
|
||||
grid-template-rows: repeat(2, minmax(0, 1fr));
|
||||
grid-template-columns: repeat(2, minmax(0, 1fr));
|
||||
row-gap: 54rpx;
|
||||
column-gap: 102rpx;
|
||||
overflow-y: auto;
|
||||
overflow-x: hidden;
|
||||
}
|
||||
.pos_temp3 {
|
||||
position: absolute;
|
||||
left: 50%;
|
||||
top: 52.99rpx;
|
||||
transform: translateX(-50%);
|
||||
}
|
||||
.pos_temp5 {
|
||||
position: absolute;
|
||||
left: 74.53rpx;
|
||||
bottom: -14.94rpx;
|
||||
}
|
||||
.group_temp7 {
|
||||
margin-top: 97.5rpx;
|
||||
padding: 0 22.5rpx;
|
||||
}
|
||||
//到这里结束
|
||||
.section_3 {
|
||||
background-image: url('https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FkDkwyiFc-border.png');
|
||||
background-color: #ffffff;
|
||||
border-radius: 26rpx;
|
||||
background-size: 100% 100%;
|
||||
background-repeat: no-repeat;
|
||||
height: 90rpx;
|
||||
}
|
||||
.font_5 {
|
||||
font-size: 30rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
line-height: 20.04rpx;
|
||||
color: #000000;
|
||||
}
|
||||
.text_12 {
|
||||
width: 150rpx;
|
||||
}
|
||||
.pos_3 {
|
||||
position: absolute;
|
||||
left: 50%;
|
||||
top: 16.99rpx;
|
||||
transform: translateX(-50%);
|
||||
}
|
||||
.pos_5 {
|
||||
position: absolute;
|
||||
left: 74.53rpx;
|
||||
bottom: 12.06rpx;
|
||||
}
|
||||
.group_7 {
|
||||
margin-top: 60rpx;
|
||||
padding: 0 22.5rpx;
|
||||
}
|
||||
.section_4 {
|
||||
margin-left: 20.63rpx;
|
||||
margin-right: 9.38rpx;
|
||||
// padding: 12.66rpx 13.54rpx 76.65rpx 16.29rpx;
|
||||
background-color: #ffffff;
|
||||
}
|
||||
.text_13 {
|
||||
line-height: 28.01rpx;
|
||||
}
|
||||
.text_14 {
|
||||
line-height: 28.84rpx;
|
||||
}
|
||||
.section_5 {
|
||||
margin: 54.38rpx 0 100rpx 0;
|
||||
padding: 32.23rpx 10.56rpx 91.29rpx 17.57rpx;
|
||||
background-color: #fff2f2f5;
|
||||
border-radius: 18.75rpx;
|
||||
}
|
||||
.font_6 {
|
||||
font-size: 30rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
line-height: 35.63rpx;
|
||||
color: #323232;
|
||||
}
|
||||
.text_1 {
|
||||
margin-left: 2.12rpx;
|
||||
}
|
||||
.section_6 {
|
||||
position: fixed;
|
||||
left: 0;
|
||||
right: 0;
|
||||
bottom: 0;
|
||||
// margin-left: 15rpx;
|
||||
// margin-top: 88.13rpx;
|
||||
padding: 16.88rpx 0;
|
||||
}
|
||||
.section_7 {
|
||||
padding: 26.14rpx 0 25.07rpx;
|
||||
background-color: #fbdedf;
|
||||
border-radius: 46.88rpx;
|
||||
width: 618.75rpx;
|
||||
}
|
||||
.text_15 {
|
||||
// margin-left: 260.94rpx;
|
||||
margin: 0 auto;
|
||||
line-height: 27.54rpx;
|
||||
}
|
||||
.text_16 {
|
||||
line-height: 27.54rpx;
|
||||
}
|
||||
.text_8:first-child {
|
||||
margin-left: 0rpx;
|
||||
}
|
||||
@import url(../../../common/css/global.css);
|
||||
</style>
|
||||
|
|
@ -84,7 +84,8 @@
|
|||
import { baseUrl } from '../../../api/request';
|
||||
import { workshopUrl } from '../../../common/globalImagesUrl';
|
||||
import { dealResult } from '../../../common/globalFunction';
|
||||
|
||||
import { onLoad } from "@dcloudio/uni-app";
|
||||
import { getFonts } from '../../../common/globalFont';
|
||||
|
||||
let selectObj = ref([])
|
||||
let fontColor = ref([])
|
||||
|
|
@ -153,9 +154,11 @@
|
|||
})
|
||||
}
|
||||
|
||||
onLoad(() => {
|
||||
getFonts()
|
||||
})
|
||||
|
||||
onMounted(() => {
|
||||
getFonts() //获取字体
|
||||
emitter.on('closeyyxzTip', closeyyxzTipHandler)
|
||||
|
||||
emitter.on('getGoodData', getGoodDataHandler)
|
||||
|
|
@ -339,19 +342,7 @@
|
|||
+ '&appointmentDate=' + appointmentDate + '&timeSlot=' + timeSlot
|
||||
})
|
||||
}
|
||||
//获取字体
|
||||
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);
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
|
||||
function getWeekday(dateStr) {
|
||||
|
|
@ -403,12 +394,12 @@
|
|||
margin-left: 6.92rpx;
|
||||
color: #c35c5d;
|
||||
font-size: 37.5rpx;
|
||||
font-family: Open Sans;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 27.52rpx;
|
||||
}
|
||||
.font {
|
||||
font-size: 26.25rpx;
|
||||
font-family: Open Sans;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 23.94rpx;
|
||||
color: #323233;
|
||||
}
|
||||
|
|
@ -417,7 +408,7 @@
|
|||
}
|
||||
.font_2 {
|
||||
font-size: 30rpx;
|
||||
font-family: Open Sans;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 27.71rpx;
|
||||
color: #323233;
|
||||
}
|
||||
|
|
@ -462,7 +453,7 @@
|
|||
}
|
||||
.font_3 {
|
||||
font-size: 26.25rpx;
|
||||
font-family: Open Sans;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 19.29rpx;
|
||||
color: #323233;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,7 +8,12 @@
|
|||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { onLoad } from "@dcloudio/uni-app";
|
||||
import { getFonts } from '../../../common/globalFont';
|
||||
import emitter from '../../../utils/emitter';
|
||||
onLoad(() => {
|
||||
getFonts()
|
||||
})
|
||||
const closeTip = () => {
|
||||
emitter.emit('closeyyxzTip')
|
||||
}
|
||||
|
|
@ -30,7 +35,7 @@
|
|||
}
|
||||
.font {
|
||||
font-size: 33.39rpx;
|
||||
font-family: Open Sans;
|
||||
font-family: FangZhengFonts;
|
||||
}
|
||||
.text {
|
||||
color: #323233;
|
||||
|
|
|
|||
|
|
@ -45,9 +45,15 @@
|
|||
<script setup>
|
||||
import { ref , onMounted } from 'vue'
|
||||
import { baseUrl } from '../../../api/request';
|
||||
import { onLoad } from "@dcloudio/uni-app";
|
||||
import { getFonts } from '../../../common/globalFont';
|
||||
const products = ref()
|
||||
const cookie = wx.getStorageSync("cookie")
|
||||
import carousel from '@/components/vear-carousel/vear-carousel'
|
||||
|
||||
onLoad(() => {
|
||||
getFonts()
|
||||
})
|
||||
onMounted(()=>{
|
||||
getProducts()
|
||||
})
|
||||
|
|
@ -149,7 +155,7 @@ const imgList = ref([{
|
|||
}
|
||||
.font {
|
||||
font-size: 24.38rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
color: #000000;
|
||||
}
|
||||
.text {
|
||||
|
|
|
|||
|
|
@ -74,6 +74,7 @@
|
|||
<script setup>
|
||||
import { ref,onMounted, nextTick, onUnmounted } from 'vue'
|
||||
import { onLoad } from "@dcloudio/uni-app";
|
||||
import { getFonts } from '../../../common/globalFont';
|
||||
import { baseUrl } from '../../../api/request';
|
||||
import timeSelectVue from '../component/timeSelect.vue';
|
||||
import emitter from '../../../utils/emitter' //导入emitter传值组件
|
||||
|
|
@ -97,6 +98,7 @@ onUnmounted(() => {
|
|||
})
|
||||
|
||||
onLoad((options)=>{
|
||||
getFonts()
|
||||
pid.value = JSON.parse(options.info)
|
||||
getProduct()
|
||||
getBookingNumberMap()
|
||||
|
|
@ -228,7 +230,7 @@ const loadPopBook = ()=> {
|
|||
}
|
||||
.font {
|
||||
font-size: 30rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 29.7rpx;
|
||||
}
|
||||
.text {
|
||||
|
|
@ -259,7 +261,7 @@ const loadPopBook = ()=> {
|
|||
}
|
||||
.font_2 {
|
||||
font-size: 26.25rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 31.88rpx;
|
||||
color: #323232;
|
||||
}
|
||||
|
|
@ -270,7 +272,7 @@ const loadPopBook = ()=> {
|
|||
.text_2 {
|
||||
color: #ff0000;
|
||||
font-size: 45rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 29.7rpx;
|
||||
}
|
||||
.text_4 {
|
||||
|
|
@ -287,7 +289,7 @@ const loadPopBook = ()=> {
|
|||
}
|
||||
.font_3 {
|
||||
font-size: 26.25rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 24.92rpx;
|
||||
color: #000000;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,10 +17,12 @@
|
|||
<script setup>
|
||||
import {ref} from 'vue'
|
||||
import { onLoad } from "@dcloudio/uni-app";
|
||||
import { getFonts } from '../../../common/globalFont';
|
||||
import { workshopUrl } from '../../../common/globalImagesUrl';
|
||||
const type = ref('')
|
||||
const goodList = ref([])
|
||||
onLoad((options) => {
|
||||
getFonts()
|
||||
type.value = options.type
|
||||
})
|
||||
|
||||
|
|
@ -90,7 +92,7 @@
|
|||
}
|
||||
.font {
|
||||
font-size: 24.38rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 22.95rpx;
|
||||
}
|
||||
.text-wrapper {
|
||||
|
|
|
|||
|
|
@ -32,11 +32,13 @@
|
|||
import { onLoad } from "@dcloudio/uni-app";
|
||||
import { baseUrl } from '../../../api/request';
|
||||
import { workshopUrl } from '../../../common/globalImagesUrl';
|
||||
import { getFonts } from '../../../common/globalFont';
|
||||
const cookie = wx.getStorageSync("cookie")
|
||||
const keyword = ref('')
|
||||
const type = ref(0)
|
||||
const goodList = ref([])
|
||||
onLoad((options) => {
|
||||
getFonts()
|
||||
keyword.value = options.keyword
|
||||
type.value = options.type
|
||||
if (type.value == 1) {
|
||||
|
|
@ -188,7 +190,7 @@
|
|||
}
|
||||
.font {
|
||||
font-size: 24.38rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 22.95rpx;
|
||||
}
|
||||
.text-wrapper {
|
||||
|
|
@ -241,7 +243,7 @@
|
|||
}
|
||||
.font_2 {
|
||||
font-size: 30rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 30rpx;
|
||||
color: #000000;
|
||||
}
|
||||
|
|
@ -251,7 +253,7 @@
|
|||
}
|
||||
.font_3 {
|
||||
font-size: 24.38rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 30rpx;
|
||||
color: #8a8a8a;
|
||||
}
|
||||
|
|
@ -261,7 +263,7 @@
|
|||
}
|
||||
.font_4 {
|
||||
font-size: 30rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 20.04rpx;
|
||||
color: #fb1212;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user