Merge branch 'pengyouhao_dev'

src/api/distributorManagement.js

@@ -11,7 +11,7 @@ export function memberListService2(data) {
 
 export function memberPageExport(data, name) {
   return postBlob({
-    url: '/member/pageExport',
+    url: '/member/list/service2/export',
     data,
     name
   })

src/api/masterManagement.js

@@ -11,7 +11,7 @@ export function memberListPageV2(data) {
 
 export function memberPageExport(data, name) {
   return postBlob({
-    url: '/member/pageExport',
+    url: '/member/list/page2/export',
     data,
     name
   })

src/views/mallManagement/configCenter/slideshowConfig/index.vue

@@ -447,18 +447,25 @@ export default {
                 Object.assign(this.formData, res.data, {
                   imgSrc: res.data.imgSrc ? [{ url: res.data.imgSrc }] : []
                 })
-                getGoodsList({
-                  pageNum: 1,
-                  pageSize: -1,
-				  goodsId: res.data.goodsId,
-                }).then(res => {
-                  // this.goodsList = res.data.records.map(item => ({
-                  //   value: item.goodsId,
-                  //   label: item.goodsName
-                  // }))
-				  this.formData.goodsId = res.data.records[0].goodsId
-				  this.formData.goodsName = res.data.records[0].goodsName
-                })
+				if(res.data.port == 'ESHOP'){
+					getUsedGoodsList({
+						pageNum: 1,
+						pageSize: -1,
+						params:  [{param: "a.id", compare: "=", value: res.data.goodsId}]
+					}).then(ress => {
+						this.formData.goodsId = ress.data.records[0].goodsId
+						this.formData.goodsName = ress.data.records[0].goodsName
+					})
+				}else{
+					getGoodsList({
+						pageNum: 1,
+						pageSize: -1,
+						goodsId: res.data.goodsId,
+					}).then(ress => {
+					  this.formData.goodsId = ress.data.records[0].goodsId
+					  this.formData.goodsName = ress.data.records[0].goodsName
+					})
+				}
               })
             }
           })

src/views/userManagement/distributorManagement/index.vue

@@ -8,8 +8,7 @@
 			}">
 				<template-page ref="pageRef" :get-list="getList" :table-attributes="tableAttributes" :table-events="tableEvents" :operationColumnWidth="280"
 				  :options-evens-group="optionsEvensGroup" :moreParameters="moreParameters" :column-parsing="columnParsing"
-				  :operation="operation()">
-					<!-- :exportList="exportList" -->
+				  :operation="operation()" :exportList="exportList">
 					<div slot="moreSearch">
 					  <el-radio-group v-model="examineStatus" size="mini" @change="changeType">
 					  	<el-radio-button label="">全部</el-radio-button>
@@ -240,6 +239,7 @@ export default {
 	changeType(val) {
 	  this.$refs.pageRef.refreshList()
 	},
+	exportList: memberPageExport,
 	// 列表请求函数
 	getList(p) {
 	  try {

src/views/userManagement/masterManagement/index.vue

@@ -8,7 +8,7 @@
       }">
         <template-page ref="pageRef" :get-list="getList" :table-attributes="tableAttributes" :table-events="tableEvents"
           :operationColumnWidth="260" :options-evens-group="optionsEvensGroup" :moreParameters="moreParameters"
-          :column-parsing="columnParsing" :operation="operation()">
+          :column-parsing="columnParsing" :operation="operation()" :exportList="exportList">
           <div slot="moreSearch">
             <el-radio-group v-model="examineStatus" size="mini" @change="changeType">
               <el-radio-button label="">全部</el-radio-button>
@@ -286,6 +286,7 @@ export default {
     changeType(val) {
       this.$refs.pageRef.refreshList()
     },
+	exportList: memberPageExport,
     // 列表请求函数
     getList(p) {
       try {