Merge branch 'master' of http://gitlab.platform.xinhuaapp.com/pengjiani/groupPurchase-miniapp

package-lock.json

@@ -27,7 +27,7 @@
         "qrcode": "^1.5.3",
         "vue": "^3.3.11",
         "vue-i18n": "^9.1.9",
-        "wot-design-uni": "^1.2.26"
+        "wot-design-uni": "^1.3.7"
       },
       "devDependencies": {
         "@dcloudio/types": "^3.3.2",
@@ -16271,9 +16271,9 @@
       }
     },
     "node_modules/wot-design-uni": {
-      "version": "1.2.26",
-      "resolved": "https://registry.npmmirror.com/wot-design-uni/-/wot-design-uni-1.2.26.tgz",
-      "integrity": "sha512-y2YL1lHobRWAJ+22E9G9lNLLIChQ8JY9loOt30PRQJ/izvd5qc+2+BqXCKlFquk2y+2qA75TEfJ/MsaESnYExA==",
+      "version": "1.3.7",
+      "resolved": "https://registry.npmmirror.com/wot-design-uni/-/wot-design-uni-1.3.7.tgz",
+      "integrity": "sha512-6saE25F/TiefYUJrtCpDYgNZTZ2W9llTNufSHZ8EMeX5JXyRTDdsDPYBVv367AxrSQsXCjZacG0RWIk2MIEdQA==",
       "engines": {
         "HBuilderX": "^3.8.7"
       },

package.json

@@ -27,7 +27,7 @@
     "qrcode": "^1.5.3",
     "vue": "^3.3.11",
     "vue-i18n": "^9.1.9",
-    "wot-design-uni": "^1.2.26"
+    "wot-design-uni": "^1.3.7"
   },
   "devDependencies": {
     "@dcloudio/types": "^3.3.2",

src/Components/Rating/Rating.vue

 <template>
-  <div class="rating">
-    <div v-for="index in maxStars" :key="index" class="star" :style="{ fontSize: fontSize }">
-      <div
+  <view class="rating">
+    <view v-for="index in maxStars" :key="index" class="star" :style="{ fontSize: size }">
+      <view
         class="filled"
         :style="{
           width: getStarWidth(index) + '%',
@@ -9,10 +9,10 @@
         }"
       >
         ★
-      </div>
+      </view>
       ★
-    </div>
-  </div>
+    </view>
+  </view>
 </template>
 
 <script>
@@ -29,9 +29,9 @@ export default {
     },
     color: {
       type: String,
-      default: '#D44118',
+      default: '#FA5151',
     },
