优化页面

unpackage/dist/dev/mp-weixin/pages/Home/Home.js

@@ -59,7 +59,11 @@ const _sfc_main = {
       //确认弹窗状态
     };
   },
-  mounted() {
+  onShow() {
+    this.page = 0;
+    this.list = [];
+    this.MakeAppointmentPKlist = [];
+    this.RealTimePklist = [];
     this.pkList({ type: 2 });
     this.pkList({ type: 1 });
   },
@@ -117,29 +121,58 @@ const _sfc_main = {
       this.list = [];
       if (this.listtype === 1) {
         this.MakeAppointmentPKlist = [];
-        this.pkList({
-          type: this.listtype,
-          sex: this.genders,
-          coin: {
-            start: this.minNumberCoins,
-            end: this.maxNumberCoins
-          },
-          country: this.countrys
-        });
+        let condition = {
+          type: this.listtype
+        };
+        if (this.genders !== 0) {
+          condition.sex = this.genders;
+        }
+        if (this.minNumberCoins !== "") {
+          condition.coin = {
+            start: this.minNumberCoins
+          };
+        }
+        if (this.maxNumberCoins !== "") {
+          condition.coin.end = this.maxNumberCoins;
+        }
+        if (this.mindatetimesingle !== "") {
+          condition.pkTime = {
+            start: this.mindatetimesingle
+          };
+        }
+        if (this.maxdatetimesingle !== "") {
+          condition.pkTime.end = this.maxdatetimesingle;
+        }
+        if (this.countrys !== "") {
+          condition.country = this.countrys;
+        }
+        this.pkList(condition);
       } else {
         this.RealTimePklist = [];
-        this.pkList({
-          sex: this.genders,
-          coin: {
-            start: this.minNumberCoins,
-            end: this.maxNumberCoins
-          },
-          country: this.countrys,
-          pkTime: {
-            start: this.mindatetimesingle,
-            end: this.maxdatetimesingle
-          }
-        });
+        let condition = {};
+        if (this.genders !== 0) {
+          condition.sex = this.genders;
+        }
+        if (this.minNumberCoins !== "") {
+          condition.coin = {
+            start: this.minNumberCoins
+          };
+        }
+        if (this.maxNumberCoins !== "") {
+          condition.coin.end = this.maxNumberCoins;
+        }
+        if (this.mindatetimesingle !== "") {
+          condition.pkTime = {
+            start: this.mindatetimesingle
+          };
+        }
+        if (this.maxdatetimesingle !== "") {
+          condition.pkTime.end = this.maxdatetimesingle;
+        }
+        if (this.countrys !== "") {
+          condition.country = this.countrys;
+        }
+        this.pkList(condition);
       }
     },
     //清空弹窗
@@ -168,15 +201,18 @@ const _sfc_main = {
     goMakeAppointmentPK() {
       this.listtype = 1;
       this.list = this.MakeAppointmentPKlist;
+      this.clear();
     },
     //大厅
     goRealTimePk() {
       this.listtype = 2;
       this.list = this.RealTimePklist;
+      this.clear();
     },
     goAdvertisement() {
       common_vendor.index.navigateTo({ url: "/pages/pkDetail/pkDetail" });
     },
+    //下拉刷新
     onRefresherRefresh() {
       this.page = 0;
       this.list = [];
@@ -245,6 +281,7 @@ const _sfc_main = {
     },
     formatDate: components_formatDate.formatDate,
     async pkList(condition) {
+      common_vendor.index.__f__("log", "at pages/Home/Home.vue:485", condition);
       const res = await components_request.request({
         url: "pk/pkList",
         method: "POST",
@@ -258,6 +295,7 @@ const _sfc_main = {
         userInfo: false
       });
       if (res.code === 200) {
+        common_vendor.index.__f__("log", "at pages/Home/Home.vue:500", res.data);
         this.triggered = false;
         if (condition.type === 1) {
           this.MakeAppointmentPKlist.push(...res.data);
@@ -285,14 +323,13 @@ const _sfc_main = {
 };
 if (!Array) {
   const _component_top_navigation = common_vendor.resolveComponent("top-navigation");
-  const _component_advertisement = common_vendor.resolveComponent("advertisement");
   const _component_uni_card = common_vendor.resolveComponent("uni-card");
   const _easycom_tabBar2 = common_vendor.resolveComponent("tabBar");
   const _easycom_wht_select2 = common_vendor.resolveComponent("wht-select");
   const _easycom_uni_number_box2 = common_vendor.resolveComponent("uni-number-box");
   const _easycom_uni_datetime_picker2 = common_vendor.resolveComponent("uni-datetime-picker");
   const _easycom_uni_popup2 = common_vendor.resolveComponent("uni-popup");
-  (_component_top_navigation + _component_advertisement + _component_uni_card + _easycom_tabBar2 + _easycom_wht_select2 + _easycom_uni_number_box2 + _easycom_uni_datetime_picker2 + _easycom_uni_popup2)();
+  (_component_top_navigation + _component_uni_card + _easycom_tabBar2 + _easycom_wht_select2 + _easycom_uni_number_box2 + _easycom_uni_datetime_picker2 + _easycom_uni_popup2)();
 }
 const _easycom_tabBar = () => "../../components/tabBar/tabBar.js";
 const _easycom_wht_select = () => "../../uni_modules/wht-select/components/wht-select/wht-select.js";
@@ -307,10 +344,9 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     a: common_vendor.o$1($options.goRealTimePk),
     b: common_vendor.o$1($options.goMakeAppointmentPK),
     c: common_vendor.o$1($options.goScreening),
-    d: common_vendor.o$1((...args) => $options.goAdvertisement && $options.goAdvertisement(...args)),
-    e: $data.list.length !== 0
+    d: $data.list.length !== 0
   }, $data.list.length !== 0 ? {
-    f: common_vendor.f($data.list, (item, index, i0) => {
+    e: common_vendor.f($data.list, (item, index, i0) => {
       return common_vendor.e({
         a: item.anchorIcon,
         b: common_vendor.t(item.disPlayId),
@@ -324,15 +360,16 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         i: common_vendor.o$1(($event) => $options.goDetail(item), index),
         j: item.isPin === true ? "2px solid #eeff00" : "2px solid #f5f5f5",
         k: index,
-        l: "7ffebbf4-2-" + i0
+        l: "7ffebbf4-1-" + i0
       });
     })
   } : {}, {
-    g: $data.list.length === 0
+    f: $data.list.length === 0
   }, $data.list.length === 0 ? {} : {}, {
-    h: common_vendor.o$1((...args) => $options.onRefresherRefresh && $options.onRefresherRefresh(...args)),
-    i: common_vendor.o$1((...args) => _ctx.onScrollToLower && _ctx.onScrollToLower(...args)),
-    j: $data.triggered,
+    g: common_vendor.o$1((...args) => $options.onRefresherRefresh && $options.onRefresherRefresh(...args)),
+    h: common_vendor.o$1((...args) => _ctx.onScrollToLower && _ctx.onScrollToLower(...args)),
+    i: $data.triggered,
+    j: common_vendor.o$1(($event) => $options.onRefresherRefresh()),
     k: common_vendor.p({
       tabIndex: 0
     }),
@@ -402,7 +439,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     H: common_vendor.o$1((...args) => $options.closePopup && $options.closePopup(...args)),
     I: common_vendor.o$1((...args) => $options.confirm && $options.confirm(...args)),
     J: common_vendor.o$1((...args) => $options.clear && $options.clear(...args)),
-    K: common_vendor.sr("popup", "7ffebbf4-4"),
+    K: common_vendor.sr("popup", "7ffebbf4-3"),
     L: common_vendor.p({
       position: "right"
     })