bding hai 1 ano
pai
achega
f43f483157

+ 2 - 1
activityPages/activityDetail/activityDetail.vue

@@ -263,7 +263,7 @@
               </view>
             </view>
             <view class="content-bottom" v-else>
-              <view class="make-outbound" @click="pleaseGoLogin"> 请登录后报名 </view>
+              <view class="make-outbound global_content_center" @click="pleaseGoLogin"> 请登录后报名 </view>
             </view>
           </view>
         </block>
@@ -896,6 +896,7 @@ export default {
           height: 40rpx;
           padding: 0 13rpx;
           margin: 0 20rpx 10rpx 0;
+          background-color: #F0F1F3;
         }
         .dustrial-item {
           padding: 0 20rpx;

+ 88 - 103
activityPages/activityDetail/jurisdiction/components.vue

@@ -1,46 +1,47 @@
 <template>
   <view class="noauth-cont" v-if="jurisdictionList.HasPermission === 2 || jurisdictionList.HasPermission === 3 || jurisdictionList.HasPermission === 4 || jurisdictionList.HasPermission === 5">
     <block v-if="!isShowAlert">
-      <image src="https://hzstatic.hzinsights.com/cygx/czbk/noauth.png" class="noauth-ico"></image>
-      <block v-if="jurisdictionList.HasPermission !== 2">
-        <view v-if="jurisdictionList.IsResearch" class="research-noauth">
-					<text v-if="jurisdictionList.IsResearchSpecial" 
-					style="margin:0 auto 100rpx ;width: 612rpx;"> 签约买方研选套餐才可参与此活动,请联系对口销售 </text>
-					<block v-else>
-						暂无 <text class="strong-text">买方研选</text> 权限
-						<text style="margin-bottom: 30rpx"> 您可申请开通试用 </text>
-					</block>
-        </view>
-        <view class="tip" v-else>{{ jurisdictionList.PopupMsg }}</view>
-        <view class="btn-cont" v-if="jurisdictionList.Type !== '专项调研' && (!jurisdictionList.IsResearchSpecial)" @click="applyAuth"> 立即申请 </view>
-      </block>
-      <view class="tip" v-if="jurisdictionList.HasPermission === 2">
-        <view v-if="jurisdictionList.IsResearch" class="research-noauth">
-          <text v-if="jurisdictionList.IsResearchSpecial"> 签约买方研选套餐才可参与此活动,请联系对口销售 </text>
+      <view class="noauth-activity-box">
+        <image src="https://hzstatic.hzinsights.com/cygx/czbk/noauth.png" class="noauth-ico"></image>
+        <block v-if="jurisdictionList.HasPermission !== 2">
+          <view v-if="jurisdictionList.IsResearch" class="research-noauth">
+            <text v-if="jurisdictionList.IsResearchSpecial" style="margin: 0 auto 100rpx; width: 612rpx"> 签约买方研选套餐才可参与此活动,请联系对口销售 </text>
+            <block v-else>
+              暂无 <text class="strong-text">买方研选</text> 权限
+              <text style="margin-bottom: 30rpx"> 您可申请开通试用 </text>
+            </block>
+          </view>
+          <view class="tip" v-else>{{ jurisdictionList.PopupMsg }}</view>
+          <view class="btn-cont" v-if="jurisdictionList.Type !== '专项调研' && !jurisdictionList.IsResearchSpecial" @click="applyAuth"> 立即申请 </view>
+        </block>
+        <view class="tip" v-if="jurisdictionList.HasPermission === 2">
+          <view v-if="jurisdictionList.IsResearch" class="research-noauth">
+            <text v-if="jurisdictionList.IsResearchSpecial"> 签约买方研选套餐才可参与此活动,请联系对口销售 </text>
+            <block v-else>
+              暂无 <text class="strong-text">买方研选</text> 权限
+              <text> 点击提交申请,提醒对口销售为你开通试用 </text>
+            </block>
+          </view>
           <block v-else>
-            暂无 <text class="strong-text">买方研选</text> 权限
-            <text> 点击提交申请,提醒对口销售为你开通试用 </text>
+            <block v-if="jurisdictionList.Type == '专项调研'"> 需要升级行业套餐权限才可参与此活动,请联系对口销售</block>
+            <block v-else>
+              <text style="margin-bottom: 20rpx"> 您暂无权限参加此活动 </text>
+              <text>若想参加可以联系对口销售 </text>
+              <text @click="callPhone(jurisdictionList.SellerMobile)" v-if="jurisdictionList.Type !== '专项调研'">
+                {{ jurisdictionList.SellerName }}:
+                <text style="color: #d4bf86; display: inline-block">{{ jurisdictionList.SellerMobile }}</text>
+              </text>
+              <text>申请开通对应的试用权限</text>
+            </block>
           </block>
         </view>
-        <block v-else>
-          <block v-if="jurisdictionList.Type == '专项调研'"> 需要升级行业套餐权限才可参与此活动,请联系对口销售</block>
-          <block v-else>
-            <text style="margin-bottom: 20rpx"> 您暂无权限参加此活动 </text>
-            <text>若想参加可以联系对口销售 </text>
-            <text @click="callPhone(jurisdictionList.SellerMobile)" v-if="jurisdictionList.Type !== '专项调研'">
-              {{ jurisdictionList.SellerName }}:
-              <text style="color: #d4bf86; display: inline-block">{{ jurisdictionList.SellerMobile }}</text>
-            </text>
-            <text>申请开通对应的试用权限</text>
-          </block>
-        </block>
-      </view>
-      <view v-if="jurisdictionList.HasPermission === 2 && jurisdictionList.Type !== '专项调研' && !jurisdictionList.IsResearchSpecial" class="btn-cont" @click="sellerApplyAuth">
-        {{ jurisdictionList.IsResearch ? "提交申请" : "立即申请" }}
+        <view v-if="jurisdictionList.HasPermission === 2 && jurisdictionList.Type !== '专项调研' && !jurisdictionList.IsResearchSpecial" class="btn-cont" @click="sellerApplyAuth">
+          {{ jurisdictionList.IsResearch ? "提交申请" : "立即申请" }}
+        </view>
+        <view class="btn-cont back-btn" @click="backIndex"> 返回</view>
       </view>
-      <view class="btn-cont back-btn" @click="backIndex"> 返回</view>
       <view class="product-introduction-box" v-if="jurisdictionList.IsResearch">
-<!--    <view class="research-btn" @click="goRouterResearch('介绍')">
+        <!--    <view class="research-btn" @click="goRouterResearch('介绍')">
           <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/report_Yx.png"></image>
           点击查看买方研选产品介绍
         </view>
@@ -52,27 +53,19 @@
           <view class="introduction-header">
             <view class="introduction-header-left"></view>
             <view class="introduction-header-right">
-              <view class="introduction-title-CN">
-                产品介绍
-              </view>
-              <view class="introduction-title-US">
-                Product Introduction
-              </view>
+              <view class="introduction-title-CN"> 产品介绍 </view>
+              <view class="introduction-title-US"> Product Introduction </view>
             </view>
           </view>
           <view class="introduction-body">
             <view class="introduction-body-box">
-              <view class="body-box-title">
-                独家亮点
-              </view>
+              <view class="body-box-title"> 独家亮点 </view>
               <view class="introduction-body-row"><span class="highHight-text">低至1000元</span>起访谈优质专家</view>
               <view class="introduction-body-row">重点公司小范围交流<span class="highHight-text">破圈</span>参加</view>
               <view class="introduction-body-row"><span class="highHight-text">海量</span>调研过程及纪要共享</view>
             </view>
             <view class="introduction-body-box">
-              <view class="body-box-title">
-                优质资源
-              </view>
+              <view class="body-box-title"> 优质资源 </view>
               <view class="introduction-body-row"><span class="highHight-text">500+</span>篇/年调研纪要更新,</view>
               <view class="introduction-body-row"><span class="highHight-text">300+</span>场/年海内外重点公司小范围交流,</view>
               <view class="introduction-body-row"><span class="highHight-text">100+</span>场/年热点线下调研,</view>
@@ -80,34 +73,22 @@
               <view class="introduction-body-row"><span class="highHight-text">1000+</span>名优秀买方汇集,</view>
             </view>
             <view class="introduction-body-box">
-              <view class="body-box-title" style="margin-bottom: 18rpx;">
-                服务报价
-              </view>
+              <view class="body-box-title" style="margin-bottom: 18rpx"> 服务报价 </view>
               <view class="body-row-content">
-                <view class="body-row-title">
-                  3万/年
-                </view>
+                <view class="body-row-title"> 3万/年 </view>
                 <view class="introduction-body-row">含无限量调研纪要查阅</view>
                 <view class="introduction-body-row"><span class="highHight-text">以及3次</span>公开专家访谈;</view>
               </view>
               <view class="body-row-content">
-                <view class="body-row-title">
-                  5万/年
-                </view>
+                <view class="body-row-title"> 5万/年 </view>
                 <view class="introduction-body-row">含无限量调研纪要查阅</view>
-                <view class="introduction-body-row">
-                  <span class="highHight-text">以及15次</span>公开专家访谈<span class="highHight-text">或30次</span>重点公司、专家小范围交流;
-                </view>
+                <view class="introduction-body-row"> <span class="highHight-text">以及15次</span>公开专家访谈<span class="highHight-text">或30次</span>重点公司、专家小范围交流; </view>
               </view>
-              <view class="body-row-content" style="margin-bottom: 0;">
-                <view class="body-row-title">
-                  10万/年
-                </view>
+              <view class="body-row-content" style="margin-bottom: 0">
+                <view class="body-row-title"> 10万/年 </view>
                 <view class="introduction-body-row">含无限量调研纪要查阅</view>
                 <view class="introduction-body-row">
-                  <span class="highHight-text">以及40次</span>公开专家访谈
-                  <span class="highHight-text">或80次</span>重点公司、专家小范围交流
-                  <span class="highHight-text">或20次</span>私享专家一对一。
+                  <span class="highHight-text">以及40次</span>公开专家访谈 <span class="highHight-text">或80次</span>重点公司、专家小范围交流 <span class="highHight-text">或20次</span>私享专家一对一。
                 </view>
               </view>
             </view>
@@ -115,12 +96,12 @@
         </view>
       </view>
     </block>
-    <block v-else>
+    <!-- <block v-else>
       <text class="moneh-text"> 上传名片并填写简单信息,24小时内我们会为您开通一个月的免费月卡 </text>
       <img src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/month_card.png" class="month_card" alt="" />
       <view class="btn-cont btn-dl" @click="applyAuth"> 立即上传 </view>
       <view class="btn-cont month-back" @click="backIndex"> 返回</view>
-    </block>
+    </block> -->
   </view>
 </template>
 
@@ -224,10 +205,13 @@ export default {
 
 <style scoped lang="scss">
 .noauth-cont {
-  padding-top: 170rpx;
-  text-align: center;
-  font-size: 28rpx;
-
+  .noauth-activity-box {
+    padding: 100rpx 25rpx 80rpx;
+    text-align: center;
+    font-size: 28rpx;
+    background-color: #fff;
+    border-radius: 16rpx;
+  }
   .noauth-ico {
     width: 365rpx;
     height: 229rpx;
@@ -249,19 +233,20 @@ export default {
   }
 
   .btn-cont {
-    width: 368rpx;
-    height: 80rpx;
-    background: linear-gradient(268deg, #2ddbff 0%, #1599ff 49%, #005eff 100%);
+    width: 500rpx;
+    height: 52rpx;
+    background: $uni-color-new;
     color: #fff;
-    font-size: 34rpx;
+    font-size: 24rpx;
+    font-weight: 600;
+    border-radius: 8rpx;
     margin: 0 auto;
     text-align: center;
-    line-height: 80rpx;
+    line-height: 52rpx;
 
     &.back-btn {
-      background: #fff !important;
-      color: #2c83ff;
-      border: 1px solid #2c83ff;
+      background: #e5efff !important;
+      color: $uni-color-new;
       margin-top: 30rpx;
     }
 
@@ -279,83 +264,83 @@ export default {
       z-index: 1;
     }
   }
-  .product-introduction-box{
-    background-color: #F7F7F7;
-    padding-top: 10rpx;
+  .product-introduction-box {
+    background-color: #f7f7f7;
+    padding: 10rpx 0;
     margin-top: 60rpx;
-    .product-introduction{
+    border-radius: 16rpx;
+    .product-introduction {
       padding: 60rpx 60rpx 0;
       background-color: white;
-      .introduction-header{
+      .introduction-header {
         margin-bottom: 40rpx;
         display: flex;
-        .introduction-header-left{
-          background-color: #CAAF8B;
+        .introduction-header-left {
+          background-color: #caaf8b;
           height: 90rpx;
           width: 14rpx;
           margin-right: 20rpx;
         }
-        .introduction-header-right{
+        .introduction-header-right {
           text-align: left;
-          .introduction-title-CN{
+          .introduction-title-CN {
             font-weight: 500;
             font-size: 34rpx;
             color: #333333;
             line-height: 42rpx;
             margin-bottom: 8rpx;
           }
-          .introduction-title-US{
+          .introduction-title-US {
             font-weight: 400;
             font-size: 28rpx;
-            color: #C0C4CC;
+            color: #c0c4cc;
             line-height: 42rpx;
           }
         }
       }
-      .introduction-body{
-        .introduction-body-box{
+      .introduction-body {
+        .introduction-body-box {
           text-align: left;
           margin-bottom: 40rpx;
-          .body-row-content{
+          .body-row-content {
             margin-bottom: 40rpx;
             font-size: 34rpx;
             line-height: 48rpx;
             font-weight: 600;
-            color: #CAAF8B;
-            .body-row-title{
+            color: #caaf8b;
+            .body-row-title {
               margin-left: 40rpx;
             }
           }
-          .body-box-title{
+          .body-box-title {
             font-weight: 600;
             font-size: 34rpx;
             line-height: 48rpx;
             padding-left: 40rpx;
             position: relative;
             margin-bottom: 22rpx;
-            &::before{
+            &::before {
               content: "";
               height: 20rpx;
               width: 20rpx;
-              background-color: #CAAF8B;
+              background-color: #caaf8b;
               border-radius: 20rpx;
               position: absolute;
               left: 0;
               top: 16rpx;
             }
           }
-          .introduction-body-row{
+          .introduction-body-row {
             margin-left: 40rpx;
             font-weight: 400;
             font-size: 26rpx;
             color: #333333;
             line-height: 36rpx;
           }
-          .highHight-text{
-            color: #CAAF8B;
+          .highHight-text {
+            color: #caaf8b;
           }
         }
-
       }
     }
   }

+ 1 - 1
activityPages/playBack/playBack.vue

@@ -63,7 +63,7 @@
             <view class="item-img" @click="goDetail(item)">
               <image :src="item.ImgUrl"> </image>
               <image v-if="item.ActiveState == 1" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/new_cygx/not_started_activity.png" class="img-status"></image>
-              <image v-if="item.ActiveState == 2" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/new_cygx/in_progress_activity.png" class="img-status"></image>
+              <image v-else-if="item.ActiveState == 2" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/new_cygx/in_progress_activity.png" class="img-status"></image>
               <image v-else src="https://hzchart.oss-cn-shanghai.aliyuncs.com/new_cygx/end_activity.png" class="img-status"></image>
               <view class="img-type">
                 <image :src="item.ImgUrlText" mode=""></image>

+ 1 - 1
activityPages/specialResearchPage/specialResearchPage.vue

@@ -29,7 +29,7 @@
               <view class="item-img" @click="goDetail(item)">
                 <image :src="item.ImgUrl"> </image>
                 <image v-if="item.ActiveState == 1" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/new_cygx/not_started_activity.png" class="img-status"></image>
-                <image v-if="item.ActiveState == 2" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/new_cygx/in_progress_activity.png" class="img-status"></image>
+                <image v-else-if="item.ActiveState == 2" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/new_cygx/in_progress_activity.png" class="img-status"></image>
                 <image v-else-if="item.ActiveState == 0 && item.TripStatus == 2" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/new_cygx/end_activity.png" class="img-status"></image>
               </view>
               <view class="item">

+ 1 - 1
activityPages/themeActivity/themeActivity.vue

@@ -79,7 +79,7 @@
               <view class="item-img" @click="goDetail(item)">
                 <image :src="item.ImgUrl"></image>
                 <image v-if="item.ActiveState == 1" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/new_cygx/not_started_activity.png" class="img-status"></image>
-                <image v-if="item.ActiveState == 2" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/new_cygx/in_progress_activity.png" class="img-status"></image>
+                <image v-else-if="item.ActiveState == 2" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/new_cygx/in_progress_activity.png" class="img-status"></image>
                 <block v-else>
                   <image v-if="item.TripStatus != 1" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/new_cygx/end_activity.png" class="img-status"></image>
                 </block>

+ 1 - 0
components/ItemComponent/roadshowItem.vue

@@ -198,6 +198,7 @@ export default {
   box-shadow: 0rpx 3rpx 8rpx 0rpx rgba(0, 0, 0, 0.05);
   overflow: hidden;
   padding-top: 25rpx;
+  margin-bottom: 20rpx;
   .cover-item {
     margin-top: 10rpx;
     width: calc(100% + 28rpx);

+ 25 - 21
components/isTrackFollow.vue

@@ -1,19 +1,21 @@
 <template>
-  <view class="track-follow-page" v-if="isShowFollowButton">
-    <view class="container-track-follow">
-      <view>若无需此赛道更新推送,请点击 </view>
-      <view class="cancel-follow" @click="isFollowHandler">{{ isFollowData ? "取消关注" : "已取消" }} </view>
-      <icon @click="followInfoHandler" type="info" size="16" color="#fff" />
-      <van-icon @click="cancelFollowClick" class="close-follow" name="cross" size="16" color="#fff" />
-    </view>
-    <van-dialog use-slot :show="show" close-on-click-overlay show-cancel-button :showConfirmButton="false" :showCancelButton="false" @close="onClickHide">
-      <view class="content-dialog">
-        <view class="close"><van-icon name="cross" color="#333" @click="onClickHide" /></view>
-        <text class="tips">提示</text>
-        <text>取消关注后,该赛道下的更新内容都不会对您做消息推送,您也可以在【查研观向小助手】公众号菜单栏【推送规则】下修改您关注的赛道</text>
-        <image show-menu-by-longpress src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/follow_dialog.png"></image>
+  <view style="height: 66rpx" v-if="isShowFollowButton">
+    <view class="track-follow-page">
+      <view class="container-track-follow">
+        <view>若无需此赛道更新推送,请点击 </view>
+        <view class="cancel-follow" @click="isFollowHandler">{{ isFollowData ? "取消关注" : "已取消" }} </view>
+        <icon @click="followInfoHandler" type="info" size="16" color="#E37318 " />
+        <van-icon @click="cancelFollowClick" class="close-follow" name="cross" size="16" color="#999" />
       </view>
-    </van-dialog>
+      <van-dialog use-slot :show="show" close-on-click-overlay show-cancel-button :showConfirmButton="false" :showCancelButton="false" @close="onClickHide">
+        <view class="content-dialog">
+          <view class="close"><van-icon name="cross" color="#333" @click="onClickHide" /></view>
+          <text class="tips">提示</text>
+          <text>取消关注后,该赛道下的更新内容都不会对您做消息推送,您也可以在【查研观向小助手】公众号菜单栏【推送规则】下修改您关注的赛道</text>
+          <image show-menu-by-longpress src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/follow_dialog.png"></image>
+        </view>
+      </van-dialog>
+    </view>
   </view>
 </template>
 
@@ -91,9 +93,11 @@ export default {
 </script>
 <style scoped lang="scss">
 .track-follow-page {
-  position: relative;
-  // width: calc(100% + 60rpx);
-  // margin-left: -30rpx;
+  position: fixed;
+  width: 100%;
+  left: 0;
+  top: 0;
+  z-index: 9;
   .container-track-follow {
     position: relative;
     display: flex;
@@ -102,13 +106,13 @@ export default {
     width: 100%;
     height: 60rpx;
     padding-right: 30rpx;
-    background-color: #376cbb;
-    color: #fff;
+    background-color: #fff1e9;
+    color: #e37318;
     .cancel-follow {
       width: 136rpx;
       height: 44rpx;
-      background-color: #fff;
-      color: #376cbb;
+      background-color: #e37318;
+      color: #fff;
       text-align: center;
       line-height: 46rpx;
       margin: 0 20rpx 0 15rpx;

+ 2 - 1
pageMy/myCollection/myCollection.vue

@@ -380,6 +380,7 @@ export default {
     display: flex;
     flex-wrap: wrap;
     justify-content: space-between;
+    padding-top: 20rpx;
     .audio-item {
       width: 49%;
     }
@@ -387,7 +388,7 @@ export default {
   .chart-ul {
     display: flex;
     flex-wrap: wrap;
-    padding: 15rpx;
+    padding-top: 20rpx;
     justify-content: space-between;
   }
 }

+ 2 - 2
pageMy/myPage/myPage.vue

@@ -360,7 +360,7 @@ export default {
   }
   .my-info {
     position: absolute;
-    background: #f9f9f9;
+    background: $uni-bg-color;
     top: 301rpx;
     left: 50%;
     transform: translateX(-50%);
@@ -510,7 +510,7 @@ export default {
   }
   .bottom-text {
     position: absolute;
-    background: #f9f9f9;
+    background: $uni-bg-color;
     bottom: 80rpx;
     right: 0;
     z-index: 9;

+ 1 - 1
pageMy/mySchedulepage/mySchedulepage.vue

@@ -28,7 +28,7 @@
           <view class="item-img" @click="goDetail(item)">
             <image :src="item.ImgUrl"></image>
             <image v-if="item.ActiveState == 1" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/new_cygx/not_started_activity.png" class="img-status"></image>
-            <image v-if="item.ActiveState == 2" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/new_cygx/in_progress_activity.png" class="img-status"></image>
+            <image v-else-if="item.ActiveState == 2" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/new_cygx/in_progress_activity.png" class="img-status"></image>
             <block v-else>
               <image v-if="item.TripStatus != 1" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/new_cygx/end_activity.png" class="img-status"></image>
             </block>

+ 9 - 9
pageMy/reportDetail/reportDetail.vue

@@ -473,19 +473,19 @@ export default {
       }
     }
     .btn-cont {
-      width: 368rpx;
-      height: 80rpx;
-      // position: relative;
-      background: linear-gradient(268deg, #2ddbff 0%, #1599ff 49%, #005eff 100%);
+      width: 500rpx;
+      height: 52rpx;
+      background: $uni-color-new;
       color: #fff;
-      font-size: 34rpx;
+      font-size: 24rpx;
+      font-weight: 600;
+      border-radius: 8rpx;
       margin: 0 auto;
       text-align: center;
-      line-height: 80rpx;
+      line-height: 52rpx;
       &.back-btn {
-        background: #fff !important;
-        color: #2c83ff;
-        border: 1px solid #2c83ff;
+        background: #e5efff !important;
+        color: $uni-color-new;
         margin-top: 30rpx;
       }
       .btn_bg {

+ 1 - 1
pageMy/reportPage/reportPage.vue

@@ -134,7 +134,7 @@
         </block>
       </view>
     </view>
-    <view v-else-if="Object.keys(reportInfo).length > 0" class="no-binding">
+    <view v-else-if="Object.keys(reportInfo).length > 0" class="container no-binding">
       <view class="no-binding-content">
         <view class="title">{{ reportInfo.Title }}</view>
         <view class="tiem">{{ reportInfo.PublishDate }}</view>

+ 89 - 75
pages-purchaser/survey/surveySubmit.vue

@@ -1,83 +1,97 @@
 <template>
-	<view class="survey-box">
-<!-- 		<textarea :value="surveyText" placeholder="请详述您的调研需求" placeholder-style="color:#999999" 
-		 :maxlength="100" /> -->
-		 <view class="survey-textArea">
-		 	<van-field :value="surveyText" type="textarea" :maxlength="100" placeholder="请详述您的调研需求"
-		 	:border="false" :show-word-limit="true" :autosize="{minHeight: 100}" @change="inputChange($event)"></van-field>
-		 </view>
-		<view @click="submit" class="submit">提交</view>
-
-	</view>
+  <view class="container survey-box">
+    <view class="survey-box-content">
+      <view class="survey-textArea">
+        <van-field
+          :value="surveyText"
+          type="textarea"
+          :maxlength="100"
+          placeholder="请详述您的调研需求"
+          :border="false"
+          :show-word-limit="true"
+          :autosize="{ minHeight: 100 }"
+          @change="inputChange($event)"
+        ></van-field>
+      </view>
+      <view @click="submit" class="submit">提交</view>
+    </view>
+  </view>
 </template>
 
 <script>
-	import {leafletUrl} from '@/config/config'
-	import {purchaserApi} from "@/config/modules/purchaser.js"
-	export default {
-		data() {
-			return {
-				surveyText:''
-			}
-		},
-		methods: {
-			inputChange(e){
-				this.surveyText=e.detail
-			},
-			submit(){
-				// console.log(this.surveyText);
-				if(!this.surveyText){
-					uni.showToast({
-						title:'调研需求不能为空',
-						icon:'none'
-					})
-					return
-				}
-				purchaserApi.purchaserSurveySubmit({Content:this.surveyText}).then(res=>{
-					if (res.Ret === 200) {
-						uni.showToast({
-							title:'提交成功,请等待销售与您联系',
-							duration:2000,
-							icon:'none'
-						})
-						setTimeout(()=>{
-							uni.navigateBack()
-						},2000)
-					}
-				})
-			}
-		},
-		onLoad(option) {
-			let id = option.Id || 0
-			this.url=`${leafletUrl}?Id=${id}#wechat_redirect`
-			console.log(this.url);
-		}
-	}
+import { leafletUrl } from "@/config/config";
+import { purchaserApi } from "@/config/modules/purchaser.js";
+export default {
+  data() {
+    return {
+      surveyText: "",
+    };
+  },
+  methods: {
+    inputChange(e) {
+      this.surveyText = e.detail;
+    },
+    submit() {
+      // console.log(this.surveyText);
+      if (!this.surveyText) {
+        uni.showToast({
+          title: "调研需求不能为空",
+          icon: "none",
+        });
+        return;
+      }
+      purchaserApi.purchaserSurveySubmit({ Content: this.surveyText }).then((res) => {
+        if (res.Ret === 200) {
+          uni.showToast({
+            title: "提交成功,请等待销售与您联系",
+            duration: 2000,
+            icon: "none",
+          });
+          setTimeout(() => {
+            uni.navigateBack();
+          }, 2000);
+        }
+      });
+    },
+  },
+  onLoad(option) {
+    let id = option.Id || 0;
+    this.url = `${leafletUrl}?Id=${id}#wechat_redirect`;
+    console.log(this.url);
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-	.survey-box{
-		padding: 30rpx 20rpx;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		justify-content: center;
-		.survey-textArea{
-			width: 100%;
-			border: solid 2rpx #999999;
-			border-radius: 16rpx;
-			padding: 6rpx;
-			box-sizing: border-box;
-			margin-bottom: 40rpx;
-		}
-		.submit{
-			width: 240rpx;
-			height: 60rpx;
-			background: linear-gradient(90deg, #0151ff 0%, #01b9ff 100%);
-			color: white;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-		}
-	}
+.survey-box {
+  padding: 30rpx 20rpx;
+  display: flex;
+  flex-direction: column;
+  align-items: center;  
+  background-color: $uni-color-new;
+  .survey-box-content {
+    width: 100%;
+    padding: 20rpx 20rpx 80rpx;
+    border-radius: 8rpx;
+    background-color: #fff;
+  }
+  .survey-textArea {
+    width: 100%;
+    border: solid 1rpx #dcdfe6;
+    border-radius: 8rpx;
+    padding: 6rpx;
+    box-sizing: border-box;
+    margin-bottom: 40rpx;
+  }
+  .submit {
+    width: 500rpx;
+    height: 60rpx;
+    background: $uni-color-new;
+    color: white;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin: 0 auto;
+  }
+}
 </style>

+ 1 - 1
pages-search/components/activityBack.vue

@@ -30,7 +30,7 @@
             <view class="item-img" @click="goDetail(item)">
               <image :src="item.ImgUrl"></image>
               <image v-if="item.ActiveState == 1" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/new_cygx/not_started_activity.png" class="img-status"></image>
-              <image v-if="item.ActiveState == 2" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/new_cygx/in_progress_activity.png" class="img-status"></image>
+              <image v-else-if="item.ActiveState == 2" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/new_cygx/in_progress_activity.png" class="img-status"></image>
               <image v-else src="https://hzchart.oss-cn-shanghai.aliyuncs.com/new_cygx/end_activity.png" class="img-status"></image>
               <view class="img-type">
                 <image :src="item.ImgUrlText" mode=""></image>

+ 1 - 1
pages/activity/activity.vue

@@ -1,7 +1,7 @@
 <template>
   <view class="container activity-content">
     <view class="top-content-box">
-      <search-bar @goSearch="goSearch" :searchTitle="searchPlaceholderList.SummarySearch" :width="46">
+      <search-bar @goSearch="goSearch" :searchTitle="searchPlaceholderList.SummarySearch" :width="52">
         <template slot="content-left">
           <view class="content">
             <view class="activity-back" @click="activityPlayBack" v-if="isUserBindingPhoneNumber">

+ 1 - 1
pages/reportForm/index.scss

@@ -123,7 +123,7 @@
 
     .tab-cont-two {
       position: sticky;
-      top: 236rpx;
+      top: 270rpx;
       left: 0;
       width: 100%;
       z-index: 99;

+ 8 - 8
reportPages/bulletinMessage/bulletinMessage.vue

@@ -72,16 +72,16 @@ export default {
     }
   }
   .btn-cont {
+    width: 500rpx;
+    height: 52rpx;
+    background: $uni-color-new;
+    color: #fff;
+    font-size: 24rpx;
+    font-weight: 600;
+    border-radius: 8rpx;
     margin: 80rpx auto;
-    width: 368rpx;
-    height: 80rpx;
-    font-size: 34rpx;
-    line-height: 80rpx;
     text-align: center;
-    color: #ffffff;
-    background: linear-gradient(268deg, #2ddbff 0%, #1599ff 49%, #005eff 100%);
-    opacity: 1;
-    border-radius: 4rpx;
+    line-height: 52rpx;
   }
 }
 </style>

+ 9 - 9
reportPages/internalDetials/internalDetials.vue

@@ -199,19 +199,19 @@ export default {
     }
   }
   .btn-cont {
-    width: 368rpx;
-    height: 80rpx;
-    // position: relative;
-    background: linear-gradient(268deg, #2ddbff 0%, #1599ff 49%, #005eff 100%);
+    width: 500rpx;
+    height: 52rpx;
+    background: $uni-color-new;
     color: #fff;
-    font-size: 34rpx;
+    font-size: 24rpx;
+    font-weight: 600;
+    border-radius: 8rpx;
     margin: 0 auto;
     text-align: center;
-    line-height: 80rpx;
+    line-height: 52rpx;
     &.back-btn {
-      background: #fff !important;
-      color: #2c83ff;
-      border: 1px solid #2c83ff;
+      background: #E5EFFF !important;
+      color: $uni-color-new;
       margin-top: 30rpx;
     }
     .btn_bg {

+ 9 - 9
reportPages/keyCompany/keyCompany.vue

@@ -551,19 +551,19 @@ export default {
     }
   }
   .btn-cont {
-    width: 368rpx;
-    height: 80rpx;
-    // position: relative;
-    background: linear-gradient(268deg, #2ddbff 0%, #1599ff 49%, #005eff 100%);
+    width: 500rpx;
+    height: 52rpx;
+    background: $uni-color-new;
     color: #fff;
-    font-size: 34rpx;
+    font-size: 24rpx;
+    font-weight: 600;
+    border-radius: 8rpx;
     margin: 0 auto;
     text-align: center;
-    line-height: 80rpx;
+    line-height: 52rpx;
     &.back-btn {
-      background: #fff !important;
-      color: #2c83ff;
-      border: 1px solid #2c83ff;
+      background: #e5efff !important;
+      color: $uni-color-new;
       margin-top: 30rpx;
     }
     .btn_bg {

+ 10 - 9
reportPages/morningDetails/morningDetails.vue

@@ -1,5 +1,5 @@
 <template>
-  <view class="container morning-details-content" >
+  <view class="container morning-details-content">
     <block v-if="hasPermission == 1">
       <view class="report-content-title">{{ reportDetails.Title }} </view>
       <view class="content-time">
@@ -164,19 +164,20 @@ export default {
     }
 
     .btn-cont {
-      width: 368rpx;
-      height: 80rpx;
-      background: linear-gradient(268deg, #2ddbff 0%, #1599ff 49%, #005eff 100%);
+      width: 500rpx;
+      height: 52rpx;
+      background: $uni-color-new;
       color: #fff;
-      font-size: 34rpx;
+      font-size: 24rpx;
+      font-weight: 600;
+      border-radius: 8rpx;
       margin: 0 auto;
       text-align: center;
-      line-height: 80rpx;
+      line-height: 52rpx;
 
       &.back-btn {
-        background: #fff !important;
-        color: #2c83ff;
-        border: 1px solid #2c83ff;
+        background: #e5efff !important;
+        color: $uni-color-new;
         margin-top: 30rpx;
       }