二维码+退款/售后

src/apis/model/myRelationProductModel.ts

@@ -23,4 +23,5 @@ export interface MyRelationProductModel {
     care_count: string
     // 原价（划线价格）
     ot_price: string
+    isSelected?:boolean
 }

src/apis/model/spreadInfoModel.ts

@@ -6,7 +6,7 @@ export interface SpreadInfoModel {
     yesterday_brokerage: number
     total_extract: number
     total_brokerage: number
-
+    member_brokerage_price:string
    // 佣金余额（可提现）
     brokerage_price: string
     now_money: string

src/apis/user.ts

@@ -98,6 +98,8 @@ enum API {
     USER_RELATION_PRODUCT_LIST = '/api/user/relation/product/lst',
     // 取消收藏
     USER_RELATION_DELETE = '/api/user/relation/delete',
+    // 批量取消收藏
+    BATCH_RELATION_DELETE = '/api/user/relation/batch/delete',
     // 我关注的店铺
     USER_RELATION_MERCHANT_LIST = '/api/user/relation/merchant/lst',
 
@@ -569,6 +571,18 @@ export function removeMyRelation(params: { type: number, type_id: string }) {
         }
     })
 }
+/**
+ * 批量取消我的收藏 user/relation/batch/delete
+ * @param type 1
+ */
+export function batchremoveMyRelation(params: { type: number, type_id:any[]}) {
+    return defHttp.post({
+        url: API.BATCH_RELATION_DELETE,
+        data: {
+            ...params
+        }
+    })
+}
 
 /**
  * 获取我的收藏
@@ -611,6 +625,21 @@ export function getApplicationWithdrawal(params: {
         }
     })
 }
+/**
+ * 提现申请
+ */
+export function getApplicationredWithdrawal(params: {
+    extract_price: string,
+    extract_type: string,
+    type:number
+}) {
+    return defHttp.post({
+        url: API.USER_EXTRACT_CREATE,
+        data: {
+            ...params
+        }
+    })
+}
 
 /**
  * 获取用户养老金信息

src/pages/immediate-withdrawal/index.vue

@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import {
+  getApplicationredWithdrawal,
   getApplicationWithdrawal,
   getBandAccountInfo,
   getUserSpreadInfo,
@@ -25,10 +26,20 @@ const yanglaojin = ref<UserYanglaoJinModel>()
 const widthdrawalConfig = ref({})
 
 const cashWithdrawalAmount = ref()
-
+const isshow = ref(0)
 const isDisabled = ref(true)
 const userBrokeragePrice = ref(0)
+const member_brokerage_price = ref(0)
 // userSpreadInfo.value.brokerage_price
+onLoad((options) => {
+  if (options && options.type) {
+    if (options.type == 1) {
+      isshow.value = 1
+    } else if (options.type == 2) {
+      isshow.value = 2
+    }
+  }
+})
 onShow(async () => {
   cashWithdrawalAmount.value = null
   getBandAccountInfo({ type: '1' }).then(res => {
@@ -72,6 +83,7 @@ onShow(async () => {
   await userStore.getUserInfo()
   // 佣金信息
   userSpreadInfo.value = await getUserSpreadInfo()
+  console.log(99999, userSpreadInfo.value);
 
   yanglaojin.value = await getUserYangLaoJin()
 
@@ -81,15 +93,29 @@ onShow(async () => {
   console.log(widthdrawalConfig.value)
   userBrokeragePrice.value = userSpreadInfo.value?.brokerage_price ? parseFloat(userSpreadInfo.value?.brokerage_price) : 0
   console.log(userBrokeragePrice.value)
+  member_brokerage_price.value = userSpreadInfo.value?.member_brokerage_price ? parseFloat(userSpreadInfo.value?.member_brokerage_price) : 0
+  console.log(member_brokerage_price.value)
   // if (userSpreadInfo.value?.brokerage_price) {
-  if (userBrokeragePrice.value < widthdrawalConfig.value.withdrawal_money) {
-    isDisabled.value = true
-    return uni.showToast({
-      title: '满' + widthdrawalConfig.value.withdrawal_money + '才可以提现~',
-      icon: 'none'
-    })
+  if (isshow.value == 1) {
+    if (userBrokeragePrice.value < widthdrawalConfig.value.withdrawal_money) {
+      isDisabled.value = true
+      return uni.showToast({
+        title: '满' + widthdrawalConfig.value.withdrawal_money + '才可以提现~',
+        icon: 'none'
+      })
+    }
+  } else if (isshow.value == 2) {
+
+    if (member_brokerage_price.value < widthdrawalConfig.value.withdrawal_money) {
+      isDisabled.value = true
+      return uni.showToast({
+        title: '满' + widthdrawalConfig.value.withdrawal_money + '才可以提现~',
+        icon: 'none'
+      })
+    }
   }
 
+
   // }
 })
 
@@ -113,24 +139,27 @@ function Tochecked() {
   if (iswxshow.value == true) {
     Accountbind({ openid: userStore.openid, wx_type: '1' }).then(resg => {
       console.log('我是resg', resg);
+      setTimeout(() => {
+        uni.showToast({
+          title: '绑定成功',
+          icon: 'none'
+        })
+      }, 300)
 
-      uni.showToast({
-        title: '绑定成功',
-        icon: 'none'
-      })
       iswxshow.value = true
     }).catch((error) => {
-      uni.showToast({
-        title: error,
-        icon: 'none'
-      })
-      if(error=='此微信已绑定其他账户'){
-        iswxshow.value=false
-      }
+      setTimeout(() => {
+        uni.showToast({
+          title: error,
+          icon: 'none'
+        })
+      }, 300)
+
+      iswxshow.value = false
     })
-  }else{
+  } else {
     console.log(111);
-    
+
   }
 }
 
@@ -140,21 +169,33 @@ function Tochecked() {
 
 function handleInputAll() {
   // console.log(userSpreadInfo.value?.brokerage_price)
-  if (userSpreadInfo.value && userSpreadInfo.value.brokerage_price && userSpreadInfo.value?.brokerage_price >= widthdrawalConfig.value.withdrawal_money) {
-    cashWithdrawalAmount.value = userSpreadInfo.value.brokerage_price
-  } else {
-    uni.showToast({
-      title: '可用余额太少，未满足提现要求',
-      icon: 'none'
-    })
+  if (isshow.value == 1) {
+    if (userSpreadInfo.value && userSpreadInfo.value.brokerage_price && userSpreadInfo.value?.brokerage_price >= widthdrawalConfig.value.withdrawal_money) {
+      cashWithdrawalAmount.value = userSpreadInfo.value.brokerage_price
+    } else {
+      uni.showToast({
+        title: '可用余额太少，未满足提现要求',
+        icon: 'none'
+      })
+    }
+  } else if (isshow.value == 2) {
+    if (userSpreadInfo.value && userSpreadInfo.value.member_brokerage_price && userSpreadInfo.value?.member_brokerage_price >= widthdrawalConfig.value.withdrawal_money) {
+      cashWithdrawalAmount.value = userSpreadInfo.value.member_brokerage_price
+    } else {
+      uni.showToast({
+        title: '可用余额太少，未满足提现要求',
+        icon: 'none'
+      })
+    }
   }
+
 }
 
 /**
  * 立即提现
  */
 function handleImmediateWithdrawal() {
-  
+
   if (isDisabled.value) {
     return
   }
@@ -213,7 +254,7 @@ function handleImmediateWithdrawal() {
     })
   }
 
