Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

renkang

2025-01-24 d492850f1cc64ddcfaf43798af9c76c2505414fd

 h5/pages/polling/detail.vue

@@ -48,7 +48,7 @@
                     <view class="la">巡检时间：</view>

                     <view class="val">
                        <text>{{item.dealDate}}</text>
                        <text v-if="item.status == 1" class="detail">查看详情</text>
                        <text @click="detailClick(item)" v-if="item.status == 1" class="detail">查看详情</text>
                     </view>

                  </view>

               </template>

@@ -60,6 +60,7 @@
         <view class="sub_btn">扫码巡检</view>

      </view>
      <!--  -->
	
      <view class="reader-box" @click="stopScan" v-if="isScaning">
         <view class="reader" id="reader"></view>
      </view>

@@ -101,7 +102,9 @@
               },

            ],

            html5Qrcode: null,

            isScaning: false,

            isScaning: false,
				
				
         };

      },

      onLoad(option) {

@@ -126,10 +129,12 @@
                     },

                     (decodeText, decodeResult) => {

                        if (decodeText) { //这里decodeText就是通过扫描二维码得到的内容

                           this.stopScan(); //关闭扫码功能

                           this.stopScan(); //关闭扫码功能
                           const index = decodeText.indexOf('ywid')
                           let pointCode = decodeText.slice(index + 5)

                           getPointRecordByCode({

                              taskId: this.id,

                              pointCode: decodeText

                              pointCode

                           }).then(ress => {

                              if (ress.data) {

                                 uni.navigateTo({

@@ -155,12 +160,18 @@
            if (this.html5Qrcode) {

               this.html5Qrcode.stop();

            }

         },

         },
			
         itemClick(item) {

            if (!this.flag) return

            uni.navigateTo({

               url: '/pages/polling/point?id=' + item.id

            })

         },
         detailClick(item) {
            uni.navigateTo({
               url: '/pages/polling/point?id=' + item.id
            })
         },

         getDetail() {

            const {