From 1a71c9b959110358c85e7e87eb03ffe57ba8a46b Mon Sep 17 00:00:00 2001
From: corala <18339694416@163.com>
Date: Wed, 14 Sep 2022 16:13:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8C=96=E6=8E=98=E6=89=A7?=
 =?UTF-8?q?=E8=A1=8C=E7=8E=87=E9=A2=9C=E8=89=B2=E5=80=BC=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json                            |  2 +-
 pages/center/consumer/consumerDetail.vue | 22 +++++++++++-----------
 pages/learning/Keywordsearch.vue         | 15 +++++++++++----
 pages/mine/details2.vue                  | 20 ++++++++++----------
 4 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/manifest.json b/manifest.json
index 16c8fd4..16f44b9 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,5 +1,5 @@
 {
-    "name" : "去房智控管家",
+    "name" : "数智工牌",
     "appid" : "__UNI__7A1611D",
     "description" : "去房智控管家",
     "versionName" : "1.1.0",
diff --git a/pages/center/consumer/consumerDetail.vue b/pages/center/consumer/consumerDetail.vue
index 37a0165..46d4b42 100644
--- a/pages/center/consumer/consumerDetail.vue
+++ b/pages/center/consumer/consumerDetail.vue
@@ -321,14 +321,14 @@
                   <view v-if="item.modelList.length==0">暂无话术</view>
                   <view class="Level3che" v-for="(che,inc) in item.modelList" :key='inc'>
                     <view class="title1"
-                      :style="che.selected==2?'color:#FF8C13':che.selected==1?'color: #666':''">
-                      {{inc+1}}.{{che.showFormatExpression || che.keywordsName}}
+                      :style="che.isAskQuestions==2?'color:#FF8C13':che.isAskQuestions==0?'':'color: #666'">
+                      {{inc+1}}.{{che.showFormatExpression}}
                     </view>
                     <view class="jiantobox">
                       <!-- 0本次选中 1未选中 2上次选中 -->
-                      <image v-if="che.selected==0" class="arrow"
+                      <image v-if="che.isAskQuestions==0" class="arrow"
                         src="/static/images/rate-checked.png" mode="" />
-                      <image v-else-if="che.selected==2" class="arrow"
+                      <image v-else-if="che.isAskQuestions==2" class="arrow"
                         src="/static/images/checked-yellow.png" mode="" />
                       <image v-else class="arrow" src="/static/images/rate-nocheck.png" mode="" />
                     </view>
@@ -384,25 +384,25 @@
                       <view
                         class="title1"
                         :style="
-                          che.selected == 2
+                          che.isAskQuestions == 2
                             ? 'color:#FF8C13'
-                            : che.selected == 1
-                            ? 'color: #666'
-                            : ''
+                            : che.isAskQuestions == 0
+                            ? ''
+                            : 'color: #666'
                         "
                         >{{ inc + 1 }}.{{
-                          che.showFormatExpression || che.keywordsName
+                          che.showFormatExpression
                         }}</view
                       >
                       <view class="jiantobox">
                         <image
-                          v-if="che.selected == 0"
+                          v-if="che.isAskQuestions == 0"
                           class="arrow"
                           src="/static/images/rate-checked.png"
                           mode=""
                         />
                         <image
-                          v-else-if="che.selected == 2"
+                          v-else-if="che.isAskQuestions == 2"
                           class="arrow"
                           src="/static/images/checked-yellow.png"
                           mode=""
diff --git a/pages/learning/Keywordsearch.vue b/pages/learning/Keywordsearch.vue
index aa6ee40..93c06b0 100644
--- a/pages/learning/Keywordsearch.vue
+++ b/pages/learning/Keywordsearch.vue
@@ -1,7 +1,6 @@
 <template>
 	<view class="translation">
-		<view style="width: 690rpx;height: 64rpx;margin: 0 auto;margin-top: 30rpx;background: #F2F2F2;border-radius: 32rpx;
-		display: flex;align-items: center;">
+		<view class="box">
 			<view style="width: 10%;height: 64rpx;display: flex;align-items: center;">
 				<image style="width: 28rpx;height: 28rpx;margin-left: 30rpx;" src="/static/images/search.png" mode=""></image>
 			</view>
@@ -11,7 +10,6 @@
 			</view>
 		</view>
 		<view style="width: 690rpx;margin: 0 auto;margin-top: 10rpx;">
-			
 			<view style="width: 100%;border-bottom: 1px solid #E0E0E0;display: flex;padding-bottom: 10rpx;margin-top: 40rpx;"
 			v-for="(item,index) in listarr" :key='index' @click="toaidoinfo(item.Content,item.corpusId,item.index)">
 				<view style="width: 26rpx;height: 36rpx;margin-top: 4rpx;">
@@ -142,5 +140,14 @@
 	}
 </script>
 <style lang="scss" scoped>
