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

this is lastest update 3.25

Browse Source
This commit is contained in:
chen-xin-zhi 2025-03-25 20:58:10 +08:00
parent bc3edf2837
commit 6057c02118
42 changed files with 154 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/request.ts
View File

@ -6,4 +6,4 @@ export const domain = 'https://www.carboner.cn:8888/api'
export const myIp = 'http://8.130.119.119:9092/api' export const myIp = 'http://8.130.119.119:9092/api'
export const nwct = 'https://winning-mouse-internally.ngrok-free.app/api' export const nwct = 'https://winning-mouse-internally.ngrok-free.app/api'
export const suiUrl = '' export const suiUrl = ''
export const baseUrl = domain export const baseUrl = Url

8
common/globalFunction.js
View File

@ -20,6 +20,14 @@ export const dealResult = (res) => {
} }
export const showTips = (msg) => {
uni.showToast({
title: msg,
icon: 'success'
})
}
export const JudgeIsNullity = (val) => { export const JudgeIsNullity = (val) => {
if (val === null || val === undefined || val === '') return true if (val === null || val === undefined || val === '') return true
return false return false

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

@ -201,14 +201,14 @@
} }
.text_3 { .text_3 {
color: #000000; color: #323232;
font-size: 28.13rpx; font-size: 28.13rpx;
font-family: FangZhengFonts; font-family: FangZhengFonts;
line-height: 26.21rpx; line-height: 26.21rpx;
} }
.text_4 { .text_4 {
color: #000000; color: #323232;
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FangZhengFonts; font-family: FangZhengFonts;
line-height: 24.34rpx; line-height: 24.34rpx;
@ -240,7 +240,7 @@
} }
.text_5 { .text_5 {
color: #000000; color: #323232;
font-size: 30rpx; font-size: 30rpx;
font-family: FangZhengFonts; font-family: FangZhengFonts;
line-height: 21.41rpx; line-height: 21.41rpx;

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

@ -101,11 +101,7 @@
</view> </view>
<view class="flex-row justify-between items-center section_8"> <view class="flex-row justify-between items-center section_8">
<view class="flex-row items-center"> <view class="flex-row items-center">
<checkbox class="shrink-0 image_8 round red" :checked="allCheck" @tap="allChecked" /> <checkbox style="margin-top: -8rpx;" class="shrink-0 image_8 round red" :checked="allCheck" @tap="allChecked" />
<!-- <image
class="shrink-0 image_8 image_13"
src="https://ide.code.fun/api/image?token=6779d8c1797f850011f55ea9&name=3f81d5886d1e216ce7cc53687e0c5499.png"
/> -->
<text class="font_2 text_11 ml-9">全选</text> <text class="font_2 text_11 ml-9">全选</text>
</view> </view>
<view class="flex-row items-center"> <view class="flex-row items-center">
@ -130,7 +126,7 @@
import * as math from 'mathjs' import * as math from 'mathjs'
import { shoppingCartUrl,bkgPubilcPath } from '../../../common/globalImagesUrl'; import { shoppingCartUrl,bkgPubilcPath } from '../../../common/globalImagesUrl';
import { publicPath } from '../../../common/globalImagesUrl'; import { publicPath } from '../../../common/globalImagesUrl';
import { JudgeIsNullity } from '../../../common/globalFunction'; import { JudgeIsNullity } from '../../../common/globalFunction';
const products = ref([]) const products = ref([])
const tempProducts = ref([]) const tempProducts = ref([])
const isShowInput = ref(false) const isShowInput = ref(false)
@ -652,6 +648,7 @@ import { JudgeIsNullity } from '../../../common/globalFunction';
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.overlay { .overlay {
position: fixed; position: fixed;
top: 0; top: 0;

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

@ -268,7 +268,7 @@
font-size: 37.5rpx; font-size: 37.5rpx;
font-family: FangZhengFonts; font-family: FangZhengFonts;
line-height: 33.99rpx; line-height: 33.99rpx;
color: #000000; color: #323232;
} }
.text { .text {
margin: 3.75rpx 0; margin: 3.75rpx 0;
@ -295,7 +295,7 @@
padding: 125.63rpx 0 86.25rpx; padding: 125.63rpx 0 86.25rpx;
background-image: linear-gradient(180deg, #fdefef 0%, #fffcfa 100%); background-image: linear-gradient(180deg, #fdefef 0%, #fffcfa 100%);
border-radius: 18.75rpx; border-radius: 18.75rpx;
box-shadow: 0rpx 7.5rpx 7.5rpx #00000040; box-shadow: 0rpx 7.5rpx 7.5rpx #32323240;
} }
.image_5 { .image_5 {
margin-left: 249.38rpx; margin-left: 249.38rpx;
@ -323,7 +323,7 @@
} }
.text_3 { .text_3 {
margin-left: 22.5rpx; margin-left: 22.5rpx;
color: #000000; color: #323232;
font-size: 30rpx; font-size: 30rpx;
font-family: FangZhengFonts; font-family: FangZhengFonts;
line-height: 26.4rpx; line-height: 26.4rpx;
@ -364,7 +364,7 @@
padding: 18.75rpx 26.25rpx; padding: 18.75rpx 26.25rpx;
background-color: #ffffff; background-color: #ffffff;
border-radius: 18.75rpx; border-radius: 18.75rpx;
box-shadow: 0rpx 7.5rpx 7.5rpx #00000040; box-shadow: 0rpx 7.5rpx 7.5rpx #32323240;
height: 157.5rpx; height: 157.5rpx;
} }
.image_7 { .image_7 {
@ -384,7 +384,7 @@
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FangZhengFonts; font-family: FangZhengFonts;
line-height: 24.21rpx; line-height: 24.21rpx;
color: #000000; color: #323232;
} }
.text_6 { .text_6 {
margin-left: 45rpx; margin-left: 45rpx;
@ -397,7 +397,7 @@
.group_4 { .group_4 {
margin-top: 37.5rpx; margin-top: 37.5rpx;
padding: 30rpx 35.63rpx; padding: 30rpx 35.63rpx;
border-top: solid 1.88rpx #0000001f; border-top: solid 1.88rpx #3232321f;
position: fixed; position: fixed;
bottom: 0; bottom: 0;
left: 0; left: 0;

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

@ -37,14 +37,14 @@ import { onLoad } from "@dcloudio/uni-app";
padding: 41.67rpx 62.5rpx; padding: 41.67rpx 62.5rpx;
background-color: #ffffff; background-color: #ffffff;
border-radius: 41.1rpx; border-radius: 41.1rpx;
box-shadow: 0rpx 8.33rpx 8.33rpx #00000061; box-shadow: 0rpx 8.33rpx 8.33rpx #32323261;
width: 100%; width: 100%;
overflow-y: auto; overflow-y: auto;
overflow-x: hidden; overflow-x: hidden;
height: 100%; height: 100%;
} }
.text { .text {
color: #000000; color: #323232;
font-size: 37.5rpx; font-size: 37.5rpx;
font-family: FangZhengFonts; font-family: FangZhengFonts;
line-height: 34.42rpx; line-height: 34.42rpx;

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

@ -14,6 +14,7 @@ import emitter from '../../../utils/emitter';
import { baseUrl } from '../../../api/request'; import { baseUrl } from '../../../api/request';
import { onLoad } from "@dcloudio/uni-app"; import { onLoad } from "@dcloudio/uni-app";
import { getFonts } from '../../../common/globalFont'; import { getFonts } from '../../../common/globalFont';
import { showTips } from '../../../common/globalFunction';
onLoad(() => { onLoad(() => {
getFonts() getFonts()
@ -53,6 +54,7 @@ import { onLoad } from "@dcloudio/uni-app";
const confirm = async () => { const confirm = async () => {
await cancelBookingOrder() await cancelBookingOrder()
showTips('取消成功')
emitter.emit('closeCancelOrderPopup') emitter.emit('closeCancelOrderPopup')
emitter.emit('flushAdvanceOrderList') emitter.emit('flushAdvanceOrderList')
} }
@ -72,8 +74,8 @@ import { onLoad } from "@dcloudio/uni-app";
height: 100%; height: 100%;
} }
.text { .text {
color: #000000; color: #323232;
font-size: 37.32rpx; font-size: 33.32rpx;
font-family: FangZhengFonts; font-family: FangZhengFonts;
line-height: 41.66rpx; line-height: 41.66rpx;
} }
@ -91,7 +93,7 @@ import { onLoad } from "@dcloudio/uni-app";
line-height: 35.41rpx; line-height: 35.41rpx;
} }
.text_2 { .text_2 {
color: #000000; color: #323232;
font-size: 30rpx; font-size: 30rpx;
} }
.text-wrapper_2 { .text-wrapper_2 {

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

@ -124,14 +124,14 @@ const cookie = wx.getStorageSync("cookie") //请求头
padding: 56.46rpx 59.18rpx; padding: 56.46rpx 59.18rpx;
background-color: #ffffff; background-color: #ffffff;
border-radius: 41.2rpx; border-radius: 41.2rpx;
box-shadow: 0rpx 9.49rpx 9.49rpx #00000061; box-shadow: 0rpx 9.49rpx 9.49rpx #32323261;
width: 100%; width: 100%;
overflow-y: auto; overflow-y: auto;
overflow-x: hidden; overflow-x: hidden;
height: 100%; height: 100%;
} }
.text { .text {
color: #000000; color: #323232;
font-size: 37.72rpx; font-size: 37.72rpx;
font-family: FangZhengFonts; font-family: FangZhengFonts;
line-height: 41.72rpx; line-height: 41.72rpx;
@ -140,7 +140,7 @@ const cookie = wx.getStorageSync("cookie") //请求头
font-size: 30.97rpx; font-size: 30.97rpx;
font-family: FangZhengFonts; font-family: FangZhengFonts;
line-height: 35.46rpx; line-height: 35.46rpx;
color: #000000; color: #323232;
} }
.text_2 { .text_2 {
margin-top: 61.71rpx; margin-top: 61.71rpx;

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

@ -14,6 +14,7 @@ import emitter from '../../../utils/emitter';
import { baseUrl } from '../../../api/request'; import { baseUrl } from '../../../api/request';
import { onLoad } from "@dcloudio/uni-app"; import { onLoad } from "@dcloudio/uni-app";
import { getFonts } from '../../../common/globalFont'; import { getFonts } from '../../../common/globalFont';
import { showTips } from '../../../common/globalFunction';
onLoad(() => { onLoad(() => {
getFonts() getFonts()
@ -54,6 +55,7 @@ import { getFonts } from '../../../common/globalFont';
const confirm = async () => { const confirm = async () => {
await deleteBookingOrder() await deleteBookingOrder()
showTips('删除成功')
emitter.emit('closeDeleteOrderPopup') emitter.emit('closeDeleteOrderPopup')
emitter.emit('flushAdvanceOrderList') emitter.emit('flushAdvanceOrderList')
} }
@ -73,8 +75,8 @@ import { getFonts } from '../../../common/globalFont';
height: 100%; height: 100%;
} }
.text { .text {
color: #000000; color: #323232;
font-size: 37.32rpx; font-size: 33.32rpx;
font-family: FangZhengFonts; font-family: FangZhengFonts;
line-height: 41.66rpx; line-height: 41.66rpx;
} }
@ -92,7 +94,7 @@ import { getFonts } from '../../../common/globalFont';
line-height: 35.41rpx; line-height: 35.41rpx;
} }
.text_2 { .text_2 {
color: #000000; color: #323232;
font-size: 30rpx; font-size: 30rpx;
} }
.text-wrapper_2 { .text-wrapper_2 {

2
pages/book/component/feeTips.vue
View File

@ -85,7 +85,7 @@ import { getFonts } from '../../../common/globalFont';
height: 750rpx; height: 750rpx;
} }
.text { .text {
color: #000000; color: #323232;
font-size: 36.99rpx; font-size: 36.99rpx;
font-family: FangZhengFonts; font-family: FangZhengFonts;
line-height: 36.12rpx; line-height: 36.12rpx;

2
pages/book/myPhotoProductDetail/myPhotoProductDetail.vue
View File

@ -198,7 +198,7 @@ button::after{
padding: 37.5rpx 52.5rpx 45rpx; padding: 37.5rpx 52.5rpx 45rpx;
background-color: #ffffff; background-color: #ffffff;
border-radius: 18.75rpx; border-radius: 18.75rpx;
box-shadow: 11.25rpx 11.25rpx 11.25rpx #00000026; box-shadow: 11.25rpx 11.25rpx 11.25rpx #32323226;
} }
.pos_2 { .pos_2 {
position: absolute; position: absolute;

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

@ -105,6 +105,7 @@
import { onPullDownRefresh } from '@dcloudio/uni-app'; import { onPullDownRefresh } from '@dcloudio/uni-app';
import { photoOrderMap } from '../../../common/global'; import { photoOrderMap } from '../../../common/global';
import emitter from '../../../utils/emitter'; import emitter from '../../../utils/emitter';
import { showTips } from '../../../common/globalFunction';
const id = ref(0) const id = ref(0)
const cookie = wx.getStorageSync('cookie') const cookie = wx.getStorageSync('cookie')
@ -249,6 +250,7 @@
await deleteOrder(val) await deleteOrder(val)
await emitter.emit('flushAdvanceOrderList') await emitter.emit('flushAdvanceOrderList')
routerJump('pages/book/photoProductsOrderDetail/photoProductsOrderDetail') routerJump('pages/book/photoProductsOrderDetail/photoProductsOrderDetail')
showTips('删除成功')
} }
} }
}) })
@ -387,7 +389,7 @@ button::after{
font-size: 28.13rpx; font-size: 28.13rpx;
font-family: FangZhengFonts; font-family: FangZhengFonts;
line-height: 26.92rpx; line-height: 26.92rpx;
color: #000000; color: #323232;
} }
.text { .text {
color: #323233; color: #323233;
@ -485,7 +487,7 @@ button::after{
height: 45rpx; height: 45rpx;
} }
.text_8 { .text_8 {
color: #000000; color: #323232;
font-size: 22.5rpx; font-size: 22.5rpx;
font-family: FangZhengFonts; font-family: FangZhengFonts;
line-height: 21.09rpx; line-height: 21.09rpx;

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

@ -188,7 +188,7 @@
.font { .font {
font-size: 45rpx; font-size: 45rpx;
font-family: FangZhengFonts; font-family: FangZhengFonts;
color: #000000; color: #323232;
} }
.text { .text {
line-height: 43.76rpx; line-height: 43.76rpx;
@ -201,7 +201,7 @@
font-size: 37.5rpx; font-size: 37.5rpx;
font-family: FangZhengFonts; font-family: FangZhengFonts;
line-height: 36.34rpx; line-height: 36.34rpx;
color: #000000; color: #323232;
} }
.pos_3 { .pos_3 {
position: absolute; position: absolute;
@ -222,7 +222,7 @@
font-size: 30rpx; font-size: 30rpx;
font-family: FangZhengFonts; font-family: FangZhengFonts;
line-height: 27.3rpx; line-height: 27.3rpx;
color: #000000; color: #323232;
} }
.group { .group {
flex: 1 1 202.5rpx; flex: 1 1 202.5rpx;

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

@ -239,7 +239,7 @@
padding-bottom: 40rpx; padding-bottom: 40rpx;
// background-color: #ffffff96; // background-color: #ffffff96;
border-radius: 18.75rpx 18.75rpx 0rpx 0rpx; border-radius: 18.75rpx 18.75rpx 0rpx 0rpx;
// box-shadow: 0rpx 7.5rpx 7.5rpx #00000040; // box-shadow: 0rpx 7.5rpx 7.5rpx #32323240;
width: 159.38rpx; width: 159.38rpx;
height: 1140rpx; height: 1140rpx;
overflow-y: auto; overflow-y: auto;
@ -269,7 +269,7 @@
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FangZhengFonts; font-family: FangZhengFonts;
line-height: 25.16rpx; line-height: 25.16rpx;
color: #000000; color: #323232;
} }
.text_2 { .text_2 {
line-height: 24rpx; line-height: 24rpx;
@ -298,7 +298,7 @@
padding: 31.88rpx 20.63rpx 27.58rpx; padding: 31.88rpx 20.63rpx 27.58rpx;
background-color: #ffffff96; background-color: #ffffff96;
border-radius: 18.75rpx; border-radius: 18.75rpx;
box-shadow: 0rpx 7.5rpx 7.5rpx #00000040; box-shadow: 0rpx 7.5rpx 7.5rpx #32323240;
} }
.list-item_2:first-child { .list-item_2:first-child {
margin-top: 0; margin-top: 0;

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

@ -512,7 +512,7 @@
font-size: 37.5rpx; font-size: 37.5rpx;
font-family: FangZhengFonts; font-family: FangZhengFonts;
line-height: 35.01rpx; line-height: 35.01rpx;
color: #000000; color: #323232;
} }
.text { .text {
line-height: 36.47rpx; line-height: 36.47rpx;
@ -535,7 +535,7 @@
font-size: 30rpx; font-size: 30rpx;
font-family: FangZhengFonts; font-family: FangZhengFonts;
line-height: 28.01rpx; line-height: 28.01rpx;
color: #000000; color: #323232;
} }
.text_2 { .text_2 {
line-height: 27.54rpx; line-height: 27.54rpx;
@ -557,8 +557,10 @@
top: 110.63rpx; top: 110.63rpx;
} }
.image_2 { .image_2 {
width: 65.63rpx; // width: 65.63rpx;
height: 67.5rpx; // height: 67.5rpx;
width: 50.88rpx;
height: 50.88rpx;
} }
.text_3 { .text_3 {
color: #818181; color: #818181;
@ -590,19 +592,19 @@
.pos_5 { .pos_5 {
position: absolute; position: absolute;
left: 16.18rpx; left: 16.18rpx;
top: 255.53rpx; top: 235.53rpx;
} }
.section_3 { .section_3 {
padding: 41.36rpx 26.25rpx 32.81rpx 28.13rpx; padding: 41.36rpx 26.25rpx 32.81rpx 28.13rpx;
background-color: #ffffff; background-color: #ffffff;
border-radius: 18.75rpx; border-radius: 18.75rpx;
box-shadow: 0rpx 7.5rpx 7.5rpx #00000040; box-shadow: 0rpx 7.5rpx 7.5rpx #32323240;
} }
.pos_6 { .pos_6 {
position: absolute; position: absolute;
left: 15rpx; left: 15rpx;
right: 16.88rpx; right: 16.88rpx;
top: 316.88rpx; top: 296.88rpx;
} }
.text_6 { .text_6 {
margin-left: 3.17rpx; margin-left: 3.17rpx;
@ -679,19 +681,19 @@
.pos_7 { .pos_7 {
position: absolute; position: absolute;
left: 24.11rpx; left: 24.11rpx;
top: 1020rpx; top: 1000rpx;
} }
.section_5 { .section_5 {
padding: 25.43rpx 35.63rpx 34.01rpx; padding: 25.43rpx 35.63rpx 34.01rpx;
background-color: #ffffff; background-color: #ffffff;
border-radius: 37.5rpx; border-radius: 37.5rpx;
box-shadow: 0rpx 7.5rpx 7.5rpx #00000040; box-shadow: 0rpx 7.5rpx 7.5rpx #32323240;
} }
.pos_8 { .pos_8 {
position: absolute; position: absolute;
left: 22.5rpx; left: 22.5rpx;
right: 22.5rpx; right: 22.5rpx;
top: 1080.75rpx; top: 1060.75rpx;
} }
.image_4 { .image_4 {
width: 120rpx; width: 120rpx;
@ -704,7 +706,7 @@
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FangZhengFonts; font-family: FangZhengFonts;
line-height: 24.3rpx; line-height: 24.3rpx;
color: #000000; color: #323232;
} }
.text_9 { .text_9 {
line-height: 23.79rpx; line-height: 23.79rpx;
@ -719,7 +721,7 @@
margin-right: 3.02rpx; margin-right: 3.02rpx;
} }
.text_11 { .text_11 {
color: #000000; color: #323232;
font-size: 22.5rpx; font-size: 22.5rpx;
font-family: FangZhengFonts; font-family: FangZhengFonts;
line-height: 21.09rpx; line-height: 21.09rpx;

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

@ -525,7 +525,7 @@ button::after{
.font { .font {
font-size: 30rpx; font-size: 30rpx;
font-family: FangZhengFonts; font-family: FangZhengFonts;
color: #000000; color: #323232;
} }
.text { .text {
line-height: 48.48rpx; line-height: 48.48rpx;
@ -641,7 +641,7 @@ button::after{
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FangZhengFonts; font-family: FangZhengFonts;
line-height: 25.84rpx; line-height: 25.84rpx;
color: #000000; color: #323232;
} }
.text_9 { .text_9 {
font-size: 28.13rpx; font-size: 28.13rpx;
@ -669,13 +669,13 @@ button::after{
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FangZhengFonts; font-family: FangZhengFonts;
line-height: 23.79rpx; line-height: 23.79rpx;
color: #000000; color: #323232;
} }
.font_10 { .font_10 {
font-size: 22.5rpx; font-size: 22.5rpx;
font-family: FangZhengFonts; font-family: FangZhengFonts;
line-height: 21.09rpx; line-height: 21.09rpx;
color: #000000; color: #323232;
} }
.text_12 { .text_12 {
margin-right: 3.75rpx; margin-right: 3.75rpx;

3
pages/clothesRent/clotherRentOrderList/clotherRentOrderList.vue
View File

@ -123,6 +123,7 @@
import { onPullDownRefresh } from '@dcloudio/uni-app'; import { onPullDownRefresh } from '@dcloudio/uni-app';
import { getFonts } from '../../../common/globalFont'; import { getFonts } from '../../../common/globalFont';
import { onLoad } from "@dcloudio/uni-app"; import { onLoad } from "@dcloudio/uni-app";
import { showTips } from '../../../common/globalFunction';
const isShowUnderLine = ref([true, false, false, false, false]) const isShowUnderLine = ref([true, false, false, false, false])
let orderStatusList = ['全部', '待支付', '待发货', '待收货', '交易成功'] let orderStatusList = ['全部', '待支付', '待发货', '待收货', '交易成功']
const color = ref(new Array(5).fill('#323232')) const color = ref(new Array(5).fill('#323232'))
@ -218,6 +219,7 @@
if (res.confirm) { if (res.confirm) {
await cancelRentOrder(val) await cancelRentOrder(val)
await getRentOrderList() await getRentOrderList()
showTips('取消成功')
} }
} }
}) })
@ -248,6 +250,7 @@
if (res.confirm) { if (res.confirm) {
await deleteOrder(val) await deleteOrder(val)
await getRentOrderList() await getRentOrderList()
showTips('删除成功')
} }
} }
}) })

11
pages/clothesRent/clothesRentOrderDetail/clothesRentOrderDetail.vue
View File

@ -26,7 +26,7 @@
/> />
<view class="ml-12 flex-col items-start group_2"> <view class="ml-12 flex-col items-start group_2">
<text class="font_2 text_4">{{ clothesSnapshot.name }}</text> <text class="font_2 text_4">{{ clothesSnapshot.name }}</text>
<text class="font_3 text_6 mt-59">￥{{ clothesSnapshot.price }}</text> <text class="font_3 text_6 mt-59">￥{{ clothesSnapshot.price.toFixed(2) }}</text>
</view> </view>
</view> </view>
<view class="flex-col items-center self-start" @click="nav"> <view class="flex-col items-center self-start" @click="nav">
@ -108,6 +108,7 @@
import { getFonts } from '../../../common/globalFont'; import { getFonts } from '../../../common/globalFont';
import emitter from '../../../utils/emitter'; import emitter from '../../../utils/emitter';
import { showTips } from '../../../common/globalFunction';
const cookie = wx.getStorageSync('cookie') const cookie = wx.getStorageSync('cookie')
const rentOrderDetail = ref({}) //租赁订单详情 const rentOrderDetail = ref({}) //租赁订单详情
const contactsSnapshot = ref({}) //联系人快照 const contactsSnapshot = ref({}) //联系人快照
@ -147,8 +148,6 @@
id: val id: val
} }
}) })
// console.log('订单详情--->',res.data.data);
console.log('订单状态---->',res.data.data.orderStatus);
rentOrderDetail.value = res.data.data rentOrderDetail.value = res.data.data
contactsSnapshot.value = res.data.data.contactsSnapshot contactsSnapshot.value = res.data.data.contactsSnapshot
clothesSnapshot.value = res.data.data.clothesSnapshot clothesSnapshot.value = res.data.data.clothesSnapshot
@ -175,6 +174,7 @@
await deleteOrder(val) await deleteOrder(val)
await emitter.emit('flushClothesOrderList') await emitter.emit('flushClothesOrderList')
routerJump('pages/clothesRent/clotherRentOrderList/clotherRentOrderList') routerJump('pages/clothesRent/clotherRentOrderList/clotherRentOrderList')
showTips('删除成功')
} }
} }
}) })
@ -313,9 +313,6 @@
} }
onBeforeUnmount(() => {
routerJump('pages/clothesRent/clotherRentOrderList/clotherRentOrderList')
})
</script> </script>
@ -547,7 +544,7 @@ button::after{
bottom: 0; bottom: 0;
} }
.text_16 { .text_16 {
color: #000000; color: #323232;
font-size: 30rpx; font-size: 30rpx;
line-height: 27.43rpx; line-height: 27.43rpx;
} }

