zianxin/pj_h5_cloud
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

11

Browse Source
This commit is contained in:
dzc committed 2025-01-09 18:08:33 +08:00
1 parent 928652218f
commit 67f5ca1ef8
4 files changed
+11 -11
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.env
+2 -2
View File
@@ -24,8 +24,8 @@ VITE_IMAGE_BASE_PATH = http://localhost:9999
# VITE_APP_DEV_SERVICE = https://stgl.pj.gov.cn/app-api
#VITE_APP_DEV_SERVICE = http://192.168.101.29:9999 # 邓-本地
#VITE_APP_DEV_SERVICE = http://127.0.0.1:9999
VITE_APP_DEV_SERVICE = http://123.156.230.15:8089/api
# VITE_APP_DEV_SERVICE = http://localhost:9999
# VITE_APP_DEV_SERVICE = http://123.156.230.15:8089/api
VITE_APP_DEV_SERVICE = http://localhost:9999
# ******************** end 开发环境 end ********************
# ******************** start 生产环境 start ********************
src/pages/merchant/detail.vue
+2 -2
View File
@@ -47,7 +47,7 @@ const getDetail = async () => {
};
const getShopCar = async () => {
const _pa = { merchantId: state.detailId };
const _pa = { merchantId: state.detailId, hardType: "CANTEEN" };
const { data } = await foodApi.getShopCar(_pa);
state.carList = data ?? [];
asyncCarCount(state.shopList)
@@ -80,7 +80,7 @@ const updateShopCar = async () => {
};
});
if (isEmpty(list)) return;
const _pa = { merchantId: state.detailId, list: list };
const _pa = { merchantId: state.detailId, list: list, hardType:"CANTEEN" };
const { data, code }: any = await foodApi.updateShopCar(_pa);
if (code == 0) await getShopCar();
};
src/pages/order/detail.vue
+6 -6
View File
@@ -118,20 +118,20 @@ const doCancelRefund = async () => {
<image class="w-160rpx h-160rpx rounded-8rpx" :src="filePath(v.productPic)" mode="aspectFill" />
<view class="flex-col m-l-15rpx second-text-26">
<view class="sub-text-28">{{ v.productName }}</view>
<view class="m-t-5rpx">¥ {{ hooks.useMoney(v.productPrice) }}</view>
<view class="m-t-5rpx color-red">¥ {{ hooks.useMoney(v.productPrice) }}</view>
<view class="m-t-5rpx">x {{ v.productCount }}</view>
</view>
</view>
<view class="flex-row-center">
<view class="sub-text-32">¥ {{ hooks.useMoney(v.totalPrice) }}</view>
<view class="sub-text-32 color-red!">¥ {{ hooks.useMoney(v.totalPrice) }}</view>
</view>
</view>
<view class="m-y-15rpx h-1px bg-#999 bg-opacity-5" />
<view class="flex-row items-center justify-between">
<view class="sub-text-32">实付款</view>
<view class="flex-row items-end">
<view class="sub-text-28">¥</view>
<view class="m-l-5rpx sub-text-32">{{ hooks.useMoney(state.detail.practicalTotalPrice) }}</view>
<view class="sub-text-28 color-red!">¥</view>
<view class="m-l-5rpx sub-text-32 color-red!">{{ hooks.useMoney(state.detail.payPrice) }}</view>
</view>
</view>
</view>
@@ -193,14 +193,14 @@ const doCancelRefund = async () => {
<!-- end 退款相关 end -->
<view class="h-30rpx" />
<template #main-bottom>
<view v-if="state.detail.orderStatus == 10 && state.refundDetail.status != 62"
<view v-if="state.detail.orderStatus == 10 && state.refundDetail.status == 62"
class="bg-#999 p-y-20rpx text-center rounded-40rpx m-x-30rpx m-y-30rpx sub-text-30 color-white!"
@tap="doCancelRefund">
取消申请
</view>
<view v-else-if="state.refundDetail.status == 62"
class="bg-#999 p-y-20rpx text-center rounded-40rpx m-x-30rpx m-y-30rpx sub-text-30 color-white!"
@tap=" router.jump('/pages/refund/apply', { id: state.detailId }, 2)">
@tap="router.jump('/pages/refund/apply', { id: state.detailId }, 2)">
重新申请
</view>
</template>
src/pages/tabbar/order.vue
+1 -1
View File
@@ -122,7 +122,7 @@ const doRefund = (v: any) => {
</view>
<view
class="absolute top-0 right-0 bottom-0 z-10 flex-col items-end w-160rpx p-x-20rpx bg-white bg-opacity-95">
<view class="main-text-30">¥ {{ hooks.useMoney(v.totalPrice) }}</view>
<view class="main-text-30 color-red!">¥ {{ hooks.useMoney(v.totalPrice) }}</view>
<view class="m-t-10rpx second-text-26">共 {{ v.carList.length }} 件</view>
</view>
</view>