产品化更新

js_sdk/http.js

@@ -681,3 +681,47 @@ export function noticeParkEdit(data) {
         data, {}
     )
 }
+
+// 新增我的反馈
+export function parkFeedbackInfoAdd(data) {
+    return $http.post(
+        '/wx/parkFeedbackInfo/add',
+        data, {}
+    )
+}
+// 新增我的反馈
+export function parkFeedbackInfoList(data) {
+    return $http.post(
+        '/wx/parkFeedbackInfo/list',
+        data, {}
+    )
+}
+// 获取我的反馈详情
+export function parkFeedbackInfoGetById(data) {
+    return $http.get(
+        '/wx/parkFeedbackInfo/getById',
+        data, {}
+    )
+}
+// 我的收藏列表
+export function parkUserCollectorsList(data) {
+    return $http.post(
+        '/wx/parkUserCollectors/list',
+        data, {}
+    )
+}
+// 产业政策列表
+export function policyList(data) {
+    return $http.post(
+        '/wx/policy/list',
+        data, {}
+    )
+}
+
+// 产业政策类型
+export function policyListAll(data) {
+    return $http.post(
+        '/wx/policyType/listAll',
+        data, {}
+    )
+}

js_sdk/request/requestConfig.js

@@ -36,7 +36,7 @@ let $http = new request({
 let requestNum = 0;
 //请求开始拦截器
 $http.requestStart = function (options) {
-
+     console.log(`$http.requestSta`,options)
     for (const key in options.data) {
         if (options.data[key] == null) {
             delete options.data[key]
@@ -103,6 +103,12 @@ $http.dataFactory = function (options, resolve) {
         });
         return false;
     }
+    if (resolve.data) {
+        callback.result = resolve.data;
+        callback.success = true;
+        uni.stopPullDownRefresh();
+        return callback;
+    }
     //判断数据是否请求成功
     if (resolve.data.errmsg == "成功") {
         callback.success = true;
@@ -131,8 +137,10 @@ $http.dataFactory = function (options, resolve) {
         // 	}, 500);
         // }
         callback.result = resolve.data;
+        callback.success = true;
     }
     uni.stopPullDownRefresh();
+    console.log('callback',callback)
     return callback;
 };
-export default $http;
+export default $http;

manifest.json

@@ -79,7 +79,7 @@
                 "desc" : "查询用户地理位置"
             }
         },
-        "requiredPrivateInfos" : [ "getLocation" ],
+        "requiredPrivateInfos" : [ "getLocation","chooseLocation" ],
         "uniStatistics" : {
             "enable" : true
         }

pages.json

@@ -26,6 +26,32 @@
                 }
             }
         },
