From 158c32b93ec5813c022e1355afb8e12c58945379 Mon Sep 17 00:00:00 2001
From: yanyan <evelyn_yanyan@sina.cn>
Date: Wed, 28 Feb 2024 11:26:43 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E8=A7=92=E8=89=B2=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 subpkg/role/role.vue | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/subpkg/role/role.vue b/subpkg/role/role.vue
index fcc5c40..1519555 100644
--- a/subpkg/role/role.vue
+++ b/subpkg/role/role.vue
@@ -3,12 +3,13 @@
 	<view class="wrap">
 	    <view class="secbar"> <span class="back" @click="back()"></span></view>
 	    <view class="mainwrap3"> 
-	      <img src="/static/images/bg_role.jpg" alt="" />
+	      <img src="/static/images/bg_role.jpg" alt=""/>
 	      <view class="role_wrap">
 	        <view class="<strong>contit</strong>">请选择您在“<font style="color:#fd6d1f;">{{sceneName}}</font>”演练中的角色：</view>
 	        <view class="role_box"> 
 			   <block class="role-item" v-for="(item,i) in roleList" :key="i">
-				<span @click="startPractice(item)">{{item.name}}</span>
+				<span  :class="item.choose === 'true' ? 'change_color':''"  @click="chooseRole(item)">{{item.name}}</span>
+			   <!-- <span class="spanitem"  @click="chooseRole(item)">{{item.name}}</span> -->
 			   </block>
 			</view>
 	        <view class="more_role" @click="showMoreRole()"><a>更多角色</a></view>
@@ -86,12 +87,27 @@
 				} = await uni.$http.post('/small/project/role/listAll',{sceneId: this.sceneId})
 				if (!res.success) return uni.$showMsg()
 			
+			   res.data.forEach(item=>{
+				 this.$set(item, 'choose', 'false')
+			   })
 				this.roleList = res.data
 				//uni.$showMsg('数据请求成功！')
 			},
+			chooseRole(item){
+				if (item.choose === "true") {
+					this.$set(item, 'choose', 'false')
+					this.roleId = ''
+				} else if(item.choose === "false"){
+					this.$set(item, 'choose', 'true')
+					this.roleId = item.guid
+				}
+			},
 			startPractice(item) {
+			  if (this.roleId === "") {
+				  return uni.$showMsg('请先选择一个角色')
+			  }
 			  uni.navigateTo({
-			    url: '/subpkg/practice/practice?roleId='+item.guid
+			    url: '/subpkg/practice/practice?roleId='+this.roleId
 			  })
 			},
 			back(){
@@ -288,5 +304,9 @@
 	line-height: 3.0;
 	letter-spacing: 2px;
 }
+.change_color{
+     background:rgba(0, 153, 255, 1.0);
+ }
+ 
 
 </style>
\ No newline at end of file

From c1b6b2c0af45291be6dbd22a008f8b96cd1e6647 Mon Sep 17 00:00:00 2001
From: yanyan <evelyn_yanyan@sina.cn>
Date: Wed, 28 Feb 2024 11:32:29 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E8=A7=92=E8=89=B2=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 subpkg/role/role.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/subpkg/role/role.vue b/subpkg/role/role.vue
index 1519555..6afc6ce 100644
--- a/subpkg/role/role.vue
+++ b/subpkg/role/role.vue
@@ -98,6 +98,7 @@
 					this.$set(item, 'choose', 'false')
 					this.roleId = ''
 				} else if(item.choose === "false"){
+					this.roleList.forEach(item=>{this.$set(item, 'choose', 'false')})
 					this.$set(item, 'choose', 'true')
 					this.roleId = item.guid
 				}
@@ -305,7 +306,7 @@
 	letter-spacing: 2px;
 }
 .change_color{
-     background:rgba(0, 153, 255, 1.0);
+     background:rgba(138, 162, 254, 1.0);
  }
  
 

From d526e630b59790a30948976b77840503413712d6 Mon Sep 17 00:00:00 2001
From: yanyan <evelyn_yanyan@sina.cn>
Date: Wed, 28 Feb 2024 14:58:43 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 subpkg/list/list.vue | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/subpkg/list/list.vue b/subpkg/list/list.vue
index 4a82d53..4d9f6e3 100644
--- a/subpkg/list/list.vue
+++ b/subpkg/list/list.vue
@@ -41,6 +41,7 @@
 					pageSize:10
 				},
 				total:0,
+				search: false,
 				isloading:false,
 				//轮播图数据列表
 				swiperList: [],
@@ -77,7 +78,12 @@
 				res.rows.forEach(item=>{
 					item.uploadPath = uni.$http.baseUrl +item.uploadPath
 				})
-				this.sceneList =[...this.sceneList,...res.rows]
+				if (this.search) {
+					this.sceneList = res.rows
+					this.search = false
+				} else {
+					this.sceneList =[...this.sceneList,...res.rows]
+				}
 				this.total = res.total
 				// uni.$showMsg('数据请求成功！')
 			},
@@ -92,7 +98,8 @@
 				clearTimeout(this.timer)
 				
 				this.timer = setTimeout(() => {
-				  this.name = e
+				  this.queryObj.name = e
+				  this.search = true
 				  this.getSceneList()
 				}, 500)
 			},

From 852c19f27881a070092c4492d5ba19d5f7fd20e8 Mon Sep 17 00:00:00 2001
From: yanyan <evelyn_yanyan@sina.cn>
Date: Thu, 29 Feb 2024 09:20:08 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=AE=8C=E6=88=90=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 subpkg/complete/complete.vue | 64 ++++++++++++++++++++++++++++--------
 1 file changed, 51 insertions(+), 13 deletions(-)

