4.3 体验版

activityPages/activitySearch/activitySearch.vue

@@ -53,7 +53,7 @@
         </view>
       </view>
       <!-- 各种状态选择 -->
-      <view class="select-conyent" v-if="isShowSearch">
+      <view class="select-conyent" v-if="isShowSearch && !dynamicName">
         <van-dropdown-menu active-color="#333333">
           <van-dropdown-item id="statusstate" :title="activeStateName" @close="closeTheWindow('statusstate')">
             <view class="menu-items">
@@ -124,7 +124,7 @@
     </view>
     <!-- 内容列表部分 -->
     <!-- 活动列表 -->
-    <view v-if="haveData" class="activity-pages">
+    <view v-if="haveData" class="activity-pages" :class="dynamicName ? 'activity-page' : '' ">
          <view class="collect-ul">
       <view class="collect-ltem" v-for="(item, index) in collectList" :key="index">
         <view class="title-date" @click="goDetail(item)">
@@ -137,6 +137,9 @@
             <text v-if="item.ActiveState==1" class="img-status begin">未开始</text>
             <text v-else-if="item.ActiveState==2"  class="img-status proceed">进行中</text>
             <text v-else class="img-status">已结束</text>
+            <view class="img-type">
+              <image :src="item.ImgUrlText" mode=""></image>
+            </view>
           </view>
           <view class="item">
             <view class="item-text" @click="goDetail(item)">
@@ -172,6 +175,14 @@
                 <text class="button" v-else @click="signupCancel(item.ActivityId, 3, item.ActivityTime)">取消报名</text>
               </view>
             </block>
+            <block v-else>
+               <view v-if="item.City" class="bottom-box city">
+                <view class="city-img">
+                  <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/location.png" />
+                  {{ item.City }}
+                </view>
+              </view>
+            </block>
           </view>
         </view>
       </view>
@@ -692,9 +703,13 @@ export default {
     height: 32rpx;
   }
 }
+
 .activity-pages {
   padding-top: 200rpx;
   padding-bottom: 30rpx;
 }
+.activity-page {
+  padding-top: 100rpx !important;
+}
 @import '../components/indexActivity.scss';
 </style>

activityPages/components/indexActivity.js

@@ -260,12 +260,12 @@ export default {
       }
     },
     //帮我代问
