retrieve file

common/api/user.js

@@ -236,6 +236,10 @@ export default {
 				if(refund_state) Object.assign(params, {refund_state: refund_state});
 				return vm.$u.post('Order/orderList', params);
 			},
+			// 售后列表
+			getAfterSaleList({ page }) {
+				return vm.$u.post('order/afterSaleList', { page: page });
+			},
 			// 订单详情
 			getOrderInfo({ order_id }) {
 				return vm.$u.post('Order/orderInfo', { order_id: order_id });

components/mine/order-item/index.vue

@@ -23,6 +23,7 @@
 			</view>
 		</view>
 		<view class="order-btn" v-if="[10, 30, 20, 40].indexOf(order.order_state) >= 0">
+			<view class="logistics" v-if="order.order_state == 30">确认收货</view>
 			<view class="logistics" v-if="order.order_state == 30" @click="toOtherPage('Logistics')">查看物流</view>
 			<view class="comment" v-if="order.order_state == 40 && order.evaluation_state == 0" @click="toOtherPage('Comment')">立即评价</view>
 			<view class="calcel" v-if="order.order_state == 10">取消支付</view>
@@ -36,7 +37,7 @@
 export default {
 	data() {
 		return {
-			state: '', // 1: 待收货 2: 待评价 3: 交易成功 4: 已取消 5: 已退款 6: 待支付
+			state: '', // 1: 待收货 2: 待评价 3: 交易成功 4: 已取消 5: 已退款 6: 待支付, 7: 售后
 		}
 	},
 	props: {
@@ -69,6 +70,12 @@ export default {
 					break;
 			}
 			if(this.order.refund_state) state = '已退款';
+			// 申请退款
+			if(this.order.refund_data) {
+				if([1, 2].indexOf(this.order.refund_data.refund_state) >= 0) state = '待退款';
+				if(this.order.refund_data.refund_state == 3) state = '已退款';
+			}
+				
 			this.state = state;
 		},
 		toOtherPage(url) {

pageC/cart/ConfirmOrder.vue

@@ -119,8 +119,15 @@ export default {
 		this.getFreight();
 	},
 	methods: {
-		showTotalPrice() {
+		sendOrder() {
-			
+			this.$u.api.sendOrder({
+				ifcart: 1,
+				// cart_id: ,
+				address_id: this.addressInfo.area_id,
+				buy_city_id: this.addressInfo.city_id,
+			}).then(res => {
+
+			})
 		},
 		getFreight() {
 			this.$u.api.getFreight({

pageC/cart/index.vue

@@ -193,6 +193,14 @@ export default {
 	},
 	onNavigationBarButtonTap(btn) {
 		// console.log(btn);
+		// #ifdef H5
+		this.status = '完成';
+		if(this.status == '编辑'){
+			this.status = "完成";
+		}else{
+			this.status = "编辑";
+		}
+		// #endif
 		if(btn.index == 0){
 			let pages = getCurrentPages();
 			let page = pages[pages.length - 1];
@@ -213,7 +221,6 @@ export default {
 			});
 			this.status = titleObj.buttons[0].text;
 			// #endif
-
 		}
 	}
 };

pageE/mine/EditUserInfo.vue

@@ -61,6 +61,7 @@ export default {
 			birthday: '',
 			phoneNumber: '',
 			avatar: '',
+			uploadPath: '', // 上传时的路径
 		}
 	},
 	onLoad() {
@@ -83,7 +84,10 @@ export default {
 						name: 'avatar',
 						filePath: res.tempFilePaths[0]
 					}).then(result => {
-						this.avatar = result;
+						// console.log(result);
+						this.$set(this, 'avatar', result.file_path);
+						// this.avatar = result.file_path;
+						this.uploadPath = result.file_name;
 					}, error => {
 						this.$u.toast(error);
 					})
@@ -108,7 +112,7 @@ export default {
 			this.$u.api.updateMemberInfo({
 				nickname: this.nickname,
 				gender: this.gender,
-				avatar: this.avatar,
+				avatar: this.uploadPath,
 				birthday: this.birthday,
 			}).then(res => {
 				if (res.errCode == 0) {

pageE/mine/MineInfo.vue

@@ -51,7 +51,8 @@ export default {
 		getUserInfo() {
 			this.$u.api.getMemberInfo().then(res => {
 				if (res.errCode == 0) {
-					this.userInfo = res.data.MemberArray;
+					// this.userInfo = res.data.MemberArray;
+					this.$set(this, 'userInfo', res.data.MemberArray);
 				}
 			})
 		},

pageE/order/Details.vue

@@ -12,10 +12,10 @@
 				<image src="../static/mine/28.png"></image>
 				<view class="address-right">
 					<view class="user-info">
-						<view>胖胖</view>
+						<view>{{ orderInfo.extend_order_common.reciver_name }}</view>
-						<view>18220171014</view>
+						<view>{{ orderInfo.extend_order_common.reciver_info.mob_phone }}</view>
 					</view>
-					<view class="address-text u-line-2">山东省泰安市泰山区东岳大街与克山路交汇口银山店四楼橙天影视南邻山东省泰安市泰山区东岳大街与克山路交汇口银山店四楼橙天影视南邻</view>
+					<view class="address-text u-line-2">{{ orderInfo.extend_order_common.reciver_info.address }}</view>
 				</view>
 			</view>
 			<view class="info-goods">
@@ -41,19 +41,19 @@
 				<view class="goods-others">
 					<view>
 						<view class="title">运费(快递/骑手)</view>
-						<view class="price">￥0.00</view>
+						<view class="price">￥{{ orderInfo.shipping_fee }}</view>
 					</view>
 					<view>
 						<view class="title">店铺优惠</view>
-						<view class="price">￥0.00</view>
+						<view class="price">￥{{ orderInfo.extend_order_common.voucher_price || '0.00' }}</view>
 					</view>
 					<view>
 						<view class="title">订单总价</view>
-						<view class="price">￥{{ orderInfo.order_amount }}</view>
+						<view class="price">￥{{ orderInfo.goods_amount }}</view>
 					</view>
 					<view>
 						<view class="title">实付费(含运费)</view>
-						<view class="price">￥{{ orderInfo.goods_amount }}</view>
+						<view class="price">￥{{ orderInfo.order_amount }}</view>
 					</view>
 					<view>
 						<view class="title">支付方式</view>
@@ -72,8 +72,8 @@
 			<view class="comment" v-if="state == '2'" @click="toOtherPage('Comment')">立即评价</view>
 			<view class="cancel" v-if="state == '6'">取消支付</view>
 			<view class="payment" v-if="state == '6'">立即支付</view>
-			<view class="service" v-if="current == 6">联系官方客服</view>
+			<view class="service" v-if="state == '7'">联系官方客服</view>
-			<view class="submit" v-if="current == 6">提交官方审核</view>
+			<view class="submit" v-if="state == '7'">提交官方审核</view>
 		</view>
 	</view>
 </template>
@@ -81,7 +81,7 @@
 export default {
 	data() {
 		return {
-			state: '', // 1: 待收货 2: 待评价 3: 交易成功 4: 已取消 5: 已退款 6: 待支付
+			state: '', // 1: 待收货 2: 待评价 3: 交易成功 4: 已取消 5: 已退款 6: 待支付 7: 待退款 8: 已退款
 			s_object: {
 				'1': {
 					text: '待收货',
@@ -107,6 +107,14 @@ export default {
 					text: '待支付',
 					image: '../static/mine/31.png',
 				},
+				'7': {
+					text: '待退款',
+					image: '../static/mine/34.png',
+				},
+				'8': {
+					text: '已退款',
+					image: '../static/mine/34.png',
+				},
 			},
 			current: 0,
 			orderInfo: {}
@@ -114,7 +122,7 @@ export default {
 	},
 	onLoad(option) {
 		this.setTitle();
-		this.getOrderInfo(option.id);
+		this.getOrderInfo(option.oid);
 	},
 	methods: {
 		viewState(value) {
@@ -139,6 +147,12 @@ export default {
 					break;
 			}
 			if(this.orderInfo.refund_state) state = '5';
+			// 申请退款
+			const refund = this.orderInfo.refund_list[this.orderInfo.extend_order_common.order_id];
+			if(this.orderInfo.refund_list) {
+				if([1, 2].indexOf(refund.refund_state) >= 0) state = '7';
+				if(refund.refund_state == 3) state = '8';
+			}
 			this.state = state;
 		},
 		getOrderInfo(id) {

pageE/order/Index.vue

@@ -53,7 +53,8 @@ export default {
 	watch: {
 		current(value) {
 			this.page = 0;
-			this.getOrderList({ reload: 'again' });
+			// again 重新请求列表 不然往列表里添加
+			value == 6 ? this.getAfterSaleList({ reload: 'again' }): this.getOrderList({ reload: 'again' });
 		},
 	},
 	onLoad(option) {
@@ -82,9 +83,6 @@ export default {
 				case 5:
 					type = 'state_noeval'; // 待评价
 					break;
-				case 6:
-					type = 40; // 售后
-					break;
 				default:
 					type = -1;
 					break;
@@ -92,7 +90,17 @@ export default {
 			const res = await this.$u.api.getOrderList({
 				page: this.page,
 				type: type,
-				refund_state: this.current == 6 ? '1' : 0, // 判断是不是售后列表
+			})
+			this.timer = true;
+			if(res.errCode == 0) {
+				if(reload) this.orderList = res.data;
+				else this.orderList.push(...res.data);
+			}
+			return res;
+		},
+		async getAfterSaleList({ reload = '' } = {}) {
+			const res = await this.$u.api.getAfterSaleList({
+				page: this.page,
 			})
 			this.timer = true;
 			if(res.errCode == 0) {
@@ -108,7 +116,10 @@ export default {
 			this.timer = false;
 			this.loadStatus.splice(this.current, 1, "loading");
 			this.page++;
-			this.getOrderList().then(res => {
+			let promise;
+			if(this.current == 6) promise = this.getAfterSaleList();
+			else promise = this.getOrderList();
+			promise.then(res => {
 				this.loadStatus.splice(this.current, 1, "nomore");
 				if(res.data.length == 0) this.page--;
 			}).catch(() => {

pages/mine/index.vue

@@ -145,7 +145,8 @@ export default {
 		getUserInfo() {
 			this.$u.api.getMemberInfo().then(res => {
 				if (res.errCode == 0) {
-					this.userInfo = res.data.MemberArray;
+					// this.userInfo = res.data.MemberArray;
+					this.$set(this, 'userInfo', res.data.MemberArray);
 				}
 			})
 		},