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

src/components/index/Search.vue

@@ -40,25 +40,22 @@ const emit = defineEmits(['toSearch']);
 const title = ref('小程序平台');
 const { countInfo, addCount } = useCountStore();
 const test = ref('');
-onMounted(() => {
-  // xma.xh.getUserProfile({
-  //   range: ['ACCOUNT', 'MOBILE', 'CITIZEN'],
-  //   async success(info) {
-  //     const info2 = JSON.stringify(info);
-  //     test.value = info2;
-  //   },
-  // });
+onLoad(() => {
+  xma.xh.getMenuButtonBoundingClientRect({
+    success(res) {
+      console.log('宽度', res.width); // 宽度，单位：px
+      console.log('高度', res.height); // 高度，单位：px
+      console.log('上边界坐标', res.top); // 上边界坐标，单位：px
+      console.log('右边界坐标', res.right); // 右边界坐标，单位：px
+      console.log('下边界坐标', res.bottom); // 下边界坐标，单位：px
+      console.log('左边界坐标', res.left); // 左边界坐标，单位：px
+    },
+  });
 });
-
 const search = (res) => {
   const keyword = res.detail.value;
   emit('toSearch', keyword);
 };
-const test2 = () => {
-  xma.navigateTo({
-    url: '/pages/shop/shop',
-  });
-};
 
 // 返回上一级
 const back = () => {

src/pages/assistingAgriculture/cart/ConfirmOrder.vue

@@ -251,7 +251,9 @@ onShow(() => {
     });
   }
 });
-
+const openZfType = () => {
+  PaymentRef.value.open();
+};
 function groupBuyConfirmFn(prodId, skuId) {
   return new Promise((resolve, reject) => {
     groupBuyConfirm({ prodId, skuId }).then((res) => {

src/pages/assistingAgriculture/index/building.vue

@@ -100,12 +100,9 @@
           v-for="(item, index) in testData"
           :key="index"
           style="margin-left: 20rpx"
+          @tap="toDetail(item)"
         >
-          <img
-            @tap="toDetail(item)"
-            :src="item.imgUrl"
-            style="width: 330rpx; height: 330rpx; border-radius: 16rpx"
-          />
+          <img :src="item.imgUrl" style="width: 330rpx; height: 330rpx; border-radius: 16rpx" />
           <view class="detail-title">{{ whh }}</view>
           <view class="price-page">
             <text class="price">￥{{ item.price }}</text>

src/pages/assistingAgriculture/index/presale.vue

@@ -76,9 +76,9 @@
     </view>
     <view class="waterfall">
       <view class="wt-left wt-list">
-        <view class="wt-item" v-for="(good, index) in buyList" :key="index" @tap="toDetail(item)">
+        <view class="wt-item" v-for="(item, index) in buyList" :key="index" @tap="toDetail(item)">
           <view class="item-img">
-            <image :src="good.img" mode="widthFix" style="border-radius: 16rpx"></image>
+            <image :src="item.img" mode="widthFix" style="border-radius: 16rpx"></image>
             <image
               class="presale-img"
               src="/static/assistingAgriculture/presale/presale.png"
@@ -100,11 +100,11 @@
           </view>
           <!-- 介绍部分 -->
           <view class="introduce-section">
-            <text class="title">{{ good.prodName }}</text>
+            <text class="title">{{ item.prodName }}</text>
             <view class="tags-box">
-              <text class="good-detail">{{ good.detail }}</text>
-              <text class="introduction">{{ good.introduction }}</text>
-              <text class="good-price">￥{{ good.price }}</text>
+              <text class="good-detail">{{ item.detail }}</text>
+              <text class="introduction">{{ item.introduction }}</text>
+              <text class="good-price">￥{{ item.price }}</text>
               <img class="add" src="/static/assistingAgriculture/presale/add.png" />
             </view>
           </view>

src/pages/index/loading.vue

@@ -10,8 +10,8 @@ import { getTokenUser } from '../../api/index';
 import { getToken } from '../../utils/auth';
 
 onLoad(async (options) => {
-  // await signIn();
-  if (!getToken()) await signIn2();
+  await signIn();
+  // if (!getToken()) await signIn2();
   const { type } = options;
   switch (type) {
     case '0':
@@ -24,7 +24,12 @@ onLoad(async (options) => {
       xma.reLaunch({ url: '/pages/assistingAgriculture/index/building?categoryId=3266' });
       break;
     case '3':
-      xma.reLaunch({ url: '/pages/assistingAgriculture/RuralTravel/RuralTravel?categoryId=3268' });
+      xma.reLaunch({
+        url: '/pages/assistingAgriculture/RuralTravel/RuralTravel?categoryId=3268',
+      });
+      break;
+    default:
+      xma.reLaunch({ url: '/pages/index/index' });
   }
 });
 onMounted(async () => {