7-7

pages.json

@@ -761,6 +761,42 @@
 				// #endif
 				"navigationBarTitleText": "我要捐赠"
 			
+			}
+		},
+		{
+			"path": "pages/user/myaid",
+			"style": {
+				// #ifndef MP
+				"app-plus": {
+					"titleNView": false
+				},
+				// #endif
+				"navigationBarTitleText": "我的捐赠"
+			
+			}
+		},
+		{
+			"path": "pages/user/intent",
+			"style": {
+				// #ifndef MP
+				"app-plus": {
+					"titleNView": false
+				},
+				// #endif
+				"navigationBarTitleText": "捐赠意向书"
+			
+			}
+		},
+		{
+			"path": "pages/user/thank",
+			"style": {
+				// #ifndef MP
+				"app-plus": {
+					"titleNView": false
+				},
+				// #endif
+				"navigationBarTitleText": "捐赠证书"
+			
 			}
 		}
 	],
@@ -773,33 +809,31 @@
 	"tabBar": {
 		"color": "#CACACA",
 		"selectedColor": "#FA7E67",
-		"borderStyle": "black",
-		// "iconWidth": "42rpx",
+		"borderStyle": "black",
 		"iconWidth": "42rpx",
-		// "fontSize": "42rpx",
 		"backgroundColor": "#ffffff",
 		"list": [{
 				"pagePath": "pages/index/index",
-				"iconPath": "static/tabBar/home.png",
+				"iconPath": "./static/tabBar/home.png",
 				"selectedIconPath": "static/tabBar/home-action.png",
 				"text": "首页"
 			},
 			{
 				"pagePath": "pages/category/category",
-				"iconPath": "static/tabBar/zuce.png",
-				"selectedIconPath": "static/tabBar/zuce-actin.png",
+				"iconPath": "static/tabBar/dengji.png",
+				"selectedIconPath": "static/tabBar/dengji-action.png",
 				"text": "救护员登记"
 			},
 			{
 				"pagePath": "pages/cart/cart",
-				"iconPath": "static/tabBar/dengji.png",
-				"selectedIconPath": "static/tabBar/dengji-action.png",
+				"iconPath": "static/tabBar/zuce.png",
+				"selectedIconPath": "static/tabBar/zuce-action.png",
 				"text": "会员登记"
 			},
 			{
 				"pagePath": "pages/user/user",
-				"iconPath": "static/tabBar/user-action.png",
-				"selectedIconPath": "static/tabBar/user.png",
+				"iconPath": "static/tabBar/user.png",
+				"selectedIconPath": "static/tabBar/user-action.png",
 				"text": "我的"
 			}
 		]

pages/applic/science.vue

@@ -80,7 +80,7 @@
 				let obj = this;
 				bannerlist().then(({ data }) => {
 					console.log(data);
-					obj.science = data;
+					obj.science = data.list;
 					console.log(obj.science,'999999999999999999')
 				});
 			},

pages/donate/donateDetail.vue

@@ -131,23 +131,23 @@
 			<view  class="type-box">
 				<view class="box-title">捐款类型</view>
 				<view class="box-tip">请选择您的捐赠身份类型</view>
-				<view class="box-btn" @click="chooseType(0)">
+				<view class="box-btn" @click="chooseType(1)">
 					<image src="" mode=""></image>
 					<view class="btn-title" >
 						个人捐赠
 					</view>
-					<view class="qq" :class="{'action': jxType === 0}">
+					<view class="qq" :class="{'action': jxType === 1}">
 						<view class="yx">
 							
 						</view>
 					</view>
 				</view>
-				<view class="box-btn" @click="chooseType(1)">
+				<view class="box-btn" @click="chooseType(0)">
 					<image src="" mode=""></image>
 					<view class="">
 						企业(团队)捐赠
 					</view>
-					<view class="qq"  :class="{'action': jxType === 1}">
+					<view class="qq"  :class="{'action': jxType === 0}">
 						<view class="yx">
 						</view>
 					</view>

pages/donate/idonate.vue

@@ -57,7 +57,7 @@
 			</view>
 			<view class="item">
 				<view class="item-tit">物流方式</view>
-				<picker @change="bindLogChange" :range="logs">
+				<picker @change="bindLogChange(item)" :range="logs">
 					<view class="log select" :class="{'action': log }">{{ log || '请选择物流方式' }}</view>
 				</picker>
 			</view>
@@ -77,38 +77,66 @@
 			<view class="mask">
 				<textarea :value="mask" placeholder="如果有备注请填写"/>
 			</view>
-			<view class="bbtm">
-				
+			<view class="bbtm"></view>
+			<view class="jzwz">
+				<view class="item-tit">捐赠物资<text>*</text></view>
+				<view class="choose-box">
+					<view class="choose-item" v-for="(item,index) in wzList" :key="index" @click="dianji(index)">
+						<picker @change="bindWzChange" :range="wzs">
+							<view class="wz select" :class="{'action': item.wzname }">{{ item.wzname }}</view>
+						</picker>
+						<input type="number" v-model="item.num" placeholder="填写数量"/>
+					</view>
+					<view class="more" @click="addMore">
+						+添加更多
+					</view>
+				</view>
 			</view>
 		</view>
 		<view class="tow" v-show="limit === 2">
 			<view class="t-item">
 				<view class="t-tit">
-					实物照片(必填)
+					实物照片(必填)<text>{{swimg | much}}/3</text>
+				</view>
+				<view class="img-list flex">
+					<template v-for="(item,index) in swimg">
+						<image src="../../static/images/upload.png" mode="" v-if="!item"  @click.stop="imgsub(swimg,index)" :key="index"></image>
+						<image :src="item" mode="" v-if="item"  @click.stop="imgsub(item)"  :key="index"></image>
+					</template>
 				</view>
-				<image src="" mode="" v-if="!cardimg1"  @click.stop="imgsub('cardimg1')"></image>
-				<image :src="cardimg1" mode="" v-if="cardimg1"  @click.stop="imgsub('cardimg1')"></image>
 			</view>
-			<view class="t-item">
+			<view class="t-item" v-if="type === 0">
 				<view class="t-tit">
-					营业执照(必填)                    
+					营业执照(必填)<text>{{yyimg | much}}/3</text>
+				</view>
+				<view class="img-list flex">
+					<template v-for="(item,index) in yyimg">
+						<image src="../../static/images/upload.png" mode="" v-if="!item"  @click.stop="imgsub(yyimg,index)" :key="index"></image>
+						<image :src="item" mode="" v-if="item"  @click.stop="imgsub(yyimg,index)"  :key="index"></image>
+					</template>
 				</view>
-				<image src="" mode="" v-if="!cardimg2"  @click.stop="imgsub('cardimg2')"></image>
-				<image :src="cardimg2" mode="" v-if="cardimg2"  @click.stop="imgsub('cardimg2')"></image>
 			</view>
 			<view class="t-item">
 				<view class="t-tit">
-					质量合格书(必填)
+					质量合格书(必填)<text>{{zlimg | much}}/3</text>
+				</view>
+				<view class="img-list flex">
+					<template v-for="(item,index) in zlimg">
+						<image src="../../static/images/upload.png" mode="" v-if="!item"  @click.stop="imgsub(zlimg,index)" :key="index"></image>
+						<image :src="item" mode="" v-if="item"  @click.stop="imgsub(zlimg,index)"  :key="index"></image>
+					</template>
 				</view>
-				<image src="" mode="" v-if="!cardimg3"  @click.stop="imgsub('cardimg3')"></image>
-				<image :src="cardimg3" mode="" v-if="cardimg3"  @click.stop="imgsub('cardimg3')"></image>
 			</view>
 			<view class="t-item">
 				<view class="t-tit">
-					价值凭证
+					价值凭证<text>{{jzimg | much}}/3</text>
+				</view>
+				<view class="img-list flex">
+					<template v-for="(item,index) in jzimg">
+						<image src="../../static/images/upload.png" mode="" v-if="!item"  @click.stop="imgsub(jzimg,index)" :key="index"></image>
+						<image :src="item" mode="" v-if="item"  @click.stop="imgsub(jzimg,index)"  :key="index"></image>
+					</template>
 				</view>
