新增现金支付备注

.env.development

@@ -5,10 +5,10 @@ ENV = development
 # VITE_API_WSS = 'wss://sockets.sxczgkj.com/wss'
 
 # 正式ws
-# VITE_API_WSS = 'wss://czgeatws.sxczgkj.com/wss'
+VITE_API_WSS = 'wss://czgeatws.sxczgkj.com/wss'
 
 # 本地ws
-VITE_API_WSS = 'ws://192.168.1.42:2348'
+# VITE_API_WSS = 'ws://192.168.1.42:2348'
 
 # 正式 php
 VITE_API_PHP_URL = 'https://newblockwlx.sxczgkj.cn/index.php/api'
@@ -20,10 +20,10 @@ VITE_API_PHP_URL = 'https://newblockwlx.sxczgkj.cn/index.php/api'
 VITE_API_KP_URL = 'https://invoice.sxczgkj.cn/api'
 
 # 本地调试连接
-VITE_API_URL = 'http://192.168.1.42/'
+# VITE_API_URL = 'http://192.168.1.42/'
 
 # 线上测试
 # VITE_API_URL = 'https://tapi.cashier.sxczgkj.cn'
 
 # 线上正式
-# VITE_API_URL = 'https://cashier.sxczgkj.com'
+VITE_API_URL = 'https://cashier.sxczgkj.com'

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "vite-electron",
 	"private": true,
-	"version": "2.0.11",
+	"version": "2.0.12",
 	"main": "dist-electron/main.js",
 	"scripts": {
 		"dev": "chcp 65001 && vite",

src/components/payCard/payCard.vue

@@ -215,10 +215,13 @@
                         <el-button type="danger" @click="clearPoint">清除</el-button>
                     </div>
                     <div class="point_tips err" v-if="couponFormUser.id && !pointOptions.usable">
-                        注意：{{ pointOptions.unusableReason || (`订单金额不足￥${formatDecimal(+pointOptions.minPaymentAmount)}，无法使用积分抵扣`) }}
+                        注意：{{ pointOptions.unusableReason ||
+                            (`订单金额不足￥${formatDecimal(+pointOptions.minPaymentAmount)}，无法使用积分抵扣`) }}
                     </div>
                     <div class="point_tips" v-if="couponFormUser.id && pointOptions.usable">
-                        说明：订单已满足使用门槛，当前积分可抵扣最多￥{{ pointOptions.potentialAmount }}（当前积分 {{ couponFormUser.accountPoints || 0 }}）
+                        说明：订单已满足使用门槛，当前积分可抵扣最多￥{{ pointOptions.potentialAmount }}（当前积分 {{ couponFormUser.accountPoints
+                            || 0
+                        }}）
                     </div>
                 </el-form-item>
             </el-form>
@@ -250,7 +253,7 @@ import { getPayType } from "@/api/account.js";
 import scanModal from "@/components/payCard/scanModal.vue";
 import SelectVipUser from '@/components/selectVipUser.vue'
 import CouponModal from '@/components/payCard/couponModal.vue'
-import { ElMessage } from "element-plus";
+import { ElMessage, ElMessageBox } from "element-plus";
 import { staffPermission } from "@/api/user.js";
 import { cashPay, buyerPage, creditPay, vipPay } from "@/api/order.js";
 import { calcUsablePoints } from '@/api/account.js'
@@ -467,6 +470,7 @@ function upadatePayData() {
         newCustomerDiscountId: goodsStore.newUserDiscount !== null ? goodsStore.newUserDiscount.id : goodsStore.newUserDiscount !== null ? goodsStore.newUserDiscount.id : '', // 新客立减Id
         newCustomerDiscountAmount: goodsStore.newUserDiscount !== null ? goodsStore.newUserDiscount.amount : 0, // 新客立减金额
         vipDiscountAmount: goodsStore.cartInfo.costSummary.vipDiscountAmount, // 超级会员折扣
+        remark: '', // 现金支付备注
     }
 }
 
@@ -501,10 +505,20 @@ async function confirmOrder() {
                     return;
                 case "cash":
                     //现金
-                    if (props.selecttype == 0) {
+                    ElMessageBox.prompt('确定现金支付？', '注意', {
-                        payLoading.loading = true
+                        confirmButtonText: '确定',
-                        await cashPay(payData.value);
+                        cancelButtonText: '取消',
-                    }
+                        inputPlaceholder: '请输入备注（选填）',
+                    }).then(async ({ value }) => {
+                        payData.value.checkOrderPay.remark = value;
+                        if (props.selecttype == 0) {
+                            payLoading.loading = true
+                            await cashPay(payData.value);
+                            payLoading.value = false;
+                            emit("paySuccess");
+                        }
+                    }).catch(() => { })
+                    return;
                     break
                 case "member-account":
                     // 会员支付