Merge branch 'main' of http://git.njrzwl.cn:3000/wangmingchuan/yanzong_qianduan

pages/goods/list.vue

@@ -248,8 +248,12 @@
 			// 设置默认列表显示方式
 			this.setShowView()
 			// 设置微信公众号链接分享卡片内容
-			this.setWxofficialShareData()
+			this.setWxofficialShareData()
-			this.getGoodsTypeList(options.categoryId)
+				console.log(111,options.categoryId!= 'undefined')
+			if(options.categoryId != 'undefined'){
+				this.getGoodsTypeList(options.categoryId)
+			}
+			
 		},
 
 		methods: {