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

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"
-        >
-          <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/order/order.vue

@@ -199,7 +199,8 @@ const stateList = ref({});
 const orderDic = ref();
 onLoad(async (options) => {
   // await signIn();
-  if (!getToken()) await signIn2();
+  if (!getToken()) await signIn();
+  // if (!getToken()) await signIn2();
   if (!getOrderDic()) await orderStatus();
   orderDic.value = getOrderDic();
   orderDic.value.baseOrder[0].value = 'all';
@@ -321,7 +322,7 @@ const catalog = reactive({
   endDate: '',
   keyword: '',
   status: '', // 待付款-not_pay，待使用-not_use，待评价not_eval，退款-after_sales
-  orderType: 'logistics', // 团购到店-store，外卖订单-takeaway，筑农物流logistics
+  orderType: '', // 团购到店-store，外卖订单-takeaway，筑农物流logistics
 });
 const getList = async () => {
   if (isEnd.value) return;