db-2-12

manifest.json

@@ -1,5 +1,5 @@
 {
-    "name" : "孝感红十字会",
+    "name" : "东宝市红十字会",
     "appid" : "__UNI__F405D65",
     "description" : "",
     "versionName" : "1.0.0",
@@ -79,8 +79,8 @@
         "enable" : false
     },
     "h5" : {
-        "title" : "孝感市红十字会",
-        "domain" : "red.frp.liuniu946.com",
+        "title" : "东宝区红十字会",
+        "domain" : "red.liuniu946.com",
         "router" : {
             "mode" : "hash",
             "base" : "/index/"
@@ -88,7 +88,7 @@
         "devServer" : {
             "proxy" : {
                 "/api" : {
-                    "target" : "http://red.frp.liuniu946.com", //请求的目标域名
+                    "target" : "http://red.liuniu946.com", //请求的目标域名
                     "changeOrigin" : true,
                     // "secure": false,
                     "pathRewrite" : {}

pages.json

@@ -17,7 +17,7 @@
 					"titleNView": false
 				},
 				// #endif
-				"navigationBarTitleText": "孝感红十字会"
+				"navigationBarTitleText": "东宝市红十字会"
 
 			}
 		},
@@ -46,32 +46,6 @@
 				"navigationBarTitleText": "捐献造血干细胞"
 			}
 		},
-		{
-			"path": "pages/form/donateLove",
-			"style": {
-				// #ifndef MP
-				"app-plus": {
-					"titleNView": false
-				},
-				// #endif
-				"navigationBarBackgroundColor": "#457DBF",
-				"navigationBarTextStyle": "white",
-				"navigationBarTitleText": "孝感红十字会安心捐赠"
-			}
-		},
-		{
-			"path": "pages/form/donateList",
-			"style": {
-				// #ifndef MP
-				"app-plus": {
-					"titleNView": false
-				},
-				// #endif
-				"navigationBarBackgroundColor": "#457DBF",
-				"navigationBarTextStyle": "white",
-				"navigationBarTitleText": "孝感红十字会安心捐赠"
-			}
-		},
 		{
 			"path": "pages/form/donaSuccess",
 			"style": {
@@ -215,17 +189,6 @@
 				"navigationBarTitleText": "定位"
 			}
 		},
