Merge branch 'dev' of http://rungit.jxdsy.cn:10000/xys/lumastoreapp into dev

pages/eleProduct/eleProduct.vue

@@ -36,11 +36,12 @@
 						<view class="btns btnboxxj"  @tap="Selectiondata(item)"  v-if="tabactive==1 && isselect==1">加入活动</view>
 						<view class="btns btnboxxj" @tap="sold_outfun(item.id,1,index)" v-else-if="tabactive==1">下 架</view>
 						<view class="btns btnboxxj"  @tap="sold_outfun(item.id,0,index)"  v-show="tabactive==2">上 架</view>
+						<view class="btns btnboxxj" @click="setSpecs(item.product_id)" >规格</view>
 						<view class="btns btnboxdel" @tap="tochanges(item,index)">修 改</view>
 					</view>
 				</view>
 				
-				
+				<video src="" controls></video>
 			</checkbox-group>
 			
 		</view>
@@ -225,7 +226,12 @@
 				}
 				
 			},
-			
+			setSpecs(id){
+				//处理规格
+				uni.navigateTo({
+					url:`/pages/specsShop/specsShop?id=${id}`,
+				})
+			},
 			//交互end
 			taggletab(inde){
 				this.tabactive = inde;