banner 订单详情Safari兼容,登录验证码限制4位

2 years ago · c4120c77b3
parent 764c2eab8f
commit c4120c77b3
12 changed files with 14 additions and 11 deletions
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@ -2,7 +2,7 @@
 * @Author: ch
 * @Date: 2019-08-22 19:41:20
 * @LastEditors: ch
- * @LastEditTime: 2022-05-05 18:42:34
+ * @LastEditTime: 2022-05-05 21:50:27
 * @Description: file content
 -->
 <template>
@ -56,6 +56,9 @@ export default {
 		return {
 			scrollTop : 0,
 			bannerList: [
+				{	url : 'https://msb-edu-dev.oss-cn-beijing.aliyuncs.com/uc/account-avatar/banner4.jpg',
+					id : 13
+				},
 				{	url : 'https://msb-edu-dev.oss-cn-beijing.aliyuncs.com/uc/account-avatar/1.png',
 					id : 30
 				},
--- a/pages/login.vue
+++ b/pages/login.vue
@ -2,7 +2,7 @@
 * @Author: ch
 * @Date: 2022-03-22 15:36:46
 * @LastEditors: ch
- * @LastEditTime: 2022-04-29 17:12:13
+ * @LastEditTime: 2022-05-05 20:32:00
 * @Description: file content
 -->
 <template>
@ -16,7 +16,7 @@
 				<input placeholder="请输入手机号" type="number" v-model="phone" class="login--input" border="bottom" />
 			</u-form-item>
 			<u-form-item class="login--code">
-				<input placeholder="验证码" type="number" maxlength="6" class="login--input" v-model="code"  border="bottom" />
+				<input placeholder="验证码" type="number" maxlength="4" class="login--input" v-model="code"  border="bottom" />
 				<u-code ref="uCode" @change="codeChange" changeText="X秒后重新获取"
 					@start="sendStatus = true" @end="sendStatus = false" seconds="60"></u-code>
 				<text class="login--send-btn" :class="sendStatus && 'login--send-btn__disabled'" 
--- a/pages/order/detail/components/StatusTips.vue
+++ b/pages/order/detail/components/StatusTips.vue
@ -2,7 +2,7 @@
 * @Author: ch
 * @Date: 2022-03-31 17:53:43
 * @LastEditors: ch
- * @LastEditTime: 2022-04-29 15:46:53
+ * @LastEditTime: 2022-05-05 20:43:19
 * @Description: file content
 -->
 <template>
@ -64,8 +64,8 @@ export default {
 		 * 计算倒计时开始秒数
 		 */
 		calcTimerStartSecondNum(){
-			let expireTime = (new Date(this.orderInfo.expireTime)).getTime(),
-				curTime = (new Date(this.orderInfo.serverTime)).getTime(),
+			let expireTime = (new Date(this.orderInfo.expireTime.replace(/-/g,'/'))).getTime(),
+				curTime = (new Date(this.orderInfo.serverTime.replace(/-/g,'/'))).getTime(),
 				second = Math.floor((expireTime - curTime) / 1000);
 			this.startSecondNum = second > 0 ? second : 0;
 		},
--- 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=/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.b5602bf5.js></script><script src=/static/js/index.608c63dc.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=/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.b5602bf5.js></script><script src=/static/js/index.662452a8.js></script></body></html>
--- a/unpackage/dist/build/h5/static/index/.DS_Store
+++ b/unpackage/dist/build/h5/static/index/.DS_Store
--- a/unpackage/dist/build/h5/static/js/index.662452a8.js
+++ b/unpackage/dist/build/h5/static/js/index.662452a8.js
--- a/unpackage/dist/build/h5/static/js/pages-index-index.47d9d6e3.js
+++ b/unpackage/dist/build/h5/static/js/pages-index-index.47d9d6e3.js
--- a/unpackage/dist/build/h5/static/js/pages-index-index.e9b5c1ac.js
+++ b/unpackage/dist/build/h5/static/js/pages-index-index.e9b5c1ac.js
--- a/unpackage/dist/build/h5/static/js/pages-login.7164aeb2.js
+++ b/unpackage/dist/build/h5/static/js/pages-login.7164aeb2.js
--- a/unpackage/dist/build/h5/static/js/pages-login.da79946f.js
+++ b/unpackage/dist/build/h5/static/js/pages-login.da79946f.js
--- a/unpackage/dist/build/h5/static/js/pages-order-detail-index.a843fa35.js
+++ b/unpackage/dist/build/h5/static/js/pages-order-detail-index.a843fa35.js
--- a/unpackage/dist/build/h5/static/js/pages-order-detail-index.bd18ffdb.js
+++ b/unpackage/dist/build/h5/static/js/pages-order-detail-index.bd18ffdb.js