Compare commits

...

3 Commits

Author SHA1 Message Date
air
4878c43571 【类 型】:docs
【原  因】:把订单 相关页面都放到新增的order目录
【过  程】:
【影  响】:

# 类型 包含:
# feat:新功能(feature)
# fix:修补bug
# docs:文档(documentation)
# style: 格式(不影响代码运行的变动)
# refactor:重构(即不是新增功能,也不是修改bug的代码变动)
# test:增加测试
# chore:构建过程或辅助工具的变动
2025-01-15 13:19:43 +08:00
air
f200f224fa 【类 型】:factor
【原  因】:一些按钮的样式 从私有转成公用
【过  程】:
【影  响】:

# 类型 包含:
# feat:新功能(feature)
# fix:修补bug
# docs:文档(documentation)
# style: 格式(不影响代码运行的变动)
# refactor:重构(即不是新增功能,也不是修改bug的代码变动)
# test:增加测试
# chore:构建过程或辅助工具的变动
2025-01-15 13:18:48 +08:00
air
ce18a2efdb 【类 型】:factor
【原  因】:整理order所有页面都放到这个目录
【过  程】:更改order页面的目录 配置
【影  响】:

# 类型 包含:
# feat:新功能(feature)
# fix:修补bug
# docs:文档(documentation)
# style: 格式(不影响代码运行的变动)
# refactor:重构(即不是新增功能,也不是修改bug的代码变动)
# test:增加测试
# chore:构建过程或辅助工具的变动
2025-01-15 13:18:01 +08:00
8 changed files with 93 additions and 18 deletions

10
App.vue
View File

@ -91,6 +91,16 @@
weight: 40rpx;
height: 40rpx;
}
//
.numberBut {
width: 130rpx;
height: 48rpx;
}
.nullBut {
width: 159rpx;
height: 48rpx;
}
.ls {
background-color: #007aff;

View File

@ -154,14 +154,4 @@
.priceBox {
margin-top: 85rpx;
}
.numberBut {
width: 130rpx;
height: 48rpx;
}
.nullBut {
width: 159rpx;
height: 48rpx;
}
</style>

View File

@ -58,13 +58,13 @@
}
},
{
"path" : "pages/main/order",
"path" : "pages/order/index",
"style": {
"navigationStyle": "custom"
}
},
{
"path" : "pages/shop/refund",
"path" : "pages/order/refund",
"style" :
{
"navigationStyle": "custom"

View File

@ -13,7 +13,7 @@
</navigator>
<u-icon name="arrow-right"></u-icon>
</view>
<navigator url="/pages/main/order">
<navigator url="/pages/order/index">
<view class="flex column mc mac m-r-24 w-80rpx h-80rpx">
<u-icon size="48rpx" name="order"></u-icon>
<view class="fz24">订单</view>
@ -31,7 +31,7 @@
<navigator url="/pages/shop/list">
<mainBut bg="#D43030" imgSrc="/static/icons/ordernow.svg" butBt="开始点餐" butSt="Order Now" />
</navigator>
<navigator url="/pages/main/order">
<navigator url="/pages/order/index">
<mainBut bg="#FF8D1A" imgSrc="/static/icons/buggoods.svg" butBt="购买商品" butSt="Buy Goods" />
</navigator>
<!-- <mainBut bg="#FFC300" imgSrc="/static/icons/franchise.svg" butBt="项目介绍" butSt="Introduction" /> -->

View File

@ -109,6 +109,16 @@
<view class="extra-space1"></view>
</view>
</u-popup>
<!-- 按钮 -->
<view class="m-l-24 m-r-24 m-t-24 flex mr">
<view class="nullBut border fcb rad8 fz28 flex mac mc">
联系客服
</view>
<view class="numberBut fci rad8 fz28 fb flex mac mc m-l-24" @click="handleSubmit"
:class="isPressed?'bg-g':'bg-m'">
确认
</view>
</view>
</view>
</template>
@ -130,6 +140,8 @@
currentRemark: -1, // 退
refund_remarkValue: '', // 退
txtmaxlength: 30, //退
isPressed: false, //
}
},
@ -164,6 +176,69 @@
this.requestRefund_price = Number(this.fullPrice)
}
},
//
handleSubmit() {
if (this.isPressed) { //
return
}
this.isPressed = true
//
if(!this.refund_remarkDescription){
uni.showToast({
title: '请填写退款说明',
icon: 'error'
})
this.isPressed = false
return
}
if(Number(this.requestRefund_price)===0){
uni.showToast({
title: '请填写退款额',
icon: 'error'
})
this.isPressed = false
return
}
//
uni.$u.http.post('/Api/Check/refundOrder', {
order_sn:this.order_sn, //
shop_id: this.$store.state.shop_id, //id
apply_price:Number(this.requestRefund_price), //
refund_remark:this.refund_remarkDescription //退
}, {
header: {
'Token': this.$store.state.userInfo.token,
'Content-Type': 'application/x-www-form-urlencoded'
}
}).then(res => {
//退
if (res.data.status === 1) {
// 退tab
// uni.navigateTo({
// url: `/pages/shop/pay?order_sn=${res.data.order_sn}&fullPrice=${fullPrice}`
// })
} else if (res.data.status === -1) {
uni.removeStorage({ //
key: 'userInfo',
success: (res) => {
this.$store.commit('clearUserInfo')
uni.redirectTo({
url: '/pages/index/index'
})
}
})
} else {
uni.showToast({
title: res.data.msg,
icon: 'error'
})
this.isPressed = false
}
})
}
},
filters: {
parseTime, //

View File

@ -290,7 +290,7 @@
//
if (this.$store.state.cartList.length === 0) {
uni.redirectTo({
url: '/pages/main/order'
url: '/pages/order/index'
})
}
}

View File

@ -136,7 +136,7 @@
//
setTimeout(() => {
uni.reLaunch({
url: '/pages/main/order',
url: '/pages/order/index',
})
}, 1500) // 1.5
console.error(res.data.msg)
@ -160,7 +160,7 @@
//
setTimeout(() => {
uni.reLaunch({
url: '/pages/main/order',
url: '/pages/order/index',
})
}, 1500) // 1.5
},
@ -173,7 +173,7 @@
//
setTimeout(() => {
uni.reLaunch({
url: '/pages/main/order',
url: '/pages/order/index',
})
}, 1500) // 1.5
}