ソースを参照

feat:合并链接页面+合并记录页面+充值页面

luoy 11 時間 前
コミット
26ab64d4dc

+ 0 - 1
.gitignore

@@ -3,7 +3,6 @@
 .htaccess
 nginx.htaccess
 db_config.php
-my.php
 guzzle
 phpmailer
 cos-sdk-v5

+ 12 - 0
images/icon/Mask.svg

@@ -0,0 +1,12 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<mask id="mask0_245_895" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="24" height="24">
+<rect width="24" height="24" fill="#D9D9D9"/>
+</mask>
+<g mask="url(#mask0_245_895)">
+<path d="M23.716 8.96072V4.64402C23.716 3.18298 22.754 2 21.568 2H3.14809C1.96188 1.99978 1 3.18298 1 4.64402V8.96072C1.0071 8.96072 1.01118 8.95788 1.0181 8.95788C2.24921 8.95788 3.24623 10.1852 3.24623 11.7C3.24623 13.2154 2.24921 14.4425 1.0181 14.4425C1.011 14.4425 1.00674 14.4388 1 14.4388V18.7566C1 20.2165 1.96206 21.4004 3.14809 21.4004H21.568C22.7542 21.4004 23.7159 20.2161 23.7159 18.7566V14.439C22.4951 14.427 21.5078 13.2067 21.5078 11.6998C21.5078 10.1926 22.4951 8.97252 23.716 8.96072Z" fill="#FFCB1F"/>
+<path d="M21.5673 2H12.3916V21.4008H21.5671C22.7533 21.4008 23.715 20.2167 23.715 18.757V14.4392C22.4942 14.4272 21.5069 13.2069 21.5069 11.7002C21.5069 10.1928 22.4942 8.97273 23.715 8.96072V4.64424C23.7154 3.1832 22.7533 2 21.5673 2Z" fill="#EF962F"/>
+<path d="M21.5673 2H12.3916V21.4008H21.5671C22.7533 21.4008 23.715 20.2167 23.715 18.757V14.4392C22.4942 14.4272 21.5069 13.2069 21.5069 11.7002C21.5069 10.1928 22.4942 8.97273 23.715 8.96072V4.64424C23.7154 3.1832 22.7533 2 21.5673 2Z" fill="#FFA71A"/>
+<path d="M16.5926 13.2158H13.4345V11.4711H16.5926C17.1862 11.4711 17.6684 10.8783 17.6684 10.1474C17.6684 9.41657 17.1866 8.82355 16.5926 8.82355H14.4184L15.871 7.09211C16.0757 6.8477 16.1932 6.51326 16.1976 6.16229C16.202 5.81132 16.093 5.47255 15.8946 5.22044C15.7964 5.09553 15.6791 4.99568 15.5495 4.92659C15.4198 4.8575 15.2804 4.82053 15.1392 4.81779C14.998 4.81505 14.8577 4.8466 14.7264 4.91063C14.595 4.97466 14.4753 5.06991 14.3739 5.19095L12.3592 7.59317L10.3448 5.19117C10.1393 4.95125 9.86514 4.8208 9.58194 4.82814C9.29874 4.83547 9.02932 4.98 8.83218 5.23034C8.63504 5.48069 8.52609 5.81664 8.52899 6.16525C8.53188 6.51386 8.64639 6.847 8.84766 7.09233L10.2999 8.82377H8.12447C7.8392 8.82383 7.56564 8.96333 7.36393 9.21159C7.16222 9.45985 7.04888 9.79654 7.04883 10.1476C7.04892 10.4987 7.16228 10.8353 7.36399 11.0835C7.5657 11.3318 7.83924 11.4712 8.12447 11.4713H11.2838V13.2158H8.12447C7.84336 13.2235 7.57587 13.3664 7.37927 13.6138C7.18267 13.8612 7.07258 14.1935 7.07258 14.5396C7.07258 14.8857 7.18267 15.218 7.37927 15.4654C7.57587 15.7128 7.84336 15.8556 8.12447 15.8633H11.2838V17.2589C11.2839 17.6099 11.3972 17.9466 11.5989 18.1948C11.8005 18.4431 12.074 18.5827 12.3592 18.5829C12.6445 18.5828 12.918 18.4432 13.1197 18.1949C13.3213 17.9466 13.4347 17.6099 13.4347 17.2589V15.8633H16.5928C16.878 15.8633 17.1516 15.7238 17.3533 15.4756C17.555 15.2274 17.6684 14.8908 17.6686 14.5397C17.6684 14.1886 17.555 13.8519 17.3533 13.6036C17.1515 13.3554 16.8779 13.2159 16.5926 13.2158Z" fill="#FF9519"/>
+<path d="M12.3916 18.5774C12.9689 18.5547 13.4333 17.9744 13.4333 17.2582V15.8627H16.5914C17.185 15.8627 17.6672 15.2699 17.6672 14.5388C17.6672 13.8077 17.1854 13.2149 16.5914 13.2149H13.4333V11.471H16.5914C17.185 11.471 17.6672 10.878 17.6672 10.1472C17.6672 9.41633 17.1854 8.82331 16.5914 8.82331H14.4172L15.8698 7.09187C16.0745 6.84746 16.192 6.51301 16.1964 6.16204C16.2008 5.81107 16.0919 5.4723 15.8934 5.22019C15.7952 5.09529 15.6779 4.99543 15.5483 4.92634C15.4187 4.85726 15.2793 4.82029 15.138 4.81755C14.9968 4.81481 14.8565 4.84636 14.7252 4.91038C14.5939 4.97441 14.4741 5.06967 14.3727 5.19071L12.3916 7.55361V18.5774Z" fill="#EF8100"/>
+</g>
+</svg>

+ 15 - 0
images/icon/huiyuan.svg