-    fontSize: {
+    size: {
       type: String,
       default: '30rpx',
     },

src/Components/assistingAgriculture/index/Search.vue

@@ -6,7 +6,7 @@
     <view class="searchBox">
       <image
         class="magnifyingGlass"
-        src="../../static/assets/magnifyingGlass.png"
+        src="/static/assistingAgriculture/assets/magnifyingGlass.png"
         mode="aspectFit|aspectFill|widthFix"
       />
       <input

src/assets/iconfont/iconfont.css

 @font-face {
-    font-family: "iconfont"; /* Project id 4633414 */
-    src: url('//at.alicdn.com/t/c/font_4633414_jhlymbmljta.woff2?t=1722933863144') format('woff2'),
-         url('//at.alicdn.com/t/c/font_4633414_jhlymbmljta.woff?t=1722933863144') format('woff'),
-         url('//at.alicdn.com/t/c/font_4633414_jhlymbmljta.ttf?t=1722933863144') format('truetype');
-  }
-  
-  .iconfont {
-    font-family: "iconfont" !important;
-    font-size: 16px;
-    font-style: normal;
-    -webkit-font-smoothing: antialiased;
-    -moz-osx-font-smoothing: grayscale;
-  }
-  
-  .icon-gengduo:before {
-    content: "\e633";
-  }
-  
-  .icon-lianhe40:before {
-    content: "\e866";
-  }
-  
-  .icon-shuangxiajiantou:before {
-    content: "\e660";
-  }
-  
-  .icon-dianzan:before {
-    content: "\e602";
-  }
-  
-  .icon-dianzan_kuai:before {
-    content: "\ec8c";
-  }
-  
-  .icon-xiai:before {
-    content: "\e601";
-  }
-  
-  .icon-tongzhi:before {
-    content: "\e60d";
-  }
-  
-  .icon-fenxiang:before {
-    content: "\e639";
-  }
-  
-  .icon-shuangshangjiantou-:before {
-    content: "\e600";
-  }
-  
-  .icon-jinggao:before {
-    content: "\e716";
-  }
-  
-  .icon-rs-countdown:before {
-    content: "\e614";
-  }
-  
-  .icon-naozhong:before {
-    content: "\e666";
-  }
-  
-  .icon-ic_business_refund24px:before {
-    content: "\e619";
-  }
-  
-  .icon-shoucang:before {
-    content: "\e606";
-  }
-  
-  .icon-pinglun:before {
-    content: "\e618";
-  }
-  
-  .icon-aixin:before {
-    content: "\e622";
-  }
-  
\ No newline at end of file
+  font-family: "iconfont"; /* Project id 4633414 */
+  src: url('iconfont.woff2?t=1722996380945') format('woff2'),
+       url('iconfont.woff?t=1722996380945') format('woff'),
+       url('iconfont.ttf?t=1722996380945') format('truetype');
+}
+
+.iconfont {
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-gengduo:before {
+  content: "\e633";
+}
+
+.icon-lianhe40:before {
+  content: "\e866";
+}
+
+.icon-shuangxiajiantou:before {
+  content: "\e660";
+}
+
+.icon-dianzan:before {
+  content: "\e602";
+}
+
+.icon-dianzan_kuai:before {
+  content: "\ec8c";
+}
+
+.icon-xiai:before {
+  content: "\e601";
+}
+
+.icon-tongzhi:before {
+  content: "\e60d";
+}
+
+.icon-fenxiang:before {
+  content: "\e639";
+}
+
+.icon-shuangshangjiantou-:before {
+  content: "\e600";
+}
+
+.icon-jinggao:before {
+  content: "\e716";
+}
+
+.icon-rs-countdown:before {
+  content: "\e614";
+}
+
+.icon-naozhong:before {
+  content: "\e666";
+}
+
+.icon-ic_business_refund24px:before {
+  content: "\e619";
+}
+
+.icon-shoucang:before {
+  content: "\e606";
+}
+
+.icon-pinglun:before {
+  content: "\e618";
+}
+
+.icon-aixin:before {
+  content: "\e622";
+}
+

src/assets/iconfont/iconfont.js

+window._iconfont_svg_string_4633414='<svg><symbol id="icon-gengduo" viewBox="0 0 1024 1024"><path d="M693.0176 486.656L381.66528 175.30368a35.84 35.84 0 0 0-50.68288 50.68288L616.99072 512l-286.00832 286.00832a35.84 35.84 0 0 0 50.68288 50.68288l311.35744-311.35232a35.84 35.84 0 0 0-0.00512-50.68288z" fill="#666666" ></path></symbol><symbol id="icon-lianhe40" viewBox="0 0 1073 1024"><path d="M384.809143 804.078919l16.40516-11.062368a309.414734 309.414734 0 0 0 446.684554-301.298815l16.390089-11.054832a326.580997 326.580997 0 0 1-479.457196 323.400943z m254.570106-37.331725l-16.9628 5.636684 3.195125-17.671153-10.022445-14.3856 17.550583-2.953984 10.776012-14.536313 7.633637 15.84752 16.676444 5.403078-12.810644 12.750358-0.474747 17.867081z m103.630575-74.279129l-13.255249 11.936506-4.031585-17.625939-14.792526-9.321627 14.845276-9.68334 4.122013-17.708832 13.202499 11.635079 17.34712-1.597562-6.669071 16.872372 6.586178 16.729194z m-225.557765 93.148455l-10.467049 14.33285-8.455026-15.342631-17.30944-5.048901 12.644859-12.599645-0.241142-17.460154 16.269518 7.565816 17.181335-5.712041-2.584736 17.264227 10.828762 13.895781z m-17.181334-59.418782l21.740417-14.66442A197.185956 197.185956 0 0 0 727.162304 573.16329l21.695203-14.626741a214.231648 214.231648 0 0 1-248.594318 167.668724z m288.329921-144.247853l-16.879907-4.415905 11.167867-13.790281-1.454385-18.183579 16.066055 7.083532 15.975627-6.812248-1.220779 18.160972 11.311045 13.963602-16.812087 4.14462-8.982522 15.44813zM292.497148 845.276443a34.754524 34.754524 0 0 1-48.198164-9.645662L127.058983 661.805412a34.76206 34.76206 0 0 1 9.118164-48.296129l644.609006-434.793262a34.746988 34.746988 0 0 1 48.183094 9.645662l117.24 173.810298a34.754524 34.754524 0 0 1-9.103093 48.303664zM146.267413 659.393996l107.458698 159.304128a26.065893 26.065893 0 0 0 36.141087 7.234246l630.283692-425.132529a26.080964 26.080964 0 0 0 6.834856-36.231516l-107.458698-159.304128a26.058357 26.058357 0 0 0-36.133552-7.234246L153.102269 623.170016a26.065893 26.065893 0 0 0-6.834856 36.22398z m419.360204-94.354161c24.57383-29.976907 14.777455-45.967605-14.739776-90.051293l13.330605-8.990058c15.990698 24.008654 27.030459 41.559237 30.534547 57.399221l2.969055-11.002082a264.419231 264.419231 0 0 1 39.91646 5.267435l-3.843193 16.797015a243.605702 243.605702 0 0 0-38.047613-6.540964c2.004489 14.242422-2.109988 27.414778-14.619206 43.254763a47.580239 47.580239 0 0 0-15.500879-6.134037z m157.578459-108.491085a101.226696 101.226696 0 0 0 8.244026-44.716684 276.159809 276.159809 0 0 1-57.504721-48.198164l-4.815295 3.240339-10.308801-15.282345 46.736244-31.514184 2.373737-2.411416 11.936506-4.242584a242.294495 242.294495 0 0 1 29.894015 87.014417 90.149256 90.149256 0 0 0 41.009133 8.334454 70.624328 70.624328 0 0 0-2.599807 20.157925 107.360734 107.360734 0 0 1-37.889364-7.8371 118.68685 118.68685 0 0 1-8.650953 40.828277 66.660564 66.660564 0 0 0-18.417185-5.380471z m5.425684-67.8512a214.766681 214.766681 0 0 0-16.917586-50.564366l-23.488693 15.839985a255.534672 255.534672 0 0 0 40.406279 34.724381zM710.613966 482.057003l-15.500879-22.983802a2558.270563 2558.270563 0 0 1-32.802785 31.122329l-13.54914-13.255249c2.434022-2.034632 5.312649-4.581689 8.334454-7.219174l-50.413652-74.746341-7.543209 5.094115-9.834053-14.573992 62.546086-42.177162 9.818982 14.566456-7.972742 5.380471 45.892248 68.032056 9.570305-8.643417 9.999838 13.051785-10.022445 9.751161 17.430012 25.832287z m-39.313606-25.093791l13.910852-12.584574-9.170914-13.60189-15.387844 10.384158z m-20.022283-29.690552l15.39538-10.384157-10.112874-14.995989-15.39538 10.384157z m-19.464644-28.861627l15.387845-10.384158-9.442199-14.016352-15.39538 10.391694zM504.483166 575.469206l5.380471-15.44813c4.069263 0.655604 8.470096 1.2886 13.036714 1.808562a283.0022 283.0022 0 0 0-2.411415-29.961836l-31.612149 21.318419-9.35177-13.865638 38.341504-25.86243 2.057239-2.584736 14.66442-0.497355a281.382031 281.382031 0 0 1 5.101651 54.731594 122.198474 122.198474 0 0 1 18.281542 4.868044l-5.199614 17.527976a305.089258 305.089258 0 0 0-48.288593-12.03447zM406.941415 681.676982c-26.525569 17.889688-38.160648 18.138365-52.154393-2.614879l-43.186943-64.023078 16.902515-11.401473 12.614717 18.696005L403.512683 580.246823l-19.781141-29.313768L298.940149 608.128813l-10.956869-16.246911 101.82955-68.68766 45.929927 68.099877-17.030621 11.484366-4.370691-6.480679-62.395372 42.086734 19.743463 29.268554c5.742183 8.515311 9.07295 8.070706 24.166904-2.109988l44.942753-30.316013c14.167065-9.547698 13.948531-14.604134 2.562129-35.915018a72.696638 72.696638 0 0 0 20.760779-4.807759c14.272565 27.972418 13.32307 39.607497-11.695364 56.479869z m154.63201-144.300603l-43.38287-64.324505 17.181335-11.582329c-1.258457-4.559082-2.637486-9.818982-4.129549-14.415743l-24.18951 16.314732-9.645662-14.295172 63.224297-42.636838 9.638126 14.295172-24.053869 16.224304c1.130351 5.237293 2.185345 10.338943 3.164983 15.063811l25.832287-17.430012 43.021157 63.774401-15.244666 10.278658-35.138843-52.086572-27.339422 18.439792 35.508091 52.636676z m-81.279769-24.151832l6.036074-13.285392a186.831941 186.831941 0 0 1 24.588901 5.621612l-5.372935 14.619206a169.206002 169.206002 0 0 0-25.259576-6.962962z m-22.350806 18.462399a136.953322 136.953322 0 0 0 1.748276-67.368917l16.804551-5.320185q1.273529 5.43322 2.125059 11.152796a320.650423 320.650423 0 0 1 43.60894 10.391693l-2.313451 17.91983a235.112998 235.112998 0 0 0-39.509534-11.152796 151.625277 151.625277 0 0 1-4.393298 47.761096 96.547043 96.547043 0 0 0-18.063008-3.391053z m214.126149-300.680889a309.414734 309.414734 0 0 0-446.639341 301.268671l-16.397624 11.054833a326.694033 326.694033 0 0 1 479.457196-323.400944z m-120.796839 81.483232A197.201027 197.201027 0 0 0 346.120998 450.859317l-21.687667 14.634277a214.427576 214.427576 0 0 1 248.579246-167.668725zM285.40608 460.369336L269.324954 467.211727l1.2886-18.304149-11.30351-14.069102 16.887444-4.204905 9.042807-15.576237 9.133236 15.749557 16.940193 4.446047-11.205546 13.925924 1.431778 18.296614z m278.254726-193.041336l-16.819622 7.008176 1.416707-17.520439-11.793329-13.142214 17.686225-4.446047 9.532626-15.124096 9.517555 14.769919 17.693761 3.790444-11.823471 13.579282 1.409171 17.460155zM344.952968 344.395328l-17.422476 1.657849 6.729356-16.970336-6.578642-16.804551 17.407404 1.11528 13.360749-12.03447 4.001442 17.708831 14.845276 9.351771-14.935704 9.788839-4.189834 17.821867z m117.375643-70.782576l-10.889047 14.619205-7.633637-15.930412-16.729194-5.380471 12.908608-12.863394 0.519961-17.97258 15.606379 7.972742 17.053228-5.727111-3.255411 17.784188 10.052588 14.483564z" fill="#A1A1A1" ></path></symbol><symbol id="icon-shuangxiajiantou" viewBox="0 0 1161 1024"><path d="M614.900456 580.943152L1161.134085 33.941953 1127.146078 0 580.835692 546.878388 33.941953 0.568002 0 34.540657l546.863037 546.310386-0.092109 0.10746 34.064764 34.01871 0.153514-0.153514 0.046054 0.046054 33.865196-33.926601" fill="" ></path><path d="M34.632766 409.698249L0.675462 443.686256l546.878388 546.310386-0.10746 0.10746 33.926601 33.895898 580.436556-580.912449-33.972656-33.941953-546.310386 546.878389L34.632766 409.698249" fill="" ></path></symbol><symbol id="icon-dianzan" viewBox="0 0 1024 1024"><path d="M190.193225 471.411583c14.446014 0 26.139334-11.718903 26.139334-26.13831 0-14.44499-11.69332-26.164916-26.139334-26.164916-0.271176 0-0.490164 0.149403-0.73678 0.149403l-62.496379 0.146333c-1.425466-0.195451-2.90005-0.295735-4.373611-0.295735-19.677155 0-35.621289 16.141632-35.621289 36.114522L86.622358 888.550075c0 19.949354 15.96767 35.597753 35.670407 35.597753 1.916653 0 3.808746 0.292666 5.649674 0l61.022819 0.022513c0.099261 0 0.148379 0.048095 0.24764 0.048095 0.097214 0 0.146333-0.048095 0.24457-0.048095l0.73678 0 0-0.148379c13.413498-0.540306 24.174586-11.422144 24.174586-24.960485 0-13.55983-10.760065-24.441669-24.174586-24.981974l0-0.393973-50.949392 0 1.450025-402.275993L190.193225 471.409536z" fill="#5D5D5D" ></path><path d="M926.52241 433.948343c-19.283182-31.445176-47.339168-44.172035-81.289398-45.546336-1.77032-0.246617-3.536546-0.39295-5.380544-0.39295l-205.447139-0.688685c13.462616-39.059598 22.698978-85.58933 22.698978-129.317251 0-28.349675-3.193739-55.962569-9.041934-82.542948l-0.490164 0.049119c-10.638291-46.578852-51.736315-81.31498-100.966553-81.31498-57.264215 0-95.466282 48.15065-95.466282 106.126063 0 3.241834-0.294712 6.387477 0 9.532097-2.996241 108.386546-91.240027 195.548698-196.23636 207.513194l0 54.881958-0.785899 222.227314 0 229.744521 10.709923 0 500.025271 0.222057 8.746198-0.243547c19.35686 0.049119 30.239721-4.817726 47.803749-16.116049 16.682961-10.761088 29.236881-25.50079 37.490869-42.156122 2.260483-3.341095 4.028757-7.075139 5.106298-11.20111l77.018118-344.324116c1.056052-4.053316 1.348718-8.181333 1.056052-12.160971C943.643346 476.446249 938.781618 453.944769 926.52241 433.948343zM893.82573 486.837924l-82.983993 367.783411-0.099261-0.049119c-2.555196 6.141884-6.879688 11.596106-12.872169 15.427364-4.177136 2.727111-8.773827 4.351098-13.414521 4.964058-1.49812-0.195451-3.046383 0-4.620227 0l-477.028511-0.540306-0.171915-407.408897c89.323375-40.266076 154.841577-79.670527 188.596356-173.661202 0.072655 0.024559 0.124843 0.049119 0.195451 0.072655 2.99931-9.137101 6.313799-20.73423 8.697079-33.164331 5.551436-29.185716 5.258771-58.123792 5.258771-58.123792-4.937452-37.98001 25.940812-52.965306 44.364417-52.965306 25.304316 0.860601 50.263777 33.656541 50.263777 52.326762 0 0 5.600555 27.563776 5.649674 57.190537 0.048095 37.366026-4.6673 56.847729-4.6673 56.847729l-0.466628 0c-5.872754 30.879288-16.214287 60.138682-30.464849 86.964654l0.36839 0.342808c-2.358721 4.815679-3.709485 10.220782-3.709485 15.943111 0 19.922748 19.088754 21.742187 38.765909 21.742187l238.761895 0.270153c0 0 14.666024 0.465604 14.690584 0.465604l0 0.100284c12.132318-0.638543 24.221658 5.207605 31.100322 16.409738 5.504364 9.016351 6.437619 19.6045 3.486404 28.988218L893.82573 486.837924z" fill="#5D5D5D" ></path><path d="M264.827039 924.31872c0.319272 0.024559 0.441045 0.024559 0.295735-0.024559 0.243547-0.048095 0.367367-0.074701-0.295735-0.074701s-0.539282 0.026606-0.271176 0.074701C264.43409 924.343279 264.532327 924.343279 264.827039 924.31872z" fill="#5D5D5D" ></path></symbol><symbol id="icon-dianzan_kuai" viewBox="0 0 1024 1024"><path d="M64 483.04V872c0 37.216 30.144 67.36 67.36 67.36H192V416.32l-60.64-0.64A67.36 67.36 0 0 0 64 483.04zM857.28 344.992l-267.808 1.696c12.576-44.256 18.944-83.584 18.944-118.208 0-78.56-68.832-155.488-137.568-145.504-60.608 8.8-67.264 61.184-67.264 126.816v59.264c0 76.064-63.84 140.864-137.856 148L256 416.96v522.4h527.552a102.72 102.72 0 0 0 100.928-83.584l73.728-388.96a102.72 102.72 0 0 0-100.928-121.824z"  ></path></symbol><symbol id="icon-xiai" viewBox="0 0 1024 1024"><path d="M533.504 268.288q33.792-41.984 71.68-75.776 32.768-27.648 74.24-50.176t86.528-19.456q63.488 5.12 105.984 30.208t67.584 63.488 34.304 87.04 6.144 99.84-17.92 97.792-36.864 87.04-48.64 74.752-53.248 61.952q-40.96 41.984-85.504 78.336t-84.992 62.464-73.728 41.472-51.712 15.36q-20.48 1.024-52.224-14.336t-69.632-41.472-79.872-61.952-82.944-75.776q-26.624-25.6-57.344-59.392t-57.856-74.24-46.592-87.552-21.504-100.352 11.264-99.84 39.936-83.456 65.536-61.952 88.064-35.328q24.576-5.12 49.152-1.536t48.128 12.288 45.056 22.016 40.96 27.648q45.056 33.792 86.016 80.896z"  ></path></symbol><symbol id="icon-tongzhi" viewBox="0 0 1024 1024"><path d="M560.633 162.477c-13.901-6.832-28.731-5.465-40.683 3.757-43.652 33.684-158.527 135.172-177.84 152.27H195.421c-35.74 0-64.817 29.077-64.817 64.817v233.126c0 35.74 29.077 64.82 64.817 64.82h125.75C347.076 704.61 471.183 816.17 519.74 854.64c6.955 5.506 14.927 8.299 23.145 8.299 5.772 0 11.665-1.378 17.415-4.159 20.77-10.048 37.668-38.89 37.668-64.293V226.552c0-25.213-16.748-53.957-37.334-64.075z m-5.879 632.01c0 8.774-6.611 19.758-11.158 23.91-54.496-43.754-196.609-172.036-198.065-173.35-0.01-0.01-0.02-0.016-0.03-0.024-3.946-4.275-9.58-6.968-15.858-6.968H195.421c-11.913 0-21.606-9.693-21.606-21.606V383.322c0-11.913 9.693-21.606 21.606-21.606h150.567c4.353 0 8.399-1.3 11.79-3.514a21.473 21.473 0 0 0 10.394-5.056c1.295-1.148 127.486-112.995 175.377-150.524 4.524 4.04 11.204 15.081 11.204 23.93v567.936zM799.893 512.648c-5.564-85.615-69.287-140.72-71.996-143.024-9.09-7.728-22.726-6.626-30.456 2.467-7.729 9.09-6.626 22.726 2.466 30.455 0.524 0.446 52.474 45.351 56.865 112.905 2.918 44.875-16.032 90.163-56.32 134.607-8.013 8.842-7.344 22.505 1.498 30.52a21.53 21.53 0 0 0 14.504 5.598c5.886 0 11.75-2.392 16.015-7.096 48.444-53.442 71.129-109.438 67.424-166.432z"  ></path><path d="M916.537 408.311c-33.194-93.424-95.514-149.89-98.15-152.248-8.895-7.953-22.553-7.193-30.508 1.703-7.954 8.894-7.192 22.553 1.702 30.508 0.563 0.504 56.696 51.358 86.238 134.505 17.195 48.393 21.879 97.97 13.923 147.354-10.062 62.459-40.517 125.212-90.518 186.518-7.542 9.247-6.16 22.858 3.088 30.4a21.52 21.52 0 0 0 13.643 4.862c6.268 0 12.486-2.715 16.757-7.951 54.864-67.269 88.406-136.9 99.692-206.956 9.123-56.63 3.785-113.386-15.867-168.695z"  ></path></symbol><symbol id="icon-fenxiang" viewBox="0 0 1024 1024"><path d="M866.474667 480.938667c-18.773333 0.682667-33.450667 16.554667-32.768 35.498666 3.584 90.282667-30.890667 178.688-94.72 242.517334-61.269333 61.269333-142.677333 95.061333-229.376 95.061333s-168.106667-33.792-229.205334-95.061333c-126.464-126.464-126.464-332.117333 0-458.581334 61.269333-61.269333 142.677333-95.061333 229.205334-95.061333 18.773333 0 34.133333-15.36 34.133333-34.133333s-15.36-34.133333-34.133333-34.133334c-104.789333 0-203.434667 40.789333-277.504 115.029334-153.088 153.088-153.088 402.090667 0 555.178666 74.069333 74.069333 172.714667 115.029333 277.504 115.029334s203.434667-40.789333 277.504-115.029334a393.335467 393.335467 0 0 0 114.688-293.376c-0.512-18.944-16.213333-33.450667-35.328-32.938666z" fill="#231815" ></path><path d="M870.058667 138.410667h-166.741334c-18.773333 0-34.133333 15.36-34.133333 34.133333s15.36 34.133333 34.133333 34.133333h87.381334L545.28 451.925333a34.2016 34.2016 0 0 0 24.064 58.368c8.704 0 17.408-3.413333 24.064-10.069333l242.346667-242.346667v81.237334c0 18.773333 15.36 34.133333 34.133333 34.133333s34.133333-15.36 34.133333-34.133333V172.373333c0.170667-18.773333-15.189333-33.962667-33.962666-33.962666z" fill="#231815" ></path></symbol><symbol id="icon-shuangshangjiantou-" viewBox="0 0 1024 1024"><path d="M204.373 872.533a34.133 34.133 0 0 1-48.213-48.213l331.947-331.947a34.133 34.133 0 0 1 48.213 0L868.267 824.32a34.133 34.133 0 0 1-48.214 48.213L512 564.907z m0-341.333a34.133 34.133 0 0 1-48.213-48.213L488.107 151.04a34.133 34.133 0 0 1 48.213 0l331.947 331.947a34.133 34.133 0 0 1-48.214 48.213L512 223.573z" fill="#999999" ></path></symbol><symbol id="icon-jinggao" viewBox="0 0 1024 1024"><path d="M704 708.266667c8.533333-8.533333 21.333333-8.533333 29.866667 0 8.533333 8.533333 8.533333 21.333333 0 29.866666-59.733333 59.733333-140.8 89.6-221.866667 89.6-174.933333 0-320-145.066667-320-320S337.066667 192 512 192s320 145.066667 320 320c0 29.866667-4.266667 64-12.8 89.6-4.266667 12.8-17.066667 17.066667-25.6 12.8-12.8-4.266667-17.066667-17.066667-12.8-25.6 8.533333-25.6 12.8-51.2 12.8-81.066667 0-153.6-123.733333-277.333333-277.333333-277.333333s-281.6 128-281.6 281.6 123.733333 277.333333 277.333333 277.333333c72.533333 0 140.8-29.866667 192-81.066666zM512 597.333333c-12.8 0-21.333333-8.533333-21.333333-21.333333v-213.333333c0-12.8 8.533333-21.333333 21.333333-21.333334s21.333333 8.533333 21.333333 21.333334v213.333333c0 12.8-8.533333 21.333333-21.333333 21.333333z m0 85.333334c-12.8 0-21.333333-8.533333-21.333333-21.333334s8.533333-21.333333 21.333333-21.333333 21.333333 8.533333 21.333333 21.333333-8.533333 21.333333-21.333333 21.333334z"  ></path></symbol><symbol id="icon-rs-countdown" viewBox="0 0 1024 1024"><path d="M532.48 346.112h-64v253.952l201.216 121.344 32.256-52.736-169.472-100.352z" fill="" ></path><path d="M510.976 176.64c-199.68 0-363.008 153.088-379.392 348.16h-36.352l77.824 168.96 77.824-168.96h-33.792c16.384-147.968 141.824-263.68 294.4-263.68 163.84 0 296.448 132.608 296.448 296.448s-132.608 296.448-296.448 296.448c-48.128 0-93.696-11.264-133.632-31.744l-34.304 77.824c50.688 25.088 107.52 38.912 167.936 38.912 210.944 0 381.44-171.008 381.44-381.44-0.512-210.432-171.52-380.928-381.952-380.928z" fill="" ></path></symbol><symbol id="icon-naozhong" viewBox="0 0 1024 1024"><path d="M508 558.4c-15.2 0-28-12-28-28 0-15.2 12-28 28-28h152.8c15.2 0 28 12 28 28 0 15.2-12 28-28 28H508z m-25.6-161.6c0-15.2 12-28 28-28 15.2 0 28 12 28 28v132.8c0 15.2-12.8 28-28 28s-28-12.8-28-28V396.8z m27.2-225.6c99.2 0 188.8 40 253.6 105.6 64.8 64.8 104.8 155.2 104.8 254.4 0 99.2-40 188.8-104.8 253.6-64.8 64.8-155.2 105.6-253.6 105.6-99.2 0-188.8-40-254.4-105.6-64.8-64.8-105.6-155.2-105.6-253.6 0-99.2 40-188.8 105.6-254.4s155.2-105.6 254.4-105.6z m215.2 144c-55.2-55.2-131.2-88.8-215.2-88.8s-160 34.4-215.2 88.8C240 370.4 205.6 446.4 205.6 530.4s34.4 160 88.8 215.2c55.2 55.2 131.2 88.8 215.2 88.8s160-34.4 215.2-88.8c55.2-55.2 88.8-131.2 88.8-215.2s-33.6-160-88.8-215.2zM272 138.4c12-9.6 29.6-8 39.2 4 9.6 12 8 29.6-4 39.2L199.2 268c-12 9.6-29.6 8-39.2-4-9.6-12-7.2-29.6 4-39.2L272 138.4z m476 0c-12-9.6-29.6-8-39.2 4-9.6 12-8 29.6 4 39.2l107.2 87.2c12 9.6 29.6 8 39.2-4 9.6-12 7.2-29.6-4-39.2L748 138.4z"  ></path></symbol><symbol id="icon-ic_business_refund24px" viewBox="0 0 1024 1024"><path d="M512 85.333333a426.453333 426.453333 0 0 1 365.952 207.146667L938.666667 256v256l-213.333334-128 79.402667-47.616a341.333333 341.333333 0 1 0 13.952 325.632l75.946667 38.954667A426.666667 426.666667 0 0 1 512 938.666667C276.352 938.666667 85.333333 747.648 85.333333 512S276.352 85.333333 512 85.333333z m-80.170667 200.832L512 366.293333l80.213333-80.128a42.666667 42.666667 0 0 1 56.32-3.541333l4.010667 3.541333a42.666667 42.666667 0 0 1 3.541333 56.32l-3.541333 4.010667-90.538667 90.538667c-2.261333 2.261333-4.693333 4.181333-7.253333 5.845333l-0.085333 39.936H618.666667a42.666667 42.666667 0 0 1 0 85.333333H554.666667v42.666667h64a42.666667 42.666667 0 0 1 0 85.333333H554.666667v42.666667a42.666667 42.666667 0 1 1-85.333334 0v-42.666667H405.333333a42.666667 42.666667 0 1 1 0-85.333333H469.333333v-42.666667H405.333333a42.666667 42.666667 0 1 1 0-85.333333H469.333333v-39.936a42.837333 42.837333 0 0 1-7.338666-5.845333L371.541333 346.453333a42.666667 42.666667 0 0 1 60.288-60.330666z" fill="#000000" ></path></symbol><symbol id="icon-shoucang" viewBox="0 0 1054 1024"><path d="M498.665413 824.614245a60.112101 60.112101 0 0 1 56.739078 0l259.783056 139.076995-49.842448-295.952713a60.353031 60.353031 0 0 1 16.985584-52.854076L993.837338 404.973958l-291.495503-43.156633a60.20245 60.20245 0 0 1-45.325006-33.308609L527.034952 60.323216l-130.011994 268.1855a60.20245 60.20245 0 0 1-45.355122 33.308609l-291.495503 43.126517 211.566888 209.940609c13.913723 13.823374 20.238142 33.519423 16.985584 52.854076L238.822124 963.69124l259.813173-139.076995z m28.369539 53.185356l-259.813173 139.046878a60.142217 60.142217 0 0 1-87.698616-63.183961l49.842448-295.952713-211.536771-209.910492a60.353031 60.353031 0 0 1 33.549539-102.485711l291.525619-43.126518 129.981877-268.185499a60.142217 60.142217 0 0 1 108.298154 0l129.981877 268.185499 291.525619 43.126518a60.262682 60.262682 0 0 1 33.549539 102.455594l-211.536771 209.940609 49.842448 295.952713a60.262682 60.262682 0 0 1-87.728732 63.183961L527.034952 877.799601z" fill="#7F7F7F" ></path></symbol><symbol id="icon-pinglun" viewBox="0 0 1114 1024"><path d="M412.43236215 880.21486555h-7.85199339c-19.62998309-3.92599633-35.33396983-15.70398675-43.18596322-31.40797352l-27.48197645-66.74194336h-62.81594705c-70.66793969 0-129.55789039-58.88994998-129.55788966-129.55789038V271.68538194c0-74.59393674 58.88994998-129.55789039 129.55788966-129.55789039h526.08355351c70.66793969 0 129.55789039 54.96395365 129.55789039 129.55789039v380.82167634c0 70.66793969-58.88994998 129.55789039-129.55789039 129.55789039h-282.6717602l-58.88994997 78.51993306c-7.85199338 11.77798971-23.55598013 19.62998309-43.18596323 19.62998381z m-141.33588011-679.19742403c-39.25996689 0-70.66793969 31.40797353-70.66793967 70.66794042v380.82167635c0 39.25996689 31.40797353 70.66793969 70.66793967 70.66794039h102.07591322l39.25996689 94.22391984 70.66794042-94.22391984h310.15373665c39.25996689 0 70.66793969-31.40797353 70.66793969-70.66794039V271.68538194c0-39.25996689-31.40797353-70.66793969-70.66793969-70.66794042H271.09648204zM346.41018531 337.51125953h374.80181521a30.71001833 30.71001833 0 0 1 0 61.4418473H346.41018531a30.71001833 30.71001833 0 1 1 0-61.4418473z m0.23992193 202.23245021h190.06186059a30.97175162 30.97175162 0 1 1 0 61.89988056H346.67191787a30.97175162 30.97175162 0 1 1 0-61.89988056z" fill="#515151" ></path></symbol><symbol id="icon-aixin" viewBox="0 0 1024 1024"><path d="M512 901.747c-13.584 0-26.122-4.18-37.094-13.061-8.882-7.315-225.698-175.02-312.424-311.38-28.735-44.93-68.441-106.057-68.441-192.784 0-144.718 108.147-262.269 240.326-262.269 67.396 0 131.657 30.825 177.633 84.637 45.453-54.335 109.192-84.637 177.11-84.637 132.702 0 240.327 117.551 240.327 262.27 0 85.159-37.094 143.673-67.396 191.216l-1.045 1.567c-86.727 136.36-303.543 304.588-312.425 311.38-10.449 8.359-22.987 13.06-36.571 13.06zM334.367 164.049c-109.714 0-198.53 98.743-198.53 220.473 0 74.188 33.959 127.478 61.649 170.319 83.07 130.09 294.138 294.139 303.02 300.93 3.657 2.613 7.314 4.18 11.494 4.18s7.837-1.567 11.494-4.18c8.882-6.791 219.95-170.84 303.02-300.93l1.045-1.568c28.212-44.93 60.604-95.608 60.604-168.75 0-121.209-89.339-220.474-198.53-220.474-60.082 0-115.984 29.257-153.6 80.98l-6.27 8.881c-4.18 5.225-10.449 8.36-16.718 8.36s-13.061-3.135-16.718-8.36l-6.27-8.881c-39.706-51.2-96.13-80.98-155.69-80.98z"  ></path></symbol></svg>',function(t){var l=(l=document.getElementsByTagName("script"))[l.length-1],a=l.getAttribute("data-injectcss"),l=l.getAttribute("data-disable-injectsvg");if(!l){var c,i,o,e,n,s=function(l,a){a.parentNode.insertBefore(l,a)};if(a&&!t.__iconfont__svg__cssinject__){t.__iconfont__svg__cssinject__=!0;try{document.write("<style>.svgfont {display: inline-block;width: 1em;height: 1em;fill: currentColor;vertical-align: -0.1em;font-size:16px;}</style>")}catch(l){console&&console.log(l)}}c=function(){var l,a=document.createElement("div");a.innerHTML=t._iconfont_svg_string_4633414,(a=a.getElementsByTagName("svg")[0])&&(a.setAttribute("aria-hidden","true"),a.style.position="absolute",a.style.width=0,a.style.height=0,a.style.overflow="hidden",a=a,(l=document.body).firstChild?s(a,l.firstChild):l.appendChild(a))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(c,0):(i=function(){document.removeEventListener("DOMContentLoaded",i,!1),c()},document.addEventListener("DOMContentLoaded",i,!1)):document.attachEvent&&(o=c,e=t.document,n=!1,h(),e.onreadystatechange=function(){"complete"==e.readyState&&(e.onreadystatechange=null,d())})}function d(){n||(n=!0,o())}function h(){try{e.documentElement.doScroll("left")}catch(l){return void setTimeout(h,50)}d()}}(window);
\ No newline at end of file

src/assets/iconfont/iconfont.json

+{
+  "id": "4633414",
+  "name": "驻场",
+  "font_family": "iconfont",
+  "css_prefix_text": "icon-",
+  "description": "",
+  "glyphs": [
+    {
+      "icon_id": "10715420",
+      "name": "更多",
+      "font_class": "gengduo",
+      "unicode": "e633",
+      "unicode_decimal": 58931
+    },
+    {
+      "icon_id": "14542055",
+      "name": "已领取",
+      "font_class": "lianhe40",
+      "unicode": "e866",
+      "unicode_decimal": 59494
+    },
+    {
+      "icon_id": "5501759",
+      "name": "双下箭头",
+      "font_class": "shuangxiajiantou",
+      "unicode": "e660",
+      "unicode_decimal": 58976
+    },
+    {
+      "icon_id": "77697",
+      "name": "点赞",
+      "font_class": "dianzan",
+      "unicode": "e602",
+      "unicode_decimal": 58882
+    },
+    {
+      "icon_id": "6380878",
+      "name": "点赞_块",
+      "font_class": "dianzan_kuai",
+      "unicode": "ec8c",
+      "unicode_decimal": 60556
+    },
+    {
+      "icon_id": "5028",
+      "name": "喜爱",
+      "font_class": "xiai",
+      "unicode": "e601",
+      "unicode_decimal": 58881
+    },
+    {
+      "icon_id": "5643534",
+      "name": "通知",
+      "font_class": "tongzhi",
+      "unicode": "e60d",
+      "unicode_decimal": 58893
+    },
+    {
+      "icon_id": "11391522",
+      "name": "分享",
+      "font_class": "fenxiang",
+      "unicode": "e639",
+      "unicode_decimal": 58937
+    },
+    {
+      "icon_id": "22652637",
+      "name": "双上箭头-01",
+      "font_class": "shuangshangjiantou-",
+      "unicode": "e600",
+      "unicode_decimal": 58880
+    },
+    {
+      "icon_id": "4266166",
+      "name": "警告",
+      "font_class": "jinggao",
+      "unicode": "e716",
+      "unicode_decimal": 59158
+    },
+    {
+      "icon_id": "6304017",
+      "name": "倒计时",
+      "font_class": "rs-countdown",
+      "unicode": "e614",
+      "unicode_decimal": 58900
+    },
+    {
+      "icon_id": "11737375",
+      "name": "闹钟",
+      "font_class": "naozhong",
+      "unicode": "e666",
+      "unicode_decimal": 58982
+    },
+    {
+      "icon_id": "15053956",
+      "name": "退钱",
+      "font_class": "ic_business_refund24px",
+      "unicode": "e619",
+      "unicode_decimal": 58905
+    },
+    {
+      "icon_id": "5849192",
+      "name": "收藏",
+      "font_class": "shoucang",
+      "unicode": "e606",
+      "unicode_decimal": 58886
+    },
+    {
+      "icon_id": "13053964",
+      "name": "评论",
+      "font_class": "pinglun",
+      "unicode": "e618",
+      "unicode_decimal": 58904
+    },
+    {
+      "icon_id": "19877102",
+      "name": "爱心",
+      "font_class": "aixin",
+      "unicode": "e622",
+      "unicode_decimal": 58914
+    }
+  ]
+}

src/pages.json

@@ -218,6 +218,18 @@
 			"style": {
 				"navigationBarTitleText": "线路详情"
 			}
+		},
+		{
+			"path": "pages/address/addressList",
+			"style": {
+				"navigationBarTitleText": "地址管理列表"
+			}
+		},
+		{
+			"path": "pages/address/addressEdit",
+			"style": {
+				"navigationBarTitleText": "编辑收货地址"
+			}
 		}
 	],
 	"globalStyle": {

src/pages/address/addressEdit.vue

+<template>
+  <view class="container">
+    <template v-if="newAddressFlag">
+      <Header title="新增收货地址"></Header>
+    </template>
+    <template v-else>
+      <Header title="编辑收货地址"></Header>
+    </template>
+    <view class="content">
+      <wd-form ref="form" :model="model" id="form">
+        <wd-cell-group border>
+          <wd-input
+            label="联系人"
+            label-width="80px"
+            prop="name"
+            v-model="model.name"
+            placeholder="请输入联系人姓名"
+            :rules="[{ required: false, validator: fieldNotEmpty, message: '姓名不能为空' }]"
+          />
+          <wd-input
+            label="手机号"
+            label-width="80px"
+            prop="phone"
+            v-model="model.phone"
+            placeholder="请输入联系人手机号"
+            :rules="[{ required: false, pattern: /^1[3-9]\d{9}$/, message: '请输入正确的手机号' }]"
+          />
+          <wd-input
+            label="详细地址"
+            label-width="80px"
+            prop="detailAddress"
+            v-model="model.detailAddress"
+            placeholder="请输入详细地址"
+            :rules="[{ required: false, validator: fieldNotEmpty, message: '详细地址不能为空' }]"
+          />
+          <wd-checkbox-group>
+            <wd-cell title="所在地区" title-width="80px">
+              <view class="area">
+                <view class="area_l" @tap="changeLocation">
+                  <view class="area_lt">这是当前定位</view>
+                  <view class="area_lb">这是定位的详细地址点击可跳转地图选择</view>
+                </view>
+                <view class="area_r">
+                  <wd-icon name="location" size="22px" @tap="changeLocation"></wd-icon>
+                </view>
+              </view>
+            </wd-cell>
+          </wd-checkbox-group>
+          <wd-checkbox-group v-model="model.isDefaultAddress" size="large">
+            <wd-cell title="设置为默认地址" center clickable @click="setDefaultAddress">
+              <view>
+                <wd-checkbox
+                  model-value="1"
+                  ref="checkBoxAdress"
+                  checked-color="#fa5151"
+                  custom-style="margin-right:-18rpx"
+                ></wd-checkbox>
+              </view>
+            </wd-cell>
+          </wd-checkbox-group>
+        </wd-cell-group>
+
+        <view class="footer">
+          <wd-button type="error" block class="addBtn" @click="handleSubmit">保存</wd-button>
+        </view>
+      </wd-form>
+    </view>
+  </view>
+</template>
+
+<script setup>
+import Header from '@/pages/order/components/Header/index.vue';
+
+const fileDomain = import.meta.env.VITE_APP_IMG_URL;
+const newAddressFlag = ref(false);
+const form = ref();
+const checkBoxAdress = ref();
+const model = ref({
+  name: '',
+  phone: '',
+  detailAddress: '',
+  isDefaultAddress: [],
+});
+
+onLoad((options) => {
+  newAddressFlag.value = options.new;
+  if (newAddressFlag.value) {
+    model.value = ref({
+      name: '',
+      phone: '',
+      detailAddress: '',
+      isDefaultAddress: [],
+    });
+  } else {
+    model.value.name = '这是名字';
+    model.value.phone = '13655844265';
+    model.value.detailAddress = '贵州省贵阳市南明区';
+    model.value.isDefaultAddress = ['1'];
+  }
+});
+
+function setDefaultAddress() {
+  // checkBoxAdress.value && checkBoxAdress.value.toggle();
+  console.log(model.value.isDefaultAddress);
+}
+
+function fieldNotEmpty(val) {
+  if (String(val).length >= 1) {
+    return true;
+  } else {
+    return false;
+  }
+}
+function handleSubmit() {
+  form.value
+    .validate()
+    .then(({ valid, errors }) => {
+      if (valid) {
+        xma.showToast({
+          title: '更新成功',
+          duration: 2000,
+          success: function () {
+            console.log('数据更新后跳转地址列表页');
+          },
+        });
+      }
+    })
+    .catch((error) => {
+      console.log(error, 'error');
+    });
+}
+// 重新定位收货地址
+function changeLocation() {
+  console.log('aaa');
+}
+</script>
+
+<style lang="scss" scoped>
+page {
+  background: #f9f9f9;
+}
+
+.container {
+  width: 375 * 2rpx;
+  margin: 0 auto;
+  font-family: Source Han Sans;
+  font-variation-settings: 'opsz' auto;
+  font-feature-settings: 'kern' on;
+  .content {
+    padding-top: 88rpx;
+    #form {
+      width: 710rpx;
+      margin: 20rpx auto;
+    }
+    .wd-input__label.is-required::after {
+      display: none !important;
+    }
+    .addBtn {
+      width: 630rpx;
+      height: 72rpx;
+      border-radius: 18px;
+      opacity: 1;
+      background: #fa5151;
+      position: fixed;
+      bottom: 80rpx;
+      left: 50%;
+      margin-left: -315rpx;
+    }
+
+    .area {
+      display: flex;
+      width: 100%;
+      align-items: center;
+      .area_l {
+        flex: 1;
+        display: flex;
+        flex-direction: column;
+        .area_lt {
+          font-size: 24rpx;
+          font-weight: 500;
+          line-height: 24rpx;
+          color: #3d3d3d;
+          text-align: left;
+          margin-bottom: 10rpx;
+        }
+        .area_lb {
+          font-size: 24rpx;
+          font-weight: normal;
+          line-height: 24rpx;
+          color: #abaaaa;
+          text-align: left;
+        }
+      }
+      .area_r {
+        width: 40rpx;
+      }
+    }
+  }
+}
+</style>

