Merge branch 'main' of http://git.ycjcjy.com/marketing/miniapp into main

src/assets/css/iconfont.json

@@ -5,6 +5,20 @@
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "21444171",
+      "name": "关 闭",
+      "font_class": "guanbi1",
+      "unicode": "e60b",
+      "unicode_decimal": 58891
+    },
+    {
+      "icon_id": "629988",
+      "name": "朋友圈",
+      "font_class": "pengyouquan1",
+      "unicode": "e6a2",
+      "unicode_decimal": 59042
+    },
     {
       "icon_id": "4282091",
       "name": "勾",

src/assets/css/iconfont.svg

@@ -14,6 +14,10 @@
     />
       <missing-glyph />
       
+      <glyph glyph-name="guanbi1" unicode="&#58891;" d="M824.50390625 63.27035522999995a25.36523438 25.36523438 0 0 0-17.9296875 7.43472289L195.80386352 681.47460938a25.3125 25.3125 0 1 0 35.859375 35.85937499l610.8230896-610.82226562a25.41796875 25.41796875 0 0 0-17.98242187-43.2421875M213.734375 63.27035522999995a25.3125 25.3125 0 0 0-17.9296875 43.29327392l610.82226563 610.77035523a25.36523438 25.36523438 0 0 0 35.80664062-35.859375L231.6640625 70.70425415a25.3125 25.3125 0 0 0-17.9296875-7.4347229"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="pengyouquan1" unicode="&#59042;" d="M874.52393575 536.98288154C854.70173809 583.84664795 826.3284875 625.93291641 790.1902294 662.07027451 754.05287129 698.20763262 711.96750283 726.58178408 665.10283643 746.40398262 616.57694316 766.9284887700001 565.03742627 777.33525557 511.91591503 777.33525557 430.03488359 777.33525557 351.5402375 752.42762636 284.91729981 705.30634746 252.83712237 682.6163903300001 224.38283575 655.33982138 200.34498799 624.23387109 176.06763388 592.81908545 156.76496386 558.0980487300001 142.97271084 521.03598457 126.65214864 477.17954003 118.37661787 431.00457597 118.37661787 383.79415839 118.37661787 330.67264717 128.78338467 279.13313027000004 149.3087917 230.60633613000005 169.13099023 183.74167060000002 197.50424082 141.65720213999998 233.64249893 105.51894316000005 269.78075703 69.38068418 311.86522549 41.007433590000005 358.72899013 21.185235939999984 407.25578516 0.6607289099999889 458.79530205-9.746938770000042 511.91681328-9.746938770000042 565.03832451-9.746938770000042 616.57784141 0.6607289099999889 665.10463643 21.185235939999984 711.96930283 41.00743535000004 754.05467128 69.38068594000003 790.1920294 105.51894316000005 826.3302875 141.65720213999998 854.70353809 183.74166973 874.52573574 230.60633613000005 895.05024277 279.13313027000004 905.45791045 330.67264717 905.45791045 383.79415839 905.45791045 436.91567051 895.04844278 488.45698653 874.52393575 536.98288154L874.52393575 536.98288154ZM839.60571377 547.9037742200001L657.91138203 377.697583C657.95820136 379.21654922000005 657.98881543 380.73821719 657.98881543 382.26798779 657.98881543 386.21352012 657.82854424 390.12213487 657.52331065 393.99113378L658.39219122 719.77479668C736.95436719 685.39230761 801.22547217 624.2311684599999 839.60571377 547.9037742200001L839.60571377 547.9037742200001ZM510.42666113 261.71948906C443.95589112 261.71948906 389.87726065 315.79812129000004 389.87726065 382.26888955000004 389.87726065 448.73965781 443.95589199 502.81829003 510.42666113 502.81829003 576.8983294 502.81829003 630.97696074 448.73965781 630.97696074 382.26888955000004 630.97696074 315.79812129000004 576.89923028 261.71948906 510.42666113 261.71948906L510.42666113 261.71948906ZM631.40825058 730.32022412L630.70774472 467.66146172C618.02387862 485.47577872 601.48001797 500.35660987 582.31510683 511.0929208L372.22591308 722.40575156C415.77622402 740.47037842 463.10909609 750.32340263 511.91591503 750.32340263 553.73476484 750.32340263 593.93830801 743.27781065 631.40825058 730.32022412L631.40825058 730.32022412ZM346.10995391 710.36206583L526.46629942 528.95585888C521.19628701 529.52851113 515.84704033 529.83104473 510.42666113 529.83104473 508.48090596 529.83104473 506.54685781 529.78152188 504.62001143 529.70678935L504.62001143 529.80043154 175.64714932 529.8319455999999C210.12057793 609.04780723 271.33213906 672.27265078 346.10995391 710.36206583L346.10995391 710.36206583ZM145.38847168 383.79595839C145.38847168 424.63338018 152.04149053 464.62442842 165.1539456 502.82009092L425.38794277 502.79487949C414.8344127 495.32700205 405.30372998 486.50853222 397.04260449 476.59518252L166.6639083 260.68133378000005C152.89596583 299.17772636999996 145.38847168 340.62561532999996 145.38847168 383.79595839L145.38847168 383.79595839ZM177.49566143 233.81354325999996L365.49185908 410.00556153C363.77570498 401.01871699 362.86630683 391.74824941 362.86630683 382.26889042000005 362.86630683 371.68474629 363.99630253 361.36081463999994 366.12393594 351.40244472999996L365.88443222 351.40334559999997 365.03265781 47.99450096999999C281.86856299 84.51272606999999 214.75941348 151.05102422000004 177.49566143 233.81354325999996L177.49566143 233.81354325999996ZM392.01479844 37.41215595999995L392.73331309 293.36657753C406.03124815 275.80527128999995 423.16036543 261.29900449 442.86821386 251.10653174000004L650.10405518 44.31008379000002C607.43793096 26.87933467000005 560.77855596 17.267617679999944 511.91591328 17.267617679999944 469.9439958 17.266715920000024 429.600892 24.36453075999998 392.01479844 37.41215595999995L392.01479844 37.41215595999995ZM676.356875 56.273632619999944L496.91803203 235.33160858999997C501.36868496 234.92553105000002 505.87246075 234.70673437000005 510.42666113 234.70673437000005 532.04604717 234.70673437000005 552.59396386 239.38068486999998 571.11419199 247.76966660999994L851.92401904 246.90888955000003C818.46983955 164.10855469 755.6096542 96.22686592000002 676.356875 56.273632619999944L676.356875 56.273632619999944ZM861.61047031 273.89193018000003L611.28261933 274.65996768C628.24156192 290.56364530999997 641.4503583 310.41645879 649.4278581 332.73815420000005L851.4143958 521.95348799C868.83704141 479.29546817 878.44425752 432.64689668 878.44425752 383.79686016000005 878.44425752 345.52196425 872.54306826 308.60216249999996 861.61047031 273.89193018000003L861.61047031 273.89193018000003Z"  horiz-adv-x="1024" />
+      
       <glyph glyph-name="gou1" unicode="&#59452;" d="M53.730509 348.7232a31.93344 31.93344 0 0 1-45.21984-1.7664 32.16896 32.16896 0 0 1 1.76128-45.3632l359.99744-334.01856a31.93344 31.93344 0 0 1 46.9504 3.80416L1017.217229 741.7344a32.16384 32.16384 0 0 1-5.51424 45.056 31.93344 31.93344 0 0 1-44.91776-5.5296L388.194509 38.4 53.730509 348.7232z"  horiz-adv-x="1024" />
       
       <glyph glyph-name="dianhua1" unicode="&#58889;" d="M512 805.875a421.875 421.875 0 1 0 0-843.75A421.875 421.875 0 1 0 512 805.875zM422.46874982 636.84375027c-20.15624982 3.42187509-37.17187509-3.46875019-63.65624991-20.6249999l-7.59375-4.92187556-6.89062528-4.35937444c-52.50000037-32.43749991-30.32812491-166.12499982 55.3125001-291.46875074 85.35937527-125.06250037 204.14062491-198.18749981 255.93750054-166.21875l17.53124964 10.31250037c22.26562481 13.26562537 34.78125037 24.046875 41.24999982 39.60937491 8.71874973 20.85937537 2.01562482 44.24999991-20.53124973 70.64062536-36.46875037 42.65625009-64.07812491 52.68749991-95.34375 38.4375001a130.40625009 130.40625009 0 0 1-14.29687491-7.68750019l-13.82812482-8.57812527c-10.45312482-6.46875027-42.51562482 24.23437537-80.9531249 80.34375036-37.87499982 55.45312537-54.14062527 95.34375-44.53125046 101.34374936 0.93750018 0.56250027 10.96875 6.65624982 13.78124972 8.4375 39.28125009 24.70312463 45.93749991 51.93750009 15.46875056 109.265625-14.43750019 27.14062527-31.54687482 41.99999963-51.65625037 45.46875064z"  horiz-adv-x="1024" />

src/components/ShareToCircle/index.jsx

@@ -0,0 +1,15 @@
+import classNames from 'classnames'
+import './style.scss'
+
+export default (props) => {
+  const { visible = false, close = () => {} } = props
+
+  return (
+    <view className={classNames('components', 'ShareToCircle', { show: visible })}>
+      <view>
+        <text>从这里“分享到朋友圈”~</text>
+        <text className='iconfont icon-guanbi1' onClick={close}></text>
+      </view>
+    </view>
+  )
+}

src/components/ShareToCircle/style.scss

@@ -0,0 +1,45 @@
+.components.ShareToCircle {
+  width: 100%;
+  position: fixed;
+  left: 0;
+  top: 0;
+  bottom: 0;
+  z-index: 1000;
+  background: rgba(0, 0, 0, 0.6);
+  display: none;
+  &.show {
+    display: block;
+  }
+  >view {
+    display: inline-block;
+    position: absolute;
+    right: 30px;
+    width: 386px;
+    font-size: 0;
+    white-space: nowrap;
+    background: #FF9700;
+    border-radius: 8px;
+    overflow: visible;
+    top: 20px;
+    text-align: center;
+    &::after {
+      content: '';
+      display: block;
+      position: absolute;
+      right: 30px;
+      top: -30px;
+      width: 0;
+      height: 0;
+      border-color: transparent transparent #FF9700 transparent;
+      border-style: solid solid dashed solid;
+      border-width: 20px;
+    }
+    >text {
+      display: inline-block;
+      vertical-align: middle;
+      font-size: 28px;
+      color: #fff;
+      line-height: 60px;
+    }
+  }
+}

src/pages/index/buildingTakeLook/index.jsx

@@ -52,8 +52,8 @@ export default withLayout((props) => {
                   <text>分享</text>
                 </view>
                 <view>
-                  <text className='iconfont icon-haibao'></text>
-                  <text>海报</text>
+                  <text className='iconfont icon-pengyouquan1'></text>
+                  <text>朋友圈</text>
                 </view>
               </view>
             </view>

src/pages/index/index.jsx

@@ -4,6 +4,7 @@ import Taro from '@tarojs/taro'
 import { ScrollView } from '@tarojs/components'
 import withLayout from '@/layout'
 import ProjectListItem from '@/components/ProjectListItem/index'
+// import ShareToCircle from '@/components/ShareToCircle/index'
 import { fetch } from '@/utils/request'
 import { API_BANNER_LIST, API_INDEX_PROJECTS } from '@/constants/api'
 import useParams from '@/utils/hooks/useParams'
@@ -62,6 +63,7 @@ export default withLayout((props) => {
 
   return (
     <view className='Page Index'>
+      {/* <ShareToCircle visible></ShareToCircle> */}
       <ScrollView scroll-y>
         <view className='PageContent'>
 

src/pages/mine/components/EditUserDetailBasicInfo/index.jsx

@@ -9,6 +9,9 @@ export default function EditUserDetailBasicInfo (props) {
   const { Data = {}, close = () => { }, CustomerId = null } = props
 
   const [FormData, setFormData] = useState({ ...Data })
+  const [Age, setAge] = useState(null)
+  const [HouseholdIncome, setHouseholdIncome] = useState(null)
+  const [EstimatedPurchaseTime, setEstimatedPurchaseTime] = useState(null)
 
   const [AgeRange] = useState(['18-25', '26-30', '30-35', '36-45', '46-50', '50-60', '60以上'])
   const [IncomeRange] = useState(['10万以下', '10-15万', '15-20万', '20-30万', '30-50万', '50-75万', '75-100万', '100万以上'])
@@ -42,6 +45,7 @@ export default function EditUserDetailBasicInfo (props) {
     } else if (key === 'estimatedPurchaseTime') {
       resData[key] = BuyTimeRange[e.detail.value]
     }
+    console.log(resData)
     setFormData(resData)
   }