傅行帆 5 anni fa
parent
commit
7a513e2bd3

+ 88
- 107
package-lock.json Vedi File

5776
 				},
5776
 				},
5777
 				"ansi-regex": {
5777
 				"ansi-regex": {
5778
 					"version": "2.1.1",
5778
 					"version": "2.1.1",
5779
-					"bundled": true,
5780
-					"optional": true
5779
+					"bundled": true
5781
 				},
5780
 				},
5782
 				"aproba": {
5781
 				"aproba": {
5783
 					"version": "1.2.0",
5782
 					"version": "1.2.0",
5789
 					"bundled": true,
5788
 					"bundled": true,
5790
 					"optional": true,
5789
 					"optional": true,
5791
 					"requires": {
5790
 					"requires": {
5792
-						"delegates": "^1.0.0",
5793
-						"readable-stream": "^2.0.6"
5791
+						"delegates": "1.0.0",
5792
+						"readable-stream": "2.3.6"
5794
 					}
5793
 					}
5795
 				},
5794
 				},
5796
 				"balanced-match": {
5795
 				"balanced-match": {
5797
 					"version": "1.0.0",
5796
 					"version": "1.0.0",
5798
-					"bundled": true,
5799
-					"optional": true
5797
+					"bundled": true
5800
 				},
5798
 				},
5801
 				"brace-expansion": {
5799
 				"brace-expansion": {
5802
 					"version": "1.1.11",
5800
 					"version": "1.1.11",
5803
 					"bundled": true,
5801
 					"bundled": true,
5804
-					"optional": true,
5805
 					"requires": {
5802
 					"requires": {
5806
-						"balanced-match": "^1.0.0",
5803
+						"balanced-match": "1.0.0",
5807
 						"concat-map": "0.0.1"
5804
 						"concat-map": "0.0.1"
5808
 					}
5805
 					}
5809
 				},
5806
 				},
5814
 				},
5811
 				},
5815
 				"code-point-at": {
5812
 				"code-point-at": {
5816
 					"version": "1.1.0",
5813
 					"version": "1.1.0",
5817
-					"bundled": true,
5818
-					"optional": true
5814
+					"bundled": true
5819
 				},
5815
 				},
5820
 				"concat-map": {
5816
 				"concat-map": {
5821
 					"version": "0.0.1",
5817
 					"version": "0.0.1",
5822
-					"bundled": true,
5823
-					"optional": true
5818
+					"bundled": true
5824
 				},
5819
 				},
5825
 				"console-control-strings": {
5820
 				"console-control-strings": {
5826
 					"version": "1.1.0",
5821
 					"version": "1.1.0",
5827
-					"bundled": true,
5828
-					"optional": true
5822
+					"bundled": true
5829
 				},
5823
 				},
5830
 				"core-util-is": {
5824
 				"core-util-is": {
5831
 					"version": "1.0.2",
5825
 					"version": "1.0.2",
5837
 					"bundled": true,
5831
 					"bundled": true,
5838
 					"optional": true,
5832
 					"optional": true,
5839
 					"requires": {
5833
 					"requires": {
5840
-						"ms": "^2.1.1"
5834
+						"ms": "2.1.1"
5841
 					}
5835
 					}
5842
 				},
5836
 				},
5843
 				"deep-extend": {
5837
 				"deep-extend": {
5860
 					"bundled": true,
5854
 					"bundled": true,
5861
 					"optional": true,
5855
 					"optional": true,
5862
 					"requires": {
5856
 					"requires": {
5863
-						"minipass": "^2.2.1"
5857
+						"minipass": "2.3.5"
5864
 					}
5858
 					}
5865
 				},
5859
 				},
5866
 				"fs.realpath": {
5860
 				"fs.realpath": {
5873
 					"bundled": true,
5867
 					"bundled": true,
5874
 					"optional": true,
5868
 					"optional": true,
5875
 					"requires": {
5869
 					"requires": {
5876
-						"aproba": "^1.0.3",
5877
-						"console-control-strings": "^1.0.0",
5878
-						"has-unicode": "^2.0.0",
5879
-						"object-assign": "^4.1.0",
5880
-						"signal-exit": "^3.0.0",
5881
-						"string-width": "^1.0.1",
5882
-						"strip-ansi": "^3.0.1",
5883
-						"wide-align": "^1.1.0"
5870
+						"aproba": "1.2.0",
5871
+						"console-control-strings": "1.1.0",
5872
+						"has-unicode": "2.0.1",
5873
+						"object-assign": "4.1.1",
5874
+						"signal-exit": "3.0.2",
5875
+						"string-width": "1.0.2",
5876
+						"strip-ansi": "3.0.1",
5877
+						"wide-align": "1.1.3"
5884
 					}
5878
 					}
5885
 				},
5879
 				},
