Merge branch 'master' of http://gitlab.oytour.com/viitto/million

src/components/car/orderPreview.vue

@@ -148,7 +148,6 @@ export default {
         this.p = n;
         if(n&&n.startDate){
           this.chosenObj.startDate = n.startDate;
-          console.log(this.chosenObj.startDate,this.dataAll,'===')
           let arr = this.dataAll.filter(x=> x.Date==this.chosenObj.startDate)
           if(arr.length>0){
             this.TicketIds = arr[0].Price.map(x=> {return x.TicketId})

src/pages/detailsNew.vue

@@ -462,8 +462,11 @@
             ref="diyContext"
             :style="{ zoom: zoomDiyContext }"
             v-html="dataList.feature.featureHtml"
-            v-if="dataList.feature.featureHtml != ''"
+            v-if="dataList.feature.featureHtml != '' && (!tripImages || tripImages.length==0)"
           ></div>
+          <div v-else-if="tripImages.length>0">
+            <img :src="x" width="100%" v-for="(x,i) in tripImages" :key="i">
+          </div>
           <div
             class="text-h5 text-weight-bold text-left q-mt-xl"
             ref="product"
@@ -772,6 +775,7 @@ export default {
       priceListHeight: 0,
       stickyHeight: 0,
       zoomDiyContext: 1,
+      tripImages:[]
     };
   },
   components: {
@@ -836,6 +840,14 @@ export default {
     // this.getCarData();
   },
   methods: {
+    getTripFeatureImageHandler(configId){
+      this.$axios.get("http://upload.oytour.com/Home/GetTripImage?configId="+configId).then(r=>{
+        console.log(r.data,'r.data.data.id')
+        if(r.data.OtherFile){
+          this.tripImages=r.data.OtherFile
+        }
+      })
+    },
     changeShowOrderPreviewHandler() {
       this.showOrderPreview = !this.showOrderPreview;
       if (!this.showOrderPreview) {
@@ -996,6 +1008,7 @@ export default {
         (r) => {
           try {
             if (r.data.resultCode == 1 && r.data.data.id>0) {
+              this.getTripFeatureImageHandler(r.data.data.id)
               this.dataList = r.data.data;
               if (this.dataList.dayList && this.dataList.dayList.length > 0) {
                 this.dataList.dayList.forEach((item) => {

src/pages/usercenter/setUsersList.vue

@@ -125,7 +125,7 @@
         />添加出行人</q-btn
       >
     </div>
-    <div class="mt flex justify-end">
+    <div class="mt flex justify-end" v-if="pageCount">
       <q-pagination
         v-model="current"
         :max="pageCount"
@@ -141,9 +141,9 @@
       <div class="bg-white dialog-box" style="padding: 20px">
         <div class="f22 bold">{{ form.Id ? "编辑" : "新增" }}出行人信息</div>
         <form @submit.prevent.stop="submit" class="q-gutter-md">
-          <div>
+          <div class="q-pt-md">
             <div :class="$q.platform.is.desktop ? 'row': 'culmuns'">
-              <div class="col q-mt-md">
+              <div class="col">
                 <div class="title">姓</div>
                 <q-input
                   class="form-item"