Merge remote-tracking branch 'origin/master-2.0' into master-2.0

陶杰

2024-09-12 fb48777cd4c3f086f77b5b26e1d03aebf995f4f5

 sub_pages/customer/coupon/good-self.vue

@@ -10,7 +10,7 @@
      <view class="p10">

         <view v-for="(item,index) of list" :key="index" class="good-item" :class="[query.status]">
            <view class="flex container img100">
            <view class="flex container img100" @click="selectItem(item)">
               <view class="info-price">
                  <image :lazy-load="true" :src="item.cover" class="cover" mode="scaleToFill"></image>
               </view>
@@ -19,8 +19,8 @@
                     {{item.name||''}}
                     <!-- <radio :checked="isIngood(item)" @click.stop="updateSelectGood(item)" v-if="source==='shopping'" class="select-coupon"></radio> -->
                     
                     <view :style="{ 'margin-right': '20rpx'}" @click.stop="updateSelectGood(item)"
                          class="component-radio m-l-a" :class="[isIngood(item)?'cur':'']" v-if="source==='shopping'">
                     <view :style="{ 'margin-right': '20rpx'}" class="component-radio m-l-a"
                        :class="[isIngood(item)?'cur':'']" v-if="source==='shopping'">
                     
                     </view>
                     
@@ -28,7 +28,7 @@
                  <view class="time word-e">
                     {{item.description||''}}
                  </view>
                  <view class="button m-l-a m-r-10" @click="getPointGood(item)" v-if="source!=='shopping'">
                  <view class="button m-l-a m-r-10" v-if="source!=='shopping'">
                     查看详情
                  </view>
            <!--       <view class="button" @click="updateSelectGood(item)" v-if="source=='shopping'">
@@ -110,6 +110,15 @@
      },

      methods: {
         selectItem(item) {
            if (this.source === 'shopping') {
               //选择
               this.updateSelectGood(item)
            } else {
               //详情
               this.getPointGood(item)
            }
         },
         isIngood(item) {
            for (var tmp of this.cache_goods) {
               if (tmp.id == item.id) {
@@ -186,8 +195,10 @@
         height: unset;
         padding: 20rpx;
         margin-top: 0rpx;

         .container {
            background-color: #fff;

            .info-price {
               .cover {
                  width: 150rpx;
@@ -198,6 +209,7 @@
            .info {
               margin-left: 20rpx;
               position: relative;

               .title {
                  font-weight: 600;
                  font-size: 36rpx;
@@ -206,6 +218,7 @@
                  text-align: left;
                  position: relative;
                  margin-top: 20rpx;

                  .select-coupon{
                     position: absolute;
                     right: 10rpx;