src/pages/address/addressList.vue

+<template>
+  <view class="container">
+    <Header title="地址管理"></Header>
+
+    <view class="content">
+      <view class="empty_list" v-if="isAdressEmpty">
+        <img src="@/static/address/address.png" />
+        <wd-button type="error" block class="addBtn" @tap="addNewAddress">新增地址</wd-button>
+      </view>
+      <view class="full_list" v-else>
+        <view class="additem">
+          <view class="additem_l">
+            <view class="address">这是地址这是地址这是地址这是地址这是地 址这是地址这是地址</view>
+            <view class="info">
+              <view class="name">这是姓名</view>
+              <view class="phone">123456789258</view>
+            </view>
+            <view class="address_status">
+              <view v-if="mainAddFlag" class="box active">
+                <wd-icon name="check-circle-filled" size="12px"></wd-icon>
+                <view class="txt">默认</view>
+              </view>
+              <view v-else class="box">
+                <wd-icon name="circle1" size="12px"></wd-icon>
+                <view class="txt">默认</view>
+              </view>
+            </view>
+          </view>
+          <view class="additem_r">
+            <wd-icon name="edit-outline" size="14px" @tap="editAddress"></wd-icon>
+          </view>
+        </view>
+        <view class="additem">
+          <view class="additem_l">
+            <view class="address">这是地址这是地址这是地址这是地址这是地 址这是地址这是地址</view>
+            <view class="info">
+              <view class="name">这是姓名</view>
+              <view class="phone">123456789258</view>
+            </view>
+            <view class="address_status">
+              <view v-if="mainAddFlag" class="box active">
+                <wd-icon name="check-circle-filled" size="12px"></wd-icon>
+                <view class="txt">默认</view>
+              </view>
+              <view v-else class="box">
+                <wd-icon name="circle1" size="12px"></wd-icon>
+                <view class="txt">默认</view>
+              </view>
+            </view>
+          </view>
+          <view class="additem_r">
+            <wd-icon name="edit-outline" size="14px" @tap="editAddress"></wd-icon>
+          </view>
+        </view>
+        <wd-button type="error" block class="addBtn" @tap="addNewAddress">新增地址</wd-button>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup>
+import Header from '@/pages/order/components/Header/index.vue';
+const fileDomain = import.meta.env.VITE_APP_IMG_URL;
+const isAdressEmpty = ref(false);
+const mainAddFlag = ref(false);
+
+const addNewAddress = () => {
+  xma.navigateTo({ url: '/pages/address/addressEdit?new=true' });
+};
+const editAddress = () => {
+  xma.navigateTo({ url: '/pages/address/addressEdit' });
+};
+
+onLoad(() => {
+  xma.getLocation({
+    success: (res) => {
+      console.log(res);
+    },
+    fail: (err) => {
+      console.log(err);
+    },
+  });
+});
+</script>
+
+<style lang="scss" scoped>
+page {
+  background: #f9f9f9;
+}
+
+.container {
+  width: 375 * 2rpx;
+  margin: 0 auto;
+
+  .content {
+    padding-top: 88rpx;
+
+    .full_list {
+      margin-top: 20rpx;
+      .additem {
+        width: 710rpx;
+        padding: 20rpx;
+        box-sizing: border-box;
+        border-radius: 8px;
+        background: #ffffff;
+        margin: 20rpx auto 20rpx;
+        display: flex;
+        flex-direction: row;
+        font-family: Source Han Sans;
+        font-variation-settings: 'opsz' auto;
+        font-feature-settings: 'kern' on;
+        .additem_l {
+          width: 600rpx;
+          display: flex;
+          flex-direction: column;
+        }
+        .additem_r {
+          flex: 1;
+          padding-top: 30rpx;
+          box-sizing: border-box;
+          text-align: right;
+        }
+        .address {
+          font-size: 24rpx;
+          font-weight: 500;
+          line-height: 32rpx;
+          letter-spacing: 0em;
+          color: #3d3d3d;
+          margin-bottom: 20rpx;
+        }
+
+        .info {
+          font-size: 22rpx;
+          font-weight: normal;
+          line-height: 22rpx;
+          color: #abaaaa;
+          display: flex;
+          margin-bottom: 30rpx;
+          .phone {
+            margin-left: 10rpx;
+          }
+        }
+
+        .address_status {
+          .box {
+            display: flex;
+            font-size: 18rpx;
+            align-items: center;
+            .txt {
+              margin-left: 5rpx;
+              color: #abaaaa;
+            }
+          }
+          .box.active {
+            color: #fa5151;
+          }
+        }
+      }
+
+      .addBtn {
+        width: 630rpx;
+        height: 72rpx;
+        border-radius: 18px;
+        opacity: 1;
+        background: #fa5151;
+        position: fixed;
+        bottom: 80rpx;
+        left: 50%;
+        margin-left: -315rpx;
+      }
+    }
+
+    .empty_list {
+      margin-top: 20rpx;
+      img {
+        width: 566rpx;
+        height: 566rpx;
+        margin: 40rpx auto 60rpx;
+        display: block;
+        border: 1px dashed rgb(182, 182, 182);
+      }
+
+      .addBtn {
+        width: 630rpx;
+        height: 72rpx;
+        border-radius: 18px;
+        opacity: 1;
+        background: #fa5151;
+      }
+    }
+  }
+}
+</style>

