From aab195ea03a3b9e67bb6111a30e418ddbbb1bea2 Mon Sep 17 00:00:00 2001
From: 396316021 <396316021@qq.com>
Date: Mon, 4 Sep 2023 18:39:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98,=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E4=BD=93=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/Index/components/HomePage/index.vue | 47 ++++++++++++++++++-----
 pages/Index/components/ShopPage/index.vue |  3 --
 pages/Index/index.vue                     | 29 +++++++++++++-
 pages/Service/index.vue                   | 37 ++++++++++++++----
 4 files changed, 94 insertions(+), 22 deletions(-)

diff --git a/pages/Index/components/HomePage/index.vue b/pages/Index/components/HomePage/index.vue
index 7acdeab..0f8b574 100644
--- a/pages/Index/components/HomePage/index.vue
+++ b/pages/Index/components/HomePage/index.vue
@@ -60,12 +60,17 @@
       <u-image class="img" width="100%" height="160" :src="staticImage.wallpaperBgImage" radius="20" mode="aspectFill"/>
     </view>
     <view class="index-ad-img" v-if="tips">
-      <view class="index-ad-desc row">
+      <view class="index-ad-desc row" style="justify-content: space-between;">
         <view class="label">
           <u-text text="温馨提示：" color="#AFB5BE" size="24"></u-text>
         </view>
-        <view class="bar col">
-          <u-notice-bar custom-style="padding:0;" speed="50" :text="tips" icon="" color="#AFB5BE" font-size="24" bg-color="transparent"></u-notice-bar>
+        <view class="bar col" style="max-width:80%;">
+          <u-notice-bar
+              custom-style="padding:0;"
+              speed="50"
+              :text="tips"
+              icon=""
+              color="#AFB5BE" font-size="24" bg-color="transparent"></u-notice-bar>
         </view>
       </view>
     </view>
@@ -73,7 +78,7 @@
     <!--  关于我们开始-->
     <u-cell-group :border="false" :custom-style="{
     marginTop:'48rpx'
-  }">
+    }">
       <u-cell
           :rightIconStyle="{
             fontSize:'28rpx'
@@ -116,7 +121,7 @@
           value="查看更多"
           :clickable="false"
           :isLink="true"
-          @click="getNotify"
+          @click="openNotDone"
       >
         <template v-slot:title>
           <view class="cell-two-container row">
@@ -153,7 +158,7 @@
           value="查看更多"
           :clickable="false"
           :isLink="true"
-          @click="getNotify"
+          @click="openNotDone"
       >
         <template v-slot:title>
           <view class="cell-two-container row">
@@ -227,7 +232,25 @@
   <u-notify ref="uNotify" message="Hi uview-plus"></u-notify>
 <!--  最新兑换结束-->
   <u-modal :show="modalShow" :content="modalContent" @confirm="modalShow = false"></u-modal>
-
+  <uv-popup ref="notDone" round="20" :safeAreaInsetBottom="false">
+    <view class="not-done-container" style="padding:0 100rpx;position: relative;">
+      <view class="not-done-icon">
+        <u-image mode="widthFix" height="400" width="400" :src="staticImage.popIcon"></u-image>
+      </view>
+      <view class="not-done-title" style="margin-bottom:74rpx;">
+        <u-text :text="modalContent" align="center" color="#020B18" size="28"></u-text>
+      </view>
+      <view class="not-done-btn" style="margin-bottom:60rpx;">
+        <u-button
+            text="确定"
+            color="#FF9545"
+            shape="circle"
+            custom-style="color:#020B18;font-size:36rpx;height:80rpx;max-width:320rpx;"
+            @click="this.$refs.notDone.close();"
+        ></u-button>
+      </view>
+    </view>
+  </uv-popup>
 
 </template>
 
@@ -289,6 +312,7 @@ export default {
       wallpaperBgImage: imghost+'/fxx-tip.png',
       bg: imghost + '/BG.png',
       fiveBackground: imghost + '/five-button-background.png',
+      popIcon:imghost+ '/not-done-icon.png',
     },
     indexBanner: [],
     goodsList: [],
