aaaa

api/order.js

@@ -154,7 +154,23 @@ export function adopt(data) {
 		data
 	});
 }
-
+//auction/carry
+//提货
+export function carry(data) {
+	return request({
+		url: '/api/auction/carry',
+		method: 'post',
+		data
+	});
+}
+//提货列表
+export function deliver_list(data) {
+	return request({
+		url: '/api/auction/deliver_list',
+		method: 'get',
+		data
+	});
+}
 //买单订单列表
 export function user_auction_order(data) {
 	return request({
@@ -163,7 +179,14 @@ export function user_auction_order(data) {
 		data
 	});
 }
-
+//商品详情
+export function dhDetail(data,id) {
+	return request({
+		url: '/api/auction/details?product_id='+id,
+		method: 'get',
+		data
+	});
+}
 //卖单订单列表
 export function seller(data) {
 	return request({

manifest.json

@@ -2,8 +2,8 @@
     "name" : "易趣GO",
     "appid" : "__UNI__0D9C79D",
     "description" : "",
-    "versionName" : "1.1.0",
-    "versionCode" : 110,
+    "versionName" : "1.1.3",
+    "versionCode" : 113,
     "transformPx" : false,
     "app-plus" : {
         /* 5+App特有相关 */

pages.json

@@ -624,6 +624,24 @@
             }
             
         }
+        ,{
+            "path" : "pages/order/tihuo",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "提货",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/order/tihuoOrder",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "提货列表",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 
 	"globalStyle": {

pages/index/index.vue

@@ -138,7 +138,7 @@
 				</view>
 			</view>
 		</view>
-		<u-tabbar activeColor="#f42b4e" v-model="current" :list="tabbar"></u-tabbar>
+		<u-tabbar activeColor="#f42b4e" :list="tabbar"></u-tabbar>
 	</view>
 </template>
 
@@ -199,6 +199,7 @@
 		onShow() {
 			this.loadData();
 			this.getaddress();
+			console.log(this.$u.config.v,'vvvvv'); 
 		},
 		methods: {
 			loadData() {

pages/order/createOrder.vue

@@ -225,7 +225,8 @@ export default {
 			pinkid: '' //保存拼团商品id
 		};
 	},
-	onLoad(option) {
+	onLoad(option) {
+		console.log(option,'options');
 		// 判断是否为拼团商品
 		if (option.type == 'pink') {
 			this.pinkid = option.pinkId;

pages/order/index.vue

@@ -9,6 +9,9 @@
 		<view class="order" @click="nav('/pages/order/order')">
 			<image src="../../static/img/order2.png" mode=""></image>
 		</view>
+		<view class="order" @click="nav('/pages/order/tihuoOrder')">
+			<image src="../../static/img/order3.png" mode=""></image>
+		</view>
 		<u-tabbar activeColor="#f42b4e" v-model="current" :list="tabbar" :mid-button="true"></u-tabbar>
 	</view>
 </template>

pages/order/order.vue

@@ -55,6 +55,7 @@
 						<view class="action-box b-t" v-if="item.stateTip == '待支付'"><button @click.stop="pay(item)" class="action-btn recom">立即支付</button></view>
 						<view class="action-box b-t" v-if="item.stateTip == '待审核'"><button @click.stop="pay(item)" class="action-btn recom">修改凭证</button></view>
 						<view class="action-box b-t" v-if="item.stateTip == '待挂售' && tabItem.state != 0">
+							<button @click.stop="tiHuo(item)" class="action-btn recom" style="color: #f3f3f3; font-weight: 500; background: #DC262B;">提货</button>
 							<button @click.stop="gsell(item)" class="action-btn recom">{{ item.frozen == 0 ? '立即挂售' : '冻结中' }}</button>
 						</view>
 					</view>
@@ -420,6 +421,11 @@ export default {
 				});
 			}
 		},
+		tiHuo(item){
+			uni.navigateTo({
+				url:'/pages/order/tihuo?id='+item.product_id
+			})
+		},
 		//卖家确认订单
 		orderPay(e) {
 			const obj = this;
@@ -428,7 +434,7 @@ export default {
 			}
 			uni.showModal({
 				title: '提示',
-				content: '通过后画将进入买家账户，是否核实完成后继续通过',
+				content: '通过后商品将进入买家账户，是否核实完成后继续通过',
 				success: function(res) {
 					if (res.confirm) {
 						uni.showLoading({

pages/order/tihuoOrder.vue

@@ -0,0 +1,1078 @@
+<template>
+	<view class="content">
+		<view class="navbar" v-show="currentIndex == 0">
+			<view v-for="(item, index) in navList" :key="index" class="nav-item"
+				:class="{ current: tabCurrentIndex === index }" @click="tabClick(index, 0)">
+				{{ item.text }}
+				<view class="dian" v-if="tabCurrentIndex != index && item.isnew == 2"></view>
+			</view>
+		</view>
+		<swiper :current="currentAuto" class="swiper-box-one" duration="0" @change="changeTab">
+			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex"
+				v-if="currentIndex == 0">
+				<scroll-view class="list-scroll-content" scroll-y @scrolltolower="loadData">
+					<!-- 空白页 -->
+					<empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty>
+					<!-- 订单列表 -->
+					<view v-for="(item, index) in tabItem.orderList" :key="index" class="order-item">
+						<view class="i-top b-b">
+							<text class="time">{{ item.create_time }}</text>
+							<text class="state" :style="{ color: item.stateTipColor }">{{ item.stateTip }}</text>
+						</view>
+						<view class="goods-box-single">
+							<image class="goods-img" :src="item.image" mode="aspectFill"></image>
+							<view class="right">
+								<text class="title clamp">{{ item.name }}</text>
+								<text class="attr-box">x1</text>
+								<text class="price">{{ moneyNum(item.price) }}</text>
+							</view>
+						</view>
+						<view class="price-box">
+							共
+							<text class="num">1</text>
+							件商品 邮费
+							<text class="price">0</text>
+							实付款
+							<text class="price">{{ moneyNum(item.price) }}</text>
+						</view>
+						<view class="price-box">
+							快递名称:
+							<text class="num">{{item.delivery_name||'暂未发货' }}</text>
+							单号:<text class=" num">{{item.delivery_id||'暂未发货'}}</text>
+						</view>
+					</view>
+
+					<uni-load-more :status="tabItem.loadingType"></uni-load-more>
+				</scroll-view>
+			</swiper-item>
+		</swiper>
+	</view>
+</template>
+
+<script>
+	import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+	import empty from '@/components/empty';
+	import {
+		orderList,
+		orderCancel,
+		orderDel,
+		orderTake,
+		adopt,
+		user_auction_order,
+		seller,
+		cancel,
+		untreated,
+		plead,
+		revoke,
+		deliver_list
+	} from '@/api/order.js';
+	import {
+		tabbar
+	} from '@/utils/tabbar.js';
+	export default {
+		components: {
+			uniLoadMore,
+			empty
+		},
+		data() {
+			return {
+				loading: false, //判断是否在点击
+				height: '', //第一层swiper高度
+				tabbar: tabbar,
+				current: 1, //底部tabar选中的icon对象
+				currentIndex: 0, //当前选中的第一级0为我要买单，1我要卖单
+				tabCurrentIndex: 0, //当前选中的第二级别我要买单选中项
+				tabCurrentIndex1: 0, //当前选中的第二级别我要卖单选中项
+				maiList: [{
+						title: '我的买单'
+					},
+					{
+						title: '我的卖单'
+					}
+				],
+				navList: [{
+						state: 0,
+						text: '未发货',
+						loadingType: 'more',
+						orderList: [],
+						isnew: 1, //判断是否有新的订单
+						page: 1, //当前页数
+						limit: 10 //每次信息条数
+					},
+					{
+						state: 1,
+						text: '待收货',
+						loadingType: 'more',
+						orderList: [],
+						isnew: 1, //判断是否有新的订单
+						page: 1, //当前页数
+						limit: 10 //每次信息条数
+					},
+					{
+						state: 2,
+						text: '已收货',
+						loadingType: 'more',
+						orderList: [],
+						isnew: 1, //判断是否有新的订单
+						page: 1, //当前页数
+						limit: 10 //每次信息条数
+					}
+				]
+			};
+		},
+		computed: {
+			currentAuto() {
+				if (this.currentIndex == 0) {
+					return this.tabCurrentIndex;
+				}
+				if (this.currentIndex == 1) {
+					return this.tabCurrentIndex1;
+				}
+			}
+		},
+		onLoad(options) {
+			/**
+			 * 修复app端点击除全部订单外的按钮进入时不加载数据的问题
+			 * 替换onLoad下代码即可
+			 */
+			this.tabCurrentIndex = +options.state || 0;
+		},
+		onShow() {
+			this.loadData();
+		},
+		// #ifdef APP-PLUS || H5
+		onBackPress(e) {
+			uni.switchTab({
+				url: '/pages/user/user'
+			});
+			return true;
+		},
+		// #endif
+		filters: {
+			moneyNum(value) {
+				return +value;
+			}
+		},
+		// 页面加载完获取swiper高度
+		onReady(res) {
+			var obj = this;
+			uni.getSystemInfo({
+				success: resu => {
+					const query = uni.createSelectorQuery();
+					query.select('.swiper-box-one').boundingClientRect();
+					query.exec(function(res) {
+						console.log(res, 'ddddddddddddd');
+						obj.height = resu.windowHeight - res[0].top + 'px';
+						console.log('打印页面的剩余高度', obj.height);
+					});
+				},
+				fail: res => {}
+			});
+		},
+		methods: {
+			//顶部tab点击
+			tabClick(index, type) {
+					this.tabCurrentIndex = index;
+			},
+			toBack() {
+				uni.switchTab({
+					url: '/pages/order/index'
+				});
+			},
+			navGo(index) {
+				this.currentIndex = index;
+				console.log(this.currentIndex, '点击');
+				this.upData();
+				this.loadData('reload');
+			},
+			// 转换金额为数字
+			moneyNum(value) {
+				return +value;
+			},
+			// 订单支付
+			pay(item) {
+				uni.navigateTo({
+					url: '/pages/hall/hallpay?ordid=' + item.order_id + '&type=2'
+				});
+			},
+
+			// 查看大图
+			lookimg(src) {
+				console.log(src);
+				let arr = [src];
+				uni.previewImage({
+					current: src,
+					urls: arr
+				});
+			},
+			//申诉和取消申诉
+			appeal(item) {
+				const obj = this;
+				if (this.loading) {
+					return;
+				}
+				this.loading = true;
+				if (item.appeal == 0) {
+					uni.showModal({
+						title: '提示',
+						content: '提交申诉后会导致画被冻结，是否继续提交申诉',
+						success: function(res) {
+							if (res.confirm) {
+								uni.showLoading({
+									title: '申诉中'
+								});
+								plead({
+									order_id: item.order_id
+								}).then(e => {
+									uni.hideLoading();
+									obj.$api.msg('申诉成功');
+									obj.loadData('reload');
+									obj.loading = false;
+								});
+							} else if (res.cancel) {
+								console.log('用户点击取消');
+							}
+						}
+					});
+				} else {
+					uni.showModal({
+						title: '提示',
+						content: '提交撤销申诉后会导致画被解冻，是否继续提交取消申诉',
+						success: function(res) {
+							if (res.confirm) {
+								uni.showLoading({
+									title: '取消申诉中'
+								});
+								revoke({
+									order_id: item.order_id
+								}).then(e => {
+									uni.hideLoading();
+									obj.$api.msg('取消申诉成功');
+									obj.loadData('reload');
+									obj.loading = false;
+								});
+							} else if (res.cancel) {
+								console.log('用户点击取消');
+							}
+						}
+					});
+				}
+			},
+			//跳转到订单详情
+			goToOrderDetail(e) {
+				console.log(11);
+				uni.navigateTo({
+					url: '/pages/order/hallorderDetail?id=' + e.order_id
+				});
+			},
+			gsell(item) {
+				if (item.frozen) {
+					return this.$api.msg('已冻结，请联系客服或与卖家协商');
+				} else {
+					uni.navigateTo({
+						url: '/pages/hall/gsell?id=' + item.product_id
+					});
+				}
+			},
+			tiHuo(item) {
+				uni.navigateTo({
+					url: '/pages/order/tihuo?id=' + item.product_id
+				})
+			},
+			//卖家确认订单
+			orderPay(e) {
+				const obj = this;
+				if (this.loading) {
+					return;
+				}
+				uni.showModal({
+					title: '提示',
+					content: '通过后商品将进入买家账户，是否核实完成后继续通过',
+					success: function(res) {
+						if (res.confirm) {
+							uni.showLoading({
+								title: '确认订单中'
+							});
+							this.loading = true;
+							adopt({
+								order_id: e.order_id
+							}).then(({
+								data
+							}) => {
+								console.log('1111');
+								uni.hideLoading();
+								obj.loading = false;
+								obj.loadData('reload');
+								obj.upData();
+							});
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				});
+			},
+			//取消挂售
+			cancel(e) {
+				if (this.loading) {
+					return;
+				}
+				this.loading = true;
+				uni.showLoading({
+					title: '取消挂售中'
+				});
+				cancel({
+					id: e.id
+				}).then(({
+					data
+				}) => {
+					uni.hideLoading();
+					this.loading = false;
+					this.loadData('reload');
+					this.upData();
+				});
+			},
+			//获取订单列表
+			loadData(source) {
+				//这里是将订单挂载到tab列表下
+				let index, navItem;
+				if (this.currentIndex == 0) {
+					index = this.tabCurrentIndex;
+					navItem = this.navList[index];
+					console.log( this.navList[index],source,' this.navList[index]; this.navList[index];');
+				}
+
+				let state = navItem.state;
+				if (source == 'reload') {
+					navItem.orderList = [];
+					navItem.page = 1;
+					navItem.limit = 10;
+					navItem.loadingType = 'more';
+				}
+				// if ( navItem.loaded === true) {
+				// 	//tab切换只有第一次需要加载数据
+				// 	return;
+				// }
+				if (navItem.loadingType === 'loading') {
+					//防止重复加载
+					return;
+				}
+				if (navItem.loadingType === 'noMore') {
+					//防止重复加载
+					return;
+				}
+				// 修改当前对象状态为加载中
+				navItem.loadingType = 'loading';
+				if (this.currentIndex == 0) {
+					deliver_list({
+							status : state,
+							page: navItem.page,
+							limit: navItem.limit
+						})
+						.then(({
+							data
+						}) => {
+							console.log(data,'data');
+							let arr = data.map(e => {
+								console.log(e);
+								if (state == 4) {
+									e.stateTip = '待挂售';
+									e.stateTipColor = '#fa436a';
+								} else {
+									if (e.status == 3 && e.is_gs == 0) {
+										e.stateTip = '待挂售';
+										e.stateTipColor = '#fa436a';
+									} else {
+										let b = this.orderStateExp(e.status);
+										e.stateTip = b.stateTip;
+										e.stateTipColor = b.stateTipColor;
+									}
+								}
+								return e;
+							});
+							console.log(arr, '123456');
+							navItem.orderList = navItem.orderList.concat(arr);
+
+							// console.log(navItem.orderList);
+							navItem.page++;
+							if (navItem.limit == data.length) {
+								//判断是否还有数据， 有改为 more， 没有改为noMore
+								navItem.loadingType = 'more';
+								return;
+							} else {
+								//判断是否还有数据， 有改为 more， 没有改为noMore
+								navItem.loadingType = 'noMore';
+							}
+							uni.hideLoading();
+							this.$set(navItem, 'loaded', true);
+						})
+						.catch(e => {
+							console.log(e);
+						});
+				}
+				if (this.currentIndex == 1) {
+					seller({
+							type: state,
+							page: navItem.page,
+							limit: navItem.limit
+						})
+						.then(({
+							data
+						}) => {
+							console.log(data);
+							let arr = data.map(e => {
+								if (state == 4) {
+									e.stateTip = '售卖中';
+									e.stateTipColor = '#fa436a';
+								} else {
+									let b = this.orderStateExp(e.status);
+									e.stateTip = b.stateTip;
+									e.stateTipColor = b.stateTipColor;
+								}
+								return e;
+							});
+							navItem.orderList = navItem.orderList.concat(arr);
+
+							// console.log(navItem.orderList);
+							navItem.page++;
+							if (navItem.limit == data.length) {
+								//判断是否还有数据， 有改为 more， 没有改为noMore
+								navItem.loadingType = 'more';
+								return;
+							} else {
+								//判断是否还有数据， 有改为 more， 没有改为noMore
+								navItem.loadingType = 'noMore';
+							}
+							uni.hideLoading();
+							this.$set(navItem, 'loaded', true);
+						})
+						.catch(e => {
+							console.log(e);
+						});
+				}
+			},
+			//swiper 切换
+			changeTab(e) {
+					this.tabCurrentIndex = e.target.current;
+				this.loadData('tabChange');
+			},
+
+			//删除订单
+			deleteOrder(index) {
+				uni.showLoading({
+					title: '请稍后'
+				});
+				setTimeout(() => {
+					this.navList[this.tabCurrentIndex].orderList.splice(index, 1);
+					uni.hideLoading();
+				}, 600);
+			},
+			//取消订单
+			call(item) {
+				console.log(item.phone);
+				uni.makePhoneCall({
+					phoneNumber: item.phone //仅为示例
+				});
+			},
+
+			//订单状态文字和颜色
+			orderStateExp(state) {
+				let stateTip = '',
+					stateTipColor = '#fa436a';
+				switch (+state) {
+					case 0:
+						stateTip = '未发货';
+						break;
+					case 1:
+						stateTip = '待收货';
+						break;
+					case 2:
+						stateTip = '已收货';
+						break;
+					case 9:
+						stateTip = '订单已关闭';
+						stateTipColor = '#909399';
+						break;
+
+						//更多自定义
+				}
+				return {
+					stateTip,
+					stateTipColor
+				};
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	page,
+	.content {
+		background: $page-color-base;
+		height: 100%;
+	}
+
+	.order-title {
+		width: 750rpx;
+		height: 270rpx;
+		background: url(../../static/img/order99.png) repeat-x 0;
+		display: flex;
+		flex-direction: column;
+		// padding: 50rpx 0;
+		text-align: center;
+
+		.body-title {
+			height: 80rpx;
+			text-align: center;
+			font-size: 35rpx;
+			position: relative;
+
+			.header {
+				position: absolute;
+				left: 0;
+				top: 30rpx;
+				width: 100%;
+				font-size: 36rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #fffeff;
+				height: 80rpx;
+				font-size: 36rpx;
+				font-weight: 700;
+				z-index: 9;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+			}
+
+			.goback-box {
+				position: absolute;
+				left: 18rpx;
+				top: 30rpx;
+				height: 80rpx;
+				display: flex;
+				align-items: center;
+			}
+
+			.goback {
+				z-index: 100;
+				width: 34rpx;
+				height: 34rpx;
+			}
+		}
+
+		text {
+			margin: 30px 0;
+			font-size: 17px;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #ffffff;
+		}
+
+		.roder-content {
+			margin-top: 80rpx;
+			display: flex;
+			justify-content: space-around;
+
+			.left {
+				width: 168px;
+				height: 40px;
+				line-height: 40px;
+				border: 1px solid #ffffff;
+				border-radius: 5px;
+				text-align: center;
+				font-size: 15px;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #ffffff;
+				background: #dc262b;
+			}
+
+			.current {
+				color: #dc262b;
+				background: #ffffff;
+			}
+		}
+	}
+
+	.swiper-box {
+		background: red;
+	}
+
+	.list-scroll-content {
+		height: 100%;
+	}
+
+	.uni-swiper-item {
+		height: auto;
+	}
+
+	.navbar {
+		display: flex;
+		height: 40px;
+		padding: 0 5px;
+		background: #fff;
+		box-shadow: 0 1px 5px rgba(0, 0, 0, 0.06);
+		position: relative;
+		z-index: 10;
+
+		.nav-item {
+			flex: 1;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			height: 100%;
+			font-size: 15px;
+			color: $font-color-dark;
+			position: relative;
+
+			.dian {
+				position: absolute;
+				top: 20rpx;
+				right: 10rpx;
+				width: 12rpx;
+				height: 12rpx;
+				border-radius: 50%;
+				background-color: $base-color;
+			}
+
+			&.current {
+				color: $base-color;
+
+				&:after {
+					content: '';
+					position: absolute;
+					left: 50%;
+					bottom: 0;
+					transform: translateX(-50%);
+					width: 44px;
+					height: 0;
+					border-bottom: 2px solid $base-color;
+				}
+			}
+		}
+	}
+
+	.order-item {
+		display: flex;
+		flex-direction: column;
+		background: #fff;
+		margin-top: 16rpx;
+
+		.i-top {
+			display: flex;
+			align-items: center;
+			height: 80rpx;
+			font-size: $font-base;
+			color: $font-color-dark;
+			position: relative;
+			padding: 0 30rpx;
+
+			.time {
+				flex: 1;
+			}
+
+			.state {
+				color: $base-color;
+			}
+
+			.del-btn {
+				padding: 10rpx 0 10rpx 36rpx;
+				font-size: $font-lg;
+				color: $font-color-light;
+				position: relative;
+
+				&:after {
+					content: '';
+					width: 0;
+					height: 30rpx;
+					border-left: 1px solid $border-color-dark;
+					position: absolute;
+					left: 20rpx;
+					top: 50%;
+					transform: translateY(-50%);
+				}
+			}
+		}
+
+		/* 多条商品 */
+		.goods-box {
+			height: 160rpx;
+			padding: 20rpx 0;
+			white-space: nowrap;
+
+			.goods-item {
+				width: 120rpx;
+				height: 120rpx;
+				display: inline-block;
+				margin-right: 24rpx;
+			}
+
+			.goods-img {
+				display: block;
+				width: 100%;
+				height: 100%;
+			}
+		}
+
+		/* 单条商品 */
+		.goods-box-single {
+			display: flex;
+			padding: 20rpx 30rpx;
+			background: #f7f7f7;
+
+			.goods-img {
+				display: block;
+				width: 120rpx;
+				height: 120rpx;
+			}
+
+			.right {
+				flex: 1;
+				display: flex;
+				flex-direction: column;
+				padding: 0 0 0 24rpx;
+				overflow: hidden;
+
+				.row {
+					margin-top: 10rpx;
+				}
+
+				.row_title {
+					padding: 5rpx 10rpx;
+					background-color: #dddddd;
+					border-radius: 10rpx;
+					font-size: 22rpx;
+					color: #ffffff;
+				}
+
+				.title {
+					font-size: $font-base + 2rpx;
+					color: $font-color-dark;
+					line-height: 1;
+					width: 80%;
+				}
+
+				.attr-box {
+					display: flex;
+					justify-content: flex-end;
+					font-size: $font-sm + 2rpx;
+					color: $font-color-light;
+				}
+
+				.price {
+					display: inline;
+					font-size: $font-base + 2rpx;
+					color: $font-color-dark;
+
+					&:before {
+						content: '￥';
+						font-size: $font-sm;
+					}
+				}
+			}
+		}
+
+		.buy-box {
+			padding: 10rpx 22rpx;
+			background-color: #ffffff;
+
+			.buy-info {
+				display: flex;
+				align-items: center;
+				margin-top: 20rpx;
+
+				.font {
+					font-size: 32rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #333333;
+				}
+
+				.avter {
+					margin-left: 10rpx;
+					width: 46rpx;
+					height: 46rpx;
+					border-radius: 50%;
+				}
+
+				.buy-name {
+					margin-left: 10rpx;
+					font-size: 32rpx;
+					font-family: PingFang SC;
+					font-weight: bold;
+					color: #333333;
+				}
+
+				.phone {
+					margin-left: 12rpx;
+					font-size: 24rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #999999;
+				}
+			}
+		}
+
+		.upimg {
+			padding-left: 20rpx;
+			padding-top: 10rpx;
+			padding-bottom: 10rpx;
+			display: flex;
+
+			.up-tit {
+				display: inline-block;
+				font-size: 26rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #6d7c88;
+			}
+
+			.img-wrap {
+				width: 153rpx;
+				height: 152rpx;
+
+				border-radius: 20rpx;
+
+				image {
+					border-radius: 20rpx;
+					width: 153rpx;
+					height: 152rpx;
+					background-color: #ccc;
+				}
+			}
+		}
+
+		.price-box {
+			display: flex;
+			justify-content: flex-end;
+			align-items: baseline;
+			padding: 20rpx 30rpx;
+			font-size: $font-sm + 2rpx;
+			color: $font-color-light;
+
+			.num {
+				margin: 0 8rpx;
+				color: $font-color-dark;
+			}
+
+			.price {
+				font-size: $font-lg;
+				color: $font-color-dark;
+
+				&:before {
+					content: '￥';
+					font-size: $font-sm;
+					margin: 0 2rpx 0 8rpx;
+				}
+			}
+		}
+
+		.action-box {
+			padding: 0 30rpx;
+			display: flex;
+			justify-content: flex-end;
+			align-items: center;
+			height: 100rpx;
+			position: relative;
+		}
+
+		.refuse {
+			margin: 0;
+			padding: 0;
+			width: 160rpx;
+			height: 60rpx;
+			border: 2rpx solid #ebebeb;
+			border-radius: 28rpx;
+			text-align: center;
+			line-height: 60rpx;
+			font-size: 26rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #999999;
+
+			&:after {
+				border-radius: 100px;
+			}
+
+			&.recom {
+				color: #999999;
+
+				&:after {
+					border-color: #999999;
+				}
+			}
+		}
+
+		.action-btn {
+			width: 160rpx;
+			height: 60rpx;
+			margin: 0;
+			margin-left: 24rpx;
+			padding: 0;
+			text-align: center;
+			line-height: 60rpx;
+			font-size: $font-sm + 2rpx;
+			color: $font-color-dark;
+			background: #fff;
+			border-radius: 100px;
+			border: 2rpx solid #fd3b39;
+			border-radius: 28px;
+
+			&:after {
+				border-radius: 100px;
+			}
+
+			&.recom {
+				color: $base-color;
+
+				&:after {
+					border-color: $base-color;
+				}
+			}
+
+			&.evaluate {
+				color: $color-yellow;
+
+				&:after {
+					border-color: $color-yellow;
+				}
+			}
+		}
+	}
+
+	/* load-more */
+	.uni-load-more {
+		display: flex;
+		flex-direction: row;
+		height: 80rpx;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.uni-load-more__text {
+		font-size: 28rpx;
+		color: #999;
+	}
+
+	.uni-load-more__img {
+		height: 24px;
+		width: 24px;
+		margin-right: 10px;
+	}
+
+	.uni-load-more__img>view {
+		position: absolute;
+	}
+
+	.uni-load-more__img>view view {
+		width: 6px;
+		height: 2px;
+		border-top-left-radius: 1px;
+		border-bottom-left-radius: 1px;
+		background: #999;
+		position: absolute;
+		opacity: 0.2;
+		transform-origin: 50%;
+		animation: load 1.56s ease infinite;
+	}
+
+	.uni-load-more__img>view view:nth-child(1) {
+		transform: rotate(90deg);
+		top: 2px;
+		left: 9px;
+	}
+
+	.uni-load-more__img>view view:nth-child(2) {
+		transform: rotate(180deg);
+		top: 11px;
+		right: 0;
+	}
+
+	.uni-load-more__img>view view:nth-child(3) {
+		transform: rotate(270deg);
+		bottom: 2px;
+		left: 9px;
+	}
+
+	.uni-load-more__img>view view:nth-child(4) {
+		top: 11px;
+		left: 0;
+	}
+
+	.load1,
+	.load2,
+	.load3 {
+		height: 24px;
+		width: 24px;
+	}
+
+	.load2 {
+		transform: rotate(30deg);
+	}
+
+	.load3 {
+		transform: rotate(60deg);
+	}
+
+	.load1 view:nth-child(1) {
+		animation-delay: 0s;
+	}
+
+	.load2 view:nth-child(1) {
+		animation-delay: 0.13s;
+	}
+
+	.load3 view:nth-child(1) {
+		animation-delay: 0.26s;
+	}
+
+	.load1 view:nth-child(2) {
+		animation-delay: 0.39s;
+	}
+
+	.load2 view:nth-child(2) {
+		animation-delay: 0.52s;
+	}
+
+	.load3 view:nth-child(2) {
+		animation-delay: 0.65s;
+	}
+
+	.load1 view:nth-child(3) {
+		animation-delay: 0.78s;
+	}
+
+	.load2 view:nth-child(3) {
+		animation-delay: 0.91s;
+	}
+
+	.load3 view:nth-child(3) {
+		animation-delay: 1.04s;
+	}
+
+	.load1 view:nth-child(4) {
+		animation-delay: 1.17s;
+	}
+
+	.load2 view:nth-child(4) {
+		animation-delay: 1.3s;
+	}
+
+	.load3 view:nth-child(4) {
+		animation-delay: 1.43s;
+	}
+
+	@-webkit-keyframes load {
+		0% {
+			opacity: 1;
+		}
+
+		100% {
+			opacity: 0.2;
+		}
+	}
+
+	.swiper-box-one {
+		height: calc(100% - 175px);
+	}
+</style>

pages/user/myAppointment.vue

@@ -111,7 +111,7 @@ export default {
 					loaded: false
 				},
 				{
-					state: 2,
+					state: 0,
 					text: '支出',
 					loadingType: 'more',
 					orderList: [],
@@ -172,7 +172,7 @@ export default {
 					if(state == 1 ){
 						navItem.orderList = data.list
 					}
-					if(state == 2 ){
+					if(state == 0 ){
 						navItem.orderList = data.list
 					}
 				})
@@ -305,7 +305,7 @@ page {
 .money-box {
 	position: relative;
 	z-index: 2;
-	padding-top: 90rpx;
+	padding-top: 20rpx;
 	color: #ffffff;
 	text-align: center;
 	.money {

pages/user/user.vue

@@ -102,6 +102,9 @@
 			<!-- <uni-list-item title="关于我们" @click="navTo('/pages/shareQrCode/index')" thumb="/static/icon/img09.png"> -->
 			</uni-list-item>
 		</uni-list>
+		<view class="bottom" @click="navGeTo('https://beian.miit.gov.cn/')">
+			浙ICP备2021003764号-1
+		</view>
 		<uni-popup ref="popupkf" type="center">
 			<view class="popup-box">
 				<view class="img">
@@ -344,6 +347,9 @@
 					this.actionDay = data.sign_num;//连续签到天数
 					// this.sum_integral = data.sum_integral;//累计总积分
 				})
+			},
+			navGeTo(url){
+			
 			},
 			// 加载初始数据
 			loadBaseData() {
@@ -995,6 +1001,12 @@
 		box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
 		border-radius: 20rpx;
 	}
+	.bottom{
+		margin: 50rpx auto;
+		text-align: center;
+		color: #999999;
+		
+	}
 
 	.popup-box {
 		width: 522rpx;

store/index.js

@@ -7,8 +7,8 @@ Vue.use(Vuex)
 const store = new Vuex.Store({
 	namespaced: true,
 	state: {
-		// baseURL:"http://yrh.liuniu946.com",//'http://eb.shuibo.net',//请求地址配置 
-		baseURL: 'http://new.yiqushangshi.com', //请求地址配置 
+		baseURL:"http://new.yiqushangshi.com",//'http://eb.shuibo.net',//请求地址配置 
+		// baseURL: 'http://new.yiqushangshi.com', //请求地址配置 
 		urlFile: '/index', //项目部署所在文件夹
 		userInfo: {}, //登录信息
 		loginInterceptor: false, //是否打开强制登录

unpackage/cache/apk/apkurl

@@ -1 +1 @@
-https://ide.dcloud.net.cn/build/download/f8c7f020-025d-11ed-bec6-0b05774bc9c6
+https://ide.dcloud.net.cn/build/download/0a8db870-08b5-11ed-b2df-4345eb7739fa

unpackage/dist/build/h5/index.html

@@ -1,2 +1,2 @@
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>嗨易趣G0</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/index/static/index.2772579d.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.3c992190.js></script><script src=/index/static/js/index.16e778bd.js></script></body></html>
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/index/static/index.2772579d.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.46b2cbf8.js></script><script src=/index/static/js/index.6942ac21.js></script></body></html>