需求挖掘功能及合并代码

manifest.json

@@ -1,5 +1,5 @@
 {
-    "name" : "数智工牌",
+    "name" : "去房智控管家",
     "appid" : "__UNI__7A1611D",
     "description" : "去房智控管家",
     "versionName" : "1.1.0",
@@ -91,7 +91,7 @@
     },
     "quickapp" : {},
     "mp-weixin" : {
-        "appid" : "wxe044603515ff2cb5",
+        "appid" : "wx8f883dca5ecc5510",
         "setting" : {
             "urlCheck" : false,
             "es6" : true,

pages/learning/Equinoctial/index.vue

@@ -34,23 +34,22 @@
 						<view class="content">
 							<view v-html="item.onebest"></view>
 						</view>
-						<view class="tankuangcss" v-if="startTime==item.bg">
-							<view style="max-width: 85rpx; height: 38rpx;font-size: 24rpx;color: #333333;text-align: center;line-height: 38rpx;
-							border-radius: 2rpx;border: 1px solid #979797;">标签</view>
-							<view style="max-width: 171rpx;height: 38rpx;background: #008EF2;border-radius: 2rpx;display: flex;
-							align-items: center;margin-left: 10rpx;" @click="dianjibiaoqian()">
-								<view style="width: 126rpx;height: 38rpx;line-height: 38rpx;font-size: 24rpx;color: #FFFFFF;
-								text-align: center; overflow: hidden;">{{biaoqian}}</view>
-								<view v-if="biaoqian.length>4" style="width: 37rpx;height: 37rpx;line-height: 37rpx;">
-									<u-icon name="chat-fill" color="#ffffff" size="32rpx"></u-icon>
+						<template v-if="refinement(item)">
+							<view class="tankuangcss">
+								<view class="tags">标签</view>
+								<view class="tags-t" @click="dianjibiaoqian()">
+									<view class="tags-t-c">{{biaoqian}}</view>
+									<view v-if="biaoqian.length>4" class="tipsss">
+										<u-icon name="chat-fill" color="#ffffff" size="32rpx"></u-icon>
+									</view>
 								</view>
 							</view>
-						</view>
-						<view class="biaoqianya" v-if="startTime==item.bg">
-							<view class="biaoqianyaisshow" v-if="biaoqianyaisshow">
-								{{biaoqian}}
+							<view class="biaoqianya">
+								<view class="biaoqianyaisshow" v-if="biaoqianyaisshow">
+									{{biaoqian}}
+								</view>
 							</view>
-						</view>
+						</template>
 					</view>
 				</view>
 				<!-- 点赞 -->
@@ -116,7 +115,7 @@
 							<textarea :value="content" :focus="textareaFocus" type="text" @input="changeContent"
 								:auto-height="true" class="editor" :class="{'active':editing}"
 								@click.stop="changeEditing(true)" @confirm="sendComment">
-        </textarea>
+							</textarea>
 							<view class="placeholder" :class="{'editing':editing}" v-if="!content">写评价</view>
 							<image class="edit" v-if="!editing && content == ''"
 								src="/static/images/recordingManagement/edit.png" mode=""></image>
@@ -207,13 +206,29 @@
 				startFile: '',
 				num: 0, //上拉  转写文件下标
 				Bnum: 0, //下拉  转写文件下标
+				pageInfo: {}, // 当前转写页面的值
 
 
 				ACTION: Symbol('zaudio'), // 唯一值区分每个页面的方法
 				isPageHide: false, // 是否息屏
 				duration: '',
+
 			};
 		},
+
+		computed: {
+			// 通过时间戳筛选找到需要展示的加精标签
+			refinement() {
+				return timestamp => {
+					if (this.pageInfo.zatd instanceof Array) {
+						return this.pageInfo.zatd.findIndex(item => (item.startTime == timestamp.bg && item.jjTransfer == timestamp.onebest)) != -1
+					} else {
+						return false
+					}
+				}
+			}
+		},
+
 		onLoad(options) {
 			this.startTime = options.startTime
 			this.customerId = options.customerId;
@@ -473,6 +488,7 @@
 					},
 					success: (data) => {
 						if (data.data.code == 10000) {
+							this.pageInfo = data.data.data
 							const jsonInfo = JSON.parse(data.data.data.audioContent);
 							this.dialogList.push({
 								message: jsonInfo
@@ -753,6 +769,43 @@
 		}
 	}
 
+	.tags {
+		max-width: 85rpx;
+		height: 38rpx;
+		font-size: 24rpx;
+		color: #333333;
+		text-align: center;
+		line-height: 38rpx;
+		border-radius: 2rpx;
+		border: 1px solid #979797;
+	}
+
+	.tags-t {
+		max-width: 171rpx;
+		height: 38rpx;
+		background: #008EF2;
+		border-radius: 2rpx;
+		display: flex;
+		align-items: center;
+		margin-left: 10rpx;
+
+		.tags-t-c {
+			width: 126rpx;
+			height: 38rpx;
+			line-height: 38rpx;
+			font-size: 24rpx;
+			color: #FFFFFF;
+			text-align: center;
+			overflow: hidden;
+
+			.tipsss {
+				width: 37rpx;
+				height: 37rpx;
+				line-height: 37rpx;
+			}
+		}
+	}
+
 	.biaoqiantom {
 		background-color: #008EF2;
 		color: #FFFFFF;

pages/mine/details2.vue

@@ -11,10 +11,10 @@
 			</view>
 			<view class="headboxbott">
 				<view class="headovfu">
-					<u-tabs-swiper ref="tabs" font-size="30" :bold="true" swiper-width="600" :current="roleindex"
+					<u-tabs ref="tabs" font-size="30" :bold="true" swiper-width="600" :current="roleindex"
 						@change="tapspagek" inactive-color="#b1b1b1" active-color="#008ef2" :list="tablist"
 						:is-scroll="true">
-					</u-tabs-swiper>
+					</u-tabs>
 				</view>
 				<view class="headpade">
 					<view class="biaoji" @tap="tagtap()">标记</view>
@@ -102,7 +102,7 @@
 				</view>
 				<view class="fill"></view>
 				<!-- audioinfo2 -->
-				<view class="tmmchen">
+				<view class="tmmchen" v-if="Menulistisshow">
 					<image @click="Receivedetailsabouttab('Receivedetailsabout')" src="../../static/images/allimg.png"
 						mode=""></image>
 					<view @click="Receivedetailsabouttab('Receivedetailsabout')">更多</view>
@@ -110,12 +110,12 @@
 						<view v-if="eqLog!=-1" @click="eqLogClick()" style="line-height: 70rpx;margin-top: 10rpx;">设备日志
 						</view>
 						<view @click="Receivetap()" style="line-height: 70rpx;margin-top: 10rpx;">接待信息</view>
-						<view v-if="Menulistisshow==true" @click="alllogo()" style="line-height:70rpx;">
+						<view @click="alllogo()" style="line-height:70rpx;">
 							{{userlistobj.validInvalidName}}
 						</view>
 					</view>
 				</view>
-				<view class="tmmchen" @click="Receivetap()" v-if="Menulistisshow==false">
+				<view class="tmmchen" @click="Receivetap()" v-else>
 					<image @click="Receivedetailsabouttab('Receivedetailsabout')"
 						src="../../static/images/audioinfo2.png" mode=""></image>
 					<view @click="Receivedetailsabouttab('Receivedetailsabout')">接待信息</view>