dyf/APP
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

合并线上代码

Browse Source
This commit is contained in:
liub
2025-11-07 12:16:10 +08:00
parent 2493bb7113
commit 623a47466a
41 changed files with 5293 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
pages/100/HBY100.vue
View File

@ -198,41 +198,39 @@
<slider min="1" max="8" step="1" :disabled="false" :value="formData.sta_VoiceVolume"
activeColor="#bbe600" backgroundColor="#00000000" block-size="20" block-color="#ffffffde"
@change="onVolumeChanging" @changing="onVolumeChanging" class="custom-slider" />
</view>
</view>
<view class="proinfo lamp">
<text class="title">产品信息</text>
<view class="itemcontent">
<view class="item" @click="proParam()">
<image class="img" src="/static/images/6155/DeviceDetail/param.png" mode="aspectFit"></image>
<text class="txt">产品参数</text>
</view>
<view class="item" @click="handRemark()">
<image class="img" src="/static/images/6155/DeviceDetail/remark.png" mode="aspectFit"></image>
<text class="txt">操作说明</text>
</view>
<view class="item" @click="handVideo()">
<image class="img" src="/static/images/6155/DeviceDetail/video.png" mode="aspectFit"></image>
<text class="txt">操作视频</text>
<view class="proinfo lamp">
<text class="title">产品信息</text>
<view class="itemcontent">
<view class="item" @click="proParam()">
<image class="img" src="/static/images/6155/DeviceDetail/param.png" mode="aspectFit"></image>
<text class="txt">产品参数</text>
</view>
<view class="item" @click="handRemark()">
<image class="img" src="/static/images/6155/DeviceDetail/remark.png" mode="aspectFit"></image>
<text class="txt">操作说明</text>
</view>
<view class="item" @click="handVideo()">
<image class="img" src="/static/images/6155/DeviceDetail/video.png" mode="aspectFit"></image>
<text class="txt">操作视频</text>
</view>
</view>
</view>
</view>
<!-- 弹窗通知 -->
<MessagePopup :visible="Status.Pop.showPop" :type="Status.Pop.popType" :bgColor="Status.Pop.bgColor"
:borderColor="Status.Pop.borderColor" :textColor="Status.Pop.textColor"
:buttonBgColor="Status.Pop.buttonBgColor" :buttonTextColor="Status.Pop.buttonTextColor"
:iconUrl="Status.Pop.iconUrl" :message="Status.Pop.message" :buttonText="Status.Pop.buttonText"
@buttonClick="HidePop" :visiblePrompt="Status.Pop.visiblePrompt" :promptTitle="Status.Pop.promptTitle"
v-model="Status.Pop.modelValue" @closePop="closePop" :buttonCancelText="Status.Pop.buttonCancelText"
:showCancel="Status.Pop.showCancel" @cancelPop="closePop" />
<!-- 弹窗通知 -->
<MessagePopup :visible="Status.Pop.showPop" :type="Status.Pop.popType" :bgColor="Status.Pop.bgColor"
:borderColor="Status.Pop.borderColor" :textColor="Status.Pop.textColor"
:buttonBgColor="Status.Pop.buttonBgColor" :buttonTextColor="Status.Pop.buttonTextColor"
:iconUrl="Status.Pop.iconUrl" :message="Status.Pop.message" :buttonText="Status.Pop.buttonText"
@buttonClick="HidePop" :visiblePrompt="Status.Pop.visiblePrompt" :promptTitle="Status.Pop.promptTitle"
v-model="Status.Pop.modelValue" @closePop="closePop" :buttonCancelText="Status.Pop.buttonCancelText"
:showCancel="Status.Pop.showCancel" @cancelPop="closePop" />
<!-- 下方菜单 -->
<!-- <BottomSlideMenuPlus :config="Status.BottomMenu" @close="closeMenu" @itemClick="handleItemClick"
<!-- 下方菜单 -->
<!-- <BottomSlideMenuPlus :config="Status.BottomMenu" @close="closeMenu" @itemClick="handleItemClick"
@btnClick="btnClick">
<view>
<view class="addIco">
@ -243,8 +241,9 @@
</view>
</BottomSlideMenuPlus> -->
<global-loading ref="loading" />
</view>
<global-loading ref="loading" />
</view>
</view>
</template>
<script>
@ -1159,11 +1158,11 @@
keys.forEach(key => {
if (key in this.formData) {
// console.log("key=",key+",value=",json[key]);
this.formData[key] = json[key]+"" ;
this.formData[key] = json[key] + "";
}
});
if(this.formData.sta_battery<=20){
if (this.formData.sta_battery <= 20) {
this.showMsg("设备电量低");
}
},

1391
pages/6075/BJQ6075.vue Normal file
View File

File diff suppressed because it is too large Load Diff

9
pages/6170/deviceControl/index.vue
View File

@ -297,11 +297,8 @@
export default {
data() {
return {
lastBrightnessTime: 0,
isCardSliding: false,
cardRect: null,
touchStartX: 0,
touchStartY: 0,
pageLoading: true,
navBarHeight: 70 + uni.getSystemInfoSync().statusBarHeight,
navTitle: "",
@ -338,7 +335,6 @@
isLaserOn: false,
isSending: false,
isProcessing: false,
isLoading: false, // 主加载状态
isPolling: false // 轮询状态
}
},
@ -557,7 +553,6 @@
};
lightModeSettings(data).then((res) => {
if (res.code == 200) {
// 只有确认成功才更新实际模式,选中模式
this.currentMainMode = this.pendingMainMode;
this.selectedItemIndex = selectedItem;
uni.showToast({
@ -566,15 +561,11 @@
})
uni.hideLoading();
this.lightModeA = false;
//this.isProcessing = false
//loadingShown = false
} else {
uni.showToast({
title: res.msg,
icon: 'none'
})
//this.isProcessing = false
//loadingShown = false
uni.hideLoading();
}
})

1237
pages/common/audioManager/AudioList.vue Normal file
View File

File diff suppressed because it is too large Load Diff

1557
pages/common/audioManager/Recording.vue Normal file
View File

File diff suppressed because it is too large Load Diff

2
pages/common/login/index.vue
View File

@ -252,7 +252,7 @@
uni.showToast({
title: res.msg || '服务器异常，请稍后重试',
icon: 'none'
})
})
}
} catch (error) {
console.log('捕获错误:', error);