8.6 审核

activityPages/activityDetail/activityDetail.vue

@@ -55,9 +55,15 @@
               <view class="card-title text_twoLine">
                 {{ detailTitle(detailData.VoiceList.Name) }}
                 <view class="title-image">
-                  <image @click="myLeavingMessageHandler(item)" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/multimedia/leaving_message.png"></image>
-                  <image @click="isCollectionHandeler(item)" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/multimedia/not_collected.png"></image>
-                  <!-- <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/multimedia/collected_icon.png"></image> -->
+                  <image @click="myLeavingMessageHandler" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/multimedia/leaving_message.png"></image>
+                  <image
+                    @click="isCollectionHandeler"
+                    :src="
+                      detailData.IsCollect
+                        ? 'https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/multimedia/collected_icon.png'
+                        : 'https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/multimedia/not_collected.png'
+                    "
+                  ></image>
                 </view>
               </view>
             </view>
@@ -79,9 +85,15 @@
               <view class="title text_twoLine">
                 {{ detailTitle(detailData.VideoDetail.Title) }}
                 <view class="title-image">
-                  <image @click="myLeavingMessageHandler(item)" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/multimedia/leaving_message.png"></image>
-                  <image @click="isCollectionHandeler(item)" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/multimedia/not_collected.png"></image>
-                  <!-- <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/multimedia/collected_icon.png"></image> -->
+                  <image @click="myLeavingMessageHandler" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/multimedia/leaving_message.png"></image>
+                  <image
+                    @click="isCollectionHandeler"
+                    :src="
+                      detailData.IsCollect
+                        ? 'https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/multimedia/collected_icon.png'
+                        : 'https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/multimedia/not_collected.png'
+                    "
+                  ></image>
                 </view>
               </view>
             </view>
@@ -265,8 +277,6 @@
         :jurisdictionList="jurisdictionList"
         :mailboxBinding="mailboxBinding"
       />
-      <!-- 区号的弹出层 -->
-      <areaCode :isAreaCode="isAreaCode" :areaCode="areaCode" />
     </view>
     <!-- 权限部分 -->
     <view v-else>
@@ -282,7 +292,6 @@
 <script>
 import { activity, User, Home } from "@/config/api.js";
 import modalDialog from "@/components/modalDialog.vue";
-import areaCode from "@/components/activity/areaCode.vue";
 import jurisdiction from "./jurisdiction/components.vue";
 import freeCharge from "@/components/freeCharge";
 import audioModule from "@/components/audioModule/index";
@@ -313,12 +322,6 @@ export default {
         state: "",
       },
       selectShow: false,
-      isAreaCode: false,
-      areaCode: {
-        id: "",
-        type: "",
-      },
-      isNeedAddCountryCode: false,
       haveAuth: "",
       jurisdictionList: {},
       editIsShow: false, //外呼莫泰框
@@ -369,7 +372,6 @@ export default {
   components: {
     modalDialog,
     jurisdiction,
-    areaCode,
     freeCharge,
     audioModule,
   },
@@ -391,14 +393,6 @@ export default {
     },
   },
   methods: {
-    // 获取是否需要填写区号接口
-    countryCcode() {
-      User.countryCcode().then((res) => {
-        if (res.Ret == 200) {
-          this.isNeedAddCountryCode = res.Data.IsNeedAddCountryCode;
-        }
-      });
-    },
     // 获取详情
     getActivityDetail() {
       activity
@@ -419,7 +413,7 @@ export default {
                 prevPage.$vm.collectList[index].IsSignup = this.detailData.IsSignup;
                 prevPage.$vm.collectList[index].SignupNum = this.detailData.SignupNum;
                 prevPage.$vm.collectList[index].IsAppointment = this.detailData.IsAppointment;
-                prevPage.$vm.collectList[index].IsCancelMeetingReminder = this.detailData.IsCancelMeetingReminder; 
+                prevPage.$vm.collectList[index].IsCancelMeetingReminder = this.detailData.IsCancelMeetingReminder;
               }
             }
           }
@@ -590,6 +584,28 @@ export default {
       let str = val.length > 41 ? val.slice(0, 41) + "..." : val;
       return str;
     },