-    askingGo(item) {
+  async  askingGo(item) {
       const str = item.ActivityTime.replace(/-/g, "/");
       const date = new Date(str);
       const times = date.getTime();
       const num = new Date().getTime();
-      if (item.ChartPermissionName !== "严选") {
+      if (item.ChartPermissionName !== "研选") {
         if (times - num <= 900000) {
           uni.showModal({
             confirmText: "知道了",
@@ -286,9 +286,22 @@ export default {
           return;
         }
       }
-      uni.navigateTo({
-        url: "/activityPages/generationAsk/generationAsk?id=" + item.ActivityId,
-      });
+      const res = await activity.checkAskActivity({ActivityId:item.ActivityId })
+      if (res.Ret == 200) {
+        this.hasPermission = res.Data.HasPermission;
+        if (this.hasPermission == 1) {
+          uni.navigateTo({
+            url: "/activityPages/generationAsk/generationAsk?id=" + item.ActivityId,
+          });
+        } else if (this.hasPermission == 2) {
+          this.jurisdictionList.SellerMobile = res.Data.SellerMobile;
+          this.jurisdictionList.PopupMsg = res.Data.PopupMsg;
+          this.isShowhasPermission = true;
+        } else if (this.hasPermission == 3 || this.hasPermission == 4) {
+          this.jurisdictionList.PopupMsg = res.Data.PopupMsg;
+          this.applyForIsShow = true;
+        }
+      }
     },
     // 弹框的初始化
     init() {

activityPages/components/indexActivity.scss

@@ -53,25 +53,16 @@
         }
         .img-type {
             position: absolute;
-            top: 50%;
-            left: 50%;
-            transform: translate(-50%,-50%);
+            top: 0;
+            left: 0;
             color: #fff;
-            font-size: 28rpx;
-            z-index: 9;
+            height: 100%;
             width: 100%;
-            text-align: center;
-            .type-icn {
-               width: 109rpx;
-               height: 40rpx;
-               border: 1rpx solid #FFFFFF;
-               opacity: 1;
-               border-radius: 4rpx;
-               margin: 10rpx auto;
-               line-height: 38rpx;
-               font-size: 22rpx;
+            image {
+                height: 100%;
+                width: 100%;
             }
-        }
+          }
         .img-status {
           position: absolute;
           top: 0;
@@ -84,6 +75,7 @@
           text-align: center;
           line-height: 40rpx;
           color: #fff;
+          z-index: 10;
         }
         .proceed {
           background-color: #ffb54a;

activityPages/themeActivity/themeActivity.vue

@@ -19,10 +19,7 @@
               <text v-else-if="item.ActiveState == 2" class="img-status proceed">进行中</text>
               <text v-else class="img-status">已结束</text>
               <view class="img-type">
-                  <text style="white-space: nowrap;">
-                      {{item.ActivityTypeName}}
-                  </text>
-                  <view class="type-icn" v-if="item.IsShowSustainable">限免</view>
+                <image :src="item.ImgUrlText" mode=""></image>
               </view>
             </view>
             <view class="item">
@@ -188,7 +185,7 @@ export default {
   onShareAppMessage: function (res) {
     return {
       title: this.type || this.label,
-      path: "/activityPages/themeActivity/themeActivity?title=" + this.label + "&permissionIds=" + this.permissionIds + "&whichDay="+ this.whichDay,
+      path: "/activityPages/themeActivity/themeActivity?title=" + this.label + "&permissionIds=" + this.permissionIds + "&whichDay="+ this.whichDay + "&type=" + this.type,
     };
   },
 };

components/modalDialog.vue

@@ -209,7 +209,9 @@ export default {
     signupType() {
       if (this.signupStatus !== "Success") return;
       if (this.signupType == 1) {
-        this.content = `${this.countryCode}-${this.mobileEdit}<br/>预约成功，已加入您的活动日程`;
+        this.content = `${this.countryCode}-${this.mobileEdit}<br/>预约成功，已加入您的活动日程 <br/><br/> 请关注【查研观向小助手】公众号，及时获取活动信息变更提醒
+
+`;
         this.accounts = `
 					${this.countryCode}-${this.mobileEdit}<br/>
 					预约成功，已加入您的活动日程<br/><br/>
@@ -217,11 +219,11 @@ export default {
 					想要及时获取活动时间变更通知，请关注【查研观向小助手】公众号
 				`;
       } else if (this.signupType == 999) {
-        this.content = "设置成功，会前15分钟会为您推送微信消息提醒";
+        this.content = "设置成功<br /> <br/>请关注【查研观向小助手】公众号，会前15分钟为您推送微信提醒";
         this.accounts = `设置成功，会前15分钟会为您推送微信消息提醒<br/><br/>
 									请关注【查研观向小助手】公众号，以获取微信消息提醒`;
       } else {
-        this.content = "报名成功，已加入您的活动日程";
+        this.content = "报名成功，已加入您的活动日程 <br/><br/> 请关注【查研观向小助手】公众号，会前1小时为您推送微信提醒";
         this.accounts = `
 						报名成功，已加入您的活动日程<br/><br/>
 						

config/api.js

@@ -236,7 +236,7 @@ export const Reports = {
   },
   /* 获取上周研究汇总详情接口*/
   minutesSummaryDetail: (params) => {
-    return getHttp("/report/minutesSummary/detail", params);
+    return getHttp("/report/minutesSummary/detailv4", params);
   },
   /* 获取报告详情接口 /  路演精华*/
   roadshowEssence: (params) => {
@@ -301,5 +301,8 @@ export const activity = {
    getActivityLabelTypeList: (params) => {
     return getHttp("/activity/labelTypeList", params);
   },
-  
+  /* 校验活动带问是否有权限接口 */
+  checkAskActivity: (params) => {
+    return postHttp("/activity/checkAsk", params,0);
+  },
 };

config/config.js

@@ -1,5 +1,5 @@
-export const baseUrl = 'http://8.136.199.33:8500/api';//小程序开发接口地址
-//export const baseUrl = 'https://cygx.hzinsights.com/api';//小程序线上接口地址
+//export const baseUrl = 'http://8.136.199.33:8500/api';//小程序开发接口地址
+export const baseUrl = 'https://cygx.hzinsights.com/api';//小程序线上接口地址
 // #ifdef H5
 export const H5baseUrl=process.env.NODE_ENV === 'development'?window.location.origin+'/':baseUrl
 // #endif

pageMy/reportDetail/reportDetail.vue

@@ -37,8 +37,8 @@ export default {
       access_token: "", //用户标识
       isIphoneX: false, //判断机型
       reportInfo: "",
-      //linkurl:'https://details.hzinsights.com/raiReportDtl',//线上链接地址
-      linkurl: "http://192.168.2.22:2000/raiReportDtl", //链接地址
+      linkurl:'https://details.hzinsights.com/raiReportDtl',//线上链接地址
+      //linkurl: "http://192.168.2.22:2000/raiReportDtl", //链接地址
       showNav: false,
       id: "",
       isShowTip: false,

pages/activity/activity.vue

@@ -82,7 +82,10 @@
             <image :src="item.ImgUrl">
             <text v-if="item.ActiveState == 1" class="img-status begin">未开始</text>
             <text v-else-if="item.ActiveState == 2" class="img-status proceed">进行中</text>
-            <text v-else class="img-status">已结束</text>
+            <text v-else class="img-status">已结束</text>
+            <view class="img-type">
+              <image :src="item.ImgUrlText" mode=""></image>
+            </view>
           </view>
           <view class="item">
             <view class="item-text" @click="goDetail(item)">

pages/reportForm/components/researchChoose.vue

@@ -129,7 +129,7 @@ export default {
               this.accounts = `作者关注成功 <br> 想要及时获取该作者新发报告时的消息推送，请关注【查研观向小助手】公众号`;
               this.isCancelBtn = true;
             } else {
-              this.accounts = "作者关注成功，该作者发布新的报告时，【查研观向小助手】公众号会为您推送微信消息提醒";
+              this.accounts = `作者关注成功 <br> 请关注【查研观向小助手】公众号，及时获取该作者的报告更新提醒`;;
             }
           } else {
             uni.showToast({

pages/reportForm/reportForm.vue

@@ -420,7 +420,7 @@ export default {
               this.accounts = `产业关注成功 <br> 想要及时获取该产业内容的更新推送，请关注【查研观向小助手】公众号`;
               this.isCancelBtn = true;
             } else {
-              this.accounts = "产业关注成功，产业报告更新时，【查研观向小助手】公众号会为您推送微信消息提醒";
+              this.accounts = "产业关注成功<br>请关注【查研观向小助手】公众号，及时获取产业报告更新提醒";
             }
           }
           this.industryList.forEach((key) => {

reportPages/myAskPage/myAskPage.vue

@@ -1,13 +1,13 @@
 <template>
   <view class="container ask-container">
     <view v-if="haveData">
-      <view class="collect-item" v-for="(item, index) in askList" :key="index">
+      <view class="collect-item" v-for="(item, index) in askList" :key="index" @click="goDetail(item)">
         <view class="item-row">
           <text>问题内容:</text>
           <text>{{ item.Content }}</text>
         </view>
         <view class="item-title">
-          <view class="item-row" @click="goDetail(item)">
+          <view class="item-row">
             <text>相关{{ item.AskType == "Activity" ? "活动" : "报告" }}:</text>
             <text class="title">{{ item.Title }}</text>
           </view>