Browse Source

跟进记录图标

15591641157 2 months ago
parent
commit
2d83459ae0

+ 10 - 5
packages/app/src/pages/home/mall/detail/index.vue

@@ -106,11 +106,16 @@ onShareTimeline(() => ({
     <div class="aspect-[1.34/1] relative">
       <div class="absolute aspect-[1.26/1] top-0 w-full">
         <swiper>
-          <template v-for="(it, index) in data?.productDetailsImgUrl?.split(',')" :key="index">
-            <swiper-item>
-              <wd-img width="100%" height="100%" mode="aspectFill" :src="it"/>
-            </swiper-item>
-          </template>
+          <wd-swiper
+            custom-class="rounded-1xl overflow-hidden aspect-[1.29/1]"
+            width="100%"
+            height="100%"
+            :list="data?.productDetailsImgUrl?.split(',')"
+            autoplay
+            v-model:current="current"
+            :indicator="{ type: 'dots-bar' } as any"
+            @click="handleClick"
+          ></wd-swiper>
         </swiper>
       </div>
     </div>

+ 2 - 1
packages/app/src/pages/material/recommend/index.vue

@@ -13,6 +13,7 @@ import { createMaterialsReferrer } from '../../../core/libs/requests'
 import {useRouter} from "@/core/utils/router";
 const { success, error } = useToast()
 const userStore = useUserStore()
+import { requestToast, toast } from '../../../core/utils/common'
 const router = useRouter()
 const { userInfo } = storeToRefs(userStore)
 const form = ref<InstanceType<typeof DataForm>>()
@@ -22,7 +23,7 @@ const handleSubmit = async () => {
   if (valid) {
     console.log(formData.value)
     const { code, msg } = await createMaterialsReferrer(formData.value)
-    code === 0 && success('提交成功')
+    code === 0 && toast('提交成功')
     code !== 0 && error(msg)
   }
   uni.switchTab({

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

@@ -10,11 +10,14 @@ import { requestToast } from '../../../../core/utils/common'
 import { useMessage } from 'wot-design-uni'
 import { right } from '@/core/libs/svgs'
 import CouponRecord from '@/pages/common/components/coupon-record.vue'
+import {useRouter} from "@/core/utils/router";
 
 const { confirm } = useMessage()
 const id = ref()
+const router = useRouter()
 const status = ref({ '0': '已报名', '1': '已完成', '2': '未核销', '3': '已取消', '4': '待交付' })
 const payTypes = ref({ '0': '积分支付', '1': '现金支付' })
+const title = ref({4:'案例拍摄',5:'微信代运营',3:'品质商城'})
 const { data, run: setData } = useRequest(() => getPointsOrder(id.value), {})
 const handleSubmit = async () => {
   await confirm({
@@ -31,6 +34,22 @@ const handleSubmit = async () => {
     },
   })
 }
+const routhInfo = (product) =>{
+  if (product.orderType == 0){
+    router.push('/pages/home/activity/detail/index?id='+product.projectId+'&type=studyTour')
+  }
+  if (product.orderType == 1){
+    router.push('/pages/home/activity/detail/index?id='+product.projectId+'&type=activity')
+  }
+  if (product.orderType == 2 ){
+      if(product.item == 5 || product.item == 4){
+        router.push('/pages/home/spread/product-detail/index?id='+product.productId+'&title='+title.value[product.item]+'&item='+product.item)
+      }
+      if (product.item == 3){
+        router.push('/pages/home/spread/product-detail/index?id='+product.productId+'&title='+title.value[product.item])
+      }
+  }
+}
 onLoad((query: { id: string }) => {
   id.value = query.id
   setData()
@@ -45,7 +64,7 @@ onLoad((query: { id: string }) => {
         {{ status[data?.orderStatus] }}
       </div>
     </div>
-    <div class="flex gap-4 border-b border-b-solid border-b-[#f2f2f2] pb-5">
+    <div class="flex gap-4 border-b border-b-solid border-b-[#f2f2f2] pb-5" @click="routhInfo(data)">
       <wd-img
         width="94"
         height="94"

+ 7 - 4
packages/merchant/src/pages/agent/designer/detail.vue

@@ -390,25 +390,28 @@ onLoad(async (query) => {
                         />
                       </template>
                     </div>
-                    <div class="flex items-center justify-between mt-[19px]">
+                    <div class="flex items-center justify-between mt-[19px] relative">
                       <div
                         class="h-[25px] px-1.5 bg-[#f4f4f4] rounded-md justify-center items-center gap-1 inline-flex"
+                        v-if="it?.followType == 1"
                       >
                         <wd-img width="15px" height="15px" :src="locationIcon"></wd-img>
-
                         <div
                           class="text-black/40 text-[10px] font-normal font-['PingFang_SC'] leading-[25px]"
                         >
-                          <!-- 一间空间设计工作室 -->
                           {{ it?.address.address }}
                         </div>
                       </div>
+
+                      <!-- 渠道 div 固定在右侧 -->
                       <div
-                        class="text-black/90 text-sm font-normal font-['PingFang_SC'] leading-relaxed mr-[15px]"
+                        class="text-black/90 text-sm font-normal font-['PingFang_SC'] leading-relaxed mr-[15px] absolute right-0"
+                        v-if="it?.brokerName"
                       >
                         渠道:{{ it?.brokerName }}
                       </div>
                     </div>
+
                   </div>
                 </template>
               </div>