From 166955466a9f04f6cda49f9eef2610b5b2071242 Mon Sep 17 00:00:00 2001
From: chenlong <vip_chenlong@163.com>
Date: Thu, 14 Sep 2023 18:13:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A21?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/address.js                             |  6 ++---
 components/RightNav/index.vue              | 31 +++++++++++++++++-----
 pages/Addr/index.vue                       | 12 ++++++---
 pages/ChatDetail/index.vue                 | 11 ++++----
 pages/Index/components/OrderPage/index.vue |  2 +-
 pages/Index/components/UserPage/index.vue  |  8 +++---
 pages/Index/index.vue                      |  4 +--
 pages/UserOrderPage/index.vue              |  2 +-
 8 files changed, 49 insertions(+), 27 deletions(-)

diff --git a/api/address.js b/api/address.js
index d9875b9..ecd9fb6 100644
--- a/api/address.js
+++ b/api/address.js
@@ -16,15 +16,15 @@ export function getAddressList(data){
 
 /**
  * 删除地址
- * @param id
+ * @param ids
  * @returns {Promise | Promise<unknown>}
  */
-export function delAddress(id){
+export function delAddress(ids){
     return request({
         url:`${host}/user/address-del`,
         method: 'post',
         data:{
-            id
+            ids
         }
     });
 }
diff --git a/components/RightNav/index.vue b/components/RightNav/index.vue
index a642fbf..6a63bb8 100644
--- a/components/RightNav/index.vue
+++ b/components/RightNav/index.vue
@@ -1,11 +1,13 @@
 <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" v-for="(item,index) in buttonGroup" @click="handle(item.type)" :style="{backgroundImage:'url('+item.image+')'}"></view>
 	</view>
 </template>
 
 <script>
 	import { imghost } from '@/config/host.js'
+  import functions from "@/utils/functions";
+  import {getConfig} from "@/api/other";
 	export default{
 		data() {
 			return {
@@ -22,11 +24,12 @@
 						image:imghost+"/static/image/right-button-phone.png",
 						type:'phone'
 					},
-				]
+				],
+        kefu_phone:''
 			}
 		},
 		onLoad() {
-		
+
 		},
 		methods: {
       callPhone(phone){
@@ -38,11 +41,25 @@
 					switch (type) {
 						case 'chat':
 							uni.navigateTo({
-								url:"/pages/ChatDetail/index?id=" + 0
-							})
+								url:"/pages/ChatDetail/index?id=0"
+							});
+              break;
+            case 'wechat':
+              functions.success('跳转微信客服');
+              break;
+            default:
+              this.callPhone(this.kefu_phone)
 					}
-			}
-		}
+			},
+      getPhone(){
+        getConfig('kefu_phone').then(res => {
+          this.kefu_phone = res.data.kefu_phone;
+        })
+      }
+		},
+    created() {
+      this.getPhone();
+    },
 	}
 </script>
 
diff --git a/pages/Addr/index.vue b/pages/Addr/index.vue
index 5a86786..e2f0d08 100644
--- a/pages/Addr/index.vue
+++ b/pages/Addr/index.vue
@@ -33,7 +33,7 @@
 					<template v-slot:right>
 						<view class="addr-list-del-container">
 							<view class="addr-list-del-content">
-								<view class="addr-list-del" @click="delAddress(item)">
+								<view class="addr-list-del" @click="delAddress(item.id)">
 									<view class="addr-del-container">
 										<image class="img " :src="staticImage.addrDel" mode="aspectFit" />
 										<view class="addr-del-title">
@@ -144,6 +144,11 @@
       this.type = option.type||'lists'
 		},
 		onShow() {
+      this.pages = {
+        page: 1,
+        limit: 6,
+      };
+      this.status = 'loadmore';
 			this.getAddressList();
 		},
 		methods: {
@@ -254,8 +259,9 @@
 				functions.confirm("确认删除吗？").then(() => {
 					delAddress(id).then(data => {
 						functions.success("删除成功");
-						this.getAddressList();
-					})
+            console.log(id);
+            this.addrList = this.addrList.filter(v => v.id !== id);
+          })
 				})
 			}
 		},
diff --git a/pages/ChatDetail/index.vue b/pages/ChatDetail/index.vue
index 49323d0..66d4afd 100644
--- a/pages/ChatDetail/index.vue
+++ b/pages/ChatDetail/index.vue
@@ -1,5 +1,5 @@
 <template>
-	<HeaderNav title="2023.5.3订单" :is-back="true"></HeaderNav>
+	<HeaderNav :title="title" :is-back="true"></HeaderNav>
 	<view class="body-background" :style="{
 		backgroundImage:'url('+staticImage.wallpaperBgImage+')'
 		}"></view>
