15102826049 vor 2 Wochen
Ursprung
Commit
2c23a24b69

+ 1 - 1
src/pages/index/index.vue

@@ -81,7 +81,7 @@ const getBanner = () => {
 const loginRef = <any>ref(null);
 const toActivity = () => {
   const data = JSON.parse(uni.getStorageSync("activityData")) || {};
-  if (!data) {
+  if (!data.id) {
     uni.showToast({
       title: "当前暂无满返红包上传小票活动哦",
       icon: "none",

+ 18 - 12
src/pages/my/index.vue

@@ -39,13 +39,12 @@
             <template #icon>
               <image :src="imgObj.gift" mode="scaleToFill" />
             </template>
-            <image
+            <wd-badge
               v-if="countData.receiptActivityCount > 0"
-              style="width: 128rpx; height: 48rpx"
-              :src="imgObj.with"
-              mode="scaleToFill"
-              class="custom-text"
-            />
+              :modelValue="countData.receiptActivityCount"
+            >
+              <view class="count flex-center">去提现</view>
+            </wd-badge>
           </wd-cell>
           <wd-cell
             is-link
@@ -55,13 +54,12 @@
             <template #icon>
               <image :src="imgObj.lpIcon" mode="scaleToFill" />
             </template>
-            <image
+            <wd-badge
               v-if="countData.quickClaimCount > 0"
-              style="width: 128rpx; height: 48rpx"
-              :src="imgObj.with"
-              mode="scaleToFill"
-              class="custom-text"
-            />
+              :modelValue="countData.quickClaimCount"
+            >
+              <view class="count flex-center">去提现</view>
+            </wd-badge>
           </wd-cell>
           <wd-cell
             border
@@ -424,5 +422,13 @@ onShow(() => {
       height: 90rpx;
     }
   }
+  .count {
+    background: #ffe091;
+    border-radius: 40rpx;
+    height: 48rpx;
+    width: 128rpx;
+    color: #333333;
+    font-size: 24rpx;
+  }
 }
 </style>

+ 3 - 2
src/pagesOne/claim/apply.vue

@@ -5,7 +5,9 @@
       <view class="content">
         优惠券在使用微信支付后,若出现未满减的问题,为了避免顾客长时间的等待,可通过此通道按要求上传图片,审核通过后,会给您返现相应的金额红包请注意微信的【服务通知】
       </view>
-      <view class="btn" @click="toUpload"> 上传凭证 </view>
+      <view class="flex-center">
+        <view class="btn" @click="toUpload"> 上传凭证 </view>
+      </view>
       <view class="guide" @click="toGraph"
         >支付账单详情和优惠券的获取指引></view
       >
@@ -78,7 +80,6 @@ const toUpload = () => {
     }
     .btn {
       @include btnStyle(560rpx, 104rpx);
-      margin: auto;
     }
     .guide {
       color: #2a6443;

+ 1 - 1
src/pagesOne/claim/claimRecord.vue

@@ -3,7 +3,7 @@
     <view class="content">
       <view class="title">理赔记录</view>
       <view>
-        <claim-item :isShow="false" :detail="detailData"></claim-item>
+        <claim-item :isShow="false" :detail="detailData" preview></claim-item>
       </view>
     </view>
   </view>

+ 8 - 4
src/pagesOne/record/components/claimItem.vue

@@ -20,8 +20,8 @@
           width="96rpx"
           height="170rpx"
           :src="joy"
-          :enable-preview="true"
-          custom-style="margin-right: 16rpx"
+          :enable-preview="preview"
+          custom-style="margin-right: 8rpx"
         />
       </view>
     </view>
@@ -34,8 +34,8 @@
           width="96rpx"
           height="170rpx"
           :src="joy"
-          :enable-preview="true"
-          custom-style="margin-right: 16rpx"
+          :enable-preview="preview"
+          custom-style="margin-right: 8rpx"
         />
       </view>
     </view>
@@ -74,6 +74,10 @@ const props = defineProps({
     type: Boolean,
     default: false,
   },
+  preview: {
+    type: Boolean,
+    default: false,
+  },
 });
 </script>
 

+ 9 - 0
src/pagesOne/winner/components/uploadReceptPopop.vue

@@ -79,6 +79,15 @@ watch(
   { deep: true, immediate: true }
 );
 
+watch(
+  () => props.show,
+  (newVal) => {
+    if (!newVal) {
+      discountId.value = "";
+    }
+  }
+);
+
 const toUploadImage = (type: string) => {
   if (!discountId.value) {
     uni.showToast({

+ 0 - 1
src/pagesOne/winner/index.vue

@@ -154,7 +154,6 @@ const getList = () => {
       uni.setStorageSync("activityData", JSON.stringify(aData));
       backImage.value = res.data[0].activityImage;
       aData.description = aData.description.split("\n");
-      // console.log("----------------------", aData.description);
     })
     .catch((err) => {
       console.log(err);

+ 1 - 0
src/utils/system.ts

@@ -46,6 +46,7 @@ export const getActivityData = () => {
   getActivity(appid)
     .then((res: any) => {
       const data = res.data[0] || {};
+
       uni.setStorageSync("activityData", JSON.stringify(data));
     })
     .catch((err) => {