From 48bf2f4d96be7aaaecea1e2ba74263bfa312995b Mon Sep 17 00:00:00 2001
From: qijq <624811160@qq.com>
Date: Mon, 1 Sep 2025 10:49:32 +0800
Subject: [PATCH] update BUG

---
 java-mall-app-shop-admin/manifest.json        | 19 ++++++++++++++-----
 java-mall-app-shop-admin/pages/my/my.vue      |  4 +++-
 .../pages/my/shopInfo.vue                     | 16 ++++++++--------
 .../warehouse/manage/addAndEditProduct.vue    |  7 +++++--
 .../warehouse/manage/specificationOfGood.vue  |  5 ++++-
 5 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/java-mall-app-shop-admin/manifest.json b/java-mall-app-shop-admin/manifest.json
index f3bf0a4..35eb931 100644
--- a/java-mall-app-shop-admin/manifest.json
+++ b/java-mall-app-shop-admin/manifest.json
@@ -1,11 +1,11 @@
 {
     "name" : "小发同城",
     "appid" : "__UNI__95F809F",
-    "package" : "com.xiaofa.shopAdmin",
+    "package" : "com.gpxscs.shopAdmin",
     "description" : "",
     // 版本号更新，不要覆盖版本号，每次发布应用商店要修改版本号
-    "versionName" : "1.0.2",
-    "versionCode" : 102,
+    "versionName" : "1.0.3",
+    "versionCode" : 103,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -24,9 +24,15 @@
             "Camera" : {},
             "Record" : {},
             "VideoPlayer" : {},
-            "UIWebview" : {},
-            "Push" : {}
+            "Push" : {
+				"kernel": {  
+					"ios": "WKWebview"    //或者 "WKWebview"  
+				} 
+			}
         },
+		"kernel": {  
+			"ios": "WKWebview"    //或者 "WKWebview"  
+		},  
         /* 应用发布信息 */
         "distribute" : {
             /* android打包配置 */
@@ -131,6 +137,9 @@
         },
         "usingComponents" : true
     },
+    "mp-ios" : {
+        "bundleId" : ""
+    },
     "h5" : {
         // "devServer" : {
         //     "https" : true,
diff --git a/java-mall-app-shop-admin/pages/my/my.vue b/java-mall-app-shop-admin/pages/my/my.vue
index 7af87d8..3f6b413 100644
--- a/java-mall-app-shop-admin/pages/my/my.vue
+++ b/java-mall-app-shop-admin/pages/my/my.vue
@@ -131,7 +131,7 @@
           icon="man-add-fill"
           title="账号设置"
         ></u-cell>
-         <u-cell
+        <u-cell
           iconStyle="marginRight:6px; color: #ff695b"
           :border="false"
           isLink
@@ -236,6 +236,7 @@ export default {
         store_info: {
           store_id: 1,
           store_name: "",
+          store_biz_state: 1,
         },
       },
       form: {
@@ -278,6 +279,7 @@ export default {
       if (res && res.status == 200) {
         uni.setStorageSync("accountDashboard", res.data);
         this.dashboardInfo = res.data;
+        this.shopStatus = this.dashboardInfo.store_info.store_biz_state;
       }
     },
 
diff --git a/java-mall-app-shop-admin/pages/my/shopInfo.vue b/java-mall-app-shop-admin/pages/my/shopInfo.vue
index 52d0695..d8ce743 100644
--- a/java-mall-app-shop-admin/pages/my/shopInfo.vue
+++ b/java-mall-app-shop-admin/pages/my/shopInfo.vue
@@ -58,7 +58,7 @@
           disabled
           inputAlign="right"
           disabledColor="#fff"
-          color="#5ac725"
+          :color="form.store_biz_state == 1 ? '#5ac725' : 'red'"
           v-model="businessName"
           placeholder=""
         />
@@ -214,6 +214,8 @@ export default {
           res.data.info.store_opening_hours +
           "-" +
           res.data.info.store_close_hours;
+
+        this.businessName = res.data.store_biz_state == 1 ? "营业中" : "停业中";
       }
     },
     skipuContract() {
@@ -221,18 +223,16 @@ export default {
         url: "/pages/my/contract",
       });
     },
-   async updateLogo() {
+    async updateLogo() {
       let that = this;
 
       // #ifdef APP-PLUS
       // 获取相册权限
-          let result = await permission.premissionCheck(
-            "EXTERNAL_STORAGE"
-          );
+      let result = await permission.premissionCheck("EXTERNAL_STORAGE");
 
-          if (result != 1) {
-            return result
-          }
+      if (result != 1) {
+        return result;
+      }
       // #endif
 
       uni.chooseImage({
diff --git a/java-mall-app-shop-admin/pages/warehouse/manage/addAndEditProduct.vue b/java-mall-app-shop-admin/pages/warehouse/manage/addAndEditProduct.vue
index 2ce18a9..1d1eeb1 100644
--- a/java-mall-app-shop-admin/pages/warehouse/manage/addAndEditProduct.vue
+++ b/java-mall-app-shop-admin/pages/warehouse/manage/addAndEditProduct.vue
@@ -616,6 +616,7 @@ export default {
       this.showBackPopup = true;
     },
     handerPageBack() {
+      this.isAdd = true;
       this.$emit("pageBack");
     },
     overSize(e) {
@@ -822,9 +823,12 @@ export default {
     async getCommoditSpecificationBaseInfo(type_id) {
       let params = {
         type_id: type_id,
-        product_id: this.productItem.product_id,
       };
 
+      if (!this.isAdd) {
+        params.product_id = this.productItem.product_id;
+      }
+
       let res = await GetCommoditSpecificationBaseInfo(params);
       if (res && res.status == 200) {
         this.commoditSpecificationBaseInfo = res.data;
@@ -872,7 +876,6 @@ export default {
         list.length > 1
           ? list[1].category_virtual_enable
           : list[0].category_virtual_enable;
-
       this.typeId = typeId;
       this.getCommoditSpecificationBaseInfo(typeId);
     },
diff --git a/java-mall-app-shop-admin/pages/warehouse/manage/specificationOfGood.vue b/java-mall-app-shop-admin/pages/warehouse/manage/specificationOfGood.vue
index 414534c..73c8bf5 100644
--- a/java-mall-app-shop-admin/pages/warehouse/manage/specificationOfGood.vue
+++ b/java-mall-app-shop-admin/pages/warehouse/manage/specificationOfGood.vue
@@ -525,7 +525,10 @@ export default {
       JSON.stringify(this.commoditSpecificationBaseInfo)
     );
 
-    if (this.commoditSpecificationBaseInfo2.specs[0].specItems.length > 0) {
+    if (
+      this.commoditSpecificationBaseInfo2 &&
+      this.commoditSpecificationBaseInfo2.specs[0].specItems.length > 0
+    ) {
       console.log(this.commoditSpecificationBaseInfo2);
     }