合并代码

pages/center/consumer/edit.vue

@@ -55,7 +55,7 @@
 				</view>
 				<view class="conmsg-msg-lab" @click="levelshow = true">
 					<view class="conmsg-msg-lab-1">
-						客户等级
+						意向等级
 					</view>
 					<view class="conmsg-msg-lab-inp">
 						<input type="text" placeholder="请选择客户等级" v-model="selectform.level" disabled />

pages/center/consumer/index.vue

@@ -228,7 +228,7 @@
 					<!-- 客户等级 -->
 					<view class="screen-record">
 						<view class="screen-record-text" @click="levelArrow = !levelArrow">
-							客户等级<image
+							意向等级<image
 								v-if="levelArrow"
 								class="arrow"
 								src="https://static.quhouse.com/6cf38a2b82694392a7ab6eea24ce76b1.png"

pages/center/consumer/newFollowup/newFollowup.vue

@@ -5,7 +5,7 @@
 			<!-- 录音标示 -->
 			<view class="screen-record">
 				<view class="screen-record-text">
-					最新状态
+					客户阶段
 				</view>
 				<view class="screen-record-tab">
 					<scroll-view scroll-x style="width: 100%;">
@@ -111,9 +111,12 @@
 			this.customerId = e.id
 			this.buildingID = uni.getStorageSync('buildingID').id;
 			this.recordList = []
+			if (e.level) {
+				this.screen.level = Number(e.level)
+			}
 			// this.getMyCustom()
 			// this.getFreeList()
-			this.getNewStatus()
+			this.getNewStatus(e)
 			this.getCustomerType();
 		},
 		methods: {
@@ -130,14 +133,19 @@
 					this.customerType = res;
 				})
 			},
-			getNewStatus() {
+			getNewStatus(e) {
 				var that = this;
 				let premo = {
 					houseId: uni.getStorageSync('buildingID').id
 				}
 				this.$u.post('/customer/getStage', premo)
 					.then(res => {
-						this.stateList = res
+						console.log(res)
+						console.log(e.stageName, res.findIndex(item =>  item.stageName == e.stageName ))
+						if (e.stageName) {
+							that.screen.state = res.findIndex(item => item.stageName == e.stageName )
+						}
+						that.stateList = res
 					})
 
 			},

pages/mine/details2.vue

@@ -338,9 +338,9 @@
 							<view class="title1" style="flex:1">{{item.name}}</view>
 							<view class="Level1-middle" style="flex:2;display:flex;">
 								<view class="item" style="flex:1;text-align:center;">执行{{item.fraction || 0}}%</view>
-								<view class="item" style="flex:1;text-align:center;">{{
-                item.selected == 0 ? "完成" : "未完成"
-              }}</view>
+								<view class="item" style="flex:1;text-align:center;">匹配({{
+                   item.keywordsList&&item.keywordsList.length||0
+              }})</view>
 							</view>
 							<view class="jiantobox">
 								<image v-if="!item.show" class="arrow rotatearrow" src="/static/images/down.png"
@@ -348,6 +348,31 @@
 								<image v-else class="arrow" src="/static/images/up.png" mode="" />
 							</view>
 						</view>
+						 <!-- 话术在一级下 -->
+						        <view v-if="item.children&&item.children.length==0">
+                      <view class="hhhbox" v-if="item.show" style="padding: 30rpx;">
+                         <view class="hsnrtest"
+                            >客户标签：{{ getKeywordsList(item.keywordsList) }}</view
+                          >
+                        <view class="hsnrtest">话术内容</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}}
+                          </view>
+                          <view class="jiantobox">
+                            <!-- 0本次选中 1未选中 2上次选中 -->
+                            <image v-if="che.selected==0" class="arrow"
+                              src="/static/images/rate-checked.png" mode="" />
+                            <image v-else-if="che.selected==2" class="arrow"
+                              src="/static/images/checked-yellow.png" mode="" />
+                            <image v-else class="arrow" src="/static/images/rate-nocheck.png" mode="" />
+                          </view>
+                        </view>
+                      </view>
+                    </view>
+						<!-- 话术二级下 -->
+						<view v-if="item.children&&item.children.length">
 							<view class="hhhbox" v-if="item.show" v-for="(subitem,i) in item.children" :key="i">
 								<view class="Level2che" @click="hangeshow2(subitem,1)">
 									<view class="title1 u-line-1">{{subitem.name}}</view>
@@ -385,6 +410,7 @@
 									</view>
 								</view>
 							</view>
+						</view>
 					</view>
 				</view>
 			</view>