暂存我的页面修改

app.json

@@ -25,7 +25,9 @@
     "pages/workBench/index",
     "pages/webPage/index",
     "pages/aid/finance/index",
-    "pages/aid/law/index"
+    "pages/aid/law/index",
+    "pages/aid/detail/index",
+    "pages/aid/consult/index"
   ],
   "subPackages": [
     {

components/aid/index.js

@@ -1,3 +1,9 @@
+import { getAidList } from "../../service/system";
+import { alertInfo, alertSuccess } from "../../utils/index";
+import request from '../../utils/request'
+
+const { OK } = request;
+
 // components/aid/index.js
 Component({
 
@@ -5,20 +11,68 @@ Component({
    * 组件的属性列表
    */
   properties: {
+    type: Number,
+    bannerType: Number,
   
   },
-
+  lifetimes: {
+    attached() {
+      this.init();
+    }
+  },
   /**
    * 组件的初始数据
    */
   data: {
-
+    park: {},
+    list: [],
+    total: 0,
+    page: 1,
+    size: 20,
+  },
+  lifetimes: {
+    attached() {
+      this.init()
+    }
   },
-
   /**
    * 组件的方法列表
    */
   methods: {
-
+    async init() {
+      const { type, page, size } = this.data;
+      const { code, message, data = [], total } = await getAidList(page, size, type);
+      console.log('data', data)
+      if (code !== OK) {
+        alertInfo(message)
+        return
+      }
+      this.setData({
+        list: data,
+        total
+      }, () => {
+        console.log("this.data", this.data)
+      })
+    },
+    onRefresh() {
+      const that = this;
+      this.setData({
+        page: 1,
+      }, () => {
+        that.init();
+      })
+    },
+    jumpToDetail(e) {
+      const { id = "" } = e.currentTarget.dataset;
+      const { type } = this.data;
+      wx.navigateTo({
+        url: `/pages/aid/detail/index?id=${id}&type=${type}`,
+      })
+    },
+    consult() {
+      wx.navigateTo({
+        url: `/pages/aid/consult/index?id=${this.data.type}`,
+      })
+    }
   }
 })

components/aid/index.json

@@ -1,4 +1,9 @@
 {
   "component": true,
-  "usingComponents": {}
+  "usingComponents": {
+    "Banner": "/components/banner/index",
+    "van-image": "@vant/weapp/image/index",
+    "empty": "/components/empty/index",
+    "van-icon": "@vant/weapp/icon/index"
+  }
 }

components/aid/index.wxml

@@ -1,2 +1,29 @@
 <!--components/aid/index.wxml-->
-<text>components/aid/index.wxml</text>
+<Banner park="{{park.id}}" type="{{bannerType}}" />
+<div class="title">行业精英</div>
+<view wx:if="{{list.length}}">
+    <view wx:for="{{list}}" wx:key="id" >
+        <view class="userInfoItem" mut-bind:tap="jumpToDetail" data-id="{{item.id}}">
+            <view class="content">
+                <van-image
+                    width="200rpx"
+                    height="200rpx"
+                    lazy-load
+                    src="{{item.avatar}}"
+                />
+                <view class="userInfo">
+                    <view style="display: flex;font-size: 30rpx;">
+                        <view class="userName"> {{ item.name }} </view>
+                        <view class="userLevel"> {{ item.level }} </view>
+                    </view>
+                    <view class="synopsis"> {{item.synopsis}}{{item.synopsis}} {{item.synopsis}}  </view>
+                    <view class="connect" bind:tap="consult">
+                        <van-icon name="service-o" />
+                        <view style="margin-left: 10rpx;"> 在线咨询 </view>
+                    </view>
+                </view>
+            </view>
+        </view>
+    </view>
+</view>
+<empty wx:else bind:refresh="onRefresh" />

components/aid/index.wxss

@@ -1 +1,44 @@
 /* components/aid/index.wxss */
+
+.title {
+    padding-top: 30rpx;
+    padding-left: 30rpx;
+    display: flex;
+}
+
+.userInfoItem {
+    padding: 30rpx;
+}
+
+.userInfoItem .content {
+    display: flex;
+    align-items: center;
+    border-bottom: 1rpx solid #ccc;
+}
+
+.userInfo {
+    height: 200rpx;
+    margin-left: 30rpx;
+    flex: 1;
+}
+
+.userLevel {
+    margin-left: 30rpx;
+    font-weight: 600;
+}
+
+.synopsis {
+    height: 80rpx;
+    overflow: hidden;
+    margin-top: 20rpx;
+    margin-bottom: 10rpx;
+    font-size: 32rpx;
+    display: -webkit-box;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
+}
+
+.connect {
+    display: flex;
+    justify-content: flex-end;
+}

components/banner/index.js

@@ -1,6 +1,6 @@
-import { getBannerList } from "../../../../service/system"
+import { getBannerList } from "../../service/system"
-import { alertInfo } from "../../../../utils/index";
+import { alertInfo } from "../../utils/index";
-import request from '../../../../utils/request'
+import request from '../../utils/request'
 
 const { OK } = request;
 
@@ -12,10 +12,14 @@ Component({
    */
   properties: {
     park: String,
+    type: Number,
   },
   observers: {
-    'park': function(newValue) {
+    'park,type': function(newPark, newType) {
-      this.init(newValue)
+      if ((!newPark && newType === 0) || (!newType && newType !== 0)) {
+        return
+      }
+      this.init(newPark, newType)
     }
   },
   /**
@@ -33,11 +37,11 @@ Component({
    * 组件的方法列表
    */
   methods: {
-    async init(park) {
+    async init(park, type) {
-      const { code, message, data = [] } = await getBannerList(park, 1);
+      const { code, message, data = [] } = await getBannerList(park, type);
       if (code !== OK) {
         alertInfo(message);
-        this.setData({ list: [] })
+        this.setData({ list: [], park, type })
         return 
       }
       this.setData({ list: data })
@@ -47,7 +51,7 @@ Component({
       switch(data.jumpType) {
         case 1:
           wx.navigateToMiniProgram({
-            appId: data.appId,
+            appId: data.appid,
             path: data.wxPath,
             envVersion: "trial"
           })

components/banner/index.wxml

@@ -5,8 +5,9 @@
     interval="{{interval}}" 
     duration="{{duration}}"
     wx:if="{{list.length}}"
+    style="height: 288rpx"
 >
-  <block wx:for="{{list}}" wx:key="{{item.id}}" wx:item="item">
+  <block wx:for="{{list}}" wx:key="id" wx:item="item">
     <swiper-item>
         <van-image
             width="100%"

pages/aid/consult/index.js

@@ -0,0 +1,67 @@
+// pages/aid/consult/index.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    form: {}
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+    const { type } = options;
+    this.setData({ type });
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})

pages/aid/consult/index.json

@@ -0,0 +1,8 @@
+{
+  "usingComponents": {
+    "navigator": "/components/navigator/index",
+    "van-field": "@vant/weapp/field/index",
+    "van-button": "@vant/weapp/button/index"
+  },
+  "navigationStyle": "custom"
+}

pages/aid/consult/index.wxml

@@ -0,0 +1,51 @@
+<!--pages/aid/consult/index.wxml-->
+<navigator title="填写咨询信息" canBack="{{true}}" />
+
+<van-cell-group>
+    <van-field
+        value="{{form.name}}"
+        label="名字"
+        placeholder="请输入名字"
+        bind:change="onChange"
+        data-name="name"
+        title-width="140rpx"
+        required
+    />
+    <van-field
+        value="{{form.name}}"
+        label="手机号"
+        bind:change="onChange"
+        data-name="phone" 
+        placeholder="请输入手机号"
+        required  
+        title-width="140rpx"
+    />
+    <van-field
+        value="{{form.email}}"
+        label="邮箱"
+        bind:change="onChange"
+        data-name="email" 
+        required  
+        placeholder="请输入邮箱"
+        title-width="140rpx"
+    />
+    <van-field
+        value="{{form.detail}}"
+        label="咨询内容"
+        bind:change="onChange"
+        data-name="email" 
+        required  
+        type="textarea"
+        autosize="{{true}}"
+        placeholder="请输入咨询内容"
+        title-width="140rpx"
+    />
+    <view style="margin-top: 20rpx; margin-left: 30rpx;">
+        <mp-html content="{{detail.detail}}" />
+    </view>
+</van-cell-group>
+
+<view class="submit" wx:if="{{editType === 'edit'}}">
+  <van-button block class="cancelEdit" bind:click="cancelEdit">取消编辑</van-button>
+  <van-button type="info" block class="save" bind:click="submit">保存</van-button>
+</view>

pages/aid/consult/index.wxss

@@ -0,0 +1,8 @@
+/* pages/aid/consult/index.wxss */
+
+.submit {
+    margin: 32rpx;
+    margin-bottom: 50rpx;
+    display: flex;
+    align-items: center;
+  }

pages/aid/detail/index.js

@@ -0,0 +1,87 @@
+import { getAidDetail } from "../../../service/system";
+import { alertInfo } from "../../../utils/index";
+import request from "../../../utils/request"
+const { OK } = request;
+// pages/aid/detail/index.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    detail: {},
+    id: "",
+    type: undefined,
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+    const that = this;
+    const { type, id } = options;
+    this.setData({ type, id }, () => {
+      that.init();
+    })
+    
+  },
+  async init() {
+    const { id, type } = this.data;
+    const { code, message, data = {} } = await getAidDetail(id);
+    if (code !== OK) {
+      alertInfo(message)
+      return;
+    }
+    this.setData({
+      detail: data 
+    })
+  },
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})

pages/aid/detail/index.json

@@ -0,0 +1,9 @@
+{
+  "usingComponents": {
+    "aid": "/components/aid/index",
+    "navigator": "/components/navigator/index",
+    "mp-html": "/components/mp-html/index",
+    "van-field": "@vant/weapp/field/index"
+  },
+  "navigationStyle": "custom"
+}

pages/aid/detail/index.wxml

@@ -0,0 +1,42 @@
+<!--pages/aid/detail/index.wxml-->
+<navigator title="详情" canBack="{{true}}" />
+
+<van-cell-group>
+    <van-field
+        value="{{detail.name}}"
+        label="名字"
+        readonly
+        autosize="{{true}}"
+        type="textarea"
+        border="{{ false }}"
+    />
+    <van-field
+        value="{{detail.level}}"
+        label="职称"
+        readonly
+        autosize="{{true}}"
+        type="textarea"
+        border="{{ false }}"
+    />
+    <van-field
+        value="{{detail.synopsis}}"
+        label="简介"
+        readonly
+        autosize="{{true}}"
+        type="textarea"
+        border="{{ false }}"
+    />
+    
+    
+    <van-field
+        use-input-slot
+        label="详细"
+        readonly
+        border="{{ false }}"
+    >
+      
+    </van-field>
+    <view style="margin-top: 20rpx; margin-left: 30rpx;">
+        <mp-html content="{{detail.detail}}" />
+    </view>
+</van-cell-group>

pages/aid/detail/index.wxss

@@ -0,0 +1 @@
+/* pages/aid/detail/index.wxss */

pages/aid/finance/index.json

@@ -1,3 +1,7 @@
 {
-  "usingComponents": {}
+  "usingComponents": {
+    "aid": "/components/aid/index",
+    "navigator": "/components/navigator/index"
+  },
+  "navigationStyle": "custom"
 }

pages/aid/finance/index.wxml

@@ -1,2 +1,3 @@
 <!--pages/aid/finance/index.wxml-->
-<text>pages/aid/finance/index.wxml</text>
+<navigator title="财税援助" canBack="{{true}}" />
+<aid bannerType="{{2}}" type="{{1}}" />

pages/aid/law/index.json

@@ -1,3 +1,7 @@
 {
-  "usingComponents": {}
+  "usingComponents": {
+    "aid": "/components/aid/index",
+    "navigator": "/components/navigator/index"
+  },
+  "navigationStyle": "custom"
 }

pages/aid/law/index.wxml

@@ -1,2 +1,3 @@
 <!--pages/aid/law/index.wxml-->
-<text>pages/aid/law/index.wxml</text>
+<navigator title="法律援助" canBack="{{true}}" />
+<aid bannerType="{{3}}" type="{{2}}" />

pages/home/index.json

@@ -10,7 +10,7 @@
     "van-grid": "@vant/weapp/grid/index",
     "van-grid-item": "@vant/weapp/grid-item/index",
     "van-action-sheet": "@vant/weapp/action-sheet/index",
-    "home-swiper": "./components/home-swiper/index"
+    "banner": "/components/banner/index"
   },
   "navigationStyle": "custom"
 }

pages/home/index.wxml

@@ -33,7 +33,7 @@
     <!-- <view class="welcome"> 欢迎使用华昌宝能用电管理系统！ </view> -->
   </view>
 </view>
-<home-swiper wx:if="{{park.id}}" park="{{park.id}}" />
+<banner type="{{1}}" wx:if="{{park.id}}" park="{{park.id}}" />
 <view class="rechargeWrapper">
   <view class="card">
     <view class="cardTop">

project.private.config.json

@@ -10,6 +10,20 @@
   "condition": {
     "miniprogram": {
       "list": [
+        {
+          "name": "pages/aid/consult/index",
+          "pathName": "pages/aid/consult/index",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "pages/aid/law/index",
+          "pathName": "pages/aid/law/index",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
         {
           "name": "pages/my/index",
           "pathName": "pages/my/index",

service/system.js

@@ -51,7 +51,17 @@ export const getEncyclopediaDetail = async function(id) {
   return await GET(`/wx/getEncyclopediaDetail/${id}`);
 }
 
-// 获取分类列表
+// 获取banner列表
 export const getBannerList = async function(park = "", address = "") {
   return await GET(`/wx/getBannerList?park=${park}&address=${address}`);
 }
+
+// 获取财务/律师援助列表
+export const getAidList = async function(page = 1, size = 10, type = 0) {
+  return await GET(`/aid/getList?page=${page}&size=${size}&type=${type}`);
+}
+
+// 获取财务/律师援助详情
+export const getAidDetail = async function(id) {
+  return await GET(`/aid/detail/${id}`);
+}