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

合完了

Browse Source
This commit is contained in:
chen-xin-zhi 2025-03-13 10:49:36 +08:00
parent c1dbacc58d
commit 8927a5944e
12 changed files with 34 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/request.ts
View File

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

12
common/globalFont.js
View File

@ -21,4 +21,16 @@ export const getFonts =()=>{
console.log('err',err); console.log('err',err);
} }
}) })
uni.loadFontFace({
family: 'FangZhengXiaoZhuan',
source: `url("https://carbon2.obs.cn-north-4.myhuaweicloud.com/fonts/FangZhengXiaoZhuan.ttf")`,
success:(res) =>{
console.log('success',res);
},
fail:(err) => {
console.log('err',err);
}
})
} }

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

@ -3,7 +3,7 @@
<view class="flex-row group"> <view class="flex-row group">
<view class=" "> <view class=" ">
<image class="flex-col justify-start items-end shrink-0 self-start image-wrapper" <image class="flex-col justify-start items-end shrink-0 self-start image-wrapper"
:src="productBrief.goodImg" /> :src="productBrief.goodImg.split(';')[0]" />
</view> </view>
<view class="flex-row flex-1 ml-23"> <view class="flex-row flex-1 ml-23">
<view class="flex-col flex-1 self-start group_2"> <view class="flex-col flex-1 self-start group_2">
@ -22,14 +22,14 @@
<view class="flex-row self-stretch mt-104"> <view class="flex-row self-stretch mt-104">
<view class="flex-col justify-start items-center image-wrapper_2"> <view class="flex-col justify-start items-center image-wrapper_2">
<image class="image_3" <image class="image_3"
src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FosWvYyNx-short1.png" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FFXJDkHOz-jian.png"
@click="decrease" /> @click="decrease" />
</view> </view>
<view class="ml-2 flex-col justify-start items-center text-wrapper"><text <view class="ml-2 flex-col justify-start items-center text-wrapper"><text
class="text_5">{{ quantity }}</text></view> class="text_5">{{ quantity }}</text></view>
<view class="ml-2 flex-col justify-start items-center image-wrapper_3"> <view class="ml-2 flex-col justify-start items-center image-wrapper_3">
<image class="image_3" <image class="image_3"
src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FGbdSQDul-add1.png" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FYvlxXoMs-jia.png"
@click="increase" /> @click="increase" />
</view> </view>
</view> </view>

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

