Authored by 邱骏

update

... ... @@ -38,9 +38,7 @@
<template #content="{detail: {miniFaultConfirm} }">
<div class="judge-content-wrapper" v-if="miniFaultConfirm">
<p class="tip">
<span :class="
miniFaultConfirm.showBtn ? '' : 'tipTextGray'
">{{ miniFaultConfirm.text }}</span>
<span :class="[miniFaultConfirm.showBtn ? '' : 'tipTextGray']">{{ miniFaultConfirm.text }}</span>
<span v-if="miniFaultConfirm.showBtn">
,请在<count-down
:leftTime="miniFaultConfirm.leftTime"
... ... @@ -107,8 +105,11 @@ export default {
stageImgUrl() {
const { stage } = this.logisticInfo;
let imgUrl = require(`../../statics/image/order/logistics_progress_${stage}@3x.png`);
console.log('imgUrl', imgUrl, typeof imgUrl);
return stage ?
require(`../../statics/image/order/logistics_progress_${stage}@3x.png`) :
imgUrl :
'';
},
detailList() {
... ... @@ -226,17 +227,20 @@ export default {
}
},
activated() {
this.copyBtn = new Clipboard(this.$refs.copy, {
text: () => {
return this.logisticInfo.wayBillCode;
}
});
this.copyBtn.on('success', () => {
this.$createToast({
txt: '复制成功',
type: 'txt'
}).show();
});
if (this.$refs.copy) {
this.copyBtn = new Clipboard(this.$refs.copy, {
text: () => {
return this.logisticInfo.wayBillCode;
}
});
this.copyBtn.on('success', () => {
this.$createToast({
txt: '复制成功',
type: 'txt'
}).show();
});
}
}
};
</script>
... ...
... ... @@ -47,7 +47,7 @@ module.exports = (req, res, next) => {
// Todo 删除 600032996 调价: 500031170 购买: 600043484
// 入住商家 50000638
// 梅 500031928
// req.user.uid = 600032996;
req.user.uid = 500031928;
res.locals.isLogin = Boolean(req.user.uid); // 用户是否登录
if (_.get(req, 'user.appSessionType') === 'miniapp') {
... ...