EvilDragon 6 месяцев назад
Родитель
Сommit
d938b222e0

+ 1 - 1
packages/app/src/pages/mine/index.vue

@@ -226,7 +226,7 @@ onPageScroll(({ scrollTop }: { scrollTop: number }) => {
     <template v-else>
       <div class="relative top--36">
         <div
-          class="mx-3.5 absolute left-0 right-0 top--4 w-[347px] h-[180px] bg-gradient-to-r from-[#141414] to-[#4b4b49] rounded-tl-[10px] rounded-tr-[10px] p-3.5 box-border"
+          class="mx-3.5 absolute left-0 right-0 top--4 h-[180px] bg-gradient-to-r from-[#141414] to-[#4b4b49] rounded-tl-[10px] rounded-tr-[10px] p-3.5 box-border"
           :class="['text-[#8FB8DB]']"
         >
           <div class="flex items-center">

+ 1 - 4
packages/merchant/src/core/themes/default.ts

@@ -1,9 +1,6 @@
 import { ConfigProviderThemeVars } from 'wot-design-uni'
 
 export const defaultThemeVars: ConfigProviderThemeVars = {
-  // colorTheme: 'red',
-  buttonPrimaryBgColor: '#000',
-  // buttonPrimaryColor: '#07c160',
   buttonMediumRadius: '16rpx',
   buttonMediumHeight: '92rpx',
   // buttonLargeRadius: '8px',
@@ -12,5 +9,5 @@ export const defaultThemeVars: ConfigProviderThemeVars = {
   tagPrimaryColor: '#fff',
   tagInfoBg: '#efefef',
   tagRoundRadius: '8rpx',
-  colorTheme: 'red',
+  colorTheme: '#2357E9',
 }

+ 37 - 26
packages/merchant/src/layouts/tabbar.vue

@@ -1,19 +1,9 @@
 <script setup lang="ts">
 import TabbarEvo from '@/components/tabbar-evo.vue'
-import { iconCamera, iconWallet } from '../core/libs/pngs'
-import {
-  home,
-  homeActive,
-  material,
-  materialActive,
-  message,
-  messageActive,
-  mine,
-  mineActive,
-  publish,
-} from '../core/libs/svgs'
+import { home, homeActive, mine, mineActive, publish } from '../core/libs/svgs'
 import { currRoute } from '../utils'
 import { defaultThemeVars } from '../core/themes/default'
+import DataForm from '@designer-hub/app/src/components/data-form.vue'
 
 const publishState = ref(false)
 const items = [
@@ -23,12 +13,6 @@ const items = [
     selectedIconPath: homeActive,
     path: '/pages/home/index',
   },
-  // {
-  //   title: '材料',
-  //   iconPath: material,
-  //   selectedIconPath: materialActive,
-  //   path: '/pages/material/index',
-  // },
   {
     title: '发布',
     iconPath: publish,
@@ -36,12 +20,6 @@ const items = [
     path: '/pages/publish/index',
     hiddenTitle: true,
   },
-  // {
-  //   title: '消息',
-  //   iconPath: message,
-  //   selectedIconPath: messageActive,
-  //   path: '/pages/messages/index',
-  // },
   {
     title: '我的',
     iconPath: mine,
@@ -49,6 +27,33 @@ const items = [
     path: '/pages/mine/index',
   },
 ]
+const schema = ref({
+  user: {
+    type: 'TextField',
+    label: '设计师',
+  },
+  dateTime: {
+    type: 'TextField',
+    label: '时间',
+  },
+  type: {
+    type: 'TextField',
+    label: '类型',
+  },
+  remark: {
+    type: 'TextField',
+    label: '备注',
+  },
+  location: {
+    type: 'TextField',
+    label: '地址',
+  },
+  images: {
+    type: 'ImageUploader',
+    label: '图片',
+    max: 9,
+  },
+})
 const handleTabbarItemClick = (path: string) => {
   if (path === '/pages/publish/index') {
     publishState.value = true
@@ -79,7 +84,13 @@ const toPublishCase = () => {
       :current-path="currRoute().path"
       @click="handleTabbarItemClick"
     />
-    <div
+    <wd-action-sheet v-model="publishState" title="创建跟进" @close="publishState = false">
+      <view class="flex flex-col p-4">
+        <div><DataForm :schema="schema" direction="horizontal"></DataForm></div>
+        <div><wd-button block :round="false">提交</wd-button></div>
+      </view>
+    </wd-action-sheet>
+    <!-- <div
       v-if="publishState"
       class="bg-white/80 backdrop-blur-[100px] fixed top-0 left-0 right-0 bottom-0 z-1"
     >
@@ -112,7 +123,7 @@ const toPublishCase = () => {
           ></wd-button>
         </div>
       </div>
-    </div>
+    </div> -->
     <wd-toast />
     <wd-message-box />
   </wd-config-provider>

+ 0 - 1
packages/merchant/src/pages/home/index.vue

@@ -153,7 +153,6 @@ onShareAppMessage(() => ({}))
             <div class="h-12 bg-white rounded-lg shadow flex items-center hover:bg-[#fff6f5]">
               <div
                 class="w-1.5 h-12 rounded-tl-lg rounded-bl-lg shadow"
-                :class="[`bg-[${color}]`]"
                 :style="{ background: color }"
               ></div>
               <div class="flex-1 mx-3">