11-13

manifest.json

@@ -98,7 +98,11 @@
         // "^/api" : ""
         "template" : "",
         "sdkConfigs" : {
-            "maps" : {}
+            "maps" : {
+                "qqmap" : {
+                    "key" : "VYZBZ-P2TRG-RMIQ3-ITAIN-2DKBK-CKFQQ"
+                }
+            }
         }
     }
 }

pages/applic/contribution.vue

@@ -437,9 +437,9 @@
 							let date = new Date()
 							let year = date.getFullYear()
 							let month = date.getMonth() >= 9 ? date.getMonth() + 1 : '0'+(date.getMonth() +1 )
-							let day = date.getDay() >= 10 ? date.getDay() : '0' + date.getDay()
+							let day = date.getDate() >= 10 ? date.getDate() : '0' + date.getDate()
 							uni.navigateTo({
-								url: '/pages/form/donaSuccess?money=' + obj.money + '&name=' + obj.donate_er + '&time=' + year + '年' + month + '月' + day +'日'
+								url: '/pages/form/donaSuccess?money=' + obj.money + '&name=' + encodeURI(obj.donate_er) + '&time=' + encodeURI(year + '年' + month + '月' + day + '日')
 							})
 						},
 						fail: function(res) {

pages/applic/other.vue

@@ -4,7 +4,7 @@
 			<image src="../../static/img/002.png" mode="aspectFill"></image>
 			<view class="font">
 				<view class="china-font">松滋市红十字会</view>
-				<view class="english-font">Red Cross Society of China Ying Shan Branch</view>
+				<view class="english-font">Songzi Red Cross Society</view>
 			</view>
 		</view>
 
@@ -32,17 +32,17 @@
 			<!-- <view class="image">
 				<image src="../../static/images/other.png" mode=""></image>
 			</view> -->
-			<view class="title">2.扫码捐款</view>
+			<!-- <view class="title">2.扫码捐款</view> -->
 		<!-- 	<view class="zfb">支付宝扫码捐款</view> -->
-			<view class="erweima"><image src="../../static/images/smjk.png" mode=""></image></view>
+			<!-- <view class="erweima"><image src="../../static/images/smjk.png" mode=""></image></view> -->
 			<!-- <view class="weixin">微信扫码捐款</view>
 			<view class="erweima" style="background: #02974A;"><image src="" mode=""></image></view> -->
 
-			<view class="title">3.现场捐款/捐物</view>
+			<view class="title">2.现场捐款/捐物</view>
 			<view class="detail">
-				<view class="detail-item">负责人：高楠清</view>
-				<view class="detail-item">咨询电话：0716-4163849</view>
-				<view class="detail-item">地址：荆州市荆州区荆东路18号</view>
+				<view class="detail-item">负责人：高明</view>
+				<view class="detail-item">咨询电话：07166222692</view>
+				<view class="detail-item">地址：湖北省松滋市新江口街道谢家冲路69号</view>
 			</view>
 		</view>
 	</view>
@@ -57,9 +57,9 @@ export default {
 				{
 					id: 0,
 					spread_url: 11,
-					name: '荆州市红十字会',
-					count: '中国银行荆州分行营业部',
-					number: '566457531072'
+					name: '松滋市红十字会',
+					count: '中国工商银行松滋市支行',
+					number: '1813028109200163332'
 				}
 			]
 		};

pages/donate/donateDetail.vue

@@ -139,7 +139,7 @@
 						<view class="item-top">
 							<image src="../../static/img/002.png" mode=""></image>
 							<view class="item-name-time">
-								<view class="item-name">荆州捐赠</view>
+								<view class="item-name">松滋市捐赠</view>
 								<view class="item-time">{{ item.time | time }}</view>
 							</view>
 						</view>
