From a5b83f31a85f7505d9eeab8ed7bd795255d5d8aa Mon Sep 17 00:00:00 2001
From: ghusermoon <2673031505@qq.com>
Date: Fri, 10 Jul 2020 09:03:19 +0800
Subject: [PATCH] upload file

---
 README.md                            |  4 +-
 common/api/user.js                   | 11 +-----
 components/mine/order-item/index.vue |  8 +++-
 pageE/mine/EditUserInfo.vue          |  3 +-
 pageE/mine/MemberServe.vue           |  9 ++++-
 pageE/more/Complaints.vue            | 37 ++++++++---------
 pageE/more/WriteComments.vue         | 31 +++++++++------
 pageE/order/Details.vue              | 29 +++++++-------
 pageE/order/Index.vue                | 10 ++---
 pageE/setting/Index.vue              |  6 ++-
 pageE/setting/ShieldUsers.vue        | 59 ++++++++++++++++++++++++++++
 pageE/tool/ManicureOrder.vue         | 30 ++++++++++----
 pages.json                           | 13 ++++++
 pages/mine/index.vue                 |  4 +-
 static/js/common.js                  | 13 +++---
 15 files changed, 183 insertions(+), 84 deletions(-)
 create mode 100644 pageE/setting/ShieldUsers.vue

diff --git a/README.md b/README.md
index d7273e7..762c8f6 100644
--- a/README.md
+++ b/README.md
@@ -44,9 +44,9 @@ unescapeHTML(temp){}
 /**
 * 上传文件(只能单文件上传)
 * @param { String } url 服务器 url
+* @param { String } name 上传类型 goods-商品图片 avatar-用户头像 video-视频 store_logo-店铺logo store_banner-店铺banner store_avatar-店铺头像
 * @param { String } filePath 要上传文件资源的路径
-* @param { String } type 上传文件验证类型 默认: img 可选: video
 * @return { object } promise 对象 resolve 返回文件服务器地址 reject 返回错误信息
 */