@@ -320,7 +344,7 @@ export default {
     fiveButtonClick(item){
       if(item.disabled){
         this.modalContent = '暂未开启,敬请期待';
-        this.modalShow = true;
+        this.$refs.notDone.open('center');
       }else{
         if(!uni.getStorageSync('token')){
           wx.navigateTo({
@@ -344,8 +368,9 @@ export default {
         // }
         if(item.title === '丰行侠认证'){
           if(this.userInfo.fxx.number){
+            console.log(this.modalContent)
             this.modalContent = '您已经是丰行侠了,不用再认证了';
-            this.modalShow = true;
+            this.$refs.notDone.open('center');
             return false;
 
           }
@@ -442,6 +467,10 @@ export default {
         this.newsLists = res.data.title_list;
       })
     },
+    openNotDone(){
+      this.modalContent = '暂未开启,敬请期待';
+      this.$refs.notDone.open('center');
+    },
   },
   onPageScroll(res) {
     if (res.scrollTop <= 20) {
diff --git a/pages/Index/components/ShopPage/index.vue b/pages/Index/components/ShopPage/index.vue
index 2c7be98..cc8d6d1 100644
--- a/pages/Index/components/ShopPage/index.vue
+++ b/pages/Index/components/ShopPage/index.vue
@@ -782,13 +782,10 @@ export default {
     this.current = current;
     this.tabCheck = tabCheck;
 
-    if(tabCheck === 'item'){
       this.getItemList(true);
       this.getGoodsType();
-    }else{
       this.getRoomList(true);
       this.getStreet();
-    }
 
     uni.hideLoading();
   },
diff --git a/pages/Index/index.vue b/pages/Index/index.vue
index cc7ebc1..602760e 100644
--- a/pages/Index/index.vue
+++ b/pages/Index/index.vue
@@ -31,6 +31,25 @@
            :closeOnClickOverlay="true" showCancelButton></u-modal>
   <u-notify ref="uNotify" message="Hi uview-plus"></u-notify>
   <u-modal :show="modalShow" :content="modalContent" @confirm="modalShow = false"></u-modal>
+  <uv-popup ref="notDone" round="20" :safeAreaInsetBottom="false">
+    <view class="not-done-container" style="padding:0 100rpx;">
+      <view class="not-done-icon">
+        <u-image mode="widthFix" height="400" width="400" :src="staticImage.popIcon"></u-image>
+      </view>
+      <view class="not-done-title" style="margin-bottom:74rpx;">
+        <u-text text="暂未开启，敬请期待" align="center" color="#020B18" size="28"></u-text>
+      </view>
+      <view class="not-done-btn" style="margin-bottom:60rpx;">
+        <u-button
+            text="确定"
+            color="#FF9545"
+            shape="circle"
+            custom-style="color:#020B18;font-size:36rpx;height:80rpx;max-width:320rpx;"
+            @click="this.$refs.notDone.close();"
+        ></u-button>
+      </view>
+    </view>
+  </uv-popup>
 </template>
 
 <script>
@@ -88,6 +107,9 @@ export default {
         },
       ],
       current:0,
+      staticImage:{
+        popIcon:imghost+ '/not-done-icon.png',
+      },
     }
   },
   onLoad(option) {
@@ -128,7 +150,7 @@ export default {
   methods: {
     footSelect(item,index) {
       if (item.name === 'disabled') {
-        this.modalShow = true;
+        this.$refs.notDone.open('center');
         return false;
       }
       if(item.name === 'shop'){
@@ -167,7 +189,10 @@ export default {
           this.$store.commit('userInfo', res.data);
         }
       });
-    }
+    },
+    openNotDone(){
+      this.$refs.notDone.open('center');
+    },
     // store.
   },
   onPageScroll(res) {
diff --git a/pages/Service/index.vue b/pages/Service/index.vue
index 2b56796..a6fd144 100644
--- a/pages/Service/index.vue
+++ b/pages/Service/index.vue
@@ -159,10 +159,11 @@
         </view>
       </view>
     </view>
+    <u-loadmore :custom-style="{display:'flex'}" :status="status" fontSize="28"
+                marginBottom="30" marginTop="30" @loadmore="getServiceList()" v-if="(tabCheck === 'room')"/>
   </view>
 
-  <u-loadmore :custom-style="{display:'flex'}" :status="status" fontSize="28"
-              marginBottom="30" marginTop="30" @loadmore="getServiceList()" v-if="(tabCheck === 'room')"/>
+
   <uv-picker
       ref="streetPicker"
       :show="streetShow"
@@ -308,17 +309,24 @@ export default {
     this.size.height = api.navHeight().navigationBar + api.navHeight().systemBar
 
   },
+  onReachBottom() {
+      this.getServiceList();
+  },
   methods: {
     getConfig(){
       systemConfig({type:'service_type'}).then(res => {
-        this.jurisdictionList = res.data.map(item => {
-          return {name:item}
+        let data = [{name:'全部'}];
+         res.data.map(item => {
+          data.push( {name:item});
         });
+        this.jurisdictionList = data;
       });
       systemConfig({type:'jurisdiction'}).then(res => {
-        this.serviceList = res.data.map(item => {
-          return {name:item}
+        let data = [{name:'全部'}];
+        res.data.map(item => {
+          data.push( {name:item});
         });
+        this.serviceList = data;
       });
     },
     showStreetPicker(){
@@ -351,6 +359,7 @@ export default {
       if (this.status === 'nomore') {
         return false;
       }
+      this.status = 'loading'
       if(!this.pages.lat || !this.pages.lng){
         this.getLocal().then(res1 => {
           serviceStreet(this.pages).then(res => {
@@ -370,6 +379,8 @@ export default {
             this.listWater.push.apply(this.listWater, res.data);
             if (res.data.length === 0) {
               this.status = 'nomore'
+            }else{
+              this.status = 'loadmore'
             }
             this.pages.page++;
           });
@@ -393,6 +404,8 @@ export default {
           this.listWater.push.apply(this.listWater, res.data);
           if (res.data.length === 0) {
             this.status = 'nomore'
+          }else{
+            this.status = 'loadmore'
           }
           this.pages.page++;
         });
@@ -445,7 +458,11 @@ export default {
       // });
     },
     selectRent(e) {
-      this.pages.type = e.value[0].name;
+      if(e.value[0].name === '全部') {
+        this.pages.type = '';
+      }else{
+        this.pages.type = e.value[0].name;
+      }
       this.getServiceList(true);
       this.rentShow = false;
     },
@@ -458,7 +475,11 @@ export default {
       this.priceShow = false;
     },
     selectStreet(e) {
-      this.pages.jurisdiction = e.value[0].name;
+      if(e.value[0].name === '全部'){
+        this.pages.jurisdiction = '';
+      }else{
+        this.pages.jurisdiction = e.value[0].name;
+      }
       this.getServiceList(true);
       this.streetShow = false;
     },