czg_team
/
cashier_wx
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更改order_food/order_food路径前

This commit is contained in:
wwz 2025-03-24 17:09:06 +08:00
parent 94b513820f
commit 429336c736
7 changed files with 74 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
framework/0-conf.js
View File

@ -1,4 +1,5 @@
const debug = process.env.NODE_ENV == 'development' ? true : false;
// const debug = process.env.NODE_ENV == 'development' ? true : false;
const debug = true;
// #ifdef H5
const proxyApi = "/api"
// #endif
@ -8,25 +9,17 @@ const proxyApi = 'https://tapi.cashier.sxczgkj.cn' // 调试地址
const proxyApiwws = 'wss://sockets.sxczgkj.com/wss' // 调试地址
// #endif
// #ifdef H5
const baseUrl = debug ? proxyApi : "https://tapi.cashier.sxczgkj.cn"
const baseUrlwws = 'wss://sockets.sxczgkj.com/wss'
// #endif
// #ifdef APP || MP-WEIXIN || MP-ALIPAY
const baseUrl = debug ? proxyApi : 'https://tapi.cashier.sxczgkj.cn' // 线上
const baseUrlwws = debug ? proxyApiwws : 'wss://sockets.sxczgkj.com/wss' // 线上
const baseUrl = debug ? proxyApi : 'https://cashier.sxczgkj.com' //
const baseUrlwws = debug ? proxyApiwws : 'wss://czgeatws.sxczgkj.com/wss' // 线上
// #endif
// import VConsole from "./vConsole.js"
// if (debug) {
// new VConsole()

2
pages/order/components/orderInfoAfter.vue
View File

@ -375,7 +375,7 @@
type: "confirm_order_product",
shopId: uni.cache.get('orderVIP').shopId,
shopUserId: props.orderVIP.id,
payAmount: props.listinfo.totalCost,
payAmount: props.listinfo.totalPrices,
shoppingCart: JSON.stringify(props.listinfo.combinedArray)
})
break;

7
pages/order/detail.vue
View File

