Compare commits
3
Commits
69d8fa75a5
...
6731ec2403
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6731ec2403 | ||
|
|
fa0246d1e5 | ||
|
|
b3e2a11423 |
@@ -8,8 +8,8 @@ const DOMAINS: Record<EnvType, { domain1: string; domain2: string }> = {
|
||||
domain2: 'http://10.10.10.10:8889/weight',
|
||||
},
|
||||
trial: {
|
||||
domain1: 'http://10.10.10.10:8889',
|
||||
domain2: 'http://10.10.10.10:8889/weight',
|
||||
domain1: 'http://device.shuziweidao.com:80/gateway',
|
||||
domain2: 'http://device.shuziweidao.com:80/weight',
|
||||
},
|
||||
release: {
|
||||
domain1: 'http://device.shuziweidao.com:80/gateway',
|
||||
|
||||
@@ -83,26 +83,46 @@
|
||||
}
|
||||
}
|
||||
|
||||
/* 描边按钮(蓝色/红色) */
|
||||
.ops-btn {
|
||||
width: 180rpx;
|
||||
.section-right {
|
||||
height: 48rpx;
|
||||
border-radius: 8rpx;
|
||||
font-size: 24rpx;
|
||||
line-height: 44rpx;
|
||||
text-align: center;
|
||||
box-sizing: border-box;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
display: flex;
|
||||
flex-wrap: nowrap;
|
||||
|
||||
.ops-btn--blue {
|
||||
border: 2rpx solid #1385FA;
|
||||
color: #1385FA;
|
||||
}
|
||||
.section-right-red {
|
||||
height: 48rpx;
|
||||
padding: 0 15rpx;
|
||||
border-radius: 8rpx;
|
||||
font-size: 24rpx;
|
||||
line-height: 44rpx;
|
||||
box-sizing: border-box;
|
||||
border: 2rpx solid #F24439;
|
||||
color: #F24439;
|
||||
}
|
||||
|
||||
.ops-btn--red {
|
||||
border: 2rpx solid #F24439;
|
||||
color: #F24439;
|
||||
.section-right-blue {
|
||||
height: 48rpx;
|
||||
display: flex;
|
||||
flex-wrap: nowrap;
|
||||
align-items: center;
|
||||
padding: 0 15rpx;
|
||||
border-radius: 8rpx;
|
||||
background-color: #1385FA;
|
||||
|
||||
> view:nth-child(1) {
|
||||
width: 32rpx;
|
||||
height: 32rpx;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
margin-right: 6rpx;
|
||||
}
|
||||
|
||||
> view:nth-child(2) {
|
||||
color: #FFFFFF;
|
||||
height: 24rpx;
|
||||
font-size: 24rpx;
|
||||
line-height: 24rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -13,17 +13,27 @@
|
||||
</view>
|
||||
|
||||
<!-- 已配对设备行 -->
|
||||
<block wx:if="{{ operationsEngineer }}">
|
||||
<view class="section-bar">
|
||||
<view class="section-left">
|
||||
<view class="bt-icon">
|
||||
<image src="/images/equipment/bluetooth.png"/>
|
||||
</view>
|
||||
<view class="section-title">已配对设备</view>
|
||||
</view>
|
||||
<view class="ops-btn ops-btn--red" bind:tap="onUnpairAll">取消全部配对</view>
|
||||
</view>
|
||||
</block>
|
||||
<view class="section-bar">
|
||||
<view class="section-left">
|
||||
<view class="bt-icon">
|
||||
<image src="/images/equipment/bluetooth.png"/>
|
||||
</view>
|
||||
<view class="section-title">已配对设备</view>
|
||||
</view>
|
||||
<view class="section-right">
|
||||
<block wx:if="{{ operationsEngineer }}">
|
||||
<view class="section-right-red" bind:tap="onUnpairAll">取消全部配对</view>
|
||||
</block>
|
||||
<block wx:else>
|
||||
<view class="section-right-blue" bind:tap="onTapAdd">
|
||||
<view>
|
||||
<image src="/images/addBtn.png"/>
|
||||
</view>
|
||||
<view>添加设备</view>
|
||||
</view>
|
||||
</block>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 设备列表 -->
|
||||
<!-- <view class="device">
|
||||
@@ -86,7 +96,7 @@
|
||||
<view>
|
||||
<image src="/images/equipment/users.png"/>
|
||||
</view>
|
||||
<view>用户({{ item.userNum }})</view>
|
||||
<view>用户管理({{ item.userNum }})</view>
|
||||
</view>
|
||||
<block wx:if="{{item.status}}">
|
||||
<view class="device-action-btn" bind:tap="onTapDataRetransfer">
|
||||
@@ -105,12 +115,14 @@
|
||||
</block>
|
||||
|
||||
<!-- 添加设备按钮 -->
|
||||
<view class="add-btn" bind:tap="onTapAdd">
|
||||
<view class="add-icon">
|
||||
<image src="/images/addBtn.png"/>
|
||||
<block wx:if="{{ operationsEngineer }}">
|
||||
<view class="add-btn" bind:tap="onTapAdd">
|
||||
<view class="add-icon">
|
||||
<image src="/images/addBtn.png"/>
|
||||
</view>
|
||||
<view class="add-text">添加设备</view>
|
||||
</view>
|
||||
<view class="add-text">绑定设备</view>
|
||||
</view>
|
||||
</block>
|
||||
|
||||
<equipment-dialog show="{{ loadingShow }}" title="{{ loadingTitle }}" content="{{ loadingContent }}"
|
||||
bind:close="onCloseLoading"/>
|
||||
|
||||
@@ -109,7 +109,7 @@
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class="submit-btn" bind:tap="onSubmit">完成并进入首页</view>
|
||||
<view class="submit-btn" bind:tap="onSubmit">开始使用</view>
|
||||
|
||||
<user-info-confirm-modal show="{{ showConfirmModal }}" userInfo="{{ serverResult }}" bind:confirm="onConfirmModalConfirm" bind:cancel="onConfirmModalCancel" />
|
||||
</view>
|
||||
|
||||
@@ -3,7 +3,7 @@ import { ENV, type EnvType } from '../env/index'
|
||||
/** 各环境接口网关地址:develop / trial 走测试网关,release 走正式网关 */
|
||||
const BASE_URLS: Record<EnvType, string> = {
|
||||
develop: 'http://10.10.10.10:8889/',
|
||||
trial: 'http://10.10.10.10:8889/',
|
||||
trial: 'https://device.shuziweidao.com/gateway/',
|
||||
release: 'https://device.shuziweidao.com/gateway/',
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user