init

activityPages/activityDetail/activityDetail.vue

@@ -1,12 +1,7 @@
 <template>
   <block>
     <view class="container activity-detail" v-if="isUserBindingPhoneNumber">
-      <is-track-follow
-        :isShowFollowButton.sync="detailData.IsShowFollowButton"
-        source="activity"
-        :sourceId="detailData.ActivityId"
-        :isFollowData.sync="detailData.IsFollowButton"
-      />
+      <is-track-follow :isShowFollowButton.sync="detailData.IsShowFollowButton" source="activity" :sourceId="detailData.ActivityId" :isFollowData.sync="detailData.IsFollowButton" />
       <view class="" v-if="haveAuth == 1">
         <block v-if="detailData.YidongActivityUrl">
           <web-view :src="detailData.YidongActivityUrl"></web-view>
@@ -14,11 +9,7 @@
         <block v-else>
           <!-- 头部滚动显示 -->
           <view class="notice" v-if="detailData.IsLimitPeople">
-            <van-notice-bar
-              color="#FFFFFF"
-              background="#FE9000"
-              text="该活动参与名额有限，报名客户请按时参加，若不能按时参加请及时取消报名，爽约会影响您的后续报名资格"
-            />
+            <van-notice-bar color="#FFFFFF" background="#FE9000" text="该活动参与名额有限，报名客户请按时参加，若不能按时参加请及时取消报名，爽约会影响您的后续报名资格" />
           </view>
           <!-- 内容部分 -->
           <view class="content">
@@ -55,29 +46,18 @@
                   </view>
                 </view>
                 <view class="fast-reverse">
-                  <image
-                    @click="speedReverseHandler('reverse')"
-                    class="speed-img"
-                    src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/fastReverse_icon.png"
-                  ></image>
+                  <image @click="speedReverseHandler('reverse')" class="speed-img" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/fastReverse_icon.png"></image>
                   <block v-for="(item, index) in timesTheSpeed" :key="item.value">
                     <view class="speed-button" v-if="isTimes == item.value" @click="isTimesHandler(index)">
                       {{ item.name }}
                     </view>
                   </block>
-                  <image
-                    @click="speedReverseHandler('speed')"
-                    class="speed-img"
-                    src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/speed_icon.png"
-                  ></image>
+                  <image @click="speedReverseHandler('speed')" class="speed-img" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/speed_icon.png"></image>
                 </view>
                 <view class="card-title text_twoLine">
                   {{ detailTitle(detailData.VoiceList.Name) }}
                   <view class="title-image">
-                    <image
-                      @click="myLeavingMessageHandler"
-                      src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/multimedia/leaving_message.png"
-                    ></image>
+                    <image @click="myLeavingMessageHandler" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/multimedia/leaving_message.png"></image>
                     <image
                       @click="isCollectionHandeler"
                       :src="
@@ -107,10 +87,7 @@
                 <view class="title text_twoLine">
                   {{ detailTitle(detailData.VideoDetail.Title) }}
                   <view class="title-image">
-                    <image
-                      @click="myLeavingMessageHandler"
-                      src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/multimedia/leaving_message.png"
-                    ></image>
+                    <image @click="myLeavingMessageHandler" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/multimedia/leaving_message.png"></image>
                     <image
                       @click="isCollectionHandeler"
                       :src="
@@ -131,24 +108,10 @@
                   {{ detailData.ActivityTypeName }}
                 </text>
                 <view class="choose-limit" @click="strictSelection">
-                  <image
-                    v-if="detailData.ChartPermissionName.includes('研选')"
-                    src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/purchaser.png"
-                    mode=""
-                  ></image>
-                  <image
-                    v-if="detailData.IsShowSustainable"
-                    class="limit-img"
-                    src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/limit_icon.png"
-                    mode=""
-                  ></image>
+                  <image v-if="detailData.ChartPermissionName.includes('研选')" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/purchaser.png" mode=""></image>
+                  <image v-if="detailData.IsShowSustainable" class="limit-img" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/limit_icon.png" mode=""></image>
                 </view>
-                <image
-                  v-if="detailData.City"
-                  style="margin-left: 15rpx"
-                  src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/location.png"
-                  mode=""
-                ></image>
+                <image v-if="detailData.City" style="margin-left: 15rpx" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/location.png" mode=""></image>
                 <text v-if="detailData.City">{{ detailData.City }}</text>
               </view>
             </view>
@@ -157,12 +120,7 @@
               <view class="network-right dustrial-content">
                 <view class="item" v-for="item in detailData.Listndustrial" :key="item.IndustrialManagementId">
                   <view :class="['dustrial-li', item.IsJump && 'dustrial-item']" @click="goDustrialHandler(item)">{{ item.IndustryName }} </view>