@@ -254,7 +254,7 @@ export default {
 				let arr = val.map(item => {
 					for (let i = 0; i < typeList.length; i++) {
 						if (item.project_donation_id == typeList[i].id) {
-							str = str + typeList[i].name + ' ' + item.project_donation_num + ' ' + '个 ';
+							str = str + typeList[i].name + ' ' + item.project_donation_num + ' ' + ' ';
 						}
 					}
 				});
@@ -425,7 +425,7 @@ export default {
 				item.forEach(item => {
 					for (let i = 0; i < this.typeList.length; i++) {
 						if (item.project_donation_id === this.typeList[i].project_donation_id) {
-							str = str + this.typeList[i].project_donation_name + item.project_donation_num + '个';
+							str = str + this.typeList[i].project_donation_name + item.project_donation_num + '';
 						}
 					}
 				});

pages/donate/idonate.vue

@@ -61,7 +61,7 @@
 					<view class="log " :class="{'select': log }">{{ log || '请选择物流方式' }}</view>
 				</picker>
 			</view>
-			<view class="item">
+			<view class="item" v-if="jxdz_show">
 				<view class="item-tit">捐赠地址<text>*</text></view>
 				<picker @change="bindAreaChange" :range="areas" range-key="name">
 					<view class="log " :class="{'select': area }">{{ area || '请选择捐赠地址' }}</view>
@@ -89,7 +89,7 @@
 				<view class="choose-box">
 					<view class="choose-item" v-for="(item,index) in wzList" :key="index" @click="dianji(index)">
 						<picker @change="bindWzChange" :range="wzs" range-key="name">
-							<view class="wz select" :class="{'action': item.project_donation_name }">{{ item.project_donation_name || '请选择物资分类' }}</view>
+							<view class="wz select clamp" :class="{'action': item.project_donation_name }">{{ item.project_donation_name || '请选择物资分类' }}</view>
 						</picker>
 						<input type="number" v-model="item.project_donation_num" placeholder="填写数量"/>
 						<!-- <view class="dele"  v-if="index != 0">
@@ -174,19 +174,11 @@
 
 <script>
 	import { upload } from '@/api/ask.js';
-	import {
-		saveUrl,
-		interceptor
-	} from '@/utils/loginUtils.js';
-	import {
-		mapState,
-		mapMutations
-	} from 'vuex';
 	import { getProjectInfo, createProject, getLogistics, getDonationInfo, createUser,getAllArea } from '../../api/money.js';
 	export default {
 		data() {
 			return {
-				project_area: 0,
+				project_area: 224,
 				areas: [{
 					id: 0,
 					name: '市本级'
@@ -233,6 +225,7 @@
 				true_wzList: [],//最终捐赠的物资列表
 				hadadd: [],//已添加分类
 				project_id: 0,//项目ID
+				jxdz_show: false,
 			}
 		},
 		filters:{
@@ -260,37 +253,11 @@
 			}else {
 				this.getDonationInfo()
 				this.getAllArea()
+				this.jxdz_show = true
 			}
 			
 			this.getLogistics()
 		},
-		onShow() {
-			if (!this.hasLogin) {
-				uni.showModal({
-					title: '登录',
-					content: '您未登录，是否马上登陆?',
-					success: e => {
-						if (e.confirm) {
-							saveUrl()
-							interceptor();
-						}
-					},
-					fail: e => {
-						console.log(e);
-						uni.showModal({
-							title: 'cuowu',
-							content: JSON.stringify(e),
-						})
-					}
-				});
-			} else {
-				// this.loadData();
-			}
-		},
-		computed: {
-			...mapState('user', ['userInfo', 'baseURL', 'hasLogin']),
-			...mapState(['weichatObj']),
-		},
 		mounted() {
 			// this.$set(this,'wzList',[this.wz1,this.wz2])
 		},
@@ -410,10 +377,13 @@
 					obj.$api.msg('请选择物流方式');
 					return;
 				}
-				if(obj.area == '') {
-					obj.$api.msg('请选择捐赠地址');
-					return;
+				if(obj.jxdz_show == true) {
+					if(obj.area == '') {
+						obj.$api.msg('请选择捐赠地址');
+						return;
+					}
 				}
+				
 				try{
 					obj.wzList.forEach( item => {
 						if(!item.project_donation_id){

pages/donate/progress.vue

@@ -165,7 +165,7 @@ export default {
 			let arr = val.map(item => {
 				for(let i = 0; i< typeList.length ;i++){
 					if(item.project_donation_id == typeList[i].id){
-						str = str + typeList[i].name + ' '+item.project_donation_num +' '+'个 '
+						str = str + typeList[i].name + ' '+item.project_donation_num +' '+' '
 					}
 				}
 			})

pages/donate/progresst.vue

@@ -151,7 +151,7 @@ export default {
 				let arr = val.map(item => {
 					for (let i = 0; i < typeList.length; i++) {
 						if (item.project_donation_id == typeList[i].id) {
-							str = str + typeList[i].name + item.project_donation_num  + '个、';
+							str = str + typeList[i].name + item.project_donation_num  + '、';
 						}
 					}
 				});

pages/form/certificates copy.vue

@@ -34,7 +34,7 @@ export default {
 	data() {
 		return {
 			name: '',
-			people: '荆州市红十字会',
+			people: '松滋市红十字会',
 			signDate: ''
 		};
 	},

pages/form/donaSuccess.vue

@@ -106,7 +106,7 @@ export default {
 		context.fillText('感谢信', ((750 - obj.size) * obj.ratio) / 2, 260 * obj.ratio)
 		context.setFontSize(30 * obj.ratio);
 		context.fillText('尊敬的' + this.name + ':', 60 * obj.ratio, 350 * obj.ratio);
-		context.fillText('衷心感谢您对荆州市红十字事业的信任与支', 120 * obj.ratio, 410 * obj.ratio);
+		context.fillText('衷心感谢您对松滋市红十字事业的信任与支', 120 * obj.ratio, 410 * obj.ratio);
 		context.fillText('持！我们已收到您的捐款', 60 * obj.ratio, 465 * obj.ratio);
 		// 画横线
 		context.moveTo(380 * obj.ratio, 470 * obj.ratio);
@@ -167,8 +167,8 @@ export default {
 	onLoad(option) {
 		console.log(333, option);
 		this.money = option.money;
-		this.name = option.name
-		this.add_time = option.time
+		this.name = decodeURI(option.name)
+		this.add_time =decodeURI(option.time)
 		this.IndexShare();
 		this.ScanAudio(true);
 	},
@@ -192,7 +192,7 @@ export default {
 			let obj = this;
 			// let money = obj.money;
 			let item = {
-				link: 'http://jz.red.igxys.com/szs/#/pages/form/donaSuccess?money=' + obj.money + '&name=' + obj.name + '&time=' + obj.add_time, // 分享链接
+				link: 'http://jz.red.igxys.com/szs/#/pages/form/donaSuccess?money=' + obj.money + '&name=' + encodeURI(obj.name) + '&time=' + encodeURI(obj.add_time), // 分享链接
 				imgUrl: 'http://jz.red.igxys.com/static/img/22.jpg',
 				desc: '感谢信',
 				title: '松滋市红十字会',

pages/index/biaoge.vue

@@ -15,7 +15,7 @@
           <img style="height: 3cm; width: 3cm;" src="{__FRAME_PATH}img/22.png" />
         </div>
         <div class="left">
-          <div style="font-size: 31px;letter-spacing:4px">荆州市遗体捐献志愿者</div>
+          <div style="font-size: 31px;letter-spacing:4px">松滋市遗体捐献志愿者</div>
           <!-- <div style="margin-top: 5px;text-align: center;font-size: 30px;">入会申请登记表</div> -->
         </div>
         <div class="img1">

pages/index/index.vue

@@ -15,7 +15,7 @@
 				<view class="img-wrapper flex">
 					<image src="../../static/icon/icon1.png" mode="" class="img1"></image>
 				</view>
-				<view class="item-title">器官捐献</view>
+				<view class="item-title">遗体器官捐献</view>
 			</view>
 			<view class="cate-item flex" @click="toapplic">
 				<view class="img-wrapper flex">
@@ -36,9 +36,20 @@
 				<view class="item-title">志愿者登记</view>
 			</view>
 		</view>
-
 		<!-- 爱心红会 -->
 		<view class="red-box">
+			<top-title :title="'爱心红会'"></top-title>
+			<view class="red-nav">
+				<view class="nav-item" @click="navTo('/pages/applic/love')">
+					<image src="../../static/img/n1.png" mode=""></image>
+				</view>
+				<view class="nav-item" @click="navTo('/pages/applic/science')">
+					<image src="../../static/img/n2.png" mode=""></image>
+				</view>
+			</view>
+		</view>
+		<!-- 爱心红会 -->
+		<!-- <view class="red-box">
 			<top-title :title="'爱心红会'"></top-title>
 			<view class="red-nav flex">
 				<view class="left-nav" @click="navTo('/pages/donate/donate')"></view>
@@ -50,12 +61,12 @@
 					</view>
 				</view>
 			</view>
-		</view>
+		</view> -->
 		<!--  sos急救系统 -->
 		<view class="system">
 			<top-title :title="'救在身边'" navurl="/pages/applic/location" :show_more="true"></top-title>
 			<view class="system-map">
-				<map class="map-box" id="map" show-location :markers="marker" :scale="scale" :latitude="latitude4"
+				<map class="map-box" id="map" show-location :markers="jzsbmarker" :scale="scale" :latitude="latitude4"
 					:longitude="longitude4" ref="map" @markertap="markertap"></map>
 			</view>
 			<view class="" style="padding-top: 80rpx;">
@@ -297,14 +308,6 @@
 			}
 		},
 		onLoad() {
-			// uni.showModal({
-			// 	content: '请选择您当前位置',
-			// 	success: res => {
-			// 		if (res.confirm) {
-			// 			this.chooseAddress()
-			// 		}
-			// 	}
-			// })
 			saveUrl();
 			let obj = this;
 			try {
@@ -320,7 +323,7 @@
 				wxOjb.ready(() => {
 					console.log('加载完毕注册事件');
 					locationAddress({
-						type: 'wgs84',
+						type: 'gcj02',
 						success: function(res) {
 							console.log('获取经纬度', res);
 							obj.longitude4 = res.longitude;
@@ -378,7 +381,7 @@
 				wxOjb.ready(() => {
 					console.log('加载完毕注册事件');
 					locationAddress({
-						type: 'wgs84',
+						type: 'gcj02',
 						success: function(res) {
 							console.log('获取经纬度', res);
 							obj.longitude4 = res.longitude;
@@ -394,7 +397,7 @@
 				// #endif
 				// #ifdef MP
 				locationAddress({
-					type: 'wgs84',
+					type: 'gcj02',
 					success: function(res) {
 						console.log('获取经纬度', res);
 						obj.longitude4 = res.longitude;
@@ -511,16 +514,6 @@
 						obj.latitude2 = obj.marker[i].latitude;
 						obj.longitude2 = obj.marker[i].longitude;
 						obj.address = obj.marker[i].address;
-						// uni.showModal({
-						// 	title: '坐标',
-						// 	content: JSON.stringify(obj.marker[i]),
-						// 	success() {
-						// 		uni.showModal({
-						// 			title: '成功',
-						// 			content: obj.marker[i].latitude
-						// 		})
-						// 	}
-						// })
 					}
 				}
 			},
@@ -648,7 +641,7 @@
 						id: item.id,
 						address: item.address
 					}))
-					obj.jzsbtmarker = obj.marker.concat(arr)
+					obj.jzsbmarker = obj.marker.concat(arr)
 				}).catch(err => {
 					console.log(err);
 				});
@@ -736,8 +729,8 @@
 						name: obj.name,
 						uid: obj.uid,
 						phone: obj.phone,
-						longitude: obj.longitude,
-						latitude: obj.latitude,
+						longitude: obj.longitude4,
+						latitude: obj.latitude4,
 						to_phone: obj.to_phone
 					}).then((data) => {
 						console.log(99988, data)
@@ -1129,60 +1122,84 @@
 		}
 	}
 
+	// .red-box {
+	// 	margin: 20rpx 0;
+	// 	height: 521rpx;
+	// 	padding: 40rpx 23rpx 35rpx 23rpx;
+	// 	background-color: #fff;
+
+	// 	.red-nav {
+	// 		justify-content: space-between;
+	// 		margin-top: 23rpx;
+
+	// 		.left-nav {
+	// 			width: 332rpx;
+	// 			height: 392rpx;
+	// 			background: #FFF3F5;
+	// 			background-image: url(../../static/img/m1.png);
+	// 			background-size: 100% 100%;
+	// 		}
+
+	// 		.right-nav {
+	// 			width: 357rpx;
+	// 			height: 392rpx;
+	// 			flex-direction: column;
+	// 			justify-content: space-between;
+
+	// 			// background: #F6F6FF;
+	// 			.right-top-nav {
+	// 				width: 357rpx;
+	// 				height: 204rpx;
+	// 				background: #F6F6FF;
+	// 				background-image: url(../../static/img/m2.png);
+	// 				background-size: 100% 100%;
+	// 			}
+
+	// 			.right-bottom-nav {
+	// 				width: 357rpx;
+	// 				height: 173rpx;
+	// 				justify-content: space-between;
+
+	// 				view {
+	// 					width: 171rpx;
+	// 					height: 173rpx;
+	// 				}
+
+	// 				.left-item {
+	// 					background: #F5EFFE;
+	// 					background-image: url(../../static/img/m3.png);
+	// 					background-size: 100% 100%;
+	// 				}
+
+	// 				.right-item {
+	// 					background: #EDFEFE;
+	// 					background-image: url(../../static/img/m4.png);
+	// 					background-size: 100% 100%;
+	// 				}
+	// 			}
+	// 		}
+	// 	}
+	// }
 	.red-box {
 		margin: 20rpx 0;
-		height: 521rpx;
-		padding: 40rpx 23rpx 35rpx 23rpx;
+		// height: 393rpx;
+		padding: 30rpx 30rpx 40rpx 30rpx;
 		background-color: #fff;
-
+	
 		.red-nav {
+			padding-top: 25rpx;
+			display: flex;
 			justify-content: space-between;
-			margin-top: 23rpx;
-
-			.left-nav {
-				width: 332rpx;
-				height: 392rpx;
-				background: #FFF3F5;
-				background-image: url(../../static/img/m1.png);
-				background-size: 100% 100%;
-			}
-
-			.right-nav {
-				width: 357rpx;
-				height: 392rpx;
-				flex-direction: column;
-				justify-content: space-between;
-
-				// background: #F6F6FF;
-				.right-top-nav {
-					width: 357rpx;
-					height: 204rpx;
-					background: #F6F6FF;
-					background-image: url(../../static/img/m2.png);
-					background-size: 100% 100%;
-				}
-
-				.right-bottom-nav {
-					width: 357rpx;
-					height: 173rpx;
-					justify-content: space-between;
-
-					view {
-						width: 171rpx;
-						height: 173rpx;
-					}
-
-					.left-item {
-						background: #F5EFFE;
-						background-image: url(../../static/img/m3.png);
-						background-size: 100% 100%;
-					}
-
-					.right-item {
-						background: #EDFEFE;
-						background-image: url(../../static/img/m4.png);
-						background-size: 100% 100%;
-					}
+	
+			.nav-item {
+				width: 330rpx;
+				height: 175rpx;
+				background: #FFF4F2;
+				border-radius: 15rpx;
+	
+				image {
+					width: 330rpx;
+					height: 175rpx;
 				}
 			}
 		}

pages/share/card.vue

@@ -10,15 +10,15 @@
 		<view class="buttom flex">
 			<view class="item flex">
 				<image class="home_img" src="../../static/img/test_home.png" mode="aspectFill"></image>
-				<view class="text"><text>*********</text></view>
+				<view class="text"><text>湖北省松滋市新江口<br />街道谢家冲路69号</text></view>
 			</view>
 			<view class="item flex">
 				<image class="home_img" src="../../static/img/test_phone.png" mode="aspectFill"></image>
 				<!-- #ifdef H5 -->
-				<view class="text"><text class="text1">87012677</text></view>
+				<view class="text"><text class="text1">07166222692</text></view>
 				<!-- #endif -->
 				<!-- #ifndef H5 -->
-				<view class="text" @click="uni.makePhoneCall({phoneNumber: '87012677'})"><text>87012677</text></view>
+				<view class="text" @click="uni.makePhoneCall({phoneNumber: '07166222692'})"><text>07166222692</text></view>
 				<!-- #endif -->
 			</view>
 <!-- 			<view class="item flex">
@@ -112,7 +112,7 @@ export default {
 		toBaiduMap() {
 			
 			window.location.href=
-			`http://api.map.baidu.com/marker?location=30.357764,112.218665&title=荆州市红十字会&content=荆州市红十字会&output=html&src=webapp.baidu.openAPIdemo `
+			`http://api.map.baidu.com/marker?location=30.357764,112.218665&title=松滋市红十字会&content=松滋市红十字会&output=html&src=webapp.baidu.openAPIdemo `
 		},
 		//分享
 		IndexShare() {

pages/user/intent.vue

@@ -116,7 +116,7 @@ export default {
 		// // context.fillText('谨表谢意', (580 * obj.ratio), 680 * obj.ratio)
 		// context.fillText('荆州市红十字会', 450 * obj.ratio, 900 * obj.ratio);
 		context.fillText('识别右边二维码', 108 * obj.ratio, 1090 * obj.ratio);
-		context.fillText('关注荆州市红十字会', 108 * obj.ratio, 1150 * obj.ratio);
+		context.fillText('关注松滋市红十字会', 108 * obj.ratio, 1150 * obj.ratio);
 
 		// 插入二维码
 		// console.log(codeX, codeY, codeSize, 999)

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>荆州市红十字会</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.5e7e3b56.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.331bfcd3.js></script><script src=/index/static/js/index.eac9b04a.js></script></body></html>
+<!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>松滋市红十字会</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=/szs/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/szs/static/js/chunk-vendors.691ce82f.js></script><script src=/szs/static/js/index.ef568a05.js></script></body></html>

unpackage/dist/build/h5/static/css/cmy.css

@@ -1,443 +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;
-}
+/*初始化类*/
+@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;
+}