COMMIT -M 修改冲突

api/other.js

@@ -1,39 +0,0 @@
-/**
- *@des 其他模块接口
- *@author zhengjinyi
- *@date 2020/03/19 14:56:57
- *@param registerByPass
- */
-import request from '@/common/config/caimeiApi.js'
-
-/**
- *医美机构正品联盟
- * @param
- */
-export function queryMember(params) {
-	return new Promise(function(resolve,reject) {
-		request.get('/home/member',params, res => {
-			if(res.code == 0){
-				resolve(res)
-			}else{
-				reject(res)
-			}
-		})
-	})
-}
-/**
- *机构协议,用户协议,隐私权政策
- *@param helpPageID 隐私权政策id:1013,平台规则id:1023,机构协议:1036
- */
-export function protocolAgree(params) {
-	return new Promise(function(resolve,reject) {
-		request.get('/club/protocol',params, res => {
-			if(res.code == 0){
-				resolve(res)
-			}else{
-				reject(res)
-			}
-		})
-	})
-}
-

components/cm-module/listTemplate/memberList.vue

@@ -35,7 +35,6 @@
 
 <script>
 	import listSkeleton from '@/components/cm-module/listTemplate/listSkeleton'
-	import { queryMember } from "@/api/other.js"
 	export default {
 		name:'MemberList',
 		components:{
@@ -100,7 +99,7 @@
 				if(loadMore) {
 					self.pageNum += 1;
 				}
-				queryMember({pageNum:this.pageNum,pageSize:this.pageSize}).then(response =>{
+				this.OtherService.QueryHomeMemberList({pageNum:this.pageNum,pageSize:this.pageSize}).then(response =>{
 					const resData = response.data;
 					const resList = resData.results;
 					if(resList && resList.length > 0){

pages/service/organagree.vue

@@ -6,7 +6,6 @@
 
 <script>
 	import richTextTemplate from '@/components/cm-module/listTemplate/richTextTemplate'
-	import { protocolAgree } from "@/api/other.js"
 	
 	export default{
 		components: {
@@ -24,7 +23,7 @@
 		methods:{
 			initData(){
 				let self = this;
-				protocolAgree({helpPageID:1036}).then(response =>{
+				this.OtherService.QueryClubProtocol({helpPageID:1036}).then(response =>{
 					let data =response.data.content
 					self.$refs.childTemplate.html = self.$api.adaptRichTextImg(data);
 				}).catch(error =>{

pages/service/privacyagree.vue

@@ -6,7 +6,6 @@
 
 <script>
 	import richTextTemplate from '@/components/cm-module/listTemplate/richTextTemplate'
-	import { protocolAgree } from "@/api/other.js"
 	
 	export default{
 		components: {
@@ -24,7 +23,7 @@
 		methods:{
 			initData(){
 				let self = this;
-				protocolAgree({helpPageID:1013}).then(response =>{
+				this.OtherService.QueryClubProtocol({helpPageID:1013}).then(response =>{
 					let data =response.data.content
 					self.$refs.childTemplate.html = self.$api.adaptRichTextImg(data);
 				}).catch(error =>{

pages/service/supplieragree.vue

@@ -6,7 +6,6 @@
 
 <script>
 	import richTextTemplate from '@/components/cm-module/listTemplate/richTextTemplate'
-	import { protocolAgree } from "@/api/other.js"
 	
 	export default{
 		components: {
@@ -24,7 +23,7 @@
 		methods:{
 			initData(){
 				let self = this;
-				protocolAgree({helpPageID:1036}).then(response =>{
+				this.OtherService.QueryClubProtocol({helpPageID:1036}).then(response =>{
 					let data =response.data.content
 					self.$refs.childTemplate.html = self.$api.adaptRichTextImg(data);
 				}).catch(error =>{

pages/service/useragree.vue

@@ -6,7 +6,6 @@
 
 <script>
 	import richTextTemplate from '@/components/cm-module/listTemplate/richTextTemplate'
-	import { protocolAgree } from "@/api/other.js"
 	
 	export default{
 		components: {
@@ -24,7 +23,7 @@
 		methods:{
 			initData(){
 				let self = this;
-				protocolAgree({helpPageID:1023}).then(response =>{
+				this.OtherService.QueryClubProtocol({helpPageID:1023}).then(response =>{
 					let data =response.data.content
 					self.$refs.childTemplate.html = self.$api.adaptRichTextImg(data);
 				}).catch(error =>{

services/other.service.js

@@ -12,4 +12,16 @@ export default class OtherService {
 	QuerySaveClause (data) {
 		return this.AjaxService.get({ url:'/seller/clause', data, isLoading: true })
 	}
+	/**
+	 * 正品联盟
+	 */
+	QueryHomeMemberList (data) {
+		return this.AjaxService.get({ url:'/home/member', data, isLoading: true })
+	}
+	/**
+	 * 协议
+	 */
+	QueryClubProtocol (data) {
+		return this.AjaxService.get({ url:'/club/protocol', data, isLoading: true })
+	}
 }

services/product.service.js

@@ -150,6 +150,10 @@ export default class ProductService {
 	GetProductPreferred (data = {}) {
 		return this.AjaxService.get({ url:'/product/preferred', data, isLoading: true })
 	}
+	/* 发票信息回显 */
+	GetPersonalCenterFindInvoice (data = {}) {
+		return this.AjaxService.get({ url:'/personalCenter/findInvoice', data, isLoading: false })
+	}
 	/* 发票信息保存 */
 	GetPersonalCenterInvoice (data = {}) {
 		return this.AjaxService.post({ url:'/personalCenter/invoice', data, isLoading: true })