@@ -0,0 +1,15 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<mask id="mask0_246_897" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="24" height="24">
+<rect width="24" height="24" fill="#D9D9D9"/>
+</mask>
+<g mask="url(#mask0_246_897)">
+<path d="M22.0795 6.95122C21.7538 6.97533 21.4409 7.08792 21.1745 7.27683C20.9081 7.46573 20.6983 7.72379 20.5678 8.02316C20.4373 8.32254 20.3911 8.65186 20.434 8.9756C20.477 9.29934 20.6075 9.6052 20.8115 9.86021L20.6322 10.6422C20.4365 11.465 19.9536 12.191 19.2704 12.6895C18.5871 13.188 17.7483 13.4263 16.905 13.3614C16.0617 13.2965 15.2693 12.9328 14.6703 12.3357C14.0713 11.7385 13.7051 10.9472 13.6377 10.1041L13.4583 7.88023C13.9306 7.56781 14.2896 7.11155 14.4822 6.57906C14.6748 6.04657 14.6907 5.4662 14.5276 4.92396C14.3645 4.38171 14.031 3.90645 13.5766 3.56862C13.1222 3.23078 12.571 3.04834 12.0047 3.04834C11.4385 3.04834 10.8873 3.23078 10.4329 3.56862C9.97843 3.90645 9.64494 4.38171 9.48182 4.92396C9.31869 5.4662 9.33461 6.04657 9.52722 6.57906C9.71982 7.11155 10.0789 7.56781 10.5511 7.88023L10.3718 10.1041C10.3043 10.9472 9.93812 11.7385 9.33913 12.3357C8.74015 12.9328 7.94769 13.2965 7.1044 13.3614C6.2611 13.4263 5.42234 13.188 4.73907 12.6895C4.05581 12.191 3.57291 11.465 3.37728 10.6422L3.19794 9.86021C3.43094 9.56732 3.56648 9.20888 3.58556 8.83511C3.60465 8.46134 3.50632 8.09096 3.30436 7.77586C3.1024 7.46077 2.80692 7.21675 2.45933 7.078C2.11174 6.93925 1.72945 6.91272 1.36602 7.00212C1.0026 7.09152 0.676243 7.29238 0.432689 7.57655C0.189136 7.86072 0.0405853 8.21397 0.00785113 8.5868C-0.0248831 8.95962 0.0598386 9.33335 0.250147 9.65562C0.440455 9.97788 0.726815 10.2325 1.0691 10.3839L2.65811 21.6253H21.3208L22.9116 10.3839C23.2964 10.214 23.6093 9.91427 23.7955 9.53708C23.9817 9.1599 24.0294 8.72927 23.9302 8.32048C23.8311 7.9117 23.5914 7.55077 23.2531 7.3008C22.9148 7.05083 22.4994 6.92773 22.0795 6.95301V6.95122Z" fill="#F9C85D"/>
+<path d="M0 8.74097C0 9.09568 0.105185 9.44243 0.302253 9.73736C0.499321 10.0323 0.77942 10.2622 1.10713 10.3979C1.43484 10.5336 1.79545 10.5692 2.14335 10.5C2.49124 10.4308 2.81081 10.26 3.06163 10.0091C3.31245 9.75831 3.48326 9.43875 3.55246 9.09085C3.62166 8.74296 3.58614 8.38235 3.4504 8.05464C3.31466 7.72693 3.08478 7.44683 2.78985 7.24976C2.49492 7.05269 2.14817 6.94751 1.79346 6.94751C1.3178 6.94751 0.861631 7.13646 0.525292 7.4728C0.188953 7.80914 0 8.26531 0 8.74097Z" fill="#F9C85D"/>
+<path d="M22.0787 6.95094C21.753 6.97506 21.4401 7.08764 21.1737 7.27655C20.9073 7.46546 20.6976 7.72352 20.5671 8.02289C20.4366 8.32226 20.3903 8.65158 20.4333 8.97532C20.4762 9.29906 20.6067 9.60493 20.8107 9.85993L20.6314 10.6419C20.4358 11.4647 19.9529 12.1907 19.2696 12.6892C18.5863 13.1878 17.7476 13.426 16.9043 13.3611C16.061 13.2963 15.2685 12.9325 14.6696 12.3354C14.0706 11.7383 13.7044 10.9469 13.6369 10.1038L13.4576 7.87995C13.8883 7.59633 14.226 7.19222 14.4286 6.718C14.6313 6.24377 14.6899 5.7204 14.5971 5.2131C14.5044 4.7058 14.2644 4.23701 13.9071 3.86515C13.5498 3.49329 13.0909 3.23481 12.5877 3.12191C12.3991 3.08652 12.2075 3.0697 12.0156 3.07169V21.625H21.3416L22.936 10.3836C23.206 10.2648 23.4425 10.0811 23.6246 9.84901C23.8067 9.61689 23.9287 9.34343 23.9798 9.05288C24.0196 8.78492 23.9995 8.51147 23.921 8.25221C23.8425 7.99294 23.7074 7.75431 23.5256 7.55347C23.3438 7.35264 23.1198 7.1946 22.8696 7.09072C22.6194 6.98685 22.3493 6.93972 22.0787 6.95274V6.95094Z" fill="#FFB103"/>
+<path d="M20.4022 8.74087C20.4022 9.09558 20.5074 9.44233 20.7045 9.73726C20.9015 10.0322 21.1816 10.2621 21.5094 10.3978C21.8371 10.5336 22.1977 10.5691 22.5456 10.4999C22.8935 10.4307 23.213 10.2599 23.4639 10.009C23.7147 9.75822 23.8855 9.43865 23.9547 9.09076C24.0239 8.74286 23.9884 8.38226 23.8526 8.05454C23.7169 7.72683 23.487 7.44673 23.1921 7.24966C22.8971 7.0526 22.5504 6.94741 22.1957 6.94741C21.9598 6.94598 21.7259 6.9914 21.5077 7.08102C21.2894 7.17065 21.0912 7.3027 20.9243 7.46952C20.7575 7.63634 20.6255 7.83462 20.5358 8.05286C20.4462 8.2711 20.4008 8.50495 20.4022 8.74087ZM9.34376 5.64715C9.34376 6.17102 9.4992 6.6831 9.79039 7.11857C10.0816 7.55405 10.4954 7.89333 10.9796 8.09348C11.4637 8.29362 11.9963 8.34562 12.51 8.2429C13.0237 8.14018 13.4953 7.88735 13.8653 7.51642C14.2352 7.14549 14.4867 6.67314 14.5881 6.15918C14.6894 5.64521 14.6359 5.11273 14.4345 4.62916C14.233 4.14558 13.8926 3.73265 13.4564 3.44264C13.0201 3.15263 12.5076 2.99859 11.9837 3.00001C11.6364 3.00001 11.2926 3.06853 10.9718 3.20165C10.651 3.33477 10.3597 3.52987 10.1144 3.77577C9.86921 4.02168 9.6749 4.31355 9.54265 4.63468C9.4104 4.9558 9.34282 5.29987 9.34376 5.64715Z" fill="#F9C85D"/>
+<path d="M3.09319 7.49785C2.88156 8.59007 1.97586 9.53701 0.68457 10.1324C0.996098 10.3895 1.38727 10.5302 1.79113 10.5306C2.26679 10.5306 2.72296 10.3416 3.0593 10.0053C3.39564 9.66896 3.58459 9.21279 3.58459 8.73713C3.58948 8.50823 3.54852 8.28066 3.46413 8.06783C3.37974 7.855 3.25361 7.6612 3.09319 7.49785ZM23.4956 7.51041C23.2463 8.58648 22.328 9.52446 21.0349 10.0948C21.2933 10.3189 21.6108 10.4638 21.9493 10.5121C22.2879 10.5604 22.6332 10.5101 22.944 10.3673C23.2547 10.2244 23.5177 9.99497 23.7014 9.7065C23.8851 9.41802 23.9818 9.08272 23.9798 8.74072C23.9776 8.28562 23.8048 7.84791 23.4956 7.51399V7.51041ZM13.8414 3.74414C13.8953 3.90436 13.9244 4.0719 13.9275 4.24093C13.9275 5.4838 12.3743 6.50248 10.4607 6.50248C10.1271 6.50174 9.79437 6.46871 9.46714 6.40384C9.6482 7.01371 10.043 7.53791 10.5791 7.88036C11.1153 8.22282 11.7569 8.36058 12.3863 8.26842C13.0158 8.17625 13.591 7.86033 14.0064 7.37854C14.4219 6.89676 14.6498 6.28139 14.6484 5.64521C14.6358 4.93197 14.3464 4.25157 13.8414 3.74773V3.74414Z" fill="#FFB103"/>
+<path d="M0.894851 7.95889C0.957622 8.05753 1.18001 8.03242 1.41675 7.89612C1.65348 7.75981 1.78979 7.57329 1.72702 7.47286C1.66425 7.37243 1.44186 7.39933 1.20512 7.53563C0.968383 7.67193 0.844635 7.85845 0.894851 7.95889ZM22.4773 7.89612C22.7123 8.03242 22.9365 8.05753 22.9992 7.95889C23.062 7.86025 22.9114 7.67193 22.6872 7.53563C22.3895 7.35629 22.1294 7.28813 22.0541 7.41188C21.9788 7.53563 22.1545 7.77057 22.4773 7.89612ZM10.9346 3.79627C10.9346 3.93257 11.3812 4.05632 11.9408 4.05632C12.5003 4.05632 12.9469 3.94513 12.9469 3.79627C12.9469 3.64741 12.5003 3.53442 11.9408 3.53442C11.3812 3.53442 10.9346 3.64741 10.9346 3.79627Z" fill="#F7EAD0"/>
+<path d="M12.7855 17.215H11.2952C11.2124 17.2195 11.1297 17.2071 11.0519 17.1785C10.9741 17.1499 10.903 17.1058 10.8428 17.0488C10.7826 16.9918 10.7347 16.9232 10.702 16.8471C10.6692 16.771 10.6523 16.689 10.6523 16.6061C10.6523 16.5233 10.6692 16.4413 10.702 16.3651C10.7347 16.289 10.7826 16.2204 10.8428 16.1634C10.903 16.1064 10.9741 16.0623 11.0519 16.0337C11.1297 16.0052 11.2124 15.9927 11.2952 15.9972H12.7855C12.9468 15.9972 13.1014 16.0613 13.2155 16.1753C13.3295 16.2893 13.3935 16.444 13.3935 16.6052C13.3947 16.6855 13.3798 16.7652 13.3497 16.8396C13.3196 16.914 13.2749 16.9816 13.2182 17.0384C13.1616 17.0953 13.0941 17.1402 13.0198 17.1705C12.9454 17.2008 12.8658 17.216 12.7855 17.215Z" fill="#DA3329"/>
+<path d="M12.7851 15.9846H11.9834V17.2149H12.7779C12.9393 17.2145 13.094 17.15 13.2079 17.0357C13.3219 16.9214 13.3859 16.7666 13.3859 16.6052C13.389 16.5245 13.3758 16.444 13.347 16.3686C13.3182 16.2932 13.2743 16.2244 13.2182 16.1664C13.162 16.1084 13.0947 16.0624 13.0203 16.0312C12.9458 15.9999 12.8658 15.9841 12.7851 15.9846Z" fill="#C11B16"/>
+</g>
+</svg>