src/pages/assistingAgriculture/RuralTravel/RuralTravel.vue

@@ -5,12 +5,16 @@
         <Search
           background="rgba(255, 255, 255, 0.8)"
           backIcon="black"
-          iconSrc="/static/assets/left.png"
+          iconSrc="/static/assistingAgriculture/assets/left.png"
           placeholderText="请输入要搜索的关键词"
         ></Search>
       </view>
       <view class="bac-img">
-        <img class="bac" src="/static/rural/bacImg.png" style="width: 750rpx; height: 440rpx" />
+        <img
+          class="bac"
+          src="/static/assistingAgriculture/rural/bacImg.png"
+          style="width: 750rpx; height: 440rpx"
+        />
       </view>
       <!--      热门-->
       <view style="display: flex; flex-direction: row">
@@ -18,19 +22,27 @@
           <text class="left-title">特价专区</text>
           <img
             class="special-icon"
-            src="/static/rural/specialOffer.png"
+            src="/static/assistingAgriculture/rural/specialOffer.png"
             style="width: 29rpx; height: 25rpx"
           />
-          <img class="spe-img" src="/static/rural/img7.png" style="width: 306rpx; height: 204rpx" />
+          <img
+            class="spe-img"
+            src="/static/assistingAgriculture/rural/img7.png"
+            style="width: 306rpx; height: 204rpx"
+          />
         </view>
         <view class="right-offer">
           <text class="left-title">日游直播</text>
           <img
             class="special-icon"
