xiaoe_mp_npm 0.1.1 → 0.1.2

package/miniprogram_dist/coupon/components/CouponSelect/index.less

@@ -1,238 +1,238 @@
-@import "../../../common/css/theme.wxss";
-
-.popUp {
-    height: 80%;
-    border-radius: 26.4rpx 26.4rpx 0 0;
-}
-.coupon-select-box {
-    display: flex;
-    flex-direction: column;
-    margin: 0 auto;
-    max-width: 480px;
-    height: 100%;
-    background-color: #F5F6F9;
-    border-radius: 26.4rpx 26.4rpx 0 0;
-    user-select: none;
-    .coupon-header {
-        display: flex;
-        flex-direction: column;
-        .header-content {
-            display: flex;
-            flex-direction: row;
-            justify-content: space-between;
-            align-items: center;
-            height: 90rpx;
-            padding: 0 36rpx;
-            top: 0;
-            left: 0;
-            font-size: 32rpx;
-            font-weight: 500;
-            background-color: #ffffff;
-            border-radius: 26.4rpx 26.4rpx 0 0;
-        }
-        .promo-code-wrap {
-            display: flex;
-            justify-content: center;
-            align-items: center;
-            padding: 0 36rpx;
-            height: 115rpx;
-            background-color: #fff;
-            .promo-code-input {
-                width: 470rpx;
-                height: 84rpx;
-                padding: 0 22rpx;
-                border: 1px solid #DCDCDC;
-                border-right: none;
-                border-radius: 8.8rpx 0 0 8.8rpx;
-                color: #333;
-                font-size: 30.8rpx;
-                user-select: text;
-                box-shadow: none;
-            }
-            .promo-code-input::-webkit-input-placeholder {
-                color: #c8c8c8;
-            }
-            .promo-code-input:disabled {
-                color: #999;
-                background-color: #eee;
-            }
-            .promo-code-btn {
-                width: 180rpx;
-                height: 84rpx;
-                line-height: 84rpx;
-                margin: 0;
-                border: none;
-                border-radius: 0 8.8rpx 8.8rpx 0;
-                text-align: center;
-                color: #fff;
-                background-color: #FF821F !important;
-                font-size: 27.5rpx;
-                cursor: pointer;
-            }
-        }
-        .coupon-code-tip {
-            display: flex;
-            align-items: center;
-            padding: 0 36rpx;
-            background-color: #fff;
-            height: 39.6rpx;
-            .tips-img {
-                margin-right: 6.6rpx;
-                width: 30.8rpx;
-                height: 28.6rpx;
-            }
-            text {
-                font-size: 26.4rpx;
-                color: #999;
-            }
-        }
-        .coupon-tab_warp{
-            display: flex;
-            justify-items: center;
-            align-items: center;
-            font-size: 35.2rpx;
-            padding: 0 36rpx;
-            font-weight: 700;
-            text-align: center;
-            background-color:#fff;
-            text{
-                display: block;
-            }
-            .tabItem{
-                position: relative;
-                width:50%;
-                height:105.6rpx;
-                line-height: 105.6rpx;
-                text-align: center;
-                cursor: pointer;
-            }
-            .greyColor{
-                color: #999999;
-                font-size: 30.8rpx;
-                font-weight: normal;
-            }
-            .activeBorder{
-                position:absolute;
-                bottom:0;
-                left:50%;
-                transform: translateX(-50%);
-                width:44rpx;
-                height:4.4rpx;
-                background:#09BB07;
-                border-radius:3.3rpx;
-            }
-        }
-        .coupon-tips {
-            display: flex;
-            background: #fff;
-            align-items: center;
-            justify-items: center;
-            padding: 10rpx 36rpx;
-            justify-content: space-between;
-            .coupon-tips-font {
-                line-height: 55rpx;
-                font-size: 26.4rpx;
-                font-weight: 500;
-                color: #000;
-                .coupon-money-num {
-                    color: #FF4747;
-                }
-            }
-            .coupon-best-combination {
-                min-width: 211.2rpx;
-                height: 52.8rpx;
-                text-align: center;
-                line-height: 55rpx;
-                background: #FF821F;
-                border: 0;
-                margin: 0;
-                border-radius: 44rpx;
-                font-size: 26.4rpx;
-                font-weight: 500;
-                color: #fff;
-            }
-        }
-    }
-    .coupon-list {
-        box-sizing: border-box;
-        flex: 1; /* 撑满剩余容器高度 */
-        overflow: scroll;
-        -webkit-overflow-scrolling: touch;
-        text-align: center;
-        padding: 26.4rpx 35.2rpx 0;
-
-        .coupon-item {
-            position: relative;
-            display: flex;
-            margin-bottom: 26.4rpx;
-            border-radius: 8.8rpx;
-            background: #fff;
-        }
-
-        .not-use-coupon {
-            display: flex;
-            justify-content: space-between;
-            align-items: center;
-            width: 100%;
-            height: 114.4rpx;
-            margin-bottom: 26.4rpx;
-            border-radius: 8.8rpx;
-            background: #fff;
-            .not-use-text {
-                width: 558.8rpx;
-                padding-left: 35.2rpx;
-                font-size: 30.8rpx;
-                color: #333;
-                text-align: left;
-            }
-            .choose-box {
-                display: flex;
-                align-items: center;
-                justify-content: center;
-                width: 132rpx;
-                height: 100%;
-                .choose-inner {
-                    width: 39.6rpx;
-                    height: 39.6rpx;
-                    border-radius: 50%;
-                    border: 3.3rpx solid #ccc;
-                }
-                .coupon-not-used {
-                    border: none;
-                }
-            }
-        }
-
-    }
-    .coupon-bottom {
-        height: 100rpx;
-        display: flex;
-        padding: 0 36rpx;
-        align-items: center;
-        justify-content: center;
-        background-color: #fff;
-        .coupon-confirm-button {
-            width: 754.6rpx;
-            height: 80.8rpx;
-            border-radius: 48.4rpx;
-            background: #FF821F;
-            line-height: 80.8rpx;
-            text-align: center;
-            font-size: 30.8rpx;
-            font-weight: 500;
-            color: #fff;
-        }
-    }
-    .coupon_emptypage{
-        text-align: center;
-        font-size: 35.2rpx;
-        color:#ADADB4;
-        .coupon_emptyImg{
-            width:428rpx;
-            height: 384rpx;
-            margin: 33rpx auto 0;
-            background-size: 100% 100%;
-        }
-
-    }
+@import "../../../common/css/theme.wxss";
+
+.popUp {
+    height: 80%;
+    border-radius: 26.4rpx 26.4rpx 0 0;
+}
+.coupon-select-box {
+    display: flex;
+    flex-direction: column;
+    margin: 0 auto;
+    max-width: 480px;
+    height: 100%;
+    background-color: #F5F6F9;
+    border-radius: 26.4rpx 26.4rpx 0 0;
+    user-select: none;
+    .coupon-header {
+        display: flex;
+        flex-direction: column;
+        .header-content {
+            display: flex;
+            flex-direction: row;
+            justify-content: space-between;
+            align-items: center;
+            height: 90rpx;
+            padding: 0 36rpx;
+            top: 0;
+            left: 0;
+            font-size: 32rpx;
+            font-weight: 500;
+            background-color: #ffffff;
+            border-radius: 26.4rpx 26.4rpx 0 0;
+        }
+        .promo-code-wrap {
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            padding: 0 36rpx;
+            height: 115rpx;
+            background-color: #fff;
+            .promo-code-input {
+                width: 470rpx;
+                height: 84rpx;
+                padding: 0 22rpx;
+                border: 1px solid #DCDCDC;
+                border-right: none;
+                border-radius: 8.8rpx 0 0 8.8rpx;
+                color: #333;
+                font-size: 30.8rpx;
+                user-select: text;
+                box-shadow: none;
+            }
+            .promo-code-input::-webkit-input-placeholder {
+                color: #c8c8c8;
+            }
+            .promo-code-input:disabled {
+                color: #999;
+                background-color: #eee;
+            }
+            .promo-code-btn {
+                width: 180rpx;
+                height: 84rpx;
+                line-height: 84rpx;
+                margin: 0;
+                border: none;
+                border-radius: 0 8.8rpx 8.8rpx 0;
+                text-align: center;
+                color: #fff;
+                background-color: #FF821F !important;
+                font-size: 27.5rpx;
+                cursor: pointer;
+            }
+        }
+        .coupon-code-tip {
+            display: flex;
+            align-items: center;
+            padding: 0 36rpx;
+            background-color: #fff;
+            height: 39.6rpx;
+            .tips-img {
+                margin-right: 6.6rpx;
+                width: 30.8rpx;
+                height: 28.6rpx;
+            }
+            text {
+                font-size: 26.4rpx;
+                color: #999;
+            }
+        }
+        .coupon-tab_warp{
+            display: flex;
+            justify-items: center;
+            align-items: center;
+            font-size: 35.2rpx;
+            padding: 0 36rpx;
+            font-weight: 700;
+            text-align: center;
+            background-color:#fff;
+            text{
+                display: block;
+            }
+            .tabItem{
+                position: relative;
+                width:50%;
+                height:105.6rpx;
+                line-height: 105.6rpx;
+                text-align: center;
+                cursor: pointer;
+            }
+            .greyColor{
+                color: #999999;
+                font-size: 30.8rpx;
+                font-weight: normal;
+            }
+            .activeBorder{
+                position:absolute;
+                bottom:0;
+                left:50%;
+                transform: translateX(-50%);
+                width:44rpx;
+                height:4.4rpx;
+                background:#09BB07;
+                border-radius:3.3rpx;
+            }
+        }
+        .coupon-tips {
+            display: flex;
+            background: #fff;
+            align-items: center;
+            justify-items: center;
+            padding: 10rpx 36rpx;
+            justify-content: space-between;
+            .coupon-tips-font {
+                line-height: 55rpx;
+                font-size: 26.4rpx;
+                font-weight: 500;
+                color: #000;
+                .coupon-money-num {
+                    color: #FF4747;
+                }
+            }
+            .coupon-best-combination {
+                min-width: 211.2rpx;
+                height: 52.8rpx;
+                text-align: center;
+                line-height: 55rpx;
+                background: #FF821F;
+                border: 0;
+                margin: 0;
+                border-radius: 44rpx;
+                font-size: 26.4rpx;
+                font-weight: 500;
+                color: #fff;
+            }
+        }
+    }
+    .coupon-list {
+        box-sizing: border-box;
+        flex: 1; /* 撑满剩余容器高度 */
+        overflow: scroll;
+        -webkit-overflow-scrolling: touch;
+        text-align: center;
+        padding: 26.4rpx 35.2rpx 0;
+
+        .coupon-item {
+            position: relative;
+            display: flex;
+            margin-bottom: 26.4rpx;
+            border-radius: 8.8rpx;
+            background: #fff;
+        }
+
+        .not-use-coupon {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            width: 100%;
+            height: 114.4rpx;
+            margin-bottom: 26.4rpx;
+            border-radius: 8.8rpx;
+            background: #fff;
+            .not-use-text {
+                width: 558.8rpx;
+                padding-left: 35.2rpx;
+                font-size: 30.8rpx;
+                color: #333;
+                text-align: left;
+            }
+            .choose-box {
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                width: 132rpx;
+                height: 100%;
+                .choose-inner {
+                    width: 39.6rpx;
+                    height: 39.6rpx;
+                    border-radius: 50%;
+                    border: 3.3rpx solid #ccc;
+                }
+                .coupon-not-used {
+                    border: none;
+                }
+            }
+        }
+
+    }
+    .coupon-bottom {
+        height: 100rpx;
+        display: flex;
+        padding: 0 36rpx;
+        align-items: center;
+        justify-content: center;
+        background-color: #fff;
+        .coupon-confirm-button {
+            width: 754.6rpx;
+            height: 80.8rpx;
+            border-radius: 48.4rpx;
+            background: #FF821F;
+            line-height: 80.8rpx;
+            text-align: center;
+            font-size: 30.8rpx;
+            font-weight: 500;
+            color: #fff;
+        }
+    }
+    .coupon_emptypage{
+        text-align: center;
+        font-size: 35.2rpx;
+        color:#ADADB4;
+        .coupon_emptyImg{
+            width:428rpx;
+            height: 384rpx;
+            margin: 33rpx auto 0;
+            background-size: 100% 100%;
+        }
+
+    }
 }

package/miniprogram_dist/coupon/components/CouponSelect/index.wxml

@@ -1,75 +1,75 @@
-<!-- 优惠券选择器 -->
-<van-popup bind:close="onClose" show="{{ showPopup }}" position="bottom" custom-class="popUp">
-    <view title="优惠券/码" class="coupon-select-box">
-        <view class="coupon-header">
-            <!-- 弹框header -->
-            <view class="header-content">
-                <view class="header-back pl-36">
-                    <van-icon name="arrow-left" bindtap="onClose" />
-                </view>
-                <view class="header-title">优惠券/码</view>
-                <view class="header-close pr-36">
-                    <van-icon name="cross" bindtap="onClose" />
-                </view>
-            </view>
-            <!-- 使用优惠码 -->
-            <view class="promo-code-wrap">
-                <input class="promo-code-input" placeholder="请输入优惠码" disabled="{{isUsedPromoCode}}" type="text" bindinput="getPromoCode" value="{{promoCode}}" maxlength="12"/>
-                <button class="theme-customize-bg theme-customize-font-black promo-code-btn"  bindtap="usePromoCode">
-                {{ isUsedPromoCode ? '取消使用' : '使用' }}
-                </button>
-            </view>
-            <!-- 使用优惠券选择器 -->
-            <view class="coupon-code-tip">
-                <image class="tips-img" src="http://wechatapppro-1252524126.file.myqcloud.com/appAKLWLitn7978/image/kfgh9ha90lf1kyxyrpd.png"/>
-                <text>优惠码与优惠券不可叠加使用</text>
-            </view>
-            <view class="coupon-tab_warp">
-                <view class="tabItem" wx:for="{{coupon_tab}}" wx:key="activeIndex" wx:for-index="index" wx:for-item="item" bindtap="setTab" data-index="{{item.activeIndex}}">
-                    <text class="tabTitle {{curTabIndex !== item.activeIndex?'greyColor':''}}">{{item.activeIndex === 1 ?item.tabName+'('+couponList.length+')' : item.tabName+'('+disableCouponList.length+')'}}</text>
-                    <text class="activeBorder theme-customize-bg" wx:if="{{curTabIndex === item.activeIndex}}"></text>
-                </view>
-            </view>
-            <view class="coupon-tips">
-                <view class="coupon-tips-font">{{ couponTips }}<text class="coupon-money-num" wx:if="{{userChooseCouponList.length !== 0 && !isUsedPromoCode}}">￥{{ couponDiscountAmount }}</text>
-                </view>
-                <button wx:if="{{!(isUsedPromoCode || isRecommendCouponList)}}" bindtap="useRecommendCoupon" class="coupon-best-combination">使用推荐优惠</button>
-            </view>
-        </view>
-        <!-- 可用优惠券 -->
-        <view wx:if="{{curTabIndex === 1}}" class="coupon-list">
-            <view wx:if="{{couponList.length>0}}">
-                <view wx:for-index="index" wx:for-item="item" wx:for="{{couponList}}" class="coupon-item">
-                    <CouponItem userChooseBatchIdList="{{userChooseBatchIdList}}" userChooseCuIdList="{{userChooseCuIdList}}" cantOverlay="{{cantOverlay}}" isRecommendCouponList="{{}}" userChooseCouponList="{{userChooseCouponList}}" cantOverlay="{{cantOverlay}}" style="width: 100%" noSuperposition="{{noSuperposition}}" data-item="{{item}}" couponContent="{{item}}" bindchooseCoupon="chooseCoupon" dateInDetail="true">
-                    </CouponItem>
-                </view>
-                <view class="not-use-coupon" bindtap="notUseCoupon">
-                    <view class="not-use-text">不使用优惠券</view>
-                    <view class="choose-box">
-                        <image src="../../../common/assets/images/coupon/coupon_select.png" wx:if="{{isNotUseCoupon}}" class="choose-inner coupon-not-used" />
-                        <view wx:else class="choose-inner"></view>
-                    </view>
-                </view>
-            </view>
-            <view class="coupon_emptypage" wx:else >
-                <image src="../../../common/assets/images/coupon/emptypage.svg" class="coupon_emptyImg"/>
-                <view>您暂无可使用的优惠券</view>
-            </view>
-        </view>
-        <!-- 不可用优惠券 -->
-        <view class="coupon-list disabledList" wx:if="{{curTabIndex==2}}">
-            <view wx:if="{{disableCouponList.length > 0}}">
-                <view wx:for-index="index" wx:for-item="item" wx:for="{{disableCouponList}}" class="coupon-item">
-                    <CouponItem style="width: 100%" couponContent="{{item}}" disabled="true" :dateInDetail="true"></CouponItem>
-                </view>
-            </view>
-            <view class="coupon_emptypage" wx:else>
-                <image src="../../../common/assets/images/coupon/emptypage.svg" class="coupon_emptyImg"/>
-                <view>您暂无不可用的优惠券</view>
-            </view>
-        </view>
-        <view class="coupon-bottom">
-            <button class="coupon-confirm-button" bindtap="confirm">确  定</button>
-        </view>
-    </view>
+<!-- 优惠券选择器 -->
+<van-popup bind:close="onClose" show="{{ showPopup }}" position="bottom" custom-class="popUp">
+    <view title="优惠券/码" class="coupon-select-box">
+        <view class="coupon-header">
+            <!-- 弹框header -->
+            <view class="header-content">
+                <view class="header-back pl-36">
+                    <van-icon name="arrow-left" bindtap="onClose" />
+                </view>
+                <view class="header-title">优惠券/码</view>
+                <view class="header-close pr-36">
+                    <van-icon name="cross" bindtap="onClose" />
+                </view>
+            </view>
+            <!-- 使用优惠码 -->
+            <view class="promo-code-wrap">
+                <input class="promo-code-input" placeholder="请输入优惠码" disabled="{{isUsedPromoCode}}" type="text" bindinput="getPromoCode" value="{{promoCode}}" maxlength="12"/>
+                <button class="theme-customize-bg theme-customize-font-black promo-code-btn"  bindtap="usePromoCode">
+                {{ isUsedPromoCode ? '取消使用' : '使用' }}
+                </button>
+            </view>
+            <!-- 使用优惠券选择器 -->
+            <view class="coupon-code-tip">
+                <image class="tips-img" src="http://wechatapppro-1252524126.file.myqcloud.com/appAKLWLitn7978/image/kfgh9ha90lf1kyxyrpd.png"/>
+                <text>优惠码与优惠券不可叠加使用</text>
+            </view>
+            <view class="coupon-tab_warp">
+                <view class="tabItem" wx:for="{{coupon_tab}}" wx:key="activeIndex" wx:for-index="index" wx:for-item="item" bindtap="setTab" data-index="{{item.activeIndex}}">
+                    <text class="tabTitle {{curTabIndex !== item.activeIndex?'greyColor':''}}">{{item.activeIndex === 1 ?item.tabName+'('+couponList.length+')' : item.tabName+'('+disableCouponList.length+')'}}</text>
+                    <text class="activeBorder theme-customize-bg" wx:if="{{curTabIndex === item.activeIndex}}"></text>
+                </view>
+            </view>
+            <view class="coupon-tips">
+                <view class="coupon-tips-font">{{ couponTips }}<text class="coupon-money-num" wx:if="{{userChooseCouponList.length !== 0 && !isUsedPromoCode}}">￥{{ couponDiscountAmount }}</text>
+                </view>
+                <button wx:if="{{!(isUsedPromoCode || isRecommendCouponList)}}" bindtap="useRecommendCoupon" class="coupon-best-combination">使用推荐优惠</button>
+            </view>
+        </view>
+        <!-- 可用优惠券 -->
+        <view wx:if="{{curTabIndex === 1}}" class="coupon-list">
+            <view wx:if="{{couponList.length>0}}">
+                <view wx:for-index="index" wx:for-item="item" wx:for="{{couponList}}" class="coupon-item">
+                    <CouponItem userChooseBatchIdList="{{userChooseBatchIdList}}" userChooseCuIdList="{{userChooseCuIdList}}" cantOverlay="{{cantOverlay}}" isRecommendCouponList="{{}}" userChooseCouponList="{{userChooseCouponList}}" cantOverlay="{{cantOverlay}}" style="width: 100%" noSuperposition="{{noSuperposition}}" data-item="{{item}}" couponContent="{{item}}" bindchooseCoupon="chooseCoupon" dateInDetail="true">
+                    </CouponItem>
+                </view>
+                <view class="not-use-coupon" bindtap="notUseCoupon">
+                    <view class="not-use-text">不使用优惠券</view>
+                    <view class="choose-box">
+                        <image src="../../../common/assets/images/coupon/coupon_select.png" wx:if="{{isNotUseCoupon}}" class="choose-inner coupon-not-used" />
+                        <view wx:else class="choose-inner"></view>
+                    </view>
+                </view>
+            </view>
+            <view class="coupon_emptypage" wx:else >
+                <image src="../../../common/assets/images/coupon/emptypage.svg" class="coupon_emptyImg"/>
+                <view>您暂无可使用的优惠券</view>
+            </view>
+        </view>
+        <!-- 不可用优惠券 -->
+        <view class="coupon-list disabledList" wx:if="{{curTabIndex==2}}">
+            <view wx:if="{{disableCouponList.length > 0}}">
+                <view wx:for-index="index" wx:for-item="item" wx:for="{{disableCouponList}}" class="coupon-item">
+                    <CouponItem style="width: 100%" couponContent="{{item}}" disabled="true" :dateInDetail="true"></CouponItem>
+                </view>
+            </view>
+            <view class="coupon_emptypage" wx:else>
+                <image src="../../../common/assets/images/coupon/emptypage.svg" class="coupon_emptyImg"/>
+                <view>您暂无不可用的优惠券</view>
+            </view>
+        </view>
+        <view class="coupon-bottom">
+            <button class="coupon-confirm-button" bindtap="confirm">确  定</button>
+        </view>
+    </view>
 </van-popup>