-  if(iswxshow.value==false){
+  if (iswxshow.value == false) {
     uni.showToast({
       title: '请先勾选提现方式',
       icon: 'none'
@@ -243,6 +284,99 @@ function handleImmediateWithdrawal() {
   // if (yanglaojin.value) {
   // }
 }
+/**
+ * 立即提现
+ */
+function handleImmediateredWithdrawal() {
+
+  if (isDisabled.value) {
+    return
+  }
+  if (widthdrawalConfig.value.withdrawal_status == '0') {
+    isDisabled.value = true
+    return uni.showToast({
+      title: '提现功能关闭',
+      icon: 'none'
+    })
+  }
+  if (widthdrawalConfig.value.withdrawal_wchat == '0') {
+    isDisabled.value = true
+
+    return uni.showToast({
+      title: '微信提现功能关闭',
+      icon: 'none'
+    })
+  }
+
+  // 1.用户可提现余额≤最低提现额
+  if (member_brokerage_price.value < widthdrawalConfig.value.withdrawal_money) {
+    return uni.showToast({
+      title: '满' + widthdrawalConfig.value.withdrawal_money + '才可以提现~',
+      icon: 'none'
+    })
+  }
+
+  // 2 当输入金额≤可提现余额＜最低提现额度
+  if (Number.parseFloat(cashWithdrawalAmount.value) <= Number.parseFloat(member_brokerage_price.value) && Number.parseFloat(cashWithdrawalAmount.value) < widthdrawalConfig.value.withdrawal_money) {
+    // 1 判断是否需要实名
+    if (!yanglaojin.value?.is_certification == 1) {
+      return uni.navigateTo({
+        url: '/pages/real-name-authentication/index'
+      })
+    }
+
+    return uni.showToast({
+      title: '满' + widthdrawalConfig.value.withdrawal_money + '才可以提现~',
+      icon: 'none'
+    })
+  }
+
+  // 当输入金额＞可提现余额且输入金额≥最低提现额度
+  if ((Number.parseFloat(cashWithdrawalAmount.value) > Number.parseFloat(member_brokerage_price.value)) && (Number.parseFloat(cashWithdrawalAmount.value) >= widthdrawalConfig.value.withdrawal_money)) {
+    // 1 判断是否需要实名
+    if (!yanglaojin.value?.is_certification == 1) {
+      return uni.navigateTo({
+        url: '/pages/real-name-authentication/index'
+      })
+    }
+
+
+    return uni.showToast({
+      title: '输入金额超过可提现余额',
+      icon: 'none'
+    })
+  }
+
+  if (iswxshow.value == false) {
+    uni.showToast({
+      title: '请先勾选提现方式',
+      icon: 'none'
+    })
+    return
+  }
+
+  getApplicationredWithdrawal({ extract_price: cashWithdrawalAmount.value, extract_type: "1", type: 2 }).then(res => {
+
+    uni.showToast({
+      title: '提现已申请',
+      icon: 'none'
+    })
+    setTimeout(() => {
+      uni.navigateTo({
+        url: '/pages/withdrawal-record/index'
+      })
+    }, 300)
+  }).catch(error => {
+    uni.showToast({
+      title: error,
+      icon: 'none'
+    })
+  })
+
+
+  // if (yanglaojin.value) {
+  // }
+}
 
 function handleWithdrawalRecord() {
   uni.navigateTo({
@@ -257,7 +391,8 @@ function handleShowAgreement(type) {
 }
 </script>
 <template>
-  <div class="p-3 flex flex-col gap-3">
+  <!-- 佣金提现 -->
+  <div class="p-3 flex flex-col gap-3" v-if="isshow == 1">
     <div class="flex justify-end">
       <div class=" text-sm" @tap="handleWithdrawalRecord">提现记录</div>
     </div>
@@ -294,8 +429,8 @@ function handleShowAgreement(type) {
             <div>微信</div>
           </div>
           <div>
-            <radio :checked="true" v-if="iswxshow==true" />
-            <radio :checked="false"  v-if="iswxshow==false" @click="Tochecked"  />
+            <radio :checked="true" v-if="iswxshow == true" />
+            <radio :checked="false" v-if="iswxshow == false" @click="Tochecked" />
           </div>
         </div>
 
@@ -321,9 +456,79 @@ function handleShowAgreement(type) {
 
       <div class="flex flex-col text-sm text-gray leading-8 py-4">
         <div>详细说明</div>
-        <div>平台服务费 {{ withdrawalCal.service }}</div>
-        <div>本次提取将扣除服务费 ¥{{ withdrawalCal.service_money }}</div>
-        <div>本次提取实际到账额度 ¥{{ withdrawalCal.money }}</div>
+        <div>平台服务费 {{ cashWithdrawalAmount ? withdrawalCal.service : '0' }}</div>
+        <div>本次提取将扣除服务费 ¥{{ cashWithdrawalAmount ? withdrawalCal.service_money : '0.00' }}</div>
+        <div>本次提取实际到账额度 ¥{{ cashWithdrawalAmount ? withdrawalCal.money : '0.00' }}</div>
+      </div>
+
+    </div>
+
+  </div>
+  <!-- 红积分提现 -->
+  <div class="p-3 flex flex-col gap-3" v-if="isshow == 2">
+    <div class="bg-white rounded-lg text-sm p-3 flex flex-col gap-4">
+      <div class="flex justify-between">
+        <div class="font-bold">提现金额</div>
+        <div class="text-xs text-gray" @click="handleShowAgreement(6)">提现规则</div>
+      </div>
+      <div class="flex justify-center items-center pt-4 f-hairline-bottom">
+        <div class="text-lg font-bold">￥</div>
+        <div class="flex-1">
+          <input placeholder="请输入金额" class="w-full" type="digit" v-model="cashWithdrawalAmount" />
+        </div>
+        <div class="text-xs text-red" @click="handleInputAll">全部提现</div>
+      </div>
+      <div class="flex text-gray items-center gap-3 text-sm">
+        <div v-if="userSpreadInfo">
+          可用余额￥：{{ userStore.userInfo.member_brokerage_price }}
+        </div>
+        <div v-if="userStore.userInfo">
+          可用红积分：{{ parseFloat(Number(userStore.userInfo.red)).toFixed(2).replace(/\.?0+$/, '') }}
+        </div>
+      </div>
+
+    </div>
+    <div class="bg-white rounded-lg text-sm p-3 flex flex-col">
+      <div class="flex f-hairline-bottom font-bold text-sm pb-2">
+        提现至
+      </div>
+      <div>
+        <div class="flex items-center justify-between py-3">
+          <div class="flex items-center gap-2">
+            <image :src="wx_logoImage" mode="widthFix" class="w-8 h-8"></image>
+            <div>微信</div>
+          </div>
+          <div>
+            <radio :checked="true" v-if="iswxshow == true" />
+            <radio :checked="false" v-if="iswxshow == false" @click="Tochecked" />
+          </div>
+        </div>
+
+        <!--        <div class="flex items-center justify-between py-3">-->
+        <!--          <div class="flex items-center gap-2">-->
+        <!--            <image :src="zfb_logoImage" mode="widthFix" class="w-8 h-8"></image>-->
+        <!--            <div>支付宝支付</div>-->
+        <!--            </div>-->
+        <!--            <div>-->
+        <!--              <radio />-->
+        <!--            </div>-->
+        <!--          </div>-->
+      </div>
+    </div>
+
+    <div class="flex flex-col">
+      <div class=" flex rounded-full bg-red-300">
+        <nut-button type="primary" block :disabled="isDisabled" :class="isDisabled && 'bg-gray-800'"
+          @tap="handleImmediateredWithdrawal">
+          立即提现
+        </nut-button>
+      </div>
+
+      <div class="flex flex-col text-sm text-gray leading-8 py-4">
+        <div>详细说明</div>
+        <div>平台服务费 {{ cashWithdrawalAmount ? withdrawalCal.service : '0' }}</div>
+        <div>本次提取将扣除服务费 ¥{{ cashWithdrawalAmount ? withdrawalCal.service_money : '0.00' }}</div>
+        <div>本次提取实际到账额度 ¥{{ cashWithdrawalAmount ? withdrawalCal.money : '0.00' }}</div>
       </div>
 
     </div>

src/pages/my-invitation/index.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import FCellGroup from "~/components/FCellGroup/FCellGroup.vue";
 import FCell from "~/components/FCell/FCell.vue";
-import {getAgentInfo, getSelectUserInviteProfit, getUserUnionId} from "~/apis/user";
+import { getAgentInfo, getSelectUserInviteProfit, getUserUnionId } from "~/apis/user";
 const userStore = useUserStore()
 const list = [{
   title: '邀请伙伴',
@@ -16,9 +16,6 @@ const list = [{
   title: '累计收益',
   url: '/pages/accumulate-income/index'
 }, {
-  title: '去提现',
-  url: '/pages/immediate-withdrawal/index'
-},{
   title: '支付平台绑定',
   url: '/pages/third_party_binding/index'
 }]
@@ -33,15 +30,15 @@ const data = ref({
   // state.extract = res.extract
   nickname: '',
   avatar: '',
-  brokerage_price: '' ,
-  yesterday: '' ,
-  cumulative: '' ,
+  brokerage_price: '',
+  yesterday: '',
+  cumulative: '',
   extract: ''
 })
 
 const userInviteProfit = reactive({
   numberSun: '',
-  UserUnsettledInviteProfit: '' ,
+  UserUnsettledInviteProfit: '',
   UserYesterdayInviteProfit: ''
 })
 onLoad(() => {
@@ -90,6 +87,37 @@ function handleClick(item: { url: string, title: string }) {
   })
 }
 
+function handleClickTomo() {
+  if (userStore.userInfo.is_ertification == 1) {
+    uni.navigateTo({
+      url: '/pages/immediate-withdrawal/index?type=1'
+    })
+  } else {
+    setTimeout(() => {
+      uni.showModal({
+        title: '温馨提示',
+        content: '实名认证后才可提现',
+        cancelText: "取消", // 取消按钮的文字
+        confirmText: "去认证", // 确认按钮的文字
+        showCancel: true, // 是否显示取消按钮，默认为 true
+        confirmColor: '#f55850',
+        success: (res) => {
+          if (res.confirm) {
+            console.log('comfirm') //点击确定之后执行的代码
+            setTimeout(() => {
+              uni.navigateTo({
+                url: '/pages/real-name-authentication/index'
+              })
+            }, 300);
+          } else {
+            console.log('cancel') //点击取消之后执行的代码
+          }
+        }
+      })
+    }, 300);
+  }
+}
+
 function handleShowAgreement() {
   uni.navigateTo({
     url: '/pages/webview/agreement?type=6'
@@ -104,7 +132,7 @@ function handleShowAgreement() {
       <div class="text-sm">规则</div>
     </div>
     <div class="bg-white rounded-lg p-4 flex flex-col gap-4 ">
-      <div class="flex justify-around">
+      <div class="flex justify-between">
         <div class="flex flex-col justify-center items-center gap-2">
           <div class="text-xs text-gray">
             当前收益（元）
@@ -112,21 +140,22 @@ function handleShowAgreement() {
           <div class="font-bold text-[28px]">
             {{ data.brokerage_price ? data.brokerage_price : '0.00' }}
           </div>
+          <div class="text-xs text-gray">昨日收益 <span class="text-red">+ {{ data.yesterday }}</span></div>
         </div>
-        <div class="flex flex-col justify-center items-center gap-2">
-          <div class="text-xs text-gray">
-            未结算（元）
-          </div>
-          <div class="font-bold text-[28px]">
-            {{ userInviteProfit.UserUnsettledInviteProfit ? userInviteProfit.UserUnsettledInviteProfit : '0.00' }}
-          </div>
+        <div  class="flex flex-col justify-center items-center gap-2">
+          <div @click="handleClickTomo" class="text_qtx">去提现</div>
         </div>
       </div>
       <div class="flex justify-around">
         <div class="flex-1 flex flex-col justify-center items-center gap-2">
-          <div class="text-xs text-gray">昨日收益（元）</div>
-          <div class="font-bold text-red">{{ data.yesterday }}</div>
+          <div class="text-xs text-gray">未结算（元）</div>
+          <div class="font-bold text-red">{{ userInviteProfit.UserUnsettledInviteProfit ?
+            userInviteProfit.UserUnsettledInviteProfit : '0.00' }}</div>
         </div>
+        <!-- {
+                title: '去提现',
+                  url: '/pages/immediate-withdrawal/index?type=1'
+        },-->
 
         <div class="flex-1 flex flex-col justify-center items-center gap-2">
           <div class="text-xs text-gray">累计收益（元）</div>
@@ -143,7 +172,8 @@ function handleShowAgreement() {
 
     <div class="bg-white  ">
       <FCellGroup divider arrow :ex-class="['rounded-xl']">
-        <FCell v-for="(item, index) in list" :key="index" :title="item.title" exClass="text-sm font-bold" @click="handleClick(item)"/>
+        <FCell v-for="(item, index) in list" :key="index" :title="item.title" exClass="text-sm font-bold"
+          @click="handleClick(item)" />
       </FCellGroup>
     </div>
 
@@ -155,6 +185,19 @@ page {
   background: #f8f8f8;
   overflow: hidden;
 }
+
+.text_qtx {
+  width: 168rpx;
+  height: 63rpx;
+  background: linear-gradient(179deg, #FE7577 0%, #FE0032 100%);
+  border-radius: 32rpx;
+  line-height: 63rpx;
+  font-size: 28rpx;
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 500;
+  color: #FFFFFF;
+  text-align: center;
+}
 </style>
 <route lang="yaml">
 style:

src/pages/my-rules/index.vue

@@ -242,14 +242,15 @@ function handleToVipPage() {
 }
 
 
-//弹框展示
-function openPopup() {
-  showValue.value = true
-}
+
 //关闭弹框
-const onCancel = () => {
+function onCancel() {
   // show.value = false
+
+  // console.log(showValue.value);
+
   showValue.value = false
+  // console.log(showValue.value);
 }
 
 
@@ -261,7 +262,7 @@ const onCancel = () => {
       <div class="">
         <!-- 头像 -->
         <div class="flex gap-2 mb-2 px-3 mb-6">
-          <image v-if="userStore.userInfo && userStore.userInfo.avatar" :src="userStore.userInfo.avatar" 
+          <image v-if="userStore.userInfo && userStore.userInfo.avatar" :src="userStore.userInfo.avatar"
             class=" rounded-full" style="width: 102rpx; height: 102rpx;"></image>
 
           <div class="flex">
@@ -339,7 +340,8 @@ const onCancel = () => {
 
       </div>
       <div class="px-4 p_abls " style="border-radius: 16rpx; background: #f8f3f3;">
-        <div v-if="ruleDetail && ruleDetail.content" class="p-3 bg-white text-sm text-gray-500" style="border-radius: 16rpx;" >
+        <div v-if="ruleDetail && ruleDetail.content" class="p-3 bg-white text-sm text-gray-500"
+          style="border-radius: 16rpx;">
           <mpHtml :content="ruleDetail.content"></mpHtml>
         </div>
         <div class="text_more px-3 bg-white text-sm flex flex-col" style="margin-top: 26rpx; padding-top: 40rpx;"
@@ -361,12 +363,14 @@ const onCancel = () => {
           </div>
         </div>
       </div>
-      <FPopup v-if="nextRuleDetail && nextRuleDetail.content" v-model:show="showValue" @close="onCancel" position="bottom"
+      <FPopup v-if="showValue==true" v-model:show="showValue" @close="onCancel" position="bottom"
         exClass="rounded-rt-xl rounded-lt-xl  min-h-[55%] max-h-[70%] h-full">
-        <div class="flex flex-col flex-1 justify-between px-3 h-full ">
+        <div v-if="nextRuleDetail && nextRuleDetail.content" class="flex flex-col flex-1 justify-between px-3 h-full ">
           <div>
             <div class="pt-2 pr-1 flex justify-end flex-1">
-              <div @click="onCancel">✕</div>
+              <div style=" text-align: center; width: 42rpx; height: 42rpx;" @click="onCancel">
+                <image style="width: 100%; height: 100%" src="../../static/icon/guanbi.png"></image>
+              </div>
             </div>
             <div class="mt-6" v-html="nextRuleDetail.content"></div>
           </div>

src/pages/order/components/AllItemList.vue

@@ -126,7 +126,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 :order-item="orderItem" v-if="orderItem.source == 7" />
+        <OrderItem :receivegoods="0" :order-item="orderItem" v-if="orderItem.source == 7" />
         <OtherOrderItem :item="orderItem" v-else />
       </div>
       <div class=" flex justify-center items-center text-[12px] text-gray-500" v-if="state.list && state.list.length > 0">

src/pages/order/components/Order3List.vue

@@ -105,7 +105,7 @@ onUnload(() => {
   <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 :order-item="orderItem" />
+        <OrderItem :receivegoods="3" :order-item="orderItem" />
         <!--        <OtherOrderItem :item="orderItem" v-else/>-->
       </div>
       <div class=" flex justify-center items-center text-[12px] text-gray-500"

src/pages/order/components/OrderItem.vue

@@ -23,6 +23,10 @@ const props = defineProps({
   tabValue: {
     type: Number,
     default: 0
+  },
+  receivegoods: {
+    type: Number,
+    default: 0
   }
 
 })
@@ -128,7 +132,7 @@ function handlePayment() {
 }
 
 function handleShowOrderDetail(order) {
-  console.log(111212121,order)
+  console.log(111212121, order)
   uni.navigateTo({
     url: '/pages/order/detail?detail=' + `${encodeBase64(order)}`
   })
@@ -167,10 +171,19 @@ function handleTakeOrder(orderItem) {
       if (res.confirm) {
         takeOrder(orderItem.order_id).then(res => {
           // console.log(res)
+          
           uni.showToast({
             title: '确认收货成功'
           })
-          uni.$emit('orderTakeFromList')
+          if(props.receivegoods==0){
+            console.log('全部订单');
+            
+            uni.$emit('AllreloadList')
+          }else if(props.receivegoods==3){
+            console.log('待收货订单');
+            uni.$emit('onTab3PullDownRefresh')
+          }
+          
 
         }).catch(error => {
           uni.showToast({
@@ -435,7 +448,12 @@ function handleShowDetail(orderItem: any) {
 
         <div class="flex justify-end gap-2" v-if="orderItem.status == 1">
           <nut-button size="small" plain type="default" @tap.stop="handleShowLogistics(orderItem)">查看物流</nut-button>
-          <nut-button size="small" plain type="default" @tap.stop="handeRefund(orderItem)">申请售后</nut-button>
+          <div v-if="orderItem.refund_order_id">
+            <nut-button size="small" plain type="default" @tap.stop="handeDetail(orderItem)">售后详情</nut-button>
+          </div>
+          <div v-else>
+            <nut-button size="small" plain type="default" @tap.stop="handeRefund(orderItem)">申请售后</nut-button>
+          </div>
 
           <nut-button size="small" plain type="primary" @tap.stop="handleTakeOrder(orderItem)">确认收货</nut-button>
 

src/pages/order/components/RefundOrderItem.vue

@@ -42,6 +42,8 @@ function getStatusText(orderItem) {
   // }
   // switch (orderItem.status) {
   // }
+  console.log(orderItem);
+  
   if (orderItem.status == -1 && orderItem.refund_type == 2) {
     // return '退款失败'
     return '审核未通过'
@@ -57,10 +59,10 @@ function getStatusText(orderItem) {
   }
   if (orderItem.status == 1) {
     // return '待退货'
-    return '审核中'
+    return '待退货'
   }
   if (orderItem.status == 2) {
-    return '审核中'
+    return '退货中'
     // return '待收货'
   }
   if (orderItem.status == 3) {

src/pages/red-integral/index.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { useUserStore } from "~/stores/userStore";
-import { CDM_URL,CDN_URL } from "~/config/app";
+import { CDM_URL, CDN_URL } from "~/config/app";
 import { encodePhone } from "../../utils";
 import CXBBasePage from "~/components/CXBBasePage/CXBBasePage.vue";
 import { getRedIntegralList, getBillIntegralList } from "~/apis/user";
@@ -54,9 +54,35 @@ function handleToVipPage() {
 }
 
 function handleImmediateWithdrawal() {
-  uni.navigateTo({
-    url: '/pages/immediate-withdrawal/index'
-  })
+  if (userStore.userInfo.is_ertification == 1) {
+    uni.navigateTo({
+      url: '/pages/immediate-withdrawal/index?type=2'
+    })
+  }else{
+    setTimeout(() => {
+        uni.showModal({
+          title: '温馨提示',
+          content: '实名认证后才可提现',
+          cancelText: "取消", // 取消按钮的文字
+          confirmText: "去认证", // 确认按钮的文字
+          showCancel: true, // 是否显示取消按钮，默认为 true
+          confirmColor: '#f55850',
+          success: (res) => {
+            if (res.confirm) {
+              console.log('comfirm') //点击确定之后执行的代码
+              setTimeout(() => {
+                uni.navigateTo({
+                  url: '/pages/real-name-authentication/index'
+                })
+              }, 300);
+            } else {
+              console.log('cancel') //点击取消之后执行的代码
+            }
+          }
+        })
+      }, 300);
+  }
+
 }
 </script>
 
@@ -147,7 +173,7 @@ function handleImmediateWithdrawal() {
     </div>
     <div class="flex p_hjf flex-col justify-center ">
       <div class="text_hjf">红积分</div>
-      <div class="hjf_num">{{ userStore.userInfo.red }}</div>
+      <div class="hjf_num">{{ parseFloat(Number(userStore.userInfo.red)).toFixed(2).replace(/\.?0+$/, '') }}</div>
     </div>
     <div @click="handleToVipPage" class="flex p_add justify-center">
       <div class="text_add">复购增加红积分</div>

src/pages/refund/index.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import {refundList} from "~/apis/order.api";
+import { refundList } from "~/apis/order.api";
 import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
 import RefundOrderItem from "~/pages/order/components/RefundOrderItem.vue";
 import FNavBar from "~/components/FNavBar/FNavBar.vue";
@@ -27,7 +27,7 @@ onLoad((options) => {
 })
 
 
-function loadList(action: 'page' | 'reload',  callback?: (items) => void) {
+function loadList(action: 'page' | 'reload', callback?: (items) => void) {
   if (action == 'reload') {
     state.list = []
   }
@@ -68,8 +68,16 @@ onReachBottom(() => {
   handleScrollToLower()
 
 })
+onPullDownRefresh(() => {
+   uni.showLoading({
+    title: '加载中'
+  })
+  loadList('reload');
+  uni.hideLoading()
+  uni.stopPullDownRefresh();
+})
 // watch(() => state.t)
-function handleTabChange(	{title,paneKey,disabled}) {
+function handleTabChange({ title, paneKey, disabled }) {
 
   console.log(paneKey)
   if (paneKey == 0) {
@@ -101,44 +109,42 @@ function onClickLeft() {
 }
 </script>
 <template>
-  <FNavBar
-      title="我的订单" :left-arrow="true" fixed placeholder z-index="999"
-      ex-class="bg-white w-screen"
-      @click-left="onClickLeft"
-  />
-  <div class="fixed top-18 bg-white w-screen z-2">
-    <nut-tabs v-model="state.tabvalue" class="bg-white" @change="handleTabChange">
-      <nut-tab-pane title="全部"></nut-tab-pane>
-      <nut-tab-pane title="处理中"></nut-tab-pane>
-      <nut-tab-pane title="已完成"></nut-tab-pane>
-    </nut-tabs>
-  </div>
-  <div v-if="state.list.length > 0" class="mt-30 flex flex-col p-3">
-    <div v-for="(orderItem, index) in state.list" :key="index">
-      <RefundOrderItem :order-item="orderItem"/>
+  <div class="bg-white">
+    <FNavBar title="我的订单" :left-arrow="true" fixed placeholder z-index="999" ex-class="bg-white w-screen"
+      @click-left="onClickLeft" />
+    <div class="fixed top-18 bg-white w-screen z-2">
+      <nut-tabs v-model="state.tabvalue" class="bg-white" @change="handleTabChange">
+        <nut-tab-pane title="全部"></nut-tab-pane>
+        <nut-tab-pane title="处理中"></nut-tab-pane>
+        <nut-tab-pane title="已完成"></nut-tab-pane>
+      </nut-tabs>
     </div>
-    <div class=" flex justify-center items-center text-[12px] text-gray-500" >
-      <div v-if="state.status === 'loading'">
-        加载中...
+    <div v-if="state.list.length > 0" class="mt-30 flex flex-col p-3" style="background-color: #f8f8f8;">
+      <div v-for="(orderItem, index) in state.list" :key="index">
+        <RefundOrderItem :order-item="orderItem" />
       </div>
-      <div v-if="state.status === 'noMore'">
-        没有更多了～
+      <div class=" flex justify-center items-center text-[12px] text-gray-500">
+        <div v-if="state.status === 'loading'">
+          加载中...
+        </div>
+        <div v-if="state.status === 'noMore'">
+          没有更多了～
+        </div>
       </div>
     </div>
+    <div class="flex h-full flex-col pt-50" v-else>
+      <CXBEmpty />
+    </div>
   </div>
-  <div class="flex h-full flex-col pt-50" v-else>
-    <CXBEmpty />
-  </div>
-
 </template>
 <route lang="yaml">
 style:
   navigationBarTitleText: 退款/售后
   navigationStyle: custom
-
+  enablePullDownRefresh: true
 </route>
 
-<style>
+<style  >
 page {
   background: #f8f8f8;
 }
@@ -150,6 +156,4 @@ page {
 .nut-tab-pane {
   display: none !important;
 }
-
-
 </style>

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

@@ -39,11 +39,21 @@ const userStore = useUserStore()
 const state = reactive({
   phone: '',
   code: '',
-
+  spread: '',
   isAuthVerify: false,
   buttonText: '获取验证码',
 })
-
+onLoad((options: any) => {
+  console.log(options);
+  if (options.scene) {
+    let queryString = decodeURIComponent(options.scene)
+    console.log(queryString);
+    
+    // 将字符串按 '&' 分割成数组
+    state.spread = queryString.split('=')[1];
+    console.log(state.spread);
+  }
+})
 function sendCode() {
   if (state.isAuthVerify) return
   // if (this.disabled) return;
@@ -128,6 +138,9 @@ function handleLogin() {
   if (shareId && shareId !== '') {
     params.share_id = shareId
   }
+  if(state.spread&&state.spread!==''&&state.spread!='0'){
+    params.spread=state.spread
+  }
   authSmsLogin({
     ...params
   }).then(authRes => {