合并冲突

合并冲突

packageA/market/detail.js

@@ -111,9 +111,14 @@ Page({
 				selectCount: ['cheek', 'color', 'material', 'spec'].filter(v => content[v].length).length,
 				UniqueLine
 			});
-			console.log("itmes", this.data.itmes)
 			//是否定制
-			if (getCustom && item.iscustomsize == 1) this.selectComponent("#customMade").init(item);
+			if (item.iscustomsize == 1 && content.spec == "custom") {
+				if (getCustom) this.selectComponent("#customMade").init(item);
+			} else {
+				this.selectComponent("#customMade").setData({
+					list: []
+				});
+			}
 		})
 	},
 	/* 预览媒体 */