diff --git a/src/components/WangEditor/index.vue b/src/components/WangEditor/index.vue index a3e05b99..bff95967 100644 --- a/src/components/WangEditor/index.vue +++ b/src/components/WangEditor/index.vue @@ -35,7 +35,6 @@ const state = reactive({ uploadImage: { // 自定义图片上传 async customUpload(file: any, insertFn: any) { - console.log("上传图片") uploadFile(file).then(response => { const url = response.data insertFn(url) diff --git a/src/views/lab/seata/index.vue b/src/views/lab/seata/index.vue index cb4d9e57..f2c2827d 100644 --- a/src/views/lab/seata/index.vue +++ b/src/views/lab/seata/index.vue @@ -36,12 +36,12 @@ const state = reactive({ orderSn: undefined, status: undefined }, - skuInfo: { + stockInfo: { name: undefined, picUrl: undefined, stockNum: undefined }, - memberInfo: { + accountInfo: { nickName: undefined, avatarUrl: undefined, balance: undefined @@ -64,8 +64,8 @@ const { cacheSeataData, seataData, loading, submitData } = toRefs(state) function handleOrderPay() { // 数据校验 - if (seataData.value.skuInfo.stockNum && seataData.value.skuInfo.stockNum != 999 - || (seataData.value.memberInfo.balance && seataData.value.memberInfo.balance != 1000000000) + if (seataData.value.stockInfo.stockNum && seataData.value.stockInfo.stockNum != 999 + || (seataData.value.accountInfo.balance && seataData.value.accountInfo.balance != 1000000000) || (seataData.value.orderInfo.status && seataData.value.orderInfo.status != 101) ) { ElMessageBox.confirm( @@ -88,8 +88,8 @@ function handleOrderPay() { }).finally(() => { cacheSeataData.value = { status: seataData.value.orderInfo.status, - stockNum: seataData.value.skuInfo.stockNum, - balance: seataData.value.memberInfo.balance + stockNum: seataData.value.stockInfo.stockNum, + balance: seataData.value.accountInfo.balance } loadData(); }) @@ -189,10 +189,10 @@ onMounted(() => {
- +
- {{ seataData.skuInfo.name }} + {{ seataData.stockInfo.name }}
@@ -202,14 +202,14 @@ onMounted(() => {
- {{ seataData.skuInfo.stockNum }} 部 + {{ seataData.stockInfo.stockNum }} 部
- 修改成功 - 修改失败 @@ -229,11 +229,11 @@ onMounted(() => {
-
- {{ seataData.memberInfo.nickName }} + {{ seataData.accountInfo.nickName }}
@@ -242,14 +242,14 @@ onMounted(() => {
- {{ (seataData.memberInfo.balance as any) / 100 }} 元 + {{ (seataData.accountInfo.balance as any) / 100 }} 元
- 修改成功 - 修改失败 @@ -306,7 +306,6 @@ onMounted(() => {