@@ -106,14 +106,15 @@
 			chat_id:0,
 			type:0,
 			user_id:0,
-			messageList:[]
+			messageList:[],
+      title:"在线咨询"
 		},
 		onLoad(options) {
-			this.getToken(options.id);
+			this.getToken(options.id, options.type ?? 1);
 		},
 		methods: {
-				getToken(order_id){
-					getToken(order_id, this.$store.state.userInfo.store_id ? 2 : 1).then(data => {
+				getToken(order_id, type){
+					getToken(order_id, type).then(data => {
 						this.chat_id = data.data.chat_id;
 						this.type = data.data.type;
 						this.user_id = data.data.user_id;
diff --git a/pages/Index/components/OrderPage/index.vue b/pages/Index/components/OrderPage/index.vue
index 0b20f13..cc75c6e 100644
--- a/pages/Index/components/OrderPage/index.vue
+++ b/pages/Index/components/OrderPage/index.vue
@@ -58,7 +58,7 @@
 								</view>
 							</view>
 							<view class="order-card-bottom col-12 row">
-								<view class="card-button" @click="navTo('/pages/ChatDetail/index?id=' + item.id)">
+								<view class="card-button" @click="navTo(`/pages/ChatDetail/index?id=${item.id}&type=2`)">
 									<MzButton
 											title="立即沟通"
 											font-color="#3E3221"
diff --git a/pages/Index/components/UserPage/index.vue b/pages/Index/components/UserPage/index.vue
index 4e7cf49..48ab358 100644
--- a/pages/Index/components/UserPage/index.vue
+++ b/pages/Index/components/UserPage/index.vue
@@ -48,17 +48,17 @@
 					<view class="user-button col-4" @click="navTo('/pages/Pet/index')">
 						<image class="img" :src="staticImage.information.pet" mode="aspectFit"/>
 						<view class="user-title">宝贝档案</view>
-						<view class="user-desc">{{ userExtends.pet_count }}个萌宠</view>
+						<view class="user-desc">{{ userExtends.pet_count ?? 0 }}个萌宠</view>
 					</view>
 					<view class="user-button col-4" @click="navTo('/pages/Addr/index')">
 						<image class="img" :src="staticImage.information.info" mode="aspectFit"/>
 						<view class="user-title">信息档案</view>
-						<view class="user-desc">{{ userExtends.address_count }}个地址</view>
+						<view class="user-desc">{{ userExtends.address_count ?? 0 }}个地址</view>
 					</view>
 					<view class="user-button col-4">
 						<image class="img" :src="staticImage.information.feed" mode="aspectFit"/>
 						<view class="user-title">喂养档案</view>
-						<view class="user-desc">{{ userExtends.feed_count }}个档案</view>
+						<view class="user-desc">{{ userExtends.feed_count ?? 0 }}个档案</view>
 					</view>
 				</view>
 			</view>
@@ -124,7 +124,7 @@
 				</view>
 				<view class="user-button-group row">
 					<view class="user-button col-3">
-						<image class="img" :src="staticImage.more.online" mode="aspectFit"/>
+						<image class="img" :src="staticImage.more.online" @click="navTo('/pages/ChatDetail/index?id=0')" mode="aspectFit"/>
 						<view class="user-title">在线沟通</view>
 					</view>
 					<view class="user-button col-3" @click="navTo('/pages/PrivacyPolicy/PrivacyPolicy')" >
diff --git a/pages/Index/index.vue b/pages/Index/index.vue
index ae6ecd5..0cf1a52 100644
--- a/pages/Index/index.vue
+++ b/pages/Index/index.vue
@@ -75,9 +75,7 @@
 			}
 		},
 		onLoad(option) {
-      if(option?.foot_check){
-        this.footSelect(option.foot_check);
-      }
+      this.footSelect(option?.foot_check ?? 0);
 		},
 		methods: {
       footSelect(index){
diff --git a/pages/UserOrderPage/index.vue b/pages/UserOrderPage/index.vue
index 59243d1..cb89e3e 100644
--- a/pages/UserOrderPage/index.vue
+++ b/pages/UserOrderPage/index.vue
@@ -63,7 +63,7 @@
 								</view>
 							</view>
 							<view class="order-card-bottom col-12 row">
-								<view class="card-button" @click="navTo('/pages/ChatDetail/index?id=' + item.id)">
+								<view class="card-button" @click="navTo(`/pages/ChatDetail/index?id=${item.id}`)">
 									<MzButton
 											title="立即沟通"
 											font-color="#3E3221"