Merge branch 'test' into dev

pages/order/OrderDetails/index.vue

@@ -1,7 +1,7 @@
 <template>
   <view class="order-details" style="padding: 30rpx;" @click="handleBody">
     <!-- 给header上与data上加on为退款订单-->
-    <view class=" v12-pa-3 v12-white" :class="refundOrder ? 'on' : ''" style="border-radius: 20rpx;">
+    <view class=" v12-pa-3 v12-white" :class="refundOrder ? 'on' : ''" style="border-radius: 20rpx;" v-if="!isGift">
       <!-- <view class="status-img-box">
         <image class="status-img" :src="getStatusImg(orderInfo)" mode=""></image>
       </view> -->
@@ -492,7 +492,8 @@ export default {
       payPassword: null,
       webUrl: this.$VUE_APP_RESOURCES_URL,
       pageKeyId: Object.freeze('userOrderInfo'),
-      logistics: {}
+      logistics: {},
+      isGift: false
     };
   },
   computed: {
@@ -501,6 +502,9 @@ export default {
     },
     ...mapGetters(["userInfo"])
   },
+  onLoad(opts) {
+    this.isGift = !!opts.isGift
+  },
   onShow() {
     const chooseAddress = uni.getStorageSync('chooseAddress') || {}
     const addressId = chooseAddress.id || ''

pagesInn/inn/innInfoDetail.vue

@@ -309,6 +309,7 @@ export default {
         uni.hideLoading();
         this.getComment()
         this.reply = ''
+        this.currentComment = {}
         this.item.replyCount === null ? this.item.replyCount = 1 : this.item.replyCount++
       })
     },
@@ -765,6 +766,7 @@ export default {
 }
 .info-section {
   word-break: break-all;
+  min-height: 100vh;
   .info-item + .info-item {
     margin: 32rpx 0 0 0;
   }

pkg_common/views/message.vue

@@ -181,7 +181,7 @@ export default {
       }
       replyMessage(params).then(res => {
         this.fetchList() // 查询消息列表
-        uni.hideLoading
+        uni.hideLoading()
       })
 
     },

pkg_user/views/giftList.vue

@@ -403,11 +403,14 @@ export default {
       this.$refs.giftTips.showTips = true
     },
     giftItemClickHanlde(item) {
-      if (this.cateIndex === 0) return
+      console.log(item);
+      
+      // if (this.cateIndex === 0) return
       this.$yrouter.push({
         path: '/pages/order/OrderDetails/index',
         query: {
-          id: item.orderId
+          id: item.orderId,
+          isGift: 1
         }
       })
     }