-            src="/static/rural/dayTOur.png"
+            src="/static/assistingAgriculture/rural/dayTOur.png"
             style="width: 32rpx; height: 32rpx"
           />
-          <img class="spe-img" src="/static/rural/img5.png" style="width: 306rpx; height: 204rpx" />
+          <img
+            class="spe-img"
+            src="/static/assistingAgriculture/rural/img5.png"
+            style="width: 306rpx; height: 204rpx"
+          />
         </view>
       </view>
       <view class="hot-way">
@@ -46,10 +58,14 @@
           <view class="foodCard" v-for="(item, index) in 5" :key="index">
             <!--            <img-->
             <!--              class="img-icon"-->
-            <!--              src="/static/rural/icon.png"-->
+            <!--              src="/static/assistingAgriculture/rural/icon.png"-->
             <!--              style="width: 118rpx; height: 32rpx"-->
             <!--            />-->
-            <image class="test5" src="/static/rural/img4.png" mode="widthFix" />
+            <image
+              class="test5"
+              src="/static/assistingAgriculture/rural/img4.png"
+              mode="widthFix"
+            />
           </view>
         </scroll-view>
         <!--        列表-->
@@ -141,11 +157,11 @@
 </template>
 
 <script setup lang="ts">
-import Search from '../../components/index/Search.vue';
-import Sort from '../../components/index/Sort.vue';
-import DepartureDate from '../../components/index/DepartureDate.vue';
-import ScenicSpots from '../../components/index/ScenicSpots.vue';
-import Screen from '../../components/index/Screen.vue';
+import Search from '../../../components/assistingAgriculture/index/Search.vue';
+import Sort from '../../../components/assistingAgriculture/index/Sort.vue';
+import DepartureDate from '../../../components/assistingAgriculture/index/DepartureDate.vue';
+import ScenicSpots from '../../../components/assistingAgriculture/index/ScenicSpots.vue';
+import Screen from '../../../components/assistingAgriculture/index/Screen.vue';
 
 const rotate = ref(false);
 const rotate2 = ref(false);
