bug修复

src/components/CXBSkuPopup/CXBSkuPopup.vue

@@ -142,7 +142,7 @@ function handleCountChange(value) {
                   剩余库存{{ currentSku.stock }}
                 </div>
                 <div class="flex items-end gap-2" v-if="detail.mer_id === '148'">
-                  {{ (currentSku.price * 30) }} 积分
+                  {{  Math.round(currentSku.price * 30) }} 积分
                 </div>
                 <div class="flex items-end gap-2" v-else>
                   <FPrice :price="detail.seckill_s==0? currentSku.price:currentSku.dacang" />

src/pages/order-confirm/index.vue

@@ -1,15 +1,15 @@
 <script setup lang="ts">
-import {getUserAddressDetail, getUserAddressList, getUserVipInfo} from "~/apis/user";
-import {reactive} from "vue";
-import {cartChange, checkProductDaCang, CreateOrderRequest, orderCheck, orderCreate} from "~/apis/order.api";
+import { getUserAddressDetail, getUserAddressList, getUserVipInfo } from "~/apis/user";
+import { reactive } from "vue";
+import { cartChange, checkProductDaCang, CreateOrderRequest, orderCheck, orderCreate } from "~/apis/order.api";
 import CXBBasePage from "~/components/CXBBasePage/CXBBasePage.vue";
 import FPrice from "~/components/FPrice/FPrice.vue";
 import CXBYaojinTag from "~/components/CXBYaojinTag/CXBYaojinTag.vue";
 import FCell from "~/components/FCell/FCell.vue";
-import {encodePhone} from "~/utils";
-import {CDN_URL} from "~/config/app";
-import {useAddressStore} from "~/stores/addressStore";
-import {useThrottle} from "@vueuse/core";
+import { encodePhone } from "~/utils";
+import { CDN_URL } from "~/config/app";
+import { useAddressStore } from "~/stores/addressStore";
+import { useThrottle } from "@vueuse/core";
 import FField from "~/components/FField/FField.vue";
 const addressIcon = CDN_URL + '/static/assets/dingwi_220624.png'
 // const addressInfo = ref({})
@@ -60,7 +60,7 @@ onLoad(async (options) => {
   //   })
   // }
   const res = await getUserAddressList()
-  console.log('我可是res啊',res)
+  console.log('我可是res啊', res)
   if (res.list && res.list.length > 0) {
     data.addressInfo = res.list[0]
     data.addressId = res.list[0].address_id
@@ -90,7 +90,7 @@ onLoad(async (options) => {
     cart_id: data.cartId.split(','),
     address_id: data.addressId
   }).then(res => {
-    console.log(15999999,res)
+    console.log(15999999, res)
     data.is_dacang_vip_product = res.is_dacang_vip_product
     data.cartOrder = res.order
     data.totalPrice = res.order_price
@@ -147,9 +147,9 @@ function handleSubmit() {
     // 优惠券
     // coupon:
     // pay_type;//支付方式：0: 余额;1: 微信;2: 小程序;4: 支付宝;5: 特殊商户积分
-    pay_type:  data.type && data.type == '3' ? '5' : '2',
+    pay_type: data.type && data.type == '3' ? '5' : '2',
     // pay_type: data.type,
-    mer_id: data.type && data.type == '3' ? '148': '',
+    mer_id: data.type && data.type == '3' ? '148' : '',
     // 用户留言
     mark: data.mark,
     // take: [],
@@ -189,8 +189,8 @@ function payment(createOrderData: CreateOrderRequest) {
           }, 500)
         })
         // uni.navigateTo({
-          //   // url: '/pages/payment/index?' + `cardId=${data.cartId}&type=1&product_id=${data.productId}`
-          // url: '/pages/payment/index?' + `pay_price=${res.groupOrder.pay_price}&order_id=${res.order_id}&OrderList=${JSON.stringify(res.groupOrder)}`
+        //   // url: '/pages/payment/index?' + `cardId=${data.cartId}&type=1&product_id=${data.productId}`
+        // url: '/pages/payment/index?' + `pay_price=${res.groupOrder.pay_price}&order_id=${res.order_id}&OrderList=${JSON.stringify(res.groupOrder)}`
         // })
       }
     }).catch(err => {
@@ -247,12 +247,12 @@ function reTotal() {
     cart_id: data.cartId.split(','),
     address_id: data.addressId
   }).then(res => {
-    console.log('我可是res啊',res)
+    console.log('我可是res啊', res)
     data.is_dacang_vip_product = res.is_dacang_vip_product
     data.cartOrder = res.order
-    console.log('data.cartOrder',data.cartOrder);
-    
-    
+    console.log('data.cartOrder', data.cartOrder);
+
+
     data.totalPrice = res.order_price
     data.orderStatus = res.status
     // data.proPrice = res.proPrice
@@ -287,124 +287,110 @@ function reTotal() {
 }
 </script>
 <template>
-    <div class="p-3 flex flex-col gap-3 pb-safe">
-      <div
-          @click="handleAddressSelect"
-          class="rounded bg-white p-3 flex">
-        <div class="flex flex-col flex-1 gap-2">
-          <div class="flex items-center gap-2">
-            <div class="flex text-sm text-gray-500 justify-between items-center w-full">
-              <div class="flex-1 flex items-center gap-2">
-                <div class="w-fit flex">
-                  <image :src="addressIcon" mode="aspectFit" class="w-4 h-4"></image>
-                </div>
-                <div class="flex-1 flex" v-if="data.addressId">
-                  {{ data.addressInfo.province + ' ' + data.addressInfo.city + ' ' + data.addressInfo.district + ' ' + data.addressInfo.detail }}
-                </div>
-                <div v-else class="flex-1 flex">
-                  请选择收货地址
-                </div>
+  <div class="p-3 flex flex-col gap-3 pb-safe">
+    <div @click="handleAddressSelect" class="rounded bg-white p-3 flex">
+      <div class="flex flex-col flex-1 gap-2">
+        <div class="flex items-center gap-2">
+          <div class="flex text-sm text-gray-500 justify-between items-center w-full">
+            <div class="flex-1 flex items-center gap-2">
+              <div class="w-fit flex">
+                <image :src="addressIcon" mode="aspectFit" class="w-4 h-4"></image>
+              </div>
+              <div class="flex-1 flex" v-if="data.addressId">
+                {{ data.addressInfo.province + ' ' + data.addressInfo.city + ' ' + data.addressInfo.district + ' ' +
+                  data.addressInfo.detail }}
               </div>
+              <div v-else class="flex-1 flex">
+                请选择收货地址
+              </div>
+            </div>
 
-              <div class="w-4 flex i-tabler-chevron-right text-gray"></div>
+            <div class="w-4 flex i-tabler-chevron-right text-gray"></div>
 
-            </div>
           </div>
-<!--          <div class="flex text-sm font-bold">{{ data.addressInfo.detail }}</div>-->
-          <div class="flex gap-2 items-center text-xs text-gray-500">
-            <div>
-              {{ data.addressInfo.real_name }}
-            </div>
-            <div v-if="data.addressInfo && data.addressInfo.phone">
-              {{ encodePhone(data.addressInfo.phone) }}
-            </div>
+        </div>
+        <!--          <div class="flex text-sm font-bold">{{ data.addressInfo.detail }}</div>-->
+        <div class="flex gap-2 items-center text-xs text-gray-500">
+          <div>
+            {{ data.addressInfo.real_name }}
+          </div>
+          <div v-if="data.addressInfo && data.addressInfo.phone">
+            {{ encodePhone(data.addressInfo.phone) }}
           </div>
         </div>
       </div>
+    </div>
 
-      <div class="pb-15">
-        <div v-for="(item, index) in data.cartOrder" :key="index"
-             class=" bg-white rounded"
-        >
-          <div class="flex items-center gap-2 text-sm font-bold f-hairline-bottom p-3">
-            <image :src="item.mer_avatar" mode="widthFix" class="w-5 h-5"></image>
-            <div>{{ item.mer_name }}</div>
-<!--            <div>{{ item.mer_id}}</div>-->
-          </div>
-
-          <div v-for="(orderProductItem, orderProductItemIndex) in item.list" :key="orderProductItemIndex">
-            <div class="p-3 flex gap-3 f-hairline-bottom">
-              <div>
-                <image :src="orderProductItem.product.image" mode="aspectFit" class="rounded w-20 h-20"></image>
+    <div class="pb-15">
+      <div v-for="(item, index) in data.cartOrder" :key="index" class=" bg-white rounded">
+        <div class="flex items-center gap-2 text-sm font-bold f-hairline-bottom p-3">
+          <image :src="item.mer_avatar" mode="widthFix" class="w-5 h-5"></image>
+          <div>{{ item.mer_name }}</div>
+          <!--            <div>{{ item.mer_id}}</div>-->
+        </div>
 
-              </div>
-              <div class="flex flex-col w-full">
-                <div class="flex flex-col ">
-                  <div class="line-clamp-1 text-xs">
-                    {{ orderProductItem.product.store_name }}
-                  </div>
-                  <div class="text-[11px] text-gray-500">{{ orderProductItem.productAttr.sku }}</div>
-                </div>
-                <div class="flex">
-                  <CXBYaojinTag :amount="orderProductItem.yanglao" v-if="item.mer_id != '148'"/>
+        <div v-for="(orderProductItem, orderProductItemIndex) in item.list" :key="orderProductItemIndex">
+          <div class="p-3 flex gap-3 f-hairline-bottom">
+            <div>
+              <image :src="orderProductItem.product.image" mode="aspectFit" class="rounded w-20 h-20"></image>
 
+            </div>
+            <div class="flex flex-col w-full">
+              <div class="flex flex-col ">
+                <div class="line-clamp-1 text-xs">
+                  {{ orderProductItem.product.store_name }}
                 </div>
-                <div class="flex justify-between ">
-                  <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 class="text-[11px] text-gray-500">{{ orderProductItem.productAttr.sku }}</div>
+              </div>
+              <div class="flex">
+                <CXBYaojinTag :amount="orderProductItem.yanglao" v-if="item.mer_id != '148'" />
 
-                </div>
               </div>
+              <div class="flex justify-between ">
+                <div v-if="item.mer_id != '148'" style="color:#fa4032">￥{{ orderProductItem.productAttr.price }}</div>
+                <div v-if="item.mer_id == '148'" style="color:#fa4032">{{ Math.round(orderProductItem.productAttr.price *
+                  30) }}积分</div>
+                <nut-input-number v-model="orderProductItem.cart_num"
+                  @change="(num) => handleNumberChange(num, orderProductItem)" />
 
+              </div>
             </div>
 
           </div>
-          <div>
-            <!-- 优惠券数据 先写死 -->
-            <FCell
-                v-if="item.mer_id != '148'"
-                title="优惠劵"
-                :value="item.order.youhui_price!=0 ? item.order.youhui_price : '暂无优惠券'"
-                arrow
-                @click="gotoCoupon"
-            ></FCell>
-            <FCell
-                v-if="item.mer_id == '148'"
-                title="积分"
-                :value="userStore.userInfo.score!='0' ? userStore.userInfo.score : '暂无积分'"
-                arrow
-            ></FCell>
-            <FCell
-                title="运费"
-                :value="item.order.postage_price > 0 ? item.order.postage_price : '免运费'"
-                arrow
-            ></FCell>
-<!--            <FCell-->
-<!--                title="留言"-->
-<!--                value="建议留言前先与商家沟通确认"-->
-<!--                arrow-->
-<!--            ></FCell>-->
-            <FField label="留言" placeholder="建议留言前先与商家沟通确认" v-model="data.mark" :exClass="['text-right']"/>
-          </div>
 
         </div>
+        <div>
+          <!-- 优惠券数据 先写死 -->
+          <FCell v-if="item.mer_id != '148'" title="优惠劵"
+            :value="item.order.youhui_price != 0 ? item.order.youhui_price : '暂无优惠券'" arrow @click="gotoCoupon"></FCell>
+          <FCell v-if="item.mer_id == '148'" title="积分"
+            :value="userStore.userInfo.score != '0' ? userStore.userInfo.score : '暂无积分'" arrow></FCell>
+          <FCell title="运费" :value="item.order.postage_price > 0 ? item.order.postage_price : '免运费'" arrow></FCell>
+          <!--            <FCell-->
+          <!--                title="留言"-->
+          <!--                value="建议留言前先与商家沟通确认"-->
+          <!--                arrow-->
+          <!--            ></FCell>-->
+          <FField label="留言" placeholder="建议留言前先与商家沟通确认" v-model="data.mark" :exClass="['text-right']" />
+        </div>
+
       </div>
     </div>
+  </div>
 
-    <div class="fixed bottom-0 pb-safe w-full bg-white">
-      <div class="flex justify-between items-center p-3">
-        <div class="flex-1 flex text-sm font-bold">
-          应付金额：
-          <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>
-        </div>
+  <div class="fixed bottom-0 pb-safe w-full bg-white">
+    <div class="flex justify-between items-center p-3">
+      <div class="flex-1 flex text-sm font-bold">
+        应付金额：
+        <div style="color:#fa4032" v-if="data.type && data.type == '3'">{{  Math.round(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>
       </div>
-
     </div>
+
+  </div>
 </template>
 
 <route lang="yaml">

src/pages/order/components/OrderItem.vue

@@ -403,7 +403,9 @@ function handleShowDetail(orderItem: any) {
 
             <div class="flex flex-col justify-center items-center">
               <!--              <FPrice :price="orderProduct.cart_info.product.price" ex-class="font-bold text-[12px] !text-[#000]"></FPrice>-->
-              <div class="font-bold text-[12px] !text-[#000]"> ￥{{
+              <div class="font-bold text-[12px] !text-[#000]" v-if="orderItem.pay_type==5"> 积分{{
+                Math.round(parseFloat(orderProduct.product_price).toFixed(2).replace(/\.?0+$/, '')*30)  }}</div>
+              <div class="font-bold text-[12px] !text-[#000]" v-if="orderItem.pay_type!=5" > ￥{{
                 parseFloat(orderProduct.product_price).toFixed(2).replace(/\.?0+$/, '') }}</div>
               <div class="text-gray-500 text-[11px]">共{{ orderProduct.product_num }}件</div>
             </div>

src/pages/order/detail.vue

@@ -368,7 +368,8 @@ function handleShowDetail(orderItem: any) {
                 <div class="flex">
                   {{ productItem.cart_info.product.store_name }}
                 </div>
-                <div class="flex">¥{{  parseFloat(Number(productItem.product_price)).toFixed(2).replace(/\.?0+$/, '')}}</div>
+                <div class="flex" v-if="detail.pay_type == 5">积分{{ Math.round( parseFloat(Number(productItem.product_price)).toFixed(2).replace(/\.?0+$/, '')*30) }}</div>
+                <div class="flex" v-if="detail.pay_type != 5">¥{{  parseFloat(Number(productItem.product_price)).toFixed(2).replace(/\.?0+$/, '')}}</div>
               </div>
 
 
@@ -405,7 +406,8 @@ function handleShowDetail(orderItem: any) {
 
         <div class="flex justify-between">
           <div>商品总额</div>
-          <div class="text-gray">{{ getSymbol(detail.pay_type) }}{{ detail.total_price }}</div>
+          <div class="text-gray" v-if="detail.pay_type == 5">{{ getSymbol(detail.pay_type) }}{{ Math.round(detail.total_price *30)  }}</div>
+          <div class="text-gray" v-if="detail.pay_type != 5">{{ getSymbol(detail.pay_type) }}{{ detail.total_price }}</div>
         </div>
         <div class="flex justify-between">
           <div>优惠金额</div>
@@ -422,7 +424,7 @@ function handleShowDetail(orderItem: any) {
           <div>实付款</div>
           <div class="text-gray">
             <div style="color: red;" class="font-bold text-xl"  v-if="detail.pay_type == 5">
-              积分{{ parseFloat(Number(detail.pay_price)).toFixed(2).replace(/\.?0+$/, '') }}
+              积分{{  Math.round(parseFloat(Number(detail.pay_price)).toFixed(2).replace(/\.?0+$/, '')*30) }}
             </div>
             <div  style="color: red;" class="font-bold text-xl" v-else>
            ￥ {{ parseFloat(Number(detail.pay_price)).toFixed(2).replace(/\.?0+$/, '') }}

src/pages/product/integral.vue

@@ -111,7 +111,7 @@ function handleItemClick(item) {
                     {{ item.store_name }}
                   </div>
                   <div class="text-[#fe0032] flex items-end gap-2">
-                    <div class="text-[20px]">{{ Number(item.price * 30)}}</div>
+                    <div class="text-[20px]">{{  Math.round(item.price * 30)}}</div>
                     <div class="text-xs">积分</div>
                   </div>
                 </div>

src/pages/store/home/components/MerchantProductCard.vue

@@ -69,7 +69,7 @@ const is148Merchant = computed(() => {
 
       <div class="flex flex-row items-center gap-2">
         <div v-if="is148Merchant && item.price" class="flex justify-end items-end gap-2 text-[#FE0032]">
-          <div class="!text-[24px]">{{ Number.parseFloat(item.price * 30) }} </div>
+          <div class="!text-[24px]">{{  Math.round(item.price * 30) }} </div>
           <div class="text-sm">积分</div>
         </div>
         <div class="flex text-[#FE0032] font-bold text-lg" v-else>

src/pages/store/home/index.vue

@@ -225,17 +225,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
@@ -356,12 +356,19 @@ onPullDownRefresh(() => {
     }, 300)
   })
 })
+
+
+function handleItemClick(item) {
+  uni.navigateTo({
+    url: `/pages/store/product/detail?id=${item.product_id}`
+  })
+}
 </script>
 <template>
   <div class="fixed top-0 w-full bg-white z-1">
     <div class="flex flex-row items-center pt-2 pb-1">
       <div class="basis-2/9 text-left cx-menu">
-        <nut-menu class="custom-menu" >
+        <nut-menu class="custom-menu">
           <template #icon>
             <image :src="downDefaultImg" mode="widthFix" class="w-1 h-1"></image>
           </template>
@@ -410,7 +417,61 @@ onPullDownRefresh(() => {
     @order-change="handleOrderChange" :is-category="currentItemId === 1" />
   <div class="px-5 pb-25 mt-3 flex flex-col gap-3">
     <div v-if="currentItemId === 1">
-      <MerchantProductList :list="productList" v-if="productList.length > 0" />
+      <!-- <MerchantProductList :list="productList" v-if="productList.length > 0" /> -->
+      <div class="" v-if="productList && productList.length > 0">
+        <grid-view type="masonry" cross-axis-count="2" cross-axis-gap="10px" main-axis-gap="10px">
+          <div v-for="(item, index) in productList" :key="index" @tap="handleItemClick(item)">
+            <!-- <MerchantProductCard :item="item" /> -->
+            <!-- 11111 -->
+            <div class="bg-white rounded-lg text-dark">
+
+              <image :src="item.image" class="rounded-t-lg" style="width: 324rpx;height: 324rpx;" :fade-in="true"></image>
+
+              <div class="text-sm p-2 flex flex-col gap-1">
+                <div class=" text_unshow">
+                  {{ item.store_name }}
+                </div>
+                <div v-if="item.type != 15">
+                  <div v-if="!is148Merchant"
+                    class="border border-solid border-1 border-red rounded flex text-auto items-center text-[#FE0032] w-fit">
+                    <image src="https://cdn.bjtdba.com/vod/image/2023-09-15/20230915160858609.png" mode="widthFix"
+                      class="!w-8.5">
+                    </image>
+                    <div class="px-2 flex items-center jusitify-center text-xs">
+                      <div>
+                        养老金 ¥{{ item.yanglao || item.yanglao_price }}
+                      </div>
+                    </div>
+                  </div>
+                </div>
+
+                <div class="flex flex-row items-center gap-2 " >
+                  <div v-if="is148Merchant && item.price" class="flex justify-end items-end gap-2 text-[#FE0032] ">
+                    <div class="!text-[24px]">{{ Math.round(item.price * 30) }} </div>
+                    <div class="text-sm">积分</div>
+                  </div>
+                  <div class="flex text-[#FE0032] font-bold text-lg" v-else>
+                    <div>
+                      ￥
+                    </div>
+                    <div>
+                      {{ item.price }}
+                    </div>
+                  </div>
+
+                </div>
+                <div class="line-through text-xs font-bold flex " v-if="item.ot_price && !is148Merchant">
+                  ¥ {{ item.ot_price }}
+                </div>
+
+
+              </div>
+            </div>
+            <!-- 2222 -->
+          </div>
+        </grid-view>
+
+      </div>
       <CXBEmpty v-else />
 
       <div class=" flex justify-center items-center text-[12px] text-gray-500"
@@ -468,7 +529,16 @@ page {
   background-color: transparent !important;
 }
 
-.custom-menu{
+.custom-menu {
   background-color: #ffffff;
 }
+
+.text_unshow {
+  white-space: nowrap;
+  /* 禁止换行 */
+  overflow: hidden;
+  /* 隐藏溢出内容 */
+  text-overflow: ellipsis;
+  /* 显示省略号 */
+}
 </style>

src/pages/store/product/detail.vue

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