8-25-文本居中

.hbuilderx/launch.json

@@ -1,11 +1,16 @@
 { // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
   // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
     "version": "0.0",
-    "configurations": [{
-            "type": "uniCloud",
-            "default": {
-                "launchtype": "local"
-            }
-        }
+    "configurations": [{
+     	"default" : 
+     	{
+     		"launchtype" : "local"
+     	},
+     	"h5" : 
+     	{
+     		"launchtype" : "local"
+     	},
+     	"type" : "uniCloud"
+     }
     ]
 }

manifest.json

@@ -1,6 +1,6 @@
 {
     "name" : "荆州市红十字会",
-    "appid" : "__UNI__87952E4",
+    "appid" : "__UNI__C8A3AAB",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",

pages/cart/cart.vue

@@ -26,7 +26,15 @@
 		</swiper>
 	</view>
 </template>
-<script>
+<script>
+	import {
+		mapState,
+		mapMutations
+	} from 'vuex';
+	import {
+		saveUrl,
+		interceptor
+	} from '@/utils/loginUtils.js';
 import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
 import empty from '@/components/empty';
 import uniPopup from '@/components/uni-popup/uni-popup.vue';
@@ -44,6 +52,28 @@ export default {
 			list: [],
 			loadingType: 'more', //加载更多状态
 		};
+	},
+	computed: {
+		...mapState('user', ['hasLogin', 'userInfo']),
+	},
+	onShow() {
+		if (this.hasLogin) {
+			// this.loadBaseData();
+		} else {
+			saveUrl();
+			uni.showModal({
+				title: '登录',
+				content: '您未登录，是否马上登陆?',
+				success: e => {
+					if (e.confirm) {
+						interceptor();
+					}
+				},
+				fail: e => {
+					console.log(e);
+				}
+			});
+		}
 	},
 	onLoad() {
 		console.log(22)

pages/cart/group.vue

@@ -85,12 +85,20 @@
 				<input type="text" value="" class="list-input" v-model="concat_address" placeholder="请输入联系地址" placeholder-class="placeholder" />
 			</view>
 		</view>
-		<view class="buttom-ts" ></view>
+		<!-- <view class="buttom-ts" ></view> -->
 		<view class="buttom" :class="{ action: loding }" @click="!loding ? join() : ''">提交申请</view>
 	</view>
 </template>
 
 <script>
+	import {
+		mapState,
+		mapMutations
+	} from 'vuex';
+	import {
+		saveUrl,
+		interceptor
+	} from '@/utils/loginUtils.js';
 import { joinSec,add_company } from '@/api/index.js';
 import { upload } from '@/api/ask.js';
 export default {
@@ -129,14 +137,34 @@ export default {
 			concat_address: ''//联系地址
 		};
 	},
-	computed: {
-		startDate() {
-			return this.getDate('start');
-		},
-		endDate() {
-			return this.getDate('end');
+	onShow() {
+		if (this.hasLogin) {
+			// this.loadBaseData();
+		} else {
+			saveUrl();
+			uni.showModal({
+				title: '登录',
+				content: '您未登录，是否马上登陆?',
+				success: e => {
+					if (e.confirm) {
+						interceptor();
+					}
+				},
+				fail: e => {
+					console.log(e);
+				}
+			});
 		}
 	},
+	computed: {
+		...mapState('user', ['hasLogin', 'userInfo'])
+		// startDate() {
+		// 	return this.getDate('start');
+		// },
+		// endDate() {
+		// 	return this.getDate('end');
+		// }
+	},
 	methods: {
 		async join() {
 			let obj = this;
@@ -330,11 +358,12 @@ page {
 		height: 120rpx;
 	}
 	.buttom {
-		// margin: 60rpx auto 0;
-		position: absolute;
-		bottom: 0;
-		width: 750rpx;
+		margin: 60rpx auto 0;
+		// position: absolute;
+		// bottom: 0;
+		width: 600rpx;
 		height: 100rpx;
+		border-radius: 50rpx;
 		background: #FA7E67;
 		font-size: 34rpx;
 		font-family: PingFang SC;

pages/category/category.vue

@@ -61,6 +61,14 @@
 </template>
 
 <script>
+	import {
+		mapState,
+		mapMutations
+	} from 'vuex';
+	import {
+		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';
@@ -70,7 +78,6 @@ export default {
 	components: {
 		pickerAddress
 	},
-	computed: {},
 	data() {
 		return {
 			longitude: '',
@@ -105,9 +112,28 @@ export default {
 			}
 		};
 	},
-
+	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() {

pages/form/applicationForm.vue

@@ -119,6 +119,14 @@
 </template>
 
 <script>
+	import {
+		mapState,
+		mapMutations
+	} from 'vuex';
+	import {
+		saveUrl,
+		interceptor
+	} from '@/utils/loginUtils.js';
 import { joinSecc } from '@/api/index.js';
 import { upload } from '@/api/ask.js';
 export default {
@@ -165,6 +173,7 @@ export default {
 		};
 	},
 	computed: {
+		...mapState('user', ['hasLogin', 'userInfo']),
 		startDate() {
 			return this.getDate('start');
 		},
@@ -172,6 +181,25 @@ export default {
 			return this.getDate('end');
 		}
 	},
+	onShow() {
+		if (this.hasLogin) {
+			// this.loadBaseData();
+		} else {
+			saveUrl();
+			uni.showModal({
+				title: '登录',
+				content: '您未登录，是否马上登陆?',
+				success: e => {
+					if (e.confirm) {
+						interceptor();
+					}
+				},
+				fail: e => {
+					console.log(e);
+				}
+			});
+		}
+	},
 	methods: {
 		async join() {
 			let obj = this;

pages/form/tovolApply.vue

@@ -222,6 +222,14 @@
 </template>
 
 <script>
+	import {
+		saveUrl,
+		interceptor
+	} from '@/utils/loginUtils.js';
+	import {
+		mapState,
+		mapMutations
+	} from 'vuex';
 import { add_volunteers } from '@/api/index.js';
 import { upload } from '@/api/ask.js';
 export default {
@@ -439,7 +447,27 @@ export default {
 			Getchecked: false //个人声明
 		};
 	},
+	onShow() {
+		if (this.hasLogin) {
+			// this.loadBaseData();
+		} else {
+			saveUrl();
+			uni.showModal({
+				title: '登录',
+				content: '您未登录，是否马上登陆?',
+				success: e => {
+					if (e.confirm) {
+						interceptor();
+					}
+				},
+				fail: e => {
+					console.log(e);
+				}
+			});
+		}
+	},
 	computed: {
+		...mapState('user', ['userInfo', 'baseURL', 'hasLogin']),
 		startDate() {
 			return this.getDate('start');
 		},

pages/train/sign.vue

@@ -193,8 +193,9 @@ export default {
 		context.moveTo(90 * obj.ratio, 586 * obj.ratio)
 		context.lineTo(250 * obj.ratio, 586 * obj.ratio)
 		context.stroke();
-		
-		context.fillText(name, 110 * obj.ratio, 574 * obj.ratio)
+		context.setTextAlign('center')
+		context.fillText(name, 170 * obj.ratio, 574 * obj.ratio)
+		context.setTextAlign('left')
 		context.fillText('先生/女士', 260 * obj.ratio, 580 * obj.ratio)
 		
 		context.setFontSize(31 * obj.ratio)

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.d0f128df.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.d9bbc571.js></script><script src=/index/static/js/index.b33946ee.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.14179d66.js></script><script src=/index/static/js/index.daa61d2d.js></script></body></html>