Browse Source

fix(merchant): 重构页面配置和路由,移除多个页面

EvilDragon 6 months ago
parent
commit
89d3e91b4e

+ 6 - 6
packages/merchant/pages.config.ts

@@ -30,15 +30,15 @@ export default defineUniPages({
       {
         pagePath: 'pages/home/index',
       },
-      {
-        pagePath: 'pages/material/index',
-      },
+      // {
+      //   pagePath: 'pages/material/index',
+      // },
       // {
       //   pagePath: 'pages/publish/index',
       // },
-      {
-        pagePath: 'pages/messages/index',
-      },
+      // {
+      //   pagePath: 'pages/messages/index',
+      // },
       {
         pagePath: 'pages/mine/index',
       },

+ 0 - 77
packages/merchant/src/pages.json

@@ -28,12 +28,6 @@
         "pagePath": "pages/home/index"
       },
       {
-        "pagePath": "pages/material/index"
-      },
-      {
-        "pagePath": "pages/messages/index"
-      },
-      {
         "pagePath": "pages/mine/index"
       }
     ]
@@ -66,13 +60,6 @@
       }
     },
     {
-      "path": "pages/about/about",
-      "type": "page",
-      "style": {
-        "navigationBarTitleText": "关于"
-      }
-    },
-    {
       "path": "pages/designer/detail",
       "type": "page",
       "style": {
@@ -105,24 +92,6 @@
       }
     },
     {
-      "path": "pages/material/index",
-      "type": "page",
-      "layout": "tabbar",
-      "style": {
-        "navigationBarTitleText": "材料",
-        "navigationStyle": "custom"
-      }
-    },
-    {
-      "path": "pages/messages/index",
-      "type": "page",
-      "layout": "tabbar",
-      "style": {
-        "navigationBarTitleText": "消息",
-        "navigationBarBackgroundColor": "#fff"
-      }
-    },
-    {
       "path": "pages/mine/index",
       "type": "page",
       "layout": "tabbar",
@@ -182,28 +151,6 @@
       }
     },
     {
-      "path": "pages/material/calculator/index",
-      "type": "page",
-      "style": {
-        "navigationStyle": "custom"
-      }
-    },
-    {
-      "path": "pages/material/detail/index",
-      "type": "page",
-      "style": {
-        "navigationStyle": "custom"
-      }
-    },
-    {
-      "path": "pages/material/recommend/index",
-      "type": "page",
-      "style": {
-        "navigationBarBackgroundColor": "#fff",
-        "navigationBarTitleText": "推荐材料商"
-      }
-    },
-    {
       "path": "pages/mine/authentication/index",
       "type": "page",
       "style": {
@@ -220,30 +167,6 @@
       }
     },
     {
-      "path": "pages/publish/cases/index",
-      "type": "page",
-      "style": {
-        "navigationBarTitleText": "设计案例",
-        "navigationBarBackgroundColor": "#fff"
-      }
-    },
-    {
-      "path": "pages/publish/moment/index",
-      "type": "page",
-      "style": {
-        "navigationBarTitleText": "个人动态",
-        "navigationBarBackgroundColor": "#fff"
-      }
-    },
-    {
-      "path": "pages/publish/tags/index",
-      "type": "page",
-      "style": {
-        "navigationBarTitleText": "添加标签",
-        "navigationBarBackgroundColor": "#fff"
-      }
-    },
-    {
       "path": "pages/home/tasks/detail/index",
       "type": "page",
       "style": {

+ 0 - 36
packages/merchant/src/pages/about/about.vue

@@ -1,36 +0,0 @@
-<route lang="json5">
-{
-  style: {
-    navigationBarTitleText: '关于',
-  },
-}
-</route>
-
-<template>
-  <view
-    class="bg-white overflow-hidden pt-2 px-4"
-    :style="{ marginTop: safeAreaInsets?.top + 'px' }"
-  >
-    <view class="text-center text-3xl mt-8">
-      鸽友们好,我是
-      <text class="text-red-500">菲鸽</text>
-    </view>
-    <RequestComp />
-    <UploadComp />
-  </view>
-</template>
-
-<script lang="ts" setup>
-import RequestComp from './components/request.vue'
-import UploadComp from './components/upload.vue'
-
-// 获取屏幕边界到安全区域距离
-const { safeAreaInsets } = uni.getSystemInfoSync()
-</script>
-
-<style lang="scss" scoped>
-.test-css {
-  // mt-4=>1rem=>16px;
-  margin-top: 16px;
-}
-</style>

+ 0 - 56
packages/merchant/src/pages/about/components/request.vue

@@ -1,56 +0,0 @@
-<route lang="json5">
-{
-  layout: 'demo',
-  style: {
-    navigationBarTitleText: '请求',
-  },
-}
-</route>
-
-<template>
-  <view class="p-6 text-center">
-    <view class="my-2">使用的是 laf 云后台</view>
-    <view class="text-green-400">我的推荐码,可以获得佣金</view>
-
-    <!-- #ifdef H5 -->
-    <view class="my-2">
-      <a class="my-2" :href="recommendUrl" target="_blank">{{ recommendUrl }}</a>
-    </view>
-    <!-- #endif -->
-
-    <!-- #ifndef H5 -->
-    <view class="my-2 text-left text-sm">{{ recommendUrl }}</view>
-    <!-- #endif -->
-
-    <!-- http://localhost:9000/#/pages/index/request -->
-    <wd-button @click="run" class="my-6">发送请求</wd-button>
-    <view class="h-12">
-      <view v-if="loading">loading...</view>
-      <block v-else>
-        <view class="text-xl">请求数据如下</view>
-        <view class="text-green leading-8">{{ JSON.stringify(data) }}</view>
-      </block>
-    </view>
-    <wd-button type="error" @click="reset" class="my-6" :disabled="!data">重置数据</wd-button>
-  </view>
-</template>
-
-<script lang="ts" setup>
-import { getFooAPI, postFooAPI, IFooItem } from '@/service/index/foo'
-
-const recommendUrl = ref('http://laf.run/signup?code=ohaOgIX')
-
-// const initialData = {
-//   name: 'initialData',
-//   id: '1234',
-// }
-const initialData = undefined
-// 适合少部分全局性的接口————多个页面都需要的请求接口,额外编写一个 Service 层
-const { loading, error, data, run } = useRequest<IFooItem>(() => getFooAPI('菲鸽'), {
-  immediate: true,
-  initialData,
-})
-const reset = () => {
-  data.value = initialData
-}
-</script>

+ 0 - 30
packages/merchant/src/pages/about/components/upload.vue

@@ -1,30 +0,0 @@
-<route lang="json5" type="page">
-{
-  layout: 'default',
-  style: {
-    navigationBarTitleText: '上传-状态一体化',
-  },
-}
-</route>
-
-<template>
-  <view class="p-4 text-center">
-    <wd-button @click="run">选择图片并上传</wd-button>
-    <view v-if="loading" class="text-blue h-10">上传...</view>
-    <template v-else>
-      <view class="m-2">上传后返回的接口数据:</view>
-      <view class="m-2">{{ data }}</view>
-      <view class="h-80 w-full">
-        <image v-if="data" :src="data || data" mode="scaleToFill" />
-      </view>
-    </template>
-  </view>
-</template>
-
-<script lang="ts" setup>
-const { loading, data, run } = useUpload({ user: '菲鸽' })
-</script>
-
-<style lang="scss" scoped>
-//
-</style>

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

@@ -1,4 +1,3 @@
-<!-- 使用 type="home" 属性设置首页,其他页面不需要设置,默认为page;推荐使用json5,更强大,且允许注释 -->
 <route lang="json5" type="home">
 {
   layout: 'tabbar',
@@ -164,7 +163,7 @@ onShareAppMessage(() => ({}))
                 <div class="flex-1 mx-3">
                   <SectionHeading
                     :title="label"
-                    path="/pages/home/index"
+                    path="/pages/designer/index"
                     size="sm"
                   ></SectionHeading>
                 </div>

+ 0 - 49
packages/merchant/src/pages/material/calculator/index.vue

@@ -1,49 +0,0 @@
-<route lang="yaml">
-style:
-  navigationStyle: 'custom'
-#   navigationBarColor: 'transparent'
-</route>
-<script setup lang="ts">
-import Card from '@/components/card.vue'
-import { calculatorBg, linkBuckle } from '@/core/libs/pngs'
-</script>
-<template>
-  <div class="flex-grow px-3.5" :style="{ background: `url(${calculatorBg}) 100% 100%` }">
-    <div
-      class="text-center text-[#e7d2c6] text-[34px] font-bold font-['Alimama ShuHeiTi'] leading-relaxed"
-    >
-      积分计算器
-    </div>
-    <div class="text-center text-white text-base font-normal font-['PingFang SC'] leading-relaxed">
-      获取积分小帮手
-    </div>
-    <Card>
-      <div class="text-[#ef4343] text-[40px] font-normal font-['D-DIN Exp'] leading-normal">
-        16000
-      </div>
-      <div
-        class="text-center text-black text-base font-normal font-['PingFang SC'] leading-relaxed"
-      >
-        积分
-      </div>
-    </Card>
-    <div class="relative h-2.5">
-      <div class="flex justify-around absolute left-0 right-0 top--3">
-        <wd-img :width="8" :src="linkBuckle" mode="widthFix" />
-        <div></div>
-        <wd-img :width="8" :src="linkBuckle" mode="widthFix" />
-      </div>
-    </div>
-    <Card>
-      <wd-input></wd-input>
-      <wd-input></wd-input>
-      <wd-input></wd-input>
-      <wd-button :round="false" block custom-class="my-4">开始计算</wd-button>
-      <div
-        class="text-center text-black/40 text-xs font-normal font-['PingFang SC'] leading-relaxed"
-      >
-        积分 = 订单金额 x 20% x 10 x 材料商兑换积分比例
-      </div>
-    </Card>
-  </div>
-</template>

+ 0 - 63
packages/merchant/src/pages/material/detail/index.vue

@@ -1,63 +0,0 @@
-<route lang="yaml">
-style:
-  navigationStyle: custom
-</route>
-<script setup lang="ts">
-import Card from '@/components/card.vue'
-import SectionHeading from '@/components/section-heading.vue'
-import StartMenuButton from '@/components/start-menu-button.vue'
-</script>
-<template>
-  <view class="w-full">
-    <div class="w-full aspect-[1.16/1] bg-amber"><StartMenuButton></StartMenuButton></div>
-    <div class="relative top--8 px-3.5">
-      <Card>
-        <img
-          class="w-[78px] h-[78px] rounded-full border border-[#f2f2f2]"
-          src="https://via.placeholder.com/78x78"
-        />
-        <div class="text-black/90 text-lg font-normal font-['PingFang SC'] leading-[10.18px]">
-          IMOLA瓷砖
-        </div>
-        <div class="text-black/40 text-xs font-normal font-['PingFang SC'] leading-[10.18px]">
-          进口品牌 | 瓷砖
-        </div>
-        <div class="text-black/60 text-xs font-normal font-['PingFang SC'] leading-normal">
-          自营品牌
-        </div>
-        <div class="text-black/60 text-xs font-normal font-['PingFang SC'] leading-normal">
-          70%积分
-        </div>
-        <div>
-          <span class="text-black/40 text-xs font-normal font-['PingFang SC'] leading-[10.18px]">
-            经营品牌:
-          </span>
-          <span
-            class="text-black/40 text-xs font-normal font-['PingFang SC'] uppercase leading-[10.18px]"
-          >
-            imola / chedit
-          </span>
-        </div>
-      </Card>
-      <Card class="my-6">
-        <div class="my-6 text-black/90 text-lg font-normal font-['PingFang SC'] leading-[10.18px]">
-          品牌介绍
-        </div>
-        <img class="w-[319px] h-[194px] rounded-xl" src="https://via.placeholder.com/319x194" />
-        <div class="text-black/90 text-base font-normal font-['PingFang SC'] leading-[10.18px]">
-          Imola瓷砖
-        </div>
-        <div
-          class="w-[319px] h-[186px] text-justify text-black/60 text-sm font-normal font-['PingFang SC'] leading-[25px]"
-        >
-          意大利“蜜蜂”瓷砖制造商—伊莫拉陶瓷股份公司,创建于1874年,意大利IMOLA市。历经百余年,凭借着对工作的执着,对美的追求和不断的创新意识,伊莫拉缔造出“蜜蜂”这一世界知名品牌。
-          <br />
-          “蜜蜂”是具有代表意大利风格及产品质量并极富艺术创造力的典型品牌,其生产始终沿着两条轨道运行,一是及时掌握体现时代趋势和审美品位的设计理念,二是不断提高产品科技含量和制作工艺。
-        </div>
-      </Card>
-      <SectionHeading title="产品展示" custom-class="my-6"></SectionHeading>
-      <img class="w-[347px] h-[209px] rounded-2xl" src="https://via.placeholder.com/347x209" />
-      <wd-button custom-class="w-full! rounded-lg!">下载所有素材包</wd-button>
-    </div>
-  </view>
-</template>

+ 0 - 182
packages/merchant/src/pages/material/index.vue

@@ -1,182 +0,0 @@
-<route lang="json5">
-{ layout: 'tabbar', style: { navigationBarTitleText: '材料', navigationStyle: 'custom' } }
-</route>
-
-<script setup lang="ts">
-import Card from '@/components/card.vue'
-import SectionHeading from '@/components/section-heading.vue'
-import { abc, calculator, treaty } from '@/core/libs/pngs'
-import { getMaterialDealers } from '@/core/libs/requests'
-import { materialDealers, close, phone } from '@/core/libs/svgs'
-
-const { data, run } = useRequest(getMaterialDealers)
-const dealerPanelState = ref(false)
-const pieces = ref([
-  {
-    title: '材料小课堂',
-    desc: '全方位了解',
-    icon: abc,
-    class: 'col-start-1 row-start-1',
-    // iconSize: 102,
-  },
-  {
-    title: '积分计算机',
-    desc: '积分小帮手',
-    icon: calculator,
-    class: 'col-start-2 row-start-1',
-    path: '/pages/material/calculator/index',
-    // iconSize: 68,
-  },
-  {
-    title: '推荐材料商',
-    desc: '我们将优先洽谈大家推荐的材料商',
-    icon: materialDealers,
-    class: 'col-start-1 row-start-2 col-end-3',
-    // iconSize: 44,
-    isMore: true,
-    path: '/pages/material/recommend/index',
-  },
-])
-const handleMenuItemClick = ({ path }: any) => {
-  uni.navigateTo({ url: path })
-}
-const toDetail = () => {
-  uni.navigateTo({
-    url: '/pages/material/detail/index',
-  })
-}
-onMounted(() => {
-  run()
-})
-</script>
-<template>
-  <view class="">
-    <view class="bg-black w-full pos-relative aspect-[1.26/1]">
-      <wd-img custom-class="w-[375px] h-[297px]" src="https://via.placeholder.com/375x297" />
-      <!-- <div
-        class="w-[375px] h-[90px] bg-gradient-to-t from-black to-black/0 absolute left-0 bottom-0 w-full flex items-center"
-      >
-        <view class="mx-7">
-          <wd-button plain custom-class="bg-transparent! border-white! text-white!">
-            02:30
-          </wd-button>
-        </view>
-      </div> -->
-    </view>
-
-    <view class="bg-[#f6f6f6] relative bottom-4 rounded-t-2xl py-1">
-      <div class="my-6 grid grid-gap-2.5 mx-3.5">
-        <template v-for="it of pieces" :key="it.title">
-          <card
-            :custom-class="[it.class, 'flex justify-between items-center'].join(' ')"
-            @click="handleMenuItemClick(it)"
-          >
-            <view class="flex items-end justify-end">
-              <wd-img :src="it.icon" :width="42" :height="42"></wd-img>
-            </view>
-            <div class="flex-1 flex flex-col justify-around h-full">
-              <div
-                class="text-black/80 text-base font-normal font-['PingFang SC'] leading-[10.18px]"
-              >
-                {{ it.title }}
-              </div>
-              <div
-                class="mt-1 text-black/40 text-xs font-normal font-['PingFang SC'] leading-normal"
-              >
-                {{ it.desc }}
-              </div>
-            </div>
-            <div v-if="it.isMore" class="mr--4">
-              <wd-button
-                custom-class="text-black/40!"
-                type="icon"
-                icon="arrow-right"
-                icon-color=""
-              ></wd-button>
-            </div>
-          </card>
-        </template>
-      </div>
-      <SectionHeading title="自营品牌" custom-class="mx-3.5"></SectionHeading>
-      <div class="my-6 flex px-1.75">
-        <template v-for="(it, i) in data" :key="i">
-          <Card custom-class="mx-1.75" :style="{ width: 'calc(50vw - 96rpx)' }" @click="toDetail">
-            <div class="flex flex-col items-center">
-              <wd-img
-                width="78"
-                height="78"
-                custom-class="border border-[#f2f2f2] rounded-full overflow-hidden"
-                :src="it.icon"
-              ></wd-img>
-              <div
-                class="my-4 text-black/90 text-base font-normal font-['PingFang SC'] leading-[10.18px]"
-              >
-                IMOLA瓷砖
-              </div>
-              <div
-                class="mb-4 text-black/60 text-sm font-normal font-['PingFang SC'] leading-[10.18px]"
-              >
-                进口品牌 | 瓷砖
-              </div>
-              <wd-button size="small" custom-class="my-4" @click="dealerPanelState = true">
-                联系商家
-              </wd-button>
-              <div class="text-black/30 text-xs font-normal font-['PingFang SC'] leading-[10.18px]">
-                {{ it.views }}次到店打卡
-              </div>
-            </div>
-          </Card>
-        </template>
-      </div>
-    </view>
-
-    <!-- <wd-action-sheet v-model="dealerPanelState">
-      <div class="relative absolute">
-        <div class="absolute top--4">x</div>
-      </div>
-      <view style="padding: 15px 15px 150px 15px">内容</view>
-    </wd-action-sheet> -->
-    <wd-overlay :show="dealerPanelState" @click="dealerPanelState = false">
-      <view class="wrapper bg-amber/50 flex flex-col justify-end h-full">
-        <div class="w-full flex justify-end mb-4">
-          <div class="mr-3.5">
-            <wd-button type="text" custom-class="w-8! h-8! p-0!" size="small">
-              <wd-img :src="close" width="28" height="28" custom-class="vertical-bottom"></wd-img>
-            </wd-button>
-          </div>
-        </div>
-        <div class="bg-neutral-100 rounded-tl-2xl rounded-tr-2xl p-3.5" @click.stop="">
-          <div class="flex flex-col">
-            <template v-for="(it, i) in [{}]" :key="i">
-              <div class="bg-white rounded-2.5 p-3.5 flex items-center">
-                <div class="text-black/40 flex-1 border-r-2 border-r-[#f6f6f6] border-r-solid">
-                  <div
-                    class="text-black/90 text-lg font-normal font-['PingFang SC'] leading-normal"
-                  >
-                    曲江新区店
-                  </div>
-                  <div>
-                    <wd-icon name="location" size="15"></wd-icon>
-                    <span
-                      class="text-black/40 text-xs font-normal font-['PingFang SC'] leading-normal"
-                    >
-                      西安市曲江路精彩世家 387 号
-                    </span>
-                  </div>
-                </div>
-                <wd-button type="text" size="small" custom-class=" bg-[#f2f2f2]! p-0! ml-4">
-                  <wd-img width="28" height="28" :src="phone"></wd-img>
-                </wd-button>
-                <wd-button type="text" size="small" custom-class=" bg-[#f2f2f2]! p-0! ml-4">
-                  <wd-img width="28" height="28"></wd-img>
-                </wd-button>
-              </div>
-            </template>
-          </div>
-        </div>
-      </view>
-    </wd-overlay>
-  </view>
-</template>
-
-<style scoped lang="scss"></style>

+ 0 - 96
packages/merchant/src/pages/material/recommend/index.vue

@@ -1,96 +0,0 @@
-<route lang="yaml">
-style:
-  navigationBarBackgroundColor: '#fff'
-  navigationBarTitleText: '推荐材料商'
-</route>
-<script setup lang="ts">
-import DataForm from '@/components/data-form.vue'
-import { useToast } from 'wot-design-uni'
-
-const { success: showSuccess } = useToast()
-
-const model = reactive<{
-  value1: string
-  value2: string
-}>({
-  value1: '',
-  value2: '',
-})
-const form = ref()
-const schema = {
-  name: {
-    type: 'TextField',
-    label: '*材料商名称/品牌名称',
-  },
-  agentName: {
-    type: 'TextField',
-    label: '*对接人姓名',
-  },
-  agentPosition: {
-    type: 'TextField',
-    label: '*对接人职位',
-  },
-  agentPhone: {
-    type: 'TextField',
-    label: '*对接人电话',
-  },
-  submit: {
-    type: 'Submit',
-    label: '提交',
-    // onSubmit: handleSubmit,
-  },
-}
-
-function handleSubmit() {
-  form.value
-    .validate()
-    .then(({ valid, errors }) => {
-      if (valid) {
-        showSuccess({
-          msg: '校验通过',
-        })
-      }
-    })
-    .catch((error) => {
-      console.log(error, 'error')
-    })
-}
-</script>
-<template>
-  <div class="w-full px-3.5 bg-white">
-    <!-- <LoginTest title="推荐材料"></LoginTest> -->
-    <DataForm :schema="schema"></DataForm>
-    <div
-      class="w-[319px] h-[43px] text-center text-black/30 text-xs font-normal font-['PingFang SC'] leading-normal"
-    >
-      为满足筑巢荟设计师设计需求,各位设计师可向平台推荐优质服务材料商/施工队,平台优先进行洽谈和考核
-    </div>
-    <!-- <wd-form ref="form" :model="model" :isCell="false">
-      <wd-cell-group border>
-        <wd-input
-          label="用户名"
-          label-width="100px"
-          prop="value1"
-          clearable
-          v-model="model.value1"
-          placeholder="请输入用户名"
-          :rules="[{ required: true, message: '请填写用户名' }]"
-          :isCell="false"
-        />
-        <wd-input
-          label="密码"
-          label-width="100px"
-          prop="value2"
-          show-password
-          clearable
-          v-model="model.value2"
-          placeholder="请输入密码"
-          :rules="[{ required: true, message: '请填写密码' }]"
-        />
-      </wd-cell-group>
-      <view class="footer">
-        <wd-button type="primary" size="large" @click="handleSubmit" block>提交</wd-button>
-      </view>
-    </wd-form> -->
-  </div>
-</template>

+ 0 - 106
packages/merchant/src/pages/messages/index.vue

@@ -1,106 +0,0 @@
-<route lang="yaml">
-layout: tabbar
-style:
-  navigationBarTitleText: 消息
-  navigationBarBackgroundColor: '#fff'
-</route>
-
-<script setup lang="ts">
-import Card from '@/components/card.vue'
-import { integral, interact, system } from '@/core/libs/svgs'
-import { beforeNow } from '@/utils/date-util'
-import dayjs from 'dayjs'
-
-const tab = ref('integral')
-const tabs = ref([
-  { label: '积分消息', value: 'integral' },
-  { label: '系统消息', value: 'system' },
-  { label: '互动消息', value: 'interact' },
-])
-const msgs = ref({
-  integral: [
-    { title: '积分变动通知', createdAt: Date.now() },
-    { title: '请确认积分', createdAt: '2023-05-05' },
-  ],
-  system: [
-    {
-      title: '新豪轩门窗入驻筑巢荟',
-      createdAt: Date.now(),
-      content: '新豪轩材料商加入筑巢荟,为筑巢荟设计师提供更好的材料和服务!',
-      img: 'https://via.placeholder.com/279x164',
-    },
-    { title: '平台通知', createdAt: Date.now(), content: '有新的材料商入驻平台,点击查看!' },
-  ],
-  interact: [
-    {
-      title: '王磊回复了你',
-      createdAt: Date.now(),
-      content: '设计师李家豪刚刚点赞了你的设计圈点击前往查看',
-    },
-    {
-      title: '李琳赞了你的设计圈',
-      createdAt: Date.now(),
-      content: '设计师李家豪刚刚点赞了你的设计圈点击前往查看',
-    },
-  ],
-})
-</script>
-
-<template>
-  <view class="flex-grow">
-    <wd-tabs v-model="tab">
-      <block v-for="({ label, value }, i) in tabs" :key="i">
-        <wd-tab :title="`${label}`" :name="value"></wd-tab>
-      </block>
-    </wd-tabs>
-    <div class="p-3.5 gap-3.5 flex flex-col">
-      <template v-for="({ title, createdAt, content, img }, i) in msgs[tab]" :key="i">
-        <Card>
-          <div class="grid items-center grid-cols-[38px_auto_100px]">
-            <div class="row-start-1 col-start-1">
-              <div
-                class="w-[30px] h-[30px] bg-neutral-100 rounded-full mr-2 flex items-center justify-center"
-              >
-                <wd-img
-                  width="18"
-                  height="18"
-                  :src="{ integral: integral, system: system, interact: interact }[tab]"
-                ></wd-img>
-              </div>
-            </div>
-            <div class="row-start-1 col-start-2 text-start">
-              <div class="text-black/90 text-base font-normal font-['PingFang SC'] leading-[30px]">
-                {{ title }}
-              </div>
-            </div>
-            <div class="row-start-1 col-start-3 text-end">
-              <div class="text-black/30 text-sm font-normal font-['PingFang SC'] leading-[10.18px]">
-                {{ beforeNow(dayjs(createdAt).toDate()) }}
-              </div>
-            </div>
-            <div class="row-start-2 col-start-2 col-end-4">
-              <div
-                class="my-3 text-black/40 text-sm font-normal font-['PingFang SC'] leading-[25px]"
-              >
-                {{ content }}
-              </div>
-            </div>
-            <div v-if="img" class="row-start-3 col-start-2 col-end-4">
-              <img class="w-[279px] h-[164px] rounded-md" :src="img" />
-            </div>
-            <div class="row-start-4 col-start-1 col-end-4 my-2">
-              <div v-if="!img" class="bg-[#dadada] w-full h-[1px]"></div>
-            </div>
-            <div class="row-start-5 col-start-2 col-end-4">
-              <div class="text-black/90 text-xs font-normal font-['PingFang SC'] leading-[25px]">
-                查看详情
-              </div>
-            </div>
-          </div>
-        </Card>
-      </template>
-    </div>
-  </view>
-</template>
-
-<style scoped lang="scss"></style>

+ 0 - 48
packages/merchant/src/pages/publish/cases/index.vue

@@ -1,48 +0,0 @@
-<route lang="yaml">
-style:
-  navigationBarTitleText: 设计案例
-  navigationBarBackgroundColor: '#fff'
-</route>
-<script setup lang="ts">
-import SectionHeading from '@/components/section-heading.vue'
-
-const value = ref('')
-const fileList = ref([])
-const action = ref('')
-const handleChange = (e: any) => {
-  console.log(e)
-}
-</script>
-<template>
-  <div class="flex-grow bg-white p-3.5 flex flex-col">
-    <wd-form ref="form">
-      <wd-cell-group border>
-        <wd-picker label="空间类型:" v-model="value" />
-        <wd-picker label="设计风格:" v-model="value" />
-        <wd-input label="空间位置:" v-model="value" placeholder="填写位置" />
-        <wd-textarea
-          label="客户需求:"
-          v-model="value"
-          placeholder="请简单描述客户的生活需求和您的设计理念"
-        />
-      </wd-cell-group>
-    </wd-form>
-
-    <wd-upload
-      :file-list="fileList"
-      image-mode="aspectFill"
-      :action="action"
-      @change="handleChange"
-    ></wd-upload>
-    <SectionHeading
-      title="标签"
-      custom-class="my-6"
-      size="base"
-      path="/pages/publish/tags/index"
-    ></SectionHeading>
-    <div class="flex-1"></div>
-    <div class="w-full">
-      <wd-button type="primary" :round="false" block>发布</wd-button>
-    </div>
-  </div>
-</template>

+ 0 - 73
packages/merchant/src/pages/publish/moment/index.vue

@@ -1,73 +0,0 @@
-<route lang="yaml">
-style:
-  navigationBarTitleText: 个人动态
-  navigationBarBackgroundColor: '#fff'
-</route>
-<script setup lang="ts">
-import SectionHeading from '@/components/section-heading.vue'
-import { createCircle } from '../../../core/libs/requests'
-import { useUserStore } from '../../../store'
-import { storeToRefs } from 'pinia'
-import { useToast } from 'wot-design-uni'
-
-const userStore = useUserStore()
-const { userInfo } = storeToRefs(userStore)
-const { error } = useToast()
-const content = ref('')
-const fileList = ref([])
-const action = ref(`${import.meta.env.VITE_SERVER_BASEURL}/app-api/infra/file/upload`)
-const handleChange = ({ fileList: files }) => {
-  fileList.value = files
-  console.log(fileList.value)
-}
-const handleSubmit = async () => {
-  const { code, msg } = await createCircle({
-    stylistId: userInfo.value.userId,
-    stylistName: userInfo.value.nickname,
-    bannerUrls: fileList.value.map(({ response }) => JSON.parse(response).data),
-    tagName: '',
-    headUrl: userInfo.value.avatar,
-    circleDesc: content.value,
-    circleType: '1',
-  })
-  if (code !== 0) {
-    error(msg)
-  }
-  uni.showToast({
-    title: '发布成功',
-  })
-}
-onMounted(() => {
-  console.log(action.value)
-})
-</script>
-<template>
-  <div class="flex-grow bg-white p-3.5 flex flex-col">
-    <wd-textarea v-model="content" placeholder="分享你此刻的想法" />
-
-    <!-- <div class="flex items-center">
-      <img
-        class="w-[100px] h-[100px] rounded-lg overflow-hidden"
-        src="https://via.placeholder.com/100x100"
-      />
-      <div class="w-[100px] h-[100px] bg-[#f3f3f3] justify-center items-center inline-flex">
-        <div class="w-7 h-7 relative flex-col justify-start items-start flex"></div>
-      </div>
-    </div> -->
-    <wd-upload
-      :file-list="fileList"
-      image-mode="aspectFill"
-      :action="action"
-      @change="handleChange"
-    ></wd-upload>
-    <SectionHeading
-      title="标签"
-      custom-class="my-6"
-      path="/pages/publish/tags/index"
-    ></SectionHeading>
-    <div class="flex-1"></div>
-    <div class="w-full">
-      <wd-button type="primary" :round="false" block @click="handleSubmit">发布</wd-button>
-    </div>
-  </div>
-</template>

+ 0 - 40
packages/merchant/src/pages/publish/tags/index.vue

@@ -1,40 +0,0 @@
-<route lang="yaml">
-style:
-  navigationBarTitleText: 添加标签
-  navigationBarBackgroundColor: '#fff'
-</route>
-<script setup lang="ts">
-import SectionHeading from '@/components/section-heading.vue'
-import { ref } from 'vue'
-
-const tags = ref<string[]>(['中国园林游学', '东方艺术设计研习营', '早稻田大学深度设计游学'])
-const tags2 = ref<string[]>(['中国园林游学', '东方艺术设计研习营', '早稻田大学深度设计游学'])
-const tags3 = ref<string[]>(['中国园林游学', '东方艺术设计研习营', '早稻田大学深度设计游学'])
-</script>
-<template>
-  <div class="bg-white flex-grow p-3.5 flex flex-col">
-    <SectionHeading title="游学标签" custom-class="my-6" size="base"></SectionHeading>
-    <div class="flex flex-wrap">
-      <template v-for="(it, i) in tags" :key="i">
-        <wd-tag custom-class="m-1">{{ it }}</wd-tag>
-      </template>
-    </div>
-    <SectionHeading title="活动标签" custom-class="my-6" size="base"></SectionHeading>
-    <div class="flex flex-wrap">
-      <template v-for="(it, i) in tags2" :key="i">
-        <wd-tag custom-class="m-1" type="primary">{{ it }}</wd-tag>
-      </template>
-    </div>
-    <SectionHeading title="自定义标签" custom-class="my-6" size="base"></SectionHeading>
-    <div class="flex flex-wrap">
-      <template v-for="(it, i) in tags3" :key="i">
-        <wd-tag custom-class="m-1">{{ it }}</wd-tag>
-      </template>
-      <wd-tag custom-class="m-1">
-        <wd-icon name="add"></wd-icon>
-      </wd-tag>
-    </div>
-    <div class="flex-1"></div>
-    <div><wd-button block :round="false">确定</wd-button></div>
-  </div>
-</template>

+ 1 - 10
packages/merchant/src/types/uni-pages.d.ts

@@ -5,13 +5,10 @@
 
 interface NavigateToOptions {
   url: "/pages/home/index" |
-       "/pages/about/about" |
        "/pages/designer/detail" |
        "/pages/designer/homepage" |
        "/pages/designer/index" |
        "/pages/login/index" |
-       "/pages/material/index" |
-       "/pages/messages/index" |
        "/pages/mine/index" |
        "/pages/scan_code/index" |
        "/pages/scan_code/merchant_settings" |
@@ -19,21 +16,15 @@ interface NavigateToOptions {
        "/pages/scan_code/order_detail" |
        "/pages/scan_code/settlement" |
        "/pages/home/tasks/index" |
-       "/pages/material/calculator/index" |
-       "/pages/material/detail/index" |
-       "/pages/material/recommend/index" |
        "/pages/mine/authentication/index" |
        "/pages/mine/homepage/index" |
-       "/pages/publish/cases/index" |
-       "/pages/publish/moment/index" |
-       "/pages/publish/tags/index" |
        "/pages/home/tasks/detail/index" |
        "/pages/mine/authentication/submit/success/index";
 }
 interface RedirectToOptions extends NavigateToOptions {}
 
 interface SwitchTabOptions {
-  url: "/pages/home/index" | "/pages/material/index" | "/pages/messages/index" | "/pages/mine/index"
+  url: "/pages/home/index" | "/pages/mine/index"
 }
 
 type ReLaunchOptions = NavigateToOptions | SwitchTabOptions;