+ 7 - 0
images/icon/pengpaibi.svg

@@ -0,0 +1,7 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 11.9998C-3.32082e-08 13.5756 0.310383 15.136 0.913427 16.5919C1.51647 18.0478 2.40037 19.3706 3.51465 20.4849C4.62893 21.5992 5.95177 22.4831 7.40765 23.0861C8.86353 23.6891 10.4239 23.9995 11.9998 23.9995C13.5756 23.9995 15.136 23.6891 16.5919 23.0861C18.0478 22.4831 19.3706 21.5992 20.4849 20.4849C21.5992 19.3706 22.4831 18.0478 23.0861 16.5919C23.6891 15.136 23.9995 13.5756 23.9995 11.9998C23.9995 10.4239 23.6891 8.86353 23.0861 7.40765C22.4831 5.95177 21.5992 4.62893 20.4849 3.51465C19.3706 2.40037 18.0478 1.51647 16.5919 0.913427C15.136 0.310383 13.5756 0 11.9998 0C10.4239 0 8.86353 0.310383 7.40765 0.913427C5.95177 1.51647 4.62893 2.40037 3.51465 3.51465C2.40037 4.62893 1.51647 5.95177 0.913427 7.40765C0.310383 8.86353 -2.34817e-08 10.4239 0 11.9998Z" fill="#FFD96B"/>
+<path d="M20.4879 3.51953L3.51953 20.4906C8.20694 25.1727 15.8005 25.1727 20.4853 20.4879C25.17 15.8005 25.1727 8.20694 20.4879 3.51953Z" fill="#FDC223"/>
+<path d="M3.27637 11.9998C3.27637 14.3135 4.19549 16.5325 5.83155 18.1686C7.4676 19.8046 9.68657 20.7237 12.0003 20.7237C14.314 20.7237 16.533 19.8046 18.1691 18.1686C19.8051 16.5325 20.7242 14.3135 20.7242 11.9998C20.7242 9.68608 19.8051 7.46711 18.1691 5.83106C16.533 4.19501 14.314 3.27588 12.0003 3.27588C9.68657 3.27588 7.4676 4.19501 5.83155 5.83106C4.19549 7.46711 3.27637 9.68608 3.27637 11.9998Z" fill="#F9AB10"/>
+<path d="M17.981 5.66247C14.5632 2.43486 9.17937 2.48575 5.83122 5.83122C2.48575 9.17937 2.43486 14.5632 5.66247 17.981L17.981 5.66247Z" fill="#F9B721"/>
+<path opacity="0.58" d="M16.4645 7L17 8.3224C15.7544 8.51475 14.2759 8.65902 12.7276 8.76721V10.4503H16.3364V15.0426C16.3364 15.7519 16.2084 16.1607 15.7311 16.3891C15.2538 16.6175 14.6135 16.6536 13.752 16.6415C13.6938 16.2208 13.4726 15.5836 13.2864 15.1989C13.8219 15.223 14.4505 15.223 14.6368 15.2109C14.8114 15.2109 14.8696 15.1628 14.8696 15.0066V11.8568H12.7276V18H11.2608V11.8568H9.22352V16.6656H7.77998V10.4503H11.2608V8.85137C9.91036 8.9235 8.55995 8.95956 7.30268 8.95956C7.29104 8.56284 7.12806 8.00984 7 7.67322C10.2596 7.61311 14.0081 7.39672 16.4645 7Z" fill="#573A01"/>
+</svg>

+ 10 - 0
images/icon/private.svg

@@ -0,0 +1,10 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<mask id="mask0_247_906" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="24" height="24">
+<rect width="24" height="24" fill="#D9D9D9"/>
+</mask>
+<g mask="url(#mask0_247_906)">
+<path d="M14.7443 1H9.25734C8.57105 1 7.88477 1.68629 7.88477 2.37257V21.9133C7.88477 22.5996 8.57105 23.2859 9.25734 23.2859H14.7409C15.4272 23.2859 16.1135 22.5996 16.1135 21.9133V2.37257C16.1135 1.68629 15.4272 1 14.7443 1ZM13.6429 20.8354H10.3587V19.1916H13.6429V20.8354ZM13.6429 17.5512H10.3587V15.9075H13.6429V17.5512ZM13.6429 14.0629H10.3587V12.4191H13.6429V14.0629ZM13.6429 10.7788H10.3587V9.13501H13.6429V10.7788Z" fill="#04C1C3"/>
+<path opacity="0.4" d="M4.80066 9.57007H1.37257C0.686287 9.57007 -2.51081e-08 10.2564 0 10.9426V21.9132C0 22.7702 0.686287 23.2858 1.37257 23.2858H4.80066C5.48695 23.2858 6.17323 22.5995 6.17323 21.9132V10.9426C6.17323 10.2564 5.48695 9.57007 4.80066 9.57007Z" fill="#04C1C3"/>
+<path d="M22.6278 6.82861H19.1997C18.5134 6.82861 17.8271 7.5149 17.8271 8.20119V21.9135C17.8271 22.7706 18.5134 23.2861 19.1997 23.2861H22.6278C23.3141 23.2861 24.0004 22.5998 24.0004 21.9135V8.19784C23.997 7.5149 23.3141 6.82861 22.6278 6.82861Z" fill="#04C1C3"/>
+</g>
+</svg>

+ 10 - 0
images/icon/public.svg

@@ -0,0 +1,10 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<mask id="mask0_247_905" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="24" height="24">
+<rect width="24" height="24" fill="#D9D9D9"/>
+</mask>
+<g mask="url(#mask0_247_905)">
+<path d="M14.7443 1H9.25734C8.57105 1 7.88477 1.68629 7.88477 2.37257V21.9133C7.88477 22.5996 8.57105 23.2859 9.25734 23.2859H14.7409C15.4272 23.2859 16.1135 22.5996 16.1135 21.9133V2.37257C16.1135 1.68629 15.4272 1 14.7443 1ZM13.6429 20.8354H10.3587V19.1916H13.6429V20.8354ZM13.6429 17.5512H10.3587V15.9075H13.6429V17.5512ZM13.6429 14.0629H10.3587V12.4191H13.6429V14.0629ZM13.6429 10.7788H10.3587V9.13501H13.6429V10.7788Z" fill="#04C1C3"/>
+<path opacity="0.4" d="M4.80066 9.57007H1.37257C0.686287 9.57007 -2.51081e-08 10.2564 0 10.9426V21.9132C0 22.7702 0.686287 23.2858 1.37257 23.2858H4.80066C5.48695 23.2858 6.17323 22.5995 6.17323 21.9132V10.9426C6.17323 10.2564 5.48695 9.57007 4.80066 9.57007Z" fill="#04C1C3"/>
+<path d="M22.6278 6.82861H19.1997C18.5134 6.82861 17.8271 7.5149 17.8271 8.20119V21.9135C17.8271 22.7706 18.5134 23.2861 19.1997 23.2861H22.6278C23.3141 23.2861 24.0004 22.5998 24.0004 21.9135V8.19784C23.997 7.5149 23.3141 6.82861 22.6278 6.82861Z" fill="#04C1C3"/>
+</g>
+</svg>

