cs

src/components/CXBBackTop/CXBBackTop.vue

@@ -49,26 +49,26 @@ const scrollToTop = function () {
 
 <style scoped>
 .backtop1{
-  width: 40px;
-  height: 40px;
+  width: 100rpx;
+  height: 100rpx;
   position: fixed;
   border-radius: 50%;
   z-index: 999;
-  right: 15px;
+  right: 1%;
   bottom: 8%;
 }
 .backtop2{
-  width: 40px;
-  height: 40px;
+  width: 100rpx;
+  height: 100rpx;
   position: fixed;
   border-radius: 50%;
   z-index: 999;
-  right: 15px;
+  right: 1%;
   bottom: 14%;
 }
 .backTopImg{
-  width: 40px;
-  height: 40px;
+  width: 100rpx;
+  height: 100rpx;
   border-radius: 50%;
 }
 </style>

src/components/CXBSkuPopup/CXBSkuPopup.vue

@@ -193,15 +193,15 @@ function handleCountChange(value) {
         </FButton>
 
       </div>
-      <div class="flex box_1 flex-row justify-between text-sm text-white gap-3 pr-3" v-if="isTo == 2">
-        <FButton @click="handleJiaCart" size="small"
-          :exClass="['bg-[#FFA319] rounded-full w-1/3 flex justify-center items-center h-9']" block>
+      <div class="flex box_1 flex-row justify-between text-sm text-white gap-3 " v-if="isTo == 2">
+        <button @click="handleJiaCart" size="small"
+          class="bg-[#FFA319] rounded-full w-60 flex justify-center items-center h-9 clor">
           加入购物车
-        </FButton>
-        <FButton @click="handleBuyNow" size="small"
-          :exClass="['bg-[#F94032] rounded-full w-1/3 flex justify-center items-center h-9']" block>
+        </button>
+        <button @click="handleBuyNow" size="small"
+          class="bg-[#F94032] rounded-full w-60 flex justify-center items-center h-9 clor ">
           立即购买
-        </FButton>
+        </button>
 
       </div>
     </div>
@@ -210,7 +210,13 @@ function handleCountChange(value) {
 </template>
 <style scoped>
 .box_1 {
-  margin-bottom: 40rpx;
-  border-top:1px solid #b6b9c0
+  padding-top: 10rpx;
+  padding-bottom: 30rpx;
+  border-top: 1px solid rgba(182, 185, 192, 50%);
+}
+
+.clor {
+  color: aliceblue;
+  font-size: 28rpx;
 }
 </style>

src/pages/order_addcart/index.vue

@@ -54,13 +54,13 @@ const state = reactive({
   shareId: '',
   status: '',
 })
-let uniqueclone=ref('')
+let uniqueclone = ref('')
 const detail: any = ref(null)
 
 
-function onSelectedSku(currentSku : any ) {
-  console.log("item",currentSku);
-  
+function onSelectedSku(currentSku: any) {
+  console.log("item", currentSku);
+
   state.currentSku = currentSku
 
 }
@@ -95,12 +95,12 @@ function handleCreateShopping() {
     //     state.isShowSku = false
     //   }
     // }
-    
+
     if (res.status === 200) {
       state.isShowSku = false
-      console.log("修改后",state.currentSku);
-      console.log('我是uniqueclone',uniqueclone);
-      detail.value.unique=uniqueclone.value
+      console.log("修改后", state.currentSku);
+      console.log('我是uniqueclone', uniqueclone);
+      detail.value.unique = uniqueclone.value
     }
 
     uni.$on('cart-reload', () => {
@@ -285,8 +285,8 @@ function shopCheck(shopItem) {
 }
 
 function handleShopTitleClick(shopItem) {
-  console.log('shopItem',shopItem);
-  
+  console.log('shopItem', shopItem);
+
   if (shopItem.allCheck) {
     shopItem.list.forEach((good, index) => {
       good.check = true
@@ -340,7 +340,7 @@ function cartAllCheck(type: 'single' | 'all') {
         allArr.push(goods)
       }
     }
-    
+
     // 总金额｜总数
     goods.list.forEach(goodItem => {
       if (goodItem.check) {
@@ -350,7 +350,7 @@ function cartAllCheck(type: 'single' | 'all') {
       }
     })
   })
-  
+
   isAllSelect.value = allArr.length === shopping.value?.list.length
   // state.totalCartCount = totalNum
   state.totalPrice = totalMoney
@@ -528,13 +528,13 @@ function openTestLog(element) {
   state.isShowSku = true
   state.changeSkuCart_id = element.cart_id
   console.log('用户点击sku', element.product_attr_unique)
-  uniqueclone.value=''
+  uniqueclone.value = ''
   getProductDetail(element.product_id).then(res => {
-    console.log('res>>>',res);
-    uniqueclone.value=element.product_attr_unique
+    console.log('res>>>', res);
+    uniqueclone.value = element.product_attr_unique
     detail.value = res.data
-    detail.value.unique=uniqueclone.value
-    console.log(detail.value,'点击sku获取的商品信息，存储的detail')
+    detail.value.unique = uniqueclone.value
+    console.log(detail.value, '点击sku获取的商品信息，存储的detail')
     state.shareImage = detail.value.image
     if (res && res.mer_id && res.mer_id === '148') {
       if (detail.value && detail.value.price) {
@@ -566,7 +566,7 @@ function openTestLog(element) {
 </script>
 <template>
   <div class="">
-     <CXBBackTop :Scroll_X="Scroll_X"  :isCss="1" />
+    <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 ">
       <div class="pr-3">
         <FButton size="small" @click="handleManageCart">
@@ -608,9 +608,16 @@ function openTestLog(element) {
               <div @click="handleProductItemClick(goodItem)" class="  text-overflow line-clamp-1 text-xs">{{
                 goodItem.product.store_name }}</div>
               <div class="flex flex-col justify-start gap-1">
-                <div class="text-[10px] text-gray min-w-5  p-1  items-center flex "
-                  v-if="goodItem.productAttr.sku" @click="openTestLog(goodItem)">
-                  <div class="skushadow" >{{ goodItem.productAttr.sku }} <span class="m-lift" >v</span> </div>
+                <div class="text-[10px] text-gray min-w-5  p-1  items-center flex " v-if="goodItem.productAttr.sku"
+                  @click="openTestLog(goodItem)">
+                  <div class="skushadow">
+                    <span class="m-live">
+                      {{ goodItem.productAttr.sku }}
+                    </span>
+                    <span class="m-lift">
+                      <img class="thumbnail_1" referrerpolicy="no-referrer" src="../../static/icon/下拉.png" />
+                    </span>
+                  </div>
                 </div>
                 <div class="flex">
                   <CXBYaojinTag :amount="goodItem.yanglao" />
@@ -628,7 +635,7 @@ function openTestLog(element) {
       </div>
     </div>
 
-    <div class="pb-12" v-if="!hasShopping" >
+    <div class="pb-12" v-if="!hasShopping">
       <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>
@@ -657,8 +664,8 @@ function openTestLog(element) {
       </div>
     </div>
   </div>
-  <CXBSkuPopup  v-model:show="state.isShowSku" :detail="detail" @selected:item="onSelectedSku"
-    @submit="handleCreateShopping" @count-change="handleCountChange"   />
+  <CXBSkuPopup :isTo=1 v-model:show="state.isShowSku" :detail="detail" @selected:item="onSelectedSku"
+    @submit="handleCreateShopping" @count-change="handleCountChange" />
   <div v-if="hasShopping" class="fixed bottom-0 w-full z-3">
     <div class="bg-white h-10 flex justify-between" v-if="shopping && shopping.list">
       <div class="flex justify-center items-center gap-2 pl-3" @tap.stop="handleSelectAll">
@@ -689,13 +696,30 @@ page {
 .skushadow {
   background-color: rgb(240, 240, 240);
   border-radius: 10px;
-  height: 100%;
+  height: 38rpx;
+  line-height: 38rpx;
+  font-size: 28rpx;
+  color: #666666;
+  display: flex;
+}
+
+.m-live {
+  max-width: 350rpx;
+  margin-left: 4rpx;
+  margin-right: 4rpx;
+  overflow: hidden; /* 溢出内容隐藏 */
+  white-space: nowrap; /* 不换行 */
+  text-overflow: ellipsis; /* 超出部分显示省略号 */
+}
+
+.m-lift {
+  margin-left: 4rpx;
+  margin-right: 4rpx;
 }
 
-.m-lift{
-  margin-left: 2px;
-  margin-right:1px;
-  color: black;
+.thumbnail_1 {
+  width: 24rpx;
+  height: 14rpx;
 }
 </style>
 <route lang="yaml">

src/pages/store/nearby/index.vue

@@ -362,18 +362,18 @@ page {
   --nut-menu-item-active-text-color: #FE0032;
 
   .back-top {
-    width: 40px;
-    height: 40px;
+    width: 100rpx;
+    height: 100rpx;
     position: fixed;
     border-radius: 50%;
     z-index: 999;
-    right: 15px;
+    right: 1%;
     bottom: 60px;
   }
 
   .back-TopImg {
-    width: 40px;
-    height: 40px;
+    width: 100rpx;
+    height: 100rpx;
     border-radius: 50%;
   }
 

src/pages/store/product/detail.vue

@@ -15,7 +15,7 @@ import {
   TaobaoProductThirdPartyWaresModel, VipProductModel
 } from "~/apis/model/product.model";
 import { DcProductModel } from "~/apis/model/dacang.model";
-import { CDN_URL } from "~/config/app";
+import { CDN_URL,CDM_URL } from "~/config/app";
 import dayjs from "dayjs";
 import { getShareId } from "~/apis/product";
 import { debounce } from "lodash-es";
@@ -82,6 +82,13 @@ onShow(() => {
   loadCartCount()
 
 })
+//下架图片
+const outImg = computed(() => {
+  if(isShow){
+    return  CDM_URL+'/image/2023-11-24/20231124182002679.png'
+  }
+
+})
 
 uni.showShareMenu({
   withShareTicket: true,
@@ -797,7 +804,7 @@ onPageScroll((page) => {
     <div class="box-out">
       <div class="flex-box pb-3 px-3 ">
         <div class="img-div">
-          <image lazy-load src="../../../static/icon/商品下架不存在@3x.png" mode="widthFix" class=" top-0 right-0 sold-out ">
+          <image lazy-load :src="outImg" mode="widthFix" class=" top-0 right-0 sold-out ">
           </image>
         </div>
         <div class="out-conter">该商品下架不存在</div>

src/pages/to-coupon/to-coupon.vue

@@ -3,7 +3,7 @@
 		<div class="block_1 flex-col"></div>
 		<div class="flex-box">
 			<div class="img-div">
-				<image lazy-load class="image_2" mode="widthFix" src="../../static/youhuiquan@3x.png" />
+				<image lazy-load class="image_2" mode="widthFix" :src="outImg" />
 			</div>
 
 			<div class="text_3">暂无可用优惠券</div>
@@ -15,9 +15,15 @@
 <script lang="ts" setup >
 
 import { ref, reactive } from 'vue'
+import { CDN_URL,CDM_URL } from "~/config/app";
 const isShow = ref(true)
 
+const outImg = computed(() => {
+  if(isShow){
+    return  CDM_URL+'/image/2023-11-24/20231124181903347.png'
+  }
 
+})
 
 </script>
 

src/pages/user/index.vue

@@ -92,11 +92,7 @@ const myServiceList = [{
   icon: CDN_URL + '/static/assets/dianpuruzhu_220620.png',
   text: '商铺入驻',
   url: ''
-}, {
-  icon: '/static/icon/bangfu.png',
-  text: '帮扶中心',
-  url: '/pages/bangfuzhongxin/index'
-}, {
+},  {
   icon: CDN_URL + '/static/assets/mine_setting_220620.png',
   text: '设置',
   url: '/pages/setting/index'
@@ -296,7 +292,7 @@ const AlholderType = computed(() => {
 })
 // '':普通用户 district-区/县代 city-市代',
 const areaType = computed(() => {
-  if (userStore.userInfo?.area_manage.area_name.length>0) {
+  if (userStore.userInfo?.area_manage?.area_name) {
     const areamanage = userStore.userInfo?.area_manage_type
     // 县/区代理
     if (areamanage == 'district') {
@@ -411,21 +407,21 @@ function handleShowMyRulePage() {
                 {{ encodePhone(userStore.userInfo.phone) }}
               </div>
             </div>
-            <div class="btm flex gap-1 px-1">
+            <div class="btm flex gap-1 ">
               <!-- 用户 -->
               <div v-if="userType" @click="handleShowMyRulePage()"
-                class="flex rounded-full  text-[12px] text-white w-12 h-5  w-fit px-1">
-                <image lazy-load class="vip_img" :src="userType"></image>
+                class="flex rounded-full  text-[12px] text-white w-12 h-5  w-fit ">
+                <image mode="heightFix" lazy-load class="vip_img" :src="userType"></image>
               </div>
               <!-- 市区县代理 -->
               <div @click="openPopup" v-if="areaType"
-                class="flex rounded-full  text-[12px] text-white w-12 h-5  w-fit px-1">
-                <image lazy-load class="vip_img" :src="areaType"></image>
+                class="flex rounded-full  text-[12px] text-white w-12 h-5  w-fit ">
+                <image mode="heightFix" lazy-load class="vip_img" :src="areaType"></image>
               </div>
               <!-- 股东 -->
               <div v-if="AlholderType" 
-                class="flex rounded-full  text-[12px] text-white w-12 h-5   w-fit px-1">
-                <image lazy-load class="vip_img" :src="AlholderType"></image>
+                class="flex rounded-full  text-[12px] text-white w-12 h-5   w-fit">
+                <image mode="heightFix" lazy-load class="vip_img" :src="AlholderType"></image>
               </div>
             </div>
           </div>
@@ -589,8 +585,7 @@ page {
 }
 
 .vip_img {
-  width: 116rpx;
-  height: 58rpx;
+  height: 56rpx;
 }
 
 .box_2 {

src/pages/vip/index.vue

@@ -2,7 +2,8 @@
   <!--  <CXBBasePage :show="true" title="">-->
 
   <div class="flex flex-col gap-3 ">
-    <div style="background-color: transparent" class="overflow-hidden fixed top-0 w-full z-10">
+    <div style="height: 80rpx;" >
+ <div style="background-color: transparent  " class="overflow-hidden fixed top-0 w-full z-10">
       <nut-searchbar v-model="state.keyword" @search="loadList('reload')" @clear="loadList('reload')">
         <!--      <template v-slot:leftout>-->
         <!--        <div @tap="navBack">-->
@@ -16,10 +17,12 @@
         </template>
       </nut-searchbar>
     </div>
+    </div>
+   
     
     <!--      <image :src="homeBanner" mode="widthFix" class="h-10 w-full "></image>-->
 
-    <div class="w-screen h-45" style="margin-top: 80rpx;" >
+    <div class="w-screen h-45"  >
       <swiper v-if="state.banners" :indicator-dots="state.indicatorDots" indicator-active-color="#e93323"
         :autoplay="state.autoplay" :circular="state.circular" :interval="state.interval" :duration="state.duration"
         class="w-full h-full">
@@ -42,10 +45,10 @@
               <div class="line-clamp-1">
                 {{ item.store_name }}
               </div>
-              <div class="border border-solid border-1 border-red rounded flex text-xs items-center text-[#FE0032] w-fit">
+              <div  v-if="item.type!=15" class="border border-solid border-1 border-red rounded flex text-xs items-center text-[#FE0032] w-fit">
                 <image src="https://cdn.bjtdba.com/vod/image/2023-09-15/20230915160858609.png" mode="widthFix"
                   class="!w-8 "></image>
-                <div class="px-2 flex items-center jusitify-center">
+                <div  class="px-2 flex items-center jusitify-center">
                   <div>
                     养老金 ¥{{ item.yanglao }}
                   </div>
@@ -62,14 +65,6 @@
 
                 </div>
 
-                <div
-                  class="bg-[#202020] text-[#FFDD99] rounded-t-lg rounded-br-lg text-10px leading-none px-1 flex items-center justify-center h-4">
-
-                  <div>
-                    大仓
-                  </div>
-                </div>
-
               </div>
 
               <div class="line-through text-xs font-bold flex ">