fix:党建引领、五星党支部、五星党员、社区风采、注册跳转

src/config/env.js

@@ -2,7 +2,7 @@
  * @name 小程序环境
  * @description 多环境配置
  */
-const envName = 'development';
+const envName = 'production';
 const envs = [{
   envName: 'production',
   appID: 'wx736395182f05a1b7',

src/packages/people/pages/area-detail/area-detail.vue

@@ -1,5 +1,5 @@
 <template>
-  <view style="height: 100%">
+  <view>
     <custom-nav-bar :left-text="options.name" left-arrow />
     <image class="custom-swiper-img"
       :src="agencyContentGetObj !== null ? agencyContentGetObj.image : '/static/packages/people/images/icon10.png'">
@@ -41,9 +41,7 @@
      */
     ,
     onLoad(options) {
-      this.setData({
-        options
-      });
+      this.options = options
       this.getConsultType();
     },
     methods: {
@@ -53,9 +51,7 @@
           const {
             item
           } = event.currentTarget.dataset;
-          this.setData({
-            ruralActive: item.value
-          });
+          this.ruralActive =item.value
         }
         this.agencyContentGetApi();
       },
@@ -69,10 +65,8 @@
           const {
             value
           } = res.data.list[0];
-          this.setData({
-            ruralTabs: res.data.list,
-            ruralActive: value
-          });
+          this.ruralTabs = res.data.list
+          this.ruralActive = value
         }
         this.agencyContentGetApi();
       },
@@ -99,9 +93,7 @@
               '</header': '</div'
             } [$1];
           });
-          this.setData({
-            agencyContentGetObj: res.data || null
-          });
+          this.agencyContentGetObj = res.data || null;
         }
       }
     }

src/packages/people/pages/area/area.vue

@@ -1,5 +1,5 @@
 <template>
-  <view style="height: 100%">
+  <view>
     <custom-nav-bar :left-text="options.name" left-arrow />
     <image class="custom-swiper-img" mode="aspectFill"
       :src="InfoObj.image ? InfoObj.image : '/static/packages/people/images/icon10.png'"></image>
@@ -57,7 +57,7 @@
 
       <view class="party-list flex flex-col" v-if="ruralActive">
         <view class="section-item flex flex-between" :data-item="item" @tap="headleDetails"
-          v-for="(item, index) in partyEventPageList" :key="index">
+          v-for="(item, index) in partyEventPageList" :key="index" >
           <image class="section-item-right" :src="item.image" mode="aspectFill"></image>
 
           <view class="section-item-left flex1 flex flex-col">
@@ -67,297 +67,335 @@
         </view>
       </view>
       <view class="rich2" v-else>
-        <rich-text :nodes="partyEventPageList[0].content"></rich-text>
+        <rich-text v-if="partyEventPageList.length !== 0" :nodes="partyEventPageList[0].content"></rich-text>
       </view>
     </view>
   </view>
 </template>
 <!-- <script module="util" lang="wxs" src="@/wxs/util.wxs"></script> -->
 <script>
