Uniapp/lucky_shop
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

refactor: 将项目内硬编码文本替换为多语言调用

Browse Source 
统一替换所有页面和组件中的硬编码字符串为 $lang 多语言方法调用，提升项目国际化适配能力
This commit is contained in:
ZF Sun
2026-06-22 14:04:13 +08:00
parent 46508c7d55
commit 2337e3cacf
38 changed files with 505 additions and 511 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components-diy/diy-article.vue
View File

@@ -91,12 +91,12 @@
<!-- 查看更多(仅非滚动模式显示) -->
<view class="view-more" v-if="viewMore.support && viewMore.control && list.length > 0"
:style="viewMoreStyle" @tap.stop="toListPage">
<text>{{ viewMore.text || '查看更多' }}</text>
<text>{{ viewMore.text || $lang('article.viewMore') }}</text>
<uni-icons type="arrowright" size="12" :color="viewMore.color" />
</view>
</template>
<view v-if="list.length === 0 && !loading" class="empty-placeholder">
<text class="empty-text">暂无相关文章</text>
<text class="empty-text">{{ $lang('article.noRelatedArticles') }}</text>
</view>
</view>
</view>

10
components-diy/diy-category.vue
View File

@@ -51,7 +51,7 @@
</scroll-view>
<view class="category-item-all" @tap.stop="$refs.templateFourPopup.open()">
<view class="category-item-all-wrap">
<text class="text">展开</text>
<text class="text">{{ $lang('category.expand') }}</text>
<image class="img" :src="$util.img('/public/uniapp/category/unfold.png')" mode="aspectFill" show-menu-by-longpress></image>
</view>
</view>
@@ -68,7 +68,7 @@
</view>
</scroll-view>
<view class="pack-up" @tap.stop="$refs.templateFourPopup.close()">
<text>点击收起</text>
<text>{{ $lang('category.clickToCollapse') }}</text>
<text class="iconfont icon-iconangledown-copy"></text>
</view>
</view>
@@ -102,7 +102,7 @@
@tologin="toLogin" @selectsku="selectSku($event, index)" @addCart="addCartPoint"
@loadfinish="getHeightArea"></diy-category-item>
</view>
<view class="end-tips" ref="endTips" :style="{ opacity: endTips }">已经到底了~</view>
<view class="end-tips" ref="endTips" :style="{ opacity: endTips }">{{ $lang('category.reachedBottom') }}</view>
</scroll-view>
<view class="content-wrap"
@@ -120,12 +120,12 @@
</block>
<view class="category-empty" v-else>
<image :src="$util.img('public/uniapp/category/empty.png')" mode="widthFix" show-menu-by-longpress></image>
<view class="tips">暂时没有分类哦！</view>
<view class="tips">{{ $lang('category.noCategory') }}</view>
</view>
</view>
<view class="category-empty" v-else>
<image :src="$util.img('public/uniapp/category/empty.png')" mode="widthFix" show-menu-by-longpress></image>
<view class="tips">暂时没有分类哦！</view>
<view class="tips">{{ $lang('category.noCategory') }}</view>
</view>
<!-- <view class="cart-box" v-if="(value.template == 2 || value.template == 4) && value.quickBuy && storeToken && categoryTree && categoryTree.length">

107
components-diy/diy-coupon.vue
View File

@@ -26,16 +26,16 @@
</view>
<view class="coupon-num" :style="{ color: value.moneyColor }" v-else>
<text class="coupon-size">{{ item.discount | moneyConduct }}</text>
<text class="font-size-tag coupon-sign">折</text>
<text class="font-size-tag coupon-sign">{{ $lang('coupon.discountSuffix') }}</text>
</view>
<view class="coupon-type font-size-tag" :style="{ color: value.limitColor }">
{{ item.at_least > 0 ? '满' + Number(item.at_least) + '元可用' : '无门槛优惠券' }}
{{ item.at_least > 0 ? $lang('coupon.thresholdAvailable', { amount: Number(item.at_least) }) : $lang('coupon.noThreshold') }}
</view>
</view>
<view class="coupon-get" :style="couponBtnStyle" v-if="item.useState == 0">
{{ value.btnStyle.text }}
</view>
<view class="coupon-get" :style="couponBtnStyle" v-if="parseInt(item.useState)">去使用</view>
<view class="coupon-get" :style="couponBtnStyle" v-if="parseInt(item.useState)">{{ $lang('coupon.goUse') }}</view>
</view>
</swiper-item>
@@ -61,10 +61,10 @@
</view>
<view class="coupon-num" :style="{ color: value.moneyColor }" v-else>
<text class="coupon-size">{{ item.discount | moneyConduct }}</text>
<text class="font-size-tag coupon-sign">折</text>
<text class="font-size-tag coupon-sign">{{ $lang('coupon.discountSuffix') }}</text>
</view>
<view class="coupon-type font-size-tag" :style="{ color: value.limitColor }">
{{ item.at_least > 0 ? '满' + Number(item.at_least) + '元可用' : '无门槛优惠券' }}
{{ item.at_least > 0 ? $lang('coupon.thresholdAvailable', { amount: Number(item.at_least) }) : $lang('coupon.noThreshold') }}
</view>
</view>
<view class="coupon-get" :style="couponBtnStyle" v-if="item.useState == 0">
@@ -95,20 +95,19 @@
</view>
<view class="coupon-num" :style="{ color: value.moneyColor }" v-else>
<text class="coupon-size">{{ item.discount | moneyConduct }}</text>
<text class="font-size-tag coupon-sign">折</text>
<text class="font-size-tag coupon-sign">{{ $lang('coupon.discountSuffix') }}</text>
</view>
<view class="coupon-type font-size-tag">
<text :style="{ color: value.limitColor }">{{ item.at_least > 0 ? '满' +
Number(item.at_least) + '元可用' : '无门槛优惠券' }}</text>
<view class="item-text" v-if="item.goods_type == 1">所有商品可用</view>
<view class="item-text" v-else-if="item.goods_type == 2">指定商品可用</view>
<view class="item-text" v-else-if="item.goods_type == 3">指定商品不可用</view>
<text :style="{ color: value.limitColor }">{{ item.at_least > 0 ? $lang('coupon.thresholdAvailable', { amount: Number(item.at_least) }) : $lang('coupon.noThreshold') }}</text>
<view class="item-text" v-if="item.goods_type == 1">{{ $lang('coupon.allGoodsAvailable') }}</view>
<view class="item-text" v-else-if="item.goods_type == 2">{{ $lang('coupon.designatedGoodsAvailable') }}</view>
<view class="item-text" v-else-if="item.goods_type == 3">{{ $lang('coupon.designatedGoodsUnavailable') }}</view>
</view>
<view class="coupon-get" :style="couponBtnStyle" v-if="item.useState == 0">
{{ value.btnStyle.text || '领取' }}
</view>
<view class="coupon-get" :style="couponBtnStyle" v-if="parseInt(item.useState)">去使用</view>
<view class="coupon-get" :style="couponBtnStyle" v-if="parseInt(item.useState)">{{ $lang('coupon.goUse') }}</view>
</view>
</swiper-item>
</swiper>
@@ -133,16 +132,16 @@
</view>
<view class="coupon-num" :style="{ color: value.moneyColor }" v-else>
<text class="coupon-size">{{ item.discount | moneyConduct }}</text>
<text class="font-size-tag coupon-sign">折</text>
<text class="font-size-tag coupon-sign">{{ $lang('coupon.discountSuffix') }}</text>
</view>
<view class="coupon-type font-size-tag" :style="{ color: value.limitColor }">
{{ item.at_least > 0 ? '满' + Number(item.at_least) + '元可用' : '无门槛优惠券' }}
{{ item.at_least > 0 ? $lang('coupon.thresholdAvailable', { amount: Number(item.at_least) }) : $lang('coupon.noThreshold') }}
</view>
</view>
<view class="coupon-get" :style="couponBtnStyle" v-if="item.useState == 0">
{{ value.btnStyle.text || '立即使用' }}
</view>
<view class="coupon-get" :style="couponBtnStyle" v-if="parseInt(item.useState)">去使用</view>
<view class="coupon-get" :style="couponBtnStyle" v-if="parseInt(item.useState)">{{ $lang('coupon.goUse') }}</view>
</view>
</swiper-item>
</swiper>
@@ -160,11 +159,11 @@
<view class="coupon-num" v-if="item.discount == '0.00'"
:style="{ color: value.moneyColor }">
<text class="coupon-size">{{ item.money | moneyConduct }}</text>
<text class="font-size-tag coupon-sign">元</text>
<text class="font-size-tag coupon-sign">{{ $lang('coupon.currencyUnit') }}</text>
</view>
<view class="coupon-num" v-else :style="{ color: value.moneyColor }">
<text class="coupon-size">{{ item.discount | moneyConduct }}</text>
<text class="font-size-tag coupon-sign">折</text>
<text class="font-size-tag coupon-sign">{{ $lang('coupon.discountSuffix') }}</text>
</view>
</view>
<view class="coupon-line"></view>
@@ -173,14 +172,14 @@
<view class="coupon-name" :style="{ color: value.nameColor }">{{
item.coupon_name }}</view>
<text class="coupon-least" :style="{ color: value.limitColor }"
v-if="item.at_least > 0">满{{ Number(item.at_least) }}元可用</text>
v-if="item.at_least > 0">{{ $lang('coupon.thresholdAvailable', { amount: Number(item.at_least) }) }}</text>
<text class="coupon-least" :style="{ color: value.limitColor }"
v-else>无门槛优惠券</text>
v-else>{{ $lang('coupon.noThreshold') }}</text>
</view>
<view class="coupon-get" :style="couponBtnStyle" v-if="item.useState == 0">{{
value.btnStyle.text || '立即领取' }}</view>
value.btnStyle.text || $lang('coupon.claimNow') }}</view>
<view class="coupon-get" :style="couponBtnStyle" v-if="parseInt(item.useState)">
去使用</view>
{{ $lang('coupon.goUse') }}</view>
</view>
</view>
</view>
@@ -201,32 +200,32 @@
marginLeft: couponItemHeight + 'px'
}" @tap.stop="couponAction(item, index)">
<view class="coupon-content">
<view class="price-wrap">
<text class="price" :style="{ color: value.moneyColor }">{{ (item.discount == '0.00'
? item.money : item.discount) | moneyConduct }}</text>
<text class="unit">{{ item.discount == '0.00' ? '元' : '折' }}</text>
<view class="price-wrap">
<text class="price" :style="{ color: value.moneyColor }">{{ (item.discount == '0.00'
? item.money : item.discount) | moneyConduct }}</text>
<text class="unit">{{ item.discount == '0.00' ? $lang('coupon.currencyUnit') : $lang('coupon.discountSuffix') }}</text>
</view>
<text class="text">{{ $lang('coupon.coupon') }}</text>
</view>
<text class="text">优惠券</text>
</view>
<text class="btn" v-if="item.useState == 0" :style="{
color: value.btnStyle.textColor,
backgroundColor: value.btnStyle.bgColor,
borderTopLeftRadius: value.btnStyle.aroundRadius * 2 + 'rpx',
borderBottomLeftRadius: value.btnStyle.aroundRadius * 2 + 'rpx'
}">
<text class="btn-content">{{ value.btnStyle.text }}</text>
</text>
<text class="btn" v-if="parseInt(item.useState)" :style="{
color: value.btnStyle.textColor,
backgroundColor: value.btnStyle.bgColor,
borderTopLeftRadius: value.btnStyle.aroundRadius * 2 + 'rpx',
borderBottomLeftRadius: value.btnStyle.aroundRadius * 2 + 'rpx'
}">
<text class="btn-content">去使用</text>
</text>
<text class="limit" :style="{ color: value.limitColor }"
v-if="parseFloat(item.at_least) > 0">满{{ item.at_least | moneyConduct }}元使用</text>
<text class="limit" :style="{ color: value.limitColor }" v-else>无门槛使用</text>
<text class="btn" v-if="item.useState == 0" :style="{
color: value.btnStyle.textColor,
backgroundColor: value.btnStyle.bgColor,
borderTopLeftRadius: value.btnStyle.aroundRadius * 2 + 'rpx',
borderBottomLeftRadius: value.btnStyle.aroundRadius * 2 + 'rpx'
}">
<text class="btn-content">{{ value.btnStyle.text }}</text>
</text>
<text class="btn" v-if="parseInt(item.useState)" :style="{
color: value.btnStyle.textColor,
backgroundColor: value.btnStyle.bgColor,
borderTopLeftRadius: value.btnStyle.aroundRadius * 2 + 'rpx',
borderBottomLeftRadius: value.btnStyle.aroundRadius * 2 + 'rpx'
}">
<text class="btn-content">{{ $lang('coupon.goUse') }}</text>
</text>
<text class="limit" :style="{ color: value.limitColor }"
v-if="parseFloat(item.at_least) > 0">{{ $lang('coupon.thresholdUse', { amount: item.at_least | moneyConduct }) }}</text>
<text class="limit" :style="{ color: value.limitColor }" v-else>{{ $lang('coupon.noThresholdUse') }}</text>
</view>
<div v-if="computedCouponList.length <= 2" @tap.stop="$util.redirectTo('/pages_goods/category')"
@@ -238,9 +237,9 @@
}">
<div class="coupon-content" :style="{ color: value.moneyColor }">
<span class="price">+</span>
<span class="text">暂无优惠券</span>
<span class="text">{{ $lang('coupon.noCoupon') }}</span>
</div>
<span class="limit" :style="{ color: value.limitColor }">去逛逛</span>
<span class="limit" :style="{ color: value.limitColor }">{{ $lang('coupon.goBrowse') }}</span>
</div>
</swiper-item>
</swiper>
@@ -257,25 +256,25 @@
<view class="coupon-num" v-if="item.discount == '0.00'"
:style="{ color: value.moneyColor }">
<text class="coupon-size">{{ item.money | moneyConduct }}</text>
<text class="font-size-tag coupon-sign">元</text>
<text class="font-size-tag coupon-sign">{{ $lang('coupon.currencyUnit') }}</text>
</view>
<view class="coupon-num" v-else :style="{ color: value.moneyColor }">
<text class="coupon-size">{{ item.discount | moneyConduct }}</text>
<text class="font-size-tag coupon-sign">折</text>
<text class="font-size-tag coupon-sign">{{ $lang('coupon.discountSuffix') }}</text>
</view>
</view>
<view class="coupon-type">
<text class="coupon-name" :style="{ color: value.limitColor }"
v-if="item.at_least > 0">满{{ Number(item.at_least) }}元可用</text>
<text class="coupon-name" :style="{ color: value.limitColor }" v-else>无门槛优惠券</text>
v-if="item.at_least > 0">{{ $lang('coupon.thresholdAvailable', { amount: Number(item.at_least) }) }}</text>
<text class="coupon-name" :style="{ color: value.limitColor }" v-else>{{ $lang('coupon.noThreshold') }}</text>
<view class="coupon-least" :style="{ color: value.limitColor }">有效期至{{
$util.timeStampTurnTime(item.end_time, 'yearmonthday') }}</view>
</view>
<view class="coupon-line"></view>
<view class="coupon-get" :style="couponBtnStyle" v-if="item.useState == 0">
{{ value.btnStyle.text || '立即领取' }}
{{ value.btnStyle.text || $lang('coupon.claimNow') }}
</view>
<view class="coupon-get" :style="couponBtnStyle" v-if="parseInt(item.useState)">去使用
<view class="coupon-get" :style="couponBtnStyle" v-if="parseInt(item.useState)">{{ $lang('coupon.goUse') }}
</view>
</view>
</view>

2
components-diy/diy-listmenu.vue
View File

@@ -12,7 +12,7 @@
style="border-radius:6rpx;width: 60rpx;"></image>
</view>
<view class="fui-cell-text" style="color:#333;">{{ item.title }}</view>
<view class="fui-cell-remark" style="font-size: 24rpx;">{{ lang == 'en-us' ? 'view' : '查看' }}</view>
<view class="fui-cell-remark" style="font-size: 24rpx;">{{ lang == 'en-us' ? 'view' : $lang('common.view') }}</view>
</view>
</view>
</view>

44
components-diy/diy-member-info.vue
View File

