小程序端和PC端bug修复

doum

5 天以前 e89688f1c058bd9c4c505a2bb891643855e50a29

小程序端和PC端bug修复

 small-program/pages/delivery-order-detail/delivery-order-detail.vue

@@ -53,7 +53,7 @@
                <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>
                        <canvas canvas-id="qrcodeCanvas" id="qrcodeCanvas":style="'width: '+width+'px; height:'+height+'px;'"></canvas>
                    </view>
                    <text>{{info.memberVerifyCode || ''}}</text>
                    <text @tap="copyCode(info.memberVerifyCode||'')">核销码</text>
@@ -348,6 +348,8 @@
        data() {
            return {
                id:null,
                height:180,
                width:180,
                info:{},
                showDone:false,
                showCancel:false,
@@ -376,6 +378,8 @@
            this.showPay=false
            this.showPhone=false
            this.getUserDetail() 
            this.width = this.rpxToPx(200)
            this.height = this.rpxToPx(200)
            this.linkItem={title:'',linkname:'',linkphone:''}
        },
        methods:{
@@ -385,6 +389,9 @@
                    urls: images  
                });
            },
            rpxToPx(rpx) {
              return rpx * wx.getSystemInfoSync().windowWidth / 750
            },
            payOrder(){
                var that = this;
                uni.showLoading({ title: '发起支付中...', mask: true })

 small-program/pages/luggage-storage/luggage-storage.vue

@@ -962,9 +962,11 @@
                        } else {
                            uni.showToast({ title: '支付失败', icon: 'none' })
                        }
                        uni.redirectTo({
                            url: '/pages/delivery-order-detail/delivery-order-detail?id=' + orderId
                        uni.setStorageSync("orderStatus",-2)
                        uni.switchTab({
                            url: '/pages/itinerary/itinerary'
                        });
						 
                    }
                })
            }

 small-program/shop/pages/login/login.vue

@@ -52,7 +52,6 @@
        },
        onLoad() {
            // 静默登录
		
            if (this.userInfo.bindShopId) {
                uni.showLoading({
                    title:'登录中...'