Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_app

Lou

2023-11-13 37b8dcd3da956f0d6bb0272c4766fc1c09e23119

 subPackage/workbench/views/csjl.vue

@@ -7,7 +7,8 @@
            </view>

            <view class="search">

               <u-search placeholder="请输入场所名称" v-model="iptContext" :clearabled="true" :showAction="true"

                  :animation="true" @change="keyWordChange" @search="searchConfirm" @clear="clearConfirm"></u-search>

                  :animation="true" @change="keyWordChange" @search="searchConfirm"

                  @clear="clearConfirm"></u-search>

            </view>

         </view>

      </u-sticky>

@@ -30,6 +31,7 @@
            </view>

         </view>

      </view>

      <u-toast ref="uToast"></u-toast>

      <u-loadmore :status="status" loadmoreText="开始加载" loadingText="数据加载中" nomoreText="没有更多了" line />

   </view>

</template>

@@ -61,12 +63,12 @@
               size: 10

            },

            tabsType: 1,

            status: 'nomore',
            status: 'nomore',

            currentRole: {}

         }

      },

      onShow() {
         this.recordsData = []
      onShow() {

         this.recordsData = []

         this.currentRole = uni.getStorageSync('activeRole')

         this.getrRecordList()

      },

@@ -76,8 +78,15 @@
      },

      methods: {

         async getrRecordList(placeName = this.iptContext, isPerfect = this.tabsType) {

            this.status = 'loadmore'
            const { roleName } = this.currentRole
            this.$refs.uToast.show({

               type: 'loading',

               message: '正在加载',

               duration: 9999999

            })

            this.status = 'loadmore'

            const {

               roleName

            } = this.currentRole

            console.log(this.currentRole);

            const {

               code,

@@ -86,7 +95,7 @@
               }

            } = await getLocationRecord({

               placeName,

               isPerfect,
               isPerfect,

               roleName,

               ...this.pagingParams

            })

@@ -98,6 +107,9 @@
               return

            }

            this.recordsData = [...this.recordsData, ...records]

            this.$nextTick(() => {

               this.$refs.uToast.isShow = false

            })

            this.status = 'nomore'

         },

         tabClick({

@@ -123,7 +135,9 @@
            this.iptContext = ''

            this.searchConfirm()

         },

         pushPage({ id }) {

         pushPage({

            id

         }) {

            if (!id) {

               uni.showToast({

                  title: "关键参数为空",

@@ -160,13 +174,14 @@


   }



   .info-box {
      padding: 20rpx 30rpx;
   .info-box {

      padding: 20rpx 30rpx;



      // background-color: #f6f6f6;

      .records-card {

         background: #fff;

         padding: 30rpx;

         border-radius: 10rpx;
         border-radius: 10rpx;

         margin-bottom: 20rpx;



         .title {