xiaoe_mp_npm 0.2.2-beta1 → 0.2.2-beta2

package/miniprogram_dist/AliveInvite/images/new_emptypage.svg

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="240px" height="180px" viewBox="0 0 240 180" version="1.1">
+  <title>emptypage_排行榜</title>
+  <defs>
+    <rect id="path-1" x="0" y="0" width="240" height="180"></rect>
+    <linearGradient x1="50%" y1="0%" x2="50%" y2="26.3264982%" id="linearGradient-3">
+      <stop stop-color="#E1E1EC" offset="0%"></stop>
+      <stop stop-color="#FFFFFF" stop-opacity="0" offset="100%"></stop>
+    </linearGradient>
+    <circle id="path-4" cx="40" cy="40" r="40"></circle>
+    <linearGradient x1="50%" y1="0%" x2="50%" y2="88.7358257%" id="linearGradient-6">
+      <stop stop-color="#C8C8DA" stop-opacity="0.98" offset="0%"></stop>
+      <stop stop-color="#F7F7FB" offset="100%"></stop>
+    </linearGradient>
+    <linearGradient x1="50%" y1="-29.4454305%" x2="50%" y2="100%" id="linearGradient-7">
+      <stop stop-color="#C8C8DA" stop-opacity="0.98" offset="0%"></stop>
+      <stop stop-color="#F7F7FB" offset="100%"></stop>
+    </linearGradient>
+  </defs>
+  <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g id="竖屏直播-达人榜空状态" transform="translate(-68.000000, -347.000000)">
+      <g id="弹窗" transform="translate(0.000000, 251.000000)">
+        <g id="emptypage_排行榜" transform="translate(68.000000, 96.000000)">
+          <mask id="mask-2" fill="white">
+            <use xlink:href="#path-1"></use>
+          </mask>
+          <use id="Mask" fill="#F2F4F6" opacity="0" xlink:href="#path-1"></use>
+          <g id="组件/空页面元素" mask="url(#mask-2)">
+            <g transform="translate(-18.000000, 13.000000)">
+              <ellipse id="椭圆形" fill="url(#linearGradient-3)" opacity="0.600000024" cx="137" cy="206" rx="137" ry="109"></ellipse>
+              <g id="分组-10" stroke-width="1" fill="none" transform="translate(188.000000, 99.000000)">
+                <path d="M9,10.7926384 C9,8.03121463 7.5,4.4336685 4.5,-5.15143483e-14 C1.5,4.4336685 0,8.03121463 0,10.7926384 C0,14.934774 9,14.934774 9,10.7926384 Z" id="椭圆形-copy" fill="#E2E2E9"></path>
+                <rect id="矩形-copy" fill="#D7D7E5" x="3.9375" y="10" width="1.125" height="10" rx="0.5625"></rect>
+              </g>
+              <ellipse id="椭圆形" fill="#D7D7E5" cx="137.5" cy="104" rx="14.5" ry="2"></ellipse>
+              <g id="1备份" stroke-width="1" fill="none" transform="translate(98.000000, 0.000000)">
+                <rect id="矩形" fill-opacity="0.01" fill="#FFFFFF" fill-rule="nonzero" x="4" y="13" width="72" height="72"></rect>
+                <g id="形状结合" transform="translate(0.000000, 10.000000)">
+                  <mask id="mask-5" fill="white">
+                    <use xlink:href="#path-4"></use>
+                  </mask>
+                  <g id="蒙版"></g>
+                  <circle id="椭圆形" fill="#FFFFFF" mask="url(#mask-5)" cx="40" cy="40" r="40"></circle>
+                  <path d="M44.5967753,54.0029672 C51.8244176,54.0298192 53.9838431,54.2590379 56.5105549,55.4858565 L56.5105549,55.4858565 L56.8098375,55.6348386 C59.6322611,57.0729565 61.9270435,59.3677389 63.3652017,62.1902416 C64.7226758,64.85459 64.969128,66.8921459 64.9970328,74.4032247 L64.9970328,74.4032247 L65,78 C65,79.6568542 63.6568542,81 62,81 L62,81 L17,81 C15.3431458,81 14,79.6568542 14,78 L14,78 L14.0006939,75.2772436 C14.0133762,67.3443591 14.2109394,65.1152078 15.485912,62.4894665 L15.485912,62.4894665 L15.6348992,62.1901907 C17.0729973,59.3677325 19.3677212,57.0729502 22.1902243,55.6347918 C24.8545916,54.277324 26.8921549,54.030872 34.4032266,54.0029672 L34.4032266,54.0029672 Z M39.5,21 C46.9558497,21 53,27.0441562 53,34.5 C53,41.9558542 46.9558542,48 39.5,48 C32.0441458,48 26,41.9558542 26,34.5 C26,27.0441562 32.0441503,21 39.5,21 Z" fill="url(#linearGradient-6)" mask="url(#mask-5)"></path>
+                  <path d="M40,0 C62.09139,0 80,17.90861 80,40 C80,62.09139 62.09139,80 40,80 C17.90861,80 0,62.09139 0,40 C0,17.90861 17.90861,0 40,0 Z M40,5 C20.6700338,5 5,20.6700338 5,40 C5,59.3299662 20.6700338,75 40,75 C59.3299662,75 75,59.3299662 75,40 C75,20.6700338 59.3299662,5 40,5 Z" id="蒙版备份" fill="url(#linearGradient-7)" opacity="0.400000006" mask="url(#mask-5)"></path>
+                </g>
+                <path d="M68.4574549,6.84501926 C68.3131826,6.84501926 68.1831344,6.90376597 68.0876302,6.99818033 C68.0815342,7.00447462 68.0795022,7.00237652 68.0815342,6.99398413 L64.511303,10.3194676 L61.6035052,4.30422404 C61.4673609,4.11749342 61.2519685,4 61.008128,4 C60.7236474,4 60.475743,4.16574965 60.3497587,4.40703078 L57.490729,10.3194676 L53.8067056,6.8869812 C53.7294895,6.84292116 53.6400813,6.817744 53.5445771,6.817744 C53.2499365,6.817744 53.012192,7.06531943 53.012192,7.36744536 C53.012192,7.39262253 53.008128,7.40521111 53,7.40521111 L54.1399543,16.1983348 C54.1399543,16.1647652 54.1379223,16.1311957 54.1338583,16.0955281 C54.2029464,16.7081723 54.6032512,17.2159117 55.1417323,17.4257214 C55.0929642,17.4068386 55.0441961,17.3921519 54.999492,17.3837595 C56.1435103,17.8264579 58.3888748,18.1138972 60.975616,18.08872 C63.5745491,18.065641 65.8402337,17.7341417 67.000508,17.2662661 C66.9578359,17.2746585 66.9131318,17.287247 66.8643637,17.3061299 C67.4028448,17.0942221 67.8031496,16.5864827 67.8722377,15.9738384 C67.8641097,16.0451737 67.8641097,16.1123128 67.8681737,16.1731576 L69,7.42619208 C68.995936,7.42199588 68.991872,7.4094073 68.991872,7.39052443 C68.991872,7.09259468 68.7541275,6.84501926 68.4574549,6.84501926 Z" id="路径" fill="#EEEEF4" transform="translate(61.000000, 11.045126) rotate(-330.000000) translate(-61.000000, -11.045126) "></path>
+              </g>
+              <g id="编组-2" stroke-width="1" fill="none" transform="translate(70.000000, 83.000000)">
+                <path d="M14,16.9857462 C14,12.6397428 11.6666667,6.97782741 7,0 C2.33333333,6.97782741 0,12.6397428 0,16.9857462 C0,23.5047513 14,23.5047513 14,16.9857462 Z" id="椭圆形" fill="#E2E2E9"></path>
+                <rect id="矩形" fill="#D7D7E5" x="6.125" y="15.75" width="1.75" height="15.75" rx="0.875"></rect>
+              </g>
+            </g>
+          </g>
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>

