修改

packages/app/src/pages-sub/home/activity/detail/index.vue

@@ -313,7 +313,7 @@ onShareTimeline(() => ({ title: data.value.name, imageUrl: data.value.thumbnailU
     </div>
     <SectionHeading v-if="isActivity" size="lg" title="活动介绍"></SectionHeading>
 
-    <div class="mt-5 mx-3.5">
+    <div class="mt-5">
       <!-- v-html="data['activityDesc'] || data['studyDesc']" -->
       <div
         v-if="tab === 0"
@@ -489,14 +489,14 @@ onShareTimeline(() => ({ title: data.value.name, imageUrl: data.value.thumbnailU
 			      </div>
 			    </div>
 			  
-			    <div class="flex flex-col justify-center aspect-[0.7/1] gap-5 p-4 relative">
+			    <div class="flex flex-col justify-center aspect-[0.7/1] gap-5 px-4 relative">
 			      <PageHelper
 			        :request="isActivity ? getActivitySignups : getStudyTourSignups"
 			        :query="isActivity ? { activityId: id } : { studyId: id }"
 			        class="flex-grow flex flex-col"
 			      >
 			        <template #default="{ source }">
-			          <div class="flex flex-col gap-5">
+			          <div class="flex flex-col gap-5 pt-[20rpx]">
 			            <template v-for="(it, i) in source.list" :key="i">
 			              <div
 			                class="text-black text-sm font-normal font-['PingFang_SC'] leading-normal"

packages/app/src/pages-sub/home/components/article.vue

@@ -31,7 +31,7 @@ const props = defineProps({
 })
 </script>
 <template>
-  <div class="px-3.5 bg-white flex-grow">
+  <div class="px-2 bg-white flex-grow">
     <div v-if="!isBanner" class="text-black text-xl font-normal font-['PingFang_SC'] leading-loose">
       {{ title }}
     </div>

packages/app/src/pages-sub/home/mall/components/product.vue

@@ -51,15 +51,15 @@ const handleAddToCart = async () => {
         custom-class="aspect-square"
       ></wd-img>
     </div>
-    <div class="flex">
-      <div class="text-black/90 text-base font-normal font-['PingFang_SC'] leading-normal line-clamp-1 text-ellipsis overflow-hidden">
+    <div class="flex items-center">
+      <div class="text-black/90 text-base font-normal font-['PingFang_SC'] leading-[48rpx] line-clamp-1 text-ellipsis overflow-hidden">
         <!-- 阿芙佳朵 -->
         {{ options.prodcutName }}
       </div>
       <div class="flex-1"></div>
       <div
         v-if="Number(options.productPrice)"
-        class="shrink-0 pr-[4rpx] text-black/30 text-xs font-normal font-['PingFang_SC'] line-through leading-normal"
+        class="shrink-0 pr-[4rpx] text-black/30 text-xs font-normal font-['PingFang_SC'] line-through leading-[48rpx]"
       >
         <!-- ¥60 -->
         ¥{{ options.productPrice }}

packages/app/src/pages-sub/home/spread/product-detail/index.vue

@@ -154,7 +154,7 @@ onShareTimeline(() => ({
         </swiper>
       </div>
     </div>
-    <div class="relative flex-1 bg-white p-7 flex flex-col gap-6 rounded-tl-2xl rounded-tr-2xl">
+    <div class="relative flex-1 bg-white py-7 px-[20rpx] flex flex-col gap-6 rounded-tl-2xl rounded-tr-2xl">
       <div
         v-if="String(data?.needPoints) === '1'"
         class="text-black/60 text-base font-normal font-['PingFang_SC'] leading-4"

packages/app/src/pages-sub/home/study-tour/components/register-card.vue

@@ -36,28 +36,17 @@ onMounted(async () => {
           :src="options?.bannerUrl"
         ></wd-img>
       </div>
-      <div
-        class="px-2.5 h-[29px] bg-black/60 rounded-[20px] backdrop-blur-[15px] absolute top-5 right-3.5 flex items-center justify-center"
-      >
+      <div class="px-2.5 h-[29px] bg-black/60 rounded-[20px] backdrop-blur-[15px] absolute top-5 right-3.5 flex items-center justify-center">
         <div class="text-white text-sm font-normal font-['PingFang_SC'] leading-relaxed">
           {{ statusText }}
         </div>
       </div>
       <view class="absolute bottom-0 left-0 right-0">
         <view class="flex items-center mx-4 my-2.5 gap-1">
-          <avatar-group-casual
-            :show-number="3"
-            :urls="
-              signups.list
-                .filter((it) => it.userId)
-                .map((it) => it.headImgUrl || NetImages.DefaultAvatar)
-            "
-          ></avatar-group-casual>
-          <div
-            class="ml-1 text-white/60 text-sm font-normal font-['PingFang_SC'] leading-[10.18px]"
-          >
+          <avatar-group-casual :show-number="3" :urls="signups.list.filter((it) => it.userId).map((it) => it.headImgUrl || NetImages.DefaultAvatar)"></avatar-group-casual>
+          <view class="ml-1 text-white/90 text-sm font-normal font-['PingFang_SC'] leading-[10.18px]">
             {{ signups.total }}人已报名
-          </div>
+          </view>
         </view>
         <div class="w-full h-[46px] absolute top-0 bg-gradient-to-t from-black to-black/00"></div>
         <div class="bg-[#010102]/50 rounded-bl-2xl rounded-br-2xl backdrop-blur-[20px] p-3.5">

packages/app/src/pages-sub/home/study-tour/components/study-tour-card.vue

@@ -70,7 +70,7 @@ const toDetail = () => {
               {{ dayjs(endAt).format('MM.DD') }}
             </div>
           </div>
-          <div class="flex">
+          <div class="flex items-center">
             <div class="text-black/40 text-sm font-normal font-['PingFang_SC'] leading-[34px]">
               兑换积分：
             </div>

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

@@ -166,8 +166,12 @@ const nickNameClickHandle = async () => {
 const handleToAuthentication = (event) => {
   // 阻止事件冒泡
   event.stopPropagation()
-  if (!isLogined.value) return router.push('/pages-sub/login/index')
-  router.push('/pages-sub/mine/authentication/index')
+  if (!isLogined.value){
+	  router.push('/pages-sub/login/index')
+  }else{
+	  router.push('/pages-sub/mine/authentication/index')
+  }
+  
 }
 const handleToHomepage = () => {
   uni.navigateTo({ url: `/pages-sub/mine/homepage/index?id=${userInfo.value.userId}` })
@@ -177,9 +181,9 @@ const handleMenuClick = (path) => {
 }
 const handleClickScan = async () => {
   const { result } = await uni.scanCode({})
-  // console.log(result)
+  console.log("result:" + result)
   const { type, options } = qrCodeString2Object(result)
-  console.log(type)
+  // console.log(type)
   if (type === QrCodeBusinessType.InStoreClockIn) {
     if (!features.value.checkInAtStoreTask)
       return router.push('/pages-sub/mine/authentication/index')

packages/merchant/src/composables/followUp.ts

@@ -35,7 +35,7 @@ export const useFollowUp = () => {
       type: 'Textarea',
       label: '备注',
       labelWidth: 64,
-      maxlength: 100,
+      maxlength: 1000,
     },
   })
   const schemaTypeOffline = ref<DataFormSchema>({
@@ -48,7 +48,7 @@ export const useFollowUp = () => {
   })
   const schemaTypeOnline = ref<DataFormSchema>({
     imgUrl: {
-      required: true,
+      // required: true,
       type: 'ImageUploader',
       label: '图片',
       labelWidth: 64,

packages/merchant/src/layouts/tabbar.vue

@@ -130,14 +130,14 @@ const handleSubmit = async () => {
     dataForm.value.imgUrl = temp.join(',')
   }
   console.log(dataForm.value)
-  if (!dataForm.value.imgUrl) {
-    uni.showToast({ icon: 'none', title: '请上传图片' })
-    return false
-  }
-  if (!dataForm.value.address && dataForm.value.followType === '1') {
-    uni.showToast({ icon: 'none', title: '请刷新定位' })
-    return false
-  }
+  // if (!dataForm.value.imgUrl) {
+  //   uni.showToast({ icon: 'none', title: '请上传图片' })
+  //   return false
+  // }
+  // if (!dataForm.value.address && dataForm.value.followType === '1') {
+  //   uni.showToast({ icon: 'none', title: '请刷新定位' })
+  //   return false
+  // }
   const { code } = await requestToast(() => createFollowUp(dataForm.value), {
     success: true,
     successTitle: '跟进成功',
@@ -272,11 +272,11 @@ onMounted(async () => {
               <label
                 class="text-sm font-normal leading-relaxed text-black/60 h-10 flex items-center"
               >
-                <span
+                <!-- <span
                   class="text-[#ef4343] text-base font-normal font-['PingFang_SC'] leading-normal visible"
                 >
                   *
-                </span>
+                </span> -->
                 地址
               </label>
               <div
@@ -295,11 +295,11 @@ onMounted(async () => {
             :style="{ 'grid-template-columns': `${addUnit(64)} auto` }"
           >
             <label class="text-sm font-normal leading-relaxed text-black/60 h-10 flex items-center">
-              <span
+              <!-- <span
                 class="text-[#ef4343] text-base font-normal font-['PingFang_SC'] leading-normal visible"
               >
                 *
-              </span>
+              </span> -->
               图片
             </label>
             <wd-upload

packages/merchant/src/pages/home/merchant/add-reporting-information.vue

@@ -60,7 +60,7 @@ const merchantSchema = ref<DataFormSchema>({
   receptionist: {
     type: 'TextField',
     label: '接待人员:',
-    required: true,
+    // required: true,
     labelWidth: 84,
     props: {
       placeholder: '请输入接待人员',
@@ -69,7 +69,7 @@ const merchantSchema = ref<DataFormSchema>({
   contactNumber: {
     type: 'TextField',
     label: '联系电话:',
-    required: true,
+    // required: true,
     labelWidth: 84,
     props: {
       placeholder: '请输入联系电话',
@@ -81,7 +81,7 @@ const customerSchema = ref<DataFormSchema>({
     type: 'TextField',
     label: '客户姓名:',
     labelWidth: 84,
-    required: true,
+    // required: true,
     props: {
       placeholder: '请输入客户姓名',
     },