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

Merge branch 'new-20250827' of http://47.107.152.87:3000/liubiao/APP into new-20250827

Browse Source 
# Conflicts:
#	config/index.js
This commit is contained in:
liub
2026-02-06 08:34:27 +08:00
parent 7cbdc00ae0 d3707c2229
commit 8d84309ce8
8 changed files with 455 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pages/common/addScan/ScanEquip.vue
View File

@ -90,7 +90,7 @@
addCode() {
debugger;
if (!this.formData.inputCode) {
MsgWarning("请输入条码","确定", this);
MsgWarning("请输入二维码内容","确定", this);
return;
}
@ -114,7 +114,7 @@
if (res && res.code == 200) {
console.log("res=", res);
let data = res.data;
this.serverDevice = data;
if (data && data.id) {
resolve(data);
return;

6
pages/common/index/index.vue
View File

@ -18,11 +18,11 @@
<image src="/static/images/common/more.png" mode="aspectFit" class="more"></image>
</view>
</view>
<view class="sendFlex" v-if="activeTab && activeTab.id !== ''&& activeTabInfo.communicationMode==0 || activeTabInfo.communicationMode==2">
<!-- <view class="sendFlex" v-if="activeTab && activeTab.id !== ''&& activeTabInfo.communicationMode==0 || activeTabInfo.communicationMode==2">
<view class="callpolice" @click="callpolice">报警</view>
<view class="Sendmessage" @click="location">位置</view>
<view class="Sendmessage" @click="handleSend">发送信息</view>
</view>
<view class="Sendmessage" @click="handleSend" v-if="activeTabInfo.typeName!=='HBY100-J'">发送信息</view>
</view> -->
<!-- <scroll-view class="device-list" scroll-y @scrolltolower="onScrollToLower" :lower-threshold="100" style="height:80vh;"> -->
<mescroll-uni class="device-list" @init="mescrollInit" @down="downCallback" @up="upCallback" :up="upOption"
:down="downOption" :fixed="false" :style="{ height: mescrollHeight + 'px' }">