package/miniprogram_dist/AliveInvite/images/new_invite_title.svg

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="142px" height="24px" viewBox="0 0 142 24" version="1.1">
+  <title>邀请达人榜</title>
+  <defs>
+    <linearGradient x1="-2.22044605e-14%" y1="50%" x2="100%" y2="50%" id="linearGradient-1">
+      <stop stop-color="#FFA4D0" offset="0%"></stop>
+      <stop stop-color="#758AFF" offset="0%"></stop>
+      <stop stop-color="#CC7CFF" offset="47.075912%"></stop>
+      <stop stop-color="#FF70C7" offset="100%"></stop>
+    </linearGradient>
+    <path d="M25.32,21.76 L25.71,18.91 L10.14,18.91 L8.07,18.4 L10.41,18.4 L11.73,14.89 L13.68,14.89 L13.32,17.38 L11.97,18.46 L14.97,18.46 C15.55,18.46 16.03,18.295 16.41,17.965 C16.79,17.635 17.01,17.24 17.07,16.78 L17.07,16.78 L17.64,12.79 L12.51,12.79 L12.78,12.13 L17.7,12.13 L18,9.85 L14.97,9.85 L15.12,8.86 L17.85,8.86 L18.81,2.02 L15.66,2.02 L16.44,0.7 L11.91,0.7 L12.48,1.33 L12.09,2.02 L9.81,2.02 L8.85,8.86 L11.55,8.86 L11.4,9.85 L8.37,9.85 L8.07,12.13 L9.57,12.13 L7.23,18.19 L6.51,18.01 L8.22,5.8 L2.82,5.8 L2.43,8.65 L3.39,8.65 L1.98,18.79 L-8.52651283e-14,21.73 L4.47,21.73 L5.01,20.89 L8.04,21.76 L25.32,21.76 Z M20.28,18.34 L21.81,15.67 L22.86,18.34 L25.8,18.34 L23.76,13.36 L25.89,9.79 L26.46,5.71 L27.33,5.71 L27.72,2.92 L23.94,2.92 L24.84,0.7 L21.18,0.7 L18.48,7.69 L22.02,7.69 L22.8,5.71 L23.34,5.71 L22.95,8.62 L22.29,9.73 L21.78,8.44 L18.42,8.44 L20.28,13.21 L17.28,18.34 L20.28,18.34 Z M8.49,4.66 L8.04,1.24 L3.54,1.24 L3.99,4.66 L8.49,4.66 Z M15.36,4.54 L12.48,4.54 L12.6,3.82 L15.48,3.82 L15.36,4.54 Z M15,7.15 L12.12,7.15 L12.21,6.49 L15.09,6.49 L15,7.15 Z M54.58,10.36 L54.91,8.08 L49.03,8.08 L49.15,7.33 L53.62,7.33 L53.95,5.05 L49.45,5.05 L49.57,4.3 L55,4.3 L55.3,2.05 L49.87,2.05 L50.08,0.73 L43.63,0.73 L44.71,1.84 L44.68,2.05 L39.28,2.05 L38.98,4.3 L44.35,4.3 L44.26,5.05 L39.52,5.05 L39.19,7.33 L43.93,7.33 L43.81,8.08 L37.78,8.08 L37.45,10.36 L54.58,10.36 Z M37,4.96 L36.25,1.24 L31.54,1.24 L32.29,4.96 L37,4.96 Z M29.62,22.18 L36.34,20.38 L36.79,17.29 L35.32,17.71 L36.88,6.52 L30.19,6.52 L29.77,9.46 L31.39,9.46 L29.62,22.18 Z M41.47,22.18 L41.92,18.91 L47.89,18.91 L47.68,20.53 L46.33,22.18 L50.86,22.18 C51.4,22.18 51.81,21.995 52.09,21.625 C52.37,21.255 52.55,20.78 52.63,20.2 L52.63,20.2 L53.95,10.93 L38.14,10.93 L36.55,22.18 L41.47,22.18 Z M48.58,14.02 L42.61,14.02 L42.73,13.21 L48.7,13.21 L48.58,14.02 Z M48.19,16.9 L42.22,16.9 L42.34,16.03 L48.31,16.03 L48.19,16.9 Z M71.63,17.65 L75.5,9.43 L77.18,17.65 L82.46,17.65 L80.42,7.54 L83.99,7.54 L84.41,4.54 L77.81,4.54 L79.61,0.7 L73.28,0.7 L73.82,1.33 L72.35,4.54 L68,4.54 L67.58,7.54 L70.97,7.54 L66.32,17.65 L71.63,17.65 Z M66.83,4.66 L65.6,1.24 L60.98,1.24 L62.21,4.66 L66.83,4.66 Z M62.51,21.76 L63.29,20.68 L66.83,21.76 L82.79,21.76 L83.18,18.91 L69.23,18.91 L65.12,17.68 L66.77,5.8 L60.41,5.8 L60.02,8.65 L61.25,8.65 L59.84,18.76 L57.68,21.76 L62.51,21.76 Z M92.82,22.27 L100.56,10.21 L106.5,22.27 L112.2,22.27 L103.74,5.29 L106.71,0.67 L99.87,0.67 L100.5,1.42 L87.12,22.27 L92.82,22.27 Z M121.06,22.27 L123.19,7.18 L125.56,7.18 L125.98,4.33 L123.61,4.33 L124.12,0.67 L119.59,0.67 L120.19,1.54 L119.8,4.33 L117.4,4.33 L116.98,7.18 L119.38,7.18 L117.25,22.27 L121.06,22.27 Z M141.16,4.63 L141.49,2.29 L136.72,2.29 L136.96,0.7 L131.44,0.7 L132.4,1.84 L132.34,2.29 L127.81,2.29 L127.48,4.63 L141.16,4.63 Z M129.46,10.9 L129.64,9.52 L137.59,9.52 L137.41,10.9 L141.16,10.9 L141.7,6.94 L138.94,6.94 L139.81,5.23 L136.09,5.23 L135.19,6.94 L133.18,6.94 L132.79,5.23 L129.04,5.23 L129.43,6.94 L126.31,6.94 L125.77,10.9 L129.46,10.9 Z M116.59,21.19 L118.9,7.96 L117.13,7.96 L114.79,21.19 L116.59,21.19 Z M124.09,19.48 L125.23,7.96 L123.46,7.96 L122.29,19.48 L124.09,19.48 Z M128.83,22.27 L131.02,17.2 L135.64,17.2 L135.25,20.05 L133.42,22 L137.62,22 C138,22 138.35,21.87 138.67,21.61 C138.99,21.35 139.17,21.02 139.21,20.62 L139.21,20.62 L140.02,14.92 L132.01,14.92 L132.28,14.32 L140.59,14.32 L140.98,11.5 L135.64,11.5 L135.88,9.91 L131.14,9.91 L130.9,11.5 L125.56,11.5 L125.17,14.32 L128.11,14.32 L124.66,22.27 L128.83,22.27 Z" id="path-2"></path>
+  </defs>
+  <g id="企业直播1.1-20210621" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g id="直播首页-邀请达人榜" transform="translate(-116.000000, -276.000000)" fill-rule="nonzero">
+      <g id="弹窗" transform="translate(0.000000, 251.000000)">
+        <g id="邀请达人榜" transform="translate(115.940000, 25.000000)">
+          <use fill="#FF6E00" xlink:href="#path-2"></use>
+          <use fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>

