Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/UpgradedVersionDetails.vue

 <template>
   <div class="UpgradedVersionDetails-form absolute row-sb z-index1"
   :style="{'background':backgroundColor}">
-    <div class="UpgradedVersionDetails-box column" v-for="item in 3">
+    <div class="UpgradedVersionDetails-box column" v-for="(item,index) in 3">
       <div class="UpgradedVersionDetails-imgbox row-aic">
         <div class="UpgradedVersionDetails-img relative">
           <div>
@@ -13,11 +13,22 @@
       <!-- UpgradedVersionDetails-two 02  UpgradedVersionDetails-three 03-->
       <div class="UpgradedVersionDetails-Title UpgradedVersionDetails-two">
         <div class="UpgradedVersionDetails-Img-one relative">
+          <div class="UpgradedVersionDetails-num relative"
+          :style="{'color':TripColor}">
+            <span class="absolute">{{'0'+(index+1)}}</span>
+          </div>
           <div class="UpgradedVersionDetails-T absolute">
             <vEditDiv :canEdit='canEdit1' v-model="first1"></vEditDiv>
           </div>
         </div>
-        <div class="UpgradedVersionDetails-Img-two"></div>
+        <div class="UpgradedVersionDetails-Img-two relative">
+          <template v-for="(items,indexs) in subscriptText">
+            <p class="absolute row-sb" v-if="indexs==index"
+            :style="{'color':TripColor}">
+              <span v-for="(t,i) in items.Name">{{t}}</span>
+            </p>
+          </template>
+        </div>
         <div class="UpgradedVersionDetails-T-two">
           <vEditDiv :canEdit='canEdit' v-model="first"></vEditDiv>
         </div>
@@ -46,7 +57,12 @@
         canEdit: true,
         first1: '日本料理',
         canEdit1: true,
-        backgroundColor: null
+        backgroundColor: null,
+        subscriptText:[
+          {Name:'FOODING',Id:0},
+          {Name:'EXPERIENCE',Id:1},
+          {Name:'DELICIOUS',Id:2}
+        ]
       };
     },
     methods: {
@@ -114,36 +130,52 @@
   padding: 0 26px;
 }
 .UpgradedVersionDetails-Img-one{
-  width: 72px;
+  /* width: 72px;
   height: 32px;
   background: url("http://192.168.10.214:8130/Upload/NewTripFeature/one.png") no-repeat center;
-  background-size: 100% 100%;
+  background-size: 100% 100%; */
 }
 .UpgradedVersionDetails-two .UpgradedVersionDetails-Img-one{
-  background: url("http://192.168.10.214:8130/Upload/NewTripFeature/two.png") no-repeat center;
-  background-size: 100% 100%;
+  /* background: url("http://192.168.10.214:8130/Upload/NewTripFeature/two.png") no-repeat center;
+  background-size: 100% 100%; */
 }
 .UpgradedVersionDetails-three .UpgradedVersionDetails-Img-one{
-  background: url("http://192.168.10.214:8130/Upload/NewTripFeature/three.png") no-repeat center;
-  background-size: 100% 100%;
+  /* background: url("http://192.168.10.214:8130/Upload/NewTripFeature/three.png") no-repeat center;
+  background-size: 100% 100%; */
+}
+.UpgradedVersionDetails-num{
+  height: 32px;
+  overflow: hidden;
+}
+.UpgradedVersionDetails-num span{
+  font-size: 76px;
+  font-weight: bold;
+  /* font-family: FZCuSong-B09S; */
+  left: 0;
+  top: -28px;
 }
 .UpgradedVersionDetails-Img-two{
   width: 264px;
   height: 21px;
-  background: url("http://192.168.10.214:8130/Upload/NewTripFeature/fooding.png") no-repeat center;
-  background-size: 100% 100%;
+  /* background: url("http://192.168.10.214:8130/Upload/NewTripFeature/fooding.png") no-repeat center;
+  background-size: 100% 100%; */
   margin-top: 77px;
   margin-bottom: 20px;
 }
 .UpgradedVersionDetails-two .UpgradedVersionDetails-Img-two{
-  background: url("http://192.168.10.214:8130/Upload/NewTripFeature/experience.png") no-repeat center;
-  background-size: 100% 100%;
+  /* background: url("http://192.168.10.214:8130/Upload/NewTripFeature/experience.png") no-repeat center;
+  background-size: 100% 100%; */
 }
 .UpgradedVersionDetails-three .UpgradedVersionDetails-Img-two{
-  background: url("http://192.168.10.214:8130/Upload/NewTripFeature/delicious.png") no-repeat center;
-  background-size: 100% 100%;
+  /* background: url("http://192.168.10.214:8130/Upload/NewTripFeature/delicious.png") no-repeat center;
+  background-size: 100% 100%; */
+}
+.UpgradedVersionDetails-Img-two p{
+  left: 0;
+  right: 0;
+  font-size: 24px;
+  font-weight: 500;
 }
-
 .UpgradedVersionDetails-T{
   width: 276px;
   height: 44px;