-
+.box{
+	width: 690rpx;
+	height: 64rpx;
+	margin: 0 auto;
+	margin-top: 30rpx;
+	background: #F2F2F2;
+	border-radius: 32rpx;
+	display: flex;
+	align-items: center;
+}
 </style>
diff --git a/pages/mine/details2.vue b/pages/mine/details2.vue
index 33309d9..b9408df 100644
--- a/pages/mine/details2.vue
+++ b/pages/mine/details2.vue
@@ -360,14 +360,14 @@
 												<view v-if="item.modelList.length==0">暂无话术</view>
                         <view class="Level3che" @click="clickWajue(che)" v-for="(che,inc) in item.modelList" :key='inc'>
                           <view class="title1"
-                            :style="che.selected==2?'color:#FF8C13':che.selected==1?'color: #666':''">
-                            {{inc+1}}.{{che.showFormatExpression || che.keywordsName}}
+                            :style="che.isAskQuestions==2?'color:#FF8C13':che.isAskQuestions==0?'':'color: #666'">
+                            {{inc+1}}.{{che.showFormatExpression}}
                           </view>
                           <view class="jiantobox">
                             <!-- 0本次选中 1未选中 2上次选中 -->
-                            <image v-if="che.selected==0" class="arrow"
+                            <image v-if="che.isAskQuestions==0" class="arrow"
                               src="/static/images/rate-checked.png" mode="" />
-                            <image v-else-if="che.selected==2" class="arrow"
+                            <image v-else-if="che.isAskQuestions==2" class="arrow"
                               src="/static/images/checked-yellow.png" mode="" />
                             <image v-else class="arrow" src="/static/images/rate-nocheck.png" mode="" />
                           </view>
@@ -400,14 +400,14 @@
 									<view class="Level3che" @click="clickWajue(che)"
 										v-for="(che,inc) in subitem.modelList" :key='inc'>
 										<view class="title1"
-											:style="che.selected==2?'color:#FF8C13':che.selected==1?'color: #666':''">
-											{{inc+1}}.{{che.showFormatExpression || che.keywordsName}}
+											:style="che.isAskQuestions==2?'color:#FF8C13':che.isAskQuestions==0?'':'color: #666'">
+											{{inc+1}}.{{che.showFormatExpression}}
 										</view>
 										<view class="jiantobox">
 											<!-- 0本次选中 1未选中 2上次选中 -->
-											<image v-if="che.selected==0" class="arrow"
+											<image v-if="che.isAskQuestions==0" class="arrow"
 												src="/static/images/rate-checked.png" mode="" />
-											<image v-else-if="che.selected==2" class="arrow"
+											<image v-else-if="che.isAskQuestions==2" class="arrow"
 												src="/static/images/checked-yellow.png" mode="" />
 											<image v-else class="arrow" src="/static/images/rate-nocheck.png" mode="" />
 										</view>
@@ -798,10 +798,10 @@
 			},
 			// 点击话术
 			clickWajue(item){
-				if(item.selected==0){
+				if(item.isAskQuestions==0){
 					this.Pinspeak = false
 					uni.navigateTo({
-						url: '/pages/learning/Keywordsearch?customerId=' + this.customerId + "&keyword=" + item.showFormatExpression||item.keywordsName +
+						url: '/pages/learning/Keywordsearch?customerId=' + this.customerId + "&keyword=" + item.showFormatExpression +
 							"&skpl=" + "2" + '&UpDateEvent=DETAILS2INIT'
 						}) 
 					}