From fce4ec8bdf9d9ace9afd3573418fd4b31e9754ec Mon Sep 17 00:00:00 2001
From: juwei001 <974220104@qq.com>
Date: Wed, 3 Apr 2024 17:57:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 subpages/businessRecord/businessRecord.js     | 99 ++++++++-----------
 .../{index.json => businessRecord.json}       |  0
 subpages/businessRecord/businessRecord.wxml   | 45 ++++++++-
 .../{index.wxss => businessRecord.wxss}       |  0
 subpages/businessRecord/index.js              | 47 ---------
 subpages/businessRecord/index.wxml            | 43 --------
 .../pages/housePortrait/housePortrait.json    |  2 +-
 7 files changed, 84 insertions(+), 152 deletions(-)
 rename subpages/businessRecord/{index.json => businessRecord.json} (100%)
 rename subpages/businessRecord/{index.wxss => businessRecord.wxss} (100%)
 delete mode 100644 subpages/businessRecord/index.js
 delete mode 100644 subpages/businessRecord/index.wxml

diff --git a/subpages/businessRecord/businessRecord.js b/subpages/businessRecord/businessRecord.js
index c098d6b..6c1fdb6 100644
--- a/subpages/businessRecord/businessRecord.js
+++ b/subpages/businessRecord/businessRecord.js
@@ -1,66 +1,47 @@
-// subpages/businessRecord/businessRecord.js
-Page({
 
-    /**
-     * 页面的初始数据
-     */
-    data: {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面加载
-     */
-    onLoad(options) {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面初次渲染完成
-     */
-    onReady() {
+Component({
 
+    properties: {
+        "ywData": {
+            "type": Object,
+            "value": {}
+        },
     },
-
     /**
-     * 生命周期函数--监听页面显示
-     */
-    onShow() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面隐藏
-     */
-    onHide() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面卸载
-     */
-    onUnload() {
-
-    },
-
-    /**
-     * 页面相关事件处理函数--监听用户下拉动作
-     */
-    onPullDownRefresh() {
-
-    },
-
-    /**
-     * 页面上拉触底事件的处理函数
-     */
-    onReachBottom() {
-
-    },
-
-    /**
-     * 用户点击右上角分享
+     * 页面的初始数据
      */
-    onShareAppMessage() {
-
+    data: {
+        tabList: [{
+            label: "12345投诉",
+            value: '12345'
+        }, {
+            label: '满意度调查',
+            value: 'provinceSurvey'
+        }, {
+            label: '满意度自查',
+            value: 'selfSurvey'
+        }, {
+            label: '上报事件',
+            value: 'event'
+        }, {
+            label: '居民需求',
+            value: 'need'
+        }, {
+            label: '社区服务',
+            value: 'serve'
+        }, {
+            label: '打卡记录',
+            value: 'punchRecord'
+        }],
+        tabValue: '12345',
+        data: {},
+        residIds: [],
+    },
+    methods: {
+        tabChange({ currentTarget: { dataset: { index } } }) {
+            this.setData({
+                tabValue: index,
+            })
+        },
     }
 })
\ No newline at end of file
diff --git a/subpages/businessRecord/index.json b/subpages/businessRecord/businessRecord.json
similarity index 100%
rename from subpages/businessRecord/index.json
rename to subpages/businessRecord/businessRecord.json
diff --git a/subpages/businessRecord/businessRecord.wxml b/subpages/businessRecord/businessRecord.wxml
index 1473c4e..0a887fe 100644
--- a/subpages/businessRecord/businessRecord.wxml
+++ b/subpages/businessRecord/businessRecord.wxml
@@ -1,2 +1,43 @@
-<!--subpages/businessRecord/businessRecord.wxml-->
-<text>subpages/businessRecord/businessRecord.wxml</text>
+<view class="tag-list">
+    <view wx:for="{{tabList}}" class="tag {{item.value === tabValue?'cur':''}}" wx:key="index" bind:tap="tabChange" data-index="{{item.value}}">
+        {{item.label}}({{ywData[item.value].length}})
+    </view>
+</view>
+
+<view class="table">
+    <view wx:if="{{tabValue === '12345'||tabValue === 'event'}}" class="row header">
+        <view class="cell">事件类型</view>
+        <view class="cell">事件描述</view>
+    </view>
+    <view wx:if="{{tabValue === 'provinceSurvey'||tabValue === 'selfSurvey'}}" class="row header">
+        <view class="cell">不满意事项类型</view>
+        <view class="cell">不满意事项描述</view>
+    </view>
+    <view wx:if="{{tabValue === 'need'}}" class="row header">
+        <view class="cell">需求类型</view>
+        <view class="cell">需求描述</view>
+    </view>
+    <view wx:if="{{tabValue === 'serve'}}" class="row header">
+        <view class="cell">需求类型</view>
+        <view class="cell">事件描述</view>
+    </view>
+    <view wx:if="{{tabValue === 'punchRecord'}}" class="row header">
+        <view class="cell1">打卡人</view>
+        <view class="cell1">打卡地址</view>
+        <view class="cell1">打卡时间</view>
+    </view>
+    <block bind:tap="gotopage" wx:if="{{tabValue !== 'punchRecord'}}" data-obj="{{item}}" wx:for="{{ywData[tabValue]}}" wx:key="index">
+        <view class="row {{index % 2 == 0 ? 'even' : 'odd'}}">
+            <view class="cell">{{item.categorycode}}</view>
+            <view class="cell">{{item.eventcontent}}</view>
+        </view>
+    </block>
+    <block bind:tap="gotopage" wx:if="{{tabValue == 'punchRecord'}}" data-obj="{{item}}" wx:for="{{ywData[tabValue]}}" wx:key="index">
+        <view class="row {{index % 2 == 0 ? 'even' : 'odd'}}">
+            <view class="cell1">{{item.name}}</view>
+            <view class="cell1">{{item.clockInAddress}}</view>
+            <view class="cell1">{{item.clockInTime}}</view>
+        </view>
+    </block>
+    <no-data isShow="{{ywData[tabValue].length===0}}" wx:if="{{ywData[tabValue].length===0}}"></no-data>
+</view>
\ No newline at end of file
diff --git a/subpages/businessRecord/index.wxss b/subpages/businessRecord/businessRecord.wxss
similarity index 100%
rename from subpages/businessRecord/index.wxss
rename to subpages/businessRecord/businessRecord.wxss
diff --git a/subpages/businessRecord/index.js b/subpages/businessRecord/index.js
deleted file mode 100644
index 6c1fdb6..0000000
--- a/subpages/businessRecord/index.js
+++ /dev/null
@@ -1,47 +0,0 @@
-
-Component({
-
-    properties: {
-        "ywData": {
-            "type": Object,
-            "value": {}
-        },
-    },
-    /**
-     * 页面的初始数据
-     */
-    data: {
-        tabList: [{
-            label: "12345投诉",
-            value: '12345'
-        }, {
-            label: '满意度调查',
-            value: 'provinceSurvey'
-        }, {
-            label: '满意度自查',
-            value: 'selfSurvey'
-        }, {
-            label: '上报事件',
-            value: 'event'
-        }, {
-            label: '居民需求',
-            value: 'need'
-        }, {
-            label: '社区服务',
-            value: 'serve'
-        }, {
-            label: '打卡记录',
-            value: 'punchRecord'
-        }],
-        tabValue: '12345',
-        data: {},
-        residIds: [],
-    },
-    methods: {
-        tabChange({ currentTarget: { dataset: { index } } }) {
-            this.setData({
-                tabValue: index,
-            })
-        },
-    }
-})
\ No newline at end of file
diff --git a/subpages/businessRecord/index.wxml b/subpages/businessRecord/index.wxml
deleted file mode 100644
index 0a887fe..0000000
--- a/subpages/businessRecord/index.wxml
+++ /dev/null
@@ -1,43 +0,0 @@
-<view class="tag-list">
-    <view wx:for="{{tabList}}" class="tag {{item.value === tabValue?'cur':''}}" wx:key="index" bind:tap="tabChange" data-index="{{item.value}}">
-        {{item.label}}({{ywData[item.value].length}})
-    </view>
-</view>
-
-<view class="table">
-    <view wx:if="{{tabValue === '12345'||tabValue === 'event'}}" class="row header">
-        <view class="cell">事件类型</view>
-        <view class="cell">事件描述</view>
-    </view>
-    <view wx:if="{{tabValue === 'provinceSurvey'||tabValue === 'selfSurvey'}}" class="row header">
-        <view class="cell">不满意事项类型</view>
-        <view class="cell">不满意事项描述</view>
-    </view>
-    <view wx:if="{{tabValue === 'need'}}" class="row header">
-        <view class="cell">需求类型</view>
-        <view class="cell">需求描述</view>
-    </view>
-    <view wx:if="{{tabValue === 'serve'}}" class="row header">
-        <view class="cell">需求类型</view>
-        <view class="cell">事件描述</view>
-    </view>
-    <view wx:if="{{tabValue === 'punchRecord'}}" class="row header">
-        <view class="cell1">打卡人</view>
-        <view class="cell1">打卡地址</view>
-        <view class="cell1">打卡时间</view>
-    </view>
-    <block bind:tap="gotopage" wx:if="{{tabValue !== 'punchRecord'}}" data-obj="{{item}}" wx:for="{{ywData[tabValue]}}" wx:key="index">
-        <view class="row {{index % 2 == 0 ? 'even' : 'odd'}}">
-            <view class="cell">{{item.categorycode}}</view>
-            <view class="cell">{{item.eventcontent}}</view>
-        </view>
-    </block>
-    <block bind:tap="gotopage" wx:if="{{tabValue == 'punchRecord'}}" data-obj="{{item}}" wx:for="{{ywData[tabValue]}}" wx:key="index">
-        <view class="row {{index % 2 == 0 ? 'even' : 'odd'}}">
-            <view class="cell1">{{item.name}}</view>
-            <view class="cell1">{{item.clockInAddress}}</view>
-            <view class="cell1">{{item.clockInTime}}</view>
-        </view>
-    </block>
-    <no-data isShow="{{ywData[tabValue].length===0}}" wx:if="{{ywData[tabValue].length===0}}"></no-data>
-</view>
\ No newline at end of file
diff --git a/subpages/house/pages/housePortrait/housePortrait.json b/subpages/house/pages/housePortrait/housePortrait.json
index 6e850b0..6a8473f 100644
--- a/subpages/house/pages/housePortrait/housePortrait.json
+++ b/subpages/house/pages/housePortrait/housePortrait.json
@@ -1,7 +1,7 @@
 {  
     "navigationBarTitleText": "房屋详情",
     "usingComponents": {
-        "BusinessRecord": "../../../businessRecord",
+        "BusinessRecord": "../../../businessRecord/businessRecord",
         "no-data": "../../../../components/noData/nodata"
     }
 }
\ No newline at end of file