解决 Profile.vue 合并冲突，同步master代码

buyer/src/pages/home/memberCenter/Profile.vue

@@ -47,8 +47,12 @@
 <script>
 import { Message } from "@/utils/message";
 import { editMemberInfo } from '@/api/account.js';
+<<<<<<< HEAD
 import { getMemberMsg } from '@/api/login.js';
 import { commonUrl } from '@/plugins/request.js';
+=======
+import { buyerUrl } from '@/plugins/request.js';
+>>>>>>> 29d5ba98ff40ecd028bcd8d89bf410f952052931
 import storage from '@/plugins/storage.js';
 import { User } from '@element-plus/icons-vue';
 export default {
@@ -60,7 +64,7 @@ export default {
         nickName: [{required: true, message: '用户昵称不能为空'}, { max: 16, message: '用户昵称不能超过15个字符' }]
       },
       formItem: {}, // 表单数据
-      action: commonUrl + '/common/common/upload/file', // 上传接口
+      action: buyerUrl + '/buyer/common/upload/file', // 上传接口
       accessToken: {} // 验证token
     }
   },

buyer/src/pages/home/memberCenter/evaluation/AddEval.vue

@@ -79,7 +79,7 @@ import { Message, Notice } from "@/utils/message";
 import { Camera, Delete, View } from '@element-plus/icons-vue';
 import { orderDetail } from '@/api/order.js';
 import { addEvaluation } from '@/api/member.js';
-import { commonUrl } from '@/plugins/request.js';
+import { buyerUrl } from '@/plugins/request.js';
 import storage from '@/plugins/storage';
 export default {
   components: { Camera, Delete, View },
@@ -93,7 +93,7 @@ export default {
         descriptionScore: 5
       }, // 表单
       visible: false, // 图片预览
-      action: commonUrl + '/common/common/upload/file', // 上传地址
+      action: buyerUrl + '/buyer/common/upload/file', // 上传地址
       accessToken: {}, // 验证token
       previewImage: '', // 预览图片地址
       loading: false, // 提交加载状态

buyer/src/pages/home/orderCenter/ApplyAfterSale.vue

@@ -105,7 +105,7 @@
 import { Message, Notice } from "@/utils/message";
 import { Camera, Delete, View } from '@element-plus/icons-vue';
 import { afterSaleReason, afterSaleInfo, applyAfterSale } from '@/api/member.js'
-import { commonUrl } from '@/plugins/request.js';
+import { buyerUrl } from '@/plugins/request.js';
 import storage from '@/plugins/storage';
 import * as RegExp from '@/plugins/RegExp'
 export default {
@@ -132,7 +132,7 @@ export default {
         num: 1
       },
       uploadList: [], // 上传列表
-      action: commonUrl + '/common/common/upload/file', // 上传地址
+      action: buyerUrl + '/buyer/common/upload/file', // 上传地址
       accessToken: {}, // 验证token
       visible: false, // 图片预览
       previewImage: '', // 预览图片url

buyer/src/pages/home/orderCenter/Complain.vue

@@ -66,7 +66,7 @@ import { Message, Notice } from "@/utils/message";
 import { Camera, Delete, View } from '@element-plus/icons-vue';
 import { orderDetail } from '@/api/order.js';
 import { afterSaleReason, handleComplain } from '@/api/member.js';
-import { commonUrl } from '@/plugins/request.js';
+import { buyerUrl } from '@/plugins/request.js';
 import storage from '@/plugins/storage';
 export default {
   components: { Camera, Delete, View },
@@ -79,7 +79,7 @@ export default {
         content: ''
       }, // 表单
       visible: false, // 图片预览
-      action: commonUrl + '/common/common/upload/file', // 上传地址
+      action: buyerUrl + '/buyer/common/upload/file', // 上传地址
       accessToken: {}, // 验证token
       previewImage: '', // 图片地址
       loading: false, // 加载状态

buyer/src/pages/shopEntry/FirstApply.vue

@@ -197,7 +197,7 @@ import { applyFirst } from '@/api/shopentry';
 import * as RegExp from '@/plugins/RegExp.js';
 import multipleMap from "@/components/map/multiple-map";
 import storage from '@/plugins/storage';
-import { commonUrl } from '@/plugins/request.js';
+import { buyerUrl } from '@/plugins/request.js';
 const FIRST_APPLY_DRAFT_KEY = 'shopEntryFirstDraft';
 
 export default {
@@ -211,7 +211,7 @@ export default {
   },
   data () {
     return {
-      action: commonUrl + '/common/common/upload/file', // 上传地址
+      action: buyerUrl + '/buyer/common/upload/file', // 上传地址
       accessToken: {}, // 验证token
       visible: false, // 预览图片
       loading: false, // 加载状态

buyer/src/pages/shopEntry/ThirdApply.vue

@@ -99,7 +99,7 @@ import { applyThird } from '@/api/shopentry';
 import { getCategory } from '@/api/goods';
 
 import storage from '@/plugins/storage';
-import { commonUrl } from '@/plugins/request.js';
+import { buyerUrl } from '@/plugins/request.js';
 
 
 import multipleMap from "@/components/map/multiple-map";
@@ -118,7 +118,7 @@ export default {
     return {
       loading: false, // 加载状态
       uploadLoading: false, // 上传加载状态
-      action: commonUrl + '/common/common/upload/file', // 上传地址
+      action: buyerUrl + '/buyer/common/upload/file', // 上传地址
       accessToken: {}, // 验证token
       previewPicture: '', // 预览图片