5886
 				"glob": {
5880
 				"glob": {
5888
 					"bundled": true,
5882
 					"bundled": true,
5889
 					"optional": true,
5883
 					"optional": true,
5890
 					"requires": {
5884
 					"requires": {
5891
-						"fs.realpath": "^1.0.0",
5892
-						"inflight": "^1.0.4",
5893
-						"inherits": "2",
5894
-						"minimatch": "^3.0.4",
5895
-						"once": "^1.3.0",
5896
-						"path-is-absolute": "^1.0.0"
5885
+						"fs.realpath": "1.0.0",
5886
+						"inflight": "1.0.6",
5887
+						"inherits": "2.0.3",
5888
+						"minimatch": "3.0.4",
5889
+						"once": "1.4.0",
5890
+						"path-is-absolute": "1.0.1"
5897
 					}
5891
 					}
5898
 				},
5892
 				},
5899
 				"has-unicode": {
5893
 				"has-unicode": {
5906
 					"bundled": true,
5900
 					"bundled": true,
5907
 					"optional": true,
5901
 					"optional": true,
5908
 					"requires": {
5902
 					"requires": {
5909
-						"safer-buffer": ">= 2.1.2 < 3"
5903
+						"safer-buffer": "2.1.2"
5910
 					}
5904
 					}
5911
 				},
5905
 				},
5912
 				"ignore-walk": {
5906
 				"ignore-walk": {
5914
 					"bundled": true,
5908
 					"bundled": true,
5915
 					"optional": true,
5909
 					"optional": true,
5916
 					"requires": {
5910
 					"requires": {
5917
-						"minimatch": "^3.0.4"
5911
+						"minimatch": "3.0.4"
5918
 					}
5912
 					}
5919
 				},
5913
 				},
5920
 				"inflight": {
5914
 				"inflight": {
5922
 					"bundled": true,
5916
 					"bundled": true,
5923
 					"optional": true,
5917
 					"optional": true,
5924
 					"requires": {
5918
 					"requires": {
5925
-						"once": "^1.3.0",
5926
-						"wrappy": "1"
5919
+						"once": "1.4.0",
5920
+						"wrappy": "1.0.2"
5927
 					}
5921
 					}
5928
 				},
5922
 				},
5929
 				"inherits": {
5923
 				"inherits": {
5930
 					"version": "2.0.3",
5924
 					"version": "2.0.3",
5931
-					"bundled": true,
5932
-					"optional": true
5925
+					"bundled": true
5933
 				},
5926
 				},
