Merge remote-tracking branch 'origin/master'

src/pages/assistingAgriculture/detail/detail.vue

@@ -35,7 +35,7 @@
       </view> -->
     </view>
     <view class="evaluate">
-      <view class="evaluate-num">
+      <view class="evaluate-num" @click="jumpPjPgae">
         <text class="env">评价（{{ commentData.count }}）</text>
         <text class="num">好评率（{{ commentData.high }} %）</text>
         <wd-icon name="arrow-right" size="32rpx" style="margin-top: 2rpx"></wd-icon>
@@ -143,6 +143,11 @@ onLoad((options) => {
 function handleClick(e) {
   console.log(e);
 }
+function jumpPjPgae() {
+  xma.navigateTo({
+    url: `/pages/assistingAgriculture/detail/comment?shopId=${dataDetails.value.prod.shopId}`,
+  });
+}
 function onChange(e) {
   console.log(e);
 }
@@ -211,7 +216,7 @@ const share = () => {
 function toStore() {
   // TODO: 跳转到筑农严选
   xma.navigateTo({
-    url: '/pages/assistingAgriculture/shop/index',
+    url: `/pages/assistingAgriculture/shop/index?shopId=${dataDetails.value.prod.shopId}`,
   });
 }
 function toCart() {

src/pages/assistingAgriculture/shop/index.vue

@@ -185,12 +185,9 @@ function toCart() {
     url: '/pages/assistingAgriculture/cart/cart',
   });
 }
+const addPurchase = ref(0);
 const sgyBasketlistFn = () => {
-  const query = {
-    shopId: currentShopId.value,
-    shopType: '3',
-  };
-  sgyBasketlist(query).then((res) => {
+  sgyBasketlist().then((res) => {
     if (res.code === 0) {
       res.data.forEach((shop) => {
         addPurchase.value += shop.prodInfos.length;
@@ -208,7 +205,6 @@ function clearFn() {
   });
 }
 
-const addPurchase = ref(0);
 const addShoppingCart = (item) => {
   const params = {
     shopId: item.shopId,

src/pages/storeEntry/detail.vue

@@ -709,7 +709,7 @@ async function changeLocation() {
       uni.request({
         url: '/ws/geocoder/v1/',
         data: {
-          key: 'MN4BZ-7JXKW-2RYRD-32QGF-AHONV-PAFUN',
+          key: 'B7VBZ-PT5RB-WRHUT-J2EEQ-3WTUE-APFX4',
           location: `${res.latitude},${res.longitude}`,
         },
         success: function (res) {