Merge branch 'master' of https://gitea.zianxin.com/zax/biz-mobile-react-cloud

src/pages/merchant/components/coupon-card.vue

@@ -36,7 +36,7 @@ const doVisibleQrcode = () => {
                 </view>
                 <view class="scope-text flex-col">
                     <text>{{ actCouponTypeEnum[detail.couponType] }}</text>
-                    <text>有限期至 {{ detail.endTime }}</text>
+                    <text>在{{ detail.startTime }}至{{ detail.endTime }}时间段使用</text>
                 </view>
             </view>
         </view>

src/pages/merchant/merchant-activity.vue

@@ -28,7 +28,8 @@
 					<view class="ribbon">{{ actCouponTypeEnum[state.actDetail.type] }}</view>
 				</view>
 			</view>
-			<view v-else class="card relative rounded-lb-0! rounded-rb-0! w-full activity-card overflow-hidden">
+			<view v-else-if="state.actType == 'COUPON_ACT'"
+				class="card relative rounded-lb-0! rounded-rb-0! w-full activity-card overflow-hidden">
 				<view class="ribbon">{{ actCouponTypeEnum[state.actDetail.type] }}</view>
 				<view class="px-8 pt-5 flex justify-between items-center font-bold">
 					<text class="text-32 c-#FF4F3F">{{ state.actDetail.name }}</text>
@@ -77,7 +78,7 @@
 			</view>
 		</template>
 	</crud-layout>
-	<modify-user ref="modifyUserRef" warnText="填写出生日期即可领取生日兑换券" />
+	<modify-user ref="modifyUserRef" warnText="填写出生日期即可领取生日兑换券" @close="modifyUserClose" />
 </template>
 
 <script setup lang="ts">
@@ -234,6 +235,10 @@ const getUserInfo = async () => {
 const doQrcode = () => {
 	router.jump("/pages/merchant/my-act-list")
 }
+
+const modifyUserClose = () => {
+	getIsEligibleForAct()
+}
 </script>
 
 <style scoped>

src/pages/merchant/my-act-list.vue

@@ -75,6 +75,14 @@ const doVisibleQrcode = async (detail: any) => {
     console.log("生成二维码:", type, actDetail);
     // 查询优惠券对应的短码
     if (type == "ACT_COUPON") {
+        // 判断核销时间 必须在`actDetail.startTime`和`actDetail.endTime`之间
+        const now = new Date().getTime()
+        const startTime = new Date(actDetail.startTime).getTime()
+        const endTime = new Date(actDetail.endTime).getTime()
+        if (now < startTime || now > endTime) {
+            uni.showToast({ title: "核销时间不在活动时间范围内", icon: "none" })
+            return
+        }
         // 特殊情况
         // 1. 生日
         if (actDetail.actUniquecode == "1qRgFo") {

src/sheep/components/modify-user.vue

@@ -19,6 +19,8 @@ const formRef = ref<any>(null)
 
 const showQrCodeDialog = ref(false)
 const form = reactive({
+    name: "",
+    phone: "",
     birthday: ""
 })
 
@@ -54,6 +56,8 @@ const doFormSubmit = async () => {
 const open = () => {
     const user = uni.getStorageSync(storageConstant.USERINFO)
     if (user && user.sysUser) {
+        form.name = user.sysUser.name
+        form.phone = user.sysUser.phone
         form.birthday = user.sysUser.birthday
     }
     showQrCodeDialog.value = true
@@ -66,13 +70,21 @@ defineExpose({
 
 <template>
     <tm-drawer z-index="100" v-model:show="showQrCodeDialog" title="编辑个人资料" :show-close="true" position="bottom"
-        size="50%" @close="emit('close')">
+        size="70%" @close="emit('close')">
         <view v-if="warnText" class="py-20rpx">
             <tm-alert status="warn" :showClose="false" :margin="[]">{{ warnText }}</tm-alert>
         </view>
         <view class="card p-x-30rpx p-y-40rpx">
             <view class="h-30rpx" />
             <tm-form ref="formRef" v-model="form" :rules="rules">
+                <tm-form-item name="name" label="姓名">
+                    <tm-input v-model="form.name" disabled>
+                    </tm-input>
+                </tm-form-item>
+                <tm-form-item name="phone" label="手机号">
+                    <tm-input v-model="form.phone" disabled>
+                    </tm-input>
+                </tm-form-item>
                 <tm-form-item name="birthday" label="出生日期" :show-bottom="false">
                     <tm-picker-date v-model="form.birthday" v-model:model-str="form.birthday" format="YYYY-MM-DD"
                         start="1950-1-1" end="2030-12-31">

src/sheep/constant/service-enum.ts

@@ -80,8 +80,9 @@ const actUserReceiveEnum = {
 	"6": "其他错误",
 	"99": "用户可以参加活动",
 	// 特殊
-	"-100": "请在生日当月领取",
+	"-100": "仅限生日当月使用",
 	"-101": "请填写出生日期",
+	"-102": "生日已结束",
 }
 
 export default {