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

src/Components/fab/fab.vue

@@ -26,7 +26,11 @@
       </view>
       <view class="custom-button" @click="go('/pages/storeEntry/index')">
         <image class="fab-icon" src="../../static/index/coupon.png"></image>
-        <text class="fab-text">商家入驻</text>
+        <text class="fab-text">商家</text>
+      </view>
+      <view class="custom-button" @click="go('/pages/assistingAgriculture/index/index')">
+        <image class="fab-icon" src="../../static/index/coupon.png"></image>
+        <text class="fab-text">助农</text>
       </view>
     </view>
     <!-- 预售主页   -->

src/pages/assistingAgriculture/RuralTravel/RuralTravel.vue

@@ -754,4 +754,11 @@ uni-video {
   padding: 20rpx;
   color: #999;
 }
+::v-deep .uni-video-progress-container {
+  transform: scale(0);
+}
+::v-deep .uni-video-current-time,
+::v-deep .uni-video-duration {
+  transform: scale(0);
+}
 </style>

src/pages/order/detail.vue

@@ -20,22 +20,36 @@
           ></wd-icon>
           <view class="status-text">{{ statusList[orderDetail.orderStore.status] }}</view>
         </view>
-        <view class="detail" v-if="orderDetail.orderStore.status == 3">
+        <view
+          class="detail"
+          v-if="orderDetail.orderStore.status == 3 && orderDetail.baseOrder.prodType === 5"
+        >
           请在{{ orderDetail.orderStore.writeOffEnd.slice(0, 4) }}年{{
             orderDetail.orderStore.writeOffEnd.slice(5, 7)
           }}月{{ orderDetail.orderStore.writeOffEnd.slice(8, 10) }}前到店消费
         </view>
+        <view
+          class="detail"
+          v-if="orderDetail.orderStore.status == 3 && orderDetail.baseOrder.prodType === 9"
+        >
+          预约时间：{{ orderDetail.orderStore.receiverTime.slice(0, 4) }}年{{
+            orderDetail.orderStore.receiverTime.slice(5, 7)
+          }}月{{ orderDetail.orderStore.receiverTime.slice(8, 10) }}日
+        </view>
       </view>
 
       <!-- 券码信息 -->
       <view class="info">
-        <view class="box">
+        <view class="box" @tap="toProdDetail()">
           <view class="left">
             <image mode="aspectFill" :src="fileDomain + orderDetail.orderItems[0].pic" />
             <view class="left-box">
               <text class="title">{{ orderDetail.orderItems[0].prodName }}</text>
               <!-- <text class="detail">周一至周日 到店吃</text>
               <text class="detail">随时退·过期自动退·免预约</text> -->
+              <text class="detail" v-if="orderDetail.baseOrder.prodType === 9">
+                预约时间：{{ orderDetail.orderStore.receiverTime }}
+              </text>
               <text class="detail">购买数量：{{ orderDetail.orderItems[0].prodCount }}</text>
               <view class="price-box">
                 <text class="icon">￥</text>
@@ -43,7 +57,12 @@
               </view>
             </view>
           </view>
-          <!-- <wd-icon name="chevron-right" size="22px" color="#333"></wd-icon> -->
+          <wd-icon
+            name="chevron-right"
+            size="22px"
+            color="#333"
+            v-if="orderDetail.baseOrder.prodType === 9"
+          ></wd-icon>
         </view>
 
         <view class="rectangle-with-semicircles"></view>
@@ -59,7 +78,7 @@
             >
               <view class="column">
                 <text class="title">券码信息（1张可用）</text>
-                <text class="text">{{ orderDetail.orderStore.writeOffEnd }} 到期</text>
+                <text class="text">{{ orderDetail.orderStore.writeOffEnd.slice(0, 16) }} 到期</text>
               </view>
               <view class="btn" @tap="handleRefund(orderDetail.orderStore.orderNumber)">
                 申请退款
@@ -385,7 +404,7 @@ function copyTextToClipboard(text) {
 
 const handleRefund = (item) => {
   xma.navigateTo({
-    url: `/pages/order/refund?orderNumber=${item.orderNumber}`,
+    url: `/pages/order/refund?orderNumber=${item}`,
   });
 };
 
@@ -394,6 +413,13 @@ const anotherOrder = () => {
     url: `/pages/shop/confirmOrder?prodId=${orderDetail.value.orderItems[0].prodId}&skuId=${orderDetail.value.orderItems[0].skuId}`,
   });
 };
+
+const toProdDetail = () => {
+  if (orderDetail.value.baseOrder.prodType === 5) return;
+  xma.navigateTo({
+    url: `/pages/assistingAgriculture/RouteDetails/RouteDetails?shopId=${orderDetail.value.baseOrder.shopId}&prodId=${orderDetail.value.orderItems[0].prodId}`,
+  });
+};
 </script>
 
 <style scoped lang="scss">

src/pages/order/order.vue

@@ -58,10 +58,10 @@
                   <image mode="aspectFill" :src="fileDomain + item.orderItems[0].pic" />
                   <view class="info-box">
                     <view class="text">下单时间：{{ item.createTime.slice(0, 16) }}</view>
-                    <view class="text" v-if="item.prodType === 6">
-                      预约时间：{{ item.receiverTime }}
+                    <view class="text" v-if="item.prodType === 9">
+                      预约时间：{{ item.subOrder.receiverTime }}
                     </view>
-                    <view class="text" v-else>数量：{{ item.orderItems[0].prodCount }}</view>
+                    <view class="text">数量：{{ item.orderItems[0].prodCount }}</view>
                     <view class="text">实付：￥{{ item.actualTotal }}</view>
                   </view>
                 </view>
@@ -545,7 +545,7 @@ function callShopPhone(phoneNumber) {
 }
 
 /**
- * 再来一单 商品类型，0-普通商品，5-团购，6-套餐，7-预售，8-售券
+ * 再来一单 商品类型，0-普通商品，5-团购，6-套餐，7-预售，8-售券 9-景点，10-旅游路线
  */
 const anotherOrder = (item) => {
   // 清空查询待付款状态