Merge branch 'master' of http://gitlab.oytour.com/viitto/mallapp

pages/goods/list.vue

@@ -94,6 +94,7 @@
 					OrderBy: 1,
 					GoodsPageType: 0,
 					StoreId: 0,
+					EduClassTypeId: 0, //进阶小课堂班级类型Id
 				},
 				newsortType: 1,
 				isShowKorea: 0, //是否显示韩国的 0不显示 1显示韩国的
@@ -106,7 +107,6 @@
 			this.mainColor = this.$uiConfig.mainColor;
 			this.catId = option.cat_id;
 			if (option && option.coupon_id && option.UseType) { //优惠券带过来的参数
-				console.log(option.coupon_id)
 				if (option.UseType == 1) {
 					this.msg.CategoryIds = option.coupon_id
 				} else if (option.UseType == 2) {
@@ -122,6 +122,10 @@
 			if (option.CategoryIds) {
 				this.msg.CategoryIds = option.CategoryIds;
 			}
+			//HK 2022-10-17新增参数
+			if (option.EduClassTypeId) {
+				this.msg.EduClassTypeId = option.EduClassTypeId;
+			}
 		},
 		mounted() {
 			this.init();
@@ -212,32 +216,6 @@
 						uni.hideNavigationBarLoading();
 					}
 				);
-				// this.request(
-				//   {
-				//     url: "",
-				//     data: {
-				//       r: "api/default/goods-list",
-				//       page: this.page,
-				//       cat_id: this.catId,
-				//       sort: this.sort,
-				//       sort_type: this.sortType,
-				//       keyword: "",
-				//       coupon_id: this.coupon_id,
-				//     },
-				//   },
-				//   (res) => {
-				//     this.showLoading = true;
-				//     this.g = this.g.concat(res.data.list);
-				//     this.page_count = res.data.pagination.page_count;
-				//     if (this.page_count == 1) {
-				//       this.isover = true;
-				//       this.status = "nomore";
-				//     } else {
-				//       this.status = "loadmore";
-				//     }
-				//     this.loading = false;
-				//   }
-				// );
 			},
 			lower(e) {
 				if (this.msg.pageIndex < this.page_count) {
@@ -250,7 +228,6 @@
 				}
 			},
 			clickHandler(u) {
-				console.log(u)
 				uni.navigateTo({
 					url: u,
 				});