-                  <image
-                    v-if="item.IndustryNewLabel"
-                    class="new_icon"
-                    src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/new_report.png"
-                    mode=""
-                  ></image>
+                  <image v-if="item.IndustryNewLabel" class="new_icon" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/new_report.png" mode=""></image>
                 </view>
               </view>
             </view>
@@ -206,20 +164,11 @@
             </view>
             <view v-if="detailData.ParticipationCode" class="network">
               <view class="network-left">拨入密码：</view>
-              <view class="network-right">{{
-                [1, 2, 3].includes(detailData.ActivityTypeId) && detailData.IsLimitPeople && !detailData.IsSignup
-                  ? "请报名获取"
-                  : detailData.ParticipationCode
-              }}</view>
+              <view class="network-right">{{ [1, 2, 3].includes(detailData.ActivityTypeId) && detailData.IsLimitPeople && !detailData.IsSignup ? "请报名获取" : detailData.ParticipationCode }}</view>
             </view>
             <view class="network" v-if="detailData.OnlineParticipation">
               <view class="network-left">网络参会：</view>
-              <view
-                class="network-right network-link"
-                v-if="[1, 2].includes(detailData.ActivityTypeId) && detailData.IsLimitPeople && !detailData.IsSignup"
-              >
-                请报名获取
-              </view>
+              <view class="network-right network-link" v-if="[1, 2].includes(detailData.ActivityTypeId) && detailData.IsLimitPeople && !detailData.IsSignup"> 请报名获取 </view>
               <view class="network-right network-link" style="color: #2c83ff" v-else>
                 <view class="">
                   <text class="default text_oneLine" @click="networkBtn">{{ detailData.OnlineParticipation }}</text>
@@ -245,16 +194,12 @@
             <view v-if="detailData.ConferencePassword" class="network">
               <view class="network-left">拨入密码：</view>
               <view class="network-right">{{
-                detailData.ActivityTypeName == "公司调研电话会" && detailData.IsLimitPeople && !detailData.IsSignup
-                  ? "请报名获取"
-                  : detailData.ConferencePassword
+                detailData.ActivityTypeName == "公司调研电话会" && detailData.IsLimitPeople && !detailData.IsSignup ? "请报名获取" : detailData.ConferencePassword
               }}</view>
             </view>
             <view v-if="detailData.Address" class="network">
               <view class="network-left">活动地址：</view>
-              <view class="network-right" v-if="!detailData.IsSignup && detailData.ActivityTypeName == '公司线下调研' && detailData.IsLimitPeople"
-                >请报名获取
-              </view>
+              <view class="network-right" v-if="!detailData.IsSignup && detailData.ActivityTypeName == '公司线下调研' && detailData.IsLimitPeople">请报名获取 </view>
               <view class="network-right" v-else>{{ detailData.Address }}</view>
             </view>
             <view v-if="detailData.Highlights" class="network">
@@ -269,9 +214,7 @@
             </view>
             <view class="network" v-if="detailData.TencentConferenceNumber">
               <view class="network-left">腾讯会议号：</view>
-              <view class="network-right network-link" v-if="!detailData.IsSignup && (detailData.IsYidongConduct || detailData.IsLimitPeople)"
-                >请报名获取</view
-              >
+              <view class="network-right network-link" v-if="!detailData.IsSignup && (detailData.IsYidongConduct || detailData.IsLimitPeople)">请报名获取</view>
               <view class="network-right network-link" style="color: #2c83ff" v-else>
                 <view class="">
                   <text class="default tencent text_oneLine">{{ detailData.TencentConferenceNumber }}</text>
@@ -303,9 +246,7 @@
                 {{ detailData.IsCancelMeetingReminder == 1 ? "取消会议提醒" : "会议提醒" }}
                 <text>(会前15分钟推送微信消息提醒)</text>
               </view>
-              <view v-if="detailData.IsShowAppointment" @click="summaryIsHandel" class="make-generation make-conference">{{
-                detailData.IsAppointment == 1 ? "取消纪要" : "预约纪要"
-              }}</view>
+              <view v-if="detailData.IsShowAppointment" @click="summaryIsHandel" class="make-generation make-conference">{{ detailData.IsAppointment == 1 ? "取消纪要" : "预约纪要" }}</view>
               <view v-if="detailData.IsShowHelpSsk" class="make-generation make-conference" @click="askingGo"> 帮我带问 </view>
               <view class="make-outbound" @click="wanttosignup" v-if="!detailData.IsSignup && detailData.IsShowSignup">
                 {{ detailData.LimitPeopleNum > 0 ? `我要报名(${detailData.SignupNum}/${detailData.LimitPeopleNum})` : "我要报名" }}
