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

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/detail.vue

@@ -477,6 +477,32 @@
               </p>
             </div>
           </div>
+          <div class="section-content">
+            <h3>售后服务</h3>
+            <el-form-item label="支持退款" prop="refund">
+               <el-radio v-model="couponForm.refund" :label="1">
+                否
+              </el-radio>
+              <el-radio v-model="couponForm.refund" :label="2">
+                是
+              </el-radio>
+            </el-form-item>
+            <el-form-item label="退款期限" prop="num">
+              <el-input-number v-model="couponForm.num"
+                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="refundList">
+              <el-checkbox-group v-model="couponForm.refundList">
+                <el-checkbox label="主动退款"></el-checkbox>
+                <el-checkbox label="过期自动退款"></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 +637,9 @@ export default {
         timeRangeList: [{ timeRange: '' }], // 部分时段数组
         timeZones: ['', ''],
         ladder: [],
+        refund: 1,
+        num: 1,
+        refundList: [],
       },
       uploadAction: getInputVal.uploadAction(),
       headersUpload: {
@@ -633,6 +662,7 @@ export default {
         exchangeDateDayArr: [{ required: true, message: '请选择时间', trigger: 'change' }],
         exchangeDateWeekArr: [{ required: true, message: '请选择时间', trigger: 'change' }],
         proName: [{ required: true, message: '请输入券包名称', trigger: 'blur' }],
+        refundList: [{ required: true, message: '请选择退款方式', trigger: 'blur' }],
       },
       validateTime,
       mallProId: '',

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/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"
@@ -160,6 +161,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 +293,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 +301,7 @@ import agreeRefund from './agreeRefund';
 import deliverModal from './delive';
 import memberInfo from '../../components/memberInfo';
 export default {
+  mixins: [sticky],
   components: {
     closeRefund,
     agreeRefund,
@@ -304,6 +310,9 @@ export default {
   },
   data () {
     return {
+      headerTop: '62px',
+      parent: 'scroll_class',
+      scrollClass: 'dm-layout-page',
       requestProject: 'integral-mall',
       placement: 'top-start',
       getTime: getInputVal.getTime,