-				<image src="" mode="" v-if="!cardimg4"  @click.stop="imgsub('cardimg4')"></image>
-				<image :src="cardimg4" mode="" v-if="cardimg4"  @click.stop="imgsub('cardimg4')"></image>
 			</view>
 		</view>
 		<view class="jg">
@@ -157,11 +185,32 @@
 				name: '',// 捐赠人姓名
 				phone: '',//捐赠人联系方式
 				identityNumber: '',//身份证号
-				cardimg1: '',//实物照片
-				cardimg2: '',//营业执照
-				cardimg3: '',//质量合格书(必填)
-				cardimg4: '',//价值凭证
-				
+				wzs: ['帐篷类（帐篷）','棉被类(被子)'],
+				wzList: [
+					{
+						wzname: '帐篷类（帐篷）',
+						num: null
+					},
+					{
+						wzname: '棉被类(被子)',
+						num: null
+					}
+				],
+				swimg: [''],//实物照片
+				yyimg: [''],//营业执照
+				zlimg: [''],//质量合格证书
+				jzimg: [''],//价值凭证
+			}
+		},
+		filters:{
+			much(val) {
+				let num =  0
+				val.forEach(item => {
+					if(item) {
+						num += 1
+					}
+				})
+				return num
 			}
 		},
 		onLoad(ops) {
@@ -171,6 +220,9 @@
 			}
 			
 		},
+		mounted() {
+			// this.$set(this,'wzList',[this.wz1,this.wz2])
+		},
 		methods: {
 			//下一页
 			nextLimit() {
@@ -205,12 +257,36 @@
 					this.Isopen = true
 				}
 			},
-			imgsub(e) {
+			imgsub(item,index) {
+				console.log(index,item)
+				
 				upload({
 					filename: ''
 				}).then(data => {
-					this[e] = data[0].url;
+					console.log(data,'6666666666')
+					this.$set(item,index,data[0].url)
+					if(index < 2) {
+						this.$set(item,index+1,'')
+					}
 				});
+			},
+			//选择捐献物资分类
+			bindWzChange(e){
+				// item.wzname = e.detail.value
+				// console.log(item)
+				this.wzList[this.currentWzIndex].wzname = this.wzs[e.detail.value]
+				console.log(this.wzList)
+				
+			},
+			dianji(index) {
+				this.currentWzIndex = index
+			},
+			//添加更多
+			addMore() {
+				this.wzList.push({
+					wzname: this.wzs[0],
+					num: null
+				})
 			}
 			
 		}
@@ -229,12 +305,19 @@
 	}
 	.btn {
 		
-		height: 196rpx;
-		width: 100%;
+		// height: 196rpx;
+		// width: 100%;
+		width: 690rpx;
 		text-align: center;
 		display: flex;
 		justify-content: center;
 		line-height: 75rpx;
+		padding-bottom: 54rpx;
+		// padding-top: 54rpx;
+		position: fixed;
+		bottom: 0;
+		background-color: #fff;
+		z-index: 9;
 		.next {
 			width: 478rpx;
 			height: 75rpx;
@@ -314,7 +397,7 @@
 			font-family: PingFang SC;
 			font-weight: 500;
 			color: #000;
-			line-height: 24rpx;
+			line-height: 32rpx;
 			padding: 24rpx 16rpx;
 		}
 	}
@@ -346,9 +429,107 @@
 			display: block;
 			width: 160rpx;
 			height: 160rpx;
-			background: red;
+			// background: red;
 			border-radius: 5rpx;
-			margin: 0 auto;
+			// margin: 0 auto;
+		}
+		.t-tit {
+			position: relative;
+			text {
+				display: inline-block;
+				width: 73rpx;
+				height: 31rpx;
+				background: #F0433C;
+				border-radius: 14rpx;
+				font-size: 24rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #FFFFFF;
+				line-height: 31rpx;
+				text-align: center;
+				position: absolute;
+				right: 0;
+				// left: 0;
+				top: 0;
+				bottom: 0;
+				margin: auto;
+			}
+			
+		}
+		.img-list {
+			margin-top: 20rpx;
+			justify-content: center;
+			image {
+				margin-right: 20rpx;
+			}
+		}
+	}
+	.jzwz {
+		display: flex;
+		.item-tit {
+			font-size: 30rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #222222;
+			padding-top: 39rpx;
+			line-height: 1;
+			width: 200rpx;
 		}
+		.choose-box {
+			padding-top: 24rpx;
+			.choose-item {
+				display: flex;
+				margin-bottom: 15rpx;
+				.wz {
+					padding-left: 58rpx;
+					width: 297rpx;
+					height: 66rpx;
+					background: #F3F3F3;
+					border-radius: 5rpx;
+					font-size: 28rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #222222;
+					line-height: 66rpx;
+					&::after {
+						content: '';
+						width: 0;
+						height: 0;
+						border-left: 10rpx solid transparent;
+						border-right: 10rpx solid transparent;
+						border-top: 10rpx solid #808080;
+						position: absolute;
+						right: 10rpx;
+						bottom: 26rpx;
+					}
+				}
+				input {
+					width: 189rpx;
+					height: 66rpx;
+					background: #F3F3F3;
+					border-radius: 5rpx;
+					line-height: 66rpx;
+					margin-left: 15rpx;
+					text-align: center;
+				}
+			}
+			.more {
+				width: 297rpx;
+				height: 66rpx;
+				background: #FFFFFF;
+				border: 1px solid #FA7E67;
+				border-radius: 5rpx;
+				font-size: 24rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #FA7E67;
+				line-height: 66rpx;
+				text-align: center;
+			}
+		}
+	}
+	.jg {
+		height: 150rpx;
+		background-color: #fff;
 	}
 </style>

pages/donate/progress.vue

@@ -3,101 +3,243 @@
 		<view class="top">
 			<view class="top-t">
 				<view class="top-item">
-					<image src="" mode=""></image>
-					<view class="item-tit">
-						1.项目创建
-					</view>
+					<image src="../../static/icon/x1.png" mode=""></image>
+					<view class="item-tit">1.项目创建</view>
 				</view>
 				<view class="top-item">
-					<image src="" mode=""></image>
-					<view class="item-tit">
-						2.项目审核
-					</view>
+					<image src="../../static/icon/x2.png" mode=""></image>
+					<view class="item-tit">2.项目审核</view>
 				</view>
 				<view class="top-item">
-					<image src="" mode=""></image>
-					<view class="item-tit">
-						3.捐赠响应
-					</view>
+					<image src="../../static/icon/x3.png" mode=""></image>
+					<view class="item-tit">3.捐赠响应</view>
 				</view>
 				<view class="top-item">
-					<image src="" mode=""></image>
-					<view class="item-tit">
-						4.捐赠审核
-					</view>
+					<image src="../../static/icon/x4.png" mode=""></image>
+					<view class="item-tit">4.捐赠审核</view>
 				</view>
 			</view>
 			<view class="top-t">
 				<view class="top-item">
-					<image src="" mode=""></image>
-					<view class="item-tit">
-						5.捐赠品入库
-					</view>
+					<image src="../../static/icon/x5.png" mode=""></image>
+					<view class="item-tit">5.捐赠品入库</view>
 				</view>
 				<view class="top-item">
-					<image src="" mode=""></image>
-					<view class="item-tit">
-						6.捐赠品出库
-					</view>
+					<image src="../../static/icon/x6.png" mode=""></image>
+					<view class="item-tit">6.捐赠品出库</view>
 				</view>
 				<view class="top-item">
-					<image src="" mode=""></image>
-					<view class="item-tit">
-						7.发往受捐者
-					</view>
+					<image src="../../static/icon/x7.png" mode=""></image>
+					<view class="item-tit">7.发往受捐者</view>
 				</view>
 				<view class="top-item">
