2 次代码提交 ce7526f175 ... 0156dc3885

作者 SHA1 备注 提交日期
  jiayubo 0156dc3885 Merge branch 'dev-1.3.0' of http://1.95.212.35:13000/root/leromro-mini into dev-1.3.0 3 月之前
  jiayubo bf67985677 Merge branch 'jyb_20250506_dev' into dev-1.3.0 3 月之前
共有 3 个文件被更改,包括 96 次插入34 次删除
  1. 67 13
      components/Client/new_file.vue
  2. 10 10
      components/QRCode/index.vue
  3. 19 11
      pages/login.vue

+ 67 - 13
components/Client/new_file.vue

@@ -2,7 +2,7 @@
   <view>
     <template>
       <view class="Wrapper-grid">
-        <view class="serve-title-Box" v-if="userType == 2">
+        <!-- <view class="serve-title-Box" v-if="userType == 2">
           <view class="serve-content">
             <image src="/static/container.png" class="serve-content-img" mode="aspectFill"></image>
             <text class="serve-content-text">注册专区</text>
@@ -10,11 +10,11 @@
           <view class="serve-content-box2">
             <text class="serve-content-text">认证资质专区</text>
           </view>
-        </view>
+        </view> -->
 
         <up-grid :border="false" col="3" v-if="userType === 1">
           <up-grid-item v-for="(item, index) in serveiceList" :key="index" @click="handleGridClick(item)">
-            <view class="grid-box" :class="{ 'first-row': index < 3 }">
+            <view class="grid-box" :class="index < 3 && 'first-row'">
               <view class="grid-image">
                 <image :src="item.businessIcon" class="service-img" mode="aspectFit" />
               </view>
@@ -27,15 +27,16 @@
         </up-grid>
         <up-toast ref="uToastRef" />
 
-        <view v-if="userType === 2">
-          <view  v-for="item in serveiceList" :key="item.id">
+        <view v-if="userType === 2" class="flex_c_c serveice-list">
+          <view v-for="item in serveiceList" :key="item.id" class="serveice-item flex_c_s"
+            @click="handleCertification(item)">
             <view>
-              <view>{{ item.businessName }}</view>
-              <view>{{ item.text }}</view>
-              </view>
-              <up-icon name="arrow-right" color="#7B7B7B" size="14"></up-icon>
-              <view :class="item.class"></view>
-          </view> 
+              <view class="serveice-name">{{ item.businessName }}</view>
+              <view class="serveice-text">{{ item.text }}</view>
+            </view>
+            <up-icon name="arrow-right" color="#7B7B7B" size="14"></up-icon>
+            <view :class="item.class"></view>
+          </view>
         </view>
 
         <view class="paiBanSty" v-if="userType == 2">
@@ -46,7 +47,7 @@
           <swiper class="zhiYuanZheSwiper" vertical circular autoplay :interval="4000" :duration="800"
             @change="onSwiperChange">
             <swiper-item v-for="(imgUrl, index) in volunteerImages" :key="index">
-              <view class="swiper-item-container" :class="{ 'active-swiper': currentSwiperIndex === index }">
+              <view class="swiper-item-container" :class="currentSwiperIndex === index && 'active-swiper'">
                 <image :src="imgUrl" class="zhiYuanZhe" mode="aspectFill" />
               </view>
             </swiper-item>
@@ -272,17 +273,30 @@ const serveInit = () => {
     },
     {
       id: '1',
-      businessName: '资质认证',
+      businessName: '服务管理',
       text: '智慧养老',
       class: 'icon2'
     },
   ]
 }
 
+const handleCertification = (record) => {
+  console.log("TCL: handleCertification -> record", record)
+  uni.navigateTo({
+    url: `/pages_home/pages/publicize/index`
+  });
+
+  // uni.navigateTo({
+  //   url: `/pages_home/pages/certification/index?data=${encodeURIComponent(JSON.stringify(record))}`
+  // });
+}
+
 onMounted(() => {
   userType === 2 ? serveInit() : init();
   const token = getToken();
   token && getVolunteerImages();
+
+ 
 });
 </script>
 
