提交

env/sh.js

@@ -1,5 +1,5 @@
 const ENV_PATH = {
-	baseUrl: 'http://192.168.31.149:9999', // 胜浩
+	baseUrl: 'http://192.168.31.85:9999', // 胜浩
 }
 
 module.exports = ENV_PATH

pages/mine/details2.vue

@@ -127,6 +127,15 @@
 						src="https://static.quhouse.com/4a977a0ecb594f2ebfd5f020b29dcc79.png" mode=""></image>
 				</view>
 				<view class="more-btn">
+					
+					<view class="btn-item" @click.stop="showTemplate = !showTemplate; Thetapeidisshow=false">
+<!-- 						<image class="icon" v-if="userlistobj.validInvalidName"
+							src="https://static.quhouse.com/868b0eba0f7c44eca63e3b4fa782f14d.png" mode=""></image>
+						<image class="icon" v-else src="https://static.quhouse.com/480e572bf43c48558ad9febe5426f439.png"
+							mode=""></image> -->
+						更换销讲业务
+					</view>
+					
 					<view class="btn-item" @click.stop="alllogo">
 						<image class="icon" v-if="userlistobj.validInvalidName"
 							src="https://static.quhouse.com/868b0eba0f7c44eca63e3b4fa782f14d.png" mode=""></image>
@@ -458,6 +467,9 @@
 		</view>
 		<u-toast ref="uToast" />
 
+		<!-- 销讲业务 -->
+		<u-select :mask-close-able="false" label-name="templateName" value-name="id" v-model="showTemplate"
+			mode="single-column" :list="templateList" @cancel="templateCancel" @confirm="templateConfirm"></u-select>
 
 		<!-- 加载组件 -->
 		<u-loadings v-model="LOADING"></u-loadings>
@@ -587,6 +599,11 @@
 				refined: false, // 多选加精;
 				nowPlaying: 0, // 当前播放位置
 				stepPosition: 0, // 需要跳转的播放位置
+				
+				
+				templateList: [], // 销讲业务
+				showTemplate: false, // 展示选择销讲业务弹窗
+				templateName: '', // 销讲业务类型文字
 			};
 		},
 		computed: {
@@ -617,7 +634,7 @@
 				this.nowPlaying = obj.current_value
 				this.TimeUpdate(this.TIMEEVENT(obj.current))
 			})
-
+			// 获取销讲业务
 			this.$zaudio.on('ended', this.ACTION, e => {
 				console.log('音频播放结束')
 				this.$zaudio.stop()
@@ -665,6 +682,8 @@
 			if (this.stateisshow == 2) {
 				var info = this.itemobj;
 			}!this.isPageHide && this.init(info);
+			
+			this.getMarketingBusiness()
 		},
 
 		onHide() {
@@ -682,6 +701,17 @@
 		},
 
 		methods: {
+			
+			// 获取销讲业务
+			getMarketingBusiness() {
+				this.$u.get('/customer/marketingBusiness', {
+					houseId: this.buildingID,
+					status: 0,
+				}).then(res => {
+					this.templateList = res
+				})
+			},
+			
 			// 跳转设备日志页面
 			eqLogClick() {
 				uni.navigateTo({
@@ -2087,11 +2117,13 @@
 
 			.more-btn {
 				display: flex;
+				flex-wrap: wrap;
 				margin-top: 30rpx;
 				padding-bottom: 30rpx;
 
 				// border-bottom: 1rpx solid #e0e0e0;
 				.btn-item {
+					margin-bottom: 10rpx;
 					width: 284rpx;
 					height: 72rpx;
 					display: flex;

pages/mine/equipmentLog.vue

@@ -30,7 +30,7 @@
 				<view class="items">
 					<text>录音开启用时</text>
 					<text class="font"
-						:style="{color: info.recording==1?'red':'#333'}">{{info.startActionTime || ''}}min</text>
+						:style="{color: info.recording==1?'red':'#333'}">{{info.startActionTime || 0}}min</text>
 				</view>
 				<view class="line"></view>
 				<view class="items">