Merge branch 'master' of http://git.dgtis.com/sunlupeng/pointsMall-admin into dev

config/prod.env.js

@@ -2,9 +2,9 @@ module.exports = {
 	NODE_ENV: '"production"',
 	ENV_CONFIG: '"prod"',
 	// 阿里云环境
-  BASE_API: '"http://47.103.79.143:9085/admin"',
-  OS_API: '"http://47.103.79.143:9085/admin"'
+  // BASE_API: '"http://47.103.79.143:9085/admin"',
+  // OS_API: '"http://47.103.79.143:9085/admin"'
   //正式环境
-  // BASE_API: '"https://xiaoyou.dgtis.com/admin"',
-  // OS_API: '"https://xiaoyou.dgtis.com/admin"'
+  BASE_API: '"https://xiaoyou.dgtis.com/admin"',
+  OS_API: '"https://xiaoyou.dgtis.com/admin"'
 }

src/views/certManage/certList.vue

@@ -13,6 +13,7 @@
           </el-option>
         </el-select>
         <el-button class="filter-item" type="primary" v-waves icon="el-icon-search" @click="handleFilter">查找</el-button>
+        <el-button class="filter-item" type="primary" v-waves icon="el-icon-download" @click="handleDownLoad">导出</el-button>
       </div>
   
       <!-- 查询结果 -->
@@ -144,6 +145,9 @@
       this.getList();
     },
     methods: {
+      handleDownLoad(){
+            window.location.href = process.env.BASE_API + '/mall-integral-obtain/export/certificate?name=' + this.listQuery.name + '&title=' + this.listQuery.title + '&userName=' + this.listQuery.userName + '&status=' + this.listQuery.status;
+        },
       getList() {
         this.listLoading = true;
         list(this.listQuery)

src/views/exchangeManage/approvalList.vue

@@ -239,28 +239,6 @@ export default {
         return {
             productAttributeList: [],
             deliveryTypeList: [ ],
-            orderTypeList: [
-                {
-                    orderType: 0,
-                    orderTypeName: '商务待确认'
-                },
-                {
-                    orderType: 1,
-                    orderTypeName: '商务部已确认'
-                },
-                {
-                    orderType: 2,
-                    orderTypeName: '商务部作废'
-                },
-                {
-                    orderType: 3,
-                    orderTypeName: '员工已确认'
-                },
-                {
-                    orderType: 4,
-                    orderTypeName: '员工反馈问题件退回'
-                },
-            ],
             trackingNumber: '',
             comment: '',
             tableData: [],

src/views/exchangeManage/exchangeList.vue

@@ -230,7 +230,11 @@ export default {
                 },
                 {
                     orderType: 3,
-                    orderTypeName: '已确认收货'
+                    orderTypeName: '待确认'
+                },
+                {
+                    orderType: 4,
+                    orderTypeName: '已确认'
                 },
                 {
                     orderType: 2,

src/views/exchangeManage/pasList.vue

@@ -237,28 +237,6 @@ export default {
             productAttributeList: [],
             deliveryTypeList: [
            
-            ],
-            orderTypeList: [
-                {
-                    orderType: 0,
-                    orderTypeName: '商务待确认'
-                },
-                {
-                    orderType: 1,
-                    orderTypeName: '商务部已确认'
-                },
-                {
-                    orderType: 2,
-                    orderTypeName: '商务部作废'
-                },
-                {
-                    orderType: 3,
-                    orderTypeName: '员工已确认'
-                },
-                {
-                    orderType: 4,
-                    orderTypeName: '员工反馈问题件退回'
-                },
             ],
             trackingNumber: '',
             comment: '',

src/views/exchangeManage/voidList.vue

@@ -231,28 +231,6 @@ export default {
             productAttributeList: [],
             deliveryTypeList: [
             
-            ],
-            orderTypeList: [
-                {
-                    orderType: 0,
-                    orderTypeName: '商务待确认'
-                },
-                {
-                    orderType: 1,
-                    orderTypeName: '商务部已确认'
-                },
-                {
-                    orderType: 2,
-                    orderTypeName: '商务部作废'
-                },
-                {
-                    orderType: 3,
-                    orderTypeName: '员工已确认'
-                },
-                {
-                    orderType: 4,
-                    orderTypeName: '员工反馈问题件退回'
-                },
             ],
             trackingNumber: '',
             comment: '',