3个页面bug修复

src/components/CXBSkuPopup/CXBSkuPopup.vue

@@ -25,6 +25,10 @@ const props = defineProps({
       return []
     }
   },
+  isTo:{
+    type:Number,
+    required:true
+  }
 })
 
 
@@ -50,6 +54,26 @@ const onConfirm = () => {
   emit(CONFIRM_EVENT)
 }
 
+//定义点击规格展示状态
+const isQr=ref(false)    //确认 加入购物车-立即购买规格出现
+const isDh=ref(false)    //兑换 立即兑换页面规格出现
+const isTwo=ref(false)   //点击大仓规格 出现双按钮
+
+//监听传入的规格
+watch(()=>props.isTo,()=>{
+  if(props.isTo as number ===1){
+    isQr.value = true
+  }
+  if(props.isTo as number ===2){
+    isQr.value = true
+  }
+  if(props.isTo as number ===3 ){
+    isTwo.value=true
+  }
+},
+{immediate:true}
+)
+
 const onCancel = () => {
   // show.value = false
   showValue.value = false
@@ -173,12 +197,27 @@ function handleCountChange(value) {
         </div>
       </div>
 
-      <div class="px-3 pb-10">
+      <div class="px-3 pb-10" v-if="isQr" >
         <FButton @click="handleAddCart" size="small" :exClass="['!bg-primary', 'rounded-full', 'text-white']" block>
           确定
         </FButton>
 
       </div>
+      <div class="px-3 pb-10" v-if="isDh" >
+        <FButton @click="handleAddCart" size="small" :exClass="['!bg-primary', 'rounded-full', 'text-white']" block>
+          立即兑换
+        </FButton>
+
+      </div>
+      <div class="px-3 pb-10"  v-if="isTwo" >
+        <FButton @click="handleAddCart" size="small" :exClass="['!bg-primary', 'rounded-full', 'text-white']" block>
+          加入购物车
+        </FButton>
+        <FButton @click="handleAddCart" size="small" :exClass="['!bg-primary', 'rounded-full', 'text-white']" block>
+          立即购买
+        </FButton>
+
+      </div>
     </div>
 
   </FPopup>

src/components/FCell/FCell.vue

@@ -4,7 +4,12 @@ import { useCell } from './use-cell'
 
 const props = defineProps(cellProps)
 const emit = defineEmits(cellEmits)
-
+onLoad(
+  (options)=>{
+    console.log('我是点击options',options);
+    
+  }
+)
 const { arrow, classes, clickHandler } = useCell(props, emit)
 </script>
 

src/manifest.json

@@ -1,6 +1,6 @@
 {
     "name" : "储蓄保",
-    "appid" : "__UNI__BCDA501",
+    "appid" : "__UNI__26118FF",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",
@@ -50,22 +50,22 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "__usePrivacyCheck__": true, //隐私政策
+        "__usePrivacyCheck__" : true, //隐私政策
         "appid" : "wxfb755febdb800f23",
         "setting" : {
             "urlCheck" : false
         },
         "usingComponents" : true,
         "permission" : {
-            "scope.userLocation": {
-                "desc": "你的位置信息将用于小程序位置接口的效果展示"
+            "scope.userLocation" : {
+                "desc" : "你的位置信息将用于小程序位置接口的效果展示"
             },
-            "scope.userFuzzyLocation": {
-                "desc": "你的位置信息将用于小程序位置接口的效果展示"
+            "scope.userFuzzyLocation" : {
+                "desc" : "你的位置信息将用于小程序位置接口的效果展示"
             }
         },
-        "lazyCodeLoading": "requiredComponents",
-        "requiredPrivateInfos": [
+        "lazyCodeLoading" : "requiredComponents",
+        "requiredPrivateInfos" : [
             "chooseAddress",
             "chooseLocation",
             "choosePoi",
@@ -84,8 +84,8 @@
     "mp-toutiao" : {
         "usingComponents" : true
     },
-    "uniStatistics": {
-        "enable": false
+    "uniStatistics" : {
+        "enable" : false
     },
     "vueVersion" : "3"
 }

src/pages/order_addcart/index.vue

@@ -608,9 +608,9 @@ 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 skushadow"
+                <div class="text-[10px] text-gray min-w-5  p-1  items-center flex "
                   v-if="goodItem.productAttr.sku" @click="openTestLog(goodItem)">
-                  {{ goodItem.productAttr.sku + ' V' }}
+                  <div class="skushadow" >{{ goodItem.productAttr.sku }} <span class="m-lift" >v</span> </div>
                 </div>
                 <div class="flex">
                   <CXBYaojinTag :amount="goodItem.yanglao" />
@@ -689,6 +689,13 @@ page {
 .skushadow {
   background-color: rgb(240, 240, 240);
   border-radius: 10px;
+  height: 100%;
+}
+
+.m-lift{
+  margin-left: 2px;
+  margin-right:1px;
+  color: black;
 }
 </style>
 <route lang="yaml">

src/pages/payment/index.vue

@@ -61,6 +61,7 @@ const state = reactive({
   tabIndex: NaN,
 })
 onLoad((options) => {
+	// console.log('我是options',options)
   if (options) {
     state.orderList = options.OrderList
     state.payPrice = options.pay_price
@@ -71,15 +72,15 @@ onLoad((options) => {
       state.tabIndex = options.tabIndex
     }
 
-    // uni.login({
-    //   success: (res) => {
-    //     state.code = res.code
-    //   }
-    // })
+    uni.login({
+      success: (res) => {
+        state.code = res.code
+      }
+    })
 
-    // checkGroupOrder(state.orderId).then(res => {
-    //   state.memberType = res.message
-    // })
+    checkGroupOrder(state.orderId).then(res => {
+      state.memberType = res.message
+    })
   }
 })
 
@@ -101,8 +102,8 @@ function handleConfirm() {
       OrderLists: state.orderList,
       type: 'tdbaspzf'
     },
-    // envVersion: 'trial', // develop（开发版），trial（体验版），release（正式版）
-    envVersion: 'release', // develop（开发版），trial（体验版），release（正式版）
+    envVersion: 'trial', // develop（开发版），trial（体验版），release（正式版）
+    // envVersion: 'release', // develop（开发版），trial（体验版），release（正式版）
     success(res) {
       // 打开成功
       uni.showToast({

src/pages/payment/success.vue

@@ -20,7 +20,7 @@ function goHome() {
 <template>
 <!-- <CXBBasePage> -->
  <FNavBar
-     title="我的订单" :left-arrow="false" fixed placeholder z-index="999"
+     title="支付成功" :left-arrow="false" fixed placeholder z-index="999"
      ex-class="bg-white w-screen"
      @click-left="onClickLeft"
  />

src/pages/store/nearby/index.vue

@@ -1,11 +1,11 @@
 <script lang="ts" setup>
-import {getMerchantCategory, getSelectMerchant, getSelectMerchantSort} from "~/apis/merchant";
-import type {StoreResult} from "~/apis/model/storeModel";
-import {StoreParams} from "~/apis/model/storeModel";
+import { getMerchantCategory, getSelectMerchant, getSelectMerchantSort } from "~/apis/merchant";
+import type { StoreResult } from "~/apis/model/storeModel";
+import { StoreParams } from "~/apis/model/storeModel";
 import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
-import {USER_LATITUDE, USER_LONGITUDE} from "~/constants";
-import {getProductShare} from "~/apis/common";
-import {useUserStore} from "~/stores/userStore";
+import { USER_LATITUDE, USER_LONGITUDE } from "~/constants";
+import { getProductShare } from "~/apis/common";
+import { useUserStore } from "~/stores/userStore";
 import Cache from "~/utils/cache";
 const usePageStore = usePageStoreWidthOut()
 const userStore = useUserStore()
@@ -49,11 +49,11 @@ const state = reactive({
   // merchantPageInfo: {}
 })
 //返回顶部标识
-let flag=ref(false)
+let flag = ref(false)
 
 const searchValue = ref('')
 
-const {windowHeight} = uni.getSystemInfoSync()
+const { windowHeight } = uni.getSystemInfoSync()
 state.scrollHeight = windowHeight - 45
 
 onLoad((option) => {
@@ -102,7 +102,7 @@ onShow(() => {
   usePageStore.setPageConfig({
     currentPage: {
       type: 'tab',
-      url:  '/pages/store/nearby/index'
+      url: '/pages/store/nearby/index'
     }
   })
   // console.log('onshow...')
@@ -210,8 +210,8 @@ const onRefresherRefresh = e => {
 };
 
 //小火箭滚动事件
-const onscroll =e=>{
-	state.scrollTop=e.detail.scrollTop
+const onscroll = e => {
+  state.scrollTop = e.detail.scrollTop
 }
 
 function handleScrollToLower() {
@@ -228,15 +228,15 @@ function handleScrollToLower() {
 //返回顶部事件
 const scrollToTop = function () {
   console.log('返回顶部');
-	state.scrollTop=0
+  state.scrollTop = 0
 
 }
 //监视
-watch(()=>state.scrollTop,()=>{
-  if(state.scrollTop as number > 400){
+watch(() => state.scrollTop, () => {
+  if (state.scrollTop as number > 400) {
     flag.value = true
   }
-  if(state.scrollTop as number < 400){
+  if (state.scrollTop as number < 400) {
     flag.value = false
   }
 })
@@ -251,8 +251,7 @@ watch(()=>state.scrollTop,()=>{
   <!--  </nut-category>-->
   <div class="flex flex-col  fixed  top-0 left-0  h-fit z-1 bg-white w-full">
 
-    <nut-searchbar
-        v-model="searchValue" @search="loadSelectMerchant('reload')" @clear="loadSelectMerchant( 'reload')">
+    <nut-searchbar v-model="searchValue" @search="loadSelectMerchant('reload')" @clear="loadSelectMerchant('reload')">
       <template v-slot:rightout>
         <div @tap="loadSelectMerchant('reload')">
           搜索
@@ -262,31 +261,22 @@ watch(()=>state.scrollTop,()=>{
 
 
   </div>
-  <div class="flex pt-10 "
-  >
+  <div class="flex pt-10 ">
     <!-- 左侧 一级分类 -->
     <div class="w-1/4">
-      <scroll-view
-		  ref="ToTop"
-          :scroll-y="true"
-          :style="{ height: `${state.scrollHeight}px` }"
-          class="w-full h-full bg-[#f8f8f8]"
-      >
-        <div
-            @tap="loadAll()"
-            :class="state.currentMerchantCategoryId == 0 ? 'bg-white font-bold' : ''"
-            class="relative w-25 h-12 block text-sm flex justify-center items-center">
+      <scroll-view ref="ToTop" :scroll-y="true" :style="{ height: `${state.scrollHeight}px` }"
+        class="w-full h-full bg-[#f8f8f8]">
+        <div @tap="loadAll()" :class="state.currentMerchantCategoryId == 0 ? 'bg-white font-bold' : ''"
+          class="relative w-25 h-12 block text-sm flex justify-center items-center">
           <div class="flex items-center gap-1">
             <div class="h-4 bg-primary w-1" v-if="state.currentMerchantCategoryId == 0"></div>
             <div>全部</div>
           </div>
 
         </div>
-        <div v-for="(item, index) in state.merchantCategory" :key="index"
-             @tap="handleCategoryChange(item)"
-             :class="state.currentMerchantCategoryId == item.merchant_category_id ? 'bg-white font-bold' : ''"
-             class="relative h-12 block text-sm flex justify-center items-center gap-1 w-25"
-        >
+        <div v-for="(item, index) in state.merchantCategory" :key="index" @tap="handleCategoryChange(item)"
+          :class="state.currentMerchantCategoryId == item.merchant_category_id ? 'bg-white font-bold' : ''"
+          class="relative h-12 block text-sm flex justify-center items-center gap-1 w-25">
           <div class="h-4 bg-primary w-1" v-if="state.currentMerchantCategoryId == item.merchant_category_id"></div>
 
           <div>
@@ -303,45 +293,25 @@ watch(()=>state.scrollTop,()=>{
     <div class="w-3/4 ">
       <div class="fixed z-3 flex flex-col justify-center h-10 pl-3 top-10">
         <nut-menu>
-          <nut-menu-item v-model="state.menuDefaultValue"
-                         :options="state.options"
-                         @change="loadSelectMerchant('reload')"
-          >
+          <nut-menu-item v-model="state.menuDefaultValue" :options="state.options" @change="loadSelectMerchant('reload')">
 
           </nut-menu-item>
         </nut-menu>
       </div>
-		<!-- 返回顶部 -->
-	  <div v-show="flag" class="back-top">
-	    <img @click="scrollToTop" class="back-TopImg" src="../../static/icon/返回顶部@2x.png" alt="">
-	  </div>
-      <scroll-view
-          :scroll-y="true"
-          :style="{ height: `${state.scrollHeight -60}px` }"
-		  :scroll-top="state.scrollTop"
-          class="flex flex-1  flex-col   p-3 gap-3 mt-10"
-          :refresher-enabled="true"
-          refresher-background="#f5f5f5"
-          refresher-default-style="black"
-          :refresher-triggered="state.triggered"
-          @scrolltolower="handleScrollToLower"
-          @refresherpulling="onRefresherPulling"
-          @refresherRestore="onRefresherRestore"
-          @refresherAbort="onRefresherAbort"
-          @refresherrefresh="onRefresherRefresh"
-          v-if="state.merchantList && state.merchantList.length > 0"
-		  @scroll="onscroll"
-      >
-        <div
-            v-for="(item, index) in state.merchantList" :key="index"
-            @click="handleShowMerchant(item)"
-            class="mb-3 ">
+      <!-- 返回顶部 -->
+      <div v-show="flag" class="back-top">
+        <img @click="scrollToTop" class="back-TopImg" src="../../static/icon/返回顶部@2x.png" alt="">
+      </div>
+      <scroll-view :scroll-y="true" :style="{ height: `${state.scrollHeight - 60}px` }" :scroll-top="state.scrollTop"
+        class="flex flex-1  flex-col   p-3 gap-3 mt-10" :refresher-enabled="true" refresher-background="#f5f5f5"
+        refresher-default-style="black" :refresher-triggered="state.triggered" @scrolltolower="handleScrollToLower"
+        @refresherpulling="onRefresherPulling" @refresherRestore="onRefresherRestore" @refresherAbort="onRefresherAbort"
+        @refresherrefresh="onRefresherRefresh" v-if="state.merchantList && state.merchantList.length > 0"
+        @scroll="onscroll">
+        <div v-for="(item, index) in state.merchantList" :key="index" @click="handleShowMerchant(item)" class="mb-3 ">
           <div class="flex">
             <div class="flex ">
-              <image :src="item.mer_avatar"
-                     mode="aspectFill"
-                     class="w-20 h-20 rounded-lg"
-              ></image>
+              <image :src="item.mer_avatar" mode="aspectFill" class="w-20 h-20 rounded-lg"></image>
             </div>
 
             <div class="flex flex-col justify-between px-2">
@@ -359,8 +329,7 @@ watch(()=>state.scrollTop,()=>{
 
           </div>
         </div>
-        <div class=" flex justify-center items-center text-[12px] text-gray-500"
-        >
+        <div class=" flex justify-center items-center text-[12px] text-gray-500">
           <div v-if="state.status === 'loading'">
             加载中...
           </div>
@@ -370,7 +339,7 @@ watch(()=>state.scrollTop,()=>{
         </div>
       </scroll-view>
       <div class="flex justify-center items-center w-full h-[60%]" v-else>
-        <CXBEmpty/>
+        <CXBEmpty />
 
       </div>
     </div>
@@ -385,29 +354,33 @@ style:
 
 <style lang="scss">
 page {
+  height: 100%;
   overflow: hidden;
   --nut-menu-item-font-size: 14px;
   --nut-menu-bar-line-height: 24px;
   --nut-menu-bar-box-shadow: none;
   --nut-menu-item-active-text-color: #FE0032;
 
-	.back-top{
-	  width: 40px;
-	  height: 40px;
-	  position: fixed;
-	  border-radius: 50%;
-	  z-index: 999;
-	  right: 15px;
-	  bottom: 60px;
-	}
-	.back-TopImg{
-	  width: 40px;
-	  height: 40px;
-	  border-radius: 50%;
-	}
+  .back-top {
+    width: 40px;
+    height: 40px;
+    position: fixed;
+    border-radius: 50%;
+    z-index: 999;
+    right: 15px;
+    bottom: 60px;
+  }
+
+  .back-TopImg {
+    width: 40px;
+    height: 40px;
+    border-radius: 50%;
+  }
+
   .nut-menu {
     background: none !important;
   }
+
   .nut-menu__bar {
     box-shadow: none !important;
     border: 1px solid #FE0032;

src/pages/store/product/detail.vue

@@ -64,6 +64,7 @@ const state = reactive({
   shareImage: '',
 })
 const detail: any = ref(null)
+const isTo= ref(0)
 let isShow = ref(false)
 onShow(() => {
   uni.showLoading({
@@ -777,7 +778,9 @@ onPageScroll((page) => {
   </div>
 
   <CXBSkuPopup v-model:show="state.isShowSku" :detail="detail" @selected:item="onSelectedSku"
-    @submit="handleCreateShopping" @count-change="handleCountChange" />
+    @submit="handleCreateShopping" @count-change="handleCountChange" 
+    :isTo="isTo"
+    />
   <!--  <nut-sku-->
   <!--      v-model:visible="state.isShowSku"-->
   <!--      :goods="state.goods"-->

src/pages/store/product/other.vue

@@ -509,7 +509,6 @@ onPageScroll((page) => {
           <image :key="index" :src="item" mode="aspectFill" class="h-full w-full" />
         </swiper-item>
       </swiper>
-      <CXBBackTop :Scroll_X="Scroll_X" :isCss="2" />
       <div>
         <div class="relative p-3 bg-white">
           <div class="flex gap-2 items-end">
@@ -561,6 +560,7 @@ onPageScroll((page) => {
         </div>
       </div>
     </div>
+    <!-- 商品下架展示 -->
     <div class="relative w-screen " v-if="isShow">
       <CXBBackTop :Scroll_X="Scroll_X" :isCss="1" />
       <div class="box-out">
@@ -596,7 +596,6 @@ onPageScroll((page) => {
     
   </CXBBasePage>
 
-  <!-- 下架 -->
 </template>
 <style scoped>
 .box-out {

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

@@ -1,20 +1,70 @@
 <template>
-	<view>
-112123132132132132
-	</view>
+	<div class="box_2 flex-col" v-if="isShow" >
+		<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" />
+			</div>
+
+			<div class="text_3">暂无可用优惠券</div>
+		</div>
+
+	</div>
 </template>
 
-<script lang="ts">
-	export default {
-		data() {
-			return {
-				
-			};
-		}
-	}
+<script lang="ts" setup >
+
+import { ref, reactive } from 'vue'
+const isShow = ref(true)
+
+
+
 </script>
 
 <style>
+.box_2 {
+	height: 100%;
+}
+
+.block_1 {
+	width: 100%;
+	height: 9px;
+	background-size: 100% 100%;
+}
+
+.image_2 {
+	width: 103px;
+	height: 103px;
+	display: block;
+	margin-top: 200px;
+	margin-bottom: 20px;
+}
+
+.text_3 {
+	height: 15px;
+	overflow-wrap: break-word;
+	color: rgba(51, 51, 51, 1);
+	font-size: 15px;
+	font-weight: NaN;
+	text-align: center;
+	white-space: nowrap;
+	line-height: 15px;
+	
+}
+
+.flex-box {
+	width: 100%;
+	height: 100%;
+	display: flex;
+	flex-direction: column;
+	justify-content: space-evenly;
+}
+
+.img-div {
+	width: 100%;
+	display: flex;
+	justify-content: space-evenly;
+}
 
 </style>
 <route lang="yaml">

src/pages/withdrawal-record/index.vue

@@ -36,10 +36,10 @@ onLoad((option) => {
     </div> -->
     <!-- 提现日期添加时分秒  -->
     <div v-if="list.length > 0" class="flex flex-col gap-3  p-3">
-      <div v-for="(item, index) in 2" :key="index" class="flex-1 text-xs f-hairline-bottom bg-white p-3">
+      <div v-for="(item, index) in list" :key="index" class="flex-1 text-xs f-hairline-bottom bg-white p-3">
         <div class="flex justify-between">
           <div>
-            <div>提现至{{ item.widthdrawal_type === '1' ? '微信' : '支付宝' }}</div>
+            <div>{{item.title}}</div>
             <div class="text-gray text-[11px]">{{ dayjs(item.create_time).format('YYYY-MM-DD HH:mm:ss') }}</div>
           </div>
           <div>