我的日常 、 搜索

activityPages/specialDetail/specialDetail.vue

@@ -17,12 +17,12 @@
           <view class="network-left">所属行业：</view>
           <view class="network-right">{{ detailData.ChartPermissionName }}</view>
         </view>
-        <view class="network">
-          <view class="network-left">预期时间：</view>
-          <view class="network-right">{{ detailData.ActivityTimeText }}</view>
-        </view>
-        <view class="network">
+        <view class="network" v-if="detailData.TripStatus == 2">
           <view class="network-left">开始时间：</view>
+          <view class="network-right">{{ detailData.ActivityTimeTextByDay }}</view>
+        </view>
+        <view class="network" v-else>
+          <view class="network-left">预期时间：</view>
           <view class="network-right">{{ detailData.ActivityTimeText }}</view>
         </view>
         <view class="network">
@@ -49,9 +49,9 @@
           </view>
         </block>
         <view class="reminder-item">
-          <image v-if="1 == '预报名'" class="item" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/Y_apply.png"></image>
-          <image v-if="'行程' === '行程'" class="item" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/confirm_XC.png"></image>
-          <image @click="reminderTextHandler(item)" class="reminder" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/reminder_icon.png"></image>
+          <image v-if="detailData.TripStatus == 1" class="item" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/Y_apply.png"></image>
+          <image v-if="detailData.TripStatus == 2" class="item" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/confirm_XC.png"></image>
+          <image v-if="detailData.Explain" @click="reminderTextHandler(detailData)" class="reminder" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/reminder_icon.png"></image>
         </view>
       </view>
       <view class="" style="height: 50rpx"></view>
@@ -60,8 +60,13 @@
         <van-icon name="arrow" />
       </view>
       <view class="interest-btn">
-        <text class="button" v-if="detailData.IsSignup !== 1" @click="interest">感兴趣</text>
-        <text class="button" @click="beNotInterested" v-else>已预报名</text>
+        <block v-if="detailData.TripStatus == 2">
+          <text class="button" @click="applyOfcancel(detailData)">{{ detailData.IsTrip == 0 ? "我要报名" : "取消报名" }}</text>
+        </block>
+        <block v-else>
+          <text class="button" v-if="detailData.IsSignup !== 1" @click="interest">感兴趣</text>
+          <text class="button" @click="beNotInterested" v-else>已预报名</text>
+        </block>
       </view>
     </view>
     <!-- 权限部分 -->
@@ -72,19 +77,19 @@
     <u-modal
       v-model="specialGoFollowShow"
       :content-style="{ fontSize: '32rpx' }"
-      :show-cancel-button="!specialIsHintShow"
+      :show-cancel-button="show_cancel_button"
       confirm-text="知道了"
       @cancel="isCancelBtn = false"
-      :show-confirm-button="!specialIsHintShow"
+      :show-confirm-button="show_confirm_button"
       :show-title="false"
       :cancel-style="{ borderRight: '1rpx solid #EBEBEB' }"
       :confirm-style="{ fontWeight: '700' }"
       :mask-close-able="specialIsHintShow"
     >
       <view class="slot-content">
-        <block v-if="1 == 1">
-          <text>感谢参与，本次报名会扣除一次贵司在弘则的调研点数。</text>
-          <text class="light-hint">由于每场活动人数有限，如果不能参加请提前48小时取消，未及时取消导致影响其他客户报名将会维持扣点。</text>
+        <block v-if="specialPopupMsg">
+          <text>{{ specialAccounts }}</text>
+          <text class="light-hint">{{ specialPopupMsg }}</text>
         </block>
         <rich-text v-else :nodes="specialAccounts"></rich-text>
       </view>
@@ -364,7 +369,10 @@ export default {
       }
     }
   }
