From 526e775cd869b2433318764478e6b4ac8c4cbf08 Mon Sep 17 00:00:00 2001
From: qiaomu <3520484422@qq.com>
Date: Mon, 22 Jul 2024 16:08:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B8=B8=E8=A7=81=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=EF=BC=8C=EF=BC=8C=E8=B0=83=E6=95=B4=E7=BD=91=E9=A1=B5?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 childPackage/pages/billDetail/index.js |  7 ++---
 pages/my/index.wxml                    |  2 +-
 pages/questions/index.js               | 43 +++++++++++++++-----------
 pages/questions/index.wxml             | 10 +++---
 pages/rechargeDetail/index.js          |  6 ++--
 service/user.js                        |  4 +++
 utils/index.js                         |  2 +-
 7 files changed, 41 insertions(+), 33 deletions(-)

diff --git a/childPackage/pages/billDetail/index.js b/childPackage/pages/billDetail/index.js
index 3f7589b..445d702 100644
--- a/childPackage/pages/billDetail/index.js
+++ b/childPackage/pages/billDetail/index.js
@@ -125,24 +125,23 @@ Page({
         if (res.confirm) {
           const result = wx.getAccountInfoSync();
           const { envVersion } = result.miniProgram;
-          let api = ""
           switch (envVersion) {
             // 开发版
             case 'develop':
               wx.setClipboardData({
-                data: `https://zgd.hbhcbn.com/user-report/?report=${id}&tenement=${tenement}`,
+                data: `http://1.92.72.5:8080/user-report/?report=${id}&tenement=${tenement}`,
               })
               break;
             // 体验版
             case 'trial':
               wx.setClipboardData({
-                data: `https://zgd.hbhcbn.com/user-report/?report=${id}&tenement=${tenement}`,
+                data: `http://1.92.72.5:8080/user-report/?report=${id}&tenement=${tenement}`,
               })
               break;
             // 正式版
             case 'release':
               wx.setClipboardData({
-                data: `https://zgd.hbhcbn.com/user-report-h5/?report=${id}&tenement=${tenement}`,
+                data: `https://zgd.hbhcbn.com/user-report/?report=${id}&tenement=${tenement}`,
               })
               break;
           }
diff --git a/pages/my/index.wxml b/pages/my/index.wxml
index a43f43c..aae8228 100644
--- a/pages/my/index.wxml
+++ b/pages/my/index.wxml
@@ -17,7 +17,7 @@
 </van-cell>
 <van-cell title="发票抬头" value="" is-link bind:tap="jumpToUpdateInvoice" />
 <van-cell title="绑定企业" value="" is-link bind:tap="bindTenement" />
-<!-- <van-cell title="常见问题" value="" is-link bind:tap="jumpToQuestions" /> -->
+<van-cell title="常见问题" value="" is-link bind:tap="jumpToQuestions" />
 <van-cell title="退出登录" value="" is-link bind:tap="logout" />
 <!-- </van-cell-group> -->
 <!-- <van-cell-group title=" ">
diff --git a/pages/questions/index.js b/pages/questions/index.js
index 85301fc..112ad11 100644
--- a/pages/questions/index.js
+++ b/pages/questions/index.js
@@ -1,3 +1,7 @@
+import { getQuestionList } from "../../service/user";
+import { alertInfo } from "../../utils/index";
+import request from '../../utils/request'
+const { OK } = request
 // pages/questions/index.js
 Page({
 
@@ -5,30 +9,33 @@ Page({
    * 页面的初始数据
    */
   data: {
-    x: 0,
-    y: 0,
-    questions: [{
-      question: "一、什么时候可以开发票？",
-      answer: "跟之前一样，每个季度一开"
-    },{
-      question: "二、一个季度开实际缴费数是吗？",
-      answer: "开实际消耗的电费数，未消耗的电费不能开。"
-    },{
-      question: "三、是否可以打钱分开充值电表？",
-      answer: "可以"
-    },{
-      question: "四、现在是多少钱一度电？",
-      answer: "每个月的电价在次月供电局发票开出来后测算。"
-    }]
+    page: 1,
+    questions: []
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
-
+    this.getList();
+  },
+  async getList() {
+    const { page, questions } = this.data;
+    const { code, data, message, total } = await getQuestionList(page)
+    if (code !== OK) {
+      alertInfo(message)
+      return;
+    }
+    let next = true;
+    if (total <= page * 20) {
+      next = false;
+    }
+    this.setData({
+      questions: [...questions, ...data],
+      next,
+      page: next ? page + 1 : page
+    })
   },
-
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
@@ -68,7 +75,7 @@ Page({
    * 页面上拉触底事件的处理函数
    */
   onReachBottom() {
-
+    this.getList();
   },
 
   /**
diff --git a/pages/questions/index.wxml b/pages/questions/index.wxml
index 1ef7740..c3bca1b 100644
--- a/pages/questions/index.wxml
+++ b/pages/questions/index.wxml
@@ -2,11 +2,9 @@
 <scrollPageWrapper>
   <navigator title="常见问题" canBack="{{true}}" />
   <view class="content">
-    <scroll-view type="list" scroll-y style="display: flex; flex-direction: column; flex: 1; width: 100%; overflow: auto;">
-      <view wx:for="{{questions}}" list-item>
-        <view class="question"> {{ item.question }} </view>
-        <view class="answer"> {{ item.answer }} </view>
-      </view>
-    </scroll-view>
+    <view wx:for="{{questions}}" list-item>
+      <view class="question"> {{index + 1}}、 {{ item.name }} </view>
+      <view class="answer"> {{ item.content }} </view>
+    </view>
   </view>  
 </scrollPageWrapper>
\ No newline at end of file
diff --git a/pages/rechargeDetail/index.js b/pages/rechargeDetail/index.js
index b9de7b4..10ffecd 100644
--- a/pages/rechargeDetail/index.js
+++ b/pages/rechargeDetail/index.js
@@ -50,19 +50,19 @@ Page({
             // 开发版
             case 'develop':
               wx.setClipboardData({
-                data: `https://1.92.72.5:8080/print/?id=${detail.serialNumber}`,
+                data: `http://1.92.72.5:8080/recharge-print/?id=${detail.serialNumber}`,
               })
               break;
             // 体验版
             case 'trial':
               wx.setClipboardData({
-                data: `http://1.92.72.5:8080/print/?id=${detail.serialNumber}`,
+                data: `http://1.92.72.5:8080/recharge-print/?id=${detail.serialNumber}`,
               })
               break;
             // 正式版
             case 'release':
               wx.setClipboardData({
-                data: `https://zgd.hbhcbn.com/print/?id=${detail.serialNumber}`,
+                data: `https://zgd.hbhcbn.com/recharge-print/?id=${detail.serialNumber}`,
               })
               break;
           }
diff --git a/service/user.js b/service/user.js
index 382616d..675b25e 100644
--- a/service/user.js
+++ b/service/user.js
@@ -63,4 +63,8 @@ export const logout = async function() {
 // 获取隐私协议
 export const getPrivaciList = async function() {
   return await GET('/wx/getQuestions?page=1&type=' + 1);
+}
+// 获取常见问题
+export const getQuestionList = async function(page) {
+  return await GET(`/wx/getQuestions?page=${page}&type=0`);
 }
\ No newline at end of file
diff --git a/utils/index.js b/utils/index.js
index b06532e..5d594a0 100644
--- a/utils/index.js
+++ b/utils/index.js
@@ -55,7 +55,7 @@ export function getConfigByEnv() {
       break;
     // 正式版
     case 'release':
-      api = "https://zgd.hbhcbn.com/wxApi"
+      api = "https://zgd.hbhcbn.com/api"
       break;
   }
   return { api, }