5934
 				"ini": {
5927
 				"ini": {
5935
 					"version": "1.3.5",
5928
 					"version": "1.3.5",
5939
 				"is-fullwidth-code-point": {
5932
 				"is-fullwidth-code-point": {
5940
 					"version": "1.0.0",
5933
 					"version": "1.0.0",
5941
 					"bundled": true,
5934
 					"bundled": true,
5942
-					"optional": true,
5943
 					"requires": {
5935
 					"requires": {
5944
-						"number-is-nan": "^1.0.0"
5936
+						"number-is-nan": "1.0.1"
5945
 					}
5937
 					}
5946
 				},
5938
 				},
5947
 				"isarray": {
5939
 				"isarray": {
5952
 				"minimatch": {
5944
 				"minimatch": {
5953
 					"version": "3.0.4",
5945
 					"version": "3.0.4",
5954
 					"bundled": true,
5946
 					"bundled": true,
5955
-					"optional": true,
5956
 					"requires": {
5947
 					"requires": {
5957
-						"brace-expansion": "^1.1.7"
5948
+						"brace-expansion": "1.1.11"
5958
 					}
5949
 					}
5959
 				},
5950
 				},
5960
 				"minimist": {
5951
 				"minimist": {
5961
 					"version": "0.0.8",
5952
 					"version": "0.0.8",
5962
-					"bundled": true,
5963
-					"optional": true
5953
+					"bundled": true
5964
 				},
5954
 				},
5965
 				"minipass": {
5955
 				"minipass": {
5966
 					"version": "2.3.5",
5956
 					"version": "2.3.5",
5967
 					"bundled": true,
5957
 					"bundled": true,
5968
-					"optional": true,
5969
 					"requires": {
5958
 					"requires": {
5970
-						"safe-buffer": "^5.1.2",
5971
-						"yallist": "^3.0.0"
5959
+						"safe-buffer": "5.1.2",
5960
+						"yallist": "3.0.3"
5972
 					}
5961
 					}
5973
 				},
5962
 				},
5974
 				"minizlib": {
5963
 				"minizlib": {
5976
 					"bundled": true,
5965
 					"bundled": true,
5977
 					"optional": true,
5966
 					"optional": true,
5978
 					"requires": {
5967
 					"requires": {
5979
-						"minipass": "^2.2.1"
5968
+						"minipass": "2.3.5"
5980
 					}
5969
 					}
5981
 				},
5970
 				},
5982
 				"mkdirp": {
5971
 				"mkdirp": {
5983
 					"version": "0.5.1",
5972
 					"version": "0.5.1",
5984
 					"bundled": true,
5973
 					"bundled": true,
5985
-					"optional": true,
5986
 					"requires": {
5974
 					"requires": {
5987
 						"minimist": "0.0.8"
5975
 						"minimist": "0.0.8"
5988
 					}
5976
 					}
5997
 					"bundled": true,
5985
 					"bundled": true,
5998
 					"optional": true,
5986
 					"optional": true,
5999
 					"requires": {
5987
 					"requires": {
6000
-						"debug": "^4.1.0",
6001
-						"iconv-lite": "^0.4.4",
6002
-						"sax": "^1.2.4"
5988
+						"debug": "4.1.1",
5989
+						"iconv-lite": "0.4.24",
5990
+						"sax": "1.2.4"
6003
 					}
5991
 					}
6004
 				},
5992
 				},
6005
 				"node-pre-gyp": {
5993
 				"node-pre-gyp": {
6007
 					"bundled": true,
5995
 					"bundled": true,
6008
 					"optional": true,
5996
 					"optional": true,
6009
 					"requires": {
5997
 					"requires": {
6010
-						"detect-libc": "^1.0.2",
6011
-						"mkdirp": "^0.5.1",
6012
-						"needle": "^2.2.1",
6013
-						"nopt": "^4.0.1",
6014
-						"npm-packlist": "^1.1.6",
6015
-						"npmlog": "^4.0.2",
6016
-						"rc": "^1.2.7",
6017
-						"rimraf": "^2.6.1",
6018
-						"semver": "^5.3.0",
6019
-						"tar": "^4"
5998
+						"detect-libc": "1.0.3",
5999
+						"mkdirp": "0.5.1",
6000
+						"needle": "2.3.0",
6001
+						"nopt": "4.0.1",
6002
+						"npm-packlist": "1.4.1",
6003
+						"npmlog": "4.1.2",
6004
+						"rc": "1.2.8",
6005
+						"rimraf": "2.6.3",
6006
+						"semver": "5.7.0",
6007
+						"tar": "4.4.8"
6020
 					}
6008
 					}
6021
 				},
6009
 				},
6022
 				"nopt": {
6010
 				"nopt": {
6024
 					"bundled": true,
6012
 					"bundled": true,
6025
 					"optional": true,
6013
 					"optional": true,
6026
 					"requires": {
6014
 					"requires": {
6027
-						"abbrev": "1",
6028
-						"osenv": "^0.1.4"
6015
+						"abbrev": "1.1.1",
6016
+						"osenv": "0.1.5"
6029
 					}
6017
 					}
6030
 				},
6018
 				},
6031
 				"npm-bundled": {
6019
 				"npm-bundled": {
6038
 					"bundled": true,
6026
 					"bundled": true,
6039
 					"optional": true,
6027
 					"optional": true,
6040
 					"requires": {
6028
 					"requires": {
6041
-						"ignore-walk": "^3.0.1",
6042
-						"npm-bundled": "^1.0.1"
6029
+						"ignore-walk": "3.0.1",
6030
+						"npm-bundled": "1.0.6"
6043
 					}
6031
 					}
6044
 				},
6032
 				},
6045
 				"npmlog": {
6033
 				"npmlog": {
6047
 					"bundled": true,
6035
 					"bundled": true,
6048
 					"optional": true,
6036
 					"optional": true,
6049
 					"requires": {
6037
 					"requires": {
6050
-						"are-we-there-yet": "~1.1.2",
6051
-						"console-control-strings": "~1.1.0",
6052
-						"gauge": "~2.7.3",
6053
-						"set-blocking": "~2.0.0"
6038
+						"are-we-there-yet": "1.1.5",
6039
+						"console-control-strings": "1.1.0",
6040
+						"gauge": "2.7.4",
6041
+						"set-blocking": "2.0.0"
6054
 					}
6042
 					}
6055
 				},
6043
 				},
6056
 				"number-is-nan": {
6044
 				"number-is-nan": {
6057
 					"version": "1.0.1",
6045
 					"version": "1.0.1",
6058
-					"bundled": true,
6059
-					"optional": true
6046
+					"bundled": true
6060
 				},
6047
 				},
6061
 				"object-assign": {
6048
 				"object-assign": {
6062
 					"version": "4.1.1",
6049
 					"version": "4.1.1",
6066
 				"once": {
6053
 				"once": {
6067
 					"version": "1.4.0",
6054
 					"version": "1.4.0",
6068
 					"bundled": true,
6055
 					"bundled": true,
6069
-					"optional": true,
6070
 					"requires": {
6056
 					"requires": {
6071
-						"wrappy": "1"
6057
+						"wrappy": "1.0.2"
6072
 					}
6058
 					}
6073
 				},
6059
 				},
6074
 				"os-homedir": {
6060
 				"os-homedir": {
6086
 					"bundled": true,
6072
 					"bundled": true,
6087
 					"optional": true,
6073
 					"optional": true,
6088
 					"requires": {
6074
 					"requires": {
6089
-						"os-homedir": "^1.0.0",
6090
-						"os-tmpdir": "^1.0.0"
6075
+						"os-homedir": "1.0.2",
6076
+						"os-tmpdir": "1.0.2"
6091
 					}
6077
 					}
6092
 				},
6078
 				},
6093
 				"path-is-absolute": {
6079
 				"path-is-absolute": {
6105
 					"bundled": true,
6091
 					"bundled": true,
6106
 					"optional": true,
6092
 					"optional": true,
6107
 					"requires": {
6093
 					"requires": {
6108
-						"deep-extend": "^0.6.0",
6109
-						"ini": "~1.3.0",
6110
-						"minimist": "^1.2.0",
6111
-						"strip-json-comments": "~2.0.1"
6094
+						"deep-extend": "0.6.0",
6095
+						"ini": "1.3.5",
6096
+						"minimist": "1.2.0",
6097
+						"strip-json-comments": "2.0.1"
6112
 					},
6098
 					},
6113
 					"dependencies": {
6099
 					"dependencies": {
6114
 						"minimist": {
6100
 						"minimist": {
6123
 					"bundled": true,
6109
 					"bundled": true,
6124
 					"optional": true,
6110
 					"optional": true,
6125
 					"requires": {
6111
 					"requires": {
6126
-						"core-util-is": "~1.0.0",
6127
-						"inherits": "~2.0.3",
6128
-						"isarray": "~1.0.0",
6129
-						"process-nextick-args": "~2.0.0",
6130
-						"safe-buffer": "~5.1.1",
6131
-						"string_decoder": "~1.1.1",
6132
-						"util-deprecate": "~1.0.1"
6112
+						"core-util-is": "1.0.2",
6113
+						"inherits": "2.0.3",
6114
+						"isarray": "1.0.0",
6115
+						"process-nextick-args": "2.0.0",
6116
+						"safe-buffer": "5.1.2",
6117
+						"string_decoder": "1.1.1",
6118
+						"util-deprecate": "1.0.2"
6133
 					}
6119
 					}
6134
 				},
6120
 				},
6135
 				"rimraf": {
6121
 				"rimraf": {
6137
 					"bundled": true,
6123
 					"bundled": true,
6138
 					"optional": true,
6124
 					"optional": true,
6139
 					"requires": {
6125
 					"requires": {
6140
-						"glob": "^7.1.3"
6126
+						"glob": "7.1.3"
6141
 					}
6127
 					}
6142
 				},
6128
 				},
6143
 				"safe-buffer": {
6129
 				"safe-buffer": {
6144
 					"version": "5.1.2",
6130
 					"version": "5.1.2",
6145
-					"bundled": true,
6146
-					"optional": true
6131
+					"bundled": true
6147
 				},
6132
 				},
6148
 				"safer-buffer": {
6133
 				"safer-buffer": {
6149
 					"version": "2.1.2",
6134
 					"version": "2.1.2",
6173
 				"string-width": {
6158
 				"string-width": {
6174
 					"version": "1.0.2",
6159
 					"version": "1.0.2",
6175
 					"bundled": true,
6160
 					"bundled": true,
6176
-					"optional": true,
6177
 					"requires": {
6161
 					"requires": {
6178
-						"code-point-at": "^1.0.0",
6179
-						"is-fullwidth-code-point": "^1.0.0",
6180
-						"strip-ansi": "^3.0.0"
6162
+						"code-point-at": "1.1.0",
6163
+						"is-fullwidth-code-point": "1.0.0",
6164
+						"strip-ansi": "3.0.1"
6181
 					}
6165
 					}
6182
 				},
6166
 				},
6183
 				"string_decoder": {
6167
 				"string_decoder": {
6185
 					"bundled": true,
6169
 					"bundled": true,
6186
 					"optional": true,
6170
 					"optional": true,
6187
 					"requires": {
6171
 					"requires": {
6188
-						"safe-buffer": "~5.1.0"
6172
+						"safe-buffer": "5.1.2"
6189
 					}
6173
 					}
6190
 				},
6174
 				},
6191
 				"strip-ansi": {
6175
 				"strip-ansi": {
6192
 					"version": "3.0.1",
6176
 					"version": "3.0.1",
6193
 					"bundled": true,
6177
 					"bundled": true,
6194
-					"optional": true,
6195
 					"requires": {
6178
 					"requires": {
6196
-						"ansi-regex": "^2.0.0"
6179
+						"ansi-regex": "2.1.1"
6197
 					}
6180
 					}
6198
 				},
6181
 				},
6199
 				"strip-json-comments": {
6182
 				"strip-json-comments": {
6206
 					"bundled": true,
6189
 					"bundled": true,
6207
 					"optional": true,
6190
 					"optional": true,
6208
 					"requires": {
6191
 					"requires": {
6209
-						"chownr": "^1.1.1",
6210
-						"fs-minipass": "^1.2.5",
6211
-						"minipass": "^2.3.4",
6212
-						"minizlib": "^1.1.1",
6213
-						"mkdirp": "^0.5.0",
6214
-						"safe-buffer": "^5.1.2",
6215
-						"yallist": "^3.0.2"
6192
+						"chownr": "1.1.1",
6193
+						"fs-minipass": "1.2.5",
6194
+						"minipass": "2.3.5",
6195
+						"minizlib": "1.2.1",
6196
+						"mkdirp": "0.5.1",
6197
+						"safe-buffer": "5.1.2",
6198
+						"yallist": "3.0.3"
6216
 					}
6199
 					}
6217
 				},
6200
 				},
6218
 				"util-deprecate": {
6201
 				"util-deprecate": {
6225
 					"bundled": true,
6208
 					"bundled": true,
6226
 					"optional": true,
6209
 					"optional": true,
6227
 					"requires": {
6210
 					"requires": {
6228
-						"string-width": "^1.0.2 || 2"
6211
+						"string-width": "1.0.2"
6229
 					}
6212
 					}
6230
 				},
6213
 				},
6231
 				"wrappy": {
6214
 				"wrappy": {
6232
 					"version": "1.0.2",
6215
 					"version": "1.0.2",
6233
-					"bundled": true,
6234
-					"optional": true
6216
+					"bundled": true
6235
 				},
6217
 				},
6236
 				"yallist": {
6218
 				"yallist": {
6237
 					"version": "3.0.3",
6219
 					"version": "3.0.3",
6238
-					"bundled": true,
6239
-					"optional": true
6220
+					"bundled": true
6240
 				}
6221
 				}
6241
 			}
6222
 			}
6242
 		},
6223
 		},

+ 2
- 2
src/pages/activity/assembleItem/index.js Vedi File

73
         <Image className="pic" src={data.mainImg} ></Image>
73
         <Image className="pic" src={data.mainImg} ></Image>
74
         <View className="title">{data.activityName}</View>
74
         <View className="title">{data.activityName}</View>
75
         {(!data.verificationCode && data.status == 1) &&
75
         {(!data.verificationCode && data.status == 1) &&
76
-          <View className="time">参与截止时间: <Text className="count-time">{`${dayjs(data.endDate).format('YYYY-MM-DD hh:mm:ss')}`}</Text></View>
76
+          <View className="time">参与截止时间: <Text className="count-time">{`${dayjs(data.endDate).format('YYYY-MM-DD HH:mm:ss')}`}</Text></View>
77
         }
77
         }
78
         {(!data.verificationCode && data.status != 1) &&
78
         {(!data.verificationCode && data.status != 1) &&
79
           <View className="time"><Text className="count-time">活动已结束</Text></View>
79
           <View className="time"><Text className="count-time">活动已结束</Text></View>
84
             <View className="hexiaoma">核销码:{data.verificationCode}</View>
84
             <View className="hexiaoma">核销码:{data.verificationCode}</View>
85
           </Block>
85
           </Block>
86
         }
86
         }
87
-        <View className="start-date">{`${dayjs(data.createTime).format('YYYY-MM-DD hh:mm:ss')}`}</View>
87
+        <View className="start-date">{`${dayjs(data.createTime).format('YYYY-MM-DD HH:mm:ss')}`}</View>
88
         {data.status == 0 &&
88
         {data.status == 0 &&
89
           <Image className="status-icon" src={groupSuccess} ></Image>
89
           <Image className="status-icon" src={groupSuccess} ></Image>
90
         }
90
         }

+ 2
- 2
src/pages/activity/assistanceItem/index.js Vedi File

72
         <Image className="pic" src={data.img} ></Image>
72
         <Image className="pic" src={data.img} ></Image>
73
         <View className="title">{data.title}</View>
73
         <View className="title">{data.title}</View>
74
         {(!data.verification &&data.status == 1 )&&
74
         {(!data.verification &&data.status == 1 )&&
75
-          <View className="time">参与截止时间: <Text className="count-time">{`${dayjs(data.endDate).format('YYYY-MM-DD hh:mm:ss')}`}</Text></View>
75
+          <View className="time">参与截止时间: <Text className="count-time">{`${dayjs(data.endDate).format('YYYY-MM-DD HH:mm:ss')}`}</Text></View>
76
         }
76
         }
77
         {(!data.verification &&data.status != 1)&&
77
         {(!data.verification &&data.status != 1)&&
78
           <View className="time"><Text className="count-time">活动已结束</Text></View>
78
           <View className="time"><Text className="count-time">活动已结束</Text></View>
83
             <View className="hexiaoma">核销码:{data.verification}</View>
83
             <View className="hexiaoma">核销码:{data.verification}</View>
84
           </Block>
84
           </Block>
85
         }
85
         }
86
-        <View className="start-date">{`${dayjs(data.createDate).format('YYYY-MM-DD hh:mm:ss')}`}</View>
86
+        <View className="start-date">{`${dayjs(data.createDate).format('YYYY-MM-DD HH:mm:ss')}`}</View>
87
         {data.status == 0 &&
87
         {data.status == 0 &&
88
           <Image className="status-icon" src={helpSuccess} ></Image>
88
           <Image className="status-icon" src={helpSuccess} ></Image>
89
         }
89
         }

+ 1
- 1
src/pages/shop/integralDetail/index.js Vedi File

124
                 <View className="list-item" key={item.recId}>
124
                 <View className="list-item" key={item.recId}>
125
                   <View className="top">
125
                   <View className="top">
126
                     <View className="title-state">{item.recordName}</View>
126
                     <View className="title-state">{item.recordName}</View>
127
-                    <View className="title-time">{dayjs(item.createDate).format('YYYY-MM-DD hh:mm:ss')}</View>
127
+                    <View className="title-time">{dayjs(item.createDate).format('YYYY-MM-DD HH:mm:ss')}</View>
128
                   </View>
128
                   </View>
129
                   <View className="bottom">
129
                   <View className="bottom">
130
                     <View className={item.pointsAmount>0?'coin1':'coin2'}>{item.pointsAmount>0?'+'+item.pointsAmount:item.pointsAmount}</View>
130
                     <View className={item.pointsAmount>0?'coin1':'coin2'}>{item.pointsAmount>0?'+'+item.pointsAmount:item.pointsAmount}</View>

+ 1
- 1
src/pages/shop/record/index.js Vedi File

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

+ 1
- 1
src/pages/shop/rule/index.js Vedi File

56
                    <View className='rule_item'  key={item.ruleId}>
56
                    <View className='rule_item'  key={item.ruleId}>
57
                      <Text>{item.ruleName}</Text>
57
                      <Text>{item.ruleName}</Text>
58
                      <Text>+{item.pointsAmount}</Text>
58
                      <Text>+{item.pointsAmount}</Text>
59
-                     <Text>{dayjs(item.updateDate).format('YYYY-MM-DD hh:mm:ss')}</Text>
59
+                     <Text>{dayjs(item.updateDate).format('YYYY-MM-DD HH:mm:ss')}</Text>
60
                    </View>
60
                    </View>
61
                 ))
61
                 ))
62
             )
62
             )