From 2d6e8703beff5a85fca0c7cff653b1ab61f416e8 Mon Sep 17 00:00:00 2001 From: yuanteng0011 <1876787513@qq.com> Date: Fri, 28 Feb 2025 11:34:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=B1=BB=E5=8D=95=E4=B8=AA?= =?UTF-8?q?=E3=80=81=E6=89=B9=E9=87=8F=E8=B4=AD=E4=B9=B0=E3=80=81=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E7=8A=B6=E6=80=81=E3=80=81=E8=81=94=E7=B3=BB=E4=BA=BA?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E3=80=81=E5=9C=B0=E5=9D=80=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E3=80=81=E6=94=AF=E4=BB=98=E9=98=B2=E6=8A=96=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/request.ts | 2 +- common/global.js | 36 + pages.json | 39 +- pages/mine/OrderDetails/OrderDetails.vue | 492 ------------- pages/mine/mineorders/mineorders.vue | 108 ++- pages/order/component/addressComponent.vue | 299 ++++---- .../product-paysuccess/product-paysuccess.vue | 63 +- .../order/product-waitpay/product-waitpay.vue | 55 +- .../service-paystatus/service-paystatus.vue | 276 +++++-- pages/order/serviceWaitPay/serviceWaitPay.vue | 18 +- .../order/singleGoodOrder/singleGoodOrder.vue | 4 +- .../singleServiceWait/singleServiceWait.vue | 687 ++++++++++++++++++ pages/workshop/component/testTimePopUp.vue | 418 ----------- pages/workshop/component/timeSelect.vue | 51 +- pages/workshop/productmain/productmain.vue | 14 +- 15 files changed, 1384 insertions(+), 1178 deletions(-) delete mode 100644 pages/mine/OrderDetails/OrderDetails.vue create mode 100644 pages/order/singleServiceWait/singleServiceWait.vue delete mode 100644 pages/workshop/component/testTimePopUp.vue diff --git a/api/request.ts b/api/request.ts index 800524d..7230ec5 100644 --- a/api/request.ts +++ b/api/request.ts @@ -4,4 +4,4 @@ export const suiUrl = 'http://154.8.193.216:9092/api' //隋宇霏的接口地 export const domain = 'https://www.carboner.cn/api' export const myIp = 'http://8.130.119.119:9092/api' -export const baseUrl = Url +export const baseUrl = testUrl diff --git a/common/global.js b/common/global.js index e525566..5f6caf2 100644 --- a/common/global.js +++ b/common/global.js @@ -47,6 +47,42 @@ export const stateMap = new Map() stateList.forEach((item)=>{ stateMap.set(item.state,item) }) +export const serviceStateList = [ + { + 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: '', + msg: '订单完成，感谢您的支持', + tips: '感谢您的支持' + }, + { + state: '交易关闭', + img: 'https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FaHDhacaI-dengdaifukuan.png', + msg: '您的订单已关闭', + tips: '下次看好了之后再买哦' + } +] +export const serviceStateMap = new Map() +serviceStateList.forEach((item)=>{ + serviceStateMap.set(item.state,item) +}) //获取选中日期是星期几方法 export const weekDay = function(time) { let datelist = ['周日','周一','周二','周三','周四','周五','周六',] diff --git a/pages.json b/pages.json index 4cf5dca..28746b6 100644 --- a/pages.json +++ b/pages.json @@ -1,5 +1,14 @@ { "pages": [ + { + "path" : "pages/home/home", + "style" : + { + "navigationBarTitleText" : "首页", + "enablePullDownRefresh":true, //开启下拉刷新 + "navigationBarBackgroundColor": "#ede8e7" + } + }, { "path" : "pages/order/service-paystatus/service-paystatus", "style" : @@ -63,15 +72,6 @@ "navigationBarTitleText" : "" } }, - { - "path" : "pages/home/home", - "style" : - { - "navigationBarTitleText" : "首页", - "enablePullDownRefresh":true, //开启下拉刷新 - "navigationBarBackgroundColor": "#ede8e7" - } - }, { "path" : "pages/store-home/main/main", "style" : @@ -198,13 +198,6 @@ "navigationBarTitleText" : "" } }, - { - "path" : "pages/mine/OrderDetails/OrderDetails", - "style" : - { - "navigationBarTitleText" : "" - } - }, { "path" : "pages/workshop/index/index", "style" : @@ -269,13 +262,6 @@ "navigationBarTitleText" : "" } }, - { - "path" : "pages/workshop/component/testTimePopUp", - "style" : - { - "navigationBarTitleText" : "" - } - }, { "path" : "pages/mine/addressList/addressList", "style" : @@ -324,6 +310,13 @@ { "navigationBarTitleText" : "" } + }, + { + "path" : "pages/order/singleServiceWait/singleServiceWait", + "style" : + { + "navigationBarTitleText" : "" + } } ], "plugins" : { diff --git a/pages/mine/OrderDetails/OrderDetails.vue b/pages/mine/OrderDetails/OrderDetails.vue deleted file mode 100644 index 085883c..0000000 --- a/pages/mine/OrderDetails/OrderDetails.vue +++ /dev/null @@ -1,492 +0,0 @@ - - - \ No newline at end of file diff --git a/pages/mine/mineorders/mineorders.vue b/pages/mine/mineorders/mineorders.vue index 1ad47f4..c71d617 100644 --- a/pages/mine/mineorders/mineorders.vue +++ b/pages/mine/mineorders/mineorders.vue @@ -91,7 +91,7 @@ 取消订单 - + 去支付 @@ -117,6 +117,8 @@ + + \ No newline at end of file diff --git a/pages/order/product-paysuccess/product-paysuccess.vue b/pages/order/product-paysuccess/product-paysuccess.vue index 5e54e6b..1f22165 100644 --- a/pages/order/product-paysuccess/product-paysuccess.vue +++ b/pages/order/product-paysuccess/product-paysuccess.vue @@ -100,7 +100,7 @@ class="shrink-0 image_8" src="https://ide.code.fun/api/image?token=6764d712797f850011f38d7b&name=549b29459342a9a09d24834be40eb53b.png" /> - {{ orderObject.totalAmount }} + ￥{{ orderObject.totalAmount }} @@ -114,6 +114,8 @@ + + diff --git a/pages/order/serviceWaitPay/serviceWaitPay.vue b/pages/order/serviceWaitPay/serviceWaitPay.vue index 3b3c69c..1496100 100644 --- a/pages/order/serviceWaitPay/serviceWaitPay.vue +++ b/pages/order/serviceWaitPay/serviceWaitPay.vue @@ -147,12 +147,13 @@ name: '请选择联系人' }) //地址页 选择地址传过来的值 进入页面首先是默认地址，若无默认地址，则为空 const productArr = ref([]) //商品对象 - const labelList = ref([]) //老套路，商品标签 const userInfo = wx.getStorageSync('userInfo') //用户信息 const orderItemList = ref({}) const totalInfo = ref([]) //购物车传过来的批量商品 const note = ref('') const postCartArr = ref([]) + const singleService = ref({}) //单个服务类商品 + const cnt = ref(1) //单个服务类商品的商品数量 onMounted(() => { getFonts() //将关闭弹窗方法传入弹窗页面，绑定弹窗按钮可关闭弹窗 @@ -165,10 +166,17 @@ }) }) onLoad((options)=>{ - totalInfo.value = JSON.parse(options.cartInfo) - console.log('options.cartInfo-->',JSON.parse(options.cartInfo)); - console.log('totalInfo.value-->',toRaw(totalInfo.value) ); - getProduct() //获取商品列表 + if(options.cartInfo === undefined) { + singleService.value = JSON.parse(options.obj) + cnt.value = JSON.parse(options.cnt) + console.log('单个服务类--->',singleService.value); + console.log('商品数量---->',cnt.value); + } else { + totalInfo.value = JSON.parse(options.cartInfo) + console.log('options.cartInfo-->',JSON.parse(options.cartInfo)); + console.log('totalInfo.value-->',toRaw(totalInfo.value) ); + getProduct() //获取商品列表 + } }) onShow(()=>{ userInfo.value = wx.getStorageSync('userInfo') //从微信缓存中获取用户信息 diff --git a/pages/order/singleGoodOrder/singleGoodOrder.vue b/pages/order/singleGoodOrder/singleGoodOrder.vue index 690ab4d..bdeb218 100644 --- a/pages/order/singleGoodOrder/singleGoodOrder.vue +++ b/pages/order/singleGoodOrder/singleGoodOrder.vue @@ -548,10 +548,10 @@ const textAssign = (e) => { //文本输入框赋值方法 } .popup-content { - height: 392px; + height: 300px; align-items: center; justify-content: center; - background-color: #fff; + // background-color: #fff; border-radius: 20rpx 20rpx 0 0; } diff --git a/pages/order/singleServiceWait/singleServiceWait.vue b/pages/order/singleServiceWait/singleServiceWait.vue new file mode 100644 index 0000000..f2dffd9 --- /dev/null +++ b/pages/order/singleServiceWait/singleServiceWait.vue @@ -0,0 +1,687 @@ + + + + + diff --git a/pages/workshop/component/testTimePopUp.vue b/pages/workshop/component/testTimePopUp.vue deleted file mode 100644 index 1471f9f..0000000 --- a/pages/workshop/component/testTimePopUp.vue +++ /dev/null @@ -1,418 +0,0 @@ - - - - - diff --git a/pages/workshop/component/timeSelect.vue b/pages/workshop/component/timeSelect.vue index 0e08bc2..d331f35 100644 --- a/pages/workshop/component/timeSelect.vue +++ b/pages/workshop/component/timeSelect.vue @@ -66,7 +66,7 @@ - 加入购物车 + {{ btnText }} @@ -77,7 +77,7 @@ -