提交

pages/index/components/scrollModeView.vue

 <template>
 	<!-- 贴图 -->
 	<view class="content" style="width: 100%; height: 100%; position: relative;overflow: hidden;">
-		
-		<!-- <scroll-view scroll-y
-			style="height:100%;width: 100%; overflow: hidden; overflow-y: scroll; position: relative;"> -->
-		
-			<template slot="content" style="margin-top: 140upx;"> 
-				<scroll-view scroll-y style="width:100%; margin: auto; height:1150upx; overflow: hidden; ">
+			<veiw> 
+				<scroll-view scroll-y style="width:100%; margin: auto; height:calc(100% - 220upx); overflow: hidden; margin-top: 140upx; ">
 					<view style="float: left; width: calc(100% / 3); margin: 10upx 0 10upx; "
 						v-for="(item, index) in datalist" :key="index" @click="modeDetail(item)">
 						<view style="width: 139upx; height: 255upx; margin: auto; position: relative;">
@@ -15,7 +11,7 @@
 								style="width: 139upx; height: 200upx; margin: auto; border-radius: 14px; overflow: hidden;"
 								:src="item.goods_pic + '?x-oss-process=image/resize,lfit,w_112'"
 								mode="aspectFit"></image>
-								<view style=" margin-top: 5upx; text-align: center; font-size: 22upx; color: #FFFFFF;">{{item.name}}</view>
+								<view style=" margin-top: 5upx; text-align: center; font-size: 22upx; color: #61D119;">{{item.name}}</view>
 						   </view>
 						</view>
 					</view>
@@ -28,10 +24,8 @@
 						</view>
 					</view>
 				</scroll-view>
-		 </template>
+		 </veiw>
 	  
-	  
-	     <!-- <> -->
 	  </view>
 </template>
 

pages/index/mall.vue

 <template>
 	<view class="full-width">
-
 		<!-- 登录弹框 -->
 		<Signin ref="Signin"></Signin>
-		
+	
 		<!-- 自定义头部 -->
 		<view class='flex commonHead' :style="{height: titleHeight +'px'}">
 			<view class='commonHead-wrap flex'>
-				<!-- <view class='commonHead_left' @click="tomine()">
-					<view class='commonHead_left_back'>
-						<view class="commonHead_left_back_img">
-							<image :src="portraitUrl" style="width: 50upx; height: 50upx; border-radius: 30upx; margin-top: 10upx; background: #FFFFFF;" mode="aspectFill"></image>
-						</view>
-					</view>
-				</view> -->
 				<view class='commonHead_right flex'>
 					<view class='commonHead_right_text line1'>手机壳定制站</view>
 				</view>

pages/index/start-up.vue

@@ -71,10 +71,8 @@
 			</view>
 		</view>
 		
-		<!-- 文本，贴图，相框 1模板 2贴图 3字体 4编辑 22添加相框 -->
 		<uni-popup ref="showshare" type="bottom" 
 			style="position: relative; z-index: 9998; width: 100%; "  :style="{height: data.windowHeight +'px'}">
-			<!-- 贴图、模板形状 -->
 			<view class="uni-share full-width"  :style="{height: data.windowHeight +'px'}">
 				<view style="position: absolute; bottom: 0; left: 0; height: 100%; width: 100%; z-index: 997; opacity: 0.8;"
 					  @click="cancel('share')"/>
@@ -86,10 +84,8 @@
 					<view style="width: 120upx;" :style="{height: (data.windowHeight - 188 * data.pixelRate) +'px'}">
 						<scroll-view class="scroll-container"
 							:style="{height: (data.windowHeight - 160 * data.pixelRate) +'px'}" scroll-y
-							scroll-with-animation v-if="brandList.length > 0" :scroll-into-view="'s' + currentIndex">
-							
+							scroll-with-animation v-if="brandList.length > 0" >
 							<view  :id="'s' + index"  
-							
 							:class="[index == currentId ? 'scroll-item-select' : 'scroll-item-no-select']"
 								v-for="(item, index) in brandList" :key="index" @tap="brandclick(index,item)">
 								<image
@@ -100,7 +96,8 @@
 						</scroll-view>
 					</view>
 				</view>
-				<view style="position: absolute; bottom: 0upx; left: 120upx; height: 100%; width: calc(100% - 200upx); z-index: 999; overflow: hidden; background: #282932;">
+				<view style="position: absolute; bottom: 0upx; left: 120upx; height: 100%; width: calc(100% - 200upx); 
+				z-index: 999; overflow: hidden; background: #fff;">
 					<scrollModeView ref="scrollModeView"
 						@goodsbrands="goodsbrands"
 						:windowHeight="(data.windowHeight - 210 * data.pixelRate - classificationHeight)">
@@ -175,6 +172,7 @@
 					windowHeight: 0, // 屏幕高度
 				},
 		        currentId: 0,
+				classificationHeight: 0,
 			};
 		},
 
@@ -227,7 +225,7 @@
 					title: err.msg,
 					icon: 'none'
 				});
-			 });
+			  });
 	  	   },
 		
 			//首次进来检查是否
@@ -298,7 +296,6 @@
 							uni.navigateTo({
 								url: '../mall/lineUp?machine_id=' + that.machine_id + '&key=3' 
 							})
-							
 						}).catch(err => {
 							that.$refs.Signin.init();
 						});
@@ -307,11 +304,6 @@
 				
 					}
 				});
-				
-				
-				/* uni.navigateTo({
-					url: '../mall/lineUp?machine_id=' + this.machine_id + '&key=' + this.key
-				}) */
 			},
 
 			tomakePhoneCall() {
@@ -534,6 +526,7 @@
 						}).then(result => {
 							this.$base.lockInventory = result //锁库存储存信息
 							this.sn = result.sn
+							
 							uni.navigateTo({
 								url: '../index/index?machine_id=' + this.machine_id + '&goods_id=' + this.goods_id +
 									'&key=' + this.key + '&sn=' + this.sn + '&dict_id=' + this.dict_id +