+
+    // 微路演留言
+    myLeavingMessageHandler() {
+      uni.navigateTo({
+        url: "/activityPages/generationAsk/generationAsk?id=" + this.detailData.ActivityId + "&type=文章&roadshow=" + 1 + "&roadshowTitle=" + this.detailData.Title,
+      });
+    },
+
+    // 微路演收藏
+    async isCollectionHandeler() {
+      const res = await Home.microRoadshowCollect({
+        Id: this.detailData.ActivityId,
+        SourceType: this.detailData.FileType == 1 ? 2 : 1,
+      });
+      if (res.Ret === 200) {
+        uni.showToast({
+          title: res.Msg,
+          duration: 2000,
+        });
+        this.getActivityDetail();
+      }
+    },
   },
   async onLoad(option) {
     this.id = option.id || "";
@@ -597,7 +613,6 @@ export default {
     // this.listenAudio()
     if (!this.$store.state.isAuth && !this.$store.state.isBind) {
       //已授权已绑定
-      this.countryCcode(); //判断是否加区号
       this.getActivityDetail();
     }
   },

activityPages/activityDetail/manageMixin.js

@@ -46,48 +46,40 @@ export default {
         clearTimeout(timer);
         this.flag = true;
         this.selectShow = false;
-        if (this.isNeedAddCountryCode) {
-          this.isAreaCode = true;
-          this.areaCode = {
-            id,
-            type,
-          };
-        } else {
-          activity
-            .signupAdd({
-              ActivityId: this.detailData.ActivityId,
-              SignupType: type,
-            })
-            .then((res) => {
-              if (res.Ret == 200) {
-                this.hasPermission = res.Data.HasPermission;
-                this.jurisdictionList = res.Data;
-                this.signupType = valName == "CClass" ? "CClass" : res.Data.SignupType;
-                this.countryCode = res.Data.CountryCode;
-                this.mobileEdit = res.Data.Mobile;
-                this.goOnNextStep = res.Data.GoFollow;
-                this.idTypeCancel = {
-                  cutId: res.Data.ActivityId,
-                  state: 1,
-                };
-                if (res.Data.GoBindEmail) {
-                  this.mailboxBinding = true;
-                  return;
-                }
-                if (res.Data.SignupStatus !== "Success") {
+        activity
+          .signupAdd({
+            ActivityId: this.detailData.ActivityId,
+            SignupType: type,
+          })
+          .then((res) => {
+            if (res.Ret == 200) {
+              this.hasPermission = res.Data.HasPermission;
+              this.jurisdictionList = res.Data;
+              this.signupType = valName == "CClass" ? "CClass" : res.Data.SignupType;
+              this.countryCode = res.Data.CountryCode;
+              this.mobileEdit = res.Data.Mobile;
+              this.goOnNextStep = res.Data.GoFollow;
+              this.idTypeCancel = {
+                cutId: res.Data.ActivityId,
+                state: 1,
+              };
+              if (res.Data.GoBindEmail) {
+                this.mailboxBinding = true;
+                return;
+              }
+              if (res.Data.SignupStatus !== "Success") {
+                this.isShow = true;
+              } else {
+                if (res.Data.GoOutboundMobile) {
+                  this.editIsShow = true;
+                } else if (res.Data.GoFollow) {
+                  this.goFollow = res.Data.GoFollow;
+                } else if (res.Data.SignupStatus == "Success") {
                   this.isShow = true;
-                } else {
-                  if (res.Data.GoOutboundMobile) {
-                    this.editIsShow = true;
-                  } else if (res.Data.GoFollow) {
-                    this.goFollow = res.Data.GoFollow;
-                  } else if (res.Data.SignupStatus == "Success") {
-                    this.isShow = true;
-                  }
                 }
               }
-            });
-        }
+            }
+          });
         timer = setTimeout(() => {
           this.flag = false;
         }, 500);

activityPages/generationAsk/generationAsk.vue

@@ -10,7 +10,7 @@
 </template>
 
 <script>
-import { activity, Report } from "@/config/api.js";
+import { activity, Report, Home } from "@/config/api.js";
 import freeCharge from "@/components/freeCharge";
 export default {
   data() {
@@ -18,6 +18,8 @@ export default {
       advice_content: "",
       id: "",
       type: "",
+      roadshowTitle: "", // 微路演标题
+      roadshow: null, // 判断微路演的类型
     };
   },
   components: {
@@ -30,8 +32,16 @@ export default {
   },
   methods: {
     async submitHandle() {
+      console.log( this.roadshow ,this.type);
       const res =
-        this.type == "文章"
+        this.roadshow && this.type == "文章"
+          ? await Home.microRoadshowAdd({
+              ArticleId: Number(this.id),
+              Content: this.advice_content,
+              SourceType: this.roadshow == 3 ? 2 : 1,
+              Title: this.roadshowTitle,
+            })
+          : this.type == "文章"
           ? await Report.articleAskAdd({
               ArticleId: Number(this.id),
               Content: this.advice_content,
@@ -50,8 +60,11 @@ export default {
     },
   },
   onLoad(option) {
+    console.log(option);
     this.id = option.id;
     this.type = option.type || "";
+    this.roadshow = option.roadshow || null;
+    this.roadshowTitle = option.roadshowTitle || "";
     uni.setNavigationBarTitle({
       title: this.type == "文章" ? "留言" : this.type == "提问" ? "实时提问" : "帮我带问",
     });

activityPages/themeActivity/themeActivity.vue

@@ -174,7 +174,6 @@
         :mailboxBinding="mailboxBinding"
       />
     </view>
-    <areaCode :isAreaCode="isAreaCode" :areaCode="areaCode" />
     <freeCharge class="free-charge" :isShowFreeBtn="isShowFree" />
     <view v-if="showAudioBox">
       <audioModule :showAudioPop.sync="showAudioPop" />
@@ -188,7 +187,6 @@ import { activity, User } from "@/config/api.js";
 import { Throttle } from "@/config/util.js";
 import modalDialog from "@/components/modalDialog.vue";
 import myActivityMixin from "@/components/activity/indexActivity.js";
-import areaCode from "@/components/activity/areaCode.vue";
 import freeCharge from "@/components/freeCharge";
 import selectMixins from "../components/selectMixins.js";
 import audioModule from "@/components/audioModule/index";
@@ -208,17 +206,10 @@ export default {
       activityId: "",
       selectShow: false,
       haveData: true,
-      isNeedAddCountryCode: false, //判断是否需要区号
-      isAreaCode: false,
-      areaCode: {
-        id: "",
-        type: "",
-      },
       isEndActivity: false,
     };
   },
   components: {
-    areaCode,
     modalDialog,
     freeCharge,
     audioModule,
@@ -260,15 +251,6 @@ export default {
       }
     },
 
-    // 获取是否需要填写区号接口
-    countryCcode() {
-      User.countryCcode().then((res) => {
-        if (res.Ret == 200) {
-          this.isNeedAddCountryCode = res.Data.IsNeedAddCountryCode;
-        }
-      });
-    },
-
     // 点击了top的标签
     jumpHandler() {
       if (this.contentDetail.IsJump) {
@@ -318,7 +300,6 @@ export default {
         this.selectInitHandler(this.selectActiveId, this.activityTypeList);
       }
       this.getActivityList();
-      this.countryCcode();
     },
   },
   onLoad(option) {

components/activity/areaCode.vue

@@ -45,7 +45,6 @@ export default {
         if (res.Ret == 200) {
           this.areacodeShow = false;
           this.$parent.isAreaCode = false;
-          this.$parent.isNeedAddCountryCode = false;
           this.$parent.signupAdd(this.areaCode.id, this.areaCode.type);
         }
       });

components/activity/indexActivity.js

@@ -13,12 +13,6 @@ export default {
         loading: "加载中",
         nomore: "已经到底了",
       },
-      isNeedAddCountryCode: false, //判断是否需要区号
-      isAreaCode: false,
-      areaCode: {
-        id: "",
-        type: "",
-      },
       /**/
       tabsActive: 0,
       /**/
@@ -59,14 +53,7 @@ export default {
         this.signupIsAddOfCancel(item, 3);
       }
     },
-    //判断是否要绑定区号
-    countryCcode() {
-      User.countryCcode().then((res) => {
-        if (res.Ret == 200) {
-          this.isNeedAddCountryCode = res.Data.IsNeedAddCountryCode;
-        }
-      });
-    },
+
     //报名/取消报名
     signupIsAddOfCancel(item, type, valName = "") {
       let id = this.activityIdAdd || item.ActivityId;
@@ -121,61 +108,53 @@ export default {
         clearTimeout(timer);
         this.flag = true;
         this.selectShow = false;
-        if (this.isNeedAddCountryCode) {
-          this.isAreaCode = true;
-          this.areaCode = {
-            id,
-            type,
-          };
-        } else {
-          activity
-            .signupAdd({
-              ActivityId: id,
-              SignupType: type,
-            })
-            .then((res) => {
-              if (res.Ret == 200) {
-                this.hasPermission = res.Data.HasPermission;
-                this.jurisdictionList = res.Data;
-                if (this.hasPermission == 1) {
-                  const index = this.collectList.findIndex((key) => key.ActivityId == id);
-                  this.collectList[index].SignupType = type;
-                  this.signupType = valName == "CClass" ? "CClass" : res.Data.SignupType;
-                  this.countryCode = res.Data.CountryCode;
-                  this.mobileEdit = res.Data.Mobile;
-                  this.goOnNextStep = res.Data.GoFollow;
-                  this.idTypeCancel = {
-                    cutId: res.Data.ActivityId,
-                    state: 1,
-                  };
-                  if (res.Data.GoBindEmail) {
-                    this.mailboxBinding = true;
-                    return;
-                  }
-                  if (res.Data.SignupStatus !== "Success") {
+        activity
+          .signupAdd({
+            ActivityId: id,
+            SignupType: type,
+          })
+          .then((res) => {
+            if (res.Ret == 200) {
+              this.hasPermission = res.Data.HasPermission;
+              this.jurisdictionList = res.Data;
+              if (this.hasPermission == 1) {
+                const index = this.collectList.findIndex((key) => key.ActivityId == id);
+                this.collectList[index].SignupType = type;
+                this.signupType = valName == "CClass" ? "CClass" : res.Data.SignupType;
+                this.countryCode = res.Data.CountryCode;
+                this.mobileEdit = res.Data.Mobile;
+                this.goOnNextStep = res.Data.GoFollow;
+                this.idTypeCancel = {
+                  cutId: res.Data.ActivityId,
+                  state: 1,
+                };
+                if (res.Data.GoBindEmail) {
+                  this.mailboxBinding = true;
+                  return;
+                }
+                if (res.Data.SignupStatus !== "Success") {
+                  this.isShow = true;
+                } else {
+                  if (res.Data.GoOutboundMobile) {
+                    this.editIsShow = true;
+                  } else if (res.Data.GoFollow) {
+                    this.goFollow = res.Data.GoFollow;
+                  } else if (res.Data.SignupStatus == "Success") {
                     this.isShow = true;
-                  } else {
-                    if (res.Data.GoOutboundMobile) {
-                      this.editIsShow = true;
-                    } else if (res.Data.GoFollow) {
-                      this.goFollow = res.Data.GoFollow;
-                    } else if (res.Data.SignupStatus == "Success") {
-                      this.isShow = true;
-                    }
-                    this.collectList.forEach((valueAct) => {
-                      if (valueAct.ActivityId === id) {
-                        valueAct.IsSignup = 1;
-                      }
-                    });
                   }
-                } else if (this.hasPermission == 2) {
-                  this.isShowhasPermission = true;
-                } else if (this.hasPermission == 3 || this.hasPermission == 4 || this.hasPermission == 5) {
-                  this.applyForIsShow = true;
+                  this.collectList.forEach((valueAct) => {
+                    if (valueAct.ActivityId === id) {
+                      valueAct.IsSignup = 1;
+                    }
+                  });
                 }
+              } else if (this.hasPermission == 2) {
+                this.isShowhasPermission = true;
+              } else if (this.hasPermission == 3 || this.hasPermission == 4 || this.hasPermission == 5) {
+                this.applyForIsShow = true;
               }
-            });
-        }
+            }
+          });
         timer = setTimeout(() => {
           this.flag = false;
         }, 500);

config/modules/Home.js

@@ -1,29 +1,36 @@
 import { getHttp, postHttp } from "../request.js";
 
-
 /* 首页 */
 export const Home = {
-    /* 
+  /* 
       列表
       PageSize * CurrentIndex * ChartPermissionId *品类id，最新传0
       */
-    getList: (params) => {
-      return getHttp("/home/artAndChart/list", params);
-    },
-    /* 获取品种 */
-    Tab: (params) => {
-      return getHttp("/permission/all", params, 0);
-    },
-    /* 首页-顶部导航 */
-    headerTab: (params) => {
-      return getHttp("/home/header_tab", params, 0);
-    },
-    /* 微路演列表 */
-    microRoadshowList: (params) => {
-      return getHttp("/micro_roadshow/list", params, 0);
-    },
-    /* 新增视频播放记录 */
-    microAideoHistoryAdd: (params) => {
-      return postHttp("/micro_roadshow/videoHistory/add", params, 0);
-    },
-  };
+  getList: (params) => {
+    return getHttp("/home/artAndChart/list", params);
+  },
+  /* 获取品种 */
+  Tab: (params) => {
+    return getHttp("/permission/all", params, 0);
+  },
+  /* 首页-顶部导航 */
+  headerTab: (params) => {
+    return getHttp("/home/header_tab", params, 0);
+  },
+  /* 微路演列表 */
+  microRoadshowList: (params) => {
+    return getHttp("/micro_roadshow/list", params, 0);
+  },
+  /* 新增视频播放记录 */
+  microAideoHistoryAdd: (params) => {
+    return postHttp("/micro_roadshow/videoHistory/add", params, 0);
+  },
+  /* 微路演留言 */
+  microRoadshowAdd: (params) => {
+    return postHttp("/micro_roadshow/comment/add", params, 0);
+  },
+  //微路演收藏
+  microRoadshowCollect: (params) => {
+    return postHttp("/micro_roadshow/collect", params);
+  },
+};

config/modules/ReportArticle.js

@@ -20,7 +20,7 @@ export const Report = {
   },
   /* 新增文章带问接口 ArticleId*/
   articleAskAdd: (params) => {
-    return postHttp("/article/askAdd", params, 0);
+    return postHttp("/report/commentAdd", params, 0);
   },
   /* 下载PDF打水印接口*/
   articlePdfwatermark: (params) => {

config/modules/User.js

@@ -76,6 +76,6 @@ export const User = {
   },
   //我的收藏-微路演
   getListMicroRoadshow: (params) => {
-    return getHttp(" user/collect/list/microRoadshow", params);
+    return getHttp("/user/collect/list/microRoadshow", params);
   },
 };

pageMy/myCollection/myCollection.vue

@@ -35,8 +35,8 @@
             <view class="title text_twoLine">{{ item.Title }}</view>
             <view class="share share-collected">
               <image @click="myLeavingMessageHandler(item)" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/multimedia/leaving_message.png"></image>
-              <image @click="isCollectionHandeler(item)" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/multimedia/not_collected.png"></image>
-              <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/multimedia/collected_icon.png"></image>
+              <image v-if="item.IsCollect" @click="isCollectionHandeler(item)" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/multimedia/collected_icon.png"></image>
+              <image v-else @click="isCollectionHandeler(item)" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/multimedia/not_collected.png"></image>
               <button class="share-icon" open-type="share" :data-item="item">
                 <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/multimedia/share-btn-icon.png"></image>
               </button>
@@ -87,7 +87,7 @@
 </template>
 
 <script>
-import { Mine, Report, Home ,User} from "@/config/api.js";
+import { Mine, Report, Home, User } from "@/config/api.js";
 import videoModule from "@/components/videoModule/index";
 import audioModule from "@/components/audioModule/index";
 import freeCharge from "@/components/freeCharge";
@@ -119,6 +119,7 @@ export default {
     };
   },
   onLoad() {
+    uni.hideShareMenu();
     this.getCollectList();
   },
   components: {
@@ -135,10 +136,7 @@ export default {
               PageSize: this.pageSize,
               CurrentIndex: this.page_no,
             })
-          : await User.getListMicroRoadshow({
-              PageSize: this.pageSize,
-              CurrentIndex: this.page_no,
-            });
+          : this.getrroadshowList();
       if (res.Ret === 200) {
         this.status = this.page_no < res.Data.Paging.Pages ? "loadmore" : "nomore";
         this.totalPage = res.Data.Paging.Pages; //总页数
@@ -154,7 +152,36 @@ export default {
         }
       }
     },
-
+    async getrroadshowList() {
+      const res = await User.getListMicroRoadshow();
+      if (res.Ret === 200) {
+        let VideoIds = res.Data.VideoIds;
+        let AudioIds = res.Data.AudioIds;
+        let ActivityVideoIds = res.Data.ActivityVideoIds;
+        const resRoadshow = await Home.microRoadshowList({
+          PageSize: this.pageSize,
+          CurrentIndex: this.page_no,
+          AudioIds,
+          VideoIds,
+          ActivityVideoIds,
+        });
+        if (resRoadshow.Ret === 200) {
+          this.status = this.page_no < resRoadshow.Data.Paging.Pages ? "loadmore" : "nomore";
+          this.totalPage = resRoadshow.Data.Paging.Pages; //总页数
+          if (this.page_no === 1) {
+            this.collectList = resRoadshow.Data.List || [];
+            this.haveData = this.collectList.length ? true : false;
+            if (this.refresh) {
+              uni.stopPullDownRefresh();
+              this.refresh = false;
+            }
+          } else {
+            this.collectList = this.collectList.concat(resRoadshow.Data.List);
+          }
+        }
+      }
+      console.log(res);
+    },
     // 去往文章详情页面
     goDetailReport(item) {
       this.$store.dispatch("checkHandle", "/pageMy/reportDetail/reportDetail?id=" + item.ArticleId);
@@ -268,6 +295,28 @@ export default {
       }
       this.showAudioPop = true;
     },
+    // 微路演留言
+    myLeavingMessageHandler(item) {
+      uni.navigateTo({
+        url: "/activityPages/generationAsk/generationAsk?id=" + (item.Type == 3 ? item.Id : item.ActivityId) + "&type=文章&roadshow=" + item.Type + "&roadshowTitle=" + item.Title,
+      });
+    },
+
+    // 微路演收藏
+    async isCollectionHandeler(item) {
+      const res = await Home.microRoadshowCollect({
+        Id: item.Id,
+        SourceType: item.Type,
+      });
+      if (res.Ret === 200) {
+        let index = this.collectList.findIndex((key) => key.Id == item.Id);
+        this.collectList.splice(index, 1);
+        uni.showToast({
+          title: res.Msg,
+          duration: 2000,
+        });
+      }
+    },
   },
   computed: {
     curVoiceId() {
@@ -302,6 +351,22 @@ export default {
     this.refresh = true;
     this.getCollectList();
   },
+  /** 用户点击分享*/
+  onShareAppMessage: function ({ from, target }) {
+    if (from === "button") {
+      let item = target.dataset.item;
+      let audio_id = item.Type == 1 || item.AudioType == 1 ? item.Id : "";
+      // type=2 -- 活动视频 type=3 -- 产业视频
+      let video_id = item.Type == 2 || item.Type == 3 ? item.Id : "";
+      let activity_id = item.Type == 2 && item.ActivityId > 0 ? item.ActivityId : "";
+      let title_share = item.AudioTitle || item.Title;
+      return {
+        title: this.isHorzMobile ? "好友向您推荐此内容，上传名片享查研观向免费月卡！" : title_share,
+        path: "/pages/index/index?topTabsActive=4" + "&audioShareId=" + audio_id + "&videoShareId=" + video_id + "&activityId=" + activity_id,
+        imageUrl: item.AudioShareImg || item.ShareImg,
+      };
+    }
+  },
 };
 </script>
 

pageMy/myLeavingMessage/myLeavingMessage.vue

@@ -9,7 +9,7 @@
         <view class="item-title">
           <view class="item-row">
             <text class="item-content-title">留言对象:</text>
-            <text class="item-content-text">{{ item.CompanyName }}</text>
+            <text class="item-content-text">{{ item.Title }}</text>
           </view>
         </view>
         <text class="time">{{ dateFormatterHandler(item.CreateTime) }}</text>

pages-search/components/activityBack.vue

@@ -118,8 +118,6 @@
       :applyForIsShow="applyForIsShow"
       :mailboxBinding="mailboxBinding"
     />
-    <!-- 选择区号弹出层 -->
-    <areaCode :isAreaCode="isAreaCode" :areaCode="areaCode" />
     <!-- 参会方式弹出层 -->
     <view class="select-box">
       <u-popup v-model="selectShow" mode="bottom">
@@ -159,7 +157,6 @@
 
 <script>
 import modalDialog from "@/components/modalDialog.vue";
-import areaCode from "@/components/activity/areaCode.vue";
 import specialMixins from "@/activityPages/components/specialMixins.js";
 import myActivityMixin from "@/components/activity/indexActivity.js";
 import mediaMixins from "@/components/activity/mediaMixins";
@@ -196,18 +193,11 @@ export default {
       ],
       selectShow: false,
       selectShow: false,
-      isNeedAddCountryCode: false, //判断是否需要区号
-      isAreaCode: false,
-      areaCode: {
-        id: "",
-        type: "",
-      },
     };
   },
   mixins: [ myActivityMixin, mediaMixins, specialMixins],
   components: {
     modalDialog,
-    areaCode,
     freeCharge,
     audioModule,
     videoModule,
@@ -222,14 +212,6 @@ export default {
     },
   },
   methods: {
-    //获取是否需要填写区号接口
-    countryCcode() {
-      User.countryCcode().then((res) => {
-        if (res.Ret == 200) {
-          this.isNeedAddCountryCode = res.Data.IsNeedAddCountryCode;
-        }
-      });
-    },
     //查看行程的事件
     lookImg(item) {
       uni.previewImage({

pages-search/components/roadshow.vue

@@ -1,5 +1,5 @@
 <template>
-  <view :class="['roadshow-search',tabsRoadshowSearch == 5 && 'roadshow-search-top']">
+  <view :class="['roadshow-search', tabsRoadshowSearch == 5 && 'roadshow-search-top']">
     <view class="audio-video-content">
       <view class="audio-item" v-for="item in roadshowPageList" :key="item.Id">
         <view class="cover-item" :style="{ 'background-image': 'url(' + item.BackgroundImg + ')' }">
@@ -19,16 +19,24 @@
             ></image>
           </block>
           <text class="time">{{ item.PublishTime }}</text>
+          <view :class="['identification', item.Type != 1 && 'identification-video']"> </view>
+          <image
+            class="identification-img"
+            :src="item.Type == 1 ? 'https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/multimedia/video-iocn.png' : 'https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/multimedia/audio-icon.png'"
+          ></image>
         </view>
         <view class="title-share">
           <view class="title text_twoLine">{{ item.Title }}</view>
-          <view class="share">
-            <view class="share-text" :style="[classifyColor(item.ChartPermissionName)]">
-              <image :src="classifyIcon(item)"></image>
-              {{ item.Type == 1 ? "音频" : "视频" }}｜{{ item.ChartPermissionName }}
-            </view>
+          <view class="share share-collected">
+            <image @click="myLeavingMessageHandler(item)" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/multimedia/leaving_message.png"></image>
+            <image
+              @click="isCollectionHandeler(item)"
+              :src="
+                item.IsCollect ? 'https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/multimedia/collected_icon.png' : 'https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/multimedia/not_collected.png'
+              "
+            ></image>
             <button class="share-icon" open-type="share" :data-item="item">
-              <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/share-btn-icon.png"></image>
+              <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/multimedia/share-btn-icon.png"></image>
             </button>
           </view>
         </view>
@@ -38,7 +46,7 @@
 </template>
 
 <script>
-import { Search, activity, Report } from "@/config/api";
+import { Search, activity, Report, Home } from "@/config/api";
 import { color_word_bg, MultimediaIcon } from "@/utils/styleClassify";
 export default {
   props: {
@@ -47,10 +55,10 @@ export default {
       default: [],
       required: true,
     },
-    tabsRoadshowSearch:{
+    tabsRoadshowSearch: {
       type: Number,
       required: true,
-    }
+    },
   },
   data() {
     return {};
@@ -135,13 +143,36 @@ export default {
       let imgSrc = item.Type == 1 || item.AudioType == 1 ? srcItem.audio : srcItem.video;
       return imgSrc;
     },
+    // 微路演留言
+    myLeavingMessageHandler(item) {
+      uni.navigateTo({
+        url: "/activityPages/generationAsk/generationAsk?id=" + (item.Type == 3 ? item.Id : item.ActivityId) + "&type=文章&roadshow=" + item.Type + "&roadshowTitle=" + item.Title,
+      });
+    },
+
+    // 微路演收藏
+    async isCollectionHandeler(item) {
+      const res = await Home.microRoadshowCollect({
+        Id: item.Id,
+        SourceType: item.Type,
+      });
+      if (res.Ret === 200) {
+        let index = this.roadshowPageList.findIndex((key) => key.Id == item.Id);
+
+        res.Data.Status == 1 ? (this.$parent.roadshowPageList[index].IsCollect = true) : (this.$parent.roadshowPageList[index].IsCollect = false);
+        uni.showToast({
+          title: res.Msg,
+          duration: 2000,
+        });
+      }
+    },
   },
 };
 </script>
 
 <style lang="scss" scoped>
 .roadshow-search {
-    padding: 35rpx;
+  padding: 35rpx;
   .audio-video-content {
     width: calc(100% + 40rpx);
     height: calc(100% + 25rpx);

pages.json

@@ -168,7 +168,7 @@
         {
           "path": "myAskPage/myAskPage",
           "style": {
-            "navigationBarTitleText": "我的提问",
+            "navigationBarTitleText": "活动提问",
             "enablePullDownRefresh": false
           }
         },

pages/index/index.vue

@@ -72,8 +72,7 @@
             <view class="title text_twoLine">{{ item.Title }}</view>
             <view class="share share-collected">
               <image @click="myLeavingMessageHandler(item)" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/multimedia/leaving_message.png"></image>
-              <image @click="isCollectionHandeler(item)" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/multimedia/not_collected.png"></image>
-              <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/multimedia/collected_icon.png"></image>
+              <image  @click="isCollectionHandeler(item)" :src="item.IsCollect ?'https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/multimedia/collected_icon.png' : 'https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/multimedia/not_collected.png'"></image>
               <button class="share-icon" open-type="share" :data-item="item">
                 <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/multimedia/share-btn-icon.png"></image>
               </button>
@@ -699,11 +698,28 @@ export default {
         this.topTabBars = res.Data || [];
       }
     },
+
     // 微路演留言
-    myLeavingMessageHandler() {},
+    myLeavingMessageHandler(item) {
+      uni.navigateTo({
+        url: "/activityPages/generationAsk/generationAsk?id=" + (item.Type == 3 ? item.Id : item.ActivityId) + "&type=文章&roadshow=" + item.Type + "&roadshowTitle=" + item.Title,
+      });
+    },
 
     // 微路演收藏
-    isCollectionHandeler() {},
+    async isCollectionHandeler(item) {
+      const res = await Home.microRoadshowCollect({
+        Id: item.Id,
+        SourceType: item.Type,
+      });
+      if (res.Ret === 200) {
+        res.Data.Status == 1 ? (item.IsCollect = true) : (item.IsCollect = false);
+        uni.showToast({
+          title: res.Msg,
+          duration: 2000,
+        });
+      }
+    },
   },
   onHide() {
     this.$store.commit("audioBg/parseIntAudio", false);