产品化更新

js_sdk/http.js

@@ -157,6 +157,11 @@ export function findRectificationManagementInOutById(e) {
     )
 }
 export function repairList(data) {
+    return $http.post(
+        '/wx/repair/list',
+        data, {}
+    )
+}export function repairHandleList(data) {
     return $http.post(
         '/wx/repair/handleList',
         data, {}
@@ -599,6 +604,12 @@ export function listHomeCommunityActivity(data) {
         data, {}
     )
 }
+export function activityList(data) {
+    return $http.post(
+        '/wx/homeActivity/list',
+        data, {}
+    )
+}
 export function isFinishComInfo(data) {
     return $http.post(
         '/wx/company/isFinishComInfo',
@@ -653,6 +664,12 @@ export function propertyNoticeClickCollect(data) {
         data, {}
     )
 }
+export function homeActivityClickCollect(data) {
+    return $http.post(
+        '/wx/homeActivity/clickCollect ',
+        data, {}
+    )
+}
 export function userNoticeAdd(data) {
     return $http.post(
         '/wx/userNotice/add',

manifest.json

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

pages.json

@@ -1,5 +1,19 @@
 {
     "pages": [
+        {
+            "path": "pages/index/index",
+            "style": {
+                "navigationBarTitleText": "首页"
+            },
+            "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/login/login",
             "style": {
@@ -78,20 +92,6 @@
                 }
             }
         },
-        {
-            "path": "pages/index/index",
-            "style": {
-                "navigationBarTitleText": "首页"
-            },
-            "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/mine/mine",
             "style": {

pages/index/components/activity.vue

@@ -1,22 +1,22 @@
 <template>
   <div class="activity">
     <div v-for="(item, index) in activityList" class="activityItem" @tap="toDetail(item)">
-      <img :src="item.img" class="itemBg" />
+      <img :src="item.annexArray[0]" class="itemBg" />
       <div class="activityItemRight">
         <div class="activityItemRightTop">
-          <span class="activityItemRightName">{{ item.name }}</span>
-          <span class="activityItemRightType">{{ item.type }}</span>
+          <span class="activityItemRightName">{{ item.activityName }}</span>
+<!--          <span class="activityItemRightType">{{ item.releaseStatus==='1'?'已发布':item.releaseStatus==='2'?'已下架':'未发布' }}</span>-->
         </div>
-        <div class="canyu">36人参与</div>
+        <div class="canyu">{{item.registrationNumbers}}人参与</div>
         <div class="activityItemRightBottom">
           <div class="shoucang" @tap.stop="clickColl(index)">
-            <img :src="item.isColl ? heartSel : heart" class="scImg" /> 收藏
+            <img :src="item.collectorsStatus==='2' ? heartSel : heart" class="scImg" /> 收藏
           </div>
           <div
             :class="item.isSign ? 'baoming' : 'baoming2'"
             @tap.stop="baoming(item)"
           >
-            {{ item.isSign ? "去报名" : "报名结束" }}
+            {{ item.statusName === '报名中'? "去报名" : "报名结束" }}
           </div>
         </div>
       </div>
@@ -25,7 +25,7 @@
 </template>
 
 <script>
-import { getUserPower, getUserLocalStorageInfo } from "@/js_sdk/http";
+import { getUserPower, getUserLocalStorageInfo, activityList, homeActivityClickCollect,getByCodes} from "@/js_sdk/http";
 export default {
   name: "activity",
   props: {
@@ -39,35 +39,64 @@ export default {
       heartSel: "https://www.idea-co-sf.com/gardenProduct/image/heartSel.png",
       heart: "https://www.idea-co-sf.com/gardenProduct/image/heart.png",
       activityList: [
-        {
-          name: "互联网私募如何入门？",
-          type: "培训活动",
-          img: "https://www.idea-co-sf.com/gardenProduct/image/img1.png",
-          isColl: true,
-          isSign: true,
-        },
-        {
-          name: "公募基金中的大数据啊啊啊？",
-          type: "活动",
-          img: "https://www.idea-co-sf.com/gardenProduct/image/img2.png",
-          isColl: false,
-          isSign: true,
-        },
-        {
-          name: "年度小艾杯篮球赛开...？",
-          type: "体育",
-          img: "https://www.idea-co-sf.com/gardenProduct/image/img3.png",
-          isColl: false,
-          isSign: false,
-        },
+        // {
+        //   name: "互联网私募如何入门？",
+        //   type: "培训活动",
+        //   img: "https://www.idea-co-sf.com/gardenProduct/image/img1.png",
+        //   isColl: true,
+        //   isSign: true,
+        // },
+        // {
+        //   name: "公募基金中的大数据啊啊啊？",
+        //   type: "活动",
+        //   img: "https://www.idea-co-sf.com/gardenProduct/image/img2.png",
+        //   isColl: false,
+        //   isSign: true,
+        // },
+        // {
+        //   name: "年度小艾杯篮球赛开...？",
+        //   type: "体育",
+        //   img: "https://www.idea-co-sf.com/gardenProduct/image/img3.png",
+        //   isColl: false,
+        //   isSign: false,
+        // },
       ],
+      search: {
+        createdBy: getUserLocalStorageInfo().userId,
+        pageNum: 1,
+        pageSize: 10
+      },
     };
   },
+  onShow(){
+  },
+  mounted(){
+    this.getList()
+  },
   methods: {
+
       clickColl(index) {
-        // console.log(index)
-        this.activityList[index].isColl = !this.activityList[index].isColl;
-        // item.isColl = !item.isColl
+        if (this.activityList[index].collectorsStatus==='2'){
+          this.activityList[index].collectorsStatus='1'
+        }else{
+          this.activityList[index].collectorsStatus='2'
+        }
+
+        homeActivityClickCollect({
+          id: this.activityList[index].id,
+          createdBy: getUserLocalStorageInfo().userId,
+          collectorsStatus: this.activityList[index].collectorsStatus
+        }).then(res => {
+        });
+      },
+      getList(){
+        this.activityList = []
+        activityList(this.search).then(res=>{
+          if (res.errno == 0){
+            this.activityList = res.data.rows
+          }
+          // console.log(res)
+        })
       },
       baoming(item) {
         if (item.isSign) {

pages/index/components/enterpriseSide.vue

@@ -9,7 +9,12 @@
         <image :src="dhIcon" class="dhIcon" @tap="toMap"></image>
         <image :src="vector" class="vector"></image>
       </div>
-      <div class="parkBgBox" :style="{ 'background-image': `url(${parkBg})` }">
+      <div class="parkBgBox">
+        <swiper :indicator-dots="false" circular style="height: 360rpx" @change="changeImg" autoplay>
+          <swiper-item v-for="item in envList">
+            <img :src="item.url" class="swiperImg"/>
+          </swiper-item>
+        </swiper>
         <div class="parkNameBox">这里是园区名称</div>
       </div>
       <div class="map2">
@@ -120,7 +125,11 @@ export default {
       searchArea: "当前园区名称",
       index: 0,
       array: ["中国", "美国", "巴西", "日本"],
-      parkBg: "https://www.idea-co-sf.com/gardenProduct/image/parkBg.png",
+      // parkBg: "https://www.idea-co-sf.com/gardenProduct/image/parkBg.png",
+      envList:[
+          {url:"https://www.idea-co-sf.com/gardenProduct/image/parkBg.png"},
+          {url:"https://www.idea-co-sf.com/gardenProduct/image/parkBg.png"}
+      ],
       tabList: [
         { name: "活动" },
         { name: "周边" },
@@ -160,7 +169,7 @@ export default {
         {
           label: "活动报名",
           url: "https://www.idea-co-sf.com/gardenProduct/image/hdbmIcon.png",
-          path: "/pages/subPackages/companyHouse/companyHouse",
+          path: "/pages/subPackages/parkActivity/index",
           // isMustCompany: true,
         },
         {
@@ -197,6 +206,9 @@ export default {
     this.getHouseKeeper()
   },
   methods: {
+    changeImg(index){
+      // this.current = index.detail.current+1
+    },
     //获取管家
     getHouseKeeper(){
       let reqData = {
@@ -583,5 +595,9 @@ export default {
     display: flex;
     align-items: center;
   }
+  .swiperImg{
+    width: 702rpx;
+    height: 320rpx;
+  }
 }
 </style>

pages/login2/login.vue

@@ -229,6 +229,12 @@ export default {
                 url: "/pages/index/index",
               });
             } else {
+              uni.showToast({
+                title: res.errmsg,
+                icon: "none",
+                mask: true,
+                duration: 2000,
+              });
               _this.captchaImageRefresh(_this.loginForm);
             }
           });
@@ -266,6 +272,12 @@ export default {
                 url: "/pages/index/index",
               });
             } else {
+              uni.showToast({
+                title: res.errmsg,
+                icon: "none",
+                mask: true,
+                duration: 2000,
+              });
               _this.captchaImageRefresh(_this.loginForm);
             }
           });

pages/subPackages/activityPromulgate/add.vue

@@ -5,28 +5,29 @@
         <li class="detailLi2">
           <span class="liName" style="margin-bottom: 16rpx"><span style="color: red">*</span> &nbsp;活动主题</span>
           <van-field
-              :value="form.contant"
+              :value="form.activityName"
               autosize
               type="textarea"
               placeholder="请填写活动名称"
               class="myField"
               maxlength="50"
               show-word-limit
+              @change="changeActivityName"
           />
         </li>
         <li class="detailLi2">
           <span class="liName">
-            选择类别
+            <span style="color: red">*</span> &nbsp;选择类别
           </span>
           <div class="detailLi2Box">
             <div class="detailLi2BoxTop">
-              <div class="checkItem" :class="item.isCheck?'checked':''" v-for="item in checkList" @click="clickCheck(item)">{{item.name}}</div>
+              <div class="checkItem" :class="item.value===form.activityType?'checked':''" v-for="item in tabList" @click="clickCheck(item)">{{item.label}}</div>
             </div>
           </div>
         </li>
         <li class="detailLi2">
           <span class="liName">
-            主题图
+            <span style="color: red">*</span> &nbsp;主题图
             <span style="color: #B3B3B3;font-size: 28rpx">（支持图片/视频上传限20M内，最多1张）</span>
           </span>
           <div class="detailLi2Box" style="margin: 24rpx 0 0 0">
@@ -43,7 +44,7 @@
           <span class="liName">
             <span style="color: red">*</span>&nbsp; 联系电话
           </span>
-          <input placeholder="请填写" v-model="phone" class="liIpt">
+          <input placeholder="请填写" v-model="form.activityPhone" class="liIpt">
         </li>
       </ul>
     </div>
@@ -52,13 +53,14 @@
         <li class="detailLi2">
           <span class="liName" style="margin-bottom: 16rpx"><span style="color: red">*</span>&nbsp; 活动举办</span>
           <van-field
-              :value="form.contant"
+              :value="form.activitiesNotice"
               autosize
               type="textarea"
               placeholder="请填写活动举办相关信息"
               class="myField"
               maxlength="2000"
               show-word-limit
+              @change="changeNotice"
           />
         </li>
         <li class="detailLi2">
@@ -66,13 +68,14 @@
            <span style="color: red">*</span>&nbsp; 活动内容
           </span>
           <van-field
-              :value="form.contant"
+              :value="form.activityContent"
               autosize
               type="textarea"
               placeholder="请填写活动举办相关信息"
               class="myField"
               maxlength="2000"
               show-word-limit
+              @change="changeContent"
           />
           <span class="liName" style="margin: 24rpx 0">
             <span style="color: #B3B3B3;font-size: 28rpx">（支持图片上传限20M内，最多6张）</span>
@@ -92,9 +95,9 @@
              <span style="color: red">*</span>&nbsp; 活动时间
           </span>
           <div class="choosTimeBox">
-            <input placeholder="请选择年月日时分" class="timeIpt" disabled v-model="time1" @click="showTime('actStartTime')">
+            <input placeholder="请选择年月日时分" class="timeIpt" disabled v-model="form.activityStartTime" @click="showTime('actStartTime')">
             <span class="midZ">至</span>
-            <input placeholder="请选择年月日时分" class="timeIpt" disabled v-model="time2" @click="showTime('actEndTime')">
+            <input placeholder="请选择年月日时分" class="timeIpt" disabled v-model="form.activityEndTime" @click="showTime('actEndTime')">
           </div>
         </li>
         <li class="detailLi2" style="border-bottom: none">
@@ -102,8 +105,11 @@
              <span style="color: red">*</span>&nbsp; 活动地址
           </span>
           <div class="placeBox">
-            <input placeholder="详细地点" class="timeIpt" v-model="place">
-            <van-icon name="location" style="color: rgba(51, 51, 51, 0.90);font-size: 30rpx"/>
+            <input placeholder="使用地图拾取" class="timeIpt" v-model="form.activityAddress" disabled>
+            <van-icon name="location" style="color: rgba(51, 51, 51, 0.90);font-size: 30rpx" @tap="toMap"/>
+          </div>
+          <div class="placeBox">
+            <input placeholder="请补充详细地址，如楼栋-门牌号" class="timeIpt" v-model="form.activityAddressDetail">
           </div>
         </li>
       </ul>
@@ -113,13 +119,14 @@
         <li class="detailLi2">
           <span class="liName" style="margin-bottom: 16rpx"><span style="color: red">*</span>&nbsp; 报名条件</span>
           <van-field
-              :value="form.contant"
+              :value="form.registrationConditions"
               autosize
               type="textarea"
               placeholder="请填写活动举办相关信息"
               class="myField"
               maxlength="2000"
               show-word-limit
+              @change="changeCond"
           />
         </li>
         <li class="detailLi2">
@@ -129,27 +136,28 @@
           <div class="choosTimeBox">
             <input placeholder="请选择年月日时分" class="timeIpt" disabled v-model="regTime1" @click="showTime('regStartTime')">
             <span class="midZ">至</span>
-            <input placeholder="活动开始时间" class="timeIpt" disabled v-model="time1" style="background: white">
+            <input placeholder="自动带出" class="timeIpt" disabled v-model="form.activityStartTime" style="background: white">
 <!--            <span>活动开始时间</span>-->
           </div>
         </li>
         <li class="detailLi2" style="border-bottom: none">
           <span class="liName" style="margin-bottom: 16rpx">活动参与</span>
           <van-field
-              :value="form.contant"
+              :value="form.activityQuota"
               autosize
               type="textarea"
               placeholder="请填写限制人数等"
               class="myField"
               maxlength="2000"
               show-word-limit
+              @change="changeQuota"
           />
         </li>
       </ul>
     </div>
        <div class="buttonBox">
          <button class="btn zcBtn">暂存</button>
-         <button class="btn fbBtn">发布</button>
+         <button class="btn fbBtn" @tap="submit('发布')">发布</button>
        </div>
     <van-popup
         :show="timeShow"
@@ -167,55 +175,90 @@
   </div>
 </template>
 <script>
+import {getByCodes} from "@/js_sdk/http";
 export default {
   data(){
-    return{
+    return {
+      dc_key:['activity_type'],
       timeShow:false,
       isCheck:false,
       isCheck2:false,
-      time1:'',
       time1Str:'',
       time2Str:'',
-      time2:'',
       regTime1:'',
       regTime1Str:'',
       place:'',
       currentDate: new Date().getTime(),
       form:{
-        contant:''
+        activityName:'',
+        activityType:'3',
+        activityPhone: '',
+        activitiesNotice: '',
+        activityContent: '',
+        activityAddress:'',
+        activityEndTime:'',
+        activityStartTime:'',
+        registrationConditions:'',
+        activityAddressDetail:'',
+        activityQuota:'',
+        longitude:'',
+        latitude:'',
       },
       phone:'',
-      checkList:[
-        {name:'培训',isCheck:true},
-        {name:'法务',isCheck:false},
-        {name:'财税',isCheck:false},
-        {name:'私募',isCheck:false},
-      ],
+      tabList:[],
       fileList:[],
       optionsType:'',
-      timePickerType:''
+      timePickerType:'',
     }
   },
   onLoad(options) {
-    console.log(options);
-    this.optionsType = options.type
-    if (options.type==='待处理'){
-      uni.setNavigationBarTitle({
-        title: '报修处理',
-      });
-    }else if(options.type==='已处理'){
-      uni.setNavigationBarTitle({
-        title: '报修详情',
-      });
-    }else {
-      uni.setNavigationBarTitle({
-        title: '报修派单',
-      });
-    }
+    console.log('options',options);
+  },
+  onShow(){
+    this.getByCodes()
   },
   methods:{
+    toMap(){
+      let _this = this
+      uni.chooseLocation({
+        success: function (res) {
+          console.log('选择的位置：', res.name);
+          _this.form.activityAddress = res.name
+          console.log('纬度：' + res.latitude + '，经度：' + res.longitude);
+          _this.form.longitude = res.longitude
+          _this.form.latitude = res.latitude
+          // 其他业务逻辑
+        },
+        fail: function (error) {
+          console.error('Choose location failed: ' + JSON.stringify(error));
+        },
+        complete: function () {
+          console.log('chooseLocation operation is complete');
+        }
+      });
+    },
+    changeActivityName(e){
+      this.form.activityName = e.detail
+    },
+    changeNotice(e){
+      this.form.activitiesNotice = e.detail
+    },
+    changeContent(e){
+      this.form.activityContent = e.detail
+    },
+    changeCond(e){
+      this.form.registrationConditions = e.detail
+    },
+    changeQuota(e){
+      this.form.activityQuota = e.detail
+    },
+    async getByCodes() {
+      let data = await getByCodes(JSON.stringify(this.dc_key));
+      this.tabList = this.$common.handleDicList(data).activity_type;
+      console.log('this.tabList',this.tabList)
+    },
     clickCheck(item){
-      item.isCheck = !item.isCheck
+      this.form.activityType = item.value
     },
     selectTime(e){
       const dateString = this.timestampToDate(e.detail);
@@ -226,10 +269,10 @@ export default {
             this.$showToast("请选择合理时间");
             return
           }else{
-            this.time1 = dateString
+            this.form.activityStartTime = dateString
           }
         }else{
-          this.time1 = dateString
+          this.form.activityStartTime = dateString
         }
       }else if(this.timePickerType === 'actEndTime'){
         this.time2Str = e.detail
@@ -238,10 +281,10 @@ export default {
             this.$showToast("请选择合理时间");
             return
           }else{
-            this.time2 = dateString
+            this.form.activityEndTime = dateString
           }
         }else{
-          this.time2 = dateString
+          this.form.activityEndTime = dateString
         }
       }else if(this.timePickerType === 'regStartTime'){
         this.regTime1Str = e.detail
@@ -260,17 +303,70 @@ export default {
       // console.log(dateString)
     },
     showTime(e){
-       this.timePickerType = e
-       this.timeShow = true
+      if (e === 'regStartTime'){
+        if (!this.form.activityStartTime){
+          this.$showToast("请先在上方选择活动开始时间");
+        }else{
+          this.timePickerType = e
+          this.timeShow = true
+        }
+      } else{
+        this.timePickerType = e
+        this.timeShow = true
+      }
     },
+
+    submit(e){
+      const _this = this;
+      if (_this.form.activityName === "") {
+        this.$showToast("请填写活动主题");
+        return;
+      }
+      if (_this.form.activityType === "") {
+        this.$showToast("请选择活动类型");
+        return;
+      }
+      if (_this.form.registrationStartTime === "") {
+        this.$showToast("请选择报名开始时间");
+        return;
+      }
+      if (_this.form.registrationEndTime === "") {
+        this.$showToast("请选择报名结束时间");
+        return;
+      }
+      if (_this.form.activityStartTime === "") {
+        this.$showToast("请选择活动开始时间");
+        return;
+      }
+      if (_this.form.activityEndTime === "") {
+        this.$showToast("请选择活动结束时间");
+        return;
+      }
+      if (!_this.fileList.length) {
+        this.$showToast("请上传主题图");
+        return;
+      }
+      if (_this.form.activityPhone === "") {
+        this.$showToast("请输入联系电话");
+        return;
+      }
+      if (_this.form.activityAddress === "") {
+        this.$showToast("请输入活动地址");
+        return;
+      }
+      // 差报名条件等必填
+      console.log(_this.form)
+    },
+
     deleteRYXXZP(event) {
       this.fileList.splice(event.detail.index, 1);
       this.$forceUpdate();
     },
     uploadRYXXZP(event) {
-      console.log(event)
+      // console.log(event)
       let that = this;
       const { file } = event.detail;
+      console.log(event.detail)
       uni.uploadFile({
         url: that.$constant.BASE_URI + "/wx/fileController/upload",
         filePath: file.url,
@@ -279,15 +375,29 @@ export default {
         success(res) {
           // 上传完成需要更新 fileList
           let data = JSON.parse(res.data);
-          that.fileList.push({
-            imgUrl: "/FileController/download/" + data.data[0],
-            id: data.data[0],
-            url:
-                that.$constant.BASE_URI +
-                "/FileController/download/" +
-                data.data[0],
-            isImage: true,
-          });
+          if (event.detail.file.type==='image'){
+            that.fileList.push({
+              imgUrl: "/FileController/download/" + data.data[0],
+              id: data.data[0],
+              url:
+                  that.$constant.BASE_URI +
+                  "/FileController/download/" +
+                  data.data[0],
+              type:event.detail.file.type,
+              isImage:true,
+            });
+          }else{
+            that.fileList.push({
+              imgUrl: "/FileController/download/" + data.data[0],
+              id: data.data[0],
+              url:
+                  that.$constant.BASE_URI +
+                  "/FileController/download/" +
+                  data.data[0],
+              type:event.detail.file.type,
+              isVideo:true
+            });
+          }
         },
         fail(res) {},
       });
@@ -425,7 +535,8 @@ export default {
           display: flex;
           justify-content: space-between;
           align-items: center;
-          margin-top: 8rpx;
+          font-size: 32rpx;
+          margin: 12rpx 0;
         }
       }
     }

pages/subPackages/activityPromulgate/list.vue

@@ -2,36 +2,39 @@
     <div class="activityPromulgate">
         <div class="activityTop">
           <div class="addRepair" @tap="newRelease">新增活动 <van-icon name="add" style="margin-left: 8rpx"/></div>
-          <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-tabs>
+          <div class="parkDynamicTab2">
+            <div
+                v-for="(item, index) in tabList"
+                :key="index"
+                class="tabItem"
+                :class="selectTab === item.label ? 'selectTabItem' : ''"
+                @click="clickTab(item)"
+            >
+              {{ item.label }}
+            </div>
+          </div>
         </div>
       <div class="activityListBody">
         <div class="listItem" v-for="item in activityList">
            <div class="listItemInfoBox">
              <div class="listItemInfoLeft">
-               <span class="listTitle">{{item.name}}</span>
-               <span class="listCon">发布时间:2024.5.612:09 </span>
-               <span class="listCon">报名截止时间:2024.6.613:00</span>
-               <span class="listCon">活动开始时间:2024.6.613:00</span>
+               <span class="listTitle">{{item.activityName}}</span>
+               <span class="listCon">发布时间:{{item.releaseTime}} </span>
+               <span class="listCon">报名截止时间:{{item.registrationEndTime}}</span>
+               <span class="listCon">活动开始时间:{{item.activityStartTime}}</span>
              </div>
              <div class="listItemInfoRight">
-               <img src="../parkActivity/image/dhIcon.png" class="listImg">
-               <div class="tags" :class="item.status==='报名中'?'bmzTag':item.status==='报名结束'?'bmjsTag':item.status==='活动结束'?'hdjsTag':'wksTag'">{{item.status}}</div>
+               <img :src="item.imgUrl" class="listImg">
+               <div class="tags" :class="item.status==='2'?'bmzTag':item.status==='3'?'bmjsTag':item.status==='4'?'hdjsTag':'wksTag'">{{item.statusName}}</div>
              </div>
            </div>
            <div class="listItemInfoBox2">
              <div class="fbrBox">
                <van-icon name="contact" style="color:rgba(102, 102, 102, 1)"/>
-               发布人：章敏
+               发布人：{{item.releaseUserName}}
              </div>
              <div class="fbrBox">
-               35人报名    0人签到
+               {{item.registrationNumbers}}人报名    {{item.signInNumber}}人签到
              </div>
            </div>
           <div class="listItemInfoBox3">
@@ -40,8 +43,8 @@
               <span>活动签到码</span>
             </div>
             <div class="listBtnBox">
-              <button class="rBtn editBtn">编辑</button>
-              <button class="rBtn" :class="item.typeName==='下架'?'downBtn':'upBtn'" @tap="clickType(item)">{{item.typeName}}</button>
+              <button class="rBtn editBtn" v-if="item.releaseStatus !== '1'">编辑</button>
+              <button class="rBtn" :class="item.releaseStatus==='1'?'downBtn':'upBtn'" @tap="clickType(item)">{{item.releaseStatus==='1'?'下架':'上架'}}</button>
             </div>
           </div>
         </div>
@@ -67,26 +70,76 @@
       </div>
     </div>
 </template>
-<script>
-
 
+<script>
+import { listHomeCommunityActivity, getUserLocalStorageInfo,editHomeCommunityActivity ,getByCodes} from "@/js_sdk/http";
 export default {
     data() {
        return{
+         dc_key:['activity_type'],
          show: false,
-         active:0,
+         selectTab:'全部',
          activityList:[
-           {name:'互联网私募如何入门？',typeName:'下架',status:'报名中'},
-           {name:'公募基金中的大数据挖掘？',typeName:'上架',status:'报名结束'},
-           {name:'年度小艾杯篮球赛开始啦？',typeName:'下架',status:'活动结束'},
-           {name:'互联网私募如何入门？？',typeName:'下架',status:'未开始'},
+           // {name:'互联网私募如何入门？',typeName:'下架',status:'报名中'},
+           // {name:'公募基金中的大数据挖掘？',typeName:'上架',status:'报名结束'},
+           // {name:'年度小艾杯篮球赛开始啦？',typeName:'下架',status:'活动结束'},
+           // {name:'互联网私募如何入门？？',typeName:'下架',status:'未开始'},
+         ],
+         tabList:[
+           {label:'全部',value:''}
          ],
-         dialogType:''
+         dialogType:'',
+         search: {
+           createdBy: getUserLocalStorageInfo().userId,
+           pageNum: 1,
+           pageSize: 10
+         },
+         actType:{
+           id:'',
+           releaseStatus:''
+         }
        }
     },
+    onShow(){
+      this.getByCodes()
+    },
+    onPullDownRefresh() {
+      this.getList()
+      setTimeout(function () {
+        uni.stopPullDownRefresh();
+      }, 1000);
+    },
     mounted() {
     },
     methods: {
+      async getByCodes() {
+        this.tabList = [{label:'全部',value:''}]
+        let data = await getByCodes(JSON.stringify(this.dc_key));
+        this.dic_SelectList = this.$common.handleDicList(data);
+        this.dic_SelectList.activity_type.forEach(item=>{
+          this.tabList.push(item)
+        })
+        this.getList()
+        // console.log('this.tabList',this.tabList)
+      },
+      clickTab(item) {
+        this.selectTab = item.label;
+        this.search.activityType = item.value
+        this.getList()
+      },
+      getList(){
+        this.activityList = []
+        listHomeCommunityActivity(this.search).then(res=>{
+          if (res.errno == 0){
+            this.activityList = res.data.rows
+            this.activityList.forEach(item=>{
+              if (item.annex) {
+                 item.imgUrl = JSON.parse(item.annex)[0].url
+              }
+            })
+          }
+        })
+      },
       newRelease(){
         uni.navigateTo({
           url:'/pages/subPackages/activityPromulgate/add'
@@ -96,9 +149,29 @@ export default {
 
       },
       clickType(item) {
-         this.dialogType = item.typeName
+        if (item.releaseStatus==='1'){
+          this.dialogType = '下架'
+          this.actType.releaseStatus = '2'
+        }else{
+          this.dialogType = '上架'
+          this.actType.releaseStatus = '1'
+        }
+         this.actType.id = item.id
          this.show = true
       },
+
+      confirm(e){
+        editHomeCommunityActivity(this.actType).then(res=>{
+            uni.showToast({
+              title: res.errmsg,
+              icon: 'none',
+              mask: true,
+              duration: 1000
+            });
+          this.getList()
+        })
+      },
+
       toQrCode(item) {
         uni.navigateTo({
           url:'/pages/subPackages/activityPromulgate/qrCode'
@@ -264,5 +337,19 @@ export default {
         flex-direction: column;
         align-items: center;
       }
+      .parkDynamicTab2 {
+        display: flex;
+        padding: 24rpx 0;
+        margin-top: 24rpx;
+        .tabItem {
+          color: #666666;
+          font-size: 28rpx;
+          margin: 0 auto;
+        }
+        .selectTabItem {
+          color: #18172a;
+          border-bottom: 6rpx solid #034df7;
+        }
+      }
     }
 </style>

pages/subPackages/parkActivity/index.vue

@@ -6,18 +6,19 @@
              v-for="(item, index) in tabList"
              :key="index"
              class="tabItem"
-             :class="selectTab === item.name ? 'selectTabItem' : ''"
+             :class="selectTab === item.label ? 'selectTabItem' : ''"
              @click="clickTab(item)"
          >
-           {{ item.name }}
+           {{ item.label }}
          </div>
        </div>
-       <activity />
+       <activity ref="avtivitys"/>
      </div>
    </div>
 </template>
 
 <script>
+import {getByCodes} from "@/js_sdk/http";
 import activity from "../../index/components/activity.vue";
 
 export default {
@@ -25,19 +26,39 @@ export default {
   name: "index",
   data(){
     return {
+      dc_key:['activity_type'],
       selectTab: "全部",
       tabList: [
-        { name: "全部" },
-        { name: "培训" },
-        { name: "私募" },
-        { name: "法务" },
-        { name: "财税" },
+        { label: "全部",value:null },
+        // { name: "培训" },
+        // { name: "私募" },
+        // { name: "法务" },
+        // { name: "财税" },
       ],
     }
   },
+  onPullDownRefresh() {
+    this.$refs.avtivitys.getList()
+    setTimeout(function () {
+      uni.stopPullDownRefresh();
+    }, 1000);
+  },
+  onShow(){
+    this.getByCodes()
+  },
   methods:{
     clickTab(item) {
-      this.selectTab = item.name;
+      this.selectTab = item.label;
+      this.$refs.avtivitys.search.activityType = item.value
+      this.$refs.avtivitys.getList()
+    },
+    async getByCodes() {
+      let data = await getByCodes(JSON.stringify(this.dc_key));
+      this.dic_SelectList = this.$common.handleDicList(data);
+      this.dic_SelectList.activity_type.forEach(item=>{
+        this.tabList.push(item)
+      })
+      // console.log('this.tabList',this.tabList)
     },
   }
 }

pages/subPackages/reportRepair/handleRepair.vue

@@ -1,655 +0,0 @@
-<template>
-  <div class="addRepair">
-    <div class="reportBody">
-      <ul class="detailUl">
-        <li class="detailLi">
-          <span class="liName">当前企业</span>
-          <span class="liInfo">{{ detail.companyName }}</span>
-        </li>
-        <li class="detailLi">
-          <span class="liName">
-            <span style="color: red;margin-right: 10rpx;">*</span>
-            您是想
-          </span>
-          <span class="liInfo">
-             <van-radio-group :value="detail.type" disabled>
-                  <van-radio name="1">报事</van-radio>
-                  <van-radio name="2">咨询</van-radio>
-             </van-radio-group>
-          </span>
-        </li>
-        <li class="detailLi2">
-          <span class="liName">
-            快捷选择
-          </span>
-          <div class="detailLi2Box">
-            <div class="detailLi2BoxTop">
-              <div class="checkItem" :class="detail.serviceType===item.label?'checked':''" v-for="item in checkList">{{item.label}}</div>
-            </div>
-            <van-field
-                :value="detail.description"
-                autosize
-                type="textarea"
-                placeholder="请输入文字进行报事报修描述"
-                class="myField"
-                maxlength="800"
-                show-word-limit
-                readonly
-            />
-          </div>
-        </li>
-        <li class="detailLi">
-          <span class="liName">
-            <span style="color: red;margin-right: 10rpx;">*</span>
-            位置
-          </span>
-          <span class="liInfo">
-             <van-radio-group :value="detail.position" disabled>
-                <van-radio name="1">室内</van-radio>
-                <van-radio name="2">公区</van-radio>
-             </van-radio-group>
-          </span>
-        </li>
-        <li class="detailLi2">
-          <span class="liName">
-            补充说明
-            <span style="color: #B3B3B3;font-size: 28rpx">（支持图片/视频上传限20M内，最多6张）</span>
-          </span>
-          <div class="detailLi2Box" style="margin: 24rpx 0 0 0">
-            <van-uploader
-                :max-count="6"
-                @delete="deleteRYXXZP"
-                :file-list="fileList"
-                @after-read="uploadRYXXZP"
-                :show-upload="true"
-            />
-          </div>
-        </li>
-        <li class="detailLi">
-          <span class="liName">
-            报事人
-          </span>
-          <span class="liInfo">
-            章敏-18915281562 <img src="https://www.idea-co-sf.com/gardenProduct/image/phoneIcon.png" class="phoneIcon">
-          </span>
-        </li>
-        <li class="detailLi" style="border-bottom: none">
-          <span class="liName">
-            报事时间
-          </span>
-          <span class="liInfo">
-            2024-05-16  15：30
-          </span>
-        </li>
-      </ul>
-    </div>
-    <div class="handleBox">
-      <div class="handleTitle">处理情况</div>
-      <div class="imageBox">
-        <div class="imageItem">
-          <img src="https://www.idea-co-sf.com/gardenProduct/image/upImage.svg" class="handleImg">
-          <span>上报</span>
-        </div>
-        <img src="https://www.idea-co-sf.com/gardenProduct/image/arrow.png" class="handleArrow">
-        <div class="imageItem">
-          <img src="https://www.idea-co-sf.com/gardenProduct/image/acceptance.svg" class="handleImg">
-          <span>受理</span>
-        </div>
-        <img src="https://www.idea-co-sf.com/gardenProduct/image/arrow.png" class="handleArrow">
-        <div class="imageItem">
-          <img :src="optionsType==='待受理'?'https://www.idea-co-sf.com/gardenProduct/image/unHandle.svg':'https://www.idea-co-sf.com/gardenProduct/image/handle.svg'" class="handleImg">
-          <span>处理</span>
-        </div>
-        <img src="https://www.idea-co-sf.com/gardenProduct/image/arrow.png" class="handleArrow">
-        <div class="imageItem">
-          <img src="https://www.idea-co-sf.com/gardenProduct/image/evaluate.svg" class="handleImg">
-          <span>评价</span>
-        </div>
-      </div>
-    </div>
-    <div class="reportBody" v-if="optionsType!=='已处理'">
-      <ul class="detailUl">
-        <li class="detailLi">
-           <span class="liInfo">
-              <label>
-                  <radio value="报事" :checked="optionsType==='待受理'" color="#0365F9" :disabled="optionsType==='待处理'"/>派单
-              </label>
-              <label style="margin-left: 64rpx">
-                  <radio value="咨询" :checked="optionsType==='待处理'" color="#0365F9" :disabled="optionsType==='待受理'"/>处理
-               </label>
-          </span>
-        </li>
-        <li class="detailLi" v-if="optionsType==='待受理'">
-          <span class="liName">
-            派单给
-          </span>
-          <span class="liInfo">
-            李开心
-          </span>
-        </li>
-        <li class="detailLi2" v-if="optionsType==='待受理'">
-           <span class="liName" style="margin-bottom: 16rpx">
-            备注
-          </span>
-          <van-field
-              :value="form.contant"
-              autosize
-              type="textarea"
-              placeholder="请输入文字进行报事报修描述"
-              class="myField2"
-              maxlength="800"
-              show-word-limit
-          />
-        </li>
-        <li class="detailLi2" v-if="optionsType==='待处理'">
-          <span class="liName">
-            处理后拍照
-            <span style="color: #B3B3B3;font-size: 28rpx">（支持图片上传限20M内，最多6张）</span>
-          </span>
-          <div class="detailLi2Box" style="margin: 24rpx 0 0 0">
-            <van-uploader
-                :max-count="6"
-                @delete="deleteRYXXZP"
-                :file-list="fileList"
-                @after-read="uploadRYXXZP"
-                :show-upload="true"
-            />
-          </div>
-        </li>
-        <li class="detailLi" v-if="optionsType==='待处理'">
-          <span class="liName">
-            处理人
-          </span>
-          <span class="liInfo">
-            李开心
-          </span>
-        </li>
-        <li class="detailLi" v-if="optionsType==='待处理'" style="border-bottom: none">
-          <span class="liName">
-            处理时间
-          </span>
-          <span class="liInfo">
-            {{timeNow}}
-          </span>
-        </li>
-      </ul>
-    </div>
-    <div class="reportBody" v-if="optionsType==='已处理'">
-      <div class="handleTitle">派单信息</div>
-      <ul class="detailUl">
-        <li class="detailLi">
-          <span class="liName">
-            派单给
-          </span>
-          <span class="liInfo">
-            李开心
-          </span>
-        </li>
-        <li class="detailLi2">
-           <span class="liName" style="margin-bottom: 16rpx">
-            备注
-          </span>
-          <van-field
-              :value="form.contant"
-              autosize
-              type="textarea"
-              placeholder="请输入文字进行报事报修描述"
-              class="myField2"
-              maxlength="800"
-              show-word-limit
-          />
-        </li>
-        <li class="detailLi">
-          <span class="liName">
-            派单人
-          </span>
-          <span class="liInfo">
-            李欣怡
-          </span>
-        </li>
-        <li class="detailLi" style="border-bottom: none">
-          <span class="liName">
-            派单时间
-          </span>
-          <span class="liInfo">
-            2024-05-18  15：30
-          </span>
-        </li>
-      </ul>
-    </div>
-    <div class="reportBody" v-if="optionsType==='已处理'">
-      <div class="handleTitle">处理信息</div>
-      <ul class="detailUl">
-        <li class="detailLi2">
-          <span class="liName">
-            处理后拍照
-            <span style="color: #B3B3B3;font-size: 28rpx">（支持图片上传限20M内，最多6张）</span>
-          </span>
-          <div class="detailLi2Box" style="margin: 24rpx 0 0 0">
-            <van-uploader
-                :max-count="6"
-                @delete="deleteRYXXZP"
-                :file-list="fileList"
-                @after-read="uploadRYXXZP"
-                :show-upload="true"
-            />
-          </div>
-        </li>
-        <li class="detailLi">
-          <span class="liName">
-            处理人
-          </span>
-          <span class="liInfo">
-            李开心
-          </span>
-        </li>
-        <li class="detailLi" style="border-bottom: none">
-          <span class="liName">
-            处理时间
-          </span>
-          <span class="liInfo">
-            2024-05-18  15：30
-          </span>
-        </li>
-      </ul>
-    </div>
-    <div class="reportBody" v-if="optionsType==='已处理'">
-      <div class="evaluationBox" >
-        <span class="evaName">您对本次服务的评价</span>
-        <van-rate
-            :value="value"
-            :size="24"
-            gutter="32rpx"
-            void-color="#eee"
-            bind:change="onChange"
-            color="#fd9a63"
-        />
-      </div>
-    </div>
-    <div class="buttonBox">
-      <button class="zcBtn" @tap="closePage" :class="optionsType==='已处理'?'btn2':'btn '">关闭</button>
-      <button class="btn tjBtn" v-if="optionsType==='待受理'">提交派单</button>
-      <button class="btn tjBtn" v-if="optionsType==='待处理'">处理完成</button>
-    </div>
-  </div>
-</template>
-<script>
-import {getRepairDispatchById,getUserLocalStorageInfo,getByCodes } from "@/js_sdk/http";
-export default {
-  data(){
-    return{
-      dc_key: ['QUICK_SELECTION'],
-      isCheck:false,
-      isCheck2:false,
-      detail:{
-      },
-      checkList:[
-        // {name:'挂件安装',isCheck:true},
-        // {name:'我要投诉',isCheck:false},
-        // {name:'疏通管道',isCheck:false},
-        // {name:'维修线路',isCheck:false},
-        // {name:'更换灯泡',isCheck:false},
-        // {name:'网络维修',isCheck:false},
-        // {name:'保洁服务',isCheck:false},
-        // {name:'其他维修',isCheck:false},
-      ],
-      fileList:[],
-      optionsType:'',
-      timeNow:'',
-      value: "5",
-      id:'',
-      dic_SelectList:[]
-    }
-  },
-  onLoad(options) {
-    const item = JSON.parse(options.item)
-    this.id = item.id
-    console.log('11111',this.id)
-    this.optionsType = item.type
-    if (options.type==='待处理'){
-      uni.setNavigationBarTitle({
-        title: '报修处理',
-      });
-    }else if(options.type==='已处理'){
-      uni.setNavigationBarTitle({
-        title: '报修详情',
-      });
-    }else {
-      uni.setNavigationBarTitle({
-        title: '报修派单',
-      });
-    }
-    this.getByCodes()
-  },
-  mounted(){
-    this.getTime()
-  },
-  methods:{
-    // toRecord() {
-    //   uni.navigateTo({
-    //     url:'/pages/subPackages/reportRepair/repairRecord'
-    //   })
-    // },
-    async getByCodes() {
-      let data = await getByCodes(JSON.stringify(this.dc_key));
-      this.dic_SelectList = this.$common.handleDicList(data);
-      this.checkList = this.dic_SelectList.QUICK_SELECTION
-      this.getById()
-    },
-    getById(){
-      const _this = this
-      getRepairDispatchById(this.id).then(res=>{
-        if (res.data) {
-          const det = _this.getItemJson(res.data)
-          this.detail = det
-          console.log('this.detail',this.detail)
-          this.explainAnnexList = det.fileUrlList
-          this.processedAnnexList = det.handleUrlList
-          this.detailStatus = det.status
-          this.params = {
-            id: det.id,
-            evaluateNum: det.evaluateNum,
-            score: det.score
-          }
-          this.evaluateVal = ((det.score == null ? 0 : det.score) / (det.evaluateNum == null ? 1 : det.evaluateNum))
-        }
-      })
-    },
-    getTime(){
-      let timestamp = new Date().getTime();
-      let dateStr = new Date().toLocaleDateString();
-
-      let date = new Date();
-      let year = date.getFullYear();
-      let month = date.getMonth() + 1;
-      let day = date.getDate();
-      let hours = date.getHours();
-      let minutes = date.getMinutes();
-      let fullDateStr = `${year}-${month}-${day} ${hours}:${minutes}`;
-      console.log(fullDateStr);
-      this.timeNow = fullDateStr
-    },
-
-    getItemJson: function(item) {
-      item.releaseTime = this.$common.transDate(item.releaseTime)
-      item.createdAt = this.$common.transDate(item.createdAt)
-
-      let transformedObject = this.dic_SelectList.QUICK_SELECTION.reduce((acc, obj) => {
-        acc[obj.value] = obj.label;
-        return acc;
-      }, {});
-
-      item.serviceType = transformedObject[item.serviceType]
-      if (item.userId) {
-        const user = item.userId.split('-')
-        item.userPhone = user[1] + '-' + user[2]
-        item.phone = user[2]
-      }
-      if (item.handleUserId) {
-        const test = item.handleUserId.split('-')
-        item.handleUserId = test[1] + '-' + test[2]
-        item.hanleUserPhone = test[2]
-      }
-      item.handleTime = this.$common.transDate(item.handleTime)
-      switch (item.status) {
-        case 'unAcceptance':
-          this.stepActive = 0
-          break
-        case 'acceptance':
-          this.stepActive = 1
-          break
-        case 'evaluated':
-          this.stepActive = 3
-          break
-        case 'processed':
-          this.stepActive = 2
-          break
-      }
-      if (item.fileUrl){
-        const fileUrl = item.fileUrl.split(',')
-        const newFile = []
-        fileUrl.forEach((e=>{
-              newFile.push({
-                imgUrl: "/FileController/download/" + e,
-                id: e,
-                url: this.$constant.BASE_URI +
-                    "/FileController/download/" +
-                    e,
-                isImage: true,
-              });
-            })
-        )
-        item.fileUrl = newFile
-      }
-
-      const handleUrls = this.$common.castEval(item.handleUrl)
-      const handleUrl = []
-      if (handleUrls !== null && handleUrls.length > 0) {
-        handleUrls.forEach(item => {
-          if (item.url) {
-            const ul = {
-              type: 'image',
-              url: item.url.replace('/server', '/smartParkH5Server')
-            }
-            handleUrl.push(ul)
-          }
-        })
-      }
-      item.handleUrlList = handleUrl
-      console.log('item',item)
-      return item
-    },
-    closePage() {
-      uni.navigateTo({
-        url:'/pages/subPackages/todo/repairAcceptance'
-      })
-    },
-    deleteRYXXZP(event) {
-      this.fileList.splice(event.detail.index, 1);
-      this.$forceUpdate();
-    },
-    uploadRYXXZP(event) {
-      console.log(event)
-      let that = this;
-      const { file } = event.detail;
-      uni.uploadFile({
-        url: that.$constant.BASE_URI + "/wx/fileController/upload",
-        filePath: file.url,
-        name: "file",
-        formData: { user: "test" },
-        success(res) {
-          // 上传完成需要更新 fileList
-          let data = JSON.parse(res.data);
-          that.fileList.push({
-            imgUrl: "/FileController/download/" + data.data[0],
-            id: data.data[0],
-            url:
-                that.$constant.BASE_URI +
-                "/FileController/download/" +
-                data.data[0],
-            isImage: true,
-          });
-        },
-        fail(res) {},
-      });
-    },
-  }
-}
-</script>
-<style lang="scss">
-.addRepair{
-  .reportBody{
-    margin-top: 24rpx;
-    padding: 38rpx 36rpx;
-    background: white;
-    //height: 1416rpx;
-    box-sizing: border-box;
-    .record {
-      display: flex;
-      align-items: center;
-      justify-content: flex-end;
-      color: #0365F9;
-      font-size: 32rpx;
-      .recordImg{
-        width: 36rpx;
-        height: 36rpx;
-        padding: 5rpx 0 0 10rpx;
-      }
-    }
-    .detailUl{
-      margin-top: 20rpx;
-      .liName{
-        font-size: 32rpx;
-        color: rgba(51, 51, 51, 1);
-        white-space: nowrap;
-      }
-      .detailLi{
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-        padding: 32rpx 0;
-        border-bottom: 2rpx solid #E6E6E6;
-        .liInfo{
-          display: inline-block;
-          text-align: right;
-          max-width: 428rpx;
-          color: rgba(102, 102, 102, 1);
-          font-size: 32rpx;
-          line-height: 38rpx;
-          display: flex;
-          align-items: center;
-          .phoneIcon{
-            width: 64rpx;
-            height: 64rpx;
-            margin-left: 24rpx;
-          }
-        }
-        .van-radio-group{
-          display: flex;
-          align-items: center;
-          gap: 0 32rpx;
-        }
-      }
-      .detailLi2{
-        display: flex;
-        flex-direction: column;
-        padding: 32rpx 0;
-        border-bottom: 2rpx solid #E6E6E6;
-        .detailLi2BoxTop{
-          display: flex;
-          flex-wrap: wrap;
-          justify-content: space-between;
-          margin: 12rpx 0;
-          .checkItem{
-            width: 160rpx;
-            height: 64rpx;
-            font-size: 28rpx;
-            color: #666666;
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            background: #F5F7FA;
-            border-radius: 8rpx;
-            margin: 12rpx 0;
-          }
-          .checked{
-            background: #0365F9;
-            color: white;
-          }
-        }
-      }
-    }
-  }
-  .van-cell {
-    background: #F5F7FA !important;
-    border-radius: 8rpx;
-    font-size: 28rpx;
-  }
-  .buttonBox{
-    display: flex;
-    justify-content: center;
-    .btn{
-      width: 240rpx;
-      height: 80rpx;
-      display: flex;
-      border-radius: 8rpx;
-      align-items: center;
-      justify-content: center;
-      margin: 48rpx 16rpx 150rpx 16rpx;
-      color: white;
-      letter-spacing: 2rpx;
-      text-indent: 2rpx;
-    }
-    .btn2{
-      width: 654rpx;
-      height: 96rpx;
-      display: flex;
-      border-radius: 8rpx;
-      align-items: center;
-      justify-content: center;
-      margin: 48rpx 48rpx 150rpx 48rpx;
-      color: white;
-      letter-spacing: 2rpx;
-      text-indent: 2rpx;
-    }
-    .zcBtn{
-      background: rgba(0, 0, 0, 0.05);
-      color: rgba(3, 101, 249, 1);
-      &::after{
-        border: none;
-      }
-    }
-    .tjBtn{
-      background: #0365F9;
-    }
-  }
-  .handleBox{
-    background: white;
-    padding: 32rpx;
-    margin: 24rpx 0;
-    .imageBox{
-      display: flex;
-      justify-content: space-evenly;
-      align-items: center;
-      margin-top: 48rpx;
-      .handleImg{
-        width: 72rpx;
-        height: 72rpx;
-        margin-bottom: 8rpx;
-      }
-      .handleArrow{
-        width: 64rpx;
-        height: 20rpx;
-      }
-    }
-    .imageItem{
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-      color: rgba(34, 34, 34, 1);
-      font-size: 28rpx;
-    }
-  }
-  .handleTitle{
-    color: rgba(34, 34, 34, 1);
-    font-size: 36rpx;
-    font-weight: 600;
-  }
-  .evaluationBox {
-    width: 686rpx;
-    height: 100rpx;
-    padding: 0 24rpx;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    background: #f5f7fa;
-    border-radius: 8rpx;
-    box-sizing: border-box;
-    margin-top: 24rpx;
-    .evaName{
-      font-size: 32rpx;
-      color: rgba(51, 51, 51, 1);
-    }
-  }
-}
-</style>

pages/subPackages/reportRepair/index.vue

@@ -25,9 +25,7 @@
           </span>
           <div class="detailLi2Box">
             <div class="detailLi2BoxTop">
-              <div class="checkItem" :class="{
-                  checked: quickSleced.value && item.value === quickSleced.value,
-                }" v-for="item in checkList" @click="clickCheck(item)">{{item.label}}</div>
+              <div class="checkItem" :class="form.serviceType===item.value?'checked':''" v-for="item in checkList" @click="clickCheck(item)">{{item.label}}</div>
             </div>
             <van-field
                 :value="form.description"
@@ -79,13 +77,13 @@
       </ul>
     </div>
     <div class="buttonBox">
-      <button class="btn zcBtn">暂存</button>
-      <button class="btn tjBtn" @tap="submit">提交</button>
+      <button class="btn zcBtn" @tap="submit('unSubmit')">暂存</button>
+      <button class="btn tjBtn" @tap="submit('unAcceptance')">提交</button>
     </div>
   </div>
 </template>
 <script>
-import { repairAdd,getUserLocalStorageInfo,getByCodes } from "@/js_sdk/http";
+import { repairAdd,getUserLocalStorageInfo,getByCodes, editRepair} from "@/js_sdk/http";
 import dayjs from "dayjs";
 export default {
   data(){
@@ -104,7 +102,8 @@ export default {
         position: '1',
         userId:getUserLocalStorageInfo().userId + '-' + getUserLocalStorageInfo().username + '-' + getUserLocalStorageInfo().phone,
         fileUrl: '',
-        status: 'unAcceptance'
+        status: '',
+        userType: getUserLocalStorageInfo().userType
       },
       submitUser:getUserLocalStorageInfo().username + '-' + getUserLocalStorageInfo().phone,
       checkList:[
@@ -125,6 +124,12 @@ export default {
   created(){
     this.getByCodes()
   },
+  onLoad(options){
+    const item = JSON.parse(options.item)
+    this.id = item.id
+    this.form = item
+    this.fileList = JSON.parse(item.fileUrl)
+  },
   methods:{
     showClick(e){
       console.log(e)
@@ -151,16 +156,12 @@ export default {
       })
     },
     clickCheck(item){
-      if (this.quickSleced.value && this.quickSleced.value === item.value) {
-        this.quickSleced = {}
-      } else {
-        this.quickSleced = item
-        // this.form.description = item.lable
-        this.$set(this.form, 'description', item.label)
-      }
+      // console.log(item)
+      this.form.serviceType = item.value
+      this.form.description = item.label
     },
-    submit(){
-      if (this.quickSleced.value == null || this.quickSleced.value === '') {
+    submit(e){
+      if (!this.form.serviceType || !this.form.description) {
         uni.showToast({
           title: '请选择服务类型',
           icon: 'none',
@@ -184,19 +185,53 @@ export default {
         picArr.push(item)
       })
       this.form.fileUrl = JSON.stringify(picArr)
-      this.form.serviceType = this.quickSleced.value
+      // this.form.serviceType = this.quickSleced.value
       this.form.createdBy = this.getUserLocalStorageInfo.userId
-      repairAdd(this.form).then((res) => {
-        uni.showToast({
-          title: '填报成功',
-          icon: 'success',
-          mask: true,
-          duration: 1000
-        });
-        uni.navigateTo({
-          url:'/pages/subPackages/reportRepair/repairRecord'
+      this.form.status = e
+      if (this.id){
+        this.form.id = this.id
+        editRepair(this.form).then((res) => {
+          if (res.code ===200){
+            uni.showToast({
+              title: '填报成功',
+              icon: 'success',
+              mask: true,
+              duration: 1000
+            });
+            uni.redirectTo({
+              url:'/pages/subPackages/reportRepair/repairRecord'
+            })
+          }else {
+            uni.showToast({
+              title: res.msg,
+              icon: 'success',
+              mask: true,
+              duration: 1000
+            });
+          }
         })
-      })
+      }else{
+        repairAdd(this.form).then((res) => {
+          if (res.code ===200){
+            uni.showToast({
+              title: '填报成功',
+              icon: 'success',
+              mask: true,
+              duration: 1000
+            });
+            uni.redirectTo({
+              url:'/pages/subPackages/reportRepair/repairRecord'
+            })
+          }else {
+            uni.showToast({
+              title: res.msg,
+              icon: 'success',
+              mask: true,
+              duration: 1000
+            });
+          }
+        })
+      }
     },
     deleteRYXXZP(event) {
       this.fileList.splice(event.detail.index, 1);

pages/subPackages/reportRepair/repairDetail.vue

@@ -113,7 +113,7 @@
         </div>
         <img src="https://www.idea-co-sf.com/gardenProduct/image/arrow.png" class="handleArrow">
         <div class="imageItem">
-          <img src="https://www.idea-co-sf.com/gardenProduct/image/evaluate.svg" class="handleImg">
+          <img :src="detail.evaluateStatus===2?'https://www.idea-co-sf.com/gardenProduct/image/unEvaluate.svg':'https://www.idea-co-sf.com/gardenProduct/image/evaluate.svg'" class="handleImg">
           <span>评价</span>
         </div>
       </div>
@@ -126,7 +126,7 @@
             派单给
           </span>
           <span class="liInfo">
-            李开心
+            {{detail.handleUserName}}
           </span>
         </li>
         <li class="detailLi2">
@@ -134,13 +134,12 @@
             备注
           </span>
           <van-field
-              :value="form.contant"
+              :value="detail.remark"
               autosize
               type="textarea"
-              placeholder="请输入文字进行报事报修描述"
+              placeholder=" "
               class="myField2"
-              maxlength="800"
-              show-word-limit
+              readonly
           />
         </li>
         <li class="detailLi">
@@ -148,7 +147,7 @@
             派单人
           </span>
           <span class="liInfo">
-            李欣怡
+            {{detail.dispatchUserName}}
           </span>
         </li>
         <li class="detailLi" style="border-bottom: none">
@@ -156,7 +155,7 @@
             派单时间
           </span>
           <span class="liInfo">
-            2024-05-18  15：30
+            {{detail.dispatchTime}}
           </span>
         </li>
       </ul>
@@ -169,14 +168,13 @@
             处理后拍照
             <span style="color: #B3B3B3;font-size: 28rpx">（支持图片上传限20M内，最多6张）</span>
           </span>
-          <div class="detailLi2Box" style="margin: 24rpx 0 0 0">
-            <van-uploader
-                :max-count="6"
-                @delete="deleteRYXXZP"
-                :file-list="fileList"
-                @after-read="uploadRYXXZP"
-                :show-upload="true"
-            />
+          <div style="display: flex;flex-wrap: wrap;gap: 24rpx">
+            <div class="detailLi2Box annex-item"
+                 style="margin: 24rpx 0 0 0;"
+                 v-for="(item, index) in handleUrlList"
+                 :key="index">
+              <img :src="item.url" alt="" class="anImg" @tap="clickImg(item.url)"/>
+            </div>
           </div>
         </li>
         <li class="detailLi">
@@ -184,7 +182,7 @@
             处理人
           </span>
           <span class="liInfo">
-            李开心
+            {{detail.handleUserName}}
           </span>
         </li>
         <li class="detailLi" style="border-bottom: none">
@@ -192,7 +190,7 @@
             处理时间
           </span>
           <span class="liInfo">
-            2024-05-18  15：30
+            {{detail.handleTime}}
           </span>
         </li>
       </ul>
@@ -201,23 +199,25 @@
       <div class="evaluationBox" >
         <span class="evaName">您对本次服务的评价</span>
         <van-rate
-            :value="value"
+            :value="detail.evaluateNum"
             :size="24"
             gutter="32rpx"
             void-color="#eee"
-            bind:change="onChange"
+            @change="changeStar"
             color="#fd9a63"
+            :disabled="detail.evaluateStatus===2"
+            disabled-color="#fd9a63"
         />
       </div>
     </div>
     <div class="buttonBox">
-      <button class="zcBtn" @tap="closePage" :class="stepActive==='已处理'?'btn2':'btn '">关闭</button>
-      <button class="btn tjBtn" v-if="stepActive==='已处理'">提交</button>
+      <button class="zcBtn" @tap="closePage" :class="stepActive==='已处理'&&detail.evaluateStatus===1?'btn2':'btn '">关闭</button>
+      <button class="btn tjBtn" v-if="stepActive==='已处理'&&detail.evaluateStatus===1" @tap="submit">提交</button>
     </div>
   </div>
 </template>
 <script>
-import {getRepairDispatchById,getUserLocalStorageInfo,getByCodes } from "@/js_sdk/http";
+import {getRepairDispatchById,getUserLocalStorageInfo,getByCodes,editRepair } from "@/js_sdk/http";
 export default {
   data(){
     return{
@@ -243,14 +243,19 @@ export default {
       id:'',
       dic_SelectList:[],
       explainAnnexList:[],
-      processedAnnexList:[],
-      stepActive:'0'
+      stepActive:'0',
+      pingParams: {
+        id: '',
+        evaluateNum: '5',
+        score: '',
+        evaluateStatus:2
+      },
+      handleUrlList:[]
     }
   },
   onLoad(options) {
     const item = JSON.parse(options.item)
     this.id = item.id
-    console.log('11111',this.id)
     this.optionsType = item.type
     if (options.type==='待处理'){
       uni.setNavigationBarTitle({
@@ -271,6 +276,26 @@ export default {
     this.getTime()
   },
   methods:{
+    changeStar(e){
+      console.log(e)
+      this.pingParams.evaluateNum = e.detail
+    },
+    submit(){
+      this.pingParams.id = this.id
+      this.pingParams.evaluateStatus = '2'
+      console.log(this.pingParams)
+       editRepair(this.pingParams).then((res) => {
+         if (res.code == 200) {
+           uni.showToast({
+             title: '提交成功',
+             icon: 'none',
+             mask: true,
+             duration: 1000
+           });
+           uni.navigateBack()
+         }
+        })
+    },
     // toRecord() {
     //   uni.navigateTo({
     //     url:'/pages/subPackages/reportRepair/repairRecord'
@@ -303,7 +328,7 @@ export default {
           this.detail = det
           console.log('this.detail',this.detail)
           this.explainAnnexList = det.fileUrlList
-          this.processedAnnexList = det.handleUrlList
+          this.handleUrlList = det.handleUrlList
           this.detailStatus = det.status
           this.params = {
             id: det.id,
@@ -357,10 +382,10 @@ export default {
         case 'acceptance':
           this.stepActive = '已受理'
           break
-        case 'evaluated':
+        case 'processed':
           this.stepActive = '已处理'
           break
-        case 'processed':
+        case 'unSubmit':
           this.stepActive = '暂存'
           break
       }
@@ -380,7 +405,22 @@ export default {
         console.log('newFile',newFile)
         item.fileUrlList = newFile
       }
-
+      if (item.handleUrl ){
+        // console.log('item.fileUrl' ,JSON.parse(item.fileUrl))
+        const fileUrl = JSON.parse(item.handleUrl)
+        const newFile = []
+        fileUrl.forEach((e=>{
+              newFile.push({
+                imgUrl: e.imgUrl,
+                id: e.id,
+                url: e.url,
+                type: e.type,
+              });
+            })
+        )
+        // console.log('newFile',newFile)
+        item.handleUrlList = newFile
+      }
       const handleUrls = JSON.parse(item.handleUrl)
       const handleUrl = []
       if (handleUrls !== null && handleUrls.length > 0) {
@@ -542,8 +582,8 @@ export default {
       text-indent: 2rpx;
     }
     .btn2{
-      width: 654rpx;
-      height: 96rpx;
+      width: 240rpx;
+      height: 80rpx;
       display: flex;
       border-radius: 8rpx;
       align-items: center;
@@ -562,6 +602,7 @@ export default {
     }
     .tjBtn{
       background: #0365F9;
+      width: 654rpx;
     }
   }
   .handleBox{
@@ -608,7 +649,7 @@ export default {
     box-sizing: border-box;
     margin-top: 24rpx;
     .evaName{
-      font-size: 32rpx;
+      font-size: 28rpx;
       color: rgba(51, 51, 51, 1);
     }
   }

pages/subPackages/reportRepair/repairRecord.vue

@@ -4,7 +4,7 @@
       <li class="customLi" v-for="item in recordList" @tap="toDetail(item)">
           <div class="firstRow">
             <span class="rowTitle">{{ item.description }}</span>
-            <span class="rowTags" :class="item.type==='已处理'?'yclTags':item.type==='暂存'?'zcTags':''">{{item.statusName}}</span>
+            <span class="rowTags" :class="getStatus(item)==='已评价'?'yclTags':getStatus(item)==='暂存'?'zcTags':getStatus(item)==='待评价'?'dpjTags':''">{{getStatus(item)}}</span>
           </div>
           <div class="secondRow">
             <img src="https://www.idea-co-sf.com/gardenProduct/image/componeyIcon.png" class="componeyIcon">
@@ -33,20 +33,30 @@ export default {
         params: {
           pageNum: 1,
           pageSize: 10,
-          createdBy: getUserLocalStorageInfo().userId
+          userId: getUserLocalStorageInfo().userId
         },
       }
     },
-    created(){
-        this.getByCodes()
+    onShow(){
+      this.getByCodes()
     },
     methods:{
+      getStatus(item){
+        if (item.userType === '1') {
+          if (item.statusName === '已处理') {
+            return item.evaluateStatus === 1 ? '待评价' : '已评价';
+          }
+        }
+        // 如果不满足上述条件，则直接返回 item.statusName
+        return item.statusName;
+      },
       async getByCodes() {
         let data = await getByCodes(JSON.stringify(this.dc_key));
         this.dic_SelectList = this.$common.handleDicList(data);
         this.getList()
       },
       getList(){
+        this.recordList = []
         const _this = this
         repairList(this.params).then(res=>{
           // console.log(res.code)
@@ -67,29 +77,36 @@ export default {
         })
       },
       toDetail(item){
-        uni.navigateTo({
-          url:'/pages/subPackages/reportRepair/repairDetail?item=' + JSON.stringify(item)
-        })
+        // console.log('item',item)
+        if (item.statusName==="暂存"){
+          uni.redirectTo({
+            url:'/pages/subPackages/reportRepair/index?item=' + JSON.stringify(item)
+          })
+        }else{
+          uni.navigateTo({
+            url:'/pages/subPackages/reportRepair/repairDetail?item=' + JSON.stringify(item)
+          })
+        }
+
       },
       getItemJson(item) {
-        item.companyId = '固定公司名'
         console.log('item',item)
-        if (item.fileUrl){
-          const fileUrl = item.fileUrl.split(',')
-          const newFile = []
-          fileUrl.forEach((e=>{
-              newFile.push({
-                imgUrl: "/FileController/download/" + e,
-                id: e,
-                url: this.$constant.BASE_URI +
-                    "/FileController/download/" +
-                    e,
-                isImage: true,
-              });
-            })
-          )
-          item.fileUrl = newFile
-        }
+        // if (item.fileUrl){
+        //   const fileUrl = item.fileUrl.split(',')
+        //   const newFile = []
+        //   fileUrl.forEach((e=>{
+        //       newFile.push({
+        //         imgUrl: "/FileController/download/" + e,
+        //         id: e,
+        //         url: this.$constant.BASE_URI +
+        //             "/FileController/download/" +
+        //             e,
+        //         isImage: true,
+        //       });
+        //     })
+        //   )
+        //   item.fileUrl = newFile
+        // }
 
         // fileUrls.forEach((item) => {
         //   item = item.replace('/server', '/smartParkH5Server')
@@ -153,6 +170,10 @@ export default {
           color: rgba(255, 107, 24, 1);
           background: rgba(254, 134, 67, 0.20);
         }
+        .dpjTags{
+          color: rgb(151, 24, 255);
+          background: rgba(151, 24, 255, 0.20);
+        }
       }
       .secondRow{
         display: flex;

pages/subPackages/todo/addRepair.vue

@@ -4,7 +4,7 @@
       <ul class="detailUl">
         <li class="detailLi">
           <span class="liName">当前企业</span>
-          <input class="liInfo" style="text-align: right" v-model="form.companyName"/>
+          <input class="liInfo" style="text-align: right" v-model="form.companyName" placeholder="请输入"/>
         </li>
         <li class="detailLi">
           <span class="liName">
@@ -100,7 +100,8 @@ export default {
         position: '1',
         userId:getUserLocalStorageInfo().userId + '-' + getUserLocalStorageInfo().username + '-' + getUserLocalStorageInfo().phone,
         fileUrl: '',
-        status: 'unAcceptance'
+        status: 'unAcceptance',
+        userType: getUserLocalStorageInfo().userType
       },
       submitUser:getUserLocalStorageInfo().username + '-' + getUserLocalStorageInfo().phone,
       checkList:[

pages/subPackages/todo/dispatch.vue

@@ -114,7 +114,7 @@
         </div>
         <img src="https://www.idea-co-sf.com/gardenProduct/image/arrow.png" class="handleArrow">
         <div class="imageItem">
-          <img src="https://www.idea-co-sf.com/gardenProduct/image/evaluate.svg" class="handleImg">
+          <img :src="detail.evaluateStatus===2?'https://www.idea-co-sf.com/gardenProduct/image/unEvaluate.svg':'https://www.idea-co-sf.com/gardenProduct/image/evaluate.svg'" class="handleImg">
           <span>评价</span>
         </div>
       </div>
@@ -212,7 +212,7 @@
               :value="detail.remark"
               autosize
               type="textarea"
-              placeholder=""
+              placeholder=" "
               class="myField2"
               readonly
           />
@@ -270,16 +270,17 @@
         </li>
       </ul>
     </div>
-    <div class="reportBody" v-if="stepActive==='已处理'">
+    <div class="reportBody" v-if="detail.evaluateStatus===2">
       <div class="evaluationBox" >
         <span class="evaName">您对本次服务的评价</span>
         <van-rate
-            :value="value"
+            :value="detail.evaluateNum"
             :size="24"
             gutter="32rpx"
             void-color="#eee"
-            bind:change="onChange"
             color="#fd9a63"
+            disabled-color="#fd9a63"
+            disabled
         />
       </div>
     </div>
@@ -318,7 +319,6 @@ export default {
       id:'',
       dic_SelectList:[],
       explainAnnexList:[],
-      processedAnnexList:[],
       stepActive:'0',
       dispatchPerson:[],
       params: {
@@ -379,7 +379,7 @@ export default {
           return
         }
         this.params.id = this.id
-        console.log('this.params',this.params)
+        // console.log('this.params',this.params)
         editRepair(this.params).then((res) => {
           if (res.code === 200) {
             uni.showToast({
@@ -408,9 +408,16 @@ export default {
           });
           return
         }
+        if (this.stepActive==='待受理'){
+          this.handleParams.dispatchUserId = this.getUserLocalStorageInfo.userId,
+          this.handleParams.dispatchUserName = this.getUserLocalStorageInfo.username
+          this.handleParams.dispatchTime = this.$common.transServDate(new Date())
+          this.handleParams.remark = null
+
+        }
         this.handleParams.id = this.id
         this.handleParams.handleUrl = JSON.stringify(this.fileList)
-        this.handleParams.handleTime= this.getTime()
+        this.handleParams.handleTime= this.$common.transServDate(new Date())
         // console.log('this.handleParams',this.handleParams)
         editRepair(this.handleParams).then((res) => {
           if (res.code === 200) {
@@ -480,7 +487,6 @@ export default {
           // console.log('this.detail',this.detail)
           this.explainAnnexList = det.fileUrlList
           this.handleUrlList = det.handleUrlList
-          this.processedAnnexList = det.handleUrlList
           this.detailStatus = det.status
           // this.params = {
           //   id: det.id,
@@ -802,7 +808,7 @@ export default {
     box-sizing: border-box;
     margin-top: 24rpx;
     .evaName{
-      font-size: 32rpx;
+      font-size: 28rpx;
       color: rgba(51, 51, 51, 1);
     }
   }

pages/subPackages/todo/repairAcceptance.vue

@@ -5,7 +5,7 @@
         <div class="repairItem" v-for="item in recordList" @click="toDetail(item)">
           <div class="repairItemTitleRow">
             <span class="titleName">{{item.description}}</span>
-            <span class="titleTag" :class="item.statusName==='已受理'?'titleTag2':item.type==='已处理'?'titleTag3':'titleTag'">{{item.statusName}}</span>
+            <span class="rowTags" :class="getStatus(item)==='已评价'?'yclTags':getStatus(item)==='暂存'?'zcTags':getStatus(item)==='待评价'?'dpjTags':''">{{getStatus(item)}}</span>
           </div>
           <div class="companyBox">
             <img src="https://www.idea-co-sf.com/gardenProduct/image/gs.svg" class="gsIcon">
@@ -18,7 +18,7 @@
 </template>
 
 <script>
-import { repairList,getUserLocalStorageInfo,getByCodes } from "@/js_sdk/http";
+import { repairHandleList,getUserLocalStorageInfo,getByCodes } from "@/js_sdk/http";
 export default {
   name: "repairAcceptance",
   data(){
@@ -33,7 +33,7 @@ export default {
       params: {
         pageNum: 1,
         pageSize: 10,
-        dispatchUserId: getUserLocalStorageInfo().userId,
+        // dispatchUserId: getUserLocalStorageInfo().userId,
         handleUserId: getUserLocalStorageInfo().userId,
       },
       checkList:[]
@@ -45,6 +45,15 @@ export default {
   mounted(){
   },
   methods:{
+    getStatus(item){
+      if (item.userType === '1') {
+        if (item.statusName === '已处理') {
+          return item.evaluateStatus === 1 ? '待评价' : '已评价';
+        }
+      }
+      // 如果不满足上述条件，则直接返回 item.statusName
+      return item.statusName;
+    },
     onPullDownRefresh() {
       this.getByCodes()
       setTimeout(function () {
@@ -60,7 +69,7 @@ export default {
     getList(){
       this.recordList = []
       const _this = this
-      repairList(this.params).then((res) => {
+      repairHandleList(this.params).then((res) => {
         if (res.code=='409'){
           uni.clearStorageSync();
           uni.reLaunch({
@@ -131,39 +140,29 @@ export default {
               font-size: 32rpx;
               font-weight: 600;
             }
-            .titleTag{
-              width: 112rpx;
-              height: 48rpx;
+            .rowTags{
               display: flex;
               align-items: center;
               justify-content: center;
-              border-radius: 4rpx;
-              color: rgba(242, 25, 18, 1);
+              color: #0365F9;
               font-size: 28rpx;
-              background: rgba(242, 25, 18, 0.20);
-            }
-            .titleTag2{
               width: 112rpx;
               height: 48rpx;
-              display: flex;
-              align-items: center;
-              justify-content: center;
+              background: rgba(3, 101, 249, 0.20);
               border-radius: 4rpx;
-              color: rgba(255, 107, 24, 1);
-              font-size: 28rpx;
-              background: rgba(255, 107, 24, 0.20);
             }
-            .titleTag3{
-              width: 112rpx;
-              height: 48rpx;
-              display: flex;
-              align-items: center;
-              justify-content: center;
-              border-radius: 4rpx;
+            .yclTags{
               color: rgba(34, 181, 101, 1);
-              font-size: 28rpx;
               background: rgba(34, 181, 101, 0.20);
             }
+            .zcTags{
+              color: rgba(255, 107, 24, 1);
+              background: rgba(254, 134, 67, 0.20);
+            }
+            .dpjTags{
+              color: rgb(151, 24, 255);
+              background: rgba(151, 24, 255, 0.20);
+            }
           }
           .companyBox{
             display: flex;

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

@@ -1,8 +1,9 @@
 {
   "pages": [
+    "pages/index/index",
     "pages/login/login",
+    "pages/index/mapLocation",
     "pages/login2/login",
-    "pages/index/index",
     "pages/mine/mine"
   ],
   "subPackages": [
@@ -83,7 +84,8 @@
         "housingResources/addPredetermine",
         "aboutThePark/index",
         "todo/resourceReview",
-        "minePages/registrationDetails"
+        "minePages/registrationDetails",
+        "economicDevelopmentReport/detail"
       ],
       "network": "all"
     }
@@ -123,7 +125,8 @@
     }
   },
   "requiredPrivateInfos": [
-    "getLocation"
+    "getLocation",
+    "chooseLocation"
   ],
   "usingComponents": {
     "van-dropdown-menu": "/wxcomponents/weapp/dist/dropdown-menu/index",

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

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

unpackage/dist/build/mp-weixin/pages/subPackages/components/selectGenzongDep/tkitree.json

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

unpackage/dist/build/mp-weixin/pages/subPackages/components/selectXiangguanDep/tkitree.json

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

unpackage/dist/build/mp-weixin/pages/subPackages/components/select_dengjiren/tkitree.json

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

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

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

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

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

unpackage/dist/build/mp-weixin/project.config.json

@@ -18,7 +18,7 @@
     }
   },
   "compileType": "miniprogram",
-  "libVersion": "3.5.0",
+  "libVersion": "3.5.1",
   "appid": "wx15404cced62d7b37",
   "projectname": "产品化管理端",
   "condition": {},

unpackage/dist/build/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.json

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

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
+  }
 }