-
+  .light-hint {
+    color: #999;
+    font-size: 24rpx;
+  }
   .network {
     margin-bottom: 30rpx;
     padding: 0 !important;

activityPages/specialResearchPage/specialResearchPage.vue

@@ -2,7 +2,7 @@
   <view class="container special-research">
     <view class="top-notice">
       <view class="notice">
-        <van-notice-bar color="#FFFFFF" background="#FE9000" text="专项调研行程持续更新中，满五家即开团，欢迎点击感兴趣预报名" />
+        <van-notice-bar color="#FFFFFF" background="#FE9000" :text="wholeShowListData.ActivitySpecialExplain" />
       </view>
       <view class="inform-btn" @click="specialFollow">{{ specialIsFollow ? "取消通知" : "新调研通知" }}</view>
     </view>
@@ -29,16 +29,18 @@
               <view class="bottom-box">
                 <view class="" style="width: 130rpx"> </view>
                 <text @click="lookImg(item)">行程安排</text>
-                <text class="button" v-if="item.IsSignup !== 1" @click="interest(item)">感兴趣</text>
-                <text class="button" @click="beNotInterested(item)" v-else>已预报名</text>
-                <text class="button" @click="applyOfcancel(item)">感兴趣</text>
+                <text v-if="item.TripStatus == 2" class="button" @click="applyOfcancel(item)">{{ item.IsTrip == 0 ? "我要报名" : "取消报名" }}</text>
+                <block v-else>
+                  <text class="button" v-if="item.IsSignup !== 1" @click="interest(item)">感兴趣</text>
+                  <text class="button" @click="beNotInterested(item)" v-else>已预报名</text>
+                </block>
               </view>
             </view>
           </view>
           <view class="reminder-item">
-            <image v-if="1 == '预报名'" class="item" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/Y_apply.png"></image>
-            <image v-if="'行程' === '行程'" class="item" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/confirm_XC.png"></image>
-            <image @click="reminderTextHandler(item)" class="reminder" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/reminder_icon.png"></image>
+            <image v-if="item.TripStatus == 1" class="item" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/Y_apply.png"></image>
+            <image v-if="item.TripStatus == 2" class="item" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/confirm_XC.png"></image>
+            <image v-if="item.Explain" @click="reminderTextHandler(item)" class="reminder" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/reminder_icon.png"></image>
           </view>
         </view>
         <u-loadmore :status="status" icon-type="flower" :load-text="loadText" margin-top="20" v-if="totalPage > 1" />
@@ -50,19 +52,19 @@
     <u-modal
       v-model="specialGoFollowShow"
       :content-style="{ fontSize: '32rpx' }"
-      :show-cancel-button="!specialIsHintShow"
+      :show-cancel-button="show_cancel_button"
       confirm-text="知道了"
       @cancel="isCancelBtn = false"
-      :show-confirm-button="!specialIsHintShow"
+      :show-confirm-button="show_confirm_button"
       :show-title="false"
       :cancel-style="{ borderRight: '1rpx solid #EBEBEB' }"
       :confirm-style="{ fontWeight: '700' }"
       :mask-close-able="specialIsHintShow"
     >
       <view class="slot-content">
-        <block v-if="1 == 1">
-          <text>感谢参与，本次报名会扣除一次贵司在弘则的调研点数。</text>
-          <text class="light-hint">由于每场活动人数有限，如果不能参加请提前48小时取消，未及时取消导致影响其他客户报名将会维持扣点。</text>
+        <block v-if="specialPopupMsg">
+          <text>{{ specialAccounts }}</text>
+          <text class="light-hint">{{ specialPopupMsg }}</text>
         </block>
         <rich-text v-else :nodes="specialAccounts"></rich-text>
       </view>
@@ -88,9 +90,6 @@ export default {
         loading: "加载中",
         nomore: "已经到底了",
       },
-      specialIsFollow: false,
-      specialAccounts: `您已开启【专项调研】新活动通知<br/><br/>请关注【查研观向小助手】公众号，及时获取微信消息提醒`,
-      specialGoFollowShow: false,
     };
   },
   mixins: [specialMixins],