@@ -326,15 +267,7 @@
         <SelectPopup :selectShow.sync="selectShow" @signupIsAddOfCancel="signupIsAddOfCancel" :selectYdong="selectYdong" />
         <view class="select-box">
           <u-popup v-model="selectShowLink" mode="bottom">
-            <view
-              style="color: #2c83ff"
-              class="text_oneLine article-title"
-              @click="goDetail(item.ArticleId)"
-              v-for="item in detailData.ArticleList"
-              :key="item.ArticleId"
-            >
-              {{ item.Title }}</view
-            >
+            <view style="color: #2c83ff" class="text_oneLine article-title" @click="goDetail(item.ArticleId)" v-for="item in detailData.ArticleList" :key="item.ArticleId"> {{ item.Title }}</view>
             <view style="color: #a9afb8" @click="selectShowLink = false">取消</view>
           </u-popup>
         </view>
@@ -363,26 +296,13 @@
       </view>
       <suspenButton v-if="showSingInImg" :showSingInImg.sync="showSingInImg" type="活动详情">
         <template slot="center">
-          <image mode="widthFix" style="height: 120rpx; width: 120rpx" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/sing_in_icon.png">
-          </image>
+          <image mode="widthFix" style="height: 120rpx; width: 120rpx" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/sing_in_icon.png"> </image>
         </template>
         <template slot="top">
-          <image
-            @click.stop="isDlgImg = true"
-            mode="widthFix"
-            style="height: 120rpx; width: 120rpx"
-            src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/sign_in_img.png"
-          >
-          </image>
+          <image @click.stop="isDlgImg = true" mode="widthFix" style="height: 120rpx; width: 120rpx" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/sign_in_img.png"> </image>
         </template>
         <template slot="left">
-          <image
-            @click.stop="goSingUpDetail"
-            mode="widthFix"
-            style="height: 120rpx; width: 120rpx"
-            src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/sing_up_details.png"
-          >
-          </image>
+          <image @click.stop="goSingUpDetail" mode="widthFix" style="height: 120rpx; width: 120rpx" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/sing_up_details.png"> </image>
         </template>
       </suspenButton>
       <van-popup custom-class="custom-class-popup" :show="isDlgImg" @close="onCloseHandler">