-					<image src="" mode=""></image>
+					<image src="../../static/icon/x8.png" mode=""></image>
+					<view class="item-tit">8.受捐者反馈</view>
+				</view>
+			</view>
+		</view>
+		<view class="main">
+			<view class="item">
+				<image src="" mode=""></image>
+				<view class="item-info">
+					<view class="item-tit">新建项目</view>
+					<view class="item-time">2021年06月17日 12:20:34 夏天里的清凉</view>
+				</view>
+				<view class="line1"></view>
+			</view>
+			<view class="item">
+				<image src="" mode="" ref="firstitem"></image>
+				<view class="item-info">
 					<view class="item-tit">
-						8.受捐者反馈
+						审核时间
+						<text>已通过</text>
+					</view>
+					<view class="item-time">2021年06月17日 12:20:34 夏天里的清凉</view>
+				</view>
+			</view>
+			<view class="item">
+				<image src="" mode=""></image>
+				<view class="item-info">
+					<view class="item-tit">捐赠审核</view>
+					<scroll-view scroll-y="true" class="item-num">
+						<view></view>
+					</scroll-view>
+				</view>
+			</view>
+			<view class="item" >
+				<image src="" mode=""></image>
+				<view class="item-info">
+					<view class="item-tit">统计信息</view>
+					<view class="all-info flex">
+						<view class="">捐赠进度<text class="jd">30%</text></view>
+						<view class="">捐赠笔数<text>25次</text></view>
+						<view class="">总计估值<text>￥100000</text></view>
+						<view class="">物流累计<text>20次</text></view>
+						<view class="" style="width: 100%;">上线时间<text>2021年06月10日</text></view>
 					</view>
 				</view>
 			</view>
 		</view>
-		<view class="">
-			
-		</view>
-	</view>
-</template>
-
-<script>
-</script>
-
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			peopleList: [],
+		};
+	},
+	mounted() {
+		this.$nextTick(()=>{ 
+			let a = this.$refs.firstitem.$el.offsetHeight;
+			console.log(a)
+		})
+	},
+	methods: {
+		getLineHeight() {
+			this.$nextTick(function(){
+				console.log(this.$refs.firstitem.$el.offsetHeight)
+				console.log(this.$refs.lastitem.$el.offsetHeight)
+				this.height1 = this.$refs.lastitem.$el.offsetHeight - this.$refs.firstitem.$el.offsetHeight
+				console.log(this.height1)
+			})
+		}
+	}
+	
+};
+</script>
+
 <style lang="scss" scoped>
