【修复】修复服务商品显示有效购买时间问题。

【修复】修复提货单列表缩略图错位问题。
【修复】修复服务券列表缩略图错位问题。
【新增】门店自提订单商品详情内提货码增加二维码展示功能。方便商家中心扫码核销。

CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/serviceVerification/list.vue

@@ -22,7 +22,9 @@
                     </view>
                 </view>
                 <view class="item" v-if="item.service">
-                    <view class="left"><image :src="item.service.thumbnail" mode="aspectFill"></image></view>
+                    <view class="left">
+                        <u--image :showLoading="true" :src="item.service.thumbnail" width="80px" height="80px" mode="aspectFill"></u--image>
+                    </view>
                     <view class="content">
                         <view class="title u-line-2">{{item.service.title}}</view>
                         <view class="type u-line-2">{{item.service.description}}</view>
@@ -49,9 +51,9 @@
 </template>
 
 <script>
-    
+
     export default {
-        
+
         data() {
             return {
                 page: 1,
@@ -123,5 +125,4 @@
 </script>
 
 <style lang="scss" scoped>
-
 </style>

CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/takeDelivery/list.vue

@@ -17,13 +17,15 @@
                         <u-icon name="tags" :size="20" color="rgb(94,94,94)"></u-icon>
                         <view class="coreshop-margin-left-5 coreshop-margin-right-5 coreshop-font-15 coreshop-font-weight-bold">提货码：{{item.id}}</view>
                         <view>
-                            <u-tag text="复制" type="success" size="mini"  @click="doCopyData(item.id)"/>
+                            <u-tag text="复制" type="success" size="mini" @click="doCopyData(item.id)" />
                         </view>
                     </view>
                     <view>{{item.statusName}}</view>
                 </view>
                 <view class="item" v-for="(v, k) in item.orderItems" :key="k">
-                    <view class="left"><image :src="v.imageUrl && v.imageUrl!='null' ?  v.imageUrl : '/static/images/common/empty-banner.png'" mode="aspectFill"></image></view>
+                    <view class="left">
+                        <u--image :showLoading="true" :src="v.imageUrl && v.imageUrl!='null' ?  v.imageUrl : '/static/images/common/empty-banner.png'" width="80px" height="80px" mode="aspectFill"></u--image>
+                    </view>
                     <view class="content">
                         <view class="title u-line-2">{{v.name}}</view>
                         <view class="type u-line-2">{{v.addon}}</view>
@@ -54,9 +56,9 @@
 </template>
 
 <script>
-    
+
     export default {
-        
+
         data() {
             return {
                 page: 1,

CoreCms.Net.Uni-App/CoreShop/pages/member/order/detail/detail.vue

@@ -132,10 +132,10 @@
 
                 <view class="coreshop-cell-group" v-if="isDelivery">
                     <!--<view class="coreshop-cell-item">
-                        <view class="coreshop-cell-bd-view black-text">
+                    <view class="coreshop-cell-bd-view black-text">
-                            <text class="coreshop-cell-bd-text">已发货，请注意查收</text>
+                        <text class="coreshop-cell-bd-text">已发货，请注意查收</text>
-                        </view>
+                    </view>
-                    </view>-->
+                </view>-->
                     <view class='coreshop-cell-item coreshop-padding-top-10 coreshop-padding-bottom-10' v-for="(v, k) in orderInfo.delivery" :key="k" @click="logistics(k)">
                         <view class='coreshop-cell-item-bd'>
                             <view class="coreshop-cell-bd-view">
@@ -179,7 +179,7 @@
                 </view>
                 <view class="coreshop-text-black title-view" v-if="lading.status">
                     <view class="title">提货码：</view>
-                    <view class="coreshop-text-right">
+                    <view class="coreshop-text-right"  @click="showQrcodeBox(lading.code)">
                         <text class="red-price">{{lading.code|| ''}}</text>
                     </view>
                 </view>
@@ -230,7 +230,7 @@
                         <text>{{orderInfo.invoice.taxNumber|| '无'}}</text>
                     </view>
                 </view>
-                <view class="coreshop-text-black title-view">
+                <view class="coreshop-text-black title-view" v-if="orderInfo.invoice.fileUrl">
                     <view class="title">下载发票</view>
                     <view class="coreshop-text-right coreshop-flex coreshop-justify-end">
                         <view class="coreshop-width-fit-content">
@@ -450,13 +450,17 @@
                 <u-button class='coreshop-bg-red coreshop-margin-left-10 coreshop-margin-right-10' size="mini" @click="showCustomerService(orderInfo)">查看售后</u-button>
             </view>
         </view>
+
+        <u-popup :show="show" mode="center" width="180px" height="180px" @close="close">
+            <canvas canvas-id="qrcode" style="width: 180px; height: 180px; " />
+        </u-popup>
+
     </view>
 
 </template>
 <script>
-
+    import uQRCode from '@/common/utils/uqrcode.js'
     export default {
-
         data() {
             return {
                 basics: 0,
@@ -469,6 +473,7 @@
                     status: false,
                     code: ''
                 }, //提货信息
+                show: false,
             }
         },
         onLoad(options) {
@@ -715,7 +720,7 @@
                                 _this.$refs.uToast.show({ message: '操作成功', type: 'success' })
                             },
                             fail() {
-                                _this.$u.toast('图片保存失败')
+                                _this.$u.toast('发票保存失败')
                             }
                         });
                     },
@@ -739,7 +744,7 @@
                                         _this.$refs.uToast.show({ message: '保存成功', type: 'success' })
                                     },
                                     fail() {
-                                        _this.$u.toast('图片保存失败')
+                                        _this.$u.toast('发票保存失败')
                                     }
                                 });
                             },
@@ -753,6 +758,32 @@
                     }
                 })
                 // #endif
+            },
+            close() {
+                this.show = false
+            },
+            showQrcodeBox(msg) {
+                let _this = this;
+                _this.make(msg);
+                _this.show = true;
+            },
+            make(textStr) {
+                console.log(textStr);
+                console.log(uQRCode);
+                uQRCode.make({
+                    canvasId: 'qrcode',
+                    componentInstance: this,
+                    text: textStr,
+                    size: 180,
+                    margin: 30,
+                    backgroundColor: '#ffffff',
+                    foregroundColor: '#000000',
+                    fileType: 'jpg',
+                    correctLevel: uQRCode.errorCorrectLevel.H,
+                    success: res => {
+                        console.log(res)
+                    }
+                })
             }
         }
     }

CoreCms.Net.Uni-App/CoreShop/pages/serviceGoods/details/details.vue

@@ -24,7 +24,7 @@
                 <view>剩余：{{ info.amount || '0' }} </view>
             </view>
             <view class="coreshop-text-right coreshop-time-right">
-                <view>限时秒杀</view>
+                <!--<view>限时秒杀</view>-->
                 <view class="coreshop-flex coreshop-flex-wrap coreshop-font-sm coreshop-flex-direction-row coreshop-align-center coreshop-font-12">
                     距结束剩余
                     <u-count-down :time="timestamp" autoStart millisecond @change="onChange">
@@ -87,7 +87,7 @@
                 </view>
                 <view class="coreshop-basis-8">
                     <text class="coreshop-font-12">
-                        {{info.validityStartTime}} 至 {{info.validityEndTime}}
+                        {{info.startTime}} 至 {{info.endTime}}
                     </text>
                 </view>
             </view>