Merge branch 'v2' of http://47.96.225.205:8888/r/hmy_farmer-main into remot...

xuxueyang

2024-09-11 e3c0ebbd9f9ee111f29be9f76979edd97f1d6f3a

 sub_pages/customer/coupon/good-all.vue

@@ -2,7 +2,8 @@
   <view class="good-list-container">
      <view class="top-bg img100 relative" :style="{'padding-top':(StatusBar)+'px','line-height':CustomBar+'rpx' }">
         <!-- ../../../static/images/customer/coupon/good-top-bg.png -->
         <image class="component-bg" src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/a9/a9731b0037924324a3d3318dfa7d10c5LZk6JsSC33ua754767bf8c714154f06bbd5b4d905174.png"
         <image class="component-bg"
            src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/a9/a9731b0037924324a3d3318dfa7d10c5LZk6JsSC33ua754767bf8c714154f06bbd5b4d905174.png"
            mode="scaleToFill" />

         <view class="title">
@@ -19,7 +20,7 @@
                  <uni-icons class="icon" type="right" size="32"></uni-icons>
               </view>
            </view>
            <view class="m-l-a m-r-0 rule"  @click="goto('/pages/help/content?id=积分规则',false)">
            <view class="m-l-a m-r-0 rule" @click="goto('/pages/help/content?id=积分规则',false)">
               <view class="flex w-fit m-l-a m-r-15">
                  <view class="m-r-10">规则</view>
                  <image src="../../../static/images/customer/coupon/icon-rule.png" class="rule-icon">
@@ -77,13 +78,13 @@
                     {{item.couponName||'-'}}
                  </view>
                  <view class="time">
                     领取后{{item.usageTimeNum||''}}{{item.usageTimeTypeName||''}}有效
                     {{item.getStartDate||'领取后'}}{{item.getEndDate&&(' 至 ' + item.getEndDate )||''}}有效
                  </view>
                  <view class="flex">
                     <view class="t-red">
                        {{item.point||'0'}}积分
                     </view>
                     <view class="button m-l-a m-r-0" @click="exchange('coupon',item)">
                     <view class="button m-l-a m-r-15" @click="exchange('coupon',item)">
                        兑换
                     </view>
                  </view>
@@ -102,6 +103,7 @@
         changeTab(flg) {
            this.flg = '' + flg
            this.listApi = this.tabs[flg].api
            this.list = []
            this.refreshList()
         },
         async exchange(type, item) {
@@ -121,12 +123,15 @@
               data: {
                  couponId: item.id,
                  goodsId: item.id, //兼容2个
                  num:1
                  num: 1
               }
            })
            this.$message.hideLoading()
            if (code == 0) {
               this.$message.showToast('兑换成功')
               //刷新积分					
               this.$store.dispatch('getCurrentInfo');
               await this.$message.showToast('兑换成功')

            }
         },
         toDetail(item) {
@@ -134,7 +139,7 @@
               url: '/sub_pages/customer/coupon/good-detail?id=' + item.id
            })
         },
         changeScore(item){
         changeScore(item) {
            this.query.pointLower = item.min || 0
            this.query.pointUpper = item.max || 990000
            this.refreshList()
@@ -187,6 +192,13 @@
      },
      onLoad() {
         this.listApi = '/api/customer/point/goods/list'
         this.getList()
      },
      onPullDownRefresh() {
         //刷新积分和刷新商品
         this.$store.dispatch('getCurrentInfo');
         // this.list = []
         this.refreshList()
      },

      onReachBottom() {
@@ -196,6 +208,8 @@
</script>

<style lang="scss" scoped>
   @import './coupon.scss';
	
   .good-list-container {
      .good-container {
         .good-item {
@@ -211,7 +225,7 @@
            }

            .title {
               padding:18rpx 18rpx 0rpx 18rpx;
               padding: 18rpx 18rpx 0rpx 18rpx;
               font-weight: 600;
               font-size: 32rpx;
               color: #000000;
@@ -225,7 +239,7 @@
               font-weight: 400;
               font-size: 24rpx;
               color: #44775A;
               padding:18rpx;
               padding: 18rpx;
               padding-bottom: 28rpx;

               .score {
@@ -261,6 +275,7 @@

      .query-scores {
         overflow-x: scroll;

         // width: max-content;
         .item {
            min-width: fit-content;
@@ -274,7 +289,7 @@
            height: 50rpx;
            border-radius: 26rpx;
            // width: fit-content;
				

         }

         .item.active {