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

package.json

@@ -33,7 +33,8 @@
         "vuelidate": "^0.7.7"
     },
     "devDependencies": {
-        "@quasar/app": "^1.0.0"
+        "@quasar/app": "^1.0.0",
+        "webpack-dev-server": "^4.12.0"
     },
     "engines": {
         "node": ">= 10.18.1",

src/components/navs/city-category.vue

@@ -133,7 +133,8 @@
   font-weight: 400;
 }
 .category-l2:hover {
-  background-color: #eee;
+  background: #ee4454;
+  color: #fff;
 }
 .category-l2-select {
   background: #ee4454;

src/components/searchdata/kkday.vue

@@ -410,10 +410,12 @@ export default {
       console.log("handleSelected", target);
     },
     handleTicked(target) {
+      this.msg.pageIndex = 1
       this.ticked = target;
       this.goSearchHandler();
     },
     handleAreaTicked(target) {
+      this.msg.pageIndex = 1
       this.areaTicked = target;
       console.log("this.areaTicked", target);
       this.msg.placeIds = this.getChoseAddressCity().join(",");
@@ -471,6 +473,7 @@ export default {
     // },
     chosenSortHandler(x) {
       this.msg.orderBy = x.value;
+      this.msg.pageIndex = 1
       this.goSearchHandler();
     },
     getChoseAddressCity() {
@@ -517,6 +520,7 @@ export default {
         }
       });
       this.msg.dayNumList = arr;
+      this.msg.pageIndex = 1
       this.goSearchHandler();
     },
     optionsFn(cd) {
@@ -529,12 +533,14 @@ export default {
       this.$forceUpdate();
       this.msg.minPrice = e.min;
       this.msg.maxPrice = e.max;
+      this.msg.pageIndex = 1
       this.goSearchHandler();
     },
     dateRangeHandler(e) {
       this.msg.startDate = `${e.from.year}/${e.from.month}/${e.from.day}`;
       this.msg.endDate = `${e.to.year}/${e.to.month}/${e.to.day} `;
       this.$refs.qDateProxy.hide();
+      this.msg.pageIndex = 1
       this.goSearchHandler();
     },
     initGoods() {

src/components/trip/calendar.vue

@@ -150,6 +150,8 @@ export default {
     },
     changeShowMonthHandler(i) {
       this.currentMonth += i;
+      let value = this.months[this.currentMonth].value
+      this.$emit('getQuotationData',value)
       this.changeMonthHandler();
     },
     changeMonthHandler() {

src/pages/Pickuporder/orderForm.vue

@@ -541,7 +541,7 @@
             <hr style="border:none;border-top:1px dashed #EEE !important;" class="bg-transparent q-mb-sm" />
             <div class="row q-mb-sm items-center" v-if="chosenObj.Count>0">
               <div class="col">支付金額</div>
-              <div class="text-h6 text-weight-bolder text-primary product-price">{{details.CurrencyCode}} {{ moneyFormat(parameters.Money,2) }}</div>
+              <div class="text-h6 text-weight-bolder text-primary product-price">CNY {{ moneyFormat(parameters.Money,2) }}</div>
             </div>
           </div>
           <div class="text-right q-mt-md" v-if="step!=3">

src/pages/ScenicSpotTicket/details.vue

@@ -29,7 +29,7 @@
           class="col product-price text-subtitle1 text-weight-bold"
           style="text-align: left"
         >
-          <span v-if="priceList&&priceList.length">{{dataList.CurrencyCode}} {{ moneyFormat(priceList[0].originalB2CPrice, 0) }}</span>
+          <span v-if="priceList&&priceList.length">CNY {{ moneyFormat(priceList[0].originalB2CPrice, 0) }}</span>
           <span class="q-ml-sm f12 text-grey-7">起</span>
         </span>
         <q-btn
@@ -170,7 +170,7 @@
         >
           <div class="product-price text-h6" v-if="priceList&&priceList.length>0">
             <!-- CNY：{{ dataList. }} -->
-            {{dataList.CurrencyCode?dataList.CurrencyCode:'CNY'}}：{{ moneyFormat(priceList[0].originalB2CPrice, 0) }}
+            CNY {{ moneyFormat(priceList[0].originalB2CPrice, 0) }}
             <span class="f12 text-grey-6">起</span>
           </div>
           <div v-else class="text-subtitle1 text-grey-6">暫無報價</div>
@@ -310,7 +310,7 @@
               <div class="" v-if="$q.platform.is.desktop">
                 <div class="row items-center">
                   <span class="product-price text-h6 q-mr-md"
-                    >{{dataList.CurrencyCode?dataList.CurrencyCode:'CNY'}}
+                    >CNY
                     {{
                       moneyFormat(priceList[0].originalB2CPrice, 0)
                     }}</span

src/pages/usercenter/order.vue

@@ -85,7 +85,7 @@
             </div>
             <div>
               <div class="text-right">
-              <span>CNY:</span>
+              <span>CNY </span>
               <span class="text-h6 q-ml-sm">{{ moneyFormat(item.totalPrice,2) }}</span>
             </div>
             <div class="q-mt-md text-right" v-if="item.orderStatus==1">

src/pages/usercenter/order/carPriceDetail.vue

@@ -45,7 +45,7 @@
       <div class="text-grey-9">
         <!-- <div class="row q-mb-sm" v-if="chosenObj.Count>0&&CarObj">
           <div class="col">{{CarObj.CarName}} x {{ chosenObj.Count }}</div>
-          <div>{{details.CurrencyCode}} {{ moneyFormat(OrderDate.originalB2CPrice,2) }}</div>
+          <div>CNY {{ moneyFormat(OrderDate.originalB2CPrice,2) }}</div>
         </div> -->
         <hr
           style="border: none;"
@@ -71,7 +71,7 @@
         <!-- <hr style="border:none;" class="bg-transparent q-mb-sm" />
         <div class="row q-mb-sm items-center">
           <div class="col">支付金額</div>
-          <div class="text-h6 text-weight-bolder text-primary product-price">{{details.CurrencyCode}} {{ moneyFormat(Money,2) }}</div>
+          <div class="text-h6 text-weight-bolder text-primary product-price">CNY {{ moneyFormat(Money,2) }}</div>
         </div> -->
       </div>