feat:提交代码，修改反馈问题

src/apis/user.ts

@@ -128,7 +128,7 @@ enum API {
 	/**
 	 * 第三方账号接触绑定状态
 	 */
-	 UNBIND_ACCOUNT = 'api/user/unbindAccount',
+	 UNBIND_ACCOUNT = '/api/user/unbindAccount',
 
     /**
      * 邀请好友分享图片分类接口

src/pages/order-confirm/index.vue

@@ -202,9 +202,8 @@
 	function payment(createOrderData : CreateOrderRequest) {
 		uni.showLoading({
 			title: '加载中',
-			mask: false,
+			mask: true,
 		})
-
 		if (createOrderData.mer_id == '148') {
 			orderCreate(createOrderData).then((res) => {
 				if (res) {

src/pages/order/components/AllItemList.vue

@@ -143,7 +143,7 @@ onUnmounted(() => {
   <div class="p-3 flex flex-col">
     <div v-if="state.list.length > 0" class="flex flex-col gap-3">
       <div v-for="(orderItem, index) in state.list" :key="index">
-		  
+		  {{orderItem.source}}
        <OrderItem :receivegoods="0" :order-item="orderItem" v-if="orderItem.source == 7" />
 		<OtherOrderItem :item="orderItem" v-else />
       </div>

src/pages/order/components/OrderItem.vue

@@ -82,9 +82,26 @@ function getStatusText(orderItem: OrderListModel) {
 }
 
 function handleHeaderClick() {
-  uni.navigateTo({
-    url: `/subPages/pages/store/home/index?id=${props.orderItem.merchant.mer_id}`
-  })
+	let _item  = props.orderItem.merchant
+	
+	if(_item.mer_name=='复购区'){
+		uni.navigateTo({
+		  url: `/subPages/pages/quick-fuc/repurchase`
+		})
+	}else if(_item.mer_name=='会员专区'){
+		uni.navigateTo({
+		  url: `/subPages/pages/quick-fuc/vip`
+		})
+	}else if(_item.mer_name=='精彩生活'){
+		uni.navigateTo({
+		  url: `/subPages/pages/quick-fuc/life`
+		})
+	}else{
+		uni.navigateTo({
+			url: `/subPages/pages/quick-fuc/store?id=${_item.mer_id}&title=${_item.mer_name}`
+		})
+	}
+  
 }
 
 /**
@@ -216,13 +233,17 @@ function handleProductItemClick(
 
 function handeRefund(orderItem) {
   console.log('售后详情', orderItem);
-  uni.showToast({
-  	title:'请联系客服！'
-  })
-  // uni.navigateTo({
+  if(orderItem.merchant.mer_name!='会员专区'){
+	  uni.navigateTo({
+	    url: `/subPages/pages/refund/option?detail=${encodeBase64(orderItem)}&from=${props.tabValue}`
+	  })
+  }else {
+	 uni.showToast({
+	 	title:'请联系客服！',
+	 	icon:'none'
+	 }) 
+  }
 
-  //   url: `/subPages/pages/refund/option?detail=${encodeBase64(orderItem)}&from=${props.tabValue}`
-  // })
 }
 
 function handeDetail(orderItem: any) {

src/pages/order/components/RefundOrderItem.vue

@@ -72,9 +72,25 @@ function getStatusText(orderItem) {
 }
 
 function handleHeaderClick() {
-  uni.navigateTo({
-    url: `/subPages/pages/store/home/index?id=${props.orderItem.merchant.mer_id}`
-  })
+	
+	let _item  = props.orderItem.merchant
+	if(_item.mer_name=='复购区'){
+		uni.navigateTo({
+		  url: `/subPages/pages/quick-fuc/repurchase`
+		})
+	}else if(_item.mer_name=='会员专区'){
+		uni.navigateTo({
+		  url: `/subPages/pages/quick-fuc/vip`
+		})
+	}else if(_item.mer_name=='精彩生活'){
+		uni.navigateTo({
+		  url: `/subPages/pages/quick-fuc/life`
+		})
+	}else{
+		uni.navigateTo({
+			url: `/subPages/pages/quick-fuc/store?id=${_item.mer_id}&title=${_item.mer_name}`
+		})
+	}
 }
 
 /**

src/pages/third_party_binding/index.vue

@@ -6,7 +6,7 @@ import {getUpdateAccount} from "~/apis/auth.api";
 
 const zfbImage = CDN_URL + '/static/assets/zfb_sf_220908.png'
 const wxImage = CDN_URL + '/static/assets/wx_sf_220908.png'
-
+const defaultHeadImg = ref('https://cdn.bjtdba.com/vod/image/2025-01-20/20250120125206881.png')
 const bindState = ref([])
 import {useUserStore} from "~/stores/userStore";
 const userList=ref([])
@@ -19,15 +19,17 @@ onLoad(() => {
 
 function loadBindingState() {
   getBindingState().then(res => {
-     console.log('loadBindingState==',res)
     if (res) {
       bindState.value = res
-    }
+    }else{
+		bindState.value = []
+	}
+	console.log("===getBindingState",res);
   }).catch(error => {
-    uni.showToast({
-      title: error,
-      icon: 'none'
-    })
+    // uni.showToast({
+    //   title: error,
+    //   icon: 'none'
+    // })
   })
 }
 
@@ -41,7 +43,7 @@ function getBindState(type:any) {
 
 function updateAccount(type, info: {unionId: string, nickName: string, avatarUrl: string}) {
   uni.showLoading({
-    title: '绑定中',
+    title: '授权中',
     icon: 'none'
   })
   getUpdateAccount({
@@ -52,7 +54,7 @@ function updateAccount(type, info: {unionId: string, nickName: string, avatarUrl
     avater: info.avatarUrl
   }).then(res => {
       uni.showToast({
-        title: '绑定成功',
+        title: '授权成功',
         icon: "none"
       })
     loadBindingState()
@@ -108,6 +110,8 @@ function getUserInfo() {
         console.log(error)
       }
     });
+  }else{
+	  unbindAccount()
   }
 }
 
@@ -128,17 +132,17 @@ function getUserInfo() {
            @tap="getUserInfo"
            :class="getBindState('1') ? 'text-red' : 'text-gray border-gray'"
       >
-        {{ getBindState('1') ? '已授权' : '去授权' }}
+        {{ getBindState('1') ? '解除授权' : '去授权' }}
       </div>
 	
     </div>
 	<view class="item-line"></view>
 	
-	<view class="flex flex-col" v-for="(item,index) in userList">
+	<view class="flex flex-col" v-for="(item,index) in bindState">
 		<view class="user-info-content">
-				  <image class="user-icon" src="" mode="aspectFill"></image>
-				  <text class="user-nick-name">地方大师傅</text>
-				  <view class="un-bind-btn">解除绑定</view>
+				  <image class="user-icon" :src="item.avater?item.avater:defaultHeadImg" mode="aspectFill"></image>
+				  <text class="user-nick-name">{{item.nickname}}</text>
+				  <!-- <view class="un-bind-btn" @click="unbindAccount">解除绑定</view> -->
 		</view>
 		<view v-if="index !=userList.length-1" class="item-line"></view>
 	</view>

src/pages/user/index.vue

@@ -212,7 +212,7 @@
 			
 			 if (item.text === '幸福小店') {
 				uni.showToast({
-					title:'功能升级中',
+					title:'功能开发中',
 					icon:'none',
 				})
 				return

src/pages/user/login/index.vue

@@ -58,6 +58,7 @@ async function handleWexinLogin() {
 
   await uni.showLoading({
     title: '登录中',
+	mask:true,
   })
   uni.login({
     provider: 'weixin',
@@ -65,38 +66,22 @@ async function handleWexinLogin() {
       fullScreen: true,
     },
     success: (result) => {
-      // console.log(result)
       getUserUnionId({
         code: result.code,
         source: 'cxb',
       }).then((unionRes) => {
-        console.log(111111, unionRes)
-        // const shareId = Cache.get('SHARE_ID')
-        // 存储openid
-        // userStore.setOpenid(unionRes.openid)
         let redirectPageObj: { page: string; type: 'page' | 'tab' }
         if (Cache.get('SHARE_REDIRECT_PAGE'))
           redirectPageObj = JSON.parse(Cache.get('SHARE_REDIRECT_PAGE'))
-
-        // if (shareId) {
-        // params.share_id = shareId
-        // params = Object.assign({}, params, { shareId })
-        // }
         wechatCheck(unionRes.openid).then((checkRes) => {
           userStore.login(checkRes.token, checkRes.exp)
           userStore.setUID(checkRes.user.uid)
           userStore.setUserInfo(checkRes.user)
-          // console.log(checkRes)
-          uni.hideLoading()
-          console.log('我存在吗111', redirectPageObj)
           uni.showToast({
             title: '登录成功',
           }).then(() => {
             setTimeout(() => {
-              console.log('我存在吗222', redirectPageObj)
-
               if (redirectPageObj) {
-                console.log('我存在吗333', redirectPageObj)
                 if (redirectPageObj.type === 'page') {
                   return uni.reLaunch({
                     url: redirectPageObj.page,
@@ -109,8 +94,6 @@ async function handleWexinLogin() {
                 }
               }
               else {
-                console.log('我是key>>>aaa', state.key)
-
                 switch (state.key) {
                   case '10': {
                     uni.switchTab({

src/pages/user/login/other-phone.vue

@@ -51,6 +51,7 @@
 	import { getUserUnionId } from "~/apis/user";
 	const userStore = useUserStore()
 	const pageStore = usePageStoreWidthOut()
+	
 	const state = reactive({
 		phone: '',
 		code: '',
@@ -58,6 +59,7 @@
 		pwd: '',
 		isAuthVerify: false,
 		buttonText: '获取验证码',
+		isCanClick:true
 	})
 	const currentIndex = ref(0)
 	const showPage = ref(false)
@@ -173,11 +175,18 @@
 				icon: 'none'
 			})
 		}
-
+      if(!state.isCanClick){
+			return
+		}
+		state.isCanClick =false
 		let params = {
 			phone: state.phone,
 			password: state.pwd,
 		}
+		uni.showLoading({
+			title: '登录中',
+			mask:true,
+		});
 		authPwdLogin({
 			...params
 		}).then(authRes => {
@@ -217,6 +226,7 @@
 
 		}).catch((errorMsg) => {
 			console.log(errorMsg)
+			state.isCanClick =true
 			uni.showToast({
 				title: errorMsg,
 				icon: 'none'
@@ -224,8 +234,14 @@
 		})
 	}
 	function handleLogin() {
+		
+		if(!state.isCanClick){
+			return
+		}
+		state.isCanClick =false
 		uni.showLoading({
-			title: '登录中'
+			title: '登录中',
+			mask:true,
 		});
 		const shareId = Cache.get('SHARE_ID')
 
@@ -247,7 +263,6 @@
 			userStore.login(authRes.token, authRes.exp)
 			userStore.setUID(authRes.user.uid)
 			userStore.setUserInfo(authRes.user)
-			uni.hideLoading();
 			uni.showToast({
 				title: '登录成功',
 				icon: 'none'
@@ -277,9 +292,9 @@
 				}
 			}, 200)
 
-
 		}).catch((errorMsg) => {
-			console.log(errorMsg)
+			uni.hideLoading();
+			state.isCanClick =true
 			uni.showToast({
 				title: errorMsg,
 				icon: 'none'

src/subPages/pages/income/index.vue

@@ -33,10 +33,11 @@
 					<view class="item-in">
 						<text class="item-title">{{item.mark?item.mark:'推荐奖'}}</text>
 						<text class="item-des">{{item.title}}</text>
+						<text class="item-date" v-if="item.sett_time">结算时间:{{item.sett_time}}</text>
 						<text class="item-date">创建时间:{{item.create_time}}</text>
 					</view>
 					<view class="item-in">
-						<text :class="item.status==0?'item-des-x':'item-des'">{{item.status==0?'未结算':'已结算'}}</text>
+						<text :class="item.status==0?'item-des-x':'item-des'">{{item.status_name}}</text>
 						<text class="item-num">{{item.money}}</text>
 					</view>
 				</view>
@@ -123,6 +124,7 @@ style:
 		display: flex;
 		flex-direction: column;
 		min-height: 100VH;
+		padding-bottom: 40rpx;
 		background-color: #f8f8f8;
 		box-sizing: border-box;
 

src/subPages/pages/order/detail.vue

@@ -218,9 +218,21 @@ function handleRemindTheDelivery() {
 }
 
 function handeRefund() {
-  uni.navigateTo({
-    url: `/subPages/pages/refund/option?detail=${encodeBase64(detail.value)}`
-  })
+	uni.showToast({
+		title:'请联系客服！',
+		icon:'none'
+	})
+	if( detail.value.merchant.mer_name!='会员专区'){
+		 uni.navigateTo({
+		   url: `/subPages/pages/refund/option?detail=${encodeBase64(detail.value)}`
+		 })
+	}else {
+		 uni.showToast({
+		 	title:'请联系客服！',
+		 	icon:'none'
+		 }) 
+	}
+ 
 }
 
 function handleClipboard() {

src/subPages/pages/refund/detail.vue

@@ -30,6 +30,7 @@ function refundDetail(id: any) {
     console.log(res)
     state.detail = res
     // res.status = -1
+	console.log("===res.status",res.refund_status);
     //三步骤
     if (res.refund_type == 1) {
       if (res.status == 0) {
@@ -80,7 +81,6 @@ onShow(() => {
   if (state.refund_id) {
     refundDetail(state.refund_id)
     refundWlList(state.refund_id)
-
   }
 })
 const getStatusshow = computed(() => {
@@ -121,41 +121,45 @@ const getshowKd = computed(() => {
 const getStatusText = computed(() => {
   // 商家已处理
   // 退款成功， 系统已退款
-  if (state.detail.refund_status) {
-    const status = state.detail.refund_status
-    // const status = -1
-    //待审核
-    if (status == 0) {
-      return ['审核中', '售后申请已提交，请耐心等待']
-    }
-
-    // 待退货
-    if (status == 1) {
-      return ['待退货', '72小时内未寄回，将自动取消申请']
-    }
-    // 待收货
-    if (status == 2) {
-      return ['退货中', '商品已寄出，请等待商家处理']
-    }
-    // 已退款
-    if (status == 3 || status == 5) {
-      return ['退款成功', '退货服务已完成，如有疑问请联系商家']
-
-    }
-    // 超时
-    if (status == 6) {
-      return ['超时未发货，申请已取消', '因您超时未发货，申请已自动取消，若有问题请联系商家']
-
-    }
-    //退款失败
-    if (status == -1 && state.detail.refund_type == 1) {
-      return ['退款失败', '退款失败，请联系商家', '查看失败原因']
-    }
-    // 审核未通过
-    if (status == -1 && state.detail.refund_type == 2) {
-      return ['审核未通过', '您的售后申请未通过，若有问题请联系商家', '查看原因']
-
-    }
+  
+  console.log("=== state.detail.refund_status", state.detail.refund_status);
+  // if (state.detail.refund_status) {
+  
+  // }
+  const status = state?.detail?.refund_status
+  
+  // const status = -1
+  //待审核
+  if (status == 0) {
+    return ['审核中', '售后申请已提交，请耐心等待']
+  }
+  
+  // 待退货
+  if (status == 1) {
+    return ['待退货', '72小时内未寄回，将自动取消申请']
+  }
+  // 待收货
+  if (status == 2) {
+    return ['退货中', '商品已寄出，请等待商家处理']
+  }
+  // 已退款
+  if (status == 3 || status == 5) {
+    return ['退款成功', '退货服务已完成，如有疑问请联系商家']
+  
+  }
+  // 超时
+  if (status == 6) {
+    return ['超时未发货，申请已取消', '因您超时未发货，申请已自动取消，若有问题请联系商家']
+  
+  }
+  //退款失败
+  if (status == -1 && state.detail.refund_type == 1) {
+    return ['退款失败', '退款失败，请联系商家', '查看失败原因']
+  }
+  // 审核未通过
+  if (status == -1 && state.detail.refund_type == 2) {
+    return ['审核未通过', '您的售后申请未通过，若有问题请联系商家', '查看原因']
+  
   }
 
 })
@@ -287,12 +291,12 @@ const statustext = computed(() => {
 })
 </script>
 <template>
-  <div v-if="getStatusText != undefined">
+  <div  >
     <div class="px-3 pt-3 relative h-full"
       v-if="state.detail.refund_status == -1 || state.detail.refund_status == 4 || state.detail.refund_status == 6">
       <div class="bg-white  rounded-lg p-3 flex justify-center items-center ">
         <div class="w-full">
-          <div class="items-center">
+          <div class="items-center"  v-if="getStatusText">
             <div class="flex items-center font-bold gap-2 text-sm mb-3 w-full">
               <div class="flex-1 flex items-center gap-2 ">
                 <div class="line-clamp-1 text_font ">
@@ -313,7 +317,7 @@ const statustext = computed(() => {
       </div>
     </div>
     <div class="top-bg relative" v-else>
-      <div class="text-white p-3">
+      <div class="text-white p-3" v-if="getStatusText">
         <div class="text-md">{{ getStatusText[0] }}</div>
         <div class="text-[12px] text-gray-50">{{ getStatusText[1] }}</div>
       </div>
@@ -499,9 +503,9 @@ const statustext = computed(() => {
           <div class="flex items-center f-hairline-bottom  pb-3 px-3">
             <div class="flex items-center font-bold gap-2 text-sm w-full">
               <div class="flex-1 flex items-center gap-2 ">
-                <image :src="state.detail.merchant.mer_avatar" mode="widthFix" class="w-4 h-4"></image>
+                <image :src="state.detail?.merchant?.mer_avatar" mode="widthFix" class="w-4 h-4"></image>
                 <div class="line-clamp-1">
-                  {{ state.detail.merchant.mer_name }}
+                  {{ state.detail?.merchant?.mer_name }}
                 </div>
               </div>
 
@@ -559,26 +563,21 @@ const statustext = computed(() => {
               <div class="flex justify-between">
                 <div>订单编号</div>
                 <div class="flex gap-2">
-                  <div class="text-gray-400">{{ state.detail.order.order_sn }}</div>
+                  <div class="text-gray-400">{{ state.detail?.order?.order_sn }}</div>
                   <div @click="handleClipboard">复制</div>
                 </div>
               </div>
               <div class="flex justify-between">
                 <div>申请时间</div>
-                <div class="text-gray-400">{{ state.detail.create_time }}</div>
+                <div class="text-gray-400">{{ state.detail?.create_time }}</div>
               </div>
               <!-- <div class="flex justify-between">
                 <div>备注说明</div>
                 <div class="text-gray-400">{{ state.detail.mark ? state.detail.mark : '暂无说明' }}</div>
               </div> -->
-
             </div>
-
           </div>
-
         </div>
-
-
       </div>
     </div>
     <!-- 查看失效原因 -->