-		{
-			"path": "pages/applic/tocontrilist",
-			"style": {
-				// #ifndef MP
-				"app-plus": {
-					"titleNView": false
-				},
-				// #endif
-				"navigationBarTitleText": "孝感红十字会"
-			}
-		},
 		{
 			"path": "pages/applic/applicList",
 			"style": {
@@ -935,7 +898,7 @@
 	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "孝感市红十字会",
+		"navigationBarTitleText": "东宝区红十字会",
 		"navigationBarBackgroundColor": "#FFFFFF",
 		"backgroundColor": "#F8F8F8"
 	},

pages/applic/donaSuccess.vue

@@ -22,7 +22,7 @@
 			</view>
 			<view class="main">
 				<view class="box-2">
-					感谢您积极参与咸宁市红十字会志愿服务各项活动，关爱他人、无私付出，为有需要的人送去温暖，用实际行动诠释了“人道、博爱、奉献”的红十字精神。
+					感谢您积极参与东宝区红十字会志愿服务各项活动，关爱他人、无私付出，为有需要的人送去温暖，用实际行动诠释了“人道、博爱、奉献”的红十字精神。
 				</view>
 				<view class="box-2">
 					祝您及您的家人新年吉祥!身体健康!万事顺意!
@@ -36,7 +36,7 @@
 					谨表谢意
 				</view>
 				<view class="box-1">
-					咸宁市红十字会
+					东宝区红十字会
 				</view>
 			</view>
 		</view>

pages/applic/other.vue

@@ -3,8 +3,8 @@
 		<view class="top flex">
 			<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 Xianning Branch</view>
+				<view class="china-font">东宝区红十字会</view>
+				<view class="english-font">Red Cross Society of Dongbao District Branch</view>
 			</view>
 		</view>
 
@@ -57,7 +57,7 @@ export default {
 				{
 					id: 0,
 					spread_url: 11,
-					name: '咸宁市红十字会',
+					name: '东宝区红十字会',
 					count: '********',
 					number: '********'
 				}

pages/applic/tohelpActi.vue

@@ -35,7 +35,7 @@
 				6.福利事业：兴办康复、养老、医疗等非营利性实体，为孤老残疾等弱势群体提供服务。因人道救助项目涉及面广，具体申请人可根据实际情况，通过直接登录各级红十字会网站，或者直接联系各级红十字会进行申请。
 			</view> -->
 			<view class="box-5">
-				咸宁市红十字会人道救助联系电话：
+				东宝区红十字会人道救助联系电话：
 			</view>
 			<view class="phone">
 				********

pages/applic/toknowledge.vue

@@ -44,7 +44,7 @@
 					<view class="name">怎样成为造血干细胞志愿捐献者？？</view>
 				</view>
 				<view class="list-tpl">
-					您可与咸宁市红十字会联系，或在余姚市爱心献血屋（阳明西路桐江桥街心公园内）报名。到指定地点抽取6-8毫升血液，经HLA分型检验，把相关资料录入到中华骨髓库的数据库中，这样您就成为造血干细胞志愿捐献者了。
+					您可与东宝区红十字会联系，报名。到指定地点抽取6-8毫升血液，经HLA分型检验，把相关资料录入到中华骨髓库的数据库中，这样您就成为造血干细胞志愿捐献者了。
 				</view>
 			</view>
 			<view class="list-item">
@@ -99,27 +99,11 @@
 				<text style="color: #C53335; text-align: center;" >江夏区造血干细胞捐献咨询电话：</text>
 			</view> -->
 			<view class="list-tips" style="color: #C53335;text-align: center;">
-				咸宁市造血干细胞捐献咨询电话:
+				东宝区造血干细胞捐献咨询电话:
 			</view>
 			<view class="list-tips" style="text-align: center;">
 				********
 			</view>
-			<!-- <view class="list01">
-				具体入库办法：
-			</view> -->
-		<!-- 	<view class="list-info">
-				一、直接到余姚市红十字会（余姚市兰江街道新西门路219-1号）报名登记、抽取血样，每个工作日均可（8：30-16：00）；
-			</view>
-			<view class="list-info">
-				二、到余姚市桐江桥献血屋或者献血车上参加无偿献血，一并参加报名登记、留取血样；
-			</view>
-			<view class="list-info">
-				三、每年“五·八”世界红十字日前后，市红十字会会在市中心开展包括造血干细胞捐献在内的系列活动，届时可前往报名抽样。请留意新闻媒体的报道。
-			</view>
-			<view class="phone">
-				余姚市红十字会报名咨询电话：62619095
-			</view> -->
-				<!-- <jyf-parser :html="description" ref="article"></jyf-parser> -->
 		</view>
 	</view>
 </template>

pages/cart/group.vue

@@ -1,365 +1,390 @@
-<template>
-	<view class="content">
-		<view class="top-box">报名参与</view>
-		<view class="b">
-				</view>
-		<view class="box">
-			<view class="box-1">
-				<view class="box-left">
-					单位名称
-					<text class="imp"></text>
-					：
-				</view>
-				<input type="text" value="" class="list-input" v-model="unit_name" placeholder="请输入单位名称" placeholder-class="placeholder" />
-			</view>
-			<view class="box-1">
-				<view class="box-left">
-					单位性质
-					<text class="imp"></text>
-					：
-				</view>
-				<input type="text" value="" class="list-input" v-model="unit_type" placeholder="请输入单位性质" placeholder-class="placeholder" />
-			</view>
-			<view class="box-1">
-				<view class="box-left">
-					法人代表
-					<text class="imp"></text>
-					：
-				</view>
-				<input type="text" value="" class="list-input" v-model="unit_peo" placeholder="请输入法人代表" placeholder-class="placeholder" />
-			</view>
-			<view class="box-1">
-				<view class="box-left">
-					单位人数
-					<text class="imp"></text>
-					：
-				</view>
-				<input type="number" value="" class="list-input" v-model="unit_num" placeholder="请输入单位人数" placeholder-class="placeholder" />
-			</view>
-			<view class="box-1">
-				<view class="box-left">
-					联系人
-					<text class="imp"></text>
-					：
-				</view>
-				<input type="text" value="" class="list-input" v-model="unit_concat" placeholder="请输入联系人" placeholder-class="placeholder" />
-			</view>
-			<view class="box-1">
-				<view class="box-left">
-					常驻地区
-					<text class="imp"></text>
-					：
-				</view>
-				<input type="text" value="" class="list-input" v-model="usually_area" placeholder="请输入常驻地区" placeholder-class="placeholder" />
-			</view>
-			<view class="box-1">
-				<view class="box-left">
-					邮政编码
-					<text class="imp"></text>
-					：
-				</view>
-				<input type="number" value="" class="list-input" v-model="postal_code" placeholder="请输入邮政编码" placeholder-class="placeholder" />
-			</view>
-			<view class="box-1">
-				<view class="box-left">
-					联系电话
-					<text class="imp"></text>
-					：
-				</view>
-				<input type="number" value="" class="list-input" v-model="concat_phone" placeholder="请输入联系电话" placeholder-class="placeholder" />
-			</view>
-			<view class="box-1">
-				<view class="box-left">
-					电子邮箱
-					<text class="imp"></text>
-					：
-				</view>
-				<input type="text" value="" class="list-input" v-model="email" placeholder="请输入电子邮箱" placeholder-class="placeholder" />
-			</view>
-			<view class="box-1">
-				<view class="box-left">
-					联系地址
-					<text class="imp"></text>
-					：
-				</view>
-				<input type="text" value="" class="list-input" v-model="concat_address" placeholder="请输入联系地址" placeholder-class="placeholder" />
-			</view>
-		</view>
-		<!-- <view class="buttom-ts" ></view> -->
-		<view class="buttom" :class="{ action: loding }" @click="!loding ? join() : ''">提交申请</view>
-	</view>
-</template>
-
-<script>
-import { mapState, mapMutations } from 'vuex';
-import { saveUrl, interceptor } from '@/utils/loginUtils.js';
-import { vip, getVipmoney, createOrder } from '@/api/index.js';
-import { upload } from '@/api/ask.js';
-export default {
-	data() {
-		const currentDate = this.getDate({
-			format: true
-		});
-		return {
-			loding: false, //是否提交中
-			unit_name: '', //单位名称
-			unit_peo: '', //法人代表
-			unit_type: '', //单位性质
-			unit_num: '', //单位人数
-			unit_concat: '', //单位联系人
-			usually_area: '', //常驻地区
-			postal_code: '', //邮政编码
-			concat_phone: '', //联系电话
-			email: '', //电子邮箱
-			id: '',
-			money: '',
-			concat_address: '' //联系地址
-		};
-	},
-	onShow() {
-		if (this.hasLogin) {
-			// this.loadBaseData();
-			const obj = this
-			getVipmoney().then(({ data }) => {
-				console.log(data);
-				data.forEach(e => {
-					if (e.name == '企业会员') {
-						obj.money = e.pay_price;
-						obj.id = e.id;
-						console.log(obj.money,obj.id)
-					}
-				});
-			});
-		} else {
-			saveUrl();
-			uni.showModal({
-				title: '登录',
-				content: '您未登录，是否马上登陆?',
-				success: e => {
-					if (e.confirm) {
-						interceptor();
-					}
-				},
-				fail: e => {
-					console.log(e);
-				}
-			});
-		}
-	},
-	computed: {
-		...mapState('user', ['hasLogin', 'userInfo']),
-		...mapState(['weichatObj']),
-		// startDate() {
-		// 	return this.getDate('start');
-		// },
-		// endDate() {
-		// 	return this.getDate('end');
-		// }
-	},
-	methods: {
-		async join() {
-			let obj = this;
-			if (obj.unit_name == '') {
-				obj.$api.msg('请填写单位名称');
-				return;
-			}
-			if (obj.unit_type == '') {
-				obj.$api.msg('请填写单位性质');
-				return;
-			}
-			if (obj.unit_peo == '') {
-				obj.$api.msg('请填写法人代表');
-				return;
-			}
-			if (obj.unit_num == '') {
-				obj.$api.msg('请填写单位人数');
-				return;
-			}
-			if (obj.unit_concat == '') {
-				obj.$api.msg('请填写联系人');
-				return;
-			}
-			if (obj.usually_area == '') {
-				obj.$api.msg('请填写常驻地址');
-				return;
-			}
-			if (obj.postal_code == '') {
-				obj.$api.msg('请填写邮政编码');
-				return;
-			}
-			if (obj.concat_phone == '') {
-				obj.$api.msg('请填写联系电话');
-				return;
-			}
-			if (!/^((\+?86)|(\(\+86\)))?1\d{10}$/.test(obj.concat_phone)) {
-				obj.$api.msg('请填写正确的联系电话');
-				return;
-			}
-			if (obj.email == '') {
-				obj.$api.msg('请填写电子邮箱');
-				return;
-			}
-
-			if (!/^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,4})$/.test(obj.email)) {
-				obj.$api.msg('请填写正确的邮箱');
-				return;
-			}
-			if (obj.concat_address == '') {
-				obj.$api.msg('请填写联系地址');
-				return;
-			}
-			// obj.loding = true;
-			vip({
-				company: obj.unit_name, //单位名称
-				nature: obj.unit_type, //性质
-				legal_person: obj.unit_peo, //法人
-				company_member: obj.unit_num * 1, //公司人数
-				company_address: obj.concat_address, //联系地址
-				zip_code: obj.postal_code, //邮编
-				mobile: obj.concat_phone, //联系电话
-				company_email: obj.email, //邮箱
-				address: obj.usually_area, //常驻地址
-				full_name: obj.unit_concat ,//联系人
-				user_type: 2
-			})
-				.then(e => {
-					if (e.status == 400) {
-						obj.$api.msg(e.msg);
-						return;
-					}
-					uni.showModal({
-						title: '提示',
-						content: '成为企业会员需要缴纳' + obj.money + '员年费，是否前往提交',
-						success: function(res) {
-							if (res.confirm) {
-								console.log('用户点击确定');
-								createOrder({
-									level_id: obj.id,
-									body: '企业红会年费',
-									pay_type: 0,
-									// name: obj.name,
-									pay_price: obj.money,
-									from: 'weixin'
-								}).then(({ data }) => {
-									let res = data.jsConfig;
-									console.log(res);
-									obj.weichatObj.chooseWXPay({
-										timestamp: res.timestamp,
-										nonceStr: res.nonceStr,
-										package: res.package,
-										signType: res.signType,
-										paySign: res.paySign,
-										success: function(res) {
-											obj.unit_name = '';
-											obj.unit_type = '';
-											obj.unit_num = '';
-											obj.concat_address = '';
-											obj.postal_code = '';
-											obj.concat_phone = '';
-											obj.email = '';
-											obj.usually_area = '';
-											uni.navigateTo({
-												url: '../joinSuc/joinNow'
-											});
-										},
-										fail: function(res) {
-											this.$refs.popup1.open();
-											console.log(res, '失败');
-											console.log(res.errMsg);
-										}
-									});
-								});
-							} else if (res.cancel) {
-								console.log('用户点击取消');
-							}
-						}
-					});
-				})
-				.catch(function(e) {
-					console.log('出错了');
-					console.log(e);
-				});
-		},
-		imgsub() {
-			console.log('imgsub');
-			upload({
-				filename: ''
-			}).then(data => {
-				this.cardimg = data[0].url;
-			});
-		},
-		// 选择性别
-		bindPickerSex: function(e) {
-			console.log(this.array[e.target.value]);
-			this.sex = this.array[e.target.value];
-			this.index = e.target.value + 1;
-		},
-		// 选择教育程度
-		bindPickerEdu: function(e) {
-			this.education = this.chooseEdu[e.target.value];
-			this.index = e.target.value + 1;
-		},
-		// 选择日期
-		bindDateChange: function(e) {
-			this.birth = e.target.value;
-		},
-		// 是否参加志愿活动
-		bindPickerVol: function(e) {
-			this.is_vol = this.chooseVol[e.target.value];
-			this.index = e.target.value + 1;
-		},
-		// 有无服务经验
-		bindPickerExp: function(e) {
-			this.is_experience = this.chooseExp[e.target.value];
-			this.index = e.target.value + 1;
-		},
-		getDate(type) {
-			const date = new Date();
-			let year = date.getFullYear();
-			let month = date.getMonth() + 1;
-			let day = date.getDate();
-
-			if (type === 'start') {
-				year = year - 60;
-			} else if (type === 'end') {
-				year = year + 2;
-			}
-			month = month > 9 ? month : '0' + month;
-			day = day > 9 ? day : '0' + day;
-			return `${year}-${month}-${day}`;
-		},
-		// 选择可提供时间
-
-		// this.quantum = item.detail.value.join(',');
-
-		checktime1(e) {
-			// var items = this.timeList,
-			// let quantum = [];
-			this.quantum = e.detail.value.join(',');
-			console.log(this.quantum);
-		},
-		checktime2(e) {
-			// var items = this.timeList,
-			let values = e.detail.value;
-			// let quantum = [];
-			console.log(values);
-		},
-		checktime3(e) {
-			// var items = this.timeList,
-			let values = e.detail.value;
-			// let quantum = [];
-			console.log(values);
-		},
-		//选择有兴趣参与的工作
-		checkjob(item) {
-			this.taste = item.detail.value.join(',');
-		},
-		// 选择专长checkspeciality
-		checkspeciality(item) {
-			this.speciali = item.detail.value.join(',');
-		}
-	}
-};
+<template>
+	<view class="content">
+		<view class="top-box">团队报名</view>
+		<view class="box">
+			<view class="box-1">
+				<view class="box-left">
+					单位名称
+					<text class="imp"></text>
+					：
+				</view>
+				<input type="text" value="" class="list-input" v-model="unit_name" placeholder="请输入单位名称"
+					placeholder-class="placeholder" />
+			</view>
+			<view class="box-1">
+				<view class="box-left">
+					单位性质
+					<text class="imp"></text>
+					：
+				</view>
+				<input type="text" value="" class="list-input" v-model="unit_type" placeholder="请输入单位性质"
+					placeholder-class="placeholder" />
+			</view>
+			<view class="box-1">
+				<view class="box-left">
+					法人代表
+					<text class="imp"></text>
+					：
+				</view>
+				<input type="text" value="" class="list-input" v-model="unit_peo" placeholder="请输入法人代表"
+					placeholder-class="placeholder" />
+			</view>
+			<view class="box-1">
+				<view class="box-left">
+					单位人数
+					<text class="imp"></text>
+					：
+				</view>
+				<input type="number" value="" class="list-input" v-model="unit_num" placeholder="请输入单位人数" placeholder-class="placeholder" />
+			</view>
+			<view class="box-1">
+				<view class="box-left">
+					联系人
+					<text class="imp"></text>
+					：
+				</view>
+				<input type="text" value="" class="list-input" v-model="unit_concat" placeholder="请输入联系人"
+					placeholder-class="placeholder" />
+			</view>
+			<view class="box-1">
+				<view class="box-left">
+					常驻地区
+					<text class="imp"></text>
+					：
+				</view>
+				<input type="text" value="" class="list-input" v-model="usually_area" placeholder="请输入常驻地区"
+					placeholder-class="placeholder" />
+			</view>
+			<view class="box-1">
+				<view class="box-left">
+					邮政编码
+					<text class="imp"></text>
+					：
+				</view>
+				<input type="number" value="" class="list-input" v-model="postal_code" placeholder="请输入邮政编码"
+					placeholder-class="placeholder" />
+			</view>
+			<view class="box-1">
+				<view class="box-left">
+					联系电话
+					<text class="imp"></text>
+					：
+				</view>
+				<input type="number" value="" class="list-input" v-model="concat_phone" placeholder="请输入联系电话"
+					placeholder-class="placeholder" />
+			</view>
+			<view class="box-1">
+				<view class="box-left">
+					电子邮箱
+					<text class="imp"></text>
+					：
+				</view>
+				<input type="text" value="" class="list-input" v-model="email" placeholder="请输入电子邮箱"
+					placeholder-class="placeholder" />
+			</view>
+			<view class="box-1">
+				<view class="box-left">
+					联系地址
+					<text class="imp"></text>
+					：
+				</view>
+				<input type="text" value="" class="list-input" v-model="concat_address" placeholder="请输入联系地址"
+					placeholder-class="placeholder" />
+			</view>
+		</view>
+		<!-- <view class="buttom-ts" ></view> -->
+		<view class="buttom" :class="{ action: loding }" @click="!loding ? join() : ''">提交申请</view>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapMutations
+	} from 'vuex';
+	import {
+		saveUrl,
+		interceptor
+	} from '@/utils/loginUtils.js';
+	import {
+		vip,
+		getVipmoney,
+		createOrder
+	} from '@/api/index.js';
+	import {
+		upload
+	} from '@/api/ask.js';
+	export default {
+		data() {
+			const currentDate = this.getDate({
+				format: true
+			});
+			return {
+				loding: false, //是否提交中
+				unit_name: '', //单位名称
+				unit_peo: '', //法人代表
+				unit_type: '', //单位性质
+				unit_num: '', //单位人数
+				unit_concat: '', //单位联系人
+				usually_area: '', //常驻地区
+				postal_code: '', //邮政编码
+				concat_phone: '', //联系电话
+				email: '', //电子邮箱
+				id: '',
+				money: '',
+				concat_address: '' //联系地址
+			};
+		},
+		onShow() {
+			if (this.hasLogin) {
+				// this.loadBaseData();
+				const obj = this
+				console.log('getVipmoney+++++')
+				getVipmoney().then(({
+					data
+				}) => {
+					console.log(data, 'getVipmoney');
+					data.forEach(e => {
+						if (e.user_type == 2) {
+							obj.money = e.pay_price;
+							obj.id = e.id;
+							console.log(obj.money, obj.id)
+						}
+					});
+				});
+			} else {
+				saveUrl();
+				uni.showModal({
+					title: '登录',
+					content: '您未登录，是否马上登陆?',
+					success: e => {
+						if (e.confirm) {
+							interceptor();
+						}
+					},
+					fail: e => {
+						console.log(e);
+					}
+				});
+			}
+		},
+		computed: {
+			...mapState('user', ['hasLogin', 'userInfo']),
+			...mapState(['weichatObj']),
+			// startDate() {
+			// 	return this.getDate('start');
+			// },
+			// endDate() {
+			// 	return this.getDate('end');
+			// }
+		},
+		methods: {
+			async join() {
+				let obj = this;
+				if (obj.unit_name == '') {
+					obj.$api.msg('请填写单位名称');
+					return;
+				}
+				if (obj.unit_type == '') {
+					obj.$api.msg('请填写单位性质');
+					return;
+				}
+				if (obj.unit_peo == '') {
+					obj.$api.msg('请填写法人代表');
+					return;
+				}
+				if (obj.unit_num == '') {
+					obj.$api.msg('请填写单位人数');
+					return;
+				}
+				if (obj.unit_concat == '') {
+					obj.$api.msg('请填写联系人');
+					return;
+				}
+				if (obj.usually_area == '') {
+					obj.$api.msg('请填写常驻地址');
+					return;
+				}
+				if (obj.postal_code == '') {
+					obj.$api.msg('请填写邮政编码');
+					return;
+				}
+				if (obj.concat_phone == '') {
+					obj.$api.msg('请填写联系电话');
+					return;
+				}
+				if (!/^((\+?86)|(\(\+86\)))?1\d{10}$/.test(obj.concat_phone)) {
+					obj.$api.msg('请填写正确的联系电话');
+					return;
+				}
+				if (obj.email == '') {
+					obj.$api.msg('请填写电子邮箱');
+					return;
+				}
+
+				if (!/^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,4})$/.test(obj.email)) {
+					obj.$api.msg('请填写正确的邮箱');
+					return;
+				}
+				if (obj.concat_address == '') {
+					obj.$api.msg('请填写联系地址');
+					return;
+				}
+				// obj.loding = true;
+				vip({
+						company_name: obj.unit_name, //单位名称
+						nature: obj.unit_type, //性质
+						legal_person: obj.unit_peo, //法人
+						company_member: obj.unit_num * 1, //公司人数
+						company_address: obj.concat_address, //联系地址
+						zip_code: obj.postal_code, //邮编
+						mobile: obj.concat_phone, //联系电话
+						company_email: obj.email, //邮箱
+						address: obj.usually_area, //常驻地址
+						full_name: obj.unit_concat, //联系人
+						user_type: 2
+					})
+					.then(e => {
+						if (e.status == 400) {
+							obj.$api.msg(e.msg);
+							return;
+						}
+						uni.showModal({
+							title: '提示',
+							content: '成为企业会员需要缴纳' + obj.money + '元年费，是否前往提交',
+							success: function(res) {
+								if (res.confirm) {
+									console.log('用户点击确定');
+									console.log(obj.money,obj.id,'obj.id+++++')
+									createOrder({
+										level_id: obj.id,
+										body: '企业红会年费',
+										pay_type: 0,
+										// name: obj.name,
+										pay_price: obj.money,
+										from: 'weixin'
+									}).then(({
+										data
+									}) => {
+										let res = data.jsConfig;
+										console.log(res);
+										obj.weichatObj.chooseWXPay({
+											timestamp: res.timestamp,
+											nonceStr: res.nonceStr,
+											package: res.package,
+											signType: res.signType,
+											paySign: res.paySign,
+											success: function(res) {
+												obj.unit_name = '';
+												obj.unit_type = '';
+												obj.unit_num = '';
+												obj.concat_address = '';
+												obj.postal_code = '';
+												obj.concat_phone = '';
+												obj.email = '';
+												obj.usually_area = '';
+												uni.navigateTo({
+													url: '../joinSuc/joinNow'
+												});
+											},
+											fail: function(res) {
+												this.$refs.popup1.open();
+												console.log(res, '失败');
+												console.log(res.errMsg);
+											}
+										});
+									});
+								} else if (res.cancel) {
+									console.log('用户点击取消');
+								}
+							}
+						});
+					})
+					.catch(function(e) {
+						console.log('出错了');
+						console.log(e);
+					});
+			},
+			imgsub() {
+				console.log('imgsub');
+				upload({
+					filename: ''
+				}).then(data => {
+					this.cardimg = data[0].url;
+				});
+			},
+			// 选择性别
+			bindPickerSex: function(e) {
+				console.log(this.array[e.target.value]);
+				this.sex = this.array[e.target.value];
+				this.index = e.target.value + 1;
+			},
+			// 选择教育程度
+			bindPickerEdu: function(e) {
+				this.education = this.chooseEdu[e.target.value];
+				this.index = e.target.value + 1;
+			},
+			// 选择日期
+			bindDateChange: function(e) {
+				this.birth = e.target.value;
+			},
+			// 是否参加志愿活动
+			bindPickerVol: function(e) {
+				this.is_vol = this.chooseVol[e.target.value];
+				this.index = e.target.value + 1;
+			},
+			// 有无服务经验
+			bindPickerExp: function(e) {
+				this.is_experience = this.chooseExp[e.target.value];
+				this.index = e.target.value + 1;
+			},
+			getDate(type) {
+				const date = new Date();
+				let year = date.getFullYear();
+				let month = date.getMonth() + 1;
+				let day = date.getDate();
+
+				if (type === 'start') {
+					year = year - 60;
+				} else if (type === 'end') {
+					year = year + 2;
+				}
+				month = month > 9 ? month : '0' + month;
+				day = day > 9 ? day : '0' + day;
+				return `${year}-${month}-${day}`;
+			},
+			// 选择可提供时间
+
+			// this.quantum = item.detail.value.join(',');
+
+			checktime1(e) {
+				// var items = this.timeList,
+				// let quantum = [];
+				this.quantum = e.detail.value.join(',');
+				console.log(this.quantum);
+			},
+			checktime2(e) {
+				// var items = this.timeList,
+				let values = e.detail.value;
+				// let quantum = [];
+				console.log(values);
+			},
+			checktime3(e) {
+				// var items = this.timeList,
+				let values = e.detail.value;
+				// let quantum = [];
+				console.log(values);
+			},
+			//选择有兴趣参与的工作
+			checkjob(item) {
+				this.taste = item.detail.value.join(',');
+			},
+			// 选择专长checkspeciality
+			checkspeciality(item) {
+				this.speciali = item.detail.value.join(',');
+			}
+		}
+	};
 </script>
 
 <style lang="scss">

