Monterey hace 3 años
padre
commit
295bb49415

+ 5 - 6
src/views/home/pages/productDetails/productDetails.vue

@@ -359,11 +359,11 @@ export default {
                         }
                         this.tripList =
                             res.data.commodity.commodityJourneyInformationList;
-                        this.commentLsitAll =res.data.commodity.orderEvaluateList.map(item=>{
-                                item.rebackContent=item.rebackContent.replace(/\<img/g, '<img style="width:auto;height:auto;max-width:100%;display:block"');
-                                return item;
-                        })
-                        console.log(this.commentLsitAll)
+                        this.commentLsitAll =res.data.commodity.orderEvaluateList;
+                        //.map(item=>{
+                        //    item.rebackContent=item.rebackContent.replace(/\<img/g, '<img style="width:auto;height:auto;max-width:100%;display:block"');
+                        //    return item;
+                        //})
                         this.recommend = res.data.sameTypeList;
                         //最初评论仅显示4条
                         //清空数据
@@ -751,7 +751,6 @@ export default {
                     break;
                 }
             }
-            console.log(`选中日期:` + departureDate);
             let seatNum = 0;
             if (departureDate != "") {
                 for (let i = 0; i < seatList.length; i++) {

+ 14 - 12
src/views/personal/pages/detailTtoBePaid/detailTtoBePaid.vue

@@ -35,9 +35,10 @@
                             </van-skeleton>
                         </div>
                         <div class="discount">
+                            <!--
                             <van-skeleton :row="1" :loading="loading">
                                 <span>{{$t('detailTtoBePaid.surplus')}}{{oderData.stock}}</span>
-                            </van-skeleton>
+                            </van-skeleton>-->
                             <!-- <div class="discountBox"><span>已领取50元优惠券</span></div>
                             <div class="delBox">
                                 <van-icon name="delete-o" color="#999999" size="14" />
@@ -121,6 +122,7 @@
                             <span>{{oderData.orderNo}}</span>
                         </div>
                     </div>
+                    <!--
                     <div class="bottomCell">
                         <div>
                             <span>{{$t('detailTtoBePaid.zfbNum')}}</span>
@@ -129,7 +131,7 @@
                             <span>{{oderData.zfBtransactionNum}}</span>
                             <span id="copySpan" :data-clipboard-text="oderData.zfBtransactionNum" style="color:#999999">{{$t('detailTtoBePaid.copy')}}</span>
                         </div>
-                    </div>
+                    </div>-->
                     <div class="bottomCell">
                         <!-- 待付款详情和已退款详情为创建时间 -->
                         <template v-if="pageType==1||pageType==4">
@@ -353,7 +355,7 @@ export default {
         }
         //拿到需要展示的商品参数 接口依赖
         this.productData = this.$store.state.home.product;
-        console.log(this.$store.state.home.product, "1111111111111");
+        //console.log(this.$store.state.home.product, "1111111111111");
         this.getData();
     },
     computed: {
@@ -395,15 +397,15 @@ export default {
                             this.oderData.createTime =
                                 this.productData.createTime;
                             this.oderData.zfBtransactionNum = "ZFB2342324242";
-                            this.oderData.orderEvaluateList =
-                                res1.data.orderEvaluate.map((item) => {
-                                    item.rebackContent =
-                                        item.rebackContent.replace(
-                                            /\<img/g,
-                                            '<img style="width:auto;height:auto;max-width:100%;display:block"'
-                                        );
-                                    return item;
-                                });
+                            this.oderData.orderEvaluateList = res1.data.orderEvaluate;
+                                //res1.data.orderEvaluate.map((item) => {
+                                //    item.rebackContent =
+                                //        item.rebackContent.replace(
+                                //            /\<img/g,
+                                //            '<img style="width:auto;height:auto;max-width:100%;display:block"'
+                                //        );
+                                //    return item;
+                                //});
                             this.loading = false;
                         }
                     });

+ 7 - 1
src/views/personal/pages/integralRecord/integralRecord.vue

@@ -15,7 +15,7 @@
                     <div class="top">
 
                         <div>
-                            <template v-if="item.integralType==1||item.integralType==4||item.integralType==9">
+                            <template v-if="item.integralType==1||item.integralType==4||item.integralType==5||item.integralType==9">
                                 <!-- <div class="title"><span>{{item.commodityName}}</span></div> -->
                                 <!-- <div><span>{{$t('integralRecord.category')}}:</span><span>{{item.typeName}}</span></div>
                                 <div><span>{{$t('integralRecord.orderNum')}}:</span><span>{{item.orderNo}}</span></div> -->
@@ -27,6 +27,12 @@
                                     <div><span>{{$t('integralRecord.category')}}:</span><span>{{item.typeName}}</span></div>
                                     <div><span>{{$t('integralRecord.orderNum')}}:</span><span>{{item.orderNo}}</span></div>
                                 </template>
+                                <template v-if="item.integralType==5">
+                                    <div class="title"><span>退款积分还原</span></div>
+                                    <div><span>{{$t('integralRecord.orerName')}}:</span><span>{{item.commodityName}}</span></div>
+                                    <div><span>{{$t('integralRecord.category')}}:</span><span>{{item.typeName}}</span></div>
+                                    <div><span>{{$t('integralRecord.orderNum')}}:</span><span>{{item.orderNo}}</span></div>
+                                </template>
                             </template>
                             <template v-else>
                                 <template v-if="item.integralType==2">