更新 'pages/painting/draw.vue'

pages/painting/draw.vue

@@ -80,10 +80,22 @@
 				<div class="conList">
 					<div class="item" v-for="(item,index) in cankaoImgList.slice(0,8)"
 						@click="handleSelModal(item,index)">
-						<div class="top" :class="[item.id==seledCankaoImg.id?'item_a':'']"
+						
+	 	<div class="top" :class="[item.id==seledCankaoImg.id?'item_a':'']">
+							<img :src="item.path" class="img">
+								<img v-if="item.id==seledCankaoImg.id" src="@/static/b_seled.png" alt="" class="tag" />
+						</div>
+						
+					<!-- 	<div class="top" :class="[item.id==seledCankaoImg.id?'item_a':'']"
 							:style="{backgroundImage:`url(${item.path})`}">
 							<img v-if="item.id==seledCankaoImg.id" src="@/static/b_seled.png" alt="" class="tag" />
-						</div>
+						</div> -->
+						
+						
+						<!-- 	<div class="top" :class="[item.id==seledCankaoImg.id?'item_a':'']"
+								:style="{backgroundImage:`url(${item.path})`}">
+								<img v-if="item.id==seledCankaoImg.id" src="@/static/b_seled.png" alt="" class="tag" />
+							</div> -->
 						<div class="name">
 							{{item.title}}
 						</div>
@@ -101,55 +113,56 @@
 					上传图片
 				</div>
 
-				<div class="tipAndUpBox">
-					<div class="left">
-						<div class="item" v-for="(item,index) in tipList">
-							<img src="@/static/renx.png" alt="" />
-							{{item}}
+			<div class="tipAndUpBox">
+				<div class="left">
+					<div class="item" v-for="(item,index) in tipList">
+						<img src="@/static/renx.png" alt="" />
+						{{item}}
+					</div>
+			
+				
+				</div>
+				<div class="upList">
+					<div class="upBox">
+						<div class="up1 up " @click.stop="upYsImg(0)" :class="[myModal?'up_a':'']"
+							>
+							<img :src="myModal" class="img">
+							<span v-if="!myModal&&!showUpLoading1">点击<br>上传模板</span>
+							<img src="@/static/b_camera.png" alt="" class="camera" />
+			
+							<div v-if="myModal" class="del" @click.stop="myModal='';">
+								<u-icon name="trash" @click.stop="myModal='';" color="#1F79F0" size="20"></u-icon>
+							</div>
+							<u-loading-icon v-if="showUpLoading1" class="loading" text='' textSize="18"
+								mode="circle" vertical duration="1000"></u-loading-icon>
 						</div>
-
-						<div class=" item xxsm" @click="toYszDetail">
-							<!-- <div class="pimg"></div> -->
-							<img class="xxsmInfo" src="@/static/b_info.png" alt="" />
-							<span>详细说明</span>
+						<div class="des">
+							上传模板
 						</div>
 					</div>
-					<div class="upList">
-						<div class="upBox">
-							<div class="up1 up " @click.stop="upYsImg(0)" :class="[myModal?'up_a':'']"
-								:style="{'background-image':`url(${myModal})`}">
-								<span v-if="!myModal&&!showUpLoading1">点击<br>上传模板</span>
-								<img src="@/static/b_camera.png" alt="" class="camera" />
-
-								<div v-if="myModal" class="del" @click.stop="myModal='';">
-									<u-icon name="trash" @click.stop="myModal='';" color="#1F79F0" size="20"></u-icon>
-								</div>
-								<u-loading-icon v-if="showUpLoading1" class="loading" text='' textSize="18"
-									mode="circle" vertical duration="1000"></u-loading-icon>
-							</div>
-							<div class="des">
-								上传模板
+			
+					<div class="upBox">
+						<div class="up2 up" :class="[myPhoto?'up_a':'']"
+							:style="{'background-image':`url(${myPhoto})`}" @click.stop="upYsImg(1)">
+							<span v-if="!myPhoto&&!showUpLoading2">点击<br>上传照片</span>
+							<img src="@/static/b_camera.png" alt="" class="camera" />
+			
+							<div v-if="myPhoto" class="del" @click.stop="myPhoto=''">
+								<u-icon @click.stop="myPhoto=''" name="trash" color="#1F79F0" size="20"></u-icon>
 							</div>
+			
+							<u-loading-icon v-if="showUpLoading2" class="loading" text='' textSize="18"
+								mode="circle" vertical duration="1000"></u-loading-icon>
 						</div>
-
-						<div class="upBox">
-							<div class="up2 up" :class="[myPhoto?'up_a':'']"
-								:style="{'background-image':`url(${myPhoto})`}" @click.stop="upYsImg(1)">
-								<span v-if="!myPhoto&&!showUpLoading2">点击<br>上传照片</span>
-								<img src="@/static/b_camera.png" alt="" class="camera" />
-
-								<div v-if="myPhoto" class="del" @click.stop="myPhoto=''">
-									<u-icon @click.stop="myPhoto=''" name="trash" color="#1F79F0" size="20"></u-icon>
-								</div>
-
-								<u-loading-icon v-if="showUpLoading2" class="loading" text='' textSize="18"
-									mode="circle" vertical duration="1000"></u-loading-icon>
-							</div>
-							<div class="des">
-								上传照片
-							</div>
+						<div class="des">
+							上传照片
 						</div>
 					</div>
