Merge branch 'dev' of http://39.101.143.165:8090/haiyang/couponCenter_mpapp into dev

src/pages-A/settingPage/index.vue

@@ -28,12 +28,12 @@ const rules = reactive({
     nickName: [
         { required: true, message: '请输入昵称', trigger: ['blur', 'change'] },
         {
-            pattern: /^[0-9a-z]*$/gi,
+            pattern: /^[\u4e00-\u9fa5a-zA-Z0-9]*$/,
             // 正则检验前先将值转为字符串
             transform(value) {
                 return String(value)
             },
-            message: '只能包含字母或数字',
+            message: '只能包含汉字、字母或数字',
         },
         { max: 12, message: '昵称长度不能超过12个字符', trigger: ['change'] },
     ],

src/pages/my/my.vue

@@ -34,10 +34,6 @@ const { send: getShareStateRequest, data: shareStateData, loading: shareStateLoa
     immediate: false,
 })
 
-// 发卷人查询审核状态
-const { send: getCouponIssuerApplyByIdRequest, data: couponIssuerApplyByIdData } = useRequest(getCouponIssuerApplyById, {
-    immediate: false,
-})
 // 昵称输入值
 const nicknameInput = ref('')
 onShow(async () => {
@@ -47,11 +43,6 @@ onShow(async () => {
         await getCouponSituationRequest({ queryType: 'time' })
         await getShareStateRequest()
         deadline.value = Date.now()
-        await getCouponIssuerApplyByIdRequest()
-        if (couponIssuerApplyByIdData.value?.status === '0') {
-            console.log('优惠券统计数据:', couponSituationData.value)
-            // open()
-        }
     }
 })
 
@@ -122,10 +113,6 @@ async function menuClick(page, otherJs?: () => Promise<boolean>) {
             return
         }
     }
-    if (couponIssuerApplyByIdData.value?.status === '0') {
-        open()
-        return
-    }
     uni.navigateTo({
         url: `/pages-A/${page}/index?couponSituation=${JSON.stringify(couponSituationData.value)}`,
     })
@@ -134,13 +121,14 @@ async function menuClick(page, otherJs?: () => Promise<boolean>) {
 // 判断是否是发券人
 function isCouponIssuer(currentPage?: string) {
     // 发券人相关页面
-    const validPages = ['myInviter']
+    const validPages = ['myInviter', 'shareFriend', 'invitePage']
+    console.log('111111111111')
     // 判断跳转页面是否是发券人相关页面
     if (!validPages.includes(currentPage)) {
         return Promise.resolve(true)
     }
     // 是否已经成为发券人
-    if (userStore.isPassIssuer) {
+    if (userStore.isPassIssuer()) {
         return Promise.resolve(true)
     }
     else {
@@ -153,6 +141,16 @@ function isCouponIssuer(currentPage?: string) {
     }
 }
 
+//展开弹窗
+function watchUserStatus() {
+    if (userInfo.value.status === '0') {
+        open();
+        return Promise.resolve(false)
+    }
+    return Promise.resolve(true)  
+    
+}
+
 async function getInviteInfo(currentPage?: string) {
     const isCouponIssuerRes = await isCouponIssuer(currentPage)
     if (!isCouponIssuerRes) {
@@ -291,7 +289,7 @@ onShareTimeline(async () => {
             </view>
             <!-- 菜单 -->
             <view class="me-header-menu">
-                <view class="me-header-menu-item" @click="menuClick('applyForm')">
+                <view class="me-header-menu-item" @click="menuClick('applyForm',watchUserStatus)">
                     <view class="me-header-menu-icon">
                         <image :src="getImageUrl('@img/me/coupon-need.png')" mode="aspectFill" />
                         <view class="me-header-menu-text">