Jelajahi Sumber

提交家庭管理

wangming 2 bulan lalu
induk
melakukan
279bc83c23

+ 19 - 17
src/components/js_sdk/index.js

@@ -5,13 +5,15 @@ http.setConfig(config => {
     if (__wxConfig.envVersion == 'develop') {
         let selectedService = uni.getStorageSync("sercviceChoice")
         if (!selectedService || selectedService == 'aloneServe') {
-            config.baseUrl = "https://radar-power.cn/portal-service-server/";
+            // config.baseUrl = "https://radar-power.cn/portal-service-server/";
+            config.baseUrl = "https://api.radar-power.asia:4443/portal-service-server/";
         }
     }
     if (__wxConfig.envVersion == 'trial') {
         let selectedService = uni.getStorageSync("sercviceChoice")
         if (!selectedService || selectedService == 'aloneServe') {
             config.baseUrl = "https://radar-power.cn/portal-service-server/";
+            // config.baseUrl = "https://api.radar-power.asia:4443/portal-service-server/";
         }
     }
     if (__wxConfig.envVersion == 'release') {
@@ -47,22 +49,22 @@ http.interceptor.request((config, cancel) => {
 
 // 响应拦截器
 http.interceptor.response(response => {
-    if (response.data.code == '11011' || response.data.code == '11012') {
-        uni.showModal({
-            content: "登录过期,请重新登录",
-            complete: (res) => {
-                if (res.confirm) {
-                    uni.reLaunch({
-                        url: "/pagesA/loginNew/loginNew"
-                    })
-                } else {
-                    uni.reLaunch({
-                        url: "/pagesA/loginNew/loginNew"
-                    })
-                }
-            },
-        });
-    }
+    // if (response.data.code == '11011' || response.data.code == '11012') {
+    //     uni.showModal({
+    //         content: "登录过期,请重新登录",
+    //         complete: (res) => {
+    //             if (res.confirm) {
+    //                 uni.reLaunch({
+    //                     url: "/pagesA/loginNew/loginNew"
+    //                 })
+    //             } else {
+    //                 uni.reLaunch({
+    //                     url: "/pagesA/loginNew/loginNew"
+    //                 })
+    //             }
+    //         },
+    //     });
+    // }
     console.log(response, '接口打印了>>>')
     return response; // 正常返回响应
 

+ 16 - 0
src/pages/home/home.vue

@@ -85,6 +85,9 @@
             <button open-type="contact">联系客服</button>
         </view>
         <view class="bot_version"> v3.0.0 </view>
+
+        <!-- <view class="headerInfo">111111</view> -->
+
         <alarmCom></alarmCom>
     </view>
 </template>
@@ -340,4 +343,17 @@ export default {
     justify-content: center;
     align-items: center;
 }
+// .headerInfo {
+//     position: fixed;
+//     top: 40rpx;
+//     left: 0;
+//     width: 750rpx;
+//     height: 105rpx;
+//     background: linear-gradient(
+//         90deg,
+//         rgba(255, 97, 97, 0) 0%,
+//         #6ddea7 50.44%,
+//         rgba(255, 97, 97, 0) 100%
+//     );
+// }
 </style>

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

@@ -189,7 +189,6 @@ export default {
                             // );
                         }
                         this.devs = devs;
-                        console.log(this.devs, 99999);
                     } else {
                         uni.showModal({
                             content: res.data.message,

+ 17 - 4
src/pagesA/homeManage/homeManage.vue

@@ -65,7 +65,11 @@
                     >
                         <text>确定</text>
                     </button>
-                    <button class="btn link-btn" @click="sureEditGroup()">
+                    <button
+                        class="btn link-btn"
+                        @click="sureEditGroup()"
+                        v-else
+                    >
                         <text>确定</text>
                     </button>
                 </view>
@@ -149,9 +153,18 @@ export default {
                 success: (res) => {
                     if (res.confirm) {
                         this.$http
-                            .post("wap/group/deleteGroup", {
-                                group_id: item.groupUuid,
-                            })
+                            .post(
+                                "wap/group/deleteGroup",
+                                {
+                                    group_id: item.groupId,
+                                },
+                                {
+                                    header: {
+                                        "Content-Type":
+                                            "application/x-www-form-urlencoded",
+                                    },
+                                }
+                            )
                             .then((res) => {
                                 if (res.data.code == 200) {
                                     uni.showToast({