6-20-1

pages/applic/aed.vue

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

pages/applic/aid.vue

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

pages/applic/toknowledge.vue

@@ -4,7 +4,7 @@
 		<view class="list-box">
 			<view class="list-item">
 				<view class="list-title flex_item">
-					<image src="../../static/icon/icon2.png"></image>
+					<image src="../../static/icon/zxkp1.png"></image>
 					<view class="name">捐献造血干细胞的意义</view>
 				</view>
 				<view class="list-tpl">
@@ -13,7 +13,7 @@
 			</view>
 			<view class="list-item">
 				<view class="list-title flex_item">
-					<image src="../../static/icon/icon2.png"></image>
+					<image src="../../static/icon/zxkp1.png"></image>
 					<view class="name">从外周血中采集造血干细胞</view>
 				</view>
 				<view class="list-tpl">
@@ -22,7 +22,7 @@
 			</view>
 			<view class="list-item">
 				<view class="list-title flex_item">
-					<image src="../../static/icon/icon2.png"></image>
+					<image src="../../static/icon/zxkp1.png"></image>
 					<view class="name">采集造血干细胞有没有危险？</view>
 				</view>
 				<view class="list-tpl">
@@ -31,7 +31,7 @@
 			</view>
 			<view class="list-item">
 				<view class="list-title flex_item">
-					<image src="../../static/icon/icon2.png"></image>
+					<image src="../../static/icon/zxkp1.png"></image>
 					<view class="name">捐献造血干细胞影响身体健康吗？</view>
 				</view>
 				<view class="list-tpl">
@@ -40,7 +40,7 @@
 			</view>
 			<view class="list-item">
 				<view class="list-title flex_item">
-					<image src="../../static/icon/icon2.png"></image>
+					<image src="../../static/icon/zxkp1.png"></image>
 					<view class="name">怎样成为造血干细胞志愿捐献者？？</view>
 				</view>
 				<view class="list-tpl">
@@ -49,7 +49,7 @@
 			</view>
 			<view class="list-item">
 				<view class="list-title flex_item">
-					<image src="../../static/icon/icon2.png"></image>
+					<image src="../../static/icon/zxkp1.png"></image>
 					<view class="name">报名前有哪些特别需要注意的事项？ </view>
 				</view>
 				<view class="list-tpl">
@@ -58,7 +58,7 @@
 			</view>
 			<view class="list-item">
 				<view class="list-title flex_item">
-					<image src="../../static/icon/icon2.png"></image>
+					<image src="../../static/icon/zxkp1.png"></image>
 					<view class="name">填写“造血干细胞志愿捐献者同意书”注意什么？ </view>
 				</view>
 				<view class="list-tpl">
@@ -67,7 +67,7 @@
 			</view>
 			<view class="list-item">
 				<view class="list-title flex_item">
-					<image src="../../static/icon/icon2.png"></image>
+					<image src="../../static/icon/zxkp1.png"></image>
 					<view class="name">健康者在多大年龄适合捐献造血干细胞？ </view>
 				</view>
 				<view class="list-tpl">
@@ -76,7 +76,7 @@
 			</view>
 			<view class="list-item">
 				<view class="list-title flex_item">
-					<image src="../../static/icon/icon2.png"></image>
+					<image src="../../static/icon/zxkp1.png"></image>
 					<view class="name">什么时候能够捐献？ </view>
 				</view>
 				<view class="list-tpl">
@@ -85,7 +85,7 @@
 			</view>
 			<view class="list-item">
 				<view class="list-title flex_item">
-					<image src="../../static/icon/icon2.png"></image>
+					<image src="../../static/icon/zxkp1.png"></image>
 					<view class="name">捐献者需要承担费用吗?有报酬吗？ </view>
 				</view>
 				<view class="list-tpl">
