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

src/components/SalesModule/groupTourOrder.vue

@@ -1988,7 +1988,7 @@
       <div class="needfenshu">
         <label>需要份数：</label><el-input type="number" v-model="SQPhotoNum" class="w200"></el-input>
       </div>
-      <p style="color: red">注：每人每份10元</p>
+      <p style="color: red">注：每人每份5元</p>
       <div slot="footer" class="dialog-footer">
           <button class="hollowFixedBtn" @click="ShenQingPhotoShow=false">{{$t('pub.cancelBtn')}}</button>
           <button class="normalBtn" type="primary" @click="SQPhoto">{{$t('pub.sureBtn')}}</button>

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -2706,7 +2706,7 @@
       <div class="needfenshu">
         <label>需要份数：</label><el-input type="number" v-model="SQPhotoNum" class="w200"></el-input>
       </div>
-      <p style="color: red">注：每人每份10元</p>
+      <p style="color: red">注：每人每份5元</p>
       <div slot="footer" class="dialog-footer">
           <button class="hollowFixedBtn" @click="ShenQingPhotoShow=false">{{$t('pub.cancelBtn')}}</button>
           <button class="normalBtn" type="primary" @click="SQPhoto">{{$t('pub.sureBtn')}}</button>

src/components/leaderPay2.vue

@@ -1577,13 +1577,23 @@ export default {
                   });
                   Scenicmap[ai.UseTimeStr] = ai;
               }else{
+                let list = []
                 for(var j = 0; j < Scenicdest.length; j++){
                     var dj = Scenicdest[j];
                     if(dj.UseTimeStr == ai.UseTimeStr  && dj.TicketID == ai.TicketID){
                       dj.data.push(ai);
                       break;
+                    }else{
+                      list.push(ai)
                     }
                 }
+                for(let i = 0; i < list.length; i++) {
+                  Scenicdest.push({
+                      UseTimeStr: ai.UseTimeStr,
+                      DiningID: ai.DiningID,
+                      data: [ai]
+                  });
+                }
               }
           }
           for(var i = 0; i < Scenicdest.length; i++){
@@ -1593,7 +1603,8 @@ export default {
             } 
             Scenicdest[i].row = row
           }
-          this.ScenicDataList = Scenicdest
+          this.ScenicDataList = this.unique(Scenicdest);
+          // this.ScenicDataList = Scenicdest
           //酒 
           let HotelList = []
           for(let i = 0; i < res.data.data.HotelOrderListReport.length; i++) {