v3.3.0大概ok

src/pages/home/index.vue

@@ -500,7 +500,7 @@ page {
   left: 50%;
   margin-left: -65rpx;
   z-index: 2;
-  width: 129rpx;
+  min-width: 129rpx;
   height: 38rpx;
 }
 
@@ -508,7 +508,7 @@ page {
   height: 38rpx;
   line-height: 38rpx;
   margin-left: 42rpx;
-  font-size: 26rpx;
+  font-size: 20rpx;
   font-family: PingFangSC, PingFang SC;
   font-weight: 500;
   color: #FFFFFF;

src/pages/order-confirm/index.vue

@@ -350,8 +350,8 @@ function reTotal() {
 
                 </div>
                 <div class="flex justify-between ">
-                  <FPrice :price="orderProductItem.productAttr.price" v-if="item.mer_id != '148'"></FPrice>
-                  <FPrice :price="orderProductItem.productAttr.price * 30" v-if="item.mer_id == '148'"  symbol="积分" position="after"></FPrice>
+                  <div  v-if="item.mer_id != '148'" style="color:#fa4032" >￥{{ orderProductItem.productAttr.price }}</div>
+                  <div  v-if="item.mer_id == '148'" style="color:#fa4032">{{ orderProductItem.productAttr.price * 30 }}积分</div>
                   <nut-input-number v-model="orderProductItem.cart_num" @change="(num) => handleNumberChange(num, orderProductItem)"/>
 
                 </div>
@@ -396,8 +396,8 @@ function reTotal() {
       <div class="flex justify-between items-center p-3">
         <div class="flex-1 flex text-sm font-bold">
           应付金额：
-          <FPrice v-if="data.type && data.type == '3'" :price="data.totalPrice * 30" symbol="积分" position="after"></FPrice>
-         <FPrice  v-else :price="data.totalPrice"></FPrice>
+          <div style="color:#fa4032" v-if="data.type && data.type == '3'" >{{ data.totalPrice * 30 }}积分</div>
+         <div style="color:#fa4032"  v-else >￥{{data.totalPrice}}</div>
         </div>
         <div class="flex">
           <nut-button type="primary" @click="handleSubmit">提交订单</nut-button>

src/pages/order/components/OrderItem.vue

@@ -128,7 +128,7 @@ function handlePayment() {
 }
 
 function handleShowOrderDetail(order) {
-  console.log(order)
+  console.log(111212121,order)
   uni.navigateTo({
     url: '/pages/order/detail?detail=' + `${encodeBase64(order)}`
   })
@@ -238,29 +238,36 @@ function updateRemainingTime(detail: any) {
   const endTime = new Date(detail.close_time).getTime();
   const timeDifference = endTime - currentTime;
 
-  // 计算剩余时间
-  const hours = Math.floor(timeDifference / (1000 * 60 * 60));
-  const minutes = Math.floor((timeDifference % (1000 * 60 * 60)) / (1000 * 60));
-  const seconds = Math.floor((timeDifference % (1000 * 60)) / 1000);
+  if (timeDifference > 0) {
+    // 计算剩余时间
+    const hours = Math.floor(timeDifference / (1000 * 60 * 60));
+    const minutes = Math.floor((timeDifference % (1000 * 60 * 60)) / (1000 * 60));
+    const seconds = Math.floor((timeDifference % (1000 * 60)) / 1000);
 
-  // 更新数据
-  remainingTime.value = {
-    hours: hours < 10 ? '0' + hours : hours,
-    minutes: minutes < 10 ? '0' + minutes : minutes,
-    seconds: seconds < 10 ? '0' + seconds : seconds
+    // 更新数据
+
+    remainingTime.value = {
+      hours: hours < 10 ? '0' + hours : hours,
+      minutes: minutes < 10 ? '0' + minutes : minutes,
+      seconds: seconds < 10 ? '0' + seconds : seconds
+    }
+  } else {
+    clearInterval(timer);
+    remainingTime.value = {
+      hours: "00",
+      minutes: "00",
+      seconds: "00"
+    }
+    //   //重新刷新页面
+    uni.$emit('AllreloadList')
+    console.log('自动关闭>>>');
   }
 }
 
 
 // 每秒更新剩余时间
 const timer = setInterval(() => {
-  if (remainingTime.hours <= 0 && remainingTime.minutes <= 0) {
-    // 达到设定时间，执行关闭操作，你可以在这里添加你的关闭逻辑
-    clearInterval(timer);
-    //重新刷新页面
-    uni.$emit('AllreloadList')
-    console.log('自动关闭');
-  }
+
   updateRemainingTime(props.orderItem)
 }, 1000);
 
@@ -336,14 +343,14 @@ function handleShowDetail(orderItem: any) {
               <nut-button size="small" type="default" @tap.stop="handleRemindTheDelivery">
                 <div class="text-black">提醒发货</div>
               </nut-button>
-              <nut-button size="small" plain type="default" @tap.stop="handeRefund(orderProduct)">售后详情</nut-button>
+              <nut-button size="small" plain type="default" @tap.stop="handeRefund(orderProduct)">申请售后</nut-button>
             </div>
 
 
             <div class="flex justify-end gap-2" v-if="orderProduct.type == 1">
               <nut-button size="small" plain type="default"
                 @tap.stop="handleShowLogistics(orderProduct)">查看物流</nut-button>
-              <nut-button size="small" plain type="default" @tap.stop="handeDetail(orderProduct)">售后详情</nut-button>
+              <nut-button size="small" plain type="default" @tap.stop="handeRefund(orderProduct)">申请售后</nut-button>
 
               <nut-button size="small" plain type="primary" @tap.stop="handleTakeOrder(orderProduct)">确认收货</nut-button>
 
@@ -428,7 +435,7 @@ 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="handeDetail(orderItem)">售后详情</nut-button>
+          <nut-button size="small" plain type="default" @tap.stop="handeRefund(orderItem)">申请售后</nut-button>
 
           <nut-button size="small" plain type="primary" @tap.stop="handleTakeOrder(orderItem)">确认收货</nut-button>
 

src/pages/order/components/OrderObligationItem.vue

@@ -219,31 +219,40 @@ function updateRemainingTime(detail: any) {
   const endTime = new Date(detail.close_time).getTime();
   const timeDifference = endTime - currentTime;
 
-  // 计算剩余时间
-  const hours = Math.floor(timeDifference / (1000 * 60 * 60));
-  const minutes = Math.floor((timeDifference % (1000 * 60 * 60)) / (1000 * 60));
-  const seconds = Math.floor((timeDifference % (1000 * 60)) / 1000);
-
-  // 更新数据
-  remainingTime.value = {
-    hours: hours < 10 ? '0' + hours : hours,
-    minutes: minutes < 10 ? '0' + minutes : minutes,
-    seconds: seconds < 10 ? '0' + seconds : seconds
+  if (timeDifference > 0) {
+    // 计算剩余时间
+    const hours = Math.floor(timeDifference / (1000 * 60 * 60));
+    const minutes = Math.floor((timeDifference % (1000 * 60 * 60)) / (1000 * 60));
+    const seconds = Math.floor((timeDifference % (1000 * 60)) / 1000);
+
+    // 更新数据
+
+    remainingTime.value = {
+      hours: hours < 10 ? '0' + hours : hours,
+      minutes: minutes < 10 ? '0' + minutes : minutes,
+      seconds: seconds < 10 ? '0' + seconds : seconds
+    }
+  } else {
+    clearInterval(timer);
+    remainingTime.value = {
+      hours: "00",
+      minutes: "00",
+      seconds: "00"
+    }
+    //   //重新刷新页面
+    uni.$emit('dfkreloadList')
+    console.log('自动关闭>>>');
   }
 }
 
 
 // 每秒更新剩余时间
 const timer = setInterval(() => {
-  if (remainingTime.hours <= 0 && remainingTime.minutes <= 0) {
-    // 达到设定时间，执行关闭操作，你可以在这里添加你的关闭逻辑
-    clearInterval(timer);
-    uni.$emit('dfkreloadList')
-    console.log('自动关闭');
-  }
+
   updateRemainingTime(props.orderItem)
 }, 1000);
 
+
 onUnload(() => {
   clearInterval(timer);
   console.log('卸载关闭');

src/pages/order/detail.vue

@@ -118,27 +118,35 @@ function updateRemainingTime(detail: any) {
   const currentTime = new Date().getTime();
   const endTime = new Date(detail.close_time).getTime();
   const timeDifference = endTime - currentTime;
-
-  // 计算剩余时间
-  const hours = Math.floor(timeDifference / (1000 * 60 * 60));
-  const minutes = Math.floor((timeDifference % (1000 * 60 * 60)) / (1000 * 60));
-  const seconds = Math.floor((timeDifference % (1000 * 60)) / 1000);
-
-  // 更新数据
-  remainingTime.value = {
-    hours: hours < 10 ? '0' + hours : hours,
-    minutes: minutes < 10 ? '0' + minutes : minutes,
-    seconds: seconds < 10 ? '0' + seconds : seconds
+  if (timeDifference > 0) {
+    // 计算剩余时间
+    const hours = Math.floor(timeDifference / (1000 * 60 * 60));
+    const minutes = Math.floor((timeDifference % (1000 * 60 * 60)) / (1000 * 60));
+    const seconds = Math.floor((timeDifference % (1000 * 60)) / 1000);
+
+    // 更新数据
+    remainingTime.value = {
+      hours: hours < 10 ? '0' + hours : hours,
+      minutes: minutes < 10 ? '0' + minutes : minutes,
+      seconds: seconds < 10 ? '0' + seconds : seconds
+    }
+  } else {
+    // 达到设定时间，执行关闭操作，你可以在这里添加你的关闭逻辑
+    clearInterval(timer);
+    uni.redirectTo({
+      url:'/pages/order/detail?detail=' + `${encodeBase64(detail.value)}`
+    })
+    
+    console.log('自动关闭');
   }
+
 }
 
 
 // 每秒更新剩余时间
 const timer = setInterval(() => {
   if (remainingTime.hours <= 0 && remainingTime.minutes <= 0) {
-    // 达到设定时间，执行关闭操作，你可以在这里添加你的关闭逻辑
-    clearInterval(timer);
-    console.log('自动关闭');
+    
   }
   updateRemainingTime(detail.value)
 }, 60000);
@@ -308,7 +316,7 @@ function handleShowDetail(orderItem: any) {
 
 </script>
 <template>
-  <div class="custom-navbar" v-if="detail.status==='5'" >
+  <div class="custom-navbar" v-if="detail.status === '5'">
     <!-- 标题行1 -->
     <text class="title-line">剩余{{ remainingTime.hours }}时{{ remainingTime.minutes }}分自动关闭</text>
   </div>
@@ -500,6 +508,7 @@ style:
 page {
   background: #f8f8f8;
 }
+
 .custom-navbar {
   background-color: #fff;
   /* 导航栏背景色 */
@@ -515,5 +524,4 @@ page {
   /* 字体大小 */
   color: #333;
 }
-
 </style>

src/pages/order/obligation-detail.vue

@@ -59,28 +59,36 @@ function updateRemainingTime(detail: any) {
   const currentTime = new Date().getTime();
   const endTime = new Date(detail.close_time).getTime();
   const timeDifference = endTime - currentTime;
-
-  // 计算剩余时间
-  const hours = Math.floor(timeDifference / (1000 * 60 * 60));
-  const minutes = Math.floor((timeDifference % (1000 * 60 * 60)) / (1000 * 60));
-  const seconds = Math.floor((timeDifference % (1000 * 60)) / 1000);
-
-  // 更新数据
-  remainingTime.value = {
-    hours: hours < 10 ? '0' + hours : hours,
-    minutes: minutes < 10 ? '0' + minutes : minutes,
-    seconds: seconds < 10 ? '0' + seconds : seconds
+  if (timeDifference > 0) {
+    // 计算剩余时间
+    const hours = Math.floor(timeDifference / (1000 * 60 * 60));
+    const minutes = Math.floor((timeDifference % (1000 * 60 * 60)) / (1000 * 60));
+    const seconds = Math.floor((timeDifference % (1000 * 60)) / 1000);
+
+    // 更新数据
+    remainingTime.value = {
+      hours: hours < 10 ? '0' + hours : hours,
+      minutes: minutes < 10 ? '0' + minutes : minutes,
+      seconds: seconds < 10 ? '0' + seconds : seconds
+    }
+  } else {
+    // 达到设定时间，执行关闭操作，你可以在这里添加你的关闭逻辑
+    clearInterval(timer);
+    uni.showToast({
+      title: '已自动取消订单',
+      icon: 'none'
+    })
+    setTimeout(() => {
+      uni.navigateBack()
+    }, 300)
+    console.log('自动关闭');
   }
+
 }
 
 
 // 每秒更新剩余时间
 const timer = setInterval(() => {
-  if (remainingTime.hours <= 0 && remainingTime.minutes <= 0) {
-    // 达到设定时间，执行关闭操作，你可以在这里添加你的关闭逻辑
-    clearInterval(timer);
-    console.log('自动关闭');
-  }
   updateRemainingTime(detail.value)
 }, 60000);
 

src/pages/order_addcart/index.vue

@@ -37,7 +37,7 @@ const state = reactive({
   totalPrice: 0,
   totalNum: 0,
   selectAllIndeterminate: false,
-  product_id:[],
+  product_id: [],
   cart_id: [],
   changeSkuCart_id: '0',
   isManage: true,
@@ -134,6 +134,12 @@ onBeforeMount(() => {
 onLoad((options) => {
 
   if (!userStore.uid) {
+    pageStore.setPageConfig({
+      currentPage: {
+        type: 'tab',
+        url: '/pages/home/index'
+      }
+    })
     return uni.redirectTo({
       url: '/pages/user/login/index'
     })
@@ -153,9 +159,9 @@ onShow(() => {
 
   if (!userStore.uid) {
     pageStore.setPageConfig({
-      orderBack: {
+      currentPage: {
         type: 'tab',
-        url: '/pages/order_addcart/index'
+        url: '/pages/home/index'
       }
     })
     return uni.redirectTo({
@@ -542,7 +548,7 @@ function handleromoveCollect() {
       success: (res) => {
         if (res.confirm) {
           console.log(state.product_id);
-          removeCartItem(state.product_id).then(res=>{
+          removeCartItem(state.product_id).then(res => {
             console.log(res);
             uni.showToast({
               title: '收藏成功'
@@ -551,9 +557,9 @@ function handleromoveCollect() {
             state.product_id = []
             state.totalPrice = ''
             loadCartList()
-          }).catch(error=>{
-            console.log('error>>>',error);
-            
+          }).catch(error => {
+            console.log('error>>>', error);
+
           })
 
         } else if (res.cancel) {
@@ -771,12 +777,13 @@ onUnload(() => {
 
       <div class="flex justify-center items-center gap-2 pr-3">
         <div class="flex text-[12px]" v-if="state.isManage">
-          <span v-if="state.totalNum != 0 &&state.isManage">已选{{ state.totalNum }}件，</span>合计：<FPrice :price="state.totalPrice"></FPrice>
+          <span v-if="state.totalNum != 0 && state.isManage">已选{{ state.totalNum }}件，</span>合计：<FPrice
+            :price="state.totalPrice"></FPrice>
         </div>
-        <FButton v-if="!state.isManage" @click="handleromoveCollect" size="small"
-          :exClass="['rounded-full', '!text-[14px]', 'text-black', 'bg-write', 'w-full']">
+        <button v-if="!state.isManage" @click="handleromoveCollect"
+          class="['rounded-full', '!text-[14px]', 'text-black',remove_sc]">
           移入收藏
-        </FButton>
+        </button>
         <FButton @click="handleSubmit" size="small"
           :exClass="['rounded-full', '!text-[14px]', 'text-white', 'bg-primary', 'w-full']">
           {{ state.isManage ? '去结算' : '删除' }}
@@ -822,6 +829,15 @@ page {
   height: 7rpx;
   margin-bottom: 6rpx;
 }
+
+
+.remove_sc {
+  background-color: #ffffff;
+  border: 1rpx solid #b7b7b7;
+  height: 64rpx;
+  line-height: 64rpx;
+  text-align: center;
+}
 </style>
 <route lang="yaml">
 style:

src/pages/refund/drawback.vue

@@ -66,7 +66,15 @@ onLoad(async (options) => {
     state.from = options.from
   }
   await userStore.getUserInfo()
+  if (options.refund_type == '1') {
+    uni.setNavigationBarTitle({
+      title: '申请退款'
+    })
+  }
   if (options.refund_type == '2') {
+    uni.setNavigationBarTitle({
+      title: '申请退货退款'
+    })
     formData.goods = '已收到货'
   }
   formData.refund_type = options.refund_type
@@ -221,8 +229,8 @@ function handleshowReasonPopup() {
         </template>
       </nut-cell>
 
-      <nut-cell :desc="formData.goods == '' ? '请选择' : `${formData.goods}`" :is-link="formData.refund_type == '1' ? true : false"
-        @click="handleChooseGoodStatus">
+      <nut-cell :desc="formData.goods == '' ? '请选择' : `${formData.goods}`"
+        :is-link="formData.refund_type == '1' ? true : false" @click="handleChooseGoodStatus">
         <template #title>
           <div class="flex font-bold gap-1 items-center">
             <div>收货状态</div>
@@ -303,13 +311,13 @@ function handleshowReasonPopup() {
 
     <GoodStatusPopup v-model:show="state.showGoodStatusPopup" @confirm="onGoodStatusConfirm" />
     <RefundReasonPopup v-model:show="state.showReasonPopup" @confirm="onRefundReasonConfirm" />
-    
+
   </div>
 </template>
 
 <route lang="yaml">
 style:
-  navigationBarTitleText: 申请退款
+  navigationBarTitleText: 储蓄保
 </route>
 
 <style lang="scss">