@@ -163,6 +162,7 @@ export default {
     },
     //新调研通知
     async specialFollow() {
+      this.show_confirm_button = true;
       if (this.specialIsFollow) {
         uni.showModal({
           content: "您要取消【专项调研】新活动通知吗？",
@@ -180,6 +180,7 @@ export default {
       } else {
         const res = await activity.postSpecialFollow();
         if (res.Ret === 200) {
+          this.show_cancel_button = true;
           this.specialIsFollow = !this.specialIsFollow;
           this.specialGoFollowShow = true;
         }

components/activity/indexActivity.js

@@ -166,11 +166,7 @@ export default {
                     } else if (res.Data.GoFollow) {
                       this.goFollow = res.Data.GoFollow;
                     } else if (res.Data.SignupStatus == "Success") {
-                      this.collectList.findIndex((key) => {
-                        if (key.ActivityId == id) {
-                          key.IsSignup = 1;
-                        }
-                      });
+                      item.IsSignup = 1;
                       this.isShow = true;
                     }
                   }

components/activity/specialMixins.js

@@ -6,37 +6,63 @@ export default {
       specialGoFollowShow: false, //弹框的隐藏显示
       specialAccounts: `您已开启【专项调研】新活动通知<br/><br/>请关注【查研观向小助手】公众号，及时获取微信消息提醒`,
       specialIsFollow: false, //是否关注
+      specialPopupMsg: "",
+      show_cancel_button: false,
+      show_confirm_button: false,
     };
   },
+  computed: {},
   methods: {
     //点击小icon
     reminderTextHandler(item) {
+      this.specialPopupMsg = "";
       this.specialIsHintShow = true;
       this.specialGoFollowShow = true;
-      this.specialAccounts = "此类调研时间安排已经确定，点击报名后按人次扣除对应机构的服务点数。由于每场活动人数有限，如果不能参加请提前48小时取消，未及时取消导致影响其他客户报名将会维持扣点。";
+      this.show_cancel_button = false;
+      this.show_confirm_button = false;
+      this.specialAccounts = item.Explain;
     },
     //报名或者取消报名
-    applyOfcancel(item) {
-      const str = item.ActivityTime.replace(/-/g, "/");
-      const date = new Date(str);
-      const times = date.getTime();
-      const num = new Date().getTime();
-      let twoDays = times - num <= 3600000 * 48;
-      uni.showModal({
-        content: twoDays ? "活动开始前48小时内，取消报名仍会维持扣点，确定要取消报名吗？" : "您要取消此次专项调研的预报名吗？",
-        confirmColor: "#3385FF",
-        cancelColor: "#606266",
-        success: async (res) => {
-          if (res.confirm) {
-            const res = await activity.postSpecialSignupAdd({
-              ActivityId: item.ActivityId,
-            });
-            if (res.Ret === 200) {
-              item.IsSignup = 0;
+    async applyOfcancel(item) {
+      this.show_cancel_button = false;
+      this.show_confirm_button = true;
+      if (item.IsTrip == 1) {
+        const str = item.ActivityTime.replace(/-/g, "/");
+        const date = new Date(str);
+        const times = date.getTime();
+        const num = new Date().getTime();
+        let twoDays = times - num <= 3600000 * 48;
+        uni.showModal({
+          content: twoDays ? "活动开始前48小时内，取消报名仍会维持扣点，确定要取消报名吗？" : "您要取消此次专项调研的预报名吗？",
+          confirmColor: "#3385FF",
+          cancelColor: "#606266",
+          success: async (res) => {
+            if (res.confirm) {
+              const res = await activity.activityApecialCancel({
+                ActivityId: item.ActivityId,
+              });
+              if (res.Ret === 200) {
+                uni.showToast({
+                  title: res.Msg,
+                  duration: 2000,
+                });
+                item.IsTrip = 0;
+              }
             }
+          },
+        });
+      } else {
+        const res = await activity.activityApecialAdd({ ActivityId: item.ActivityId });
+        if (res.Ret == 200) {
+          this.specialIsHintShow = false;
+          this.specialGoFollowShow = true;
+          this.specialAccounts = res.Data.PopupMsg;
+          this.specialPopupMsg = res.Data.PopupMsg2;
+          if (res.Data.SignupStatus == 1) {
+            item.IsTrip = 1;
           }
-        },
-      });
+        }
+      }
     },
   },
 };

config/api.js

@@ -353,11 +353,11 @@ export const activity = {
   },
   /*获取专项产业调研列表接口*/
   getSpecialList: (params) => {
-    return getHttp("/activity/special/list", params);
+    return getHttp("/activity_special/list", params);
   },
   /*获取专项产业调研列表接口*/
   getSpecialDetailList: (params) => {
-    return getHttp("/activity/special/detail", params);
+    return getHttp("/activity_special/detail", params);
   },
   /*感兴趣、不感兴趣接口*/
   postSpecialSignupAdd: (params) => {
@@ -379,6 +379,14 @@ export const activity = {
   backAudioPlay: (params) => {
     return postHttp("/activity/voiceHistory/add", params, 0);
   },
+  //专项产业报名取消报名接口
+  activityApecialAdd: (params) => {
+    return postHttp("/activity_special/add", params, 0);
+  },
+  //专项产业取消报名接口
+  activityApecialCancel: (params) => {
+    return postHttp("/activity_special/trip/cancel", params, 0);
+  },
 };
 export const Research = {
   /* 近期更新主题列表接口 */