Merge branch 'dev-new-campaign-0302' of...

Merge branch 'dev-new-campaign-0302' of http://192.168.110.53/com.pica.cloud.education.frontend/pica-new-compaign into dev-new-campaign-0302

components/carve-up/index.vue

 <template>
   <section class="carve-up-wrap">
     <div class="inter-content carve-container" v-if="joinStatus == 1">
-      <img class="main-bg" src="~/assets/carve-up/main-bg.png" alt="">
+      <img
+        class="main-bg"
+        src="~/assets/carve-up/main-bg.png"
+        v-bp="{ component_tag: '363#360013'}"
+      >
       <img
         class="cancel"
         src="~/assets/icon-dialog-cancel.png"
         @click="knowFn"
+        v-bp="{ component_tag: '363#360015'}"
       >
     </div>
     <div class="success-content carve-container" v-else-if="joinStatus == 2">
@@ -18,7 +23,13 @@
         <p class="awards-num">500<span>云鹊豆</span></p>
         <p class="tips">所获云鹊豆将在1分钟内到账</p>
         <div class="btn-content">
-          <div class="btn btn1" @click="goToBeanCenter">去兑换</div>
+          <div
+            class="btn btn1"
+            @click="goToBeanCenter"
+            v-bp="{ component_tag: '363#360014'}"
+          >
+            去兑换
+          </div>
           <div class="btn btn2" @click="knowFn">查看排名</div>
         </div>
       </div>
@@ -26,6 +37,7 @@
         class="cancel"
         src="~/assets/icon-dialog-cancel.png"
         @click="knowFn"
+        v-bp="{ component_tag: '363#360015'}"
       >
     </div>
     <div class="defeat-content carve-container" v-else >
@@ -37,12 +49,17 @@
           <p class="title">很遗憾</p>
           <p class="text">您的勤奋分小于100不能瓜分云鹊豆</p>
         </div>-->
-        <div class="know-btn" @click="knowFn">我知道了</div>
+        <div
+          class="know-btn"
+          @click="knowFn"
+          v-bp="{ component_tag: '363#360016'}"
+        >  </div>
       </div>
       <img
         class="cancel"
         src="~/assets/icon-dialog-cancel.png"
         @click="knowFn"
+        v-bp="{ component_tag: '363#360015'}"
       >
     </div>
   </section>

components/first-enter-dialog/index.vue

@@ -4,6 +4,7 @@
       <div class="bg-content">
         <p class="title">恭喜您</p>
         <p class="awards">参与活动奖励您<span>75</span>勤奋分</p>
+        <p class="tips">奖励发放可能会有延迟</p>
         <div class="know-btn" @click="cancel">我知道了</div>
       </div>
       <img
@@ -72,9 +73,9 @@
         font-size: 18px;
         font-weight: 700;
         line-height: 18px;
-        margin: 137px auto 8px auto;
+        margin: 127.5px auto 8px auto;
       }
-      p {
+      .awards {
         color: #666666;
         font-size: 14px;
         line-height: 19px;
@@ -82,6 +83,11 @@
           color: #FD5A2F;
         }
       }
+      .tips {
+        color: #ACACAC;
+        font-size: 12px;
+        line-height: 19px;
+      }
     }
     .cancel {
       display: block;

plugins/vue-inject.js

@@ -45,7 +45,7 @@ Vue.use(Toast)
 Vue.use(Dialog)
 
 if (name === 'nuxt_ssr') throw Error('需要给当前项目起一个有意义的名称，多英文单词用 _ 拼接，不能有空格。修改文件：package.json (name)');
-// Vue.use(WebBuriedPoint, {
-//   class_name: name,
-//   url: `${BASE_URL[NUXT_ENV_APP]}/file/log/trace1`
-// });
+Vue.use(WebBuriedPoint, {
+  class_name: name || 'compaign_ssr',
+  url: `${BASE_URL[NUXT_ENV_APP]}/file/log/trace1`
+});
\ No newline at end of file