diff --git a/java-mall-app-shop-admin/api/store.js b/java-mall-app-shop-admin/api/store.js
new file mode 100644
index 0000000..49d20c5
--- /dev/null
+++ b/java-mall-app-shop-admin/api/store.js
@@ -0,0 +1,18 @@
+import http from "../utils/http";
+import config from "../config/config";
+
+/** 更新商店营业状态
+ * @author Seven
+ * @data 2025-6-25
+ * @returns { }
+ * @see https://mall.gpxscs.cn/api/admin/shop/shop-store-base/update/storeBizState
+ */
+
+export function UpdateStoreBizState(params) {
+ return http({
+ url: "shop/shop-store-base/update/storeBizState",
+ method: "post",
+ baseURL: config.adminApi,
+ data: params,
+ });
+}
diff --git a/java-mall-app-shop-admin/pages.json b/java-mall-app-shop-admin/pages.json
index f307a03..de57098 100644
--- a/java-mall-app-shop-admin/pages.json
+++ b/java-mall-app-shop-admin/pages.json
@@ -143,6 +143,12 @@
"navigationBarTitleText": "设置"
}
},
+ {
+ "path": "pages/my/businessStatus",
+ "style": {
+ "navigationBarTitleText": "营业状态"
+ }
+ },
{
"path": "pages/my/contract",
"style": {
diff --git a/java-mall-app-shop-admin/pages/audit/checkAudit.vue b/java-mall-app-shop-admin/pages/audit/checkAudit.vue
index 6004f03..6425dd9 100644
--- a/java-mall-app-shop-admin/pages/audit/checkAudit.vue
+++ b/java-mall-app-shop-admin/pages/audit/checkAudit.vue
@@ -559,9 +559,8 @@ export default {
approval_remark: "",
approval_invalid_col: [],
};
- // this.auditInfo.has_apply_mer = 2;
- if (!res.data) {
+ if (!res.data || res.data.approval_status == 4) {
this.showLoading = false;
return;
}
diff --git a/java-mall-app-shop-admin/pages/my/businessStatus.vue b/java-mall-app-shop-admin/pages/my/businessStatus.vue
new file mode 100644
index 0000000..e58367b
--- /dev/null
+++ b/java-mall-app-shop-admin/pages/my/businessStatus.vue
@@ -0,0 +1,152 @@
+
+
+
+ 营业状态
+
+
+ 店铺正常营业中
+
+ 营业时间:{{ dashboardInfo.store_info.info.store_opening_hours }} -
+ {{ dashboardInfo.store_info.info.store_close_hours }}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/java-mall-app-shop-admin/pages/my/my.vue b/java-mall-app-shop-admin/pages/my/my.vue
index 044d545..d3c1e97 100644
--- a/java-mall-app-shop-admin/pages/my/my.vue
+++ b/java-mall-app-shop-admin/pages/my/my.vue
@@ -2,7 +2,7 @@
@@ -10,7 +10,7 @@
- {{ accountInfo.store_info.store_name }}
+ {{ dashboardInfo.store_info.store_name }}
- {{ accountInfo.store_info.store_grade_name }}
+ {{ dashboardInfo.store_info.store_grade_name }}
@@ -40,7 +40,7 @@
class="icon-shezhi"
custom-prefix="custom-icon-kefu custom-icon"
size="25"
- color="#000"
+ color="#fff"
>
平台客服
@@ -49,52 +49,41 @@
class="icon-shezhi"
custom-prefix="custom-icon-shezhi custom-icon"
size="22"
- color="#000"
+ color="#fff"
>
设置
-
-
-
-
- 昨日订单数
-
-
-
- 当月订单数
-
-
-
- 成交总金额
-
-
-
- 营业状态
-
-
- 店铺正常营业中
- 营业时间:07:00 - 22:30
+
+
+
+ 昨日订单数
+
+
+
+ 当月订单数
+
+
+
+ 成交总金额
-
@@ -105,19 +94,28 @@
class="fm-icon"
custom-prefix="custom-icon-dayinji custom-icon"
size="25"
- color="#000"
+ color="#e62300"
>
打印机
-
+
店铺二维码
+
+
+ 营业状态
+