Merge branch 'feature/奥莱商场迭代' into dev

src/views/goods/coupon/coupon.vue

@@ -101,7 +101,7 @@
             </el-button>
           </div>
         </div>
-        <div v-loading="loading">
+        <div v-loading="loading" class="scroll_class">
           <el-table
             ref="multipleTable"
             :data="tableDate"
@@ -130,6 +130,7 @@
                   <img v-if="scope.row.cardType === 2 && !scope.row.mainImageUrl" src="../../../../static/img/quan02.png" alt>
                   <img v-if="scope.row.cardType === 0 && !scope.row.mainImageUrl" src="../../../../static/img/quan01.png" alt>
                   <img v-if="scope.row.cardType === 1 && !scope.row.mainImageUrl" src="../../../../static/img/quan03.png" alt>
+                  <img v-if="scope.row.cardType === 3 && !scope.row.mainImageUrl" src="../../../../static/img/quan04.png" alt>
                   <div class="info-name">
                     <div>
                       <el-tooltip :content="'优惠券id：' + scope.row.integralMallProId" effect="dark" placement="top-start">
@@ -512,7 +513,9 @@ import couponLadderPrice from '../../../components/couponLadderPrice';
 import checkStockDistirbute from '../../../components/checkStockDistirbute';
 import relatePop from '@/components/relatePop';
 // import stockModal from '../../../components/getSkuList';
+import sticky from '@/utils/sticky.js';
 export default {
+  mixins: [sticky],
   components: {
     eqCode,
     editInfo,
@@ -524,6 +527,9 @@ export default {
   },
   data () {
     return {
+      headerTop: '62px',
+      parent: 'scroll_class',
+      scrollClass: 'dm-layout-page',
       getTime: getInputVal.getTime,
       getSeconds: getInputVal.getSeconds,
       searchValue: '',

src/views/goods/coupon/detail.vue

@@ -480,15 +480,16 @@
           <div class="section-content">
             <h3>售后服务</h3>
             <el-form-item label="支持退款" prop="refundType">
-               <el-radio v-model="couponForm.refundType" :label="0">
+               <el-radio v-model="couponForm.refundType" :label="0" :disabled="$route.query.giftId != '-1'">
                 否
               </el-radio>
-              <el-radio v-model="couponForm.refundType" :label="1">
+              <el-radio v-model="couponForm.refundType" :label="1" :disabled="$route.query.giftId != '-1'">
                 是
               </el-radio>
             </el-form-item>
             <el-form-item label="退款期限" prop="refundPeriod">
               <el-input-number v-model="couponForm.refundPeriod"
+                :disabled="$route.query.giftId != '-1'"
                 controls-position="right"
                 :min="1"
                 :max="10"
@@ -497,7 +498,7 @@
                 step-strictly></el-input-number> 月
             </el-form-item>
             <el-form-item label="退款方式" prop="refundWay">
-              <el-checkbox-group v-model="couponForm.refundWay" @change="checkBoxChange">
+              <el-checkbox-group v-model="couponForm.refundWay" @change="checkBoxChange" :disabled="$route.query.giftId != '-1'">
                 <el-checkbox label="1">主动退款</el-checkbox>
                 <el-checkbox label="2">过期自动退款</el-checkbox>
               </el-checkbox-group>
@@ -638,7 +639,7 @@ export default {
         timeZones: ['', ''],
         ladder: [],
         refundType: 0,
-        refundPeriod: 10,
+        refundPeriod: 1,
         refundWay: [],
       },
       uploadAction: getInputVal.uploadAction(),
@@ -919,7 +920,7 @@ export default {
             this.getCardInfo();
           }
           this.couponForm.refundType = res.data.result.refundType ? res.data.result.refundType : 0;
-          this.couponForm.refundPeriod = res.data.result.refundPeriod ? res.data.result.refundPeriod : 10;
+          this.couponForm.refundPeriod = res.data.result.refundPeriod ? res.data.result.refundPeriod : 1;
           this.couponForm.refundWay = res.data.result.refundWay ? res.data.result.refundWay.split(',') : [];
           this.echoVisibleData(res.data.result);
           this.couponForm.proName = res.data.result.proName;

src/views/order/refundList.vue

@@ -102,7 +102,12 @@
             <el-table-column fixed label="礼品信息" min-width="310px">
               <template slot-scope="scope">
                 <div class="gift-info">
-                  <img :src="scope.row.photoUrl">
+                  <!-- <img :src="scope.row.photoUrl"> -->
+                  <img v-if="scope.row.photoUrl" :src="scope.row.photoUrl" alt>
+                  <img v-if="scope.row.cardType === 2 && !scope.row.photoUrl" src="../../../static/img/quan02.png" alt>
+                  <img v-if="scope.row.cardType === 0 && !scope.row.photoUrl" src="../../../static/img/quan01.png" alt>
+                  <img v-if="scope.row.cardType === 1 && !scope.row.photoUrl" src="../../../static/img/quan03.png" alt>
+                  <img v-if="scope.row.cardType === 3 && !scope.row.photoUrl" src="../../../static/img/quan04.png" alt>
                   <div class="info-name">
                     <p class="pro-ellipsis">
                       {{ scope.row.proName }}