end

manifest.json

@@ -1,6 +1,6 @@
 {
     "name" : "赤壁市红十字会",
-    "appid" : "__UNI__F405D65",
+    "appid" : "__UNI__3591D6C",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",

pages/applic/aed.vue

@@ -259,7 +259,7 @@
 					let arr = data.map(item => ({
 						latitude: item.latitude,
 						longitude: item.longitude,
-						iconPath: '/static/img/img014.png',
+						iconPath: '/static/img/aed.png',
 						width: '35',
 						height: '35',
 						id: item.id,

pages/applic/aid.vue

@@ -270,7 +270,7 @@
 					let arr = data.map(item => ({
 						latitude: item.latitude,
 						longitude: item.longitude,
-						iconPath: '/static/img/img014.png',
+						iconPath: '/static/img/jhz.png',
 						width: '35',
 						height: '35',
 						id: item.id,

pages/applic/contribution.vue

@@ -42,7 +42,8 @@
 						<text class="imp">*</text>捐款金额
 					</view>
 					<view class="box-right">
-						<input type="text" placeholder="请选择金额" v-model="money" disabled />
+						<text>{{ money || '请选择金额'}}</text>
+						<!-- <input type="text" placeholder="请选择金额" v-model="money" disabled /> -->
 						<!-- <picker @change="PickerMoney" :value="index" :range="chooseMoney" class="box-right">
 							<text>{{ money || '请选择捐款金额'}}</text>
 						</picker> -->
@@ -224,19 +225,19 @@
 					},
 					{
 						id: 1,
-						money: 200
+						money: 100
 					},
 					{
 						id: 2,
-						money: 100
+						money: 10
 					},
 					{
 						id: 3,
-						money: 50
+						money: 5
 					},
 					{
 						id: 4,
-						money: 20
+						money: 1
 					},
 				],
 				is_public: '0', // 是否实名公开
@@ -304,8 +305,18 @@
 				chosintention({}).then(({
 					data
 				}) => {
-					this.chooseDire = data.map(item => item.name)
-					this.chooseList = data
+					this.chooseDire = data.map(item => {
+						if(item.name.indexOf('疫情防控') == -1 ) {
+							return item.name
+						}
+					})
+					this.chooseList = data.map(item => {
+						if(item.name.indexOf('疫情防控') == -1 ) {
+							return item
+						}
+					})
+					// this.chooseDire = data.map(item => item.name)
+					// this.chooseList = data
 				}).catch()
 			},
 			// 选择捐赠意向

pages/index/index.vue

@@ -44,7 +44,9 @@
 				<image src="../../static/img/join-logo.png" mode=""></image>
 			</view>
 			<view class="item-wrap">
-				<view class="join-item flex" @click="navTo('/pages/form/tovolApply')">
+				<!-- <view class="join-item flex" @click="navTo('/pages/form/tovolApply')"> -->
+				<view class="join-item flex" @click="showEwm('zyzbm')">
+					<!-- #小程序://荆楚志愿红/HDZnYXqy2A1EKPq -->
 					<image src="../../static/icon/icon5.png" mode="" class="join-log"></image>
 					<view class="join-tit">
 						<view class="tit-top">
@@ -68,7 +70,7 @@
 					</view>
 					<image src="../../static/icon/jointo.png" mode="" class="join-to"></image>
 				</view>
-				<view class="join-item flex" @click="navTo('/pages/cart/cart')">
+				<view class="join-item flex" @click="showEwm('hybm')">
 					<image src="../../static/icon/icon7.png" mode="" class="join-log"></image>
 					<view class="join-tit">
 						<view class="tit-top">
@@ -114,6 +116,18 @@
 				</view>
 			</scroll-view>
 		</view>
+		<uni-popup ref="zyzbm" type="center" >
+			<view class="zyzbm">
+				<image src="../../static/img/zyzbm1.png" mode=""></image>
+				<image src="../../static/icon/close.png" mode="" class="close" @click="closePup('zyzbm')"></image>
+			</view>
+		</uni-popup>
+		<uni-popup ref="hybm" type="center" >
+			<view class="zyzbm">
+				<image src="../../static/img/hydj.png" mode=""></image>
+				<image src="../../static/icon/close.png" mode="" class="close" @click="closePup('hybm')"></image>
+			</view>
+		</uni-popup>
 	</view>
 </template>
 
@@ -365,6 +379,12 @@
 		methods: {
 			...mapMutations('user', ['setUserInfo']),
 			...mapMutations(['setUserInfo']),
+			showEwm(ref) {
+				this.$refs[ref].open()
+			},
+			closePup(ref) {
+				this.$refs[ref].close()
+			},
 			loadIndex() {
 				let obj = this;
 				loadIndexs({}).then(({
@@ -1206,5 +1226,22 @@
 			}
 		}
 	}
-
+	.zyzbm {
+		height: 900rpx;
+		width: 563rpx;
+		position: relative;
+		image {
+			width: 100%;
+			height: 100%;
+		}
+		.close {
+			width: 50rpx;
+			height: 50rpx;
+			position: absolute;
+			bottom: -60rpx;
+			left: 0;
+			right: 0;
+			margin: auto;
+		}
+	}
 </style>