MrShi
昨天 f422860fe7e521f4d252e5d77621d92d7f8dfe61
Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxinglijicun
已修改4个文件
55 ■■■■ 文件已修改
small-program/pages/delivery-order-detail/delivery-order-detail.vue 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
small-program/pages/payment-success/payment-success.vue 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
small-program/shop/pages/order-details/order-details.vue 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
small-program/shop/pages/write-off-a/write-off-a.vue 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
small-program/pages/delivery-order-detail/delivery-order-detail.vue
@@ -39,7 +39,7 @@
                            <text>{{info.depositShopName || ''}}</text>
                            <image src="/static/icon/ar_jicundian@2x.png" mode="widthFix"></image>
                        </view>
                        <text>{{info.takeUser || ''}} {{info.takePhone || ''}}</text>
                        <text>{{info.depositShopAddress || ''}} </text>
                    </view>
                    <view class="addr-item" v-if="info.type === 1">
                        <view class="ji bg1">收</view>
@@ -47,14 +47,13 @@
                            <text>{{info.takeShopName || info.takeLocation || ''}}</text>
                            <image src="/static/icon/ar_jicundian@2x.png" mode="widthFix"></image>
                        </view>
                        <text>{{info.takeUser || ''}} {{info.takePhone || ''}}</text>
                        <text>{{info.takeShopAddress || ''}}</text>
                    </view>
                </view>
                <view class="item-qrcode" v-if=" (info.type ===0 && info.status >=1 &&info.status <7) || (info.type ===1 && (info.status ===1 || (info.takeShopId && info.status ===5)))">
                    <!-- <image src="/static/image/btn_upload@2x.png" mode="widthFix"></image> -->
                    <view style="width: 360rpx; height: 360rpx;">
                        <canvas canvas-id="qrcodeCanvas" id="qrcodeCanvas" style="width: 180px; height: 180px;"></canvas>
                        <!-- <image :src="qrcodeImage" mode="widthFix"></image> -->
                    </view>
                    <text>{{info.memberVerifyCode || ''}}</text>
                    <text @tap="copyCode(info.memberVerifyCode||'')">核销码</text>
@@ -62,6 +61,14 @@
                <view class="item-x"></view>
                <view class="item-list">
                    <view class="item-list-row">
                        <view class="item-form-label">收件人</view>
                        <view class="item-form-val">{{info.takeUser || ''}}</view>
                    </view>
                    <view class="item-list-row">
                        <view class="item-form-label">收件人电话</view>
                        <view class="item-form-val">{{info.takePhone || ''}}</view>
                    </view>
                    <view class="item-list-row">
                        <view class="item-form-label">预计到店时间</view>
                        <view class="item-form-val">{{info.expectedDepositTime || ''}}</view>
                    </view>
small-program/pages/payment-success/payment-success.vue
@@ -18,7 +18,7 @@
            <view class="pickup-card">
                <text class="pickup-title">核销码</text>
                <view class="qrcode-box">
                    <canvas canvas-id="qrcodeCanvas" id="qrcodeCanvas" style="width: 100px; height: 100px;"></canvas>
                    <canvas canvas-id="qrcodeCanvas" id="qrcodeCanvas" :style="'width: '+width+'px; height:'+height+'px;'"></canvas>
                    <image class="qrcode-image" :src="qrcodeImage" mode="widthFix"></image>
                </view>
                <text class="pickup-code">{{ orderDetail.memberVerifyCode }}</text>
@@ -33,7 +33,10 @@
    export default {
        data() {
            return {
                height:100,
                width:100,
                orderId: '',
                orderDetail: null,
                qrcodeImage: ''
@@ -45,6 +48,8 @@
                title: '支付成功'
            })
            this.getOrderDetail()
            this.width = this.rpxToPx(200)
            this.height = this.rpxToPx(200)
        },
        methods: {
            async getOrderDetail() {
@@ -56,12 +61,15 @@
                    }
                }
            },
            rpxToPx(rpx) {
              return rpx * wx.getSystemInfoSync().windowWidth / 750
            },
            generateQrcode(code) {
                drawQrcode({
                    canvasId: 'qrcodeCanvas',
                    text: code,
                    width: 100,
                    height: 100,
                    width: this.width,
                    height: this.height,
                    correctLevel: 2
                })
                setTimeout(() => {
small-program/shop/pages/order-details/order-details.vue
@@ -28,7 +28,7 @@
                        <view class="addr-item-top">
                            <text>{{info.depositShopName || ''}}</text>
                        </view>
                        <text>{{info.takeUser || ''}}  </text>
                        <text>{{info.depositShopAddress || ''}}  </text>
                        <view class='addr-link' style="top: 50rpx;">
                            <image style="margin-right: 10rpx;" @click="contactPhoneDo(info.takePhone)" src="/static/icon/ic_call@2x.png" mode="widthFix"  ></image>
                            <text class=" txt-d1">联系客户</text>
@@ -39,16 +39,20 @@
                        <view class="addr-item-top">
                            <text>{{info.takeShopName || info.takeLocation || ''}}</text> 
                        </view>
                        <text>{{info.takeUser || ''}}  </text>
                    <!--     <view class='addr-link' style="top: 50rpx;">
                            <image style="margin-right: 10rpx;" @click="contactPhoneDo(info.takePhone)" src="/static/icon/ic_call@2x.png" mode="widthFix"  ></image>
                            <text class=" txt-d1">联系客户</text>
                        </view> -->
                        <text>{{info.takeShopAddress || ''}}  </text>
                    </view>
                </view>
                <view class="item-x"></view>
                <view class="item-list">
                    <view class="item-list-row">
                        <view class="item-form-label">收件人</view>
                        <view class="item-form-val">{{info.takeUser || ''}}</view>
                    </view>
                    <view class="item-list-row">
                        <view class="item-form-label">收件人电话</view>
                        <view class="item-form-val">{{info.takePhone || ''}}</view>
                    </view>
                    <view class="item-list-row">
                        <view class="item-form-label">预计到店时间</view>
                        <view class="item-form-val">{{info.expectedDepositTime || ''}}</view>
                    </view>
small-program/shop/pages/write-off-a/write-off-a.vue
@@ -19,19 +19,27 @@
                        <view class="addr-item-top">
                            <text>{{info.depositShopName || ''}}</text>
                        </view>
                        <text>{{info.takeUser || ''}}  </text>
                        <text>{{info.depositShopAddress || ''}}  </text>
                    </view>
                    <view class="addr-item" v-if="info.type === 1">
                        <view class="ji bg1">收</view>
                        <view class="addr-item-top">
                            <text>{{info.takeShopName || info.takeLocation || ''}}</text> 
                        </view>
                        <text>{{info.takeUser || ''}}  </text>
                        <text>{{info.takeShopAddress || ''}}  </text>
                    </view>
                </view>
                <view class="item-x"></view>
                <view class="item-list">
                    <view class="item-list-row">
                        <view class="item-form-label">收件人</view>
                        <view class="item-form-val">{{info.takeUser || ''}}</view>
                    </view>
                    <view class="item-list-row">
                        <view class="item-form-label">收件人电话</view>
                        <view class="item-form-val">{{info.takePhone || ''}}</view>
                    </view>
                    <view class="item-list-row">
                        <view class="item-form-label">预计到店时间</view>
                        <view class="item-form-val">{{info.expectedDepositTime || ''}}</view>
                    </view>