Merge branch '2025_4_11_admin_home' into pre

src/views/news/GoodListApply.vue

@@ -220,13 +220,18 @@ export default {
       this.$confirm('将此商品通过审核吗?', '提示', {
         confirmButtonText: '通过',
         cancelButtonText: '拒绝',
+        distinguishCancelAndClose: true,  // 关键配置项
         type: 'warning'
       }).then(() => {
         this.upRow(id, 2)
-      }).catch(() => {
-        //输入驳回理由
-        console.log("驳回")
-        this.examineWindow = true;
+      }).catch((the_reback) => {
+
+         if(the_reback=="cancel"){
+                  //输入驳回理由
+                  // console.log("驳回" )
+                  this.examineWindow = true;
+         }    
+		 
       })
     },
     //1.列表和分页相关 start ------------------------------------------------------------>