516 Commits (dev)

Author	SHA1	Message	Date
xiaowen	fab9737ee9	cxw-010203	3 years ago
zx	3ac652828f	zx	3 years ago
xiaowen	1e73cc84db	Merge branch 'dd-7.15' into dev ... # Conflicts: # app.js # app.json # components/option/pictographicOption.js # pages/mine/pages/bindUser/index.js	3 years ago
Esdese	ee93550538	登录二	3 years ago
Esdese	1323571145	登录	3 years ago
zx	ff46631522	zx	3 years ago
liuyongli	50b30c32f2	no message	3 years ago
liuyongli	62314db793	no message	3 years ago
xiaowen	ece350738d	cxw-010203	3 years ago
liuyongli	b977e64db2	no message	3 years ago
liuyongli	1a0665eb62	no message	3 years ago
liuyongli	c5cb3cefc6	Merge branch 'dd-7' of git.oa00.com:xiaowen/swsWecat into dd-7 ... * 'dd-7' of git.oa00.com:xiaowen/swsWecat: w # Conflicts: # pages/index/Salesranking/Salesranking.wxss	3 years ago
liuyongli	036601accc	no message	3 years ago
wylyl22	4ec99013c8	w	3 years ago
xiaowen	802681013c	cxw-010204	3 years ago
wylyl22	e87c34242d	w	3 years ago
wylyl22	de6256a75e	wyl	3 years ago
liuyongli	d0f2ee26a4	lyl	3 years ago
liuyongli	a8f4bbcc47	lyl	3 years ago
wylyl22	d7401350fa	wyl	3 years ago
wylyl22	5c90e5cff2	wyl	3 years ago
liuyongli	aa82511d37	Merge branch 'dd-7' of git.oa00.com:xiaowen/swsWecat into dd-7 ... * 'dd-7' of git.oa00.com:xiaowen/swsWecat: wyl wyl cxw-010203 cxw-010203 # Conflicts: # pages/index/Salesranking/Allbrands/Allbrands.wxml # pages/index/Salesranking/Salesranking.js # pages/index/Salesranking/Salesranking.wxml	3 years ago
liuyongli	5b31842fd6	no message	3 years ago
wylyl22	6a18a0845c	wyl	3 years ago
zx	60a4aa7dfb	zx	3 years ago
wylyl22	43f3bbd9e0	wyl	3 years ago
liuyongli	fda21127f2	Merge branch 'dd-7' of git.oa00.com:xiaowen/swsWecat into dd-7 ... * 'dd-7' of git.oa00.com:xiaowen/swsWecat: wyl wyl wyl # Conflicts: # pages/index/Salesranking/Salesranking.wxss	3 years ago
liuyongli	463deba9de	no message	3 years ago
wylyl22	b05770152c	wyl	3 years ago
wylyl22	6b10c1b203	wyl	3 years ago
wylyl22	f83779912d	Merge branch 'dd-7' of https://git.oa00.com/xiaowen/swsWecat into dd-7	3 years ago
wylyl22	8908d0edb6	wyl	3 years ago
liuyongli	5211abdae6	no message	3 years ago
liuyongli	e25c88a49a	Merge branch 'dd-7' of git.oa00.com:xiaowen/swsWecat into dd-7 ... * 'dd-7' of git.oa00.com:xiaowen/swsWecat: wyl # Conflicts: # pages/index/Salesranking/Salesranking.wxss	3 years ago
liuyongli	5697038036	no message	3 years ago
wylyl22	de1efa504b	wyl	3 years ago
wylyl22	31ac9f0119	wyl	3 years ago
liuyongli	ef5275f031	Merge branch 'dd-7' of git.oa00.com:xiaowen/swsWecat into dd-7 ... * 'dd-7' of git.oa00.com:xiaowen/swsWecat: wyl	3 years ago
liuyongli	826c547cb7	no message	3 years ago
wylyl22	ddf9298d20	Merge branch 'dd-7' of https://git.oa00.com/xiaowen/swsWecat into dd-7	3 years ago
wylyl22	b55c5302d8	wyl	3 years ago
xiaowen	b334ee1172	cxw-010203	3 years ago
wylyl22	6a76cc0328	wyl	3 years ago
wylyl22	b5ed3043e4	wyl	3 years ago
liuyongli	112c57b8b9	no message	3 years ago
Esdese	73f406b552	Merge remote-tracking branch 'refs/remotes/origin/dd-7.15' into dev	3 years ago
Esdese	0cb6ded737	对比	3 years ago
zx	8fcd0a1c14	zx	3 years ago
wylyl22	d0002e6b39	wyl	3 years ago
wylyl22	f492c9a54e	wyl	3 years ago
wylyl22	97bb262b22	wyl	3 years ago
liuyongli	2d920a5a27	no message	3 years ago
wylyl22	fe062c0337	Merge branch 'dd-7' of https://git.oa00.com/xiaowen/swsWecat into dd-7	3 years ago
wylyl22	cabedb526f	wyl	3 years ago
xiaowen	b509a3a69e	cxw-010203	3 years ago
zx	e3420f298a	zx	3 years ago
wylyl22	29d36d469d	Merge branch 'dd-7' of https://git.oa00.com/xiaowen/swsWecat into dd-7 ... # Conflicts: # pages/index/Brandsales/Brandsales.js	3 years ago
wylyl22	d78d4da271	wyl	3 years ago
xiaowen	050032c178	cxw-010203	3 years ago
zx	4ab729915a	zx	3 years ago
liuyongli	50e7cd2e1d	Merge branch 'dd-7' of git.oa00.com:xiaowen/swsWecat into dd-7 ... * 'dd-7' of git.oa00.com:xiaowen/swsWecat: wyl cxw-010203 wyl # Conflicts: # pages/index/Salesranking/Vehicletype/Vehicletype.js	3 years ago
liuyongli	469c80a4ef	no message	3 years ago
wylyl22	b26d76edcf	Merge branch 'dd-7' of https://git.oa00.com/xiaowen/swsWecat into dd-7	3 years ago
wylyl22	952c3f1974	wyl	3 years ago
xiaowen	462d66f52e	Merge branch 'dd-7' of https://git.oa00.com/xiaowen/swsWecat into dd-7 ... * 'dd-7' of https://git.oa00.com/xiaowen/swsWecat: wyl no message wyl no message wyl # Conflicts: # pages/detail/index.js	3 years ago
xiaowen	e32cf9a457	cxw-010203	3 years ago
zx	c29d27a97a	zx	3 years ago
wylyl22	1704b589ca	Merge branch 'dd-7' of https://git.oa00.com/xiaowen/swsWecat into dd-7	3 years ago
wylyl22	74cc3d02d9	wyl	3 years ago
liuyongli	cedd178931	Merge branch 'dd-7' of git.oa00.com:xiaowen/swsWecat into dd-7 ... * 'dd-7' of git.oa00.com:xiaowen/swsWecat: wyl # Conflicts: # pages/index/Salesranking/Vehicletype/Vehicletype.js	3 years ago
liuyongli	0e3668bdf1	no message	3 years ago
wylyl22	cfd3bbd355	wyl	3 years ago
wylyl22	f7076be791	wyl	3 years ago
liuyongli	9592451b0a	Merge branch 'dd-7' of git.oa00.com:xiaowen/swsWecat into dd-7 ... * 'dd-7' of git.oa00.com:xiaowen/swsWecat: wyl cxw-010203 # Conflicts: # pages/index/Salesranking/Vehicletype/Vehicletype.js	3 years ago
liuyongli	42a756f6c4	no message	3 years ago
zx	98225d5b0d	zx	3 years ago
wylyl22	4f34912e9b	wyl	3 years ago
wylyl22	499a465195	wyl	3 years ago
xiaowen	5b8624a7db	cxw-010203	3 years ago
liuyongli	f1a149a13b	Merge branch 'dd-7' of git.oa00.com:xiaowen/swsWecat into dd-7 ... * 'dd-7' of git.oa00.com:xiaowen/swsWecat: no message cxw-010203 cxw-010203	3 years ago
liuyongli	acb40b87c8	no message	3 years ago
xiaowen	c960909ab1	no message	3 years ago
xiaowen	77c0f13ebb	cxw-010203	3 years ago
xiaowen	b1a29d2184	cxw-010203	3 years ago
liuyongli	bd657a3488	lyl	3 years ago
liuyongli	1f1afc802b	no message	3 years ago
wylyl22	5f994ea039	wyl	3 years ago
Esdese	8ca33ec170	Merge remote-tracking branch 'refs/remotes/origin/dd-7.15' into dev	3 years ago
Esdese	d90ca64943	登录流程	3 years ago
wylyl22	1c741e63f4	Merge branch 'dd-7' of https://git.oa00.com/xiaowen/swsWecat into dd-7	3 years ago
wylyl22	889cd97e64	wyl	3 years ago
liuyongli	36ca18ee7d	Merge branch 'dd-7' of git.oa00.com:xiaowen/swsWecat into dd-7 ... * 'dd-7' of git.oa00.com:xiaowen/swsWecat: cxw-010203 cxw-010203 cxw-010203 cxw-010203 cxw-010203 wyl cxw-010203	3 years ago
liuyongli	d08f650c48	no message	3 years ago
xiaowen	3717086a3f	cxw-010203	3 years ago
xiaowen	81d2672f40	cxw-010203	3 years ago
zx	9f011bbafa	zx	3 years ago
xiaowen	29923624e0	cxw-010203	3 years ago
xiaowen	26d21452c1	cxw-010203	3 years ago
xiaowen	cfa3037c0b	cxw-010203	3 years ago
wylyl22	1b3a1fed98	wyl	3 years ago
wylyl22	fc0a14a11a	wyl	3 years ago
liuyongli	794a9f2803	lyl	3 years ago
liuyongli	be7cca8074	no message	3 years ago
wylyl22	b097285cd2	wyl	3 years ago
wylyl22	d42a8230b4	wyl	3 years ago
xiaowen	97b039edd3	cxw-010203	3 years ago
zx	d8fdc37ea2	Merge branch 'dd-7.15' of https://git.oa00.com/xiaowen/swsWecat into dd-7.15	3 years ago
zx	acc281a810	zx	3 years ago
xiaowen	8f57b19873	cxw-010203	3 years ago
wylyl22	7348d51134	wyl	3 years ago
wylyl22	5f1acd8f0f	wyl	3 years ago
liuyongli	6766c89be7	lyl	3 years ago
Esdese	b6967b121b	对比开发	3 years ago
wylyl22	61f78758ef	wyl	3 years ago
wylyl22	2eb66e5681	wyl	3 years ago
liuyongli	b734abe6c6	lyl	3 years ago
liuyongli	709c8c9914	no message	3 years ago
wylyl22	7fe27a82bc	wyl	3 years ago
liuyongli	848388c206	Merge branch 'dd-7' of git.oa00.com:xiaowen/swsWecat into dd-7 ... * 'dd-7' of git.oa00.com:xiaowen/swsWecat: cxw-010203	3 years ago
liuyongli	4b50d3772c	no message	3 years ago
Esdese	cf6ed13500	Merge remote-tracking branch 'refs/remotes/origin/dd-7.15' into dev	3 years ago
Esdese	b3f279f41c	7.21	3 years ago
xiaowen	28d01c825e	cxw-010203	3 years ago
wylyl22	378c931bd6	Merge branch 'dd-7' of https://git.oa00.com/xiaowen/swsWecat into dd-7	3 years ago
wylyl22	c01a92c43f	wyl	3 years ago
zx	9b39bc911a	zx	3 years ago
liuyongli	468390cbef	no message	3 years ago
xiaowen	f0d4ad660d	cxw-010203	3 years ago
liuyongli	6e739281ea	Merge branch 'dd-7' of git.oa00.com:xiaowen/swsWecat into dd-7 ... * 'dd-7' of git.oa00.com:xiaowen/swsWecat: wyl cxw-010203	3 years ago
liuyongli	f09381eb80	no message	3 years ago
wylyl22	d49bc6b7c3	Merge branch 'dd-7' of https://git.oa00.com/xiaowen/swsWecat into dd-7	3 years ago
wylyl22	c65faed38d	wyl	3 years ago
xiaowen	e57af3faa1	cxw-010203	3 years ago
wylyl22	5d427961e5	wyl	3 years ago
wylyl22	59c4d4c8f4	wyl	3 years ago
zx	70d0ce4253	zx	3 years ago
liuyongli	1868f7500d	lyl	3 years ago
liuyongli	e3062c1c36	no message	3 years ago
wylyl22	a5e666062e	wyl	3 years ago
zx	3025b28a1e	zx	3 years ago
wylyl22	84fbed8197	wyl	3 years ago
wylyl22	dcfe896842	wyl	3 years ago
liuyongli	b1938c7cba	no message	3 years ago
zx	2f8f2dad36	zx	3 years ago
xiaowen	cd707ba36a	cxw-010203	3 years ago
zx	09276fe8d6	zx	3 years ago
xiaowen	2b909bfc7d	cxw-010203	3 years ago
wylyl22	ea5c73d9a4	wyl	3 years ago
wylyl22	1e3994271e	wyl	3 years ago
liuyongli	8fa4e2fc11	no message	3 years ago
liuyongli	c227c7d5c8	no message	3 years ago
zx	e41edba78c	zx	3 years ago
xiaowen	ba2ba87551	cxm-010203	3 years ago
liuyongli	946f585f7d	no message	3 years ago
xiaowen	25f280eb3f	Merge branch 'dd-7' of https://git.oa00.com/xiaowen/swsWecat into dd-7 ... * 'dd-7' of https://git.oa00.com/xiaowen/swsWecat: wyl no message wyl wyl no message no message wyl wyl no message wyl # Conflicts: # project.private.config.json	3 years ago
xiaowen	4db01a3a66	cxw-010203	3 years ago
zx	16e08835ba	zx	3 years ago
wylyl22	9a03632e31	wyl	3 years ago
zx	259f16cb28	zx	3 years ago
zx	0232d312ec	zx	3 years ago
liuyongli	c480348a33	Merge branch 'dd-7' of git.oa00.com:xiaowen/swsWecat into dd-7 ... * 'dd-7' of git.oa00.com:xiaowen/swsWecat: wyl 词云 # Conflicts: # pages/index/Salesranking/Vehicletype/Vehicletype.wxml	3 years ago
liuyongli	f81c510994	no message	3 years ago
wylyl22	958b79f121	wyl	3 years ago
wylyl22	010e0f4c01	wyl	3 years ago
wylyl22	8463179a08	词云	3 years ago
liuyongli	f88ab0da49	no message	3 years ago
liuyongli	8d5520aab3	Merge branch 'dev' of git.oa00.com:xiaowen/swsWecat into dev ... * 'dev' of git.oa00.com:xiaowen/swsWecat: wyl cxw-010023 zx 销量排行 # Conflicts: # project.private.config.json	3 years ago
liuyongli	6b2300b388	no message	3 years ago
xiaowen	3a39258ecc	cxw-010023	3 years ago
zx	9ed287bf6b	zx	3 years ago
wylyl22	5c95bf7cba	销量排行	3 years ago
wylyl22	acd9e88539	销量排行	3 years ago
liuyongli	8a97578504	no message	3 years ago
zx	6b843c1df8	zx	3 years ago
liuyongli	53f80533b4	no message	3 years ago
zx	ea3fe4844e	Merge branch 'dev' of https://git.oa00.com/xiaowen/swsWecat into dev	3 years ago
zx	c1c02fb335	zx	3 years ago
xiaowen	f0d39648ca	cxw-010203	3 years ago
Esdese	c81554f51a	Merge remote-tracking branch 'refs/remotes/origin/dev' into dev	3 years ago
Esdese	532f95a7de	lhf	3 years ago
liuyongli	c75c1042c9	Merge branches 'dev' and 'dev' of git.oa00.com:xiaowen/swsWecat into dev ... * 'dev' of git.oa00.com:xiaowen/swsWecat: lhf no message 接口调试 * 'dev' of git.oa00.com:xiaowen/swsWecat: lhf no message 接口调试	3 years ago
liuyongli	3776705517	no message	3 years ago
Esdese	136ecec7f6	Merge remote-tracking branch 'refs/remotes/origin/dev' into dev	3 years ago
Esdese	4b0791af79	lhf	3 years ago
xiaowen	975b702706	Merge branch 'dev' of https://git.oa00.com/xiaowen/swsWecat into dev ... * 'dev' of https://git.oa00.com/xiaowen/swsWecat: 712 zx option no message	3 years ago
xiaowen	eb836b5aa8	no message	3 years ago
wylyl22	c9fbf7c49a	Merge branch 'dev' of https://git.oa00.com/xiaowen/swsWecat into dev	3 years ago
wylyl22	5b7bf08360	712	3 years ago
zx	bfd5af76b4	zx	3 years ago
liuyongli	a39db59b08	no message	3 years ago
liuyongli	4dfe64a8fc	Merge branch 'dev' of git.oa00.com:xiaowen/swsWecat into dev ... * 'dev' of git.oa00.com:xiaowen/swsWecat: no message zx cxw-010203 zx	3 years ago
liuyongli	eb322a2dbf	no message	3 years ago
Esdese	fe75ecbcde	Merge remote-tracking branch 'refs/remotes/origin/dev' into dev	3 years ago
xiaowen	9401f7366a	Merge branch 'dev' of https://git.oa00.com/xiaowen/swsWecat into dev ... * 'dev' of https://git.oa00.com/xiaowen/swsWecat: zx # Conflicts: # pages/insight/themeChild/index.wxml # pages/insight/themeChild/index.wxss	3 years ago
xiaowen	0087ab10be	no message	3 years ago
Esdese	10a2917a88	Merge remote-tracking branch 'refs/remotes/origin/dev' into dev	3 years ago
Esdese	73054b2a5c	接口调试	3 years ago
zx	0b6ad510a2	zx	3 years ago
zx	f267d83228	zx	3 years ago
Esdese	b54629731a	Merge remote-tracking branch 'refs/remotes/origin/dev' into dev	3 years ago
Esdese	0c04d6d1b9	...	3 years ago
wylyl22	8a30a9ea84	Merge branch 'dev' of https://git.oa00.com/xiaowen/swsWecat into dev	3 years ago
wylyl22	a35bb9f157	1	3 years ago
liuyongli	ff7ef22ff1	Merge branch 'dev' of git.oa00.com:xiaowen/swsWecat into dev ... * 'dev' of git.oa00.com:xiaowen/swsWecat: no message	3 years ago
liuyongli	3e37a4f399	no message	3 years ago
xiaowen	92c15d60b0	no message	3 years ago
liuyongli	e6c12336cd	no message	3 years ago
xiaowen	455cb13b09	cxw-010203	3 years ago
liuyongli	a038c448b9	Merge branch 'dev' of git.oa00.com:xiaowen/swsWecat into dev ... * 'dev' of git.oa00.com:xiaowen/swsWecat: 弹出框	3 years ago
liuyongli	0b695b1866	no message	3 years ago
wylyl22	7f2cf926db	Merge branch 'dev' of https://git.oa00.com/xiaowen/swsWecat into dev	3 years ago
wylyl22	29d56a69c2	弹出框	3 years ago
liuyongli	4700f0bbc4	Merge branch 'dev' of git.oa00.com:xiaowen/swsWecat into dev ... * 'dev' of git.oa00.com:xiaowen/swsWecat: 排行榜	3 years ago
liuyongli	04138f024a	no message	3 years ago
wylyl22	bde7fb29cf	1	3 years ago
wylyl22	1c30cb99ee	排行榜	3 years ago
liuyongli	a80e4a31d4	no message	3 years ago
liuyongli	356e69f320	Merge branch 'dev' of git.oa00.com:xiaowen/swsWecat into dev ... * 'dev' of git.oa00.com:xiaowen/swsWecat: 重塑排行榜 no message # Conflicts: # pages/index/Rankdetail/Rankdetail.js # pages/index/Rankdetail/Rankdetail.wxml	3 years ago
liuyongli	d384c3c9d8	no message	3 years ago
wylyl22	fa524a0566	重塑排行榜	3 years ago
wylyl22	3b48af5273	重塑排行榜	3 years ago
xiaowen	60526bfe58	Merge branch 'dev' of https://git.oa00.com/xiaowen/swsWecat into dev ... * 'dev' of https://git.oa00.com/xiaowen/swsWecat: no message 1 # Conflicts: # components/indexCom/dataChild/index.wxml	3 years ago
xiaowen	928c5a06d3	no message	3 years ago
liuyongli	8adba1dfc4	Merge branch 'dev' of git.oa00.com:xiaowen/swsWecat into dev ... * 'dev' of git.oa00.com:xiaowen/swsWecat: 1 # Conflicts: # pages/index/Rankdetail/Rankdetail.wxml	3 years ago
liuyongli	54e2d5ed79	no message	3 years ago
wylyl22	87a74f85d9	1	3 years ago
wylyl22	e516188204	1	3 years ago
xiaowen	6b9e290830	cxw-010203	3 years ago
liuyongli	f50009b056	no message	3 years ago
xiaowen	466bdd73d5	cxw-010203	3 years ago
liuyongli	ed3a3367dc	Merge branch 'dev' of git.oa00.com:xiaowen/swsWecat into dev ... * 'dev' of git.oa00.com:xiaowen/swsWecat: cxw-010203 1 1 # Conflicts: # pages/index/Rankdetail/Rankdetail.js # pages/index/Rankdetail/Rankdetail.json	3 years ago
liuyongli	1ad26449cb	no message	3 years ago
xiaowen	e1298225f0	Merge branch 'dev' of https://git.oa00.com/xiaowen/swsWecat into dev ... * 'dev' of https://git.oa00.com/xiaowen/swsWecat: 1 1 no message 1 排行 排行 no message 排行 no message no message 排行 对比开发 # Conflicts: # app.json	3 years ago
xiaowen	d37b204f44	cxw-010203	3 years ago
wylyl22	17825d24e3	1	3 years ago
wylyl22	608cccd585	1	3 years ago
wylyl22	5d3c084ccb	1	3 years ago
liuyongli	29a0108921	no message	3 years ago
wylyl22	45aaabe0c0	1	3 years ago
wylyl22	b7745222ce	排行	3 years ago
wylyl22	431743ecc9	排行	3 years ago
wylyl22	e62ddd2f60	排行	3 years ago
liuyongli	eb3071f41e	no message	3 years ago
wylyl22	a298c11016	Merge branch 'dev' of https://git.oa00.com/xiaowen/swsWecat into dev	3 years ago
wylyl22	4b60cd606c	排行	3 years ago
liuyongli	cbf6738357	no message	3 years ago
liuyongli	8f60753d8e	Merge branch 'dev' of git.oa00.com:xiaowen/swsWecat into dev ... * 'dev' of git.oa00.com:xiaowen/swsWecat: 排行 对比开发 # Conflicts: # app.json # project.private.config.json	3 years ago
liuyongli	6fd5dc1618	no message	3 years ago
wylyl22	5c3603807b	Merge branch 'dev' of https://git.oa00.com/xiaowen/swsWecat into dev	3 years ago
wylyl22	0fd8efd1d3	排行	3 years ago