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-03-23 12:16:10 +08:00
parent 8dce07b2f7
commit 4628d14aab
7 changed files with 713 additions and 615 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

54
common/global.js
View File

@ -1,4 +1,4 @@
//订单状态数组 //实体类订单状态数组
export const stateList = [ export const stateList = [
{ {
state: '待支付', state: '待支付',
@ -15,7 +15,7 @@ export const stateList = [
{ {
state: '已退款', state: '已退款',
img: 'https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FlPnvgqCp-yituikuan.png', img: 'https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FlPnvgqCp-yituikuan.png',
msg: '订单已经退款', msg: '订单已退款',
tips: '希望下次能让君满意' tips: '希望下次能让君满意'
}, },
{ {
@ -41,6 +41,8 @@ export const stateMap = new Map()
stateList.forEach((item)=>{ stateList.forEach((item)=>{
stateMap.set(item.state,item) stateMap.set(item.state,item)
}) })
//服务类订单状态
export const serviceStateList = [ export const serviceStateList = [
{ {
state: '待支付', state: '待支付',
@ -57,7 +59,7 @@ export const serviceStateList = [
{ {
state: '已退款', state: '已退款',
img: 'https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FlPnvgqCp-yituikuan.png', img: 'https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FlPnvgqCp-yituikuan.png',
msg: '订单已经退款', msg: '订单已退款',
tips: '希望下次能让君满意' tips: '希望下次能让君满意'
}, },
{ {
@ -73,6 +75,7 @@ export const serviceStateList = [
tips: '下次看好了之后再买哦' tips: '下次看好了之后再买哦'
} }
] ]
export const serviceStateMap = new Map() export const serviceStateMap = new Map()
serviceStateList.forEach((item)=>{ serviceStateList.forEach((item)=>{
serviceStateMap.set(item.state,item) serviceStateMap.set(item.state,item)
@ -82,3 +85,48 @@ export const weekDay = function(time) {
let datelist = ['周日','周一','周二','周三','周四','周五','周六',] let datelist = ['周日','周一','周二','周三','周四','周五','周六',]
return datelist[new Date(time).getDay()]; return datelist[new Date(time).getDay()];
} }
//服装租赁订单
export const clothesRentOrder = [
{
state: '待支付',
img: 'https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FFybMDtHR-dengdaifukuan.png',
msg: '等待买家付款',
tips: '请于15分钟内付款，超时订单将自动关闭'
},
{
state: '待发货',
img: 'https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FEOzVqolp-fahuo.png',
msg: '等待您来取货',
tips: '等待您的光临体验~'
},
{
state: '已退款',
img: 'https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FlPnvgqCp-yituikuan.png',
msg: '订单已退款',
tips: '希望下次能让君满意'
},
{
state: '交易完成',
img: 'https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FaHDhacaI-dengdaifukuan.png',
msg: '租赁完成，感谢您的支持',
tips: '感谢您的支持'
},
{
state: '交易关闭',
img: 'https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Fuser_avatar%2F0%2FLPwbfbRj-cancel.png',
msg: '您的订单已关闭',
tips: '下次看好了之后再买哦'
},
{
state: '待收货',
img: 'https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Fuser_avatar%2F0%2FLPwbfbRj-cancel.png',
msg: '服装已被您取走',
tips: '请好好爱护服装'
}
]
export const clothesRentOrderMap = new Map()
clothesRentOrder.forEach((item)=>{
clothesRentOrderMap.set(item.state,item)
})

501
pages.json
View File

@ -1,314 +1,272 @@
{ {
"pages": [ "pages": [
{
"path" : "pages/home/home",
"style" :
{ {
"navigationBarTitleText" : "首页", "path": "pages/clothesRent/clotherRentOrderList/clotherRentOrderList",
// "enablePullDownRefresh":true, //开启下拉刷新 "style": {
"navigationBarBackgroundColor": "#ede8e7" "navigationBarTitleText": ""
} }
}, },
{
"path" : "pages/my-order/myGeneralOrderDetail/myGeneralOrderDetail",
"style" :
{ {
"navigationBarTitleText" : "", "path": "pages/home/home",
"enablePullDownRefresh":true //开启下拉刷新 "style": {
} "navigationBarTitleText": "首页",
}, // "enablePullDownRefresh":true, //开启下拉刷新
{ "navigationBarBackgroundColor": "#ede8e7"
"path" : "pages/my-order/myServiceOrderDetail/myServiceOrderDetail", }
"style" : },
{ {
"navigationBarTitleText" : "", "path": "pages/my-order/myGeneralOrderDetail/myGeneralOrderDetail",
"enablePullDownRefresh":true //开启下拉刷新 "style": {
} "navigationBarTitleText": "",
}, "enablePullDownRefresh": true //开启下拉刷新
{ }
"path" : "pages/my-order/myOrderList/myOrderList", },
"style" :
{ {
"navigationBarTitleText" : "", "path": "pages/my-order/myServiceOrderDetail/myServiceOrderDetail",
"enablePullDownRefresh":true //开启下拉刷新 "style": {
} "navigationBarTitleText": "",
}, "enablePullDownRefresh": true //开启下拉刷新
{ }
"path" : "pages/my-order/researchOrder/researchOrder", },
"style" :
{ {
"navigationBarTitleText" : "" "path": "pages/my-order/myOrderList/myOrderList",
} "style": {
}, "navigationBarTitleText": "",
{ "enablePullDownRefresh": true //开启下拉刷新
"path" : "pages/workshop/searchResult/searchResult", }
"style" : },
{ {
"navigationBarTitleText" : "" "path": "pages/my-order/researchOrder/researchOrder",
} "style": {
}, "navigationBarTitleText": ""
}
{ },
"path" : "pages/workshop/searchGood/searchGood",
"style" :
{ {
"navigationBarTitleText" : "" "path": "pages/workshop/searchResult/searchResult",
} "style": {
}, "navigationBarTitleText": ""
{ }
"path" : "pages/book/photoProductsOrderDetail/photoProductsOrderDetail", },
"style" :
{ {
"navigationBarTitleText" : "" "path": "pages/workshop/searchGood/searchGood",
} "style": {
}, "navigationBarTitleText": ""
{ }
"path" : "pages/book/photoProductsOrder/photoProductsOrder", },
"style" :
{ {
"navigationBarTitleText" : "" "path": "pages/book/photoProductsOrderDetail/photoProductsOrderDetail",
} "style": {
}, "navigationBarTitleText": ""
{ }
"path" : "pages/book/photoProductDetail/photoProductDetail", },
"style" :
{ {
"navigationBarTitleText" : "" "path": "pages/book/photoProductsOrder/photoProductsOrder",
} "style": {
}, "navigationBarTitleText": ""
{ }
"path" : "pages/book/photoProducts/photoProducts", },
"style" :
{ {
"navigationBarTitleText" : "" "path": "pages/book/photoProductDetail/photoProductDetail",
} "style": {
}, "navigationBarTitleText": ""
{ }
"path" : "pages/order/component/contactsComponent", },
"style" :
{ {
"navigationBarTitleText" : "" "path": "pages/book/photoProducts/photoProducts",
} "style": {
}, "navigationBarTitleText": ""
{ }
"path" : "pages/coupon/CouponMall/CouponMall", },
"style" :
{ {
"navigationBarTitleText" : "" "path": "pages/order/component/contactsComponent",
} "style": {
}, "navigationBarTitleText": ""
{ }
"path" : "pages/testPage/testPage", },
"style" :
{ {
"navigationBarTitleText" : "" "path": "pages/coupon/CouponMall/CouponMall",
} "style": {
}, "navigationBarTitleText": ""
{ }
"path" : "pages/test/test", },
"style" :
{ {
"navigationBarTitleText" : "" "path": "pages/testPage/testPage",
} "style": {
}, "navigationBarTitleText": ""
}
{ },
"path" : "pages/mine/main/main",
"style" :
{ {
"navigationBarTitleText" : "", "path": "pages/test/test",
"enablePullDownRefresh":true //开启下拉刷新 "style": {
} "navigationBarTitleText": ""
}, }
{ },
"path" : "pages/store-home/ProductDetails/ProductDetails",
"style" :
{ {
"navigationBarTitleText" : "泠珑水月阁工作室" "path": "pages/mine/main/main",
} "style": {
}, "navigationBarTitleText": "",
{ "enablePullDownRefresh": true //开启下拉刷新
"path" : "pages/Shopping-cart/newaddress_Info/newaddress_Info", }
"style" : },
{ {
"navigationBarTitleText" : "" "path": "pages/store-home/ProductDetails/ProductDetails",
} "style": {
}, "navigationBarTitleText": "泠珑水月阁工作室"
{ }
"path" : "pages/order/product-waitpay/product-waitpay", },
"style" :
{ {
"navigationBarTitleText" : "" "path": "pages/Shopping-cart/newaddress_Info/newaddress_Info",
} "style": {
}, "navigationBarTitleText": ""
{ }
"path" : "pages/login/login", },
"style" :
{ {
"navigationBarTitleText" : "" "path": "pages/order/product-waitpay/product-waitpay",
} "style": {
}, "navigationBarTitleText": ""
{ }
"path" : "pages/Shopping-cart/component/addProduct", },
"style" :
{ {
"navigationBarTitleText" : "" "path": "pages/login/login",
} "style": {
}, "navigationBarTitleText": ""
{ }
"path" : "pages/workshop/index/index", },
"style" :
{ {
"navigationBarTitleText" : "", "path": "pages/Shopping-cart/component/addProduct",
"enablePullDownRefresh":true //开启下拉刷新 "style": {
} "navigationBarTitleText": ""
}, }
{ },
"path" : "pages/workshop/productmain/productmain",
"style" :
{ {
"navigationBarTitleText" : "" "path": "pages/workshop/index/index",
} "style": {
}, "navigationBarTitleText": "",
{ "enablePullDownRefresh": true //开启下拉刷新
"path" : "pages/store-home/main/testMain", }
"style" : },
{ {
"navigationBarTitleText" : "", "path": "pages/workshop/productmain/productmain",
"enablePullDownRefresh":true //开启下拉刷新 "style": {
} "navigationBarTitleText": ""
}, }
{ },
"path" : "pages/order/singleGoodOrder/singleGoodOrder",
"style" :
{ {
"navigationBarTitleText" : "" "path": "pages/store-home/main/testMain",
} "style": {
}, "navigationBarTitleText": "",
{ "enablePullDownRefresh": true //开启下拉刷新
"path" : "pages/Shopping-cart/productmain/testproductmain", }
"style" : },
{ {
"navigationBarTitleText" : "", "path": "pages/order/singleGoodOrder/singleGoodOrder",
"enablePullDownRefresh":true //开启下拉刷新 "style": {
} "navigationBarTitleText": ""
}, }
{ },
"path" : "pages/mine/addressList/addressList",
"style" :
{ {
"navigationBarTitleText" : "" "path": "pages/Shopping-cart/productmain/testproductmain",
} "style": {
}, "navigationBarTitleText": "",
{ "enablePullDownRefresh": true //开启下拉刷新
"path" : "pages/coupon/CouponTips/CouponTips", }
"style" : },
{ {
"navigationBarTitleText" : "" "path": "pages/mine/addressList/addressList",
} "style": {
}, "navigationBarTitleText": ""
{ }
"path" : "pages/coupon/MyCoupon/MyCoupon", },
"style" :
{ {
"navigationBarTitleText" : "" "path": "pages/coupon/CouponTips/CouponTips",
} "style": {
}, "navigationBarTitleText": ""
{ }
"path" : "pages/order/serviceWaitPay/serviceWaitPay", },
"style" :
{ {
"navigationBarTitleText" : "" "path": "pages/coupon/MyCoupon/MyCoupon",
} "style": {
}, "navigationBarTitleText": ""
{ }
"path" : "pages/mine/Contact/testContact", },
"style" :
{ {
"navigationBarTitleText" : "" "path": "pages/order/serviceWaitPay/serviceWaitPay",
} "style": {
}, "navigationBarTitleText": ""
{ }
"path" : "pages/mine/component/contactPop", },
"style" :
{ {
"navigationBarTitleText" : "" "path": "pages/mine/Contact/testContact",
} "style": {
}, "navigationBarTitleText": ""
{ }
"path" : "pages/coupon/OverDueCoupon/OverDueCoupon", },
"style" :
{ {
"navigationBarTitleText" : "" "path": "pages/mine/component/contactPop",
} "style": {
}, "navigationBarTitleText": ""
{ }
"path" : "pages/order/singleServiceWait/singleServiceWait", },
"style" :
{ {
"navigationBarTitleText" : "" "path": "pages/coupon/OverDueCoupon/OverDueCoupon",
} "style": {
}, "navigationBarTitleText": ""
{ }
"path" : "pages/activity/activityHome/activityHome", },
"style" :
{ {
"navigationBarTitleText" : "" "path": "pages/order/singleServiceWait/singleServiceWait",
} "style": {
}, "navigationBarTitleText": ""
{ }
"path" : "pages/activity/activityMain/activityMain", },
"style" :
{ {
"navigationBarTitleText" : "" "path": "pages/activity/activityHome/activityHome",
} "style": {
}, "navigationBarTitleText": ""
{ }
"path" : "pages/clothesRent/clotherRentOrderList/clotherRentOrderList", },
"style" :
{ {
"navigationBarTitleText" : "" "path": "pages/activity/activityMain/activityMain",
} "style": {
}, "navigationBarTitleText": ""
{ }
"path" : "pages/clothesRent/clothesRentSubmitOrder/clothesRentSubmitOrder", },
"style" :
{ {
"navigationBarTitleText" : "" "path": "pages/clothesRent/clothesRentSubmitOrder/clothesRentSubmitOrder",
} "style": {
}, "navigationBarTitleText": ""
{ }
"path" : "pages/book/myPhotoProductsOrderDetail/myPhotoProductsOrderDetail", },
"style" :
{ {
"navigationBarTitleText" : "", "path": "pages/book/myPhotoProductsOrderDetail/myPhotoProductsOrderDetail",
"enablePullDownRefresh":true //开启下拉刷新 "style": {
} "navigationBarTitleText": "",
}, "enablePullDownRefresh": true //开启下拉刷新
{ }
"path" : "pages/book/myPhotoProductDetail/myPhotoProductDetail", },
"style" :
{ {
"navigationBarTitleText" : "" "path": "pages/book/myPhotoProductDetail/myPhotoProductDetail",
} "style": {
}, "navigationBarTitleText": ""
{ }
"path" : "pages/book/myPhotoProducts/myPhotoProducts", },
"style" :
{ {
"navigationBarTitleText" : "" "path": "pages/book/myPhotoProducts/myPhotoProducts",
} "style": {
}, "navigationBarTitleText": ""
{ }
"path" : "pages/clothesRent/clothesRentOrderDetail/clothesRentOrderDetail", },
"style" :
{ {
"navigationBarTitleText" : "" "path": "pages/clothesRent/clothesRentOrderDetail/clothesRentOrderDetail",
"style": {
"navigationBarTitleText": ""
}
} }
}
], ],
"plugins" : { "plugins": {
"logisticsPlugin" : { "logisticsPlugin": {
"version": "2.3.0", "version": "2.3.0",
"provider": "wx9ad912bf20548d92" "provider": "wx9ad912bf20548d92"
} }
@ -328,27 +286,26 @@
}, },
"tabBar": { "tabBar": {
"backgroundColor": "#FFFFFF", "backgroundColor": "#FFFFFF",
"list": [ "list": [{
{
"pagePath": "pages/home/home", "pagePath": "pages/home/home",
"iconPath": "./static/home.png", "iconPath": "./static/home.png",
"text":"首页" "text": "首页"
}, },
{ {
"pagePath": "pages/store-home/main/testMain", "pagePath": "pages/store-home/main/testMain",
"iconPath": "./static/store.png", "iconPath": "./static/store.png",
"text":"商城" "text": "商城"
}, },
{ {
"pagePath": "pages/Shopping-cart/productmain/testproductmain", "pagePath": "pages/Shopping-cart/productmain/testproductmain",
"iconPath": "./static/shopcar.png", "iconPath": "./static/shopcar.png",
"text":"购物车" "text": "购物车"
}, },
{ {
"pagePath": "pages/mine/main/main", "pagePath": "pages/mine/main/main",
"iconPath": "./static/mine.png", "iconPath": "./static/mine.png",
"text":"我的" "text": "我的"
} }
] ]
} }
} }

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

@ -1,105 +1,123 @@
<template> <template>
<view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgUrl + ')'}"> <view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgUrl + ')'}">
<view class="flex-row justify-between section_2 pos"> <view class="flex-row justify-between section_2 pos">
<view @click="isSelectedState(0)"> <view @click="isSelectedState(0)">
<text class="font" :style="{ color: color[0] }">&ensp;全部&ensp;</text> <text class="font" :style="{ color: color[0] }">&ensp;全部&ensp;</text>
<view class="flex-col justify-start items-center" v-if="isShowUnderLine[0]" style="border: 1.88rpx solid #e79ea1; width: 90rpx; margin-top: 10rpx;"></view> <view class="flex-col justify-start items-center" v-if="isShowUnderLine[0]"
</view> style="border: 1.88rpx solid #e79ea1; width: 90rpx; margin-top: 10rpx;"></view>
</view>
<view @click="isSelectedState(1)">
<text class="font" :style="{ color: color[1] }">待支付</text> <view @click="isSelectedState(1)">
<view class="flex-col justify-start items-center" v-if="isShowUnderLine[1]" style="border: 1.88rpx solid #e79ea1; width: 90rpx; margin-top: 10rpx;"></view> <text class="font" :style="{ color: color[1] }">待支付</text>
</view> <view class="flex-col justify-start items-center" v-if="isShowUnderLine[1]"
style="border: 1.88rpx solid #e79ea1; width: 90rpx; margin-top: 10rpx;"></view>
<view @click="isSelectedState(2)"> </view>
<text class="font" :style="{ color: color[2] }">待提货</text>
<view class="flex-col justify-start items-center" v-if="isShowUnderLine[2]" style="border: 1.88rpx solid #e79ea1; width: 90rpx; margin-top: 10rpx;"></view> <view @click="isSelectedState(2)">
<text class="font" :style="{ color: color[2] }">待提货</text>
<view class="flex-col justify-start items-center" v-if="isShowUnderLine[2]"
style="border: 1.88rpx solid #e79ea1; width: 90rpx; margin-top: 10rpx;"></view>
</view>
<view @click="isSelectedState(3)">
<text class="font" :style="{ color: color[3] }">租赁中</text>
<view class="flex-col justify-start items-center" v-if="isShowUnderLine[3]"
style="border: 1.88rpx solid #e79ea1; width: 90rpx; margin-top: 10rpx;"></view>
</view>
<view @click="isSelectedState(4)">
<text class="font" :style="{ color: color[4] }">已完成</text>
<view class="flex-col justify-start items-center" v-if="isShowUnderLine[4]"
style="border: 1.88rpx solid #e79ea1; width: 90rpx; margin-top: 10rpx;"></view>
</view>
</view> </view>
<view @click="isSelectedState(3)">
<text class="font" :style="{ color: color[3] }">租赁中</text> <view class="flex-col pos_2">
<view class="flex-col justify-start items-center" v-if="isShowUnderLine[3]" style="border: 1.88rpx solid #e79ea1; width: 90rpx; margin-top: 10rpx;"></view> <view class="flex-col list-item mt-15" v-for="(item, index) in items" :key="index">
<view class="flex-row justify-between group">
<text class="font_3">泠珑水月阁</text>
<view class="flex-row items-center">
<text class="font_4 text_2">00:45</text>
<text class="ml-4 font_5 text_3">等待买家付款</text>
</view>
</view>
<view class="flex-row items-center group view">
<text class="font_6">订单编号：</text>
<text class="font_7 text_4">E20241005095840091406189</text>
</view>
<view class="divider"></view>
<view class="flex-row justify-between items-end group_2">
<view class="flex-row">
<image class="image"
src="https://ide.code.fun/api/image?token=67dd57af4ae84d00122a84d1&name=4e1283e4d0bf9a8e9fe23602be4fa0f7.png" />
<view class="flex-col items-start group_3 ml-13">
<text class="font_8">汉服—曲裾系列</text>
<text class="font_10 text_6 mt-59">￥138.00</text>
</view>
</view>
<view class="flex-col items-center group_4">
<image class="image_2" :src="clothesRentUrl + '/clothesRentOrderList/bkg.png'" />
<text class="font_9 text_5 mt-11">提货地址</text>
</view>
</view>
<view class="flex-row justify-between items-baseline group view_2">
<text class="font_6 text_7">租赁天数</text>
<text class="font_11 text_8">X3</text>
</view>
<view class="flex-row justify-end items-baseline group_5">
<text class="font_9 text_9">实付款：</text>
<text class="font_12">￥138.00</text>
</view>
<view class="flex-row justify-center group_6">
<view class="flex-col justify-start items-center text-wrapper">
<text class="font_13 text_10">联系客服</text>
</view>
<view class="ml-10 flex-col justify-start items-center text-wrapper">
<text class="font_13">取消订单</text>
</view>
<view class="ml-10 flex-col justify-start items-center text-wrapper_2">
<text class="font_14 text_11">去付款</text>
</view>
</view>
</view>
</view> </view>
<view @click="isSelectedState(4)">
<text class="font" :style="{ color: color[4] }">已完成</text>
<view class="flex-col justify-start items-center" v-if="isShowUnderLine[4]" style="border: 1.88rpx solid #e79ea1; width: 90rpx; margin-top: 10rpx;"></view>
</view>
</view>
<view class="flex-col pos_2">
<view class="flex-col list-item mt-15" v-for="(item, index) in items" :key="index">
<view class="flex-row justify-between group">
<text class="font_3">泠珑水月阁</text>
<view class="flex-row items-center">
<text class="font_4 text_2">00:45</text>
<text class="ml-4 font_5 text_3">等待买家付款</text>
</view>
</view>
<view class="flex-row items-center group view">
<text class="font_6">订单编号：</text>
<text class="font_7 text_4">E20241005095840091406189</text>
</view>
<view class="divider"></view>
<view class="flex-row justify-between items-end group_2">
<view class="flex-row">
<image
class="image"
src="https://ide.code.fun/api/image?token=67dd57af4ae84d00122a84d1&name=4e1283e4d0bf9a8e9fe23602be4fa0f7.png"
/>
<view class="flex-col items-start group_3 ml-13">
<text class="font_8">汉服—曲裾系列</text>
<text class="font_10 text_6 mt-59">￥138.00</text>
</view>
</view>
<view class="flex-col items-center group_4">
<image
class="image_2"
:src="clothesRentUrl + '/clothesRentOrderList/bkg.png'"
/>
<text class="font_9 text_5 mt-11">提货地址</text>
</view>
</view>
<view class="flex-row justify-between items-baseline group view_2">
<text class="font_6 text_7">租赁天数</text>
<text class="font_11 text_8">X3</text>
</view>
<view class="flex-row justify-end items-baseline group_5">
<text class="font_9 text_9">实付款：</text>
<text class="font_12">￥138.00</text>
</view>
<view class="flex-row justify-center group_6">
<view class="flex-col justify-start items-center text-wrapper">
<text class="font_13 text_10">联系客服</text>
</view>
<view class="ml-10 flex-col justify-start items-center text-wrapper">
<text class="font_13">取消订单</text>
</view>
<view class="ml-10 flex-col justify-start items-center text-wrapper_2">
<text class="font_14 text_11">去付款</text>
</view>
</view>
</view>
</view>
</view> </view>
</template> </template>
<script setup> <script setup>
import {ref} from 'vue' import { onMounted, ref } from 'vue'
import { clothesRentUrl } from '../../../common/globalImagesUrl'; import { clothesRentUrl } from '../../../common/globalImagesUrl';
import { baseUrl } from '../../../api/request';
const items = ref([null, null, null, null]) const items = ref([null, null, null, null])
const isShowUnderLine = ref([true, false, false, false, false]) const isShowUnderLine = ref([true, false, false, false, false])
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 cookie = wx.getStorageSync("cookie") //请求头
const bkgUrl = ref(clothesRentUrl + '/clothesRentOrderList/bkg.png') const bkgUrl = ref(clothesRentUrl + '/clothesRentOrderList/bkg.png')
onMounted(() => {
getRentOrderList()
})
const getRentOrderList = async () => {
const res = await uni.request({
url: baseUrl + '/clothesRent/list/my',
method: 'POST',
header: {
'cookie': cookie
}
})
console.log('订单列表--->', res.data);
}
const isSelectedState = async (val) => { const isSelectedState = async (val) => {
if (point.value === val) return console.log('val--->',val);
if (point.value === val) return
point.value = val point.value = val
for (var i = 0; i < 5; i ++ ) { for (var i = 0; i < 5; i++) {
if (i === val) { if (i === val) {
isShowUnderLine.value[i] = true isShowUnderLine.value[i] = true
color.value[i] = '#e79ea1' color.value[i] = '#e79ea1'
@ -108,247 +126,308 @@
color.value[i] = '#323232' color.value[i] = '#323232'
} }
} }
// if()
// await getMyOrder() // await getMyOrder()
// if (point.value !== 0) { // if (point.value !== 0) {
// orderList.value = orderList.value.filter(item => item.orderStatus === orderStatusList[point.value]) // orderList.value = orderList.value.filter(item => item.orderStatus === orderStatusList[point.value])
// } // }
} }
const nav = () => { //导航
wx.openLocation({
latitude: 45.867741,
longitude: 126.560037,
name: '哈尔滨师范大学(松北校区)',
address: '黑龙江省哈尔滨市呼兰区利民经济开发区师大路1号',
success: (res) => {
console.log(res)
}
})
}
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
.mt-15 { .mt-15 {
margin-top: 28.13rpx; margin-top: 28.13rpx;
} }
.ml-13 {
margin-left: 24.38rpx; .ml-13 {
} margin-left: 24.38rpx;
.mt-59 { }
margin-top: 110.63rpx;
} .mt-59 {
.mt-11 { margin-top: 110.63rpx;
margin-top: 20.63rpx; }
}
.page { .mt-11 {
background-color: #ffffff; margin-top: 20.63rpx;
overflow: hidden; }
background-size: 100% 100%;
background-repeat: no-repeat; .page {
width: 100%; background-color: #ffffff;
overflow-y: auto; overflow: hidden;
overflow-x: hidden; background-size: 100% 100%;
height: 100vh; background-repeat: no-repeat;
} width: 100%;
.section_2 { overflow-y: auto;
display: flex; overflow-x: hidden;
justify-content: space-between; height: 100vh;
align-items: center; }
padding: 20rpx 41.25rpx 0;
background-color: #ebe7e4; .section_2 {
} display: flex;
.pos { justify-content: space-between;
position: fixed; align-items: center;
top: 0; padding: 20rpx 41.25rpx 0;
left: 0; background-color: #ebe7e4;
right: 0; }
z-index: 9;
} .pos {
.font { position: fixed;
font-size: 30rpx; top: 0;
font-family: FZSongKeBenXiuKaiS-R-GB; left: 0;
line-height: 28.24rpx; right: 0;
color: #323232; z-index: 9;
} }
.font_2 {
font-size: 30rpx; .font {
font-family: FZSongKeBenXiuKaiS-R-GB; font-size: 30rpx;
line-height: 28.84rpx; font-family: FZSongKeBenXiuKaiS-R-GB;
color: #323232; line-height: 28.24rpx;
} color: #323232;
.text { }
line-height: 27.43rpx;
} .font_2 {
.pos_2 { font-size: 30rpx;
position: absolute; font-family: FZSongKeBenXiuKaiS-R-GB;
left: 22.5rpx; line-height: 28.84rpx;
right: 24.38rpx; color: #323232;
top: 108.75rpx; }
padding-bottom: 40rpx;
} .text {
.list-item { line-height: 27.43rpx;
padding: 18.75rpx 15rpx 0; }
background-color: #ffffff;
border-radius: 18.75rpx; .pos_2 {
} position: absolute;
.list-item:first-child { left: 22.5rpx;
margin-top: 0; right: 24.38rpx;
} top: 108.75rpx;
.group { padding-bottom: 40rpx;
padding: 0 11.25rpx; }
}
.font_3 { .list-item {
font-size: 30rpx; padding: 18.75rpx 15rpx 0;
font-family: FZSongKeBenXiuKaiS-R-GB; background-color: #ffffff;
line-height: 28.01rpx; border-radius: 18.75rpx;
color: #323232; }
}
.font_4 { .list-item:first-child {
font-size: 26.25rpx; margin-top: 0;
font-family: FZSongKeBenXiuKaiS-R-GB; }
line-height: 18.79rpx;
color: #ffaaa5; .group {
} padding: 0 11.25rpx;
.text_2 { }
font-size: 28.13rpx;
} .font_3 {
.font_5 { font-size: 30rpx;
font-size: 26.25rpx; font-family: FZSongKeBenXiuKaiS-R-GB;
font-family: FZSongKeBenXiuKaiS-R-GB; line-height: 28.01rpx;
line-height: 25.84rpx; color: #323232;
color: #ffaaa5; }
}
.text_3 { .font_4 {
line-height: 25.74rpx; font-size: 26.25rpx;
} font-family: FZSongKeBenXiuKaiS-R-GB;
.view { line-height: 18.79rpx;
margin-top: 18.75rpx; color: #ffaaa5;
} }
.font_6 {
font-size: 26.25rpx; .text_2 {
font-family: FZSongKeBenXiuKaiS-R-GB; font-size: 28.13rpx;
line-height: 25.84rpx; }
color: #818181;
} .font_5 {
.font_7 { font-size: 26.25rpx;
font-size: 26.25rpx; font-family: FZSongKeBenXiuKaiS-R-GB;
font-family: FZSongKeBenXiuKaiS-R-GB; line-height: 25.84rpx;
line-height: 18.79rpx; color: #ffaaa5;
color: #818181; }
}
.text_4 { .text_3 {
line-height: 17.53rpx; line-height: 25.74rpx;
} }
.divider {
margin-top: 18.75rpx; .view {
background-color: #dbdbdb; margin-top: 18.75rpx;
height: 1.88rpx; }
}
.group_2 { .font_6 {
margin-top: 26.25rpx; font-size: 26.25rpx;
padding: 0 9.38rpx; font-family: FZSongKeBenXiuKaiS-R-GB;
position: relative; line-height: 25.84rpx;
} color: #818181;
.image { }
border-radius: 9.38rpx;
width: 148.13rpx; .font_7 {
height: 165rpx; font-size: 26.25rpx;
} font-family: FZSongKeBenXiuKaiS-R-GB;
.group_3 { line-height: 18.79rpx;
margin-bottom: 3.75rpx; color: #818181;
} }
.font_8 {
font-size: 30rpx; .text_4 {
font-family: FZSongKeBenXiuKaiS-R-GB; line-height: 17.53rpx;
line-height: 29.18rpx; }
color: #323232;
} .divider {
.font_10 { margin-top: 18.75rpx;
font-size: 30rpx; background-color: #dbdbdb;
font-family: FZSongKeBenXiuKaiS-R-GB; height: 1.88rpx;
line-height: 18.79rpx; }
color: #323232;
} .group_2 {
.text_6 { margin-top: 26.25rpx;
margin-left: 7.5rpx; padding: 0 9.38rpx;
line-height: 20.04rpx; position: relative;
} }
.group_4 {
position: absolute; .image {
top: 0; border-radius: 9.38rpx;
right: 0rpx; width: 148.13rpx;
} height: 165rpx;
.image_2 { }
width: 46.88rpx;
height: 46.88rpx; .group_3 {
} margin-bottom: 3.75rpx;
.font_9 { }
font-size: 26.25rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; .font_8 {
line-height: 25.84rpx; font-size: 30rpx;
color: #323232; font-family: FZSongKeBenXiuKaiS-R-GB;
} line-height: 29.18rpx;
.text_5 { color: #323232;
line-height: 25.22rpx; }
}
.view_2 { .font_10 {
margin-top: 22.5rpx; font-size: 30rpx;
} font-family: FZSongKeBenXiuKaiS-R-GB;
.text_7 { line-height: 18.79rpx;
font-size: 28.13rpx; color: #323232;
line-height: 27.02rpx; }
}
.font_11 { .text_6 {
font-size: 26.25rpx; margin-left: 7.5rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; line-height: 20.04rpx;
line-height: 18.79rpx; }
color: #323232;
} .group_4 {
.text_8 { position: absolute;
font-size: 28.13rpx; top: 0;
} right: 0rpx;
.group_5 { }
margin-top: 30rpx;
} .image_2 {
.text_9 { width: 46.88rpx;
font-size: 28.13rpx; height: 46.88rpx;
line-height: 26.7rpx; }
}
.font_12 { .font_9 {
font-size: 33.75rpx; font-size: 26.25rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 22.54rpx; line-height: 25.84rpx;
color: #c35c5d; color: #323232;
} }
.group_6 {
margin-top: 30rpx; .text_5 {
padding: 26.25rpx 0rpx 26.25rpx 180rpx; line-height: 25.22rpx;
border-top: solid 1.88rpx #dbdbdb; }
}
.font_13 { .view_2 {
font-size: 26.25rpx; margin-top: 22.5rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; }
line-height: 25.84rpx;
color: #e79ea1; .text_7 {
} font-size: 28.13rpx;
.text_10 { line-height: 27.02rpx;
line-height: 25.54rpx; }
}
.text-wrapper { .font_11 {
padding: 15rpx 0; font-size: 26.25rpx;
background-color: #ffffff; font-family: FZSongKeBenXiuKaiS-R-GB;
border-radius: 75rpx; line-height: 18.79rpx;
width: 153.75rpx; color: #323232;
height: 56.25rpx; }
border-left: solid 1.88rpx #e79ea1;
border-right: solid 1.88rpx #e79ea1; .text_8 {
border-top: solid 1.88rpx #e79ea1; font-size: 28.13rpx;
border-bottom: solid 1.88rpx #e79ea1; }
}
.text-wrapper_2 { .group_5 {
padding: 15rpx 0; margin-top: 30rpx;
background-color: #e79ea1; }
border-radius: 75rpx;
width: 153.75rpx; .text_9 {
height: 56.25rpx; font-size: 28.13rpx;
} line-height: 26.7rpx;
.font_14 { }
font-size: 26.25rpx;
font-family: FZSongKeBenXiuKaiS-R-GB; .font_12 {
line-height: 25.84rpx; font-size: 33.75rpx;
color: #ffffff; font-family: FZSongKeBenXiuKaiS-R-GB;
} line-height: 22.54rpx;
.text_11 { color: #c35c5d;
line-height: 24rpx; }
}
@import url(../../../common/css/global.css); .group_6 {
</style> margin-top: 30rpx;
padding: 26.25rpx 0rpx 26.25rpx 180rpx;
border-top: solid 1.88rpx #dbdbdb;
}
.font_13 {
font-size: 26.25rpx;
font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 25.84rpx;
color: #e79ea1;
}
.text_10 {
line-height: 25.54rpx;
}
.text-wrapper {
padding: 15rpx 0;
background-color: #ffffff;
border-radius: 75rpx;
width: 153.75rpx;
height: 56.25rpx;
border-left: solid 1.88rpx #e79ea1;
border-right: solid 1.88rpx #e79ea1;
border-top: solid 1.88rpx #e79ea1;
border-bottom: solid 1.88rpx #e79ea1;
}
.text-wrapper_2 {
padding: 15rpx 0;
background-color: #e79ea1;
border-radius: 75rpx;
width: 153.75rpx;
height: 56.25rpx;
}
.font_14 {
font-size: 26.25rpx;
font-family: FZSongKeBenXiuKaiS-R-GB;
line-height: 25.84rpx;
color: #ffffff;
}
.text_11 {
line-height: 24rpx;
}
@import url(../../../common/css/global.css);
</style>

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

@ -88,6 +88,8 @@
import {ref} from 'vue' import {ref} from 'vue'
import { clothesRentUrl } from '../../../common/globalImagesUrl'; import { clothesRentUrl } from '../../../common/globalImagesUrl';
const bkgUrl = ref(clothesRentUrl + '/clothesRentOrderDetail/bkg.png') const bkgUrl = ref(clothesRentUrl + '/clothesRentOrderDetail/bkg.png')
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">

2
pages/login/login.vue
View File

@ -11,7 +11,7 @@
<view class="section_3 pos_5"></view> <view class="section_3 pos_5"></view>
<view class="flex-col justify-start items-center text-wrapper pos_6" @click="login"> <view class="flex-col justify-start items-center text-wrapper pos_6" @click="login">
<text class="text">微信登陆</text> <text class="text">微信登录</text>
</view> </view>
</view> </view>
<!-- </view> --> <!-- </view> -->

46
pages/workshop/index/index.vue
View File

@ -54,21 +54,50 @@ import carousel from '@/components/vear-carousel/vear-carousel'
const products = ref() const products = ref()
const cookie = wx.getStorageSync("cookie") const cookie = wx.getStorageSync("cookie")
const bkgUrl = ref(workshopUrl + '/index/bkg.png') const bkgUrl = ref(workshopUrl + '/index/bkg.png')
const carouseList = ref([]) //轮播图
const imgList = ref([]) //轮播图展示图
onLoad(() => { onLoad(() => {
getFonts() getFonts()
}) })
onMounted(()=>{ onMounted(()=>{
getProducts() getProducts()
getCarouseList()
}) })
onPullDownRefresh( async ()=>{ //下拉刷新 onPullDownRefresh( async ()=>{ //下拉刷新
await getProducts() await getProducts()
await getCarouseList()
setTimeout(()=>{ setTimeout(()=>{
uni.stopPullDownRefresh() //停止下拉刷新 uni.stopPullDownRefresh() //停止下拉刷新
}, 1000) }, 1000)
}) })
const getCarouseList = async () => {
const res = await uni.request({
url: baseUrl + '/banner/query',
method: 'POST',
header: {
cookie
},
data: {
type: '服务类'
}
})
console.log('轮播图---->',res.data);
if(res.data.code === 1) {
carouseList.value = res.data.data
carouseList.value.forEach((item)=>{
imgList.value.push({
url: publicPath + item.url
})
})
}
}
const getProducts = async ()=> { const getProducts = async ()=> {
const res = await uni.request({ const res = await uni.request({
url: baseUrl + '/goods/service/list/card', url: baseUrl + '/goods/service/list/card',
@ -86,23 +115,6 @@ const jump_detail =(item,index)=>{
}) })
} }
const imgList = ref([{
url: workshopUrl + '/index/banner1.png',
id: 1
},{
url: workshopUrl + '/index/banner2.png',
id: 2
},{
url: workshopUrl + '/index/banner3.png',
id: 3
},{
url: workshopUrl + '/index/banner4.png',
id: 4
},])
const goToSearch = () => { const goToSearch = () => {
uni.navigateTo({ uni.navigateTo({