2
pages/clothesRent/component/clothesAttribute.vue
View File

@ -207,7 +207,7 @@ import { dealResult } from '../../../common/globalFunction';
} }
.divider { .divider {
margin-top: 30rpx; margin-top: 30rpx;
background-color: #0000001f; background-color: #3232321f;
height: 1.88rpx; height: 1.88rpx;
} }
.view_3 { .view_3 {

2
pages/clothesRent/component/clothesAttributePlus.vue
View File

@ -207,7 +207,7 @@
} }
.group { .group {
padding: 37.5rpx 22.5rpx; padding: 37.5rpx 22.5rpx;
border-bottom: solid 1.88rpx #0000001f; border-bottom: solid 1.88rpx #3232321f;
} }
.font { .font {
font-size: 37.5rpx; font-size: 37.5rpx;

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

@ -222,7 +222,7 @@
color: #818181; color: #818181;
} }
.text { .text {
color: #000000; color: #323232;
line-height: 28.59rpx; line-height: 28.59rpx;
} }
.section_2 { .section_2 {
@ -236,7 +236,7 @@
top: 114.38rpx; top: 114.38rpx;
} }
.text_2 { .text_2 {
color: #000000; color: #323232;
font-size: 30rpx; font-size: 30rpx;
font-family: FangZhengFonts; font-family: FangZhengFonts;
line-height: 25.78rpx; line-height: 25.78rpx;
@ -256,7 +256,7 @@
height: 73.13rpx; height: 73.13rpx;
} }
.text_4 { .text_4 {
color: #000000; color: #323232;
font-size: 24.38rpx; font-size: 24.38rpx;
font-family: FangZhengFonts; font-family: FangZhengFonts;
line-height: 21.34rpx; line-height: 21.34rpx;
@ -280,7 +280,7 @@
font-size: 33.75rpx; font-size: 33.75rpx;
font-family: FangZhengFonts; font-family: FangZhengFonts;
line-height: 32.83rpx; line-height: 32.83rpx;
color: #000000; color: #323232;
} }
.text_5 { .text_5 {
line-height: 29.42rpx; line-height: 29.42rpx;

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

@ -65,7 +65,7 @@
font-size: 30rpx; font-size: 30rpx;
font-family: FangZhengFonts; font-family: FangZhengFonts;
line-height: 35.63rpx; line-height: 35.63rpx;
color: #000000; color: #323232;
} }
.text { .text {
line-height: 26.25rpx; line-height: 26.25rpx;
@ -85,7 +85,7 @@
font-size: 33.75rpx; font-size: 33.75rpx;
font-family: FangZhengFonts; font-family: FangZhengFonts;
line-height: 32.44rpx; line-height: 32.44rpx;
color: #000000; color: #323232;
} }
.group { .group {
margin-top: 18.75rpx; margin-top: 18.75rpx;
@ -107,7 +107,7 @@
font-size: 30rpx; font-size: 30rpx;
font-family: FangZhengFonts; font-family: FangZhengFonts;
line-height: 28.95rpx; line-height: 28.95rpx;
color: #000000; color: #323232;
} }
.text_5 { .text_5 {
margin-left: 15rpx; margin-left: 15rpx;

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

@ -115,7 +115,7 @@
color: #c35c5c; color: #c35c5c;
} }
.text_2 { .text_2 {
color: #000000; color: #323232;
line-height: 36.47rpx; line-height: 36.47rpx;
} }
.pos_2 { .pos_2 {
@ -143,7 +143,7 @@
padding: 30rpx 22.5rpx 30rpx 48.75rpx; padding: 30rpx 22.5rpx 30rpx 48.75rpx;
background-image: linear-gradient(90deg, #ffffff 28.8%, #faddde 96.8%); background-image: linear-gradient(90deg, #ffffff 28.8%, #faddde 96.8%);
border-radius: 18.75rpx; border-radius: 18.75rpx;
box-shadow: 0rpx 7.5rpx 7.5rpx #00000040; box-shadow: 0rpx 7.5rpx 7.5rpx #32323240;
} }
.list-item:first-child { .list-item:first-child {
margin-top: 0; margin-top: 0;
@ -164,7 +164,7 @@
font-size: 30rpx; font-size: 30rpx;
font-family: FangZhengFonts; font-family: FangZhengFonts;
line-height: 29.42rpx; line-height: 29.42rpx;
color: #000000; color: #323232;
} }
.text { .text {
line-height: 29.18rpx; line-height: 29.18rpx;
@ -173,7 +173,7 @@
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FangZhengFonts; font-family: FangZhengFonts;
line-height: 24.62rpx; line-height: 24.62rpx;
color: #000000; color: #323232;
} }
.text_4 { .text_4 {
margin-right: 11.25rpx; margin-right: 11.25rpx;

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

@ -103,7 +103,7 @@
font-size: 30rpx; font-size: 30rpx;
font-family: FangZhengFonts; font-family: FangZhengFonts;
line-height: 29.42rpx; line-height: 29.42rpx;
color: #000000; color: #323232;
} }
.text { .text {
line-height: 29.18rpx; line-height: 29.18rpx;
@ -115,7 +115,7 @@
color: #818181; color: #818181;
} }
.text_2 { .text_2 {
color: #000000; color: #323232;
line-height: 36.47rpx; line-height: 36.47rpx;
} }
.pos_2 { .pos_2 {
@ -142,7 +142,7 @@
padding: 30rpx 22.5rpx 30rpx 48.75rpx; padding: 30rpx 22.5rpx 30rpx 48.75rpx;
background-color: #ffffff; background-color: #ffffff;
border-radius: 18.75rpx; border-radius: 18.75rpx;
box-shadow: 0rpx 7.5rpx 7.5rpx #00000040; box-shadow: 0rpx 7.5rpx 7.5rpx #32323240;
} }
.list-item:first-child { .list-item:first-child {
margin-top: 0; margin-top: 0;

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

@ -38,7 +38,7 @@
height: 100%; height: 100%;
} }
.text { .text {
color: #000000; color: #323232;
font-size: 42.32rpx; font-size: 42.32rpx;
font-family: FangZhengFonts; font-family: FangZhengFonts;
line-height: 41.17rpx; line-height: 41.17rpx;
@ -57,7 +57,7 @@
line-height: 35.41rpx; line-height: 35.41rpx;
} }
.text_2 { .text_2 {
color: #000000; color: #323232;
} }
.text-wrapper_2 { .text-wrapper_2 {
padding: 23.51rpx 0; padding: 23.51rpx 0;

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

@ -362,7 +362,7 @@
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FangZhengFonts; font-family: FangZhengFonts;
line-height: 30rpx; line-height: 30rpx;
color: #000000; color: #323232;
} }
.text_6 { .text_6 {
font-size: 24.38rpx; font-size: 24.38rpx;

14
pages/home/home.vue
View File

@ -2,7 +2,7 @@
<view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgPubilcPath + ')' }"> <view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgPubilcPath + ')' }">
<view class="section" :style="{ backgroundImage: 'url(' + bkgPubilcPath + ')' }"></view> <view class="section" :style="{ backgroundImage: 'url(' + bkgPubilcPath + ')' }"></view>
<image class="image pos" :src="homeUrl + '/flower.png'" /> <image class="image pos" :src="homeUrl + '/flower.png'" />
<text class="text pos_6">限定手制|非量售卖</text> <text class="text pos_6">手作传艺|锦绣邀约</text>
<text class="font pos_2">匠</text> <text class="font pos_2">匠</text>
<text class="font pos_3">承</text> <text class="font pos_3">承</text>
<text class="font pos_4">非</text> <text class="font pos_4">非</text>
@ -15,7 +15,7 @@
/> />
<view class="ml-4 flex-col items-center flex-1 self-start group"> <view class="ml-4 flex-col items-center flex-1 self-start group">
<text class="font_2 text_2">写真预约</text> <text class="font_2 text_2">写真预约</text>
<text class="mt-14 font_3 text_3">伊人摸样，丹青绘画</text> <text class="mt-14 font_3 text_3">锦绣华服，即刻预约</text>
</view> </view>
</view> </view>
<view class="flex-row items-center grid-item_2" @click="jump_feiyi"> <view class="flex-row items-center grid-item_2" @click="jump_feiyi">
@ -25,7 +25,7 @@
/> />
<view class="flex-col items-center flex-1 ml-7"> <view class="flex-col items-center flex-1 ml-7">
<text class="font_2">技艺体验</text> <text class="font_2">技艺体验</text>
<text class="mt-14 font_3">朴物良社，匠心手作</text> <text class="mt-14 font_3">古艺新学，手作体验</text>
</view> </view>
</view> </view>
<view class="flex-row grid-item_3" @click="jump_store"> <view class="flex-row grid-item_3" @click="jump_store">
@ -34,8 +34,8 @@
:src="homeUrl + '/tjsp.png'" :src="homeUrl + '/tjsp.png'"
/> />
<view class="flex-col items-center flex-1 self-start group_2 ml-7"> <view class="flex-col items-center flex-1 self-start group_2 ml-7">
<text class="font_2 text_5">推荐商品</text> <text class="font_2 text_5">手作商城</text>
<text class="mt-12 font_3 text_6">伊人摸样，丹青绘画</text> <text class="mt-12 font_3 text_6">传统工艺，匠心好物</text>
</view> </view>
</view> </view>
<view class="flex-row relative grid-item_4" @click="jumpToActivity"> <view class="flex-row relative grid-item_4" @click="jumpToActivity">
@ -43,8 +43,8 @@
class="shrink-0 self-center image_4" class="shrink-0 self-center image_4"
:src="homeUrl + '/hdzx.png'" :src="homeUrl + '/hdzx.png'"
/> />
<text class="self-start font_2 text_4">活动咨询</text> <text class="self-start font_2 text_4">活动日记</text>
<text class="font_3 pos_8">朴物良社，匠心手作</text> <text class="font_3 pos_8">活动点滴，邀您共阅</text>
</view> </view>
</view> </view>
</view> </view>

2
pages/login/login.vue
View File

@ -148,7 +148,7 @@ const loginUser = async ( code ) =>{
top: 1348.13rpx; top: 1348.13rpx;
} }
.text { .text {
color: #000000; color: #323232;
font-size: 30rpx; font-size: 30rpx;
font-family: FangZhengFonts; font-family: FangZhengFonts;
line-height: 28.01rpx; line-height: 28.01rpx;

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

@ -160,7 +160,7 @@
} }
.text { .text {
color: #000000; color: #323232;
font-size: 37.5rpx; font-size: 37.5rpx;
font-family: FangZhengFonts; font-family: FangZhengFonts;
line-height: 36.47rpx; line-height: 36.47rpx;

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

@ -131,7 +131,7 @@
import { stateList } from '../../../common/global.js' import { stateList } from '../../../common/global.js'
import { onLoad } from "@dcloudio/uni-app"; import { onLoad } from "@dcloudio/uni-app";
import { baseUrl } from '../../../api/request'; import { baseUrl } from '../../../api/request';
import { JudgeIsNullity } from '../../../common/globalFunction'; import { JudgeIsNullity, showTips } from '../../../common/globalFunction';
import { getFonts } from '../../../common/globalFont'; import { getFonts } from '../../../common/globalFont';
import emitter from '../../../utils/emitter'; import emitter from '../../../utils/emitter';
import { myOrderUrl } from '../../../common/globalImagesUrl.js'; import { myOrderUrl } from '../../../common/globalImagesUrl.js';
@ -306,6 +306,7 @@
await deleteOrder(val) await deleteOrder(val)
await emitter.emit('flushOrderList') await emitter.emit('flushOrderList')
routerJump('pages/my-order/myGeneralOrderDetail/myGeneralOrderDetail') routerJump('pages/my-order/myGeneralOrderDetail/myGeneralOrderDetail')
showTips('删除成功')
} }
} }
}) })
@ -658,7 +659,7 @@ button::after{
bottom: 0; bottom: 0;
} }
.text_21 { .text_21 {
color: #000000; color: #323232;
font-size: 30rpx; font-size: 30rpx;
line-height: 27.43rpx; line-height: 27.43rpx;
} }

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

