From 4115fe481849d5e75ff610e600fcbab9cc862f3f Mon Sep 17 00:00:00 2001
From: 396316021 <396316021@qq.com>
Date: Fri, 8 Sep 2023 18:08:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=AC=E5=85=B1=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E8=A1=A8=E7=8E=B0,=E6=B7=BB=E5=8A=A0=E5=8D=A1?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=B8=8B=E6=8B=89=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/FooterNav/index.vue             | 55 ++++++++-----------
 components/HeaderNav/index.vue             |  2 +-
 components/RightNav/index.vue              | 26 ++++-----
 config/image.js                            | 14 +++++
 pages/Addr/index.vue                       |  2 +-
 pages/Card/index.vue                       | 63 ++++++++++++----------
 pages/Draw/index.vue                       |  2 +-
 pages/FeedLog/index.vue                    |  2 +-
 pages/Index/components/ChatPage/index.vue  | 46 ++++++++++------
 pages/Index/components/HomePage/index.vue  |  4 +-
 pages/Index/components/OrderPage/index.vue | 45 +++++++++-------
 pages/Index/components/UserPage/index.vue  |  9 ++--
 pages/Index/index.vue                      | 55 ++++++++++++++-----
 pages/OrderPage/index.vue                  |  7 ++-
 pages/Pet/index.vue                        |  2 +-
 pages/UserCoupons/index.vue                |  2 +-
 16 files changed, 198 insertions(+), 138 deletions(-)
 create mode 100644 config/image.js

diff --git a/components/FooterNav/index.vue b/components/FooterNav/index.vue
index 8eb0a00..2078f1b 100644
--- a/components/FooterNav/index.vue
+++ b/components/FooterNav/index.vue
@@ -6,11 +6,11 @@
 			</view>
 		</view>
 		<view class="foot-nav-button-group row">
-			<view class="col-3 foot-nav-button" v-for="(item,index) in buttonGroup"
-				:class="{active:(item.name == footCheck)}" :style="{
-					backgroundImage:'url('+item.image+ ((item.name == footCheck)?'-active':'')+'.png)',
-					backgroundSize:'auto '+((item.name == footCheck)?'81':'54')+'rpx'
-				}" @click="commitFootCheck(item)">
+			<view class="col-3 foot-nav-button" v-for="(item,index) in footGroup"
+            :class="{active:(item.name === footCheck)}" :style="{
+					backgroundImage:'url('+item.image+ ((index === footCheck)?'-active':'')+'.png)',
+					backgroundSize:'auto '+((index === footCheck)?'81':'54')+'rpx'
+				}" @click="selectItem(index)">
 
 			</view>
 		</view>