@@ -605,10 +525,7 @@ export default {
       let pages = getCurrentPages();
       let prevPage = pages[pages.length - 2];
       let path = prevPage ? prevPage.$page.fullPath : "";
-      if (
-        path.includes("/activityPages/themeActivity/themeActivity") ||
-        path.includes("/pages-search/indedxSearch/indedxSearch?source=活动详情页面")
-      ) {
+      if (path.includes("/activityPages/themeActivity/themeActivity") || path.includes("/pages-search/indedxSearch/indedxSearch?source=活动详情页面")) {
         const index = prevPage.$vm.collectList.findIndex((item) => item.ActivityId == this.id);
         prevPage.$vm.collectList[index].IsSignup = this.detailData.IsSignup;
         prevPage.$vm.collectList[index].SignupNum = this.detailData.SignupNum;
@@ -795,13 +712,7 @@ export default {
     myLeavingMessageHandler() {
       let title = this.detailData.FileType == 1 ? this.detailData.VoiceList.Name : this.detailData.VideoDetail.Title;
       uni.navigateTo({
-        url:
-          "/activityPages/generationAsk/generationAsk?id=" +
-          this.detailData.ActivityId +
-          "&type=文章&roadshow=" +
-          this.detailData.FileType +
-          "&roadshowTitle=" +
-          title,
+        url: "/activityPages/generationAsk/generationAsk?id=" + this.detailData.ActivityId + "&type=文章&roadshow=" + this.detailData.FileType + "&roadshowTitle=" + title,
       });
     },
 
@@ -833,7 +744,7 @@ export default {
     // 去往报名详情
     goSingUpDetail() {
       uni.navigateTo({
-        url: "/pages-message/activityTemplate/activityTemplate",
+        url: "/pages-message/activityTemplate/activityTemplate?id=" + this.id,
       });
     },
   },

config/modules/Msg.js

@@ -5,4 +5,9 @@ export const MsgTemplate = {
   microRoadshowDetail: (params) => {
     return getHttp("/micro_roadshow/comment/detail", params);
   },
+  // 活动签到到会详情
+  activity_signinDetail: (params) => {
+    return getHttp("/activity_signin/signup/detail", params);
+  },
+ 
 };

pages-message/activityTemplate/activityTemplate.vue

@@ -1,15 +1,15 @@
 <template>
   <view class="container container-activity-template">
-    <text class="title">【上海】机械行业全球化视角分析一面朝海外，春暖花开</text>
-    <block v-if="1 == 2">
+    <text class="title">{{ activityName }}</text>
+    <block v-if="dataList.length > 0">
       <view class="lable-title lable-box">
         <text v-for="item in lableList" :key="item">{{ item }}</text>
       </view>
       <view v-for="item in dataList" :key="item.id" class="lable-box lable-content">
-        <text>{{ item.name }}</text>
-        <text>{{ item.companyName }}</text>
-        <text>{{ item.is }}</text>
-        <text>{{ item.time }}</text>
+        <text>{{ item.RealName }}</text>
+        <text>{{ item.CompanyName }}</text>
+        <text>{{ item.IsMeeting == 1 ? "是" : "否" }}</text>
+        <text>{{ item.SigninTime }}</text>
       </view>
       <view class="ButtonText" @click="viewDetailsHandler"> 查看活动详情 </view>
     </block>
@@ -21,44 +21,35 @@
 </template>
 
 <script>
+import { MsgTemplate } from "@/config/api.js";
 export default {
   data() {
     return {
       lableList: ["姓名", "公司名", "是否到会", "签到时间"],
-      dataList: [
-        {
-          name: "王珊珊",
-          companyName: "招商证券（自营）",
-          is: "是",
-          time: "2023-04-28 12:04:22",
-          id: 1,
-        },
-        {
-          name: "王珊珊",
-          companyName: "招商证券（自营）",
-          is: "是",
-          time: "",
-          id: 1,
-        },
-        {
-          name: "王珊珊",
-          companyName: "招商证券（自营）",
-          is: "是",
-          time: "2023-04-28 12:04:22",
-          id: 1,
-        },
-        {
-          name: "王珊珊",
-          companyName: "招商证券（自营）",
-          is: "是",
-          time: "",
-          id: 1,
-        },
-      ],
+      dataList: [],
+      activityId: 0,
+      detailId: 0,
+      activityName: "",
     };
   },
   methods: {
-    viewDetailsHandler() {},
+    async getDetail() {
+      const res = await MsgTemplate.activity_signinDetail({
+        ActivityId: this.detailId,
+      });
+      if (res.Ret === 200) {
+        this.dataList = res.Data.List || [];
+        this.activityId = res.Data.ActivityId;
+        this.activityName = res.Data.ActivityName;
+      }
+    },
+    viewDetailsHandler() {
+      uni.navigateTo({ url: "/activityPages/activityDetail/activityDetail?id=" + this.activityId });
+    },
+  },
+  onLoad(optios) {
+    this.detailId = Number(optios.id) || 0;
+    this.detailId && this.getDetail();
   },
 };
 </script>

pages-signIn/isSignIn/components/uploadContact.vue

@@ -2,29 +2,28 @@
   <view class="content-upload-contact">
     <view class="title"> 您暂未绑定手机号<br />请按选择方式补充信息后确认签到</view>
     <radio-group style="margin-left: 35rpx" @change="radioChange">
-      <radio
-        v-for="item in radioList"
-        :key="item.value"
-        :class="['class-radio', radioValue === item.value && 'active-radio']"
-        :value="item.value"
-        color="#CAAF8B"
-        :checked="item.value == 1"
-        >{{ item.label }}</radio
-      >
+      <radio v-for="item in radioList" :key="item.value" :class="['class-radio', radioValue === item.value && 'active-radio']" :value="item.value" color="#CAAF8B" :checked="item.value == 1">{{
+        item.label
+      }}</radio>
     </radio-group>
     <view class="content-bind" v-if="radioValue == 1">
-      <view class="ipt-item">
-        <view class="item-label" @click="isAreaCode = true">
-          {{ `+${countryCode}` }}
-          <u-icon :name="isAreaCode ? 'arrow-up' : 'arrow-down'" color="#999999" size="28"></u-icon>
-        </view>
-        <input type="number" v-model="phoneNumber" placeholder="请输入手机号" />
-      </view>
-      <view class="ipt-item">
-        <input type="number" v-model="phoneCode" placeholder="请输入4位手机号验证码" />
-        <u-verification-code :seconds="seconds" ref="uCode" @change="codeTimeChange"></u-verification-code>
-        <view class="item-code" @click="getCode">{{ tips }} </view>
+      <view class="ipt-item" v-if="itemDetail.Mobile">
+        <view class="show-mobile"> {{ itemDetail.Mobile }}</view>
       </view>
+      <block v-else>
+        <view class="ipt-item">
+          <view class="item-label" @click="isAreaCode = true">
+            {{ `+${countryCode}` }}
+            <u-icon :name="isAreaCode ? 'arrow-up' : 'arrow-down'" color="#999999" size="28"></u-icon>
+          </view>
+          <input type="number" v-model="phoneNumber" placeholder="请输入手机号" />
+        </view>
+        <view class="ipt-item">
+          <input type="number" v-model="phoneCode" placeholder="请输入4位手机号验证码" />
+          <u-verification-code :seconds="seconds" ref="uCode" @change="codeTimeChange"></u-verification-code>
+          <view class="item-code" @click="getCode">{{ tips }} </view>
+        </view>
+      </block>
       <view class="ipt-item">
         <input type="text" v-model="userName" placeholder="请输入您的姓名" />
       </view>
@@ -71,8 +70,8 @@ export default {
       tips: "获取验证码",
       countryCode: "86",
       isAreaCode: false,
-      phoneNumber: "",
       phoneCode: "",
+      phoneNumber: "",
       userName: "",
       corporateName: "",
       fileUrl: "",
@@ -85,6 +84,20 @@ export default {
   },
   props: {
     codeId: {},
+    itemDetail: {
+      type: Object,
+      default: {},
+    },
+  },
+  watch: {
+    "itemDetail.Mobile": {
+      handler(newVal) {
+        this.phoneNumber = newVal;
+        console.log(this.phoneNumber);
+      },
+      deep: true,
+      immediate: true,
+    },
   },
   methods: {
     radioChange(e) {
@@ -131,18 +144,10 @@ export default {
     // 确认签到
     async submitButton() {
       if (this.radioValue == 1) {
-        if (this.phoneNumber && this.phoneCode && this.userName && this.corporateName) {
+        if (this.phoneNumber && (this.itemDetail.Mobile || this.phoneCode) && this.userName && this.corporateName) {
           this.submitPost();
         } else {
-          let msg = !this.phoneNumber
-            ? "请输入手机号"
-            : !this.phoneCode
-            ? "请输入验证码"
-            : !this.userName
-            ? "请输入姓名"
-            : !this.corporateName
-            ? "请输入公司名称"
-            : "";
+          let msg = !this.phoneNumber ? "请输入手机号" : !this.itemDetail.Mobile && this.phoneCode ? "请输入验证码" : !this.userName ? "请输入姓名" : !this.corporateName ? "请输入公司名称" : "";
           this.$util.toast(msg);
         }
       } else {
@@ -155,7 +160,7 @@ export default {
     },
     async submitPost() {
       const res = await Mine.activity_signin_byHand({
-        ActivityId: this.codeId || 2161, //活动ID
+        ActivityId: this.codeId, //活动ID
         CountryCode: this.countryCode, //区号
         Mobile: this.phoneNumber, //手机号
         VCode: this.phoneCode, //验证码
@@ -174,6 +179,17 @@ export default {
 
 <style lang="scss" scoped>
 .content-upload-contact {
+  .show-mobile {
+    display: flex;
+    align-items: center;
+    padding-left: 30rpx;
+    position: absolute;
+    width: 690rpx;
+    height: 78rpx;
+    background: #bfbfbf;
+    border-radius: 8rpx;
+    color: #333333;
+  }
   .title {
     text-align: center;
     color: #fff;

pages-signIn/isSignIn/isSignIn.vue

@@ -1,7 +1,7 @@
 <template>
   <view class="container content-sign-in">
     <view class="content-box" v-if="dataDetail">
-      <upload-contact v-if="!isBindMobile" :codeId="codeId" @getDetail="getDetail" />
+      <upload-contact v-if="!isBindMobile" :codeId="codeId" :itemDetail="dataDetail" @getDetail="getDetail" />
       <signInItem :itemDetail="dataDetail" v-else />
     </view>
   </view>
@@ -33,7 +33,7 @@ export default {
     },
   },
   onLoad(options) {
-    this.codeId = Number(options.scene) || 0;
+    this.codeId = Number(options.scene);
     this.codeId && this.getDetail();
   },
 };

pages/index/index.vue

@@ -248,7 +248,7 @@ export default {
         });
       }
       this.$refs.suspenButton.onOpen();
-    }
+    },
     // 获取banner 列表
     async getBannerList() {
       const res = await Home.bannerList();