-  // const app = getApp();
-  // const { peopleApi } = app.globalData.api;
-  import * as peopleApi from '@/api/peopleApi';
-  export default {
-    components: {},
-    data() {
-      return {
-        options: {
-          name: '',
-          type: ''
-        },
-
-        InfoObj: {
-          image: false,
-          content: ''
-        },
-
-        // 富文本渲染
-        ruralActive: 0,
-
-        // tabs下标
-        ruralTabs: [],
+// const app = getApp();
+// const { peopleApi } = app.globalData.api;
+import * as peopleApi from '@/api/peopleApi';
+export default {
+  components: {},
+  data() {
+    return {
+      options: {
+        name: '',
+        type: ''
+      },
 
-        deptList: [],
-        villageAffairsPageList: [],
-        partyEventPageList: [],
+      InfoObj: {
+        image: false,
         content: ''
+      },
+
+      // 富文本渲染
+      ruralActive: 0,
+
+      // tabs下标
+      ruralTabs: [],
+
+      deptList: [],
+      villageAffairsPageList: [],
+      partyEventPageList: [],
+      content: ''
+    };
+  },
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+    console.log('options', options);
+    this.options = options
+    if (options.type === '1' || options.type === '2') {
+      const typeTbas = {
+        1: [{
+          name: '乡镇农业产业'
+        },
+        {
+          name: '村列表'
+        }
+        ],
+        2: [{
+          name: '街道简介'
+        },
+        {
+          name: '社区列表'
+        }
+        ]
       };
-    },
-    /**
-     * 生命周期函数--监听页面加载
-     */
-    onLoad(options) {
-      console.log('options', options);
-      this.setData({
-        options
-      });
-      if (options.type === '1' || options.type === '2') {
-        const typeTbas = {
-          1: [{
-              name: '乡镇农业产业'
-            },
-            {
-              name: '村列表'
-            }
-          ],
-          2: [{
-              name: '街道简介'
-            },
-            {
-              name: '社区列表'
-            }
-          ]
-        };
-        this.setData({
-          ruralTabs: typeTbas[Number(options.type)] || []
-        });
-        this.tabsSwitch();
-      }
-      if (options.type === '3') {
-        this.villageAffairsPageApi();
-        this.getVillageAffairsGetApi();
+      this.ruralTabs = typeTbas[Number(options.type)] || []
+      this.tabsSwitch();
+    }
+    if (options.type === '3') {
+      this.villageAffairsPageApi();
+      this.getVillageAffairsGetApi();
+    }
+    if (options.type === '12101') {
+      this.ruralTabs = [{
+        name: '优秀事迹'
+      },
+      {
+        name: '党建活动'
       }
-      if (options.type === '12101') {
-        this.setData({
-          ruralTabs: [{
-              name: '优秀事迹'
-            },
-            {
-              name: '党建活动'
-            }
-          ]
-        });
-        this.partyBranchGetApi();
-        this.tabsSwitch();
+      ]
+      this.partyBranchGetApi();
+      this.tabsSwitch();
+    }
+  },
+  methods: {
+    // 切换tabs
+    tabsSwitch(event) {
+      if (event) {
+        const {
+          index
+        } = event.currentTarget.dataset;
+        this.ruralActive = index || 0
       }
-    },
-    methods: {
-      // 切换tabs
-      tabsSwitch(event) {
-        if (event) {
-          const {
-            index
-          } = event.currentTarget.dataset;
-          this.setData({
-            ruralActive: index || 0
-          });
+      if (['1', '2'].includes(this.options.type)) {
+        if (this.ruralActive) {
+          this.deptListApi();
+        } else {
+          this.agencyContentGetApi();
         }
-        if (['1', '2'].includes(this.options.type)) {
-          if (this.ruralActive) {
-            this.deptListApi();
-          } else {
-            this.agencyContentGetApi();
-          }
-        }
-        if (['12101'].includes(this.options.type)) {
-          if (this.ruralActive) {
-            this.partyEventPageApi(2);
-          } else {
-            this.partyEventPageApi(1);
-          }
+      }
+      if (['12101'].includes(this.options.type)) {
+        if (this.ruralActive) {
+          this.partyEventPageApi(2);
+        } else {
+          this.partyEventPageApi(1);
         }
-      },
-
-      // 获取简介
-      // TODO:10月13日之前读的是 agencyContentGetOrgIdApi 这个接口
-      async agencyContentGetApi() {
-        const res = await peopleApi.agencyGetApi({
-          id: this.options.id,
-          orgId: this.options.orgId
-        });
-        this.setData({
-          InfoObj: this.generalFunction(res)
-        });
-      },
+      }
+    },
 
-      // 获取党支部详情
-      async partyBranchGetApi() {
-        const res = await peopleApi.partyBranchGetApi({
-          id: this.options.id
-        });
-        res.data.title = res.data.name || '';
-        res.data.content = res.data.descInfo || '';
-        this.setData({
-          InfoObj: this.generalFunction(res)
-        });
-      },
+    // 获取简介
+    // TODO:10月13日之前读的是 agencyContentGetOrgIdApi 这个接口
+    async agencyContentGetApi() {
+      const res = await peopleApi.agencyGetApi({
+        id: this.options.id,
+        orgId: this.options.orgId
+      });
+     this.InfoObj = this.generalFunction(res)
+    },
 
-      // 获取村务公开详情
-      async getVillageAffairsGetApi() {
-        const res = await peopleApi.agencyGetApi({
-          id: this.options.id
-        });
-        res.data.title = res.data.name || '';
-        res.data.content = res.data.descInfo || '';
-        this.setData({
-          InfoObj: this.generalFunction(res)
-        });
-      },
+    // 获取党支部详情
+    async partyBranchGetApi() {
+      const res = await peopleApi.partyBranchGetApi({
+        id: this.options.id
+      });
+      res.data.title = res.data.name || '';
+      res.data.content = res.data.descInfo || '';
+      this.InfoObj = this.generalFunction(res)
+    },
 
-      // 获取列表
-      async deptListApi() {
-        const res = await peopleApi.deptListApi({
-          parentId: this.options.orgId
-        });
-        this.setData({
-          deptList: res.data
-        });
-      },
+    // 获取村务公开详情
+    async getVillageAffairsGetApi() {
+      const res = await peopleApi.agencyGetApi({
+        id: this.options.id
+      });
+      res.data.title = res.data.name || '';
+      res.data.content = res.data.descInfo || '';
+      this.InfoObj = this.generalFunction(res)
+    },
 
-      // 获取村务公开详情列表
-      async villageAffairsPageApi() {
-        const params = {
-          pageNo: 1,
-          pageSize: 99,
-          agencyId: this.options.id
-        };
-        const res = await peopleApi.villageAffairsPageApi(params);
-        if (res.data) {
-          const {
-            list = []
-          } = res.data;
-          this.setData({
-            villageAffairsPageList: list
-          });
-        }
-      },
+    // 获取列表
+    async deptListApi() {
+      const res = await peopleApi.deptListApi({
+        parentId: this.options.orgId
+      });
+     this.deptList = res.data
+    },
 
-      // 获得党活动事件分页
-      async partyEventPageApi(eventType) {
-        const params = {
-          pageNo: 1,
-          pageSize: 99,
-          eventType,
-          // 字典
-          partyBranchId: this.options.id
-        };
-        const res = await peopleApi.partyEventPageApi(params);
-        if (res.data) {
-          const {
-            list = []
-          } = res.data;
-          if (eventType === 1) {
-            const setList = list.map((item) => {
-              const e = item;
-              // e.createTime = app.globalData.util.timeFormat(e.createTime);
-              e.content = e.content
-                .replace(/<img/gi, '<img style="max-width:100%;height:auto;display:block" ')
-                .replace(/&lt;/g, '<')
-                .replace(/&gt;/g, '>')
-                .replace(/&amp;nbsp;/g, ' ')
-                .replace(/&quot;/g, '"');
-              return e;
-            });
-            this.setData({
-              partyEventPageList: setList
-            });
-            return;
-          }
-          this.setData({
-            partyEventPageList: list
-          });
-        }
-      },
+    // 获取村务公开详情列表
+    async villageAffairsPageApi() {
+      const params = {
+        pageNo: 1,
+        pageSize: 99,
+        agencyId: this.options.id
+      };
+      const res = await peopleApi.villageAffairsPageApi(params);
+      if (res.data) {
+        const {
+          list = []
+        } = res.data;
+        this.villageAffairsPageList = list
+      }
+    },
 
-      // 通用函数
-      generalFunction(res) {
-        if (res.data && res.data.createTime) {
-          // res.data.createTime = app.globalData.util.timeFormat(res.data.createTime);
-          if (res.data.introduce) {
-            res.data.content = res.data.introduce;
-          }
-          if (res.data.content) {
-            res.data.content = res.data.content
+    // 获得党活动事件分页
+    async partyEventPageApi(eventType) {
+      const params = {
+        pageNo: 1,
+        pageSize: 99,
+        eventType,
+        // 字典
+        partyBranchId: this.options.id
+      };
+      const res = await peopleApi.partyEventPageApi(params);
+      if (res.data) {
+       let list = res.data.list
+        if (eventType === 1) {
+          let setList = list.map((item) => {
+            const e = item;
+            // e.createTime = app.globalData.util.timeFormat(e.createTime);
+            e.content = e.content
               .replace(/<img/gi, '<img style="max-width:100%;height:auto;display:block" ')
               .replace(/&lt;/g, '<')
               .replace(/&gt;/g, '>')
               .replace(/&amp;nbsp;/g, ' ')
               .replace(/&quot;/g, '"');
-          }
-          return res.data;
+            return e;
+          });
+          console.log(setList)
+          this.partyEventPageList = setList
+          return;
         }
-        return {};
-      },
 
-      toArea(event) {
-        const {
-          item
-        } = event.currentTarget.dataset;
-        uni.navigateTo({
-          url: `/packages/people/pages/area-detail/area-detail?orgId=${item.id}&name=${item.name}`
-        });
-      },
+        this.partyEventPageList = list
+      }
+    },
 
-      headleDetails(event) {
-        const {
-          item
-        } = event.currentTarget.dataset;
-        uni.navigateTo({
-          url: `/packages/public/pages/details/details-no-ops?name=村务公开详情&referId=${item.id}`
-        });
+    // 通用函数
+    generalFunction(res) {
+      if (res.data && res.data.createTime) {
+        // res.data.createTime = app.globalData.util.timeFormat(res.data.createTime);
+        if (res.data.introduce) {
+          res.data.content = res.data.introduce;
+        }
+        if (res.data.content) {
+          res.data.content = res.data.content
+            .replace(/<img/gi, '<img style="max-width:100%;height:auto;display:block" ')
+            .replace(/&lt;/g, '<')
+            .replace(/&gt;/g, '>')
+            .replace(/&amp;nbsp;/g, ' ')
+            .replace(/&quot;/g, '"');
+        }
+        return res.data;
       }
+      return {};
+    },
+
+    toArea(event) {
+      const {
+        item
+      } = event.currentTarget.dataset;
+      uni.navigateTo({
+        url: `/packages/people/pages/area-detail/area-detail?orgId=${item.id}&name=${item.name}`
+      });
+    },
+
+    headleDetails(event) {
+      const {
+        item
+      } = event.currentTarget.dataset;
+      uni.navigateTo({
+        url: `/packages/public/pages/details/details-no-ops?name=村务公开详情&referId=${item.id}`
+      });
     }
-  };
+  }
+};
 </script>
 <style lang="less">
-  .custom-swiper-img {
-    width: 100%;
-    height: 400rpx;
-    display: block;
+.custom-swiper-img {
+  width: 100%;
+  height: 400rpx;
+  display: block;
+}
+
+.rich {
+  padding: 45rpx;
+  font-size: 30rpx;
+  font-weight: 400;
+  color: #222222;
+  line-height: 60rpx;
+}
+
+.tabs-list {
+  .tabs-item {
+    font-size: 32rpx;
+    font-weight: 500;
+    color: #000000;
+    line-height: 32rpx;
+    position: relative;
+
+    &:not(:last-child) {
+      margin-right: 55rpx;
+    }
   }
 
-  .rich {
-    padding: 45rpx;
-    font-size: 30rpx;
-    font-weight: 400;
-    color: #222222;
-    line-height: 60rpx;
+  .tabs-active {
+    color: #f5001c;
+
+    &::after {
+      content: '';
+      position: absolute;
+      left: 4rpx;
+      bottom: 0;
+      z-index: -1;
+      // width: 175rpx;
+      width: 95%;
+      height: 10rpx;
+      background: var(--title-guides-color);
+      border-radius: 2rpx;
+    }
   }
-
-  .tabs-list {
-    .tabs-item {
+}
+
+.area {
+  margin-top: 60rpx;
+
+  .area-list {
+    padding: 46rpx 40rpx;
+    flex-wrap: wrap;
+
+    .area-item {
+      // flex: 1 0 0;
+      flex-shrink: 0;
+      width: 326rpx;
+      height: 80rpx;
+      background: #fff6f7;
+      border-radius: 8rpx;
       font-size: 32rpx;
       font-weight: 500;
-      color: #000000;
-      line-height: 32rpx;
-      position: relative;
+      color: #333333;
+      line-height: 80rpx;
+      text-align: center;
 
-      &:not(:last-child) {
-        margin-right: 55rpx;
+      &:nth-child(2n) {
+        margin-left: 16rpx;
+      }
+
+      &:nth-child(n + 3) {
+        margin-top: 16rpx;
       }
     }
+  }
+}
+
+.page-content {
+  margin-top: 70rpx;
+  padding: 0 40rpx;
 
-    .tabs-active {
-      color: #f5001c;
+  .title {
+    font-size: 36rpx;
+    font-weight: 500;
+    color: #000000;
+    line-height: 36rpx;
+    padding-left: 6rpx;
+
+    .title-name {
+      position: relative;
 
       &::after {
         content: '';
         position: absolute;
-        left: 4rpx;
+        left: -6rpx;
         bottom: 0;
         z-index: -1;
         // width: 175rpx;
-        width: 95%;
+        width: 115%;
         height: 10rpx;
         background: var(--title-guides-color);
         border-radius: 2rpx;
@@ -365,154 +403,94 @@
     }
   }
 
-  .area {
-    margin-top: 60rpx;
+  .cell-list {
+    margin-top: 20rpx;
+
+    .cell {
+      width: 100%;
+      padding: 24rpx 0;
+      background: #ffffff;
+      border-bottom: 1px solid #efefef;
+      display: flex;
+      justify-content: space-between;
+
+      .cell-left {
+        height: 100%;
+        font-size: 30rpx;
+        font-weight: 400;
+        color: #007bd7;
+        line-height: 30rpx;
+      }
 
-    .area-list {
-      padding: 46rpx 40rpx;
-      flex-wrap: wrap;
+      .cell-right {
+        height: 100%;
+        width: 40rpx;
+        display: flex;
+        align-items: center;
+        justify-content: flex-end;
 
-      .area-item {
-        // flex: 1 0 0;
-        flex-shrink: 0;
-        width: 326rpx;
-        height: 80rpx;
-        background: #fff6f7;
-        border-radius: 8rpx;
-        font-size: 32rpx;
-        font-weight: 500;
-        color: #333333;
-        line-height: 80rpx;
-        text-align: center;
-
-        &:nth-child(2n) {
-          margin-left: 16rpx;
-        }
+        .cell-right-number {
+          font-size: 32rpx;
 
-        &:nth-child(n + 3) {
-          margin-top: 16rpx;
+          font-weight: 400;
+          color: #666666;
+          margin-right: 28rpx;
         }
       }
     }
   }
+}
 
-  .page-content {
-    margin-top: 70rpx;
-    padding: 0 40rpx;
-
-    .title {
-      font-size: 36rpx;
-      font-weight: 500;
-      color: #000000;
-      line-height: 36rpx;
-      padding-left: 6rpx;
-
-      .title-name {
-        position: relative;
-
-        &::after {
-          content: '';
-          position: absolute;
-          left: -6rpx;
-          bottom: 0;
-          z-index: -1;
-          // width: 175rpx;
-          width: 115%;
-          height: 10rpx;
-          background: var(--title-guides-color);
-          border-radius: 2rpx;
-        }
-      }
-    }
-
-    .cell-list {
-      margin-top: 20rpx;
-
-      .cell {
-        width: 100%;
-        padding: 24rpx 0;
-        background: #ffffff;
-        border-bottom: 1px solid #efefef;
-        display: flex;
-        justify-content: space-between;
-
-        .cell-left {
-          height: 100%;
-          font-size: 30rpx;
-          font-weight: 400;
-          color: #007bd7;
-          line-height: 30rpx;
-        }
+.party {
+  .rich {
+    padding: 60rpx 45rpx;
+  }
 
-        .cell-right {
-          height: 100%;
-          width: 40rpx;
-          display: flex;
-          align-items: center;
-          justify-content: flex-end;
+  .party-list {
+    margin-top: 55rpx;
+    padding: 0 40rpx 0;
 
-          .cell-right-number {
-            font-size: 32rpx;
+    .section-item {
+      padding: 20rpx 0;
+      border-bottom: 1px solid #e1e1e1;
 
-            font-weight: 400;
-            color: #666666;
-            margin-right: 28rpx;
-          }
-        }
+      &:first-child {
+        padding-top: 0;
       }
-    }
-  }
-
-  .party {
-    .rich {
-      padding: 60rpx 45rpx;
-    }
-
-    .party-list {
-      margin-top: 55rpx;
-      padding: 0 40rpx 0;
 
-      .section-item {
-        padding: 20rpx 0;
-        border-bottom: 1px solid #e1e1e1;
+      .section-item-left {
+        margin-left: 24rpx;
 
-        &:first-child {
-          padding-top: 0;
+        .consult-content-title {
+          font-size: 32rpx;
+          font-weight: 400;
+          color: #333333;
+          line-height: 40rpx;
+          margin-bottom: 24rpx;
         }
 
-        .section-item-left {
-          margin-left: 24rpx;
-
-          .consult-content-title {
-            font-size: 32rpx;
-            font-weight: 400;
-            color: #333333;
-            line-height: 40rpx;
-            margin-bottom: 24rpx;
-          }
-
-          .consult-content-block {
-            font-size: 28rpx;
-            font-weight: 400;
-            color: #666666;
-            line-height: 28rpx;
-          }
+        .consult-content-block {
+          font-size: 28rpx;
+          font-weight: 400;
+          color: #666666;
+          line-height: 28rpx;
         }
+      }
 
-        .section-item-right {
-          width: 214rpx;
-          height: 140rpx;
-          border-radius: 8rpx;
-        }
+      .section-item-right {
+        width: 214rpx;
+        height: 140rpx;
+        border-radius: 8rpx;
       }
     }
+  }
 
-    .rich2 {
-      padding: 44rpx 45rpx;
-      font-size: 30rpx;
-      font-weight: 400;
-      color: #222222;
-      line-height: 60rpx;
-    }
+  .rich2 {
+    padding: 44rpx 45rpx;
+    font-size: 30rpx;
+    font-weight: 400;
+    color: #222222;
+    line-height: 60rpx;
   }
+}
 </style>

src/packages/people/pages/guide/guide.vue

@@ -11,7 +11,7 @@
         </swiper-item>
       </block>
     </swiper>
-    <view class="guide-list flex" v-if="option.path === 'sonGuide2'">
+    <view class="guide-list flex" v-if="option.name === '五星党员'">
       <view class="guide-item flex flex-col flex-v-center" :data-id="item.id" @tap="jumpDetail"
         v-for="(item, index) in doctorPageList" :key="index">
         <image class="guide-img" :src="item.photo"></image>
@@ -54,11 +54,6 @@
 </template>
 <!-- <script module="util" lang="wxs" src="@/wxs/util.wxs"></script> -->
 <script>
-  // const app = getApp();
-  // const {
-  //   publicApi,
-  //   peopleApi
-  // } = app.globalData.api;
   import * as peopleApi from '@/api/peopleApi';
   import * as publicApi from '@/api/publicApi';
   export default {
@@ -85,6 +80,7 @@
      */
     onLoad(option) {
       this.option = option
+      console.log(option)
       this.recursionApi();
       this.callFcuntion();
     },
@@ -191,7 +187,7 @@
           sonGuide1: {
             api: this.partyBranchApi
           },
-          sonGuide2: {
+          '五星党员': {
             api: this.excellentPartMemberPageApi
           },
           sonGuide3: {
@@ -204,7 +200,7 @@
             api: this.agencyPageApi
           }
         };
-        const obj = ApiConfig[this.option.path];
+        const obj = ApiConfig[this.option.path || this.option.name];
         if (obj.api) {
           obj.api();
         }

src/packages/people/pages/second/second.vue

@@ -20,8 +20,8 @@
         v-for="(itemName, idx) in recursionTwoObj.children" :key="idx">
         <!-- <navigator v-if="itemName.clickUrl" class="line-navigator" :url="toods.updateQuery(itemName.clickUrl, itemName)"
           hover-class="none"></navigator> -->
-        <navigator v-if="itemName.clickUrl" class="line-navigator" :url="itemName.clickUrl" hover-class="none">
-        </navigator>
+          <navigator v-if="itemName.clickUrl" class="line-navigator" :url="updateQuery(itemName.clickUrl, itemName)"
+          hover-class="none"></navigator>
 
         <image class="line-bg" :src="itemName.icon"></image>
 
@@ -50,7 +50,7 @@
     </view>
 
     <view class="second-section" v-if="option.name === '党建引领'">
-      <view class="section-item flex flex-between" :data-item="item" @click="headleDetails(item)"
+      <view class="section-item flex flex-between" :data-item="item" @tap="headleDetails(item)"
         v-for="(item, index) in newsPageList" :key="index">
         <view class="section-item-left flex1 flex flex-between flex-col">
           <view class="consult-content-title text-line-1">{{ item.title }}</view>
@@ -119,14 +119,11 @@
   </view>
 </template>
 <script>
-  // const app = getApp();
-  // const {
-  //   peopleApi,
-  //   publicApi
-  // } = app.globalData.api;
   import * as peopleApi from '@/api/peopleApi';
   import * as publicApi from '@/api/publicApi';
   import * as enterprise from '@/api/enterprise';
+  import utils from '@/utils/util.map.js'
+
   // 民生 - 家庭医生列表 / 党建引领 复用
   export default {
     components: {},
@@ -169,6 +166,9 @@
       this.getGridList(false);
     },
     methods: {
+      updateQuery(url, name) {
+        return utils.updateQuery(url, name);
+      },
       /**
        * 接口
        */
@@ -188,7 +188,7 @@
       },
 
       async newsPageApi(reset = true) {
-        // const params = this.generalQueryData(reset);
+        const params = this.generalQueryData(reset);
         const param = {
           pageNo: 1,
           pageSize: 10,
@@ -284,7 +284,7 @@
           if (name === 3) {
             this.newsPageList = []
             this.pageNo = 1
-            this['option.categoryId'] = 1101
+            this.option.categoryId = 1101
             this.newsPageApi();
           }
         }
@@ -294,15 +294,13 @@
             // 党建新闻所需id
             1: 5 // 党建活动所需id
           };
-          console.log(event)
-          this['option.categoryId'] = data[event && event.name] || data[0]
+          this.option.categoryId = data[event && event.name] || data[0]
           this.newsPageList = []
           this.newsPageApi();
         }
       },
 
       async getGridList(reset = true) {
-        console.log(111);
         const params = this.generalQueryData(reset);
         let _goodsList = []
         params.type = this.tabsIndex === 1 ? 1 : 2;

src/pages/enterprise/enterprise.vue

@@ -52,8 +52,7 @@
 
       <!-- 内容部分 -->
       <view v-if="'dataList.length > 0'">
-        <view class="good-reply-conent" @click="details" :data-item="item" v-for="(item, index) in dataList"
-          :key="index">
+        <view class="good-reply-conent" @click="details" :data-item="item" v-for="(item, index) in dataList" :key="index">
           <view class="good-reply-flex">
             <view>
               <image :src="item.avatar" mode="aspectFill" />
@@ -103,452 +102,452 @@
   </view>
 </template>
 <script>
-  import utils from '@/utils/util.map.js'
-  import * as publicApi from '@/api/publicApi.js'; // 公共 API
-  import * as enterprise from '@/api/enterprise'; // 企业
-  export default {
-    data() {
-      return {
-        isLogin: uni.getStorageSync('isLogin'),
-        userInfo: null,
-        userInfoCount: null,
-        indicatorDots: false,
-        vertical: false,
-        autoplay: true,
-        duration: 500,
-
-        page: {
-          pageNo: 1,
-          pageSize: 15,
-          type: 3
-        },
-
-        imageList: [],
-        interval: 2000,
-
-        params: {
-          pageNo: 1,
-          pageSize: 15
-        },
-
-        dataList: [],
-        recursionList: [],
-        typeList: '',
-
-        state: {
-          value: '',
-          cssClass: '',
-          label: ''
-        }
-      };
+import utils from '@/utils/util.map.js'
+import * as publicApi from '@/api/publicApi.js'; // 公共 API
+import * as enterprise from '@/api/enterprise'; // 企业
+export default {
+  data() {
+    return {
+      isLogin: uni.getStorageSync('isLogin'),
+      userInfo: null,
+      userInfoCount: null,
+      indicatorDots: false,
+      vertical: false,
+      autoplay: true,
+      duration: 500,
+
+      page: {
+        pageNo: 1,
+        pageSize: 15,
+        type: 3
+      },
+
+      imageList: [],
+      interval: 2000,
+
+      params: {
+        pageNo: 1,
+        pageSize: 15
+      },
+
+      dataList: [],
+      recursionList: [],
+      typeList: '',
+
+      state: {
+        value: '',
+        cssClass: '',
+        label: ''
+      }
+    };
+  },
+  onLoad() {
+    this.getpublicApiList();
+    this.getType();
+    this.recursionApi();
+  },
+  onShow() {
+    this.isLogin = uni.getStorageSync('isLogin')
+    this.userInfo = uni.getStorageSync('userInfoData')
+    this.userInfoCount = uni.getStorageSync('userInfoCount')
+
+    if (this.isLogin) {
+      this.getPerfectReply();
+    }
+  },
+  methods: {
+    getDateTime(replyTime, key) {
+      return utils.getDateTime(replyTime, key)
     },
-    onLoad() {
-      this.getpublicApiList();
-      this.getType();
-      this.recursionApi();
+    updateQuery(url, name) {
+      return utils.updateQuery(url, name);
+    },
+    // 获取企业轮播图
+    async getpublicApiList() {
+      const res = await publicApi.getBannerApi(this.page);
+      if (res.data) {
+        this.imageList = res.data.list
+        this.interval = res.data.list[0].rotationTime
+      }
     },
-    onShow() {
-      this.isLogin = uni.getStorageSync('isLogin')
-      this.userInfo = uni.getStorageSync('userInfoData')
-      this.userInfoCount = uni.getStorageSync('userInfoCount')
 
-      if (this.isLogin) {
-        this.getPerfectReply();
+    async recursionApi() {
+      const res = await publicApi.recursionApi({
+        bannerType: 3
+      });
+      if (res.data) {
+        this.recursionList = res.data
       }
     },
-    methods: {
-      getDateTime(replyTime, key) {
-        return utils.getDateTime(replyTime, key)
-      },
-      updateQuery(url, name) {
-        return utils.updateQuery(url, name);
-      },
-      // 获取企业轮播图
-      async getpublicApiList() {
-        const res = await publicApi.getBannerApi(this.page);
-        if (res.data) {
-          this.imageList = res.data.list
-          this.interval = res.data.list[0].rotationTime
-        }
-      },
 
-      async recursionApi() {
-        const res = await publicApi.recursionApi({
-          bannerType: 3
+    // 优质回复
+    async getPerfectReply() {
+      const res = await enterprise.getPerfectReplyApi(this.params);
+      if (res.data) {
+        res.data.list.forEach((item) => {
+          if (item.name !== null) {
+            item.name = item.name.substring(0, 1) + new Array(item.name.length).join('*');
+          }
         });
-        if (res.data) {
-          this.recursionList = res.data
-        }
-      },
+        this.dataList = res.data.list
+      }
+    },
 
-      // 优质回复
-      async getPerfectReply() {
-        const res = await enterprise.getPerfectReplyApi(this.params);
-        if (res.data) {
-          res.data.list.forEach((item) => {
-            if (item.name !== null) {
-              item.name = item.name.substring(0, 1) + new Array(item.name.length).join('*');
-            }
-          });
-          this.dataList = res.data.list
-        }
-      },
+    // 详情页跳转
+    details(event) {
+      const {
+        item
+      } = event.currentTarget.dataset;
+      uni.navigateTo({
+        url: `/packages/enterprise/pages/details/details?id=${item.id}`
+      });
+    },
 
-      // 详情页跳转
-      details(event) {
-        const {
-          item
-        } = event.currentTarget.dataset;
+    async getType() {
+      const res = await publicApi.getDictDataApi({
+        dictType: 'appeal_type'
+      });
+      if (res.data) {
+        this.typeList = res.data.list
+      }
+    },
+
+    myAppeal() {
+      const {
+        userInfoCount,
+        isLogin
+      } = this;
+      if (!isLogin) {
         uni.navigateTo({
-          url: `/packages/enterprise/pages/details/details?id=${item.id}`
+          url: '/pages/authorize/authorize'
         });
-      },
-
-      async getType() {
-        const res = await publicApi.getDictDataApi({
-          dictType: 'appeal_type'
+        return false;
+      }
+      // 暂时去除实名认证
+      // else if (userInfoCount.realNameAuthFlag === 0) {
+      //   wx.navigateTo({
+      //     url: '/packages/enterprise/pages/enterprise-certification/enterprise-certification',
+      //   })
+      //   return false
+      // } else if (userInfoCount.realNameAuthFlag === 3) {
+      //   wx.showToast({
+      //     title: '身份审核中...',
+      //     icon: 'none'
+      //   })
+      //   return false
+      // }
+      else {
+        uni.navigateTo({
+          url: '/packages/enterprise/pages/my-appeal/my-appeal'
         });
-        if (res.data) {
-          this.typeList = res.data.list
-        }
-      },
-
-      myAppeal() {
-        const {
-          userInfoCount,
-          isLogin
-        } = this;
-        if (!isLogin) {
-          uni.navigateTo({
-            url: '/pages/authorize/authorize'
-          });
-          return false;
-        }
-        // 暂时去除实名认证
-        // else if (userInfoCount.realNameAuthFlag === 0) {
-        //   wx.navigateTo({
-        //     url: '/packages/enterprise/pages/enterprise-certification/enterprise-certification',
-        //   })
-        //   return false
-        // } else if (userInfoCount.realNameAuthFlag === 3) {
-        //   wx.showToast({
-        //     title: '身份审核中...',
-        //     icon: 'none'
-        //   })
-        //   return false
-        // }
-        else {
-          uni.navigateTo({
-            url: '/packages/enterprise/pages/my-appeal/my-appeal'
-          });
-        }
-      },
+      }
+    },
 
-      crateAppeal() {
-        const {
-          userInfoCount,
-          isLogin
-        } = this;
-        if (!isLogin) {
-          uni.navigateTo({
-            url: '/pages/authorize/authorize'
-          });
-          return false;
-        }
-        // 去除实名认证
-        //  else if (userInfoCount.realNameAuthFlag === 0) {
-        //   wx.navigateTo({
-        //     url: '/packages/enterprise/pages/enterprise-certification/enterprise-certification',
-        //   })
-        //   return false
-        // } else if (userInfoCount.realNameAuthFlag === 3) {
-        //   wx.showToast({
-        //     title: '身份审核中...',
-        //     icon: 'none'
-        //   })
-        //   return false
-        // }
-        else {
-          uni.navigateTo({
-            url: '/packages/enterprise/pages/issue-appeal/issue-appeal'
-          });
-        }
+    crateAppeal() {
+      const {
+        userInfoCount,
+        isLogin
+      } = this;
+      if (!isLogin) {
+        uni.navigateTo({
+          url: '/pages/phone/index'
+        });
+        return false;
+      }
+      // 去除实名认证
+      //  else if (userInfoCount.realNameAuthFlag === 0) {
+      //   wx.navigateTo({
+      //     url: '/packages/enterprise/pages/enterprise-certification/enterprise-certification',
+      //   })
+      //   return false
+      // } else if (userInfoCount.realNameAuthFlag === 3) {
+      //   wx.showToast({
+      //     title: '身份审核中...',
+      //     icon: 'none'
+      //   })
+      //   return false
+      // }
+      else {
+        uni.navigateTo({
+          url: '/packages/enterprise/pages/issue-appeal/issue-appeal'
+        });
       }
     }
-  };
+  }
+};
 </script>
 <style lang="less">
-  page {
-    --nav-bar-background-color: transparent;
-    --nav-bar-text-color: #ffffff; // 导航栏左侧文案样式
-    background-color: #fff;
-  }
-
-  .mt-20 {
-    margin-top: 40rpx;
-  }
-
-  .mt-21 {
-    margin-top: 21rpx;
-  }
-
-  .enterprise-title {
-    font-size: 32r;
-    font-weight: 400;
-    color: #000000;
-  }
-
-  .line-navigator {
+page {
+  --nav-bar-background-color: transparent;
+  --nav-bar-text-color: #ffffff; // 导航栏左侧文案样式
+  background-color: #fff;
+}
+
+.mt-20 {
+  margin-top: 40rpx;
+}
+
+.mt-21 {
+  margin-top: 21rpx;
+}
+
+.enterprise-title {
+  font-size: 32r;
+  font-weight: 400;
+  color: #000000;
+}
+
+.line-navigator {
+  width: 100%;
+  height: 100%;
+  position: absolute;
+  z-index: 10;
+  top: 0;
+  left: 0;
+}
+
+swiper,
+swiper-item {
+  width: 100%;
+  height: 400rpx;
+
+  image {
     width: 100%;
     height: 100%;
-    position: absolute;
-    z-index: 10;
-    top: 0;
-    left: 0;
   }
+}
 
-  swiper,
-  swiper-item {
-    width: 100%;
-    height: 400rpx;
+.enterprise-appeal {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 30rpx 24rpx 0 24rpx;
 
-    image {
-      width: 100%;
-      height: 100%;
+  .enterprise-appeal-item {
+    width: 340rpx;
+    height: 122rpx;
+    display: flex;
+    align-items: center;
+    border-radius: 16rpx;
+    padding: 0 24rpx;
+    background-color: #fef9f5;
+    position: relative;
+
+    .enterprise-appeal-icon {
+      width: 120rpx;
+      height: 80rpx;
+      border-radius: 46rpx;
+      margin-right: 24rpx;
+    }
+
+    &:nth-child(2n) {
+      background-color: #fef6f6;
     }
   }
+}
 
-  .enterprise-appeal {
+.good-reply {
+  padding: 40rpx 24rpx;
+}
+
+.good-reply-conent {
+  margin-top: 37rpx;
+
+  .good-reply-flex {
     display: flex;
     align-items: center;
     justify-content: space-between;
-    padding: 30rpx 24rpx 0 24rpx;
 
-    .enterprise-appeal-item {
-      width: 340rpx;
-      height: 122rpx;
+    view {
       display: flex;
       align-items: center;
-      border-radius: 16rpx;
-      padding: 0 24rpx;
-      background-color: #fef9f5;
-      position: relative;
+      justify-content: space-between;
 
-      .enterprise-appeal-icon {
-        width: 120rpx;
-        height: 80rpx;
-        border-radius: 46rpx;
+      image {
+        width: 44rpx;
+        height: 44rpx;
+        border-radius: 50%;
         margin-right: 24rpx;
       }
 
-      &:nth-child(2n) {
-        background-color: #fef6f6;
+      .good-reply-conent-title {
+        font-size: 32rpx;
+        font-weight: 400;
+        color: #fe3b53;
+      }
+
+      .good-reply-conent-bg {
+        width: 100rpx;
+        height: 38rpx;
+        text-align: center;
+        color: #fff;
+        line-height: 38rpx;
+        background: #fe3b53;
+        box-shadow: 2px 2px 2px 0px rgba(254, 61, 85, 0.1);
+        border-radius: 500rpx;
+        margin-left: 39rpx;
       }
     }
   }
 
-  .good-reply {
-    padding: 40rpx 24rpx;
+  .good-reply-conent-block {
+    font-size: 24rp;
+    font-weight: 400;
+    color: #999999;
   }
 
-  .good-reply-conent {
-    margin-top: 37rpx;
-
-    .good-reply-flex {
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
+  .good-reply-title {
+    font-size: 32rpx;
+    font-weight: 500;
+    color: #000000;
+  }
 
-      view {
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-
-        image {
-          width: 44rpx;
-          height: 44rpx;
-          border-radius: 50%;
-          margin-right: 24rpx;
-        }
-
-        .good-reply-conent-title {
-          font-size: 32rpx;
-          font-weight: 400;
-          color: #fe3b53;
-        }
-
-        .good-reply-conent-bg {
-          width: 100rpx;
-          height: 38rpx;
-          text-align: center;
-          color: #fff;
-          line-height: 38rpx;
-          background: #fe3b53;
-          box-shadow: 2px 2px 2px 0px rgba(254, 61, 85, 0.1);
-          border-radius: 500rpx;
-          margin-left: 39rpx;
-        }
-      }
-    }
+  .good-reply-subheading {
+    font-size: 28rp;
+    font-weight: 400;
+    color: #333333;
+    margin-top: 24rpx;
+  }
 
-    .good-reply-conent-block {
-      font-size: 24rp;
-      font-weight: 400;
-      color: #999999;
-    }
+  .good-reply-imgage {
+    margin-top: 24rpx;
+    display: grid;
+    grid-template-columns: 1fr 1fr 1fr;
 
-    .good-reply-title {
-      font-size: 32rpx;
-      font-weight: 500;
-      color: #000000;
+    image {
+      width: 222rpx;
+      height: 150rpx;
+      border-radius: 10rpx;
+      margin-bottom: 20rpx;
     }
+  }
 
-    .good-reply-subheading {
-      font-size: 28rp;
-      font-weight: 400;
-      color: #333333;
-      margin-top: 24rpx;
-    }
+  .good-reply-bg {
+    width: 678rpx;
+    // height: 232rpx;
+    background: #f7f7f7;
+    border-radius: 8px;
+    margin-top: 32rpx;
+    padding: 28rpx 20rpx;
 
-    .good-reply-imgage {
-      margin-top: 24rpx;
-      display: grid;
-      grid-template-columns: 1fr 1fr 1fr;
+    view {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
 
       image {
-        width: 222rpx;
-        height: 150rpx;
-        border-radius: 10rpx;
-        margin-bottom: 20rpx;
+        width: 32rpx;
+        height: 32rpx;
+        margin-right: 8rpx;
       }
-    }
 
-    .good-reply-bg {
-      width: 678rpx;
-      // height: 232rpx;
-      background: #f7f7f7;
-      border-radius: 8px;
-      margin-top: 32rpx;
-      padding: 28rpx 20rpx;
-
-      view {
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-
-        image {
-          width: 32rpx;
-          height: 32rpx;
-          margin-right: 8rpx;
-        }
-
-        text {
-          font-size: 28rpx;
-          font-weight: 400;
-          color: #fe3b53;
-        }
-      }
-
-      .good-reply-bg-conent {
-        padding: 16rpx 0 0 40rpx;
+      text {
         font-size: 28rpx;
         font-weight: 400;
-        color: #333333;
+        color: #fe3b53;
       }
     }
-  }
 
-  // 模块配置样式 start
-  .title {
+    .good-reply-bg-conent {
+      padding: 16rpx 0 0 40rpx;
+      font-size: 28rpx;
+      font-weight: 400;
+      color: #333333;
+    }
+  }
+}
+
+// 模块配置样式 start
+.title {
+  font-size: 36rpx;
+  font-weight: 500;
+  color: #000000;
+  line-height: 36rpx;
+  padding-left: 6rpx;
+
+  .title-name {
+    position: relative;
     font-size: 36rpx;
     font-weight: 500;
-    color: #000000;
-    line-height: 36rpx;
-    padding-left: 6rpx;
+    color: #333333;
+
+    &::after {
+      content: '';
+      position: absolute;
+      left: -6rpx;
+      bottom: 0;
+      z-index: -1;
+      // width: 175rpx;
+      width: 115%;
+      height: 10rpx;
+      background: var(--title-guides-color);
+      border-radius: 2rpx;
+    }
+  }
+}
+
+.life-section {
+  padding: 0 24rpx;
+}
+
+.second-block,
+.third-block,
+.fourth-block {
+  margin-top: 50rpx;
 
-    .title-name {
+  .second-model {
+    margin-top: 40rpx;
+    flex-wrap: wrap;
+
+    .second-line {
+      width: 343rpx;
+      height: 110rpx;
+      justify-content: center;
+      padding-left: 39rpx;
       position: relative;
-      font-size: 36rpx;
-      font-weight: 500;
-      color: #333333;
 
-      &::after {
-        content: '';
+      &:not(:first-child) {
+        margin-top: 16rpx;
+      }
+
+      .line-bg {
+        width: 100%;
+        height: 100%;
         position: absolute;
-        left: -6rpx;
-        bottom: 0;
-        z-index: -1;
-        // width: 175rpx;
-        width: 115%;
-        height: 10rpx;
-        background: var(--title-guides-color);
-        border-radius: 2rpx;
+        // z-index: -1;
+        top: 0;
+        left: 0;
       }
-    }
-  }
 
-  .life-section {
-    padding: 0 24rpx;
-  }
+      .line-title {
+        position: absolute;
+        font-size: 40rpx;
+        font-weight: 500;
+        line-height: 32rpx;
+      }
 
-  .second-block,
-  .third-block,
-  .fourth-block {
-    margin-top: 50rpx;
-
-    .second-model {
-      margin-top: 40rpx;
-      flex-wrap: wrap;
-
-      .second-line {
-        width: 343rpx;
-        height: 110rpx;
-        justify-content: center;
-        padding-left: 39rpx;
-        position: relative;
-
-        &:not(:first-child) {
-          margin-top: 16rpx;
-        }
-
-        .line-bg {
-          width: 100%;
-          height: 100%;
-          position: absolute;
-          // z-index: -1;
-          top: 0;
-          left: 0;
-        }
-
-        .line-title {
-          position: absolute;
-          font-size: 40rpx;
-          font-weight: 500;
-          line-height: 32rpx;
-        }
-
-        .line-msg {
-          position: absolute;
-          margin-top: 100rpx;
-          font-size: 26rpx;
-          font-weight: 400;
-          color: #666666;
-          line-height: 26rpx;
-        }
+      .line-msg {
+        position: absolute;
+        margin-top: 100rpx;
+        font-size: 26rpx;
+        font-weight: 400;
+        color: #666666;
+        line-height: 26rpx;
       }
+    }
 
-      .line1 {
-        width: 100%;
-        height: 171rpx;
+    .line1 {
+      width: 100%;
+      height: 171rpx;
 
-        .line-title {
-          font-size: 40rpx;
-          font-weight: 500;
-          line-height: 40rpx;
-        }
+      .line-title {
+        font-size: 40rpx;
+        font-weight: 500;
+        line-height: 40rpx;
       }
     }
   }
+}
 
-  // 模块配置样式 end
+// 模块配置样式 end
 </style>

src/pages/my/my.vue

@@ -303,7 +303,7 @@
               this.getInitData();
           } else {
               uni.navigateTo({
-                  url: '/pages/authorize/authorize'
+                  url: '/pages/phone/index'
               });
           }
       },

src/utils/server.js

@@ -38,7 +38,7 @@ const responseFuns = {
         });
         setTimeout(() => {
             uni.navigateTo({
-                url: '/pages/authorize/authorize'
+                url: '/pages/phone/index'
             });
         }, 2000);
     },
@@ -52,7 +52,7 @@ const responseFuns = {
         });
         setTimeout(() => {
             uni.navigateTo({
-                url: '/pages/authorize/authorize'
+                url: '/pages/phone/index'
             });
         }, 2000);
     },

src/utils/util.map.js

@@ -134,9 +134,17 @@ function updateQuery(url, item) {
   if (!item) {
     return url;
   }
-  let name = item.name;
-  let newUrl = url.replace(/name=\[name\]/, 'name=' + name);
-  return newUrl;
+  let keys = Object.keys(item);
+  let newUrl = url;
+
+  keys.forEach(key => {
+    let value = item[key];
+    let search = `\\[${key}\\]`;
+    let regex = new RegExp(search, 'g');
+    newUrl = newUrl.replace(regex, value);
+  });
+
+  return newUrl
 }
 
 function formatStr(str) {