pages/cart/personal.vue

@@ -1,9 +1,6 @@
 <template>
 	<view class="content">
-		<view class="top-box">报名参与</view>
-		<view class="b">
-			
-		</view>
+		<view class="top-box">个人报名</view>
 		<view class="box">
 			<view class="box-1">
 				<view class="box-left">
@@ -108,7 +105,7 @@ export default {
 		return {
 			loding: false, //是否提交中
 			array: ['男', '女'],
-			chooseEdu: ['小学以下', '小学', '初中', '高中/中专', '大专/本科', '硕士', '博士', '博士后'],
+			chooseEdu: ['小学以下', '小学', '初中', '高中/中专', '大专/高职','本科','研究生', '硕士', '博士', '博士后'],
 			chooseVol: ['是', '否'],
 			chooseExp: ['是', '否'],
 			index: 0,
@@ -145,7 +142,7 @@ export default {
 		getVipmoney().then(({ data }) => {
 			console.log(data);
 			data.forEach(e => {
-				if (e.name == '个人会员') {
+				if (e.user_type == 1) {
 					obj.money = e.pay_price;
 					obj.id = e.id;
 				}
@@ -224,9 +221,9 @@ export default {
 			// obj.loding = true;
 			vip({
 				full_name: obj.name, //姓名
-				sex: obj.sex, //性别
+				gender: obj.sex, //性别
 				education: obj.educationid, //学历
-				birth: obj.birth, //生日
+				birthday: obj.birth, //生日
 				nation: obj.mz, //民族
 				mobile: obj.phone,
 				address: obj.address, //居住地址
@@ -242,7 +239,7 @@ export default {
 					// });
 					uni.showModal({
 						title: '提示',
-						content: '成为个人会员需要缴纳' + obj.money + '员年费，是否前往提交',
+						content: '成为个人会员需要缴纳' + obj.money + '元年费，是否前往提交',
 						success: function(res) {
 							if (res.confirm) {
 								console.log('用户点击确定');

pages/form/applicationForm.vue

@@ -145,7 +145,7 @@
 				type: '',
 				loding: false, //是否提交中
 				array: ['男', '女'],
-				chooseEdu: ['小学以下', '小学', '初中', '高中/中专', '大专/本科', '硕士', '博士', '博士后'],
+				chooseEdu: ['小学以下', '小学', '初中', '高中/中专', '大专/高职','本科','研究生', '硕士', '博士', '博士后'],
 				chooseVol: ['是', '否'],
 				chooseExp: ['是', '否'],
 				realyItems: [], //捐赠对照表
@@ -251,7 +251,7 @@
 						return (item.name != '人体器官') && (item.name != '眼角膜') && (item.name != '遗体') && (
 							item.name != '全部器官')
 					})
-					this.apparatus = arr;
+					this.apparatus = arr.reverse();
 					console.log(this.realyItems, '获取捐赠对照列表')
 
 				});

pages/form/certificates copy.vue

@@ -6,7 +6,7 @@
 				<view class="name-left"><input type="text" v-model="name" /></view>
 				<view class="name-right">先生/女士</view>
 			</view>
-			<view class="info">您已完成咸宁市红十字会普及培训,特发此证,以资鼓励。</view>
+			<view class="info">您已完成东宝区红十字会普及培训,特发此证,以资鼓励。</view>
 			<view class="signName">
 				<view class="signName-left">
 					<view class="signName-1">签发人</view>
@@ -34,7 +34,7 @@ export default {
 	data() {
 		return {
 			name: '',
-			people: '咸宁市红十字会',
+			people: '东宝区红十字会',
 			signDate: ''
 		};
 	},

pages/form/certificates.vue

@@ -4,6 +4,7 @@
 			<empty></empty>
 		</view>
 		<view class="certificates" v-if='is_over'>
+
 			<canvas v-if="showcanvas" id="qrShareBox" canvas-id="qrShareBox" class="tki-qrcode-canvas" />
 			<image class="imgbox" v-else :src="img" mode=" aspectFill"></image>
 		</view>
@@ -36,7 +37,6 @@
 		},
 		data() {
 			return {
-				send_time: 0,//发证时间
 				is_over: 1,
 				type: '', //0是个人报名，1是团体报名
 				id: '',
@@ -53,7 +53,7 @@
 				companyName: '',
 				companyphone: '',
 				num: '',
-				people: '咸宁市红十字会',
+				people: '神农架林区红十字会',
 				signDate: '',
 				loading: true, //是否载入图片中
 				size: 180,
@@ -63,15 +63,15 @@
 				url: '',
 				img: '',
 				showcanvas: true,
-				uid: ''
+				uid: '',
+				sendtime: ''
 			};
 		},
 		onLoad(option) {
 			this.type = option.type;
 			// this.id = option.id;
-			this.send_time = option.send_time
-			// this.
 			this.name = decodeURI(option.name)
+			this.sendtime = option.sendtime
 			this.IndexShare();
 			// this.loadData();
 
@@ -82,14 +82,14 @@
 			// }).then(({
 			// 	data
 			// }) => {
-				// console.log(999, data)
-				// this.name = data.name
-				// this.signDate = data.add_time
-				// this.is_over = data.is_over
-				// console.log(3, data.add_time)
+			// 	console.log(999, data)
+			// 	this.name = data.name
+			// 	this.signDate = data.add_time
+			// 	this.is_over = data.is_over
+			// 	console.log(3, data.add_time)
 				let obj = this;
 				let name = obj.name
-				let signDate = obj.signDate
+				let signDate = obj.sendtime
 
 				function getRecTime(timestamp, fmt) {
 					let d = new Date(timestamp * 1000)
@@ -116,7 +116,7 @@
 					return f;
 					console.log(f)
 				}
-				let send_time = getRecTime(obj.send_time)
+				let m = getRecTime(signDate)
 				let query = uni.createSelectorQuery();
 				// this.loadData();
 				// 获取页面比例
@@ -180,7 +180,7 @@
 
 				context.setFontSize(31 * obj.ratio)
 
-				context.fillText('您已完成咸宁市红十字会普及培训', 105 * obj.ratio, 670 * obj.ratio)
+				context.fillText('您已完成东宝区红十字会普及培训', 105 * obj.ratio, 670 * obj.ratio)
 				context.fillText('的全部课程，特发此证。', 105 * obj.ratio, 720 * obj.ratio)
 				context.setFontSize(22 * obj.ratio)
 				context.fillText('签发人:', 300 * obj.ratio, 800 * obj.ratio)
@@ -192,8 +192,8 @@
 				context.fillText('签发日期:', 300 * obj.ratio, 880 * obj.ratio)
 				context.fillText('Issuer Date:', 300 * obj.ratio, 910 * obj.ratio)
 				context.setFontSize(26 * obj.ratio)
-				context.fillText(send_time, 475 * obj.ratio, 908 * obj.ratio)
-				context.fillText('咸宁市红十字会', 440 * obj.ratio, 820 * obj.ratio)
+				context.fillText(m, 475 * obj.ratio, 908 * obj.ratio)
+				context.fillText('东宝区红十字会', 440 * obj.ratio, 820 * obj.ratio)
 				// 画横线
 				context.moveTo(430 * obj.ratio, 915 * obj.ratio)
 				context.lineTo(660 * obj.ratio, 915 * obj.ratio)
@@ -217,7 +217,7 @@
 						width: obj.canWeidth,
 						height: obj.canHeight,
 						destWidth: obj.canWeidth,
-						destHeight: obj.canHeight,
+			  	destHeight: obj.canHeight,
 						canvasId: 'qrShareBox',
 						success: function(res) {
 							console.log(res)
@@ -228,8 +228,7 @@
 							// console.log(res.tempFilePath)
 							obj.showcanvas = false;
 							obj.img = res.tempFilePath
-
-						}
+			 		}
 					})
 				})
 			// })
@@ -241,8 +240,7 @@
 			console.log('this.uid', this.uid)
 		},
 		computed: {
-			...mapState('user', ['hasLogin', 'userInfo']),
-			...mapState(['baseURL'])
+			...mapState('user', ['hasLogin', 'userInfo'])
 		},
 		methods: {
 			...mapMutations('user', ['setUserInfo']),
@@ -250,111 +248,14 @@
 			IndexShare() {
 				let obj = this;
 				let item = {
-					link: obj.baseURL + '/index/#/pages/form/certificates?type=' + obj.type + '&send_time=' + obj.send_time + '&name=' + encodeURI(obj.name), 
-					imgUrl: '/index/static/img/002.png',
+					link: obj.$store.state.baseURL + '/index/#/pages/form/certificates?name=' + encodeURI(obj.name) + '&sendtime=' + obj.sendtime,
+					imgUrl: obj.$store.state.baseURL + '/index/static/img/002.png',
 					desc: '结业证书',
-					title: '咸宁市红十字会',
+					title: '东宝区红十字会',
 				};
 				console.log('分享加', item)
 				weixindata(item);
 			},
-			async loadData() {
-				let obj = this;
-				console.log('当前is_over', obj.is_over)
-				if (obj.is_over == 1) {
-					let uid = obj.userInfo.uid
-					console.log(9090, uid)
-				}
-				get_training({
-					id: obj.id,
-					// uid:uid
-				}).then(({
-					data
-				}) => {
-					obj.list = data;
-					console.log(9988, data)
-					if (obj.list.content != null) {
-						obj.description = obj.list.content.replace(/<img/g,
-							"<img style='max-width:100%;height:auto;'");
-					}
-				});
-
-			},
-			submit() {
-				let obj = this;
-				let data = {};
-				if (obj.type == 0) {
-					if (!obj.name) {
-						obj.$api.msg('请填写姓名！');
-						return;
-					}
-					if (!obj.phone) {
-						obj.$api.msg('请输入联系方式！');
-						return;
-					}
-					if (!obj.addr) {
-						obj.$api.msg('请输入联系方式！');
-						return;
-					}
-					data = {
-						name: obj.name,
-						work: obj.addr,
-						phone: obj.phone,
-						tid: obj.id,
-						type: 0
-					}
-				}
-				if (obj.type == 1) {
-					if (!obj.company) {
-						obj.$api.msg('请填写企业名称！');
-						return;
-					}
-					if (!obj.address) {
-						obj.$api.msg('请填写企业地址！');
-						return;
-					}
-					if (!obj.companyName) {
-						obj.$api.msg('请填写负责人姓名！');
-						return;
-					}
-					if (!obj.companyphone) {
-						obj.$api.msg('请输入联系方式！');
-						return;
-					}
-					if (!obj.num) {
-						obj.$api.msg('请输入参加培训人数！');
-						return;
-					}
-					data = {
-						company: obj.company,
-						address: obj.address,
-						name: obj.companyName,
-						phone: obj.companyphone,
-						num: obj.num,
-						tid: obj.id,
-						type: 1
-					}
-				}
-				sign_training(data).then(function(e) {
-					console.log(data.type)
-					let type = data.type
-					uni.setStorageSync('type', type)
-					obj.$api.msg(e.msg);
-					setTimeout(function() {
-						uni.navigateTo({
-							url: '/pages/train/index'
-						})
-					}, 1000);
-				}).catch(e => {
-					obj.$api.msg(e.message);
-					setTimeout(function() {
-						uni.navigateTo({
-							url: '/pages/train/index'
-						})
-					}, 1000);
-				});;
-
-			},
 			getRecTime(timestamp, fmt) {
 				let d = new Date(timestamp * 1000),
 					// f = fmt || 'yyyy/MM/dd', 

pages/form/certificatesList.vue

@@ -1,193 +1,202 @@
-<template>
-	<view class="container">
-		<!-- <view class="top">
-			普及培训
-		</view> -->
-		<swiper class="swiper-box" duration="300" @change="changeTab">
-			<swiper-item class="tab-content">
-				<scroll-view class="list-scroll-content" scroll-y >
-					<!-- 空白页 -->
-					<empty v-if="loadingType === true && list.length === 0"></empty>
-					<!-- 订单列表 -->
-					<view class="order-item" @click="ToDetail(item)" v-for="(item, index) in list" :key="index">
-						<view class="list-cell">
-							<image class="image" :src="baseURL + item.training.image"></image>
-							<view class="list-tpl">{{ item.training.title }}</view>
-						</view>
-					</view>
-				</scroll-view>
-			</swiper-item>
-		</swiper>
-	</view>
-</template>
+<template>
+	<view class="container">
+		<!-- <view class="top">
+			普及培训
+		</view> -->
+		<swiper class="swiper-box" duration="300" @change="changeTab">
+			<swiper-item class="tab-content">
+				<scroll-view class="list-scroll-content" scroll-y>
+					<!-- 空白页 -->
+					<empty v-if="loaded && list.length == 0"></empty>
+					<!-- 订单列表 -->
+					<view class="order-item" @click="ToDetail(item)" v-for="(item, index) in list" :key="index">
+						<view class="list-cell">
+							<image class="image" :src="baseURL + item.training.image"></image>
+							<view class="list-tpl">{{ item.training.title }}</view>
+						</view>
+					</view>
+				</scroll-view>
+			</swiper-item>
+		</swiper>
+	</view>
+</template>
 <script>
 	import {
 		mapState,
 		mapMutations
-	} from 'vuex';
-import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
-import empty from '@/components/empty';
-import uniPopup from '@/components/uni-popup/uni-popup.vue';
-import { myTrainingList } from '@/api/index.js';
-export default {
-	components: {
-		uniLoadMore,
-		empty,
-		uniPopup
-	},
-	computed: {
-		...mapState(['baseURL'])
-	},
-	data() {
-		return {
-			page: 1, //当前页数
-			limit: 6, //每次信息条数
-			list: [],
-			loadingType: 'more', //加载更多状态
-		};
-	},
-	onLoad() {
-		console.log(22)
-		this.loadData();
-	},
-	methods: {
-		//获取订单列表
-		loadData(type) {
-			//这里是将订单挂载到tab列表下
-			let obj = this;
-			if (type != 'refresh') {
-				console.log(obj.loadingType, '456');
-				//没有更多数据直接跳出方法
-				if (obj.loadingType === 'nomore') {
-					return;
-				} else {
-					// 设置当前为数据载入中
-					obj.loadingType = 'loading';
-				}
-			} else {
-				//当重新加载数据时更新状态为可继续添加数据
-				obj.loadingType = 'more';
-			}
-			myTrainingList({})
-				.then(data => {
-					if (type === 'refresh') {
-						obj.list = [];
-					}
-					let arr = data.data
-					obj.list = obj.list.concat(arr);
-					//判断是否还有下一页，有是more  没有是nomore
-					if (obj.limit == arr.length) {
-						obj.page++;
-						obj.loadingType = 'more';
-					} else {
-						obj.loadingType = 'nomore';
-					}
-					// 判断是否为刷新数据
-					if (type === 'refresh') {
-						console.log('refresh');
-						// 判断是否为点击搜索按钮跳转加载
-						if (obj.loading == 1) {
-							uni.hideLoading();
-						} else {
-							uni.stopPullDownRefresh();
-						}
-					}
-				})
-				.catch(e => {
-					obj.loadingType = 'nomore';
-					uni.hideLoading();
-				});
-		},
-		//跳转到详情
-		ToDetail(e) {
-			let type = e.num == 1 ? '0': '1';//0是个人报名，1是团体报名
-			// let id = e.id;
-			uni.navigateTo({
-				url: '/pages/form/certificates?type=' + type+ '&send_time=' + e.sendtime + '&name=' + encodeURI(e.name)
-			});
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-page {
-	background: #F2F2F2;
-	height: 100%;
-	padding-bottom: 25rpx;
-}
-.container {
-	height: 100%;
-	.top{
-		background-color: #FFFFFF;
-		height: 88rpx;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		font-size: 36rpx;
-		font-weight: 500;
-		color: #333333;
-	}
-	.swiper-box {
-		height:100%;
-		.list-scroll-content {
-			height:100%;
-		}
-	}
-}
-.scroll-list {
-	width: 100%;
-	overflow: hidden;
-	white-space: nowrap;
-	background-color: #ffffff;
-	font-size: 32rpx;
-	.scoll-box {
-		text-align: center;
-		display: inline-block;
-		margin: 0rpx 38rpx;
-		padding: 15rpx 0rpx;
-		.scoll-img {
-			width: 130rpx;
-			height: 85rpx;
-			border-radius: 100%;
-			image {
-				width: 85rpx;
-				height: 100%;
-				border-radius: 100%;
-			}
-		}
-		.scoll-name {
-			padding-top: 15rpx;
-		}
-		&.active {
-			color: #ef3d28;
-			border-bottom: 6rpx solid #ef3d28;
-		}
-	}
-}
-
-.order-item {
-	width: 100%;
-	padding: 0rpx 25rpx;
-	padding-top: 25rpx !important;
-	.list-cell {
-		background-color: #ffffff;
-		border-radius: 20rpx;
-		width: 100%;
-		box-shadow: 0px 0px 40px 0px rgba(0, 0, 0, 0.06);
-		.image {
-			width: 100%;
-			height: 300rpx;
-			border-top-left-radius: 25rpx;
-			border-top-right-radius: 25rpx;
-		}
-		.list-tpl {
-			padding: 25rpx 25rpx;
-			padding-bottom: 35rpx !important;
-			font-size: 34rpx;
-			color: #222222;
-			font-weight:500;
-		}
-	}
-}
+	} from 'vuex';
+	import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+	import empty from '@/components/empty';
+	import uniPopup from '@/components/uni-popup/uni-popup.vue';
+	import {
+		myTrainingList
+	} from '@/api/index.js';
+	export default {
+		components: {
+			uniLoadMore,
+			empty,
+			uniPopup
+		},
+		data() {
+			return {
+				page: 1, //当前页数
+				limit: 6, //每次信息条数
+				list: [],
+				loadingType: 'more', //加载更多状态
+				loaded: false
+			};
+		},
+		onLoad() {
+			console.log(22)
+			this.loadData();
+		},
+		computed: {
+			...mapState(['baseURL'])
+		},
+		onReachBottom() {
+			this.loadData()
+		},
+		methods: {
+			//获取订单列表
+			loadData() {
+				//这里是将订单挂载到tab列表下
+				let obj = this;
+				if(obj.loadingType == 'loading' || obj.loadingType == 'noMore') {
+					return 
+				}
+				obj.loadingType = 'loading'
+				myTrainingList({
+					page: obj.page,
+					limit: obj.limit
+				})
+					.then(data => {
+						obj.loaded == true
+						let arr = data.data
+						obj.list = obj.list.concat(arr);
+						obj.page++;
+						//判断是否还有下一页，有是more  没有是nomore
+						if (obj.limit == arr.length) {
+							
+							obj.loadingType = 'more';
+						} else {
+							obj.loadingType = 'noMore';
+						}
+						obj.loaded = true
+					})
+					.catch(e => {
+						obj.loadingType = 'nomore';
+						// uni.hideLoading();
+					});
+			},
+			//跳转到详情
+			ToDetail(e) {
+				console.log(e)
+				let type ;
+				if(e.num == 1) {
+					type = 0
+				}else {
+					type = 1
+				}
+				let id = e.id;
+				uni.navigateTo({
+					url: '/pages/form/certificates?name=' + encodeURI(e.name) + '&sendtime=' + e.sendtime
+				});
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	page {
+		background: #F2F2F2;
+		height: 100%;
+		padding-bottom: 25rpx;
+	}
+
+	.container {
+		height: 100%;
+
+		.top {
+			background-color: #FFFFFF;
+			height: 88rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			font-size: 36rpx;
+			font-weight: 500;
+			color: #333333;
+		}
+
+		.swiper-box {
+			height: 100%;
+
+			.list-scroll-content {
+				height: 100%;
+			}
+		}
+	}
+
+	.scroll-list {
+		width: 100%;
+		overflow: hidden;
+		white-space: nowrap;
+		background-color: #ffffff;
+		font-size: 32rpx;
+
+		.scoll-box {
+			text-align: center;
+			display: inline-block;
+			margin: 0rpx 38rpx;
+			padding: 15rpx 0rpx;
+
+			.scoll-img {
+				width: 130rpx;
+				height: 85rpx;
+				border-radius: 100%;
+
+				image {
+					width: 85rpx;
+					height: 100%;
+					border-radius: 100%;
+				}
+			}
+
+			.scoll-name {
+				padding-top: 15rpx;
+			}
+
+			&.active {
+				color: #ef3d28;
+				border-bottom: 6rpx solid #ef3d28;
+			}
+		}
+	}
+
+	.order-item {
+		width: 100%;
+		padding: 0rpx 25rpx;
+		padding-top: 25rpx !important;
+
+		.list-cell {
+			// background-color: #ffffff;
+			border-radius: 20rpx;
+			width: 100%;
+			box-shadow: 0px 0px 40px 0px rgba(0, 0, 0, 0.06);
+
+			.image {
+				width: 100%;
+				height: 300rpx;
+				border-top-left-radius: 25rpx;
+				border-top-right-radius: 25rpx;
+			}
+
+			.list-tpl {
+				padding: 25rpx 25rpx;
+				padding-bottom: 35rpx !important;
+				font-size: 34rpx;
+				color: #222222;
+				font-weight: 500;
+			}
+		}
+	}
 </style>

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);
@@ -124,7 +124,7 @@ export default {
 		context.fillText('我们因您更有力量，因您倍感温暖！', 60 * obj.ratio, 735 * obj.ratio);
 		// context.fillText('谨表谢意', (580 * obj.ratio), 680 * obj.ratio)
 		// context.setTextAlign('right')
-		context.fillText('孝感市红十字会', 450 * obj.ratio, 850 * obj.ratio);
+		context.fillText('东宝区红十字会', 450 * obj.ratio, 850 * obj.ratio);
         context.fillText(obj.add_time, 450 * obj.ratio, 910 * obj.ratio);
 		// 插入二维码
 		// console.log(codeX, codeY, codeSize, 999)
@@ -195,7 +195,7 @@ export default {
 				link: 'http://slj.igxys.com/index/#/pages/form/donaSuccess?money=' + obj.money + '&name=' + encodeURI(obj.name) + '&time=' + encodeURI(obj.add_time), // 分享链接
 				imgUrl: 'http://slj.igxys.com/index/static/img/002.png',
 				desc: '弘扬红十字精神，传播红十字观念，宣传红十字工作，这是一个汇聚爱心、救助之家力量的平台！',
-				title: '来自孝感市红十字会的感谢信',
+				title: '来自东宝区红十字会的感谢信',
 				success: console.log('分享加载成功')
 			};
 			console.log('分享加', item);

pages/form/tovolApply.vue

@@ -103,7 +103,6 @@
 				<view class="box-left">
 					有无服务经验
 					<text class="imp">*</text>
-					
 				</view>
 			</view>
 			<view class="uni-list">
@@ -228,7 +227,7 @@ export default {
 			otherspe: '',
 			loding: false, //是否提交中
 			array: ['男', '女'],
-			chooseEdu: ['小学以下', '小学', '初中', '高中/中专', '大专/本科', '硕士','博士','博士后'],
+			chooseEdu: ['小学以下', '小学', '初中', '高中/中专', '大专/高职','本科','研究生', '硕士', '博士', '博士后'],
 			chooseVol: ['有', '无'],
 			is_experience: [
 				{
@@ -471,10 +470,10 @@ export default {
 				obj.$api.msg('请填写正确的移动电话');
 				return;
 			}
-			if (obj.address == '') {
-				obj.$api.msg('请填写您的地址');
-				return;
-			}
+			// if (obj.address == '') {
+			// 	obj.$api.msg('请填写您的地址');
+			// 	return;
+			// }
 			// /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[Xx])$)$/
 
 			if (obj.checked1 === '') {
@@ -485,10 +484,10 @@ export default {
 				obj.$api.msg('请选择是否接受过志愿者服务');
 				return;
 			}
-			if (obj.cardimg == '') {
-				obj.$api.msg('请上传您的证件');
-				return;
-			}
+			// if (obj.cardimg == '') {
+			// 	obj.$api.msg('请上传您的证件');
+			// 	return;
+			// }
 			if (!obj.start_hour){
 				this.$api.msg('请选择开始时间！');
 				return;
@@ -500,17 +499,11 @@ export default {
 			if (!obj.dates) {
 				this.$api.msg('请选择日期！');
 				return;
-			}
-			
-			if(obj.education == '') {
-				this.$api.msg('请选择教育程度！');
-				return;
 			}
 			if (obj.Getchecked == false) {
 				this.$api.msg('请阅读并同意个人声明！');
 				return;
-			}
-			
+			}
 			// let reg1 = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[Xx])$)$/;
 			// if (!reg1.test(obj.card)) {
 			// 	obj.$api.msg('请填写正确的身份证信息');
@@ -538,7 +531,7 @@ export default {
 				specialty: obj.specialty, //职业/职务/专业
 				education: obj.educationid, //教育程度
 				is_vol: obj.checked,//是否受过志愿者服务
-				is_experience: obj.checked1,//有无工作经验
+				is_experience: obj.checked1 == 1 ? 0: 1,//有无工作经验
 				start_hour: obj.start_hour,
 				end_hour: obj.end_hour,
 				work_week: obj.dates,//星期几

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">
@@ -26,7 +26,7 @@
       <!-- <div class="img"></div> -->
       <div class="header1" style="width: 21cm;">
         <div class="box-1">
-          制表单位：咸宁市红十字会
+          制表单位：东宝区红十字会
         </div>
         <div class="box-2">
           填表日期：

pages/index/index.vue

@@ -170,7 +170,7 @@
 				getArticList({
 					page: obj.page,
 					limit: obj.limit
-				},11).then(({data}) => {
+				},61).then(({data}) => {
 					obj.science = obj.science.concat(data.list);
 					obj.page++
 					if(data.list.length == obj.limit) {

pages/share/card.vue

@@ -3,14 +3,14 @@
 		<view class="bg"><image class="imgBox" src="../../static/img/test_bg.png" mode="scaleToFill"></image></view>
 		<view class="top flex">
 			<image src="../../static/img/top_bg.png" mode="aspectFill"></image>
-			<view class="china-font">咸宁市红十字会</view>
+			<view class="china-font">东宝区红十字会</view>
 			<view class="english-font">Red Cross Society of China Xianning Branch</view>
 			<view class="fgx"></view>
 		</view>
 		<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>咸宁市新堤街道<br />宏伟南路38号</text></view>
+				<view class="text"><text></text></view>
 			</view>
 			<view class="item flex">
 				<image class="home_img" src="../../static/img/test_phone.png" mode="aspectFill"></image>
@@ -30,7 +30,7 @@
 				<map class="map-box" id="map" :markers="markers" :scale="scale" :latitude="latitude"
 					:longitude="longitude" ref="map" :show-location="false"></map>
 				<view class="map-font flex">
-					<view class="font-left">咸宁市红十字会</view>
+					<view class="font-left">东宝区红十字会</view>
 					<view @click="navigation()" class="font-right"><image src="../../static/img/btn.png" mode="aspectFill"></image></view>
 				</view>
 			</view>
@@ -67,10 +67,10 @@ export default {
 			latitude: '29.811251', //神农架林区纬度
 			longitudeNew: '', //当前经度
 			latitudeNew: '', //当前纬度
-			addr: '咸宁市红十字会',
+			addr: '东宝区红十字会',
 			markers: [{
 				id: '226',
-				title: '咸宁市红十字会',
+				title: '东宝区红十字会',
 				iconPath: '/static/img/img10.png',
 				width: '28',
 				height: '28',
@@ -124,7 +124,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() {
@@ -133,7 +133,7 @@ export default {
 				link:  'http://slj.igxys.com/index/#/pages/share/card',// 分享链接
 				imgUrl: '/index/static/img/002.png',
 				desc: '电子名片分享',
-				title: '咸宁市红十字会',
+				title: '东宝区红十字会',
 			};
 			console.log('分享加',item)
 			weixindata(item);

pages/train/index.vue

@@ -7,7 +7,7 @@
 			<swiper-item class="tab-content">
 				<scroll-view class="list-scroll-content" scroll-y>
 					<!-- 空白页 -->
-					<empty v-if="loadingType === true && list.length === 0"></empty>
+					<empty v-if="loaded && list.length === 0"></empty>
 					<!-- 订单列表 -->
 					<view class="order-item" @click="ToDetail(item)" v-for="(item, index) in list" :key="index">
 						<view class="list-cell">
@@ -66,7 +66,8 @@ export default {
 			page: 1, //当前页数
 			limit: 6, //每次信息条数
 			list: [],
-			loadingType: 'more' //加载更多状态
+			loadingType: 'more' ,//加载更多状态
+			loaded: false
 		};
 	},
 	computed: {
@@ -75,55 +76,37 @@ export default {
 	onLoad() {
 		console.log(22);
 		this.loadData();
+	},
+	onReachBottom() {
+		this.loadData();
 	},
 	methods: {
 		//获取订单列表
 		loadData(type) {
-			//这里是将订单挂载到tab列表下
 			let obj = this;
-			if (type != 'refresh') {
-				console.log(obj.loadingType, '456');
-				//没有更多数据直接跳出方法
-				if (obj.loadingType === 'nomore') {
-					return;
-				} else {
-					// 设置当前为数据载入中
-					obj.loadingType = 'loading';
-				}
-			} else {
-				//当重新加载数据时更新状态为可继续添加数据
-				obj.loadingType = 'more';
-			}
-			training({})
+			if(obj.loadingType == 'loading' || obj.loadingType == 'noMore') {
+				return 
+			}
+			obj.loadingType = 'loading'
+			training({
+				page: obj.page,
+				limit: obj.limit,
+			})
 				.then(data => {
-					if (type === 'refresh') {
-						obj.list = [];
-					}
 					data.data.forEach(item => {});
 					let arr = data.data;
-					obj.list = obj.list.concat(arr);
-					console.log(obj.list, 123456);
-					//判断是否还有下一页，有是more  没有是nomore
+					obj.list = obj.list.concat(arr);
+					obj.page++;
 					if (obj.limit == arr.length) {
-						obj.page++;
+						
 						obj.loadingType = 'more';
 					} else {
-						obj.loadingType = 'nomore';
-					}
-					// 判断是否为刷新数据
-					if (type === 'refresh') {
-						console.log('refresh');
-						// 判断是否为点击搜索按钮跳转加载
-						if (obj.loading == 1) {
-							uni.hideLoading();
-						} else {
-							uni.stopPullDownRefresh();
-						}
+						obj.loadingType = 'noMore';
 					}
+					obj.loaded = true
 				})
 				.catch(e => {
-					obj.loadingType = 'nomore';
-					uni.hideLoading();
+					obj.loadingType = 'noMore';
 				});
 		},
 		//跳转到详情

pages/train/sign.vue

@@ -5,7 +5,7 @@
 			<!-- <view class="box">
 				<jyf-parser :html="description" ref="article"></jyf-parser>
 			</view> -->
-			<view class="top-title canten">免费报名</view>
+			<view class="top-title canten">培训报名</view>
 			<view class="sign-tip">完成信息填写，即可参加红十字会救护员培训</view>
 			<view class="form-box">
 				<view class="label">
@@ -24,7 +24,7 @@
 				</view>
 				<input type="number" v-model="num" placeholder="请输入参加培训人数" />
 			</view>
-			<view class="top-title">免费报名</view>
+			<view class="top-title">培训报名</view>
 			<view class="text-box" v-html="description">
 				<view class="text">请参训学员在培训当天携带身份证复印件1张，一寸证件照2张。</view>
 				<view class="text">报名咨询电话：0716-4163849</view>

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)
@@ -185,7 +185,7 @@ export default {
 				link: 'http://slj.igxys.com/index/#/pages/form/donaSuccess?money=' + obj.money, // 分享链接
 				imgUrl: 'http://slj.igxys.com/index/#/static/img/thinks.png',
 				desc: '感谢信',
-				title: '咸宁市红十字会',
+				title: '东宝区红十字会',
 				success: console.log('分享加载成功')
 			};
 			console.log('分享加', item);

pages/user/thank.vue

@@ -243,7 +243,7 @@ export default {
 				link: 'http://slj.igxys.com/index/#/pages/user/thank?project_id=' + obj.pid + '&name=' + obj.userName + '&time=' + obj.time + '&title=' + obj.itemName, // 分享链接
 				imgUrl: 'http://slj.igxys.com/static/img/22.jpg',
 				desc: '感谢信',
-				title: '咸宁市红十字会',
+				title: '东宝区红十字会',
 				success: console.log('分享加载成功')
 			};
 			console.log('分享加', item);

pages/user/user.vue

@@ -7,21 +7,21 @@
 			</view>
 			<view class="name-box">
 				<view class="name-top">
-					{{userInfo.nickname}}
-				</view>
-				<view class="name-phone">
-					{{getPhone || ''}}
+					{{userInfo.nickname}}<text v-if="userInfo && userInfo.level_name && userInfo.level > 1">{{'('+ userInfo.level_name +')'}}</text>
+				</view>
+				<view class="" v-if="userInfo && userInfo.level_name && userInfo.level > 1" style="color: #fff;font-size: 32rpx;">
+					<text v-if="vip_endtime < newTime">已到期，立即续费</text><text>{{userInfo.vip_endtime | time}} 到期<text @click="xuFei()">（续费）</text></text>
 				</view>
 			</view>
 		</view>
 		<view class="nav-wrapper">
-			<view class="nav-item flex" @click="tohelp">
+			<!-- <view class="nav-item flex" @click="tohelp">
 				<view class="item-left flex">
 					<image src="../../static/icon/i6.png" mode="" class="img1"></image>
 					<view class="title">求救记录</view>
 				</view>
 				<view class="item-right">
-					<image src="../../static/index/right.png" mode=""></image>
+					>
 				</view>
 			</view>
 			<view class="nav-item flex" @click="torreco">
@@ -29,74 +29,65 @@
 					<image src="../../static/icon/u-help.png" mode="" class="img2"></image>
 					<view class="title">救援记录</view>
 				</view>
-				<view class="item-right">
-					<image src="../../static/index/right.png" mode=""></image>
-				</view>
-			</view>
-			<view class="nav-item flex" @click="navTo('/pages/form/myDonate')">
-				<view class="item-left flex">
-					<image src="../../static/icon/u-jk.png" mode="" class="img2"></image>
-					<view class="title">我的捐赠</view>
-				</view>
-				<view class="item-right">
-					<image src="../../static/index/right.png" mode=""></image>
-				</view>
-			</view>
-			<!-- <view class="nav-item flex" @click="navTo('/pages/user/myaid')">
-				<view class="item-left flex">
-					<image src="../../static/icon/u-jz.png" mode="" class="img1"></image>
-					<view class="title">捐赠记录</view>
-				</view>
 				<view class="item-right">
 					>
 				</view>
-			</view> -->
-			<!-- <view class="nav-item flex" @click="tojkjl">
-				<view class="item-left flex">
-					<image src="../../static/icon/u-jk.png" mode="" class="img1"></image>
-					<view class="title">捐款记录</view>
-				</view>
-				<view class="item-right">
-					>
-				</view>
-			</view> -->
-			<view class="nav-item flex" @click="tocertificates">
+			</view> -->
+			<!-- <view class="nav-item flex" @click="navTo('/pages/form/myDonate')">
+				<view class="item-left flex">
+					<image src="../../static/icon/u-jz.png" mode="" class="img1"></image>
+					<view class="title">捐赠记录</view>
+				</view>
+				<view class="item-right">
+					>
+				</view>
+			</view> -->
+			<view class="nav-item flex" @click="navTo('/pages/form/myDonate')">
+				<view class="item-left flex">
+					<image src="../../static/icon/u-jk.png" mode="" class="img1"></image>
+					<view class="title">捐款记录</view>
+				</view>
+				<view class="item-right">
+					>
+				</view>
+			</view>
+			<view class="nav-item flex" @click="tocertificates" >
 				<view class="item-left flex">
 					<image src="../../static/icon/i9.png" mode="" class="img4"></image>
 					<view class="title">我的证书</view>
 				</view>
-				<view class="item-right">
-					<image src="../../static/index/right.png" mode=""></image>
-				</view>
-			</view>
-			<!-- <view class="nav-item flex" @click="navTo('/pages/applyHelp/cation')" >
-				<view class="item-left flex">
-					<image src="../../static/icon/i7.png" mode="" class="img4"></image>
-					<view class="title">申请帮扶</view>
-				</view>
 				<view class="item-right">
 					>
 				</view>
-			</view> -->
-			<!-- <view class="nav-item flex" @click="navTo('/pages/user/myFu')" >
-				<view class="item-left flex">
-					<image src="../../static/icon/u-m-f.png" mode="" class="img4"></image>
-					<view class="title">我的帮扶</view>
-				</view>
-				<view class="item-right">
-					>
-				</view>
-			</view> -->
-			<!-- @click="loginout"  -->
-			<!-- <view class="nav-item flex" @click="navTo('/pages/user/userSet')" >
-				<view class="item-left flex">
-					<image src="../../static/icon/u-set.png" mode="" class="img4"></image>
-					<view class="title">退出</view>
-				</view>
-				<view class="item-right">
-					>
-				</view>
-			</view> -->
+			</view>
+			<!-- <view class="nav-item flex" @click="navTo('/pages/applyHelp/cation')" >
+				<view class="item-left flex">
+					<image src="../../static/icon/i7.png" mode="" class="img4"></image>
+					<view class="title">申请帮扶</view>
+				</view>
+				<view class="item-right">
+					>
+				</view>
+			</view>
+			<view class="nav-item flex" @click="navTo('/pages/user/myFu')" >
+				<view class="item-left flex">
+					<image src="../../static/icon/u-m-f.png" mode="" class="img4"></image>
+					<view class="title">我的帮扶</view>
+				</view>
+				<view class="item-right">
+					>
+				</view>
+			</view> -->
+			<!-- @click="loginout"  -->
+			<view class="nav-item flex" @click="navTo('/pages/user/userSet')" >
+				<view class="item-left flex">
+					<image src="../../static/icon/u-set.png" mode="" class="img4"></image>
+					<view class="title">设置</view>
+				</view>
+				<view class="item-right">
+					>
+				</view>
+			</view>
 		</view>
 	</view>
 </template>
@@ -110,35 +101,62 @@
 		saveUrl,
 		interceptor
 	} from '@/utils/loginUtils.js';
+	import { detail_training } from '@/api/train.js';
 	import {
-		detail_training
-	} from '@/api/train.js';
-	import {
-		userinfo,
+		userinfo,
 		logout
 	} from '@/api/user.js';
 	// #ifdef H5
 	import {
 		weixindata
 	} from '@/utils/wxAuthorized';
-	// #endif
+	// #endif
+	import { getVipmoney, createOrder } from '@/api/index.js'
 	export default {
 		data() {
 			return {
-				common_address: '',
-				name: '',
-				signDate: '',
-				id: 0,
-				is_over: 0,
-
+				common_address:'',
+				name:'',
+				signDate:'',
+				id:0,
+				is_over:0,
+				newTime: 0,
+				money: '',
+				mid: '',
 			}
+		},
+		filters: {
+			time(val) {
+				let str = '';
+				// console.log(val)
+				if (val) {
+					let date = new Date(val * 1000);
+					let Y = date.getFullYear();
+					let M = date.getMonth() + 1 > 9 ? (date.getMonth()+1) : '0' + (date.getMonth()+1);
+					let D = date.getDate() > 9 ? date.getDate() : '0' + date.getDate();
+					str = Y + '年' + M + '月' + D + '日';
+				}
+				return str;
+			},
 		},
-
 		onShow() {
-			console.log(this);
+			console.log(this);
+			let obj = this
 			//	判断是否已经登录
 			if (this.hasLogin) {
-				this.loadBaseData();
+				this.loadBaseData();
+				getVipmoney().then(({
+					data
+				}) => {
+					console.log(data, 'getVipmoney');
+					data.forEach(e => {
+						if (e.name == obj.userInfo.level_name) {
+							obj.money = e.pay_price;
+							obj.mid = e.id;
+							console.log(obj.money, obj.mid)
+						}
+					});
+				});
 			} else {
 				saveUrl();
 				uni.showModal({
@@ -155,9 +173,10 @@
 				});
 			}
 			this.type = this.userInfo.type;
-			this.common_address = this.userInfo.common_address
-			console.log(this.userInfo, 'wuwu')
-			console.log('点前保存的地址', this.common_address)
+			this.common_address = this.userInfo.common_address
+			let str = new Date()
+			this.newTime = str.getTime()
+			console.log('点前保存的地址',this.common_address)
 			// 保存当前页面
 		},
 		onReady() {
@@ -172,39 +191,81 @@
 			// })
 		},
 		computed: {
-			...mapState('user', ['hasLogin', 'userInfo']),
-			getPhone() {
-				if(this.userInfo.mobile) {
-					return this.userInfo.mobile.substring(0, 3) + '****' + this.userInfo.mobile.substring(7)
-				}
-				return ''
-			}
+			...mapState('user', ['hasLogin', 'userInfo']),
+			...mapState(['weichatObj']),
 		},
 		methods: {
-			...mapMutations('user', ['setUserInfo', 'logout']),
-			loginout() {
-				let obj = this;
-				uni.showModal({
-					content: '确定要退出登录么',
-					success: e => {
-						if (e.confirm) {
-							logout({}).then(e => {
-									obj.logout();
-									uni.switchTab({
-										url: '/pages/index/index'
-									})
-								})
-								.catch(e => {
-									console.log(e);
-								});
-						}
-					}
-				});
-			},
-			tojkjl() {
-				uni.navigateTo({
-					url: '/pages/user/jkjl'
-				})
+			...mapMutations('user', ['setUserInfo','logout']),
+			// 续费
+			xuFei() {
+				let obj = this
+				uni.showModal({
+					title: '提示',
+					content: '续费' + obj.userInfo.level_name + '需要缴纳' + obj.money + '元年费，是否续费',
+					success: function(res) {
+						if (res.confirm) {
+							console.log('用户点击确定');
+							createOrder({
+								level_id: obj.mid,
+								body: '红会年费',
+								pay_type: 0,
+								// name: obj.name,
+								pay_price: obj.money,
+								from: 'weixin'
+							}).then(({data}) =>{
+								let res = data.jsConfig;
+								obj.weichatObj.chooseWXPay({
+									timestamp: res.timestamp,
+									nonceStr: res.nonceStr,
+									package: res.package,
+									signType: res.signType,
+									paySign: res.paySign,
+									success: function(res) {
+										// uni.navigateTo({
+										// 	url: '../joinSuc/joinNow'
+										// });
+										obj.loadBaseData()
+										uni.showModal({
+											title:'提示',
+											content: '续费成功'
+										})
+									},
+									fail: function(res) {
+										console.log(res, "失败")
+										console.log(res.errMsg)
+									}
+								});
+							})
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				});
+			},
+			// 登出
+			loginout() {
+				let obj = this;
+				uni.showModal({
+					content: '确定要退出登录么',
+					success: e => {
+						if (e.confirm) {
+							logout({}).then(e => {
+									obj.logout();
+									uni.switchTab({
+										url: '/pages/index/index'
+									})
+								})
+								.catch(e => {
+									console.log(e);
+								});
+						}
+					}
+				});
+			},
+			tojkjl() {
+				uni.navigateTo({
+					url: '/pages/user/jkjl'
+				})
 			},
 			loadBaseData() {
 				userinfo({}).then(({
@@ -229,11 +290,6 @@
 					url: '/pages/user/myFu'
 				})
 			},
-			getAdress(){
-				uni.navigateTo({
-					url:'/pages/applic/chooseAddress'
-				})
-			},
 			torreco() {
 				uni.navigateTo({
 					url: '/pages/applic/rescuerecords'
@@ -253,10 +309,10 @@
 				uni.navigateTo({
 					// pages/form/certificatesList
 					// url: '/pages/form/certificates?name=' + this.name + '&signDate=' + this.signDate
-					url: '/pages/form/certificatesList'
+					url: '/pages/form/certificatesList' 
 				})
 			},
-			navTo(url) {
+			navTo(url) {
 				console.log(url)
 				uni.navigateTo({
 					url: url
@@ -268,16 +324,14 @@
 
 <style lang="scss">
 	page {
-		min-height: 100%;
+		min-height: 100%;
 		height: auto;
 		background: #fff;
 	}
-
 	.content {
 		line-height: 1.5;
-		background-color: #fff;
+		background-color: #fff;
 		height: 100%;
-
 		.top {
 			width: 750rpx;
 			height: 312rpx;
@@ -290,7 +344,6 @@
 			justify-content: center;
 			background-image: url(../../static/img/userbg.png);
 			background-size: 100% 100%;
-
 			.avater {
 				width: 150rpx;
 				height: 150rpx;
@@ -306,33 +359,23 @@
 			.name-box {
 				// flex: 1;
 				padding-top: 25rpx;
-				display: flex;
-				flex-direction: column;
-				align-items: center;
-				justify-content: center;
-
 				.name-top {
-
+					font-size: 42rpx;
+					font-weight: 400;
+					margin-bottom: 15rpx;
 					font-size: 32rpx;
 					font-family: PingFang SC;
 					font-weight: 500;
-					color: #FFFFFF;
-				}
-
-				.name-phone {
-					font-size: 26rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #FFFFFF;
+					color: #FFFFFF;
+					text-align: center;
 				}
-
-				.name-bottom {
+				.name-bottom{
 					margin-top: 16rpx;
 					display: flex;
 					align-items: center;
 					// justify-content: center;
-
-					.nameInfo {
+					
+					.nameInfo{
 						color: #FFFFFF;
 						padding: 6rpx 16rpx;
 						border: 1rpx solid #FFFFFF;
@@ -421,8 +464,7 @@
 		.tt {
 			display: flex;
 			flex-wrap: wrap;
-			padding-left: 32rpx;
-
+			padding-left:32rpx;
 			.tt-box {
 				width: 206rpx;
 				height: 206rpx;
@@ -433,12 +475,10 @@
 				justify-content: center;
 				margin-right: 35rpx;
 				margin-bottom: 30rpx;
-
 				image {
 					width: 64rpx;
 					height: 64rpx;
 				}
-
 				.tt-txt {
 					font-size: 24rpx;
 					font-family: PingFang SC;
@@ -450,7 +490,6 @@
 
 		}
 	}
-
 	.nav-wrapper {
 		width: 678rpx;
 		// height: 560rpx;
@@ -459,51 +498,41 @@
 		border-radius: 20rpx;
 		margin: 32rpx auto 0;
 		color: #555555;
-
 		.nav-item {
 			height: 115rpx;
 			border-bottom: 1rpx #F6F6F6 solid;
-
 			&:last-of-type {
 				border-bottom: none;
 			}
-
 			justify-content: space-between;
 			align-items: center;
 			padding: 0 36rpx 0 40rpx;
-
 			.item-left {
-
+				
 				align-items: center;
-
 				image {
 					// background-color: red;
 				}
-
 				.img1 {
 					width: 34rpx;
 					height: 34rpx;
 					margin-right: 21rpx;
 				}
-
 				.img2 {
 					width: 36rpx;
 					height: 32rpx;
 					margin-right: 19rpx;
 				}
-
 				.img3 {
 					width: 28rpx;
 					height: 36rpx;
 					margin-right: 25rpx;
 				}
-
 				.img4 {
 					width: 36rpx;
 					height: 28rpx;
 					margin-right: 19rpx;
 				}
-
 				.title {
 					font-size: 32rpx;
 					font-family: PingFang SC;
@@ -511,15 +540,8 @@
 					color: #555555;
 				}
 			}
-
 			.item-right {
-				
-				width: 16rpx;
-				height: 30rpx;
-				image{
-					width: 100%;
-					height: 100%;
-				}
+				line-height: 115rpx;
 			}
 		}
 	}

store/index.js

@@ -5,10 +5,10 @@ Vue.use(Vuex)
 const store = new Vuex.Store({
 	state: {
 		// #ifdef MP
-		baseURL: 'http://red.frp.liuniu946.com', //请求地址配置
+		baseURL: 'http://dongbao.igxys.com', //请求地址配置
 		// #endif
 		// #ifndef MP
-		baseURL: 'http://red.frp.liuniu946.com', //请求地址配置
+		baseURL: 'http://dongbao.igxys.com', //请求地址配置
 		// #endif
 		// baseURL: 'http://yrh.liuniu946.com', //请求地址配置
 		urlFile: '/index', //项目部署所在文件夹
@@ -23,8 +23,8 @@ const store = new Vuex.Store({
 		// #endif
 		// shareData:'',//分享信息
 		project_area: 0,
-		sys_appid: 'xnshszh2022120',//系统AppID
-		sys_appsecret: '2022120xnshszh',//系统AppSecret
+		sys_appid: 'dongbaoqured22212',//系统AppID
+		sys_appsecret: '22212dongbaoqured',//系统AppSecret
 	},
 	mutations: {