重要更新

sheep/components/s-coupon-list/s-coupon-list.vue

@@ -1,5 +1,5 @@
 <template>
-  <view class="ss-m-20" :style="{ opacity: disabled ? '0.4' : '1' }">
+  <view class="ss-m-20" :style="{ opacity: disabled ? '0.5' : '1' }">
     <view class="content">
       <view
         class="tag ss-flex ss-row-center"
@@ -66,8 +66,14 @@
     </view>
 
     <view class="desc ss-flex ss-row-between">
-      <view class="desc-title">
-        {{ data.description }}
+      <view>
+        <view class="desc-title">
+          {{ data.description }}
+        </view>
+        <view>
+          <slot name="reason">
+          </slot>
+        </view>
       </view>
       <view>
         <slot></slot>

sheep/components/s-coupon-select/s-coupon-select.vue

@@ -32,7 +32,14 @@
         </view>
         <view class="subtitle ss-m-t-40 ss-m-l-20">不可使用优惠券</view>
         <view v-for="item in state.couponInfo.cannot_use" :key="item.id">
-          <s-coupon-list :data="item" type="user" :disabled="true" />
+          <s-coupon-list :data="item" type="user" :disabled="true">
+            <template v-slot:reason>
+              <view class="ss-flex ss-m-t-24">
+                <view class="reason-title"> 不可用原因：</view>
+                <view class="reason-desc">{{ item.cannot_use_msg }}</view>
+              </view>
+            </template>
+          </s-coupon-list>
         </view>
       </scroll-view>
     </view>
@@ -106,4 +113,16 @@
     border-radius: 40rpx;
     color: #fff;
   }
+  .reason-title {
+    font-weight: 600;
+    font-size: 20rpx;
+    line-height: 26rpx;
+    color: #ff0003;
+  }
+  .reason-desc {
+    font-weight: 600;
+    font-size: 20rpx;
+    line-height: 26rpx;
+    color: #434343;
+  }
 </style>

sheep/components/s-popup-image/s-popup-image.vue

@@ -35,7 +35,7 @@
   const advHistory = modalStore.advHistory || [];
   const currentIndex = ref(0);
   const popupList = computed(() => {
-    const list = sheep.$store('app').template.basic.popupImage?.list || [];
+    const list = sheep.$store('app').template.basic?.popupImage?.list || [];
     const newList = [];
     if (list.length > 0) {
       list.forEach((adv) => {

sheep/ui/su-navbar/su-navbar.vue

@@ -58,7 +58,7 @@
               :radius="20"
               placeholder="请输入关键词"
               cancelButton="none"
-              v-model="defaultSearch"
+              v-model="searchModel"
               @confirm="onSearch"
             />
           </slot>
@@ -209,6 +209,11 @@
       margin: '0 ' + (sheep.$platform.device.windowWidth - sheep.$platform.capsule.right) + 'px',
     };
   });
+
+  const searchModel = computed(() => {
+		return props.defaultSearch
+	})
+
   const themeBgColor = computed(() => {
     if (props.dark) {
       // 默认值