fix

common/api.js

@@ -32,20 +32,14 @@
 import login from './httpList/login.js'
 import polyvVideo from './httpList/polyvVideo.js'
 import course from './httpList/course.js'
-<<<<<<< HEAD
 import oss from './httpList/oss.js'
-=======
 import bank from './httpList/bank.js'
 import note from './httpList/note.js'
->>>>>>> 19adad0d3b563f01c63edb1267920e3c4ea473bf
 export default {
 	...login,
 	...polyvVideo,
 	...course,
-<<<<<<< HEAD
-	...oss
-=======
+	...oss,
 	...bank,
 	...note
->>>>>>> 19adad0d3b563f01c63edb1267920e3c4ea473bf
 }

pages2/wd/info.vue

@@ -46,7 +46,6 @@
 					</picker>
 				</u-form-item>
 				<u-form-item label="一寸头像" :label-width="auto" label-position="top">
-<<<<<<< HEAD
 					<u-upload
 						:auto-upload="false"
 						custom-btn="true"
@@ -59,10 +58,7 @@
 						@on-list-change="changePhotoListHeader"
 					>
 						<template v-slot:addBtn>
-=======
-					<u-upload :auto-upload="false" custom-btn="true" :action="action"  :file-list="fileList" width="120" height ="169" size-type="['compressed']" max-count="1">
-						<template v-slot:addBtn >
->>>>>>> 19adad0d3b563f01c63edb1267920e3c4ea473bf
+
 							<image src="/static/info_1.png" style="width: 120rpx; height: 169rpx;"></image>
 						</template>
 					</u-upload>