@@ -193,6 +193,7 @@ page {
 		color: #222222;
 		font-size: 28rpx;
 		border-radius: 25rpx;
+		text-align: justify;
 	}
 }
 .list-tips{

pages/index/index.vue

@@ -282,7 +282,7 @@
 			console.log(11, this);
 			if (!this.hasLogin) {
 				// 登录拦截
-				saveUrl();
+				// saveUrl();
 				interceptor();
 				// uni.showModal({
 				// 	title: '登录',
@@ -579,7 +579,7 @@
 					let arr = data.map(item => ({
 						latitude: item.latitude,
 						longitude: item.longitude,
-						iconPath: '/static/img/img014.png',
+						iconPath: '/static/icon/aed.png',
 						width: '35',
 						height: '35',
 						id: item.id,
@@ -602,7 +602,7 @@
 					let arr = data.map(item => ({
 						latitude: item.latitude,
 						longitude: item.longitude,
-						iconPath: '/static/img/img014.png',
+						iconPath: '/static/icon/jhz.png',
 						width: '35',
 						height: '35',
 						id: item.id,

pages/redirect/redirect.vue

@@ -113,7 +113,7 @@
 					// 保存返回用户数据
 					obj.setUserInfo(e.data);
 					let ur = uni.getStorageSync('present') || '/pages/index/index';
-					console.log(ur,'ur+++++++++++++')
+					console.log(ur,'ur+++++++++++++',uni.getStorageSync('present'))
 					// 用于处理缓存bug
 					if (ur == 'pages/product/product') {
 						ur = '/pages/index/index'

unpackage/dist/build/h5/index.html

@@ -1,2 +1,2 @@
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>鄂州市红十字会</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/index/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.930a3811.js></script><script src=/index/static/js/index.a416408f.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=/index/static/index.63b34199.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.0e2ba1a7.js></script><script src=/index/static/js/index.6a498a34.js></script></body></html>

unpackage/dist/build/h5/static/js/pages-form-demo.3b429226.js

@@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-form-demo"],{"2a7b":function(t,n,e){"use strict";var r;e.d(n,"b",(function(){return a})),e.d(n,"c",(function(){return i})),e.d(n,"a",(function(){return r}));var a=function(){var t=this,n=t.$createElement,e=t._self._c||n;return e("v-uni-view",[e("v-uni-canvas",{staticStyle:{width:"750px",height:"200px"},attrs:{"canvas-id":"firstCanvas",id:"firstCanvas"}})],1)},i=[]},"4b93":function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var r={onReady:function(t){var n=uni.createCanvasContext("firstCanvas");n.setStrokeStyle("#00ff00"),n.setLineWidth(5),n.rect(0,0,200,200),n.stroke(),n.draw()},methods:{canvasIdErrorCallback:function(t){console.error(t.detail.errMsg)}}};n.default=r},"52ee":function(t,n,e){"use strict";e.r(n);var r=e("4b93"),a=e.n(r);for(var i in r)"default"!==i&&function(t){e.d(n,t,(function(){return r[t]}))}(i);n["default"]=a.a},c177:function(t,n,e){"use strict";e.r(n);var r=e("2a7b"),a=e("52ee");for(var i in a)"default"!==i&&function(t){e.d(n,t,(function(){return a[t]}))}(i);var u,c=e("f0c5"),o=Object(c["a"])(a["default"],r["b"],r["c"],!1,null,null,null,!1,r["a"],u);n["default"]=o.exports}}]);

unpackage/dist/build/h5/static/js/pages-form-demo.bdb4d56b.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-form-demo"],{"4b93":function(t,n,e){"use strict";e("7a82"),Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var r={onReady:function(t){var n=uni.createCanvasContext("firstCanvas");n.setStrokeStyle("#00ff00"),n.setLineWidth(5),n.rect(0,0,200,200),n.stroke(),n.draw()},methods:{canvasIdErrorCallback:function(t){console.error(t.detail.errMsg)}}};n.default=r},"52ee":function(t,n,e){"use strict";e.r(n);var r=e("4b93"),a=e.n(r);for(var i in r)["default"].indexOf(i)<0&&function(t){e.d(n,t,(function(){return r[t]}))}(i);n["default"]=a.a},"947f":function(t,n,e){"use strict";e.d(n,"b",(function(){return r})),e.d(n,"c",(function(){return a})),e.d(n,"a",(function(){}));var r=function(){var t=this.$createElement,n=this._self._c||t;return n("v-uni-view",[n("v-uni-canvas",{staticStyle:{width:"750px",height:"200px"},attrs:{"canvas-id":"firstCanvas",id:"firstCanvas"}})],1)},a=[]},c177:function(t,n,e){"use strict";e.r(n);var r=e("947f"),a=e("52ee");for(var i in a)["default"].indexOf(i)<0&&function(t){e.d(n,t,(function(){return a[t]}))}(i);var u=e("f0c5"),c=Object(u["a"])(a["default"],r["b"],r["c"],!1,null,null,null,!1,r["a"],void 0);n["default"]=c.exports}}]);