lhl пре 4 година
родитељ
комит
b3299809c2
63 измењених фајлова са 589 додато и 567 уклоњено
  1. 21 14
      App.vue
  2. 2 10
      pages/applic/contribution.vue
  3. 6 6
      pages/applic/other.vue
  4. 1 1
      pages/applic/perSign.vue
  5. 1 1
      pages/applic/teamSign.vue
  6. 2 2
      pages/applic/tohelpActi.vue
  7. 3 3
      pages/applic/toknowledge.vue
  8. 492 485
      pages/category/category.vue
  9. 4 3
      pages/donate/donate.vue
  10. 5 5
      pages/donate/donateDetail.vue
  11. 10 5
      pages/donate/idonate.vue
  12. 1 1
      pages/donate/progress.vue
  13. 1 1
      pages/donate/progresst.vue
  14. 12 12
      pages/form/applicationForm.vue
  15. 2 2
      pages/form/certificates.vue
  16. 2 2
      pages/form/donaSuccess.vue
  17. 6 6
      pages/share/card.vue
  18. 2 2
      pages/train/sign.vue
  19. 2 2
      pages/user/intent.vue
  20. 2 2
      pages/user/thank.vue
  21. BIN
      static/icon/erweima.jpg
  22. 1 0
      store/index.js
  23. 1 1
      unpackage/dist/build/h5/index.html
  24. BIN
      unpackage/dist/build/h5/ssq-10-16-3.rar
  25. BIN
      unpackage/dist/build/h5/static/icon/erweima.jpg
  26. 0 0
      unpackage/dist/build/h5/static/js/index.a958625e.js
  27. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-contribution.14099dc6.js
  28. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-contribution.6da45b78.js
  29. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-other.3e3f94d9.js
  30. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-other.71a7eb67.js
  31. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-perSign.69fe7881.js
  32. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-perSign.b6970c31.js
  33. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-teamSign.2d6f08f5.js
  34. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-teamSign.c4b29abb.js
  35. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-tohelpActi.04462535.js
  36. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-tohelpActi.6bc416dd.js
  37. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-toknowledge.273c3760.js
  38. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-toknowledge.675b85a8.js
  39. 0 0
      unpackage/dist/build/h5/static/js/pages-category-category.2f9c316b.js
  40. 0 0
      unpackage/dist/build/h5/static/js/pages-category-category.4cdbdf74.js
  41. 0 0
      unpackage/dist/build/h5/static/js/pages-donate-donate.65cca251.js
  42. 0 0
      unpackage/dist/build/h5/static/js/pages-donate-donate.c672c081.js
  43. 0 0
      unpackage/dist/build/h5/static/js/pages-donate-donateDetail.1e4b0818.js
  44. 0 0
      unpackage/dist/build/h5/static/js/pages-donate-donateDetail.af8c1a8e.js
  45. 0 0
      unpackage/dist/build/h5/static/js/pages-donate-idonate.23d9f054.js
  46. 0 0
      unpackage/dist/build/h5/static/js/pages-donate-idonate.b25bc1e5.js
  47. 0 0
      unpackage/dist/build/h5/static/js/pages-donate-progress.3c821be6.js
  48. 0 0
      unpackage/dist/build/h5/static/js/pages-donate-progress.d35dd182.js
  49. 0 0
      unpackage/dist/build/h5/static/js/pages-donate-progresst.dc8226d2.js
  50. 0 0
      unpackage/dist/build/h5/static/js/pages-donate-progresst.f76397c0.js
  51. 0 0
      unpackage/dist/build/h5/static/js/pages-form-applicationForm.1e66e675.js
  52. 0 0
      unpackage/dist/build/h5/static/js/pages-form-applicationForm.9e9e2a01.js
  53. 0 0
      unpackage/dist/build/h5/static/js/pages-form-certificates.da7c6bdb.js
  54. 0 0
      unpackage/dist/build/h5/static/js/pages-form-certificates.dfc737fe.js
  55. 0 0
      unpackage/dist/build/h5/static/js/pages-form-donaSuccess.820b3ebf.js
  56. 0 0
      unpackage/dist/build/h5/static/js/pages-form-donaSuccess.a4c689fa.js
  57. 0 0
      unpackage/dist/build/h5/static/js/pages-train-sign.3f3c091d.js
  58. 0 0
      unpackage/dist/build/h5/static/js/pages-train-sign.8a1a7926.js
  59. 0 0
      unpackage/dist/build/h5/static/js/pages-user-intent.34d80431.js
  60. 0 0
      unpackage/dist/build/h5/static/js/pages-user-intent.7b022bc8.js
  61. 0 0
      unpackage/dist/build/h5/static/js/pages-user-thank.8e09719b.js
  62. 0 0
      unpackage/dist/build/h5/static/js/pages-user-thank.d147249f.js
  63. 10 1
      utils/newRequest.js

+ 21 - 14
App.vue

@@ -3,6 +3,7 @@
 	 * vuex管理登陆状态,具体可以参考官方登陆模板示例
 	 */
 	import {
+		mapState,
 		mapMutations
 	} from 'vuex';
 	// #ifdef H5
@@ -19,6 +20,9 @@
 				weixinObj: '' //保存微信对象
 			};
 		},
+		computed:{
+		      ...mapState(['project_area'])
+		    },
 		methods: {
 			...mapMutations('user', ['setUserInfo', 'login', 'hasLogin']),
 		},
@@ -26,9 +30,9 @@
 			let obj = this;
 			// 加载缓存中的用户信息
 			let userInfo = uni.getStorageSync('userInfo') || '';
-			console.log(userInfo,'bba');
+			console.log(userInfo, 'bba');
 			// 判断是否拥有用户信息