ファイルの差分が大きいため隠しています
+ 5 - 0
images/icon/weixipay.svg


ファイルの差分が大きいため隠しています
+ 1 - 0
images/icon/yuepay.svg


+ 11 - 0
images/icon/zfb.svg

@@ -0,0 +1,11 @@
+<svg width="136" height="40" viewBox="0 0 136 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<mask id="mask0_249_988" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="136" height="40">
+<rect width="136" height="40" fill="#D9D9D9"/>
+</mask>
+<g mask="url(#mask0_249_988)">
+<path d="M44.9961 0.714355H18.3923C14.9702 0.714355 12.1553 3.47409 12.1553 6.95135V33.3344C12.1553 36.7565 14.9702 39.5714 18.3923 39.5714H44.9409C48.4182 39.5714 51.1779 36.8116 51.1779 33.3344V33.0584C51.1779 33.0584 41.0221 28.8636 35.889 26.3799C32.4669 30.5747 27.9961 33.1688 23.415 33.1688C15.6325 33.1688 12.9832 26.3799 16.6812 21.9091C17.5092 20.9156 18.8338 20.0325 20.9864 19.4805C24.2981 18.6526 29.5968 19.9773 34.5643 21.6331C35.5026 19.9221 36.2201 18.1559 36.7721 16.2792H21.4832V14.7338H29.376V11.9741H19.8273V10.4286H29.376V6.50979C29.376 6.50979 29.376 5.84746 30.0383 5.84746H33.902V10.4286H43.3402V11.9741H33.902V14.7338H41.6292C40.9117 17.7143 39.7526 20.474 38.3727 22.9026C40.6909 23.7305 42.7883 24.5584 44.3889 25.0552C50.0188 26.9318 51.2883 27.0422 51.2883 27.0422V6.95135C51.2331 3.47409 48.4734 0.714355 44.9961 0.714355Z" fill="#108EE9"/>
+<path d="M21.6498 21.7985C20.6563 21.9089 18.8349 22.3504 17.8414 23.2336C14.8609 25.8277 16.6271 30.5745 22.6985 30.5745C26.231 30.5745 29.7635 28.3115 32.5232 24.7238C28.6044 22.8472 25.2927 21.4673 21.6498 21.7985Z" fill="#108EE9"/>
+<path d="M78.0573 23.1784C74.8008 22.0193 72.2067 20.6947 70.1645 19.4252C73.0898 17.2726 75.6839 14.2921 76.7326 10.3733H69.8885V7.9447H77.8365V6.39925H69.8885V3.30835H66.356C65.9697 3.30835 65.6385 3.63952 65.6385 4.02588V6.39925H57.6905V7.9447H65.5833V10.3733H58.9599V11.9187H72.2619C72.2619 11.9187 71.5443 14.7888 67.9015 17.8797C64.645 15.396 63.5411 13.4642 63.5411 13.4642H59.9534C61.3885 15.9479 63.4307 17.9349 65.6385 19.5356C63.5963 20.8602 61.0021 22.1297 57.5801 23.1232V24.9447C57.5801 24.9447 62.8236 23.9511 67.9015 20.9706C72.9794 23.896 78.0573 24.9447 78.0573 24.9447V23.1784ZM106.924 6.78561H118.129V8.9934H122.103V6.39925C122.103 5.79211 121.661 5.35055 121.054 5.35055H114.596V3.30835H110.401V5.35055H102.895V9.04859H106.869V6.78561H106.924ZM84.2391 27.7044H85.8397V36.5907H84.2391V27.7044ZM63.1547 27.7044L59.8983 36.5907H61.5541L62.1612 34.8245H65.4177L66.0249 36.5907H67.6807L64.4242 27.7044H63.1547ZM62.5476 33.6654L63.8171 29.9674L65.0314 33.6654H62.5476ZM74.58 27.7044H72.9794V36.5907H78.3333V35.3764H74.58V27.7044ZM119.232 27.7044L117.521 31.5128L115.755 27.7044H113.989L116.694 32.9479V36.5907H118.294V32.9479L120.999 27.7044H119.232ZM105.765 27.7044L102.509 36.5907H104.164L104.771 34.8245H108.028L108.635 36.5907H110.291L107.034 27.7044H105.765ZM105.213 33.6654L106.483 29.9674L107.697 33.6654H105.213ZM121.275 19.8667C121.22 19.5908 120.944 19.4252 120.668 19.4252H117.356L118.294 22.6817H114.375V16.3343H122.047V14.844H114.375V11.8635H122.047V10.3733H102.895V11.8635H110.567V14.844H102.895V16.3343H110.567V22.6265H102.895V24.1167H122.544V24.0615L121.275 19.8667ZM82.6936 3.41874L78.6092 13.0778H81.7553V24.6135H85.1774V9.32457H83.9079L86.5021 3.41874H82.6936ZM91.4696 11.3668C91.3592 11.0908 91.0832 10.9252 90.7521 10.9252H87.7715L90.0897 18.2109H93.6222L91.4696 11.3668Z" fill="#3E3A38"/>
+<path d="M99.0311 3.6394H95.4434V7.33745H86.6123V8.8277H95.4434V22.1848C95.4434 22.516 95.1675 22.7368 94.8915 22.7368H93.0701V24.2822H97.7064C98.424 24.227 99.0311 23.6199 99.0311 22.9023V8.8277H100.466V7.33745H99.0311V3.6394ZM95.7746 27.7043H92.2974V36.5906H93.898V33.1685H95.7746C97.4857 33.1685 98.6999 32.0646 98.6999 30.464C98.6999 28.8634 97.4857 27.7043 95.7746 27.7043ZM95.6642 31.9543H93.898V28.9186H95.6642C96.5473 28.9186 97.0993 29.6913 97.0993 30.464C97.0993 31.1815 96.6025 31.9543 95.6642 31.9543Z" fill="#3E3A38"/>
+</g>
+</svg>

+ 325 - 294
source/index/item_price.php

