li.shaoyi 3 jaren geleden
bovenliggende
commit
a755e8907e

+ 1 - 1
src/packages/mobile/views/credit/lottery/components/reward/index.vue

@@ -6,7 +6,7 @@
             </div>
             </div>
             <div class="lottery-reward__footer">
             <div class="lottery-reward__footer">
                 <div class="tips">
                 <div class="tips">
-                    <template v-if="level">
+                    <template v-if="value">
                         <span>恭喜您获得</span>
                         <span>恭喜您获得</span>
                         <span>{{ levelText }}</span>
                         <span>{{ levelText }}</span>
                     </template>
                     </template>

+ 1 - 1
src/packages/mobile/views/credit/lottery/index.vue

@@ -36,7 +36,7 @@
                     <dt class="block-title">- 我的红包 -</dt>
                     <dt class="block-title">- 我的红包 -</dt>
                     <dd class="block-item" v-for="(item, index) in creditList" :key="index">
                     <dd class="block-item" v-for="(item, index) in creditList" :key="index">
                         <span>{{ item.createtime }}</span>
                         <span>{{ item.createtime }}</span>
-                        <span>{{ item.score }}</span>
+                        <span>{{ item.redpacketvalue }}</span>
                     </dd>
                     </dd>
                 </dl>
                 </dl>
             </div>
             </div>

+ 15 - 3
src/packages/mobile/views/goods/details/index.vue

@@ -10,8 +10,7 @@
                     :optionProps="{ label: 'enumdicname', value: 'enumitemname' }" />
                     :optionProps="{ label: 'enumdicname', value: 'enumitemname' }" />
                 <Field v-model="formData.PresaleApplyID" name="loginpwd" label="交割月份" :rules="formRules.PresaleApplyID">
                 <Field v-model="formData.PresaleApplyID" name="loginpwd" label="交割月份" :rules="formRules.PresaleApplyID">
                     <template #input>
                     <template #input>
-                        <app-select placeholder="开始月份" :options="months"
-                            :optionProps="{ label: 'endmonth', value: 'endmonth' }" :is-link="false" />
+                        <app-select v-model="selectedMonth" placeholder="开始月份" :options="months" :is-link="false" />
                         <app-select placeholder="结束日期" :options="months"
                         <app-select placeholder="结束日期" :options="months"
                             :optionProps="{ label: 'enddate', value: 'presaleapplyid' }" :is-link="false" />
                             :optionProps="{ label: 'enddate', value: 'presaleapplyid' }" :is-link="false" />
                     </template>
                     </template>
@@ -38,6 +37,7 @@ import AppSelect from '@mobile/components/base/select/index.vue'
 const { getQueryStringToNumber } = useNavigation()
 const { getQueryStringToNumber } = useNavigation()
 const wrstandardid = getQueryStringToNumber('wrstandardid')
 const wrstandardid = getQueryStringToNumber('wrstandardid')
 const formRef = shallowRef<FormInstance>()
 const formRef = shallowRef<FormInstance>()
+const selectedMonth = shallowRef('') // 当前选中的交割月份
 
 
 const { details, getWrstandardDetails } = useWrstandardDetails(wrstandardid)
 const { details, getWrstandardDetails } = useWrstandardDetails(wrstandardid)
 const { formData, formSubmit } = usePurchaseOrderDesting()
 const { formData, formSubmit } = usePurchaseOrderDesting()
@@ -54,7 +54,19 @@ const formRules: { [key in keyof Proto.SpotPresaleDestingOrderReq]?: FieldRule[]
 
 
 // 交割月份
 // 交割月份
 const months = computed(() => {
 const months = computed(() => {
-    return details.value?.deliverymonth ?? []
+    const deliveryMonths = details.value?.deliverymonth ?? []
+    const monthMap = new Map<string, { label: string, value: string; }>()
+
+    deliveryMonths.forEach(({ endmonth }) => {
+        if (!monthMap.has(endmonth)) {
+            monthMap.set(endmonth, {
+                label: endmonth,
+                value: endmonth,
+            })
+        }
+    })
+
+    return [...monthMap.values()]
 })
 })
 
 
 const onSubmit = () => {
 const onSubmit = () => {