merge

packages/app/src/composables/activity.ts

@@ -1,4 +1,3 @@
-import { get } from 'radash'
 import { Activity, StudyTour } from '../core/libs/models'
 import { getActivityStatusButtonText } from '../core/utils/common'
 import dayjs from 'dayjs'

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

@@ -129,7 +129,9 @@ const infos = computed(() => [
     icon: user,
     title: `${activityTypes.value[type.value]}名额`,
     content: [
-      places.value === '不限制' ? `不限制` : `${places.value}人/剩余${data.value.surplus}人`,
+      places.value === '不限制'
+        ? `不限制`
+        : `${places.value}人/剩余${status.value === 'closed' || status.value === 'overdue' ? 0 : data.value.surplus}人`,
     ],
     visable: true,
   },
@@ -150,7 +152,6 @@ const schedules = computed(() =>
 
 const activity = useActivity(data)
 const { status, statusText, difference, refresh } = activity
-
 const handleConfirm = async () => {
   const { data, code, msg } = await (isActivity.value ? activitySignup : studyTourSignup)({
     id: id.value,
@@ -213,6 +214,7 @@ onLoad(async (query: { id: string; type: 'activity' | 'studyTour' }) => {
     })
     .exec()
   await Promise.all([setSignups(), setLevels(), setPhotos()])
+  console.log('报名状态::::', status.value)
 })
 
 onShareAppMessage(() => ({ title: data.value.name, imageUrl: data.value.thumbnailUrl }))

packages/app/src/pages-sub/mine/homepage/index.vue

@@ -367,7 +367,7 @@ defineExpose({
           <div
             v-if="designerInfo?.videoNumber"
             class="text-[#e08e38] text-xs font-normal font-['PingFang_SC'] leading-normal"
-            @click="handle2Video"
+            @click.stop="router.push('/pages-sub/mine/homepage/index')"
           >
             去看看
           </div>

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

@@ -215,7 +215,7 @@ defineExpose({
             v-model="modelValue[prop]"
           >
             <template v-for="{ label, value } of props.columns" :key="value">
-              <wd-radio :value="value">{{ label }}</wd-radio>
+              <wd-radio custom-class="custom-line" :value="value">{{ label }}</wd-radio>
             </template>
           </wd-radio-group>
 

packages/merchant/src/layouts/tabbar.vue

@@ -164,7 +164,7 @@ const handleChange = ({ fileList: files }) => {
   console.log(fileList.value)
 }
 const getCurrentLocation = () => {
-  console.log('点击地址')
+  uni.showToast({ icon: 'loading', title: '正在获取位置...' })
   uni.getLocation({
     type: 'gcj02',
     success: async (success: any) => {
@@ -173,7 +173,7 @@ const getCurrentLocation = () => {
       dataForm.value.address.address = name
       dataForm.value.address.latitude = latitude
       dataForm.value.address.longitude = longitude
-      console.log('提交信息:::', dataForm.value)
+      uni.hideToast()
     },
     fail: (err) => {
       console.log('获取地址失败', err)
@@ -191,15 +191,16 @@ const getCurrentLocation = () => {
                 dataForm.value.address.address = name
                 dataForm.value.address.latitude = latitude
                 dataForm.value.address.longitude = longitude
-                console.log('提交信息:::', dataForm.value)
+                uni.hideToast()
               },
               fail: function (err) {
                 console.log('获取位置失败:', err)
+                uni.hideToast()
               },
             })
           },
           fail: function () {
-            console.log('用户拒绝授权,不再提示')
+            uni.hideToast()
             // 用户拒绝授权,可以选择记录下来,不再提示
             uni.showToast({
               title: '您拒绝了位置授权',
@@ -253,7 +254,7 @@ onMounted(async () => {
       @click="handleTabbarItemClick"
     />
     <wd-action-sheet v-model="publishState" title="创建跟进" @close="publishState = false">
-      <view class="flex flex-col p-4 h-[calc(75vh)] overflow-y-auto">
+      <view class="flex flex-col p-4 h-[calc(65vh)]! overflow-y-auto">
         <div>
           <DataForm
             ref="dataFormRef"

packages/merchant/src/pages/agent/designer/archives/index.vue

@@ -52,7 +52,6 @@ const tabs = [
 ]
 const id = ref()
 const { data: basicData, run: setBasicData } = useRequest(() => getDesignerBasicInfo(id.value))
-console.log('basicData::::', basicData)
 const { data: familyData, run: setData } = useRequest(() => getUserInfoById(id.value))
 const { data: editData, run: setEditData } = useRequest(() => getEditRecords())
 const query = computed(() => ({ userId: id.value }))
@@ -669,7 +668,7 @@ onShow(async () => {
     <wd-action-sheet v-model="actionSheetStatus">
       <div class="p-4">
         <DataForm :schema="schema" :direction="'horizontal'" v-model="formData"></DataForm>
-        <template v-if="submitType = 'award'">
+        <template v-if="submitType == 'award'">
           <div
             class="grid mb-4 items-start"
             :style="{ 'grid-template-columns': `${addUnit(64)} auto` }"
@@ -711,4 +710,7 @@ onShow(async () => {
     font-size: 28rpx;
   }
 }
+::v-deep .wd-radio__label {
+  line-height: 30px !important;
+}
 </style>