lex 2 år sedan
förälder
incheckning
f15fd68888
3 ändrade filer med 30 tillägg och 20 borttagningar
  1. 1 1
      src/router/routes-common.ts
  2. 1 0
      src/styles/index.less
  3. 28 19
      src/views/mine-orchestra/index.tsx

+ 1 - 1
src/router/routes-common.ts

@@ -237,7 +237,7 @@ export const rootRouter = [
     name: 'cashProtocol',
     component: () => import('@/views/preview-protocol/cash-protocol'),
     meta: {
-      title: '管乐团隐私政策'
+      title: '共享经济平台注册经营者协议'
     }
   },
   {

+ 1 - 0
src/styles/index.less

@@ -109,6 +109,7 @@
   -moz-osx-font-smoothing: grayscale;
   color: #2c3e50;
   min-height: 100vh;
+  font-family: PingFangSC-Regular, PingFang SC;
 }
 
 body {

+ 28 - 19
src/views/mine-orchestra/index.tsx

@@ -2,7 +2,7 @@ import OHeader from '@/components/o-header'
 import OSticky from '@/components/o-sticky'
 import request from '@/helpers/request'
 import { state } from '@/state'
-import { Button, Cell, CellGroup, Picker, Popup, Tab, Tabs } from 'vant'
+import { Button, Cell, CellGroup, Picker, Popup, Sticky, Tab, Tabs } from 'vant'
 import { defineComponent, nextTick, onMounted, reactive, ref } from 'vue'
 import styles from './index.module.less'
 import iconOrchestra from './images/icon-or.png'
@@ -98,32 +98,41 @@ export default defineComponent({
         >
           <OHeader title="我的乐团" />
         </OSticky>
+        {!!data.orchestraList.length && (
+          <CellGroup inset>
+            <Cell
+              class={styles.select}
+              center
+              isLink
+              onClick={() => (modelData.orchestraStatus = true)}
+            >
+              {{
+                icon: () => <img class={styles.icon} src={iconOrchestra} />,
+                title: () => <div class="van-ellipsis">{modelData.orchestra.name}</div>
+              }}
+            </Cell>
+          </CellGroup>
+        )}
         <OFullRefresh
           v-model:modelValue={data.loading}
           onRefresh={() => {
             data.reshLoading = true
-            data.orchestraList = []
-            nextTick(() => {
-              getData()
-            })
+            data.loading = true
+            setTimeout(() => {
+              data.reshLoading = false
+              data.loading = false
+            }, 500)
+            // data.orchestraList = []
+            // nextTick(() => {
+            //   getData()
+            // })
           }}
-          style="min-height: calc(100vh - var(--van-nav-bar-height) - var(--header-height) - var(--footer-height))"
+          style={`min-height: calc(100vh - var(--van-nav-bar-height) - var(--header-height) - var(--footer-height) - ${
+            data.orchestraList.length ? '1.2rem' : ''
+          })`}
         >
           {!data.loading && !!data.orchestraList.length && (
             <>
-              <CellGroup inset>
-                <Cell
-                  class={styles.select}
-                  center
-                  isLink
-                  onClick={() => (modelData.orchestraStatus = true)}
-                >
-                  {{
-                    icon: () => <img class={styles.icon} src={iconOrchestra} />,
-                    title: () => <div class="van-ellipsis">{modelData.orchestra.name}</div>
-                  }}
-                </Cell>
-              </CellGroup>
               <Tabs
                 v-model:active={tabActive.value}
                 class={styles.tabs}