@@ -107,22 +107,22 @@
<block v-if="value.style == 1 || value.style == 2">
<view class="super-info">
<text class="icondiy icon-system-huangguan"></text>
<text>超级会员</text>
<text>{{ $lang('memberInfo.superMember') }}</text>
</view>
<view class="super-text">
<text class="see" v-if="memberInfo && memberInfo.member_level_type" @tap.stop="redirectBeforeAuth('/pages_tool/member/card')">查看特权</text>
<text class="see" v-else @tap.stop="redirectBeforeAuth('/pages_tool/member/card_buy')">会员可享更多权益</text>
<text class="see" v-if="memberInfo && memberInfo.member_level_type" @tap.stop="redirectBeforeAuth('/pages_tool/member/card')">{{ $lang('memberInfo.viewPrivilege') }}</text>
<text class="see" v-else @tap.stop="redirectBeforeAuth('/pages_tool/member/card_buy')">{{ $lang('memberInfo.memberMoreBenefit') }}</text>
<text class="iconfont icon-right"></text>
</view>
</block>
<block v-if="value.style == 3">
<view class="super-info">
<image :src="$util.img('public/uniapp/member/open_member.png')" class="title" mode="heightFix" show-menu-by-longpress/>
<view class="desc">开通可享更多权益</view>
<view class="desc">{{ $lang('memberInfo.openMoreBenefit') }}</view>
</view>
<view class="super-text">
<text class="see" v-if="memberInfo && memberInfo.member_level_type" @tap.stop="redirectBeforeAuth('/pages_tool/member/card')">查看特权</text>
<text class="see" v-else @tap.stop="redirectBeforeAuth('/pages_tool/member/card_buy')">立即开通</text>
<text class="see" v-if="memberInfo && memberInfo.member_level_type" @tap.stop="redirectBeforeAuth('/pages_tool/member/card')">{{ $lang('memberInfo.viewPrivilege') }}</text>
<text class="see" v-else @tap.stop="redirectBeforeAuth('/pages_tool/member/card_buy')">{{ $lang('memberInfo.openNow') }}</text>
</view>
</block>
</view>
@@ -131,11 +131,11 @@
<view class="super-member" v-if="superMember" :style="superMemberStyle">
<view class="super-info">
<image :src="$util.img('app/component/view/member_info/img/style_4_vip_huangguan.png')" class="title" mode="widthFix" show-menu-by-longpress/>
<view class="desc">开通可享更多权益</view>
<view class="desc">{{ $lang('memberInfo.openMoreBenefit') }}</view>
</view>
<view class="super-text" :class="{ 'more' : memberInfo && memberInfo.member_level_type }">
<text class="see" v-if="memberInfo && memberInfo.member_level_type" @tap.stop="redirectBeforeAuth('/pages_tool/member/card')">查看更多权益</text>
<text class="see" v-else @tap.stop="redirectBeforeAuth('/pages_tool/member/card_buy')">立即开通</text>
<text class="see" v-if="memberInfo && memberInfo.member_level_type" @tap.stop="redirectBeforeAuth('/pages_tool/member/card')">{{ $lang('memberInfo.viewMoreBenefit') }}</text>
<text class="see" v-else @tap.stop="redirectBeforeAuth('/pages_tool/member/card_buy')">{{ $lang('memberInfo.openNow') }}</text>
</view>
</view>
<view class="account-info" :style="{ 'margin-left': parseInt(value.infoMargin) * 2 + 'rpx', 'margin-right': parseInt(value.infoMargin) * 2 + 'rpx' }">
@@ -143,25 +143,25 @@
<view class="value price-font">
{{ memberInfo ? (parseFloat(memberInfo.balance) + parseFloat(memberInfo.balance_money)).toFixed(2) : '--' }}
</view>
<view class="title">余额</view>
<view class="title">{{ $lang('memberInfo.balance') }}</view>
</view>
<view class="solid"></view>
<view class="account-item" @tap.stop="redirect('/pages_tool/member/point_detail')">
<view class="value price-font">{{ memberInfo ? parseFloat(memberInfo.point) : '--' }}
</view>
<view class="title">积分</view>
<view class="title">{{ $lang('invite.point') }}</view>
</view>
<view class="solid"></view>
<view class="account-item" @tap.stop="redirect('/pages_tool/member/coupon')">
<view class="value price-font">
{{ memberInfo && memberInfo.coupon_num != undefined ? memberInfo.coupon_num : '--' }}
</view>
<view class="title">优惠券</view>
<view class="title">{{ $lang('member.coupon') }}</view>
</view>
</view>
<view class="style4-other">
<view class="style4-btn-wrap">
<view @tap.stop="redirect('/pages_tool/recharge/list')" class="recharge-btn">余额充值</view>
<view @tap.stop="redirect('/pages_tool/recharge/list')" class="recharge-btn">{{ $lang('memberInfo.recharge') }}</view>
</view>
</view>
</view> -->
@@ -194,13 +194,13 @@
<uni-popup ref="completeInfoPopup" type="bottom" :maskClick="false">
<view class="complete-info-wrap">
<view class="head">
<text class="title">获取您的昵称、头像</text>
<text class="color-tip tips">获取用户头像、昵称完善个人资料，主要用于向用户提供具有辨识度的用户中心界面</text>
<text class="title">{{ $lang('memberInfo.getNicknameAvatar') }}</text>
<text class="color-tip tips">{{ $lang('memberInfo.getAvatarTip') }}</text>
<text class="iconfont icon-close color-tip" @tap.stop="cancelCompleteInfo"></text>
</view>
<!-- #ifdef MP-WEIXIN -->
<view class="item-wrap">
<text class="label">头像</text>
<text class="label">{{ $lang('memberInfo.avatar') }}</text>
<button open-type="chooseAvatar" @chooseavatar="onChooseAvatar">
<image :src="avatarUrl ? avatarUrl : $util.getDefaultImage().head"
@error="avatarUrl = $util.getDefaultImage().head" mode="aspectFill" show-menu-by-longpress/>
@@ -208,13 +208,13 @@
</button>
</view>
<view class="item-wrap">
<text class="label">昵称</text>
<input type="nickname" placeholder="请输入昵称" v-model="nickName" @blur="blurNickName" />
<text class="label">{{ $lang('memberInfo.nickname') }}</text>
<input type="nickname" :placeholder="$lang('form.inputNickname')" v-model="nickName" @blur="blurNickName" />
</view>
<!-- #endif -->
<!-- #ifdef MP-ALIPAY -->
<view class="item-wrap">
<text class="label">头像</text>
<text class="label">{{ $lang('memberInfo.avatar') }}</text>
<button open-type="getAuthorize" scope="userInfo" @getAuthorize="aliappGetUserinfo"
:plain="true" class="border-0">
<image :src="avatarUrl ? avatarUrl : $util.getDefaultImage().head"
@@ -223,11 +223,11 @@
</button>
</view>
<view class="item-wrap">
<text class="label">昵称</text>
<input type="nickname" placeholder="请输入昵称" v-model="nickName" @blur="blurNickName" />
<text class="label">{{ $lang('memberInfo.nickname') }}</text>
<input type="nickname" :placeholder="$lang('form.inputNickname')" v-model="nickName" @blur="blurNickName" />
</view>
<!-- #endif -->
<button type="default" class="save-btn" @tap.stop="saveCompleteInfo" :disabled="isDisabled">保存</button>
<button type="default" class="save-btn" @tap.stop="saveCompleteInfo" :disabled="isDisabled">{{ $lang('form.save') }}</button>
</view>
</uni-popup>
</view>

17
components-diy/diy-pinfan.vue
View File

@@ -21,11 +21,11 @@
:style="{ color: value.theme == 'diy' ? value.groupStyle.bgColor : '', borderColor: value.theme == 'diy' ? value.groupStyle.bgColor : '' }">
<text class="iconfont icon-yonghu3"
:style="{ backgroundColor: value.theme == 'diy' ? value.groupStyle.bgColor : '' }"></text>
<text>{{ item.pintuan_num }}人团</text>
<text>{{ item.pintuan_num }}{{ $lang('pinfan.group') }}</text>
</view>
<view v-if="value.saleStyle.control"
:style="{ color: value.theme == 'diy' ? value.saleStyle.color : '', borderColor: value.theme == 'diy' ? value.saleStyle.color : '' }">
<text>已拼{{ item.order_num }}件</text>
<text>{{ $lang('pinfan.soldCount', { count: item.order_num }) }}</text>
</view>
</view>
<view class="price-wrap">
@@ -49,10 +49,9 @@
borderRadius: value.btnStyle.aroundRadius * 2 + 'rpx'
}">
<text class="text">{{ value.btnStyle.text }}</text>
<text class="fan" v-if="item.reward_type == 4">返{{ item.reward_type_num }}积分</text>
<text class="fan" v-if="item.reward_type == 1 || item.reward_type == 2">返￥{{
item.reward_type_num }}</text>
<text class="fan" v-if="item.reward_type == 3">返优惠券</text>
<text class="fan" v-if="item.reward_type == 4">{{ $lang('pinfan.rewardPoint', { count: item.reward_type_num }) }}</text>
<text class="fan" v-if="item.reward_type == 1 || item.reward_type == 2">{{ $lang('pinfan.rewardCash', { amount: item.reward_type_num }) }}</text>
<text class="fan" v-if="item.reward_type == 3">{{ $lang('pinfan.rewardCoupon') }}</text>
</button>
</view>
</view>
@@ -83,16 +82,16 @@
<text class="content-tuan-price"
:style="{ color: value.theme == 'diy' ? value.groupStyle.bgColor : '' }"
v-if="item.reward_type == 4">
返{{ item.reward_type_num }}积分
{{ $lang('pinfan.rewardPoint', { count: item.reward_type_num }) }}
</text>
<text class="content-tuan-price"
:style="{ color: value.theme == 'diy' ? value.groupStyle.bgColor : '' }"
v-if="item.reward_type == 1 || item.reward_type == 2">
返￥{{ item.reward_type_num }}
{{ $lang('pinfan.rewardCash', { amount: item.reward_type_num }) }}
</text>
<text class="content-tuan-price"
:style="{ color: value.theme == 'diy' ? value.groupStyle.bgColor : '' }"
v-if="item.reward_type == 3">返优惠券</text>
v-if="item.reward_type == 3">{{ $lang('pinfan.rewardCoupon') }}</text>
</view>
<view class="price-wrap" v-if="value.priceStyle.mainControl">
<text class="unit price-style small"

14
components-diy/diy-pintuan.vue
View File

@@ -26,7 +26,7 @@
</view>
<view :style="{ color: value.titleStyle.textColor }">
<text>{{ value.titleStyle.virtualNum || headData.pintuan_count }}</text>
<text>{{ value.titleStyle.style == 'style-2' ? '人参与' : '人拼团成功' }}</text>
<text>{{ value.titleStyle.style == 'style-2' ? $lang('pintuan.participate') : $lang('pintuan.groupSuccess') }}</text>
</view>
</view>
<view class="head-right"
@@ -59,11 +59,11 @@
}">
<text class="iconfont icon-yonghu3"
:style="{ backgroundColor: value.theme == 'diy' ? value.groupStyle.bgColorStart : '' }"></text>
<text>{{ item.pintuan_num }}人团</text>
<text>{{ item.pintuan_num }}{{ $lang('pintuan.group') }}</text>
</view>
<view v-if="value.saleStyle.control"
:style="{ color: value.theme == 'diy' ? value.saleStyle.color : '', borderColor: value.theme == 'diy' ? value.saleStyle.color : '' }">
<text>已拼{{ item.order_num }}件</text>
<text>{{ $lang('pintuan.soldCount', { count: item.order_num }) }}</text>
</view>
</view>
@@ -148,10 +148,10 @@
{{ '.' + item.pintuan_price.split('.')[1] }}
</text>
</view>
<view class="sale-action">去参团</view>
<view class="sale-action">{{ $lang('pintuan.joinGroup') }}</view>
</view>
<view class="sale-num" v-if="value.style == 'style-2'">已拼{{ item.sale_num }}件</view>
<view class="sale-num" v-if="value.style == 'style-2'">{{ $lang('pintuan.soldCount', { count: item.sale_num }) }}</view>
</view>
</view>
</scroll-view>
@@ -170,7 +170,7 @@
color: value.theme == 'diy' ? value.groupStyle.color : '',
background: value.theme == 'diy' ? 'linear-gradient(to right,' + value.groupStyle.bgColorStart + ',' + value.groupStyle.bgColorEnd + ')' : ''
}">
{{ item.pintuan_num }}人团
{{ item.pintuan_num }}{{ $lang('pintuan.group') }}
</view>
</view>
<view :class="['content', { 'multi-content': value.nameLineMode == 'multiple' }]"
@@ -192,7 +192,7 @@
{{ '.' + item.pintuan_price.split('.')[1] }}
</text>
</view>
<view class="sale-num" v-if="value.style == 'style-2'">已拼{{ item.sale_num }}件</view>
<view class="sale-num" v-if="value.style == 'style-2'">{{ $lang('pintuan.soldCount', { count: item.sale_num }) }}</view>
</view>
</view>
</swiper-item>

6
components-diy/diy-seckill.vue
View File

@@ -13,10 +13,10 @@
</view>
<image v-else class="title-img" :src="$util.img(value.titleStyle.leftImg)" mode="heightFix" show-menu-by-longpress/>
<text v-if="value.titleStyle.style == 'style-2' && isFuture"
:style="{ color: value.titleStyle.textColor }" class="seckill-style-name">距离开始</text>
:style="{ color: value.titleStyle.textColor }" class="seckill-style-name">{{ $lang('seckill.timeToStart') }}</text>
<view class="time" :style="{ background: value.titleStyle.timeBgColor }">
<text :style="{ color: value.titleStyle.textColor }" class="seckill-title-name text">{{ isFuture ?
'距离开始' : '距离结束' }}</text>
$lang('seckill.timeToStart') : $lang('seckill.timeToEnd') }}</text>
<text v-if="value.titleStyle.timeImageUrl"
:class="['seckill-title-name icon', value.titleStyle.timeImageUrl]"></text>
<text class="hour number" :style="titleTimeStyle">{{ seckillH ? seckillH : '00' }}</text>
@@ -87,7 +87,7 @@
</view>
<view class="price-font" v-else>
<text
:style="{ color: value.theme == 'diy' ? value.priceStyle.lineColor : '' }">原价：</text>
:style="{ color: value.theme == 'diy' ? value.priceStyle.lineColor : '' }">{{ $lang('seckill.originalPrice') }}</text>
<text :style="{ color: value.theme == 'diy' ? value.priceStyle.lineColor : '' }"
class="original-price">¥{{ item.price }}</text>
</view>

14
components-diy/diy-store.vue
View File

@@ -7,17 +7,17 @@
<block v-if="globalStoreInfo && globalStoreInfo.store_id">
<text class="title">{{ globalStoreInfo.store_name }}</text>
<text>
<text class="change margin-left">切换</text>
<text class="change margin-left">{{ $lang('store.switch') }}</text>
<text class="iconfont icon-right"></text>
</text>
</block>
<text class="title" v-else>定位中...</text>
<text class="title" v-else>{{ $lang('store.locating') }}</text>
</view>
<view class="address-wrap" :style="{ color: value.textColor }">
<text class="iconfont icon-dizhi"></text>
<text v-if="globalStoreInfo && globalStoreInfo.store_id" @tap.stop="mapRoute" class="address">{{
globalStoreInfo.show_address }}</text>
<text v-else>获取当前位置...</text>
<text v-else>{{ $lang('store.getCurrentLocation') }}</text>
</view>
</view>
<view class="store-image" @tap.stop="selectStore()">
@@ -40,11 +40,11 @@
<block v-if="globalStoreInfo && globalStoreInfo.store_id">
<text class="title">{{ globalStoreInfo.store_name }}</text>
<text>
<text class="change margin-left">切换</text>
<text class="change margin-left">{{ $lang('store.switch') }}</text>
<text class="iconfont icon-right"></text>
</text>
</block>
<text class="title" v-else>定位中...</text>
<text class="title" v-else>{{ $lang('store.locating') }}</text>
</view>
</view>
<view class="store-icon" @tap.stop="search()"><text class="iconfont icon-sousuo3"
@@ -60,10 +60,10 @@
<text class="title" :style="{ color: value.textColor }">{{ globalStoreInfo.store_name }}</text>
<text class="iconfont icon-unfold" :style="{ color: value.textColor }"></text>
</block>
<text class="title" v-else>定位中...</text>
<text class="title" v-else>{{ $lang('store.locating') }}</text>
</view>
<view class="store-right-search">
<input type="text" class="uni-input font-size-tag" disabled placeholder="商品搜索"
<input type="text" class="uni-input font-size-tag" disabled :placeholder="$lang('goods.searchGoods')"
@tap.stop="search()" />
<text class="iconfont icon-sousuo3" @tap.stop="search()"></text>
</view>

2
components-diy/diy-text.vue
View File

@@ -208,7 +208,7 @@
{{ value.text }}
</text>
<text class="zone"
:style="{ fontSize: value.fontSize * 2 + 'rpx', fontWeight: value.fontWeight }">专区</text>
:style="{ fontSize: value.fontSize * 2 + 'rpx', fontWeight: value.fontWeight }">{{ $lang('diyText.zone') }}</text>
</view>
<text class="iconfont icon-danxuan-xuanzhong"
:style="{ color: value.textColor, fontWeight: value.fontWeight }"></text>

34
components/ns-goods-sku/ns-goods-sku-category.vue
View File