package/miniprogram_dist/AliveInvite/images/rank_first.svg

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="26px" height="26px" viewBox="0 0 26 26" version="1.1">
+  <title>icon/排行榜图标/排名-1</title>
+  <g id="icon/排行榜图标/排名-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g id="Group">
+      <circle id="Oval-2-Copy" fill="#FCDE61" cx="13" cy="13" r="13"></circle>
+      <circle id="Oval-2-Copy" fill="#FDB113" cx="13" cy="13" r="10"></circle>
+      <polygon id="1" fill="#FFFFFF" fill-rule="nonzero" points="15 8 10 8 10 10.6309214 11.9477612 10.6309214 11.9477612 19 15 19"></polygon>
+    </g>
+  </g>
+</svg>

package/miniprogram_dist/AliveInvite/images/rank_second.svg

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="26px" height="26px" viewBox="0 0 26 26" version="1.1">
+  <title>icon/排行榜图标/排名-2</title>
+  <g id="icon/排行榜图标/排名-2" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g id="Group">
+      <circle id="Oval-2-Copy" fill="#D4DCE2" cx="13" cy="13" r="13"></circle>
+      <circle id="Oval-2-Copy" fill="#A6B5C2" cx="13" cy="13" r="10"></circle>
+      <path d="M12.9815385,7 C11.7662178,7 10.7877165,7.38962174 10.0683264,8.16865393 C9.35606391,8.93996768 9,9.9187577 9,11.0893855 L9,11.3941087 L11.6092308,11.3941087 L11.6092308,11.0893855 C11.6092308,10.5400525 11.7422168,10.0831246 12.0059175,9.71004439 C12.2497667,9.36504985 12.5709808,9.20010157 13,9.20010157 C13.4405979,9.20010157 13.7824116,9.35109403 14.0491934,9.66016693 C14.3279637,9.98312879 14.4646154,10.3457191 14.4646154,10.7602844 L14.461052,10.844808 L14.4503403,10.9295889 C14.4461538,11.1856435 14.3422284,11.4838553 14.1259807,11.8627555 L14.004682,12.0563307 C13.6767134,12.5488459 12.9258424,13.5155931 11.7638427,14.9383842 L9.31213139,18.0128341 C9.10149006,18.2769815 9.14695175,18.6602261 9.41367291,18.8688348 C9.52229425,18.95379 9.65666278,19 9.79507276,19 L17,19 L17,16.7998984 L13.1507692,16.7998984 L14.6180954,15.1090844 C16.1517295,13.3392021 16.9261538,11.9447448 16.9261538,10.8882682 C16.9261538,9.78376624 16.5430638,8.85192276 15.7817913,8.11122303 C15.02209,7.37205197 14.0828973,7 12.9815385,7 Z" id="2" fill="#FFFFFF" fill-rule="nonzero"></path>
+    </g>
+  </g>
+</svg>

