Merge branch 'dev-new-campaign-0302' into 'release'

新活动开发  code reviewer : 张平

新活动开发  code reviewer : 张平

See merge request !2

components/header/index.vue

@@ -5,7 +5,7 @@
         <img :src="headerLeftIcon" />
       </div>
       <div :class="{ active: isScroll }" class="content title">
-        <span>国际医生节特辑活动</span>
+        <span>{{shareTitle1}}</span>
       </div>
       <div 
       v-show="isShowRightIcon" 

components/task-activity.vue

@@ -25,12 +25,12 @@
                         <div class="task-b" v-if="handleData(item.rewardJsonInfo)[0].rewardType == 3">
                             <span class="score">+{{handleData(item.rewardJsonInfo)[0].rewardQuantity}}</span>
                             <span v-if="item.resourceType == 11 || item.resourceType == 9">勤奋分/人</span>
-                            <span v-if="item.resourceType == 8 && item.taskFrequency == 1">勤奋分 {{item.doctorFinishFrequency}}/{{item.finishFrequency}}</span>
-                            <span v-if="item.resourceType == 8 && item.taskFrequency == 2">勤奋分 {{item.nowCumulativeFrequency}}/{{item.cumulativeFrequency}}</span>
-                            <span v-if="item.resourceType == 1 && item.taskFrequency == 1">勤奋分 {{item.doctorFinishFrequency}}/{{item.finishFrequency}}</span>
-                            <span v-if="item.resourceType == 1 && item.taskFrequency == 2">勤奋分 {{item.nowCumulativeFrequency}}/{{item.cumulativeFrequency}}</span>
-                            <span v-if="item.resourceType == 4 && item.taskFrequency == 1">勤奋分 {{item.doctorFinishFrequency}}/{{item.finishFrequency}}</span>
-                            <span v-if="item.resourceType == 4 && item.taskFrequency == 2">勤奋分 {{item.nowCumulativeFrequency}}/{{item.cumulativeFrequency}}</span>
+                            <span v-if="item.resourceType == 8 && item.taskFrequency == 1">勤奋分{{item.doctorFinishFrequency}}/{{item.finishFrequency}}</span>
+                            <span v-if="item.resourceType == 8 && item.taskFrequency == 2">勤奋分{{item.nowCumulativeFrequency}}/{{item.cumulativeFrequency}}</span>
+                            <span v-if="item.resourceType == 1 && item.taskFrequency == 1">勤奋分{{item.doctorFinishFrequency}}/{{item.finishFrequency}}</span>
+                            <span v-if="item.resourceType == 1 && item.taskFrequency == 2">勤奋分{{item.nowCumulativeFrequency}}/{{item.cumulativeFrequency}}</span>
+                            <span v-if="item.resourceType == 4 && item.taskFrequency == 1">勤奋分{{item.doctorFinishFrequency}}/{{item.finishFrequency}}</span>
+                            <span v-if="item.resourceType == 4 && item.taskFrequency == 2">勤奋分{{item.nowCumulativeFrequency}}/{{item.cumulativeFrequency}}</span>
                         </div>
                         <div class="task-b" v-if="handleData(item.rewardJsonInfo)[0].rewardType == 4">
                             {{handleData(item.rewardJsonInfo)[0].rewardQuantity}}条短信额度/人
@@ -205,26 +205,31 @@ export default {
         .task-con {
             position: relative;
             padding-bottom: 5px;
+            width: 335px;
+            height: 70px;
             img {
-                width: 100%;
+                width: 335px;
+                height: 70px;
             }
             .task-item {
                 position: absolute;
                 left: 0;
                 top: 0;
-                width: 94%;
-                height: 90%;
-                padding: 0px 10px;
+                width: 335px;
+                height: 70px;
+                padding: 0px 10px 0px 14px;
+                box-sizing: border-box;
                 display: flex;
                 flex-direction: row;
                 justify-content: space-between;
                 align-items: center;
                 img {
-                    width: 50px;
-                    height: 50px;
+                    width: 35px;
+                    height: 35px;
                 }
                 .task-l {
-                    width: 167px;
+                    width: 162px;
+                    padding-left: 13px;
                     .task-t {
                         padding-bottom: 25px;
                         font-size: 16px;
@@ -233,6 +238,7 @@ export default {
                     }
                 }
                 .task-r {
+                    width: 86px;
                     text-align: right;
                     // height: 39px;
                     span.has-bg {
@@ -256,8 +262,11 @@ export default {
                     }
                     .task-b {
                         text-align: center;
-                        font-size: 12px;
+                        font-size: 0px;
                         color: #979899;
+                        span {
+                            font-size: 12px;
+                        }
                         span.score {
                             display: inline-block;
                             color: #CC2646;

nuxt.config.js

@@ -4,7 +4,7 @@ module.exports = {
   ** Headers of the page
   */
   head: {
-    title: '医生节活动',
+    title: '国际医生节特辑活动',
     meta: [
       { charset: 'utf-8' },
       // { name: 'viewport', content: 'width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no, minimal-ui' },

utils/enumerate.js

@@ -3,6 +3,7 @@ const { NUXT_ENV_APP } = process.env;
 export const BASE_URL = {
   dev: 'https://dev-sc.yunqueyi.com',
   test: 'https://test1-sc.yunqueyi.com',
+  uat: 'https://uat-sc.yunqueyi.com',
   prod: 'https://sc.yunqueyi.com'  
 };