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

src/manifest.json

@@ -82,7 +82,7 @@
         "sdkConfigs": {
             "maps": {
                 "qqmap": {
-                    "key": "MN4BZ-7JXKW-2RYRD-32QGF-AHONV-PAFUN"
+                    "key": "B7VBZ-PT5RB-WRHUT-J2EEQ-3WTUE-APFX4"
                 }
             }
         }

src/pages/address/addressEdit.vue

@@ -145,7 +145,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) {

src/pages/assistingAgriculture/RuralTravel/RuralTravel.vue

@@ -8,7 +8,6 @@
           iconSrc="/static/assistingAgriculture/assets/left.png"
           placeholderText="请输入要搜索的关键词"
           @search="toSearch"
-          v-model="keyword"
         ></Search>
       </view>
       <view class="bac-img">
@@ -301,9 +300,9 @@ const screenParams = (selectedItems, type) => {
   }
 };
 // 搜索
-const toSearch = (data) => {
-  keyword.value = data.detail.value;
-  getProd(keyword.value);
+// 搜索
+const toSearch = () => {
+  xma.navigateTo({ url: '/pages/assistingAgriculture/searchPage/searchPage?prodType=10' });
 };
 
 // 查询列表

src/pages/assistingAgriculture/index/building.vue

@@ -176,7 +176,7 @@ onMounted(async () => {
 
 // 搜索
 const toSearch = () => {
-  xma.navigateTo({ url: '/pages/assistingAgriculture/searchPage/searchPage' });
+  xma.navigateTo({ url: '/pages/assistingAgriculture/searchPage/searchPage?prodType=7' });
 };
 // 获取购物车列表
 const getshoppingCartListFn = () => {

src/pages/assistingAgriculture/index/index.vue

@@ -6,6 +6,7 @@
         backIcon="black"
         iconSrc="/static/assistingAgriculture/assets/return.png"
         placeholderText="请输入要搜索的内容"
+        @search="toSearch"
       ></Search>
       <view>
         <wd-swiper
@@ -117,7 +118,10 @@ const getPresale = () => {
     });
   });
 };
-
+// 搜索
+const toSearch = () => {
+  xma.navigateTo({ url: '/pages/assistingAgriculture/searchPage/searchPage?prodType=[7,10]' });
+};
 const onChange = (e) => {
   // console.log(e);
 };

src/pages/assistingAgriculture/index/presale.vue

@@ -161,7 +161,7 @@ onMounted(async () => {
 });
 // 搜索
 const toSearch = () => {
-  xma.navigateTo({ url: '/pages/assistingAgriculture/searchPage/searchPage' });
+  xma.navigateTo({ url: '/pages/assistingAgriculture/searchPage/searchPage?prodType=7' });
 };
 // 获取购物车列表
 const getshoppingCartListFn = () => {