文案修改

src/common/lang/en.js

@@ -1741,7 +1741,7 @@ module.exports = {
         projectData:"项目数据",
         projectRank:"项目排行",
         requireRank:"需求排行",
-        visitNum:"Viewing Count",
+        visitNum:"View",
         collectionNum:"收藏数",
         collucationNum:"沟通数",
         allPercent:"综合比重",
@@ -1947,10 +1947,10 @@ module.exports = {
         plactivity:'Please enter event name keywords',
         activityimg:'Event Picture',
         channelTitle:'Event name',
-        channelType:'type of Event',
+        channelType:'Type of Event',
         channelState:'Active status',
         enterCount:'Enrollment',
-        publishTime:'release time',
+        publishTime:'Release time',
         procollection:'Project solicitation',
         offsalon:'Offline salon',
         onlineactivitie:'Online activities',
@@ -1960,7 +1960,7 @@ module.exports = {
         conduct:'Processing',
         over:'over',
         enrollmentlist:'Registration list',
-        share:'share',
+        share:'Share',
         activitytips:'You have not completed your personal certification, please publish the Event after certification',
         newfield:'New field',
         export:'Export',
@@ -2012,7 +2012,7 @@ module.exports = {
         options:'Options',
         delete:'Delete',
         addone:'Add one',
-        create:'create',
+        create:'Create',
         deletefield:'Delete field',
         guestname:'Guest name',
         plguestname:'Please enter guest name',

src/views/findeventpage/eventdetail.vue

@@ -312,6 +312,13 @@
             window.removeEventListener('scroll', this.menu);
         },
         mounted() {
+            if (this.publicFun.judgeBrandIsWechatOrHtml() != 1) {
+                if(this.$route.query.type == 5){
+                    this.$router.replace({path:'/redEnvelopeActDetail',query:{id:this.$route.query.id}});
+                }else{
+                    this.$router.replace({path:'/activitydetail',query:{id:this.$route.query.id,type:this.$route.query.type,isApply:this.$route.query.ismyevent==0?1:3}});
+                }
+            }
             globalMsg.$emit('topisInit', false);
             globalMsg.$emit('sendIndex', 3);
             globalMsg.$emit('maidianfunc',({type:'report-channel-read',channelId:this.$route.query.id}));

src/views/findeventpage/eventpage.vue

@@ -24,7 +24,7 @@
                         <p class="gendisplay" style="padding: 0 10px 0 0">
                             <span>&nbsp;</span>
                             <span v-if="item.channelCityStr" style="width: 50%;display: inline-block;" @click="toeventdetail(item)"><i style="font-size: 12px;" class="iconfont icon-dingwei"></i> {{item.channelCityStr}}</span>
-                            <span v-if="item.readCount" :style="item.channelCityStr?'text-align: right;':''" style="width: 50%;display: inline-block;"><i style="font-size: 12px;" class="iconfont icon-liulan"></i> {{item.readCountStr}}</span>
+                            <span v-if="item.readCount" :style="item.channelCityStr?'text-align: right;':''" style="width: 50%;display: inline-block;">{{$t('activityInfo.viewCount')}}  {{item.readCountStr}}</span>
                         </p>
                         <div class="gendisplay">
                             <p class="ellipsisFont1" style="height: 50px;position: relative;" :style="item.channelType==5?'color:#ff5d5d;padding-left: 30px;':''">
@@ -114,7 +114,7 @@
             //活动详情
             toeventdetail(val){
                 globalMsg.$emit('maidianfunc',({type:'report-channel-list-click',channelId:val.channelId}));
-                this.$router.push({path:'/eventdetail',query:{id:val.channelId,ismyevent:0}});
+                this.$router.push({path:'/eventdetail',query:{id:val.channelId,ismyevent:0,type:val.channelType}});
             },
             // 分页导航
             handleCurrentChange(val) {

src/views/findeventpage/myevent.vue

@@ -43,7 +43,7 @@
                                     <span v-if="item.channelLabelList" style="color:#5D78FF;">
                                         <i style="margin-right: 5px;" v-for="(itemchannel,index) in item.channelLabelList" :key="index">{{itemchannel}}</i>
                                     </span>
-                                    <span style="margin-left: 20px;" v-if="item.readCountStr!=0"><i style="font-size: 12px;" class="iconfont icon-liulan"></i> {{item.readCountStr}}</span>
+                                    <span style="margin-left: 20px;" v-if="item.readCountStr!=0">{{$t('activityInfo.viewCount')}} {{item.readCountStr}}</span>
                                 </p>
                             </el-col>
                         </el-row>

src/views/index/pages/index.vue

@@ -107,7 +107,7 @@
                                     </p>
                                     <p class="ellipsisFont2" style="color:#69697A;margin: 14px 0 10px;font-size: 12px;line-height: 20px;height: 40px;">{{item.topicDescription}}</p>
                                     <div class="gendisplay" style="color: #AAAAAA;font-size: 12px;">
-                                        <span class="ellipsisFont1" style="color:#5D78FF;margin-right: 50px;width: 210px;height: 20px;">发起方： <i>{{item.topicInitiator}}</i></span>
+                                        <span class="ellipsisFont1" style="color:#5D78FF;margin-right: 50px;width: 210px;height: 20px;line-height: 20px;">发起方： <i>{{item.topicInitiator}}</i></span>
                                         <span style="margin-right: 20px;">阅读 {{item.readCountStr}}</span>
                                         <span>讨论 {{item.discussUserCountStr}}</span>
                                     </div>
@@ -176,7 +176,7 @@
                                         <div class="gendisplay" style="width: calc(100% - 120px);line-height: 28px;">
                                             <p v-if="item.channelCityStr" style="margin-right: 30px;width: 75px;height: 30px;overflow: hidden;"><i style="font-size: 12px;" class="iconfont icon-dingwei"></i> {{item.channelCityStr}}</p>
                                             <p style="color:#5D78FF;width: 70px;height: 30px;overflow: hidden;">{{item.channelLabel}}</p>
-                                            <p><span v-if="item.readCount"><i style="font-size: 12px;" class="iconfont icon-liulan"></i> {{item.readCountStr}}</span></p>
+                                            <p><span v-if="item.readCount">{{$t('activityInfo.viewCount')}} {{item.readCountStr}}</span></p>
                                         </div>
                                         <p style="text-align: right;width: 100%;">
                                             <span v-if="userInfo&&userInfo.empId!=item.createdBy||!userInfo">

src/views/publishactivity/pubactivities.vue

@@ -36,7 +36,7 @@
                     </el-table-column>
                     <el-table-column prop="channelType" :label="$t('pubactivities.channelType')" align="center">
                         <template slot-scope="scope">
-                            {{scope.row.channelType == '2' ? $t('pubactivities.procollection'): scope.row.channelType == '3' ? $t('pubactivities.offsalon'): scope.row.channelType == '4' ? $t('pubactivities.onlineactivitie') : scope.row.channelType == '5' ? '红包活动' : ''}}
+                            {{scope.row.channelType == '2' ? $t('pubactivities.procollection'): scope.row.channelType == '3' ? $t('pubactivities.offsalon'): scope.row.channelType == '4' ? $t('pubactivities.onlineactivitie') : scope.row.channelType == '5' ? $t('activityInfo.redMoneyType') : ''}}
                         </template>
                     </el-table-column>
                     <el-table-column prop="channelState" :label="$t('pubactivities.channelState')" align="center">