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

给后端使用的版本

Browse Source
This commit is contained in:
yuanteng0011 2025-01-02 10:07:36 +08:00
parent 1ef72442d8
commit f1a76acdff
6 changed files with 494 additions and 434 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/request.ts
View File

@ -3,4 +3,4 @@ export const testUrl = 'http://123.249.108.160:8888/api' //自己组的服务
export const suiUrl = 'http://154.8.193.216:9092/api' //隋宇霏的接口地址 export const suiUrl = 'http://154.8.193.216:9092/api' //隋宇霏的接口地址
export const domain = 'https://www.carboner.cn/api' export const domain = 'https://www.carboner.cn/api'
export const baseUrl = domain export const baseUrl = testUrl

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

@ -130,7 +130,7 @@
<script setup> <script setup>
import { ref , onMounted , toRaw} from 'vue' import { ref , onMounted , toRaw} from 'vue'
import { onShow } from "@dcloudio/uni-app"; import { onShow , onLoad } from "@dcloudio/uni-app";
import { baseUrl , testUrl ,suiUrl} from '../../../api/request'; import { baseUrl , testUrl ,suiUrl} from '../../../api/request';
import * as math from 'mathjs' import * as math from 'mathjs'
const products = ref([]) const products = ref([])
@ -146,6 +146,9 @@ const stateText = ref({
onShow(()=>{ onShow(()=>{
getProductCart() //获取商品类 getProductCart() //获取商品类
}) })
// onLoad(()=>{
// getProductCart() //再获取一次实体类商品的列表
// })
//小程序刷新根据用户id获取购物车信息 //小程序刷新根据用户id获取购物车信息
const getProductCart = async ()=>{ const getProductCart = async ()=>{
const res = await uni.request({ const res = await uni.request({
@ -175,7 +178,10 @@ const deleteProduct = async (idArr) =>{ //删除商品
}) })
console.log(res.data); console.log(res.data);
if(res.data.code === 1) { if(res.data.code === 1) {
getProductCart() //重新获取购物车信息 // getProductCart() //重新获取购物车信息
uni.reLaunch({
url: '/pages/Shopping-cart/productmain/productmain'
})
totalPrice.value = 0 totalPrice.value = 0
} }
} }
@ -328,8 +334,9 @@ const editOrSettle = async ()=>{ //去结算或者删除状态方法
title: '提示', title: '提示',
content: '是否删除商品?', content: '是否删除商品?',
success: (e) => { success: (e) => {
if(e.confirm) if(e.confirm) {
deleteProduct(checkedData.value) deleteProduct(checkedData.value)
}
else if(e.cancel) else if(e.cancel)
return; return;
} }

5
pages/home/home.vue
View File

@ -54,9 +54,6 @@
import {inject, ref} from 'vue' import {inject, ref} from 'vue'
import { baseUrl, testUrl , suiUrl} from '@/api/request'; import { baseUrl, testUrl , suiUrl} from '@/api/request';
import { onShow,onLoad } from "@dcloudio/uni-app"; import { onShow,onLoad } from "@dcloudio/uni-app";
//变量
const items = ref( [null, null, null])
const items_1 = ref( [null, null, null])
onShow(() => { onShow(() => {
uni.removeStorageSync('businessId') uni.removeStorageSync('businessId')
getMyUser() getMyUser()
@ -73,7 +70,7 @@ const getMyUser = async () =>{
'cookie': wx.getStorageSync("cookie") 'cookie': wx.getStorageSync("cookie")
} }
}) })
// console.log('获取用户信息==>',res.data) console.log('获取用户信息==>',res.data)
if( res.data.code === 40100 ) { if( res.data.code === 40100 ) {
uni.navigateTo({ uni.navigateTo({
url: '/pages/login/login' url: '/pages/login/login'

898
pages/mine/OrderDetails/OrderDetails.vue
View File

@ -1,436 +1,492 @@
<template> <template>
<view class="flex-col page"> <view class="flex-col page">
<view class="flex-col"> <view class="flex-col">
<view class="flex-col justify-start items-start image-wrapper"> <view class="flex-col justify-start items-start image-wrapper">
<image <image class="image"
class="image" src="https://ide.code.fun/api/image?token=672dbef4c471750012de4bf6&name=c450ffa87845363012613b1e0f522a87.png" />
src="https://ide.code.fun/api/image?token=672dbef4c471750012de4bf6&name=c450ffa87845363012613b1e0f522a87.png" </view>
/> <view class="flex-col group">
</view> <view class="flex-row items-center section">
<view class="flex-col group"> <image class="image_2"
<view class="flex-row items-center section"> src="https://ide.code.fun/api/image?token=672dbef4c471750012de4bf6&name=d7c7e8f082bbf68fe1e60091fa650fcd.png" />
<image <view class="ml-6 flex-col items-start flex-1">
class="image_2" <text class="font text">等待买家付款</text>
src="https://ide.code.fun/api/image?token=672dbef4c471750012de4bf6&name=d7c7e8f082bbf68fe1e60091fa650fcd.png" <text class="font_2 text_2 mt-5">请于13分51秒内付款，超时订单将自动关闭</text>
/> </view>
<view class="ml-6 flex-col items-start flex-1"> </view>
<text class="font text">等待买家付款</text> <view class="mt-8 flex-row items-center section_2">
<text class="font_2 text_2 mt-5">请于13分51秒内付款，超时订单将自动关闭</text> <image class="shrink-0 image_3"
</view> src="https://ide.code.fun/api/image?token=672dbef4c471750012de4bf6&name=19ebf0fd3bd190ff882354f39ef52d3e.png" />
</view> <view class="ml-8 flex-col items-start flex-1">
<view class="mt-8 flex-row items-center section_2"> <!-- <text class="font text_3">张三 15888610253</text> -->
<image <view class="font text_3">{{Status.addressSnapshot.name+Status.addressSnapshot.phone}}</view>
class="shrink-0 image_3" <!-- <text class="mt-12 font_2 text_4">黑龙江省哈尔滨市呼兰区学院路街道288号哈尔滨华德学院</text> -->
src="https://ide.code.fun/api/image?token=672dbef4c471750012de4bf6&name=19ebf0fd3bd190ff882354f39ef52d3e.png" <view class="mt-12 font_2 text_4">{{Status.addressSnapshot.region+Status.addressSnapshot.detailAddress}}
/> </view>
<view class="ml-8 flex-col items-start flex-1"> </view>
<!-- <text class="font text_3">张三 15888610253</text> --> </view>
<view class="font text_3">{{Status.addressSnapshot.name+Status.addressSnapshot.phone}}</view> <view class="mt-8 flex-col section_3">
<!-- <text class="mt-12 font_2 text_4">黑龙江省哈尔滨市呼兰区学院路街道288号哈尔滨华德学院</text> --> <view class="flex-row justify-between self-stretch group_2">
<view class="mt-12 font_2 text_4">{{Status.addressSnapshot.region+Status.addressSnapshot.detailAddress}}</view> <view class="flex-row self-center">
</view> <!-- <image
</view>
<view class="mt-8 flex-col section_3">
<view class="flex-row justify-between self-stretch group_2">
<view class="flex-row self-center">
<!-- <image
class="image_4" class="image_4"
src="https://ide.code.fun/api/image?token=672dbef4c471750012de4bf6&name=be4a0c4089866e086291773796509ef4.png" src="https://ide.code.fun/api/image?token=672dbef4c471750012de4bf6&name=be4a0c4089866e086291773796509ef4.png"
/> --> /> -->
<view v-for="i in Status.orderItemList" :key="i" > <view v-for="i in Status.orderItemList" :key="i">
<image :src="i.goodSnapshot.goodImg" style="height: 50px;width: 50px;" class="image_4"></image> <image :src="i.goodSnapshot.goodImg" style="height: 50px;width: 50px;" class="image_4"></image>
</view> </view>
<view class="flex-col group_3 ml-17"> <view class="flex-col group_3 ml-17">
<view class="flex-col"> <view class="flex-col">
<view class="flex-row self-stretch"> <view class="flex-row self-stretch">
<!-- <text class="font">非遗绒花</text> --> <!-- <text class="font">非遗绒花</text> -->
<view v-for="i in Status.orderItemList" :key="i" class="font"> <view v-for="i in Status.orderItemList" :key="i" class="font">
{{i.goodSnapshot.name}} {{i.goodSnapshot.name}}
</view> </view>
<!-- <text class="ml-4 font">【材料包】</text> --> <!-- <text class="ml-4 font">【材料包】</text> -->
<view v-for="i in Status.orderItemList" :key="i" class="ml-4 font"> <view v-for="i in Status.orderItemList" :key="i" class="ml-4 font">
【{{i.goodSnapshot.type}}】 【{{i.goodSnapshot.type}}】
</view> </view>
</view> </view>
<text class="self-start font_2 text_5 mt-11">已选种类：紫色</text> <text class="self-start font_2 text_5 mt-11">已选种类：紫色</text>
</view> </view>
<view class="mt-38 flex-row items-center"> <view class="mt-38 flex-row items-center">
<view class="flex-row items-center group_4"> <view class="flex-row items-center group_4">
<!-- <text class="text_6">138.</text> --> <!-- <text class="text_6">138.</text> -->
<view v-for="i in Status.orderItemList" :key="i" class="text_6" > <view v-for="i in Status.orderItemList" :key="i" class="text_6">
{{i.goodSnapshot.price}} {{i.goodSnapshot.price}}
</view> </view>
<image <image class="image_5 image_6"
class="image_5 image_6" src="https://ide.code.fun/api/image?token=672dbef4c471750012de4bf6&name=53a8efcd2031289983433ba21eb70050.png" />
src="https://ide.code.fun/api/image?token=672dbef4c471750012de4bf6&name=53a8efcd2031289983433ba21eb70050.png" </view>
/> </view>
</view> </view>
</view> </view>
</view> <text class="self-start font_3 text_8">×1</text>
</view> </view>
<text class="self-start font_3 text_8">×1</text> <view class="flex-row justify-between items-center self-stretch group_5">
</view> <text class="font_4 text_9">商品金额</text>
<view class="flex-row justify-between items-center self-stretch group_5"> <view class="flex-row items-center">
<text class="font_4 text_9">商品金额</text> <!-- <text class="font_3">138.00</text> -->
<view class="flex-row items-center"> <view v-for="i in Status.orderItemList" :key="i" class="font_3">
<!-- <text class="font_3">138.00</text> --> {{i.goodSnapshot.price}}
<view v-for="i in Status.orderItemList" :key="i" class="font_3"> </view>
{{i.goodSnapshot.price}} </view>
</view> </view>
</view> <view class="flex-row justify-between items-center self-stretch group_6">
</view> <text class="font_4 text_10">优惠券</text>
<view class="flex-row justify-between items-center self-stretch group_6"> <view class="flex-row items-center">
<text class="font_4 text_10">优惠券</text> <text class="font_3">-50.00</text>
<view class="flex-row items-center"> </view>
<text class="font_3">-50.00</text> </view>
</view> <view class="flex-row justify-end items-center self-stretch group_7">
</view> <view class="flex-row items-center group_8">
<view class="flex-row justify-end items-center self-stretch group_7"> <image class="image_5 image_8"
<view class="flex-row items-center group_8"> src="https://ide.code.fun/api/image?token=672dbef4c471750012de4bf6&name=4713f88f0f01fcb4c33fac4a8eba7f0f.png" />
<image <text class="font text_11">合计：</text>
class="image_5 image_8" </view>
src="https://ide.code.fun/api/image?token=672dbef4c471750012de4bf6&name=4713f88f0f01fcb4c33fac4a8eba7f0f.png" <text class="font_3 text_12">88.00</text>
/> </view>
<text class="font text_11">合计：</text> <view class="self-stretch divider view"></view>
</view> <text class="self-start font_4 text_13">买家留言</text>
<text class="font_3 text_12">88.00</text> <view class="flex-col justify-start self-stretch text-wrapper">
</view> <text class="font_2 text_14">
<view class="self-stretch divider view"></view> 希望所使用的材料是可持续来源的，并且制作工艺要精细，以确保每一朵花瓣都能生动地展现出绒花的质感和美感。
<text class="self-start font_4 text_13">买家留言</text> </text>
<view class="flex-col justify-start self-stretch text-wrapper"> </view>
<text class="font_2 text_14"> <view class="self-stretch divider view_2"></view>
希望所使用的材料是可持续来源的，并且制作工艺要精细，以确保每一朵花瓣都能生动地展现出绒花的质感和美感。 <view class="flex-row justify-between self-stretch group_9">
</text> <text class="font_2 text_15">订单编号：</text>
</view> <view class="flex-row items-center">
<view class="self-stretch divider view_2"></view> <!-- <text class="font_5 text_16">E20241005095840091406189</text> -->
<view class="flex-row justify-between self-stretch group_9"> <text class="font_5 text_16">{{Status.orderNumber}}</text>
<text class="font_2 text_15">订单编号：</text> <view class="ml-2 flex-col justify-start items-center shrink-0 text-wrapper_2">
<view class="flex-row items-center"> <text class="text_17">复制</text>
<!-- <text class="font_5 text_16">E20241005095840091406189</text> --> </view>
<text class="font_5 text_16">{{Status.orderNumber}}</text> </view>
<view class="ml-2 flex-col justify-start items-center shrink-0 text-wrapper_2"> </view>
<text class="text_17">复制</text> <view class="flex-row justify-between items-center self-stretch group_10">
</view> <text class="font_2 text_18">创建时间：</text>
</view> <text class="font_5 text_19">2024-10-05 09:58:41</text>
</view> </view>
<view class="flex-row justify-between items-center self-stretch group_10"> </view>
<text class="font_2 text_18">创建时间：</text> </view>
<text class="font_5 text_19">2024-10-05 09:58:41</text> </view>
</view> <view class="flex-row justify-between items-center section_4 mt-284">
</view> <view class="flex-row items-center" style="margin-left:80px;">
</view> <!-- <text class="text_21">88.</text> -->
</view> <text class="font_6 text_20"> 合计：</text>
<view class="flex-row justify-between items-center section_4 mt-284"> <!-- <text class="text_23">00</text> -->
<view class="flex-row items-center" style="margin-left:80px;"> <view v-for="i in Status.orderItemList" :key="i" class="text_21">
<!-- <text class="text_21">88.</text> --> {{i.goodSnapshot.price}}
<text class="font_6 text_20" > 合计：</text> </view>
<!-- <text class="text_23">00</text> --> </view>
<view v-for="i in Status.orderItemList" :key="i" class="text_21"> <view class="flex-col justify-start items-center text-wrapper_3">
{{i.goodSnapshot.price}} <!-- <text class="font_6 text_22">去支付</text> -->
</view> <view v-if="Status.orderStatus==='待支付'" class="font_6 text_22">去支付</view>
</view> <view v-if="Status.orderStatus==='待发货'" class="font_6 text_22">取消订单</view>
<view class="flex-col justify-start items-center text-wrapper_3"> <view v-if="Status.orderStatus==='待收货'" class="font_6 text_22">查看物流</view>
<!-- <text class="font_6 text_22">去支付</text> --> <view v-if="Status.orderStatus==='待收货'" class="font_6 text_22">确认收货</view>
<view v-if="Status.orderStatus==='待支付'" class="font_6 text_22">去支付</view> <view v-if="Status.orderStatus==='售后'" class="font_6 text_22">售后详情</view>
<view v-if="Status.orderStatus==='待发货'" class="font_6 text_22">取消订单</view> </view>
<view v-if="Status.orderStatus==='已发货'" class="font_6 text_22">确认收货</view>
<view v-if="Status.orderStatus==='售后'" class="font_6 text_22">售后详情</view>
</view> </view>
</view>
</view> </view>
</template> </template>
<script setup> <script setup>
import {onMounted, ref} from 'vue' import { onMounted, ref } from 'vue'
import { onLoad } from "@dcloudio/uni-app"; import { onLoad } from "@dcloudio/uni-app";
const Status = ref({}) const Status = ref({})
console.log(Status.value,34) console.log(Status.value, 34)
onLoad((options) => { onLoad((options) => {
Status.value = JSON.parse(options.info); Status.value = JSON.parse(options.info);
console.log(Status.value,111) console.log(Status.value, 111)
console.log(Status.value.orderStatus,222) console.log(Status.value.orderStatus, 222)
}) })
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.mt-5 { .mt-5 {
margin-top: 9.38rpx; margin-top: 9.38rpx;
} }
.ml-17 {
margin-left: 31.88rpx; .ml-17 {
} margin-left: 31.88rpx;
.mt-11 { }
margin-top: 20.63rpx;
} .mt-11 {
.mt-284 { margin-top: 20.63rpx;
margin-top: 532.5rpx; }
}
.page { .mt-284 {
background-color: #f8e8c1; margin-top: 532.5rpx;
width: 100%; }
overflow-y: auto;
overflow-x: hidden; .page {
height: 100%; background-color: #f8e8c1;
} width: 100%;
.image-wrapper { overflow-y: auto;
padding: 15rpx 0; overflow-x: hidden;
background-color: #fffef8; height: 100%;
} }
.image {
margin-left: 16.88rpx; .image-wrapper {
width: 37.5rpx; padding: 15rpx 0;
height: 37.5rpx; background-color: #fffef8;
} }
.group {
padding: 15rpx 15rpx 0; .image {
} margin-left: 16.88rpx;
.section { width: 37.5rpx;
padding: 16.88rpx 18.75rpx; height: 37.5rpx;
background-color: #fffef8; }
border-radius: 18.75rpx;
} .group {
.image_2 { padding: 15rpx 15rpx 0;
width: 75rpx; }
height: 75rpx;
} .section {
.section_2 { padding: 16.88rpx 18.75rpx;
padding: 33.75rpx 18.75rpx; background-color: #fffef8;
background-color: #fffef8; border-radius: 18.75rpx;
border-radius: 18.75rpx; }
}
.image_3 { .image_2 {
width: 43.13rpx; width: 75rpx;
height: 43.13rpx; height: 75rpx;
} }
.font_2 {
font-size: 22.5rpx; .section_2 {
font-family: Open Sans; padding: 33.75rpx 18.75rpx;
line-height: 19.39rpx; background-color: #fffef8;
color: #818181; border-radius: 18.75rpx;
} }
.text_2 {
color: #6b6e72; .image_3 {
line-height: 21.34rpx; width: 43.13rpx;
} height: 43.13rpx;
.text_4 { }
line-height: 20.91rpx;
} .font_2 {
.section_3 { font-size: 22.5rpx;
padding: 0 18.75rpx 26.25rpx 24.38rpx; font-family: Open Sans;
background-color: #fffef8; line-height: 19.39rpx;
border-radius: 18.75rpx; color: #818181;
} }
.group_2 {
padding: 22.5rpx 0; .text_2 {
border-bottom: solid 1.88rpx #dfdfdf; color: #6b6e72;
} line-height: 21.34rpx;
.image_4 { }
margin-bottom: 5.63rpx;
border-radius: 9.38rpx; .text_4 {
width: 146.25rpx; line-height: 20.91rpx;
height: 165rpx; }
}
.group_3 { .section_3 {
margin-top: 3.75rpx; padding: 0 18.75rpx 26.25rpx 24.38rpx;
} background-color: #fffef8;
.font { border-radius: 18.75rpx;
font-size: 26.25rpx; }
font-family: Open Sans;
line-height: 24.43rpx; .group_2 {
color: #323232; padding: 22.5rpx 0;
} border-bottom: solid 1.88rpx #dfdfdf;
.text_3 { }
line-height: 23.77rpx;
} .image_4 {
.text { margin-bottom: 5.63rpx;
color: #323233; border-radius: 9.38rpx;
font-size: 28.13rpx; width: 146.25rpx;
line-height: 26.08rpx; height: 165rpx;
} }
.text_5 {
line-height: 20.79rpx; .group_3 {
} margin-top: 3.75rpx;
.group_4 { }
width: 90.66rpx;
} .font {
.text_6 { font-size: 26.25rpx;
margin-left: 26.25rpx; font-family: Open Sans;
color: #323232; line-height: 24.43rpx;
font-size: 33.75rpx; color: #323232;
font-family: Open Sans; }
font-weight: 600;
line-height: 24.88rpx; .text_3 {
} line-height: 23.77rpx;
.image_5 { }
width: 30rpx;
height: 30rpx; .text {
} color: #323233;
.image_6 { font-size: 28.13rpx;
margin-left: -90rpx; line-height: 26.08rpx;
} }
.font_3 {
font-size: 26.25rpx; .text_5 {
font-family: Open Sans; line-height: 20.79rpx;
line-height: 19.39rpx; }
color: #323232;
} .group_4 {
.text_7 { width: 90.66rpx;
font-weight: 600; }
line-height: 19.29rpx;
} .text_6 {
.text_8 { margin-left: 26.25rpx;
margin-right: 7.5rpx; color: #323232;
margin-top: 146.25rpx; font-size: 33.75rpx;
line-height: 18.73rpx; font-family: Open Sans;
} font-weight: 600;
.group_5 { line-height: 24.88rpx;
margin-top: 26.25rpx; }
}
.font_4 { .image_5 {
font-size: 26.25rpx; width: 30rpx;
font-family: Open Sans; height: 30rpx;
line-height: 24.43rpx; }
color: #818181;
} .image_6 {
.text_9 { margin-left: -90rpx;
line-height: 24.28rpx; }
}
.group_6 { .font_3 {
margin-top: 13.13rpx; font-size: 26.25rpx;
} font-family: Open Sans;
.text_10 { line-height: 19.39rpx;
line-height: 24.26rpx; color: #323232;
} }
.image_7 {
width: 41.25rpx; .text_7 {
height: 30rpx; font-weight: 600;
} line-height: 19.29rpx;
.group_7 { }
margin-top: 16.88rpx;
} .text_8 {
.group_8 { margin-right: 7.5rpx;
width: 102.26rpx; margin-top: 146.25rpx;
} line-height: 18.73rpx;
.image_8 { }
margin-left: 71.25rpx;
} .group_5 {
.text_11 { margin-top: 26.25rpx;
margin-left: -101.25rpx; }
line-height: 24.09rpx;
} .font_4 {
.text_12 { font-size: 26.25rpx;
color: #fb8b05; font-family: Open Sans;
} line-height: 24.43rpx;
.divider { color: #818181;
background-color: #dfdfdf; }
height: 1.88rpx;
} .text_9 {
.view { line-height: 24.28rpx;
margin-top: 16.88rpx; }
}
.text_13 { .group_6 {
margin-top: 30rpx; margin-top: 13.13rpx;
line-height: 24.21rpx; }
}
.text-wrapper { .text_10 {
margin-top: 15rpx; line-height: 24.26rpx;
padding: 15rpx 0 11.25rpx; }
background-color: #fffef8;
border-radius: 9.38rpx; .image_7 {
border-left: solid 1.88rpx #f0f0b5; width: 41.25rpx;
border-right: solid 1.88rpx #f0f0b5; height: 30rpx;
border-top: solid 1.88rpx #f0f0b5; }
border-bottom: solid 1.88rpx #f0f0b5;
} .group_7 {
.text_14 { margin-top: 16.88rpx;
margin-left: 15rpx; }
margin-right: 18.75rpx;
line-height: 26.25rpx; .group_8 {
} width: 102.26rpx;
.view_2 { }
margin-top: 18.75rpx;
} .image_8 {
.group_9 { margin-left: 71.25rpx;
margin-top: 22.5rpx; }
}
.text_15 { .text_11 {
line-height: 20.85rpx; margin-left: -101.25rpx;
} line-height: 24.09rpx;
.font_5 { }
font-size: 22.5rpx;
font-family: Open Sans; .text_12 {
color: #323232; color: #fb8b05;
} }
.text_16 {
line-height: 16.54rpx; .divider {
} background-color: #dfdfdf;
.text-wrapper_2 { height: 1.88rpx;
background-color: #fffef8; }
width: 50.63rpx;
height: 22.5rpx; .view {
border-left: solid 0.94rpx #d1d1d1; margin-top: 16.88rpx;
border-right: solid 0.94rpx #d1d1d1; }
border-top: solid 0.94rpx #d1d1d1;
border-bottom: solid 0.94rpx #d1d1d1; .text_13 {
} margin-top: 30rpx;
.text_17 { line-height: 24.21rpx;
color: #323232; }
font-size: 18.75rpx;
font-family: Open Sans; .text-wrapper {
line-height: 17.38rpx; margin-top: 15rpx;
} padding: 15rpx 0 11.25rpx;
.group_10 { background-color: #fffef8;
margin-top: 11.25rpx; border-radius: 9.38rpx;
} border-left: solid 1.88rpx #f0f0b5;
.text_18 { border-right: solid 1.88rpx #f0f0b5;
line-height: 20.7rpx; border-top: solid 1.88rpx #f0f0b5;
} border-bottom: solid 1.88rpx #f0f0b5;
.text_19 { }
margin-right: 157.5rpx;
line-height: 16.63rpx; .text_14 {
} margin-left: 15rpx;
.section_4 { margin-right: 18.75rpx;
padding: 15rpx 26.25rpx; line-height: 26.25rpx;
background-color: #fffef8; }
}
.image_9 { .view_2 {
margin-left: 86.25rpx; margin-top: 18.75rpx;
width: 33.75rpx; }
height: 33.75rpx;
} .group_9 {
.text_21 { margin-top: 22.5rpx;
color: #fbb612; }
font-size: 37.5rpx;
font-family: Open Sans; .text_15 {
font-weight: 700; line-height: 20.85rpx;
line-height: 27.62rpx; }
}
.font_6 { .font_5 {
font-size: 30rpx; font-size: 22.5rpx;
font-family: Open Sans; font-family: Open Sans;
line-height: 27.62rpx; color: #323232;
} }
.text_20 {
margin-left: -172.5rpx; .text_16 {
color: #000000; line-height: 16.54rpx;
line-height: 27.54rpx; }
}
.text_23 { .text-wrapper_2 {
margin-left: 78.75rpx; background-color: #fffef8;
color: #fbb612; width: 50.63rpx;
font-size: 30rpx; height: 22.5rpx;
font-family: Open Sans; border-left: solid 0.94rpx #d1d1d1;
font-weight: 700; border-right: solid 0.94rpx #d1d1d1;
line-height: 22.05rpx; border-top: solid 0.94rpx #d1d1d1;
} border-bottom: solid 0.94rpx #d1d1d1;
.text-wrapper_3 { }
padding: 22.5rpx 0;
background-color: #fbb612; .text_17 {
border-radius: 75rpx; color: #323232;
width: 204.38rpx; font-size: 18.75rpx;
height: 71.25rpx; font-family: Open Sans;
} line-height: 17.38rpx;
.text_22 { }
color: #ffffff;
line-height: 27.86rpx; .group_10 {
} margin-top: 11.25rpx;
@import url(/common/css/global.css); }
</style>
.text_18 {
line-height: 20.7rpx;
}
.text_19 {
margin-right: 157.5rpx;
line-height: 16.63rpx;
}
.section_4 {
padding: 15rpx 26.25rpx;
background-color: #fffef8;
}
.image_9 {
margin-left: 86.25rpx;
width: 33.75rpx;
height: 33.75rpx;
}
.text_21 {
color: #fbb612;
font-size: 37.5rpx;
font-family: Open Sans;
font-weight: 700;
line-height: 27.62rpx;
}
.font_6 {
font-size: 30rpx;
font-family: Open Sans;
line-height: 27.62rpx;
}
.text_20 {
margin-left: -172.5rpx;
color: #000000;
line-height: 27.54rpx;
}
.text_23 {
margin-left: 78.75rpx;
color: #fbb612;
font-size: 30rpx;
font-family: Open Sans;
font-weight: 700;
line-height: 22.05rpx;
}
.text-wrapper_3 {
padding: 22.5rpx 0;
background-color: #fbb612;
border-radius: 75rpx;
width: 204.38rpx;
height: 71.25rpx;
}
.text_22 {
color: #ffffff;
line-height: 27.86rpx;
}
@import url(/common/css/global.css);
</style>

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

@ -100,7 +100,7 @@
<text class="font_3">联系客服</text> <text class="font_3">联系客服</text>
</view> </view>
</view> </view>
<view class="flex-row justify-end group_7" v-if="order.orderStatus==='已发货'"> <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"> <view class="flex-col justify-start items-center text-wrapper_2 ml-14">
<text class="font_3">查看物流</text> <text class="font_3">查看物流</text>
</view> </view>
@ -186,8 +186,8 @@ const isSelected = (tab) => Status.value.orderStatus === tab
return order.orderStatus === '待支付'; return order.orderStatus === '待支付';
case '待发货': case '待发货':
return order.orderStatus === '待发货'; return order.orderStatus === '待发货';
case '已发货': case '待收货':
return order.orderStatus === '已发货'; return order.orderStatus === '待收货';
case '已退款': case '已退款':
return order.orderStatus === '已退款'; return order.orderStatus === '已退款';
default: default:

4
pages/order/product-paysuccess/product-paysuccess.vue
View File

@ -157,7 +157,7 @@ const setBottomText =()=>{ //更改按钮的字体
switch(stateObject.value.state) { switch(stateObject.value.state) {
case '待支付': bottomBtn.value = '立即支付';break; case '待支付': bottomBtn.value = '立即支付';break;
case '待发货': bottomBtn.value = '联系客服';break; case '待发货': bottomBtn.value = '联系客服';break;
case '已发货': bottomBtn.value = '查看物流';break; case '待收货': bottomBtn.value = '查看物流';break;
case '已退款': bottomBtn.value = '删除订单';break; case '已退款': bottomBtn.value = '删除订单';break;
case '交易成功': bottomBtn.value = '删除订单';break; case '交易成功': bottomBtn.value = '删除订单';break;
default: bottomBtn.value = '删除订单' default: bottomBtn.value = '删除订单'
@ -169,7 +169,7 @@ const stateSubmit = () => { //按钮状态改变的方法
} else if(bottomBtn.value === '删除订单') { } else if(bottomBtn.value === '删除订单') {
console.log('订单被删除'); console.log('订单被删除');
} else { } else {
console.log('联系客服'); console.log('查看物流');
} }
} }
const wxPay = async( oid )=> { //传入订单id const wxPay = async( oid )=> { //传入订单id