+				</div>
+			
+			</div>
+				
+					</div>
 
 				</div>
 				<div class="line"></div>
@@ -159,9 +172,6 @@
 					模板可直接选择上面的现成模板，可点击自己上传<br>
 					仅支持JPG/PNG格式，大小10M以下
 				</div>
-
-
-
 				<!-- <div class="ysBtn" @click="genYishuZhao">
 					生成艺术照
 				</div> -->
@@ -178,6 +188,29 @@
 
 		<view class="directask" v-if="current!=0" style="padding-top: 0;">
 			<!-- <view v-if="modelslist.length>0" class="cu-form-group"> -->
+		<!-- Mj引导页  如果current等于1-->
+		<view v-if="current == 1">
+		<view class="mj-new-leader" v-if="mjShowLead" >
+		
+		<view class="mj-bg">
+				<view class="MjNewshow" :style="{'background-image':`url(${MjNewBaseUrl})`}"></view>
+		</view>
+		<view class="mj-next-btn" @click="mjnextLead"></view>
+		</view>
+		</view>
+		<!-- 如果SD引导页面 如果current等于2 -->
+		<view v-if="current == 2">
+		<view class="mj-new-leader" v-if="sdShowLead" >
+		
+		<view class="mj-bg">
+				<view class="MjNewshow" :style="{'background-image':`url(${MjNewBaseUrl})`}"></view>
+		</view>
+		<view class="mj-next-btn" @click="sdnextLead"></view>
+		</view>
+	
+		</view>
+		
+		
 			<view class="cu-form-group">
 				<view class="cu-title flxe align-center justify-between">
 					<view class="title flxe align-center">模型选择</view>
@@ -195,6 +228,9 @@
 					</block>
 				</view>
 				<view class="engine-container" @click="showmode = true" v-if="current==2">
+					
+					
+					
 					<view class="model_view">模型：{{xzmodels}}</view>
 					<u-icon name="arrow-down-fill" color="#9e9e9e"></u-icon>
 				</view>
@@ -423,13 +459,15 @@
 					:lower-threshold="150" :show-scrollbar="false">
 					<div class="conList_div">
 						<div class="item" v-for="(item,index) in cankaoImgList" @click="handleSelMoreModal(item,index)">
-							<div class="top" :class="[item.id==seledCankaoImg_temp.id?'item_a':'']"
-								:style="{backgroundImage:`url(${item.path})`}">
+							<div class="top" :class="[item.id==seledCankaoImg_temp.id?'item_a':'']" 
+								>
+								<img class="img"  :src="item.path">
 								<img v-if="item.id==seledCankaoImg_temp.id" src="@/static/b_seled.png" alt=""
 									class="tag" />
 							</div>
 							<div class="name">
-								{{item.title}}
+								  {{item.title}} 
+							
 							</div>
 						</div>
 					</div>
@@ -490,6 +528,7 @@
 				showDemo: false,
 				demoImg: 'https://oaigc.oss-cn-chengdu.aliyuncs.com/face/demo.jpg',
 				leadBaseUrl: BaseUrl.leadBaseUrl,
+				MjNewBaseUrl:BaseUrl.NewBaseUrl,
 				// 艺术照
 				tipList: ['五官清晰', '人像正面', '人脸无遮挡', '照片清晰'],
 
@@ -536,8 +575,8 @@
 
 				showMorePopup: false,
 
-
-
+sdShowLead:false,
+mjShowLead :false,
 				showHuiHuaLead: false,
 				showLead2: false,
 				showLead1: true,
@@ -649,8 +688,12 @@
 				// sex: 1,
 				init: true
 			})
-
+//艺术照如果不存在就设置成true
 			this.showHuiHuaLead = !uni.getStorageSync('showHuiHuaLead')
+//在MJ页面如果不存在就设置
+			this.mjShowLead = !uni.getStorageSync('mjShowLead')
+//在SD页面如果不存在就设置成true
+			this.sdShowLead = !uni.getStorageSync('sdShowLead')
 			console.log("uni.getStorageSync('showHuiHuaLead')", uni.getStorageSync('showHuiHuaLead'));
 
 
@@ -841,6 +884,7 @@
 
 				if (res.code == 0) {
 					this.cankaoImgList = res.msg.data.data
+					console.log(this.cankaoImgList) 
 					this.total = res.msg.data.total
 					if (this.page * this.limit < this.total) {
 						this.status = 'loadmore'
@@ -919,7 +963,7 @@
 			handleSelMoreModal(item, index) {
 				if (this.seledCankaoImg_temp.id == item.id) {
 					uni.previewImage({
-						urls: [item.path],
+						urls: [item.previewUrl],
 						longPressActions: {
 							itemList: ['发送给朋友', '保存图片', '收藏'],
 							success: function(data) {
@@ -1206,6 +1250,17 @@
 				this.showLead1 = false
 				this.showLead2 = true
 			},
+			sdnextLead(){
+				this.sdShowLead = false
+				uni.setStorageSync('sdShowLead',true)		
+				// console.log(333)
+							},
+			mjnextLead(){
+				// console.log(33333)
+				 this.mjShowLead = false
+				
+				uni.setStorageSync('mjShowLead',true)
+			},
 			finishLead() {
 				this.showHuiHuaLead = false
 				this.showLead2 = false