时间格式化

package-lock.json

@@ -5776,8 +5776,7 @@
 				},
 				"ansi-regex": {
 					"version": "2.1.1",
-					"bundled": true,
-					"optional": true
+					"bundled": true
 				},
 				"aproba": {
 					"version": "1.2.0",
@@ -5789,21 +5788,19 @@
 					"bundled": true,
 					"optional": true,
 					"requires": {
-						"delegates": "^1.0.0",
-						"readable-stream": "^2.0.6"
+						"delegates": "1.0.0",
+						"readable-stream": "2.3.6"
 					}
 				},
 				"balanced-match": {
 					"version": "1.0.0",
-					"bundled": true,
-					"optional": true
+					"bundled": true
 				},
 				"brace-expansion": {
 					"version": "1.1.11",
 					"bundled": true,
-					"optional": true,
 					"requires": {
-						"balanced-match": "^1.0.0",
+						"balanced-match": "1.0.0",
 						"concat-map": "0.0.1"
 					}
 				},
@@ -5814,18 +5811,15 @@
 				},
 				"code-point-at": {
 					"version": "1.1.0",
-					"bundled": true,
-					"optional": true
+					"bundled": true
 				},
 				"concat-map": {
 					"version": "0.0.1",
-					"bundled": true,
-					"optional": true
+					"bundled": true
 				},
 				"console-control-strings": {
 					"version": "1.1.0",
-					"bundled": true,
-					"optional": true
+					"bundled": true
 				},
 				"core-util-is": {
 					"version": "1.0.2",
@@ -5837,7 +5831,7 @@
 					"bundled": true,
 					"optional": true,
 					"requires": {
-						"ms": "^2.1.1"
+						"ms": "2.1.1"
 					}
 				},
 				"deep-extend": {
@@ -5860,7 +5854,7 @@
 					"bundled": true,
 					"optional": true,
 					"requires": {
-						"minipass": "^2.2.1"
+						"minipass": "2.3.5"
 					}
 				},
 				"fs.realpath": {
@@ -5873,14 +5867,14 @@
 					"bundled": true,
 					"optional": true,
 					"requires": {
-						"aproba": "^1.0.3",
-						"console-control-strings": "^1.0.0",
-						"has-unicode": "^2.0.0",
-						"object-assign": "^4.1.0",
-						"signal-exit": "^3.0.0",
-						"string-width": "^1.0.1",
-						"strip-ansi": "^3.0.1",
-						"wide-align": "^1.1.0"
+						"aproba": "1.2.0",
+						"console-control-strings": "1.1.0",
+						"has-unicode": "2.0.1",
+						"object-assign": "4.1.1",
+						"signal-exit": "3.0.2",
+						"string-width": "1.0.2",
+						"strip-ansi": "3.0.1",
+						"wide-align": "1.1.3"
 					}
 				},
 				"glob": {
@@ -5888,12 +5882,12 @@
 					"bundled": true,
 					"optional": true,
 					"requires": {
-						"fs.realpath": "^1.0.0",
-						"inflight": "^1.0.4",
-						"inherits": "2",
-						"minimatch": "^3.0.4",
-						"once": "^1.3.0",
-						"path-is-absolute": "^1.0.0"
+						"fs.realpath": "1.0.0",
+						"inflight": "1.0.6",
+						"inherits": "2.0.3",
+						"minimatch": "3.0.4",
+						"once": "1.4.0",
+						"path-is-absolute": "1.0.1"
 					}
 				},
 				"has-unicode": {
@@ -5906,7 +5900,7 @@
 					"bundled": true,
 					"optional": true,
 					"requires": {
-						"safer-buffer": ">= 2.1.2 < 3"
+						"safer-buffer": "2.1.2"
 					}
 				},
 				"ignore-walk": {
@@ -5914,7 +5908,7 @@
 					"bundled": true,
 					"optional": true,
 					"requires": {
-						"minimatch": "^3.0.4"
+						"minimatch": "3.0.4"
 					}
 				},
 				"inflight": {
@@ -5922,14 +5916,13 @@
 					"bundled": true,
 					"optional": true,
 					"requires": {
-						"once": "^1.3.0",
-						"wrappy": "1"
+						"once": "1.4.0",
+						"wrappy": "1.0.2"
 					}
 				},
 				"inherits": {
 					"version": "2.0.3",
-					"bundled": true,
-					"optional": true
+					"bundled": true
 				},
 				"ini": {
 					"version": "1.3.5",
@@ -5939,9 +5932,8 @@
 				"is-fullwidth-code-point": {
 					"version": "1.0.0",
 					"bundled": true,
-					"optional": true,
 					"requires": {
-						"number-is-nan": "^1.0.0"
+						"number-is-nan": "1.0.1"
 					}
 				},
 				"isarray": {
@@ -5952,23 +5944,20 @@
 				"minimatch": {
 					"version": "3.0.4",
 					"bundled": true,
-					"optional": true,
 					"requires": {
-						"brace-expansion": "^1.1.7"
+						"brace-expansion": "1.1.11"
 					}
 				},
 				"minimist": {
 					"version": "0.0.8",
-					"bundled": true,
-					"optional": true
+					"bundled": true
 				},
 				"minipass": {
 					"version": "2.3.5",
 					"bundled": true,
-					"optional": true,
 					"requires": {
-						"safe-buffer": "^5.1.2",
-						"yallist": "^3.0.0"
+						"safe-buffer": "5.1.2",
+						"yallist": "3.0.3"
 					}
 				},
 				"minizlib": {
@@ -5976,13 +5965,12 @@
 					"bundled": true,
 					"optional": true,
 					"requires": {
-						"minipass": "^2.2.1"
+						"minipass": "2.3.5"
 					}
 				},
 				"mkdirp": {
 					"version": "0.5.1",
 					"bundled": true,
-					"optional": true,
 					"requires": {
 						"minimist": "0.0.8"
 					}
@@ -5997,9 +5985,9 @@
 					"bundled": true,
 					"optional": true,
 					"requires": {
-						"debug": "^4.1.0",
-						"iconv-lite": "^0.4.4",
-						"sax": "^1.2.4"
+						"debug": "4.1.1",
+						"iconv-lite": "0.4.24",
+						"sax": "1.2.4"
 					}
 				},
 				"node-pre-gyp": {
@@ -6007,16 +5995,16 @@
 					"bundled": true,
 					"optional": true,
 					"requires": {
-						"detect-libc": "^1.0.2",
-						"mkdirp": "^0.5.1",
-						"needle": "^2.2.1",
-						"nopt": "^4.0.1",
-						"npm-packlist": "^1.1.6",
-						"npmlog": "^4.0.2",
-						"rc": "^1.2.7",
-						"rimraf": "^2.6.1",
-						"semver": "^5.3.0",
-						"tar": "^4"
+						"detect-libc": "1.0.3",
+						"mkdirp": "0.5.1",
+						"needle": "2.3.0",
+						"nopt": "4.0.1",
+						"npm-packlist": "1.4.1",
+						"npmlog": "4.1.2",
+						"rc": "1.2.8",
+						"rimraf": "2.6.3",
+						"semver": "5.7.0",
+						"tar": "4.4.8"
 					}
 				},
 				"nopt": {
@@ -6024,8 +6012,8 @@
 					"bundled": true,
 					"optional": true,
 					"requires": {
-						"abbrev": "1",
-						"osenv": "^0.1.4"
+						"abbrev": "1.1.1",
+						"osenv": "0.1.5"
 					}
 				},
 				"npm-bundled": {
@@ -6038,8 +6026,8 @@
 					"bundled": true,
 					"optional": true,
 					"requires": {
-						"ignore-walk": "^3.0.1",
-						"npm-bundled": "^1.0.1"
+						"ignore-walk": "3.0.1",
+						"npm-bundled": "1.0.6"
 					}
 				},
 				"npmlog": {
@@ -6047,16 +6035,15 @@
 					"bundled": true,
 					"optional": true,
 					"requires": {
-						"are-we-there-yet": "~1.1.2",
-						"console-control-strings": "~1.1.0",
-						"gauge": "~2.7.3",
-						"set-blocking": "~2.0.0"
+						"are-we-there-yet": "1.1.5",
+						"console-control-strings": "1.1.0",
+						"gauge": "2.7.4",
+						"set-blocking": "2.0.0"
 					}
 				},
 				"number-is-nan": {
 					"version": "1.0.1",
-					"bundled": true,
-					"optional": true
+					"bundled": true
 				},
 				"object-assign": {
 					"version": "4.1.1",
@@ -6066,9 +6053,8 @@
 				"once": {
 					"version": "1.4.0",
 					"bundled": true,
-					"optional": true,
 					"requires": {
-						"wrappy": "1"
+						"wrappy": "1.0.2"
 					}
 				},
 				"os-homedir": {
@@ -6086,8 +6072,8 @@
 					"bundled": true,
 					"optional": true,
 					"requires": {
-						"os-homedir": "^1.0.0",
-						"os-tmpdir": "^1.0.0"
+						"os-homedir": "1.0.2",
+						"os-tmpdir": "1.0.2"
 					}
 				},
 				"path-is-absolute": {
@@ -6105,10 +6091,10 @@
 					"bundled": true,
 					"optional": true,
 					"requires": {
-						"deep-extend": "^0.6.0",
-						"ini": "~1.3.0",
-						"minimist": "^1.2.0",
-						"strip-json-comments": "~2.0.1"
+						"deep-extend": "0.6.0",
+						"ini": "1.3.5",
+						"minimist": "1.2.0",
+						"strip-json-comments": "2.0.1"
 					},
 					"dependencies": {
 						"minimist": {
@@ -6123,13 +6109,13 @@
 					"bundled": true,
 					"optional": true,
 					"requires": {
-						"core-util-is": "~1.0.0",
-						"inherits": "~2.0.3",
-						"isarray": "~1.0.0",
-						"process-nextick-args": "~2.0.0",
-						"safe-buffer": "~5.1.1",
-						"string_decoder": "~1.1.1",
-						"util-deprecate": "~1.0.1"
+						"core-util-is": "1.0.2",
+						"inherits": "2.0.3",
+						"isarray": "1.0.0",
+						"process-nextick-args": "2.0.0",
+						"safe-buffer": "5.1.2",
+						"string_decoder": "1.1.1",
+						"util-deprecate": "1.0.2"
 					}
 				},
 				"rimraf": {
@@ -6137,13 +6123,12 @@
 					"bundled": true,
 					"optional": true,
 					"requires": {
-						"glob": "^7.1.3"
+						"glob": "7.1.3"
 					}
 				},
 				"safe-buffer": {
 					"version": "5.1.2",
-					"bundled": true,
-					"optional": true
+					"bundled": true
 				},
 				"safer-buffer": {
 					"version": "2.1.2",
@@ -6173,11 +6158,10 @@
 				"string-width": {
 					"version": "1.0.2",
 					"bundled": true,
-					"optional": true,
 					"requires": {
-						"code-point-at": "^1.0.0",
-						"is-fullwidth-code-point": "^1.0.0",
-						"strip-ansi": "^3.0.0"
+						"code-point-at": "1.1.0",
+						"is-fullwidth-code-point": "1.0.0",
+						"strip-ansi": "3.0.1"
 					}
 				},
 				"string_decoder": {
@@ -6185,15 +6169,14 @@
 					"bundled": true,
 					"optional": true,
 					"requires": {
-						"safe-buffer": "~5.1.0"
+						"safe-buffer": "5.1.2"
 					}
 				},
 				"strip-ansi": {
 					"version": "3.0.1",
 					"bundled": true,
-					"optional": true,
 					"requires": {
-						"ansi-regex": "^2.0.0"
+						"ansi-regex": "2.1.1"
 					}
 				},
 				"strip-json-comments": {
@@ -6206,13 +6189,13 @@
 					"bundled": true,
 					"optional": true,
 					"requires": {
-						"chownr": "^1.1.1",
-						"fs-minipass": "^1.2.5",
-						"minipass": "^2.3.4",
-						"minizlib": "^1.1.1",
-						"mkdirp": "^0.5.0",
-						"safe-buffer": "^5.1.2",
-						"yallist": "^3.0.2"
+						"chownr": "1.1.1",
+						"fs-minipass": "1.2.5",
+						"minipass": "2.3.5",
+						"minizlib": "1.2.1",
+						"mkdirp": "0.5.1",
+						"safe-buffer": "5.1.2",
+						"yallist": "3.0.3"
 					}
 				},
 				"util-deprecate": {
@@ -6225,18 +6208,16 @@
 					"bundled": true,
 					"optional": true,
 					"requires": {
-						"string-width": "^1.0.2 || 2"
+						"string-width": "1.0.2"
 					}
 				},
 				"wrappy": {
 					"version": "1.0.2",
-					"bundled": true,
-					"optional": true
+					"bundled": true
 				},
 				"yallist": {
 					"version": "3.0.3",
-					"bundled": true,
-					"optional": true
+					"bundled": true
 				}
 			}
 		},

src/pages/activity/assembleItem/index.js

@@ -73,7 +73,7 @@ export default class Item extends Component {
         <Image className="pic" src={data.mainImg} ></Image>
         <View className="title">{data.activityName}</View>
         {(!data.verificationCode && data.status == 1) &&
-          <View className="time">参与截止时间: <Text className="count-time">{`${dayjs(data.endDate).format('YYYY-MM-DD hh:mm:ss')}`}</Text></View>
+          <View className="time">参与截止时间: <Text className="count-time">{`${dayjs(data.endDate).format('YYYY-MM-DD HH:mm:ss')}`}</Text></View>
         }
         {(!data.verificationCode && data.status != 1) &&
           <View className="time"><Text className="count-time">活动已结束</Text></View>
@@ -84,7 +84,7 @@ export default class Item extends Component {
             <View className="hexiaoma">核销码：{data.verificationCode}</View>
           </Block>
         }
-        <View className="start-date">{`${dayjs(data.createTime).format('YYYY-MM-DD hh:mm:ss')}`}</View>
+        <View className="start-date">{`${dayjs(data.createTime).format('YYYY-MM-DD HH:mm:ss')}`}</View>
         {data.status == 0 &&
           <Image className="status-icon" src={groupSuccess} ></Image>
         }

src/pages/activity/assistanceItem/index.js

@@ -72,7 +72,7 @@ export default class Item extends Component {
         <Image className="pic" src={data.img} ></Image>
         <View className="title">{data.title}</View>
         {(!data.verification &&data.status == 1 )&&
-          <View className="time">参与截止时间: <Text className="count-time">{`${dayjs(data.endDate).format('YYYY-MM-DD hh:mm:ss')}`}</Text></View>
+          <View className="time">参与截止时间: <Text className="count-time">{`${dayjs(data.endDate).format('YYYY-MM-DD HH:mm:ss')}`}</Text></View>
         }
         {(!data.verification &&data.status != 1)&&
           <View className="time"><Text className="count-time">活动已结束</Text></View>
@@ -83,7 +83,7 @@ export default class Item extends Component {
             <View className="hexiaoma">核销码：{data.verification}</View>
           </Block>
         }
-        <View className="start-date">{`${dayjs(data.createDate).format('YYYY-MM-DD hh:mm:ss')}`}</View>
+        <View className="start-date">{`${dayjs(data.createDate).format('YYYY-MM-DD HH:mm:ss')}`}</View>
         {data.status == 0 &&
           <Image className="status-icon" src={helpSuccess} ></Image>
         }

src/pages/shop/integralDetail/index.js

@@ -124,7 +124,7 @@ export default class Index extends Component {
                 <View className="list-item" key={item.recId}>
                   <View className="top">
                     <View className="title-state">{item.recordName}</View>
-                    <View className="title-time">{dayjs(item.createDate).format('YYYY-MM-DD hh:mm:ss')}</View>
+                    <View className="title-time">{dayjs(item.createDate).format('YYYY-MM-DD HH:mm:ss')}</View>
                   </View>
                   <View className="bottom">
                     <View className={item.pointsAmount>0?'coin1':'coin2'}>{item.pointsAmount>0?'+'+item.pointsAmount:item.pointsAmount}</View>

src/pages/shop/record/index.js

@@ -67,7 +67,7 @@ export default class Index extends Component {
               <View className="list-item" key={item.recId} onClick={this.onViewDetail.bind(this, item)}>
 								<Image className="cardBg"  src={item.status==0?require('@assets/person/card2.png'):require('@assets/person/card1.png')}/>
 								<View className="top">
-									<View className="title-time">兑换时间:{dayjs(item.createDate).format('YYYY-MM-DD hh:mm:ss')}</View>
+									<View className="title-time">兑换时间:{dayjs(item.createDate).format('YYYY-MM-DD HH:mm:ss')}</View>
 									<View className="title-state">{item.status==0?"未领取":"已领取"}</View>
 								</View>
 								<View className="bottom">

src/pages/shop/rule/index.js

@@ -56,7 +56,7 @@ export default class Shop extends Component {
                    <View className='rule_item'  key={item.ruleId}>
                      <Text>{item.ruleName}</Text>
                      <Text>+{item.pointsAmount}</Text>
-                     <Text>{dayjs(item.updateDate).format('YYYY-MM-DD hh:mm:ss')}</Text>
+                     <Text>{dayjs(item.updateDate).format('YYYY-MM-DD HH:mm:ss')}</Text>
                    </View>
                 ))
             )