From e6aefb2f750992613bcc20e38e1c942a0f17a40d Mon Sep 17 00:00:00 2001
From: zhenyuWang <13641039885@163.com>
Date: Fri, 8 Dec 2023 13:57:17 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=86=B2=E7=AA=81=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/API/loading/loading.uvue                |  40 --
 .../list-view/list-view-multiplex.uvue        |   2 -
 .../sticky-section/sticky-section.uvue        |   4 +-
 pages/pages.test.js                           |   6 -
 pages/tabBar/template.uvue                    | 642 ++++++------------
 5 files changed, 222 insertions(+), 472 deletions(-)

diff --git a/pages/API/loading/loading.uvue b/pages/API/loading/loading.uvue
index 783c4608..ed07b5c2 100644
--- a/pages/API/loading/loading.uvue
+++ b/pages/API/loading/loading.uvue
@@ -12,10 +12,6 @@
         </view>
       </view>
       <view class="uni-list uni-common-pl">
-        <radio-group @change="radioChange">
-          <radio class="uni-list-cell uni-list-cell-pd radio" v-for="(item, index) in items" :key="item.value"
-            :class="index < items.length - 1 ? 'uni-list-cell-line' : ''" :value="item.value"
-            :checked="index === current">
         <radio-group @change="radioChange" class="radio-group">
           <radio
             class="uni-list-cell uni-list-cell-pd radio"
@@ -44,42 +40,6 @@
   </view>
 </template>
 <script lang="uts">