-	.top {
-		padding: 40rpx 0;
-		background-color: #fff;
-		margin: 20rpx 0;
-		.top-t{
+.top {
+	padding: 40rpx 0;
+	background-color: #fff;
+	margin: 20rpx 0;
+	.top-t {
+		display: flex;
+		justify-content: space-between;
+		padding: 0 55rpx;
+		.top-item {
+			width: 160rpx;
 			display: flex;
-			justify-content: space-between;
-			padding: 0 55rpx;
-			.top-item {
+			flex-direction: column;
+			justify-content: center;
+			align-items: center;
+			margin-bottom: 30rpx;
+			image {
 				width: 160rpx;
-				display: flex;
-				flex-direction: column;
-				justify-content: center;
-				align-items: center;
-				margin-bottom: 30rpx;
-				image {
-					width: 115rpx;
-					height: 115rpx;
-					background: #FFFFFF;
-					border: 1px solid #DADADA;
-					box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.1);
-					border-radius: 14px;
-					margin-bottom: 15rpx;
-				}
-				.item-tit {
+				height: 160rpx;
+				background: #ffffff;
+				border-radius: 14px;
+				margin-bottom: 15rpx;
+			}
+			.item-tit {
+				font-size: 24rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #333333;
+				line-height: 1;
+			}
+			
+		}
+	}
+}
+.main {
+	background-color: #fff;
+	padding-right: 30rpx;
+	height: 100%;
+	.item {
+		position: relative;
+		image {
+			width: 45rpx;
+			height: 45rpx;
+			background: #FA7E67;
+			border-radius: 50%;
+			position: absolute;
+			top: 49rpx;
+			left: 39rpx;
+			z-index: 2;
+		}
+		.item-info {
+			width: 600rpx;
+			position: relative;
+			left: 112rpx;
+			padding-bottom: 34rpx;
+			border-bottom: 1px solid #ededed;
+			.item-tit {
+				padding-top: 39rpx;
+				font-size: 32rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #333333;
+				line-height: 1;
+				text {
+					display: inline-block;
+					width: 87rpx;
+					height: 33rpx;
+					border: 1px solid #0ec400;
+					border-radius: 5rpx;
 					font-size: 24rpx;
 					font-family: PingFang SC;
 					font-weight: 500;
-					color: #333333;
-					line-height: 1;
+					color: #0ec400;
+					text-align: center;
+					line-height: 30rpx;
+					margin-left: 10rpx;
+				}
+			}
+			
+			.item-time {
+				padding-top: 17rpx;
+				font-size: 24rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #bfbfbf;
+				line-height: 1;
+			}
+			.item-num {
+				margin-top: 21rpx;
+				height: 392rpx;
+				width: 592rpx;
+				background-color: red;
+			}
+			.all-info {
+				margin-top: 20rpx;
+				width: 601rpx;
+				height: 174rpx;
+				border: 1px solid #CCCCCC;
+				border-radius: 10rpx;
+				font-size: 24rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #999999;
+				align-items: center;
+				flex-wrap: wrap;
+				view {
+					flex-shrink: 0;
+					width: 50%;
+					padding-left: 20rpx;
+					text {
+						display: inline-block;
+						margin-left: 5rpx;
+						color: #000000;
+					}
+					.jd {
+						color: #E80000;
+					}
 				}
-				
 			}
 		}
-		
-	}
+		.line1 {
+			width: 2rpx;
+			height: 800rpx;
+			background: #FA7E67;
+			// opacity: 0.3;
+			position: absolute;
+			left: 61rpx;
+			top: 90rpx;
+			z-index: 1;
+		}
+	}
+}
 </style>

pages/form/certificates.vue

@@ -237,10 +237,10 @@ export default {
 		IndexShare() {
 			let obj = this;
 			let item = {
-				link:  'http://jxred.igxys.com/index/#/pages/train/sign?type=' + obj.type + '&id=' + obj.id + '&uid=' + obj.userInfo.uid,// 分享链接
+				link:  'http://jz.red.igxys.com/index/#/pages/train/sign?type=' + obj.type + '&id=' + obj.id + '&uid=' + obj.userInfo.uid,// 分享链接
 				imgUrl: '/index/static/img/002.png',
 				desc: '结业证书',
-				title: '江夏红十字会',
+				title: '荆州市红十字会',
 			};
 			console.log('分享加',item)
 			weixindata(item);

pages/form/donaSuccess.vue

@@ -184,8 +184,8 @@ export default {
 			let obj = this;
 			// let money = obj.money;
 			let item = {
-				link: 'http://http://ys.red.igxys.com/index/#/pages/form/donaSuccess?money=' + obj.money, // 分享链接
-				imgUrl: 'http://http://ys.red.igxys.com/index/#/static/img/thinks.png',
+				link: 'http://http://jz.red.igxys.com/index/#/pages/form/donaSuccess?money=' + obj.money, // 分享链接
+				imgUrl: 'http://http://jz.red.igxys.com/index/#/static/img/thinks.png',
 				desc: '感谢信',
 				title: '荆州市红十字会',
 				success: console.log('分享加载成功')

pages/index/index.vue

@@ -39,28 +39,9 @@
 		<view class="red-box">
 			<top-title :title="'爱心红会'"></top-title>
 			<view class="red-nav flex">
-				<!-- <view class="nav-item" @click="navTo('/pages/applic/love')">
-					<image src="../../static/icon/love1.png" mode=""></image>
-					<view class="item-tit">爱心捐款</view>
-					<view class="item-tit2">全民慈善传爱心</view>
-				</view>
-				<view class="nav-item" @click="navTo('/pages/applic/science')">
-					<view>
-						<image src="../../static/icon/love2.png" mode="" style="width: 111rpx; position: relative; right: -17rpx;"></image>
-					</view>
-					<view class="item-tit">红会科普</view>
-					<view class="item-tit2">关爱身心健康</view>
-				</view>
-				<view class="nav-item" @click="navTo('/pages/applic/item')">
-					<image src="../../static/icon/love3.png" mode=""></image>
-					<view class="item-tit">博爱项目</view>
-					<view class="item-tit2">弘扬红十字精神</view>
-				</view> -->
 				<view class="left-nav" @click="navTo('/pages/donate/donate')"></view>
 				<view class="right-nav flex">
-					<view class="right-top-nav">
-						
-					</view>
+					<view class="right-top-nav"></view>
 					<view class="right-bottom-nav flex">
 						<view class="left-item" @click="navTo('/pages/applic/love')"></view>
 						<view class="right-item" @click="navTo('/pages/applic/science')"></view>
@@ -677,7 +658,7 @@ a {
 	.carousel-section {
 		// padding-top: 10px;
 		overflow: hidden;
-
+		background-color: #fff;
 		.carousel {
 			width: 705rpx;
 			height: 375rpx;
@@ -989,6 +970,8 @@ a {
 			width: 332rpx;
 			height: 392rpx;
 			background: #FFF3F5;
+			background-image: url(../../static/img/m1.png);
+			background-size: 100% 100%;
 		}
 		.right-nav {
 			width: 357rpx;
@@ -1000,6 +983,8 @@ a {
 				width: 357rpx;
 				height: 204rpx;
 				background: #F6F6FF;
+				background-image: url(../../static/img/m2.png);
+				background-size: 100% 100%;
 			}
 			.right-bottom-nav {
 				width: 357rpx;
@@ -1014,6 +999,8 @@ a {
 				}
 				.right-item {
 					background: #EDFEFE;
+					background-image: url(../../static/img/m4.png);
+					background-size: 100% 100%;
 				}
 			}
 		}

pages/share/card.vue

@@ -118,10 +118,10 @@ export default {
 		IndexShare() {
 			let obj = this;
 			let item = {
-				link:  'http://jxred.igxys.com/index/#/pages/share/card',// 分享链接
+				link:  'http://jz.red.igxys.com/index/#/pages/share/card',// 分享链接
 				imgUrl: '/index/static/img/002.png',
 				desc: '电子名片分享',
-				title: '江夏红十字会',
+				title: '荆州市红十字会',
 			};
 			console.log('分享加',item)
 			weixindata(item);

pages/train/sign.vue

@@ -265,10 +265,10 @@ export default {
 		IndexShare() {
 			let obj = this;
 			let item = {
-				link:  'http://jxred.igxys.com/index/#/pages/train/sign?type=' + obj.type + '&id=' + obj.id + '&uid=' + obj.userInfo.uid,// 分享链接
+				link:  'http://jz.red.igxys.com/index/#/pages/train/sign?type=' + obj.type + '&id=' + obj.id + '&uid=' + obj.userInfo.uid,// 分享链接
 				imgUrl: '/index/static/img/002.png',
 				desc: '结业证书',
-				title: '江夏红十字会',
+				title: '荆州市红十字会',
 			};
 			console.log('分享加',item)
 			weixindata(item);

pages/user/intent.vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

pages/user/myaid.vue

@@ -0,0 +1,665 @@
+<template>
+	<view class="content">
+		<view class="navbar">
+			<view v-for="(item, index) in navList" :key="index" class="nav-item" :class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">{{ item.text }}</view>
+		</view>
+
+		<swiper :current="tabCurrentIndex" class="swiper-box" duration="300" @change="changeTab">
+			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
+				<scroll-view class="list-scroll-content" scroll-y @scrolltolower="loadData">
+					<!-- 空白页 -->
+					<empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty>
+
+					<!-- 订单列表 -->
+					<view @click="goToOrderDetail(item)" v-for="(item, index) in tabItem.orderList" :key="index" class="order-item">
+						<view class="item-top flex">
+							<view class="item-number">
+								项目编号：{{item.numb}}
+							</view>
+							<view class="item-status" v-if="item.status === 1" style="color: #FA7E67;">审核中</view>
+							<view class="item-status" v-if="item.status === 2" style="color: #FA7E67;">进行中</view>
+							<view class="item-status" v-if="item.status === 3" style="color: #FA7E67;">已完成</view>
+							<view class="item-status" v-if="item.status === 4" style="color: #999999">已失败</view>
+						</view>
+						<view class="item-main flex">
+							<image src="" mode=""></image>
+							<view class="item-info">
+								<view class="info-title">
+									{{item.title}}
+								</view>
+								<view class="info-content">
+									项目进度:您的捐赠{{item.status === 1 ? '正在审核中,请耐心等待':item.status !== 4 ? ' 审核未通过,感谢您的爱心!' : '审核已通过' }}
+								</view>
+								<view class="info-time">
+									申请时间{{item.add_time}}
+								</view>
+							</view>
+						</view>
+						<view class="item-bottom flex" v-if="item.status !== 4 && item.status !== 1">
+							<view class="yxs">
+								捐献意向书
+							</view>
+							<view class="zs" @click="navTo('/pages/user/intent')">
+								捐赠证书
+							</view>
+						</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 { mapState } from 'vuex';
+import { saveUrl } from '@/utils/loginUtils.js';
+import { orderList, orderCancel, orderDel, orderTake } from '@/api/order.js';
+export default {
+	filters: {
+
+	},
+	components: {
+		uniLoadMore,
+		empty
+	},
+	data() {
+		return {
+			tabCurrentIndex: 0,
+			state: '',
+			showModal: false,
+			navList: [
+				{
+					state: 0,
+					text: '全部',
+					loadingType: 'more',
+					orderList: [
+						{
+							numb: 1234567890,
+							status: 2,
+							img: '',
+							title: '夏天的清凉',
+							add_time: '2021-06-10',
+							
+						}
+					],
+					page: 1, //当前页数
+					limit: 10 //每次信息条数
+				},
+				{
+					state: 1,
+					text: '审核中',
+					loadingType: 'more',
+					orderList: [],
+					page: 1, //当前页数
+					limit: 10 //每次信息条数
+				},
+				{
+					state: 2,
+					text: '进行中',
+					loadingType: 'more',
+					orderList: [],
+					page: 1, //当前页数
+					limit: 10 //每次信息条数
+				},
+				{
+					state: 3,
+					text: '已完成',
+					loadingType: 'more',
+					orderList: [],
+					page: 1, //当前页数
+					limit: 10 //每次信息条数
+				}
+			]
+		};
+	},
+
+	onLoad(options) {
+			this.state = options.state;
+		
+		saveUrl();
+		/**
+		 * 修复app端点击除全部订单外的按钮进入时不加载数据的问题
+		 * 替换onLoad下代码即可
+		 */
+		this.tabCurrentIndex = +options.state;
+		// #ifndef MP
+		this.loadData();
+		// #endif
+		// #ifdef MP
+		if (options.state == 0) {
+			this.loadData();
+		}
+		// #endif
+	},
+	computed: {
+		...mapState(['userInfo'])
+	},
+	methods: {
+		// 确认收货
+		orderTake(item, index) {
+			let obj = this;
+			uni.showModal({
+				title: '是否确认收货？',
+				success: function(res) {
+					if (res.confirm) {
+						orderTake({
+							uni: item.order_id
+						})
+							.then(e => {
+								obj.navList[obj.tabCurrentIndex].orderList.splice(index, 1);
+								uni.showToast({
+									title: '收货成功',
+									icon: 'none'
+								});
+							})
+							.catch(e => {
+								console.log(e);
+							});
+					} else if (res.cancel) {
+						console.log('用户点击取消');
+					}
+				}
+			});
+		},
+		// 跳转到查询快递页面
+		expressCheck(item) {
+			uni.navigateTo({
+				url: '/pages/order/expressInfo?id=' + item.id
+			});
+		},
+
+		//跳转到订单详情
+		goToOrderDetail(e) {
+			uni.navigateTo({
+				url: '/pages/order/orderDetail?id=' + e.order_id
+			});
+		},
+
+		//分享
+		share(e) {
+			console.log(e);
+			uni.navigateTo({
+				url: '/pages/product/details?pink_id=' + e.pink_id
+			});
+		},
+		// 申请退款
+		orderRefund(e) {
+			uni.navigateTo({
+				url: '/pages/order/orderRefund?id=' + e.order_id
+			});
+		},
+		// 订单支付
+		orderPay(e) {
+			if (e.combination_id > 0) {
+				uni.navigateTo({
+					url: '/pages/money/pay?type=1&ordid=' + e.order_id + '&money=' + e.pay_price + '&goodsType=2'
+				});
+			} else {
+				uni.navigateTo({
+					url: '/pages/money/pay?type=1&ordid=' + e.order_id + '&money=' + e.pay_price
+				});
+			}
+			
+		},
+		//获取订单列表
+		loadData(source) {
+			//这里是将订单挂载到tab列表下
+			let index = this.tabCurrentIndex;
+			let navItem = this.navList[index];
+			let state = navItem.state;
+			if (source === 'tabChange' && navItem.loaded === true) {
+				//tab切换只有第一次需要加载数据
+				return;
+			}
+			if (navItem.loadingType === 'loading') {
+				//防止重复加载
+				return;
+			}
+			if (navItem.loadingType === 'noMore') {
+				//防止重复加载
+				return;
+			}
+			// 修改当前对象状态为加载中
+			navItem.loadingType = 'loading';
+
+			orderList({
+				type: state,
+				page: navItem.page,
+				limit: navItem.limit
+			})
+				.then(({ data }) => {
+					let arr = data.map(e => {
+						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';
+					}
+					this.$set(navItem, 'loaded', true);
+				})
+				.catch(e => {
+					console.log(e);
+				});
+			
+		},
+
+		//swiper 切换
+		changeTab(e) {
+			this.tabCurrentIndex = e.target.current;
+			this.loadData('tabChange');
+		},
+		//顶部tab点击
+		tabClick(index) {
+			this.tabCurrentIndex = index;
+			this.loadData('tabChange');
+		},
+		//删除订单
+		deleteOrder(item, index) {
+			uni.showModal({
+				content: '是否确认删除订单？',
+				success: res => {
+					uni.showLoading({
+						title: '请稍后'
+					});
+					setTimeout((e) => {
+						orderDel({
+							uni: item.order_id
+						})
+							.then(e => {
+								this.navList[this.tabCurrentIndex].orderList.splice(index, 1);
+								uni.hideLoading();
+							})
+							.catch(e => {
+								console.log(e);
+								uni.hideLoading();
+							});
+					},1000)
+				},
+				fail: e => {
+					console.log(e);
+				}
+			});
+		},
+		
+
+		//订单状态文字和颜色
+		orderStateExp(state) {
+			let stateTip = '',
+				stateTipColor = '#EF041F';
+			switch (+state) {
+				case 0:
+					stateTip = '全部';
+					break;
+				case 1:
+					stateTip = '待付款';
+					break;
+				case 2:
+					stateTip = '待发货';
+					break;
+				case 3:
+					stateTip = '待收货';
+					break;
+				case 4:
+					stateTip = '已完成';
+					stateTipColor = '#5dbc7c';
+					break;
+				case 9:
+					stateTip = '订单已关闭';
+					stateTipColor = '#909399';
+					break;
+
+				//更多自定义
+			}
+			return { stateTip, stateTipColor };
+		},
+		navTo(url) {
+			uni.navigateTo({
+				url: url
+			})
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+page,
+.content {
+	background: $page-color-base;
+	height: 100%;
+}
+
+.swiper-box {
+	height: calc(100% - 40px);
+	// padding: 0 20rpx;
+}
+.list-scroll-content {
+	height: 100%;
+}
+
+.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;
+		&.current {
+			color: #FF0000;
+			&:after {
+				content: '';
+				position: absolute;
+				left: 50%;
+				bottom: 0;
+				transform: translateX(-50%);
+				width: 44px;
+				height: 0;
+				border-bottom: 2px solid #FF0000;
+			}
+		}
+	}
+}
+
+.uni-swiper-item {
+	height: auto;
+}
+.order-item {
+	background-color: #fff;
+	padding: 0 20rpx;
+	.item-top {
+		justify-content: space-between;
+		height: 79rpx;
+		border-bottom: 1px solid  #E1E1E5;
+		line-height: 79rpx;
+		font-size: 26rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #333333;
+	}
+	.item-main {
+		height: 210rpx;
+		align-items: center;
+		image {
+			width: 220rpx;
+			height: 170rpx;
+			background: #FFFFFF;
+			border: 1px solid #DDDDDD;
+			border-radius: 10rpx;
+			margin: 18rpx;
+		}
+		.item-info {
+			width: 471rpx;
+			height: 170rpx;
+			position: relative;
+			.info-title {
+				font-size: 32rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #323232;
+				line-height: 1;
+				// position: absolute;
+				// top: 0;
+			}
+			.info-content {
+				padding-top: 14rpx;
+				font-size: 22rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #666666;
+				line-height: 1.5;
+			}
+			.info-time {
+				font-size: 22rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #999999;
+				position: absolute;
+				right: 0;
+				bottom: 0;
+			}
+		}
+		
+	}
+	.item-bottom {
+		height: 96rpx;
+		border-top: 1px solid  #E1E1E5;
+		justify-content: flex-end;
+		align-items: center;
+		view {
+			width: 144rpx;
+			height: 55rpx;
+			line-height: 55rpx;
+			text-align: center;
+			border-radius: 28rpx;
+			font-size: 24rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+		}
+		.yxs {		
+			border: 2px solid #FA7E67;
+			color: #FA7E67;
+			line-height: 50rpx;
+		}
+		.zs {
+			background: #FA7E67;
+			color: #fff;
+			margin-left: 15rpx;
+		}
+	}
+}
+
+// 积分投注弹窗
+.mask {
+	z-index: 10;
+	position: fixed;
+	top: 0;
+	right: 0;
+	bottom: 0;
+	left: 0;
+	background-color: rgba(0, 0, 0, 0.5);
+	width: 100%;
+	height: 100%;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	flex-direction: column;
+	.pop {
+		z-index: 12;
+		width: 560rpx;
+		height: 379rpx;
+		background: rgba(255, 255, 255, 1);
+		border-radius: 30px;
+		.pop-box {
+			width: 100%;
+			height: 100%;
+			display: flex;
+			flex-direction: column;
+			text-align: center;
+			align-items: center;
+			margin-top: -72rpx !important;
+			.pop-img {
+				width: 177rpx;
+				height: 186rpx;
+				margin-bottom: 34rpx;
+			}
+			.pop-title {
+				height: 34rpx;
+				font-size: 36rpx;
+				font-weight: 500;
+				color: rgba(51, 51, 51, 1);
+				margin-bottom: 32rpx;
+			}
+			.number {
+				width: 454rpx;
+				height: 78rpx;
+				background: rgba(234, 234, 234, 1);
+				background: #eaeaea;
+			}
+		}
+		//关闭按钮
+		.close-box {
+			margin-top: 130rpx;
+			text-align: center;
+			.close {
+				width: 83rpx;
+				height: 83rpx;
+			}
+		}
+	}
+}
+
+/* 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;
+	}
+}
+</style>

pages/user/thank.vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

pages/user/user.vue

@@ -17,9 +17,9 @@
 			</view>
 		</view>
 		<view class="nav-wrapper">
-			<view class="nav-item flex">
+			<view class="nav-item flex" @click="navTo('/pages/user/myaid?state=0')">
 				<view class="item-left flex">
-					<image src="" mode="" class="img1"></image>
+					<image src="../../static/icon/i5.png" mode="" class="img1"></image>
 					<view class="title">我的捐款</view>
 				</view>
 				<view class="item-right">
@@ -28,7 +28,7 @@
 			</view>
 			<view class="nav-item flex" @click="tohelp">
 				<view class="item-left flex">
-					<image src="" mode="" class="img1"></image>
+					<image src="../../static/icon/i6.png" mode="" class="img1"></image>
 					<view class="title">求救记录</view>
 				</view>
 				<view class="item-right">
@@ -37,7 +37,7 @@
 			</view>
 			<view class="nav-item flex" @click="torreco">
 				<view class="item-left flex">
-					<image src="" mode="" class="img2"></image>
+					<image src="../../static/icon/i7.png" mode="" class="img2"></image>
 					<view class="title">救援记录</view>
 				</view>
 				<view class="item-right">
@@ -46,7 +46,7 @@
 			</view>
 			<view class="nav-item flex" @click="commonaddress">
 				<view class="item-left flex">
-					<image src="" mode="" class="img3"></image>
+					<image src="../../static/icon/i8.png" mode="" class="img3"></image>
 					<view class="title">常用地址</view>
 				</view>
 				<view class="item-right">
@@ -55,7 +55,7 @@
 			</view>
 			<view class="nav-item flex" @click="tocertificates" >
 				<view class="item-left flex">
-					<image src="" mode="" class="img4"></image>
+					<image src="../../static/icon/i9.png" mode="" class="img4"></image>
 					<view class="title">我的证书</view>
 				</view>
 				<view class="item-right">
@@ -202,6 +202,11 @@
 					// url: '/pages/form/certificates?name=' + this.name + '&signDate=' + this.signDate
 					url: '/pages/form/certificatesList' 
 				})
+			},
+			navTo(url) {
+				uni.navigateTo({
+					url: url
+				})
 			}
 		}
 	}
@@ -218,13 +223,15 @@
 		.top {
 			width: 750rpx;
 			height: 312rpx;
-			background-color: #fa7e67;
+			// background-color: #fa7e67;
 			display: flex;
 			flex-direction: column;
 			align-items: center;
 			padding-left: 55rpx;
 			align-items: center;
 			justify-content: center;
+			background-image: url(../../static/img/userbg.png);
+			background-size: 100% 100%;
 			.avater {
 				width: 150rpx;
 				height: 150rpx;
@@ -391,7 +398,7 @@
 				
 				align-items: center;
 				image {
-					background-color: red;
+					// background-color: red;
 				}
 				.img1 {
 					width: 34rpx;

unpackage/dist/dev/app-plus/__uniappview.html

@@ -4,10 +4,7 @@
   <head>
     <meta charset="UTF-8" />
     <script>
-      var __UniViewStartTime__ = Date.now();
-      document.addEventListener('DOMContentLoaded', function() {
-          document.documentElement.style.fontSize = document.documentElement.clientWidth / 20 + 'px'
-      })
+      var __UniViewStartTime__ = Date.now();
       var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') ||
         CSS.supports('top: constant(a)'))
       document.write(
@@ -19,10 +16,10 @@
   </head>
 
   <body>
-    <div id="app"></div>
-    <script src="__uniappes6.js"></script>
-    <script src="view.umd.min.js"></script>
+    <div id="app"></div>
+    <script src="__uniappes6.js"></script>
+    <script src="view.umd.min.js"></script>
     <script src="app-view.js"></script>
   </body>
 
-</html>
+</html>

unpackage/dist/dev/app-plus/app-config.js

@@ -1,153 +1,154 @@
-/******/ (function(modules) { // webpackBootstrap
-/******/ 	// install a JSONP callback for chunk loading
-/******/ 	function webpackJsonpCallback(data) {
-/******/ 		var chunkIds = data[0];
-/******/ 		var moreModules = data[1];
-/******/ 		var executeModules = data[2];
-/******/
-/******/ 		// add "moreModules" to the modules object,
-/******/ 		// then flag all "chunkIds" as loaded and fire callback
-/******/ 		var moduleId, chunkId, i = 0, resolves = [];
-/******/ 		for(;i < chunkIds.length; i++) {
-/******/ 			chunkId = chunkIds[i];
-/******/ 			if(installedChunks[chunkId]) {
-/******/ 				resolves.push(installedChunks[chunkId][0]);
-/******/ 			}
-/******/ 			installedChunks[chunkId] = 0;
-/******/ 		}
-/******/ 		for(moduleId in moreModules) {
-/******/ 			if(Object.prototype.hasOwnProperty.call(moreModules, moduleId)) {
-/******/ 				modules[moduleId] = moreModules[moduleId];
-/******/ 			}
-/******/ 		}
-/******/ 		if(parentJsonpFunction) parentJsonpFunction(data);
-/******/
-/******/ 		while(resolves.length) {
-/******/ 			resolves.shift()();
-/******/ 		}
-/******/
-/******/ 		// add entry modules from loaded chunk to deferred list
-/******/ 		deferredModules.push.apply(deferredModules, executeModules || []);
-/******/
-/******/ 		// run deferred modules when all chunks ready
-/******/ 		return checkDeferredModules();
-/******/ 	};
-/******/ 	function checkDeferredModules() {
-/******/ 		var result;
-/******/ 		for(var i = 0; i < deferredModules.length; i++) {
-/******/ 			var deferredModule = deferredModules[i];
-/******/ 			var fulfilled = true;
-/******/ 			for(var j = 1; j < deferredModule.length; j++) {
-/******/ 				var depId = deferredModule[j];
-/******/ 				if(installedChunks[depId] !== 0) fulfilled = false;
-/******/ 			}
-/******/ 			if(fulfilled) {
-/******/ 				deferredModules.splice(i--, 1);
-/******/ 				result = __webpack_require__(__webpack_require__.s = deferredModule[0]);
-/******/ 			}
-/******/ 		}
-/******/ 		return result;
-/******/ 	}
-/******/
-/******/ 	// The module cache
-/******/ 	var installedModules = {};
-/******/
-/******/ 	// object to store loaded and loading chunks
-/******/ 	// undefined = chunk not loaded, null = chunk preloaded/prefetched
-/******/ 	// Promise = chunk loading, 0 = chunk loaded
-/******/ 	var installedChunks = {
-/******/ 		"app-config": 0
-/******/ 	};
-/******/
-/******/ 	var deferredModules = [];
-/******/
-/******/ 	// The require function
-/******/ 	function __webpack_require__(moduleId) {
-/******/
-/******/ 		// Check if module is in cache
-/******/ 		if(installedModules[moduleId]) {
-/******/ 			return installedModules[moduleId].exports;
-/******/ 		}
-/******/ 		// Create a new module (and put it into the cache)
-/******/ 		var module = installedModules[moduleId] = {
-/******/ 			i: moduleId,
-/******/ 			l: false,
-/******/ 			exports: {}
-/******/ 		};
-/******/
-/******/ 		// Execute the module function
-/******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
-/******/
-/******/ 		// Flag the module as loaded
-/******/ 		module.l = true;
-/******/
-/******/ 		// Return the exports of the module
-/******/ 		return module.exports;
-/******/ 	}
-/******/
-/******/
-/******/ 	// expose the modules object (__webpack_modules__)
-/******/ 	__webpack_require__.m = modules;
-/******/
-/******/ 	// expose the module cache
-/******/ 	__webpack_require__.c = installedModules;
-/******/
-/******/ 	// define getter function for harmony exports
-/******/ 	__webpack_require__.d = function(exports, name, getter) {
-/******/ 		if(!__webpack_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
-/******/ 		}
-/******/ 	};
-/******/
-/******/ 	// define __esModule on exports
-/******/ 	__webpack_require__.r = function(exports) {
-/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
-/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-/******/ 		}
-/******/ 		Object.defineProperty(exports, '__esModule', { value: true });
-/******/ 	};
-/******/
-/******/ 	// create a fake namespace object
-/******/ 	// mode & 1: value is a module id, require it
-/******/ 	// mode & 2: merge all properties of value into the ns
-/******/ 	// mode & 4: return value when already ns object
-/******/ 	// mode & 8|1: behave like require
-/******/ 	__webpack_require__.t = function(value, mode) {
-/******/ 		if(mode & 1) value = __webpack_require__(value);
-/******/ 		if(mode & 8) return value;
-/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
-/******/ 		var ns = Object.create(null);
-/******/ 		__webpack_require__.r(ns);
-/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
-/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
-/******/ 		return ns;
-/******/ 	};
-/******/
-/******/ 	// getDefaultExport function for compatibility with non-harmony modules
-/******/ 	__webpack_require__.n = function(module) {
-/******/ 		var getter = module && module.__esModule ?
-/******/ 			function getDefault() { return module['default']; } :
-/******/ 			function getModuleExports() { return module; };
-/******/ 		__webpack_require__.d(getter, 'a', getter);
-/******/ 		return getter;
-/******/ 	};
-/******/
-/******/ 	// Object.prototype.hasOwnProperty.call
-/******/ 	__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
-/******/
-/******/ 	// __webpack_public_path__
-/******/ 	__webpack_require__.p = "/";
-/******/
-/******/ 	var jsonpArray = this["webpackJsonp"] = this["webpackJsonp"] || [];
-/******/ 	var oldJsonpFunction = jsonpArray.push.bind(jsonpArray);
-/******/ 	jsonpArray.push = webpackJsonpCallback;
-/******/ 	jsonpArray = jsonpArray.slice();
-/******/ 	for(var i = 0; i < jsonpArray.length; i++) webpackJsonpCallback(jsonpArray[i]);
-/******/ 	var parentJsonpFunction = oldJsonpFunction;
-/******/
-/******/
-/******/ 	// run deferred modules from other chunks
-/******/ 	checkDeferredModules();
-/******/ })
-/************************************************************************/
+/******/ (function(modules) { // webpackBootstrap
+/******/ 	// install a JSONP callback for chunk loading
+/******/ 	function webpackJsonpCallback(data) {
+/******/ 		var chunkIds = data[0];
+/******/ 		var moreModules = data[1];
+/******/ 		var executeModules = data[2];
+/******/
+/******/ 		// add "moreModules" to the modules object,
+/******/ 		// then flag all "chunkIds" as loaded and fire callback
+/******/ 		var moduleId, chunkId, i = 0, resolves = [];
+/******/ 		for(;i < chunkIds.length; i++) {
+/******/ 			chunkId = chunkIds[i];
+/******/ 			if(Object.prototype.hasOwnProperty.call(installedChunks, chunkId) && installedChunks[chunkId]) {
+/******/ 				resolves.push(installedChunks[chunkId][0]);
+/******/ 			}
+/******/ 			installedChunks[chunkId] = 0;
+/******/ 		}
+/******/ 		for(moduleId in moreModules) {
+/******/ 			if(Object.prototype.hasOwnProperty.call(moreModules, moduleId)) {
+/******/ 				modules[moduleId] = moreModules[moduleId];
+/******/ 			}
+/******/ 		}
+/******/ 		if(parentJsonpFunction) parentJsonpFunction(data);
+/******/
+/******/ 		while(resolves.length) {
+/******/ 			resolves.shift()();
+/******/ 		}
+/******/
+/******/ 		// add entry modules from loaded chunk to deferred list
+/******/ 		deferredModules.push.apply(deferredModules, executeModules || []);
+/******/
+/******/ 		// run deferred modules when all chunks ready
+/******/ 		return checkDeferredModules();
+/******/ 	};
+/******/ 	function checkDeferredModules() {
+/******/ 		var result;
+/******/ 		for(var i = 0; i < deferredModules.length; i++) {
+/******/ 			var deferredModule = deferredModules[i];
+/******/ 			var fulfilled = true;
+/******/ 			for(var j = 1; j < deferredModule.length; j++) {
+/******/ 				var depId = deferredModule[j];
+/******/ 				if(installedChunks[depId] !== 0) fulfilled = false;
+/******/ 			}
+/******/ 			if(fulfilled) {
+/******/ 				deferredModules.splice(i--, 1);
+/******/ 				result = __webpack_require__(__webpack_require__.s = deferredModule[0]);
+/******/ 			}
+/******/ 		}
+/******/
+/******/ 		return result;
+/******/ 	}
+/******/
+/******/ 	// The module cache
+/******/ 	var installedModules = {};
+/******/
+/******/ 	// object to store loaded and loading chunks
+/******/ 	// undefined = chunk not loaded, null = chunk preloaded/prefetched
+/******/ 	// Promise = chunk loading, 0 = chunk loaded
+/******/ 	var installedChunks = {
+/******/ 		"app-config": 0
+/******/ 	};
+/******/
+/******/ 	var deferredModules = [];
+/******/
+/******/ 	// The require function
+/******/ 	function __webpack_require__(moduleId) {
+/******/
+/******/ 		// Check if module is in cache
+/******/ 		if(installedModules[moduleId]) {
+/******/ 			return installedModules[moduleId].exports;
+/******/ 		}
+/******/ 		// Create a new module (and put it into the cache)
+/******/ 		var module = installedModules[moduleId] = {
+/******/ 			i: moduleId,
+/******/ 			l: false,
+/******/ 			exports: {}
+/******/ 		};
+/******/
+/******/ 		// Execute the module function
+/******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
+/******/
+/******/ 		// Flag the module as loaded
+/******/ 		module.l = true;
+/******/
+/******/ 		// Return the exports of the module
+/******/ 		return module.exports;
+/******/ 	}
+/******/
+/******/
+/******/ 	// expose the modules object (__webpack_modules__)
+/******/ 	__webpack_require__.m = modules;
+/******/
+/******/ 	// expose the module cache
+/******/ 	__webpack_require__.c = installedModules;
+/******/
+/******/ 	// define getter function for harmony exports
+/******/ 	__webpack_require__.d = function(exports, name, getter) {
+/******/ 		if(!__webpack_require__.o(exports, name)) {
+/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
+/******/ 		}
+/******/ 	};
+/******/
+/******/ 	// define __esModule on exports
+/******/ 	__webpack_require__.r = function(exports) {
+/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 		}
+/******/ 		Object.defineProperty(exports, '__esModule', { value: true });
+/******/ 	};
+/******/
+/******/ 	// create a fake namespace object
+/******/ 	// mode & 1: value is a module id, require it
+/******/ 	// mode & 2: merge all properties of value into the ns
+/******/ 	// mode & 4: return value when already ns object
+/******/ 	// mode & 8|1: behave like require
+/******/ 	__webpack_require__.t = function(value, mode) {
+/******/ 		if(mode & 1) value = __webpack_require__(value);
+/******/ 		if(mode & 8) return value;
+/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
+/******/ 		var ns = Object.create(null);
+/******/ 		__webpack_require__.r(ns);
+/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
+/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
+/******/ 		return ns;
+/******/ 	};
+/******/
+/******/ 	// getDefaultExport function for compatibility with non-harmony modules
+/******/ 	__webpack_require__.n = function(module) {
+/******/ 		var getter = module && module.__esModule ?
+/******/ 			function getDefault() { return module['default']; } :
+/******/ 			function getModuleExports() { return module; };
+/******/ 		__webpack_require__.d(getter, 'a', getter);
+/******/ 		return getter;
+/******/ 	};
+/******/
+/******/ 	// Object.prototype.hasOwnProperty.call
+/******/ 	__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
+/******/
+/******/ 	// __webpack_public_path__
+/******/ 	__webpack_require__.p = "/";
+/******/
+/******/ 	var jsonpArray = this["webpackJsonp"] = this["webpackJsonp"] || [];
+/******/ 	var oldJsonpFunction = jsonpArray.push.bind(jsonpArray);
+/******/ 	jsonpArray.push = webpackJsonpCallback;
+/******/ 	jsonpArray = jsonpArray.slice();
+/******/ 	for(var i = 0; i < jsonpArray.length; i++) webpackJsonpCallback(jsonpArray[i]);
+/******/ 	var parentJsonpFunction = oldJsonpFunction;
+/******/
+/******/
+/******/ 	// run deferred modules from other chunks
+/******/ 	checkDeferredModules();
+/******/ })
+/************************************************************************/
 /******/ ([]);

unpackage/dist/dev/app-plus/static/css/cmy.css

@@ -0,0 +1,443 @@
+/*初始化类*/
+@font-face {
+	font-family: 'iconfont';
+	/* project id 1482221 */
+	src: url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.eot');
+	src: url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.eot?#iefix') format('embedded-opentype'),
+		url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.woff2') format('woff2'),
+		url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.woff') format('woff'),
+		url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.ttf') format('truetype'),
+		url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.svg#iconfont') format('svg');
+}
+
+.iconfont {
+	font-family: 'iconfont' !important;
+	font-size: 34rpx;
+	font-style: normal;
+	-webkit-font-smoothing: antialiased;
+	-webkit-text-stroke-width: 0rpx;
+	-moz-osx-font-smoothing: grayscale;
+}
+
+.iconedit:before {
+	content: "\e649";
+}
+
+.iconfavorfill:before {
+	content: "\e64b";
+}
+
+.iconfavor:before {
+	content: "\e64c";
+}
+
+.iconlocation:before {
+	content: "\e651";
+}
+
+.iconroundcheckfill:before {
+	content: "\e656";
+}
+
+.iconroundcheck:before {
+	content: "\e657";
+}
+
+.iconunfold:before {
+	content: "\e661";
+}
+
+.iconlikefill:before {
+	content: "\e668";
+}
+
+.iconlike:before {
+	content: "\e669";
+}
+
+.iconshop:before {
+	content: "\e676";
+}
+
+.iconcart:before {
+	content: "\e6af";
+}
+
+.icondelete:before {
+	content: "\e6b4";
+}
+
+.iconhome:before {
+	content: "\e6b8";
+}
+
+.iconcartfill:before {
+	content: "\e6b9";
+}
+
+.iconhomefill:before {
+	content: "\e6bb";
+}
+
+.iconlock:before {
+	content: "\e6c0";
+}
+
+.iconfriendadd:before {
+	content: "\e6ca";
+}
+
+.iconfold:before {
+	content: "\e6de";
+}
+
+.iconapps:before {
+	content: "\e729";
+}
+
+.iconadd:before {
+	content: "\e767";
+}
+
+.iconmove:before {
+	content: "\e768";
+}
+
+.icontriangledownfill:before {
+	content: "\e79b";
+}
+
+.icontriangleupfill:before {
+	content: "\e79c";
+}
+
+.iconshaixuan:before {
+	content: "\e74a";
+}
+
+.iconyanzhengma:before {
+	content: "\e684";
+}
+
+.iconjifen:before {
+	content: "\e60f";
+}
+
+.iconwuliuxinxi:before {
+	content: "\e62b";
+}
+
+.iconmessage:before {
+	content: "\e78a";
+}
+
+.iconsetting:before {
+	content: "\e78e";
+}
+
+.iconaddition:before {
+	content: "\e6e0";
+}
+
+.iconclose:before {
+	content: "\e6e9";
+}
+
+.iconenter:after {
+	content: "\e6f8";
+}
+
+.iconprompt:before {
+	content: "\e71b";
+}
+
+.iconreturn:before {
+	content: "\e720";
+}
+
+.iconsearch:before {
+	content: "\e741";
+}
+
+.iconpengyouquan:before {
+	content: "\e62c";
+}
+
+.iconweixin:before {
+	content: "\e60e";
+}
+
+.iconzhifubao:before {
+	content: "\e673";
+}
+
+.iconyue:before {
+	content: "\e618";
+}
+
+.iconweixin1:before {
+	content: "\e622";
+}
+
+.iconlock1:before {
+	content: "\e64d";
+}
+
+.iconuser:before {
+	content: "\e64e";
+}
+
+.iconchenggongtixianshouyi:before {
+	content: "\e64f";
+}
+
+.iconviptuiguangdingdan:before {
+	content: "\e650";
+}
+
+.icondaifukuan:before {
+	content: "\e652";
+}
+
+.icondaijiesuanshouyi:before {
+	content: "\e653";
+}
+
+.icondaidakuanshouyi:before {
+	content: "\e654";
+}
+
+.icondaifahuo:before {
+	content: "\e655";
+}
+
+.icondaishouhuoshouyi:before {
+	content: "\e658";
+}
+
+.icondaishouhuo:before {
+	content: "\e659";
+}
+
+.iconwuxiaoshouyi:before {
+	content: "\e65a";
+}
+
+.icontixianmingxi:before {
+	content: "\e65b";
+}
+
+.iconshouyi:before {
+	content: "\e65c";
+}
+
+.iconkouchutixianshouxufei:before {
+	content: "\e65d";
+}
+
+.iconyishenqingshouyi:before {
+	content: "\e65e";
+}
+
+.icontuihuanhuo:before {
+	content: "\e65f";
+}
+
+
+/*水平线*/
+.hr {
+	width: 100%;
+	position: relative;
+	border-bottom: 1px solid #dddddd;
+	/* height: 0.5rpx; */
+}
+
+/* 一行显示 */
+.clamp {
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	display: block;
+}
+/* 二行显示 */
+.ellipsis{
+	overflow:hidden; 
+	text-overflow:ellipsis;
+	display:-webkit-box; 
+	-webkit-box-orient:vertical;
+	-webkit-line-clamp:2;
+}
+.common-hover {
+	background: #f5f5f5;
+}
+
+/* 角标 */
+.corner{
+	background-color:#e51c23;
+	position: absolute;
+	right: -18rpx;
+	top: -18rpx;
+	color:#FFFFFF;
+	text-align: center;
+	border-radius: 999px;
+	font-size: 24rpx !important;
+	min-width: 35rpx;
+	min-height: 35rpx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	line-height: 1;
+}
+/*文字对齐*/
+.text-left {
+	text-align: left !important;
+}
+
+.text-center {
+	text-align: center !important;
+}
+
+.text-justify {
+	text-align: justify !important;
+}
+
+.text-right {
+	text-align: right !important;
+}
+
+.text-default {
+	color: #212121 !important;
+}
+
+.text-white {
+	color: #ffffff !important;
+}
+
+.text-primary {
+	color: #00bcd4 !important;
+}
+
+.text-success {
+	color: #009688 !important;
+}
+
+.text-info {
+	color: #03a9f4 !important;
+}
+
+.text-warning {
+	color: #ffc107 !important;
+}
+
+.text-danger {
+	color: #e51c23 !important;
+}
+
+.text-pink {
+	color: #e91e63 !important;
+}
+
+.text-purple {
+	color: #673ab7 !important;
+}
+
+.text-indigo {
+	color: #3f51b5 !important;
+}
+
+.text-gray {
+	color: #999999 !important;
+}
+
+.bg-default {
+	background-color: #f5f5f5 !important;
+}
+
+.bg-primary {
+	background-color: #00bcd4 !important;
+}
+
+.bg-success {
+	background-color: #009688 !important;
+}
+
+.bg-info {
+	background-color: #03a9f4 !important;
+}
+
+.bg-warning {
+	background-color: #f1c40f !important;
+}
+
+.bg-danger {
+	background-color: #e51c23 !important;
+}
+
+.bg-pink {
+	background-color: #e91e63 !important;
+}
+
+.bg-purple {
+	background-color: #673ab7 !important;
+}
+
+.bg-indigo {
+	background-color: #3f51b5 !important;
+}
+
+.bg-white {
+	background-color: white !important;
+}
+
+.bg-gray {
+	background-color: #e3e3e3 !important;
+}
+
+/* 边框 */
+.border-radius-15 {
+	border-radius: 15rpx;
+}
+
+.border-radius-10 {
+	border-radius: 10rpx;
+}
+
+.border-radius-all {
+	border-radius: 1000rpx;
+}
+
+/* 底部边线 */
+.borde-b {
+	border-bottom: 1px solid #dddddd;
+}
+
+/* 弹性盒子 */
+.flex {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+}
+.flex_item {
+	display: flex;
+	align-items: center;
+	/* justify-content: space-between; */
+}
+.items-left {
+	justify-content: flex-start;
+}
+
+.items-right {
+	justify-content: flex-end;
+}
+
+.flex-shrink-false {
+	flex-shrink: 0;
+}
+
+.flex-grow-true {
+	flex-grow: 1;
+}
+
+.position-relative {
+	position: relative;
+}