修改

pages/index/js/drag.js

@@ -3,7 +3,7 @@ const drag = {
 	 * 部件缩放中事件四角缩放
 	 */
 	scaleMove(e, item, data, allLineListData, designWidth, designHeight) {
-
+		console.log(item)
 		item.isShowLineV = false; //初始化默认不显示
 		item.isShowLineH = false; //初始化默认不显示
 		var minwwidth = 20

pages/index/machineDetail.vue

@@ -116,7 +116,8 @@
 				uni.navigateTo({
 					url: '../mall/size?machine_id=' + this.machine_id +
 					// + "&title=" + item.title + "&real_width=" + item.key + 
-					"&machineDetail=" + JSON.stringify(this.list)
+					 "&isFirstPage=true" + 
+					 "&machineDetail=" + JSON.stringify(this.list)
 					// url: '../index/size?machine_id=' + this.machine_id +
 					// 	'&key=' + this.key;
 				})

pages/index/switchGoods.vue

@@ -6,20 +6,18 @@
 			@click="closeView()">
 		</view>
 
-		<view
-			style=" width: 562upx; border-radius: 20upx; height: 900upx; z-index: 998; position: absolute ;margin:auto; top:0; right: 0; left: 0; bottom: 0;flex-direction: column">
+		<view  style=" width: 562upx; border-radius: 20upx; height: 900upx; z-index: 998; position: absolute ;margin:auto; top:0; right: 0; left: 0; bottom: 0;flex-direction: column">
 
 			<image src="../../static/icon_home_good_back.png" style="width: 562upx; border-radius: 20upx;
 			  height: 720upx;
 			  left:50%;
 			  top:50%;
 			  transform: translate(-50%,-50%);
-			  position: absolute; " />
+			  position: absolute; "/>
 
 			<view style="position: absolute;  
 			width: 562upx; height:720upx;
 			top: 0; ">
-
 				<view style="
 				 width: 200upx;
 				 height: 120upx;
@@ -31,7 +29,7 @@
 				<view style="height: 280upx; ">
 					<view v-for="(item,index) in goods" :key="index" @click="goodclick(item,index)">
 						<view style="
-					margin-left: 70upx;
+					  margin-left: 70upx;
 					 float: left;
 					 border-radius: 15upx; 
 					 position: relative;
@@ -55,24 +53,24 @@
 					 position: relative; 
 		             margin: 10upx;">
 							<view :class="[sizeCurrentIndexTop == index? 'size-item-select':'size-item-no-select' ]">
-								{{item !=null ? item.title : ''}}
+								{{item !=null ? item.title : '' }}
 							</view>
 						</view>
 					</view>
-				</view>
-
-				<view @click="saveGood()" style="width: 289upx;
-  height: 84upx;
-  background: #F29F3D;
-  border-radius: 42px; 
-  color: #fff;
-  font-size: 32upx;
-  margin: 0 auto;
-  line-height: 84upx;
-   margin-top:60upx;
-   text-align: center;">确定</view>
-
-				<view @click="toCustomSize()" style="width: 289upx;
+			  	</view>
+
+			<view @click="saveGood()" style="width: 289upx;
+    height: 84upx;
+    background: #F29F3D;
+    border-radius: 42px; 
+    color: #fff;
+    font-size: 32upx;
+    margin: 0 auto;
+    line-height: 84upx;
+    margin-top:60upx;
+     text-align: center;">确定</view>
+
+				<view v-if="isShowCustomize"  @click="toCustomSize()" style="width: 289upx;
      height: 84upx;
      color: #F29F3D;
      font-size: 32upx;
@@ -98,14 +96,15 @@
 				goodCurrentIndexTop: 0, //上面商品选中
 				sizeCurrentIndexTop: 0, //下面尺寸选中
 				selectGoodSize: null, //选中商品尺寸
-				isShowCustomize: true, //是否自定义选中
+				isShowCustomize: false, //是否自定义选中
 			};
 		},
-		mounted() {},
+		mounted() {
+			
+		},
 
 		methods: {
 
-
 			//自定义尺寸
 			toCustomSize() {
 				this.isShow = false;
@@ -143,6 +142,7 @@
 					this.selectGoodSize = this.selectGood.attribute[0];
 				}
 			},
+			
 
 			//商品点击事件
 			sizeclick(item, index) {
@@ -150,6 +150,7 @@
 				this.sizeCurrentIndexTop = index;
 			},
 
+
 			//打开页面
 			open(machineId, isShowCustomize) {
 				if (isShowCustomize) {
@@ -161,6 +162,7 @@
 				this.getGooods();
 			},
 
+
 			//获取商品列表
 			getGooods() {
 				let that = this;
@@ -186,7 +188,6 @@
 					} else {
 						this.isShow = true;
 					}
-
 				}).catch(err => {
 					this.isShow = false;
 					uni.showToast({
@@ -206,6 +207,13 @@
 			getGooods();
 
 		},
+		
+		
+		options(options){
+			
+		},
+		
+		
 
 	}
 </script>
@@ -253,4 +261,5 @@
 		text-align: center;
 		border: 2upx transparent solid;
 	}
+	
 </style>

pages/mall/lineUp.vue

@@ -41,7 +41,7 @@
 								<view style="text-align: left; font-size: 30upx; color: #333; line-height: 80upx;font-weight: 600; margin-top: 20upx;"> 排队中</view>
 							</view>
 							<view style="font-size: 29upx; color: #333333; margin-top: 20upx; font-weight: 600;">
-							{{designer.goods_name || ''}}    {{designer.goods_specs || ''}}
+							{{ designer.customize_size_id == 0  ? designer.goods_name || '' : ''}}    {{designer.goods_specs || ''}}
 							</view>
 						</view>
 						<view style="width: 90%;font-size: 28upx; margin-top: 70upx; font-weight: 550; text-align: right; font-size: 36upx; color: #333; margin-right: 30upx;">