From 7f6ace8ac6e111c3d31ab58f95d305e42184b00b Mon Sep 17 00:00:00 2001
From: Waiting <waitinghc@foxmail.com>
Date: Wed, 24 Apr 2024 23:01:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E5=86=8C=E6=9C=89=E7=A4=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/user/index.ts                 |  5 ++-
 src/pages/common/register/index.vue   | 58 ++++++++++++++++++---------
 src/pages/mine/subs/contact/index.vue |  5 ++-
 3 files changed, 46 insertions(+), 22 deletions(-)

diff --git a/src/api/user/index.ts b/src/api/user/index.ts
index 13fed78..78d840a 100644
--- a/src/api/user/index.ts
+++ b/src/api/user/index.ts
@@ -31,7 +31,8 @@ enum URL {
   integralList = '/ext/member/integral_query',
   tradeList = '/memberIncoming/wx_balance_records',
   terminal = 'wechat/coupons/terminal?companyId=',
-  cardLink = '/wc/wechat/get_card_url'
+  cardLink = '/wc/wechat/get_card_url',
+  registerCoupon = '/couponsStrategy/wx_register_coupon'
 }
 
 export const getUserProfile = () => get<UserBean>({ url: URL.profile });
@@ -70,3 +71,5 @@ export const getTerminal = (companyId: string) => get<TerminalBean>({ url: URL.t
 export const getTradeList = (data: any) => post<any>({ url: URL.tradeList, data });
 
 export const getCardLink = () => get<string>({ url: URL.cardLink });
+
+export const getRegisterCoupon = () => get<any>({ url: URL.registerCoupon });
diff --git a/src/pages/common/register/index.vue b/src/pages/common/register/index.vue
index c58cf47..333360b 100644
--- a/src/pages/common/register/index.vue
+++ b/src/pages/common/register/index.vue
@@ -2,8 +2,8 @@
   <view class='content'>
     <image class='bg-image' :src='assetsUrl("bg_register.png")' />
 
-    <image src='./static/images/ic_register_gift_text.png'
-    style='align-self: center;position: relative;width: 356rpx;height: 124rpx;margin-top: 70rpx'/>
+    <image :src='assetsUrl("ic_register_gift_text.png")'
+           style='align-self: center;position: relative;width: 356rpx;height: 124rpx;margin-top: 70rpx' />
     <view class='card-view'>
       <view class='mobile-view c-flex-row' style='display: none'>
         <image :src='assetsUrl("ic_register_mobile.png")' />
@@ -27,25 +27,42 @@
       align-self: center;color: #666666;'>长按扫码注册
       </text>
 
-      <view class='divider' />
-      <view class='coupon c-flex-column' @click.stop='goPath("/pages/mine/subs/coupon/index")'>
-        <view class='c-flex-row'>
-          <text class='coupon-name'>新人“福“利券</text>
-          <image :src='assetsUrl("ic_arrow_right_gray.png")' />
+      <template v-if='couponBean&&couponBean.status==0'>
+        <view class='divider' />
+        <view class='coupon c-flex-column' @click.stop='goPath("/pages/mine/subs/coupon/index")'>
+          <view class='c-flex-row'>
+            <text class='coupon-name'>{{ couponBean.title }}</text>
+            <image :src='assetsUrl("ic_arrow_right_gray.png")' />
+          </view>
+          <text class='expired-time'>
+            有效期至{{ dayjs(Date.now()).add(couponBean.triggerEndDay, 'day').format('YYYY.MM.DD') }}
+          </text>
         </view>
-        <text class='expired-time'>有效期至2023.11.12</text>
-      </view>
-      <view class='divider' />
+        <view class='divider' />
 
-      <text style='font-size: 28rpx;
+        <text style='font-size: 28rpx;
       font-weight: bold;
 color: #333333;margin-top: 20rpx'>福利详情
-      </text>
-      <text style='font-size: 28rpx;
-color: #333333;margin-top: 14rpx'>1.优惠金额10元\n
-        2.满300减50\n
-        3.赠送3张
-      </text>
+        </text>
+        <text style='font-size: 28rpx;
+color: #333333;margin-top: 14rpx'>1.优惠金额{{ couponBean.reduce }}元\n
+          2.满{{ couponBean.threshold }}减{{ couponBean.reduce }}\n
+          3.赠送{{ couponBean.publicNum }}张
+        </text>
+      </template>
+      <template v-else>
+        <text style='font-size: 28rpx;
+      font-weight: bold;
+color: #333333;margin-top: 20rpx'>
+          微信扫一扫领取会员卡
+        </text>
+        <text style='font-size: 28rpx;
+color: #333333;margin-top: 14rpx'>
+          1、及时接受消费小票\n
+          2、随时查询消费记录\n
+          3、及时接收优惠信息
+        </text>
+      </template>
     </view>
   </view>
 </template>
@@ -54,14 +71,17 @@ color: #333333;margin-top: 14rpx'>1.优惠金额10元\n
 import { assetsUrl, defaultImage } from '@/utils/assets';
 import { useUserStore } from '@/store';
 import { goPath } from '@/utils';
+import { getRegisterCoupon } from '@/api/user';
+import dayjs from 'dayjs';
 
 const userStore = useUserStore();
 const { companyConfigInfo } = storeToRefs(userStore);
 
 const countdown = ref('获取验证码');
+const couponBean = ref();
 
-onLoad((e) => {
-
+onLoad(async (e) => {
+  couponBean.value = await getRegisterCoupon();
 });
 
 const startCountdown = () => {
diff --git a/src/pages/mine/subs/contact/index.vue b/src/pages/mine/subs/contact/index.vue
index 958e3cb..9b136b4 100644
--- a/src/pages/mine/subs/contact/index.vue
+++ b/src/pages/mine/subs/contact/index.vue
@@ -2,19 +2,20 @@
   <view class='card-view'>
     <view class='c-flex-row'>
       <text class='key'>姓名</text>
-      <text class='value'>{{companyInfo.creatorName||companyInfo.companyName}}</text>
+      <text class='value'>{{companyInfo.master||companyInfo.companyName}}</text>
     </view>
     <view class='divider' />
     <view class='c-flex-row'>
       <text class='key'>手机号</text>
       <text class='value'>{{companyInfo.telphone}}</text>
-      <image src='./static/images/ic_contact_merchant.png' @click.stop='call' />
+      <image :src='assetsUrl("ic_contact_merchant.png")' @click.stop='call' />
     </view>
   </view>
 </template>
 
 <script lang='ts' setup>
 import { useUserStore } from '@/store';
+import { assetsUrl } from '@/utils/assets';
 
 const { companyInfo } = storeToRefs(useUserStore());
 const call = () => {