@@ -13,9 +13,9 @@
goodsDetail.en_goods_name : goodsDetail.goods_name) }}</view>
<view class="other-info">
<view class="stock color-tip" v-if="goodsDetail.stock_show">
库存{{ goodsDetail.stock }}{{ goodsDetail.unit }}</view>
{{ $lang('sku.stock') }}{{ goodsDetail.stock }}{{ goodsDetail.unit }}</view>
<view class="starting-num" v-if="parseFloat(goodsDetail.min_buy)">
起售{{ goodsDetail.min_buy }}件
{{ $lang('sku.startSale') }}{{ goodsDetail.min_buy }}{{ $lang('sku.unit') }}
</view>
</view>
</view>
@@ -43,10 +43,10 @@
<view class="footer">
<view class="sku-name font-size-goods-tag">
<template v-if="goodsDetail.sku_spec_format" class="color-tip">
已选择：
<text class="color-tip" v-for="(item, index) in goodsDetail.sku_spec_format"
:key="index">{{ item.spec_value_name }}</text>
</template>
{{ $lang('sku.selectedSpec') }}
<text class="color-tip" v-for="(item, index) in goodsDetail.sku_spec_format"
:key="index">{{ item.spec_value_name }}</text>
</template>
</view>
<view class="footer-bottom">
<view class="footer-left">
@@ -72,8 +72,8 @@
<view v-else-if="number == 0 && isLoad">
<view class="num-action">
<button type="primary" v-if="goodsDetail.stock && goodsDetail.stock != 0"
@click="confirm($event)">加入购物车</button>
<button type="primary" disabled="true" v-else>确定</button>
@click="confirm($event)">{{ $lang('sku.addToCart') }}</button>
<button type="primary" disabled="true" v-else>{{ $lang('sku.confirm') }}</button>
<view class="click-event"></view>
</view>
</view>
@@ -261,7 +261,7 @@ export default {
} else {
if (this.number >= this.goodsDetail.stock) {
this.$util.showToast({
title: '库存不足'
title: this.$lang('sku.stockInsufficient')
});
return;
}
@@ -269,13 +269,13 @@ export default {
if (this.goodsDetail.is_limit == 1 && this.maxBuy > 0) {
if (this.goodsDetail.limit_type == 1) {
this.$util.showToast({
title: '该商品每次最多购买' + this.maxBuy + this.goodsDetail.unit
title: this.$lang('sku.maxBuyPerOrder') + this.maxBuy + this.goodsDetail.unit
});
return;
}
if (this.goodsDetail.limit_type == 2) {
let message = '该商品每人限购' + this.maxBuy + this.goodsDetail.unit;
let message = this.$lang('sku.maxBuyPerPerson') + this.maxBuy + this.goodsDetail.unit;
message += this.goodsDetail.purchased_num > 0 ? '，您已购买了' + this.goodsDetail.purchased_num + this.goodsDetail.unit : '';
this.$util.showToast({
title: message
@@ -375,7 +375,7 @@ export default {
}
if (this.goodsDetail.goods_state == 0) {
this.$util.showToast({
title: '商品已下架'
title: this.$lang('sku.productRemoved')
});
return;
}
@@ -385,14 +385,14 @@ export default {
this.keyInput(true, () => {
if (this.goodsDetail.stock == 0) {
this.$util.showToast({
title: '商品已售罄'
title: this.$lang('sku.productSoldOut')
});
return;
}
if (this.number > this.goodsDetail.stock) {
this.$util.showToast({
title: '库存不足'
title: this.$lang('sku.stockInsufficient')
});
return;
}
@@ -400,14 +400,14 @@ export default {
if (this.goodsDetail.is_limit == 1 && this.goodsDetail.limit_type == 1 && this.maxBuy > 0 &&
this.number > this.maxBuy) {
this.$util.showToast({
title: '该商品每次最多购买' + this.maxBuy + this.goodsDetail.unit
title: this.$lang('sku.maxBuyPerOrder') + this.maxBuy + this.goodsDetail.unit
});
return;
}
if (this.goodsDetail.is_limit == 1 && this.goodsDetail.limit_type == 2 && this.maxBuy > 0 &&
this.number + this.goodsDetail.purchased_num > this.maxBuy) {
let message = '该商品每人限购' + this.maxBuy + this.goodsDetail.unit;
let message = this.$lang('sku.maxBuyPerPerson') + this.maxBuy + this.goodsDetail.unit;
message += this.goodsDetail.purchased_num > 0 ? '，您已购买了' + this.goodsDetail.purchased_num + this.goodsDetail.unit : '';
this.$util.showToast({
title: message
@@ -456,7 +456,7 @@ export default {
this.$store.dispatch('cartCalculate');
this.$emit('refresh');
this.$util.showToast({
title: '加入购物车成功'
title: this.$lang('sku.addToCartSuccess')
});
}
this.btnSwitch = false;

6
components/ns-goods-sku/ns-goods-sku-index.vue
View File

@@ -67,13 +67,13 @@ export default {
let cart_id = cart ? cart.cart_id : 0;
if (_num > parseInt(data.stock)) {
this.$util.showToast({
title: '商品库存不足'
title: this.$lang('sku.stockInsufficient')
});
return;
}
if (data.is_limit && data.max_buy && _num > parseInt(data.max_buy)) {
this.$util.showToast({
title: `该商品每人限购${data.max_buy}${data.unit || '件'}`
title: this.$lang('sku.maxBuyPerPerson') + data.max_buy + (data.unit || this.$lang('sku.unit'))
});
return;
}
@@ -121,7 +121,7 @@ export default {
res.data;
}
this.$util.showToast({
title: "商品添加购物车成功"
title: this.$lang('sku.addToCartSuccess')
});
this.$store.commit('setCartChange');
this.$store.dispatch('cartCalculate');

104
components/ns-goods-sku/ns-goods-sku.vue
View File

@@ -19,27 +19,27 @@
<block v-if="type == 'point'">
<block v-if="goodsDetail.type == 1">
<view class="price-wrap">
<text class="price price-color font-size-toolbar">{{ goodsDetail.point }}积分</text>
<text class="price price-color font-size-toolbar">{{ goodsDetail.point }}{{ $lang('sku.point') }}</text>
<block v-if="goodsDetail.exchange_price != '0.00' && goodsDetail.pay_type > 0">
<text class="unit price-color font-size-tag">+</text>
<text class="price price-color font-size-toolbar price-font">{{ $lang('common.currencySymbol') }}{{ goodsDetail.exchange_price }}</text>
</block>
</view>
<view class="stock" v-if="goodsDetail.stock_show">
库存{{ goodsDetail.stock }}{{ goodsDetail.unit }}</view>
{{ $lang('sku.stock') }}{{ goodsDetail.stock }}{{ goodsDetail.unit }}</view>
</block>
<block v-else>
<view class="price-wrap">
<view class="price font-size-toolbar">{{ goodsDetail.name }}</view>
</view>
<view class="stock" style="height: auto;">
积分：
<text class="price-color">{{ goodsDetail.point }}</text>
</view>
<view class="stock">
库存：
<text class="color-base-text">{{ goodsDetail.stock }}{{ goodsDetail.unit }}</text>
</view>
{{ $lang('sku.point') }}：
<text class="price-color">{{ goodsDetail.point }}</text>
</view>
<view class="stock">
{{ $lang('sku.stock') }}：
<text class="color-base-text">{{ goodsDetail.stock }}{{ goodsDetail.unit }}</text>
</view>
</block>
</block>
<block v-else-if="type == 'presale'">
@@ -48,14 +48,14 @@
<text class="price price-style large">{{ parseFloat(goodsDetail.presale_deposit).toFixed(2).split('.')[0] }}</text>
<text class="unit price-style small">.{{ parseFloat(goodsDetail.presale_deposit).toFixed(2).split('.')[1] }}</text>
<view class="balance" v-if="balance > 0">
<text>尾款</text>
<text>{{ $lang('sku.tailPayment') }}</text>
<text class="unit price-color font-size-tag price-font">￥</text>
<text class="price-color price-font">{{ balance }}</text>
</view>
</view>
<view class="stock presale-stock">
<block v-if="goodsDetail.stock_show">库存{{ goodsDetail.stock }}{{ goodsDetail.unit }}
</block>
<block v-if="goodsDetail.stock_show">{{ $lang('sku.stock') }}{{ goodsDetail.stock }}{{ goodsDetail.unit }}
</block>
</view>
</block>
<block v-else>
@@ -117,11 +117,11 @@
<text class="unit price-style small" v-else>.{{ parseFloat(goodsDetail.price).toFixed(2).split('.')[1] }}</text>
</block>
</view>
<view class="stock" v-if="goodsDetail.stock_show">库存{{ goodsDetail.stock }}{{ goodsDetail.unit }}</view>
<view class="stock" v-if="goodsDetail.stock_show">{{ $lang('sku.stock') }}{{ goodsDetail.stock }}{{ goodsDetail.unit }}</view>
</block>
<view class="sku-name font-size-tag" v-if="goodsDetail.sku_spec_format">
<text class="color-tip">已选规格：</text>
<text class="color-tip">{{ $lang('sku.selectedSpec') }}</text>
<text v-for="(item, index) in goodsDetail.sku_spec_format" :key="index" class="spec-value">{{ item.spec_value_name }}</text>
</view>
</view>
@@ -135,13 +135,13 @@
<view class="sku-list-wrap" v-if="type == 'pintuan' && goodsDetail.pintuan_type == 'ladder' && !goodsDetail.group_id">
<text class="title font-size-base">&nbsp;</text>
<view class="items" :class="{ selected: pintuan_num_field == 'pintuan_num' }" @click="pintuanChange('pintuan_num')">
<text>{{ goodsDetail.pintuan_num }}人团</text>
<text>{{ goodsDetail.pintuan_num }}{{ $lang('sku.personTeam') }}</text>
</view>
<view class="items" v-if="goodsDetail.pintuan_num_2 > 0" :class="{ selected: pintuan_num_field == 'pintuan_num_2' }" @click="pintuanChange('pintuan_num_2')">
<text>{{ goodsDetail.pintuan_num_2 }}人团</text>
<text>{{ goodsDetail.pintuan_num_2 }}{{ $lang('sku.personTeam') }}</text>
</view>
<view class="items" v-if="goodsDetail.pintuan_num_3 > 0" :class="{ selected: pintuan_num_field == 'pintuan_num_3' }" @click="pintuanChange('pintuan_num_3')">
<text>{{ goodsDetail.pintuan_num_3 }}人团</text>
<text>{{ goodsDetail.pintuan_num_3 }}{{ $lang('sku.personTeam') }}</text>
</view>
</view>
@@ -158,14 +158,14 @@
<view class="number-wrap">
<view class="number-line">
<text class="title font-size-base" v-if="type == 'point'">兑换数量</text>
<text class="title font-size-base" v-else>购买数量</text>
<text class="limit-txt color-base-text" v-if="limitNumber > 0">(每人限购{{ limitNumber }}{{ goodsDetail.unit }})</text>
<text class="title font-size-base" v-if="type == 'point'">{{ $lang('sku.exchangeQuantity') }}</text>
<text class="title font-size-base" v-else>{{ $lang('sku.buyQuantity') }}</text>
<text class="limit-txt color-base-text" v-if="limitNumber > 0">({{ $lang('sku.perPersonLimit') }}{{ limitNumber }}{{ goodsDetail.unit }})</text>
<text v-if="maxBuy > 0 && minBuy > 1" class="limit-txt color-base-text">
({{ minBuy }}{{ goodsDetail.unit }}起售，限购{{ maxBuy }}{{ goodsDetail.unit }})
({{ minBuy }}{{ goodsDetail.unit }}{{ $lang('sku.startSale') }}，{{ $lang('sku.limit') }}{{ maxBuy }}{{ goodsDetail.unit }})
</text>
<text v-else-if="maxBuy > 0" class="limit-txt color-base-text">(限购{{ maxBuy }}{{ goodsDetail.unit }})</text>
<text v-else-if="minBuy > 1" class="limit-txt color-base-text">({{ minBuy }}{{ goodsDetail.unit }}起售)</text>
<text v-else-if="maxBuy > 0" class="limit-txt color-base-text">({{ $lang('sku.limit') }}{{ maxBuy }}{{ goodsDetail.unit }})</text>
<text v-else-if="minBuy > 1" class="limit-txt color-base-text">({{ minBuy }}{{ goodsDetail.unit }}{{ $lang('sku.startSale') }})</text>
<view class="number">
<button type="default" class="decrease color-line-border" :class="{ disabled: decreaseDisabled }" @click="changeNum('-')">-</button>
<input type="number" class="uni-input color-line-border font-size-goods-tag" @blur="blur" v-model="number" placeholder="0" @input="keyInput(false)" />
@@ -178,34 +178,34 @@
</scroll-view>
</view>
<view class="footer" @click="confirm()">
<button type="primary" v-if="goodsDetail.stock && goodsDetail.stock != 0 && goodsDetail.is_virtual == 0 && type == 'buy_now'" :style="{ background: themeStyle.goods_detail.goods_btn_color_shallow, color : '#fff' }" @click.stop="confirm(true)">加入购物车</button>
<button type="primary" v-if="goodsDetail.stock && goodsDetail.stock != 0 && goodsDetail.is_virtual == 0 && type == 'buy_now'" :style="{ background: themeStyle.goods_detail.goods_btn_color_shallow, color : '#fff' }" @click.stop="confirm(true)">{{ $lang('sku.addToCart') }}</button>
<block v-if="type == 'point'">
<block v-if="goodsDetail.type == 1">
<!-- 兑换商品 -->
<button v-if="goodsDetail.stock && goodsDetail.stock != 0" type="primary">兑换</button>
<button type="primary" v-else disabled="true">库存不足</button>
<button v-if="goodsDetail.stock && goodsDetail.stock != 0" type="primary">{{ $lang('sku.exchange') }}</button>
<button type="primary" v-else disabled="true">{{ $lang('sku.stockInsufficient') }}</button>
</block>
<block v-else-if="goodsDetail.type == 2 || goodsDetail.type == 3">
<!-- 兑换优惠券、红包 -->
<button type="primary">兑换</button>
<button type="primary">{{ $lang('sku.exchange') }}</button>
</block>
</block>
<block v-else-if="goodsDetail.goods_state == 1">
<button type="primary" v-if="goodsDetail.stock && goodsDetail.stock != 0 && type == 'join_cart'">加入购物车</button>
<button type="primary" v-else-if="goodsDetail.stock && goodsDetail.stock != 0 && type == 'buy_now'">立即购买</button>
<button type="primary" v-else-if="goodsDetail.stock && goodsDetail.stock != 0 && type == 'confirm'">确认</button>
<button type="primary" v-if="goodsDetail.stock && goodsDetail.stock != 0 && type == 'join_cart'">{{ $lang('sku.addToCart') }}</button>
<button type="primary" v-else-if="goodsDetail.stock && goodsDetail.stock != 0 && type == 'buy_now'">{{ $lang('sku.buyNow') }}</button>
<button type="primary" v-else-if="goodsDetail.stock && goodsDetail.stock != 0 && type == 'confirm'">{{ $lang('sku.confirm') }}</button>
<template v-else-if="goodsDetail.stock && goodsDetail.stock != 0">
<template v-if="goodsDetail.buy_num">
<button type="primary" v-if="goodsDetail.buy_num <= goodsDetail.stock">立即抢购</button>
<button type="primary" v-else disabled="true">库存不足</button>
<button type="primary" v-if="goodsDetail.buy_num <= goodsDetail.stock">{{ $lang('sku.snatchNow') }}</button>
<button type="primary" v-else disabled="true">{{ $lang('sku.stockInsufficient') }}</button>
</template>
<template v-else>
<button type="primary">立即抢购</button>
<button type="primary">{{ $lang('sku.snatchNow') }}</button>
</template>
</template>
<button type="primary" v-else disabled="true">库存不足</button>
<button type="primary" v-else disabled="true">{{ $lang('sku.stockInsufficient') }}</button>
</block>
<button type="primary" v-else disabled="true">该商品已下架</button>
<button type="primary" v-else disabled="true">{{ $lang('sku.productRemoved') }}</button>
</view>
</view>
</uni-popup-sku>
@@ -707,7 +707,7 @@
if (this.$util.inArray(this.skuId + '', this.goodsDetail.activity_sku_ids) == -1) {
this.confirmDisabled = true;
this.$util.showToast({
title: '该规格未参与打包一口价活动'
title: this.$lang('sku.specNotInCombo')
});
} else {
this.confirmDisabled = false;
@@ -771,7 +771,7 @@
if (this.$util.inArray(skuId + '', this.goodsDetail.activity_sku_ids) == -1) {
this.confirmDisabled = true;
this.$util.showToast({
title: '该规格未参与打包一口价活动'
title: this.$lang('sku.specNotInCombo')
});
} else {
this.confirmDisabled = false;
@@ -850,7 +850,7 @@
} else {
if (this.number >= this.goodsDetail.stock) {
this.$util.showToast({
title: '库存不足'
title: this.$lang('sku.stockInsufficient')
});
return;
}
@@ -858,13 +858,13 @@
if (this.goodsDetail.is_limit == 1 && this.maxBuy > 0) {
if (this.goodsDetail.limit_type == 1) {
this.$util.showToast({
title: '该商品每次最多购买' + this.maxBuy + this.goodsDetail.unit
title: this.$lang('sku.maxBuyPerOrder') + this.maxBuy + this.goodsDetail.unit
});
return;
}
if (this.goodsDetail.limit_type == 2) {
let message = '该商品每人限购' + this.maxBuy + this.goodsDetail.unit;
let message = this.$lang('sku.maxBuyPerPerson') + this.maxBuy + this.goodsDetail.unit;
message += this.goodsDetail.purchased_num > 0 ? '，您已购买了' + this.goodsDetail.purchased_num + this.goodsDetail.unit : '';
this.$util.showToast({
title: message
@@ -875,14 +875,14 @@
if (this.type == 'seckill' && this.goodsDetail.seckill_id && this.goodsDetail.num > 0) {
this.$util.showToast({
title: '该商品每人限购' + this.goodsDetail.num + this.goodsDetail.unit
title: this.$lang('sku.maxBuyPerPerson') + this.goodsDetail.num + this.goodsDetail.unit
});
return;
}
if (this.type == 'presale' && this.goodsDetail.presale_id && this.goodsDetail.presale_num > 0) {
this.$util.showToast({
title: '该商品每人限购' + this.goodsDetail.presale_num + this.goodsDetail.unit
title: this.$lang('sku.maxBuyPerPerson') + this.goodsDetail.presale_num + this.goodsDetail.unit
});
return;
}
@@ -894,7 +894,7 @@
} else {
if (this.minBuy > 1) {
this.$util.showToast({
title: '该商品' + this.minBuy + this.goodsDetail.unit + '起售'
title: this.$lang('sku.minBuyStart') + this.minBuy + this.goodsDetail.unit + this.$lang('sku.startSale')
});
}
return;
@@ -982,7 +982,7 @@
uni.removeStorageSync('delivery');
if (this.preview) {
this.$util.showToast({
title: '预览商品无法购买'
title: this.$lang('sku.previewCannotBuy')
});
return;
}
@@ -997,42 +997,42 @@
this.keyInput(true, () => {
if (this.goodsDetail.stock == 0) {
this.$util.showToast({
title: '商品已售罄'
title: this.$lang('sku.productSoldOut')
});
return;
}
if (this.number.length == 0 || this.number <= 0) {
this.$util.showToast({
title: '购买数量不能小于等于0'
title: this.$lang('sku.quantityMustBePositive')
});
return;
}
if (this.goodsDetail.buy_num > this.goodsDetail.stock) {
this.$util.showToast({
title: '库存小于最低购买数量'
title: this.$lang('sku.stockLessThanMin')
});
return;
}
if (this.number > this.goodsDetail.stock) {
this.$util.showToast({
title: '库存不足'
title: this.$lang('sku.stockInsufficient')
});
return;
}
if (this.goodsDetail.is_limit == 1 && this.goodsDetail.limit_type == 1 && this.maxBuy > 0 && this.number > this.maxBuy) {
this.$util.showToast({
title: '该商品每次最多购买' + this.maxBuy + this.goodsDetail.unit
title: this.$lang('sku.maxBuyPerOrder') + this.maxBuy + this.goodsDetail.unit
});
return;
}
if (this.goodsDetail.is_limit == 1 && this.goodsDetail.limit_type == 2 && this.maxBuy > 0 &&
this.number + this.goodsDetail.purchased_num > this.maxBuy) {
let message = '该商品每人限购' + this.maxBuy + this.goodsDetail.unit;
let message = this.$lang('sku.maxBuyPerPerson') + this.maxBuy + this.goodsDetail.unit;
message += this.goodsDetail.purchased_num > 0 ? '，您已购买了' + this.goodsDetail.purchased_num + this.goodsDetail.unit : '';
this.$util.showToast({
title: message
@@ -1042,7 +1042,7 @@
if ((this.type == 'join_cart' || isJoinCartBtn) && this.goodsDetail.is_limit == 1 && this.maxBuy > 0 && this.cartNum + this.number > this.maxBuy) {
this.$util.showToast({
title: '该商品每人限购' + this.maxBuy + this.goodsDetail.unit
title: this.$lang('sku.maxBuyPerPerson') + this.maxBuy + this.goodsDetail.unit
});
return;
}
@@ -1070,7 +1070,7 @@
var data = res.data;
if (data > 0) {
this.$util.showToast({
title: '加入购物车成功'
title: this.$lang('sku.addToCartSuccess')
});
this.cartNum += this.number;

8
components/ns-payment/ns-payment.vue
View File

@@ -392,10 +392,10 @@ export default {
fail: res => {
this.flag = false;
if (res.errMsg == 'requestOrderPayment:fail cancel') {
this.$util.showToast({ title: '您已取消支付' });
this.$util.showToast({ title: this.$lang('payment.payCancel') });
} else {
uni.showModal({
content: '支付失败,失败原因: ' + res.errMsg,
content: this.$lang('payment.payFail') + ', ' + this.$lang('payment.errorReason') + res.errMsg,
showCancel: false
});
}
@@ -428,10 +428,10 @@ export default {
fail: res => {
this.flag = false;
if (res.errMsg == 'requestPayment:fail cancel') {
this.$util.showToast({ title: '您已取消支付' });
this.$util.showToast({ title: this.$lang('payment.payCancel') });
} else {
uni.showModal({
content: '支付失败,失败原因: ' + res.errMsg,
content: this.$lang('payment.payFail') + ', ' + this.$lang('payment.errorReason') + res.errMsg,
showCancel: false
});
}

8
components/payment/payment.vue
View File

@@ -378,12 +378,12 @@
this.flag = false;
if (res.errMsg == 'requestOrderPayment:fail cancel') {
this.$util.showToast({
title: '您已取消支付'
title: this.$lang('payment.payCancel')
});
this.resetpay();
} else {
uni.showModal({
content: '支付失败,失败原因: ' + res.errMsg,
content: this.$lang('payment.payFail') + ', ' + this.$lang('payment.errorReason') + res.errMsg,
showCancel: false
});
setTimeout(() => {
@@ -406,12 +406,12 @@
this.flag = false;
if (res.errMsg == 'requestPayment:fail cancel') {
this.$util.showToast({
title: '您已取消支付'
title: this.$lang('payment.payCancel')
});
this.resetpay();
} else {
uni.showModal({
content: '支付失败,失败原因: ' + res.errMsg,
content: this.$lang('payment.payFail') + ', ' + this.$lang('payment.errorReason') + res.errMsg,
showCancel: false
});
setTimeout(() => {

2
components/privacy-popup/privacy-popup.vue
View File

@@ -250,7 +250,7 @@ export default {
uni.setStorageSync('privacyAgreed', true);
uni.showModal({
content: '未同意隐私协议，无法使用相关功能',
content: this.$lang('privacy.noAgreementTip'),
success: () => {
this.$emit('disagree')
}

4
components/wxwork-contact/wxwork-contact.vue
View File

@@ -165,7 +165,7 @@
path: `pages/contacts/externalContactDetail?url=${encodeURIComponent(contactUrl)}`,
success: () => {
this.$util.showToast({
title: '跳转成功',
title: this.$lang('wxwork.jumpSuccess'),
icon: 'success'
});
},
@@ -199,7 +199,7 @@
*/
showError(message) {
uni.showModal({
title: '提示',
title: this.$lang('common.tip'),
content: message,
showCancel: false
});

18
pages/index/index.vue
View File

@@ -13,7 +13,7 @@
<text>{{ followOfficialAccount.welcomeMsg }}</text>
</view>
</view>
<view class="dite-button" @click="officialAccountsOpen">{{ isEnEnv ? 'Follow Official Account' : '关注公众号'
<view class="dite-button" @click="officialAccountsOpen">{{ $lang('index.followOfficialAccount')
}}</view>
</view>
@@ -44,7 +44,7 @@
<uni-popup ref="uniPopupWindow" type="center" class="wap-floating" :maskClick="false">
<view class="small-bot">
<!-- <view class="adver-time" wx:if="{{startadv.params.style=='default'&&startadv.params.canclose==1}}">
<view bindtap="adverclose">跳过</view>
<view bindtap="adverclose">{{ $lang('common.skip') }}</view>
<view class="time">{{clock}}s</view>
</view>
<view class="adver-time" wx:if="{{startadv.params.style=='default'&&startadv.params.canclose==0}}">
@@ -86,7 +86,7 @@
<uni-popup ref="officialAccountsPopup" type="center">
<view class="official-accounts-wrap">
<image class="content" :src="$util.img(wechatQrcode)" mode="aspectFit" show-menu-by-longpress></image>
<text class="desc">关注了解更多</text>
<text class="desc">{{ $lang('index.followToLearnMore') }}</text>
<text class="close iconfont icon-round-close" @click="officialAccountsClose"></text>
</view>
</uni-popup>
@@ -97,7 +97,7 @@
<view v-if="showTip" class="collectPopupWindow"
:style="{ marginTop: (collectTop + statusBarHeight) * 2 + 'rpx' }">
<image :src="$util.img('public/uniapp/index/collect2.png')" mode="aspectFit" show-menu-by-longpress/>
<text @click="closeCollectPopupWindow">我知道了</text>
<text @click="closeCollectPopupWindow">{{ $lang('index.iKnow') }}</text>
</view>
</uni-popup>
@@ -105,18 +105,18 @@
<view @touchmove.prevent.stop class="choose-store">
<uni-popup ref="chooseStorePopup" type="center" :maskClick="false" class="choose-store">
<view class="choose-store-popup">
<view class="head-wrap" @click="closeChooseStorePopup">请确认门店</view>
<view class="head-wrap" @click="closeChooseStorePopup">{{ $lang('index.confirmStore') }}</view>
<view class="position-wrap">
<text class="iconfont icon-dizhi"></text>
<text class="address">{{ currentPosition }}</text>
<view class="reposition" @click="reposition"
v-if="globalStoreConfig && globalStoreConfig.is_allow_change == 1">
<text class="iconfont icon-dingwei"></text>
<text>重新定位</text>
<text>{{ $lang('index.reposition') }}</text>
</view>
</view>
<view class="store-wrap" v-if="nearestStore">
<text class="tag">当前门店</text>
<text class="tag">{{ $lang('index.currentStore') }}</text>
<view class="store-name">{{ nearestStore.store_name }}</view>
<view class="address">{{ nearestStore.show_address }}</view>
<view class="distance" v-if="nearestStore.distance">
@@ -127,10 +127,10 @@
'm' }}</text>
</view>
</view>
<button type="primary" @click="enterStore">确认进入</button>
<button type="primary" @click="enterStore">{{ $lang('index.confirmEnter') }}</button>
<view class="other-store" @click="chooseOtherStore"
v-if="globalStoreConfig && globalStoreConfig.is_allow_change == 1">
<text>选择其他门店</text>
<text>{{ $lang('index.selectOtherStore') }}</text>
<text class="iconfont icon-right"></text>
</view>
</view>

2
pages_goods/_components/goods-detail-view/goods-detail-view.vue
View File

@@ -72,7 +72,7 @@
<text class="iconfont icon-right"></text>
</block>
<block v-else>
<view class="box">未配置</view>
<view class="box">{{ $lang('goods.notConfigured') }}</view>
</block>
</view>

28
pages_goods/_components/ns-goods-promotion/ns-goods-promotion.vue
View File

@@ -3,45 +3,45 @@
<view class="ns-goods-promotion" v-if="goodsPromotion.length">
<view v-for="(item, index) in goodsPromotion" v-if="promotion != item.promotion_type" :key="index">
<view v-if="item.promotion_type == 'discount'" class="item" @click="redirectTo('/pages_goods/detail', { goods_id: item.goods_id })">
<text class="promotion-mark ">限时折扣</text>
<text class="title">当前商品正在参加{{ item.promotion_name }}</text>
<text class="promotion-mark ">{{ $lang('promotion.limitedTimeDiscount') }}</text>
<text class="title">{{ $lang('promotion.participating', { name: item.promotion_name }) }}</text>
<text class="iconfont icon-right"></text>
<!-- <view class="img-wrap"><image :src="$util.img('public/uniapp/goods/detail_more.png')" mode="aspectFit" show-menu-by-longpress/></view> -->
</view>
<view v-else-if="item.promotion_type == 'groupbuy'" class="item" @click="redirectTo('/pages_promotion/groupbuy/detail', { groupbuy_id: item.groupbuy_id })">
<!-- <view v-else-if="item.promotion_type == 'groupbuy'" class="item" @click="redirectTo('/pages_promotion/groupbuy/detail', { id: item.groupbuy_id })"> -->
<text class="promotion-mark ">团购</text>
<text class="title">当前商品正在参加{{ item.promotion_name }}</text>
<text class="promotion-mark ">{{ $lang('promotion.groupbuy') }}</text>
<text class="title">{{ $lang('promotion.participating', { name: item.promotion_name }) }}</text>
<text class="iconfont icon-right"></text>
<!-- <view class="img-wrap"><image :src="$util.img('public/uniapp/goods/detail_more.png')" mode="aspectFit" show-menu-by-longpress/></view> -->
</view>
<view v-else-if="item.promotion_type == 'pintuan'" class="item" @click="redirectTo('/pages_promotion/pintuan/detail', { pintuan_id: item.pintuan_id })">
<text class="promotion-mark ">拼团</text>
<text class="title">当前商品正在参加{{ item.promotion_name }}</text>
<text class="promotion-mark ">{{ $lang('promotion.pintuan') }}</text>
<text class="title">{{ $lang('promotion.participating', { name: item.promotion_name }) }}</text>
<text class="iconfont icon-right"></text>
<!-- <view class="img-wrap"><image :src="$util.img('public/uniapp/goods/detail_more.png')" mode="aspectFit" show-menu-by-longpress/></view> -->
</view>
<view v-else-if="item.promotion_type == 'seckill'" class="item" @click="redirectTo('/pages_promotion/seckill/detail', { seckill_id: item.id })">
<text class="promotion-mark ">秒杀</text>
<text class="title">当前商品正在参加{{ item.promotion_name }}</text>
<text class="promotion-mark ">{{ $lang('promotion.seckill') }}</text>
<text class="title">{{ $lang('promotion.participating', { name: item.promotion_name }) }}</text>
<text class="iconfont icon-right"></text>
<!-- <view class="img-wrap"><image :src="$util.img('public/uniapp/goods/detail_more.png')" mode="aspectFit" show-menu-by-longpress/></view> -->
</view>
<view v-else-if="item.promotion_type == 'topic'" class="item" @click="redirectTo('/pages_promotion/topics/goods_detail', { id: item.id })">
<text class="promotion-mark ">专题活动</text>
<text class="title">当前商品正在参加{{ item.promotion_name }}</text>
<text class="promotion-mark ">{{ $lang('promotion.topicActivity') }}</text>
<text class="title">{{ $lang('promotion.participating', { name: item.promotion_name }) }}</text>
<text class="iconfont icon-right"></text>
<!-- <view class="img-wrap"><image :src="$util.img('public/uniapp/goods/detail_more.png')" mode="aspectFit" show-menu-by-longpress/></view> -->
</view>
<view v-else-if="item.promotion_type == 'bargain'" class="item" @click="redirectTo('/pages_promotion/bargain/detail', { b_id: item.bargain_id })">
<text class="promotion-mark ">砍价</text>
<text class="title">当前商品正在参加{{ item.promotion_name }}</text>
<text class="promotion-mark ">{{ $lang('promotion.bargain') }}</text>
<text class="title">{{ $lang('promotion.participating', { name: item.promotion_name }) }}</text>
<text class="iconfont icon-right"></text>
<!-- <view class="img-wrap"><image :src="$util.img('public/uniapp/goods/detail_more.png')" mode="aspectFit" show-menu-by-longpress/></view> -->
</view>
<view v-else-if="item.promotion_type == 'pinfan'" class="item" @click="redirectTo('/pages_promotion/pinfan/detail', { pinfan_id: item.pintuan_id })">
<text class="promotion-mark ">拼团返利</text>
<text class="title">当前商品正在参加{{ item.promotion_name }}</text>
<text class="promotion-mark ">{{ $lang('promotion.pinfan') }}</text>
<text class="title">{{ $lang('promotion.participating', { name: item.promotion_name }) }}</text>
<text class="iconfont icon-right"></text>
</view>
</view>

62
pages_goods/cart.vue
View File

@@ -5,7 +5,7 @@
:refresher-triggered="refresherTriggered" @refresherrefresh="onRefresh">
<block v-if="hasData">
<view class="cart-header" v-if="cartData.length">
<view class="num-wrap">共{{ cartData[0].cartList.length }}种商品</view>
<view class="num-wrap">{{ $lang('cart.totalTypes') }}{{ cartData[0].cartList.length }}{{ $lang('cart.types') }}</view>
<view class="cart-action" @click="changeAction">
{{ isAction ? $lang('complete') : $lang('edit') }}
</view>
@@ -13,11 +13,11 @@
<view class="cart-wrap" v-for="(siteItem, siteIndex) in cartData" :key="siteIndex">
<view class="coupon-use-tips" v-if="discount.coupon_info">
<view>
<text class="title color-base-text">优惠券</text>
<text class="desc">领券结算最高可减{{ discount.coupon_info.coupon_money | moneyFormat }}元</text>
<text class="title color-base-text">{{ $lang('cart.coupon') }}</text>
<text class="desc">{{ $lang('cart.couponDesc') }}{{ discount.coupon_info.coupon_money | moneyFormat }}{{ $lang('sku.unit') }}</text>
</view>
<view class="color-base-text" @click="$refs.couponPopup.open()">
点击{{ discount.coupon_info.receive_type == 'wait' ? '领取' : '查看' }}
{{ $lang('cart.click') }}{{ discount.coupon_info.receive_type == 'wait' ? $lang('goods.receive') : $lang('cart.view') }}
<text class="iconfont icon-right"></text>
</view>
</view>
@@ -120,10 +120,10 @@
@limit="goodsLimit($event, { siteIndex, cartIndex })" />
</view>
<view class="discount-wrap" v-if="manjian && manjian['sku_' + item.sku_id]">
<text class="discount-tag">满减</text>
<text class="discount-tag">{{ $lang('goods.fullReduce') }}</text>
<scroll-view scroll-x="true" class="scroll-view">
<block v-for="(mitem, key) in manjian['sku_' + item.sku_id]" :key="key">
<text v-if="mitem.discount_money">{{ Number(mitem.limit) }}减{{
<text v-if="mitem.discount_money">{{ $lang('goods.full') }}{{ Number(mitem.limit) }}{{ $lang('goods.minus') }}{{
mitem.discount_money }}</text>
<text class="interval" v-if="mitem.discount_money"></text>
</block>
@@ -140,9 +140,9 @@
<view class="cart-wrap invalid" v-if="invalidGoods.length">
<view class="cart-header">
<view class="num-wrap">
<text class="font-size-base">失效商品{{ invalidGoods.length }}件</text>
<text class="font-size-base">{{ $lang('cart.invalidGoodsCount', { count: invalidGoods.length }) }}</text>
</view>
<view class="cart-action color-base-text" @click="clearInvalidGoods">清空</view>
<view class="cart-action color-base-text" @click="clearInvalidGoods">{{ $lang('cart.clear') }}</view>
</view>
<block v-for="(goodsItem, goodsIndex) in invalidGoods" :key="goodsIndex">
<view class="cart-goods invalid-goods">
@@ -189,7 +189,7 @@
</template>
</text>
</view>
<text class="invalid-mark">已失效</text>
<text class="invalid-mark">{{ $lang('cart.invalid') }}</text>
</view>
</view>
</view>
@@ -199,7 +199,7 @@
</block>
<block v-else>
<view class="cart-empty">
<ns-empty text="购物车为空" subText="赶紧去逛逛, 购买心仪的商品吧" :isIndex="Boolean(storeToken)"
<ns-empty :text="$lang('cart.emptyCart')" :subText="$lang('cart.emptyDesc')" :isIndex="Boolean(storeToken)"
:emptyBtn="{ text: $lang('toGoodsCategoryPage'), url: '/pages_goods/category' }"></ns-empty>
<button type="primary" size="mini" class="button mini" v-if="!storeToken" @click="toLogin">{{
$lang('toLogin')
@@ -218,26 +218,26 @@
<uni-popup ref="discountPopup" custom-class="uni-popup-discount" type="bottom">
<view class="discount-popup popup" v-if="Object.keys(discount).length">
<view class="popup-header">
<text class="tit">优惠明细</text>
<text class="tit">{{ $lang('cart.discountDetail') }}</text>
<text class="iconfont icon-close" @click="toggleDiscountPopup"></text>
</view>
<view class="popup-body" :class="{ 'safe-area': isIphoneX }" @click="toggleDiscountPopup">
<view class="detail-item">
<view class="title">商品总额</view>
<view class="money price-font">￥{{ discount.goods_money | moneyFormat }}</view>
<view class="title">{{ $lang('cart.goodsTotal') }}</view>
<view class="money price-font">{{ $lang('common.currencySymbol') }}{{ discount.goods_money | moneyFormat }}</view>
</view>
<view class="detail-item" v-if="discount.coupon_money > 0">
<view class="title">优惠券</view>
<view class="money price-font reduce">-￥{{ discount.coupon_money | moneyFormat }}</view>
<view class="title">{{ $lang('goods.coupon') }}</view>
<view class="money price-font reduce">-{{ $lang('common.currencySymbol') }}{{ discount.coupon_money | moneyFormat }}</view>
</view>
<view class="detail-item" v-if="discount.promotion_money > 0">
<view class="title">满减</view>
<view class="money reduce price-font">-￥{{ discount.promotion_money | moneyFormat }}
<view class="title">{{ $lang('goods.fullReduce') }}</view>
<view class="money reduce price-font">-{{ $lang('common.currencySymbol') }}{{ discount.promotion_money | moneyFormat }}
</view>
</view>
<view class="detail-item total">
<view class="title">合计</view>
<view class="money price-font ">￥{{ discount.order_money | moneyFormat }}</view>
<view class="title">{{ $lang('cart.total') }}</view>
<view class="money price-font ">{{ $lang('common.currencySymbol') }}{{ discount.order_money | moneyFormat }}</view>
</view>
</view>
<view :style="{ height: tabBarHeight }"></view>
@@ -247,7 +247,7 @@
<uni-popup ref="couponPopup" custom-class="uni-popup-discount" type="bottom" v-if="discount.coupon_info">
<view class="coupon-popup popup">
<view class="popup-header">
<text class="tit">优惠券</text>
<text class="tit">{{ $lang('goods.coupon') }}</text>
<text class="iconfont icon-close" @click="$refs.couponPopup.close()"></text>
</view>
<view class="popup-body" :class="{ 'safe-area': isIphoneX }" @click="$refs.couponPopup.close()">
@@ -264,14 +264,14 @@
</template>
<template v-else-if="discount.coupon_info.type == 'discount'">
<text class="money">{{ parseFloat(discount.coupon_info.discount) }}</text>
<text class="unit">折</text>
<text class="unit">{{ $lang('coupon.discountSuffix') }}</text>
</template>
<view class="at-least">
<template v-if="discount.coupon_info.at_least > 0">
满{{ discount.coupon_info.at_least }}可用
{{ $lang('goods.full') }}{{ discount.coupon_info.at_least }}{{ $lang('goods.usable') }}
</template>
<template v-else>
无门槛
{{ $lang('goods.noThreshold') }}
</template>
</view>
</view>
@@ -281,23 +281,23 @@
<view
v-if="discount.coupon_info.type == 'discount' && discount.coupon_info.discount_limit > 0"
class="limit">
最多可抵￥{{ discount.coupon_info.discount_limit }}
{{ $lang('cart.maxDeduct') }}{{ $lang('common.currencySymbol') }}{{ discount.coupon_info.discount_limit }}
</view>
<view class="time font-size-goods-tag"
v-if="discount.coupon_info.validity_type == 0">
有效期：{{ $util.timeStampTurnTime(discount.coupon_info.end_time) }}
{{ $lang('form.validityPeriod') }}{{ $util.timeStampTurnTime(discount.coupon_info.end_time) }}
</view>
<view class="time font-size-goods-tag"
v-else-if="discount.coupon_info.validity_type == 1">
有效期：领取之日起{{ discount.coupon_info.fixed_term }}天内有效
{{ $lang('cart.validFromReceive') }}{{ discount.coupon_info.fixed_term }}{{ $lang('cart.daysValid') }}
</view>
<view class="time font-size-goods-tag" v-else>有效期：长期有效</view>
<view class="time font-size-goods-tag" v-else>{{ $lang('cart.longTermValid') }}</view>
</view>
<button type="primary" v-if="discount.coupon_info.receive_type != 'wait'"
disabled>已领取</button>
disabled>{{ $lang('goods.received') }}</button>
<button type="primary" v-else
@click.stop="receiveCoupon(discount.coupon_info.coupon_type_id)">领取</button>
@click.stop="receiveCoupon(discount.coupon_info.coupon_type_id)">{{ $lang('goods.receive') }}</button>
</view>
</view>
</view>
@@ -329,7 +329,7 @@
</block>
</view>
<view class="detail" @click="toggleDiscountPopup" v-if="Object.keys(discount).length">
优惠明细
{{ $lang('cart.discountDetail') }}
<text class="iconfont icon-unfold" :class="{ open: !discountPopupShow }"></text>
</view>
</view>
@@ -338,7 +338,7 @@
</view>
<view class="action-btn" v-else>
<button type="primary" size="mini" class="mini" @click="settlement" v-if="totalCount != 0">
{{ discount.coupon_info && discount.coupon_info.receive_type == 'wait' ? '领券' : '立即' }}结算({{
{{ discount.coupon_info && discount.coupon_info.receive_type == 'wait' ? $lang('cart.receiveCouponSettle') : $lang('cart.settleNow') }}({{
totalCount }})
</button>
<button type="primary" size="mini" class="mini" @click="settlement" disabled v-else>{{

64
pages_goods/detail.vue
View File

@@ -14,13 +14,13 @@
<view class="price-info">
<view class="icon-box"><text class="iconfont icon-tutechan"></text></view>
<view class="price-box">
<view class="promotion-text">限时折扣</view>
<view class="sale-num" v-if="goodsSkuDetail.sale_show">已售{{ goodsSkuDetail.sale_num }}{{ goodsSkuDetail.unit }}</view>
<view class="promotion-text">{{ $lang('goods.limitedTimeDiscount') }}</view>
<view class="sale-num" v-if="goodsSkuDetail.sale_show">{{ $lang('goods.sold') }}{{ goodsSkuDetail.sale_num }}{{ goodsSkuDetail.unit }}</view>
</view>
</view>
<view class="countdown">
<view class="txt">距结束仅剩</view>
<view class="txt">{{ $lang('goods.endsIn') }}</view>
<view class="clockrun">
<uni-count-down
:day="goodsSkuDetail.discountTimeMachine.d"
@@ -52,7 +52,7 @@
<image :src="$util.img('public/uniapp/goods/member_vip.png')" mode="aspectFit" show-menu-by-longpress/>
</view>
<view class="member-price-wrap" v-if="!goodsSkuDetail.market_price_show">
<text class="unit price-font">原价</text>
<text class="unit price-font">{{ $lang('goods.originalPrice') }}</text>
<text class="unit price-font">{{ $lang('common.currencySymbol') }}</text>
<text class="money price-font">{{ goodsSkuDetail.price }}</text>
</view>
@@ -192,7 +192,7 @@
</view>
<view class="item free" v-if="manjian.rule_json !== null && addonIsExist.manjian" @click="openManjianPopup()">
<view class="label">促销</view>
<text class="free-tip color-base-text">满减</text>
<text class="free-tip color-base-text">{{ $lang('goods.fullReduce') }}</text>
<text class="font-size-base value">{{ manjian.manjian_name }}</text>
<text class="iconfont icon-right"></text>
</view>
@@ -217,7 +217,7 @@
<view class="group-wrap" @click="openBundlingPopup()">
<view class="goods-cell" @click="openBundlingPopup()">
<view class="box">
<text class="tit">组合套餐</text>
<text class="tit">{{ $lang('goods.comboMeal') }}</text>
<text>{{ bundling[0].bl_name }}</text>
</view>
<text class="iconfont icon-right"></text>
@@ -257,7 +257,7 @@
<uni-popup ref="bundlingPopup" type="bottom">
<view class="bundling-popup-layer popup-layer">
<view class="head-wrap" @click="closeBundlingPopup()">
<text>组合套餐</text>
<text>{{ $lang('goods.comboMeal') }}</text>
<text class="iconfont icon-close"></text>
</view>
<scroll-view scroll-y class="bundling-body">
@@ -297,10 +297,10 @@
</view>
</scroll-view>
<view class="bundling-price-wrap">
<text class="label">套餐价</text>
<text class="label">{{ $lang('goods.comboPrice') }}</text>
<text class="unit price-color">{{ $lang('common.currencySymbol') }}</text>
<text class="price price-color">{{ item.bl_price }}</text>
<button type="primary" size="mini" class="mini" @click="toComoDetail(item.bl_id)">立即购买</button>
<button type="primary" size="mini" class="mini" @click="toComoDetail(item.bl_id)">{{ $lang('goods.buyNow') }}</button>
</view>
</view>
</block>
@@ -316,7 +316,7 @@
<uni-popup ref="couponPopup" type="bottom">
<view class="goods-coupon-popup-layer popup-layer">
<view class="head-wrap" @click="closeCouponPopup()">
<text>优惠券</text>
<text>{{ $lang('goods.coupon') }}</text>
<text class="iconfont icon-close"></text>
</view>
<scroll-view class="coupon-body" scroll-y>
@@ -331,33 +331,33 @@
</template>
<template v-else-if="item.type == 'discount'">
<text class="money">{{ parseFloat(item.discount) }}</text>
<text class="unit">折</text>
<text class="unit">{{ $lang('coupon.discountSuffix') }}</text>
</template>
<view class="at-least">
<template v-if="item.at_least > 0">
满{{ item.at_least }}可用
{{ $lang('goods.full') }}{{ item.at_least }}{{ $lang('goods.usable') }}
</template>
<template v-else>
无门槛
{{ $lang('goods.noThreshold') }}
</template>
</view>
</view>
</view>
<view class="desc-wrap">
<view class="coupon-name">{{ item.coupon_name }}</view>
<view v-if="item.type == 'discount' && item.discount_limit > 0" class="limit">最多可抵￥{{ item.discount_limit }}</view>
<view class="time font-size-goods-tag" v-if="item.validity_type == 0">有效期：{{ $util.timeStampTurnTime(item.end_time) }}</view>
<view class="time font-size-goods-tag" v-else-if="item.validity_type == 1">有效期：领取之日起{{ item.fixed_term }}天内有效</view>
<view class="time font-size-goods-tag" v-else>有效期：长期有效</view>
<view v-if="item.type == 'discount' && item.discount_limit > 0" class="limit">{{ $lang('goods.maxDeduct', { amount: item.discount_limit }) }}</view>
<view class="time font-size-goods-tag" v-if="item.validity_type == 0">{{ $lang('goods.validity') }}：{{ $util.timeStampTurnTime(item.end_time) }}</view>
<view class="time font-size-goods-tag" v-else-if="item.validity_type == 1">{{ $lang('goods.validity') }}：{{ $lang('goods.validityFromReceive', { days: item.fixed_term }) }}</view>
<view class="time font-size-goods-tag" v-else>{{ $lang('goods.validity') }}：{{ $lang('goods.validityLong') }}</view>
</view>
<button type="primary" v-if="item.useState == 2" disabled>已抢光</button>
<button type="primary" v-else-if="item.useState == 1" disabled>已领取</button>
<button type="primary" v-else @click="receiveCoupon(item)">领取</button>
<button type="primary" v-if="item.useState == 2" disabled>{{ $lang('goods.taken') }}</button>
<button type="primary" v-else-if="item.useState == 1" disabled>{{ $lang('goods.received') }}</button>
<button type="primary" v-else @click="receiveCoupon(item)">{{ $lang('goods.receive') }}</button>
</view>
</view>
</scroll-view>
<view class="button-box"><button type="primary" @click="closeCouponPopup()">确定</button></view>
<view class="button-box"><button type="primary" @click="closeCouponPopup()">{{ $lang('common.confirm') }}</button></view>
</view>
</uni-popup>
</view>
@@ -367,24 +367,24 @@
<uni-popup ref="manjianPopup" type="bottom">
<view class="manjian-popup-layer popup-layer">
<view class="head-wrap" @click="closeManjianPopup()">
<text>促销</text>
<text>{{ $lang('goods.promotion') }}</text>
<text class="iconfont icon-close"></text>
</view>
<scroll-view scroll-y class="manjian-body">
<view class="item" v-if="manjian.manjian != undefined" style="display: flex;">
<view class="free-tip color-base-text color-base-border">满减</view>
<view class="free-tip color-base-text color-base-border">{{ $lang('goods.fullReduce') }}</view>
<text class="font-size-base">{{ manjian.manjian }}</text>
</view>
<view class="item" v-if="manjian.mansong != undefined">
<text class="free-tip color-base-text color-base-border">满送</text>
<text class="free-tip color-base-text color-base-border">{{ $lang('goods.fullGift') }}</text>
<text class="font-size-base">{{ manjian.mansong }}</text>
</view>
<view class="item" v-if="manjian.free_shipping != undefined" style="display: flex;">
<view class="free-tip color-base-text color-base-border">包邮</view>
<view class="free-tip color-base-text color-base-border">{{ $lang('goods.freeShipping') }}</view>
<text class="font-size-base">{{ manjian.free_shipping }}</text>
</view>
</scroll-view>
<view class="button-box"><button type="primary" @click="closeManjianPopup()">确定</button></view>
<view class="button-box"><button type="primary" @click="closeManjianPopup()">{{ $lang('common.confirm') }}</button></view>
</view>
</uni-popup>
</view>
@@ -393,7 +393,7 @@
<uni-popup ref="informationPopup" type="bottom">
<view class="manjian-popup-layer popup-layer" :style="{ height: FormHeight }">
<view class="head-wrap" @click="closeinformationPopup()">
<text>商品留言</text>
<text>{{ $lang('goods.goodsMessage') }}</text>
<text class="iconfont icon-close"></text>
</view>
<scroll-view scroll-y class="manjian-body" >
@@ -414,7 +414,7 @@
<ns-form :data="informationform" ref="form"></ns-form>
</view>
</scroll-view>
<view class="button-box"><button type="primary" @click="saveubfirnation()">确定</button></view>
<view class="button-box"><button type="primary" @click="saveubfirnation()">{{ $lang('common.confirm') }}</button></view>
</view>
</uni-popup>
<!-- <uni-popup ref="informationPopup" type="bottom" class="sku-layer" @change="popclose">
@@ -463,7 +463,7 @@
<ns-goods-action-button v-if="goodsSkuDetail.isinformation == 1" class="goods-action-button active3" disabled-text="" backgroundColor="#54c952" @click="phoneClick(goodsSkuDetail.goods_mobile)" :text="$lang('make')" :disabled="false" />
<ns-goods-action-button v-if="goodsSkuDetail.isinformation == 2" class="goods-action-button active3" disabled-text="" backgroundColor="#54c952" @click="showinformation" :text="$lang('leave')" :disabled="false" />
<ns-goods-action-button v-if="goodsSkuDetail.isinformation == 3" class="goods-action-button active3" disabled-text="" backgroundColor="#54c952" @click="goToAIChat" text="智能客服" :disabled="false" />
<ns-goods-action-button v-if="goodsSkuDetail.isinformation == 3" class="goods-action-button active3" disabled-text="" backgroundColor="#54c952" @click="goToAIChat" :text="$lang('goods.aiService')" :disabled="false" />
<!-- <ns-goods-action-button v-if="goodsSkuDetail.isinformation == 2" class="goods-action-button active3" disabled-text="" backgroundColor="#54c952" @click="buyNow" text="商品留言" :disabled="false" /> -->
</block>
@@ -520,11 +520,11 @@
<uni-popup ref="contactPopup" type="center">
<view class="contact-popup">
<view class="contact-content">
<text class="contact-text">可在手机端拨打 021-51815181</text>
<text class="contact-text">{{ $lang('goods.callOnMobile', { phone: '021-51815181' }) }}</text>
</view>
<view class="contact-buttons">
<button class="contact-btn cancel-btn" @click="closeContactPopup">取消</button>
<button class="contact-btn copy-btn" @click="copyPhoneNumber">复制到剪切板</button>
<button class="contact-btn cancel-btn" @click="closeContactPopup">{{ $lang('common.cancel') }}</button>
<button class="contact-btn copy-btn" @click="copyPhoneNumber">{{ $lang('goods.copyToClipboard') }}</button>
</view>
</view>
</uni-popup>

36
pages_goods/list.vue
View File

@@ -5,7 +5,7 @@
<view class="search-wrap uni-flex uni-row">
<view class="flex-item input-wrap">
<input class="uni-input" maxlength="50" v-model="keyword" @confirm="search()"
:placeholder="langstatus ? $lang('Search') : '请输入您要搜索的商品'" />
:placeholder="langstatus ? $lang('Search') : $lang('goods.searchGoods')" />
<text class="iconfont icon-sousuo3" @click.stop="search()"></text>
</view>
<view class="iconfont" :class="{ 'icon-apps': isList, 'icon-list': !isList }"
@@ -16,16 +16,16 @@
<view class="sort-wrap">
<view class="comprehensive-wrap" :class="{ 'color-base-text': orderType === '' }"
@click="sortTabClick('')">
<text :class="{ 'color-base-text': orderType === '' }">{{ langstatus ? $lang('Random') : '综合' }}</text>
<text :class="{ 'color-base-text': orderType === '' }">{{ langstatus ? $lang('Random') : $lang('goods.comprehensive') }}</text>
</view>
<view :class="{ 'color-base-text': orderType === 'sale_num' }" @click="sortTabClick('sale_num')">
{{ langstatus ? $lang('Sales') : '销量' }}
{{ langstatus ? $lang('Sales') : $lang('chat.sales') }}
</view>
<view class="price-wrap" @click="sortTabClick('discount_price')">
<text
:class="{ 'color-base-text': orderType === 'discount_price' }">{{ langstatus ? $lang('Price') : '价格' }}</text>
:class="{ 'color-base-text': orderType === 'discount_price' }">{{ langstatus ? $lang('Price') : $lang('goods.price') }}</text>
<view class="iconfont-wrap">
<view class="iconfont icon-iconangledown-copy asc"
:class="{ 'color-base-text': priceOrder === 'asc' && orderType === 'discount_price' }">
@@ -37,7 +37,7 @@
</view>
<view :class="{ 'color-base-text': orderType === 'screen' }" class="screen-wrap">
<text @click="sortTabClick('screen')">{{ langstatus ? $lang('Filter') : '筛选' }}</text>
<text @click="sortTabClick('screen')">{{ langstatus ? $lang('Filter') : $lang('goods.filter') }}</text>
<view @click="sortTabClick('screen')" class="iconfont-wrap">
<view class="iconfont icon-shaixuan color-tip"></view>
</view>
@@ -78,8 +78,8 @@
</view>
<view class="pro-info" v-if="item.isinformation == 0">
<view class="block-wrap">
<view class="sale" v-if="item.sale_show">已售{{ item.sale_num }}{{ item.unit
? item.unit : '件' }}</view>
<view class="sale" v-if="item.sale_show">{{ $lang('goods.sold') }}{{ item.sale_num }}{{ item.unit
? item.unit : $lang('sku.unit') }}</view>
</view>
<view class="cart-action-wrap" v-if="config.control && item.is_virtual == 0">
<view class="cart buy-btn click-wrap" :id="'goods-' + item.id"
@@ -126,8 +126,8 @@
</view>
<view class="pro-info" v-if="item.isinformation == 0">
<view class="block-wrap">
<view class="sale" v-if="item.sale_show">已售{{ item.sale_num }}{{ item.unit
? item.unit : '件' }}</view>
<view class="sale" v-if="item.sale_show">{{ $lang('goods.sold') }}{{ item.sale_num }}{{ item.unit
? item.unit : $lang('sku.unit') }}</view>
</view>
<view class="cart-action-wrap" v-if="config.control && item.is_virtual == 0">
<view class="cart buy-btn click-wrap" :id="'goods-' + item.id"
@@ -145,7 +145,7 @@
</view>
</view>
</view>
<view v-if="goodsList.length == 0 && emptyShow"><ns-empty text="暂无商品"></ns-empty></view>
<view v-if="goodsList.length == 0 && emptyShow"><ns-empty :text="$lang('goods.noGoods')"></ns-empty></view>
</block>
</mescroll-uni>
@@ -153,11 +153,11 @@
<!-- 筛选弹出框 -->
<uni-drawer :visible="showScreen" mode="right" @close="showScreen = false" class="screen-wrap">
<view class="title color-tip">筛选</view>
<view class="title color-tip">{{ $lang('goodsList.filter') }}</view>
<scroll-view scroll-y>
<!-- 包邮 -->
<!-- <view class="item-wrap">
<view class="label"><text>是否包邮</text></view>
<view class="label"><text>{{ $lang('goodsList.freeShipping') }}</text></view>
<view class="list">
<uni-tag :inverted="true" text="包邮" :type="isFreeShipping ? 'primary' : 'default'" @click="isFreeShipping = !isFreeShipping" />
</view>
@@ -165,7 +165,7 @@
<!-- 价格筛选项 -->
<!-- <view class="item-wrap">
<view class="label"><text>价格区间(元)</text></view>
<view class="label"><text>{{ $lang('goodsList.priceRange') }}</text></view>
<view class="price-wrap">
<input class="uni-input" type="digit" v-model="minPrice" placeholder="最低价" />
<view class="h-line"></view>
@@ -175,7 +175,7 @@
<!-- 品牌筛选项 -->
<!-- <view class="item-wrap" v-if="brandList.length > 0">
<view class="label"><text>品牌</text></view>
<view class="label"><text>{{ $lang('goodsList.brand') }}</text></view>
<view class="list">
<view v-for="(item, index) in brandList" :key="index">
<uni-tag :inverted="true" :text="item.brand_name" :type="item.brand_id == brandId ? 'primary' : 'default'" @click="brandId == item.brand_id ? (brandId = 0) : (brandId = item.brand_id)" />
@@ -185,10 +185,10 @@
<!-- 分类筛选项 -->
<view class="category-list-wrap">
<text class="first">全部分类</text>
<text class="first">{{ $lang('goodsList.allCategory') }}</text>
<view class="class-box">
<view @click="selectedCategory('')" class="list-wrap">
<text :class="{ selected: !categoryId, 'color-base-text': !categoryId }">全部</text>
<text :class="{ selected: !categoryId, 'color-base-text': !categoryId }">{{ $lang('goodsList.all') }}</text>
</view>
<view @click="selectedCategory(item.category_id)" v-for="(item, index) in categoryList"
:key="index" class="list-wrap">
@@ -200,8 +200,8 @@
</view>
</scroll-view>
<view class="footer" :class="{ 'safe-area': isIphoneX }">
<button type="default" class="footer-box" @click="resetData">重置</button>
<button type="primary" class="footer-box1" @click="screenData">确定</button>
<button type="default" class="footer-box" @click="resetData">{{ $lang('goodsList.reset') }}</button>
<button type="primary" class="footer-box1" @click="screenData">{{ $lang('goodsList.confirm') }}</button>
</view>
</uni-drawer>
<loading-cover ref="loadingCover"></loading-cover>

168
pages_order/detail.vue
View File

@@ -11,13 +11,13 @@
<text v-if="orderData.promotion_status_name">（{{ orderData.promotion_status_name }}）</text>
</view>
<view class="desc" v-if="orderData.promotion_type == 'presale' && orderData.order_status == 1">
预计{{ $util.timeStampTurnTime(orderData.predict_delivery_time, true) }}日后发货
{{ $lang('order.estimatedShip') }}{{ $util.timeStampTurnTime(orderData.predict_delivery_time, true) }}{{ $lang('order.daysLater') }}
</view>
<view class="desc" v-if="orderData.close_cause">订单关闭原因：{{ orderData.close_cause }}</view>
<view class="desc" v-if="orderData.close_cause">{{ $lang('order.closeReason') }}{{ orderData.close_cause }}</view>
</view>
</view>
<view class="order-time" v-if="orderData.order_status == 0" id="action-date">
剩余时间：
{{ $lang('order.remainingTime') }}
<uni-count-down :day="orderData.closeTimeMachine.d" :hour="orderData.closeTimeMachine.h"
:minute="orderData.closeTimeMachine.i" :second="orderData.closeTimeMachine.s" color="#fff"
splitorColor="#fff" />
@@ -34,21 +34,21 @@
<text class="font-size-base">{{ orderData.name }}&nbsp;{{ orderData.mobile }}</text>
</view>
<view class="detail">
<text class="font-size-base">收货地址：{{ orderData.full_address }} {{ orderData.address }}</text>
<text class="font-size-base">{{ $lang('order.receiptAddress') }}：{{ orderData.full_address }} {{ orderData.address }}</text>
</view>
</view>
<template v-if="orderData.order_type == 3">
<view class="pick-block first-pick-block">
<view class="font-size-base">送达时间：</view>
<view class="font-size-base">{{ $lang('order.deliverTime') }}：</view>
<view class="last-child">{{ orderData.buyer_ask_delivery_time }}</view>
</view>
<block v-if="orderData.package_list">
<view class="pick-block">
<view>配送员：</view>
<view>{{ $lang('order.deliverer') }}：</view>
<view class="last-child">{{ orderData.package_list.deliverer }}</view>
</view>
<view class="pick-block">
<view>外卖电话：</view>
<view>{{ $lang('order.delivererPhone') }}：</view>
<view class="last-child">{{ orderData.package_list.deliverer_mobile }}</view>
</view>
</block>
@@ -74,27 +74,27 @@
</view>
<view class="detail store-detail">
<view class="color-tip" v-if="orderData.delivery_store_info.open_date">
营业时间：{{ orderData.delivery_store_info.open_date }}</view>
<view class="color-tip">地址：{{ orderData.delivery_store_info.full_address }}</view>
{{ $lang('order.businessHours') }}：{{ orderData.delivery_store_info.open_date }}</view>
<view class="color-tip">{{ $lang('order.address') }}：{{ orderData.delivery_store_info.full_address }}</view>
</view>
</view>
</view>
<view v-else>
<view class="address-empty">
<view class="color-base-text">当前无自提门店</view>
<view class="color-base-text">{{ $lang('order.noPickupStore') }}</view>
</view>
</view>
</view>
<view class="pick-block first-pick-block">
<view class="font-size-base">姓名</view>
<view class="font-size-base">{{ $lang('order.name') }}</view>
<input class="last-child" type="text" disabled :value="orderData.name" />
</view>
<view class="pick-block first-pick-block">
<view class="font-size-base">预留手机</view>
<view class="font-size-base">{{ $lang('order.phone') }}</view>
<input class="last-child" type="number" disabled :value="orderData.mobile" />
</view>
<view class="pick-block first-pick-block">
<view class="font-size-base">提货时间</view>
<view class="font-size-base">{{ $lang('order.pickupTime') }}</view>
<input class="last-child" disabled :value="orderData.buyer_ask_delivery_time" />
</view>
</view>
@@ -103,10 +103,10 @@
<view class="pickup-code-info">
<view class="info">
<text class="font-size-base">
<text class="color-tip font-size-base">提货码：</text>
<text class="color-tip font-size-base">{{ $lang('order.pickupCode') }}：</text>
{{ orderData.delivery_code }}
</text>
<text class="copy" @click="$util.copy(orderData.delivery_code)">复制</text>
<text class="copy" @click="$util.copy(orderData.delivery_code)">{{ $lang('order.copy') }}</text>
</view>
<view class="code">
<image :src="$util.img(orderData.pickup_barcode)"
@@ -179,7 +179,7 @@
</view>
<view class="box" v-else>
<text class="color-title">{{ item.val }}</text>
<text class="copy" @click="$util.copy(item.val)">复制</text>
<text class="copy" @click="$util.copy(item.val)">{{ $lang('order.copy') }}</text>
</view>
</view>
</view>
@@ -189,13 +189,13 @@
<view @click="goRefund(goodsItem.order_goods_id)"
v-if="orderData.order_scene == 'online' && (goodsItem.refund_status == 0 || goodsItem.refund_status == -1)">
<view class="order-box-btn" v-if="orderData.promotion_type != 'blindbox'">
{{ orderData.order_status == 10 ? '申请售后' : '申请退款' }}
{{ orderData.order_status == 10 ? $lang('order.applyAfterSale') : $lang('order.applyRefund') }}
</view>
</view>
</block>
<view @click="goRefundDetail(goodsItem.order_goods_id)"
v-if="goodsItem.refund_status != 0 && goodsItem.refund_status != -1">
<view class="order-box-btn">{{ orderData.order_status == 10 ? '查看售后' : '查看退款' }}</view>
<view class="order-box-btn">{{ orderData.order_status == 10 ? $lang('order.viewAfterSale') : $lang('order.viewRefund') }}</view>
</view>
</view>
</view>
@@ -205,32 +205,32 @@
<!-- 订单概况 -->
<view class="order-summary">
<view class="order-cell">
<text class="tit">订单类型：</text>
<text class="tit">{{ $lang('order.orderType') }}：</text>
<view class="box">
<text class="color-title">{{ orderData.order_type_name }}</text>
</view>
</view>
<view class="order-cell">
<text class="tit">订单编号：</text>
<text class="tit">{{ $lang('order.orderNo') }}：</text>
<view class="box">
<text class="color-title">{{ orderData.order_no }}</text>
<view class="copy" @click="$util.copy(orderData.order_no)">复制</view>
<view class="copy" @click="$util.copy(orderData.order_no)">{{ $lang('common.copy') }}</view>
</view>
</view>
<view class="order-cell">
<text class="tit">订单交易号：</text>
<text class="tit">{{ $lang('order.tradeNo') }}：</text>
<view class="box">
<text class="color-title">{{ orderData.out_trade_no }}</text>
</view>
</view>
<view class="order-cell">
<text class="tit">创建时间：</text>
<text class="tit">{{ $lang('order.createTime') }}：</text>
<view class="box">
<text class="color-title">{{ $util.timeStampTurnTime(orderData.create_time) }}</text>
</view>
</view>
<view class="order-cell" v-if="orderData.close_time > 0">
<text class="tit">关闭时间：</text>
<text class="tit">{{ $lang('order.closeTime') }}：</text>
<view class="box">
<text class="color-title">{{ $util.timeStampTurnTime(orderData.close_time) }}</text>
</view>
@@ -238,32 +238,32 @@
<block v-if="orderData.pay_status > 0">
<view class="hr"></view>
<view class="order-cell">
<text class="tit">支付方式：</text>
<text class="tit">{{ $lang('order.paymentMethod') }}：</text>
<view class="box">
<text class="color-title">{{ orderData.pay_type_name }}</text>
</view>
</view>
<view class="order-cell">
<text class="tit">支付时间：</text>
<text class="tit">{{ $lang('order.paymentTime') }}：</text>
<view class="box">
<text class="color-title">{{ $util.timeStampTurnTime(orderData.pay_time) }}</text>
</view>
</view>
</block>
<view class="order-cell" v-if="orderData.delivery_type_name">
<text class="tit">配送方式：</text>
<text class="tit">{{ $lang('order.deliveryMethod') }}：</text>
<view class="box">
<text class="color-title">{{ orderData.delivery_type_name }}</text>
</view>
</view>
<view class="order-cell" v-if="orderData.buyer_message != ''">
<text class="tit">买家留言：</text>
<text class="tit">{{ $lang('order.buyerMessage') }}：</text>
<view class="box">
<text class="color-title">{{ orderData.buyer_message }}</text>
</view>
</view>
<view class="order-cell" v-if="orderData.promotion_type_name != ''">
<text class="tit">活动优惠：</text>
<text class="tit">{{ $lang('order.promotion') }}：</text>
<view class="box">
<text class="color-title">{{ orderData.promotion_type_name }}</text>
</view>
@@ -271,38 +271,38 @@
<block v-if="orderData.is_invoice > 0">
<view class="hr"></view>
<view class="order-cell">
<text class="tit">发票类型：</text>
<text class="tit">{{ $lang('order.invoiceType') }}：</text>
<view class="box">
<text class="color-title">{{ orderData.invoice_type == 1 ? '纸质发票' : '电子发票' }}</text>
<text class="color-title">{{ orderData.invoice_type == 1 ? $lang('order.paperInvoice') : $lang('order.eInvoice') }}</text>
</view>
</view>
<view class="order-cell">
<text class="tit">发票抬头类型：</text>
<text class="tit">{{ $lang('order.invoiceTitleType') }}：</text>
<view class="box">
<text class="color-title">{{ orderData.invoice_title_type == 1 ? '个人' : '企业' }}</text>
<text class="color-title">{{ orderData.invoice_title_type == 1 ? $lang('order.personal') : $lang('order.enterprise') }}</text>
</view>
</view>
<view class="order-cell">
<text class="tit">发票抬头：</text>
<text class="tit">{{ $lang('order.invoiceTitle') }}：</text>
<view class="box">
<text class="color-title">{{ orderData.invoice_title }}</text>
</view>
</view>
<view class="order-cell">
<text class="tit">发票内容：</text>
<text class="tit">{{ $lang('order.invoiceContent') }}：</text>
<view class="box">
<text class="color-title">{{ orderData.invoice_content }}</text>
</view>
</view>
<view class="order-cell" v-if="orderData.invoice_type == 1">
<text class="tit">发票邮寄地址：</text>
<text class="tit">{{ $lang('order.invoiceAddress') }}：</text>
<view class="box">
<text class="color-title">{{ orderData.invoice_full_address }}</text>
</view>
</view>
<view class="order-cell" v-else>
<text class="tit">发票接收邮件：</text>
<text class="tit">{{ $lang('order.invoiceEmail') }}：</text>
<view class="box">
<text class="color-title">{{ orderData.invoice_email }}</text>
</view>
@@ -319,16 +319,16 @@
</view>
<view class="box" v-else>
<text class="color-title">{{ item.val }}</text>
<text class="copy" @click="$util.copy(item.val)">复制</text>
<text class="copy" @click="$util.copy(item.val)">{{ $lang('order.copy') }}</text>
</view>
</view>
</block>
<block v-if="orderData.goods_class == 5">
<view class="order-cell">
<text class="tit">我的卡包：</text>
<text class="tit">{{ $lang('order.myCardPack') }}</text>
<view class="box"><text class="color-base-text"
@click="$util.redirectTo('/pages_promotion/cardservice/card/my_card')">查看</text></view>
@click="$util.redirectTo('/pages_promotion/cardservice/card/my_card')">{{ $lang('order.view') }}</text></view>
</view>
</block>
<!-- 联系客服 -->
@@ -347,76 +347,74 @@
<view class="code">
<image :src="$util.img(orderData.virtualgoods_barcode)" class="barcode" mode="widthFix" show-menu-by-longpress></image>
<image :src="$util.img(orderData.virtualgoods)" class="qrcode" mode="widthFix" show-menu-by-longpress></image>
<text>请将条形码或二维码出示给核销员</text>
<text>{{ $lang('order.showCodeToVerifier') }}</text>
</view>
<view class="hr"></view>
<view class="wrap">
<text class="font-size-base virtual-code">{{ orderData.virtual_code }}</text>
<view class="copy" @click="$util.copy(orderData.virtual_code)">复制</view>
<view class="copy" @click="$util.copy(orderData.virtual_code)">{{ $lang('common.copy') }}</view>
</view>
</view>
<view class="verify-info-wrap">
<view class="head">核销信息</view>
<view class="head">{{ $lang('order.verifyInfo') }}</view>
<view class="order-cell">
<text class="tit">核销次数</text>
<text class="tit">{{ $lang('order.verifyTimes') }}</text>
<view class="box align-right">
<text class="color-title">
剩余{{ orderData.virtual_goods.verify_total_count - orderData.virtual_goods.verify_use_num
}}次/共{{
orderData.virtual_goods.verify_total_count }}次
{{ $lang('order.verifyRemaining', { remaining: orderData.virtual_goods.verify_total_count - orderData.virtual_goods.verify_use_num, total: orderData.virtual_goods.verify_total_count }) }}
</text>
</view>
</view>
<view class="order-cell">
<text class="tit">有效期</text>
<text class="tit">{{ $lang('order.validPeriod') }}</text>
<view class="box align-right">
<text class="color-title" v-if="orderData.virtual_goods.expire_time > 0">{{
$util.timeStampTurnTime(orderData.virtual_goods.expire_time) }}</text>
<text v-else>永久有效</text>
<text v-else>{{ $lang('order.permanentValid') }}</text>
</view>
</view>
</view>
<view class="verify-info-wrap">
<view class="head">核销记录</view>
<view class="head">{{ $lang('order.verifyRecord') }}</view>
<view v-if="orderData.virtual_goods.verify_record.length">
<view v-for="(item, index) in orderData.virtual_goods.verify_record" :key="index"
class="record-item">
<view class="order-cell">
<text class="tit">核销人</text>
<text class="tit">{{ $lang('order.verifier') }}</text>
<view class="box align-right">
<text class="color-title">{{ item.verifier_name }}</text>
</view>
</view>
<view class="order-cell">
<text class="tit">核销时间</text>
<text class="tit">{{ $lang('order.verifyTime') }}</text>
<view class="box align-right">
<text class="color-title">{{ $util.timeStampTurnTime(item.verify_time) }}</text>
</view>
</view>
</view>
</view>
<view class="record-empty" v-else>暂无核销记录</view>
<view class="record-empty" v-else>{{ $lang('order.noVerifyRecord') }}</view>
</view>
</block>
<block v-if="orderData.virtual_goods && orderData.goods_class == 3">
<view class="verify-info-wrap carmichael">
<view class="head">卡密信息</view>
<view class="head">{{ $lang('order.cardInfo') }}</view>
<view v-for="(item, index) in orderData.virtual_goods" :key="index" class="record-item">
<view class="order-cell">
<text class="tit">卡号：</text>
<text class="tit">{{ $lang('order.cardNo') }}</text>
<view class="box">
<text class="color-title">{{ item.card_info.cardno }}</text>
<view class="copy" @click="$util.copy(item.card_info.cardno)">复制</view>
<view class="copy" @click="$util.copy(item.card_info.cardno)">{{ $lang('order.copy') }}</view>
</view>
</view>
<view class="order-cell">
<text class="tit">密码：</text>
<text class="tit">{{ $lang('order.password') }}</text>
<view class="box">
<text class="color-title">{{ item.card_info.password }}</text>
<view class="copy" @click="$util.copy(item.card_info.password)">复制</view>
<view class="copy" @click="$util.copy(item.card_info.password)">{{ $lang('order.copy') }}</view>
</view>
</view>
</view>
@@ -428,63 +426,61 @@
<view class="code">
<image :src="$util.img(orderData.virtualgoods_barcode)" class="barcode" mode="widthFix" show-menu-by-longpress></image>
<image :src="$util.img(orderData.virtualgoods)" class="qrcode" mode="widthFix" show-menu-by-longpress></image>
<text>请将条形码或二维码出示给核销员</text>
<text>{{ $lang('order.showCodeToVerifier') }}</text>
</view>
<view class="hr"></view>
<view class="wrap">
<text class="font-size-base virtual-code">{{ orderData.virtual_code }}</text>
<view class="copy" @click="$util.copy(orderData.virtual_code)">复制</view>
<view class="copy" @click="$util.copy(orderData.virtual_code)">{{ $lang('common.copy') }}</view>
</view>
</view>
<view class="verify-info-wrap">
<view class="head">核销信息</view>
<view class="head">{{ $lang('order.verifyInfo') }}</view>
<view class="order-cell">
<text class="tit">核销次数</text>
<text class="tit">{{ $lang('order.verifyTimes') }}</text>
<view class="box align-right">
<text class="color-title">
剩余{{ orderData.virtual_goods.verify_total_count - orderData.virtual_goods.verify_use_num
}}次/共{{
orderData.virtual_goods.verify_total_count }}次
{{ $lang('order.verifyRemaining', { remaining: orderData.virtual_goods.verify_total_count - orderData.virtual_goods.verify_use_num, total: orderData.virtual_goods.verify_total_count }) }}
</text>
</view>
</view>
<view class="order-cell">
<text class="tit">有效期</text>
<text class="tit">{{ $lang('order.validPeriod') }}</text>
<view class="box align-right">
<text class="color-title" v-if="orderData.virtual_goods.expire_time > 0">{{
$util.timeStampTurnTime(orderData.virtual_goods.expire_time) }}</text>
<text v-else>永久有效</text>
<text v-else>{{ $lang('order.permanentValid') }}</text>
</view>
</view>
</view>
<view class="verify-info-wrap">
<view class="head">核销记录</view>
<view class="head">{{ $lang('order.verifyRecord') }}</view>
<view v-if="orderData.virtual_goods.verify_record.length">
<view v-for="(item, index) in orderData.virtual_goods.verify_record" :key="index"
class="record-item">
<view class="order-cell">
<text class="tit">核销人</text>
<text class="tit">{{ $lang('order.verifier') }}</text>
<view class="box align-right">
<text class="color-title">{{ item.verifier_name }}</text>
</view>
</view>
<view class="order-cell">
<text class="tit">核销时间</text>
<text class="tit">{{ $lang('order.verifyTime') }}</text>
<view class="box align-right">
<text class="color-title">{{ $util.timeStampTurnTime(item.verify_time) }}</text>
</view>
</view>
</view>
</view>
<view class="record-empty" v-else>暂无核销记录</view>
<view class="record-empty" v-else>{{ $lang('order.noVerifyRecord') }}</view>
</view>
</block>
<!-- 订单金额 -->
<view class="order-money">
<view class="order-cell">
<text class="tit">商品金额</text>
<text class="tit">{{ $lang('order.goodsAmount') }}</text>
<view class="box align-right">
<text class="color-title price-font">
<text class="font-size-goods-tag">{{ $lang('common.currencySymbol') }}</text>
@@ -493,7 +489,7 @@
</view>
</view>
<view class="order-cell" v-if="orderData.order_type != 4">
<text class="tit">运费</text>
<text class="tit">{{ $lang('order.shippingFee') }}</text>
<view class="box align-right">
<text class="color-base-text price-font">
<text class="font-size-goods-tag">{{ $lang('common.currencySymbol') }}</text>
@@ -502,7 +498,7 @@
</view>
</view>
<view class="order-cell" v-if="orderData.member_card_money > 0">
<text class="tit">会员卡</text>
<text class="tit">{{ $lang('order.memberCard') }}</text>
<view class="box align-right">
<text class="color-base-text price-font">
<text class="font-size-goods-tag">{{ $lang('common.currencySymbol') }}</text>
@@ -512,7 +508,7 @@
</view>
<view class="order-cell" v-if="orderData.invoice_money > 0">
<text class="tit">
税费
{{ $lang('order.taxFee') }}
<text class="color-base-text">({{ orderData.invoice_rate }}%)</text>
</text>
<view class="box align-right">
@@ -524,7 +520,7 @@
</view>
</view>
<view class="order-cell" v-if="orderData.invoice_delivery_money > 0">
<text class="tit">发票邮寄费</text>
<text class="tit">{{ $lang('order.invoiceDeliveryFee') }}</text>
<view class="box align-right">
<text class="color-base-text price-font">
<text class="operator">+</text>
@@ -534,7 +530,7 @@
</view>
</view>
<view class="order-cell" v-if="orderData.adjust_money != 0">
<text class="tit">订单调整</text>
<text class="tit">{{ $lang('order.orderAdjust') }}</text>
<view class="box align-right">
<text class="color-base-text price-font">
<text class="operator" v-if="orderData.adjust_money < 0">-</text>
@@ -545,7 +541,7 @@
</view>
</view>
<view class="order-cell" v-if="orderData.promotion_money > 0">
<text class="tit">优惠</text>
<text class="tit">{{ $lang('order.discount') }}</text>
<view class="box align-right">
<text class="color-base-text price-font">
<text class="operator">-</text>
@@ -555,7 +551,7 @@
</view>
</view>
<view class="order-cell" v-if="orderData.coupon_money > 0">
<text class="tit">优惠券</text>
<text class="tit">{{ $lang('order.coupon') }}</text>
<view class="box align-right">
<text class="color-base-text price-font">
<text class="operator">-</text>
@@ -565,7 +561,7 @@
</view>
</view>
<view class="order-cell" v-if="orderData.balance_money > 0">
<text class="tit">使用余额</text>
<text class="tit">{{ $lang('order.useBalance') }}</text>
<view class="box align-right">
<text class="color-base-text price-font">
<text class="operator">-</text>
@@ -575,7 +571,7 @@
</view>
</view>
<view class="order-cell" v-if="orderData.point_money > 0">
<text class="tit">积分抵扣</text>
<text class="tit">{{ $lang('order.pointDeduct') }}</text>
<view class="box align-right">
<text class="color-base-text price-font">
<text class="operator">-</text>
@@ -586,7 +582,7 @@
</view>
<view class="order-cell">
<view class="box align-right">
<text>实付金额：</text>
<text>{{ $lang('order.actualPayment') }}</text>
<text class="color-base-text price-font">
<text class="font-size-goods-tag">{{ $lang('common.currencySymbol') }}</text>
<text class="font-size-base">{{ orderData.order_money }}</text>
@@ -598,8 +594,8 @@
<view class="order-box-btn white"
v-if="evaluateConfig.evaluate_status == 1 && orderData.is_evaluate == 1"
@click="operation('memberOrderEvaluation')">
<text v-if="orderData.evaluate_status == 0">评价</text>
<text v-else-if="orderData.evaluate_status == 1">追评</text>
<text v-if="orderData.evaluate_status == 0">{{ $lang('order.evaluate') }}</text>
<text v-else-if="orderData.evaluate_status == 1">{{ $lang('order.additionalReview') }}</text>
</view>
<block v-if="orderData.order_scene == 'online'">
<view class="order-box-btn"
@@ -614,8 +610,8 @@
<view class="order-action fixed-bottom bottom-safe-area"
v-else-if="orderData.action.length == 0 && orderData.is_evaluate == 1 && evaluateConfig.evaluate_status == 1">
<view class="order-box-btn white" @click="operation('memberOrderEvaluation')">
<text v-if="orderData.evaluate_status == 0">评价</text>
<text v-else-if="orderData.evaluate_status == 1">追评</text>
<text v-if="orderData.evaluate_status == 0">{{ $lang('order.evaluate') }}</text>
<text v-else-if="orderData.evaluate_status == 1">{{ $lang('order.additionalReview') }}</text>
</view>
</view>
</view>

24
pages_order/detail_point.vue
View File

@@ -32,7 +32,7 @@
<view>
<text class="goods-price color-base-text">
<text>
<text>{{ orderData.point }}积分</text>
<text>{{ $lang('order.pointCount', { count: orderData.point }) }}</text>
<text v-if="orderData.price > 0" class="price-color">
+
<text class="unit">{{ $lang('common.currencySymbol') }}</text>
@@ -58,26 +58,26 @@
<!-- 订单概况 -->
<view class="order-summary">
<view class="order-cell">
<text class="tit">订单编号：</text>
<text class="tit">{{ $lang('order.orderNo') }}</text>
<view class="box">
<text class="color-title">{{ orderData.order_no }}</text>
<view class="copy" @click="$util.copy(orderData.order_no)">复制</view>
<view class="copy" @click="$util.copy(orderData.order_no)">{{ $lang('order.copy') }}</view>
</view>
</view>
<view class="order-cell">
<text class="tit">订单交易号：</text>
<text class="tit">{{ $lang('order.tradeNo') }}</text>
<view class="box">
<text class="color-title">{{ orderData.out_trade_no }}</text>
</view>
</view>
<view class="order-cell">
<text class="tit">创建时间：</text>
<text class="tit">{{ $lang('order.createTime') }}</text>
<view class="box">
<text class="color-title">{{ $util.timeStampTurnTime(orderData.create_time) }}</text>
</view>
</view>
<view class="order-cell" v-if="orderData.close_time > 0">
<text class="tit">关闭时间：</text>
<text class="tit">{{ $lang('order.closeTime') }}</text>
<view class="box">
<text class="color-title">{{ $util.timeStampTurnTime(orderData.close_time) }}</text>
</view>
@@ -87,7 +87,7 @@
<view class="kefu">
<view>
<text class="iconfont icon-ziyuan"></text>
<text>联系客服</text>
<text>{{ $lang('order.contactCustomerService') }}</text>
</view>
</view>
</ns-contact> -->
@@ -96,7 +96,7 @@
<!-- 订单金额 -->
<view class="order-money">
<view class="order-cell" v-if="orderData.point > 0">
<text class="tit">使用积分</text>
<text class="tit">{{ $lang('order.usePoint') }}</text>
<view class="box align-right">
<text class="color-base-text price-font">
<text>{{ orderData.point }}</text>
@@ -104,7 +104,7 @@
</view>
</view>
<view class="order-cell" v-if="orderData.delivery_price > 0">
<text class="tit">运费</text>
<text class="tit">{{ $lang('order.shippingFee') }}</text>
<view class="box align-right">
<text class="color-base-text price-font">
<text class="unit font-size-tag">{{ $lang('common.currencySymbol') }}</text>
@@ -114,7 +114,7 @@
</view>
<view class="order-cell" v-if="orderData.order_money > 0">
<view class="box align-right">
<text>实付金额：</text>
<text>{{ $lang('order.actualPayment') }}</text>
<text class="color-base-text price-font">
<text class="font-size-goods-tag">{{ $lang('common.currencySymbol') }}</text>
<text class="font-size-base">{{ orderData.order_money }}</text>
@@ -123,9 +123,9 @@
</view>
<view class="order-action" v-if="orderData.order_status == 0 && orderData.type == 1">
<view class="order-box-btn" @click="orderClose()">关闭</view>
<view class="order-box-btn" @click="orderClose()">{{ $lang('order.close') }}</view>
<view class="order-box-btn color-base-bg color-base-border color-text-white"
@click="openChoosePayment()">支付</view>
@click="openChoosePayment()">{{ $lang('order.pay') }}</view>
</view>
</view>

30
pages_order/list.vue
View File

@@ -3,7 +3,7 @@
<view class="cate-search">
<view class="search-box">
<input class="uni-input" maxlength="50" v-model="searchText" confirm-type="search"
placeholder="请输入商品名称/订单编号" @confirm="search()" @click.stop="search()" @tap.stop="search()" />
:placeholder="$lang('order.searchPlaceholder')" @confirm="search()" @click.stop="search()" @tap.stop="search()" />
<text class="iconfont icon-sousuo3" @click.stop="search()" @tap.stop="search()"></text>
</view>
</view>
@@ -32,7 +32,7 @@
:class="$util.inArray(orderItem.order_id, mergePayOrder) == -1 ? 'icon-yuan_checkbox' : 'icon-yuan_checked color-base-text'"
@click="selectOrder(orderItem.order_id, orderItem.pay_money)"
v-if="orderStatus == 'waitpay' && orderItem.order_status == 0"></view> -->
<text class="order-no">订单号：{{ orderItem.order_no }}</text>
<text class="order-no">{{ $lang('order.orderNo') }}{{ orderItem.order_no }}</text>
<text class="order-type-name">{{ orderItem.order_type_name }}</text>
<text class="status-name">{{ orderItem.order_status_name }}</text>
</view>
@@ -98,18 +98,18 @@
<view class="order-footer">
<view class="order-base-info">
<view class="total">
<text class="font-size-sub">共{{ orderItem.goods_num }}件商品</text>
<text class="align-right font-size-base">
实付款：
<text class="font-size-base price-font">{{ $lang('common.currencySymbol')
}}{{ orderItem.order_money }}</text>
</text>
</view>
<text class="font-size-sub">{{ $lang('order.totalGoods') }}{{ orderItem.goods_num }}{{ $lang('cart.types') }}</text>
<text class="align-right font-size-base">
{{ $lang('order.actualPayment') }}
<text class="font-size-base price-font">{{ $lang('common.currencySymbol')
}}{{ orderItem.order_money }}</text>
</text>
</view>
</view>
<view class="order-action" v-if="orderItem.action.length > 0">
<view class="order-time" v-if="orderItem.order_status == 0" id="action-date">
<image :src="$util.img('public/uniapp/order/time.png')" show-menu-by-longpress></image>
剩余时间：
{{ $lang('order.remainingTime') }}
<uni-count-down :day="orderItem.discountTimeMachine.d"
:hour="orderItem.discountTimeMachine.h"
:minute="orderItem.discountTimeMachine.i"
@@ -119,8 +119,8 @@
<view class="order-box-btn"
v-if="evaluateConfig.evaluate_status == 1 && orderItem.is_evaluate == 1"
@click="operation('memberOrderEvaluation', orderItem)">
<text v-if="orderItem.evaluate_status == 0">评价</text>
<text v-else-if="orderItem.evaluate_status == 1">追评</text>
<text v-if="orderItem.evaluate_status == 0">{{ $lang('order.evaluate') }}</text>
<text v-else-if="orderItem.evaluate_status == 1">{{ $lang('order.additionalEvaluate') }}</text>
</view>
<view class="order-box-btn"
:class="{ 'color-base-border color-base-bg': operationItem.action == 'orderPay' }"
@@ -133,12 +133,12 @@
v-else-if="orderItem.action.length == 0 && orderItem.is_evaluate == 1 && evaluateConfig.evaluate_status == 1">
<view class="order-box-btn" v-if="orderItem.is_evaluate == 1"
@click="operation('memberOrderEvaluation', orderItem)">
<text v-if="orderItem.evaluate_status == 0">评价</text>
<text v-else-if="orderItem.evaluate_status == 1">追评</text>
<text v-if="orderItem.evaluate_status == 0">{{ $lang('order.evaluate') }}</text>
<text v-else-if="orderItem.evaluate_status == 1">{{ $lang('order.additionalEvaluate') }}</text>
</view>
</view>
<view class="order-action" v-else>
<view class="order-box-btn" @click="orderDetail(orderItem)">查看详情</view>
<view class="order-box-btn" @click="orderDetail(orderItem)">{{ $lang('order.viewDetail') }}</view>
</view>
</view>
</view>

40
pages_tool/_components/img-cropping/img-cropping.vue
View File

@@ -16,11 +16,11 @@
<view class="oper-wrapper" :style="{ display: sD, top: tp }">
<view class="oper">
<view class="btn-wrapper" v-if="sO">
<view @click="fClose" class="cancel" :style="{ width: bW }"><text>取消</text></view>
<view @click="fClose" class="cancel" :style="{ width: bW }"><text>{{ $lang('common.cancel') }}</text></view>
<view @click="fSelect" :style="{ width: bW }"><text class="iconfont icon-shangchuan"></text></view>
<view @click="fRotate" :style="{ width: bW, display: bD }"><text class="iconfont icon-xuanzhuan"></text></view>
<!-- <view @click="fPreview" hover-class="hover" :style="{width: bW}"><text>预览</text></view> -->
<view @click="fUpload" :style="{ width: bW }"><text class="upload">上传</text></view>
<view @click="fUpload" :style="{ width: bW }"><text class="upload">{{ $lang('common.upload') }}</text></view>
</view>
<view class="clr-wrapper" v-else>
<slider
@@ -35,7 +35,7 @@
block-color="grey"
show-value
></slider>
<view @click="fPrvUpload" hover-class="hover" :style="{ width: bW }"><text>上传</text></view>
<view @click="fPrvUpload" hover-class="hover" :style="{ width: bW }"><text>{{ $lang('common.upload') }}</text></view>
</view>
</view>
</view>
@@ -209,7 +209,7 @@ export default {
// #endif
// #ifndef MP-ALIPAY
uni.showLoading({
title: '加载中...',
title: this.$lang('common.loading'),
mask: true
});
// #endif
@@ -232,9 +232,9 @@ export default {
style.left = ((this.wW - sW) | 0) / 2 + 'px';
} else {
uni.showModal({
title: '裁剪框的宽或高没有设置',
showCancel: false
});
title: this.$lang('imgCropping.cropBoxSizeNotSet'),
showCancel: false
});
return;
}
this.sS = style;
@@ -252,7 +252,7 @@ export default {
},
fail: () => {
this.$util.showToast({
title: '请选择正确图片'
title: this.$lang('imgCropping.selectCorrectImage')
});
},
complete() {
@@ -282,9 +282,9 @@ export default {
// #endif
// #ifndef MP-ALIPAY
uni.showLoading({
title: '加载中...',
mask: true
});
title: this.$lang('common.loading'),
mask: true
});
// #endif
this.sD = 'none';
@@ -439,9 +439,9 @@ export default {
// #endif
// #ifndef MP-ALIPAY
uni.showLoading({
title: '加载中...',
mask: true
});
title: this.$lang('common.loading'),
mask: true
});
// #endif
this.sD = 'none';
@@ -750,9 +750,9 @@ export default {
// #endif
// #ifndef MP-ALIPAY
uni.showLoading({
title: '加载中...',
mask: true
});
title: this.$lang('common.loading'),
mask: true
});
// #endif
// #ifdef MP-ALIPAY
@@ -1152,9 +1152,9 @@ export default {
// #endif
// #ifndef MP-ALIPAY
uni.showLoading({
title: '加载中...',
mask: true
});
title: this.$lang('common.loading'),
mask: true
});
// #endif
if (!this.prvImgData) {

30
pages_tool/_components/ns-birthday-gift/ns-birthday-gift.vue
View File

@@ -8,10 +8,10 @@
<view class="birthday-title-desc" v-if="birthday.blessing_content">
{{ birthday.blessing_content }}
</view>
<view class="birthday-title-desc" v-else>感谢您一直以来的支持，在您生日到来之际，特为您送上最真诚的祝福！</view>
<view class="birthday-title-desc" v-else>{{ $lang('birthday.defaultBlessing') }}</view>
<view class="birthday-title-hint">
<image :src="$util.img('public/uniapp/birthday_gift/birthday_gift_left.png')" mode="" class="birthday-img-all" show-menu-by-longpress/>
<view class="font-size-toolbar">生日贺礼</view>
<view class="font-size-toolbar">{{ $lang('birthday.birthdayGift') }}</view>
<image :src="$util.img('public/uniapp/birthday_gift/birthday_gift_right.png')" mode="" class="birthday-img-all" show-menu-by-longpress/>
</view>
<scroll-view scroll-y="true" class="register-box">
@@ -20,31 +20,31 @@
<view class="info">
<text class="num">
{{ parseFloat(birthday.point) }}
<text class="type">积分</text>
<text class="type">{{ $lang('invite.point') }}</text>
</text>
<view class="desc">用于下单时抵现或兑换商品等</view>
<view class="desc">{{ $lang('birthday.pointDesc') }}</view>
</view>
<view class="tip" @click="closeRewardPopup('1')">立即查看</view>
<view class="tip" @click="closeRewardPopup('1')">{{ $lang('birthday.viewNow') }}</view>
</view>
<view class="content" v-if="birthday.balance_type == 0 && birthday.balance > 0">
<view class="info">
<text class="num">
{{ parseFloat(birthday.balance) }}
<text class="type">元红包</text>
<text class="type">{{ $lang('birthday.redPacket') }}</text>
</text>
<view class="desc">不可提现红包</view>
<view class="desc">{{ $lang('birthday.nonWithdrawableRedPacket') }}</view>
</view>
<view class="tip" @click="closeRewardPopup('2')">立即查看</view>
<view class="tip" @click="closeRewardPopup('2')">{{ $lang('birthday.viewNow') }}</view>
</view>
<view class="content" v-if="birthday.balance_type == 1 && birthday.balance_money > 0">
<view class="info">
<text class="num">
{{ parseFloat(birthday.balance_money) }}
<text class="type">元红包</text>
<text class="type">{{ $lang('birthday.redPacket') }}</text>
</text>
<view class="desc">可提现红包</view>
<view class="desc">{{ $lang('birthday.withdrawableRedPacket') }}</view>
</view>
<view class="tip" @click="closeRewardPopup('2')">立即查看</view>
<view class="tip" @click="closeRewardPopup('2')">{{ $lang('birthday.viewNow') }}</view>
</view>
<block v-if="birthday.coupon_list.length > 0">
@@ -54,18 +54,18 @@
<block v-if="item.type == 'reward'">
<text class="num">
{{ parseFloat(item.money) }}
<text class="type">元优惠劵</text>
<text class="type">{{ $lang('birthday.coupon') }}</text>
</text>
</block>
<block v-else-if="item.type == 'discount'">
<text class="num">
{{ item.discount }}
<text class="type">折</text>
<text class="type">{{ $lang('member.discountUnit') }}</text>
</text>
</block>
<view class="desc">用于下单时抵现或兑换商品等</view>
<view class="desc">{{ $lang('birthday.couponDesc') }}</view>
</view>
<view class="tip" @click="closeRewardPopup('3')">立即查看</view>
<view class="tip" @click="closeRewardPopup('3')">{{ $lang('birthday.viewNow') }}</view>
</view>
</block>
</block>

28
pages_tool/_components/ns-new-gift/ns-new-gift.vue
View File

@@ -11,38 +11,38 @@
</view>
<view class="content-title-name" v-if="memberInfo">Dear {{ memberInfo.nickname }}</view>
<view class="content-title-hint" v-if="newgift.remark">{{ newgift.remark }}</view>
<view class="content-title-hint" v-else>感谢您一直以来的支持，为回馈会员，商城{{ newgift.activity_name ? newgift.activity_name : 'xx' }}节日，为您提供以下福利</view>
<view class="content-title-hint" v-else>{{ $lang('newGift.defaultHint', { activityName: newgift.activity_name || 'xx' }) }}</view>
<scroll-view scroll-y="true" class="register-box">
<view :class="introduction > 38 ? 'reward-content' : 'reward-content-two'">
<view class="content" v-if="newgift.award_list.point > 0">
<view class="info">
<text class="num">
{{ newgift.award_list.point }}
<text class="type">积分</text>
<text class="type">{{ $lang('invite.point') }}</text>
</text>
<view class="desc">用于参与活动购买商品时抵扣</view>
<view class="desc">{{ $lang('newGift.pointDesc') }}</view>
</view>
<view class="tip" @click="closeRewardPopup('1')">立即查看</view>
<view class="tip" @click="closeRewardPopup('1')">{{ $lang('birthday.viewNow') }}</view>
</view>
<view class="content" v-if="newgift.award_list.balance_type == 0 && newgift.award_list.balance > 0">
<view class="info">
<text class="num">
{{ newgift.award_list.balance | int }}
<text class="type">元红包</text>
<text class="type">{{ $lang('birthday.redPacket') }}</text>
</text>
<view class="desc">不可提现红包</view>
<view class="desc">{{ $lang('birthday.nonWithdrawableRedPacket') }}</view>
</view>
<view class="tip" @click="closeRewardPopup('2')">立即查看</view>
<view class="tip" @click="closeRewardPopup('2')">{{ $lang('birthday.viewNow') }}</view>
</view>
<view class="content" v-if="newgift.award_list.balance_type == 1 && newgift.award_list.balance_money > 0">
<view class="info">
<text class="num">
{{ newgift.award_list.balance_money | int }}
<text class="type">元红包</text>
<text class="type">{{ $lang('birthday.redPacket') }}</text>
</text>
<view class="desc">可提现红包</view>
<view class="desc">{{ $lang('birthday.withdrawableRedPacket') }}</view>
</view>
<view class="tip" @click="closeRewardPopup('2')">立即查看</view>
<view class="tip" @click="closeRewardPopup('2')">{{ $lang('birthday.viewNow') }}</view>
</view>
<block v-if="newgift.award_list.coupon_list.length > 0">
<block v-for="(item, index) in newgift.award_list.coupon_list" :key="index">
@@ -50,15 +50,15 @@
<view class="info">
<text v-if="item.type == 'reward'" class="num">
{{ parseFloat(item.money) }}
<text class="type">元优惠劵</text>
<text class="type">{{ $lang('birthday.coupon') }}</text>
</text>
<text v-else-if="item.type == 'discount'" class="num">
{{ item.discount | int }}
<text class="type">折</text>
<text class="type">{{ $lang('member.discountUnit') }}</text>
</text>
<view class="desc">用于下单时抵现或兑换商品等</view>
<view class="desc">{{ $lang('birthday.couponDesc') }}</view>
</view>
<view class="tip" @click="closeRewardPopup('3')">立即查看</view>
<view class="tip" @click="closeRewardPopup('3')">{{ $lang('birthday.viewNow') }}</view>
</view>
</block>
</block>

4
pages_tool/article/detail.vue
View File

@@ -7,12 +7,12 @@
<view class="help-content"><rich-text :nodes="content"></rich-text></view>
<view class="bottom-area">
<view v-if="detail.is_show_read_num == 1">
阅读：
{{ $lang('article.readCount') }}：
<text class="price-font">{{ detail.read_num + detail.initial_read_num }}</text>
</view>
<view v-if="detail.is_show_dianzan_num == 1">
<text class="price-font">{{ detail.dianzan_num + detail.initial_dianzan_num }}</text>
人已赞
{{ $lang('article.peopleLiked') }}
</view>
</view>
<loading-cover ref="loadingCover"></loading-cover>

32
pages_tool/cases/index.vue
View File

@@ -19,7 +19,7 @@
<view style="padding:20rpx;">
<view style="font-size:36rpx;font-weight:600;">{{item.$orig.title}}</view>
<view>{{item.$orig.desc}}</view>
<view style="font-size:24rpx;color:#888;padding-top:20rpx;">{{"完成时间：" + item.g3}}</view>
<view style="font-size:24rpx;color:#888;padding-top:20rpx;">{{ $lang('cases.completionTime') }}：{{ item.g3 }}</view>
<block v-if="item.$orig.files_url">
<view @tap="toDetail(item.$orig)" class="item">
<view class="article-img">
@@ -28,7 +28,7 @@
<view class="info-wrap">
<view class="title">{{item.$orig.files_title}}</view>
<view class="read-wrap">
<text>查看PDF文件</text>
<text>{{ $lang('cases.viewPdfFile') }}</text>
</view>
</view>
</view>
@@ -44,35 +44,35 @@
<uni-popup ref="informationPopup" class="vue-ref" type="bottom" @change="change">
<view class="liuyan-popup-layer popup-layer">
<view @tap="closeinformationPopup" class="head-wrap">
<text>在线留言</text>
<text>{{ $lang('cases.onlineMessage') }}</text>
<text class="iconfont icon-close"></text>
</view>
<scroll-view class="liuyan-body" scroll-y="true">
<view style="padding:0 30rpx;">
<view class="fui-cell-group">
<view class="fui-cell">
<view class="fui-cell-label">姓名</view>
<view class="fui-cell-label">{{ $lang('form.name') }}</view>
<view class="fui-cell-info">
<input class="fui-input" placeholder="请输入您的姓名" v-model="Form.realname" />
<input class="fui-input" :placeholder="$lang('cases.inputName')" v-model="Form.realname" />
</view>
</view>
<view class="fui-cell">
<view class="fui-cell-label">联系方式</view>
<view class="fui-cell-label">{{ $lang('form.contactInfo') }}</view>
<view class="fui-cell-info">
<input class="fui-input" maxlength="11" placeholder="请输入您的手机号" type="number" v-model="Form.mobile" />
<input class="fui-input" maxlength="11" :placeholder="$lang('cases.inputMobile')" type="number" v-model="Form.mobile" />
</view>
</view>
<view class="fui-cell">
<view class="fui-cell-label" style="position:absolute;top:10px;">留言内容</view>
<view class="fui-cell-label" style="position:absolute;top:10px;">{{ $lang('cases.messageContent') }}</view>
<view class="fui-cell-info" style="margin-left:160rpx;border:solid 2rpx #eee;">
<textarea class="textarea" style="font-size:28rpx;padding:10rpx;" placeholder="请输入留言内容" v-model="Form.remark"></textarea>
<textarea class="textarea" style="font-size:28rpx;padding:10rpx;" :placeholder="$lang('cases.inputMessageContent')" v-model="Form.remark"></textarea>
</view>
</view>
</view>
</view>
</scroll-view>
<view class="button-box">
<button type="primary" @tap="save">提交</button>
<button type="primary" @tap="save">{{ $lang('form.submit') }}</button>
</view>
</view>
</uni-popup>
@@ -140,7 +140,7 @@ export default {
},
toDetail(item) {
const url = item.files_url;
uni.showLoading({ title: "正在加载" });
uni.showLoading({ title: this.$lang('cases.loading') });
try {
uni.downloadFile({
url: url,
@@ -164,7 +164,7 @@ export default {
},
complete: (res) => {
if (res.statusCode === 404) {
uni.showToast({ title: "文件不存在", icon: "none" });
uni.showToast({ title: this.$lang('cases.fileNotExist'), icon: "none" });
}
}
});
@@ -186,7 +186,7 @@ export default {
},
onTapDoc(item) {
const url = this.$util.img(item.files_url);
uni.showLoading({ title: "正在加载" });
uni.showLoading({ title: this.$lang('cases.loading') });
try {
uni.downloadFile({
url: url,
@@ -210,7 +210,7 @@ export default {
},
complete: (res) => {
if (res.statusCode === 404) {
uni.showToast({ title: "文件不存在", icon: "none" });
uni.showToast({ title: this.$lang('cases.fileNotExist'), icon: "none" });
}
}
});
@@ -220,7 +220,7 @@ export default {
},
share(item) {
const url = this.$util.img(item.files_url);
uni.showLoading({ title: "正在加载" });
uni.showLoading({ title: this.$lang('cases.loading') });
try {
uni.downloadFile({
url: url,
@@ -241,7 +241,7 @@ export default {
},
complete: (res) => {
if (res.statusCode === 404) {
uni.showToast({ title: "文件不存在", icon: "none" });
uni.showToast({ title: this.$lang('cases.fileNotExist'), icon: "none" });
}
}
});

24
pages_tool/contact/contact.vue
View File

@@ -73,7 +73,7 @@
<!-- 企业文件 -->
<view class="view_files_container" v-if="showFileListDiy && fileList.length > 0">
<view class="section-title">企业文件</view>
<view class="section-title">{{ $lang('contact.companyFiles') }}</view>
<view class="files-list">
<view v-for="(file, index) in fileList" :key="index" class="file-item">
<image mode="aspectFill" :src="$util.img('public/static/img/pdf-icon.png')"
@@ -90,7 +90,7 @@
</view>
<!-- 企业视频 -->
<view class="view_videos_container" v-if="showVideoListDiy && videoList.length > 0">
<view class="section-title">企业视频</view>
<view class="section-title">{{ $lang('contact.companyVideos') }}</view>
<view class="videos-list">
<view v-for="(video, index) in videoList" :key="index" class="video-item"
@click="playVideo(video)">
@@ -311,11 +311,11 @@ export default {
// 如果后台没配置，用默认值
this.mpShareData = {
appMessage: {
title: '联系我们',
title: this.$lang('contact.contactUs'),
path: '/pages_tool/contact/contact'
},
timeLine: {
title: '联系我们',
title: this.$lang('contact.contactUs'),
query: ''
}
};
@@ -369,22 +369,22 @@ export default {
},
save() {
if (!this.Form.realname.trim()) {
uni.showToast({ title: '请填写姓名', icon: 'none' });
uni.showToast({ title: this.$lang('contact.inputName'), icon: 'none' });
return;
}
if (!this.Form.mobile || !/^1[3-9]\d{9}$/.test(this.Form.mobile)) {
uni.showToast({ title: '手机号格式不正确', icon: 'none' });
uni.showToast({ title: this.$lang('contact.mobileFormatError'), icon: 'none' });
return;
}
if (!this.Form.remark.trim()) {
uni.showToast({ title: '请填写留言内容', icon: 'none' });
uni.showToast({ title: this.$lang('contact.inputMessage'), icon: 'none' });
return;
}
this.$api.sendRequest({
url: '/api/member/message',
data: this.Form,
success: res => {
uni.showToast({ title: res.message || '提交成功', icon: 'success' });
uni.showToast({ title: res.message || this.$lang('contact.submitSuccess'), icon: 'success' });
// 重置表单数据
@@ -402,7 +402,7 @@ export default {
// #endif
},
fail: () => {
uni.showToast({ title: '提交失败，请重试', icon: 'none' });
uni.showToast({ title: this.$lang('contact.submitFail'), icon: 'none' });
}
});
},
@@ -471,19 +471,19 @@ export default {
},
onShareAppMessage() {
return this.mpShareData?.appMessage || {
title: '联系我们',
title: this.$lang('contact.contactUs'),
path: '/pages_tool/contact/contact'
};
},
onShareTimeline() {
return this.mpShareData?.timeLine || {
title: '联系我们',
title: this.$lang('contact.contactUs'),
query: ''
};
},
onAddToFavorites() {
return {
title: '联系我们',
title: this.$lang('contact.contactUs'),
path: '/pages_tool/contact/contact'
};
},

2
pages_tool/index/diy.vue
View File

@@ -43,7 +43,7 @@
<view v-if="showTip" class="collectPopupWindow"
:style="{ marginTop: (collectTop + statusBarHeight) * 2 + 'rpx' }">
<image :src="$util.img('public/uniapp/index/collect2.png')" mode="aspectFit" show-menu-by-longpress/>
<text @click="closeCollectPopupWindow">我知道了</text>
<text @click="closeCollectPopupWindow">{{ $lang('common.iknow') }}</text>
</view>
</uni-popup>

4
pages_tool/member/balance.vue
View File

@@ -21,11 +21,11 @@
<!-- <view class="flex-box">
<view class="flex-item">
<view class="num price-font">{{ balanceInfo.balance_money|moneyFormat }}</view>
<view class="font-size-tag">现金余额（元）</view>
<view class="font-size-tag">{{ $lang('balance.cashBalance') }}</view>
</view>
<view class="flex-item">
<view class="num price-font">{{ balanceInfo.balance|moneyFormat }}</view>
<view class="font-size-tag">储值余额（元）</view>
<view class="font-size-tag">{{ $lang('balance.storeBalance') }}</view>
</view>
</view> -->
<view class="btns">

6
pages_tool/member/coupon.vue
View File

@@ -31,7 +31,7 @@
</view>
<view class="use_price" v-else-if="item.type == 'discount'">
{{ parseFloat(item.discount) }}
<text>折</text>
<text>{{ $lang('coupon.discountSuffix') }}</text>
</view>
<view class="use_condition font-size-tag" v-if="item.at_least > 0">
{{ $lang('form.full') }}{{ item.at_least }}{{ $lang('form.yuan') }}{{ $lang('coupon.available') }}</view>
@@ -41,8 +41,8 @@
<view class="item-info">
<view class="use_title">
<view class="title">{{ item.coupon_name }}</view>
<view class="max_price" v-if="item.goods_type == 2 || item.goods_type == 3" :class="{ disabled: item.state == 3 }">指定商品</view>
<view class="max_price" v-if="item.discount_limit != '0.00'">(最大优惠{{ item.discount_limit }}元)</view>
<view class="max_price" v-if="item.goods_type == 2 || item.goods_type == 3" :class="{ disabled: item.state == 3 }">{{ $lang('coupon.designatedGoods') }}</view>
<view class="max_price" v-if="item.discount_limit != '0.00'">({{ $lang('coupon.maxDiscount') }}{{ item.discount_limit }}{{ $lang('coupon.yuan') }})</view>
<view class="max_price" :class="{ disabled: item.useState == 2 }">{{ item.use_channel_name }}</view>
<!-- <view class="max_price truncate" v-if="item.use_channel!='online'" :class="{ disabled: item.useState == 2 }">
{{ item.use_store==='all'?'适用门店：全部门店': '适用门店：'+item.use_store_name}}

6
pages_tool/order/logistics.vue
View File

@@ -34,11 +34,11 @@
<view class="company-logo"><image :src="$util.img(packageItem.express_company_image)" show-menu-by-longpress></image></view>
<view class="info">
<view class="company">
<text>承运公司： {{ packageItem.express_company_name }}</text>
<text>{{ $lang('logistics.carrierCompany') }}： {{ packageItem.express_company_name }}</text>
</view>
<view class="no">
<text>
运单号：
{{ $lang('logistics.waybillNo') }}：
<text class="color-tip">{{ packageItem.delivery_no }}</text>
</text>
<text class="iconfont icon-fuzhi" @click="copyDeliveryNo(packageItem.delivery_no)"></text>
@@ -124,7 +124,7 @@ export default {
if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
} else {
this.$util.showToast({
title: '未获取到订单信息！'
title: this.$lang('order.noOrderInfo')
});
setTimeout(() => {
this.$util.redirectTo('/pages_order/list');

16
pages_tool/seal/medium/detail.vue
View File

@@ -14,8 +14,8 @@
</view>
<block v-if="g0>0">
<view class="foot">
<view @tap="generateImage" class="item" style="margin-right:30rpx;">导出图片</view>
<view @tap="generatePdf" class="item">导出PDF</view>
<view @tap="generateImage" class="item" style="margin-right:30rpx;">{{ $lang('seal.exportImage') }}</view>
<view @tap="generatePdf" class="item">{{ $lang('seal.exportPdf') }}</view>
</view>
</block>
</view>
@@ -50,7 +50,7 @@ export default {
methods: {
generatePdf() {
const url = this.$util.img(this.info.files_url);
uni.showLoading({ title: '正在加载' });
uni.showLoading({ title: this.$lang('cases.loading') });
try {
uni.downloadFile({
url: url,
@@ -70,7 +70,7 @@ export default {
},
complete: (res) => {
if (res.statusCode === 404) {
uni.showToast({ title: '文件不存在', icon: 'none' });
uni.showToast({ title: this.$lang('cases.fileNotExist'), icon: 'none' });
}
}
});
@@ -80,7 +80,7 @@ export default {
},
generateImage() {
const url = this.$util.img(this.info.img_url);
uni.showLoading({ title: '正在加载' });
uni.showLoading({ title: this.$lang('cases.loading') });
uni.downloadFile({
url: url,
success: (res) => {
@@ -89,16 +89,16 @@ export default {
uni.saveImageToPhotosAlbum({
filePath: res.tempFilePath,
success: () => {
this.$util.showToast({ title: '保存成功' });
this.$util.showToast({ title: this.$lang('seal.saveSuccess') });
},
fail: (err) => {
if (err.errMsg !== 'saveImageToPhotosAlbum:fail auth deny' && err.errMsg !== 'saveImageToPhotosAlbum:fail:auth denied') {
this.$util.showToast({ title: '保存失败，请稍后重试' });
this.$util.showToast({ title: this.$lang('seal.saveFail') });
}
}
});
} else {
this.$util.showToast({ title: '下载失败' });
this.$util.showToast({ title: this.$lang('seal.downloadFail') });
}
},
fail: (err) => {

6
pages_tool/seal/structure.vue
View File

@@ -3,13 +3,13 @@
<view class="picker-container">
<view v-for="(item, idx) in pickerList" :key="item.id" class="single-picker">
<picker mode="selector" :value="item.value" :range="item.range" range-key="name" @change="bindPickerChange($event, idx, item)">
<view class="picker">当前选择：{{item.range[item.value].name || '请选择'}}</view>
<view class="picker">{{ $lang('seal.currentSelection') }}：{{item.range[item.value].name || $lang('seal.pleaseSelect')}}</view>
</picker>
</view>
</view>
<block v-if="answerName">
<view style="font-size:32rpx;color:#ff0000;text-align:center;">
<view style="color:#ff0000;">选型结果：</view>{{answerName}}
<view style="color:#ff0000;">{{ $lang('seal.selectionResult') }}：</view>{{answerName}}
</view>
</block>
<block v-if="files_url">
@@ -20,7 +20,7 @@
<image style="width:50rpx;height:50rpx;" :src="g0" mode="widthFix" show-menu-by-longpress></image>
</view>
</view>
<view class="file_title">结果文件</view>
<view class="file_title">{{ $lang('seal.resultFile') }}</view>
</view>
</view>
</block>