diff --git a/config/index.ts b/config/index.ts
index bc28a33..d4c4e16 100644
--- a/config/index.ts
+++ b/config/index.ts
@@ -50,7 +50,7 @@ const config = {
prebundle: { enable: false },
},
cache: {
- enable: false, // Webpack 持久化缓存配置,建议开启。默认配置请参考:https://docs.taro.zone/docs/config-detail#cache
+ enable: true, // Webpack 持久化缓存配置,建议开启。默认配置请参考:https://docs.taro.zone/docs/config-detail#cache
},
sass: {
data: `@import "@nutui/nutui-taro/dist/styles/variables.scss";`,
diff --git a/src/api/admin.ts b/src/api/admin.ts
index 3563f21..64ef92c 100644
--- a/src/api/admin.ts
+++ b/src/api/admin.ts
@@ -66,4 +66,8 @@ export const editAfterOrder = (data: object) =>
// 生成付款二维码
export const createPayQr = (data: object) =>
- request("/later/order/pay", data, "POST");
\ No newline at end of file
+ request("/later/order/pay", data, "POST");
+
+// 检查手机号码是否存在
+export const checkPhone = (data: object) =>
+ request("/user/find/phone", data, "POST");
\ No newline at end of file
diff --git a/src/components/Cart.vue b/src/components/Cart.vue
index e1590f5..5ac53cf 100644
--- a/src/components/Cart.vue
+++ b/src/components/Cart.vue
@@ -140,7 +140,7 @@ const create_order = async () => {
res = await createAfterOrder(data);
await get_cart_list();
Taro.navigateTo({
- url: `/pages/admin/add_order/pending_order/pending_order_detail/index?oid=${props.merInfo.oid}&bid=${props.merInfo.bid}`,
+ url: `/pages/admin/add_order/pending_order/pending_order_detail/index?oid=${res.data.oid}&bid=${props.merInfo.bid}`,
});
} else {
res = await createActiveOrder({
@@ -175,13 +175,13 @@ defineExpose({
购物车数量: {{ cartInfo.count }}
- 总金额: {{ cartInfo.price.toFixed(2) }},
- 总积分: {{ cartInfo.exchange.toFixed(2) }}
+ 总金额: {{ cartInfo.price.toFixed(2) }}元
+ ,总积分: {{ cartInfo.exchange.toFixed(2) }}
立即结算立即下单
diff --git a/src/pages/admin/add_order/add_table/index.scss b/src/pages/admin/add_order/add_table/index.scss
index 28c8296..80423ce 100644
--- a/src/pages/admin/add_order/add_table/index.scss
+++ b/src/pages/admin/add_order/add_table/index.scss
@@ -33,3 +33,14 @@
}
}
}
+
+.nut-dialog__header {
+ text-align: left;
+ font-weight: bold;
+ font-size: 36px;
+ height: auto;
+}
+.nut-dialog__content {
+ text-align: left !important;
+ font-size: 28px;
+}
\ No newline at end of file
diff --git a/src/pages/admin/add_order/add_table/index.vue b/src/pages/admin/add_order/add_table/index.vue
index b78ecc8..8c2814d 100644
--- a/src/pages/admin/add_order/add_table/index.vue
+++ b/src/pages/admin/add_order/add_table/index.vue
@@ -42,6 +42,15 @@
>
+
+ 提示
+ 客户手机号:
+ {{ formVal.phone }}
+ 没有注册捷兑
+通,请通知他登录捷兑通小程序注册。
+
@@ -49,6 +58,7 @@
import { ref } from "vue";
import Taro from "@tarojs/taro";
import BackComponent from "../../../../components/Back.vue";
+import { checkPhone } from "../../../../api/admin";
const formVal = ref({
seat: "",
@@ -56,23 +66,41 @@ const formVal = ref({
notes: "",
});
+const visible = ref(false);
+
const formSubmit = async ({ detail }: any) => {
- if (!detail.value.seat || !detail.value.phone)
+ if (!detail.value.seat)
return Taro.showToast({
- title: "请填写完整信息",
+ title: "请填写台号",
icon: "none",
});
- const user_info = await Taro.getStorageSync("userInfo");
- Taro.navigateTo({
- url: `/pages/admin/add_order/add_menu/index?type=1&bid=${user_info.data.bid}&seat=${formVal.value.seat}&phone=${formVal.value.phone}¬es=${formVal.value.notes}`,
- success: () => {
- formVal.value = {
- seat: "",
- phone: "",
- notes: "",
- };
- },
- });
+ if (
+ !/^1(3\d|4[5-9]|5[0-35-9]|6[567]|7[0-8]|8\d|9[0-35-9])\d{8}$/.test(
+ detail.value.phone
+ )
+ )
+ return Taro.showToast({
+ title: "请输入正确的手机号码",
+ icon: "none",
+ });
+ try {
+ const res = await checkPhone({ phone: detail.value.phone });
+ console.log(res);
+ const user_info = await Taro.getStorageSync("userInfo");
+ Taro.navigateTo({
+ url: `/pages/admin/add_order/add_menu/index?type=1&bid=${user_info.data.bid}&seat=${formVal.value.seat}&phone=${formVal.value.phone}¬es=${formVal.value.notes}`,
+ success: () => {
+ formVal.value = {
+ seat: "",
+ phone: "",
+ notes: "",
+ };
+ },
+ });
+ } catch (error) {
+ console.log(error);
+ visible.value = true;
+ }
};
diff --git a/src/pages/admin/add_order/pending_order/index.config.ts b/src/pages/admin/add_order/pending_order/index.config.ts
index e3f86e8..5605b00 100644
--- a/src/pages/admin/add_order/pending_order/index.config.ts
+++ b/src/pages/admin/add_order/pending_order/index.config.ts
@@ -1,3 +1,3 @@
export default definePageConfig({
- navigationBarTitleText: "挂帐订单",
+ navigationBarTitleText: "后结订单",
});
diff --git a/src/pages/admin/add_order/pending_order/pay/index.vue b/src/pages/admin/add_order/pending_order/pay/index.vue
index 18b215f..8d9fa3a 100644
--- a/src/pages/admin/add_order/pending_order/pay/index.vue
+++ b/src/pages/admin/add_order/pending_order/pay/index.vue
@@ -108,7 +108,7 @@ const ok = async () => {
});
Taro.setStorageSync("pay_code", res.data.data.code_url);
Taro.navigateTo({
- url: `/pages/admin/add_order/pending_order/wx_pay_code/index`,
+ url: `/pages/admin/add_order/pending_order/wx_pay_code/index?oid=${data.value.oid}&bid=${data.value.bid}`,
});
};
diff --git a/src/pages/admin/add_order/pending_order/pending_order_detail/index.config.ts b/src/pages/admin/add_order/pending_order/pending_order_detail/index.config.ts
index 661c252..3cea8b7 100644
--- a/src/pages/admin/add_order/pending_order/pending_order_detail/index.config.ts
+++ b/src/pages/admin/add_order/pending_order/pending_order_detail/index.config.ts
@@ -1,3 +1,4 @@
export default definePageConfig({
navigationBarTitleText: "订单详情",
+ navigationStyle: "custom",
});
diff --git a/src/pages/admin/add_order/pending_order/pending_order_detail/index.scss b/src/pages/admin/add_order/pending_order/pending_order_detail/index.scss
index 15f039a..ce8de0a 100644
--- a/src/pages/admin/add_order/pending_order/pending_order_detail/index.scss
+++ b/src/pages/admin/add_order/pending_order/pending_order_detail/index.scss
@@ -2,7 +2,7 @@
width: 710px;
background: #ffffff;
border-radius: 12px;
- margin: 20px auto;
+ margin: auto;
box-sizing: border-box;
.header {
diff --git a/src/pages/admin/add_order/pending_order/pending_order_detail/index.vue b/src/pages/admin/add_order/pending_order/pending_order_detail/index.vue
index c722636..412c583 100644
--- a/src/pages/admin/add_order/pending_order/pending_order_detail/index.vue
+++ b/src/pages/admin/add_order/pending_order/pending_order_detail/index.vue
@@ -1,6 +1,7 @@
-
+
+