4 年前 · 4e722f6518
--- a/App.vue
+++ b/App.vue
@@ -21,17 +21,17 @@
 
				 		},

			
 
				 		methods: {

			
 
				 			...mapMutations('user', ['setUserInfo', 'login', 'hasLogin']),

			
 
				-			IndexShare() {

			
 
				-				let obj = this;

			
 
				-				let item = {

			
 
				-					link:  'http://ez.igxys.com/index/#/pages/index/index',// 分享链接

			
 
				-					imgUrl: 'http://ez.igxys.com/index/static/img/002.png',

			
 
				-					desc: '',

			
 
				-					title: '鄂州市红十字会',

			
 
				-				};

			
 
				-				console.log('分享加',item)

			
 
				-				weixindata(item);

			
 
				-			},

			
 
				+			// IndexShare() {

			
 
				+			// 	let obj = this;

			
 
				+			// 	let item = {

			
 
				+			// 		link:  'http://ez.igxys.com/index/#/pages/index/index',// 分享链接

			
 
				+			// 		imgUrl: 'http://ez.igxys.com/index/static/img/002.png',

			
 
				+			// 		desc: '',

			
 
				+			// 		title: '鄂州市红十字会',

			
 
				+			// 	};

			
 
				+			// 	console.log('分享加',item)

			
 
				+			// 	weixindata(item);

			
 
				+			// },

			
 
				 		},

			
 
				 		onLaunch: function(urlObj) {

			
 
				 			let obj = this;

			
@@ -78,7 +78,7 @@
 
				 			

			
 
				 		},

			
 
				 		onShow: function() {

			
 
				-			this.IndexShare()

			
 
				+			// this.IndexShare()

			
 
				 			// 加载拦截

			
 
				 			// console.log('App Show');

			
 
				 			// console.log(this.$u.config.v);

			
--- a/pages/applic/location.vue
+++ b/pages/applic/location.vue
@@ -18,10 +18,10 @@
 
				 							<image src="../../static/img/line01.png" mode=""></image>
			
 
				 						</view>
			
 
				 						<view class="img02" v-if="item.info !=null">
			
 
				-							<image :src="item.info.avatar" mode=""></image>
			
 
				+							<image src="../../static/img/002.png" mode=""></image>
			
 
				 						</view>

			
 
				 						<view class="img02" v-else>

			
 
				-							<image src="../../static/img/missing-face.png" mode=""></image>

			
 
				+							<image src="../../static/img/002.png" mode=""></image>

			
 
				 						</view>
			
 
				 						<view class="info">
			
 
				 							<view class="info-header">
			
--- a/pages/category/category.vue
+++ b/pages/category/category.vue
@@ -10,7 +10,7 @@
 
				 		<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="item.avatar" 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>

			
--- a/pages/form/tovolApply.vue
+++ b/pages/form/tovolApply.vue
@@ -529,7 +529,7 @@ export default {
 
				 				work: obj.work, //工作单位

			
 
				 				specialty: obj.specialty, //职业/职务/专业

			
 
				 				zy:obj.zy,

			
 
				-				education: obj.education, //教育程度

			
 
				+				education: obj.education == '请选择教育程度' ? '' : obj.education , //教育程度

			
 
				 				is_vol: obj.checked,

			
 
				 				is_experience: obj.checked1,

			
 
				 				quantum: obj.quantum,

			
@@ -541,7 +541,7 @@ export default {
 
				 			})

			
 
				 				.then(e => {

			
 
				 					obj.sex = '请选择你的性别';

			
 
				-					obj.education = '请选择你的教育程度';

			
 
				+					obj.education = '请选择教育程度';

			
 
				 					obj.birth = '请选择你的生日';

			
 
				 					uni.navigateTo({

			
 
				 						url: '../joinSuc/joinNow'

			
--- a/pages/redirect/redirect.vue
+++ b/pages/redirect/redirect.vue
@@ -113,6 +113,7 @@
 
				 					// 保存返回用户数据

			
 
				 					obj.setUserInfo(e.data);

			
 
				 					let ur = uni.getStorageSync('present') || '/pages/index/index';

			
 
				+					console.log(ur,'ur+++++++++++++')

			
 
				 					// 用于处理缓存bug

			
 
				 					if (ur == 'pages/product/product') {

			
 
				 						ur = '/pages/index/index'

			
--- a/store/index.js
+++ b/store/index.js
@@ -5,10 +5,10 @@ Vue.use(Vuex)
 
				 const store = new Vuex.Store({

			
 
				 	state: {

			
 
				 		// #ifdef MP

			
 
				-		baseURL: 'http://ez.igxys.com', //请求地址配置

			
 
				+		baseURL: 'http://www.ezsredcross.org.cn', //请求地址配置

			
 
				 		// #endif

			
 
				 		// #ifndef MP

			
 
				-		baseURL: 'http://ez.igxys.com', //请求地址配置

			
 
				+		baseURL: 'http://www.ezsredcross.org.cn', //请求地址配置

			
 
				 		// #endif

			
 
				 		// baseURL: 'http://yrh.liuniu946.com', //请求地址配置

			
 
				 		urlFile: '/index', //项目部署所在文件夹

			
--- a/unpackage/dist/build/h5/ez-9-15-4.rar
+++ b/unpackage/dist/build/h5/ez-9-15-4.rar
--- a/unpackage/dist/build/h5/index.html
+++ b/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.f4fc78fe.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.d847b7ca.js></script><script src=/index/static/js/index.4a1b87e7.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.f4fc78fe.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.d847b7ca.js></script><script src=/index/static/js/index.761958c6.js></script></body></html>
			
--- a/unpackage/dist/build/h5/static/img/missing-face.01b4ac4f.png
+++ b/unpackage/dist/build/h5/static/img/missing-face.01b4ac4f.png
--- a/unpackage/dist/build/h5/static/js/index.4a1b87e7.js
+++ b/unpackage/dist/build/h5/static/js/index.4a1b87e7.js
--- a/unpackage/dist/build/h5/static/js/index.761958c6.js
+++ b/unpackage/dist/build/h5/static/js/index.761958c6.js
--- a/unpackage/dist/build/h5/static/js/pages-applic-location.013f4cee.js
+++ b/unpackage/dist/build/h5/static/js/pages-applic-location.013f4cee.js
--- a/unpackage/dist/build/h5/static/js/pages-applic-location.089e944d.js
+++ b/unpackage/dist/build/h5/static/js/pages-applic-location.089e944d.js
--- a/unpackage/dist/build/h5/static/js/pages-category-category.6e83c960.js
+++ b/unpackage/dist/build/h5/static/js/pages-category-category.6e83c960.js
--- a/unpackage/dist/build/h5/static/js/pages-category-category.db0fac15.js
+++ b/unpackage/dist/build/h5/static/js/pages-category-category.db0fac15.js
--- a/unpackage/dist/build/h5/static/js/pages-form-tovolApply.6390e613.js
+++ b/unpackage/dist/build/h5/static/js/pages-form-tovolApply.6390e613.js
--- a/unpackage/dist/build/h5/static/js/pages-form-tovolApply.b573d555.js
+++ b/unpackage/dist/build/h5/static/js/pages-form-tovolApply.b573d555.js
--- a/utils/loginUtils.js
+++ b/utils/loginUtils.js
@@ -78,7 +78,10 @@ export function saveUrl() {
 
				 	// 		})

			
 
				 	// 	}

			
 
				 	// })

			
 
				-	uni.setStorageSync('present', path);

			
 
				+	console.log(path,'pathpathpathpathpath')

			
 
				+		uni.setStorageSync('present', path);

			
 
				+

			
 
				+	

			
 
				 	// // 获取当前页面

			
 
				 	// let page = getActionPage();

			
 
				 	// // 获取跳转前路由地址