-  type ItemType = {
-    value : string
-    name : string
-  }
-  export default {
-    data() {
-      return {
-        title: 'loading',
-        items: [
-          {
-            value: 'null',
-            name: '无标题',
-          },
-          {
-            value: '三秒后自动关闭',
-            name: '普通标题',
-          },
-          {
-            value: '超长文本内容，测试超出范围-超长文本内容，测试超出范围-三秒后自动关闭',
-            name: '长标题',
-          },
-        ] as ItemType[],
-        current: 0,
-        maskSelect: false,
-        titleSelect: "null"
-      }
-    },
-    onLoad(){
-      uni.showLoading({
-      	title:'onLoad 调用示例,1秒后消失'
-      })
-      setTimeout(function() {
-        uni.hideLoading()
-      }, 1000);
-    },
-    methods: {
 type ItemType = {
   value : string
   name : string
diff --git a/pages/component/list-view/list-view-multiplex.uvue b/pages/component/list-view/list-view-multiplex.uvue
index f9049e4f..5d378ca8 100644
--- a/pages/component/list-view/list-view-multiplex.uvue
+++ b/pages/component/list-view/list-view-multiplex.uvue
@@ -1,8 +1,6 @@
 <template>
 	<list-view id="listview" style="flex: 1;" show-scrollbar=false @scrolltolower="onScrollTolower">
     <list-item v-for="index in item_count" class="item" @click="itemClick(index)">
-	<list-view id="listview" style="flex: 1;" show-scrollbar=false @scrolltolower="onScrollTolower">
-    <list-item v-for="index in item_count" class="item">
       <text >item-------<text>{{index}}</text></text>
     </list-item>
   </list-view>
diff --git a/pages/component/sticky-section/sticky-section.uvue b/pages/component/sticky-section/sticky-section.uvue
index dbc81c00..286df37d 100644
--- a/pages/component/sticky-section/sticky-section.uvue
+++ b/pages/component/sticky-section/sticky-section.uvue
@@ -1,7 +1,7 @@
 <template>
   <list-view id="list-view" ref="list-view" show-scrollbar=false class="page" :scroll-into-view="scrollIntoView"
   @scroll="onScroll" @scrollend="onScrollEnd" rebound="false">
-    <list-item style="padding: 10px; margin: 5px 0;align-items: center;" type = 20>
+    <list-item style="padding: 10px; margin: 5px 0;align-items: center;">
       <button @click="gotoStickyHeader('C')" size="mini">跳转到id为C的sticky-header位置上</button>
     </list-item>
     <sticky-section v-for="(sectionText) in data" :padding="sectionPadding" :push-pinned-header="true">
@@ -12,7 +12,7 @@
         <text class="text">{{sectionText}}--item--content----{{i}}</text>
       </list-item>
     </sticky-section>
-    <list-item style="padding: 10px; margin: 5px 0;align-items: center;" type= 30>
+    <list-item style="padding: 10px; margin: 5px 0;align-items: center;">
       <!-- <text style="color: #aaa">到底了</text> -->
       <button @click="toTop" size="mini">回到顶部</button>
     </list-item>
diff --git a/pages/pages.test.js b/pages/pages.test.js
index 50174ed2..658dd3a5 100755
--- a/pages/pages.test.js
+++ b/pages/pages.test.js
@@ -9,7 +9,6 @@ const pages = [
   // '/pages/component/image/image-large', // 截图过大
   '/pages/component/image/image-mode',
   // '/pages/component/image/image-path', // 网络资源加载，单独测试例截图
-  // '/pages/component/image/image-path', // 网络资源加载
   '/pages/component/image/image',
   // '/pages/component/input/input', // 自动获取焦点，单独测试例截图
   // '/pages/component/list-view/list-view',
@@ -112,7 +111,6 @@ const pages = [
   // '/pages/template/drop-card/drop-card',
   '/pages/template/half-screen/half-screen',
   // '/pages/template/list-news/list-news', // 网络资源加载，单独测试例截图
-  // '/pages/template/list-news/list-news', // 网络资源加载
   // '/pages/template/long-list/long-list', // 动态内容
   '/pages/template/navbar-lite/navbar-lite',
   '/pages/template/pull-zoom-image/pull-zoom-image',
@@ -144,7 +142,6 @@ const notFullPages = [
 ]
 
 let page;
-describe("page screenshot test", () => {
 describe("page screenshot test", () => {
   beforeAll(async () => {
     console.log("page screenshot test start");
@@ -165,13 +162,10 @@ describe("page screenshot test", () => {
     if (notFullPages.includes(pages[pageIndex])) {
       fullPage = false;
     }
-  test.each(pages)("%s", async () => {
     const image = await program.screenshot({
       fullPage: fullPage
     });
     expect(image).toMatchImageSnapshot();
     await page.waitFor(500);
   });
-});
-  });
 });
diff --git a/pages/tabBar/template.uvue b/pages/tabBar/template.uvue
index a42f6338..1772f15b 100644
--- a/pages/tabBar/template.uvue
+++ b/pages/tabBar/template.uvue
@@ -1,424 +1,222 @@
-<template>
-  <!-- #ifdef APP -->
-  <scroll-view style="flex: 1">
-    <!-- #endif -->
-    <view class="uni-container">
-      <view class="uni-header-logo">
-        <image class="uni-header-image" src="/static/templateIndex.png"></image>
-      </view>
-      <view class="uni-text-box">
-        <text class="hello-text">以下是部分模板示例，更多模板见插件市场：</text>
-        <u-link
-          href="https://ext.dcloud.net.cn"
-          :text="'https://ext.dcloud.net.cn'"
-          :inWhiteList="true"
-        ></u-link>
-      </view>
-      <view class="uni-panel" v-for="(item, index) in list" :key="item.id">
-        <view
-          class="uni-panel-h"
-          :class="item.open ? 'uni-panel-h-on' : ''"
-          @click="triggerCollapse(index, item)"
-        >
-          <text
-            class="uni-panel-text"
-            :class="item.enable == false ? 'text-disabled' : ''"
-            >{{ item.name }}</text
-          >
-          <image
-            :src="
-              item.pages.length > 0
-                ? item.open
-                  ? arrowUpIcon
-                  : arrowDownIcon
-                : arrowRightIcon
-            "
-            class="uni-icon"
-          >
-          </image>
-        </view>
-        <view v-if="item.open">
-          <view
-            class="uni-navigate-item"
-            :hover-class="page.enable == false ? '' : 'is--active'"
-            v-for="(page, key) in item.pages"
-            :key="key"
-            @click="goDetailPage(page)"
-          >
-            <text
-              class="uni-navigate-text"
-              :class="page.enable == false ? 'text-disabled' : ''"
-              >{{ page.name }}</text
-            >
-            <image :src="arrowRightIcon" class="uni-icon"></image>
-          </view>
-        </view>
-      </view>
-    </view>
-    <!-- #ifdef APP -->
-  </scroll-view>
-  <!-- #endif -->
-</template>
-
-<script lang="uts">
-  type Page = {
-    name : string
-    enable ?: boolean
-    url : string
+<template>
+  <!-- #ifdef APP -->
+  <scroll-view style="flex: 1">
+  <!-- #endif -->
+    <view class="uni-container">
+      <view class="uni-header-logo">
+        <image class="uni-header-image" src="/static/templateIndex.png"></image>
+      </view>
+      <view class="uni-text-box">
+        <text class="hello-text">以下是部分模板示例，更多模板见插件市场：</text>
+        <u-link href="https://ext.dcloud.net.cn" :text="'https://ext.dcloud.net.cn'" :inWhiteList="true"></u-link>
+      </view>
+      <view class="uni-panel" v-for="(item, index) in list" :key="item.id">
+        <view class="uni-panel-h" :class="item.open ? 'uni-panel-h-on' : ''" @click="triggerCollapse(index, item)">
+          <text class="uni-panel-text" :class="item.enable == false ? 'text-disabled' : ''">{{ item.name }}</text>
+          <image :src="
+              item.pages.length > 0
+                ? item.open
+                  ? arrowUpIcon
+                  : arrowDownIcon
+                : arrowRightIcon
+            " class="uni-icon">
+          </image>
+        </view>
+        <view v-if="item.open">
+          <view class="uni-navigate-item" :hover-class="page.enable == false ? '' : 'is--active'"
+            v-for="(page, key) in item.pages" :key="key" @click="goDetailPage(page)">
+            <text class="uni-navigate-text" :class="page.enable == false ? 'text-disabled' : ''">{{ page.name }}</text>
+            <image :src="arrowRightIcon" class="uni-icon"></image>
+          </view>
+        </view>
+      </view>
+    </view>
+  <!-- #ifdef APP -->
+  </scroll-view>
+  <!-- #endif -->
+</template>
+
+<script lang="uts">
+  type Page = {
+    name : string
+    enable ?: boolean
+    url : string
   }
-
-  type ListItem = {
-    id : string
-    name : string
-    open : boolean
-    pages : Page[]
-    url ?: string
-    enable ?: boolean
-  }
-  export default {
-    data() {
-      return {
-        list: [
-          {
-            id: 'long-list',
-            url: 'long-list',
-            name: '左右滑动长列表',
-            open: false,
-            enable: true,
-            pages: [
-              {
-                name: '顶部搜索框随时下移长列表',
-                url: 'long-list'
-              },
-              {
-                name: '顶部banner长列表',
-                url: 'long-list2'
-              },
-            ] as Page[],
-          },
-          {
-            id: 'list-news',
-            url: 'list-news',
-            name: '列表到详情',
-            open: false,
-            pages: [] as Page[],
-          },
-          {
-            id: 'scroll-fold-nav',
-            url: 'scroll-fold-nav',
-            name: '随滚动折叠的导航栏',
-            open: false,
-            pages: [] as Page[],
-          },
-          {
-            id: 'swiper-list',
-            url: 'swiper-list',
-            name: 'swiper-list',
-            open: false,
-            pages: [
-              {
-                name: '下划线样式',
-                url: 'swiper-list'
-              },
-              {
-                name: '字体放大样式',
-                url: 'swiper-list2'
-              },
-            ] as Page[],
-          },
-          {
-            id: 'custom-refresher',
-            url: 'custom-refresher',
-            name: '自定义下拉刷新',
-            open: false,
-            pages: [] as Page[],
-          },
-          {
-            id: 'pull-zoom-image',
-            url: 'pull-zoom-image',
-            name: '下拉缩放顶部封面图',
-            open: false,
-            pages: [] as Page[],
-          },
-          {
-            id: 'swiper-vertical-video',
-            url: 'swiper-vertical-video',
-            name: '竖滑视频',
-            open: false,
-            pages: [] as Page[],
-          },
-          {
-            id: 'scroll-sticky',
-            url: 'scroll-sticky',
-            name: 'scroll-view自定义滚动吸顶',
-            open: false,
-            pages: [] as Page[],
-          },
-          {
-            id: 'half-screen',
-            url: 'half-screen',
-            name: '半屏弹窗',
-            open: false,
-            pages: [] as Page[],
-          },
-          {
-            id: 'drop-card',
-            url: 'drop-card',
-            name: '划走式卡片',
-            open: false,
-            pages: [] as Page[],
-          },
-          {
-            id: 'navbar-lite',
-            url: 'navbar-lite',
-            name: '自定义导航栏',
-            open: false,
-            pages: [] as Page[],
-          },
-          {
-            id: 'custom-tab-bar',
-            url: 'custom-tab-bar',
-            name: '自定义TabBar',
-            open: false,
-            enable: true,
-            pages: [] as Page[],
-          },
-          {
-            id: 'calendar',
-            url: 'calendar',
-            name: '日历',
-            open: false,
-            pages: [] as Page[],
-          }, {
-            id: 'schema',
-            url: 'schema',
-            name: '打开外部链接',
-            open: false,
-            pages: [] as Page[],
-          }, {
-            id: 'share',
-            url: 'share',
-            name: '分享示例',
-            open: false,
-            pages: [] as Page[],
-          }
-        ] as ListItem[],
-        arrowUpIcon: '/static/icons/arrow-up.png',
-        arrowDownIcon: '/static/icons/arrow-down.png',
-        arrowRightIcon: '/static/icons/arrow-right.png',
-      }
-    },
-    methods: {
-      triggerCollapse(index : number, item : ListItem) {
-        if (item.pages.length == 0) {
-          const page : Page = {
-            name: item.name,
-            enable: item.enable,
-            url: item.url!,
-          }
-          this.goDetailPage(page)
-          return
-        }
-        for (var i = 0; i < this.list.length; ++i) {
-          if (index == i) {
-            this.list[i].open = !this.list[i].open
-          } else {
-            this.list[i].open = false
-          }
-        }
-      },
-      goDetailPage(e : Page) {
-        if (e.enable == false) {
-          uni.showToast({
-            icon: 'none',
-            title: '暂不支持',
-          })
-          return
-        }
-        const url =
-          e.url.indexOf('platform') > -1
-            ? e.url
-            : `/pages/template/${e.url}/${e.url}`
-        uni.navigateTo({
-          url,
-        })
-      },
-    },
-  }
-type ListItem = {
-  id: string
-  name: string
-  open: boolean
-  pages: Page[]
-  url?: string
-  enable?: boolean
-}
-export default {
-  data() {
-    return {
-      list: [
-        {
-          id: 'long-list',
-          url: 'long-list',
-          name: '左右滑动长列表',
-          open: false,
-          enable: true,
-          pages: [
-            {
-              name: '顶部搜索框随时下移长列表',
-              url:'long-list'
-            },
-            {
-              name: '顶部banner长列表',
-              url:'long-list2'
-            },
-          ] as Page[],
-        },
-        {
-          id: 'list-news',
-          url: 'list-news',
-          name: '列表到详情',
-          open: false,
-          pages: [] as Page[],
-        },
-        {
-          id: 'scroll-fold-nav',
-          url: 'scroll-fold-nav',
-          name: '随滚动折叠的导航栏',
-          open: false,
-          pages: [] as Page[],
-        },
-        {
-          id: 'swiper-list',
-          url: 'swiper-list',
-          name: 'swiper-list',
-          open: false,
-          pages: [
-            {
-              name: '下划线样式',
-              url:'swiper-list'
-            },
-            {
-              name: '字体放大样式',
-              url:'swiper-list2'
-            },
-          ] as Page[],
-        },
-        {
-          id: 'custom-refresher',
-          url: 'custom-refresher',
-          name: '自定义下拉刷新',
-          open: false,
-          pages: [] as Page[],
-        },
-        {
-          id: 'pull-zoom-image',
-          url: 'pull-zoom-image',
-          name: '下拉缩放顶部封面图',
-          open: false,
-          pages: [] as Page[],
-        },
-        {
-          id: 'swiper-vertical-video',
-          url: 'swiper-vertical-video',
-          name: '竖滑视频',
-          open: false,
-          pages: [] as Page[],
-        },
-        {
-          id: 'scroll-sticky',
-          url: 'scroll-sticky',
-          name: 'scroll-view自定义滚动吸顶',
-          open: false,
-          pages: [] as Page[],
-        },
-        {
-          id: 'half-screen',
-          url: 'half-screen',
-          name: '半屏弹窗',
-          open: false,
-          pages: [] as Page[],
-        },
-        {
-          id: 'drop-card',
-          url: 'drop-card',
-          name: '划走式卡片',
-          open: false,
-          pages: [] as Page[],
-        },
-        {
-          id: 'navbar-lite',
-          url: 'navbar-lite',
-          name: '自定义导航栏',
-          open: false,
-          pages: [] as Page[],
-        },
-        {
-          id: 'custom-tab-bar',
-          url: 'custom-tab-bar',
-          name: '自定义TabBar',
-          open: false,
-          enable: true,
-          pages: [] as Page[],
-        },
-        {
-          id: 'calendar',
-          url: 'calendar',
-          name: '日历',
-          open: false,
-          pages: [] as Page[],
-        },{
-          id: 'schema',
-          url: 'schema',
-          name: '打开外部链接',
-          open: false,
-          pages: [] as Page[],
-        },
-      ] as ListItem[],
-      arrowUpIcon: '/static/icons/arrow-up.png',
-      arrowDownIcon: '/static/icons/arrow-down.png',
-      arrowRightIcon: '/static/icons/arrow-right.png',
-    }
-  },
-  methods: {
-    triggerCollapse(index: number, item: ListItem) {
-      if (item.pages.length == 0) {
-        const page: Page = {
-          name: item.name,
-          enable: item.enable,
-          url: item.url!,
-        }
-        this.goDetailPage(page)
-        return
-      }
-      for (var i = 0; i < this.list.length; ++i) {
-        if (index == i) {
-          this.list[i].open = !this.list[i].open
-        } else {
-          this.list[i].open = false
-        }
-      }
-    },
-    goDetailPage(e: Page) {
-      if (e.enable == false) {
-        uni.showToast({
-          icon: 'none',
-          title: '暂不支持',
-        })
-        return
-      }
-      const url =
-        e.url.indexOf('platform') > -1
-          ? e.url
-          : `/pages/template/${e.url}/${e.url}`
-      uni.navigateTo({
-        url,
-      })
-    },
-  },
-}
-</script>
-
-<style>
-@import "../../common/uni-uvue.css";
+
+  type ListItem = {
+    id : string
+    name : string
+    open : boolean
+    pages : Page[]
+    url ?: string
+    enable ?: boolean
+  }
+  export default {
+    data() {
+      return {
+        list: [
+          {
+            id: 'long-list',
+            url: 'long-list',
+            name: '左右滑动长列表',
+            open: false,
+            enable: true,
+            pages: [
+              {
+                name: '顶部搜索框随时下移长列表',
+                url: 'long-list'
+              },
+              {
+                name: '顶部banner长列表',
+                url: 'long-list2'
+              },
+            ] as Page[],
+          },
+          {
+            id: 'list-news',
+            url: 'list-news',
+            name: '列表到详情',
+            open: false,
+            pages: [] as Page[],
+          },
+          {
+            id: 'scroll-fold-nav',
+            url: 'scroll-fold-nav',
+            name: '随滚动折叠的导航栏',
+            open: false,
+            pages: [] as Page[],
+          },
+          {
+            id: 'swiper-list',
+            url: 'swiper-list',
+            name: 'swiper-list',
+            open: false,
+            pages: [
+              {
+                name: '下划线样式',
+                url: 'swiper-list'
+              },
+              {
+                name: '字体放大样式',
+                url: 'swiper-list2'
+              },
+            ] as Page[],
+          },
+          {
+            id: 'custom-refresher',
+            url: 'custom-refresher',
+            name: '自定义下拉刷新',
+            open: false,
+            pages: [] as Page[],
+          },
+          {
+            id: 'pull-zoom-image',
+            url: 'pull-zoom-image',
+            name: '下拉缩放顶部封面图',
+            open: false,
+            pages: [] as Page[],
+          },
+          {
+            id: 'swiper-vertical-video',
+            url: 'swiper-vertical-video',
+            name: '竖滑视频',
+            open: false,
+            pages: [] as Page[],
+          },
+          {
+            id: 'scroll-sticky',
+            url: 'scroll-sticky',
+            name: 'scroll-view自定义滚动吸顶',
+            open: false,
+            pages: [] as Page[],
+          },
+          {
+            id: 'half-screen',
+            url: 'half-screen',
+            name: '半屏弹窗',
+            open: false,
+            pages: [] as Page[],
+          },
+          {
+            id: 'drop-card',
+            url: 'drop-card',
+            name: '划走式卡片',
+            open: false,
+            pages: [] as Page[],
+          },
+          {
+            id: 'navbar-lite',
+            url: 'navbar-lite',
+            name: '自定义导航栏',
+            open: false,
+            pages: [] as Page[],
+          },
+          {
+            id: 'custom-tab-bar',
+            url: 'custom-tab-bar',
+            name: '自定义TabBar',
+            open: false,
+            enable: true,
+            pages: [] as Page[],
+          },
+          {
+            id: 'calendar',
+            url: 'calendar',
+            name: '日历',
+            open: false,
+            pages: [] as Page[],
+          }, {
+            id: 'schema',
+            url: 'schema',
+            name: '打开外部链接',
+            open: false,
+            pages: [] as Page[],
+          },
+        ] as ListItem[],
+        arrowUpIcon: '/static/icons/arrow-up.png',
+        arrowDownIcon: '/static/icons/arrow-down.png',
+        arrowRightIcon: '/static/icons/arrow-right.png',
+      }
+    },
+    methods: {
+      triggerCollapse(index : number, item : ListItem) {
+        if (item.pages.length == 0) {
+          const page : Page = {
+            name: item.name,
+            enable: item.enable,
+            url: item.url!,
+          }
+          this.goDetailPage(page)
+          return
+        }
+        for (var i = 0; i < this.list.length; ++i) {
+          if (index == i) {
+            this.list[i].open = !this.list[i].open
+          } else {
+            this.list[i].open = false
+          }
+        }
+      },
+      goDetailPage(e : Page) {
+        if (e.enable == false) {
+          uni.showToast({
+            icon: 'none',
+            title: '暂不支持',
+          })
+          return
+        }
+        const url =
+          e.url.indexOf('platform') > -1
+            ? e.url
+            : `/pages/template/${e.url}/${e.url}`
+        uni.navigateTo({
+          url,
+        })
+      },
+    },
+  }
+</script>
+
+<style>
+  @import "../../common/uni-uvue.css";
 </style>
-- 
GitLab