@ -375,7 +375,7 @@ const changeState =()=>{ //修改购物车订单方法
margin-top: 324.38rpx; margin-top: 324.38rpx;
} }
.page { .page {
background-color: #f8e8c1; background-color: #fff;
width: 100%; width: 100%;
overflow-y: auto; overflow-y: auto;
overflow-x: hidden; overflow-x: hidden;

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

@ -3,7 +3,7 @@
<view class="flex-col group"> <view class="flex-col group">
<view class="flex-row items-center group_2"> <view class="flex-row items-center group_2">
<button class="avatar_button" open-type="chooseAvatar" @chooseavatar="onChooseAvatar"> <button class="avatar_button" open-type="chooseAvatar" @chooseavatar="onChooseAvatar">
<image class="avatar_son" :src="myAvatar" /> <image class="avatar_son" mode="aspectFill" :src="myAvatar" />
</button> </button>
@ -193,7 +193,7 @@ const userLogout = () => {
let tempFile = '' let tempFile = ''
const myAvatar = ref('') const myAvatar = ref('https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FQbtEasUN-VCG211285566731.png')
const onChooseAvatar = (e) => { const onChooseAvatar = (e) => {
tempFile = e.detail.avatarUrl tempFile = e.detail.avatarUrl
console.log(tempFile) console.log(tempFile)
@ -216,7 +216,7 @@ const onChooseAvatar = (e) => {
} }
const nickName = ref('') const nickName = ref('非遗雅士')
const onUpdateNick = (e) => { const onUpdateNick = (e) => {
nickName.value = e.detail.value nickName.value = e.detail.value
updateMyUser() updateMyUser()

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

@ -27,7 +27,7 @@
<view class="flex-row"> <view class="flex-row">
<image <image
class="image_3" class="image_3"
:src="item.goodSnapshot.goodImg" :src="item.goodSnapshot.goodImg.split(';')[0]"
/> />
<view class="flex-col items-start ml-11"> <view class="flex-col items-start ml-11">
<text class="font text_5">{{ item.goodSnapshot.name }}</text> <text class="font text_5">{{ item.goodSnapshot.name }}</text>
@ -458,10 +458,11 @@ button::after{
border-radius: 18.75rpx; border-radius: 18.75rpx;
} }
.pos_2 { .pos_2 {
position: absolute; // position: absolute;
left: 16.88rpx; // left: 16.88rpx;
right: 15rpx; // right: 15rpx;
top: 144.38rpx; // top: 144.38rpx;
margin: 144.38rpx 15rpx 0 16.88rpx;
} }
.image_2 { .image_2 {
width: 43.13rpx; width: 43.13rpx;
@ -484,7 +485,7 @@ button::after{
// left: 15rpx; // left: 15rpx;
// right: 16.88rpx; // right: 16.88rpx;
// top: 287.5rpx; // top: 287.5rpx;
margin: 287.5rpx 16.88rpx 150rpx 15rpx; margin: 25.5rpx 16.88rpx 150rpx 15rpx;
} }
.list-item:first-child { .list-item:first-child {
margin-top: 0; margin-top: 0;

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

@ -55,7 +55,7 @@
<view class="flex-row"> <view class="flex-row">
<image <image
class="image_2" class="image_2"
:src="subItem.goodSnapshot.goodImg" :src="subItem.goodSnapshot.goodImg.split(';')[0]"
/> />
<view class="flex-col items-start group_19 ml-11"> <view class="flex-col items-start group_19 ml-11">
<text class="font_2">{{ subItem.goodSnapshot.name }}</text> <text class="font_2">{{ subItem.goodSnapshot.name }}</text>

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

@ -567,7 +567,7 @@ const wxPay = async( oid )=> { //传入订单id
margin-top: 20.63rpx; margin-top: 20.63rpx;
} }
.page { .page {
background-color: #f8e8c1; background-color: #fff;
background-image: url('https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FQfLHXSAU-feiyigongfangbeijin.png'); background-image: url('https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FQfLHXSAU-feiyigongfangbeijin.png');
background-size: 100% 100%; background-size: 100% 100%;
background-repeat: no-repeat; background-repeat: no-repeat;

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

@ -539,7 +539,7 @@ import { dealResult } from '../../../common/globalFunction';
} }
.page { .page {
padding-top: 24.38rpx; padding-top: 24.38rpx;
background-color: #f8e8c1; background-color: #fff;
background-image: url('https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FQfLHXSAU-feiyigongfangbeijin.png'); background-image: url('https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FQfLHXSAU-feiyigongfangbeijin.png');
background-size: 100% 100%; background-size: 100% 100%;
background-repeat: no-repeat; background-repeat: no-repeat;

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

@ -593,7 +593,7 @@ const getFonts =()=>{
margin-top: 20.63rpx; margin-top: 20.63rpx;
} }
.page { .page {
background-color: #f8e8c1; background-color: #fff;
background-image: url('https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FQfLHXSAU-feiyigongfangbeijin.png'); background-image: url('https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FQfLHXSAU-feiyigongfangbeijin.png');
background-size: 100% 100%; background-size: 100% 100%;
background-repeat: no-repeat; background-repeat: no-repeat;

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

@ -519,7 +519,7 @@
} }
.page { .page {
padding-top: 24.38rpx; padding-top: 24.38rpx;
background-color: #f8e8c1; background-color: #fff;
background-image: url('https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FQfLHXSAU-feiyigongfangbeijin.png'); background-image: url('https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FQfLHXSAU-feiyigongfangbeijin.png');
background-size: 100% 100%; background-size: 100% 100%;
background-repeat: no-repeat; background-repeat: no-repeat;

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

@ -16,7 +16,7 @@
<view class="flex-col items-start self-stretch"> <view class="flex-col items-start self-stretch">
<image <image
class="image_2" class="image_2"
:src="item.goodImg" :src="item.goodImg.split(';')[0]"
/> />
<text class="font_2 text_3 mt-5">{{ item.name }}</text> <text class="font_2 text_3 mt-5">{{ item.name }}</text>
<text class="font_3 text_4 mt-5">{{ item.intro.length > 19 ? item.intro.substr(0, 20) + '...' : item.intro }}</text> <text class="font_3 text_4 mt-5">{{ item.intro.length > 19 ? item.intro.substr(0, 20) + '...' : item.intro }}</text>