diff --git a/subpkg/complete/complete.vue b/subpkg/complete/complete.vue
index ad7245e..d769e70 100644
--- a/subpkg/complete/complete.vue
+++ b/subpkg/complete/complete.vue
@@ -1,8 +1,8 @@
 <template>
 	<view class="wrap">
 		<view class="stabar"></view>
-		<view class="marsk"></view>
-		<view class="popup-layer">
+		<view class="marsk" v-if="showLayer"></view>
+		<view class="popup-layer" v-if="showMedal">
 			<image class="animg" src="/static/images/joy.png"></image>
 		</view>
 
@@ -13,9 +13,9 @@
 		  <view class="question-item" v-for="(item, i) in questionList" :key="i" @click="itemClickHandler(item)">
 				<span class="question-num">{{i+1}}</span>
 		  </view>
-		  <view class="question-item erritem" v-for="(item, i) in questionList" :key="i" @click="itemClickHandler(item)">
+		  <!-- <view class="question-item erritem" v-for="(item, i) in questionList" :key="i" @click="itemClickHandler(item)">
 			<span class="question-num">{{i+1}}</span>
-		  </view>  
+		  </view>  -->
 			  
 		</view>
 		<view class="answer-content">
@@ -41,7 +41,7 @@
 		<view class="perinfo">
 		  <view class="myitem"> 
 			<!-- <label><button open-type="share"></button>炫耀一下</label> -->
-			<view open-type="share"><label><image src="/static/images/btn-xy.png"></image></label>炫耀一下</view>
+			<view @click="shareUser()"><label><image src="/static/images/btn-xy.png"></image></label>炫耀一下</view>
 		  </view>
 		  <view class="myitem"> 
 			<view @click="review()"><label><image src="/static/images/btn-hg.png"></image></label>演练回顾</view>
@@ -51,15 +51,16 @@
 		  </view>
 		</view>
 	</view>
-	<view class="popup-share">
+	<view class="popup-share" v-if="showShare">
+		<view @click="closeShare()" style="margin-left: 250px;">关闭</view>
 		<label class="medimg"><image src="/static/images/medal_1.png"></image></label>
 		<view class="congrat">恭喜你获得1枚成就勋章！</view>
 		<view class="perinfo">
 		  <view class="myitem"> 
-			<view @click=""><label><image src="/static/images/btn-wx.png"></image></label>分享给微信好友</view>
+			<view @click=""><label><button open-type="share"></button><image src="/static/images/btn-wx.png"></image></label>分享给微信好友</view>
 		  </view>
 		  <view class="myitem"> 
-			<view @click=""><label><image src="/static/images/btn-pyq.png"></image></label>分享到朋友圈</view>
+			<view @click=""><label><button @tap="share"></button><image src="/static/images/btn-pyq.png"></image></label>分享到朋友圈</view>
 		  </view>
 		  <view class="myitem"> 
 			<view @click=""><label><image src="/static/images/btn-ma.png"></image></label>二维码邀请</view>
@@ -80,8 +81,13 @@
 			   recordList: [],
 			   "ask":"",
 			   "answer":"",
+			   "showLayer":true,
+			   "showAnlysisc":false,
+			   "showMedal":true,
+			   "showShare":false,
 			};
 		},
+		//分享到好友
 		 onShareAppMessage(res) {
 		    if (res.from === 'button') {// 来自页面内分享按钮
 		      console.log(res.target)
@@ -91,13 +97,36 @@
 		      path: '/pages/home/home'
 		    }
 		},
+		//分享到朋友圈
+		 onShareTimeline(res) {
+		    return {
+		      title: "快来和我一起答题吧",
+		      type: 0,
+		      summary: "",
+		    };
+		},
 		onLoad(options) {
-			//this.roleId = options.roleId
-			//this.questionFreId = options.questionFreId
+			this.timer = setTimeout(() => {
+			  this.showMedal = false
+			  this.showLayer = false
+			  clearTimeout(this.timer)
+			}, 5000)
+			this.roleId = options.roleId
+			this.questionFreId = options.questionFreId
 			this.getQuestionList()
 			this.getRecordList()
 		},
 		methods: {
+			async share(){
+				await uni.share({
+					title: "快来和我一起答题吧",
+					type: 0,
+					summary: "",
+					success() {
+						console.log('分享成功')
+					}
+				})
+			}, 
 			async getQuestionList() {
 				const {
 					data: res
@@ -125,6 +154,10 @@
 				  url:'/pages/index/index'
 				})
 			},
+			shareUser(){
+				this.showShare = true
+				this.showLayer = true
+			},
 			reChallenge(){
 				uni.navigateTo({
 				 url: '/subpkg/rechallenge/rechallenge?questionFreId='+this.questionFreId
@@ -135,10 +168,15 @@
 				 url: '/subpkg/review/review?questionFreId='+this.questionFreId
 				})
 			},
+			closeShare(){
+				this.showShare = false
+				this.showLayer = false
+			},
 			itemClickHandler(item) {
 				if(item !== ""){
 					this.ask= item.ask
 					this.answer= item.answer
+					this.showAnlysisc = true
 				}
 			},
 		}
@@ -150,7 +188,7 @@
 	
 	/* 设置弹出层 */
 	.marsk {
-		display: none;
+		// display: none;
 		position: absolute;
 		z-index: 999;
 		width: 100%;
@@ -158,7 +196,7 @@
 		background-color: rgba(0, 0, 0, .5);
 	}
 	.popup-layer, .popup-share {
-		display: none;
+		//display: none;
 		position: absolute;
 		top: 45%;
 		left: 50%;
@@ -239,7 +277,7 @@
 		}	
 	}
    .answer-content {
-	   display: none;
+	   //display: none;
 	   position: absolute;
 	   z-index: 100; 
 	   margin: 2% 3%;