4 anos atrás · fde421bf64
--- a/pages/applic/contribution.vue
+++ b/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),

			
 
				 						})

			
 
				 					}

			
--- a/pages/donate/donate.vue
+++ b/pages/donate/donate.vue
@@ -45,6 +45,14 @@
 
				 		getProjectInfo,

			
 
				 		getAllArea

			
 
				 	} from '../../api/money.js';

			
 
				+	import {

			
 
				+		saveUrl,

			
 
				+		interceptor

			
 
				+	} from '@/utils/loginUtils.js';

			
 
				+	import {

			
 
				+		mapState,

			
 
				+		mapMutations

			
 
				+	} from 'vuex';

			
 
				 	export default {

			
 
				 		components: {

			
 
				 			empty

			
@@ -82,12 +90,32 @@
 
				 		onReady(res) {

			
 
				 			this.getHeight()

			
 
				 		},

			
 
				-		onShow() {

			
 
				-			// console.log(this.list.length,'********************************************444')

			
 
				-			// location.reload()

			
 
				-

			
 
				-		},

			
 
				 		computed: {

			
 
				+			...mapState('user', ['userInfo', 'baseURL', 'hasLogin']),

			
 
				+			...mapState(['weichatObj']),

			
 
				+		},

			
 
				+		onShow() {

			
 
				+			if (!this.hasLogin) {

			
 
				+				uni.showModal({

			
 
				+					title: '登录',

			
 
				+					content: '您未登录，是否马上登陆?',

			
 
				+					success: e => {

			
 
				+						if (e.confirm) {

			
 
				+							saveUrl()

			
 
				+							interceptor();

			
 
				+						}

			
 
				+					},

			
 
				+					fail: e => {

			
 
				+						console.log(e);

			
 
				+						uni.showModal({

			
 
				+							title: 'cuowu',

			
 
				+							content: JSON.stringify(e),

			
 
				+						})

			
 
				+					}

			
 
				+				});

			
 
				+			} else {

			
 
				+				// this.loadData();

			
 
				+			}

			
 
				 

			
 
				 		},

			
 
				 		onLoad() {

			
--- a/pages/donate/idonate.vue
+++ b/pages/donate/idonate.vue
@@ -174,6 +174,14 @@
 
				 
			
 
				 <script>

			
 
				 	import { upload } from '@/api/ask.js';

			
 
				+	import {

			
 
				+		saveUrl,

			
 
				+		interceptor

			
 
				+	} from '@/utils/loginUtils.js';

			
 
				+	import {

			
 
				+		mapState,

			
 
				+		mapMutations

			
 
				+	} from 'vuex';

			
 
				 	import { getProjectInfo, createProject, getLogistics, getDonationInfo, createUser,getAllArea } from '../../api/money.js';

			
 
				 	export default {

			
 
				 		data() {

			
@@ -256,6 +264,33 @@
 
				 			

			
 
				 			this.getLogistics()

			
 
				 		},

			
 
				+		onShow() {

			
 
				+			if (!this.hasLogin) {

			
 
				+				uni.showModal({

			
 
				+					title: '登录',

			
 
				+					content: '您未登录，是否马上登陆?',

			
 
				+					success: e => {

			
 
				+						if (e.confirm) {

			
 
				+							saveUrl()

			
 
				+							interceptor();

			
 
				+						}

			
 
				+					},

			
 
				+					fail: e => {

			
 
				+						console.log(e);

			
 
				+						uni.showModal({

			
 
				+							title: 'cuowu',

			
 
				+							content: JSON.stringify(e),

			
 
				+						})

			
 
				+					}

			
 
				+				});

			
 
				+			} else {

			
 
				+				// this.loadData();

			
 
				+			}

			
 
				+		},

			
 
				+		computed: {

			
 
				+			...mapState('user', ['userInfo', 'baseURL', 'hasLogin']),

			
 
				+			...mapState(['weichatObj']),

			
 
				+		},

			
 
				 		mounted() {

			
 
				 			// this.$set(this,'wzList',[this.wz1,this.wz2])

			
 
				 		},

			
--- 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.274db71c.js></script><script src=/index/static/js/index.88dc7bd7.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.274db71c.js></script><script src=/index/static/js/index.8a935b79.js></script></body></html>
			
--- a/unpackage/dist/build/h5/jz-10-16-1.rar
+++ b/unpackage/dist/build/h5/jz-10-16-1.rar
--- a/unpackage/dist/build/h5/static/js/index.8a935b79.js
+++ b/unpackage/dist/build/h5/static/js/index.8a935b79.js
--- a/unpackage/dist/build/h5/static/js/pages-applic-contribution.5e250e47.js
+++ b/unpackage/dist/build/h5/static/js/pages-applic-contribution.5e250e47.js
--- a/unpackage/dist/build/h5/static/js/pages-applic-contribution.db2c7c7b.js
+++ b/unpackage/dist/build/h5/static/js/pages-applic-contribution.db2c7c7b.js
--- a/unpackage/dist/build/h5/static/js/pages-donate-donate.49fabcc2.js
+++ b/unpackage/dist/build/h5/static/js/pages-donate-donate.49fabcc2.js
--- a/unpackage/dist/build/h5/static/js/pages-donate-donate.d90991e4.js
+++ b/unpackage/dist/build/h5/static/js/pages-donate-donate.d90991e4.js
--- a/utils/request.js
+++ b/utils/request.js
@@ -64,9 +64,9 @@ service.interceptors.response(
 
				 service.interceptors.request(

			
 
				 	config => {

			
 
				 		let token = uni.getStorageSync('token') || '';

			
 
				-		var timestamp = new Date().getTime();

			
 
				-		var appSecret = '55dc12c813b6131578780dcd9cfd9d90';

			
 
				-		var Appid = 'wx9e9cda4611521ed4';

			
 
				+		let timestamp = new Date().getTime();

			
 
				+		let appSecret = '55dc12c813b6131578780dcd9cfd9d90';

			
 
				+		let Appid = 'wx9e9cda4611521ed4';

			
 
				 		let Sign = md5(sha1(Appid + timestamp + appSecret + timestamp + Appid + appSecret))

			
 
				 		

			
 
				 		console.log(Sign,Sign.length,'md5+++++++++++')