11111111111

components.d.ts

@@ -48,7 +48,6 @@ declare module '@vue/runtime-core' {
     NutCell: typeof import('nutui-uniapp/components/cell/cell.vue')['default']
     NutCellGroup: typeof import('nutui-uniapp/components/cellgroup/cellgroup.vue')['default']
     NutCheckbox: typeof import('nutui-uniapp/components/checkbox/checkbox.vue')['default']
-    NutCountdown: typeof import('nutui-uniapp/components/countdown/countdown.vue')['default']
     NutDatePicker: typeof import('nutui-uniapp/components/datepicker/datepicker.vue')['default']
     NutDialog: typeof import('nutui-uniapp/components/dialog/dialog.vue')['default']
     NutForm: typeof import('nutui-uniapp/components/form/form.vue')['default']

src/pages/annuity/index.vue

@@ -197,20 +197,20 @@ const ImgType = computed(() => {
         <div class="flex-1 flex flex-col justify-between items-center py-4 gap-4">
           <div class="flex flex-col justify-center items-center">
             <div class="text-xs">总养老金</div>
-            <div class="text-[#F94032] font-bold text-[28px]" v-if="yanglaoStatistics">￥{{ yanglaoStatistics.all_yanglao
+            <div class="text-[#F94032] font-bold text-[28px]" v-if="yanglaoStatistics">￥{{parseFloat(Number( yanglaoStatistics.all_yanglao)).toFixed(2).replace(/\.?0+$/, '')
             }}
             </div>
           </div>
           <div class=" flex justify-around w-full">
             <div class="flex flex-col justify-center items-center " v-if="yanglaoStatistics">
               <div class="font-bold">
-                ￥ {{ (yanglaoStatistics.all_yanglao - yanglaoStatistics.all_yanglao_a).toFixed(2) }}
+                ￥ {{ parseFloat(Number(yanglaoStatistics.all_yanglao - yanglaoStatistics.all_yanglao_a)).toFixed(2).replace(/\.?0+$/, '') }}
               </div>
               <div class="text-xs text-gray-400">预估养老金</div>
             </div>
 
             <div class="flex flex-col justify-center items-center pl-3" v-if="yanglaoStatistics">
-              <div>￥ {{ (yanglaoStatistics.all_yanglao_a).toFixed(2) }}</div>
+              <div>￥ {{parseFloat(Number(yanglaoStatistics.all_yanglao_a)).toFixed(2).replace(/\.?0+$/, '') }}</div>
               <div class="text-xs text-gray-400">已结算</div>
             </div>
             <div @tap="handleToCitic" class="flex flex-col justify-center items-center pl-3">

src/pages/home/index.vue

@@ -237,7 +237,9 @@ function getCountdown() {
     clearInterval(timer);
     //加载秒杀数据
     console.log('自动关闭');
-    loadList('reload')
+    uni.switchTab({
+      url:'pages/home/index'
+    })
   }
 }
 

src/pages/my-invitation/index.vue

@@ -149,8 +149,8 @@ function handleShowAgreement() {
       <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">{{ userInviteProfit.UserUnsettledInviteProfit ?
-            userInviteProfit.UserUnsettledInviteProfit : '0.00' }}</div>
+          <div class="font-bold">{{ userInviteProfit.UserUnsettledInviteProfit ?
+            userInviteProfit.UserUnsettledInviteProfit : '0' }}</div>
         </div>
         <!-- {
                 title: '去提现',

src/pages/order/detail.vue

@@ -368,7 +368,7 @@ function handleShowDetail(orderItem: any) {
                 <div class="flex">
                   {{ productItem.cart_info.product.store_name }}
                 </div>
-                <div class="flex">¥{{ productItem.product_price }}</div>
+                <div class="flex">¥{{  parseFloat(Number(productItem.product_price)).toFixed(2).replace(/\.?0+$/, '')}}</div>
               </div>
 
 
@@ -387,13 +387,16 @@ function handleShowDetail(orderItem: any) {
         <div class="flex justify-end gap-2 " v-if="detail.status == -1">
           <nut-button size="small" type="default" plain @tap.stop="handleShowDetail(detail)">售后详情</nut-button>
         </div>
-        <div class="flex justify-end gap-2 " v-if="detail.status == 0 && detail.refund_order_id">
+        <div class="flex justify-end gap-2 " v-if="detail.status == 0 && detail.refund_order_id ">
           <nut-button size="small" type="default" plain @tap.stop="handleShowDetail(detail)">售后详情</nut-button>
         </div>
-        <div class="flex justify-end gap-2 " v-if="detail.status == 0 && !detail.refund_order_id">
+        <div class="flex justify-end gap-2 " v-if="detail.status == 0 && !detail.refund_order_id &&detail.pay_type!=5">
           <nut-button size="small" type="default" plain @tap.stop="handeRefund">申请售后</nut-button>
         </div>
-        <div class="flex justify-end" v-if="detail.status == 1 || detail.status == 2">
+        <div class="flex justify-end" v-if="detail.status == 1 &&detail.pay_type!=5">
+          <nut-button size="small" plain type="default" @tap.stop="handeRefund">申请售后</nut-button>
+        </div>
+        <div class="flex justify-end" v-if="detail.status == 2&&detail.pay_type!=5">
           <nut-button size="small" plain type="default" @tap.stop="handeRefund">申请售后</nut-button>
         </div>
         <!--          <div class="flex justify-end" v-if="detail.status == 0">-->
@@ -418,9 +421,12 @@ function handleShowDetail(orderItem: any) {
 
           <div>实付款</div>
           <div class="text-gray">
-            <FPrice :price="detail.pay_price" ex-class="font-bold text-xl" symbol="积分" v-if="detail.pay_type == 5">
-            </FPrice>
-            <FPrice :price="detail.pay_price" ex-class="font-bold text-xl" v-else></FPrice>
+            <div style="color: red;" class="font-bold text-xl"  v-if="detail.pay_type == 5">
+              积分{{ parseFloat(Number(detail.pay_price)).toFixed(2).replace(/\.?0+$/, '') }}
+            </div>
+            <div  style="color: red;" class="font-bold text-xl" v-else>
+           ￥ {{ parseFloat(Number(detail.pay_price)).toFixed(2).replace(/\.?0+$/, '') }}
+            </div>
           </div>
         </div>
 

src/pages/order_addcart/index.vue

@@ -715,7 +715,7 @@ const Buttonshow = ref(null)
 const showButtons = (goodItem) => {
   // 设置当前项的 showButtons 为 true，显示按钮
   Buttonshow.value = goodItem;
-  goodItem.check=true
+  goodItem.check = true
 };
 
 function handlePageClick() {
@@ -728,7 +728,7 @@ function handlePageClick() {
 }
 </script>
 <template>
-  <div @tap="handlePageClick" >
+  <div @tap="handlePageClick">
     <div class="">
       <CXBBackTop :Scroll_X="Scroll_X" :isCss="1" />
       <div v-if="hasShopping" class="bg-white h-10 fixed top-0 w-full z-1 flex justify-end ">
@@ -761,7 +761,8 @@ function handlePageClick() {
 
             </div>
             <div v-for="(goodItem, goodIndex) in shopItem.list" :key="goodIndex">
-              <div @longpress="showButtons(goodItem)" class="flex f-hairline-bottom p-3 gap-2" :style="Buttonshow === goodItem ? { backgroundColor: '#919191' } : {}">
+              <div @longpress="showButtons(goodItem)" class="flex f-hairline-bottom p-3 gap-2"
+                :style="Buttonshow === goodItem ? { backgroundColor: '#919191' } : {}">
 
                 <div class="flex">
                   <nut-checkbox v-model="goodItem.check" @change="handleGoodsItemCheck" label="单选"
@@ -812,7 +813,7 @@ function handlePageClick() {
         </div>
       </div>
 
-      <div class="pb-12" v-if="!hasShopping">
+      <div class="pb-12" >
         <div class="flex flex-row justify-center items-center gap-3 font-bold text-sm p-3 ">
           <image :src="like_adorn_220628Image" mode="widthFix" class="w-6 h-6"></image>
           <div>
@@ -853,8 +854,8 @@ function handlePageClick() {
 
         <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>合计：<span
+              style="color: red;">￥{{ parseFloat(Number(state.totalPrice)).toFixed(2).replace(/\.?0+$/, '') }}</span>
           </div>
           <button v-if="!state.isManage" @click="handleromoveCollect"
             class="['rounded-full', '!text-[14px]', 'text-black',remove_sc]">

src/pages/store/home/search.vue

@@ -31,7 +31,7 @@ const state = reactive({
   params: {},
   // priceType: NaN,
   is_best: NaN,
- 
+
   searchValue: '',
   options: [{
     text: '全部',
@@ -159,17 +159,17 @@ function handleProductTypeChange(typeValue: any) {
   // }
   loadList('reload')
 }
-function handleOrderChange(priceType:any) {
+function handleOrderChange(priceType: any) {
   console.log(priceType)
   state.currentSelected = NaN
   state.order = true
-  if (priceType ==0) {
+  if (priceType == 0) {
     state.priceType = 1
   } else {
     state.priceType = 0
   }
   state.params = {
-    priceType:state.priceType,
+    priceType: state.priceType,
   }
   // reset
   // state.sales = NaN
@@ -184,6 +184,9 @@ function loadList(action: 'page' | 'reload', callback?: (items) => void) {
     pageNum: state.currentPage,
     pageSize: state.pageSize,
   }
+  if (state.searchValue) {
+    params.mer_keyword = state.searchValue
+  }
   // if (state.type) {
   //   params.type = state.type
   // }

src/pages/store/product/detail.vue

@@ -822,7 +822,7 @@ onUnload(() => {
       </div>
 
       <div class="flex flex-col p-3 gap-3">
-        <div class="flex flex-row  items-center text-[#FE0032] font-bold text-lg gap-2">
+        <div v-if="detail.seckill_s == 0" class="flex flex-row  items-center text-[#FE0032] font-bold text-lg gap-2">
           <div v-if="is148Merchant && detail.price" class="flex justify-end items-end gap-2">
             <div class="!text-[24px]">{{ Number.parseFloat(detail.price * 30) }} </div>
             <div class="text-sm">积分</div>