package/miniprogram_dist/AliveInvite/images/rank_third.svg

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="26px" height="26px" viewBox="0 0 26 26" version="1.1">
+  <title>icon/排行榜图标/排名-3</title>
+  <g id="icon/排行榜图标/排名-3" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g id="Group">
+      <circle id="Oval-2-Copy" fill="#FDD5C2" cx="13" cy="13" r="13"></circle>
+      <circle id="Oval-2-Copy" fill="#FBAA8B" cx="13" cy="13" r="10"></circle>
+      <path d="M13.1100076,7 C12.0626007,7 11.2009952,7.30678079 10.5424828,7.92166141 C9.88814388,8.53264494 9.509466,9.36045378 9.40484092,10.3916845 L9.37169415,10.7183937 L11.7929717,10.7183937 L11.7929717,10.4209222 C11.7929717,9.47189903 12.1742527,9.05850273 13.0183346,9.05850273 C13.8624165,9.05850273 14.2436975,9.47189903 14.2436975,10.4209222 C14.2436975,10.8046466 14.1090403,11.1168683 13.8330349,11.3757825 C13.6885526,11.5113179 13.3413781,11.6364151 12.8035527,11.7303559 L12.3002292,11.8059776 L12.3002292,13.5384234 L13.2634415,13.5384234 C13.4943496,13.5384234 13.8318204,13.7182567 14.1056811,14.0316247 C14.4084748,14.3780997 14.5553858,14.7419078 14.5553858,15.1328706 C14.5553858,15.6262074 14.4158715,16.0362111 14.1368327,16.3744765 C13.8717881,16.6957776 13.5259495,16.8522558 13.0733384,16.8522558 C12.6107969,16.8522558 12.2412653,16.7054273 11.945451,16.4075294 C11.6469013,16.1068768 11.499618,15.7410191 11.499618,15.2935052 L11.499618,14.9960337 L9,14.9960337 L9,15.2935052 C9,16.3397306 9.39571508,17.2276928 10.178953,17.9384633 C10.9571395,18.6446497 11.8995873,19 12.9908327,19 C14.1530245,19 15.1169948,18.6614015 15.866524,17.9834098 C16.6218205,17.3002011 17,16.3847169 17,15.2578086 L16.9928402,14.9710201 C16.940332,13.9427619 16.5989785,13.1715291 15.967673,12.6813862 L15.8067227,12.567179 L15.9595033,12.409853 C16.4090428,11.8965267 16.6333079,11.2046968 16.6333079,10.349529 C16.6333079,9.33200078 16.3091074,8.51012275 15.6591002,7.9037219 C15.0124398,7.30044336 14.156999,7 13.1100076,7 Z" id="3" fill="#FFFFFF" fill-rule="nonzero"></path>
+    </g>
+  </g>
+</svg>

