调整一下底部小样式
This commit is contained in:
@ -4,7 +4,8 @@ export function login(data) {
|
|||||||
return request({
|
return request({
|
||||||
url: '/app/auth/login',
|
url: '/app/auth/login',
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
data: data
|
data: data,
|
||||||
|
isAuthen:false
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
// 注册发送验证码
|
// 注册发送验证码
|
||||||
|
|||||||
@ -2,7 +2,7 @@
|
|||||||
const config = {
|
const config = {
|
||||||
// 开发环境
|
// 开发环境
|
||||||
development: {
|
development: {
|
||||||
BASE_URL: 'http://192.168.110.57:8000',//http://139.224.253.23:8000
|
BASE_URL: 'http://139.224.253.23:8000',//http://139.224.253.23:8000
|
||||||
API_PREFIX: '',
|
API_PREFIX: '',
|
||||||
// MQTT 配置
|
// MQTT 配置
|
||||||
MQTT_HOST: 'www.cnxhyc.com',
|
MQTT_HOST: 'www.cnxhyc.com',
|
||||||
|
|||||||
@ -2,7 +2,7 @@
|
|||||||
"name" : "星汉物联",
|
"name" : "星汉物联",
|
||||||
"appid" : "__UNI__A21EF43",
|
"appid" : "__UNI__A21EF43",
|
||||||
"description" : "设备管控",
|
"description" : "设备管控",
|
||||||
"versionName" : "1.0.12",
|
"versionName" : "1.0.13",
|
||||||
"versionCode" : "100",
|
"versionCode" : "100",
|
||||||
"transformPx" : false,
|
"transformPx" : false,
|
||||||
/* 5+App特有相关 */
|
/* 5+App特有相关 */
|
||||||
|
|||||||
@ -95,7 +95,7 @@
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
<view class="warn" style="padding-bottom: 20rpx;">
|
<view style="padding-bottom: 20rpx;">
|
||||||
|
|
||||||
|
|
||||||
<view class="proinfo lamp">
|
<view class="proinfo lamp">
|
||||||
|
|||||||
@ -223,25 +223,30 @@
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
<view class="proinfo lamp">
|
|
||||||
<text class="title">产品信息</text>
|
|
||||||
<view class="itemcontent">
|
|
||||||
<view class="item" @click="proParam()">
|
</view>
|
||||||
<image class="img" src="/static/images/6155/DeviceDetail/param.png" mode="aspectFit"></image>
|
|
||||||
<text class="txt">产品参数</text>
|
<view class="proinfo lamp">
|
||||||
</view>
|
<text class="title">产品信息</text>
|
||||||
<view class="item" @click="handRemark()">
|
<view class="itemcontent">
|
||||||
<image class="img" src="/static/images/6155/DeviceDetail/remark.png" mode="aspectFit"></image>
|
<view class="item" @click="proParam()">
|
||||||
<text class="txt">操作说明</text>
|
<image class="img" src="/static/images/6155/DeviceDetail/param.png" mode="aspectFit"></image>
|
||||||
</view>
|
<text class="txt">产品参数</text>
|
||||||
<view class="item" @click="handVideo()">
|
</view>
|
||||||
<image class="img" src="/static/images/6155/DeviceDetail/video.png" mode="aspectFit"></image>
|
<view class="item" @click="handRemark()">
|
||||||
<text class="txt">操作视频</text>
|
<image class="img" src="/static/images/6155/DeviceDetail/remark.png" mode="aspectFit"></image>
|
||||||
</view>
|
<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>
|
||||||
|
</view>
|
||||||
|
|
||||||
<!-- 弹窗通知 -->
|
<!-- 弹窗通知 -->
|
||||||
<MessagePopup :visible="Status.Pop.showPop" :type="Status.Pop.popType" :bgColor="Status.Pop.bgColor"
|
<MessagePopup :visible="Status.Pop.showPop" :type="Status.Pop.popType" :bgColor="Status.Pop.bgColor"
|
||||||
:borderColor="Status.Pop.borderColor" :textColor="Status.Pop.textColor"
|
:borderColor="Status.Pop.borderColor" :textColor="Status.Pop.textColor"
|
||||||
:buttonBgColor="Status.Pop.buttonBgColor" :buttonTextColor="Status.Pop.buttonTextColor"
|
:buttonBgColor="Status.Pop.buttonBgColor" :buttonTextColor="Status.Pop.buttonTextColor"
|
||||||
@ -263,7 +268,6 @@
|
|||||||
</BottomSlideMenuPlus> -->
|
</BottomSlideMenuPlus> -->
|
||||||
|
|
||||||
<global-loading ref="loading" />
|
<global-loading ref="loading" />
|
||||||
</view>
|
|
||||||
</view>
|
</view>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
|||||||
@ -147,7 +147,7 @@
|
|||||||
</view>
|
</view>
|
||||||
|
|
||||||
|
|
||||||
<view class="warn" style="padding-bottom: 20rpx;">
|
<view style="padding-bottom: 20rpx;">
|
||||||
|
|
||||||
|
|
||||||
<view class="proinfo lamp">
|
<view class="proinfo lamp">
|
||||||
|
|||||||
@ -183,7 +183,7 @@
|
|||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<view class="warn" style="padding-bottom: 20rpx;">
|
<view style="padding-bottom: 20rpx;">
|
||||||
|
|
||||||
|
|
||||||
<view class="proinfo lamp">
|
<view class="proinfo lamp">
|
||||||
|
|||||||
@ -775,7 +775,7 @@ class BleHelper {
|
|||||||
str: str,
|
str: str,
|
||||||
hexs: hexs
|
hexs: hexs
|
||||||
};
|
};
|
||||||
// console.log("监听到特征值:" + JSON.stringify(recData));
|
console.log("监听到特征值:" + JSON.stringify(recData));
|
||||||
if (this.cfg.receivDataCallback) {
|
if (this.cfg.receivDataCallback) {
|
||||||
|
|
||||||
if (this.cfg.receivDataCallback.length > 0) {
|
if (this.cfg.receivDataCallback.length > 0) {
|
||||||
|
|||||||
@ -48,8 +48,11 @@ const request = (options) => {
|
|||||||
reject(err);
|
reject(err);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
//是否添加身份验证,undefined时默认需要
|
||||||
if (!options.url.includes('/login')) {
|
if(options.isAuthen===undefined){
|
||||||
|
options.isAuthen=true;
|
||||||
|
}
|
||||||
|
if (options.isAuthen) {
|
||||||
const token = uni.getStorageSync('token');
|
const token = uni.getStorageSync('token');
|
||||||
const clientid = uni.getStorageSync('clientID');
|
const clientid = uni.getStorageSync('clientID');
|
||||||
if (token) {
|
if (token) {
|
||||||
|
|||||||
Reference in New Issue
Block a user