-			if (userInfo.uid) {
+			if (userInfo.project_area == obj.project_area) {
 				//更新登陆状态
 				uni.getStorage({
 					key: 'userInfo',
@@ -62,9 +66,9 @@
 			// obj.audioMusic.onError(function(res){
 			// 	console.log(res)
 			// })
-			
-			
-			
+
+
+
 		},
 		onShow: function() {
 			// 加载拦截
@@ -135,14 +139,15 @@
 	}
 
 	//多行字体省略
-	.word2_ellipsis{
+	.word2_ellipsis {
 		overflow: hidden;
 		text-overflow: ellipsis;
 		display: -webkit-box;
-		-webkit-line-clamp: 2;//在第几行显示...
+		-webkit-line-clamp: 2; //在第几行显示...
 		-webkit-box-orient: vertical;
 
 	}
+
 	//右外边距
 	.m-r25 {
 		margin-right: 25rpx;
@@ -355,17 +360,19 @@
 		// 设置默认字体
 		font-family: PingFang SC, STHeitiSC-Light, Helvetica-Light, arial, sans-serif, Droid Sans Fallback;
 	}
+
 	.clamp {
 		overflow: hidden;
 		text-overflow: ellipsis;
 		white-space: nowrap;
 		display: block;
 	}
-	.clamp2{
-		overflow:hidden; 
-		text-overflow:ellipsis;
-		display:-webkit-box; 
-		-webkit-box-orient:vertical;
-		-webkit-line-clamp:2;
+
+	.clamp2 {
+		overflow: hidden;
+		text-overflow: ellipsis;
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 2;
 	}
-</style>
+</style>

+ 2 - 10
pages/applic/contribution.vue

@@ -258,16 +258,8 @@
 			// console.log(333,options)
 		},
 		onShow() {
-			// saveUrl()
-			// let token = uni.getStorageSync('token');
-			console.log(1, this);
-			// uni.showModal({
-			// 	title: '判断hasLogin',
-			// 	content: JSON.stringify(this.hasLogin),
-			// })
 			if (!this.hasLogin) {
 				// 登录拦截
-				// interceptor();
 				uni.showModal({
 					title: '登录',
 					content: '您未登录,是否马上登陆?',
@@ -280,7 +272,7 @@
 					fail: e => {
 						console.log(e);
 						uni.showModal({
-							title: 'cuowu',
+							title: '错误',
 							content: JSON.stringify(e),
 						})
 					}
@@ -445,7 +437,7 @@
 							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 +'日'
 							})

+ 6 - 6
pages/applic/other.vue

@@ -33,9 +33,9 @@
 			<view class="erweima"><image src="../../static/images/smjk.png" mode=""></image></view> -->
 			<view class="title">2.现场捐款/捐物</view>
 			<view class="detail">
-				<view class="detail-item">负责人:*****</view>
-				<view class="detail-item">咨询电话:******</view>
-				<view class="detail-item">地址:*********</view>
+				<view class="detail-item">负责人:范康扬</view>
+				<view class="detail-item">咨询电话:0716-8817963</view>
+				<view class="detail-item">地址:湖北省荆州市沙市区碧波路13号</view>
 			</view>
 		</view>
 	</view>
@@ -50,9 +50,9 @@ export default {
 				{
 					id: 0,
 					spread_url: 11,
-					name: '沙市区红十字会',
-					count: '***********',
-					number: '************'
+					name: '荆州市沙市区红十字会',
+					count: '湖北银行股份有限公司荆州银海支行',
+					number: '130600120100012488 '
 				}
 			]
 		};

+ 1 - 1
pages/applic/perSign.vue

@@ -44,7 +44,7 @@
 					请参训学员在培训当天携带身份证复印件1张,一寸证件照2张。
 				</view>
 				<view style="margin-top: 16rpx;">
-					报名电话: 0573-88103165
+					报名电话: 0716-8817963
 				</view>
 			</view>
 		</view>

+ 1 - 1
pages/applic/teamSign.vue

@@ -59,7 +59,7 @@
 					请参训学员在培训当天携带身份证复印件1张,一寸证件照2张。
 				</view>
 				<view style="margin-top: 16rpx;">
-					报名电话: 0573-88103165
+					报名电话: 0716-8817963
 				</view>
 			</view>
 		</view>

+ 2 - 2
pages/applic/tohelpActi.vue

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

+ 3 - 3
pages/applic/toknowledge.vue

@@ -95,12 +95,12 @@
 			<view class="list-tips">
 				<text style="color: #C53335;">温馨提示</text>:每个志愿者抽取一次血样即可,您的资料将储存在中国造血干细胞捐献者资料库中。
 			</view>
-			<!-- <view class="list-tips" style="color: #C53335;text-align: center;">
+			<view class="list-tips" style="color: #C53335;text-align: center;">
 				沙市区造血干细胞捐献咨询电话:
 			</view>
 			<view class="list-tips" style="text-align: center;">
-				0716-4163849
-			</view> -->
+				0716-8817963
+			</view>
 		</view>
 	</view>
 </template>

+ 492 - 485
pages/category/category.vue

@@ -1,60 +1,49 @@
 <template>
 	<view class="content">
-		<view class="top"><image src="../../static/img/jiuzai.png" mode="widthFix" class="bgi"></image></view>
-<!-- 		<view class="top-xtitle">
-			红十字
+		<view class="top">
+			<image src="../../static/img/jiuzai.png" mode="widthFix" class="bgi"></image>
 		</view>
-		<view class="top-title">
-			救护员招募
-		</view> -->
 		<view class="pop-box">公众参与</view>
 		<view class="pop-list">
 			<view class="list-box1" v-for="(item, index) in peoplelist" :key="index" v-if="index < 20">
-				<view class="list-top"><image src="../../static/img/002.png" mode="" class="avatar-img"></image></view>
+				<view class="list-top">
+					<image src="../../static/img/002.png" mode="" class="avatar-img"></image>
+				</view>
 				<view class="nickname">{{ item.name }}</view>
 			</view>
 		</view>
 		<view class="red-box">活动报名</view>
-		<!-- 	<view class="people">
-			
-		</view> -->
 		<view class="list-box">
 			<view class="list">
-				<view class="list-left">姓名 <text>*</text></view>
-				<input type="text" v-model="name" class="list-input" placeholder="请填写您的姓名" />
+				<view class="list-left">姓名<text>*</text></view>
+				<input type="text" v-model="name" class="list-input" placeholder="请输入您的姓名" />
 			</view>
 			<view class="list">
-				<view class="list-left">手机<text>*</text></view>
+				<view class="list-left">手机<text>*</text></view>
 				<input type="text" v-model="phone" class="list-input" placeholder="请填写您的联系方式" />
 			</view>
 			<view class="list" @click="getLocation">
-				<view class="list-left">地址 <text>*</text></view>
+				<view class="list-left">地址<text>*</text></view>
 				<!-- <picker-address class="box-right" @change="onCityClick">{{ address }}</picker-address> -->
 				<input type="text" v-model="showaddress" class="list-input" placeholder="请选择定位地址" />
 			</view>
-			<view class="list" @click="Toshow">
-				<view class="list-left">机构 <text>*</text></view>
-				<!-- <input type="text" v-model="mechanism" @click="tosearch" class="list-input" placeholder='请输入机构关键字'/> -->
-				<input type="text" v-model="mechanism" class="list-input" placeholder="请填写您的所在机构" disabled />
-			</view>
+			<!-- <view class="list" @click="Toshow">
+				<view class="list-left">机构<text>*</text></view>
+				<input type="text" v-model="searchVal" class="list-input" placeholder="请输入机构关键字"
+					disabled />
+			</view> -->
 
 			<view class="upload-box">
-				<view class="upload-left">证件 <text>*</text></view>
+				<view class="upload-left">证件<text>*</text></view>
 				<view class="upload-right">
-					<image :src="certificates" mode="" class="upload-img" @click.stop="imgsub" v-if="certificates"></image>
-					<image src="../../static/images/upload.png" class="upload-img" mode="" v-if="!certificates" @click.stop="imgsub"></image>
+					<image :src="certificates" mode="" class="upload-img" @click.stop="imgsub" v-if="certificates">
+					</image>
+					<image src="../../static/images/upload.png" class="upload-img" mode="" v-if="!certificates"
+						@click.stop="imgsub"></image>
 				</view>
 			</view>
-			<zhilin-picker
-				v-model="show"
-				:title="title"
-				:data="list"
-				:initSelected="initSelected"
-				:showSearch="true"
-				@change="onChange"
-				@searchInput="onSearchInput"
-				@confirm="onConfirm1"
-			/>
+			<zhilin-picker v-model="show" :title="title" :data="list" :initSelected="initSelected" :showSearch="true"
+				@change="onChange" @searchInput="onSearchInput" @confirm="onConfirm1" />
 		</view>
 		<view class="sub" :class="{ action: loding }" @click="!loding ? join() : ''">提交申请</view>
 	</view>
@@ -69,227 +58,240 @@
 		saveUrl,
 		interceptor
 	} from '@/utils/loginUtils.js';
-import { mechanism } from '@/api/ask.js';
-import { getNumber } from '@/api/index.js';
-import pickerAddress from '@/components/wangding-pickerAddress/wangding-pickerAddress.vue';
-import zhilinPicker from '@/components/zhilin-picker/zhilin-picker.vue';
-import { upload, addrescuer } from '@/api/ask.js';
-export default {
-	components: {
-		pickerAddress
-	},
-	data() {
-		return {
-			longitude: '',
-			latitude: '',
-			name: '',
-			phone: '',
-			mechanism: '',
-			title: '选择机构',
-			show: false,
-			list: [],
-			initSelected: [],
-			searchVal: '',
-			address: '',
-			certificates: '',
-			loding: false, //是否提交中
-			showaddress: '', //显示用的地址
-			count: 0,
-			peoplelist: [],
-			addressData: {
-				name: '',
-				mobile: '',
-				latitude: 0, //纬度
-				longitude: 0, //经度
-				address: {
-					province: '',
-					city: '',
-					district: '',
-					detail: ''
-				},
-				area: '',
-				default: false
-			}
-		};
-	},
-	computed: {
-		...mapState('user', ['hasLogin', 'userInfo']),
-	},
-	onShow() {
-		this.loadData();
-		if (this.hasLogin) {
-			// this.loadBaseData();
-		} else {
-			saveUrl();
-			uni.showModal({
-				title: '登录',
-				content: '您未登录,是否马上登陆?',
-				success: e => {
-					if (e.confirm) {
-						interceptor();
-					}
-				},
-				fail: e => {
-					console.log(e);
-				}
-			});
-		}
-	},
-	watch: {
-		searchVal() {
-			this.ListDate();
-		}
-	},
-	methods: {
-		tosearch() {
-			console.log(123);
-			uni.navigateTo({
-				url: '/pages/category/search'
-			});
+	import {
+		mechanism
+	} from '@/api/ask.js';
+	import {
+		getNumber
+	} from '@/api/index.js';
+	import pickerAddress from '@/components/wangding-pickerAddress/wangding-pickerAddress.vue';
+	import zhilinPicker from '@/components/zhilin-picker/zhilin-picker.vue';
+	import {
+		upload,
+		addrescuer
+	} from '@/api/ask.js';
+	export default {
+		components: {
+			pickerAddress
 		},
-		async loadData() {
-			let obj = this;
-			getNumber({}).then(({ data }) => {
-				// console.log(12)
-				// console.log(data)
-				obj.count = data.count;
-				obj.peoplelist = data.data;
-			});
+		computed: {
+			...mapState('user', ['userInfo', 'baseURL', 'hasLogin']),
 		},
-		// 选择当前位置
-		getLocation() {
-			console.log('选择当前位置');
-			let obj = this;
-			uni.chooseLocation({
-				success: function(res) {
-					obj.addressData.area = res.name;
-					console.log('位置名称:' + res.name);
-					console.log('详细地址:' + res.address);
-					console.log('纬度:' + res.latitude);
-					console.log('经度:' + res.longitude);
-					obj.addressData.latitude = res.latitude;
-					obj.addressData.longitude = res.longitude;
-					// let	dizhi = obj.addressData.latitude + ','+ obj.addressData.longitude;
-					obj.showaddress = res.address;
+		data() {
+			return {
+				longitude: '',
+				latitude: '',
+				name: '',
+				phone: '',
+				mechanism: '',
+				title: '选择机构',
+				show: false,
+				list: [],
+				initSelected: [],
+				searchVal: '',
+				address: '',
+				certificates: '',
+				loding: false, //是否提交中
+				showaddress: '', //显示用的地址
+				count: 0,
+				peoplelist: [],
+				addressData: {
+					name: '',
+					mobile: '',
+					latitude: 0, //纬度
+					longitude: 0, //经度
+					address: {
+						province: '',
+						city: '',
+						district: '',
+						detail: ''
+					},
+					area: '',
+					default: false
 				}
-			});
-		},
-		// 机构
-		Toshow() {
-			console.log('点击选择机构');
-			this.show = true;
+			};
 		},
-		onChange(val) {
-			let obj = this;
-			console.log(val, 'onChange');
-			// let arr = val.split(',');
-			// console.log(999,arr)
-			// obj.hospital = arr[1];
-			// obj.hospital_id = arr[0];
-			// obj.city = arr[2];
-			// obj.city_id = arr[3];
-			// obj.district = arr[4];
-			// obj.district_id = arr[5];
-			// obj.province = arr[6];
-			// obj.province_id = arr[7];
-			// obj.addr = obj.province + obj.city + obj.district;
-			// console.log(obj.hospital,obj.hospital_id)
-			// console.log(obj.city,obj.city_id)
-			// console.log(obj.district,obj.district_id)
-			// console.log(obj.province,obj.province_id)
-		},
-		onSearchInput(val) {
-			this.searchVal = val.value;
-		},
-		// 选择机构
-		ListDate() {
-			let obj = this;
-			let data = '';
-			console.log('obj.searchVal', obj.searchVal);
-			if (!obj.searchVal) {
-				console.log('!obj.searchVal');
-				data = {
-					keyword: '',
-					// sort:'id desc',
-					page: 1,
-					limit: 1500
-				};
+
+		onShow() {
+			saveUrl();
+			if (!this.hasLogin) {
+				// 登录拦截
+				// interceptor();
+				uni.showModal({
+					title: '登录',
+					content: '您未登录,是否马上登陆?',
+					success: e => {
+						if (e.confirm) {
+							interceptor();
+						}
+					},
+					fail: e => {
+						console.log(e);
+					}
+				});
 			} else {
-				console.log('else');
-				console.log('当前input值', obj.searchVal);
-				data = {
-					keyword: obj.searchVal,
-					// sort:'id desc',
-					page: 1,
-					limit: 1500
-				};
+				// this.loadData();
 			}
-			mechanism(data).then(data => {
-				console.log('请求成功', data);
-				this.list = data.data.map(item => item);
-				// this.show = true
-			});
-			// getHospitalList(data).then(e => {
-			// 	obj.list = e.data.list;
-			// }).catch((e) => {
-			// 	console.log(e)
-			// });
-		},
-		onConfirm1(e) {
-			console.log('点击确认');
-			// let arr = e
-			this.mechanism = e.split(',')[1];
-			this.list = [];
+			this.loadData();
 		},
-		imgsub() {
-			console.log('imgsub');
-			upload({
-				filename: ''
-			}).then(data => {
-				this.certificates = data[0].url;
-			});
-		},
-		join() {
-			let obj = this;
-			if (obj.name == '') {
-				obj.$api.msg('请输入您的姓名');
-				return;
+		watch: {
+			searchVal() {
+				this.ListDate();
 			}
+		},
+		methods: {
+			tosearch() {
+				console.log(123);
+				uni.navigateTo({
+					url: '/pages/category/search'
+				});
+			},
+			async loadData() {
+				let obj = this;
+				getNumber({}).then(({
+					data
+				}) => {
+					// console.log(12)
+					// console.log(data)
+					obj.count = data.count;
+					obj.peoplelist = data.data;
+				});
+			},
+			// 选择当前位置
+			getLocation() {
+				console.log('选择当前位置');
+				let obj = this;
+				uni.chooseLocation({
+					success: function(res) {
+						obj.addressData.area = res.name;
+						console.log('位置名称:' + res.name);
+						console.log('详细地址:' + res.address);
+						console.log('纬度:' + res.latitude);
+						console.log('经度:' + res.longitude);
+						obj.addressData.latitude = res.latitude;
+						obj.addressData.longitude = res.longitude;
+						// let	dizhi = obj.addressData.latitude + ','+ obj.addressData.longitude;
+						obj.showaddress = res.address;
+					}
+				});
+			},
+			// 机构
+			Toshow() {
+				console.log('点击选择机构');
+				this.show = true;
+			},
+			onChange(val) {
+				let obj = this;
+				console.log(val, 'onChange');
+				// let arr = val.split(',');
+				// console.log(999,arr)
+				// obj.hospital = arr[1];
+				// obj.hospital_id = arr[0];
+				// obj.city = arr[2];
+				// obj.city_id = arr[3];
+				// obj.district = arr[4];
+				// obj.district_id = arr[5];
+				// obj.province = arr[6];
+				// obj.province_id = arr[7];
+				// obj.addr = obj.province + obj.city + obj.district;
+				// console.log(obj.hospital,obj.hospital_id)
+				// console.log(obj.city,obj.city_id)
+				// console.log(obj.district,obj.district_id)
+				// console.log(obj.province,obj.province_id)
+			},
+			onSearchInput(val) {
+				this.searchVal = val.value;
+			},
+			// 选择机构
+			ListDate() {
+				let obj = this;
+				let data = '';
+				console.log('obj.searchVal', obj.searchVal);
+				if (!obj.searchVal) {
+					console.log('!obj.searchVal');
+					data = {
+						keyword: '',
+						// sort:'id desc',
+						page: 1,
+						limit: 1500
+					};
+				} else {
+					console.log('else');
+					console.log('当前input值', obj.searchVal);
+					data = {
+						keyword: obj.searchVal,
+						// sort:'id desc',
+						page: 1,
+						limit: 1500
+					};
+				}
+				mechanism(data).then(data => {
+					console.log('请求成功', data);
+					this.list = data.data.map(item => item);
+					// this.show = true
+				});
+				// getHospitalList(data).then(e => {
+				// 	obj.list = e.data.list;
+				// }).catch((e) => {
+				// 	console.log(e)
+				// });
+			},
+			onConfirm1(e) {
+				console.log('点击确认');
+				// let arr = e
+				this.mechanism = e.split(',')[1];
+				this.searchVal = e.split(',')[1];
+				this.list = [];
+			},
+			imgsub() {
+				console.log('imgsub');
+				upload({
+					filename: ''
+				}).then(data => {
+					this.certificates = data[0].url;
+				});
+			},
+			join() {
+				let obj = this;
+				if (obj.name == '') {
+					obj.$api.msg('请输入您的姓名');
+					return;
+				}
 
-			const reg = /^(\+?0?86-?)?1[\d]\d{9}$/;
-			if (!reg.test(obj.phone)) {
-				obj.$api.msg('请填写正确的手机号码');
-				return;
-			}
-			if (obj.showaddress == '') {
-				obj.$api.msg('请选择您的所在地区');
-				return;
-			}
+				const reg = /^(\+?0?86-?)?1[\d]\d{9}$/;
+				if (!reg.test(obj.phone)) {
+					obj.$api.msg('请填写正确的手机号码');
+					return;
+				}
+				if (obj.showaddress == '') {
+					obj.$api.msg('请选择您的所在地区');
+					return;
+				}
 
-			if (obj.mechanism == '') {
-				obj.$api.msg('请输入机构关键字');
-				return;
-			}
+				// if (obj.mechanism == '' || obj.searchVal == '') {
+				// 	obj.$api.msg('请输入机构关键字');
+				// 	return;
+				// }
 
-			if (obj.certificates == '') {
-				obj.$api.msg('请上传救护员证书或身份证');
-				return;
-			}
-			obj.loding = true;
-			addrescuer({
-				name: obj.name,
-				phone: obj.phone,
-				address: obj.showaddress,
-				latitude: obj.addressData.latitude,
-				longitude: obj.addressData.longitude,
-				mechanism: obj.mechanism,
-				certificates: obj.certificates
-			})
-				.then(data => {
-					obj.loding = false;
-
-					if (data.status == 200) {
-						(obj.name = ''),
+				if (obj.certificates == '') {
+					obj.$api.msg('请上传救护员证书或身份证');
+					return;
+				}
+				obj.loding = true;
+				addrescuer({
+						name: obj.name,
+						phone: obj.phone,
+						address: obj.showaddress,
+						latitude: obj.addressData.latitude,
+						longitude: obj.addressData.longitude,
+						mechanism: obj.mechanism || obj.searchVal,
+						certificates: obj.certificates
+					})
+					.then(data => {
+						obj.loding = false;
+
+						if (data.status == 200) {
+							(obj.name = ''),
 							(obj.phone = ''),
 							(obj.showaddress = ''),
 							(obj.certificates = ''),
@@ -302,290 +304,295 @@ export default {
 									console.log('success');
 								}
 							});
-						uni.navigateTo({
-							url: '../joinSuc/joinNow'
-						});
-					} else if (data.status == 400) {
-						obj.$api.msg(data.msg);
-					}
-				})
-				.catch(err => {
-					console.log(err);
-				});
+							uni.navigateTo({
+								url: '../joinSuc/joinNow'
+							});
+						} else if (data.status == 400) {
+							obj.$api.msg(data.msg);
+						}
+					})
+					.catch(err => {
+						console.log(err);
+					});
+			}
 		}
-	}
-};
+	};
 </script>
 
 <style lang="scss">
-	page {
-		// background-color: #FD3B34;
-		background-image: url();
-	}
-.content {
-	line-height: 1;
-	// background-color: #FD3B34;
-	.top {
-		width: 750rpx;
-		
-		.bgi {
-			display: block;
-			
-			width: 564rpx;
-			height: 678rpx;
-			margin: 53rpx auto;
-			// position: relative;
-			// top: -20rpx;
+	.content {
+		line-height: 1;
+		// background-color: #cb281c;
+		// padding-bottom: 20rpx;
+
+
+
+		.top {
+			width: 750rpx;
+
+			.bgi {
+				width: 750rpx;
+				position: relative;
+				top: -20rpx;
+			}
 		}
-	}
-	.top-xtitle {
-		font-size: 65rpx;
-		font-family: Microsoft YaHei;
-		font-weight: bold;
-		color: #FFFFFF;
-		line-height: 110rpx;
-		text-shadow: 0px 5px 8px rgba(96, 1, 0, 0.61);
-		text-align: center;
-	}
-	.top-title {
-		font-size: 85rpx;
-		font-family: PingFang SC;
-		font-weight: bold;
-		color: #FD424B;
-		font-family: Microsoft YaHei;
-		font-weight: bold;
-		color: #FFFFFF;
-		line-height: 110rpx;
-		text-shadow: 0px 5px 8px rgba(96, 1, 0, 0.61);
-		text-align: center;
-		padding-bottom: 69rpx;
-	}
 
-	.pop-box {
-		padding-top: 31rpx;
-		margin: 0 auto;
-		position: relative;
-		z-index: 99;
-		width: 156rpx;
-		height: 36rpx;
-		font-size: 38rpx;
-		font-family: PingFang SC;
-		font-weight: bold;
-		color: #FA7E67;
-		&::after {
-			content: '';
-			width: 220rpx;
-			height: 17rpx;
-			background: #FDCBC2;
-			opacity: 0.26;
-			position: absolute;
-			bottom: -35rpx;
-			left: -40rpx;
+		.top-xtitle {
+			font-size: 65rpx;
+			font-family: Microsoft YaHei;
+			font-weight: bold;
+			color: #FFFFFF;
+			line-height: 110rpx;
+			text-shadow: 0px 5px 8px rgba(96, 1, 0, 0.61);
+			text-align: center;
 		}
-	}
 
-	.red-box {
-		padding-top: 31rpx;
-		margin: 0 auto ;
-		position: relative;
-		z-index: 99;
-		width: 156rpx;
-		height: 36rpx;
-		font-size: 38rpx;
-		font-family: PingFang SC;
-		font-weight: bold;
-		color: #FA7E67;
-		&::after {
-			content: '';
-			width: 220rpx;
-			height: 17rpx;
-			background: #FDCBC2;
-			opacity: 0.26;
-			position: absolute;
-			bottom: -35rpx;
-			left: -40rpx;
+		.top-title {
+			font-size: 85rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #FD424B;
+			font-family: Microsoft YaHei;
+			font-weight: bold;
+			color: #FFFFFF;
+			line-height: 110rpx;
+			text-shadow: 0px 5px 8px rgba(96, 1, 0, 0.61);
+			text-align: center;
+			padding-bottom: 69rpx;
 		}
-	}
 
-	.red-box2 {
-		position: relative;
-		width: 405rpx;
-		line-height: 66rpx;
-		text-align: center;
-		background: linear-gradient(0deg, #c90f1b, #f14d33);
-		border-radius: 10rpx;
-		font-size: 30rpx;
-		font-weight: 500;
-		color: #ffffff;
-		margin: -80rpx auto 0;
-		position: relative;
-		z-index: 1;
-	}
+		.pop-box {
+			padding-top: 31rpx;
+			margin: 0 auto;
+			position: relative;
+			z-index: 99;
+			width: 156rpx;
+			height: 36rpx;
+			font-size: 38rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #F0433C;
+
+			&::after {
+				content: '';
+				width: 220rpx;
+				height: 17rpx;
+				background: #FDCBC2;
+				opacity: 0.26;
+				position: absolute;
+				bottom: -35rpx;
+				left: -40rpx;
+			}
+		}
+
+		.red-box {
+			padding-top: 31rpx;
+			margin: 0 auto;
+			position: relative;
+			z-index: 99;
+			width: 156rpx;
+			height: 36rpx;
+			font-size: 38rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #F0433C;
+
+			&::after {
+				content: '';
+				width: 220rpx;
+				height: 17rpx;
+				background: #FDCBC2;
+				opacity: 0.26;
+				position: absolute;
+				bottom: -35rpx;
+				left: -40rpx;
+			}
+		}
 
-	.pop-list {
-		width: 686rpx;
-		background: #ffffff;
-		border-radius: 29rpx;
-		position: relative;
-		margin: -33rpx auto 78rpx;
-		padding: 150rpx 0rpx 30rpx 30rpx;
-		display: flex;
-		flex-wrap: wrap;
-		box-shadow: 0px 10rpx 20rpx 0px rgba(254, 0, 8, 0.28);
-		.list-box1 {
+		.red-box2 {
+			position: relative;
+			width: 405rpx;
+			line-height: 66rpx;
 			text-align: center;
-			margin-right: 30rpx;
-			margin-bottom: 30rpx;
+			background: linear-gradient(0deg, #c90f1b, #f14d33);
+			border-radius: 10rpx;
+			font-size: 30rpx;
+			font-weight: 500;
+			color: #ffffff;
+			margin: -80rpx auto 0;
+			position: relative;
+			z-index: 1;
+		}
 
-			.list-top {
-				width: 100rpx;
-				height: 100rpx;
+		.pop-list {
+			width: 686rpx;
+			background: #ffffff;
+			border-radius: 29rpx;
+			position: relative;
+			margin: -33rpx auto 78rpx;
+			padding: 150rpx 0rpx 30rpx 30rpx;
+			display: flex;
+			flex-wrap: wrap;
+			box-shadow: 0px 10rpx 20rpx 0px rgba(255, 110, 110, 0.3);
+
+			.list-box1 {
+				text-align: center;
+				margin-right: 30rpx;
+				margin-bottom: 30rpx;
 
-				.avatar-img {
+				.list-top {
 					width: 100rpx;
 					height: 100rpx;
-					border-radius: 50%;
+
+					.avatar-img {
+						width: 100rpx;
+						height: 100rpx;
+						border-radius: 50%;
+					}
+				}
+
+				.nickname {
+					margin-top: 12rpx;
 				}
-			}
-			.nickname {
-				margin-top: 12rpx;
 			}
 		}
-	}
 
-	.list-box {
-		width: 686rpx;
-		background: #ffffff;
-		border-radius: 29rpx;
-		position: relative;
-		margin: -33rpx auto 0;
-		padding: 100rpx 30rpx 0rpx 30rpx;
-		display: flex;
-		flex-wrap: wrap;
-		box-shadow: 0px 10rpx 20rpx 0px rgba(254, 0, 8, 0.28);
-		.upload-box {
-			width: 100%;
-			height: 290rpx;
+		.list-box {
+			width: 686rpx;
 			background: #ffffff;
-			// border: 1px solid #E63931;
-			border-radius: 15rpx;
+			border-radius: 29rpx;
+			position: relative;
+			margin: -33rpx auto 0;
+			padding: 100rpx 30rpx 0rpx 30rpx;
 			display: flex;
-			flex-direction: column;
-			padding-top: 24rpx;
-			margin: 0 auto 50rpx;
-
-			.upload-left {
-				font-weight: 400;
-				color: #000;
-				text {
-					color: #FD424B;
-					font-size: 30rpx;
-				}
-			}
+			flex-wrap: wrap;
+			box-shadow: 0px 10rpx 20rpx 0px rgba(255, 110, 110, 0.3);
 
-			.upload-right {
-				margin-top: 16rpx;
+			.upload-box {
 				width: 100%;
-				height: 100%;
-				border: 1px solid #888888;
+				height: 290rpx;
+				background: #ffffff;
+				// border: 1px solid #E63931;
 				border-radius: 15rpx;
-				flex: 1;
 				display: flex;
-				align-items: center;
-				justify-content: center;
-
-				.upload-img {
-					width: 102rpx;
-					height: 102rpx;
-					// border: 1px solid #888888;
-					// border-radius: 3rpx;
-					// width: 133rpx;
-					// height: 133rpx;
-					// margin-top: 44rpx;
-				}
-			}
-		}
+				flex-direction: column;
+				padding-top: 24rpx;
+				margin: 0 auto 50rpx;
 
-		.list {
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-			width: 100%;
-			margin-top: 32rpx;
-			// height: 133rpx;
+				.upload-left {
+					font-weight: 400;
+					color: #000;
 
-			.list-left {
-				width: 100%;
-				text-align: left;
-				color: #000;
-				text {
-					color: #FD424B;
-					font-size: 30rpx;
+					text {
+						color: red;
+					}
 				}
-			}
 
-			input {
-				height: 66rpx;
-				// line-height: 66rpx;
-				margin-top: 32rpx;
-				// height: 88rpx;
-			}
+				.upload-right {
+					margin-top: 16rpx;
+					width: 100%;
+					height: 100%;
+					border: 1px solid #888888;
+					border-radius: 15rpx;
+					flex: 1;
+					display: flex;
+					align-items: center;
+					justify-content: center;
 
-			.list-input {
-				padding-left: 24rpx;
-				// margin: 12rpx 0 ;
+					.upload-img {
+						width: 102rpx;
+						height: 102rpx;
+						// border: 1px solid #888888;
+						// border-radius: 3rpx;
+						// width: 133rpx;
+						// height: 133rpx;
+						// margin-top: 44rpx;
+					}
+				}
+			}
 
-				line-height: 66rpx;
+			.list {
 				display: flex;
+				flex-direction: column;
 				align-items: center;
 				width: 100%;
-				font-size: 26rpx;
-				flex: 1;
-				color: #000;
-				border: 1rpx solid #929292;
-				border-radius: 15rpx;
-				text-align: left;
+				margin-top: 32rpx;
+				// height: 133rpx;
+
+				.list-left {
+					width: 100%;
+					text-align: left;
+					color: #000;
+
+					text {
+						color: red;
+					}
+				}
+
+				input {
+					height: 66rpx;
+					// line-height: 66rpx;
+					margin-top: 32rpx;
+					// height: 88rpx;
+				}
 
-				.input-placeholder {
-					height: 70rpx;
-					color: #929292;
+				.list-input {
+					padding-left: 24rpx;
+					// margin: 12rpx 0 ;
+
+					line-height: 66rpx;
+					display: flex;
+					align-items: center;
+					width: 100%;
 					font-size: 26rpx;
+					flex: 1;
+					color: #000;
+					border: 1rpx solid #929292;
+					border-radius: 15rpx;
+					text-align: left;
+
+					.input-placeholder {
+						height: 70rpx;
+						color: #929292;
+						font-size: 26rpx;
+					}
 				}
-			}
 
-			.box-right {
-				display: flex;
-				align-items: center;
-				padding-left: 24rpx;
-				height: 66rpx;
-				line-height: 66rpx;
-				border: 1rpx solid #f3afad;
-				border-radius: 22rpx;
-				margin: 32rpx 36rpx 0 36rpx;
-
-				width: 96%;
-				font-size: 36rpx;
-				color: #ff9797;
-				text-align: left;
-				line-height: 1;
+				.box-right {
+					display: flex;
+					align-items: center;
+					padding-left: 24rpx;
+					height: 66rpx;
+					line-height: 66rpx;
+					border: 1rpx solid #f3afad;
+					border-radius: 22rpx;
+					margin: 32rpx 36rpx 0 36rpx;
+
+					width: 96%;
+					font-size: 36rpx;
+					color: #ff9797;
+					text-align: left;
+					line-height: 1;
+				}
 			}
 		}
-	}
-	.sub {
-		width: 690rpx;
-		height: 83rpx;
-		background: #FF5056;
-		border-radius: 42rpx;
-		font-size: 32rpx;
-		font-family: PingFang SC;
-		font-weight: 500;
-		color: #FFFFFF;
-		line-height: 83rpx;
-		text-align: center;
-		margin: 53rpx auto 60rpx;
-		&.action {
-			background: #999999;
+
+		.sub {
+			width: 690rpx;
+			height: 83rpx;
+			line-height: 83rpx;
+			background: #F0433C;
+			border-radius: 42rpx;
+			margin: 67rpx auto 30rpx;
+			font-size: 32rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #FFFFFF;
+			text-align: center;
+
+			&.action {
+				background: #999999;
+			}
 		}
 	}
-}
 </style>

+ 4 - 3
pages/donate/donate.vue

@@ -1,10 +1,10 @@
 <template>
 	<view class="donate-wrapper">
 		<view class="top-select flex" style=" position: relative; z-index: 99;">
-			<view class="">选择地区</view>
-			<picker @change="bindAreaChange" :range="areas" range-key="name">
+			<view class="">选择项目状态</view>
+			<!-- <picker @change="bindAreaChange" :range="areas" range-key="name">
 				<view class="area select" :class="{ action: area }">{{ area || '点击选择地区' }}</view>
-			</picker>
+			</picker> -->
 			<picker @change="bindStatusChange" :range="statuss" range-key="name">
 				<view class="status select" :class="{ action: status }">{{ status }}</view>
 			</picker>
@@ -265,6 +265,7 @@
 		}
 
 		.status {
+			margin: 0 10rpx 0 24rpx;
 			width: 204rpx;
 			height: 63rpx;
 		}

+ 5 - 5
pages/donate/donateDetail.vue

@@ -59,12 +59,12 @@
 						<view class="">
 							{{ item.project_donation_id | type(typeList) }}:
 							<text>{{ item.project_donation_num }}</text>
-							
+							
 						</view>
 						<view class="">
 							最低需求捐赠数:
 							<text>{{ item.project_donation_num }}</text>
-							
+							
 						</view>
 						<!-- <view class="">
 							物资捐赠要求:
@@ -154,7 +154,7 @@
 		<view class="jg" style="height: 99rpx;"></view>
 		<view class="btn-wrapper flex">
 			<view class="btn1 btn" @click="navTo('/pages/donate/progress?id=' + proInfo.id)">实时进展</view>
-			<view class="btn2 btn" @click="proInfo.status === 1 ? want() : cant()">我要捐</view>
+			<view class="btn2 btn" @click="proInfo.status === 1 ? want() : cant()">我要捐</view>
 		</view>
 		<uni-popup ref="popup" type="center">
 			<view class="type-box">
@@ -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 + '';
 						}
 					}
 				});

+ 10 - 5
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>
@@ -178,7 +178,7 @@
 	export default {
 		data() {
 			return {
-				project_area: 0,
+				project_area: 222,
 				areas: [{
 					id: 0,
 					name: '市本级'
@@ -225,6 +225,7 @@
 				true_wzList: [],//最终捐赠的物资列表
 				hadadd: [],//已添加分类
 				project_id: 0,//项目ID
+				jxdz_show: false,
 			}
 		},
 		filters:{
@@ -252,6 +253,7 @@
 			}else {
 				this.getDonationInfo()
 				this.getAllArea()
+				this.jxdz_show = true
 			}
 			
 			this.getLogistics()
@@ -375,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){

+ 1 - 1
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 +' '+' '
 					}
 				}
 			})

+ 1 - 1
pages/donate/progresst.vue

@@ -134,7 +134,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  + '、';
 						}
 					}
 				});

+ 12 - 12
pages/form/applicationForm.vue

@@ -50,10 +50,10 @@
 				<view class="box-left">移动电话:</view>
 				<input type="text" class="list-input" v-model="phone" placeholder="请输入移动电话"/>
 			</view>
-			<view class="box-1">
+			<!-- <view class="box-1">
 				<view class="box-left">固定电话:</view>
 				<input type="text" class="list-input" v-model="tel" placeholder="请输入固定电话"/>
-			</view>
+			</view> -->
 			<view class="box-1">
 				<view class="box-left">居住地址:</view>
 				<input type="text" class="list-input" v-model="address" placeholder="请输入居住地址"/>
@@ -87,10 +87,10 @@
 				<view class="box-left max-line">捐献执行人移动电话:</view>
 				<input type="text" class="list-input" v-model="n_phone" placeholder="请输入执行人移动电话"/>
 			</view>
-			<view class="box-1">
+			<!-- <view class="box-1">
 				<view class="box-left max-line">捐献执行人固定电话:</view>
 				<input type="text" class="list-input" v-model="n_tel" placeholder="请输入执行人固定电话"/>
-			</view>
+			</view> -->
 
 			<view class="box-1" style="border-bottom: none;"><view>我保证填写的以上信息准确真实,如发生变更或个人意愿发生变化时,及时告知登记机构。</view></view>
 		</view>
@@ -174,10 +174,10 @@ export default {
 				obj.$api.msg('请填写正确的身份证信息');
 				return;
 			}
-			if (obj.tel == ''){
-				obj.$api.msg('请填写您的固定电话');
-				return;
-			}
+			// if (obj.tel == ''){
+			// 	obj.$api.msg('请填写您的固定电话');
+			// 	return;
+			// }
 			if (obj.occupation == '') {
 				obj.$api.msg('请填写您的职业');
 				return;
@@ -220,10 +220,10 @@ export default {
 				obj.$api.msg('请填写执行人的手机号');
 				return;
 			}
-			if (obj.n_tel == ''){
-				obj.$api.msg('请填写执行人的固定电话');
-				return;
-			}
+			// if (obj.n_tel == ''){
+			// 	obj.$api.msg('请填写执行人的固定电话');
+			// 	return;
+			// }
 			obj.loding = true;
 			joinSecc({
 				name: obj.name,

+ 2 - 2
pages/form/certificates.vue

@@ -135,8 +135,8 @@ export default {
 				}
 			)
 			.exec();
-		let ctxBg = '/index/static/img/graduation.png'; //画布背景
-		let src = '/index/static/icon/erweima.jpg' // 二维码
+		let ctxBg = '/static/img/graduation.png'; //画布背景
+		let src = '/static/icon/erweima.jpg' // 二维码
 		let context = uni.createCanvasContext('qrShareBox');
 		// 插入背景图片
 		context.drawImage(ctxBg, 0, 0, obj.canWeidth, obj.canHeight);

+ 2 - 2
pages/form/donaSuccess.vue

@@ -77,8 +77,8 @@ export default {
 				}
 			)
 			.exec();
-		let ctxBg = '/index/static/img/thanks1.png'; //画布背景
-		let src = '/index/static/icon/erweima.jpg'; // 二维码
+		let ctxBg = '/static/img/thanks1.png'; //画布背景
+		let src = '/static/icon/erweima.jpg'; // 二维码
 
 		let context = uni.createCanvasContext('qrShareBox');
 		// 插入背景图片

+ 6 - 6
pages/share/card.vue

@@ -10,21 +10,21 @@
 		<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>沙市区红门路48号</text></view>
+				<view class="text"><text>湖北省荆州市沙市区碧波路13号</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">********</text></view>
+				<view class="text"><text class="text1">0716-8817963</text></view>
 				<!-- #endif -->
 				<!-- #ifndef H5 -->
-				<view class="text" @click="uni.makePhoneCall({phoneNumber: '*********'})"><text>******</text></view>
+				<view class="text" @click="uni.makePhoneCall({phoneNumber: '0716-8817963'})"><text>0716-8817963</text></view>
 				<!-- #endif -->
 			</view>
-<!-- 			<view class="item flex">
+			<view class="item flex">
 				<image class="home_img" src="../../static/img/test_mail.png" mode="aspectFill"></image>
-				<view class="text"><text>jz_hszh@sina.com</text></view>
-			</view> -->
+				<view class="text"><text>550023532@qq.com</text></view>
+			</view>
 			<view class="map">
 				<image class="map-box" src="../../static/img/baseaddr.jpg"></image>
 				<view class="map-font flex">

+ 2 - 2
pages/train/sign.vue

@@ -165,8 +165,8 @@ export default {
 			}).exec();
 			console.log('obj.canHeight',obj.canHeight)
 			console.log('obj.canWeidth',obj.canWeidth)
-		let ctxBg = '/index/static/img/graduation.png'; //画布背景
-		let src = '/index/static/icon/erweima.jpg' // 二维码
+		let ctxBg = '/static/img/graduation.png'; //画布背景
+		let src = '/static/icon/erweima.jpg' // 二维码
 		let context = uni.createCanvasContext('qrShareBox');
 		// 插入背景图片
 		context.drawImage(ctxBg, 0, 0, obj.canWeidth, obj.canHeight);

+ 2 - 2
pages/user/intent.vue

@@ -70,8 +70,8 @@ export default {
 				}
 			)
 			.exec();
-		let ctxBg = '/index/static/img/yxs.png'; //画布背景
-		let src = '/index/static/icon/erweima.jpg'; // 二维码
+		let ctxBg = '/static/img/yxs.png'; //画布背景
+		let src = '/static/icon/erweima.jpg'; // 二维码
 
 		let context = uni.createCanvasContext('qrShareBox');
 		// 插入背景图片

+ 2 - 2
pages/user/thank.vue

@@ -83,8 +83,8 @@ export default {
 				}
 			)
 			.exec();
-		let ctxBg = '/index/static/img/zszs.png'; //画布背景
-		let src = '/index/static/icon/erweima.jpg'; // 二维码
+		let ctxBg = '/static/img/zszs.png'; //画布背景
+		let src = '/static/icon/erweima.jpg'; // 二维码
 
 		let context = uni.createCanvasContext('qrShareBox');
 		// 插入背景图片

BIN
static/icon/erweima.jpg


+ 1 - 0
store/index.js

@@ -22,6 +22,7 @@ const store = new Vuex.Store({
 		weichatBrowser: '' ,//当前是否为微信内置浏览器
 		// #endif
 		// shareData:'',//分享信息
+		 project_area: 222
 	},
 	mutations: {
 	

+ 1 - 1
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=/ssq/static/index.f4fc78fe.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/ssq/static/js/chunk-vendors.27541ad6.js></script><script src=/ssq/static/js/index.26b7d312.js></script></body></html>
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/ssq/static/index.f4fc78fe.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/ssq/static/js/chunk-vendors.27541ad6.js></script><script src=/ssq/static/js/index.a958625e.js></script></body></html>

BIN
unpackage/dist/build/h5/ssq-10-16-3.rar


BIN
unpackage/dist/build/h5/static/icon/erweima.jpg


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/h5/static/js/index.a958625e.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-contribution.14099dc6.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-contribution.6da45b78.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-other.3e3f94d9.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-other.71a7eb67.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-perSign.69fe7881.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-perSign.b6970c31.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-teamSign.2d6f08f5.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-teamSign.c4b29abb.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-tohelpActi.04462535.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-tohelpActi.6bc416dd.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-toknowledge.273c3760.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-toknowledge.675b85a8.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-category-category.2f9c316b.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-category-category.4cdbdf74.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-donate-donate.65cca251.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-donate-donate.c672c081.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-donate-donateDetail.1e4b0818.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-donate-donateDetail.af8c1a8e.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-donate-idonate.23d9f054.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-donate-idonate.b25bc1e5.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-donate-progress.3c821be6.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-donate-progress.d35dd182.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-donate-progresst.dc8226d2.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-donate-progresst.f76397c0.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-form-applicationForm.1e66e675.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-form-applicationForm.9e9e2a01.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-form-certificates.da7c6bdb.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-form-certificates.dfc737fe.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-form-donaSuccess.820b3ebf.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-form-donaSuccess.a4c689fa.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-train-sign.3f3c091d.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-train-sign.8a1a7926.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-user-intent.34d80431.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-user-intent.7b022bc8.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-user-thank.8e09719b.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-user-thank.d147249f.js


+ 10 - 1
utils/newRequest.js

@@ -1,4 +1,6 @@
 import store from '../store'
+import md5 from './md5.js'
+import sha1 from './sha1.js'
 let service = {
 	// baseURL: store.state.baseURL, // 请求头
 	baseURL: '', // 请求头
@@ -119,12 +121,19 @@ let service = {
 						uni.showLoading({
 							title: '上传中'
 						})
+						let timestamp = new Date().getTime();
+						let appSecret = 'ce617b08843cd432a2afc4f264c219fa';
+						let Appid = 'wxf0998a621d36c1ee';
+						let Sign = md5(sha1(Appid + timestamp + appSecret + timestamp + Appid + appSecret))
 						uni.uploadFile({
 							url: config.upload_img_url, //仅为示例,非真实的接口地址
 							filePath: path,
 							name: 'file',
 							header: {
-								"Authori-zation": 'Bearer ' + uni.getStorageSync('token')
+								"Authori-zation": 'Bearer ' + uni.getStorageSync('token'),
+								"App-id": Appid,
+								"Sign": Sign,
+								"Sign-time": timestamp
 							},
 							success: (uploadFileRes) => {
 								if ("string" === typeof uploadFileRes.data) {

Неке датотеке нису приказане због велике количине промена