-uploadFile({ url, filePath, type = 'img' } = {}) {}
+uploadFile({ url, name, filePath }) {}
 ```
\ No newline at end of file
diff --git a/common/api/user.js b/common/api/user.js
index a2bf0a0..547978c 100644
--- a/common/api/user.js
+++ b/common/api/user.js
@@ -216,7 +216,7 @@ export default {
 					page: page,
 				});
 			},
-			// 意见反馈列表 
+			// 意见反馈列表
 			getFeedbackList({ page }) {
 				return vm.$u.post('Member/feedbackList', {
 					page: page,
@@ -254,15 +254,6 @@ export default {
 					file: file,
 				 });
 			},
-			// 上传图片视频
-			uploadfile({ file }) {
-				const params = {
-					file: file
-				}
-				console.log(params);
-				
-				return vm.$u.post('Upload/uploadfile', params);
-			},
         }
     }
 }
\ No newline at end of file
diff --git a/components/mine/order-item/index.vue b/components/mine/order-item/index.vue
index cc7cb64..8000b77 100644
--- a/components/mine/order-item/index.vue
+++ b/components/mine/order-item/index.vue
@@ -17,7 +17,7 @@
 					<view class="goods-price u-line-1" v-if="order.order_state == 20 || order.order_state == 40">总价：￥99.00，实付款￥99</view>
 					<view class="goods-date" v-if="order.order_state == 20 || order.order_state == 40">
 						<image src="@/pageE/static/mine/26.png"></image>
-						<view>2020.05.17</view>
+						<view>{{ order.add_time | date }}</view>
 					</view>
 				</view>
 			</view>
@@ -25,6 +25,7 @@
 		<view class="order-btn" v-if="[10, 30, 20, 40].indexOf(order.order_state) >= 0">
 			<view class="logistics" v-if="order.order_state == 30" @click="toLogistics">查看物流</view>
 			<view class="comment" v-if="order.order_state == 20" @click="toComment">立即评价</view>
+			<view class="calcel" v-if="order.order_state == 10">取消支付</view>
 			<view class="payment" v-if="order.order_state == 10">立即支付</view>
 			<view class="service" v-if="order.order_state == 40">联系官方客服</view>
 			<view class="submit" v-if="order.order_state == 40">提交官方审核</view>
@@ -70,7 +71,7 @@ export default {
 	methods: {
 		toDetailsPage() {
 			uni.navigateTo({
-				url: '/pageE/order/Details?order.order_state=' + this.order.order_state
+				url: '/pageE/order/Details?id=' + this.order.order_id
 			});
 		},
 		toLogistics() {
@@ -184,6 +185,9 @@ export default {
 		.logistics, .comment, .payment {
 			@include btn-class($width: 160rpx, $color: rgba(255,119,15,1));
 		}
+		.calcel {
+			@include btn-class($width: 160rpx, $color: rgba(155,153,153,1));
+		}
 		.service {
 			@include btn-class($width: 216rpx, $color: rgba(155,153,153,1));
 		}
diff --git a/pageE/mine/EditUserInfo.vue b/pageE/mine/EditUserInfo.vue
index 91fc9c1..c5276bd 100644
--- a/pageE/mine/EditUserInfo.vue
+++ b/pageE/mine/EditUserInfo.vue
@@ -80,7 +80,8 @@ export default {
 					this.avatar = res.tempFilePaths[0];
 					common.uploadFile({ 
 						url: url,
-						filePath: res.tempFilePaths[0] 
+						name: 'avatar',
+						filePath: res.tempFilePaths[0]
 					}).then(result => {
 						this.avatar = result;
 					}, error => {
diff --git a/pageE/mine/MemberServe.vue b/pageE/mine/MemberServe.vue
index 575dfa1..af082c6 100644
--- a/pageE/mine/MemberServe.vue
+++ b/pageE/mine/MemberServe.vue
@@ -17,7 +17,10 @@
 						</view>
 						<view @click="viewProgress">
 							<view class="title">预计进度</view>
-							<view class="value">{{ memberInfo.next_grade_exppoints_diff }}</view>
+							<!-- <view class="value">{{ memberInfo.next_grade_exppoints_diff }}</view> -->
+							<view class="value">
+								<image src="/static/image/mine/32.png"></image>
+							</view>
 						</view>
 					</view>
 					<scroll-view scroll-y class="integral-botom" :style="{ height: richHeight }">
@@ -151,6 +154,10 @@ export default {
 						font-size: 48rpx;
 						font-weight: 500;
 						color: rgba(255,255,255,1);
+						> image {
+							width: 52rpx;
+							height: 35rpx;
+						}
 					}
 				}
 			}
diff --git a/pageE/more/Complaints.vue b/pageE/more/Complaints.vue
index 7c99502..4366878 100644
--- a/pageE/more/Complaints.vue
+++ b/pageE/more/Complaints.vue
@@ -1,33 +1,30 @@
 <template>
 	<view class="complaints">
-		<view class="complaints-box" v-for="item in feedbackList" :key="item.fb_id">
-			<view class="suggestions">
-				<view class="text">{{ item.fb_content }}</view>
-				<view class="image">
-					<image v-for="(url, index) in item.fb_images" :key="index" :src="url"></image>
+		<scroll-view scroll-y @scrolltolower="reachBottom">
+			<view class="complaints-box" v-for="item in feedbackList" :key="item.fb_id">
+				<view class="suggestions">
+					<view class="text">{{ item.fb_content }}</view>
+					<view class="image">
+						<image v-for="(url, index) in item.fb_images" :key="index" :src="url"></image>
+					</view>
+				</view>
+				<view class="reply">
+					<view class="reply-title">后台回复：</view>
+					<view class="reply-content u-line-4">{{ item.reply_content }}</view>
+				</view>
+				<view class="date">
+					<image src="../static/mine/26.png"></image>
+					<view>{{ reply_time }}</view>
 				</view>
 			</view>
-			<view class="reply">
-				<view class="reply-title">后台回复：</view>
-				<view class="reply-content u-line-4">{{ item.reply_content }}</view>
-			</view>
-			<view class="date">
-				<image src="../static/mine/26.png"></image>
-				<view>{{ reply_time }}</view>
-			</view>
-		</view>
+			<u-empty text="暂无意见" mode="list" color="#000000" icon-size="90" margin-top="300" v-if="!feedbackList.length"></u-empty>
+		</scroll-view>
 	</view>
 </template>
 <script>
 export default {
 	data() {
 		return {
-			imgList: [
-				require('../static/mine/23.png'),
-				require('../static/mine/23.png'),
-				require('../static/mine/23.png'),
-				require('../static/mine/23.png')
-			],
 			feedbackList: [],
 			page: 1, // 默认1
 		}
diff --git a/pageE/more/WriteComments.vue b/pageE/more/WriteComments.vue
index ce8c4e9..f28426c 100644
--- a/pageE/more/WriteComments.vue
+++ b/pageE/more/WriteComments.vue
@@ -7,6 +7,9 @@
 				:custom-btn="true" 
 				:max-count="count" 
 				:auto-upload="false"
+				:action="action"
+				:header="header"
+				:form-data="formData"
 			>
 				<view slot="addBtn" class="slot-btn" hover-class="slot-btn__hover" hover-stay-time="150">
 					<img src="../static/mine/27.png" />
@@ -20,32 +23,36 @@
 export default {
 	data() {
 		return {
-			action: $u.http.baseUrl + 'Upload/uploadfile',
+			action: this.$u.http.config.baseUrl + '/Upload/uploadfile',
 			count: 4, // 最大图片数量
 			text: '',
-			imageList: []
+			imageList: [],
+			header: {
+				"authorization": 'Bearer' + " " + uni.getStorageSync('token')
+			},
+			formData: {
+				name: '',
+			}
 		}
 	},
 	methods: {
 		submit() {
 			console.log(this.action);
 			console.log(this.imageList);
-			
-			// this.$refs.uUpload.upload();
+			this.$refs.uUpload.upload();
 			let promise = [];
 			this.imageList.forEach(url => {
 				// this.uploadImage(url);
 			})
-			Promise.all(promise).then(() => {
+			// Promise.all(promise).then(() => {
 				
-			})
+			// })
 		},
-		async uploadImage(file) {
-			this.$u.api.uploadfile({ 
-				file: file,
-			}).then(res => {
-				if(res.errCode == 0) {}
-			})
+		async beforeUpload(index, list) {
+			console.log(index, list);
+			
+			// let data = await this.$u.post('url');
+			// return true; // 或者根据逻辑返回false
 		},
 		writeFeedback() {
 			this.$u.api.writeFeedback({ 
diff --git a/pageE/order/Details.vue b/pageE/order/Details.vue
index 06bf86e..76b473c 100644
--- a/pageE/order/Details.vue
+++ b/pageE/order/Details.vue
@@ -21,17 +21,19 @@
 			<view class="info-goods">
 				<view class="goods-store">
 					<view class="stoer-title">
-						<image src="../static/mine/23.png" class="store-image"></image>
-						<view class="store-name">胖胖的店</view>
+						<image :src="orderInfo.extend_store.store_avatar" class="store-image"></image>
+						<view class="store-name">{{ orderInfo.extend_store.store_name }}</view>
 						<image src="../static/mine/21.png" class="right-icon"></image>
 					</view>
-					<view class="store-goods">
-						<image src="../static/mine/23.png"></image>
-						<view class="goods-info">
-							<view class="goods-name u-line-2">木糖少女小紫薯西装领连衣裙夏季新款女装夏收腰格子格纹裙子木糖少女小紫薯西装领连衣裙夏季新款女装夏收腰格子格纹裙子</view>
-							<view class="goods-order">
-								<view class="price">￥99</view>
-								<view class="num">x2</view>
+					<view v-for="goods in orderInfo.extend_order_goods" :key="goods.goods_id">
+						<view class="store-goods">
+							<image :src="goods.goods_image"></image>
+							<view class="goods-info">
+								<view class="goods-name u-line-2">{{ goods.goods_name }}</view>
+								<view class="goods-order">
+									<view class="price">￥{{ goods.goods_pay_price }}</view>
+									<view class="num">x{{ goods.goods_num }}</view>
+								</view>
 							</view>
 						</view>
 					</view>
@@ -55,7 +57,7 @@
 					</view>
 					<view>
 						<view class="title">支付方式</view>
-						<view class="price">￥0.00</view>
+						<view class="price">{{ orderInfo.payment_name }}</view>
 					</view>
 				</view>
 			</view>
@@ -83,9 +85,8 @@ export default {
 		}
 	},
 	onLoad(option) {
-		this.current = option.current;
-		console.log(option.current);
 		this.setTitle();
+		this.getOrderInfo(option.id);
 	},
 	methods: {
 		getOrderInfo(id) {
@@ -98,11 +99,9 @@ export default {
 			})
 		},
 		setTitle(){
-			let title = ''
+			let title = '';
 			switch (this.current) {
 				case '1':
-					console.log(title);
-					
 					title = "支付成功"
 					break;
 				default:
diff --git a/pageE/order/Index.vue b/pageE/order/Index.vue
index ffaa35c..10af7bc 100644
--- a/pageE/order/Index.vue
+++ b/pageE/order/Index.vue
@@ -41,7 +41,7 @@ export default {
 			orderList: [],
 			loadStatus: ['loadmore','loadmore','loadmore','loadmore','loadmore','loadmore','loadmore'],
 			page: 0,
-			current: 0,
+			current: Number,
 			swiperCurrent: 0,
 			swiperHeight: '',
 			timer: true,
@@ -51,7 +51,7 @@ export default {
 		OrderItem
 	},
 	watch: {
-		current() {
+		current(value) {
 			this.page = 0;
 			this.getOrderList('again');
 		},
@@ -98,16 +98,16 @@ export default {
 				if(reload) this.orderList = res.data;
 				else this.orderList.push(...res.data);
 			}
-			return res.data.length;
+			return res;
 		},
 		reachBottom() {
 			if(!this.timer) return false;
 			this.timer = false;
 			this.loadStatus.splice(this.current, 1, "loading");
 			this.page++;
-			this.getOrderList.then(length => {
+			this.getOrderList.then(res => {
 				this.loadStatus.splice(this.current, 1, "nomore");
-				if(length == 0) this.page--;
+				if(res.data.length == 0) this.page--;
 			}).catch(() => {
 				this.loadStatus.splice(this.current, 1, "nomore");
 				this.page--;
diff --git a/pageE/setting/Index.vue b/pageE/setting/Index.vue
index a98cf59..79b8297 100644
--- a/pageE/setting/Index.vue
+++ b/pageE/setting/Index.vue
@@ -59,6 +59,10 @@ export default {
 					title: '证件中心',
 					link: '../mine/ArticleDetails?type=1'
 				},
+				{
+					title: '屏蔽用户',
+					link: './ShieldUsers'
+				},
 				{
 					title: '关于我们',
 					link: '../mine/ArticleDetails?type=2'
@@ -66,7 +70,7 @@ export default {
 				{
 					title: '帮助与反馈',
 					link: './feedback'
-				}
+				},
 			]
 		}
 	},
diff --git a/pageE/setting/ShieldUsers.vue b/pageE/setting/ShieldUsers.vue
new file mode 100644
index 0000000..6d5649f
--- /dev/null
+++ b/pageE/setting/ShieldUsers.vue
@@ -0,0 +1,59 @@
+<template>
+	<view class="shield">
+		<view class="shield-list" v-for="(item, index) in 5" :key="index">
+			<view class="infomation">
+				<u-avatar :src="src" size="80"></u-avatar>
+				<view class="nickname u-line-1">神的温柔</view>
+			</view>
+			<view class="btn">取消屏蔽</view>
+		</view>
+	</view>
+</template>
+<script>
+export default {
+	data() {
+		return {
+			src: 'https://dmmall.sdbairui.com/uploads/home/avatar/avatar_19.jpg'
+		}
+	}
+};
+</script>
+<style lang="scss" scoped>
+.shield {
+	min-height: calc(100vh - var(--window-top));
+	background-color: #ECECEC;
+	padding-top: 1rpx;
+	.shield-list {
+		background-color: #FFF;;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 10rpx 30rpx;
+		color:rgba(51,51,51,1);
+		margin-bottom: 2rpx;
+		.infomation {
+			display: flex;
+			align-items: center;
+			.nickname {
+				width: 300rpx;
+				font-size: 28rpx;
+				margin-left: 20rpx;
+			}
+		}
+		.btn {
+			font-size: 24rpx;
+			position: relative;
+			&::before {
+				position: absolute;
+				left: -30rpx;
+				top: 50%;
+				transform: translate(0, -50%);
+				content: '';
+				width: 1rpx;
+				height: 38rpx;
+				background: rgba(236,236,236,1);
+			}
+		}
+	}
+}
+</style>
\ No newline at end of file
diff --git a/pageE/tool/ManicureOrder.vue b/pageE/tool/ManicureOrder.vue
index c0bf180..c8db2d9 100644
--- a/pageE/tool/ManicureOrder.vue
+++ b/pageE/tool/ManicureOrder.vue
@@ -1,14 +1,18 @@
 <template>
 	<view class="manicure-order">
 		<view class="order-form">
-			<view class="order-name">
+			<!-- <view class="order-name">
 				<view>美甲人：</view>
 				<input type="text" v-model="name" />
-			</view>
+			</view> -->
 			<view class="order-date" @click="show=true">
-				<view>美甲时间：</view>
-				<img src="../static/mine/21.png" v-if="!time" />
-				<view v-else>{{ time }}</view>
+				<view class="title">美甲时间：</view>
+				<image src="../static/mine/21.png" v-if="!time"></image>
+				<view v-else class="time">{{ time }}</view>
+			</view>
+			<view class="order-address">
+				<view class="title">美甲地址：</view>
+				<input type="text" v-model="address" disabled />
 			</view>
 		</view>
 		<view class="order-btn" @click="addManicureOrder">确认订单</view>
@@ -22,6 +26,7 @@ export default {
 		return {
 			name: '',
 			time: '',
+			address: '四川省攀枝花市银江镇',
 			params: {
 				year: true,
 				month: true,
@@ -96,8 +101,11 @@ export default {
 			&:not(:last-child) {
 				margin-bottom: 2rpx;
 			}
+			.title {
+				font-size: 30rpx;
+			}
 		}
-		.order-name {
+		.order-address {
 			display: flex;
 			align-items: center;
 			> view {
@@ -105,18 +113,24 @@ export default {
 				color: rgba(51,51,51,1);
 			}
 			> input {
+				padding-left: 20rpx;
 				flex: 1;
-				text-align: right;
+				font-size: 28rpx;
 			}
 		}
 		.order-date {
 			display: flex;
 			align-items: center;
 			justify-content: space-between;
-			> img {
+			> image {
 				width: 14rpx;
 				height :24rpx;
 			}
+			.time {
+				padding-left: 20rpx;
+				flex: 1;
+				text-align: left;
+			}
 		}
 	}
 	.order-btn {
diff --git a/pages.json b/pages.json
index d7ac6c5..0fcd1a4 100644
--- a/pages.json
+++ b/pages.json
@@ -715,6 +715,19 @@
 						}
 					}
 				},
+				{
+					"path": "setting/ShieldUsers",
+					"style": {
+						"navigationBarTitleText": "屏蔽用户",
+						"app-plus": {
+							"titleSize": "36px",
+							"titleNView": {
+								"titleColor": "#333333",
+								"backgroundColor": "#FFFFFF"
+							}
+						}
+					}
+				},
 				{
 					"path": "order/Index",
 					"style": {
diff --git a/pages/mine/index.vue b/pages/mine/index.vue
index d870fd4..24780df 100644
--- a/pages/mine/index.vue
+++ b/pages/mine/index.vue
@@ -2,10 +2,10 @@
     <view class="mine">
         <view class="mine-top">
             <view class="top">
-				<u-avatar :src="userInfo.member_avatar" :size="110"></u-avatar>
+				<u-avatar  @click="toOtherPage('/mine/MineInfo')" :src="userInfo.member_avatar" :size="110"></u-avatar>
 				<view class="user-info">
 					<view class="info-left">
-						<view class="user-nickname" @click="toOtherPage('/mine/MineInfo')">{{ userInfo.member_nickname }}</view>
+						<view class="user-nickname">{{ userInfo.member_nickname }}</view>
 						<view class="user-medal" @click="toOtherPage('/mine/MedalIntroduction')">
 							<img src="/static/image/mine/13.png" />
 							<view class="rank-title">勋章</view>
diff --git a/static/js/common.js b/static/js/common.js
index dc9b353..8d5a5a9 100644
--- a/static/js/common.js
+++ b/static/js/common.js
@@ -12,23 +12,26 @@ const common = {
 	/**
 	* 上传文件(只能单文件上传)
 	* @param { String } url 服务器 url
+	* @param { String } name 上传类型 goods-商品图片 avatar-用户头像 video-视频 store_logo-店铺logo store_banner-店铺banner store_avatar-店铺头像
 	* @param { String } filePath 要上传文件资源的路径
-	* @param { String } type 上传文件验证类型 默认: img 可选: video
 	* @return { object } promise 对象 resolve 返回文件服务器地址 reject 返回错误信息
 	*/
-	uploadFile({ url, filePath, type = 'img' } = {}) {
+	uploadFile({ url, name, filePath }) {
 		const token = uni.getStorageSync('token');
 		const promise =  new Promise((resolve, reject) => {
 			uni.uploadFile({
 				url: url,
 				header: { "authorization": 'Bearer' + " " + token },
 				filePath: filePath,
-				name: 'file',
-				formData: { type: type },
+				name: name,
+				formData: {
+					name: name,
+				},
 				success: uploadFileRes => {
 					const data = JSON.parse(uploadFileRes.data);
+					// console.log(data);
 					if(data.errCode == 0) {
-						resolve(data.data.url);
+						resolve(data.data);
 					} else {
 						reject(data.message);
 					}