+        {
+            "path": "pages/index/mapLocation",
+            "style": {
+                "navigationBarTitleText": "地址选择",
+                "app-plus": {
+                    "titleNView": {
+                        "buttons": [
+                            {
+                                "text": "\ue534",
+                                "fontSrc": "/static/uni.ttf",
+                                "fontSize": "22px",
+                                "color": "#FFFFFF"
+                            }
+                        ]
+                    }
+                },
+                "usingComponents": {
+                    "van-button": "/wxcomponents/weapp/dist/button/index",
+                    "van-toast": "/wxcomponents/weapp/dist/toast/index",
+                    "van-field": "/wxcomponents/weapp/dist/field/index",
+                    "van-popup": "/wxcomponents/weapp/dist/popup/index",
+                    "van-picker": "/wxcomponents/weapp/dist/picker/index",
+                    "van-dialog": "/wxcomponents/weapp/dist/dialog/index"
+                }
+            }
+        },
         {
             "path": "pages/login2/login",
             "style": {

pages/index/components/enterpriseSide.vue

@@ -6,7 +6,7 @@
         <picker @change="bindPickerChange" :value="index" :range="array">
           <input v-model="searchArea" class="searchArea" disabled />
         </picker>
-        <image :src="dhIcon" class="dhIcon"></image>
+        <image :src="dhIcon" class="dhIcon" @tap="toMap"></image>
         <image :src="vector" class="vector"></image>
       </div>
       <div class="parkBgBox" :style="{ 'background-image': `url(${parkBg})` }">
@@ -132,7 +132,7 @@ export default {
         {
           label: "待办提醒",
           url: "https://www.idea-co-sf.com/gardenProduct/image/dbtxIcon.png",
-          path: "/pages/subPackages/companyHouse/companyHouse",
+          // path: "/pages/subPackages/companyHouse/companyHouse",
         },
         {
           label: "企业账单",
@@ -196,6 +196,21 @@ export default {
     this.getNotice()
   },
   methods: {
+    toMap(){
+      uni.chooseLocation({
+        success: function (res) {
+          console.log('选择的位置：', res.name);
+          console.log('纬度：' + res.latitude + '，经度：' + res.longitude);
+          // 其他业务逻辑
+        },
+        fail: function (error) {
+          console.error('Choose location failed: ' + JSON.stringify(error));
+        },
+        complete: function () {
+          console.log('chooseLocation operation is complete');
+        }
+      });
+    },
     getNotice(){
       newNotice().then(res=>{
         const newNotice = res.data

pages/mine/mine.vue

@@ -223,9 +223,7 @@ export default {
       });
     },
     editPassWord() {
-      uni.navigateTo({
-        url: "/pages/subPackages/password/index",
-      });
+      uni.goNavigateBack();
     },
     async getUserInfo() {
       let data = await getUserInfo();

pages/subPackages/enterPriseBill/detail.vue

@@ -48,7 +48,7 @@ export default {
   },
   methods:{
     backClick(){
-      uni.navigateTo({
+      uni.redirectTo({
         url: "/pages/subPackages/enterPriseBill/index",
       });
     }

pages/subPackages/industrialPolicy/index.vue

@@ -3,11 +3,7 @@
     <div class="peripheralBody">
       <van-tabs :active="active" @change="onChange">
         <van-tab title="全部" :name="0"></van-tab>
-        <van-tab title="大类" :name="1"></van-tab>
-        <van-tab title="大类" :name="2"></van-tab>
-        <van-tab title="大类" :name="3"></van-tab>
-        <van-tab title="大类" :name="4"></van-tab>
-        <van-tab title="大类" :name="5"></van-tab>
+        <van-tab title="大类" :name="1" v-for="(item,index) in typeList"></van-tab>
       </van-tabs>
       <div class="peripheralBox">
         <div class="peripheralItem" v-for="item in peripheralList" @tap="toDetail(item)">
@@ -23,6 +19,7 @@
 </template>
 
 <script>
+import { policyList,getUserLocalStorageInfo,policyListAll } from "@/js_sdk/http.js";
 export default {
   name: "peripheralService",
   data(){
@@ -31,13 +28,27 @@ export default {
       peripheralList:[
         {name:'关于入住企业规模发展奖励',type:['小类','大类']},
         {name:'关于入住企业规模发展奖励',type:['小类','大类']},
-      ]
+      ],
+      typeList:[],
+      userId:getUserLocalStorageInfo().userId
     }
   },
+  mounted() {
+    this.getList()
+  },
   methods:{
     onChange(e) {
       console.log(e)
     },
+    getList(){
+      policyListAll().then(res=>{
+        this.typeList = res.data
+        console.log(this.typeList,'11111')
+      })
+      // policyList({userId:this.userId}).then(res=>{
+      //
+      // })
+    },
     toDetail(item) {
       uni.navigateTo({
         url:'/pages/subPackages/industrialPolicy/detail'

pages/subPackages/minePages/feedback.vue

@@ -7,13 +7,14 @@
           <li class="detailLi2">
             <div class="detailLi2Box">
               <van-field
-                  :value="form.contant"
+                  :value="form.feedbackContent"
                   autosize
                   type="textarea"
-                  placeholder="请输入文字进行报事报修描述"
+                  placeholder="请输入文字进行描述"
                   class="myField"
                   maxlength="800"
                   show-word-limit
+                  @change="changeField"
               />
             </div>
           </li>
@@ -33,24 +34,58 @@
             </div>
           </li>
         </ul>
-      <button class="submitBtn">
+      <button class="submitBtn" @tap="submit">
         提交
       </button>
     </div>
 </template>
 
 <script>
+import { parkFeedbackInfoAdd,getUserLocalStorageInfo } from "@/js_sdk/http.js";
 export default {
   name: "feedback",
   data(){
     return{
       form:{
-        contant:''
+        feedbackContent:'',
+        feedbackPicture: '',
+        feedbackId: getUserLocalStorageInfo().userId,
+        feedbackName:getUserLocalStorageInfo().username
       },
       fileList:[]
     }
   },
   methods:{
+    changeField(e){
+      // console.log(e.detail)
+      this.form.feedbackContent = e.detail
+    },
+    submit(){
+      let picArr = []
+      this.fileList.forEach(item=>{
+        picArr.push(item.id)
+      })
+      this.form.feedbackPicture = picArr.toString()
+      // console.log(this.form.feedbackld)
+      if (!this.form.feedbackContent){
+        uni.showToast({
+          title: '请描述反馈内容',
+          icon: 'error',
+          mask: true,
+          duration: 1000
+        });
+      }else{
+        parkFeedbackInfoAdd(this.form).then(res=>{
+          console.log(res)
+            uni.showToast({
+              title: res.msg,
+              icon: 'none',
+              mask: true,
+              duration: 1000
+            });
+        })
+      }
+    },
     toRecord(){
       uni.navigateTo({
         url:'/pages/subPackages/minePages/feedback_record'
@@ -72,6 +107,7 @@ export default {
         success(res) {
           // 上传完成需要更新 fileList
           let data = JSON.parse(res.data);
+          console.log('data',data)
           that.fileList.push({
             imgUrl: "/FileController/download/" + data.data[0],
             id: data.data[0],

pages/subPackages/minePages/feedback_detail.vue

@@ -3,30 +3,30 @@
       <div class="myRecord">
         <div class="detailTitle">我的反馈</div>
         <div class="infoBox">
-          <span class="info">园区道路问题一直没有解决，遇到下雨天就容易造成积水的情形，请园区尽快处理。</span>
+          <span class="info">{{form.feedbackContent}}</span>
           <span class="infoImgBox">
-            <img src="./image/msgIcon.png" class="infoImg" v-for="item in 5">
+            <img :src="item.url" class="infoImg" v-for="item in imgArr" @click="clickImg(item.url)" />
           </span>
         </div>
       </div>
-      <div class="myRecord">
+      <div class="myRecord" v-if="form.status == '2'">
         <div class="detailTitle">回复内容</div>
         <div class="infoBox">
-          <span class="info">您反映的问题，我们已经受理，并且将想关问题进行了工作安排，预计3个工作日会有具体的工作人员联系您。</span>
+          <span class="info">{{form.replyContent}}</span>
         </div>
         <div class="handleBox">
           <div class="handleItem">
             <span class="handleTitle">受理企业</span>：
-            <span class="handleInfo">受理人所在集团名称</span>
+            <span class="handleInfo">{{form.receiveCompanyName}}</span>
           </div>
           <div class="handleItem">
             <span class="handleTitle">受理人</span>：
-            <span class="handleInfo">王斌-13921168766</span>
+            <span class="handleInfo">{{form.receiver}}-{{form.receivePhone}}</span>
             <img src="https://www.idea-co-sf.com/gardenProduct/image/phoneIcon.png" class="phoneIcon">
           </div>
           <div class="handleItem">
             <span class="handleTitle">受理时间</span>：
-            <span class="handleInfo">2024-1-13 15:23</span>
+            <span class="handleInfo">{{form.receiveTime}}</span>
           </div>
         </div>
       </div>
@@ -34,8 +34,50 @@
 </template>
 
 <script>
+import { parkFeedbackInfoGetById } from "@/js_sdk/http.js";
 export default {
-  name: "feedbackDetail"
+  name: "feedbackDetail",
+  data() {
+    return{
+       form:{
+
+       },
+       imgArr:[]
+    }
+  },
+  onLoad(e){
+    // console.log(e)
+    try {
+      parkFeedbackInfoGetById({id:e.id}).then(res=>{
+        this.form = res
+        let imgArr = res.feedbackPicture.split(',')
+        console.log(imgArr)
+        this.getImage(imgArr)
+      })
+    }catch (e){
+      console.log(e)
+    }
+
+  },
+  methods:{
+      getImage(e){
+        e.forEach(item=>{
+          this.imgArr.push({url:this.$constant.BASE_URI + "/FileController/download/" + item})
+        })
+      },
+    clickImg(url) {
+      wx.previewImage({
+        urls: [url], //接受的是一个数组，默认展示第一张
+        current: "",
+        success: function (res) {
+        },
+        fail: function (res) {
+        },
+        complete: function (res) {
+        },
+      })
+    }
+  }
 }
 </script>
 

pages/subPackages/minePages/feedback_record.vue

@@ -1,31 +1,51 @@
 <template>
     <div class="feedback_record">
       <div class="recordItem" v-for="item in recordList" @click="toDetail(item)">
-        <div class="recordTitle">{{item.name}}</div>
+        <div class="recordTitle">{{item.feedbackContent}}</div>
         <div class="recordTime">
-          <span class="time">提交时间：{{item.time}}</span>
-          <span :class="item.type==='待回复'?'dhf':'yhf'">{{item.type}}</span>
+          <span class="time">提交时间：{{item.feedbackTime}}</span>
+          <span :class="item.status=='1'?'dhf':'yhf'">{{item.status=='1'?'待回复':'已回复'}}</span>
         </div>
       </div>
     </div>
 </template>
 
 <script>
+import { parkFeedbackInfoList,getUserLocalStorageInfo } from "@/js_sdk/http.js";
 export default {
   name: "feedback_record",
   data(){
     return{
       recordList:[
-        {name:'园区道路的积水问题还需要尽快处理。否则会影响路面通行的效率。',time:'2021-1-21  13:00',type:'待回复'},
-        {name:'上月水费不太对，怀疑水表有问题，请派人查看。',time:'2021-1-21  13:00',type:'已回复'},
-        {name:'园区道路的积水问题还需要尽快处理。否则会影响路面通行的效率。',time:'2021-1-21  13:00',type:'已回复'},
-      ]
+        // {name:'园区道路的积水问题还需要尽快处理。否则会影响路面通行的效率。',time:'2021-1-21  13:00',type:'待回复'},
+        // {name:'上月水费不太对，怀疑水表有问题，请派人查看。',time:'2021-1-21  13:00',type:'已回复'},
+        // {name:'园区道路的积水问题还需要尽快处理。否则会影响路面通行的效率。',time:'2021-1-21  13:00',type:'已回复'},
+      ],
+      form:{
+        feedbackId: getUserLocalStorageInfo().userId
+      },
     }
   },
+  mounted(){
+     this.getList()
+  },
+  onPullDownRefresh() {
+    this.getList()
+    setTimeout(function () {
+      uni.stopPullDownRefresh();
+    }, 1000);
+  },
   methods:{
+    getList(){
+      parkFeedbackInfoList(this.form).then(res=>{
+        if (res.length){
+          this.recordList = res
+        }
+      })
+    },
     toDetail(item){
       uni.navigateTo({
-        url:'/pages/subPackages/minePages/feedback_detail'
+        url:'/pages/subPackages/minePages/feedback_detail?id=' + item.id
       })
     }
   }

pages/subPackages/minePages/myCollection.vue

@@ -1,16 +1,39 @@
 <template>
     <div class="myCollection">
-      <div class="collItem" v-for="item in 5">
-        <span class="collType">【园区通知】</span>
-        <span class="collTheme">主题主题主题主题主题主题主题主题主题主题主题主题主题主题主题主题主题主题主题主题主题主题主题主题主题</span>
-        <span class="collTime">2024-04-25  09:00</span>
+      <div class="collItem" v-for="item in collList">
+        <span class="collType">【{{item.collectorsType==='1'?'园区通知':'物业通知'}}】</span>
+        <span class="collTheme">{{item.title}}</span>
+        <span class="collTime">{{ item.publishDate }}</span>
       </div>
     </div>
 </template>
 
 <script>
+import { parkUserCollectorsList, getUserLocalStorageInfo} from "@/js_sdk/http.js";
 export default {
-  name: "myCollection"
+  name: "myCollection",
+  data(){
+    return{
+      collList:[],
+      userId: getUserLocalStorageInfo().userId,
+    }
+  },
+  mounted(){
+    this.getList()
+  },
+  onPullDownRefresh() {
+    this.getList()
+    setTimeout(function () {
+      uni.stopPullDownRefresh();
+    }, 1000);
+  },
+  methods:{
+    getList() {
+      parkUserCollectorsList({userId:this.userId}).then(res=>{
+           this.collList = res
+      })
+    }
+  }
 }
 </script>
 

pages/utils/constant.js

@@ -1,10 +1,10 @@
 // 系统常量
 // export const BASE_URI = "http://192.168.2.111:9011"; // 正式
-export const BASE_URI = 'https://www.idea-co-sf.com/gardenProductApi'
+// export const BASE_URI = 'https://www.idea-co-sf.com/gardenProductApi'
 // export const BASE_URI = "http://192.168.3.94:9010"; // 老潘本地
 // export const BASE_URI = "http://192.168.2.107:9011"; // 洮洮本地
 // export const BASE_URI = "http://192.168.2.103:9010"; // 老崔本地
-// export const BASE_URI = "http://192.168.2.107:9011"; // 许峰本地
+export const BASE_URI = "http://192.168.2.112:9011"; // 许峰本地
 // export const BASE_URI = "http://192.168.2.112:9010"; // 陈凡本地
 
 export default {

unpackage/dist/build/mp-weixin/app.json

@@ -32,6 +32,7 @@
         "toread/index",
         "todo/index",
         "todo/predetermineDetail",
+        "todo/inventoryReview",
         "todo/repairAcceptance",
         "todo/addRepair",
         "todo/dispatch",
@@ -80,7 +81,9 @@
         "housingResources/index",
         "housingResources/detail",
         "housingResources/addPredetermine",
-        "aboutThePark/index"
+        "aboutThePark/index",
+        "todo/resourceReview",
+        "minePages/registrationDetails"
       ],
       "network": "all"
     }

unpackage/dist/build/mp-weixin/pages/subPackages/components/momo-multipleSelect/momo-multipleSelect.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

unpackage/dist/build/mp-weixin/pages/subPackages/components/tel-number/index.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

unpackage/dist/build/mp-weixin/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

unpackage/dist/build/mp-weixin/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.json

@@ -1,6 +1,6 @@
 {
-  "component": true,
   "usingComponents": {
     "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons"
-  }
+  },
+  "component": true
 }

unpackage/dist/dev/mp-weixin/app.json

@@ -1,6 +1,7 @@
 {
   "pages": [
     "pages/login/login",
+    "pages/index/mapLocation",
     "pages/login2/login",
     "pages/index/index",
     "pages/mine/mine"
@@ -123,7 +124,8 @@
     }
   },
   "requiredPrivateInfos": [
-    "getLocation"
+    "getLocation",
+    "chooseLocation"
   ],
   "usingComponents": {
     "van-dropdown-menu": "/wxcomponents/weapp/dist/dropdown-menu/index",