package/miniprogram_dist/CollectionAddress/index.js

@@ -0,0 +1,285 @@
+// src/CollectionAddress/index.js
+import {
+  getConfirmOrderDetail,
+  getExpressSwitch,
+  getPickerInfo,
+  getGoodsPackage,
+  getSuperVipInfo,
+  getBusinessFeature,
+  getMarketingInfo,
+  getShopConf
+} from "../common/api/confirmOrder"
+import {
+  isEmptyObject
+} from "../common/utils/index"
+const computedBehavior = require('miniprogram-computed').behavior
+
+Component({
+  behaviors: [computedBehavior],
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    baseInfoQuery: {
+      type: Object,
+      required: true,
+      value: () => {},
+    },
+    isCart: {
+      type: Number,
+      value: 0,
+    },
+    title: {
+      type: String,
+      value: "",
+    },
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+    isShowPoint: false, // 是否显示选择提货点组件
+    isShowSelectShipper: false, // 是否显示选择提货人组件
+    isShowCreateShipper: false, // 是否显示新增、编辑提货人组件
+    isShowAddressManage: false, // 是否显示地址管理组件（非自提）
+    isShowEditAddress: false, // 是否显示新建、编辑组件（非自提）
+    activeMode: 0, // 0：快递配送，1：自提
+    express_type: 1, // 接口下发配送信息 1-快递配送 2-商品自提
+    userCanPick: 1, // 商家是否支持自提 1支持 0不支持
+    sInfo: {}, // 地址信息（非自提）
+    addressInfo: {}, // 地址信息（非自提）
+    pickerUserInfo: {}, // 自提人信息
+    distributionMode: 0, // 配送方式 -1全部 1快递配送 2商品自提 （目前只支持实物商品，非实物商品返回0）
+    confirmOrderInfo: {
+      // 订单页详细信息(通过查询接口拿到)
+      app_info: {},
+      goods_info: {},
+    },
+    shipperType: 1, // 1：新建自提人；2：编辑自提人
+  },
+  lifetimes: {
+    attached() {
+      this.initConfirmOrderInfo()
+      this.initDeliveryState()
+      this.initGoodsPackage()
+    }
+  },
+  computed: {
+    isShowMain(data) {
+      return (
+        !data.isShowPoint &&
+        !data.isShowSelectShipper &&
+        !data.isShowCreateShipper &&
+        !data.isShowAddressManage &&
+        !data.isShowEditAddress
+      )
+    },
+    //通过商家是否开启自提和自提选择 决定自提组件的显示和隐藏
+    showPickSelf(data) {
+      return (
+        data.userCanPick === 1 &&
+        (data.activeMode === 1 || data.distributionMode === 2)
+      );
+    },
+    // 判断模式选择tab栏的显示和隐藏
+    showModeSelect(data) {
+      return data.distributionMode === -1 && data.userCanPick === 1;
+    },
+    // 显示地址栏的情况 商品有两种配送方式,商家关闭自提/购物车
+    showAddressSelect(data) {
+      return (
+        data.activeMode === 0 &&
+        (data.distributionMode === -1 || data.distributionMode === 1)
+      );
+    },
+    // 商品信息
+    goodsInfo(data) {
+      if (isEmptyObject(data.confirmOrderInfo.goods_info)) {
+        return data.baseInfoQuery;
+      }
+      return data.confirmOrderInfo.goods_info;
+    },
+  },
+  observers: {
+    express_type(val) {
+      this.outData();
+    },
+    activeMode(val) {
+      val === 1 ? this.triggerEvent("changeTitle", "选择提货地址") : this.triggerEvent("changeTitle", "选择收货地址");
+    },
+    distributionMode(val) {
+      if (val === 2) {
+        this.setData({
+          express_type: 2
+        })
+        this.triggerEvent("changeTitle", "选择提货地址");
+      } else {
+        this.setData({
+          express_type: 1
+        })
+        this.triggerEvent("changeTitle", "选择收货地址");
+      }
+    },
+    isShowMain(val) {
+      this.triggerEvent("changeState", val)
+      if (val) {
+        if (this.data.distributionMode === -1 || this.data.distributionMode === 1 && this.data.activeMode === 0) {
+          this.triggerEvent("changeTitle", "选择收货地址");
+        } else {
+          this.triggerEvent("changeTitle", "选择提货地址");
+        }
+      }
+      this.outData();
+    },
+    isShowPoint(val) {
+      if (val) {
+        this.triggerEvent("changeTitle", "选择自提点");
+      }
+    },
+    isShowSelectShipper(val) {
+      if (val) {
+        this.triggerEvent("changeTitle", "选择提货人");
+      }
+    },
+    isShowCreateShipper(val) {
+      if (val) {
+        this.data.shipperType === 1
+          ? this.triggerEvent("changeTitle", "新建提货人")
+          : this.triggerEvent("changeTitle", "编辑提货人");
+      }
+    },
+    isShowAddressManage(val) {
+      if (val) {
+        this.triggerEvent("changeTitle", "选择地址");
+      } else {
+        this.initConfirmOrderInfo();
+      }
+    },
+    isShowEditAddress(val) {
+      if (val) {
+        this.triggerEvent("changeTitle", "地址编辑");
+      }
+    },
+  },
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    // 供子组件修改父组件值
+    updataData(e) {
+      this.setData({
+        ...e.detail
+      })
+    },
+    // 商品的套餐信息
+    initGoodsPackage() {
+      let params = {
+        spu_id: this.data.baseInfoQuery.spu_id,
+      }
+      getGoodsPackage(params).then(res => {
+          let {
+            code,
+            data: goodsPackage
+          } = res.data
+          if (code === 0) {
+            this.setData({
+              hasEntityGoods: goodsPackage.entity_goods_num > 0 ? true : false
+            })
+            if (this.data.baseInfoQuery.spu_type != "ENT" && goodsPackage.has_package) {
+              this.setData({
+                distributionMode: goodsPackage.package_delivery
+              })
+            }
+          }
+        }).catch((err) => console.log(err))
+        .finally(() => {})
+    },
+    // 获取商家自提状态
+    initDeliveryState() {
+      getExpressSwitch().then(res => {
+          if (res.data.code === 0) {
+            this.setData({
+              userCanPick: res.data.data.self_service_switch
+            })
+          }
+        })
+        .catch((err) => console.log(err))
+        .finally(() => {})
+    },
+    // 初始化订单页基本信息
+    initConfirmOrderInfo() {
+      let {
+        id,
+        resource_type,
+        spu_type,
+        sku
+      } = this.data.baseInfoQuery
+      let params = {
+        spu_id: id,
+        resource_type,
+        spu_type,
+        address_id: this.data.addressInfo.id || "",
+        sku_id: sku || "",
+      }
+      wx.showLoading({
+        mask: true
+      })
+      getConfirmOrderDetail(params).then(res => {
+        if (res.data.code === 0) {
+          if (this.data.baseInfoQuery.spu_type == "ENT") {
+            this.setData({
+              distributionMode: res.data.data.goods_info.distribution_pattern
+            })
+          }
+          this.setData({
+            confirmOrderInfo: res.data.data,
+            pickerUserInfo: res.data.data.picker_info || {}
+          })
+          if (!this.data.isCart) {
+            let addressInfo = res.data.data.address_info;
+            this.setData({
+              addressInfo: Array.isArray(addressInfo) || !addressInfo ? {} : addressInfo
+            })
+          }
+        }
+      }).catch(err => {
+        console.log(err);
+      }).finally(() => {
+        this.outData()
+        wx.hideLoading()
+      })
+    },
+    // 切换配送模式
+    changeMode(e) {
+      let val = e.detail;
+      let num = 0;
+      val ? num = 2 : num = 1;
+      this.setData({
+        activeMode: val,
+        express_type: num
+      })
+    },
+    // 往外层抛出选择好的地址/自提数据
+    outData() {
+      let dataObj = {
+        express_type: this.data.express_type,
+        addressInfo: this.data.addressInfo,
+        picksiteInfo: this.data.picksiteInfo,
+        pickerUserInfo: this.data.pickerUserInfo,
+      };
+      this.triggerEvent("outData", dataObj);
+    },
+    // 供父组件调用此方法来显示最初的页面（比如：父组件有个返回箭头）
+    changeMain() {
+      this.setData({
+        isShowPoint: false,
+        isShowSelectShipper: false,
+        isShowCreateShipper: false,
+        isShowAddressManage: false,
+        isShowEditAddress: false,
+      })
+
+    },
+  }
+})

