静态页面

project.config.json

@@ -27,7 +27,7 @@
 			"outputPath": ""
 		},
 		"useIsolateContext": true,
-		"useCompilerModule": true,
+		"useCompilerModule": false,
 		"userConfirmedUseCompilerModuleSwitch": false
 	},
 	"compileType": "miniprogram",

src/assets/css/iconfont.json

@@ -5,6 +5,69 @@
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "1167166",
+      "name": "交通",
+      "font_class": "jiaotong",
+      "unicode": "e634",
+      "unicode_decimal": 58932
+    },
+    {
+      "icon_id": "3206111",
+      "name": "学校",
+      "font_class": "xuexiao",
+      "unicode": "e63f",
+      "unicode_decimal": 58943
+    },
+    {
+      "icon_id": "10931550",
+      "name": "商业",
+      "font_class": "shangye",
+      "unicode": "e60f",
+      "unicode_decimal": 58895
+    },
+    {
+      "icon_id": "16024449",
+      "name": "银行",
+      "font_class": "yinhang",
+      "unicode": "e64e",
+      "unicode_decimal": 58958
+    },
+    {
+      "icon_id": "19608543",
+      "name": "医院",
+      "font_class": "yiyuan",
+      "unicode": "e604",
+      "unicode_decimal": 58884
+    },
+    {
+      "icon_id": "1682792",
+      "name": "贴心服务",
+      "font_class": "tiexin",
+      "unicode": "e788",
+      "unicode_decimal": 59272
+    },
+    {
+      "icon_id": "3350537",
+      "name": "保障",
+      "font_class": "baozhang",
+      "unicode": "e615",
+      "unicode_decimal": 58901
+    },
+    {
+      "icon_id": "5643542",
+      "name": "咨询",
+      "font_class": "zixun",
+      "unicode": "e610",
+      "unicode_decimal": 58896
+    },
+    {
+      "icon_id": "5743821",
+      "name": "政策解读",
+      "font_class": "jiedu",
+      "unicode": "e789",
+      "unicode_decimal": 59273
+    },
     {
       "icon_id": "17169429",
       "name": "分 享",

src/assets/css/iconfont.svg

@@ -20,6 +20,33 @@ Created by iconfont
   />
     <missing-glyph />
     
+    <glyph glyph-name="jiaotong" unicode="&#58932;" d="M869.76159781 95.83633499999996l-19.94871469 576.56141156c0 51.59190094-44.65868156 93.41186719-99.74453343 93.41186719L271.29248 765.80961281c-55.08681094 0-99.74357344-41.82092531-99.74357344-93.41186719L151.59923187 95.83633499999996l69.13840407 0c-0.50173969-2.63629219-0.81928406-5.34165844-0.81928407-8.12569125l0-18.960585c0-23.93385281 19.40188594-43.33669781 43.33669782-43.33669781l62.29824187 0c23.93673094 0 43.33861687 19.40380406 43.33861688 43.33669781L368.8919075 87.71064375000003c0 2.78307281-0.31754437 5.48843906-0.81928406 8.12569125l285.21750281 0c-0.50173969-2.63629219-0.81928406-5.34165844-0.81928406-8.12569125l0-18.960585c0-23.93385281 19.402845-43.33669781 43.33861687-43.33669781l62.29824188 0c23.93481188 0 43.33861687 19.40380406 43.33861687 43.33669781L801.446315 87.71064375000003c0 2.78307281-0.31754437 5.48843906-0.81928406 8.12569125L869.76159781 95.83633499999996zM274.68953656 186.18020156c-30.24829125 0-54.77118469 24.52289344-54.77118469 54.77310375 0 30.25021031 24.52289344 54.77310375 54.77118469 54.77310375 30.25212937 0 54.77310375-24.52289344 54.77310375-54.77310375C329.46264031 210.70309499999996 304.94166594 186.18020156 274.68953656 186.18020156zM235.89727719 385.01115469l7.4224875 236.69552062c0 52.20204656 19.01047125 72.85012781 67.06716843 72.85012781l400.3212225 0c48.05669719 0 67.06716844-20.64808031 67.06716844-72.85012781l7.68918656-236.69552062L235.89727719 385.01115469zM746.67129313 186.18020156c-30.25021031 0-54.77310375 24.52289344-54.77310376 54.77310375 0 30.25021031 24.52289344 54.77310375 54.77310375 54.77310375 30.25021031 0 54.77310375-24.52289344 54.77310376-54.77310375C801.44439687 210.70309499999996 776.92150344 186.18020156 746.67129313 186.18020156z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="xuexiao" unicode="&#58943;" d="M987.009 549.331c-24.672 11.415-414.621 187.426-414.621 187.426S529.674 757.011 512 757.011c-17.675 0-60.388-20.254-60.388-20.254S61.661 560.745 36.991 549.331c-24.672-11.415 0-25.775 0-25.775s333.612-151.341 394.367-178.221c49.711-22.095 60.756-21.725 80.641-21.725 19.884 0 30.93-0.369 80.641 21.725 41.979 18.78 213.571 96.476 315.936 142.871v-129.983l-33.509-33.509 46.765-46.765 46.765 46.765-33.509 33.509V500.357c31.668 14.361 51.92 23.568 51.92 23.568s24.672 14.361 0 25.408zM512 280.896c-19.884 0-30.93-0.369-80.641 21.725-30.195 13.625-127.774 57.442-218.356 98.684v-298.997c90.583-40.873 188.162-85.059 218.356-98.684 49.711-22.095 60.756-21.725 80.641-21.725 19.884 0 30.93-0.369 80.641 21.725 30.195 13.625 127.774 57.442 218.356 98.684V401.305c-90.583-40.873-188.162-85.059-218.356-98.684-49.711-22.462-60.756-21.725-80.641-21.725z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="shangye" unicode="&#58895;" d="M195.59375 348.84374973h632.8125v-281.32031196a35.015625 35.015625 0 0 0-34.91015625-35.08593804H230.50390625A34.98046848 34.98046848 0 0 0 195.59375 67.52343776999999V348.84374973zM195.59375 700.47656223C195.59375 719.84765652 211.23828152 735.56250027 230.50390625 735.56250027h562.9921875c19.26562473 0 34.91015625-15.67968723 34.91015625-35.08593804V419.15625027H195.59375V700.47656223zM406.53125 630.09375027v-70.31250054h210.9375V630.09375027H406.53125z m0-386.71875054v-70.31249973h210.9375v70.31249973H406.53125z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="yinhang" unicode="&#58958;" d="M918.9376 151.7568V510.3616H105.1648v-356.6592c-1.9456-12.4928 0.9216-25.3952 8.192-35.84 7.0656-10.1376 18.0224-16.9984 30.3104-18.8416h736.8704c24.8832 4.4032 41.7792 27.648 38.4 52.736zM188.2112 380.7232h-27.8528v66.048h27.8528v-66.048z m72.9088 0h-28.0576v66.048H261.12v-66.048z m74.1376 0H307.2v66.048h28.0576v-66.048z m505.1392-162.5088h-128l31.3344 98.304h127.7952l-31.1296-98.304zM105.1648 617.6768c-2.6624 24.576 14.1312 47.0016 38.5024 51.3024h736.8704c24.064-4.608 40.6528-26.9312 38.0928-51.3024v-53.1456H105.1648v53.1456z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="yiyuan" unicode="&#58884;" d="M698.045 654.585l-134.37 134.355c-11.055-20.16-32.19-34.005-56.835-34.005-24.63 0-45.78 13.845-56.835 34.005l-134.355-134.355c-15.06-15.06-15.06-39.705 0-54.765l126.15-126.165L441.8 611.7c0 8.55 6.915 15.48 15.495 15.48l99.105 0c8.55 0 15.465-6.93 15.465-15.48l0-138.06 126.18 126.165C713.105 614.865 713.105 639.51 698.045 654.585M777.98 192.22500000000002l134.37 134.37c-20.175 11.055-34.02 32.19-34.02 56.835 0 24.615 13.845 45.795 34.02 56.85l-134.37 134.355c-15.06 15.045-39.705 15.045-54.75 0l-126.135-126.165 138.015 0c8.55 0 15.495-6.93 15.495-15.48l0-99.105c0-8.565-6.945-15.48-15.495-15.48l-138.015 0 126.135-126.165C738.275 177.16499999999996 762.935 177.16499999999996 777.98 192.22500000000002M315.65 112.28999999999996l134.355-134.37c11.055 20.16 32.205 34.005 56.835 34.005 24.645 0 45.78-13.845 56.835-34.005l134.37 134.37c15.06 15.06 15.06 39.69 0 54.75l-126.18 126.135 0-138.03c0-8.535-6.915-15.495-15.465-15.495l-99.105 0c-8.565 0-15.495 6.96-15.495 15.495l0 138.03-126.15-126.135C300.59 151.98000000000002 300.59 127.35000000000002 315.65 112.28999999999996M235.7 574.62l-134.37-134.355c20.175-11.07 34.005-32.235 34.005-56.85 0-24.63-13.83-45.765-34.005-56.835l134.37-134.37c15.06-15.06 39.72-15.06 54.765 0l126.15 126.165-138.045 0c-8.55 0-15.48 6.915-15.48 15.48l0 99.09c0 8.565 6.93 15.495 15.48 15.495l138.045 0-126.15 126.165C275.42 589.6800000000001 250.76 589.6800000000001 235.7 574.62"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="tiexin" unicode="&#59272;" d="M511.08021414 136.02579943c97.20294314 0 176.04696592 78.84402279 176.04696593 176.04696594-152.90515958-34.767896-352.09393186 0-352.09393187 0 0-97.20294314 78.82562705-176.04696592 176.04696593-176.04696594m362.94740241 205.79283274a30.53688243 30.53688243 0 0 1-35.79805635-23.73046875C806.82807992 163.36182786999996 669.26494339 51.037609119999956 511.06181839 51.037609119999956 327.01271824 51.037609119999956 177.19803817 200.81549769000003 177.19803817 384.91978586S327.01271824 718.80196183 511.08021414 718.80196183c157.96398104 0 295.47192956-112.14026127 327.07576307-266.57226562a30.22415549 30.22415549 0 0 1 35.83484785-23.63849002 30.35292494 30.35292494 0 0 1 23.62009426 35.81645212C860.28601896 647.00349744 697.72311013 779.5078125 511.08021414 779.5078125 293.49573002 779.5078125 116.4921875 602.48587423 116.4921875 384.91978586S293.49573002-9.668241540000054 511.08021414-9.668241540000054c186.93722721 0 349.55532326 132.74345902 386.6962669 315.67042161a30.44490369 30.44490369 0 0 1-23.73046875 35.8164521m-107.98283068 126.50731276c0 21.08148642-64.01707838 67.47547208-101.23160425 67.47547208-37.26971312 0-67.51226357-43.76339908-67.51226435-67.47547208 0-23.74886451 30.24255123 0 67.51226435 0 37.23292162 0 101.2132085-21.11827792 101.2132085 0m-408.71593417 1.71080072c-37.23292162 0-101.2132085-21.09988217-101.21320851 0 0 21.08148642 63.98028688 67.51226357 101.21320851 67.51226433 37.28810887 0 67.51226357-43.80019057 67.51226358-67.51226433 0-23.73046875-30.22415549 0-67.51226358 0"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="baozhang" unicode="&#58901;" d="M895.7890625 668.3278124999999c0 12.9215625-8.62124999 21.538125-21.538125 25.8478125L533.9215625 788.953125c-12.9309375 4.310625-30.1584375 4.310625-38.775 0L154.80875001 694.175625c-12.92624999-4.305-17.236875-12.9215625-21.53718752-25.84687499 0-4.31156249-17.236875-137.86125001 17.22656251-288.64406251 21.538125-90.4753125 56.00625001-168.01875001 107.7028125-232.6275 60.316875-77.548125 142.171875-133.554375 241.2525-168.02343751 8.62124999-4.3059375 17.236875-4.3059375 30.159375 0 99.0853125 34.45875001 180.935625 90.4753125 241.2525 168.02343751 47.390625 64.60875001 86.16 142.153125 107.6971875 232.6275 34.4540625 150.7921875 17.2275 284.338125 17.2275 288.643125zM818.24375001 392.62124999C775.16 211.6846875 671.778125 91.04999999999995 512.375 39.35531249999997c-159.3984375 56.0109375-262.790625 172.329375-305.8696875 353.26593751-25.84874998 112.0078125-21.538125 211.089375-17.2321875 254.17406249L512.375 737.26125001l323.1075-90.46593751c4.30124999-43.0846875 8.6109375-146.4815625-17.236875-254.175zM460.6784375 267.6909375l-107.7028125 103.3875c-12.92624999 12.9215625-12.92624999 30.1584375 0 43.08 12.9215625 12.92624999 30.159375 12.92624999 43.08562499 0l86.15437501-81.849375L658.84624999 496.0125c12.9309375 12.92624999 30.159375 12.92624999 43.08937501 0 12.9215625-12.9215625 12.9215625-30.1584375 0-43.08l-198.1725-185.240625c-4.310625-4.3059375-12.9215625-8.62124999-21.5371875-8.62125-8.62124999 0-17.2415625 4.310625-21.5475 8.6203125z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="zixun" unicode="&#58896;" d="M817.956 495.533h-36.287v13.471c0 72.697-28.521 141.145-80.221 192.967-51.7 51.7-120.271 80.221-192.967 80.221s-141.145-28.521-192.967-80.221c-51.7-51.7-80.221-120.271-80.221-192.967v-13.471h-35.195c-52.914 0-89.808-36.895-89.808-89.808v-154.01c0-49.516 40.292-89.808 89.808-89.808h46.239v-0.242c0-69.541 56.676-126.218 126.218-126.218h41.991c1.942-24.88 22.938-44.661 48.423-44.661h92.479c26.7 0 48.545 21.845 48.545 48.545v31.312c0 26.7-21.845 48.545-48.545 48.545h-92.479c-25.486 0-46.482-19.903-48.423-44.905h-41.991c-48.181 0-87.381 39.2-87.381 87.381v8.738l0.85 0.85c0.485 0.485 0.971 1.092 1.334 1.578 0.122 0.122 0.122 0.242 0.242 0.364 0.485 0.607 0.85 1.092 1.214 1.699 0 0.122 0.122 0.122 0.122 0.242 0.364 0.607 0.729 1.092 1.092 1.699 0 0.122 0.122 0.122 0.122 0.242 0.364 0.607 0.607 1.214 0.971 1.942 0 0.122 0.122 0.242 0.122 0.364 0.242 0.607 0.485 1.334 0.729 1.942 0 0.122 0.122 0.242 0.122 0.242 0.242 0.607 0.485 1.334 0.607 2.063v0.122c0.242 0.729 0.364 1.456 0.485 2.185 0 0.122 0 0.242 0.122 0.364 0.122 0.729 0.242 1.456 0.242 2.185v0.364c0 0.729 0.122 1.578 0.122 2.306v317.85c0 118.45 96.362 214.813 214.813 214.813s214.813-96.362 214.813-214.813v-317.971a29.057 29.057 0 0 1 29.127-29.127h65.294c49.516 0 89.808 40.292 89.808 89.808v154.01c0.242 52.914-36.652 89.808-89.566 89.808zM168.543 251.714v154.01c0 26.093 17.113 31.554 31.554 31.554h35.316v-217.119h-35.316c-17.476 0-31.554 14.199-31.554 31.554z m680.967 0c0-17.355-14.199-31.554-31.554-31.554h-36.287V437.279h36.287c14.442 0 31.554-5.461 31.554-31.554v-154.01z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="jiedu" unicode="&#59273;" d="M407.25800822 449.81038805l-9.59114324-76.49049407a22.23589263 22.23589263 0 0 1 5.4889756-17.46287113 22.24246948 22.24246948 0 0 1 16.57497617-7.42073387h0.16818275c3.14568452 0 6.34398471 0.69716209 9.30081578 2.04074924l69.92664952 32.78070021 69.88530814-32.39735503a22.08556103 22.08556103 0 0 1 9.42859726-2.09806312 22.12972118 22.12972118 0 0 1 12.79789973 4.05425016 22.27347591 22.27347591 0 0 1 9.32618391 20.27594748l-9.61557204 76.71787013 52.62350562 56.14126024a22.2180407 22.2180407 0 0 1 5.00979394 22.12220421 22.2142826 22.2142826 0 0 1-16.98181002 14.9889798L555.87280873 557.6252468800001l-37.23802613 67.44242323c-3.90109981 7.12570822-11.39981746 11.55296783-19.56938976 11.55296783a22.19549135 22.19549135 0 0 1-19.47637205-11.52384086l-37.25306006-67.4715502-75.70501248-14.55771638a22.21146384 22.21146384 0 0 1-17.00060205-14.99273789c-2.50771575-7.73924821-0.59568807-16.20948292 4.97221143-22.08650113l52.65545059-56.17790343z m138.70890103 5.25596126l5.87419945-47.37318188-42.97222973 19.8343491c-5.78493983 2.71442109-13.10513978 2.71442109-18.8863215 0l-42.83035444-20.09461024 5.85352876 47.20593846c0.84843301 6.57793839-1.2618445 13.14084364-5.79903365 18.01627771l-32.24890365 34.41555493 45.99764974 8.93720198a22.16824379 22.16824379 0 0 1 15.33004349 11.10385249l22.77144882 41.21711051 22.86352643-41.85038187c3.20863592-5.82346244 8.80378222-9.87583317 15.37608308-11.1217044l45.90839012-8.44956402-31.45872385-33.89221313c-4.51745856-4.85664359-6.62303787-11.40733443-5.77930307-17.94862964zM419.73081675 353.13414545zM669.30536475 777.62866992v0.10335266H242.53801756C209.06297326 777.73202258 181.82950108 750.49855042 181.82950108 717.02350688v-667.07020714c0-33.47504354 27.23347217-60.70851571 60.70851648-60.70851571h538.78960655c33.47504354 0 60.70851571 27.23347217 60.7085157 60.70851571V605.00124753h0.13435911L669.30536475 777.62866992z m44.44641712-128.18100527v34.24455266l34.24455265-34.24455266h-34.24455265zM226.2796763 717.02350688c0 4.34457761 1.69122848 8.427954 4.76080788 11.49753339A16.15122972 16.15122972 0 0 0 242.53707747 733.28090804h421.624135l5.14415228-5.14415305V605.00124753h123.1373869l5.14415227-5.14321295v-549.90473485c0-4.34457761-1.69122848-8.427954-4.75986776-11.49753262a16.15498782 16.15498782 0 0 0-11.49847272-4.76456597H242.53801756a16.15404847 16.15404847 0 0 0-11.49659405 4.76362588 16.15686725 16.15686725 0 0 0-4.76174721 11.49847271V717.02350688zM322.94182586 264.60116693h352.32417842v-44.45017523H322.94182586zM322.94182586 161.97461975h352.32417842v-44.45017522H322.94182586z"  horiz-adv-x="1024" />
+
+    
     <glyph glyph-name="fenxiang" unicode="&#58894;" d="M857.03473144 234.56598896000003a145.69076425 145.69076425 0 0 1-135.99176748-84.51247763L422.04630781 277.24671973a176.12554658 176.12554658 0 0 1 27.0131212 95.83226191 180.47337276 180.47337276 0 0 1-5.14535625 43.55544112l190.86699198 148.13480829a153.56315918 153.56315918 0 0 1 93.28531026-30.48623613 149.85850253 149.85850253 0 1 1-149.88422901 149.80704873 159.50604551 159.50604551 0 0 1 11.31978341-59.17159775l-176.09982012-135.03987598a191.38152832 191.38152832 0 1 1-157.78235128-297.96758437 203.03576016 203.03576016 0 0 1 108.05248302 29.58579843l343.42680674-146.35966025a150.09004336 150.09004336 0 1 1 149.93568368 159.50604551z"  horiz-adv-x="1075" />
 
     

src/constants/api.js

@@ -80,7 +80,7 @@ export const API_SALESBATCH_LIST = resolvePath('taSalesBatch/choice')
 export const API_NOTICE_INFO = resolvePath('getNoticeInfo')
 export const API_SALES_BATCH = resolvePath('taSalesBatch')
 export const API_ADDLIVE_NUM = resolvePath('addVisitNum')
-export const API_LIVE_DEATIL = resolvePath('taLiveActivity')
+export const API_LIVE_LIST = resolvePath('taLiveActivity')
 // /wx/location/city?location=lon,lat
 
 //sign

src/pages/index/activityDetail/index.jsx

@@ -1,13 +1,11 @@
-import React, { useState, useEffect } from 'react'
+import { useState, useEffect } from 'react'
 import withLayout from '@/layout'
+import { ScrollView, Image } from '@tarojs/components'
+import '@/assets/css/iconfont.css'
 import './index.scss'
-import { ScrollView } from '@tarojs/components'
-import '../../../assets/css/iconfont.css'
 
-export default withLayout((props) => {
+export default withLayout(() => {
 
-  // const [PageProps] = useState(props)
-  const [PageList, setPageList] = useState(['', '', '', '', '', '', '', '', '', '', '', '', ''])
   const [IsPull, setPull] = useState(false)
   const [PullTimer, setPullTimer] = useState(null)
 
@@ -25,21 +23,79 @@ export default withLayout((props) => {
   }, [IsPull])
 
   return (
-    <view className='Page activityDetail'>
+    <view className='Page activityDetail flex-v'>
+      <view className='flex-item'>
+        <view>
+          <ScrollView scroll-y refresher-enabled refresher-triggered={IsPull} onrefresherrefresh={PageRefresh} refresher-background='#fff'>
+            <view className='PageContent'>
 
-      <ScrollView scroll-y={true} refresher-enabled={true} refresher-triggered={IsPull} onrefresherrefresh={PageRefresh} refresher-background='#fff'>
-        <view className='PageContent'>
+              <view className='Top'>
+                <Image mode='aspectFill' src={null} className='centerLabel'></Image>
+              </view>
 
-          活动详情
+              <view className='Info'>
+                <view>
+                  <view className='Title flex-h'>
+                    <view className='flex-item'>
+                      <text>换了套圈圈福利 快来参加吧</text>
+                    </view>
+                    <text className='Tips'>17人已报名</text>
+                  </view>
+                  <text className='Time'>报名截止时间：2019-07-19 12:00</text>
+                  <text className='Name'>“香颂 · 蔚澜半岛”</text>
+                  <view className='flex-h Address'>
+                    <text>地址：</text>
+                    <view className='flex-item'>
+                      <text>江苏省南京市奥体大厦1楼</text>
+                    </view>
+                  </view>
+                  <view className='flex-h Date'>
+                    <text>时间：</text>
+                    <view className='flex-item'>
+                      <text>2019/10/20 10:00 - 2019/10/22 10:00</text>
+                    </view>
+                  </view>
+                  <view className='Btn'>
+                    <text>分享好友</text>
+                  </view>
+                </view>
+              </view>
 
-          {/* bottom */}
-          <view className='PageBottom'>
-            <text>已经到底了~</text>
-          </view>
+              <view className='ActivityIntro'>
+                <view className='Title'>
+                  <text>活动介绍</text>
+                </view>
+              </view>
 
-        </view>
-      </ScrollView>
+              <view className='Bottom'>
+                <view>
+                  <view>
+                    <text className='iconfont icon-shengming'></text>
+                    <text>免责声明</text>
+                  </view>
+                  <view>
+                    <text>&emsp;&emsp;以上价格仅供参考,具体一房一价的信息以售楼处展示为准。房屋位置交通、医疗、教育、商业等配套信息，来源于第三方不作为要约,仅供参考,双方具体权利义务应以法律规定及买卖合同约定为准。本平台对项目周边文化教育的介绍旨在提供相关信息1 意味着信息发布方对就学安排作出承诺。相关教育资首页信息存在调整的可能,应以政府教育主管部门门及办学颁布的政策规定为准。详情请仔细阅读</text>
+                    <text className='active'>《新联家使用免责条款》</text>
+                  </view>
+                </view>
+              </view>
 
+            </view>
+          </ScrollView>
+        </view>
+      </view>
+      <view className='PageBottom flex-h'>
+        <view className='Share'>
+          <text className='iconfont icon-fenxiang'></text>
+          <text>分享</text>
+        </view>
+        <view className='Collect'>
+          <text className='iconfont icon-shoucang'></text>
+          <text>收藏</text>
+        </view>
+        <view className='flex-item'></view>
+        <text className='Post'>立即报名</text>
+      </view>
     </view>
   )
 })

src/pages/index/activityDetail/index.scss

@@ -1,12 +1,215 @@
 .Page.activityDetail {
   background: #fff;
-  > scroll-view {
-    width: 100%;
-    height: 100%;
-    .PageContent {
-      position: relative;
-      overflow: hidden;
-      min-height: 100vh;
+  > .flex-item {
+    position: relative;
+    overflow: hidden;
+    z-index: 1;
+    > view {
+      width: 100%;
+      position: absolute;
+      left: 0;
+      top: 0;
+      bottom: 0;
+      > scroll-view {
+        width: 100%;
+        height: 100%;
+        .PageContent {
+          position: relative;
+          overflow: hidden;
+          min-height: 100vh;
+          > .Top {
+            width: 100%;
+            padding-bottom: 56%;
+            position: relative;
+            overflow: hidden;
+            background: #eee;
+            z-index: 1;
+            > image {
+              width: 100%;
+              height: 100%;
+            }
+          }
+          >.Info {
+            padding: 0 30px;
+            position: relative;
+            z-index: 2;
+            margin-top: -30px;
+            >view {
+              position: relative;
+              overflow: hidden;
+              background: #fff;
+              min-height: 100px;
+              box-shadow: 0 0 10px 10px rgba(0, 0, 0, 0.03);
+              >.Title {
+                align-items: flex-start;
+                >.flex-item {
+                  margin-left: 30px;
+                  margin-right: 20px;
+                  margin-top: 20px;
+                  >text {
+                    display: block;
+                    font-size: 34px;
+                    font-weight: bold;
+                    line-height: 40px;
+                  }
+                }
+                >.Tips {
+                  background: rgba(25, 60, 131, 0.2);
+                  font-size: 28px;
+                  line-height: 58px;
+                  color: #193C83;
+                  border-radius: 0 0 0 24px;
+                  padding: 0 10px;
+                  min-width: 170px;
+                  text-align: center;
+                }
+              }
+              >.Time {
+                display: block;
+                font-size: 20px;
+                color: #FF0000;
+                line-height: 1;
+                margin-top: 16px;
+                text-indent: 30px;
+              }
+              >.Name {
+                display: block;
+                text-align: center;
+                font-size: 48px;
+                font-weight: bold;
+                line-height: 1;
+                margin-top: 40px;
+                text-align: center;
+              }
+              >.Address,
+              >.Date {
+                align-items: flex-start;
+                margin-top: 30px;
+                padding: 0 30px;
+                >text {
+                  font-size: 28px;
+                  line-height: 32px;
+                }
+                >.flex-item {
+                  >text {
+                    display: block;
+                    font-size: 28px;
+                    line-height: 32px;
+                  }
+                }
+              }
+              >.Address {
+                margin-top: 38px;
+              }
+              >.Btn {
+                padding: 0 10px;
+                position: relative;
+                overflow: hidden;
+                margin-top: 40px;
+                margin-bottom: 40px;
+                >text {
+                  display: block;
+                  text-align: center;
+                  font-size: 32px;
+                  line-height: 92px;
+                  font-weight: bold;
+                  background: #F2F2F2;
+                  border-radius: 92px;
+                }
+              }
+            }
+          }
+          >.ActivityIntro {
+            position: relative;
+            overflow: hidden;
+            margin-top: 40px;
+            >.Title {
+              padding: 0 30px;
+              position: relative;
+              overflow: hidden;
+              text-align: center;
+              font-size: 0;
+              &::after {
+                content: '';
+                display: block;
+                height: 2px;
+                background: rgba(0, 0, 0, 0.08);
+                z-index: 1;
+                position: absolute;
+                left: 30px;
+                right: 30px;
+                top: 19px;
+              }
+              >text {
+                display: inline-block;
+                font-size: 32px;
+                color: #5B717A;
+                position: relative;
+                z-index: 2;
+                background: #fff;
+                padding: 0 20px;
+                line-height: 40px;
+              }
+            }
+          }
+          >.Bottom {
+            padding: 0 30px 30px;
+            position: relative;
+            overflow: hidden;
+            margin-top: 60px;
+            >view {
+              padding: 30px;
+              position: relative;
+              overflow: hidden;
+              background: #F8F8F8;
+              border-radius: 8px;
+              >view {
+                >text {
+                  font-size: 20px;
+                  color: #999;
+                  line-height: 30px;
+                  letter-spacing: 2px;
+                  &.active {
+                    color: #193C83;
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  >.PageBottom {
+    align-items: center;
+    background: #fff;
+    z-index: 2;
+    border-top: 2px solid rgba(0, 0, 0, 0.12);
+    padding: 20px 30px;
+    >.Share,
+    >.Collect {
+      margin-left: 50px;
+      >text {
+        display: block;
+        text-align: center;
+        font-size: 30px;
+        &:first-child {
+          font-size: 44px;
+        }
+      }
+    }
+    >.Share {
+      margin-left: 0;
+    }
+    >.Post {
+      width: 360px;
+      line-height: 92px;
+      background: #193C83;
+      color: #fff;
+      font-size: 32px;
+      color: #fff;
+      border-radius: 8px;
+      text-align: center;
     }
   }
 }

src/pages/index/buildingDetail/components/BasicInfo/index.jsx

@@ -30,7 +30,7 @@ export default function BasicInfo (props) {
 
       {/* 项目列表 */}
       <view className='ProjectList'>
-        <ScrollView scroll-x={true}>
+        <ScrollView scroll-x>
           {
             ['', '', ''].map((item, index) => (
               <view className='ListItem' key={`List-${index}`}>

src/pages/index/buildingDetail/components/HouseTypeIntro/index.jsx

@@ -1,10 +1,11 @@
 import React, { useState, useEffect } from 'react'
-import './index.scss'
-import '../../../../../assets/css/iconfont.css'
 import { ScrollView, Image } from '@tarojs/components'
+import '@/assets/css/iconfont.css'
+import './index.scss'
 
 export default function HouseTypeIntro (props) {
   const { Data = {} } = props
+  const [PageList, setPageList] = useState(['', '', '', '', ''])
   return (
     <view className='components HouseTypeIntro'>
 
@@ -16,6 +17,26 @@ export default function HouseTypeIntro (props) {
         <text className='iconfont icon-jiantouright'></text>
       </view>
 
+      <view className='ProjectList'>
+        <ScrollView scroll-x>
+          {
+            PageList.map((item, index) => (
+              <view className='ListItem' key={`List-${index}`}>
+                <view className='Img'>
+                  <Image mode='aspectFill' src={null}></Image>
+                </view>
+                <view className='Title'>
+                  <text>290平</text>
+                  <text>户型</text>
+                </view>
+                <text>建面290m²</text>
+                <text>套内288m²</text>
+              </view>
+            ))
+          }
+        </ScrollView>
+      </view>
+
     </view>
   )
 }

src/pages/index/buildingDetail/components/HouseTypeIntro/index.scss

@@ -1,9 +1,10 @@
 .components.HouseTypeIntro {
   position: relative;
   overflow: hidden;
-  padding: 40px 30px;
+  padding: 40px 0 30px;
   >.Title {
     align-items: center;
+    padding: 0 30px;
     >.flex-item {
       >text {
         display: block;
@@ -19,4 +20,74 @@
       color: #A1A1A1;
     }
   }
+  >.ProjectList {
+    position: relative;
+    overflow: hidden;
+    margin-top: 30px;
+    height: 558px;
+    >scroll-view {
+      width: 100%;
+      height: 100%;
+      font-size: 0;
+      white-space: nowrap;
+      position: relative;
+      overflow: visible;
+      .ListItem {
+        width: 336px;
+        height: 538px;
+        margin-left: 18px;
+        margin-top: 10px;
+        display: inline-block;
+        vertical-align: middle;
+        position: relative;
+        overflow: hidden;
+        border-radius: 12px;
+        background: #fff;
+        box-shadow: 0 0 6px 6px rgba(0, 0, 0, 0.03);
+        &:first-child {
+          margin-left: 30px;
+        }
+        &:last-child {
+          margin-right: 30px;
+        }
+        >.Img {
+          width: 100%;
+          height: 336px;
+          position: relative;
+          overflow: hidden;
+          background: #eee;
+          border-bottom: rgba(0, 0, 0, 0.12);
+          >image {
+            width: 100%;
+            height: 100%;
+          }
+        }
+        >.Title {
+          font-size: 0;
+          white-space: nowrap;
+          margin-top: 20px;
+          padding: 0 20px;
+          >text {
+            display: inline-block;
+            vertical-align: middle;
+            font-size: 32px;
+            line-height: 44px;
+            &:first-child {
+              color: #FA5431;
+              margin-right: 10px;
+            }
+          }
+        }
+        >text {
+          display: block;
+          font-size: 28px;
+          line-height: 40px;
+          margin-top: 10px;
+          white-space: nowrap;
+          color: #555;
+          text-indent: 20px;
+        }
+      }
+    }
+  }
 }

src/pages/index/buildingDetail/components/LivingActivity/index.jsx

@@ -1,10 +1,11 @@
 import React, { useState, useEffect } from 'react'
+import { Image } from '@tarojs/components'
+import '@/assets/css/iconfont.css'
 import './index.scss'
-import '../../../../../assets/css/iconfont.css'
-import { ScrollView, Image } from '@tarojs/components'
 
 export default function LivingActivity (props) {
   const { Data = {} } = props
+  const [PageList, setPageList] = useState(['', ''])
   return (
     <view className='components LivingActivity'>
 
@@ -16,6 +17,18 @@ export default function LivingActivity (props) {
         <text className='iconfont icon-jiantouright'></text>
       </view>
 
+      <view className='List flex-h'>
+        {
+          PageList.map((item, index) => (
+            <view className='flex-item' key={`ListItem-${index}`}>
+              <view>
+                <Image mode='aspectFill' src={null} className='centerLabel'></Image>
+              </view>
+            </view>
+          ))
+        }
+      </view>
+
     </view>
   )
 }

src/pages/index/buildingDetail/components/LivingActivity/index.scss

@@ -19,4 +19,28 @@
       color: #A1A1A1;
     }
   }
+  >.List {
+    margin-top: 20px;
+    align-items: center;
+    >.flex-item {
+      position: relative;
+      overflow: hidden;
+      margin-left: 20px;
+      &:first-child {
+        margin-left: 0;
+      }
+      >view {
+        width: 100%;
+        padding-bottom: 60%;
+        background: #eee;
+        border-radius: 8px;
+        position: relative;
+        overflow: hidden;
+        >image {
+          width: 100%;
+          height: 100%;
+        }
+      }
+    }
+  }
 }

src/pages/index/buildingDetail/components/MarketingActivity/index.jsx

@@ -1,10 +1,11 @@
 import React, { useState, useEffect } from 'react'
+import { Swiper, SwiperItem, Image } from '@tarojs/components'
+import { getImgURL } from '@/utils/image'
+import '@/assets/css/iconfont.css'
 import './index.scss'
-import '../../../../../assets/css/iconfont.css'
-import { ScrollView, Image } from '@tarojs/components'
 
 export default function MarketingActivity (props) {
-  const { Data = {} } = props
+  const { List = ['', '', ''] } = props
   return (
     <view className='components MarketingActivity'>
 
@@ -16,6 +17,22 @@ export default function MarketingActivity (props) {
         <text className='iconfont icon-jiantouright'></text>
       </view>
 
+      <view className='SwiperContainer'>
+        <view>
+          <Swiper autoplay interval={2000} indicator-dots>
+            {
+              List.map((item, index) => (
+                <SwiperItem key={`Banner-${index}`}>
+                  <view className='swiper-item'>
+                    <Image mode='aspectFill' className='centerLabel' src={getImgURL(item?.image)} />
+                  </view>
+                </SwiperItem>
+              ))
+            }
+          </Swiper>
+        </view>
+      </view>
+
     </view>
   )
 }

src/pages/index/buildingDetail/components/MarketingActivity/index.scss

@@ -1,9 +1,10 @@
 .components.MarketingActivity {
   position: relative;
   overflow: hidden;
-  padding: 40px 30px;
+  padding: 40px 0;
   >.Title {
     align-items: center;
+    padding: 0 30px;
     >.flex-item {
       >text {
         display: block;
@@ -19,4 +20,33 @@
       color: #A1A1A1;
     }
   }
+  >.SwiperContainer {
+    width: 100%;
+    padding-bottom: 33.33%;
+    position: relative;
+    overflow: hidden;
+    background: #eee;
+    margin-top: 40px;
+    >view {
+      width: 100%;
+      position: absolute;
+      left: 0;
+      top: 0;
+      bottom: 0;
+      >swiper {
+        width: 100%;
+        height: 100%;
+        .swiper-item {
+          width: 100%;
+          height: 100%;
+          position: relative;
+          overflow: hidden;
+          >image {
+            width: 100%;
+            height: 100%;
+          }
+        }
+      }
+    }
+  }
 }

src/pages/index/buildingDetail/components/News/index.jsx

@@ -1,12 +1,13 @@
 import React, { useState, useEffect } from 'react'
+import { Image } from '@tarojs/components'
+import '@/assets/css/iconfont.css'
 import './index.scss'
-import '../../../../../assets/css/iconfont.css'
-import { ScrollView, Image } from '@tarojs/components'
 
-export default function MarketingActivity (props) {
+export default function News (props) {
   const { Data = {} } = props
+  const [PageList, setPageList] = useState(['', ''])
   return (
-    <view className='components MarketingActivity'>
+    <view className='components News'>
 
       <view className='Title flex-h'>
         <view className='flex-item'>
@@ -16,6 +17,19 @@ export default function MarketingActivity (props) {
         <text className='iconfont icon-jiantouright'></text>
       </view>
 
+      <view className='List flex-h'>
+        {
+          PageList.map((item, index) => (
+            <view className='flex-item' key={`ListItem-${index}`}>
+              <view className='Img'>
+                <Image mode='aspectFill' src={null} className='centerLabel'></Image>
+              </view>
+              <text className='Title'>一方山营销中心盛大样板间开盘活动</text>
+            </view>
+          ))
+        }
+      </view>
+
     </view>
   )
 }

src/pages/index/buildingDetail/components/News/index.scss

@@ -1,4 +1,4 @@
-.components.MarketingActivity {
+.components.News {
   position: relative;
   overflow: hidden;
   padding: 40px 30px;
@@ -19,4 +19,34 @@
       color: #A1A1A1;
     }
   }
+  >.List {
+    margin-top: 30px;
+    align-items: center;
+    >.flex-item {
+      position: relative;
+      overflow: hidden;
+      margin-left: 20px;
+      &:first-child {
+        margin-left: 0;
+      }
+      >.Img {
+        width: 100%;
+        padding-bottom: 80%;
+        background: #eee;
+        border-radius: 8px;
+        position: relative;
+        overflow: hidden;
+        >image {
+          width: 100%;
+          height: 100%;
+        }
+      }
+      >.Title {
+        display: block;
+        font-size: 28px;
+        line-height: 40px;
+        margin-top: 4px;
+      }
+    }
+  }
 }

src/pages/index/buildingDetail/components/Periphery/index.jsx

@@ -1,7 +1,6 @@
 import React, { useState, useEffect } from 'react'
 import './index.scss'
 import '../../../../../assets/css/iconfont.css'
-import { ScrollView, Image } from '@tarojs/components'
 
 export default function Periphery (props) {
   const { Data = {} } = props
@@ -14,6 +13,33 @@ export default function Periphery (props) {
         </view>
       </view>
 
+      <view className='Map'>
+        <view></view>
+      </view>
+
+      <view className='List flex-h'>
+        <view className='flex-item'>
+          <text className='iconfont icon-jiaotong'></text>
+          <text>交通(10)</text>
+        </view>
+        <view className='flex-item'>
+          <text className='iconfont icon-shangye'></text>
+          <text>商业(10)</text>
+        </view>
+        <view className='flex-item'>
+          <text className='iconfont icon-xuexiao'></text>
+          <text>学校(10)</text>
+        </view>
+        <view className='flex-item'>
+          <text className='iconfont icon-yiyuan'></text>
+          <text>医院(10)</text>
+        </view>
+        <view className='flex-item'>
+          <text className='iconfont icon-yinhang'></text>
+          <text>银行(10)</text>
+        </view>
+      </view>
+
     </view>
   )
 }

src/pages/index/buildingDetail/components/Periphery/index.scss

@@ -19,4 +19,40 @@
       color: #A1A1A1;
     }
   }
+  >.Map {
+    width: 100%;
+    padding-bottom: 50%;
+    position: relative;
+    overflow: hidden;
+    background: #eee;
+    margin-top: 40px;
+    >view {
+      width: 100%;
+      position: absolute;
+      left: 0;
+      top: 0;
+      bottom: 0;
+      overflow: hidden;
+    }
+  }
+  >.List {
+    align-items: center;
+    margin-top: 24px;
+    >.flex-item {
+      >text {
+        display: block;
+        text-align: center;
+        font-size: 32px;
+        line-height: 44px;
+        color: #666;
+        margin-top: 12px;
+        &:first-child {
+          font-size: 44px;
+          color: #1A3B83;
+          margin-top: 0;
+          line-height: 1;
+        }
+      }
+    }
+  }
 }

src/pages/index/buildingDetail/components/Pictures/index.jsx

@@ -1,10 +1,11 @@
 import React, { useState, useEffect } from 'react'
-import './index.scss'
-import '../../../../../assets/css/iconfont.css'
+import '@/assets/css/iconfont.css'
 import { ScrollView, Image } from '@tarojs/components'
+import './index.scss'
 
 export default function Pictures (props) {
   const { Data = {} } = props
+  const [PageList, setPageList] = useState(['', '', '', '', ''])
   return (
     <view className='components Pictures'>
 
@@ -14,6 +15,34 @@ export default function Pictures (props) {
         </view>
       </view>
 
+      <view className='ProjectList'>
+        <ScrollView scroll-x>
+          {
+            PageList.map((item, index) => (
+              <view className='ListItem' key={`List-${index}`}>
+                <view className='Img'>
+                  <Image mode='aspectFill' className='centerLabel' src={null}></Image>
+                </view>
+                <text className='Title'>效果图(6)</text>
+              </view>
+            ))
+          }
+        </ScrollView>
+      </view>
+
+      <view className='Bottom'>
+        <view>
+          <view>
+            <text className='iconfont icon-shengming'></text>
+            <text>免责声明</text>
+          </view>
+          <view>
+            <text>&emsp;&emsp;以上价格仅供参考,具体一房一价的信息以售楼处展示为准。房屋位置交通、医疗、教育、商业等配套信息，来源于第三方不作为要约,仅供参考,双方具体权利义务应以法律规定及买卖合同约定为准。本平台对项目周边文化教育的介绍旨在提供相关信息1 意味着信息发布方对就学安排作出承诺。相关教育资首页信息存在调整的可能,应以政府教育主管部门门及办学颁布的政策规定为准。详情请仔细阅读</text>
+            <text className='active'>《新联家使用免责条款》</text>
+          </view>
+        </view>
+      </view>
+
     </view>
   )
 }

src/pages/index/buildingDetail/components/Pictures/index.scss

@@ -1,9 +1,10 @@
 .components.Pictures {
   position: relative;
   overflow: hidden;
-  padding: 40px 30px;
+  padding: 40px 0;
   >.Title {
     align-items: center;
+    padding: 0 30px;
     >.flex-item {
       >text {
         display: block;
@@ -19,4 +20,78 @@
       color: #A1A1A1;
     }
   }
+  >.ProjectList {
+    position: relative;
+    overflow: hidden;
+    margin-top: 30px;
+    height: 224px;
+    >scroll-view {
+      width: 100%;
+      height: 100%;
+      font-size: 0;
+      white-space: nowrap;
+      position: relative;
+      overflow: visible;
+      .ListItem {
+        width: 218px;
+        height: 100%;
+        margin-left: 18px;
+        display: inline-block;
+        vertical-align: middle;
+        position: relative;
+        overflow: hidden;
+        &:first-child {
+          margin-left: 30px;
+        }
+        &:last-child {
+          margin-right: 30px;
+        }
+        >.Img {
+          width: 100%;
+          padding-bottom: 75%;
+          position: relative;
+          overflow: hidden;
+          background: #eee;
+          border-bottom: rgba(0, 0, 0, 0.12);
+          border-radius: 12px;
+          >image {
+            width: 100%;
+            height: 100%;
+          }
+        }
+        >.Title {
+          display: block;
+          text-align: center;
+          font-size: 28px;
+          line-height: 40px;
+          margin-top: 20px;
+          color: #353535;
+        }
+      }
+    }
+  }
+  >.Bottom {
+    padding: 0 30px 30px;
+    position: relative;
+    overflow: hidden;
+    margin-top: 36px;
+    >view {
+      padding: 30px;
+      position: relative;
+      overflow: hidden;
+      background: #F8F8F8;
+      border-radius: 8px;
+      >view {
+        >text {
+          font-size: 20px;
+          color: #999;
+          line-height: 30px;
+          letter-spacing: 2px;
+          &.active {
+            color: #193C83;
+          }
+        }
+      }
+    }
+  }
 }

src/pages/index/buildingDetail/components/ProjectDynamic/index.jsx

@@ -1,7 +1,6 @@
-import React, { useState, useEffect } from 'react'
+// import React, { useState, useEffect } from 'react'
+import '@/assets/css/iconfont.css'
 import './index.scss'
-import '../../../../../assets/css/iconfont.css'
-import { ScrollView, Image } from '@tarojs/components'
 
 export default function ProjectDynamic (props) {
   const { Data = {} } = props
@@ -16,6 +15,17 @@ export default function ProjectDynamic (props) {
         <text className='iconfont icon-jiantouright'></text>
       </view>
 
+      <view className='Nav'>
+        <text>楼盘资讯(8)</text>
+        <text>最新活动(1)</text>
+      </view>
+
+      <view className='Info'>
+        <text className='Time'>2020年5月20日</text>
+        <text className='Title'>山和九著府预计5月加推5号楼</text>
+        <text className='Desc'>山和九著府预计5月加推5号楼，目前在售房源位于89号楼，均价26400元/㎡，户型建筑面积82、89、112㎡，预计2023年6月交付。</text>
+      </view>
+
     </view>
   )
 }

src/pages/index/buildingDetail/components/ProjectDynamic/index.scss

@@ -19,4 +19,51 @@
       color: #A1A1A1;
     }
   }
+  >.Nav {
+    font-size: 0;
+    white-space: nowrap;
+    margin-top: 30px;
+    >text {
+      display: inline-block;
+      vertical-align: middle;
+      font-size: 28px;
+      line-height: 56px;
+      color: #333;
+      border-radius: 56px;
+      background: #F8F8F8;
+      padding: 0 20px;
+      min-width: 148px;
+      text-align: center;
+      margin-left: 30px;
+      &:first-child {
+        margin-left: 0;
+      }
+    }
+  }
+  >.Info {
+    position: relative;
+    overflow: hidden;
+    >text {
+      display: block;
+      &.Time {
+        font-size: 28px;
+        line-height: 40px;
+        margin-top: 28px;
+        color: #1A3B83;
+      }
+      &.Title {
+        font-size: 32px;
+        line-height: 44px;
+        margin-top: 20px;
+        font-weight: bold;
+      }
+      &.Desc {
+        font-size: 28px;
+        line-height: 40px;
+        margin-top: 20px;
+        color: #A1A1A1;
+        text-indent: 2em;
+      }
+    }
+  }
 }

src/pages/index/buildingDetail/components/PropertyConsultant/index.jsx

@@ -1,10 +1,19 @@
 import React, { useState, useEffect } from 'react'
+import { Image } from '@tarojs/components'
+import '@/assets/css/iconfont.css'
 import './index.scss'
-import '../../../../../assets/css/iconfont.css'
-import { ScrollView, Image } from '@tarojs/components'
 
 export default function PropertyConsultant (props) {
+
   const { Data = {} } = props
+  const [TipsList] = useState([
+    {name: '官方保障', icon: 'icon-baozhang'},
+    {name: '免费咨询', icon: 'icon-zixun'},
+    {name: '户型解读', icon: 'icon-jiedu'},
+    {name: '贴心服务', icon: 'icon-tiexin'}
+  ])
+  const [PageList, setPageList] = useState(['', '', ''])
+
   return (
     <view className='components PropertyConsultant'>
 
@@ -16,6 +25,35 @@ export default function PropertyConsultant (props) {
         <text className='iconfont icon-jiantouright'></text>
       </view>
 
+      <view className='TipsList flex-h'>
+        {
+          TipsList.map((item, index) => (
+            <view className='flex-item' key={`TipsItem-${index}`}>
+              <text className={`iconfont ${item.icon}`}></text>
+              <text>{item.name}</text>
+            </view>
+          ))
+        }
+      </view>
+
+      <view className='PersonList'>
+        {
+          PageList.map((item, index) => (
+            <view key={`PersonItem-${index}`} className='flex-h'>
+              <view className='Icon'>
+                <Image mode='aspectFill' src={null}></Image>
+              </view>
+              <view className='flex-item'>
+                <text>陶虹</text>
+                <text>好评经纪人，熟悉楼盘特色</text>
+              </view>
+              <text className='iconfont icon-liaotian Chat'></text>
+              <text className='iconfont icon-dianhua Phone'></text>
+            </view>
+          ))
+        }
+      </view>
+
     </view>
   )
 }

src/pages/index/buildingDetail/components/PropertyConsultant/index.scss

@@ -19,4 +19,84 @@
       color: #A1A1A1;
     }
   }
+  >.TipsList {
+    position: relative;
+    overflow: hidden;
+    margin-top: 28px;
+    >view.flex-item {
+      font-size: 0;
+      white-space: nowrap;
+      text-align: center;
+      flex: 3;
+      &:first-child {
+        flex: 2;
+        text-align: left;
+      }
+      &:last-child {
+        flex: 2;
+        text-align: right;
+      }
+      >text {
+        display: inline-block;
+        vertical-align: middle;
+        font-size: 22px;
+        color: #888;
+        line-height: 32px;
+      }
+    }
+  }
+  >.PersonList {
+    position: relative;
+    overflow: hidden;
+    margin-top: 34px;
+    >view {
+      align-items: center;
+      margin-top: 52px;
+      &:first-child {
+        margin-top: 0;
+      }
+      >.Icon {
+        width: 88px;
+        height: 88px;
+        position: relative;
+        overflow: hidden;
+        border-radius: 100%;
+        background: #eee;
+        >image {
+          width: 100%;
+          height: 100%;
+        }
+      }
+      >.flex-item {
+        margin-left: 24px;
+        >text {
+          display: block;
+          white-space: nowrap;
+          font-size: 26px;
+          color: #666;
+          line-height: 36px;
+          margin-top: 4px;
+          &:first-child {
+            margin-top: 0;
+            font-size: 32px;
+            color: #333;
+          }
+        }
+      }
+      >text {
+        font-size: 48px;
+        width: 80px;
+        line-height: 80px;
+        text-align: center;
+        border-radius: 100%;
+        background: rgba(251, 171, 87, 0.12);
+        color: #FBAB57;
+        margin-left: 40px;
+        &:last-child {
+          color: #81BC4B;
+          background: rgba(129, 188, 75, 0.12);
+        }
+      }
+    }
+  }
 }

src/pages/index/buildingDetail/index.jsx

@@ -1,7 +1,7 @@
-import React, { useState, useEffect } from 'react'
+import { useState, useEffect } from 'react'
 import withLayout from '@/layout'
+import { ScrollView } from '@tarojs/components'
 import './index.scss'
-import { ScrollView, Image } from '@tarojs/components'
 import '../../../assets/css/iconfont.css'
 import DetailBottom from './components/DetailBottom/index'
 import BasicInfo from './components/BasicInfo/index'
@@ -15,10 +15,8 @@ import LivingActivity from './components/LivingActivity/index'
 import News from './components/News/index'
 import Pictures from './components/Pictures/index'
 
-export default withLayout((props) => {
+export default withLayout(() => {
 
-  // const [PageProps] = useState(props)
-  const [PageList, setPageList] = useState(['', '', '', '', '', '', '', '', '', '', '', '', ''])
   const [IsPull, setPull] = useState(false)
   const [PullTimer, setPullTimer] = useState(null)
 
@@ -40,7 +38,7 @@ export default withLayout((props) => {
 
       <view className='flex-item'>
         <view>
-          <ScrollView scroll-y={true} refresher-enabled={false} refresher-triggered={IsPull} onrefresherrefresh={PageRefresh} refresher-background='#f8f8f8'>
+          <ScrollView scroll-y refresher-enabled={false} refresher-triggered={IsPull} onrefresherrefresh={PageRefresh} refresher-background='#f8f8f8'>
             <view className='PageContent'>
 
               {/* banner */}
@@ -107,11 +105,6 @@ export default withLayout((props) => {
 
               </view>
 
-              {/* bottom */}
-              <view className='ScrollBottom'>
-                <text>已经到底了~</text>
-              </view>
-
             </view>
           </ScrollView>
         </view>

src/pages/index/components/Banner/index.jsx

@@ -1,17 +1,17 @@
-import React, { useState, useEffect } from 'react'
-import './index.scss'
+
 import { Swiper, SwiperItem, Image } from '@tarojs/components'
 import { getImgURL } from '@/utils/image'
+import './index.scss'
 
 export default function Banner (props) {
   const { List = [] } = props
   return (
     <view className='components Banner'>
-      <Swiper autoplay={true} interval={2000} indicator-dots={true}>
+      <Swiper autoplay interval={2000} indicator-dots>
         {
           List.map((item, index) => (
             <SwiperItem key={`Banner-${index}`}>
-              <view className="swiper-item">
+              <view className='swiper-item'>
                 <Image mode='aspectFill' className='centerLabel' src={getImgURL(item.image)} />
               </view>
             </SwiperItem>

src/pages/index/components/HotRecommend/index.jsx

@@ -1,12 +1,12 @@
-import React, { useState, useEffect } from 'react'
-import './index.scss'
-import '../../../../assets/css/iconfont.css'
+import { useState, useEffect } from 'react'
 import { useSelector } from 'react-redux'
 import Taro from '@tarojs/taro'
 import { fetch } from '@/utils/request'
 import { API_ACTIVITY_LIST } from '@/constants/api'
+import './index.scss'
+import '../../../../assets/css/iconfont.css'
 
-export default function HotRecommend (props) {
+export default function HotRecommend () {
 
   const city = useSelector(state => state.city)
   const [MenuList] = useState([{ name: '热门活动', id: 1 }, { name: '热门团房', id: 2 }])

src/pages/index/components/LiveSale/index.jsx

@@ -1,15 +1,13 @@
-import React, { useState, useEffect, } from 'react'
-import './index.scss'
-import '../../../../assets/css/iconfont.css'
+import { useState, useEffect } from 'react'
 import { ScrollView, Image } from '@tarojs/components'
-import Taro from '@tarojs/taro'
-import emptyImg from '@/assets/empty.png'
 import { useSelector } from 'react-redux'
 import { fetch } from '@/utils/request'
 import { getImgURL } from '@/utils/image'
-import { API_LIVE_DEATIL } from '@/constants/api'
+import { API_LIVE_LIST } from '@/constants/api'
+import './index.scss'
+import '../../../../assets/css/iconfont.css'
 
-export default function LiveSale (props) {
+export default function LiveSale () {
 
   const city = useSelector(state => state.city)
   const [MenuList] = useState([{ name: '全部', id: 1 }, { name: '预告', id: 2 }, { name: '直播中', id: 3 }, { name: '新房推荐', id: 4 }])
@@ -23,7 +21,7 @@ export default function LiveSale (props) {
   }, [city])
 
   const GetLiveList = () => {
-    fetch({url: API_LIVE_DEATIL, method: 'get', payload: {cityId: city.curCity.id, pageNum: 1, pageSize: 20}}).then((res) => {
+    fetch({url: API_LIVE_LIST, method: 'get', payload: {cityId: city.curCity.id, pageNum: 1, pageSize: 20}}).then((res) => {
       setPageList(res.records || [])
     })
   }
@@ -45,7 +43,7 @@ export default function LiveSale (props) {
           }
         </view>
         <view className='Content'>
-          <ScrollView scroll-x={true}>
+          <ScrollView scroll-x>
             {
               PageList.map((item, index) => (
                 <view className='ListItem' key={`List-${index}`} style={{display: CurrentId === 1 || (CurrentId === 2 && item.kind === 'notice') || (CurrentId === 3 && item.kind === 'live')  || (CurrentId === 4 && item.kind !== 'notice') ? 'inline-block' : 'none'}}>

src/pages/index/index.jsx

@@ -1,5 +1,10 @@
-import React, { useState, useEffect } from 'react'
+import { useState, useEffect } from 'react'
 import withLayout from '@/layout'
+import { ScrollView } from '@tarojs/components'
+import Taro from '@tarojs/taro'
+import { useSelector } from 'react-redux'
+import { fetch } from '@/utils/request'
+import { API_BANNER_LIST, API_INDEX_PROJECTS } from '@/constants/api'
 import './index.scss'
 import Location from './components/Location/index'
 import Banner from './components/Banner/index'
@@ -8,16 +13,10 @@ import HotRecommend from './components/HotRecommend/index'
 import LiveSale from './components/LiveSale/index'
 import ColumnTitle from './components/ColumnTitle/index'
 import ProjectListItem from '../../components/ProjectListItem/index'
-import { ScrollView } from '@tarojs/components'
-import Taro from '@tarojs/taro'
-import { useSelector } from 'react-redux'
-import { fetch } from '@/utils/request'
-import { API_BANNER_LIST, API_INDEX_PROJECTS } from '@/constants/api'
 
-export default withLayout((props) => {
+export default withLayout(() => {
 
   const city = useSelector(state => state.city)
-  const [PageProps] = useState(props)
   const [BannerList, setBannerList] = useState([])
   const [ProjectList, setProjectList] = useState([])
   const [IsPull, setPull] = useState(false)
@@ -58,11 +57,11 @@ export default withLayout((props) => {
   return (
     <view className='Page Index'>
 
-      <ScrollView scroll-y={true} refresher-enabled={true} refresher-triggered={IsPull} onrefresherrefresh={PageRefresh} refresher-background='#fff'>
+      <ScrollView scroll-y refresher-enabled refresher-triggered={IsPull} onrefresherrefresh={PageRefresh} refresher-background='#fff'>
         <view className='PageContent'>
 
           {/* 定位 */}
-          <view className="Location">
+          <view className='Location'>
             <Location></Location>
           </view>
 
@@ -82,19 +81,19 @@ export default withLayout((props) => {
 
           {/* 热门推荐 */}
           <view className='HotRecommend'>
-            <ColumnTitle Name='热门推荐' Icon="icon-shoucang"></ColumnTitle>
+            <ColumnTitle Name='热门推荐' Icon='icon-shoucang'></ColumnTitle>
             <HotRecommend></HotRecommend>
           </view>
 
           {/* 直播购房 */}
           <view className='LiveSale'>
-            <ColumnTitle Name='直播购房' Icon="icon-yinpin" ShowMore={true} ToMore={() => { Taro.switchTab({ url: `/pages/video/index` }) }}></ColumnTitle>
+            <ColumnTitle Name='直播购房' Icon='icon-yinpin' ShowMore ToMore={() => { Taro.switchTab({ url: `/pages/video/index` }) }}></ColumnTitle>
             <LiveSale></LiveSale>
           </view>
 
           {/* 全部项目 */}
           <view className='AllProject'>
-            <ColumnTitle Name='全部项目' Icon="icon-aixin" ShowMore={true} ToMore={() => { Taro.navigateTo({ url: `/pages/index/buildingList/index` }) }}></ColumnTitle>
+            <ColumnTitle Name='全部项目' Icon='icon-aixin' ShowMore ToMore={() => { Taro.navigateTo({ url: `/pages/index/buildingList/index` }) }}></ColumnTitle>
             <view className='ProjectList'>
               {
                 ProjectList.map((item, index) => (

src/pages/mine/index.jsx

@@ -1,22 +1,36 @@
-import React, { useState, useEffect } from 'react'
+import { useState, useEffect } from 'react'
+import { useSelector } from 'react-redux'
 import withLayout from '@/layout'
+import { ScrollView, Image } from '@tarojs/components'
+import Taro from '@tarojs/taro'
 import './index.scss'
 import NeedLogin from './components/NeedLogin'
-import { ScrollView, Image } from '@tarojs/components'
 import '../../assets/css/iconfont.css'
 import MineMenuList from './tabData'
-import Taro from '@tarojs/taro'
 
-export default withLayout((props) => {
+export default withLayout(() => {
 
-  const [PageProps] = useState(props)
-  console.log(`PageProps`, PageProps.person)
-  const UserRole = PageProps.person.personType === 'customer' ? 1 : PageProps.person.personType === 'estate agent' ? 2 : PageProps.person.personType === 'Realty Consultant' ? 3 : 4 // 1-普通用户 2-经纪人 3-置业顾问 4-驻场管理
-  const [MenuList, setMenuList] = useState(UserRole === 1 ? MineMenuList.User : UserRole === 2 ? MineMenuList.Broker : UserRole === 3 ? MineMenuList.Adviser : MineMenuList.Resident)
+  const user = useSelector(state => state.user)
+  const [UserRole, setUserRole] = useState(null) // 1-普通用户 2-经纪人 3-置业顾问 4-驻场管理
+  const [MenuList, setMenuList] = useState([])
   const [IsPull, setPull] = useState(false)
   const [ShowLogin, setShowLogin] = useState(false)
   const [PullTimer, setPullTimer] = useState(null)
 
+  useEffect(() => {
+    setShowLogin(false)
+    if(user?.userInfo?.person?.personId) {
+      const person = user.userInfo.person
+      setUserRole(person.personType === 'customer' || person.personType === 'drift' ? 1 : person.personType === 'estate agent' ? 2 : person.personType === 'Realty Consultant' ? 3 : 4)
+    }
+  }, [user])
+
+  useEffect(() => {
+    if(UserRole !== null) {
+      setMenuList(UserRole === 1 ? MineMenuList.User : UserRole === 2 ? MineMenuList.Broker : UserRole === 3 ? MineMenuList.Adviser : MineMenuList.Resident)
+    }
+  }, [UserRole])
+
   const PageRefresh = () => { // 页面下拉刷新回调
     setPull(true)
   }
@@ -41,7 +55,7 @@ export default withLayout((props) => {
   return (
     <view className='Page Mine'>
 
-      <ScrollView scroll-y={true} refresher-enabled={true} refresher-triggered={IsPull} onrefresherrefresh={PageRefresh} refresher-background='#fff'>
+      <ScrollView scroll-y refresher-enabled refresher-triggered={IsPull} onrefresherrefresh={PageRefresh} refresher-background='#fff'>
         <view className='PageContent'>
 
           {/* 需要登录 */}
@@ -58,12 +72,12 @@ export default withLayout((props) => {
               {/* 用户信息 */}
               <view className='UserInfo'>
                 <view className='UserIcon'>
-                  <Image mode='aspectFill' className='centerLabel' src={PageProps.person.avatarurl || require('../../assets/mine-icon18.png')} />
+                  <Image mode='aspectFill' className='centerLabel' src={user?.userInfo?.person?.avatarurl || require('../../assets/mine-icon18.png')} />
                 </view>
                 <view className='OtherInfo'>
                   <view className='Name'>
                     <view>
-                      <text>{PageProps.person.nickname}</text>
+                      <text>{user?.userInfo?.person?.nickname}</text>
                       <view>
                         <text className='iconfont icon-bianji' onClick={() => { Taro.navigateTo({ url: `/pages/mine/userInfo/index` }) }}></text>
                         <text onClick={() => { Taro.navigateTo({ url: `/pages/mine/userInfo/index` }) }}>个人信息资料修改</text>

src/pages/video/components/VideoListItem/index.jsx

@@ -1,4 +1,5 @@
-import React, { useState, useEffect } from 'react'
+import { getImgURL } from '@/utils/image'
+import { Image } from '@tarojs/components'
 import './index.scss'
 
 export default function VideoListItem (props) {
@@ -7,20 +8,17 @@ export default function VideoListItem (props) {
     <view className='components VideoListItem'>
       <view className='Img'>
         <view>
-          {
-            Data.img &&
-            <Image mode='aspectFill' className='centerLabel' src={Data.img || null} />
-          }
+          <Image mode='aspectFill' className='centerLabel' src={getImgURL(Data.images) || null} />
         </view>
       </view>
       <view className='Title'>
-        <text>{Data.title || '这是一条直播视频的标题请你关注一下...'}</text>
+        <text>{Data.title}</text>
       </view>
       <view className='Location flex-h'>
         <text className='iconfont icon-dingwei'></text>
         <view className='flex-item'>
           <view>
-            <text>{Data.location || '南京万科九都荟'}</text>
+            <text>{Data.cityName}</text>
           </view>
         </view>
       </view>

src/pages/video/index.jsx

@@ -1,24 +1,66 @@
-import React, { useState, useEffect } from 'react'
+import { useState, useEffect } from 'react'
+import { ScrollView } from '@tarojs/components'
 import withLayout from '@/layout'
+import { useSelector } from 'react-redux'
+import { fetch } from '@/utils/request'
+import { API_LIVE_LIST } from '@/constants/api'
 import './index.scss'
-import { ScrollView } from '@tarojs/components'
 import '../../assets/css/iconfont.css'
 import VideoListItem from './components/VideoListItem/index'
 
-export default withLayout((props) => {
+export default withLayout(() => {
 
-  // const [PageProps] = useState(props)
+  const city = useSelector(state => state.city)
   const [IsPull, setPull] = useState(false)
-  const [CurrnetMenuId, setCurrnetMenuId] = useState(1)
-  const [MenuList, setMenuList] = useState([
-    { name: '全部', id: 1 },
-    { name: '预告', id: 2 },
-    { name: '直播中', id: 3 },
-    { name: '新房推荐', id: 4 },
-    { name: '视频', id: 5 }
+  const [CurrnetMenuId, setCurrnetMenuId] = useState(null)
+  const [MenuList] = useState([
+    { name: '全部', id: 'all' },
+    { name: '预告', id: 'notice' },
+    { name: '直播中', id: 'live' },
+    { name: '新房推荐', id: 'new' }
   ])
   const [PullTimer, setPullTimer] = useState(null)
-  const [PageList, setPageList] = useState(['', '', '', '', '', '', '', '', '', '', '', '', ''])
+  const [OriginList, setOriginList] = useState([])
+  const [PageList, setPageList] = useState([])
+
+  useEffect(() => {
+    if (city.curCity.name) {
+      setOriginList([])
+      GetLiveList()
+    }
+  }, [city])
+
+  useEffect(() => {
+    if(OriginList.length && CurrnetMenuId === null) {
+      setCurrnetMenuId('all')
+    }
+  }, [OriginList])
+
+  useEffect(() => {
+    if (CurrnetMenuId === 'all') {
+      setPageList([...OriginList])
+    } else {
+      let Arr = []
+      OriginList.map((item) => {
+        if (CurrnetMenuId === 'new') {
+          if(item.kind !== 'notice') {
+            Arr.push({...item})
+          }
+        } else {
+          if(item.kind === CurrnetMenuId) {
+            Arr.push({...item})
+          }
+        }
+      })
+      setPageList([...Arr])
+    }
+  }, [CurrnetMenuId])
+
+  const GetLiveList = () => {
+    fetch({ url: API_LIVE_LIST, method: 'get', payload: { cityId: city.curCity.id, pageNum: 1, pageSize: 10000 } }).then((res) => {
+      setOriginList(res.records || [])
+    })
+  }
 
   const PageRefresh = () => { // 页面下拉刷新回调
     setPull(true)
@@ -65,7 +107,7 @@ export default withLayout((props) => {
 
       <view className='flex-item'>
         <view>
-          <ScrollView scroll-y={true} refresher-enabled={true} refresher-triggered={IsPull} onrefresherrefresh={PageRefresh} refresher-background='#f8f8f8'>
+          <ScrollView scroll-y refresher-enabled refresher-triggered={IsPull} onrefresherrefresh={PageRefresh} refresher-background='#f8f8f8'>
             <view className='PageContent'>
               {
                 PageList.map((item, index) => (

src/pages/video/index.scss

@@ -63,8 +63,6 @@
           }
         }
         &:last-child {
-          flex: 1;
-          -webkit-flex: 1;
           text-align: right;
         }
         &.active {