@ -134,6 +134,7 @@
import { myOrderUrl,bkgPubilcPath } from '../../../common/globalImagesUrl'; import { myOrderUrl,bkgPubilcPath } from '../../../common/globalImagesUrl';
import { publicPath } from '../../../common/globalImagesUrl'; import { publicPath } from '../../../common/globalImagesUrl';
import { onPullDownRefresh } from '@dcloudio/uni-app'; import { onPullDownRefresh } from '@dcloudio/uni-app';
import { showTips } from '../../../common/globalFunction';
const color = ref(new Array(5).fill('#323232')) const color = ref(new Array(5).fill('#323232'))
const point = ref(0) const point = ref(0)
const isShowUnderLine = ref([true, false, false, false, false]) const isShowUnderLine = ref([true, false, false, false, false])
@ -405,6 +406,7 @@
else { else {
await cancelServiceOrder(val) await cancelServiceOrder(val)
} }
showTips('取消成功')
await getMyOrder() await getMyOrder()
} }
} }
@ -420,6 +422,7 @@
if (res.confirm) { if (res.confirm) {
await deleteOrder(val) await deleteOrder(val)
await getMyOrder() await getMyOrder()
showTips('删除成功')
} }
} }
}) })
@ -636,7 +639,7 @@
.section_2 { .section_2 {
padding: 31.88rpx 35.63rpx 0; padding: 31.88rpx 35.63rpx 0;
background-color: #ffffff; background-color: #ffffff;
box-shadow: 0rpx 3.75rpx 3.75rpx #00000040; box-shadow: 0rpx 3.75rpx 3.75rpx #32323240;
position: fixed; position: fixed;
top: 0; top: 0;
left: 0; left: 0;
@ -793,7 +796,7 @@
font-size: 30rpx; font-size: 30rpx;
font-family: FangZhengFonts; font-family: FangZhengFonts;
line-height: 25.84rpx; line-height: 25.84rpx;
color: #000000; color: #323232;
} }
.text_14 { .text_14 {
font-size: 28.13rpx; font-size: 28.13rpx;

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

@ -112,7 +112,7 @@
import {onMounted, ref} from 'vue' import {onMounted, ref} from 'vue'
import { onLoad } from "@dcloudio/uni-app"; import { onLoad } from "@dcloudio/uni-app";
import { baseUrl } from '../../../api/request'; import { baseUrl } from '../../../api/request';
import { JudgeIsNullity } from '../../../common/globalFunction'; import { JudgeIsNullity, showTips } from '../../../common/globalFunction';
import { serviceStateList } from '../../../common/global.js' import { serviceStateList } from '../../../common/global.js'
import emitter from '../../../utils/emitter'; import emitter from '../../../utils/emitter';
import { getFonts } from '../../../common/globalFont'; import { getFonts } from '../../../common/globalFont';
@ -277,6 +277,7 @@
await deleteOrder(val) await deleteOrder(val)
await emitter.emit('flushOrderList') await emitter.emit('flushOrderList')
routerJump('pages/my-order/myServiceOrderDetail/myServiceOrderDetail') routerJump('pages/my-order/myServiceOrderDetail/myServiceOrderDetail')
showTips('删除成功')
} }
} }
}) })
@ -631,7 +632,7 @@ button::after{
bottom: 0; bottom: 0;
} }
.text_22 { .text_22 {
color: #000000; color: #323232;
line-height: 27.43rpx; line-height: 27.43rpx;
} }
.group_10 { .group_10 {

2
pages/my-order/researchOrder/researchOrder.vue
View File

@ -52,7 +52,7 @@
.section_2 { .section_2 {
padding: 33.75rpx 0 35.63rpx; padding: 33.75rpx 0 35.63rpx;
background-color: #fff; background-color: #fff;
box-shadow: 0rpx 3.75rpx 3.75rpx #00000040; box-shadow: 0rpx 3.75rpx 3.75rpx #32323240;
} }
.pos { .pos {
position: fixed; position: fixed;

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

@ -793,7 +793,7 @@ const wxPay = async( oid )=> { //传入订单id
} }
.text_21 { .text_21 {
// margin-left: -119.06rpx; // margin-left: -119.06rpx;
color: #000000; color: #323232;
font-size: 30rpx; font-size: 30rpx;
font-family: FangZhengFonts; font-family: FangZhengFonts;
line-height: 26.49rpx; line-height: 26.49rpx;

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

@ -1,7 +1,7 @@
<template> <template>
<!-- 批量服务类商品购买 --> <!-- 批量服务类商品购买 -->
<view class="flex-col page" :style="{ backgroundImage: 'url(' + bkgPubilcPath + ')' }"> <view class="flex-col page" :style="{ backgroundImage: 'url(' + bkgPubilcPath + ')' }">
<view class="flex-row justify-between items-center section_2"> <view class="flex-row justify-between items-center section_2" @click="loadPop">
<view class="flex-row items-center"> <view class="flex-row items-center">
<image <image
class="shrink-0 image" class="shrink-0 image"
@ -9,12 +9,12 @@
/> />
<text class="text ml-10" style="font-size: 30rpx;">{{ contactRealInfo.name }} {{ contactRealInfo.phone }}</text> <text class="text ml-10" style="font-size: 30rpx;">{{ contactRealInfo.name }} {{ contactRealInfo.phone }}</text>
</view> </view>
<view class="flex-row items-center group" @click="loadPop" :style="{ pointerEvents: isLoading ? 'none' : 'auto' }"> <view class="flex-row items-center group" :style="{ pointerEvents: isLoading ? 'none' : 'auto' }">
<text class="font text_2">更换联系人</text>
<image <image
class="image_2" class="image_2"
:src="orderUrl + '/serviceWaitPay/yjt.png'" :src="orderUrl + '/serviceWaitPay/yjt.png'"
/> />
<text class="font text_2">更换联系人</text>
</view> </view>
</view> </view>
<view class="flex-col section_3"> <view class="flex-col section_3">
@ -582,8 +582,8 @@
border-radius: 18.75rpx; border-radius: 18.75rpx;
} }
.image { .image {
width: 65.63rpx; width: 50.63rpx;
height: 67.5rpx; height: 50.5rpx;
} }
.text { .text {
color: #818181; color: #818181;
@ -593,11 +593,12 @@
} }
.group { .group {
width: 167.03rpx; width: 167.03rpx;
display: flex;
justify-content: space-around;
} }
.image_2 { .image_2 {
margin-left: 129.53rpx; width: 25.5rpx;
width: 37.5rpx; height: 25.5rpx;
height: 37.5rpx;
} }
.font { .font {
font-size: 26.25rpx; font-size: 26.25rpx;
@ -606,7 +607,6 @@
color: #323232; color: #323232;
} }
.text_2 { .text_2 {
margin-left: -167.03rpx;
color: #ffaaa5; color: #ffaaa5;
} }
.section_3 { .section_3 {
@ -690,7 +690,7 @@
color: #ffffff; color: #ffffff;
} }
.text_6 { .text_6 {
line-height: 17.23rpx; line-height: 26.25rpx;
} }
.image_5 { .image_5 {
border-radius: 0rpx 9.38rpx 9.38rpx 0rpx; border-radius: 0rpx 9.38rpx 9.38rpx 0rpx;
@ -775,7 +775,7 @@
border-radius: 18.75rpx; border-radius: 18.75rpx;
} }
.text_15 { .text_15 {
color: #000000; color: #323232;
line-height: 29.53rpx; line-height: 29.53rpx;
} }
.text-wrapper_2 { .text-wrapper_2 {
@ -805,7 +805,7 @@
} }
.text_17 { .text_17 {
// margin-left: -119.06rpx; // margin-left: -119.06rpx;
color: #000000; color: #323232;
font-size: 30rpx; font-size: 30rpx;
font-family: FangZhengFonts; font-family: FangZhengFonts;
line-height: 26.49rpx; line-height: 26.49rpx;

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

@ -789,7 +789,7 @@ const wxPay = async ( oid )=> { //传入订单id
border-radius: 18.75rpx; border-radius: 18.75rpx;
} }
.text_19 { .text_19 {
color: #000000; color: #323232;
line-height: 29.53rpx; line-height: 29.53rpx;
} }
.text-wrapper_2 { .text-wrapper_2 {
@ -820,7 +820,7 @@ const wxPay = async ( oid )=> { //传入订单id
} }
.text_21 { .text_21 {
// margin-left: -119.06rpx; // margin-left: -119.06rpx;
color: #000000; color: #323232;
font-size: 30rpx; font-size: 30rpx;
font-family: FangZhengFonts; font-family: FangZhengFonts;
line-height: 26.49rpx; line-height: 26.49rpx;

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

@ -10,11 +10,11 @@
<text class="text ml-10" style="font-size: 30rpx;">{{ contactRealInfo.name }} {{ contactRealInfo.phone }}</text> <text class="text ml-10" style="font-size: 30rpx;">{{ contactRealInfo.name }} {{ contactRealInfo.phone }}</text>
</view> </view>
<view class="flex-row items-center group" :style="{ pointerEvents: isLoading ? 'none' : 'auto' }"> <view class="flex-row items-center group" :style="{ pointerEvents: isLoading ? 'none' : 'auto' }">
<text class="font text_2">更换联系人</text>
<image <image
class="image_2" class="image_2"
:src="orderUrl + '/singleServiceWait/yjt.png'" :src="orderUrl + '/singleServiceWait/yjt.png'"
/> />
<text class="font text_2">更换联系人</text>
</view> </view>
</view> </view>
<view class="flex-col section_3"> <view class="flex-col section_3">
@ -576,8 +576,8 @@
border-radius: 18.75rpx; border-radius: 18.75rpx;
} }
.image { .image {
width: 65.63rpx; width: 50.63rpx;
height: 67.5rpx; height: 50.5rpx;
} }
.text { .text {
color: #818181; color: #818181;
@ -587,11 +587,12 @@
} }
.group { .group {
width: 167.03rpx; width: 167.03rpx;
display: flex;
justify-content: space-around;
} }
.image_2 { .image_2 {
margin-left: 129.53rpx; width: 25.5rpx;
width: 37.5rpx; height: 25.5rpx;
height: 37.5rpx;
} }
.font { .font {
font-size: 26.25rpx; font-size: 26.25rpx;
@ -600,7 +601,6 @@
color: #323232; color: #323232;
} }
.text_2 { .text_2 {
margin-left: -167.03rpx;
color: #ffaaa5; color: #ffaaa5;
} }
.section_3 { .section_3 {
@ -768,7 +768,7 @@
border-radius: 18.75rpx; border-radius: 18.75rpx;
} }
.text_15 { .text_15 {
color: #000000; color: #323232;
line-height: 29.53rpx; line-height: 29.53rpx;
} }
.text-wrapper_2 { .text-wrapper_2 {
@ -798,7 +798,7 @@
} }
.text_17 { .text_17 {
// margin-left: -119.06rpx; // margin-left: -119.06rpx;
color: #000000; color: #323232;
font-size: 30rpx; font-size: 30rpx;
font-family: FangZhengFonts; font-family: FangZhengFonts;
line-height: 26.49rpx; line-height: 26.49rpx;

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

@ -13,8 +13,8 @@
<view class="flex-col self-stretch section_2"> <view class="flex-col self-stretch section_2">
<view class="self-start group"> <view class="self-start group">
<text class="font text_2">￥</text> <text class="font text_2">￥</text>
<text class="text">{{ goodObject.price }}</text> <text class="text">{{ goodObject.price.toFixed(2) }}</text>
<text class="discountsText">限时优惠{{ coupon }}元</text> <text class="discountsText">限时优惠{{ coupon.toFixed(2) }}元</text>
</view> </view>
<view class="flex-row justify-between items-center self-stretch group_2"> <view class="flex-row justify-between items-center self-stretch group_2">
<text class="text_4">{{ goodObject.name }}</text> <text class="text_4">{{ goodObject.name }}</text>
@ -326,7 +326,7 @@ button::after {
padding: 16.88rpx 0 20.63rpx; padding: 16.88rpx 0 20.63rpx;
} }
.text_5 { .text_5 {
color: #000000; color: #323232;
line-height: 24.62rpx; line-height: 24.62rpx;
} }
.text-wrapper { .text-wrapper {
@ -387,7 +387,7 @@ button::after {
color: #ffffff; color: #ffffff;
} }
.text_10 { .text_10 {
color: #000000; color: #323232;
line-height: 28.01rpx; line-height: 28.01rpx;
text-decoration: underline; text-decoration: underline;
} }

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

@ -44,7 +44,7 @@
<view class="flex-col items-start self-center group_1"> <view class="flex-col items-start self-center group_1">
<text class="font">{{ item.name }}</text> <text class="font">{{ item.name }}</text>
<text class="font_3 mt-9">{{ item.intro }}</text> <text class="font_3 mt-9">{{ item.intro }}</text>
<text class="font_4 text_5 text_1 mt-9">￥{{ item.price }}</text> <text class="font_4 text_5 text_1 mt-9">￥{{ item.price.toFixed(2) }}</text>
</view> </view>
<!-- <image <!-- <image
class="self-start image_5" class="self-start image_5"
@ -268,7 +268,7 @@ input {
top: 0; top: 0;
} }
.text { .text {
color: #000000; color: #323232;
font-size: 35rpx; font-size: 35rpx;
font-family: FangZhengFonts; font-family: FangZhengFonts;
line-height: 35.66rpx; line-height: 35.66rpx;
@ -357,7 +357,7 @@ input {
font-size: 30rpx; font-size: 30rpx;
font-family: FangZhengFonts; font-family: FangZhengFonts;
line-height: 30rpx; line-height: 30rpx;
color: #000000; color: #323232;
} }
.font_3 { .font_3 {
font-size: 22.5rpx; font-size: 22.5rpx;

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

@ -423,7 +423,7 @@
margin-right: 20.57rpx; margin-right: 20.57rpx;
} }
.text_4 { .text_4 {
color: #000000; color: #323232;
line-height: 24.23rpx; line-height: 24.23rpx;
} }
.equal-division { .equal-division {

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

@ -41,11 +41,13 @@
</view> </view>
<view class="flex-row section_5"> <view class="flex-row section_5">
<view class="flex-col items-center shrink-0 self-start"> <view class="flex-col items-center shrink-0 self-start">
<button style="background-color: #ffffff;" class="flex-col" open-type="contact" bindcontact="handleContact" session-from="sessionFrom">
<image <image
class="image_4" class="image_4"
:src="workshopUrl + '/productmain/lxkf.png'" :src="workshopUrl + '/productmain/lxkf.png'"
/> />
<text class="text_13 mt-3">客服</text> <text class="text_13 mt-3">客服</text>
</button>
</view> </view>
<view class="flex-row flex-1 self-center ml-26"> <view class="flex-row flex-1 self-center ml-26">
<view class="flex-col justify-start items-center text-wrapper" @click="loadPopCart"> <view class="flex-col justify-start items-center text-wrapper" @click="loadPopCart">
@ -188,6 +190,9 @@ const loadPopBook = ()=> {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
button::after {
border: none;
}
.popup-content { .popup-content {
height: 85vh; height: 85vh;
} }
@ -235,7 +240,7 @@ const loadPopBook = ()=> {
line-height: 29.7rpx; line-height: 29.7rpx;
} }
.text { .text {
color: #000000; color: #323232;
line-height: 28.37rpx; line-height: 28.37rpx;
} }
.image { .image {
@ -292,7 +297,7 @@ const loadPopBook = ()=> {
font-size: 26.25rpx; font-size: 26.25rpx;
font-family: FangZhengFonts; font-family: FangZhengFonts;
line-height: 24.92rpx; line-height: 24.92rpx;
color: #000000; color: #323232;
} }
.section_4 { .section_4 {
padding: 31.63rpx 18.04rpx 56.83rpx 26.76rpx; padding: 31.63rpx 18.04rpx 56.83rpx 26.76rpx;
@ -366,7 +371,7 @@ const loadPopBook = ()=> {
.text_14 { .text_14 {
margin-left: 4.74rpx; margin-left: 4.74rpx;
margin-top: 32.87rpx; margin-top: 32.87rpx;
color: #000000; color: #323232;
font-size: 30rpx; font-size: 30rpx;
font-family: Open Sans; font-family: Open Sans;
line-height: 27.71rpx; line-height: 27.71rpx;

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

@ -244,7 +244,7 @@
font-size: 30rpx; font-size: 30rpx;
font-family: FangZhengFonts; font-family: FangZhengFonts;
line-height: 30rpx; line-height: 30rpx;
color: #000000; color: #323232;
} }
.text_3 { .text_3 {
margin-left: 17.7rpx; margin-left: 17.7rpx;