@ -259,7 +259,7 @@
uniqueIds.value = [] // 筛选出商品卷的id
listinfo.coupondiscountAmount = 0 // 优惠卷减去的金额
listinfo.Productroll = 0 // 商品卷总价价格
listinfo.coupondiscountAmount = 0 // 优惠卷减去的金额
listinfo.pointsNum = 0 // 商品卷总价价格
// 支付方式切换
// #ifdef MP-WEIXIN
paymentMethodref.value.groupChanges(2)
@ -320,7 +320,6 @@
// 这是优惠卷传的值
const handleReturnData = async (data) => {
console.log(data, uniqueIds.value, '11')
// 这是优惠卷
if (data.typeOrder == 1) {
if (data.item) {
@ -364,7 +363,6 @@
}
const istoricalorders = async () => {
return false;
// 先调用历史订单
let APIhistoryOrderres = await APIhistoryOrder({
tableCode: listinfo.tableCode
@ -446,7 +444,8 @@
userAllPack: is_type.value == 0 ? 0 : 1, //是否整单打包
amount: listinfo.totalCost, // 最终订单金额
returnUrl: '', //跳转地址
buyerRemark: ''
buyerRemark: '',
seatNum: listinfo.seatNum
})
return false;
} else {

9
pages/product/index.vue
View File

@ -903,7 +903,14 @@
// 单规格
const singleclick = async (item, i) => {
// 判断购物车是否有该选中商品
let res = await matchingProduct(item)
let res = null
try {
res = matchedProducts.value.find((product, index) => {
return product.skuId == item.skuId && product.id == item.id
});
} catch (error) {
//TODO handle the exception
}
websocketsendMessage({
id: res ? item.cartListId : '',
type: 'shopping',

69
pages/user/member/billDetails.vue
View File

@ -1,6 +1,6 @@
<template>
<!-- 账单明细 -->
<view>
<view style="padding-bottom: 40rpx;">
<view class="bild">
<view class="bildLeft">
<text>我的余额</text>
@ -26,27 +26,65 @@
<view class="flex-start">
<view class="listStyle_left">
<view class="listrigth">
<view>{{formData.active == 1 ? item.biz_name : item.content}}</view>
<view
<view v-if="formData.active == 1">
<text v-if="item.bizCode == 'cashIn'">
现金充值
</text>
<text v-if="item.bizCode == 'wechatIn'">
微信小程序充值
</text>
<text v-if="item.bizCode == 'alipayIn'">
支付宝小程序充值
</text>
<text v-if="item.bizCode == 'awardIn'">
充值奖励
</text>
<text v-if="item.bizCode == 'rechargeRefund'">
充值退款
</text>
<text v-if="item.bizCode == 'orderPay'">
订单消费
</text>
<text v-if="item.bizCode == 'orderRefund'">
订单退款
</text>
<text v-if="item.bizCode == 'adminIn'">
管理员充值
</text>
<text v-if="item.bizCode == 'adminOut'">
管理员消费
</text>
</view>
<view v-else>
{{item.content}}
</view>
<!-- <view
:class="{colorStyle: (formData.active==1&&item.type == '+') || (formData.active==2&&item.floatType=='add')}">
{{ formData.active == 1 ? item.type : (item.floatType == 'add'?'+':'')}}
{{formData.active == 1 ? item.amount : item.floatPoints}}
</view> -->
<view v-if="formData.active == 1" :class="{colorStyle: (item.bizCode == 'cashIn' || item.bizCode == 'wechatIn' ||
item.bizCode == 'alipayIn'|| item.bizCode == 'awardIn'|| item.bizCode == 'rechargeRefund')}">
{{ item.amount }}
</view>
<view v-else :class="{colorStyle: (item.floatPoint>0)}">
{{item.floatPoints}}
</view>
</view>
</view>
<view class="listrigth2">
<view>{{item.createTime}}
<view class=" listrigth2">
<view>{{item.createTime}}
</view>
<view v-if="formData.active == 1">余额:{{item.balance}}</view>
</view>
</view>
<view v-if="formData.active == 1">余额:{{item.balance}}</view>
</view>
<view v-if="formData.list.length <= 0" style="text-align: center;">
<image style="width: 402rpx;height: 442rpx;margin:240rpx auto 32rpx;"
src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/nomore.png" mode="aspectFill"></image>
</view>
<up-loadmore :status="formData.form.status" fontSize="14" color="#999" iconSize="14" />
</view>
</view>
<view v-if="formData.list.length <= 0" style="text-align: center;">
<image style="width: 402rpx;height: 442rpx;margin:240rpx auto 32rpx;"
src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/nomore.png" mode="aspectFill"></image>
</view>
<up-loadmore :status="formData.form.status" fontSize="14" color="#999" iconSize="14" />
</view>
</template>
<script setup>
@ -86,14 +124,15 @@
res = await APIshopUsermoneyRecord({
page: formData.form.page,
size: formData.form.size,
status: formData.status,
// status: formData.status,
shopId: formData.shopId
})
} else {
res = await APIshopUserpointsRecord({
page: formData.form.page,
size: formData.form.size,
status: formData.form.status
// status: formData.form.status,
shopId: formData.shopId
})
}
if (res.totalPage == 0 || res.totalPage == 1 && res.totalRow <= 10) {

2
pages/user/user.vue
View File

@ -1,7 +1,7 @@
<template>
<view class="container">
<image class="topBack"
:src="shopExtend?shopExtend.shopExtendList[1].value:'https://czg-qr-order.oss-cn-beijing.aliyuncs.com/my/myTopBack.png'"
:src="ShopId?shopExtend.shopExtendList[1].value:'https://czg-qr-order.oss-cn-beijing.aliyuncs.com/my/myTopBack.png'"
mode="aspectFill"></image>
<view class="myContent">
<view class="my_info flex-between">

3
stores/pay.js
View File

@ -38,7 +38,8 @@ export const Memberpay = defineStore('memberpay', {
returnUrl: data.returnUrl ? data.returnUrl : '',
buyerRemark: data.buyerRemark ? data.buyerRemark : '',
orderId: data.orderId,
userAllPack: data.userAllPack
userAllPack: data.userAllPack,
seatNum:data.seatNum
})
if (res) {
uni.showLoading({