merge code

packages/app/src/pages.json

@@ -630,16 +630,5 @@
       }
     }
   ],
-  "requiredPrivateInfos": [
-    "getLocation",
-    "onLocationChange",
-    "startLocationUpdateBackground",
-    "chooseAddress"
-  ],
-  "permission": {
-    "scope.userLocation": {
-      "desc": "你的位置信息将用于小程序位置接口的效果展示" // 高速公路行驶持续后台定位
-    }
-  },
   "subPackages": []
-}
+}

packages/app/src/pages/mine/honors/detail/collection.vue

@@ -14,16 +14,6 @@ import { NetImages } from '../../../../core/libs/net-images'
 import dayjs from 'dayjs'
 
 const id = ref<string | number>()
-// 游学徽章,活动徽章,积分徽章,典藏勋章,传播徽章,打卡徽章,课程徽章
-const badgeTypes = ref([
-  { label: '游学徽章', value: '游学徽章' },
-  { label: '活动徽章', value: '活动徽章' },
-  { label: '积分徽章', value: '积分徽章' },
-  { label: '典藏勋章', value: '典藏勋章' },
-  { label: '传播徽章', value: '传播徽章' },
-  { label: '打卡徽章', value: '打卡徽章' },
-  { label: '课程徽章', value: '课程徽章' },
-])
 const { data: collectionBadges, run: setCollectionBadges } = useRequest(
   () => getCollectionBadge({ badgeId: id.value }),
   {

packages/app/src/pages/mine/honors/leaderboard/index.vue

@@ -182,7 +182,7 @@ onLoad(async (query?: Record<string | 'active' | 'id' | 'isShared', string>) =>
   </div>
 </template>
 
-<style lang="scss">
+<style lang="scss" scoped>
 .sign-bg1 {
   border-radius: 20px;
   border: 1px solid #e5c57f;

packages/merchant/src/assets/svgs/leader-v1.svg

@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="50" height="26" viewBox="0 0 50 26" fill="none">
+  <path d="M0 16L5.5 25.5H45L50 16C47.3333 17 41.6 18.8 40 18C38.4 17.2 39.3333 10.3333 40 7C38 9 33.5 13 31.5 13C29.5 13 26.6667 4.33333 25.5 0C24.5 4.33333 21.8 13 19 13C16.2 13 12.5 9 11 7C11.5 10.3333 12 17.2 10 18C8 18.8 2.5 17 0 16Z" fill="url(#paint0_linear_946_2979)"/>
+  <defs>
+    <linearGradient id="paint0_linear_946_2979" x1="25" y1="0" x2="25" y2="25.5" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#FAE867"/>
+      <stop offset="1" stop-color="#FCC02C"/>
+    </linearGradient>
+  </defs>
+</svg>

packages/merchant/src/assets/svgs/leader-v2.svg

@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="24" viewBox="0 0 48 24" fill="none">
+  <path d="M0.510742 15.0188L5.62646 23.8551H42.3667L47.0173 15.0188C44.537 15.949 39.2042 17.6232 37.716 16.8791C36.2278 16.135 37.0959 9.74808 37.716 6.64764C35.8557 8.5079 31.6701 12.2284 29.8099 12.2284C27.9496 12.2284 25.3142 4.16729 24.2291 0.136719C23.299 4.16729 20.7876 12.2284 18.1832 12.2284C15.5789 12.2284 12.1374 8.5079 10.7422 6.64764C11.2073 9.74808 11.6723 16.135 9.81206 16.8791C7.95179 17.6232 2.83607 15.949 0.510742 15.0188Z" fill="url(#paint0_linear_946_2990)"/>
+  <defs>
+    <linearGradient id="paint0_linear_946_2990" x1="23.764" y1="0.136719" x2="23.764" y2="23.8551" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#E9F1F8"/>
+      <stop offset="1" stop-color="#D1E0EE"/>
+    </linearGradient>
+  </defs>
+</svg>

packages/merchant/src/assets/svgs/leader-v3.svg

@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="24" viewBox="0 0 48 24" fill="none">
+  <path d="M0.510742 15.0188L5.62646 23.8551H42.3667L47.0173 15.0188C44.537 15.949 39.2042 17.6232 37.716 16.8791C36.2278 16.135 37.0959 9.74808 37.716 6.64764C35.8557 8.5079 31.6701 12.2284 29.8099 12.2284C27.9496 12.2284 25.3142 4.16729 24.2291 0.136719C23.299 4.16729 20.7876 12.2284 18.1832 12.2284C15.5789 12.2284 12.1374 8.5079 10.7422 6.64764C11.2073 9.74808 11.6723 16.135 9.81206 16.8791C7.95179 17.6232 2.83607 15.949 0.510742 15.0188Z" fill="url(#paint0_linear_946_3001)"/>
+  <defs>
+    <linearGradient id="paint0_linear_946_3001" x1="23.764" y1="0.136719" x2="23.764" y2="23.8551" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#F1DBD0"/>
+      <stop offset="1" stop-color="#A87F79"/>
+    </linearGradient>
+  </defs>
+</svg>

packages/merchant/src/assets/svgs/platform-v1.svg

@@ -0,0 +1,19 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="137" height="95" viewBox="0 0 137 95" fill="none">
+  <path d="M137 12H0L28.1157 0H110.418L137 12Z" fill="url(#paint0_linear_946_2969)"/>
+  <mask id="path-2-outside-1_946_2969" maskUnits="userSpaceOnUse" x="0" y="11" width="137" height="84" fill="black">
+    <rect fill="white" y="11" width="137" height="84"/>
+    <path d="M0 13C0 12.4477 0.447715 12 1 12H136C136.552 12 137 12.4477 137 13V94C137 94.5523 136.552 95 136 95H0.999996C0.447712 95 0 94.5523 0 94V13Z"/>
+  </mask>
+  <path d="M0 13C0 12.4477 0.447715 12 1 12H136C136.552 12 137 12.4477 137 13V94C137 94.5523 136.552 95 136 95H0.999996C0.447712 95 0 94.5523 0 94V13Z" fill="url(#paint1_linear_946_2969)"/>
+  <path d="M0 13C0 12.0335 0.783502 11.25 1.75 11.25H135.25C136.216 11.25 137 12.0335 137 13C137 12.8619 136.552 12.75 136 12.75H1C0.447715 12.75 0 12.8619 0 13ZM137 95H0H137ZM0 95V12V95ZM137 12V95V12Z" fill="#3A3633" mask="url(#path-2-outside-1_946_2969)"/>
+  <defs>
+    <linearGradient id="paint0_linear_946_2969" x1="68.5" y1="12" x2="68.5" y2="-2.854e-08" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#353130"/>
+      <stop offset="1" stop-color="#262629" stop-opacity="0.6"/>
+    </linearGradient>
+    <linearGradient id="paint1_linear_946_2969" x1="68.5" y1="12" x2="68.5" y2="95" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#2A272D"/>
+      <stop offset="1" stop-color="#1C1D23"/>
+    </linearGradient>
+  </defs>
+</svg>

packages/merchant/src/assets/svgs/platform-v2.svg

@@ -0,0 +1,19 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="137" height="95" viewBox="0 0 137 95" fill="none">
+  <path d="M137 12H0L28.1157 0H110.418L137 12Z" fill="url(#paint0_linear_946_2966)"/>
+  <mask id="path-2-outside-1_946_2966" maskUnits="userSpaceOnUse" x="0" y="11" width="137" height="84" fill="black">
+    <rect fill="white" y="11" width="137" height="84"/>
+    <path d="M0 13C0 12.4477 0.447715 12 1 12H136C136.552 12 137 12.4477 137 13V94C137 94.5523 136.552 95 136 95H0.999996C0.447712 95 0 94.5523 0 94V13Z"/>
+  </mask>
+  <path d="M0 13C0 12.4477 0.447715 12 1 12H136C136.552 12 137 12.4477 137 13V94C137 94.5523 136.552 95 136 95H0.999996C0.447712 95 0 94.5523 0 94V13Z" fill="url(#paint1_linear_946_2966)"/>
+  <path d="M0 13C0 12.0335 0.783502 11.25 1.75 11.25H135.25C136.216 11.25 137 12.0335 137 13C137 12.8619 136.552 12.75 136 12.75H1C0.447715 12.75 0 12.8619 0 13ZM137 95H0H137ZM0 95V12V95ZM137 12V95V12Z" fill="#3A3633" mask="url(#path-2-outside-1_946_2966)"/>
+  <defs>
+    <linearGradient id="paint0_linear_946_2966" x1="68.5" y1="12" x2="68.5" y2="-2.854e-08" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#353130"/>
+      <stop offset="1" stop-color="#262629" stop-opacity="0.6"/>
+    </linearGradient>
+    <linearGradient id="paint1_linear_946_2966" x1="68.5" y1="12" x2="68.5" y2="95" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#2A272D"/>
+      <stop offset="1" stop-color="#1C1D23"/>
+    </linearGradient>
+  </defs>
+</svg>

packages/merchant/src/assets/svgs/platform-v3.svg

@@ -0,0 +1,19 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="137" height="95" viewBox="0 0 137 95" fill="none">
+  <path d="M137 12H0L28.1157 0H110.418L137 12Z" fill="url(#paint0_linear_946_2963)"/>
+  <mask id="path-2-outside-1_946_2963" maskUnits="userSpaceOnUse" x="0" y="11" width="137" height="84" fill="black">
+    <rect fill="white" y="11" width="137" height="84"/>
+    <path d="M0 13C0 12.4477 0.447715 12 1 12H136C136.552 12 137 12.4477 137 13V94C137 94.5523 136.552 95 136 95H0.999996C0.447712 95 0 94.5523 0 94V13Z"/>
+  </mask>
+  <path d="M0 13C0 12.4477 0.447715 12 1 12H136C136.552 12 137 12.4477 137 13V94C137 94.5523 136.552 95 136 95H0.999996C0.447712 95 0 94.5523 0 94V13Z" fill="url(#paint1_linear_946_2963)"/>
+  <path d="M0 13C0 12.0335 0.783502 11.25 1.75 11.25H135.25C136.216 11.25 137 12.0335 137 13C137 12.8619 136.552 12.75 136 12.75H1C0.447715 12.75 0 12.8619 0 13ZM137 95H0H137ZM0 95V12V95ZM137 12V95V12Z" fill="#3A3633" mask="url(#path-2-outside-1_946_2963)"/>
+  <defs>
+    <linearGradient id="paint0_linear_946_2963" x1="68.5" y1="12" x2="68.5" y2="-2.854e-08" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#353130"/>
+      <stop offset="1" stop-color="#262629" stop-opacity="0.6"/>
+    </linearGradient>
+    <linearGradient id="paint1_linear_946_2963" x1="68.5" y1="12" x2="68.5" y2="95" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#2A272D"/>
+      <stop offset="1" stop-color="#1C1D23"/>
+    </linearGradient>
+  </defs>
+</svg>

packages/merchant/src/components/data-form.vue

@@ -108,7 +108,7 @@ const validate = async (): Promise<{ valid: boolean; errors: any[] }> => {
   return await form.value!.validate()
 }
 onShow(() => {
-  console.log('App Show',modelValue)
+  console.log('App Show', modelValue)
 })
 defineExpose({
   validate,
@@ -167,6 +167,7 @@ defineExpose({
           <wd-datetime-picker
             v-model="modelValue[prop]"
             v-if="type === 'TimePick'"
+            :minDate="315514870000"
             v-bind="{
               ...(direction === 'vertical'
                 ? verticalDefaultProps[type]

packages/merchant/src/core/libs/svgs.ts

@@ -26,11 +26,16 @@ import mine from '@/assets/svgs/mine.svg'
 import publish from '@/assets/svgs/publish.svg'
 import order from '@/assets/svgs/order.svg'
 import close from '@/assets/svgs/close.svg'
-import materialDealers from '@/assets/svgs/material-dealers.svg'
 import memberIconV1 from '@/assets/svgs/member-icon-v1.svg'
 import memberIconV2 from '@/assets/svgs/member-icon-v2.svg'
 import memberIconV3 from '@/assets/svgs/member-icon-v3.svg'
 import memberIconV4 from '@/assets/svgs/member-icon-v4.svg'
+import leaderV1 from '@/assets/svgs/leader-v1.svg'
+import leaderV2 from '@/assets/svgs/leader-v2.svg'
+import leaderV3 from '@/assets/svgs/leader-v3.svg'
+import platformV1 from '@/assets/svgs/platform-v1.svg'
+import platformV2 from '@/assets/svgs/platform-v2.svg'
+import platformV3 from '@/assets/svgs/platform-v3.svg'
 import phone from '@/assets/svgs/phone.svg'
 import route from '@/assets/svgs/route.svg'
 import system from '@/assets/svgs/system.svg'
@@ -60,6 +65,12 @@ export {
   memberIconV2,
   memberIconV3,
   memberIconV4,
+  leaderV1,
+  leaderV2,
+  leaderV3,
+  platformV1,
+  platformV2,
+  platformV3,
   material,
   homeActive,
   home,
@@ -70,7 +81,6 @@ export {
   publish,
   order,
   close,
-  materialDealers,
   phone,
   route,
   system,