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

config/index.js

@@ -3,7 +3,7 @@ module.exports = {
   publicPath: '/integral-mall/',
   devServerProxy: {
     '/api-.*/': {
-      target: 'http://gicdev.demogic.com',
+      target: 'http://www.gicdev.com',
       changeOrigin: true,
     },
   },

index.html

@@ -49,7 +49,7 @@
     (function() {
       var src = '/component/static/import-component.js?timestrap=' + new Date().getTime();
       var host = window.location.host;
-      host = host.indexOf('localhost') > -1 || host.indexOf('192.168') > -1 ? 'gicdev.demogic.com' : host;
+      host = host.indexOf('localhost') > -1 || host.indexOf('192.168') > -1 ? 'www.gicdev.com' : host;
       document.write('<script src="//' + host + src + '"><\/script>');
     })();
   </script>

src/components/store/store.vue

@@ -107,7 +107,7 @@ export default {
   data () {
     return {
       action: window.location.origin + '/api-integral-mall/upload-pick-up-points',
-      // action: 'http://gicdev.demogic.com/api-integral-mall/upload-pick-up-points',
+      // action: 'http://www.gicdev.com/api-integral-mall/upload-pick-up-points',
       uploadData: {
         requestProject: 'integral-mall',
       },

src/config/index.js

 export default {
   // eslint-disable-next-line
-  api: process.env['NODE_ENV'] === 'development' ? 'http://gicdev.demogic.com/' : window.location.protocol + '//' + window.location.host + '/' || ''
+  api: process.env['NODE_ENV'] === 'development' ? 'http://www.gicdev.com/' : window.location.protocol + '//' + window.location.host + '/' || ''
   // /dmApi/
-  // http://gicdev.demogic.com/
+  // http://www.gicdev.com/
 };

src/service/request.js

@@ -5,9 +5,9 @@ import router from '../router';
 import { Message } from 'element-ui';
 // axios 配置
 // axios.defaults.timeout = 5000;
-// let adminUrl = 'http://gicdev.demogic.com'
+// let adminUrl = 'http://www.gicdev.com'
 // let adminUrl = process.env.NODE_ENV === 'production' ? '':'localhost:8080/'
-let adminUrl = process.env.NODE_ENV === 'production' ? '' : 'http://gicdev.demogic.com';
+let adminUrl = process.env.NODE_ENV === 'production' ? '' : 'http://www.gicdev.com';
 
 let request;
 

src/utils/common.js

@@ -103,7 +103,7 @@ export default {
   uploadAction: function(src='/api-plug/upload-img?requestProject=integral-mall') {
     let url = window.location.origin + src;
     if (window.location.origin.indexOf('localhost') != -1) {
-      url = `http://gicdev.demogic.com${src}`;
+      url = `http://www.gicdev.com${src}`;
     }
     return url;
   },

src/views/activities/flashSale/detail.vue

@@ -594,7 +594,7 @@ export default {
       responseParams: [], // 回显的数据
       channel: 0,
       uploadAction: window.location.origin + '/api-plug/upload-img?requestProject=integral-mall',
-      // uploadAction: 'http://gicdev.demogic.com/api-plug/upload-img?requestProject=integral-mall',
+      // uploadAction: 'http://www.gicdev.com/api-plug/upload-img?requestProject=integral-mall',
       headersUpload: {
         sign: '',
       },

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

@@ -477,6 +477,33 @@
               </p>
             </div>
           </div>
+          <div class="section-content">
+            <h3>售后服务</h3>
+            <el-form-item label="支持退款" prop="refundType">
+               <el-radio v-model="couponForm.refundType" :label="0" :disabled="$route.query.giftId != '-1'">
+                否
+              </el-radio>
+              <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"
+                style="width:130px"
+                :step="1"
+                step-strictly></el-input-number> 月
+            </el-form-item>
+            <el-form-item label="退款方式" prop="refundWay">
+              <el-checkbox-group v-model="couponForm.refundWay" @change="checkBoxChange" :disabled="$route.query.giftId != '-1'">
+                <el-checkbox label="1">主动退款</el-checkbox>
+                <el-checkbox label="2" :disabled="cardList.length > 1">过期自动退款</el-checkbox>
+              </el-checkbox-group>
+            </el-form-item>
+          </div>
 
           <!-- <div class="confim-btn" :style="{ width: fixedWidth + 'px' }">
             <el-form-item class="fix-btn">
@@ -611,6 +638,9 @@ export default {
         timeRangeList: [{ timeRange: '' }], // 部分时段数组
         timeZones: ['', ''],
         ladder: [],
+        refundType: 0,
+        refundPeriod: 1,
+        refundWay: [],
       },
       uploadAction: getInputVal.uploadAction(),
       headersUpload: {
@@ -633,6 +663,7 @@ export default {
         exchangeDateDayArr: [{ required: true, message: '请选择时间', trigger: 'change' }],
         exchangeDateWeekArr: [{ required: true, message: '请选择时间', trigger: 'change' }],
         proName: [{ required: true, message: '请输入券包名称', trigger: 'blur' }],
+        refundWay: [{ required: true, message: '请选择退款方式', trigger: 'blur' }],
       },
       validateTime,
       mallProId: '',
@@ -706,6 +737,9 @@ export default {
     document.documentElement.scrollTop = 0;
   },
   methods: {
+    checkBoxChange (e) {
+      // console.log(e);
+    },
     clearHistoryData () {
       this.$confirm('是否确认清除【展示门店数据】？清除后，可进入升级后的编辑页面。', '提示', {
         confirmButtonText: '确定',
@@ -885,6 +919,9 @@ export default {
             this.proReferId = this.coupCardId;
             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 : 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;
           this.proNameLen = getInputVal.getZhLen(this.couponForm.proName);
@@ -1039,7 +1076,7 @@ export default {
         this.visibleData.uuid = '';
         this.visibleData.useNewStoreWidget = 1;
       }
-      console.log(this.visibleData);
+      // console.log(this.visibleData);
       this.visibleData = Object.assign({}, this.visibleData);
     },
     // 礼品字数限制
@@ -1056,6 +1093,10 @@ export default {
       };
       request.post('/api-integral-mall/get-card', qs.stringify(params)).then(res => {
         if (res.data.errorCode === 0) {
+          // 退款方式
+          if (res.data.result.refundWay) {
+            this.couponForm.refundWay = res.data.result.refundWay.split(',');
+          }
           this.cardList = [];
           this.cardList = res.data.result;
           if (this.cardList.length === 1) {
@@ -1104,8 +1145,14 @@ export default {
     },
     // 子组件触发方法
     selectCard (arr) {
-      console.log(arr);
-      console.log(this.cardList);
+      // console.log(arr);
+      // console.log(this.cardList);
+      if (arr.length > 1) {
+        const index = this.couponForm.refundWay.indexOf('2');
+        if (index != -1) {
+          this.couponForm.refundWay.splice(index, 1);
+        }
+      }
 
       if (arr.length + this.cardList.length > 15) {
         this.$message.error(`最多支持添加15张卡券,目前一共选择${arr.length + this.cardList.length}张卡券`);
@@ -1129,7 +1176,7 @@ export default {
             });
             this.limitTimesNumArr.push(val.cardLimit);
             this.couponCardStockArr.push(val.couponStock);
-            console.log(this.couponCardStockArr);
+            // console.log(this.couponCardStockArr);
             this.limitTimes = Math.min.apply(null, this.limitTimesNumArr);
             this.limitTimesNum = Math.min.apply(null, this.limitTimesNumArr);
             this.couponCardStock = Math.min.apply(null, this.couponCardStockArr);
@@ -1142,7 +1189,7 @@ export default {
         };
         this.getCardCost(params);
       }
-      console.log(this.limitTimesNumArr);
+      // console.log(this.limitTimesNumArr);
     },
     async getCardCost (params) {
       const res = await request.post('/api-integral-mall/get-integral-mall-CashCost', qs.stringify(params));
@@ -1192,8 +1239,8 @@ export default {
         this.couponCardStock = '';
         this.couponForm.limitTimesStatus = false;
       }
-      console.log(this.limitTimesNumArr);
-      console.log(this.cardList);
+      // console.log(this.limitTimesNumArr);
+      // console.log(this.cardList);
     },
     // 券包积分计算
     handleIntegralCostTotal () {
@@ -1404,6 +1451,9 @@ export default {
             exchangeTimeType: this.couponForm.exchangeTimeType, // 兑换时段
             isDifferentialPricing: this.isDifferentialPricing,
             differentialPricingJson: JSON.stringify(this.submitLadderList),
+            refundType: this.couponForm.refundType,
+            refundPeriod: this.couponForm.refundPeriod,
+            refundWay: this.couponForm.refundWay.toString(),
           };
           // 可见配置参数组装
           params = { ...params, ...data };

src/views/goods/coupon/info.vue

@@ -697,7 +697,7 @@ export default {
         ladder: [],
       },
       uploadAction: window.location.origin + '/api-plug/upload-img?requestProject=integral-mall',
-      // uploadAction: 'http://gicdev.demogic.com/api-plug/upload-img?requestProject=integral-mall',
+      // uploadAction: 'http://www.gicdev.com/api-plug/upload-img?requestProject=integral-mall',
       headersUpload: {
         sign: '',
       },

src/views/goods/gift/addSku.vue

@@ -238,7 +238,7 @@ export default {
       refash: false,
       // skuList: [],
       uploadAction: window.location.origin + '/api-plug/upload-img?requestProject=intergral-mall',
-      // uploadAction: 'http://gicdev.demogic.com/api-plug/upload-img?requestProject=intergral-mall',
+      // uploadAction: 'http://www.gicdev.com/api-plug/upload-img?requestProject=intergral-mall',
       intergral: '',
       cash: '',
       stock: '',

src/views/goods/gift/info.vue

@@ -928,7 +928,7 @@ export default {
       },
       refundTypeStatus: false,
       uploadAction: window.location.origin + '/api-plug/upload-img?requestProject=integral-mall',
-      // uploadAction: 'http://gicdev.demogic.com/api-plug/upload-img?requestProject=integral-mall',
+      // uploadAction: 'http://www.gicdev.com/api-plug/upload-img?requestProject=integral-mall',
       headersUpload: {
         sign: '',
       },

src/views/order/couponExchange.vue

@@ -133,6 +133,8 @@
                   <img v-if="scope.row.cardType === 0 && !scope.row.giftMainPic" src="../../../static/img/quan01.png" alt="">
                   <!-- 折扣券 -->
                   <img v-if="scope.row.cardType === 1 && !scope.row.giftMainPic" src="../../../static/img/quan03.png" alt="">
+                  <!-- 商场券 -->
+                  <img v-if="scope.row.cardType === 3 && !scope.row.giftMainPic" src="../../../static/img/quan04.png" alt>
                   <div class="info-name">
                     <p class="pro-ellipsis">
                       {{ scope.row.giftName }}
@@ -144,7 +146,12 @@
                     </el-tooltip>
 
                     <p style="font-size:13px;color:#909399" v-if="scope.row.proReferId.indexOf(',') === -1">
-                      <span v-if="scope.row.status === 2">已领取</span><span v-if="scope.row.status <= 1">待领取</span> / <span v-if="scope.row.useStatus === 5">已使用</span><span v-if="scope.row.useStatus === 0">待使用</span><span v-if="scope.row.useStatus === 7">已销毁</span>
+                      <span v-if="scope.row.status === 2">已领取</span>
+                      <span v-if="scope.row.status <= 1 && scope.row.status != -2">待领取</span>
+                      <span v-if="scope.row.status != -2"> / </span>
+                      <span v-if="scope.row.useStatus === 5">已使用</span>
+                      <span v-if="scope.row.useStatus === 0">待使用</span>
+                      <span v-if="scope.row.useStatus === 7">已销毁</span>
                     </p>
                   </div>
                 </div>

src/views/order/giftExchange.vue

@@ -561,7 +561,7 @@ export default {
       projectName: '', // 当前项目名
       dialogVisible: false,
       excelUrl: '/api-integral-mall/download-integral-online-excel', // 下载数据的地址
-      // excelUrl: 'http://gicdev.demogic.com/api-integral-mall/download-integral-online-excel', // 下载数据的地址
+      // excelUrl: 'http://www.gicdev.com/api-integral-mall/download-integral-online-excel', // 下载数据的地址
       params: {}, // 传递的参数
       orderInfo: {}, // 订单信息
       deliverdModal: {

src/views/order/importInfo.vue

@@ -66,7 +66,7 @@ export default {
   data () {
     return {
       action: window.location.origin + '/api-integral-mall/upload-order-ship?requestProject=intergral-mall',
-      // action: 'http://gicdev.demogic.com/api-integral-mall/upload-order-ship?requestProject=intergral-mall',
+      // action: 'http://www.gicdev.com/api-integral-mall/upload-order-ship?requestProject=intergral-mall',
       headersUpload: {
         sign: '',
       },

src/views/order/refundList.vue

@@ -39,6 +39,7 @@
                 >
                   <el-option label="仅退款" :value="1" />
                   <el-option label="退货退款" :value="2" />
+                  <el-option label="过期自动退" :value="3" />
                 </el-select>
               </div>
               <div class="search-item m-r-10">
@@ -90,7 +91,7 @@
         <el-tab-pane label="待退款" name="0" class="goods-table-content" />
         <el-tab-pane label="退款成功" name="1" class="goods-table-content" />
         <el-tab-pane label="退款关闭" name="2" class="goods-table-content" />
-        <div class="goods-list-content" v-loading="loading">
+        <div class="goods-list-content scroll_class" v-loading="loading">
           <el-table
             :data="tableData"
             ref="multipleTable"
@@ -101,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 }}
@@ -160,6 +166,9 @@
                 <p v-if="scope.row.refundType === 2">
                   退货退款
                 </p>
+                <p v-if="scope.row.refundType === 3">
+                  过期自动退
+                </p>
               </template>
             </el-table-column>
             <el-table-column prop="definedCode" label="申请金额" min-width="120px">
@@ -289,6 +298,7 @@
 
 <script>
 import qs from 'qs';
+import sticky from '@/utils/sticky.js';
 import request from '../../service/request.js';
 import getInputVal from '../../utils/common.js';
 import closeRefund from './closeRefund';
@@ -296,6 +306,7 @@ import agreeRefund from './agreeRefund';
 import deliverModal from './delive';
 import memberInfo from '../../components/memberInfo';
 export default {
+  mixins: [sticky],
   components: {
     closeRefund,
     agreeRefund,
@@ -304,6 +315,9 @@ export default {
   },
   data () {
     return {
+      headerTop: '62px',
+      parent: 'scroll_class',
+      scrollClass: 'dm-layout-page',
       requestProject: 'integral-mall',
       placement: 'top-start',
       getTime: getInputVal.getTime,