@@ -5,335 +5,366 @@ namespace app\index;
 
 class item_price extends BaseUser
 {
-	function getlist()
-	{
-		$_var_0 = SafeRequest("type", "get") ?: 0;
-		$_var_1 = SafeRequest("gid", "get") ?: 0;
-		$_var_1 = is_numeric($_var_1) ? $_var_1 : bees_decrypt($_var_1);
-		if ($_var_1) {
-			$_var_2 = SafeRequest("recommended", "get") ?: 0;
-			$_var_3[] = ["recommended", "=", $_var_2];
-		}
-		$_var_3[] = ["type", "=", $_var_0];
-		$_var_3[] = ["status", "=", "1"];
-		$_var_4 = db("item")->where($_var_3)->select();
-		reJSON(["list" => $_var_4]);
-	}
-	function index()
-	{
-		$_var_5 = SafeRequest("type", "get") ?: 0;
-		$_var_6 = SafeRequest("gid", "get") ?: 0;
-		$_var_7 = SafeRequest("ump_notify", "get") ?: "";
-		if (!IN_SUPER && $_var_5 > 3 || $_var_5 == 3 && !$_var_6 || $_var_5 > 4 && IN_SUPER && !IN_SUPER_PRV) {
-			redirect();
-		}
-		$_var_6 = is_numeric($_var_6) ? $_var_6 : bees_decrypt($_var_6);
-		if ($_var_6) {
-			$_var_8 = db("appid")->where("in_id", $_var_6)->find();
-		}
-		$_var_9[] = ["type", "=", $_var_5];
-		$_var_9[] = ["status", "=", "1"];
-		$_var_10 = json_decode(IN_ITEM_TYPE, true);
-		?>        <!doctype html>
+    function getlist()
+    {
+        $_var_0 = SafeRequest("type", "get") ?: 0;
+        $_var_1 = SafeRequest("gid", "get") ?: 0;
+        $_var_1 = is_numeric($_var_1) ? $_var_1 : bees_decrypt($_var_1);
+        if ($_var_1) {
+            $_var_2 = SafeRequest("recommended", "get") ?: 0;
+            $_var_3[] = ["recommended", "=", $_var_2];
+        }
+        $_var_3[] = ["type", "=", $_var_0];
+        $_var_3[] = ["status", "=", "1"];
+        $_var_4 = db("item")->where($_var_3)->select();
+        reJSON(["list" => $_var_4]);
+    }
+    function index()
+    {
+        $_var_5 = SafeRequest("type", "get") ?: 0;
+        $_var_6 = SafeRequest("gid", "get") ?: 0;
+        $_var_7 = SafeRequest("ump_notify", "get") ?: "";
+        if (!IN_SUPER && $_var_5 > 3 || $_var_5 == 3 && !$_var_6 || $_var_5 > 4 && IN_SUPER && !IN_SUPER_PRV) {
+            redirect();
+        }
+        $_var_6 = is_numeric($_var_6) ? $_var_6 : bees_decrypt($_var_6);
+        if ($_var_6) {
+            $_var_8 = db("appid")->where("in_id", $_var_6)->find();
+        }
+        $_var_9[] = ["type", "=", $_var_5];
+        $_var_9[] = ["status", "=", "1"];
+        $_var_10 = json_decode(IN_ITEM_TYPE, true);   
+        $_var_imgs = ['Mask', 'pengpaibi', 'huiyuan','', 'public', 'private']   
+?>
+        <!doctype html>
         <html lang="">
+
         <head>
             <meta charset="utf-8">
-            <meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0"/>
-            <meta name="keywords" content="<?php echo IN_KEYWORDS;?>"/>
-            <meta name="description" content="<?php echo IN_DESCRIPTION;?>"/>
-            <title>商品购买 - <?php echo IN_NAME;?> - 免费应用内测托管平台|iOS应用Beta测试分发|Android应用内测分发</title>
-            <?php 
-		$this->static_();
-		?>            <style> [v-cloak] {
+            <meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0" />
+            <meta name="keywords" content="<?php echo IN_KEYWORDS; ?>" />
+            <meta name="description" content="<?php echo IN_DESCRIPTION; ?>" />
+            <title>商品购买 - <?php echo IN_NAME; ?> - 免费应用内测托管平台|iOS应用Beta测试分发|Android应用内测分发</title>
+            <?php
+            $this->static_();
+            ?> <style>
+                [v-cloak] {
                     display: none;
                 }
             </style>
+
         <body>
-        <?php 
-		$this->header();
-		?>        <main v-cloak>
-            <div class="price-pay-wrap">
-                <div class="container">
-                    <div class="price-pay">
-                        <div class="crumbs">
-                            <a href="###">价格</a><span>/</span>商品购买
-                        </div>
-                        <div class="con">
-                            <div class="common">
-                                <div class="tit">选择套餐内容</div>
-                                <?php 
-		if ($_var_5 != 3) {
-			?>                                    <ul class="clearfix list3">
-                                        <?php 
-			foreach ($_var_10 as $_var_11 => $_var_12) {
-				if ($_var_11 < 3 || IN_SUPER && ($_var_11 == 4 || IN_SUPER_PRV && $_var_11 == 5)) {
-					?>                             <li class="clearfix" :class="{active:type==<?php echo $_var_11;?>}" @click="type=<?php echo $_var_11;?>">
-                                                    <?php echo $_var_12;?><span class="radio-checked icon icon-checkbox"></span>
-                                                </li>
-                                            <?php 
-				}
-			}
-			?>                                    </ul>
-                                <?php 
-		} elseif ($_var_6 && $_var_8) {
-			?>                                    <ul class="clearfix list3">
-                                        <li class="clearfix <?php echo $_var_5 == 3 ? "active" : "";?>"  style="padding-right: 15px">
-                                            <img src="/data/image/app/<?php echo $_var_8["in_icon"];?>" width="35" height="35" onerror="javascript:this.src='/static/index/image/iOS.png'" style="margin-right: 15px"/>
-                                            <?php echo $_var_8["in_name"];?>                                            <span class="radio-checked icon icon-checkbox"></span>
-                                        </li>
-                                    </ul>
-                                    <ul class="clearfix list3">
-                                        <li class="clearfix" :class="{active:recommended==0}" @click="recommended=0">
-                                            基础版
-                                            <span class="radio-checked icon icon-checkbox"></span>
-                                        </li>
-                                        <li class="clearfix" :class="{active:recommended==1}" @click="recommended=1">
-                                            稳定版
-                                            <span class="radio-checked icon icon-checkbox"></span>
-                                        </li>
-                                    </ul>
-                                <?php 
-		}
-		?>                                <ul class="clearfix list1">
-                                    <li v-for="(v,k) in list" class="clearfix" :class="{active:k==active}" @click="active=k">
-                                        <div class="fl left">
-                                            <div class="text1">{{v.name}}</div>
-                                            <div class="text2">{{fnote(v)}}</div>
-                                        </div>
-                                        <div class="fr right">{{v.price|pf}}<span>元</span></div>
-                                        <span class="radio-checked icon icon-checkbox"></span>
-                                    </li>
-                                </ul>
-                            </div>
-                            <div class="common">
-                                <div class="tit">数量</div>
-                                <ul class="clearfix list2">
-                                    <li class="clearfix active" data-num="1">
-                                        <span class="icon icon-radio fl"></span><span>1个</span>
-                                    </li>
-                                </ul>
+            <?php
+            $this->header();
+            ?> <main v-cloak>
+                <div class="price-pay-wrap">
+                    <div class="container">
+                        <div class="price-pay">
+                            <div class="crumbs">
+                                <a href="###">我的应用</a><span>/</span>充值
                             </div>
-                            <div class="common">
-                                <div class="tit">选择支付方式</div>
-                                <ul class="clearfix list3" id="list3">
-                                    <?php 
-		$_var_13 = json_decode(IN_PAY, true);
-		$_var_14 = $_var_13[1];
-		if (in_array(1, $_var_13)) {
-			?>                                        <li class="clearfix" :class="{active:pay_type==1}" @click="pay_type=1">
-                                            <img src="/static/index/image/pay-1.jpg" alt="">
-                                            <span class="radio-checked icon icon-checkbox"></span>
-                                        </li>
-                                    <?php 
-		}
-		?>                                    <?php 
-		if (in_array(2, $_var_13)) {
-			?>                                        <li class="clearfix" :class="{active:pay_type==2}" @click="pay_type=2">
-                                            <img src="/static/index/image/pay-2.jpg" alt="">
-                                            <span class="radio-checked icon icon-checkbox"></span>
-                                        </li>
-                                    <?php 
-		}
-		?>                                    <?php 
-		if (in_array(3, $_var_13)) {
-			?>                                        <li class="clearfix" :class="{active:pay_type==3}" @click="pay_type=3">
-                                            <img src="/static/index/image/pay-3.jpg" alt="">
+                            <div class="con">
+                                <div class="common">
+                                    <div class="tit" style="padding-top: 20px; border: none">选择充值内容</div>
+                                    <!-- <pre>
+                                    <?php var_dump($_var_5);var_dump($_var_6);var_dump($_var_8) ?>
+                                    </pre> -->
+                                    <?php
+                                    if ($_var_5 != 3) {
+                                    ?> <ul class="clearfix list3 1" style="padding-top: 10px;">
+                                            <?php
+                                            // var_dump($_var_10);
+                                            foreach ($_var_10 as $_var_11 => $_var_12) {
+                                                if ($_var_11 < 3 || IN_SUPER && ($_var_11 == 4 || IN_SUPER_PRV && $_var_11 == 5)) {
+                                            ?> <li class="clearfix" :class="{active:type==<?php echo $_var_11; ?>}" @click="type=<?php echo $_var_11; ?>">
+                                                        <div class="price-type">
+                                                            <img style="margin-bottom: 10px;" src="/images/icon/<?php echo $_var_imgs[$_var_11]?>.svg" alt="">
+                                                            <br>
+                                                            <div class="price-type"><?php echo $_var_12; ?></div>
+                                                        </div>                                                    
+                                                        <span class="radio-checked icon icon-checkbox"></span>
+                                                    </li>
+                                            <?php
+                                                }
+                                            }
+                                            ?> </ul>
+                                    <?php
+                                    } elseif ($_var_6 && $_var_8) {
+                                    ?> <ul class="clearfix list3 2" style="padding-top: 10px;">
+                                            <li class="clearfix <?php echo $_var_5 == 3 ? "active" : ""; ?>" style="padding-right: 15px">
+                                                <img src="/data/image/app/<?php echo $_var_8["in_icon"]; ?>" width="35" height="35" onerror="javascript:this.src='/static/index/image/iOS.png'" style="margin-right: 15px" />
+                                                <?php echo $_var_8["in_name"]; ?> <span class="radio-checked icon icon-checkbox"></span>
+                                            </li>
+                                        </ul>
+                                        <ul class="clearfix list3">
+                                            <li class="clearfix" :class="{active:recommended==0}" @click="recommended=0">
+                                                基础版
+                                                <span class="radio-checked icon icon-checkbox"></span>
+                                            </li>
+                                            <li class="clearfix" :class="{active:recommended==1}" @click="recommended=1">
+                                                稳定版
+                                                <span class="radio-checked icon icon-checkbox"></span>
+                                            </li>
+                                        </ul>
+                                    <?php
+                                    }
+                                    ?> 
+                                    <div class="tit" style="border: none;padding-bottom: 10px">选择数量</div>
+                                    <ul class="clearfix list1">
+                                        <li v-for="(v,k) in list" class="clearfix" :class="{active:k==active}" @click="active=k">
+                                            <div class="fl left">
+                                                <div class="text1">{{v.name}}</div>
+                                                <div class="text2">{{fnote(v)}}</div>
+                                            </div>
+                                            <div class="fr right">{{v.price|pf}}<span>元</span></div>
                                             <span class="radio-checked icon icon-checkbox"></span>
                                         </li>
-                                    <?php 
-		}
-		?>                                    <?php 
-		if (in_array(4, $_var_13)) {
-			?>                                        <li class="clearfix" :class="{active:pay_type==4}" @click="pay_type=4">
-                                            <img src="/static/index/image/pay-4.jpg" alt="">                                            
-                                            <span class="radio-checked icon icon-checkbox"></span>
+                                    </ul>
+                                </div>
+                                <!-- <div class="common">
+                                    <div class="tit">数量</div>
+                                    <ul class="clearfix list2">
+                                        <li class="clearfix active" data-num="1">
+                                            <span class="icon icon-radio fl"></span><span>1个</span>
                                         </li>
-                                    <?php 
-		}
-		?>                                    <?php 
-		if (in_array(5, $_var_13)) {
-			?>                                        <li class="clearfix" :class="{active:pay_type==5}" @click="pay_type=5">
-                                            <img src="/static/index/image/pay-5.jpg" alt="">                                            
+                                    </ul>
+                                </div> -->
+                                <div class="common">
+                                    <div class="tit" style="border: none;padding-bottom: 10px">选择支付方式</div>
+                                    <ul class="clearfix list3" id="list3">
+                                        <li class="clearfix" style="width: 270px;height: 88px" :class="{active:pay_type==2}" @click="pay_type=2">
+                                            <img src="/images/icon/weixipay.svg" alt="">
                                             <span class="radio-checked icon icon-checkbox"></span>
                                         </li>
-                                    <?php 
-		}
-		?>									<?php 
-		if (in_array(7, $_var_13)) {
-			?>                                        <li class="clearfix" :class="{active:pay_type==7}" @click="pay_type=7">
-                                            <img src="/static/index/image/pay-7.jpg" alt="">
+                                        <li class="clearfix" style="width: 270px;height: 88px" :class="{active:pay_type==1}" @click="pay_type=1">
+                                            <img src="/images/icon/zfb.svg" alt="">
                                             <span class="radio-checked icon icon-checkbox"></span>
                                         </li>
-                                    <?php 
-		}
-		?>                                    <?php 
-		if (in_array(6, $_var_13)) {
-			?>                                        <li v-if="type>0" class="clearfix" :class="{active:pay_type==6}" @click="pay_type=6">
-                                            余额支付
+                                        <li v-if="type>0" style="width: 270px;height: 88px" class="clearfix" :class="{active:pay_type==6}" @click="pay_type=6">
+                                            <img src="/images/icon/yuepay.svg" alt="">
                                             <span class="radio-checked icon icon-checkbox"></span>
                                         </li>
-                                    <?php 
-		}
-		?>                                </ul>
-                            </div>
-                            <div class="pay-money">
-                                <div class="money">应支付<span>¥{{pay_money}}</span></div>
-                                <a href="javascript:;" class="ms-btn-primary ms-btn toPay" @click="action()">去支付</a>
+                                    </ul>
+                                    <!-- <ul class="clearfix list3" id="list3">
+                                        <?php
+                                        $_var_13 = json_decode(IN_PAY, true);
+                                        $_var_14 = $_var_13[1];
+                                        var_dump($_var_13);
+                                        if (in_array(1, $_var_13)) {
+                                        ?> <li class="clearfix" :class="{active:pay_type==1}" @click="pay_type=1">
+                                                <img src="/static/index/image/pay-1.jpg" alt="">
+                                                <span class="radio-checked icon icon-checkbox"></span>
+                                            </li>
+                                        <?php
+                                        }
+                                        ?> <?php
+            if (in_array(2, $_var_13)) {
+            ?> <li class="clearfix" :class="{active:pay_type==2}" @click="pay_type=2">
+                                                <img src="/static/index/image/pay-2.jpg" alt="">
+                                                <span class="radio-checked icon icon-checkbox"></span>
+                                            </li>
+                                        <?php
+                                    }
+                                        ?> <?php
+            if (in_array(3, $_var_13)) {
+            ?> <li class="clearfix" :class="{active:pay_type==3}" @click="pay_type=3">
+                                                <img src="/static/index/image/pay-3.jpg" alt="">
+                                                <span class="radio-checked icon icon-checkbox"></span>
+                                            </li>
+                                        <?php
+                                    }
+                                        ?> <?php
+            if (in_array(4, $_var_13)) {
+            ?> <li class="clearfix" :class="{active:pay_type==4}" @click="pay_type=4">
+                                                <img src="/static/index/image/pay-4.jpg" alt="">
+                                                <span class="radio-checked icon icon-checkbox"></span>
+                                            </li>
+                                        <?php
+                                    }
+                                        ?> <?php
+            if (in_array(5, $_var_13)) {
+            ?> <li class="clearfix" :class="{active:pay_type==5}" @click="pay_type=5">
+                                                <img src="/static/index/image/pay-5.jpg" alt="">
+                                                <span class="radio-checked icon icon-checkbox"></span>
+                                            </li>
+                                        <?php
+                                    }
+                                        ?> <?php
+            if (in_array(7, $_var_13)) {
+            ?> <li class="clearfix" :class="{active:pay_type==7}" @click="pay_type=7">
+                                                <img src="/static/index/image/pay-7.jpg" alt="">
+                                                <span class="radio-checked icon icon-checkbox"></span>
+                                            </li>
+                                        <?php
+                                    }
+                                        ?> <?php
+            if (in_array(6, $_var_13)) {
+            ?> <li v-if="type>0" class="clearfix" :class="{active:pay_type==6}" @click="pay_type=6">
+                                                余额支付
+                                                <span class="radio-checked icon icon-checkbox"></span>
+                                            </li>
+                                        <?php
+                                    }
+                                        ?> </ul> -->
+                                </div>
+                                <div class="pay-money">
+                                    <div class="money"><span style="font-size: 14px;font-weight:500;color:#000000;">应支付</span><span>¥{{pay_money}}</span></div>
+                                    <a href="javascript:;" class="ms-btn-primary ms-btn toPay price-btn" @click="action()">去支付</a>
+                                </div>
                             </div>
                         </div>
                     </div>
                 </div>
-            </div>
 
-            <div class="modal fade ms-modal" id="myModalPay" tabindex="-1" role="dialog">
-                <div class="modal-dialog" role="document">
-                    <div class="modal-content">
-                        <div class="modal-header">
-                            <h4 class="modal-title">购买</h4>
-                        </div>
-                        <div class="modal-body">
-                            <div class="font18 color-333">
-                                是否完成了购买?
+                <div class="modal fade ms-modal" id="myModalPay" tabindex="-1" role="dialog">
+                    <div class="modal-dialog" role="document">
+                        <div class="modal-content">
+                            <div class="modal-header">
+                                <h4 class="modal-title">购买</h4>
+                            </div>
+                            <div class="modal-body">
+                                <div class="font18 color-333">
+                                    是否完成了购买?
+                                </div>
+                                <p class="mt15">
+                                    请在新打开的页面中完成购买,购买完成后,请根据购买结果点击下面的按钮
+                                </p>
+                            </div>
+                            <div class="modal-footer">
+                                <input type="hidden" name="order_sn" value="">
+                                <button type="button" class="ms-btn ms-btn-primary complete-pay">支付成功</button>
+                                <button type="button" class="ms-btn ms-btn-default fail-pay" data-dismiss="modal">支付遇到问题
+                                </button>
                             </div>
-                            <p class="mt15">
-                                请在新打开的页面中完成购买,购买完成后,请根据购买结果点击下面的按钮
-                            </p>
-                        </div>
-                        <div class="modal-footer">
-                            <input type="hidden" name="order_sn" value="">
-                            <button type="button" class="ms-btn ms-btn-primary complete-pay">支付成功</button>
-                            <button type="button" class="ms-btn ms-btn-default fail-pay" data-dismiss="modal">支付遇到问题
-                            </button>
                         </div>
                     </div>
                 </div>
-            </div>
-        </main>
-        <script src="/static/index/js/vue.js"></script>
-        <script>
-
-            var app = new Vue({
-                el: 'main',
-                data: {
-                    type: '<?php echo $_var_5;?>',
-                    gid: '<?php echo $_var_6;?>',
-                    recommended: 0,
-                    list: [],
-                    active: 0,
-                    pay_type: '<?php echo $_var_14;?>'
-                },
-                computed: {
-                    pay_money: function () {
-                        return this.list[this.active] ? this.list[this.active].price : 0;
-                    }
-                },
-                filters: {
-                    pf: function (v) {
-                        return parseFloat(v)
-                    },
-                },
-                methods: {
-                    fnote: function (v) {
-                        return v.note || (v.number + ['元', '个', '年', '月', '台', '台'][v.type]);
+            </main>
+            <script src="/static/index/js/vue.js"></script>
+            <script>
+                var app = new Vue({
+                    el: 'main',
+                    data: {
+                        type: '<?php echo $_var_5; ?>',
+                        gid: '<?php echo $_var_6; ?>',
+                        recommended: 0,
+                        list: [],
+                        active: 0,
+                        pay_type: '<?php echo $_var_14; ?>'
                     },
-                    action: function () {
-                        var discount_id = this.list[this.active].id;
-                        if (!discount_id) {
-                            alert('请选择需要购买的套餐');
-                            return;
-                        }
-                        var pay_type = this.pay_type;
-                        if (!pay_type) {
-                            return alert('请选择支付渠道');
+                    computed: {
+                        pay_money: function() {
+                            return this.list[this.active] ? this.list[this.active].price : 0;
                         }
-                        var type = this.type;
-                        var sign_id = this.gid;
-                        if (type == '3' && !sign_id) {
-                            return alert('没有可用的APP,请先上传IPA包');
-                        }
-                        $.post('/index/ajax_profile/pay', {
-                            discount_id,
-                            sign_id,
-                            pay_type,
-                        }, function (result) {
-                            $(".pay-money a:last").removeClass("disabled");
-                            $(".pay-money a:last").addClass("toPay");
-                            if (result.code != 200) {
-                                if (result.code == -10001) {
-                                    alert(result.msg, function () {
-                                        window.location.href = '/index/login';
-                                    });
-                                } else {
-                                    alert(result.msg);
-                                }
+                    },
+                    filters: {
+                        pf: function(v) {
+                            return parseFloat(v)
+                        },
+                    },
+                    methods: {
+                        fnote: function(v) {
+                            return v.note || (v.number + ['元', '个', '年', '月', '台', '台'][v.type]);
+                        },
+                        action: function() {
+                            var discount_id = this.list[this.active].id;
+                            if (!discount_id) {
+                                alert('请选择需要购买的套餐');
                                 return;
                             }
-                            if (result.msg) {
-                                alert(result.msg, function () {
-                                    Do_submit(result);
-                                });
-                            } else {
-                                Do_submit(result);
+                            var pay_type = this.pay_type;
+                            if (!pay_type) {
+                                return alert('请选择支付渠道');
                             }
-
-                            function Do_submit(result) {
-                                // $('#myModalPay').modal('show');
-                                // $('#myModalPay').find('input[name="order_sn"]').val(result.data.trade_id);
-                                form = $("<form></form>");
-                                form.attr('action', '/index/to_pay');
-                                form.attr('method', 'get');
-                                form.append($("<input type='hidden' name='trade_id' value='" + result.data.trade_id + "'/>"));
-                                form.append($("<input type='hidden' name='pay_type' value='" + result.data.pay_type + "' />"));
-                                form.appendTo("body");
-                                form.submit();
+                            var type = this.type;
+                            var sign_id = this.gid;
+                            if (type == '3' && !sign_id) {
+                                return alert('没有可用的APP,请先上传IPA包');
                             }
-                        }, 'json');
+                            $.post('/index/ajax_profile/pay', {
+                                discount_id,
+                                sign_id,
+                                pay_type,
+                            }, function(result) {
+                                $(".pay-money a:last").removeClass("disabled");
+                                $(".pay-money a:last").addClass("toPay");
+                                if (result.code != 200) {
+                                    if (result.code == -10001) {
+                                        alert(result.msg, function() {
+                                            window.location.href = '/index/login';
+                                        });
+                                    } else {
+                                        alert(result.msg);
+                                    }
+                                    return;
+                                }
+                                if (result.msg) {
+                                    alert(result.msg, function() {
+                                        Do_submit(result);
+                                    });
+                                } else {
+                                    Do_submit(result);
+                                }
+
+                                function Do_submit(result) {
+                                    // $('#myModalPay').modal('show');
+                                    // $('#myModalPay').find('input[name="order_sn"]').val(result.data.trade_id);
+                                    form = $("<form></form>");
+                                    form.attr('action', '/index/to_pay');
+                                    form.attr('method', 'get');
+                                    form.append($("<input type='hidden' name='trade_id' value='" + result.data.trade_id + "'/>"));
+                                    form.append($("<input type='hidden' name='pay_type' value='" + result.data.pay_type + "' />"));
+                                    form.appendTo("body");
+                                    form.submit();
+                                }
+                            }, 'json');
+                        },
+                        getList: function() {
+                            app = this;
+                            $.get('/index/item_price/getlist', {
+                                type: this.type,
+                                gid: this.gid,
+                                recommended: this.recommended
+                            }, function(ret) {
+                                if (ret.data) {
+                                    app.list = ret.data.list;
+                                }
+                            }, 'json')
+                        }
                     },
-                    getList: function () {
-                        app = this;
-                        $.get('/index/item_price/getlist', {
-                            type: this.type,
-                            gid: this.gid,
-                            recommended: this.recommended
-                        }, function (ret) {
-                            if (ret.data) {
-                                app.list = ret.data.list;
-                            }
-                        }, 'json')
-                    }
-                },
-                mounted() {
-                    this.$nextTick(() => {
-                        this.getList();
-                    });
-                },
-                watch: {
-                    recommended: function () {
-                        this.active = 0;
-                        this.getList();
+                    mounted() {
+                        this.$nextTick(() => {
+                            this.getList();
+                        });
                     },
-                    type: function () {
-                        this.active = 0;
-                        this.getList();
-                    }
-                }
-            });
-            var user_money = parseFloat("0.00");
-        </script>
-        <?php 
-		$this->footer();
-		?>        <script>
-            var ump_notify = '<?php echo $_var_7;?>';
-            if (ump_notify) {
-                alert(ump_notify == 'error' ? '支付失败' : '支付成功', function () {
-                    if (ump_notify == 'success') {
-                        location.href = '/index/user_order';
+                    watch: {
+                        recommended: function() {
+                            this.active = 0;
+                            this.getList();
+                        },
+                        type: function() {
+                            this.active = 0;
+                            this.getList();
+                        }
                     }
                 });
-            }
-        </script>
+                var user_money = parseFloat("0.00");
+            </script>
+            <?php
+            $this->footer();
+            ?> <script>
+                var ump_notify = '<?php echo $_var_7; ?>';
+                if (ump_notify) {
+                    alert(ump_notify == 'error' ? '支付失败' : '支付成功', function() {
+                        if (ump_notify == 'success') {
+                            location.href = '/index/user_order';
+                        }
+                    });
+                }
+            </script>
         </body>
+
         </html>
-    <?php 
-	}
-}
+<?php
+    }
+}

+ 5 - 4
source/index/jilu.php

@@ -65,10 +65,10 @@ class jilu extends BaseUser
                             <div class="aside-right">
                                 <div class="app-details app-details2">
                                     <div class="details-top clearfix">
-                                        <b>合并短链接记录</b>
+                                        <b class="f16-w500-c151515">合并短链接记录</b>
                                        
                                     </div>
-                                    <hr/>
+                                    <hr class="line10"/>
                                     <div class="download-details">
 
 
@@ -117,8 +117,9 @@ class jilu extends BaseUser
                                                             <td>
                                                                 <input name="del_id" type="hidden"
                                                                        value="<?php echo $_var_2["id"];?>">
-                                                                <a href="javascript:;" class="iconfont icon-shanchu"
-                                                                   title="删除"></a>
+                                                                <!-- <a href="javascript:;" class="iconfont icon-shanchu"
+                                                                   title="删除"></a> -->
+                                                                <div class="icon-shanchu app-bloder-btn" style="color: #FF7429;border-color:#FF7429">删除</div>
                                                             </td>
                                                         </tr>
                                                     <?php 

+ 2 - 2
source/system/my.php

@@ -1,10 +1,10 @@
 <?php
 define('IN_ARTICLE_TYPE','["文章","问答","公告"]');
-define('IN_ITEM_TYPE','["\u73b0\u91d1\u4f59\u989d","\u4e91\u5e01","\u4f1a\u5458","\u4f01\u4e1a\u7b7e\u540d","\u516c\u6709\u8bbe\u5907","\u79c1\u6709\u8bbe\u5907"]');
+define('IN_ITEM_TYPE','["\u73b0\u91d1\u4f59\u989d","\u6f8e\u6e43\u5e01","\u4f1a\u5458","\u4f01\u4e1a\u7b7e\u540d","\u516c\u6709\u8bbe\u5907","\u79c1\u6709\u8bbe\u5907"]');
 define('IN_CONFIG_TYPE','{"url":"\u94fe\u63a5","date":"\u65e5\u671f","list":"\u5217\u8868","text":"\u6587\u672c","time":"\u65f6\u95f4","email":"\u7535\u5b50\u90ae\u7bb1","image":"\u56fe\u7247","radio":"\u5355\u9009\u6846","number":"\u6570\u5b57","select":"\u4e0b\u62c9\u9009\u6846","checkbox":"\u591a\u9009\u6846","datetime":"\u65e5\u671f\u65f6\u95f4","textarea":"\u591a\u884c\u6587\u672c","json":"JSON"}');
 define('IN_CONFIG_CATEGORY','{"dev":"\u5f00\u53d1\u914d\u7f6e","pay":"\u652f\u4ed8\u914d\u7f6e","sms":"\u77ed\u4fe1\u914d\u7f6e","sign":"\u7b7e\u540d\u914d\u7f6e","site":"\u7ad9\u70b9\u914d\u7f6e","credit":"\u4e1a\u52a1\u914d\u7f6e","extend":"\u6269\u5c55\u914d\u7f6e","system":"\u5168\u5c40\u914d\u7f6e","upload":"\u4e0a\u4f20\u914d\u7f6e"}');
 define('IN_ARTICLE_GROUP','{"tf":"TF\u7b7e\u540d","vip":"VIP\u4f1a\u5458","sign":"\u4f01\u4e1a\u7b7e\u540d","distr":"\u5206\u53d1","pack":"\u5c01\u88c5APP"}');
-define('IN_ACLOG_TYPE','{"in_points":"\u4e91\u5e01","device_num":"\u516c\u6709\u8bbe\u5907","max_super_code":"\u6388\u6743\u7801","money":"\u73b0\u91d1\u4f59\u989d","prv_device_num":"\u79c1\u6709\u8bbe\u5907","promote_money":"\u4f63\u91d1"}');
+define('IN_ACLOG_TYPE','{"in_points":"\u6f8e\u6e43\u5e01","device_num":"\u516c\u6709\u8bbe\u5907","max_super_code":"\u6388\u6743\u7801","money":"\u73b0\u91d1\u4f59\u989d","prv_device_num":"\u79c1\u6709\u8bbe\u5907","promote_money":"\u4f63\u91d1"}');
 define('IN_NAME','鸿山分发');
 define('IN_KEYWORDS','APP,ios免签,APP封装,企业签名,超级签名');
 define('IN_DESCRIPTION','APP分发为开发者提供专业的APP分发和封装打包等稳定服务,我们支持IOS在线签名,企业签名,APP应用托管,Android应用内测等等一系列的方案!');

+ 18 - 1
static/index/css/ly.css

@@ -2,7 +2,10 @@
   font-size: 16px !important;
   font-weight: 500 !important;
   color: #151515 !important;
-  font: Source Han Sans SC;
+}
+.line10 {
+  height: 10px !important;
+  background: rgb(242, 242, 245)
 }
 .w194-h34 {
   width: 194px !important;
@@ -70,4 +73,18 @@
 }
 .app-bloder-btn::before{
     content: '' !important;
+}
+.price-type {
+    display: block !important;
+    font-size: 14px !important;
+    font-weight: 500;
+    text-align: center !important;
+}
+.price-btn {
+    border-radius: 4px;
+    height: 40px !important;
+    width: 96px !important;
+    padding: 10px 24px;
+    font-size: 16px;
+    font-weight: 500;
 }

+ 7 - 4
static/index/css/main.css

@@ -2263,7 +2263,9 @@ footer {
 .price-pay .common .tit {
     padding: 25px 30px 20px;
     border-bottom: 1px solid #e5e5e5;
-    color: #333;
+    font-size: 16px !important;
+    font-weight: 700 !important;
+    color: #151515 !important;
 }
 
 .price-pay .common ul {
@@ -2354,7 +2356,8 @@ footer {
 }
 
 .price-pay .common .list3 li {
-    height: 44px;
+    height: 84px;
+    width: 120px;
     border: 1px solid #e5e5e5;
     justify-content: center;
     display: flex;
@@ -2408,7 +2411,7 @@ footer {
 
 .price-pay .pay-money .money span {
     color: #fd641d;
-    font-size: 24px;
+    font-size: 32px;
 }
 
 .price-pay .pay-money .ms-btn {
@@ -10147,7 +10150,7 @@ aside.aside-left ul li:hover a .iconfont {
 
 /*.app-details{margin-bottom: 40px;}*/
 .app-details .details-top {
-    padding: 25px 20px;
+    padding: 39px 30px;
     background-color: #fff;
     margin-bottom: 20px;
     box-shadow: 0 0 5px rgba(0, 0, 0, .05);

この差分においてかなりの量のファイルが変更されているため、一部のファイルを表示していません