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 00:46:53 +08:00
parent cf0e5b408e
commit c1dbacc58d
13 changed files with 66 additions and 51 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 nwct = 'https://winning-mouse-internally.ngrok-free.app/api'
export const suiUrl = ''
export const baseUrl = testUrl
export const baseUrl = Url

1
common/globalImagesUrl.js
View File

@ -1,3 +1,4 @@
export const bookUrl = 'https://carbon2.obs.cn-north-4.myhuaweicloud.com/feiyi/miniProgram/book'
export const couponUrl = 'https://carbon2.obs.cn-north-4.myhuaweicloud.com/feiyi/miniProgram/coupon'
export const workshopUrl = 'https://carbon2.obs.cn-north-4.myhuaweicloud.com/feiyi/miniProgram/workshop'
export const myOrderUrl = 'https://carbon2.obs.cn-north-4.myhuaweicloud.com/feiyi/miniProgram/my-order'

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

@ -251,7 +251,7 @@
.text {
color: #323232;
font-size: 33.75rpx;
font-family: Inter;
font-family: FangZhengFonts;
line-height: 31.18rpx;
}
.image {
@ -269,7 +269,7 @@
}
.font {
font-size: 30rpx;
font-family: Inter;
font-family: FangZhengFonts;
line-height: 25.65rpx;
color: #323232;
}
@ -324,7 +324,7 @@
}
.font_3 {
font-size: 45rpx;
font-family: Inter;
font-family: FangZhengFonts;
line-height: 33.81rpx;
font-weight: 600;
color: #c35c5d;
@ -334,7 +334,7 @@
}
.font_4 {
font-size: 30rpx;
font-family: Inter;
font-family: FangZhengFonts;
line-height: 21.64rpx;
color: #c35c5d;
}
@ -353,7 +353,7 @@
}
.font_5 {
font-size: 26.25rpx;
font-family: Inter;
font-family: FangZhengFonts;
line-height: 30rpx;
color: #000000;
}
@ -368,7 +368,7 @@
}
.font_2 {
font-size: 26.25rpx;
font-family: Inter;
font-family: FangZhengFonts;
line-height: 25.65rpx;
color: #323232;
}
@ -398,7 +398,7 @@
}
.font_6 {
font-size: 30rpx;
font-family: Inter;
font-family: FangZhengFonts;
color: #ffffff;
}
.text_8 {

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

@ -2,7 +2,7 @@
<view class="flex-row items-center equal-division-item" style="display: flex; align-items: center;">
<image
class="shrink-0 image_3"
src="https://ide.code.fun/api/image?token=67d0f1a04ae84d0012292f49&name=863037eb0051f07b12da8be904d01267.png"
:src="myOrderUrl + '/component/nav.png'"
/>
<text class="ml-2 font text_18" style="margin-left: 5rpx;">导航</text>
</view>
@ -11,7 +11,7 @@
<script setup>
import { onLoad } from "@dcloudio/uni-app";
import { getFonts } from '../../../common/globalFont';
import { myOrderUrl } from "../../../common/globalImagesUrl";
onLoad(() => {
getFonts()
})

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

@ -14,7 +14,7 @@
<view class="flex-row items-center section_3 pos_2">
<image
class="shrink-0 image_2"
src="https://ide.code.fun/api/image?token=67cf80c84ae84d001228feb1&name=387313f270b8e4f6cc89b61569777988.png"
:src="myOrderUrl + '/myGeneralOrderDetail/dw.png'"
/>
<view class="ml-8 flex-col items-start flex-1">
<text class="font text_3">{{ addressObj.name }} {{ addressObj.phone }}</text>
@ -87,7 +87,7 @@
<button style="display: flex; align-items: center; height: 60rpx;" open-type="contact" bindcontact="handleContact" session-from="sessionFrom">
<image
class="image_4"
src="https://ide.code.fun/api/image?token=67cf80c84ae84d001228feb1&name=c8d71ce891d47896e44d7aba3b432ab8.png"
:src="myOrderUrl + '/myGeneralOrderDetail/zxkf.png'"
/>
<text class="font text_20">在线客服</text>
</button>
@ -134,6 +134,7 @@
import { JudgeIsNullity } from '../../../common/globalFunction';
import { getFonts } from '../../../common/globalFont';
import emitter from '../../../utils/emitter';
import { myOrderUrl } from '../../../common/globalImagesUrl.js';
const order = ref({})
const cookie = wx.getStorageSync('cookie')
let orderId = ''
@ -399,7 +400,7 @@ button::after{
}
.page {
background-color: #fff;
background-image: url('https://ide.code.fun/api/image?token=67cf80c84ae84d001228feb1&name=24453f696e665b4a146abeed1b16ec7c.png');
background-image: url(https://carbon2.obs.cn-north-4.myhuaweicloud.com/feiyi/miniProgram/my-order/myGeneralOrderDetail/bkg.png);
background-size: 100% 100%;
background-repeat: no-repeat;
width: 100%;

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

@ -9,7 +9,7 @@
<view class="flex-row justify-center section_3" style="display: flex; align-items: center;" @click="gotoResearch">
<image
class="image"
src="https://ide.code.fun/api/image?token=67cf80c84ae84d001228feb1&name=4ff44c6bdf30d5c8585ab27127ca096f.png"
:src="myOrderUrl + '/myOrderList/ss.png'"
/>
<text class="font text ml-17" v-if="isHiddenInput">搜索订单</text>
<input class="font text ml-7" v-if="!isHiddenInput" placeholder="搜索订单" :disabled="true" v-model="orderNumber" style="width: 85%; color: #323232;"/>
@ -131,6 +131,7 @@
import navVue from '../component/nav.vue';
import emitter from '../../../utils/emitter';
import { getFonts } from '../../../common/globalFont';
import { myOrderUrl } from '../../../common/globalImagesUrl';
const color = ref(new Array(5).fill('#323232'))
const point = ref(0)
const isShowUnderLine = ref([true, false, false, false, false])

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

@ -14,7 +14,7 @@
<view class="flex-row items-center section_3 pos_2">
<image
class="image_2"
src="https://ide.code.fun/api/image?token=67cf80c84ae84d001228feb1&name=c722632a6d3422b784ca869ba8b27cb0.png"
:src="myOrderUrl + '/myServiceOrderDetail/lxr.png'"
/>
<text class="font_3 text_3 ml-9">{{ contactObj.name }} {{ contactObj.phone }}</text>
</view>
@ -74,7 +74,7 @@
<button style="display: flex; align-items: center; height: 60rpx;" open-type="contact" bindcontact="handleContact" session-from="sessionFrom">
<image
class="image_4"
src="https://ide.code.fun/api/image?token=67cf80c84ae84d001228feb1&name=c8d71ce891d47896e44d7aba3b432ab8.png"
:src="myOrderUrl + '/myServiceOrderDetail/zxkf.png'"
/>
<text class="font text_21">在线客服</text>
</button>
@ -116,6 +116,7 @@
import { serviceStateList } from '../../../common/global.js'
import emitter from '../../../utils/emitter';
import { getFonts } from '../../../common/globalFont';
import { myOrderUrl } from '../../../common/globalImagesUrl';
const cookie = wx.getStorageSync('cookie')
let orderId = ''
const order = ref({})
@ -348,7 +349,7 @@ button::after{
}
.page {
background-color: #ffffff;
background-image: url('https://ide.code.fun/api/image?token=67cf80c84ae84d001228feb1&name=9df295c356c1b6849e20b6b4853b4d1c.png');
background-image: url(https://carbon2.obs.cn-north-4.myhuaweicloud.com/feiyi/miniProgram/my-order/myServiceOrderDetail/bkg.png);
background-size: 100% 100%;
background-repeat: no-repeat;
width: 100%;

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

@ -1,11 +1,11 @@
<template>
<view class="flex-col justify-start relative page">
<view class="section"></view>
<!-- <view class="section"></view> -->
<view class="flex-col justify-start section_2 pos">
<view class="flex-row section_3" style="display: flex; align-items: center;">
<image
class="image"
src="https://ide.code.fun/api/image?token=67cf80c84ae84d001228feb1&name=4ff44c6bdf30d5c8585ab27127ca096f.png"
:src="myOrderUrl + '/researchOrder/ss.png'"
/>
<input confirm-type="search" @confirm="search" class="ml-7" placeholder="搜索订单" style="width: 100%;" v-model="orderNumber"/>
</view>
@ -17,7 +17,7 @@
import {ref} from 'vue'
import { onLoad } from "@dcloudio/uni-app";
import { getFonts } from '../../../common/globalFont';
import { myOrderUrl } from '../../../common/globalImagesUrl';
onLoad(() => {
getFonts()
})
@ -43,7 +43,7 @@
}
.page {
background-color: #ffffff;
background-image: url('https://ide.code.fun/api/image?token=67cf80c84ae84d001228feb1&name=98c27c9593262699d4de87045e9a792c.png');
background-image: url(https://carbon2.obs.cn-north-4.myhuaweicloud.com/feiyi/miniProgram/my-order/researchOrder/bkg.png);
background-size: 100% 100%;
background-repeat: no-repeat;
width: 100%;
@ -51,13 +51,13 @@
overflow-x: hidden;
height: 100%;
}
.section {
background-image: url('https://ide.code.fun/api/image?token=67cf80c84ae84d001228feb1&name=98c27c9593262699d4de87045e9a792c.png');
background-size: 100% 100%;
background-repeat: no-repeat;
width: 750rpx;
height: 1571.25rpx;
}
// .section {
// background-image: url('https://ide.code.fun/api/image?token=67cf80c84ae84d001228feb1&name=98c27c9593262699d4de87045e9a792c.png');
// background-size: 100% 100%;
// background-repeat: no-repeat;
// width: 750rpx;
// height: 1571.25rpx;
// }
.section_2 {
padding: 33.75rpx 0 35.63rpx;
background-color: #ffffff;

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

@ -161,6 +161,7 @@ import addressComponentVue from '../component/addressComponent.vue'; //导入组
import couponPopupVue from '../../coupon/component/couponPopup.vue';
import { stateMap } from '../../../common/global';
import * as math from 'mathjs'
import { dealResult } from '../../../common/globalFunction';
//一些暂时变量
const sumprice = ref(0) //总价格
//11.4开发 不应该删掉的
@ -227,7 +228,6 @@ const getCouponObjHandler = (val) => {
}
onMounted(() => {
FangZhengFontsts()
//将关闭弹窗方法传入弹窗页面，绑定弹窗按钮可关闭弹窗
emitter.on('closeAddress', closeHandler)
//获取地址信息
@ -256,7 +256,7 @@ onUnmounted(() => {
onLoad( async (options)=>{
FangZhengFontsts()
getFonts()
totalInfo.value = JSON.parse(options.cartInfo)
console.log('options.cartInfo-->',JSON.parse(options.cartInfo));
console.log('totalInfo.value-->',toRaw(totalInfo.value) );
@ -293,7 +293,7 @@ const createOrder = async () => { //购物车的购买方法
console.log('地址信息-->',addressRealInfo.value);
formatArr()
console.log('postCartArr--->',postCartArr.value);
const resOrder = await uni.request({ //向后端发送生成订单请求
const res = await uni.request({ //向后端发送生成订单请求
url: baseUrl + '/order/add/cart',
method: 'POST',
header: {
@ -309,10 +309,12 @@ const createOrder = async () => { //购物车的购买方法
cartOrderItemAddRequestList: toRaw(postCartArr.value)
}
})
console.log('后台返回订单响应==>',resOrder.data);
if(resOrder.data.code === 1) {
wxPay(resOrder.data.data)
if (!dealResult(res)) {
hideLoading()
isShow.value = false
return
}
wxPay(res.data.data)
}
//根据商品id数组获取商品信息
const getProduct = async ()=> {

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

@ -150,6 +150,7 @@
import contactPopVue from '../../mine/component/contactPop.vue'; //新增联系人弹窗
import { getFonts } from '../../../common/globalFont';
import * as math from 'mathjs'
import { dealResult } from '../../../common/globalFunction';
//一些暂时变量
const sumprice = ref(0) //总价格
const popup = ref(null) //弹窗对象
@ -293,7 +294,7 @@
console.log('联系人信息-->',contactRealInfo.value);
formatArr()
console.log('postCartArr--->',postCartArr.value);
const resOrder = await uni.request({ //向后端发送生成订单请求
const res = await uni.request({ //向后端发送生成订单请求
url: baseUrl + '/order/add/experience/cart',
method: 'POST',
header: {
@ -308,10 +309,12 @@
cartOrderItemAddRequestList: toRaw(postCartArr.value)
}
})
console.log('后台返回订单响应==>',resOrder.data);
if(resOrder.data.code === 1) {
wxPay(resOrder.data.data)
if (!dealResult(res)) {
hideLoading()
isShow.value = false
return
}
wxPay(res.data.data)
}
//根据商品id数组获取商品信息
const getProduct = async ()=> {

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

@ -165,6 +165,7 @@ import addressComponentVue from '../component/addressComponent.vue';//导入组
import couponPopupVue from '../../coupon/component/couponPopup.vue';
import { stateMap } from '../../../common/global';
import * as math from 'mathjs'
import { dealResult } from '../../../common/globalFunction';
//一些暂时变量
const sumprice = ref(0) //总价格
//11.4开发 不应该删掉的
@ -424,7 +425,7 @@ const createOrder = async () => { //创建单个商品订单的方法
console.log('地址信息-->',addressRealInfo.value);
formatArr()
console.log('postCartArr--->',postCartArr.value);
const resOrder = await uni.request({ //向后端发送生成订单请求
const res = await uni.request({ //向后端发送生成订单请求
url: baseUrl + '/order/add',
method: 'POST',
header: {
@ -440,10 +441,14 @@ const createOrder = async () => { //创建单个商品订单的方法
orderItemMainInfoAddRequestList: toRaw(postCartArr.value)
}
})
console.log('后台返回订单响应==>',resOrder.data);
if(resOrder.data.code === 1) {
wxPay(resOrder.data.data)
console.log('后台返回订单响应==>',res.data);
if (!dealResult(res)) {
hideLoading()
isShow.value = false
return
}
wxPay(res.data.data)
}
//根据商品id获取单个商品信息
const getProduct = async ()=> {

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

@ -292,7 +292,7 @@
console.log('联系人信息-->',contactRealInfo.value);
formatArr()
// console.log('postCartArr--->',postCartArr.value);
const resOrder = await uni.request({ //向后端发送生成订单请求
const res = await uni.request({ //向后端发送生成订单请求
url: baseUrl + '/order/add',
method: 'POST',
header: {
@ -307,13 +307,12 @@
orderItemMainInfoAddRequestList: toRaw(postCartArr.value)
}
})
if (!dealResult(resOrder)) {
if (!dealResult(res)) {
hideLoading()
isShow.value = false
return
}
console.log('后台返回订单响应==>',resOrder.data);
wxPay(resOrder.data.data)
wxPay(res.data.data)
}
//减少当前商品数量

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

@ -212,7 +212,9 @@ const imgList = ref([{
</script>
<style lang="scss" scoped>
input {
font-family: FangZhengFonts;
}
::-webkit-scrollbar {
display: none;