fix: 后端接口改为java,联调接口修改。

2026-01-12 00:36:05 +08:00
parent 7e10c62cf9
commit b2f7f5fe1e
21 changed files with 550 additions and 259 deletions
--- a/src/pages/login/index.vue
+++ b/src/pages/login/index.vue
@@ -141,12 +141,27 @@ function wxLoginCheck() {
 /** 微信登录 */
 function wxLogin(e) {
  isLoading.value = true;
+  console.log('获取手机号返回：', e.detail);
+  
+  // 用户拒绝授权
+  if (!e.detail.code) {
+    state.msg = "获取手机号失败，请允许授权";
+    state.show = true;
+    isLoading.value = false;
+    return;
+  }
+  
  if (e.detail.code) {
    Taro.login({
      success: function (res) {
+        console.log('微信登录返回：', res);
        if (res.code) {
-          loginWxToPhone({ code: e.detail.code, js_code: res.code })
+          const params = { code: e.detail.code, js_code: res.code };
+          console.log('调用登录接口参数：', params);
+          
+          loginWxToPhone(params)
            .then((res) => {
+              console.log('登录接口返回：', res);
              if (res.statusCode == 200) {
                Taro.setStorageSync(
                  "ReTime",
@@ -169,27 +184,32 @@ function wxLogin(e) {
                  url: "/pages/main/home",
                });
                return;
+              } else {
+                state.msg = `登录失败：${res.data?.msg || '服务器返回异常'}`;
+                state.show = true;
              }
            })
+            .catch((err) => {
+              console.error('登录接口错误：', err);
+              state.msg = `登录失败：${err.data?.msg || err.errMsg || '网络错误'}`;
+              state.show = true;
+            })
            .finally(() => {
              isLoading.value = false;
            });
        } else {
-          state.msg = "登录失败";
+          state.msg = "微信登录失败，请重试";
          state.show = true;
          isLoading.value = false;
        }
      },
-      fail: function () {
-        state.msg = "登录失败";
+      fail: function (err) {
+        console.error('微信登录失败：', err);
+        state.msg = `微信登录失败：${err.errMsg || '未知错误'}`;
        state.show = true;
        isLoading.value = false;
      },
    });
-  } else {
-    state.msg = "登录失败";
-    state.show = true;
-    isLoading.value = false;
  }
 }
 /** 查看用户协议 */
--- a/src/pages/login/loginPhone.vue
+++ b/src/pages/login/loginPhone.vue
@@ -163,29 +163,38 @@ function login() {
  }
  isLoading.value = true
  loginSms(loginForm.phonenumber, loginForm.code).then((res: any) => {
-    if (res.statusCode == 200) {
+    if (res.code == 200) {
+      // 存储 token
+      if (res.data.access_token) {
+        Taro.setStorageSync("Access-Token", res.data.access_token);
+        Taro.setStorageSync("X-Access-Token", res.data.access_token);
+      }
+      
      Taro.setStorageSync(
        "ReTime",
        res.data.createdTime
          ? formatDate(new Date(res.data.createdTime))
          : formatDate(new Date())
      );
-      Taro.setStorageSync("UserName", res.data.userName);
-      Taro.setStorageSync("Phone", res.data.mobilePhone);
+      Taro.setStorageSync("UserName", res.data.userName || loginForm.phonenumber);
+      Taro.setStorageSync("Phone", loginForm.phonenumber);
      Taro.setStorageSync("LoginType", "1");
-      Taro.setStorageSync("UserId", res.data.id);
+      Taro.setStorageSync("UserId", res.data.userId || "");
      Taro.setStorageSync("UnLogin", 2);
      store.updateLoginStatus(0);
      store.updateUnLogin(2);
-      store.updateRootUserId(res.data.id);
-      store.updateUserId(res.data.id);
-      store.updateRootUserName(res.data.userName);
+      store.updateRootUserId(res.data.userId || "");
+      store.updateUserId(res.data.userId || "");
+      store.updateRootUserName(res.data.userName || loginForm.phonenumber);
      state.msg = "登录成功";
      state.show = true;
      Taro.switchTab({
        url: "/pages/main/home",
      });
      return;
+    } else {
+      state.msg = res.msg || "登录失败";
+      state.show = true;
    }
  }).finally(()=>{
    isLoading.value = false
--- a/src/pages/main/home.vue
+++ b/src/pages/main/home.vue
@@ -858,7 +858,7 @@ function resUsetInfo() {
 function getWarnMsg() {
  const warnParams = ref({
    pageSize: 10,
-    curPage: 1,
+    pageNum: 1,
  });
  msgWarn(warnParams.value).then((res: any) => {
    if (res.statusCode == 200) {
@@ -922,14 +922,15 @@ function changeMode() {
 // 塘口模式1
 function pond1() {
  getPond1().then((res: any) => {
-    if (res.statusCode == 200) {
+    if (res.code == 200) {
      const pondIds = [];
-      res.data.forEach((item: any) => {
+      const rows = res.rows || [];
+      rows.forEach((item: any) => {
        pondIds.push(item.id);
        let num = 3;
-        const msg = item.warnCodeInfo.warnDescription;
-        const showPh = !alarmJudgeCode(item.warnCodeInfo.warnCode, 1);
-        const showSa = !alarmJudgeCode(item.warnCodeInfo.warnCode, 2);
+        const msg = item.warnCodeInfo?.warnDescription || '';
+        const showPh = !alarmJudgeCode(item.warnCodeInfo?.warnCode, 1);
+        const showSa = !alarmJudgeCode(item.warnCodeInfo?.warnCode, 2);
        if (msg) {
          item.isPh = showPh;
          item.isSa = showSa;
@@ -950,18 +951,18 @@ function pond1() {
        item.up = true;

      });
-      pondList.value = res.data;
+      pondList.value = rows;
      setTimeout(() => {
-        showTour.value = res.data.length == 0 ? true : false;
+        showTour.value = rows.length == 0 ? true : false;
      }, 500);
      selPond.value = selPond.value
        ? selPond.value
-        : res.data.length > 0
-        ? Number(res.data[0]["id"])
+        : rows.length > 0
+        ? Number(rows[0]["id"])
        : undefined;
      if (selPond.value) {
        if (!pondIds.includes(selPond.value)) {
-          selPond.value = res.data.length > 0 ? Number(res.data[0]["id"]) : undefined;
+          selPond.value = rows.length > 0 ? Number(rows[0]["id"]) : undefined;
        }
      }
    }
--- a/src/pages/main/my.vue
+++ b/src/pages/main/my.vue
@@ -333,7 +333,7 @@ Taro.useUnload(() => {
 function getWarnMsg() {
  const warnParams = ref({
    pageSize: 10,
-    curPage: 1,
+    pageNum: 1,
  })
  msgWarn(warnParams.value).then((res: any) => {
    if (res.statusCode == 200) {
--- a/src/pages/msg/index.vue
+++ b/src/pages/msg/index.vue
@@ -93,7 +93,7 @@
                    >
                      <view class="title">{{ item.title }}</view>
                      <view class="time">{{
-                        item.createdTime ? formatDateMin(item.createdTime) : ""
+                        item.createTime ? formatDateMin(item.createTime) : ""
                      }}</view>
                    </view>
                    <view class="view_f_between_2">
@@ -146,10 +146,10 @@
                      <view class="title">{{ item.title }}</view>
                     
                      <view class="time">{{
-                        item.createdTime ? formatDateMin(item.createdTime) : ""
+                        item.createTime ? formatDateMin(item.createTime) : ""
                      }}</view>
                    </view>
-                    <view class="content" v-show="item.opName">{{ '控制模式：'+item.opName }}</view>
+                    <view class="content" v-if="item.opUserName">操作人：{{ item.opUserName }}</view>
                    <view class="content">{{ item.message }}</view>
                  </nut-col>
                </nut-row>
@@ -176,25 +176,24 @@
                  </nut-col>
                  <nut-col :span="14">
                    <view :style="{ display: 'flex', alignItems: 'center' }">
-                      <view class="title">{{
-                        item.deviceType == 2 ? "测控一体机" : "水质检测仪"
-                      }}</view>
+                      <view class="title">充值订单</view>
                    </view>
                    <view :style="{ display: 'flex', alignItems: 'center',marginTop:'10rpx' }">
                      <nut-tag class="tag" :style="{marginLeft:'0px !important'}"> {{ item.addMonth }}个月 </nut-tag>
-                      <nut-tag class="tag"> {{ item.payType==1?'用户充值':'后台续期' }} </nut-tag>
+                      <nut-tag class="tag" v-if="item.orderStatus == 2"> 已支付 </nut-tag>
+                      <nut-tag class="tag" v-else-if="item.orderStatus == 1"> 待支付 </nut-tag>
                    </view>
-                    <view class="content" v-if="item.serialNum ">
-                      设备：{{ item.serialNum }}
+                    <view class="content">
+                      设备数量：{{ item.deviceCount }}台
                    </view>
                    <view class="time mt">
-                      续费日期：{{
-                        item.createdTime ? formatDateMin(item.createdTime) : ""
+                      下单时间：{{
+                        item.createTime ? formatDateMin(item.createTime) : ""
                      }}
                    </view>
-                    <view class="time mt">
-                      到期日期：{{
-                        item.deadTime ? formatDate_(item.deadTime) : ""
+                    <view class="time mt" v-if="item.successTime">
+                      支付时间：{{
+                        item.successTime ? formatDateMin(item.successTime) : ""
                      }}
                    </view>
                  </nut-col>
@@ -209,7 +208,7 @@
                    }"
                  >
                    <text class="price" style="line-height: 1"
-                      >¥{{ Number(item.payAmount)/100 }}</text
+                      >¥{{ item.totalAmountYuan }}</text
                    >
                  </nut-col>
                </nut-row>
@@ -251,7 +250,7 @@ const selectVal = ref(0);
 const warnList = ref([]);
 const warnParams = ref({
  pageSize: 10,
-  curPage: 1
+  pageNum: 1
 });
 const warnTotal = ref(0);
 const warnTotalPages = ref(1);
@@ -259,7 +258,7 @@ const warnTotalPages = ref(1);
 const switchList = ref([]);
 const switchParams = ref({
  pageSize: 10,
-  curPage: 1
+  pageNum: 1
 });
 const switchTotal = ref(0);
 const switchTotalPages = ref(1);
@@ -267,7 +266,7 @@ const switchTotalPages = ref(1);
 const payList = ref([]);
 const payParams = ref({
  pageSize: 10,
-  curPage: 1
+  pageNum: 1
 });
 const payTotal = ref(0);
 const payTotalPages = ref(1);
@@ -293,25 +292,34 @@ function changeVal(e) {

  selectVal.value = e;
  if (e == 0) {
-    warnParams.value.curPage = 1;
+    warnParams.value.pageNum = 1;
    getWarnMsg();
  } else if (e == 1) {
-    switchParams.value.curPage = 1;
+    switchParams.value.pageNum = 1;
    getSwitchMsg();
  } else if (e == 2) {
-    payParams.value.curPage = 1;
+    payParams.value.pageNum = 1;
    getPayMsg();
  }
 }
 // 查询告警消息
 function getWarnMsg() {
-  msgWarn(warnParams.value).then((res: any) => {
-    if (res.statusCode == 200) {
-      warnList.value = res.data.items;
-      warnTotal.value = res.data.totalCount;
-      warnTotalPages.value = res.data.totalPages;
-      unReadCount.value = res.data.unReadCount;
-      msgCount.value = res.data.totalCount;
+  const userId = Taro.getStorageSync("UserId");
+  const params = {
+    ...warnParams.value,
+    userId
+  };
+  msgWarn(params).then((res: any) => {
+    if (res.code == 200) {
+      // 数据直接在 res 上，不是 res.data
+      warnList.value = res.rows || [];
+      warnTotal.value = res.total || 0;
+      // 计算总页数
+      warnTotalPages.value = Math.ceil(warnTotal.value / warnParams.value.pageSize);
+      // 统计未读数量
+      unReadCount.value = warnList.value.filter(item => !item.isRead).length;
+      msgCount.value = warnTotal.value;
+      
      if (unReadCount.value) {
        Taro.setTabBarBadge({
          index: 1, // tabBar的位置，从0开始计数
@@ -327,55 +335,81 @@ function getWarnMsg() {
 }
 // 查询开关消息
 function getSwitchMsg() {
-  msgSwitch(switchParams.value).then((res: any) => {
-    if (res.statusCode == 200) {
-      switchList.value = res.data.items;
-      switchTotal.value = res.data.totalCount;
-      switchTotalPages.value = res.data.totalPages;
-      msgCount.value = res.data.totalCount;
+   const userId = Taro.getStorageSync("UserId");
+  const params = {
+    ...switchParams.value,
+    userId
+  };
+  msgSwitch(params).then((res: any) => {
+    if (res.code == 200) {
+      switchList.value = res.rows || [];
+      switchTotal.value = res.total || 0;
+      switchTotalPages.value = Math.ceil(switchTotal.value / switchParams.value.pageSize);
+      msgCount.value = switchTotal.value;
    }
  });
 }
 // 查询充值消息
 function getPayMsg() {
-  msgPay(payParams.value).then((res: any) => {
-    if (res.statusCode == 200) {
-      payList.value = res.data.items;
-      payTotal.value = res.data.totalCount;
-      payTotalPages.value = res.data.totalPages;
-      msgCount.value = res.data.totalCount;
+   const userId = Taro.getStorageSync("UserId");
+  const params = {
+    ...payParams.value,
+    userId
+  };
+  msgPay(params).then((res: any) => {
+    if (res.code == 200) {
+      payList.value = res.rows || [];
+      payTotal.value = res.total || 0;
+      payTotalPages.value = Math.ceil(payTotal.value / payParams.value.pageSize);
+      msgCount.value = payTotal.value;
    }
  });
 }
 function lower() {
+  const userId = Taro.getStorageSync("UserId");
  if (selectVal.value == 0) {
-    if (warnParams.value.curPage < warnTotalPages.value) {
-      warnParams.value.curPage = warnParams.value.curPage + 1;
-      msgWarn(warnParams.value).then((res: any) => {
-        if (res.statusCode == 200) {
-          res.data.items.forEach((r) => {
+    if (warnParams.value.pageNum < warnTotalPages.value) {
+      warnParams.value.pageNum = warnParams.value.pageNum + 1;
+      const params = {
+        ...warnParams.value,
+        userId
+      };
+      msgWarn(params).then((res: any) => {
+        if (res.code == 200) {
+          const newRows = res.rows || [];
+          newRows.forEach((r) => {
            warnList.value.push(r);
          });
        }
      });
    }
  } else if (selectVal.value == 1) {
-    if (switchParams.value.curPage < switchTotalPages.value) {
-      switchParams.value.curPage = switchParams.value.curPage + 1;
-      msgSwitch(switchParams.value).then((res: any) => {
-        if (res.statusCode == 200) {
-          res.data.items.forEach((r) => {
+    if (switchParams.value.pageNum < switchTotalPages.value) {
+      switchParams.value.pageNum = switchParams.value.pageNum + 1;
+      const params = {
+        ...switchParams.value,
+        userId
+      };
+      msgSwitch(params).then((res: any) => {
+        if (res.code == 200) {
+          const newRows = res.rows || [];
+          newRows.forEach((r) => {
            switchList.value.push(r);
          });
        }
      });
    }
  } else if (selectVal.value == 2) {
-    if (payParams.value.curPage < payTotalPages.value) {
-      payParams.value.curPage = payParams.value.curPage + 1;
-      msgPay(payParams.value).then((res: any) => {
-        if (res.statusCode == 200) {
-          res.data.items.forEach((r) => {
+    if (payParams.value.pageNum < payTotalPages.value) {
+      payParams.value.pageNum = payParams.value.pageNum + 1;
+      const params = {
+        ...payParams.value,
+        userId
+      };
+      msgPay(params).then((res: any) => {
+        if (res.code == 200) {
+          const newRows = res.rows || [];
+          newRows.forEach((r) => {
            payList.value.push(r);
          });
        }
@@ -385,34 +419,50 @@ function lower() {
 }
 /** 上拉触底分页 */
 Taro.useReachBottom(() => {
+  const userId = Taro.getStorageSync("UserId");
  if (selectVal.value == 0) {
-    if (warnParams.value.curPage < warnTotalPages.value) {
-      warnParams.value.curPage = warnParams.value.curPage + 1;
-      msgWarn(warnParams.value).then((res: any) => {
-        if (res.statusCode == 200) {
-          res.data.items.forEach((r) => {
+    if (warnParams.value.pageNum < warnTotalPages.value) {
+      warnParams.value.pageNum = warnParams.value.pageNum + 1;
+      const params = {
+        ...warnParams.value,
+        userId
+      };
+      msgWarn(params).then((res: any) => {
+        if (res.code == 200) {
+          const newRows = res.rows || [];
+          newRows.forEach((r) => {
            warnList.value.push(r);
          });
        }
      });
    }
  } else if (selectVal.value == 1) {
-    if (switchParams.value.curPage < switchTotalPages.value) {
-      switchParams.value.curPage = switchParams.value.curPage + 1;
-      msgSwitch(switchParams.value).then((res: any) => {
-        if (res.statusCode == 200) {
-          res.data.items.forEach((r) => {
+    if (switchParams.value.pageNum < switchTotalPages.value) {
+      switchParams.value.pageNum = switchParams.value.pageNum + 1;
+      const params = {
+        ...switchParams.value,
+        userId
+      };
+      msgSwitch(params).then((res: any) => {
+        if (res.code == 200) {
+          const newRows = res.rows || [];
+          newRows.forEach((r) => {
            switchList.value.push(r);
          });
        }
      });
    }
  } else if (selectVal.value == 2) {
-    if (payParams.value.curPage < payTotalPages.value) {
-      payParams.value.curPage = payParams.value.curPage + 1;
-      msgPay(payParams.value).then((res: any) => {
-        if (res.statusCode == 200) {
-          res.data.items.forEach((r) => {
+    if (payParams.value.pageNum < payTotalPages.value) {
+      payParams.value.pageNum = payParams.value.pageNum + 1;
+      const params = {
+        ...payParams.value,
+        userId
+      };
+      msgPay(params).then((res: any) => {
+        if (res.code == 200) {
+          const newRows = res.rows || [];
+          newRows.forEach((r) => {
            payList.value.push(r);
          });
        }
@@ -423,7 +473,7 @@ Taro.useReachBottom(() => {
 // 已读
 function read(id) {
  msgRead({ id }).then((res: any) => {
-    if (res.statusCode == 200) {
+    if (res.code == 200) {
      getWarnMsg();
    }
  });
@@ -434,7 +484,7 @@ function readAll() {
    id:0
  }
  msgReadAll().then((res: any) => {
-    if (res.statusCode == 200) {
+    if (res.code == 200) {
      getWarnMsg();
    }
  });