From 01445689e582b0fafbc723308d64fad1824e6f7d Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Mon, 9 Jun 2025 16:42:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E4=BF=AE=E6=8A=A5=E4=BA=8B=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=20=E6=9C=8D=E5=8A=A1=E8=B7=B3=E8=BD=AC=E6=8A=A5?=
 =?UTF-8?q?=E4=BF=AE=E6=8A=A5=E4=BA=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/serve/serve.js               | 10 +++++++
 pages/serve/serve.wxml             |  4 +--
 subpages/bsPage/bsPage/bsPage.js   | 47 +++++++++++++++++-------------
 subpages/bsPage/bsPage/bsPage.json |  6 ++--
 subpages/bsPage/bsPage/bsPage.wxml | 13 +++++++--
 subpages/bsPage/bsPage/bsPage.wxss | 19 ++++++++++--
 subpages/eventAdd/add/add.js       | 19 ++++++------
 7 files changed, 79 insertions(+), 39 deletions(-)

diff --git a/pages/serve/serve.js b/pages/serve/serve.js
index 18b40ad..ec75fb1 100644
--- a/pages/serve/serve.js
+++ b/pages/serve/serve.js
@@ -67,5 +67,15 @@ Page({
      */
     onShareAppMessage() {
 
+    },
+    toEventAdd(){
+        wx.navigateTo({
+          url: '/subpages/eventAdd/add/add',
+        })
+    },
+    toBsPage(){
+        wx.navigateTo({
+            url: '/subpages/bsPage/bsPage/bsPage',
+          })
     }
 })
\ No newline at end of file
diff --git a/pages/serve/serve.wxml b/pages/serve/serve.wxml
index fef560b..2ad978b 100644
--- a/pages/serve/serve.wxml
+++ b/pages/serve/serve.wxml
@@ -32,12 +32,12 @@
     <view class="card flex items-center">
         <image src="../../images/icon/333.png" class="icon-80 mr-30" mode=""/>
         <view class="flex-1 text-30">故障报修</view>
-        <van-button color="#ecf6ff" round custom-style="color:#999999" size="small ">去处理</van-button>
+        <van-button color="#ecf6ff" round custom-style="color:#999999" size="small" bind:click="toEventAdd">去报修</van-button>
     </view>
     <view class="card flex items-center">
         <image src="../../images/icon/444.png" class="icon-80 mr-30" mode=""/>
         <view class="flex-1 text-30">报事儿</view>
-        <van-button color="#ecf6ff" round custom-style="color:#999999" size="small ">去处理</van-button>
+        <van-button color="#ecf6ff" round custom-style="color:#999999" size="small" bind:click="toBsPage">去报事</van-button>
     </view>
 </view>
 <!-- <view class="card flex flex-col list">
diff --git a/subpages/bsPage/bsPage/bsPage.js b/subpages/bsPage/bsPage/bsPage.js
index 8b0747e..e462b1d 100644
--- a/subpages/bsPage/bsPage/bsPage.js
+++ b/subpages/bsPage/bsPage/bsPage.js
@@ -1,12 +1,6 @@
 // subpages/bsPage/bsPage/bsPage.js