@@ -538,6 +552,7 @@ onMounted(() => {
   background-size: 68rpx auto;
   background-repeat: no-repeat;
 }
+
 .icon2 {
   width: 68rpx;
   height: 68rpx;
@@ -546,4 +561,43 @@ onMounted(() => {
   background-size: 68rpx auto;
   background-repeat: no-repeat;
 }
+
+.serveice-list {
+  padding: 0 34rpx;
+  gap: 16rpx;
+  margin-top: 49rpx;
+
+  .serveice-item {
+    flex: 1;
+
+    border-radius: 14rpx;
+    background: #FFF7EC;
+    padding: 28rpx 51rpx 28rpx 25rpx;
+
+  }
+
+  .serveice-item:first-child {
+    background: #FFF6F5;
+  }
+
+  .serveice-name {
+    font-family: PingFang SC;
+    font-size: 32rpx;
+    font-weight: 500;
+    line-height: 36rpx;
+    letter-spacing: normal;
+    color: #313131;
+    margin-bottom: 10rpx;
+  }
+
+  .serveice-text {
+    font-family: PingFang SC;
+    font-size: 26rpx;
+    font-weight: normal;
+    line-height: 28rpx;
+    letter-spacing: -0.02em;
+    color: #818181;
+  }
+
+}
 </style>

+ 10 - 10
components/QRCode/index.vue

@@ -52,25 +52,25 @@ const props = defineProps({
 })
 
 const qrCodeUrl = ref('')
-const userType = 1 //默认为1
-const userId = uni.getStorageSync('userId')// 读取本地存储
-
+// 使用props中的referrerType
+const userType = props.referrerType
+// 从本地存储获取用户ID
+const userId = uni.getStorageSync('userId')
 
 // 初始化二维码版本号
 const referrerQrCodeVersion = ref()
 
-// 打印用户信息,方便查看
-console.log('=== QRCode组件读取到的用户信息 ===')
-console.log('userType:', userType)
-console.log('userId:', userId)
+console.log('=== 二维码组件用户信息 ===')
+console.log('推荐人类型:', userType)
+console.log('用户ID:', userId)
 
 const generateQRCode = async () => {
   try {
     const response = await getUnlimitedQRCode({
       page: props.page,
-      referrerType: userType,
-      referrerId: userId,
-      referrerQrCodeVersion: referrerQrCodeVersion.value,
+      referrerType: userType, // 推荐人类型,默认为1
+      referrerId: userId, // 用户ID
+      referrerQrCodeVersion: referrerQrCodeVersion.value, // 二维码版本号
     })
     
     // 处理返回的二进制数据

+ 19 - 11
pages/login.vue

@@ -69,19 +69,27 @@ const router = useRouter()
 
 // 获取小程序码参数
 onLoad((options) => {
-  console.log(options,'options');
+  console.log('登录页面接收到的参数:', options);
+  
   // 处理从二维码扫描进入的场景
-  // debugger
   if (options.scene) {
-  console.log('options.scene:>>>>>>>123123s', options.scene)
-  const scene = decodeURIComponent(options.scene)
-  const params = scene.split(':')
-  console.log('params:>>>>>>>123123s', params)
-  loginForm.referrerType = params[0]
-  loginForm.referrerId = params[1]
-  if (params.length >= 3) {
-    loginForm.referrerQrCodeVersion = params[2]
-  }
+    // 解码场景值
+    const scene = decodeURIComponent(options.scene);
+    // const scene = "2:122:2"
+    console.log('解码后的场景值:', scene);
+    
+    // 解析场景值参数,格式:推荐人类型:推荐人ID:二维码版本号
+    const params = scene.split(':');
+    console.log('解析后的参数:', params);
+    
+    // 设置推荐人类型
+    loginForm.referrerType = params[0];
+    // 设置推荐人ID
+    loginForm.referrerId = params[1];
+    // 设置二维码版本号
+    if (params.length >= 3) {
+      loginForm.referrerQrCodeVersion = params[2];
+    }
   }
 
   // 处理直接传入的参数