@@ -153,7 +169,7 @@ const rotate3 = ref(false);
 const rotate4 = ref(false);
 const cardList = ref([
   {
-    img: '/static/rural/img2.png',
+    img: '/static/assistingAgriculture/rural/img2.png',
     title: '红枫湖+青岩古镇+云漫湖+云顶高坡景区一日游',
     give: '赠价值59元特产伴手礼一份',
     tag: ['可定明日', '无购物', '含保险'],
@@ -163,7 +179,7 @@ const cardList = ref([
     price: '299.00',
   },
   {
-    img: '/static/rural/img2.png',
+    img: '/static/assistingAgriculture/rural/img2.png',
     title: '红枫湖+青岩古镇+云漫湖+云顶高坡景区一日游',
     give: '赠价值59元特产伴手礼一份',
     tag: ['可定明日', '无购物', '含保险'],
@@ -173,7 +189,7 @@ const cardList = ref([
     price: '299.00',
   },
   {
-    img: '/static/rural/img2.png',
+    img: '/static/assistingAgriculture/rural/img2.png',
     title: '红枫湖+青岩古镇+云漫湖+云顶高坡景区一日游',
     give: '赠价值59元特产伴手礼一份',
     tag: ['可定明日', '无购物', '含保险'],
@@ -183,7 +199,7 @@ const cardList = ref([
     price: '299.00',
   },
   {
-    img: '/static/rural/img2.png',
+    img: '/static/assistingAgriculture/rural/img2.png',
     title: '红枫湖+青岩古镇+云漫湖+云顶高坡景区一日游',
     give: '赠价值59元特产伴手礼一份',
     tag: ['可定明日', '无购物', '含保险'],
@@ -224,7 +240,7 @@ const locationFiltering = (index) => {
 function toRouteDetails() {
   // TODO: 跳转到线路详情
   xma.navigateTo({
-    url: '/pages/RouteDetails/RouteDetails',
+    url: '/pages/assistingAgriculture/RouteDetails/RouteDetails',
   });
 }
 </script>

src/pages/assistingAgriculture/cart/ConfirmOrder.vue

@@ -6,9 +6,17 @@
         <view class="hypotenuse-view"></view>
       </view>
       <view class="location">
-        <img class="location-pic" src="/src/static/assets/location.png" alt="" />
+        <img
+          class="location-pic"
+          src="/src/static/assistingAgriculture/assets/location.png"
+          alt=""
+        />
         <view class="location-text">贵州省贵阳市南明区花果园中环广场3号楼 1718</view>
-        <img class="location-icon" src="/src/static/assets/right-arrow.png" alt="" />
+        <img
+          class="location-icon"
+          src="/src/static/assistingAgriculture/assets/right-arrow.png"
+          alt=""
+        />
         <view class="customer-information">
           <view class="customer-name">张三</view>
           <view class="customer-phone">187****5632</view>
@@ -18,14 +26,22 @@
         <text class="send-time">立即送出</text>
         <view class="estimated-time">大约13:45送达</view>
         <view class="estimated-icon"></view>
-        <img class="estimated-icon" src="/src/static/assets/right-arrow.png" alt="" />
+        <img
+          class="estimated-icon"
+          src="/src/static/assistingAgriculture/assets/right-arrow.png"
+          alt=""
+        />
       </view>
     </view>
     <view class="commordity-information-view">
       <view class="trade-name">杨家黄焖鸡</view>
       <view class="commordity-content">
         <view class="commordity-details">
-          <img class="commodity-picture" src="/src/static/assets/img1.png" alt="" />
+          <img
+            class="commodity-picture"
+            src="/src/static/assistingAgriculture/assets/img1.png"
+            alt=""
+          />
           <view class="commodity-name">招牌黄焖鸡+米饭（土豆+生菜）</view>
           <view class="price-information">
             <text class="price-symbol">￥</text>
@@ -35,7 +51,11 @@
           <view class="label">约1000克</view>
         </view>
         <view class="commordity-details">
-          <img class="commodity-picture" src="/src/static/assets/img1.png" alt="" />
+          <img
+            class="commodity-picture"
+            src="/src/static/assistingAgriculture/assets/img1.png"
+            alt=""
+          />
           <view class="commodity-name">招牌黄焖鸡+米饭（土豆+生菜）</view>
           <view class="price-information">
             <text class="price-symbol">￥</text>
@@ -50,7 +70,11 @@
           <view class="discount-coupon">卷</view>
           <view class="discount-coupon-text">商家优惠券</view>
           <view class="discount-coupon-price">￥0</view>
-          <img class="discount-coupon-icon" src="/src/static/assets/right-arrow.png" alt="" />
+          <img
+            class="discount-coupon-icon"
+            src="/src/static/assistingAgriculture/assets/right-arrow.png"
+            alt=""
+          />
         </view>
       </view>
       <view class="freight-view">

src/pages/assistingAgriculture/cart/cart(old).vue

@@ -10,7 +10,7 @@
 
         <view class="commodity-information">
           <view class="commodity-checkbox"></view>
-          <img class="commodity-picture" src="/src/static/assets/fruit.png" alt="" />
+          <img class="commodity-picture" src="/src/static/assistingAgriculture/assets/fruit.png" alt="" />
           <view class="commodity-name">招牌黄焖鸡+米饭（土豆+生菜）</view>
           <view class="label">约1000克</view>
           <view class="price-information">
@@ -34,7 +34,7 @@
 
         <view class="commodity-information">
           <view class="commodity-checkbox"></view>
-          <img class="commodity-picture" src="/src/static/assets/fruit.png" alt="" />
+          <img class="commodity-picture" src="/src/static/assistingAgriculture/assets/fruit.png" alt="" />
           <view class="commodity-name">招牌黄焖鸡+米饭（土豆+生菜）</view>
           <view class="label">约1000克</view>
           <view class="price-information">
@@ -51,7 +51,7 @@
       </view>
       <view class="commodity-information">
         <view class="commodity-checkbox"></view>
-        <img class="commodity-picture" src="/src/static/assets/fruit.png" alt="" />
+        <img class="commodity-picture" src="/src/static/assistingAgriculture/assets/fruit.png" alt="" />
         <view class="commodity-name">招牌黄焖鸡+米饭（土豆+生菜）</view>
         <view class="label">约1000克</view>
         <view class="price-information">

src/pages/assistingAgriculture/cart/cart.vue

@@ -143,7 +143,7 @@ const changeCheckedAll = () => {
 function toSettle() {
   // TODO: 跳转到结算页面
   xma.navigateTo({
-    url: '/pages/cart/ConfirmOrder',
+    url: '/pages/assistingAgriculture/cart/ConfirmOrder',
   });
 }
 </script>

src/pages/assistingAgriculture/detail/detail.vue

@@ -6,23 +6,27 @@
         <Search
           background="rgba(255, 255, 255, 0.8)"
           backIcon="black"
-          iconSrc="/static/assets/blackLeft.png"
+          iconSrc="/static/assistingAgriculture/assets/blackLeft.png"
           placeholderText="请输入要搜索的内容"
         ></Search>
       </view>
     </view>
     <!--    图片-->
     <view class="nav">
-      <img class="main-img" src="/static/detail/img2.png" style="width: 750rpx; height: 668rpx" />
+      <img
+        class="main-img"
+        src="/static/assistingAgriculture/detail/img2.png"
+        style="width: 750rpx; height: 668rpx"
+      />
       <view class="pre-icon">
         <img
           class="left-icon"
-          src="/static/detail/img4.png"
+          src="/static/assistingAgriculture/detail/img4.png"
           style="width: 248rpx; height: 100rpx; position: relative"
         />
         <img
           class="right-icon"
-          src="/static/detail/img3.png"
+          src="/static/assistingAgriculture/detail/img3.png"
           style="width: 546rpx; height: 62rpx"
         />
       </view>
@@ -38,7 +42,7 @@
         这是商品简介这是商品简介这是商品简介这是商品简介这是商品 简介这是商品简介这是商品简介
       </view>
       <view>
-        <img class="share-img" src="/static/detail/share.png" />
+        <img class="share-img" src="/static/assistingAgriculture/detail/share.png" />
         <text class="share-text" @click="share">分享</text>
       </view>
     </view>
@@ -52,24 +56,33 @@
     <!--    详情图-->
     <view class="detail-info">
       <text class="info-title">详情</text>
-      <img class="info-img" src="/static/detail/detail-img.png" />
-      <img class="info-img" src="/static/detail/detail-img.png" />
+      <img class="info-img" src="/static/assistingAgriculture/detail/detail-img.png" />
+      <img class="info-img" src="/static/assistingAgriculture/detail/detail-img.png" />
     </view>
     <!--    底部-->
     <view class="detail-bottom">
       <view class="sort">
         <view class="bottom" style="display: flex; flex-direction: row">
           <view class="borderClass" @tap="toStore">
-            <img src="/static/detail/img7.png" style="width: 40rpx; height: 40rpx" />
+            <img
+              src="/static/assistingAgriculture/detail/img7.png"
+              style="width: 40rpx; height: 40rpx"
+            />
             <view class="sort-text">店铺</view>
           </view>
           <view class="borderClass">
-            <img src="/static/detail/img8.png" style="width: 40rpx; height: 40rpx" />
+            <img
+              src="/static/assistingAgriculture/detail/img8.png"
+              style="width: 40rpx; height: 40rpx"
+            />
             <view class="sort-text">客服</view>
           </view>
           <view class="borderClass" @tap="toCart">
             <wd-badge modelValue="4">
-              <img src="/static/detail/car.png" style="width: 40rpx; height: 40rpx" />
+              <img
+                src="/static/assistingAgriculture/detail/car.png"
+                style="width: 40rpx; height: 40rpx"
+              />
             </wd-badge>
             <view class="sort-text">购物车</view>
           </view>
@@ -91,21 +104,21 @@
 </template>
 
 <script setup>
-import Search from '../../components/index/Search.vue';
+import Search from '../../../components/assistingAgriculture/index/Search.vue';
 import { ref } from 'vue';
 import { onShow } from '@dcloudio/uni-app';
 
 // 图片
 const swiperList = ref([
-  '../../static/detail/img2.png',
-  '../../static/detail/img2.png',
-  '../../static/detail/img2.png',
+  '../../static/assistingAgriculture/detail/img2.png',
+  '../../static/assistingAgriculture/detail/img2.png',
+  '../../static/assistingAgriculture/detail/img2.png',
 ]);
 // 底部
 const storeList = ref([
-  { img: '/static/detail/img7.png', text: '店铺' },
-  { img: '/static/detail/img8.png', text: '客服' },
-  { img: '/static/detail/img6.png', text: '购物车' },
+  { img: '/static/assistingAgriculture/detail/img7.png', text: '店铺' },
+  { img: '/static/assistingAgriculture/detail/img8.png', text: '客服' },
+  { img: '/static/assistingAgriculture/detail/img6.png', text: '购物车' },
 ]);
 // 进入页面回到顶部
 onShow(() => {
@@ -120,13 +133,13 @@ const share = () => {
 function toStore() {
   // TODO: 跳转到筑农严选
   xma.navigateTo({
-    url: '/pages/shop/index',
+    url: '/pages/assistingAgriculture/shop/index',
   });
 }
 function toCart() {
   // TODO: 跳转到购物车
   xma.navigateTo({
-    url: '/pages/cart/cart',
+    url: '/pages/assistingAgriculture/cart/cart',
   });
 }
 </script>

src/pages/assistingAgriculture/index/building.vue

@@ -5,7 +5,7 @@
       <Search
         background="rgba(255, 255, 255, 0.8)"
         backIcon="black"
-        iconSrc="/static/assets/blackLeft.png"
+        iconSrc="/static/assistingAgriculture/assets/blackLeft.png"
         placeholderText="请输入要搜索的内容"
       ></Search>
     </view>
@@ -24,19 +24,19 @@
       <view class="nav-img">
         <img
           class="culture"
-          src="/static/assets/culture.png"
+          src="/static/assistingAgriculture/assets/culture.png"
           style="width: 366rpx; height: 362rpx"
         />
         <view class="right-img">
           <img
             class="delicacy"
-            src="/static/assets/delicacy.png"
+            src="/static/assistingAgriculture/assets/delicacy.png"
             style="height: 176rpx; margin-left: 8rpx"
           />
           <img
             @tap="toPresale"
             class="fresh"
-            src="/static/assets/fresh.png"
+            src="/static/assistingAgriculture/assets/fresh.png"
             style="height: 176rpx; margin-left: 8rpx"
           />
         </view>
@@ -57,13 +57,13 @@
       <img
         @tap="toDetail"
         class="rice"
-        src="/static/assets/rice.png"
+        src="/static/assistingAgriculture/assets/rice.png"
         style="width: 670rpx; height: 236rpx"
       />
       <img
         @tap="toDetail"
         class="potato"
-        src="/static/assets/potato.png"
+        src="/static/assistingAgriculture/assets/potato.png"
         style="width: 650rpx; height: 236rpx; margin-left: 20rpx; margin-top: -20rpx"
       />
     </view>
@@ -83,7 +83,7 @@
     <view class="tabs-list">
       <img
         class="fruit-img"
-        src="/static/assets/fruit4.png"
+        src="/static/assistingAgriculture/assets/fruit4.png"
         style="width: 670rpx; height: 236rpx"
       />
       <view class="sort-list">
@@ -93,45 +93,57 @@
           <view class="price-page">
             <text class="price">￥{{ item.price }}</text>
           </view>
-          <img class="presale" src="/static/assets/car.png" style="width: 40rpx; height: 40rpx" />
+          <img
+            class="presale"
+            src="/static/assistingAgriculture/assets/car.png"
+            style="width: 40rpx; height: 40rpx"
+          />
         </view>
       </view>
     </view>
     <!-- 购物车悬浮按钮 -->
     <view class="cart-floating" @tap="toCart">
       <wd-badge modelValue="4">
-        <img class="shop-car" src="/static/presale/cart.png" style="width: 40rpx; height: 40rpx" />
+        <img
+          class="shop-car"
+          src="/static/assistingAgriculture/presale/cart.png"
+          style="width: 40rpx; height: 40rpx"
+        />
       </wd-badge>
     </view>
   </view>
 </template>
 
 <script setup>
-import Search from '../../components/index/Search.vue';
+import Search from '../../../components/assistingAgriculture/index/Search.vue';
 const current = ref(0);
 const light = ref(0);
 // 轮播图
 const swiperList = ref([
-  '../../static/assets/village.png',
-  '../../static/assets/village.png',
-  '../../static/assets/village.png',
+  '../../../static/assistingAgriculture/assets/village.png',
+  '../../../static/assistingAgriculture/assets/village.png',
+  '../../../static/assistingAgriculture/assets/village.png',
 ]);
 // 分类列表数据
 const tabsData = ref([
-  { img: '/static/assets/mainPicture.png', text: '水果生鲜' },
-  { img: '/static/assets/presale.png', text: '米面粮油' },
-  { img: '/static/assets/mainPicture.png', text: '农家干货' },
-  { img: '/static/assets/mainPicture.png', text: '鲜货预售' },
-  { img: '/static/assets/mainPicture.png', text: '水果生鲜' },
-  { img: '/static/assets/mainPicture.png', text: '米面粮油' },
-  { img: '/static/assets/mainPicture.png', text: '农家干货' },
-  { img: '/static/assets/mainPicture.png', text: '鲜货预售' },
+  { img: '/static/assistingAgriculture/assets/mainPicture.png', text: '水果生鲜' },
+  { img: '/static/assistingAgriculture/assets/presale.png', text: '米面粮油' },
+  { img: '/static/assistingAgriculture/assets/mainPicture.png', text: '农家干货' },
+  { img: '/static/assistingAgriculture/assets/mainPicture.png', text: '鲜货预售' },
+  { img: '/static/assistingAgriculture/assets/mainPicture.png', text: '水果生鲜' },
+  { img: '/static/assistingAgriculture/assets/mainPicture.png', text: '米面粮油' },
+  { img: '/static/assistingAgriculture/assets/mainPicture.png', text: '农家干货' },
+  { img: '/static/assistingAgriculture/assets/mainPicture.png', text: '鲜货预售' },
 ]);
 const detailList = ref([
-  { img: '/static/assets/fruit.png', price: '2555', text: '这是草莓这是草莓' },
-  { img: '/static/assets/fruit1.png', price: '2555', text: '这是草莓这是草莓' },
-  { img: '/static/assets/fruit2.png', price: '2555', text: '麻辣鱼豆腐' },
-  { img: '/static/assets/fruit3.png', price: '2555', text: '麻辣鱼豆腐' },
+  { img: '/static/assistingAgriculture/assets/fruit.png', price: '2555', text: '这是草莓这是草莓' },
+  {
+    img: '/static/assistingAgriculture/assets/fruit1.png',
+    price: '2555',
+    text: '这是草莓这是草莓',
+  },
+  { img: '/static/assistingAgriculture/assets/fruit2.png', price: '2555', text: '麻辣鱼豆腐' },
+  { img: '/static/assistingAgriculture/assets/fruit3.png', price: '2555', text: '麻辣鱼豆腐' },
 ]);
 const choice = (index) => {
   light.value = index;
@@ -145,19 +157,19 @@ function onChange(e) {
 function toPresale() {
   // TODO: 跳转到预售
   xma.navigateTo({
-    url: '/pages/index/presale',
+    url: '/pages/assistingAgriculture/index/presale',
   });
 }
 function toDetail() {
   // TODO: 跳转到详情页
   xma.navigateTo({
-    url: '/pages/detail/detail',
+    url: '/pages/assistingAgriculture/detail/detail',
   });
 }
 function toCart() {
   // TODO: 跳转到购物车
   xma.navigateTo({
-    url: '/pages/cart/cart',
+    url: '/pages/assistingAgriculture/cart/cart',
   });
 }
 </script>
@@ -257,7 +269,7 @@ page {
       content: '';
       width: 40rpx;
       height: 12rpx;
-      background: url('../../static/assets/selected.png') no-repeat;
+      background: url('../../static/assistingAgriculture/assets/selected.png') no-repeat;
       background-size: 100% 100%;
       position: absolute;
       bottom: -16rpx;

src/pages/assistingAgriculture/index/index.vue

@@ -4,30 +4,54 @@
       <Search
         background="rgba(255, 255, 255, 0.8)"
         backIcon="black"
-        iconSrc="/static/assets/return.png"
+        iconSrc="/static/assistingAgriculture/assets/return.png"
         placeholderText="请输入要搜索的内容"
       ></Search>
       <view>
-        <img class="img1" src="/static/assets/bacImg.png" style="width: 750rpx; height: 440rpx" />
-        <img class="img2" src="/static/assets/bottom.png" style="width: 750rpx; height: 32rpx" />
-        <img class="img3" src="/static/assets/right.png" style="width: 288rpx; height: 124rpx" />
+        <img
+          class="img1"
+          src="/static/assistingAgriculture/assets/bacImg.png"
+          style="width: 750rpx; height: 440rpx"
+        />
+        <img
+          class="img2"
+          src="/static/assistingAgriculture/assets/bottom.png"
+          style="width: 750rpx; height: 32rpx"
+        />
+        <img
+          class="img3"
+          src="/static/assistingAgriculture/assets/right.png"
+          style="width: 288rpx; height: 124rpx"
+        />
       </view>
       <view class="sort">
         <view style="display: flex; flex-direction: row">
           <view class="borderClass" @tap="toBuilding">
-            <img src="/static/assets/buildingAgriculture.png" style="width: 96rpx; height: 96rpx" />
+            <img
+              src="/static/assistingAgriculture/assets/buildingAgriculture.png"
+              style="width: 96rpx; height: 96rpx"
+            />
             <view class="sort-text">筑农严选</view>
           </view>
           <view class="borderClass">
-            <img src="/static/assets/adoption.png" style="width: 96rpx; height: 96rpx" />
+            <img
+              src="/static/assistingAgriculture/assets/adoption.png"
+              style="width: 96rpx; height: 96rpx"
+            />
             <view class="sort-text">认养农业</view>
           </view>
           <view class="borderClass" @tap="toRuralTravel">
-            <img src="/static/assets/rural.png" style="width: 96rpx; height: 96rpx" />
+            <img
+              src="/static/assistingAgriculture/assets/rural.png"
+              style="width: 96rpx; height: 96rpx"
+            />
             <view class="sort-text">乡村旅居</view>
           </view>
           <view class="borderClass">
-            <img src="/static/assets/buildingAgriculture.png" style="width: 96rpx; height: 96rpx" />
+            <img
+              src="/static/assistingAgriculture/assets/buildingAgriculture.png"
+              style="width: 96rpx; height: 96rpx"
+            />
             <view class="sort-text">特色农庄</view>
           </view>
         </view>
@@ -46,10 +70,13 @@
       <view class="product-page">
         <view>
           <view class="page-title">特色美食</view>
-          <img src="/static/assets/mainPicture.png" class="main-img" />
+          <img src="/static/assistingAgriculture/assets/mainPicture.png" class="main-img" />
           <view style="display: flex; flex-direction: row">
             <view class="detail-border">
-              <img src="/static/assets/detailedMapOne.png" style="width: 216rpx; height: 176rpx" />
+              <img
+                src="/static/assistingAgriculture/assets/detailedMapOne.png"
+                style="width: 216rpx; height: 176rpx"
+              />
               <view class="detail-title">干辣椒炒肉</view>
               <view class="jiage-page">
                 <text class="jiage">￥25</text>
@@ -58,7 +85,10 @@
               <view class="yushou">预售</view>
             </view>
             <view class="detail-border">
-              <img src="/static/assets/detailedMapOne.png" style="width: 216rpx; height: 176rpx" />
+              <img
+                src="/static/assistingAgriculture/assets/detailedMapOne.png"
+                style="width: 216rpx; height: 176rpx"
+              />
               <view class="detail-title">贵阳辣子鸡</view>
               <view class="jiage-page">
                 <text class="jiage">￥25</text>
@@ -67,7 +97,10 @@
               <view class="yushou">预售</view>
             </view>
             <view class="detail-border">
-              <img src="/static/assets/detailedMapOne.png" style="width: 216rpx; height: 176rpx" />
+              <img
+                src="/static/assistingAgriculture/assets/detailedMapOne.png"
+                style="width: 216rpx; height: 176rpx"
+              />
               <view class="detail-title">麻辣鱼豆腐</view>
               <view class="jiage-page">
                 <text class="jiage">￥25</text>
@@ -81,10 +114,13 @@
       <view class="product-page" @tap="toDetail">
         <view>
           <view class="page-title">农货预售</view>
-          <img src="/static/assets/img4.png" class="main-img" />
+          <img src="/static/assistingAgriculture/assets/img4.png" class="main-img" />
           <view style="display: flex; flex-direction: row">
             <view class="detail-border">
-              <img src="/static/assets/img1.png" style="width: 216rpx; height: 176rpx" />
+              <img
+                src="/static/assistingAgriculture/assets/img1.png"
+                style="width: 216rpx; height: 176rpx"
+              />
               <view class="detail-title">这是农村种的土豆</view>
               <view class="jiage-page">
                 <text class="jiage">￥25</text>
@@ -93,7 +129,10 @@
               <view class="yushou">预售</view>
             </view>
             <view class="detail-border">
-              <img src="/static/assets/img2.png" style="width: 216rpx; height: 176rpx" />
+              <img
+                src="/static/assistingAgriculture/assets/img2.png"
+                style="width: 216rpx; height: 176rpx"
+              />
               <view class="detail-title">这是农村玉米</view>
               <view class="jiage-page">
                 <text class="jiage">￥25</text>
@@ -102,7 +141,10 @@
               <view class="yushou">预售</view>
             </view>
             <view class="detail-border">
-              <img src="/static/assets/img3.png" style="width: 216rpx; height: 176rpx" />
+              <img
+                src="/static/assistingAgriculture/assets/img3.png"
+                style="width: 216rpx; height: 176rpx"
+              />
               <view class="detail-title">这是农村中的猕猴桃</view>
               <view class="jiage-page">
                 <text class="jiage">￥25</text>
@@ -119,7 +161,10 @@
           <img :src="item.img" class="main-img" />
           <view style="display: flex; flex-direction: row">
             <view class="detail-border" v-for="(item, index) in detailList" :key="index">
-              <img src="/static/assets/detailedMapOne.png" style="width: 216rpx; height: 176rpx" />
+              <img
+                src="/static/assistingAgriculture/assets/detailedMapOne.png"
+                style="width: 216rpx; height: 176rpx"
+              />
               <view class="detail-title">{{ item.text }}</view>
               <view class="jiage-page">
                 <text class="jiage">￥{{ item.price }}</text>
@@ -135,44 +180,64 @@
 </template>
 
 <script setup lang="ts">
-import Search from '../../components/index/Search.vue';
+import Search from '../../../components/assistingAgriculture/index/Search.vue';
 
 const list = ref([
-  // { img: '/static/assets/mainPicture.png', text: '特色美食' },
-  // { img: '/static/assets/presale.png', text: '农货预售' },
-  { img: '/static/assets/mainPicture.png', text: '乡村非遗' },
-  { img: '/static/assets/mainPicture.png', text: '认养农业' },
-  { img: '/static/assets/mainPicture.png', text: '乡村旅居' },
-  { img: '/static/assets/mainPicture.png', text: '特色农庄' },
+  // { img: '/static/assistingAgriculture/assets/mainPicture.png', text: '特色美食' },
+  // { img: '/static/assistingAgriculture/assets/presale.png', text: '农货预售' },
+  { img: '/static/assistingAgriculture/assets/mainPicture.png', text: '乡村非遗' },
+  { img: '/static/assistingAgriculture/assets/mainPicture.png', text: '认养农业' },
+  { img: '/static/assistingAgriculture/assets/mainPicture.png', text: '乡村旅居' },
+  { img: '/static/assistingAgriculture/assets/mainPicture.png', text: '特色农庄' },
 ]);
 const detailList = ref([
-  { img: '/static/assets/detailedMapOne.png', price: '25', text: '干辣椒炒肉干辣椒炒肉' },
-  { img: '/static/assets/detailedMapTwo.png', price: '25', text: '贵阳辣子鸡' },
-  { img: '/static/assets/detailedMapThree.png', price: '25', text: '麻辣鱼豆腐' },
+  {
+    img: '/static/assistingAgriculture/assets/detailedMapOne.png',
+    price: '25',
+    text: '干辣椒炒肉干辣椒炒肉',
+  },
+  {
+    img: '/static/assistingAgriculture/assets/detailedMapTwo.png',
+    price: '25',
+    text: '贵阳辣子鸡',
+  },
+  {
+    img: '/static/assistingAgriculture/assets/detailedMapThree.png',
+    price: '25',
+    text: '麻辣鱼豆腐',
+  },
 ]);
 const sortList = ref([
-  { img: '/static/assets/buildingAgriculture.png', price: '25', text: '筑农严选' },
-  { img: '/static/assets/adoption.png', price: '25', text: '认养农业' },
-  { img: '/static/assets/rural.png', price: '25', text: '乡村旅居' },
-  { img: '/static/assets/buildingAgriculture.png', price: '25', text: '特色农庄' },
+  {
+    img: '/static/assistingAgriculture/assets/buildingAgriculture.png',
+    price: '25',
+    text: '筑农严选',
+  },
+  { img: '/static/assistingAgriculture/assets/adoption.png', price: '25', text: '认养农业' },
+  { img: '/static/assistingAgriculture/assets/rural.png', price: '25', text: '乡村旅居' },
+  {
+    img: '/static/assistingAgriculture/assets/buildingAgriculture.png',
+    price: '25',
+    text: '特色农庄',
+  },
 ]);
 function toBuilding() {
   // TODO: 跳转到筑农严选
   xma.navigateTo({
-    url: '/pages/index/building',
+    url: '/pages/assistingAgriculture/index/building',
   });
 }
 function toRuralTravel() {
   // TODO: 跳转到乡村旅居
   xma.navigateTo({
-    url: '/pages/RuralTravel/RuralTravel',
+    url: '/pages/assistingAgriculture/RuralTravel/RuralTravel',
   });
 }
 // 跳转详情页
 function toDetail() {
   // TODO: 跳转到详情页
   xma.navigateTo({
-    url: '/pages/detail/detail',
+    url: '/pages/assistingAgriculture/detail/detail',
   });
 }
 </script>

src/pages/assistingAgriculture/index/presale.vue

@@ -4,7 +4,7 @@
       <Search
         background="rgba(255, 255, 255, 0.8)"
         backIcon="black"
-        iconSrc="/static/assets/left.png"
+        iconSrc="/static/assistingAgriculture/assets/left.png"
         placeholderText="输入商品名称"
       ></Search>
     </view>
@@ -50,7 +50,7 @@
         <view>
           <img
             class="buy-img"
-            src="/static/presale/img6.png"
+            src="/static/assistingAgriculture/presale/img6.png"
             style="
               position: sticky;
               width: 284rpx;
@@ -75,7 +75,7 @@
             <image :src="good.image" mode="widthFix"></image>
             <image
               class="presale-img"
-              src="/static/presale/presale.png"
+              src="/static/assistingAgriculture/presale/presale.png"
               style="
                 width: 132rpx;
                 height: 64rpx;
@@ -87,7 +87,7 @@
             />
             <image
               class="preview-img"
-              src="/static/presale/preview.png"
+              src="/static/assistingAgriculture/presale/preview.png"
               style="width: 264rpx; height: 40rpx; z-index: 9; top: -70rpx"
             />
             <text class="pre-text">预计9月15日发货</text>
@@ -115,12 +115,12 @@
             <image :src="good.image" mode="widthFix"></image>
             <image
               class="presale-img"
-              src="/static/presale/presale.png"
+              src="/static/assistingAgriculture/presale/presale.png"
               style="width: 132rpx; height: 64rpx; z-index: 10; top: -70rpx"
             />
             <image
               class="preview-img"
-              src="/static/presale/preview.png"
+              src="/static/assistingAgriculture/presale/preview.png"
               style="width: 264rpx; height: 40rpx; z-index: 9; top: -66rpx"
             />
             <text class="pre-text">预计9月15日发货</text>
@@ -141,51 +141,55 @@
   <!-- 购物车悬浮按钮 -->
   <view class="cart-floating" @tap="toCart">
     <wd-badge modelValue="4">
-      <img class="shop-car" src="/static/presale/cart.png" style="width: 40rpx; height: 40rpx" />
+      <img
+        class="shop-car"
+        src="/static/assistingAgriculture/presale/cart.png"
+        style="width: 40rpx; height: 40rpx"
+      />
     </wd-badge>
   </view>
 </template>
 
 <script setup>
-import Search from '../../components/index/Search.vue';
+import Search from '../../../components/assistingAgriculture/index/Search.vue';
 import { ref } from 'vue';
 const current = ref(0);
 const light = ref(0);
 const sortList = ref([
-  { img: '/static/presale/bacImg.png', price: '25', text: '应季好物' },
-  { img: '/static/presale/img2.png', price: '25', text: '猪肉蛋禽' },
-  { img: '/static/presale/img3.png', price: '25', text: '米面粮油' },
-  { img: '/static/presale/img4.png', price: '25', text: '预选蔬菜' },
-  { img: '/static/presale/img5.png', price: '25', text: '心选水果' },
+  { img: '/static/assistingAgriculture/presale/bacImg.png', price: '25', text: '应季好物' },
+  { img: '/static/assistingAgriculture/presale/img2.png', price: '25', text: '猪肉蛋禽' },
+  { img: '/static/assistingAgriculture/presale/img3.png', price: '25', text: '米面粮油' },
+  { img: '/static/assistingAgriculture/presale/img4.png', price: '25', text: '预选蔬菜' },
+  { img: '/static/assistingAgriculture/presale/img5.png', price: '25', text: '心选水果' },
 ]);
 const swiperList = ref([
-  '../../static/presale/img.png',
-  '../../static/presale/img.png',
-  '../../static/presale/img.png',
+  '../../../static/assistingAgriculture/presale/img.png',
+  '../../../static/assistingAgriculture/presale/img.png',
+  '../../../static/assistingAgriculture/presale/img.png',
 ]);
 const tabsData = ref([
-  { img: '/static/assets/mainPicture.png', text: '全部' },
-  { img: '/static/assets/presale.png', text: '分类1' },
-  { img: '/static/assets/presale.png', text: '分类2' },
-  { img: '/static/assets/presale.png', text: '分类3' },
-  { img: '/static/assets/presale.png', text: '分类4' },
-  { img: '/static/assets/presale.png', text: '分类5' },
-  { img: '/static/assets/presale.png', text: '分类6' },
-  { img: '/static/assets/presale.png', text: '分类7' },
-  { img: '/static/assets/presale.png', text: '分类8' },
+  { img: '/static/assistingAgriculture/assets/mainPicture.png', text: '全部' },
+  { img: '/static/assistingAgriculture/assets/presale.png', text: '分类1' },
+  { img: '/static/assistingAgriculture/assets/presale.png', text: '分类2' },
+  { img: '/static/assistingAgriculture/assets/presale.png', text: '分类3' },
+  { img: '/static/assistingAgriculture/assets/presale.png', text: '分类4' },
+  { img: '/static/assistingAgriculture/assets/presale.png', text: '分类5' },
+  { img: '/static/assistingAgriculture/assets/presale.png', text: '分类6' },
+  { img: '/static/assistingAgriculture/assets/presale.png', text: '分类7' },
+  { img: '/static/assistingAgriculture/assets/presale.png', text: '分类8' },
 ]);
 const buyList = ref([
-  { img: '/static/presale/buy.png', price: '29.9', text: '应季好物' },
-  { img: '/static/presale/buy.png', price: '29.9', text: '猪肉蛋禽' },
-  { img: '/static/presale/buy.png', price: '29.9', text: '米面粮油' },
+  { img: '/static/assistingAgriculture/presale/buy.png', price: '29.9', text: '应季好物' },
+  { img: '/static/assistingAgriculture/presale/buy.png', price: '29.9', text: '猪肉蛋禽' },
+  { img: '/static/assistingAgriculture/presale/buy.png', price: '29.9', text: '米面粮油' },
 ]);
 const shopList = ref([
-  { img: '/static/presale/img7.png', price: '29.9', text: '应季好物' },
-  { img: '/static/presale/img7.png', price: '29.9', text: '应季好物' },
-  { img: '/static/presale/img7.png', price: '29.9', text: '应季好物' },
-  { img: '/static/presale/img7.png', price: '29.9', text: '应季好物' },
-  { img: '/static/presale/img7.png', price: '29.9', text: '应季好物' },
-  { img: '/static/presale/img7.png', price: '29.9', text: '应季好物' },
+  { img: '/static/assistingAgriculture/presale/img7.png', price: '29.9', text: '应季好物' },
+  { img: '/static/assistingAgriculture/presale/img7.png', price: '29.9', text: '应季好物' },
+  { img: '/static/assistingAgriculture/presale/img7.png', price: '29.9', text: '应季好物' },
+  { img: '/static/assistingAgriculture/presale/img7.png', price: '29.9', text: '应季好物' },
+  { img: '/static/assistingAgriculture/presale/img7.png', price: '29.9', text: '应季好物' },
+  { img: '/static/assistingAgriculture/presale/img7.png', price: '29.9', text: '应季好物' },
 ]);
 // 声明需要的数据
 const data = reactive({
@@ -201,35 +205,35 @@ const goodList = ref([
   {
     id: 1,
     name: '这是一个商品',
-    image: '/static/presale/buy.png',
+    image: '/static/assistingAgriculture/presale/buy.png',
     introduction: '商品简介商品简介',
     price: 69.9,
   },
   {
     id: 2,
     name: '商品二',
-    image: '/static/presale/img7.png',
+    image: '/static/assistingAgriculture/presale/img7.png',
     introduction: '商品简介商品简介',
     price: 69.9,
   },
   {
     id: 3,
     name: '商品三',
-    image: '/static/assets/fruit.png',
+    image: '/static/assistingAgriculture/assets/fruit.png',
     introduction: '商品简介商品简介',
     price: 69.9,
   },
   {
     id: 4,
     name: '商品四',
-    image: '/static/presale/buy.png',
+    image: '/static/assistingAgriculture/presale/buy.png',
     introduction: '商品简介商品简介',
     price: 69.9,
   },
   {
     id: 5,
     name: '商品五',
-    image: '/static/presale/buy.png',
+    image: '/static/assistingAgriculture/presale/buy.png',
     introduction: '商品简介商品简介',
     price: 69.9,
   },
@@ -264,13 +268,13 @@ const choice = (index) => {
 function toCart() {
   // TODO: 跳转到筑农严选
   xma.navigateTo({
-    url: '/pages/cart/cart',
+    url: '/pages/assistingAgriculture/cart/cart',
   });
 }
 function toDetail() {
   // TODO: 跳转到筑农严选
   xma.navigateTo({
-    url: '/pages/detail/detail',
+    url: '/pages/assistingAgriculture/detail/detail',
   });
 }
 </script>

src/pages/assistingAgriculture/reviewDetails/reviewDetails.vue

@@ -22,7 +22,10 @@
     <view class="revuew-content">
       <view class="user-info">
         <view class="info-content">
-          <image src="@/static/reviewDetails/avatar.png" mode="aspectFill"></image>
+          <image
+            src="@/static/assistingAgriculture/reviewDetails/avatar.png"
+            mode="aspectFill"
+          ></image>
           <view class="text-box">
             <text class="user-name">不爱吃鱼的小猫咪</text>
             <text class="fb-time">2024-08-03</text>
@@ -39,7 +42,7 @@
       </text>
     </view>
     <view class="scenic-spot">
-      <image src="@/static/reviewDetails/fj.png" mode="aspectFill"></image>
+      <image src="@/static/assistingAgriculture/reviewDetails/fj.png" mode="aspectFill"></image>
       <view class="scenic-area-details">
         <text class="scenic-name">红枫湖+青岩古镇+云漫湖</text>
         <text class="scenic-type">自然风景</text>

src/pages/assistingAgriculture/reviewDetails/scenicSpotDetails.vue

@@ -3,7 +3,7 @@
   <view class="review-details-pages">
     <view class="list">
       <view class="item" v-for="i in 10" :key="i">
-        <image mode="aspectFill" src="@/static/reviewDetails/fj.png"></image>
+        <image mode="aspectFill" src="@/static/assistingAgriculture/reviewDetails/fj.png"></image>
         <view class="info-box">
           <text>红枫湖景区</text>
           <text>自然风景</text>

src/pages/assistingAgriculture/shop/index.vue

@@ -87,7 +87,7 @@ const activeFilter = ref(false);
 function toCart() {
   // TODO: 跳转到购物车
   xma.navigateTo({
-    url: '/pages/cart/cart',
+    url: '/pages/assistingAgriculture/cart/cart',
   });
 }
 </script>

src/pages/index/index.vue

 <template>
   <view class="container">
-    <my-icon name="add-circle" color="#0083ff" />
     <view class="top">
       <!-- 搜索 -->
       <Search background="rgba(255, 255, 255, 0.8)" backIcon="black" @toSearch="toSearch">
@@ -264,7 +263,7 @@ const getClassification = () => {
       item.pic = import.meta.env.VITE_APP_IMG_URL + item.pic;
     });
     classificationT.value = res.data.slice(0, 4);
-    classificationB.value = res.data.slice(4);
+    classificationB.value = res.data.slice(4, 9);
   });
 };
 // 附近人气美食分页

src/pages/packageDetails/packageDetails.vue

@@ -141,15 +141,15 @@
         <view class="bz">
           <text class="yh-name">保障：</text>
           <view class="icon-box">
-            <i class="iconfont icon icon-jinggao" />
+            <i class="iconfont icon icon-rs-countdown" />
             过期退
           </view>
-          <view class="icon-box">
-            <i class="iconfont icon icon-jinggao" />
+          <view style="margin-left: 64rpx" class="icon-box">
+            <i class="iconfont icon icon-ic_business_refund24px" />
             随时退
           </view>
-          <view class="icon-box">
-            <i class="iconfont icon icon-jinggao" />
+          <view style="margin-left: 64rpx" class="icon-box">
+            <i class="iconfont icon icon-naozhong" />
             随时用
           </view>
           <i @click="alert" class="iconfont jg icon-jinggao" />
@@ -855,10 +855,10 @@ page {
           align-items: center;
           font-size: 11 * 2rpx;
           color: #abaaaa;
-
           .icon {
-            font-size: 46rpx;
+            font-size: 38rpx;
             font-weight: bold;
+            font-weight: 300;
             color: #fa5151;
           }
         }

src/pages/shop/shop.vue

@@ -45,15 +45,14 @@
                 <text class="tj">推荐</text>
               </view>
               <view class="score-icon">
-                <!-- <wd-rate
+                <wd-rate
                   color="#fff"
                   readonly
                   v-model="shopInfo.grade"
                   size="22rpx"
                   space="8rpx"
                   :active-color="['#FA5151']"
-                /> -->
-                <myRate :score="grade" />
+                />
               </view>
             </view>
             <view class="shop-business-hours">
@@ -314,9 +313,7 @@ import {
   addImgUrlPrefix,
   navigationSelect,
 } from '@/utils/common';
-import myRate from '@/Components/Rating/Rating.vue';
 const imgUrl = import.meta.env.VITE_APP_IMG_URL;
-const grade = ref(1.8);
 const current = ref(0);
 const old = reactive({ scrollTop: 0 });
 const activeId = ref(1);
@@ -324,8 +321,6 @@ const activeId = ref(1);
 const shopInfo = ref({});
 // 店铺轮播图
 const shopSwiperList = ref([]);
-// 当前位置的经纬度-// 店铺的经纬度
-const currentLatitudeAndLongitude = ref({ latitude: 0, longitude: 0 });
 // 店铺经纬度
 const shopLocation = ref({ lat: 0, lon: 0 });
 // 团购商品列表

src/pages/storeEntry/detail.vue

@@ -5,45 +5,117 @@
       <view class="formmain">
         <wd-form ref="form" :model="formData" :rules="rules">
           <wd-cell-group border>
-            <wd-picker label="店铺类型" placeholder="请选择店铺类型" label-width="100px" prop="promotion"
-              v-model="formData.promotion" :columns="promotionlist" />
-            <wd-input label="店铺名称" label-width="100px" prop="xm" clearable v-model="formData.xm"
-              placeholder="请输入店铺名称" />
-            <wd-input label="联系电话" label-width="100px" prop="sjh" clearable v-model="formData.sjh"
-              placeholder="请输入联系电话" />
-            <wd-input label="所在地区" label-width="100px" v-model="formData.szdq" prop="szdq" readonly
-              placeholder="请选择所在地区" @click="getLocationFn" />
-            <wd-input label="详细地址" label-width="100px" prop="xxdz" clearable v-model="formData.xm"
-              placeholder="请输入详细地址" />
-            <wd-input label="小区/学校" label-width="100px" v-model="formData.szdq" prop="szdq" readonly placeholder="请选择"
-              @click="getLocationFn" />
+            <wd-picker
+              label="店铺类型"
+              placeholder="请选择店铺类型"
+              label-width="100px"
+              prop="promotion"
+              v-model="formData.promotion"
+              :columns="promotionlist"
+            />
+            <wd-input
+              label="店铺名称"
+              label-width="100px"
+              prop="xm"
+              clearable
+              v-model="formData.xm"
+              placeholder="请输入店铺名称"
+            />
+            <wd-input
+              label="联系电话"
+              label-width="100px"
+              prop="sjh"
+              clearable
+              v-model="formData.sjh"
+              placeholder="请输入联系电话"
+            />
+            <wd-input
+              label="所在地区"
+              label-width="100px"
+              v-model="formData.szdq"
+              prop="szdq"
+              readonly
+              placeholder="请选择所在地区"
+              @click="getLocationFn"
+            />
+            <wd-input
+              label="详细地址"
+              label-width="100px"
+              prop="xxdz"
+              clearable
+              v-model="formData.xm"
+              placeholder="请输入详细地址"
+            />
+            <wd-input
+              label="小区/学校"
+              label-width="100px"
+              v-model="formData.szdq"
+              prop="szdq"
+              readonly
+              placeholder="请选择"
+              @click="getLocationFn"
+            />
             <view class="flex">
-
               <view class="logo">LOGO/门头照</view>
-              <wd-upload :file-list="fileList1" image-mode="aspectFill" :action="action" @change="handleChange1"
-                :limit="1" class="img1"></wd-upload>
+              <wd-upload
+                :file-list="fileList1"
+                image-mode="aspectFill"
+                :action="action"
+                @change="handleChange1"
+                :limit="1"
+                class="img1"
+              ></wd-upload>
             </view>
             <view class="flex">
               <view class="logo">营业执照</view>
-              <wd-upload :file-list="fileList1" image-mode="aspectFill" :action="action" @change="handleChange1"
-                :limit="1" class="img1"></wd-upload>
+              <wd-upload
+                :file-list="fileList1"
+                image-mode="aspectFill"
+                :action="action"
+                @change="handleChange1"
+                :limit="1"
+                class="img1"
+              ></wd-upload>
             </view>
             <view class="flex">
               <view class="logo">身份证照</view>
-              <wd-upload :file-list="fileList1" image-mode="aspectFill" :action="action" @change="handleChange1"
-                :limit="1" class="img1"></wd-upload>
-              <wd-upload :file-list="fileList1" image-mode="aspectFill" :action="action" @change="handleChange1"
-                :limit="1" class="img1"></wd-upload>
+              <wd-upload
+                :file-list="fileList1"
+                image-mode="aspectFill"
+                :action="action"
+                @change="handleChange1"
+                :limit="1"
+                class="img1"
+              ></wd-upload>
+              <wd-upload
+                :file-list="fileList1"
+                image-mode="aspectFill"
+                :action="action"
+                @change="handleChange1"
+                :limit="1"
+                class="img1"
+              ></wd-upload>
             </view>
             <view class="flex">
               <view class="logo">店铺分类</view>
               <view class="text" @click="showclass">请选择</view>
             </view>
-            <wd-textarea placeholder="请填写评价" label="店铺介绍" label-width="100px" v-model="formData.szdq" prop="szdq" />
+            <wd-textarea
+              placeholder="请填写评价"
+              label="店铺介绍"
+              label-width="100px"
+              v-model="formData.szdq"
+              prop="szdq"
+            />
 
             <button type="primary" style="width: 80%">提交</button>
           </wd-cell-group>
-          <wd-popup v-model="show" position="bottom" custom-style="height:300px;overflow:auto;" @close="handleClose">
+          <wd-popup
+            v-model="show"
+            position="bottom"
+            custom-style="height:300px;overflow:auto;"
+            @close="handleClose"
+          >
             <view class="hcontent">
               <view class="flex1">
                 <view class="text">取消</view>
@@ -231,7 +303,8 @@ page {
   .flex {
     display: flex;
     align-items: flex-start;
-    padding: var(--wot-input-cell-padding, 10px) var(--wot-input-padding, var(--wot-size-side-padding, 15px));
+    padding: var(--wot-input-cell-padding, 10px)
+      var(--wot-input-padding, var(--wot-size-side-padding, 15px));
     background-color: var(--wot-input-cell-bg, var(--wot-color-white, rgb(255, 255, 255)));
 
     .text {