8.1

App.vue

@@ -50,7 +50,7 @@
 </script>
  
 <style lang="scss">
-	b,h1,h2,h3,h4,h5,h6,p,li{
+	h1,h2,h3,h4,h5,h6,p,li{
 	        display: inline-block;
 	        text-align: justify;
 	    }
@@ -63,4 +63,34 @@
 		box-sizing: border-box;
 	}
 	/*每个页面公共css */
+	@font-face {
+		font-family: 'typeface1';
+		src: url('https://banmayouxi.oss-cn-beijing.aliyuncs.com/uploads/font/WenQuanZhengHei-1.ttf') format('truetype');
+	}
+	
+	@font-face {
+		font-family: 'typeface2';
+		src: url('https://banmayouxi.oss-cn-beijing.aliyuncs.com/uploads/font/WenQuanWeiMiHei-1.ttf') format('truetype');
+	}
+	
+	@font-face {
+		font-family: 'typeface3';
+		src: url('https://banmayouxi.oss-cn-beijing.aliyuncs.com/uploads/font/FangZhengShuSongJianTi-1.ttf') format('truetype');
+	}
+	
+	@font-face {
+		font-family: 'typeface4';
+		src: url('https://banmayouxi.oss-cn-beijing.aliyuncs.com/uploads/font/FangZhengKaiTiJianTi-1.ttf') format('truetype');
+	}
+	
+	@font-face {
+		font-family: 'typeface5';
+		src: url('https://banmayouxi.oss-cn-beijing.aliyuncs.com/uploads/font/FangZhengHeiTiJianTi-1.ttf') format('truetype');
+	}
+	
+	@font-face {
+		font-family: 'typeface6';
+		src: url('https://banmayouxi.oss-cn-beijing.aliyuncs.com/uploads/font/FangZhengFangSongJianTi-1.ttf') format('truetype');
+	}
+	
 </style>

pages.json

@@ -93,7 +93,7 @@
 	},
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "斑马",
+		"navigationBarTitleText": "",
 		"navigationBarBackgroundColor": "#FFFFFF",
 		"backgroundColor": "#FFFFFF"
 	},

pages/deal/deal.vue

@@ -13,7 +13,7 @@
 					<view class="tips">
 					{{mark_notice}}
 					</view>
-					<u-badge  absolute='true' :offset='[10,30]' bgColor='red' type="warning " max="99" :value="total_num"></u-badge>
+					<u-badge  showZero absolute='true' :offset='[10,30]' bgColor='red' type="warning " max="99" :value="total_num"></u-badge>
 				</view>
 				
 				<u-icon name="arrow-down-fill" :color="{color:current==2?'#A5CF49':'#333333'}"
@@ -176,7 +176,7 @@
 			</view>
 			<view class="labelItem">
 				<view class="label">
-					战力范围
+					战力范围(单位：亿)
 				</view>
 				<view class="value1">
 					<input type="number" v-model="condition.min_force" class="codeInput" placeholder="最低战力">
@@ -186,7 +186,7 @@
 			</view>
 			<view class="labelItem">
 				<view class="label">
-					速度范围
+					速度范围(单位：万)
 				</view>
 				<view class="value1">
 					<input type="number" v-model="condition.min_speed" class="codeInput" placeholder="最低速度">
@@ -196,7 +196,7 @@
 			</view>
 			<view class="labelItem">
 				<view class="label">
-					法伤范围
+					法伤范围(单位：万)
 				</view>
 				<view class="value1">
 					<input type="number" v-model="condition.min_atk" class="codeInput" placeholder="最低法伤">
@@ -206,7 +206,7 @@
 			</view>
 			<view class="labelItem">
 				<view class="label">
-					冰冻范围
+					冰冻范围(单位：万)
 				</view>
 				<view class="value1">
 					<input type="number" v-model="condition.min_property" class="codeInput" placeholder="最低冰冻">
@@ -351,8 +351,8 @@
 		show1.value=false
 		current.value=0
 		getGoodsList(condition.value).then(res=>{
+			getNum()
 			bg_list.value=res.data.bg_list
-			total_num.value=res.data.total_num
 			if(condition.value.page==1){
 				goodsList.value=res.data.list
 			}else{
@@ -366,9 +366,52 @@
 // 	visible.value=false
 // },3000)
 	})
+	let getNum=()=>{
+		let count=0
+		if(condition.value.search_name!=''){
+			count+=1
+		}
+		if(condition.value.label_ids.split(',')!=0){
+			count+=condition.value.label_ids.split(',').length
+		}
+		if(condition.value.min_money!=''||condition.value.max_money!=''){
+			count+=1
+		}
+		if(condition.value.min_server!=''||condition.value.max_server!=''){
+			count+=1
+		}
+		if(condition.value.min_partner!=''||condition.value.max_partner!=''){
+			count+=1
+		}
+		if(condition.value.min_level!=''||condition.value.max_level!=''){
+			count+=1
+		}
+		if(condition.value.min_force!=''||condition.value.max_force!=''){
+			count+=1
+		}
+		
+		if(condition.value.min_speed!=''||condition.value.max_speed!=''){
+			count+=1
+		}
+		// console.log(123,condition.value.min_atk,condition.value.max_atk)
+		if(condition.value.min_atk!=''||condition.value.max_atk!=''){
+			count+=1
+		}
+		if(condition.value.min_property!=''||condition.value.max_property!=''){
+			count+=1
+		}
+		if(condition.value.account_type!=0){
+			count+=1
+		}
+		
+		if(condition.value.is_top!=-1){
+			count+=1
+		}
+		total_num.value=count
+	}
 	let reset=()=>{
-		radiovalue1.value = ref()
-		radiovalue2.value = ref()
+		radiovalue1.value = ref(0)
+		radiovalue2.value = ref(-1)
 		checkboxValue1.value=[]
 		condition.value={
 			page:1,
@@ -388,10 +431,11 @@
 			min_speed:'',
 			max_speed:'',
 			min_atk:'',
+			max_atk:'',
 			min_property:'',
 			max_property:'',
-			account_type:'',
-			is_top:'',
+			account_type:0,
+			is_top:-1,
 			label_ids:'',
 			search_name:''
 		}
@@ -430,10 +474,11 @@
 		min_speed:'',
 		max_speed:'',
 		min_atk:'',
+		max_atk:'',
 		min_property:'',
 		max_property:'',
-		account_type:'',
-		is_top:'',
+		account_type:0,
+		is_top:-1,
 		label_ids:'',
 		search_name:''
 	})