package/miniprogram_dist/CollectionAddress/index.json

@@ -0,0 +1,14 @@
+{
+  "component": true,
+  "usingComponents": {
+    "ModeSelect": "../ConfirmOrder/components/ModeSelect/index",
+    "AddressSelect": "../ConfirmOrder/components/AddressSelect/index",
+    "AddressManage": "../ConfirmOrder/components/AddressManage/index",
+    "AddressEdit": "../ConfirmOrder/components/AddressEdit/index",
+    "PickupSelect": "../ConfirmOrder/components/PickupSelect/index",
+    "SelectSite": "../ConfirmOrder/components/SelectSite/index",
+    "Shipper": "../ConfirmOrder/components/Shipper/index",
+    "ChoosePicker": "../ConfirmOrder/components/ChoosePicker/index",
+    "ShipperEdit": "../ConfirmOrder/components/ShipperEdit/index"
+  }
+}

package/miniprogram_dist/CollectionAddress/index.less

@@ -0,0 +1,5 @@
+.address-content {
+  font-size: 32rpx;
+  margin-bottom: 162rpx;
+  height: calc(100% - 96rpx);
+}

package/miniprogram_dist/CollectionAddress/index.wxml

@@ -0,0 +1,91 @@
+<!--src/CollectionAddress/index.wxml-->
+<view class="address-content">
+  <view class="address-main" wx:if="{{ isShowMain }}">
+    <!-- 配送模式选择 -->
+    <view style="margin-bottom: 16rpx;">
+      <ModeSelect 
+        wx:if="{{ showModeSelect }}"
+        activeMode="{{ activeMode }}" 
+        bind:changeMode="changeMode" 
+      ></ModeSelect>
+    </view>
+    <!-- 地址选择（非自提） -->
+    <AddressSelect 
+      wx:if="{{ showAddressSelect }}" 
+      addressInfo="{{ addressInfo }}"
+      isCart="{{ isCart }}"
+      baseInfoQuery="{{ baseInfoQuery }}"
+      hasEntityGoods="{{ hasEntityGoods }}"
+      goodsInfo="{{ goodsInfo }}"
+      isShowAddressManage="{{ isShowAddressManage }}"
+      isShowEditAddress="{{ isShowEditAddress }}"
+      addressQuery="{{ addressQuery }}"
+      cartInfoLoaded="{{ cartInfoLoaded }}"
+      addressInfoLoaded="{{ addressInfoLoaded }}"
+      activeMode="{{ activeMode }}"
+      bind:updataData="updataData"
+    ></AddressSelect>
+    <!-- 自提点信息 -->
+    <PickupSelect
+      wx:if="{{ showPickSelf }}"
+      isShowPoint="{{ isShowPoint }}"
+      picksiteInfo="{{ picksiteInfo }}"
+      express_type="{{ express_type }}"
+      bind:updataData="updataData"
+    ></PickupSelect>
+    <!-- 提货人信息 -->
+    <ChoosePicker
+      wx:if="{{ showPickSelf }}"
+      pickerUserInfo="{{ pickerUserInfo }}"
+      express_type="{{ express_type }}"
+      isShowSelectShipper="{{ isShowSelectShipper }}"
+      isShowCreateShipper="{{ isShowCreateShipper }}"
+      backPage="{{ backPage }}"
+      shipperType="{{ shipperType }}"
+      showPickSelf="{{ showPickSelf }}"
+      bind:updataData="updataData"
+    ></ChoosePicker>
+  </view>
+
+  <!-- 地址管理（非自提） -->
+  <AddressManage
+    wx:if="{{ isShowAddressManage }}"
+    isShowAddressManage="{{ isShowAddressManage }}"
+    addressInfo="{{ addressInfo }}"
+    addressQuery="{{ addressQuery }}"
+    isShowEditAddress="{{ isShowEditAddress }}"
+    bind:updataData="updataData"
+  ></AddressManage>
+  <!-- 编辑、编辑地址 -->
+  <AddressEdit
+    wx:if="{{ isShowEditAddress }}"
+    addressInfo="{{ addressInfo }}"
+    addressList="{{ addressList }}"
+    addressQuery="{{ addressQuery }}"
+    isShowEditAddress="{{ isShowEditAddress }}"
+    bind:updataData="updataData"
+    bind:initConfirmOrderInfo="handleInfo"
+  ></AddressEdit>
+  <!-- 选择自提点 -->
+  <SelectSite
+    wx:if="{{ isShowPoint }}"
+    picksiteInfo="{{ picksiteInfo }}"
+    bind:updataData="updataData"
+  ></SelectSite>
+  <!-- 选择提货人 -->
+  <Shipper
+    wx:if="{{ isShowSelectShipper }}"
+    pickerUserInfo="{{ pickerUserInfo }}"
+    bind:updataData="updataData"
+  ></Shipper>
+  <!-- 新建、编辑提货人 -->
+  <ShipperEdit
+    wx:if="{{ isShowCreateShipper }}"
+    pickerUserInfo="{{ pickerUserInfo }}"
+    updateShipperInfo="{{ updateShipperInfo }}"
+    shipperType="{{ shipperType }}"
+    isShowCreateShipper="{{ isShowCreateShipper }}"
+    bind:updataData="updataData"
+    bind:initPickerInfo="initPickerInfo"
+  ></ShipperEdit>
+</view>

package/miniprogram_dist/CollectionAddress/index.wxss

@@ -0,0 +1,5 @@
+.address-content {
+  font-size: 32rpx;
+  margin-bottom: 162rpx;
+  height: calc(100% - 96rpx);
+}

package/miniprogram_dist/ConfirmOrder/README.md

@@ -0,0 +1,12 @@
+- 开发：刘宗信
+
+- 用处：支付流程中，确认订单弹框（直播间）
+
+- 使用说明
+
+  ```javascript
+  // 这里写使用这个组件的demo
+  
+  ```
+
+