1

.gitignore

@@ -67,4 +67,6 @@ unimall.log.*.tmp
 ### plugins ###
 /plugins/
 /unimall-app/pages/plugins/
-/unimall-admin/src/views/plugins/
+/unimall-admin/src/views/plugins/
+xiaochengxu/unpackage/
+

xiaochengxu/config/index.js

@@ -1,5 +1,5 @@
 const dev = {
-	baseUrlNew: 'http://192.168.110.82:8090',
+	baseUrlNew: 'http://192.168.110.138:8182',
 	// baseUrlNew: 'https://shiyaopinche.cspc.cn:10443',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false

xiaochengxu/pages/mySet/cardType.vue

@@ -17,17 +17,18 @@
 		<u-modal :show="show" title="新增分类" >
 			<view class="slot-content">
 				<u--input
-										v-model="model1.userInfo.sex"
-										disabled
-										disabledColor="#ffffff"
-										placeholder="输入分类名称，2-8个字符"
-										border="none"
-								></u--input>
+				v-model="model1.userInfo.sex"
+				placeholder="输入分类名称，2-8个字符"
+				border="none"
+				showCancelButton='true'
+				@confirm='confirm'
+				@cancel='show=false'
+				></u--input>
 			</view>
 		</u-modal>
 
 		<view class="footer">
-			<view class='button'>新增</view>
+			<view @click='add' class='button'>新增</view>
 		</view>
 	</view>
 </template>
@@ -36,8 +37,22 @@
 	export default {
 		data() {
 			return {
-				
+				show:false,
 			};
+		},
+		methods: {
+			del(){
+				
+			},
+			add(){
+				// if(){
+					
+				// }
+				this.show=true
+			},
+			confirm(){
+				this.show=false
+			}
 		}
 	}
 </script>

xiaochengxu/pages/mySet/myHome.vue

@@ -6,34 +6,47 @@
 		    @change="change" @click="click">
 			</u-swiper>	
 		</view>
+		<view>
+			<u-upload
+					:fileList="fileList1"
+					@afterRead="afterRead"
+					@delete="deletePic"
+					name="1"
+					multiple
+					:maxCount="10"
+				></u-upload>
+		</view>
 		<!-- <u-skeleton
 			    rows="3"
 			    title
 				loading
 		></u-skeleton> -->
 		<view class="company-title">
-		 	
+		 	<u--input v-model="companyData.companyName" placeholder="请选择性别" border="none" ></u--input>
 		</view>
 		<view class="intro">
-			
+			<u--input v-model="companyData.companyIntroduction" placeholder="请选择性别" border="none" ></u--input>
 		</view>
 		<view class="scope">
-			
+			<u--input v-model="companyData.scopeOfBusiness" placeholder="请选择性别" border="none" ></u--input>
 		</view>
-		<u-list @scrolltolower="scrolltolower">
+		<u-list>
 			<u-list-item>
-				我是地址我是地址我是地址我是地址我是地址
+				<u--input v-model="companyData.companyAddress" placeholder="请选择性别" border="none" ></u--input>
 			</u-list-item>
 			<u-list-item>
-				我是地址我是地址我是地址我是地址我是地址
+				<u--input v-model="companyData.phone" placeholder="请选择性别" border="none" ></u--input>
 			</u-list-item>
 			<u-list-item>
-				我是地址我是地址我是地址我是地址我是地址
+				<u--input v-model="companyData.portraiture" placeholder="请选择性别" border="none" ></u--input>
 			</u-list-item>
 			<u-list-item>
-				我是地址我是地址我是地址我是地址我是地址
+				<u--input v-model="companyData.postbox" placeholder="请选择性别" border="none" ></u--input>
 			</u-list-item>
 		</u-list>
+		<view class="footer">
+			<view @click='edit' class='button'>编辑</view>
+		</view>
 	</view>
 </template>
 
@@ -41,15 +54,96 @@
 	export default {
 		data() {
 			return {
-				list1: [
-					'https://cdn.uviewui.com/uview/swiper/swiper1.png',
-				    'https://cdn.uviewui.com/uview/swiper/swiper2.png',
-				    'https://cdn.uviewui.com/uview/swiper/swiper3.png',
-				]
+				list1: [],
+				companyData:{},
 			}
 		},
 		methods: {
-			
+			edit(){
+				
+				// uni.showLoading({
+				// 	title: '数据加载中'
+				// })
+				// this.$request.baseRequest('personalHomepageInfo', 'list', {
+				// 	remark2: this.route,
+				// 	carpoolingType: this.type,
+				// 	companyId: 1,
+				// 	pageNum: page.num,
+				// 	pageSize: page.size,
+				// }, failres => {
+				// 	console.log('res+++++', failres.errmsg)
+				// 	this.$refs.uToast.show({
+				// 		type: 'error',
+				// 		message: failres.errmsg,
+				// 	})
+				// 	uni.hideLoading()
+				// }).then(res => {
+				// 	// if (res.errno == 200) {
+				// 	uni.hideLoading()
+				// 	console.log(11)
+				// 	let curPageData = res.data.items;
+				// 	let totalPage = res.data.total;
+				// 	let curPageLen = curPageData.length;
+				// 	this.mescroll.endByPage(curPageLen, totalPage);
+				// 	console.log(res.data)
+				// 	// this.makeData(res.data)
+				// 	if (page.num == 1) this.infoList = []; //如果是第一页需手动置空列表
+				// 	this.infoList = this.infoList.concat(curPageData); //追加新数据
+				// 	// }
+				// })
+				// uni.navigateTo({
+				// 	url:_url
+				// })
+			},
+			deletePic(event) {
+				this[`fileList${event.name}`].splice(event.index, 1)
+			},
+			// 新增图片
+			async afterRead(event) {
+				// 当设置 multiple 为 true 时, file 为数组格式，否则为对象格式
+				let lists = [].concat(event.file)
+				let fileListLen = this[`fileList${event.name}`].length
+				lists.map((item) => {
+					this[`fileList${event.name}`].push({
+						...item,
+						status: 'uploading',
+						message: '上传中'
+					})
+				})
+				for (let i = 0; i < lists.length; i++) {
+					const result = await this.uploadFilePromise(lists[i].url)
+					let item = this[`fileList${event.name}`][fileListLen]
+					this[`fileList${event.name}`].splice(fileListLen, 1, Object.assign(item, {
+						status: 'success',
+						message: '',
+						url: result
+					}))
+					fileListLen++
+				}
+			},
+			uploadFilePromise(url) {
+				return new Promise((resolve, reject) => {
+					// uploadImage(res.tempFilePaths[0], 'cardImages/',
+					// 				result => {
+					// 					// this.trainImg = result
+					// 					uni.hideLoading();
+					// 				}
+					// 			)
+					// let a = uni.uploadFile({
+					// 	url: 'http://192.168.2.21:7001/upload', // 仅为示例，非真实的接口地址
+					// 	filePath: url,
+					// 	name: 'file',
+					// 	formData: {
+					// 		user: 'test'
+					// 	},
+					// 	success: (res) => {
+					// 		setTimeout(() => {
+					// 			resolve(res.data.data)
+					// 		}, 1000)
+					// 	}
+					// });
+				})
+			},
 		}
 	}
 </script>

xiaochengxu/pages/mySet/newCard.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="content">
-		<view class="content1">
+		 <view class="content1">
 			<view class="left">
 				<image src="../../static/c3.png" mode="widthFix" class="img"></image>
 			</view>
@@ -23,32 +23,32 @@
 			</view>
 		</view>
 		<view class="change-template">
-			<切换模板>
+			切换模板
 		</view>
-		<view class="content2">
+		 <view class="content2">
 			<view class="">
 				名片信息
 			</view>
-			<u--form labelPosition="left" :model="cardInfo" ref="uForm">
-				<u-form-item label="名片标识" prop="userInfo.name" borderBottom ref="item1">
+			 <u--form labelPosition="left" :model="cardInfo" ref="uForm">
+				<u-form-item label="名片标识" prop="name" borderBottom >
 					<text>名片-1</text>
 				</u-form-item>
-				<u-form-item label="姓名" prop="userInfo.name" borderBottom ref="item1">
+				<u-form-item label="姓名" prop="name" borderBottom>
 					<u--input v-model="cardInfo.name" border="none" placeholder="输入姓名"></u--input>
 				</u-form-item>
-				<u-form-item label="职务" prop="userInfo.name" borderBottom ref="item1">
+				<u-form-item label="职务" prop="name" borderBottom >
 					<u--input v-model="cardInfo.name" border="none" placeholder="输入职务,不超过8个字符"></u--input>
 				</u-form-item>
-				<u-form-item label="公司/机构名称" prop="userInfo.name" borderBottom ref="item1">
+				<u-form-item label="公司/机构名称" prop="name" borderBottom >
 					<u--input v-model="cardInfo.name" border="none" placholder="输入公司/机构名称"></u--input>
 				</u-form-item>
-				<u-form-item label="定位" prop="userInfo.name" borderBottom ref="item1">
+				<u-form-item label="定位" prop="name" borderBottom >
 					<text>选择定位></text>
 				</u-form-item>
-				<u-form-item label="详细地址" prop="userInfo.name" borderBottom ref="item1">
+				<u-form-item label="详细地址" prop="name" borderBottom>
 					<u--input v-model="cardInfo.name" border="none" placeholder="输入地址,不超过15个字"></u--input>
 				</u-form-item>
-				<u-form-item label="联系电话" prop="userInfo.name" borderBottom ref="item1">
+				<u-form-item label="联系电话" prop="name" borderBottom>
 					<u--input v-model="cardInfo.name" border="none" placeholder="输入联系电话"></u--input>
 				</u-form-item>
 			</u--form>
@@ -61,7 +61,7 @@
 				<u-upload :fileList="fileList1" @afterRead="afterRead" @delete="deletePic" name="1" multiple
 					:maxCount="10"></u-upload>
 			</view>
-		</view>
+		</view> 
 		<view class="bottom">
 			<button>提交</button>
 		</view>