-const options = [{
-    text: '浙江省',
-    value: '330000',
-  },
-  {
-    text: '江苏省',
-    value: '320000',
-  },
+const options = [
+  '安全问题','卫生问题','服务问题','噪音问题','体验问题','其它'
 ];
 Page({
 
@@ -19,18 +13,19 @@ Page({
     fieldValue: '',
     cascaderValue: '',
     questionText: '',
-    fileList: [{
-        url: 'https://img.yzcdn.cn/vant/leaf.jpg',
-        name: '图片1',
-      },
-      // Uploader 根据文件后缀来判断是否为图片文件
-      // 如果图片 URL 中不包含类型信息，可以添加 isImage 标记来声明
-      {
-        url: 'http://iph.href.lu/60x60?text=default',
-        name: '图片2',
-        isImage: true,
-        // deletable: true,
-      },
+    fileList: [
+      // {
+      //   url: 'https://img.yzcdn.cn/vant/leaf.jpg',
+      //   name: '图片1',
+      // },
+      // // Uploader 根据文件后缀来判断是否为图片文件
+      // // 如果图片 URL 中不包含类型信息，可以添加 isImage 标记来声明
+      // {
+      //   url: 'http://iph.href.lu/60x60?text=default',
+      //   name: '图片2',
+      //   isImage: true,
+      //   // deletable: true,
+      // },
     ],
   },
 
@@ -170,5 +165,17 @@ Page({
    */
   onShareAppMessage() {
 
+  },
+  onconfirm(e){
+    this.setData({
+      show:false,
+      fieldValue:e.detail.value
+    })
+    console.log(e);
+  },
+  oncancel(){
+    this.setData({
+      show:false
+    })
   }
 })
\ No newline at end of file
diff --git a/subpages/bsPage/bsPage/bsPage.json b/subpages/bsPage/bsPage/bsPage.json
index 6ddd9f4..5b129c0 100644
--- a/subpages/bsPage/bsPage/bsPage.json
+++ b/subpages/bsPage/bsPage/bsPage.json
@@ -3,7 +3,9 @@
     "van-cell": "@vant/weapp/cell/index",
     "van-cell-group": "@vant/weapp/cell-group/index",
     "van-popup": "@vant/weapp/popup/index",
-    "van-cascader": "@vant/weapp/cascader/index",
-    "van-uploader": "@vant/weapp/uploader/index"
+    "van-picker": "@vant/weapp/picker/index",
+    "van-uploader": "@vant/weapp/uploader/index",
+    "van-radio": "@vant/weapp/radio/index",
+    "van-radio-group": "@vant/weapp/radio-group/index"
   }
 }
\ No newline at end of file
diff --git a/subpages/bsPage/bsPage/bsPage.wxml b/subpages/bsPage/bsPage/bsPage.wxml
index 40d754b..ac34e58 100644
--- a/subpages/bsPage/bsPage/bsPage.wxml
+++ b/subpages/bsPage/bsPage/bsPage.wxml
@@ -2,11 +2,11 @@
 <view class="bsPageCont">
   <image class="bsImg" src="../../images/bsBac.png" />
   <view class="bsTitle">
-    <van-cell-group class="bsCon">
-      <van-cell title="反馈类型" value="{{fieldValue}}" is-link readonly bind:tap="onClick" />
+    <van-cell-group class="bsCon" border="{{false}}">
+      <van-cell title="反馈类型"  border="{{false}}" value="{{fieldValue}}" is-link readonly bind:tap="onClick" />
     </van-cell-group>
     <van-popup show="{{ show }}" round position="bottom">
-      <van-cascader wx:if="{{ show }}" value="{{ cascaderValue }}" title="请选择类型" options="{{ options }}" bind:close="onClose" bind:finish="onFinish" />
+      <van-picker columns="{{ options }}"  bind:confirm="onconfirm" bind:cancel="oncancel" show-toolbar  />
     </van-popup>
   </view>
   <view class="bsCon2">
@@ -15,5 +15,12 @@
     <view class="bsSpan" style="margin-top: 15rpx;">上传图片/视频</view>
     <van-uploader file-list="{{ fileList }}" bind:after-read="afterRead" bind:before-read="beforeRead" bind:delete="deleteData" max-count="3" />
   </view>
+  <view class="bsCon3">
+    <view class="bsSpan1">位置</view>
+    <van-radio-group value="{{ radio }}" bind:change="onChange" direction="horizontal">
+      <van-radio name="1">所住房间</van-radio>
+      <van-radio name="2">公共区域</van-radio>
+    </van-radio-group>
+  </view>
   <view class="bsBtn" bindtap="onButtonTap">提交</view>
 </view>
\ No newline at end of file
diff --git a/subpages/bsPage/bsPage/bsPage.wxss b/subpages/bsPage/bsPage/bsPage.wxss
index 16f0592..f35254f 100644
--- a/subpages/bsPage/bsPage/bsPage.wxss
+++ b/subpages/bsPage/bsPage/bsPage.wxss
@@ -15,7 +15,6 @@
 
 .bsTitle {
   border-radius: 10rpx;
-  height: 100rpx;
   background-color: rgba(255, 255, 255, 1);
   color: rgba(16, 16, 16, 1);
   position: absolute;
@@ -47,7 +46,7 @@
   position: absolute;
   width: 96%;
   margin-left: 2%;
-  top: calc(6% + 100rpx);
+  top: calc(6% + 80rpx);
   padding: 2%;
   box-sizing: border-box;
 }
@@ -57,7 +56,21 @@
   font-size: 30rpx;
   margin-left: 20rpx;
 }
-
+.bsCon3 {
+  border-radius: 10rpx;
+  height: 100rpx;
+  overflow-y: auto;
+  background-color: rgba(255, 255, 255, 1);
+  position: absolute;
+  width: 96%;
+  margin-left: 2%;
+  top: calc(7% + 900rpx);
+  padding: 2%;
+  box-sizing: border-box;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
 /* 输入框样式 */
 .question-input {
   width: 98%;
diff --git a/subpages/eventAdd/add/add.js b/subpages/eventAdd/add/add.js
index 209d4c2..69a0869 100644
--- a/subpages/eventAdd/add/add.js
+++ b/subpages/eventAdd/add/add.js
@@ -10,15 +10,16 @@ Page({
     radio: '1',
     bxname: '',
     questionText: '',
-    fileList: [{
-        url: 'https://img.yzcdn.cn/vant/leaf.jpg',
-        name: '图片1',
-      },
-      {
-        url: 'http://iph.href.lu/60x60?text=default',
-        name: '图片2',
-        isImage: true,
-      },
+    fileList: [
+      // {
+      //   url: 'https://img.yzcdn.cn/vant/leaf.jpg',
+      //   name: '图片1',
+      // },
+      // {
+      //   url: 'http://iph.href.lu/60x60?text=default',
+      //   name: '图片2',
+      //   isImage: true,
+      // },
     ],
   },
   deleteData(event) {