wangming 1 kuukausi sitten
vanhempi
commit
83e9dd2353

+ 1 - 6
src/components/component/alarModel.vue

@@ -121,7 +121,6 @@ export default {
             const name = this.name;
             const sn = this.clientId;
             const voipDevices = this.voipDevices;
-            console.log(name, sn, voipDevices, 88888888888);
             if (!name || name.length === 0 || !sn || sn.length === 0) {
                 wx.showToast({
                     title: "请输入授权人名称和设备clientId",
@@ -465,13 +464,9 @@ export default {
             if (!selectedService || selectedService == "aloneServe") {
                 if (__wxConfig.envVersion == "develop") {
                     client = mqtt.connect(
-                        "wxs://radar-power.cn:8084/mqtt",
+                        "wxs://api.radar-power.asia:8084/mqtt",
                         params
                     );
-                    // client = mqtt.connect(
-                    //     "wxs://radar-power.cn:8084/mqtt",
-                    //     params
-                    // );
                 }
                 if (__wxConfig.envVersion == "trial") {
                     client = mqtt.connect(

+ 0 - 2
src/components/component/tenMinutes.vue

@@ -120,7 +120,6 @@ export default {
             const name = this.name;
             const sn = this.clientId;
             const voipDevices = this.voipDevices;
-            console.log(name, sn, voipDevices, 88888888888);
             if (!name || name.length === 0 || !sn || sn.length === 0) {
                 wx.showToast({
                     title: "请输入授权人名称和设备clientId",
@@ -472,7 +471,6 @@ export default {
                 });
         },
         getFallingEventsQuery() {
-            console.log(this.userId, 88888);
             this.$http
                 .get("wap/stats/fallingEventsQuery", {
                     user_id: this.userId,

+ 2 - 2
src/components/js_sdk/index.js

@@ -5,9 +5,9 @@ http.setConfig(config => {
     if (__wxConfig.envVersion == 'develop') {
         let selectedService = uni.getStorageSync("sercviceChoice")
         if (!selectedService || selectedService == 'aloneServe') {
-            // config.baseUrl = "https://api.radar-power.asia:4443/portal-service-server/";
+            config.baseUrl = "https://api.radar-power.asia:4443/portal-service-server/";
         }
-        config.baseUrl = "https://radar-power.cn/portal-service-server/";
+        // config.baseUrl = "https://radar-power.cn/portal-service-server/";
     }
     if (__wxConfig.envVersion == 'trial') {
         let selectedService = uni.getStorageSync("sercviceChoice")

+ 10 - 1
src/pages/home/home.vue

@@ -307,7 +307,6 @@ export default {
     },
     onLoad() {},
     onShow() {
-        this.getWeather();
         if (uni.getStorageSync("userId")) {
             uni.showLoading({
                 title: "雷能为您守护中...",
@@ -323,6 +322,16 @@ export default {
         if (!selectedService) {
             uni.setStorageSync("sercviceChoice", "aloneServe");
         }
+        uni.getLocation({
+            type: "wgs84",
+            success: (res) => {
+                if (res) {
+                    // this.weatherText = res.data.now.text;
+                    console.log(res, 99999);
+                }
+                this.getWeather();
+            },
+        });
     },
     onHide() {
         this.isInitAlarm = false;

+ 0 - 1
src/pagesA/adDevice/adDevice.vue

@@ -468,7 +468,6 @@ export default {
                                 duration: 1500,
                             });
                         }
-                        console.log(res.data.code, 888888);
                     });
             }
         },

+ 0 - 76
src/uni.scss

@@ -1,76 +0,0 @@
-/**
- * 这里是uni-app内置的常用样式变量
- *
- * uni-app 官方扩展插件及插件市场(https://ext.dcloud.net.cn)上很多三方插件均使用了这些样式变量
- * 如果你是插件开发者,建议你使用scss预处理,并在插件代码中直接使用这些变量(无需 import 这个文件),方便用户通过搭积木的方式开发整体风格一致的App
- *
- */
-
-/**
- * 如果你是App开发者(插件使用者),你可以通过修改这些变量来定制自己的插件主题,实现自定义主题功能
- *
- * 如果你的项目同样使用了scss预处理,你也可以直接在你的 scss 代码中使用如下变量,同时无需 import 这个文件
- */
-
-/* 颜色变量 */
-
-/* 行为相关颜色 */
-$uni-color-primary: #007aff;
-$uni-color-success: #4cd964;
-$uni-color-warning: #f0ad4e;
-$uni-color-error: #dd524d;
-
-/* 文字基本颜色 */
-$uni-text-color: #333; // 基本色
-$uni-text-color-inverse: #fff; // 反色
-$uni-text-color-grey: #999; // 辅助灰色,如加载更多的提示信息
-$uni-text-color-placeholder: #808080;
-$uni-text-color-disable: #c0c0c0;
-
-/* 背景颜色 */
-$uni-bg-color: #fff;
-$uni-bg-color-grey: #f8f8f8;
-$uni-bg-color-hover: #f1f1f1; // 点击状态颜色
-$uni-bg-color-mask: rgba(0, 0, 0, 0.4); // 遮罩颜色
-
-/* 边框颜色 */
-$uni-border-color: #c8c7cc;
-
-/* 尺寸变量 */
-
-/* 文字尺寸 */
-$uni-font-size-sm: 12px;
-$uni-font-size-base: 14px;
-$uni-font-size-lg: 16px;
-
-/* 图片尺寸 */
-$uni-img-size-sm: 20px;
-$uni-img-size-base: 26px;
-$uni-img-size-lg: 40px;
-
-/* Border Radius */
-$uni-border-radius-sm: 2px;
-$uni-border-radius-base: 3px;
-$uni-border-radius-lg: 6px;
-$uni-border-radius-circle: 50%;
-
-/* 水平间距 */
-$uni-spacing-row-sm: 5px;
-$uni-spacing-row-base: 10px;
-$uni-spacing-row-lg: 15px;
-
-/* 垂直间距 */
-$uni-spacing-col-sm: 4px;
-$uni-spacing-col-base: 8px;
-$uni-spacing-col-lg: 12px;
-
-/* 透明度 */
-$uni-opacity-disabled: 0.3; // 组件禁用态的透明度
-
-/* 文章场景相关 */
-$uni-color-title: #2c405a; // 文章标题颜色
-$uni-font-size-title: 20px;
-$uni-color-subtitle: #555; // 二级标题颜色
-$uni-font-size-subtitle: 18px;
-$uni-color-paragraph: #3f536e; // 文章段落颜色
-$uni-font-size-paragraph: 15px;