@@ -599,9 +644,10 @@ border-radius: 30rpx;
 		.accountItem{
 			border-bottom: 20rpx solid #F5F5F5;
 			display: flex;
-			padding: 24rpx;
+			padding: 8rpx 24rpx;
 			align-items: center;
 			.imgBox{
+				overflow: hidden;
 				position: relative;
 				margin-right: 26rpx;
 				image{
@@ -611,17 +657,18 @@ border-radius: 30rpx;
 					
 				}
 				.bar{
+					display: flex;
+					justify-content: center;
 					font-weight: bold;
 					overflow: hidden;
-					font-size: 30rpx;
+					font-size: 28rpx;
 					color: #fff;
-					line-height: 60rpx;
-					text-align: center;
+					padding: 5rpx;
+					// text-align: center;
 					position: absolute;
 					top: 50%;
 					transform: translateY(-50%);
 					width: 188rpx;
-					height: 60rpx;
 					background: red;
 				}
 				.bule{
@@ -789,14 +836,14 @@ border-radius: 30rpx;
 					width: 100%;
 					text-align: center;
 					position: absolute;
-					bottom: -34rpx;
+					bottom: -40rpx;
 					left: 0;
-					transform: translateX(-50%);
-					font-size: 10rpx;
+					// transform: translateX(-50%);
+					font-size: 8rpx;
 					white-space: nowrap;
 					color: #000;
 					font-weight: bold;
-					transform: scale(0.8);
+					// transform: scale(0.8);
 					
 				}
 			}

pages/deal/productInfo.vue

@@ -17,53 +17,53 @@
 			<view class="attributeBox">
 				<view class="attributeItem">
 					<view class="labelItem">
-						编号：{{info.code}}
+						编号：<text class="fontWeight">{{info.code}}</text>
 					</view>
 					<view class="labelItem">
-						区服：{{info.server}}
+						区服：<text class="fontWeight">{{info.server}}</text>
 					</view>
 				</view>
 				<view class="attributeItem">
-					<view class="labelItem fontWeight">
-						金伙伴：{{info.partner}}
+					<view class="labelItem">
+						金伙伴：<text class="fontWeight">{{info.partner}}</text>
 					</view>
-					<view class="labelItem  fontWeight">
-						vip：V{{info.level}}
+					<view class="labelItem">
+						vip：<text class="fontWeight">{{info.level}}</text>
 					</view>
 					
 				</view>
 				<view class="attributeItem">
-					<view class="labelItem  fontWeight">
-											战力：{{info.force}}亿
+					<view class="labelItem">
+											战力：<text class="fontWeight">{{info.force}}亿</text>
 										</view>
-					<view class="labelItem  fontWeight">
-						速度：{{info.speed}}万
+					<view class="labelItem">
+						速度：<text class="fontWeight">{{info.speed}}万</text>
 					</view>
 					
 				</view>
 				<view class="attributeItem">
-					<view class="labelItem  fontWeight">
-						法伤：{{info.atk}}万
+					<view class="labelItem">
+						法伤：<text class="fontWeight">{{info.atk}}万</text>
 					</view>
 					
 					<view class="labelItem">
-						冰冻：{{info.property}}万
+						冰冻：<text class="fontWeight">{{info.property}}万</text>
 					</view>
 				</view>
 				<view class="attributeItem">
 					<view class="labelItem">
-						渡劫：{{info.dj_level}}
+						渡劫：<text class="fontWeight">{{info.dj_level}}</text>
 					</view>
 					<view class="labelItem">
-						小号数量：{{info.children}}
+						小号数量：<text class="fontWeight">{{info.children}}</text>
 					</view>
 				</view>
 				<view class="attributeItem">
 					<view class="labelItem">
-						是否榜一：{{info.top_one==1?'是':'否'}}
+						是否榜一：<text class="fontWeight">{{info.top_one==1?'是':'否'}}</text>
 					</view>
 					<view class="labelItem">
-						账号类型：{{info.account_type_text}}
+						账号类型：<text class="fontWeight">{{info.account_type_text}}</text>
 					</view>
 				</view>
 			</view>
@@ -141,7 +141,7 @@
 		<view class="swiper-item swiper-itemcopy" id="copyswiperItem">
 			<view class="titleBox" :style="{background: 'url('+BASE_URL+jt_bg1+')'}">
 				<!-- <image :src="BASE_URL+item.qrimage" mode=""></image> -->
-				<limeQrcodeVue ref="qrcodeRef" :value="BASE_URL1+'/h5/#/pages/deal/productInfo?id='+item.id" size="112rpx" ></limeQrcodeVue>
+				<limeQrcodeVue ref="qrcodeRef" :value="BASE_URL1+'/h5/#/pages/deal/productInfo?id='+id" size="112rpx" ></limeQrcodeVue>
 				<view class="title">
 					<p>{{item.title1}}</p>
 			
@@ -155,13 +155,13 @@
 				</view>
 				<view class="watermark" v-if="item.watermark_info&&item.watermark_info.type==1||item.watermark_info&&item.watermark_info.type==3">
 					
-					<view v-for="it in 100" class="" :style="{transform: 'rotate('+item.watermark_info.angle+'deg)',opacity:(100-item.watermark_info.opacity*1)*0.01,color:item.watermark_info.color,marginTop:item.watermark_info.hh+'px',marginBottom:item.watermark_info.hh+'px',marginLeft:item.watermark_info.ww+'px',marginRight:item.watermark_info.ww+'px',fontSize:item.watermark_info.text_font+'px'}">
+					<view v-for="it in 100" class="" :style="{transform: 'rotate('+item.watermark_info.angle+'deg)',opacity:(100-item.watermark_info.opacity*1)*0.01,color:item.watermark_info.color,marginTop:item.watermark_info.hh+'px',marginBottom:item.watermark_info.hh+'px',marginLeft:item.watermark_info.ww+'px',marginRight:item.watermark_info.ww+'px',fontSize:item.watermark_info.text_font+'px',fontWeight:item.watermark_info.bold==1?'bold':'',fontFamily:item.watermark_info.typeface==1?'typeface1':item.watermark_info.typeface==2?'typeface2':item.watermark_info.typeface==3?'typeface3':item.watermark_info.typeface==4?'typeface4':item.watermark_info.typeface==5?'typeface5':item.watermark_info.typeface==6?'typeface6':''}">
 						<image  :src="BASE_URL+item.watermark_info.image" mode="" v-if="item.watermark_info.image&&item.watermark_info.type==1"></image>
 						<text v-if="item.watermark_info.water_text&&item.watermark_info.type==3">{{item.watermark_info.water_text}}</text>
 					</view>
 				</view>
 				<view class="watermark1" 
-				:style="{left:item.watermark_info.waterPos==0?0+item.watermark_info.xx+'px':item.watermark_info.waterPos==1?0+item.watermark_info.xx+'px':item.watermark_info.waterPos==4?0+item.watermark_info.voffset+'px':item.watermark_info.waterPos==7?0+item.watermark_info.xx+'px':item.watermark_info.waterPos==2?'calc( 40%'+' + '+item.watermark_info.xx+'px )':item.watermark_info.waterPos==5?'calc( 40%'+' + '+item.watermark_info.voffset+'px )':item.watermark_info.waterPos==8?'calc( 40%'+' + '+item.watermark_info.xx+'px )':'',top:item.watermark_info.waterPos==0?0+item.watermark_info.yy+'px':item.watermark_info.waterPos==1?0+item.watermark_info.yy+'px':item.watermark_info.waterPos==2?0+item.watermark_info.yy+'px':item.watermark_info.waterPos==3?0+item.watermark_info.yy+'px':item.watermark_info.waterPos==4?'40%':item.watermark_info.waterPos==5?'40%':item.watermark_info.waterPos==6?'40%':'',right:item.watermark_info.waterPos==3?0+item.watermark_info.xx+'px':item.watermark_info.waterPos==6?0+item.watermark_info.waterPos+'px':item.watermark_info.waterPos==9?0+item.watermark_info.xx+'px':'',bottom:item.watermark_info.waterPos==7?0+item.watermark_info.xx+'px':item.watermark_info.waterPos==8?0+item.watermark_info.ww+'px':item.watermark_info.waterPos==9?0+item.watermark_info.xx+'px':''}"
+				:style="{left:item.watermark_info.waterPos==0?0+item.watermark_info.xx+'px':item.watermark_info.waterPos==1?0+item.watermark_info.xx+'px':item.watermark_info.waterPos==4?0+item.watermark_info.voffset+'px':item.watermark_info.waterPos==7?0+item.watermark_info.xx+'px':item.watermark_info.waterPos==2?'calc( 40%'+' + '+item.watermark_info.xx+'px )':item.watermark_info.waterPos==5?'calc( 40%'+' + '+item.watermark_info.voffset+'px )':item.watermark_info.waterPos==8?'calc( 40%'+' + '+item.watermark_info.xx+'px )':'',top:item.watermark_info.waterPos==0?0+item.watermark_info.yy+'px':item.watermark_info.waterPos==1?0+item.watermark_info.yy+'px':item.watermark_info.waterPos==2?0+item.watermark_info.yy+'px':item.watermark_info.waterPos==3?0+item.watermark_info.yy+'px':item.watermark_info.waterPos==4?'40%':item.watermark_info.waterPos==5?'40%':item.watermark_info.waterPos==6?'40%':'',right:item.watermark_info.waterPos==3?0+item.watermark_info.xx+'px':item.watermark_info.waterPos==6?0+item.watermark_info.waterPos+'px':item.watermark_info.waterPos==9?0+item.watermark_info.xx+'px':'',bottom:item.watermark_info.waterPos==7?0+item.watermark_info.xx+'px':item.watermark_info.waterPos==8?0+item.watermark_info.ww+'px':item.watermark_info.waterPos==9?0+item.watermark_info.xx+'px':'',fontWeight:item.watermark_info.bold==1?'bold':'',fontFamily:item.watermark_info.typeface==1?'typeface1':item.watermark_info.typeface==2?'typeface2':item.watermark_info.typeface==3?'typeface3':item.watermark_info.typeface==4?'typeface4':item.watermark_info.typeface==5?'typeface5':item.watermark_info.typeface==6?'typeface6':''}"
 				v-if="item.watermark_info&&item.watermark_info.type==2||item.watermark_info&&item.watermark_info.type==4">
 					
 					<view  class="" :style="{transform: 'rotate('+item.watermark_info.angle+'deg)',opacity:(100-item.watermark_info.opacity*1)*0.01,color:item.watermark_info.color,fontSize:item.watermark_info.text_font+'px'}">
@@ -174,7 +174,8 @@
 		</view>
 		<view class="swiper-item" id="swiperItem"> 
 			<view class="titleBox" :style="{background: 'url('+BASE_URL+jt_bg1+')'}">
-				<limeQrcodeVue v-if="item.id" ref="qrcodeRef" :value="BASE_URL1+'/h5/#/pages/deal/productInfo?id='+item.id" size="112rpx" ></limeQrcodeVue>
+				<limeQrcodeVue v-if="item.id" ref="qrcodeRef" :value="BASE_URL1+'/h5/#/pages/deal/productInfo?id='+id" size="112rpx" ></limeQrcodeVue>
+				<!-- <image :src="BASE_URL+item.qrimage" mode=""></image> -->
 				<view class="title">
 					<p>{{item.title1}}</p>
 
@@ -188,12 +189,12 @@
 				</view>
 				<view class="watermark" v-if="item.watermark_info&&item.watermark_info.type==1||item.watermark_info&&item.watermark_info.type==3">
 					
-					<view v-for="it in 100" class="" :style="{transform: 'rotate('+item.watermark_info.angle+'deg)',opacity:(100-item.watermark_info.opacity*1)*0.01,color:item.watermark_info.color,marginTop:item.watermark_info.hh+'px',marginBottom:item.watermark_info.hh+'px',marginLeft:item.watermark_info.ww+'px',marginRight:item.watermark_info.ww+'px',fontSize:item.watermark_info.text_font+'px'}">
+					<view v-for="it in 100" class="" :style="{transform: 'rotate('+item.watermark_info.angle+'deg)',opacity:(100-item.watermark_info.opacity*1)*0.01,color:item.watermark_info.color,marginTop:item.watermark_info.hh+'px',marginBottom:item.watermark_info.hh+'px',marginLeft:item.watermark_info.ww+'px',marginRight:item.watermark_info.ww+'px',fontSize:item.watermark_info.text_font+'px',fontWeight:item.watermark_info.bold==1?'bold':'',fontFamily:item.watermark_info.typeface==1?'typeface1':item.watermark_info.typeface==2?'typeface2':item.watermark_info.typeface==3?'typeface3':item.watermark_info.typeface==4?'typeface4':item.watermark_info.typeface==5?'typeface5':item.watermark_info.typeface==6?'typeface6':''}">
 						<image  :src="BASE_URL+item.watermark_info.image" mode="" v-if="item.watermark_info.image&&item.watermark_info.type==1"></image>
 						<text v-if="item.watermark_info.water_text&&item.watermark_info.type==3">{{item.watermark_info.water_text}}</text>
 					</view>
 				</view>
-				<view class="watermark1" :style="{left:item.watermark_info.waterPos==0?0:item.watermark_info.waterPos==1?0:item.watermark_info.waterPos==4?0:item.watermark_info.waterPos==7?0:item.watermark_info.waterPos==2?'40%':item.watermark_info.waterPos==5?'40%':item.watermark_info.waterPos==8?'40%':'',top:item.watermark_info.waterPos==0?0:item.watermark_info.waterPos==1?0:item.watermark_info.waterPos==2?0:item.watermark_info.waterPos==3?0:item.watermark_info.waterPos==4?'40%':item.watermark_info.waterPos==5?'40%':item.watermark_info.waterPos==6?'40%':'',right:item.watermark_info.waterPos==3?0:item.watermark_info.waterPos==6?0:item.watermark_info.waterPos==9?0:'',bottom:item.watermark_info.waterPos==7?0:item.watermark_info.waterPos==8?0:item.watermark_info.waterPos==9?0:''}"  v-if="item.watermark_info&&item.watermark_info.type==2||item.watermark_info&&item.watermark_info.type==4">
+				<view class="watermark1" :style="{left:item.watermark_info.waterPos==0?0:item.watermark_info.waterPos==1?0:item.watermark_info.waterPos==4?0:item.watermark_info.waterPos==7?0:item.watermark_info.waterPos==2?'40%':item.watermark_info.waterPos==5?'40%':item.watermark_info.waterPos==8?'40%':'',top:item.watermark_info.waterPos==0?0:item.watermark_info.waterPos==1?0:item.watermark_info.waterPos==2?0:item.watermark_info.waterPos==3?0:item.watermark_info.waterPos==4?'40%':item.watermark_info.waterPos==5?'40%':item.watermark_info.waterPos==6?'40%':'',right:item.watermark_info.waterPos==3?0:item.watermark_info.waterPos==6?0:item.watermark_info.waterPos==9?0:'',bottom:item.watermark_info.waterPos==7?0:item.watermark_info.waterPos==8?0:item.watermark_info.waterPos==9?0:'',fontWeight:item.watermark_info.bold==1?'bold':'',fontFamily:item.watermark_info.typeface==1?'typeface1':item.watermark_info.typeface==2?'typeface2':item.watermark_info.typeface==3?'typeface3':item.watermark_info.typeface==4?'typeface4':item.watermark_info.typeface==5?'typeface5':item.watermark_info.typeface==6?'typeface6':''}"  v-if="item.watermark_info&&item.watermark_info.type==2||item.watermark_info&&item.watermark_info.type==4">
 					
 					<view  class="" :style="{transform: 'rotate('+item.watermark_info.angle+'deg)',opacity:(100-item.watermark_info.opacity*1)*0.01,color:item.watermark_info.color,fontSize:item.watermark_info.text_font+'px'}">
 						<image  :src="BASE_URL+item.watermark_info.image" mode="" v-if="item.watermark_info.image&&item.watermark_info.type==2"></image>
@@ -317,6 +318,7 @@ getGoodsDetail(id.value).then(res=>{
 		}
 	}else{
 		show10.value=true
+		isLoading.value=false
 	}
 	
 	
@@ -426,7 +428,10 @@ getGoodsDetail(id.value).then(res=>{
 		  // console.log(1223,res)
 		          let html = forFn(res)
 				  dom1.innerHTML=html
-		  html2canvas(swiper).then((canvas) => {
+		  html2canvas(swiper,{
+			   allowTaint: true,
+			  useCORS: true
+		  }).then((canvas) => {
 		    url.value = canvas.toDataURL("image/png").replace('image/png', 'image/octet-stream');
 			show.value=true
 		  });  

pages/index/index.vue

@@ -26,14 +26,14 @@
 								v-if="item.watermark_info&&item.watermark_info.type==1||item.watermark_info&&item.watermark_info.type==3">
 							
 								<view v-for="it in 9" class=""
-									:style="{transform: 'rotate('+item.watermark_info.angle+'deg)',opacity:(100-item.watermark_info.opacity*1)*0.01,color:item.watermark_info.color,marginTop:item.watermark_info.hh+'px',marginBottom:item.watermark_info.hh+'px',marginLeft:item.watermark_info.ww+'px',marginRight:item.watermark_info.ww+'px',fontSize:item.watermark_info.text_font+'px'}">
+									:style="{transform: 'rotate('+item.watermark_info.angle+'deg)',opacity:(100-item.watermark_info.opacity*1)*0.01,color:item.watermark_info.color,marginTop:item.watermark_info.hh+'px',marginBottom:item.watermark_info.hh+'px',marginLeft:item.watermark_info.ww+'px',marginRight:item.watermark_info.ww+'px',fontSize:item.watermark_info.text_font+'px',fontWeight:item.watermark_info.bold==1?'bold':'',fontFamily:item.watermark_info.typeface==1?'typeface1':item.watermark_info.typeface==2?'typeface2':item.watermark_info.typeface==3?'typeface3':item.watermark_info.typeface==4?'typeface4':item.watermark_info.typeface==5?'typeface5':item.watermark_info.typeface==6?'typeface6':''}">
 									<image :src="BASE_URL+item.watermark_info.image" mode="" v-if="item.watermark_info.image&&item.watermark_info.type==1"></image>
 									<text
 										v-if="item.watermark_info.water_text&&item.watermark_info.type==3">{{item.watermark_info.water_text}}</text>
 								</view>
 							</view>
 							<view class="watermark1"
-								:style="{left:item.watermark_info.waterPos==0?0:item.watermark_info.waterPos==1?0:item.watermark_info.waterPos==4?0:item.watermark_info.waterPos==7?0:item.watermark_info.waterPos==2?'40%':item.watermark_info.waterPos==5?'40%':item.watermark_info.waterPos==8?'40%':'',top:item.watermark_info.waterPos==0?0:item.watermark_info.waterPos==1?0:item.watermark_info.waterPos==2?0:item.watermark_info.waterPos==3?0:item.watermark_info.waterPos==4?'40%':item.watermark_info.waterPos==5?'40%':item.watermark_info.waterPos==6?'40%':'',right:item.watermark_info.waterPos==3?0:item.watermark_info.waterPos==6?0:item.watermark_info.waterPos==9?0:'',bottom:item.watermark_info.waterPos==7?0:item.watermark_info.waterPos==8?0:item.watermark_info.waterPos==9?0:''}"
+								:style="{left:item.watermark_info.waterPos==0?0:item.watermark_info.waterPos==1?0:item.watermark_info.waterPos==4?0:item.watermark_info.waterPos==7?0:item.watermark_info.waterPos==2?'40%':item.watermark_info.waterPos==5?'40%':item.watermark_info.waterPos==8?'40%':'',top:item.watermark_info.waterPos==0?0:item.watermark_info.waterPos==1?0:item.watermark_info.waterPos==2?0:item.watermark_info.waterPos==3?0:item.watermark_info.waterPos==4?'40%':item.watermark_info.waterPos==5?'40%':item.watermark_info.waterPos==6?'40%':'',right:item.watermark_info.waterPos==3?0:item.watermark_info.waterPos==6?0:item.watermark_info.waterPos==9?0:'',bottom:item.watermark_info.waterPos==7?0:item.watermark_info.waterPos==8?0:item.watermark_info.waterPos==9?0:'',fontWeight:item.watermark_info.bold==1?'bold':'',fontFamily:item.watermark_info.typeface==1?'typeface1':item.watermark_info.typeface==2?'typeface2':item.watermark_info.typeface==3?'typeface3':item.watermark_info.typeface==4?'typeface4':item.watermark_info.typeface==5?'typeface5':item.watermark_info.typeface==6?'typeface6':''}"
 								v-if="item.watermark_info&&item.watermark_info.type==2||item.watermark_info&&item.watermark_info.type==4">
 							
 								<view class=""
@@ -69,7 +69,7 @@
 								v-if="item.watermark_info&&item.watermark_info.type==1||item.watermark_info&&item.watermark_info.type==3">
 
 								<view v-for="it in 100" class=""
-									:style="{transform: 'rotate('+item.watermark_info.angle+'deg)',opacity:(100-item.watermark_info.opacity*1)*0.01,color:item.watermark_info.color,marginTop:item.watermark_info.hh+'px',marginBottom:item.watermark_info.hh+'px',marginLeft:item.watermark_info.ww+'px',marginRight:item.watermark_info.ww+'px',fontSize:item.watermark_info.text_font+'px'}">
+									:style="{transform: 'rotate('+item.watermark_info.angle+'deg)',opacity:(100-item.watermark_info.opacity*1)*0.01,color:item.watermark_info.color,marginTop:item.watermark_info.hh+'px',marginBottom:item.watermark_info.hh+'px',marginLeft:item.watermark_info.ww+'px',marginRight:item.watermark_info.ww+'px',fontSize:item.watermark_info.text_font+'px',fontWeight:item.watermark_info.bold==1?'bold':'',fontFamily:item.watermark_info.typeface==1?'typeface1':item.watermark_info.typeface==2?'typeface2':item.watermark_info.typeface==3?'typeface3':item.watermark_info.typeface==4?'typeface4':item.watermark_info.typeface==5?'typeface5':item.watermark_info.typeface==6?'typeface6':''}">
 									<image :src="BASE_URL+item.watermark_info.image" mode=""
 										v-if="item.watermark_info.image&&item.watermark_info.type==1"></image>
 									<text
@@ -77,7 +77,7 @@
 								</view>
 							</view>
 							<view class="watermark1"
-								:style="{left:item.watermark_info.waterPos==0?0+item.watermark_info.xx+'px':item.watermark_info.waterPos==1?0+item.watermark_info.xx+'px':item.watermark_info.waterPos==4?0+item.watermark_info.voffset+'px':item.watermark_info.waterPos==7?0+item.watermark_info.xx+'px':item.watermark_info.waterPos==2?'calc( 40%'+' + '+item.watermark_info.xx+'px )':item.watermark_info.waterPos==5?'calc( 40%'+' + '+item.watermark_info.voffset+'px )':item.watermark_info.waterPos==8?'calc( 40%'+' + '+item.watermark_info.xx+'px )':'',top:item.watermark_info.waterPos==0?0+item.watermark_info.yy+'px':item.watermark_info.waterPos==1?0+item.watermark_info.yy+'px':item.watermark_info.waterPos==2?0+item.watermark_info.yy+'px':item.watermark_info.waterPos==3?0+item.watermark_info.yy+'px':item.watermark_info.waterPos==4?'40%':item.watermark_info.waterPos==5?'40%':item.watermark_info.waterPos==6?'40%':'',right:item.watermark_info.waterPos==3?0+item.watermark_info.xx+'px':item.watermark_info.waterPos==6?0+item.watermark_info.waterPos+'px':item.watermark_info.waterPos==9?0+item.watermark_info.xx+'px':'',bottom:item.watermark_info.waterPos==7?0+item.watermark_info.xx+'px':item.watermark_info.waterPos==8?0+item.watermark_info.ww+'px':item.watermark_info.waterPos==9?0+item.watermark_info.xx+'px':''}"
+								:style="{left:item.watermark_info.waterPos==0?0+item.watermark_info.xx+'px':item.watermark_info.waterPos==1?0+item.watermark_info.xx+'px':item.watermark_info.waterPos==4?0+item.watermark_info.voffset+'px':item.watermark_info.waterPos==7?0+item.watermark_info.xx+'px':item.watermark_info.waterPos==2?'calc( 40%'+' + '+item.watermark_info.xx+'px )':item.watermark_info.waterPos==5?'calc( 40%'+' + '+item.watermark_info.voffset+'px )':item.watermark_info.waterPos==8?'calc( 40%'+' + '+item.watermark_info.xx+'px )':'',top:item.watermark_info.waterPos==0?0+item.watermark_info.yy+'px':item.watermark_info.waterPos==1?0+item.watermark_info.yy+'px':item.watermark_info.waterPos==2?0+item.watermark_info.yy+'px':item.watermark_info.waterPos==3?0+item.watermark_info.yy+'px':item.watermark_info.waterPos==4?'40%':item.watermark_info.waterPos==5?'40%':item.watermark_info.waterPos==6?'40%':'',right:item.watermark_info.waterPos==3?0+item.watermark_info.xx+'px':item.watermark_info.waterPos==6?0+item.watermark_info.waterPos+'px':item.watermark_info.waterPos==9?0+item.watermark_info.xx+'px':'',bottom:item.watermark_info.waterPos==7?0+item.watermark_info.xx+'px':item.watermark_info.waterPos==8?0+item.watermark_info.ww+'px':item.watermark_info.waterPos==9?0+item.watermark_info.xx+'px':'',fontWeight:item.watermark_info.bold==1?'bold':'',fontFamily:item.watermark_info.typeface==1?'typeface1':item.watermark_info.typeface==2?'typeface2':item.watermark_info.typeface==3?'typeface3':item.watermark_info.typeface==4?'typeface4':item.watermark_info.typeface==5?'typeface5':item.watermark_info.typeface==6?'typeface6':''}"
 								v-if="item.watermark_info&&item.watermark_info.type==2||item.watermark_info&&item.watermark_info.type==4">
 
 								<view class=""
@@ -102,7 +102,7 @@
 				</view>
 			</view>
 		</u-overlay>
-		<u-overlay :show="show2" @click="show2 = false">
+		<u-overlay :show="show2" @click="show2 = false" @touchstart="start" @touchend="end" @touchmove="move">
 			<view class="warp">
 				<view class="rect2">
 					<image src="../../static/swiper1.png" mode=""></image>
@@ -142,10 +142,54 @@
 		getsimpleimages,
 		getplatformeditor,getplatformmeun
 	} from '@/utils/api.js'
+	let isSave=ref(false)
 	let show = ref(false)
 	let show1 = ref(false)
 	let show2 = ref(false)
-	
+	let startData=ref({clientX: '',clientY: '',})
+			let moveX=ref(0)
+			let touch=ref({})
+	// let touch=(e)=>{
+	// 	console.log(123,e)
+	// 	current.value++
+	// 	// show2.value = false
+	// }
+	// 触摸touch事件
+	let	start=(e)=>{  //@touchstart 触摸开始
+		    startData.value.clientX = e.changedTouches[0].clientX;   //手指按下时的X坐标         
+		}
+		let	end=(e)=>{  //@touchend触摸结束
+			moveX.value = 0;  //触摸事件结束恢复原状
+			console.log(123,touch.value.clientX-startData.value.clientX)
+			if(touch.value.clientX-startData.value.clientX> 0) {  //在事件结束时，判断滑动的距离是否达到出发需要执行事件的要求
+				if(current.value!=0){
+					current.value-=1
+				}
+			} else {
+				current.value+=1
+				// this.touch = {};
+			}
+		}
+		let	move=(event)=>{  //@touchmove触摸移动
+			let touch1 = event.touches[0];  //滑动过程中，手指滑动的坐标信息 返回的是Objcet对象
+			touch.value = touch1;
+			let data = touch1.clientX - startData.value.clientX;
+			if(touch1.clientX < startData.value.clientX) {  //向左移动
+				if(data<-250) {
+					data = -250;
+				}
+			}
+			if(touch1.clientX > startData.value.clientX) {  //向右移动
+				if(moveX.value == 0) {
+					data = 0
+				} else {
+					if(data>50) {
+						data = 50;
+					}
+				}
+			}
+			moveX.value = data;
+		}
 	let swiperChange = (e) => {
 		
 		current.value = e.detail.current
@@ -225,12 +269,13 @@
 		var dom1 = document.getElementById('copycontent'+current.value); // 获取dom元素
 		  dom1.innerHTML=dom.innerHTML
 		  let res = domTrans(dom1)
-		  console.log(1223,res)
 		          let html = forFn(res)
 				  dom1.innerHTML=html
-		  html2canvas(swiper).then((canvas) => {
+		  html2canvas(swiper,{
+			   allowTaint: true,
+			  useCORS: true
+		  }).then((canvas) => {
 		    url.value = canvas.toDataURL("image/png").replace('image/png', 'image/octet-stream');
-			
 			show.value=true
 		  });  
 	}
@@ -461,6 +506,10 @@
 
 
 <style lang="scss">
+	
+	.typeface1{
+		font-family:typeface1;
+	}
 	.swiper-itemcopy{
 		position: absolute;
 		top: 999px;
@@ -530,10 +579,10 @@
 transform:translate(0);
 }
  50% {
-transform:translate(-30px);
+transform:translate(-40px);
 }
  100% {
-transform:translate(-60px);
+transform:translate(-80px);
 }
 0% {
 transform:translate(0);
@@ -549,7 +598,7 @@ transform:translate(0);
 			height: 361rpx;
 		}
 		transform: translate(0);
-		animation:example1 2s linear  0s backwards;
+		animation:example1 1s linear  0s backwards;
 		animation-iteration-count:infinite;
 		
 	}

uni_modules/zb-tooltip/components/zb-tooltip/zb-tooltip.vue

@@ -215,15 +215,15 @@
 	.zb-tooltip{
 		position: absolute;
 		transform: translate(0);
-		animation:example1 2s linear  0s backwards;
+		animation:example1 1s linear  0s backwards;
 		animation-iteration-count:infinite;
 	}
 	@keyframes example1 {
 	0% {
-	transform:translateY(0);
+	transform:translateY(20px);
 	}
 	 25% {
-	transform:translateY(-10px);
+	transform:translateY(10px);
 	}
 	 50% {
 	transform:translateY(0);
@@ -232,7 +232,7 @@
 	transform:translateY(10px);
 	}
 	100% {
-	transform:translateY(0px);
+	transform:translateY(20px);
 	}
 	}
 	.zb_tooltip_content{

unpackage/dist/build/h5/assets/pages-notice-notice.2565cf6a.js

@@ -1 +0,0 @@
-import{r as t,g as a,s as e,a as s,L as o,e as l,o as n,f as u,w as r,i as c,h as f,n as i,u as _,j as d,A as m,x as p}from"./index-d3a1e3c2.js";import{_ as b}from"./u-notice-bar.57fe320a.js";import{_ as v,o as y,a as j,b as x,r as C}from"./u-icon.78edcd83.js";import{_ as g}from"./u-parse.4f4c9fd9.js";/* empty css                                                                   */const k=v({__name:"notice",setup(v){let k=t(""),A=t("");y((()=>{a().then((t=>{e({title:t.data.name})})),s().then((t=>{k.value=t.data.platform_information,A.value=t.data.platform_rules})),h.value=o().globalData.config.infomation_notice})),j((()=>{}));let h=t(""),F=t(1),I=t=>{F.value!=t&&(F.value=t)};return x((()=>{setTimeout((function(){l()}),1e3)})),(t,a)=>{const e=m,s=c,o=C(p("u-notice-bar"),b),l=C(p("u-parse"),g);return n(),u(s,{class:""},{default:r((()=>[f(s,{class:"sort"},{default:r((()=>[f(s,{class:"sortItem",style:i({color:1==_(F)?"#A5CF49":"#333333"}),onClick:a[0]||(a[0]=t=>_(I)(1))},{default:r((()=>[f(e,null,{default:r((()=>[d("平台资讯")])),_:1})])),_:1},8,["style"]),f(s,{class:"sortItem",onClick:a[1]||(a[1]=t=>_(I)(2)),style:i({color:2==_(F)?"#A5CF49":"#333333"})},{default:r((()=>[f(e,null,{default:r((()=>[d("平台规则")])),_:1})])),_:1},8,["style"])])),_:1}),f(s,{class:"notice"},{default:r((()=>[f(o,{text:_(h),color:"#fff",bgColor:"#A5CF49",fontSize:"16"},null,8,["text"])])),_:1}),f(s,{class:"content"},{default:r((()=>[1==_(F)?(n(),u(l,{key:0,content:_(k)},null,8,["content"])):(n(),u(l,{key:1,content:_(A)},null,8,["content"]))])),_:1})])),_:1})}}},[["__scopeId","data-v-7808cb32"]]);export{k as default};

unpackage/dist/build/h5/assets/pages-notice-notice.f5b41081.js

@@ -0,0 +1 @@
+import{r as t,g as a,s as e,a as s,L as o,e as l,o as n,f as u,w as r,i as c,h as i,n as _,u as f,j as d,A as m,x as p}from"./index-8f185d2b.js";import{_ as v}from"./u-notice-bar.ee3f2e0f.js";import{_ as y,o as b,a as j,b as x,r as C}from"./u-icon.098e319a.js";import{_ as g}from"./u-parse.d965ba50.js";/* empty css                                                                   */const k=y({__name:"notice",setup(y){let k=t(""),A=t("");b((()=>{a().then((t=>{e({title:t.data.name})})),s().then((t=>{k.value=t.data.platform_information,A.value=t.data.platform_rules})),h.value=o().globalData.config.infomation_notice})),j((()=>{}));let h=t(""),F=t(1),I=t=>{F.value!=t&&(F.value=t)};return x((()=>{setTimeout((function(){l()}),1e3)})),(t,a)=>{const e=m,s=c,o=C(p("u-notice-bar"),v),l=C(p("u-parse"),g);return n(),u(s,{class:""},{default:r((()=>[i(s,{class:"sort"},{default:r((()=>[i(s,{class:"sortItem",style:_({color:1==f(F)?"#A5CF49":"#333333"}),onClick:a[0]||(a[0]=t=>f(I)(1))},{default:r((()=>[i(e,null,{default:r((()=>[d("平台资讯")])),_:1})])),_:1},8,["style"]),i(s,{class:"sortItem",onClick:a[1]||(a[1]=t=>f(I)(2)),style:_({color:2==f(F)?"#A5CF49":"#333333"})},{default:r((()=>[i(e,null,{default:r((()=>[d("平台规则")])),_:1})])),_:1},8,["style"])])),_:1}),i(s,{class:"notice"},{default:r((()=>[i(o,{text:f(h),color:"#fff",bgColor:"#A5CF49",fontSize:"16"},null,8,["text"])])),_:1}),i(s,{class:"content"},{default:r((()=>[1==f(F)?(n(),u(l,{key:0,content:f(k)},null,8,["content"])):(n(),u(l,{key:1,content:f(A)},null,8,["content"]))])),_:1})])),_:1})}}},[["__scopeId","data-v-7808cb32"]]);export{k as default};

unpackage/dist/build/h5/assets/pages-skip-skip.97451523.js → unpackage/dist/build/h5/assets/pages-skip-skip.9baf2435.js

@@ -1 +1 @@
-import{r as a,g as t,s as e,e as s,o,f as u,w as l,i as n,u as r,h as c,z as i,x as f,W as m}from"./index-d3a1e3c2.js";import{_ as p}from"./u-notice-bar.57fe320a.js";import{_,o as d,a as j,b,r as v}from"./u-icon.78edcd83.js";import{_ as x}from"./u-parse.4f4c9fd9.js";const k=_({__name:"skip",setup(_){let k=a(""),y=a();d((()=>{t().then((a=>{e({title:a.data.name});let t=a.data;1==t.jtype?(y.value=1,g.value=t.jump_url):(y.value=2,g.value=t.jump_text,k.value=t.jump_notice)}))}));let g=a("");return j((()=>{})),b((()=>{setTimeout((function(){s()}),1e3)})),(a,t)=>{const e=v(f("u-notice-bar"),p),s=n,_=m,d=v(f("u-parse"),x);return o(),u(s,{class:""},{default:l((()=>[2==r(y)?(o(),u(s,{key:0,class:"notice"},{default:l((()=>[c(e,{text:r(k),color:"#fff",bgColor:"#A5CF49",fontSize:"16"},null,8,["text"])])),_:1})):i("",!0),1==r(y)?(o(),u(_,{key:1,src:r(g)},null,8,["src"])):i("",!0),2==r(y)?(o(),u(s,{key:2,class:"content"},{default:l((()=>[c(d,{content:r(g)},null,8,["content"])])),_:1})):i("",!0)])),_:1})}}},[["__scopeId","data-v-62b993bb"]]);export{k as default};
+import{r as a,g as t,s as e,e as s,o,f as u,w as l,i as n,u as r,h as c,z as i,x as f,W as m}from"./index-8f185d2b.js";import{_ as p}from"./u-notice-bar.ee3f2e0f.js";import{_,o as d,a as j,b,r as v}from"./u-icon.098e319a.js";import{_ as x}from"./u-parse.d965ba50.js";const k=_({__name:"skip",setup(_){let k=a(""),y=a();d((()=>{t().then((a=>{e({title:a.data.name});let t=a.data;1==t.jtype?(y.value=1,g.value=t.jump_url):(y.value=2,g.value=t.jump_text,k.value=t.jump_notice)}))}));let g=a("");return j((()=>{})),b((()=>{setTimeout((function(){s()}),1e3)})),(a,t)=>{const e=v(f("u-notice-bar"),p),s=n,_=m,d=v(f("u-parse"),x);return o(),u(s,{class:""},{default:l((()=>[2==r(y)?(o(),u(s,{key:0,class:"notice"},{default:l((()=>[c(e,{text:r(k),color:"#fff",bgColor:"#A5CF49",fontSize:"16"},null,8,["text"])])),_:1})):i("",!0),1==r(y)?(o(),u(_,{key:1,src:r(g)},null,8,["src"])):i("",!0),2==r(y)?(o(),u(s,{key:2,class:"content"},{default:l((()=>[c(d,{content:r(g)},null,8,["content"])])),_:1})):i("",!0)])),_:1})}}},[["__scopeId","data-v-62b993bb"]]);export{k as default};

unpackage/dist/build/h5/assets/zb-tooltip-8c19be3a.css

@@ -1 +0,0 @@
-.zb-tooltip[data-v-9f289bd2]{position:absolute;transform:translate(0);animation:example1-9f289bd2 2s linear 0s backwards;animation-iteration-count:infinite}@keyframes example1-9f289bd2{0%{transform:translateY(0)}25%{transform:translateY(-10px)}50%{transform:translateY(0)}75%{transform:translateY(10px)}to{transform:translateY(0)}}.zb_tooltip_content[data-v-9f289bd2]{position:relative;display:inline-block}.zb_tooltip__popper[data-v-9f289bd2]{background:var(--theme-bg-color);visibility:hidden;position:absolute;border-radius:4px;font-size:12px;padding:0 10px;min-width:10px;word-wrap:break-word;display:inline-block;white-space:nowrap;z-index:9}.zb_popper__icon[data-v-9f289bd2]{width:0;height:0;z-index:9;position:absolute}.zb_popper__arrow[data-v-9f289bd2]{bottom:-5px;border-left:6px solid transparent;border-right:6px solid transparent;border-top:6px solid var(--theme-bg-color)}.zb_popper__right[data-v-9f289bd2]{border-top:6px solid transparent;border-bottom:6px solid transparent;border-right:6px solid var(--theme-bg-color);left:-5px}.zb_popper__left[data-v-9f289bd2]{border-top:6px solid transparent;border-bottom:6px solid transparent;border-left:6px solid var(--theme-bg-color);right:-5px}.zb_popper__up[data-v-9f289bd2]{border-left:6px solid transparent;border-right:6px solid transparent;border-bottom:6px solid var(--theme-bg-color);top:-5px}.fixed[data-v-9f289bd2]{position:absolute;width:100vw;height:100vh;position:fixed;left:0;top:0;pointer-events:auto;background:red;z-index:-1}

unpackage/dist/build/h5/assets/zb-tooltip-eb7ef32d.css

@@ -0,0 +1 @@
+.zb-tooltip[data-v-7dd658dc]{position:absolute;transform:translate(0);animation:example1-7dd658dc 1s linear 0s backwards;animation-iteration-count:infinite}@keyframes example1-7dd658dc{0%{transform:translateY(20px)}25%{transform:translateY(10px)}50%{transform:translateY(0)}75%{transform:translateY(10px)}to{transform:translateY(20px)}}.zb_tooltip_content[data-v-7dd658dc]{position:relative;display:inline-block}.zb_tooltip__popper[data-v-7dd658dc]{background:var(--theme-bg-color);visibility:hidden;position:absolute;border-radius:4px;font-size:12px;padding:0 10px;min-width:10px;word-wrap:break-word;display:inline-block;white-space:nowrap;z-index:9}.zb_popper__icon[data-v-7dd658dc]{width:0;height:0;z-index:9;position:absolute}.zb_popper__arrow[data-v-7dd658dc]{bottom:-5px;border-left:6px solid transparent;border-right:6px solid transparent;border-top:6px solid var(--theme-bg-color)}.zb_popper__right[data-v-7dd658dc]{border-top:6px solid transparent;border-bottom:6px solid transparent;border-right:6px solid var(--theme-bg-color);left:-5px}.zb_popper__left[data-v-7dd658dc]{border-top:6px solid transparent;border-bottom:6px solid transparent;border-left:6px solid var(--theme-bg-color);right:-5px}.zb_popper__up[data-v-7dd658dc]{border-left:6px solid transparent;border-right:6px solid transparent;border-bottom:6px solid var(--theme-bg-color);top:-5px}.fixed[data-v-7dd658dc]{position:absolute;width:100vw;height:100vh;position:fixed;left:0;top:0;pointer-events:auto;background:red;z-index:-1}

unpackage/dist/build/h5/index.html

@@ -25,8 +25,8 @@
     <title>banma</title>
     <!--preload-links-->
     <!--app-context-->
-    <script type="module" crossorigin src="/h5/assets/index-d3a1e3c2.js"></script>
-    <link rel="stylesheet" href="/h5/assets/index-4ebba7e9.css">
+    <script type="module" crossorigin src="/h5/assets/index-8f185d2b.js"></script>
+    <link rel="stylesheet" href="/h5/assets/index-8dee9acb.css">
   </head>
   <body>
     <div id="app"><!--app-html--></div>