diff --git a/api/request.ts b/api/request.ts index 219aee6..0f71fa1 100644 --- a/api/request.ts +++ b/api/request.ts @@ -1,5 +1,6 @@ export const Url = 'http://localhost:9092/api' //后端接口文档 export const testUrl = 'http://123.249.108.160:8888/api' //自己组的服务器接口地址 export const suiUrl = 'http://154.8.193.216:9092/api' //隋宇霏的接口地址 +export const domain = 'https://www.carboner.cn/api' -export const baseUrl = testUrl \ No newline at end of file +export const baseUrl = domain \ No newline at end of file diff --git a/pages.json b/pages.json index a27d8da..38245e6 100644 --- a/pages.json +++ b/pages.json @@ -66,14 +66,6 @@ "navigationBarTitleText" : "泠泷水月阁工作室" } }, - { - "path" : "pages/Shopping-cart/Phone/Phone", - "style" : - { - "navigationBarTitleText" : "", - "navigationBarBackgroundColor": "#a0522d" - } - }, { "path" : "pages/order/product-paysuccess/product-paysuccess", "style" : @@ -212,6 +204,13 @@ { "navigationBarTitleText" : "" } + }, + { + "path" : "pages/order/singleGoodOrder/singleGoodOrder", + "style" : + { + "navigationBarTitleText" : "" + } } ], "globalStyle": { diff --git a/pages/Shopping-cart/Phone/Phone.vue b/pages/Shopping-cart/Phone/Phone.vue deleted file mode 100644 index 2ea56b4..0000000 --- a/pages/Shopping-cart/Phone/Phone.vue +++ /dev/null @@ -1,111 +0,0 @@ - - - - - \ No newline at end of file diff --git a/pages/Shopping-cart/productmain/productmain.vue b/pages/Shopping-cart/productmain/productmain.vue index ea2c979..6c8a105 100644 --- a/pages/Shopping-cart/productmain/productmain.vue +++ b/pages/Shopping-cart/productmain/productmain.vue @@ -295,6 +295,9 @@ const jump_product =(gid)=>{ const editOrSettle = async ()=>{ //去结算或者删除状态方法 // console.log('要传到订单详情页面的checked--->',checkedData.value); if(stateText.value.bottomBtn === '去结算') { + if(checkedData.value.length === 0) { //在没有勾选的时候禁止发请求 + return; + } const res = await uni.request({ url: baseUrl + '/cart/submit/error', method: 'POST', @@ -318,6 +321,7 @@ const editOrSettle = async ()=>{ //去结算或者删除状态方法 uni.navigateTo({ url: '/pages/order/product-waitpay/product-waitpay?cartInfo=' + JSON.stringify(checkedData.value) }) + checkedData.value.splice(0,checkedData.value.length) } } else { uni.showModal({ diff --git a/pages/booking/respectable/respectable.vue b/pages/booking/respectable/respectable.vue index b1f86d2..f176a01 100644 --- a/pages/booking/respectable/respectable.vue +++ b/pages/booking/respectable/respectable.vue @@ -48,12 +48,12 @@ + src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FQrbJhlbu-zhengtaoyuepai.png" /> 整套约拍 + src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FvEBBpzOI-zidaifuzhuang.png" /> 自带服装 diff --git a/pages/home/home.vue b/pages/home/home.vue index 8b43920..707c5cf 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -38,7 +38,7 @@ 伊人摸样，丹青绘画 - + { } }) } +//为了上架的提示框 +const showStop =()=>{ + uni.showModal({ + title: '提示', + content: '正在开发中!' + }) +} \ No newline at end of file diff --git a/pages/order/component/addressComponent.vue b/pages/order/component/addressComponent.vue index bdeaa26..5648707 100644 --- a/pages/order/component/addressComponent.vue +++ b/pages/order/component/addressComponent.vue @@ -47,6 +47,10 @@ const items = ref([null, null]) const addressList = ref([]) const userInfo = wx.getStorageSync('userInfo') //页面跳转回来之后，刷新一次地址列表 onShow就是在页面显示后执行 + +onMounted(() => { + getAddressList() +}) onShow(() => { getAddressList() }) @@ -57,11 +61,9 @@ const getAddressList = async () =>{ method: 'POST', header: { 'cookie': wx.getStorageSync('cookie') - }, - data: { - id : userInfo.id } }) + console.log('组件的地址信息---->',res.data); addressList.value = res.data.data } //关闭弹窗 diff --git a/pages/order/product-paysuccess/product-paysuccess.vue b/pages/order/product-paysuccess/product-paysuccess.vue index 82562e6..a07b12f 100644 --- a/pages/order/product-paysuccess/product-paysuccess.vue +++ b/pages/order/product-paysuccess/product-paysuccess.vue @@ -103,9 +103,13 @@ {{ orderObject.totalAmount }} - - {{ bottomBtn }} + + + {{ bottomBtn }} + @@ -191,8 +195,7 @@ const wxPay = async( oid )=> { //传入订单id content: '支付成功', showCancel: false }) - getOrderItem(); - setBottomText(); + buffer() }, fail(e) { uni.showModal({ @@ -209,6 +212,10 @@ const wxPay = async( oid )=> { //传入订单id }) } } +const buffer = async ()=>{ //缓冲函数 + await getOrderItem(); + await setBottomText(); +} diff --git a/pages/order/product-waitpay/product-waitpay.vue b/pages/order/product-waitpay/product-waitpay.vue index 40d3427..d8052b3 100644 --- a/pages/order/product-waitpay/product-waitpay.vue +++ b/pages/order/product-waitpay/product-waitpay.vue @@ -148,7 +148,7 @@ 微信支付 - + @@ -158,15 +158,11 @@ diff --git a/pages/store-home/ProductDetails/ProductDetails.vue b/pages/store-home/ProductDetails/ProductDetails.vue index c499ec9..5889946 100644 --- a/pages/store-home/ProductDetails/ProductDetails.vue +++ b/pages/store-home/ProductDetails/ProductDetails.vue @@ -88,7 +88,7 @@ import emitter from '../../../utils/emitter' import addProduct from '../../Shopping-cart/component/addProduct.vue'; const popup = ref(null) //弹窗对象 const goodObject = ref({}) //商品对象 -const idInfo = ref([]) //数量 + 商品id +const idInfo = ref(0) //发送到下一页的商品id const userInfo = ref({}) //用户信息 const labelList = ref([]) //标签 const imgArr = ref([]) @@ -124,10 +124,7 @@ const getProduct = async (gid) =>{ //根据商品获取商品信息 labelList.value = labelList.value.filter((s)=>{ //使用filter将最后一个空值去掉 return s }) - idInfo.value = [{ - goodId: goodObject.value.id, - quantity: 1 //暂时为1 - }] + idInfo.value = goodObject.value.id } } const loadPop =()=>{ @@ -141,7 +138,7 @@ const close =()=>{ //将商品对象发送到下一个页面 const jump_buy =()=> { uni.navigateTo({ - url: '../../../pages/order/product-waitpay/product-waitpay?cartInfo=' + JSON.stringify(idInfo.value) + url: '../../../pages/order/singleGoodOrder/singleGoodOrder?cartInfo=' + JSON.stringify(idInfo.value) }) } //获取字体 diff --git a/pages/store-home/main/main.vue b/pages/store-home/main/main.vue index 182ed0e..e65e438 100644 --- a/pages/store-home/main/main.vue +++ b/pages/store-home/main/main.vue @@ -47,7 +47,7 @@ ￥{{ item.price }} + src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FRcPadqFv-add.png" @click.stop/>