@@ -23,44 +23,28 @@
 	} from '@/config/host.js'
 	export default {
 		props: {
-
+      footGroup:{
+        type:Object,
+        default:{}
+      },
+      footCheck:{
+        type:Number,
+        default:0
+      },
 		},
 		data() {
 			return {
-				footCheck: 'home',
-				title: 'Hello',
-				loading: true,
-				buttonGroup: [{
-						image: imghost + "/static/image/foot-nav-button-one",
-						url: '/pages/index/index',
-						name: 'home',
-						title:'汪汪行天下',
-					},
-					{
-						image: imghost + "/static/image/foot-nav-button-two",
-						url: '/pages/order/index',
-						name: 'order',
-						title:'订单',
-					},
-					{
-						image: imghost + "/static/image/foot-nav-button-three",
-						url: '/pages/chatList/index',
-						name: 'chat',
-						title:'在线沟通',
-					},
-					{
-						image: imghost + "/static/image/foot-nav-button-four",
-						url: '/pages/user/index',
-						name: 'user',
-						title:'',
-					},
-				],
+        check:0,
 			}
 		},
 		onLoad() {
 
 		},
 		methods: {
+      selectItem(index){
+        this.current = index;
+        this.$emit('change',index)
+      },
 			commitFootCheck(item) {
 				this.$store.commit('footCheck',item.name);
 				this.$store.commit('title',item.title);
@@ -70,6 +54,9 @@
 				// return this.;
 			}
 		},
+    mounted() {
+      this.check = this.footCheck;
+    },
 		watch: {
 			"$store.state.footCheck": {
 				handler(newVal, oldVal) {
diff --git a/components/HeaderNav/index.vue b/components/HeaderNav/index.vue
index 5259aa8..32f958c 100644
--- a/components/HeaderNav/index.vue
+++ b/components/HeaderNav/index.vue
@@ -63,7 +63,7 @@
 				console.log('this.headerPadding',this.headerPadding);
 			},
 			navBack(){
-				wx.navigateBack({
+				uni.navigateBack({
 					delta:1
 				});
 			}
diff --git a/components/RightNav/index.vue b/components/RightNav/index.vue
index 9a02e5d..c3c19a5 100644
--- a/components/RightNav/index.vue
+++ b/components/RightNav/index.vue
@@ -1,6 +1,8 @@
 <template>
 	<view class="right-nav row">
-		<view class="right-nav-button col-12" v-for="(item,index) in buttonGroup" :style="{backgroundImage:'url('+item.image+')'}"></view>
+		<view class="right-nav-button col-12" :style="{backgroundImage:'url('+staticImage.wechat+')'}"></view>
+		<view class="right-nav-button col-12" :style="{backgroundImage:'url('+staticImage.chat+')'}"></view>
+		<view @click="callPhone('15012345678')" class="right-nav-button col-12" :style="{backgroundImage:'url('+staticImage.phone+')'}"></view>
 	</view>
 </template>
 
@@ -11,22 +13,22 @@
 			return {
 				title: 'Hello',
 				loading: true,
-				buttonGroup:[
-					{
-						image:imghost+"/static/image/right-button-wechat.png",
-					},{
-						image:imghost+"/static/image/right-button-chat.png",
-					},{
-						image:imghost+"/static/image/right-button-phone.png",
-					},
-				]
+				staticImage:{
+          wechat: imghost + "/static/image/right-button-wechat.png",
+          chat: imghost + "/static/image/right-button-chat.png",
+          phone: imghost + "/static/image/right-button-phone.png",
+				}
 			}
 		},
 		onLoad() {
-		
+
 		},
 		methods: {
-		
+      callPhone(phone){
+        uni.makePhoneCall({
+          phoneNumber: phone.toString()
+        });
+      },
 		}
 	}
 </script>
diff --git a/config/image.js b/config/image.js
new file mode 100644
index 0000000..69992ef
--- /dev/null
+++ b/config/image.js
@@ -0,0 +1,14 @@
+import {imghost} from "@/config/host";
+
+const image = {
+    CardList:{
+            screenActiveImg: imghost + '/static/image/screen-active.png',
+            cardBackground: imghost + '/static/image/order-card-background.png',
+            wallpaperBgImage:imghost +'/static/image/card-background.png',
+            dogImage:imghost+'/static/image/index-user-title-dog.png',
+    },
+    IndexPage(){
+
+    }
+}
+export default image;
\ No newline at end of file
diff --git a/pages/Addr/index.vue b/pages/Addr/index.vue
index 6c42478..d35eb9b 100644
--- a/pages/Addr/index.vue
+++ b/pages/Addr/index.vue
@@ -215,7 +215,7 @@
 				});
 			},
 			navTo(url){
-				wx.navigateTo({
+				uni.navigateTo({
 					url:url
 				})
 			},
diff --git a/pages/Card/index.vue b/pages/Card/index.vue
index e5ed877..7a35d20 100644
--- a/pages/Card/index.vue
+++ b/pages/Card/index.vue
@@ -31,7 +31,7 @@
 												{{item.illustrate}}
 											</view>
 											<view class="card-content-bottom">
-                        抵扣券有效期：{{item.que_illustrate}}
+                        {{item.que_illustrate}}
 											</view>
 										</view>
 										<view class="card-btn" @click="navTo('/pages/CardDetail/index?id='+item.id)">
@@ -51,26 +51,30 @@
 						</view>
 					</view>
 				</view>
-				<view class="item-end row">
-					— 没有更多内容了 —
-				</view>
+<!--				<view class="item-end row">-->
+
+<!--				</view>-->
+
 			</view>
 		</view>
+    <u-loadmore :status="status" fontSize="28"
+                color="#ACB4B6"
+                line
+                line-color="#ACB4B6"
+                marginBottom="30" marginTop="30" @loadmore="getCardList()"/>
 	</view>
 
 	<!-- <RightNav></RightNav> -->
 </template>
 
 <script>
-	import {
-		imghost
-	} from '@/config/host.js'
 	import HeaderNav from '@/components/HeaderNav/Index.vue';
 	import FooterNav from '@/components/FooterNav/Index.vue';
 	import RightNav from '@/components/RightNav/Index.vue';
 	import MzButton from '../../components/MzButton/Index.vue';
 	import api from '@/utils/functions.js';
-  import {cardList} from "../../api/card";
+  import image from "@/config/image";
+  import {cardList} from "@/api/card";
 	export default {
 		components: {
 			HeaderNav,
@@ -82,26 +86,15 @@
 			return {
 				title: 'Hello',
 				loading: true,
-				staticImage: {
-					screenActiveImg: imghost + '/static/image/screen-active.png',
-					cardBackground: imghost + '/static/image/order-card-background.png',
-					wallpaperBgImage:imghost +'/static/image/card-background.png',
-					dogImage:imghost+'/static/image/index-user-title-dog.png',
-				},
-				indexBanner: [{
-					image: imghost + '/static/image/banner.png',
-					url: '',
-				}],
-				user: {
-					avatar: imghost + '/static/image/banner.png',
-					nickname: '清晨的风',
-					coupons: 221,
-					id: 88685
-				},
+				staticImage: image.CardList,
 				isTop: false,
 				pagePadding: 100,
-				petImage: imghost + '/static/image/pet_avatar1.jpeg',
 				orderCardList:[],
+        status:'loadmore',
+        data:{
+          page:1,
+          limit:10,
+        }
 			}
 		},
 		onLoad() {
@@ -109,14 +102,23 @@
 		},
 		methods: {
       navTo(url){
-        wx.navigateTo({
+        uni.navigateTo({
           url:url
         })
       },
       getCardList(){
-        cardList().then((res) => {
-          console.log(res)
-          this.orderCardList = res.data
+        if(this.status === 'nomre'){
+          return false;
+        }
+        this.status = 'loading';
+        cardList(this.data).then((res) => {
+          this.orderCardList.push.apply(this.orderCardList,res.data);
+          if(res.data.length === 0){
+            this.status = 'nomore';
+          }else{
+            this.status = 'loadmore';
+          }
+          this.data.page++;
         })
       }
 		},
@@ -127,6 +129,9 @@
 				uni.$emit('isTop', false);
 			}
 		},
+    onReachBottom() {
+      this.getCardList();
+    },
 		created() {
 			this.pagePadding = (api.navHeight().navPaddingTop +
 				api.navHeight().navHeight + (api.navHeight().headerPadding * 2))
diff --git a/pages/Draw/index.vue b/pages/Draw/index.vue
index f46f75f..b7e9bdf 100644
--- a/pages/Draw/index.vue
+++ b/pages/Draw/index.vue
@@ -158,7 +158,7 @@ export default {
   },
   methods: {
     navTo(url) {
-      wx.navigateTo({
+      uni.navigateTo({
         url: url
       })
     },
diff --git a/pages/FeedLog/index.vue b/pages/FeedLog/index.vue
index 6e7e11b..e69fad4 100644
--- a/pages/FeedLog/index.vue
+++ b/pages/FeedLog/index.vue
@@ -236,7 +236,7 @@
 		},
 		methods: {
       navTo(url){
-        wx.navigateTo({
+        uni.navigateTo({
           url:url
         })
       },
diff --git a/pages/Index/components/ChatPage/index.vue b/pages/Index/components/ChatPage/index.vue
index cef86ee..6576777 100644
--- a/pages/Index/components/ChatPage/index.vue
+++ b/pages/Index/components/ChatPage/index.vue
@@ -25,10 +25,15 @@
 					</view>
 				</view>
 			</view>
-			<view class="chat-item-end row">
-				— 没有更多内容了 —
-			</view>
+<!--			<view class="chat-item-end row">-->
+<!--				— 没有更多内容了 —-->
+<!--			</view>-->
 		</view>
+    <u-loadmore :status="status" fontSize="28"
+                color="#ACB4B6"
+                line
+                line-color="#ACB4B6"
+                marginBottom="30" marginTop="30" @loadmore="getChatList()"/>
 	</view>
 
 </template>
@@ -43,6 +48,7 @@
 	import MzButton from '@/components/MzButton/Index.vue';
 	import api from '@/utils/functions.js';
 	import {chatList} from "@/api/chat";
+  import {cardList} from "@/api/card";
 	export default {
 		components: {
 			HeaderNav,
@@ -62,14 +68,10 @@
 					chatLTBgImage:imghost +'/static/image/chat-list-lt-background.png',
 					bodyBackground:imghost+'/static/image/background.png'
 				},
-				user: {
-					avatar: imghost + '/static/image/banner.png',
-					nickname: '清晨的风',
-					coupons: 221,
-					id: 88685,
-				},
 				isTop: false,
-				chatList:[]
+				chatList:[],
+        status:'loadmore',
+        page:1,
 			}
 		},
 		mounted() {
@@ -77,16 +79,30 @@
 		},
 		methods: {
 			chatDetail(item){
-				wx.navigateTo({
+				uni.navigateTo({
 					url:'/pages/ChatDetail/index?id='+item.id
 				});
 			},
-			getChatList(page = 1){
-				chatList(page, this.$store.state.userInfo.store_id !== null).then(data => {
-						this.chatList = data.data;
-				})
+			getChatList(){
+
+        if(this.status === 'nomre'){
+          return false;
+        }
+        this.status = 'loading';
+        chatList(this.page, this.$store.state.userInfo.store_id !== null).then(res => {
+          this.chatList.push.apply(this.chatList,res.data);
+          if(res.data.length === 0){
+            this.status = 'nomore';
+          }else{
+            this.status = 'loadmore';
+          }
+          this.page++;
+        })
 			}
 		},
+    onReachBottom() {
+      this.getChatList();
+    },
 		onPageScroll(res) {
 			if(res.scrollTop <= 20){
 				uni.$emit('isTop', true);
diff --git a/pages/Index/components/HomePage/index.vue b/pages/Index/components/HomePage/index.vue
index 8b29baf..d6bc7a6 100644
--- a/pages/Index/components/HomePage/index.vue
+++ b/pages/Index/components/HomePage/index.vue
@@ -114,12 +114,12 @@
 		},
 		methods: {
 			userCouponsPage(){
-				wx.navigateTo({
+				uni.navigateTo({
 					url:'/pages/UserCoupons/index'
 				})
 			},
 			navTo(url){
-				wx.navigateTo({
+				uni.navigateTo({
 					url:url
 				})
 			},
diff --git a/pages/Index/components/OrderPage/index.vue b/pages/Index/components/OrderPage/index.vue
index 4e5896c..3e9ba6b 100644
--- a/pages/Index/components/OrderPage/index.vue
+++ b/pages/Index/components/OrderPage/index.vue
@@ -4,15 +4,14 @@
 		}">
 
 		<view class="order-capsule-container row">
-			<view class="order-capsule col-4 active">
-				全部
-			</view>
-			<view class="order-capsule col-4">
-				待服务
-			</view>
-			<view class="order-capsule col-4">
-				已完成
+      <view class="order-capsule col-4"
+         v-for="(item,index) in screenMenu"
+         :class="{active:(index === screenCheck)}"
+            @click="selectScreen(index)"
+      >
+        {{ item.name }}
 			</view>
+
 		</view>
 		<view class="order-screen-container row">
 			<view class="order-screen active">
@@ -113,21 +112,24 @@
 			return {
 				title: 'Hello',
 				loading: true,
+        screenCheck:0,
+        screenMenu:[
+          {
+            name:'全部',
+            value:'',
+          },{
+            name:'待服务',
+            value:'1',
+          },{
+            name:'已完成',
+            value:'2',
+          },
+        ],
 				staticImage: {
 					screenActiveImg: imghost + '/static/image/order-screen-active.png',
 					orderCardBackground: imghost + '/static/image/order-card-background.png',
 					wallpaperBgImage:imghost +'/static/image/background.png'
 				},
-				indexBanner: [{
-					image: imghost + '/static/image/banner.png',
-					url: '',
-				}],
-				user: {
-					avatar: imghost + '/static/image/banner.png',
-					nickname: '清晨的风',
-					coupons: 221,
-					id: 88685
-				},
 				isTop: false,
 				pagePadding: 100,
 				petImage: imghost + '/static/image/pet_avatar1.jpeg',
@@ -144,15 +146,18 @@
 						do_time:'2023/05/03 15—17时',
 						create_time:'2023/03/03 15:23:22',
 					},
-				]
+				],
 			}
 		},
 		onLoad() {
 
 		},
 		methods: {
+      selectScreen(index){
+        this.screenCheck = index;
+      },
       navTo(url){
-        wx.navigateTo({
+        uni.navigateTo({
           url:url
         })
       },
diff --git a/pages/Index/components/UserPage/index.vue b/pages/Index/components/UserPage/index.vue
index c16dc4b..4fa95fc 100644
--- a/pages/Index/components/UserPage/index.vue
+++ b/pages/Index/components/UserPage/index.vue
@@ -212,18 +212,17 @@
 		},
 		methods: {
 			navTo(url){
-				wx.navigateTo({
+				uni.navigateTo({
 					url:url
 				})
 			},
 			userDetail(){
-				wx.navigateTo({
+				uni.navigateTo({
 					url:'/pages/UserDetail/index'
 				})
 			},
 			orderPage(){
-				this.$store.commit('footCheck','order');
-				this.$store.commit('title','订单');
+				this.$emit('tabNavTo',1)
 			},
 			showNumber(){
 				userExtends().then(data => {
@@ -232,7 +231,7 @@
 				})
 			},
 			userCouponsPage(){
-				wx.navigateTo({
+				uni.navigateTo({
 					url:'/pages/UserCoupons/index'
 				})
 			},
diff --git a/pages/Index/index.vue b/pages/Index/index.vue
index 3a811d0..9933da5 100644
--- a/pages/Index/index.vue
+++ b/pages/Index/index.vue
@@ -1,19 +1,19 @@
 <template>
 	<HeaderNav :title="title"></HeaderNav>
 	<view :class="{show:(footCheck === 'home')}">
-		<HomePage v-show="(footCheck === 'home')"></HomePage>
+		<HomePage v-if="(footCheck === 'home')"></HomePage>
 	</view>
 	<view :class="{show:(footCheck === 'order')}">
-		<OrderPage v-show="(footCheck === 'order')"></OrderPage>
+		<OrderPage v-if="(footCheck === 'order')"></OrderPage>
 	</view>
 	<view :class="{show:(footCheck === 'chat')}">
-		<ChatPage v-show="(footCheck === 'chat')"></ChatPage>
+		<ChatPage v-if="(footCheck === 'chat')"></ChatPage>
 	</view>
 	<view :class="{show:(footCheck === 'user')}">
-		<UserPage v-show="(footCheck === 'user')"></UserPage>
+		<UserPage v-if="(footCheck === 'user')" @tabNavTo="footSelect"></UserPage>
 	</view>
-	<RightNav></RightNav>
-	<FooterNav></FooterNav>
+	<RightNav v-if="rightShow"></RightNav>
+	<FooterNav :foot-group="footGroup" @change="footSelect" :footCheck="current"></FooterNav>
 	<u-modal :show="show" title="登录" content="当前未登录是否前往登录" @confirm="userLogin" @cancel="this.show = false;"
 		:closeOnClickOverlay="true" showCancelButton></u-modal>
 </template>
@@ -26,11 +26,7 @@
 	import OrderPage from '@/pages/Index/components/OrderPage/Index.vue';
 	import ChatPage from '@/pages/Index/components/ChatPage/Index.vue';
 	import UserPage from '@/pages/Index/components/UserPage/Index.vue';
-	import {
-		testLogin,
-		userDetail,
-		userExtends
-	} from "../../api/user";
+  import {imghost} from "@/config/host";
 	export default {
 		components: {
 			FooterNav,
@@ -43,16 +39,47 @@
 		},
 		data() {
 			return {
+        current:0,
 				footCheck: 'home',
 				show: false,
 				title: '标题',
-				content: 'uview-plus的目标是成为uni-app生态最优秀的UI框架'
+				content: 'uview-plus的目标是成为uni-app生态最优秀的UI框架',
+        footGroup: [{
+          image: imghost + "/static/image/foot-nav-button-one",
+          name: 'home',
+          title:'汪汪行天下',
+        },
+          {
+            image: imghost + "/static/image/foot-nav-button-two",
+            name: 'order',
+            title:'订单',
+          },
+          {
+            image: imghost + "/static/image/foot-nav-button-three",
+            name: 'chat',
+            title:'在线沟通',
+          },
+          {
+            image: imghost + "/static/image/foot-nav-button-four",
+            name: 'user',
+            title:'',
+          },
+        ],
+        rightShow:false,
 			}
 		},
-		onLoad() {
-
+		onLoad(option) {
+      if(option?.foot_check){
+        this.footSelect(option.foot_check)
+      }
 		},
 		methods: {
+      footSelect(index){
+        this.current = index;
+        this.footCheck = this.footGroup[index].name;
+        this.title = this.footGroup[index].title;
+        this.rightShow = this.footCheck === 'home' || this.footCheck === 'user';
+      },
 			userLogin() {
 				uni.navigateTo({
 					url:'/pages/Login/index'
diff --git a/pages/OrderPage/index.vue b/pages/OrderPage/index.vue
index 74fc5af..2984f02 100644
--- a/pages/OrderPage/index.vue
+++ b/pages/OrderPage/index.vue
@@ -9,7 +9,7 @@
         <view class="addr-content">
           <view class="addr-content-main row" :style="{
           backgroundImage:'url('+staticImage.addrBg+')'
-          }">
+          }" @click="navTo('/pages/Addr/index?type=select')">
             <view class="main-img">
               <image mode="widthFix" class="img" :src="staticImage.addrAvatar"/>
             </view>
@@ -298,6 +298,11 @@
       this.getCardDetail();
 		},
 		methods: {
+      navTo(url){
+        uni.navigateTo({
+          url:url
+        })
+      },
       getCardDetail(){
         cardDetail({
           id:this.id
diff --git a/pages/Pet/index.vue b/pages/Pet/index.vue
index dce8384..b476d63 100644
--- a/pages/Pet/index.vue
+++ b/pages/Pet/index.vue
@@ -93,7 +93,7 @@
 		},
 		methods: {
       navTo(url){
-        wx.navigateTo({
+        uni.navigateTo({
           url:url
         })
       },
diff --git a/pages/UserCoupons/index.vue b/pages/UserCoupons/index.vue
index 09ae3b5..f8b484a 100644
--- a/pages/UserCoupons/index.vue
+++ b/pages/UserCoupons/index.vue
@@ -126,7 +126,7 @@
 		},
 		methods: {
       navTo(url){
-        wx.navigateTo({
+        uni.navigateTo({
           url:url
         })
       },