Skip to content

J
jiedao-app-customer-new-master
Commit 133801e3 authored by chenwei's avatar chenwei
Browse files
Options

Merge branch 'release' into 'dev' 

Release

See merge request !15
parents 46c261b7 fa9c7981
Hide whitespace changes
Inline Side-by-side
Showing with 592 additions and 223 deletions
src/App.vue
View file @ 133801e3
......@@ -4,9 +4,12 @@
let Authorization = uni.getStorageSync('Authorization')
if((!Authorization || Authorization == '')){
uni.redirectTo({
url: './pages/login/login'
})
if(this.$route.path != '/pages/register/register' && this.$route.path != '/pages/activityShare/index' ){
uni.redirectTo({
url: './pages/login/login'
})
}
}
if(Authorization && !this.$store.state.userInfo){
this.$store.dispatch('updateUserInfo')
......
src/pages.json
View file @ 133801e3
......@@ -303,6 +303,12 @@
"style": {
"navigationStyle": "custom"
}
},
{
"path": "pages/activityShare/index",
"style": {
"navigationStyle": "custom"
}
}
],
"globalStyle": {
......
src/pages/activityShare/index.vue 0 → 100644
View file @ 133801e3
<template>
<view class="activity_detail">
<view class="detail">
<view class="title">{{language=='zh' ?detailInfo.titleZh:detailInfo.titleEn }}</view>
<view class="container">
<img class="coverImg" :src="language=='zh' ?detailInfo.coverImageZh:detailInfo.coverImageEn" alt="" srcset="">
<view class="activityDesc" v-html="language=='zh' ?detailInfo.extraShare.activityDescZh:detailInfo.extraShare.activityDescEn"></view>
</view>
</view>
</view>
</template>
<script>
export default {
data() {
return {
id: null,
memberCode:"",
detailInfo: {
extraShare:{
activityDescZh:''
}
},
language:"zh"
}
},
onLoad(route) {
console.log(route)
this.id = route.id
this.memberCode = route.memberId
this.getDetail()
},
computed: {
locale() {
return this.$lang.locale
},
detail() {
return this.$lang.lang.detail
}
},
methods: {
// 获取详情
getDetail() {
this.$request
.post("/app-api/member/score-rule/get", { id: this.id })
.then(({ code, data }) => {
if (code === 0 && data) {
this.detailInfo = data
this.handleTriggerShare()
}
})
},
handleTriggerShare(){
this.$request
.get("/app-api/member/score-rule/trigger/share", {userId: this.memberCode, ruleId:this.id })
.then(({ code, data }) => {
if (code === 0 && data) {
this.detailInfo = data
}
})
}
// 时间范围返回
}
}
</script>
<style lang="scss">
.activityDesc{
padding: 20upx;
}
.activity_detail{
max-width: 750upx;
.title{
padding: 20upx;
font-size: 16px;
font-weight: 600;
}
.coverImg{
width: 100%;
}
}
page {
/* #ifdef H5 */
padding-top: 140upx;
/* #endif */
/* #ifdef APP-PLUS */
padding-top: calc(var(--status-bar-height) + 100upx);
/* #endif */
background-color: #d4e5fe;
}
.container {
// padding: 20upx;
// background-color: #fff;
// border-radius: 20upx;
}
.img-box {
width: 100%;
height: 400upx;
display: flex;
justify-content: center;
align-items: center;
.img {
width: 100%;
height: 100%;
object-fit: cover;
}
}
.container-main {
padding: 12upx;
}
.activity-title {
font-size: 28upx;
height: 84upx;
display: flex;
align-items: center;
color: var(--c2);
}
.activity-remark {
font-size: 24upx;
color: #7f7f7f;
}
.activity-cell {
margin-top: 20upx;
width: 100%;
display: flex;
justify-content: space-between;
}
.cell-label {
font-size: 24upx;
color: #7f7f7f;
}
.cell-content {
display: flex;
align-items: center;
flex-wrap: wrap;
font-size: 24upx;
color: #7f7f7f;
}
.cell-image {
width: 24upx;
height: 24upx;
}
.cell-text {
margin-left: 6upx;
font-weight: 600;
font-size: 26upx;
color: #000;
}
</style>
src/pages/activity_detail/activity_detail.vue
View file @ 133801e3
......@@ -16,7 +16,7 @@
class="activity-remark"
v-if="detailInfo.type == 4"
v-html="
locale === 'zh_CN'
locale === 'zh'
? detailInfo.extraShare.activityDescZh
: detailInfo.extraShare.activityDescEn
"
......@@ -27,7 +27,7 @@
<view class="cell-content">
<image class="cell-image" src="../../static/img/score_b.png"></image>
<span v-if="detailInfo.type == 4">{{
detail.shareLabel(detailInfo.getScoreOnce)
detail.shareLabel(detailInfo.getScoreOnce)
}}</span>
<span v-if="detailInfo.type == 3">{{
detail.referralCodeLabel(detailInfo.getScoreOnce)
......@@ -115,6 +115,7 @@ export default {
},
// 时间范围返回
getTimeRange(start, end) {
const formatDate = (timestamp) => {
const date = new Date(timestamp)
const year = date.getFullYear()
......
src/pages/create_order/create_order.vue
View file @ 133801e3
......@@ -177,19 +177,13 @@
<view class="corder-goods">
<view class="" v-for="(item,index) in params.orderItemVOList" :key="index">
<view class="corder-gnums">{{index+1}}</view>
<view class="corder-goods-v">
<view class="corder-goods-v-item">
<view class="">
<view class="corder-goods-v" style="flex-direction: column">
<view class="corder-goods-v-item flex">
<view class="flex-1">
<text>{{$lang.lang.create.prodZh}}：</text>
<text>{{item.prodTitleZh}}</text>
</view>
<view class="">
<text>{{$lang.lang.create.brand}}：</text>
<text>{{item.brandType==1?$lang.lang.create.yes:$lang.lang.create.no}}</text>
</view>
</view>
<view class="corder-goods-v-item">
<view class="flex">
<view class="flex flex-1">
<text>{{$lang.lang.create.prodEn}}：</text>
<text class="flex-1">{{item.prodTitleEn}}</text>
<view class="action">
......@@ -197,7 +191,14 @@
<image v-else @click="item.showFull = false" src="../../static/img/sub.png" class="icon"></image>
</view>
</view>
<view class="flex items-center">
</view>
<view class="corder-goods-v-item flex">
<view class="flex-1">
<text>{{$lang.lang.create.brand}}：</text>
<text>{{item.brandType==1?$lang.lang.create.yes:$lang.lang.create.no}}</text>
</view>
<view class="flex-1 flex">
<text>{{$lang.lang.create.form}}：</text>
<text class="flex-1">{{item.num}}{{$lang.lang.create.box}}</text>
<view class="action flex">
......@@ -208,7 +209,7 @@
</view>
</view>
<view class="corder-goods-v" v-if="item.showFull">
<view class="corder-goods-v-item">
<view class="corder-goods-v-item2">
<view class="">
<text>{{$lang.lang.create.num}}：</text>
<text>{{item.quantity||0}}{{$lang.lang.create.aunit}}</text>
......@@ -231,7 +232,7 @@
</view>
</view>
<view class="corder-goods-v-item">
<view class="corder-goods-v-item2">
<view class="">
<text>{{$lang.lang.create.prodAttr}}： </text>
<text>{{getProductAttrLabel(item.prodAttrIds)}}</text>
......@@ -251,6 +252,13 @@
<view class="corder-linkLabel" @click="toLink(item.link)"><input v-model="item.link" type="text" disabled/></view>
<view class="link-btn" @click="openLink(index)">{{item.link?$lang.lang.create.editLink:$lang.lang.create.addLink}}</view>
</view>
<view class="corder-bom" v-if="item.showFull">
<view class="corder-bom-v"></view>
<view class="corder-bom-v">
<view class="" @click="open(index)">{{$lang.lang.create.edit}}</view>
<view class="" @click="delGoods(index)">{{$lang.lang.create.delete}}</view>
</view>
</view>
</view>
</view>
......@@ -414,7 +422,13 @@
<view class="corder-phone">
<input class="countrySn-input" v-model="params.collectionProxy" type="number" :placeholder="$lang.lang.create.money" />
<view class="countrySn-item">
<picker class="countrySn" :value="config.currencyType.index" :range="config.currencyType.label" data-config="currencyType" data-key="collectionProxyCurrency" @change="configChange" v-if="config.currencyType.value.length > 0">
<picker class="countrySn" style="width: 100px"
:value="config.currencyType.index"
:range="config.currencyType.label"
data-config="currencyType"
data-key="collectionProxyCurrency"
@change="configChange"
v-if="config.currencyType.value.length > 0">
<view class="uni-input">{{config.currencyType.label[config.currencyType.index]}}</view>
</picker>
<image class="rgt" src="../../static/img/rgt.png" mode="widthFix"></image>
......@@ -1018,7 +1032,35 @@
objectiveId: 0, //目的地ID
lineId: 0, //线路ID
channelId:0,//渠道ID
orderItemVOList:[{showFull: false, prodAttrIds: ''}],
orderItemVOList:[
/*{
"prodTitleZh": "测试单询产品",
"prodTitleEn": "dd11",
"volume": "1",
"prodAttrs": [
"16"
],
"prodAttrIds": "16",
"brandType": "0",
"num": "1",
"unit": "1",
"quantity": "1",
"weight": "1",
"worth": "123",
"material": null,
"prodId": 3719,
"showFull": true,
"charging": 0,
"clearanceFreight": 20,
"clearanceFreightCurrency": 27,
"clearanceFreightVolume": 7,
"seaFreight": 30,
"seaFreightCurrency": 27,
"seaFreightVolume": 7,
"isPayAdvance": 0,
"premium": 2
}*/
],
costVO:{},
deliveryDate:currentDate+' 00:00:00',
drawee:2,
......@@ -1069,7 +1111,6 @@
collectionShow:false,
isdisable:false,
searchKey:'',//搜索联系人关键词
page:1,
moreShow:true,
controlLine:false,//线路控货
currencyUnit:0,
......@@ -1156,6 +1197,10 @@
methods: {
changeHasConsignee(e){
this.hasConsignee = e.detail.value === "1"
// 无收货人默认发货人付款
if(!this.hasConsignee){
this.$set(this.params, 'drawee', 1)
}
},
toback(){
uni.navigateBack()
......
src/pages/integral/components/points.vue
View file @ 133801e3
<template>
<view class="int">
<view
class="int-content"
v-for="item in activityList"
:key="item.id"
@click="toDetail(item.id)"
class="contentBox"
>
<view class="int-content-left">
<view class="content-tag">
<view class="tag-text">{{ locale === 'zh' ? item.typeZh : item.typeEn }}</view>
<view class="int-content" @click="toDetail(item.id)">
<view class="int-content-left">
<view class="content-tag">
<view class="tag-text">{{ locale === 'zh' ? item.typeZh : item.typeEn }}</view>
</view>
<image
class="content-image"
:src="locale === 'zh' ? item.coverImageZh : item.coverImageEn"
></image>
</view>
<view class="int-content-right">
<view class="content-title">{{ locale === 'zh' ? item.titleZh : item.titleEn }}</view>
<view class="content-text">{{ locale === 'zh' ? item.descZh : item.descEn }}</view>
</view>
<image
class="content-image"
:src="locale === 'zh' ? item.coverImageZh : item.coverImageEn"
></image>
</view>
<view class="int-content-right">
<view class="content-title">{{ locale === 'zh' ? item.titleZh : item.titleEn }}</view>
<view class="content-text">{{ locale === 'zh' ? item.descZh : item.descEn }}</view>
<view v-if="item.type == 3||item.type == 4" class="btn" @click="handleCopyBtn(item, $event)">
{{ $lang.lang.integral.copy }}
</view>
</view>
</view>
......@@ -39,6 +43,41 @@ export default {
}
},
methods: {
getCopyText(item) {
if (item.type == 3) {
return `${this.locale === 'zh' ? item.extraRecommend.shareContentZh : item.extraRecommend.shareContentEn} ${item.recommendUrl} `
} else if (item.type == 4) {
return `${this.locale === 'zh' ? item.titleZh
: item.titleEn} ${item.extraShare.activityUrl}?id=${item.id}&memberId=${this.$store.getters.id}&language=${this.locale}`
}
},
handleCopyBtn(item ,e){
this.$request
.post('/app-api/member/score-rule/share-record/create', { memberId: this.$store.getters.id,
ruleId: item.id })
.then(({ code, data }) => {
if (code == 0) {
const str =this.getCopyText(item)
uni.setClipboardData({
data:str,
success:()=>{
uni.showToast({
title:this.$lang.lang.notices.copySuccess,
icon:"none",
})
}
})
// uni.navigateTo({
// url: '/pages/activityShare/index?id=' + item.id + '&memberId=' + this.$store.getters.id+ '&language='+this.locale
// })
}
})
},
toDetail(id) {
uni.navigateTo({
url: '/pages/activity_detail/activity_detail?id=' + id
......@@ -47,7 +86,7 @@ export default {
// 获取活动列表
getActivityList() {
this.$request
.post('/app-api/member/score-rule/list', { platform: 2 })
.post('/app-api/member/score-rule/list', { platform: 2,memberId:this.$store.getters.id })
.then(({ code, data }) => {
// console.log(res)
if (code == 0 && data) {
......@@ -60,6 +99,19 @@ export default {
</script>
<style lang="scss" scoped>
.contentBox{
position: relative;
.btn{
position: absolute;
right: 14upx;
bottom: 10upx;
padding: 6upx 28upx;
border-radius: 100px;
font-size: 24upx;
border: 1px solid #5382fe;
color: #5382fe;
}
}
.int {
padding: 30upx 0;
height: inherit;
......
src/pages/login/login.vue
View file @ 133801e3
......@@ -161,6 +161,7 @@ export default {
areaData: [],
areaName: [],
loginType: 1,
closePopup:true,
leviteInfo: '',
mobile: '',
password: '',
......
src/pages/orderInfo/orderInfo.vue
View file @ 133801e3
......@@ -132,9 +132,9 @@
<view class="order-info-title">
<image src=".../../static/img/order-express.png" mode=""></image>
<text>{{$lang.lang.orderInfo.logistics}}</text>
<text class="mudi">{{$lang.lang.orderInfo.startCity}}：{{orderData.initialLogisticsInfoDto?($lang.locale=='zh'?orderData.initialLogisticsInfoDto.startTitleZh:orderData.initialLogisticsInfoDto.startTitleZh):''}}</text>
</view>
<view class="order-info-txt">
<view class="mudi">{{$lang.lang.orderInfo.startCity}}：{{orderData.initialLogisticsInfoDto?($lang.locale=='zh'?orderData.initialLogisticsInfoDto.startTitleZh:orderData.initialLogisticsInfoDto.startTitleZh):''}}</view>
<!-- <view class="">{{$lang.lang.orderInfo.address}}：{{orderData.logisticsInfoDto?($lang.locale=='zh'?orderData.logisticsInfoDto.startAddressZh:orderData.logisticsInfoDto.startAddressEn):''}} </view> -->
<view>{{$lang.lang.orderInfo.endCity}}：{{orderData.initialLogisticsInfoDto?($lang.locale=='zh'?(orderData.initialLogisticsInfoDto.destCountryTitleZh+'-'+(objectCity?objectCity.titleZh:'')+'-'+orderData.initialLogisticsInfoDto.destTitleZh):(orderData.initialLogisticsInfoDto.destCountryTitleEn+'-'+(objectCity?objectCity.titleEn:'')+'-'+orderData.initialLogisticsInfoDto.destTitleEn)):''}}</view>
</view>
......@@ -175,7 +175,7 @@
</view>
<view style="height: 36px;">{{$lang.lang.orderInfo.datas}}：{{orderData.sumNum}}{{$lang.lang.orderInfo.box}} {{orderData.vweight}}KG {{orderData.wvolume}}m³ {{orderData.sumQuantity}}{{$lang.lang.create.aunit}}</view>
<view style="height: 36px;">{{$lang.lang.orderInfo.customsType}}：{{getConfigLabel('customsType',orderData.customsType)}}</view>
<view style="height: 36px;">{{$lang.lang.orderInfo.isCargoControl}}：{{orderData.isCargoControl?$lang.lang.orderInfo.yes:$lang.lang.orderInfo.no}}</view>
<view style="height: 36px;">{{$lang.lang.orderInfo.isCargoControl}}：{{orderData.isCargoControl?$lang.lang.orderInfo.yes:$lang.lang.orderInfo.no}}</view>
<view>{{$lang.lang.create.specialNote}}: {{orderData.packageRemarks||''}}</view>
</view>
</view>
......@@ -186,7 +186,13 @@
<view class="order-info-line" >
<view class="order-info-line-v">
<view style="height: 36px;">{{$lang.lang.orderInfo.time}}：{{orderData.deliveryDate||$lang.lang.orderInfo.none}}</view>
<view style="height: 36px;" v-if="['3','4'].indexOf(orderData.transportId+'') > -1">{{$lang.lang.orderInfo.clearCard}}：{{orderData.customsClearCert?$lang.lang.orderInfo.is:$lang.lang.orderInfo.no}}</view>
<view style="height: 36px;" v-if="['3','4'].indexOf(orderData.transportId+'') > -1">
{{$lang.lang.orderInfo.clearCard}}：
<template v-if="orderData.customsClearCert !== null">
{{orderData.customsClearCert? $lang.lang.orderInfo.is : $lang.lang.orderInfo.no}}
</template>
<template v-else>-</template>
</view>
<view style="height: 36px;" v-if="['3','4'].indexOf(orderData.transportId+'') > -1">{{$lang.lang.orderInfo.unpack}}：{{orderData.isUnpack?$lang.lang.orderInfo.is:$lang.lang.orderInfo.no}}</view>
<view style="height: 36px;">{{$lang.lang.orderInfo.loans}}：{{orderData.collectionProxy?($lang.lang.orderInfo.yes+' ('+orderData.collectionProxy+getType(orderData.collectionProxyCurrency)+')'):$lang.lang.orderInfo.no}}</view>
<view style="height: 72px;" v-if="orderData.isExternalWarehouse&&orderData.externalWarehousedtolist.length>0">
......@@ -194,7 +200,7 @@
<text>{{$lang.lang.orderInfo.estLoading}}:{{orderData.externalWarehousedtolist[0].estLoadingtime}}</text>
<text>{{$lang.lang.orderInfo.loadingAddress}}:{{orderData.externalWarehousedtolist[0].loadingAddress}}</text>
</view>
<view style="height: 36px;">{{$lang.lang.orderInfo.creator}}:{{orderData.creator}}</view>
<view style="height: 36px;">{{$lang.lang.orderInfo.creator}}:{{orderData.creatorName}}</view>
</view>
<view class="order-info-line-v">
<view style="height: 36px;">{{$lang.lang.orderInfo.levite}}：{{getConfigLabel('warehouseType',orderData.warehouseType)}}</view>
......@@ -202,7 +208,7 @@
<view style="height: 36px;" v-if="['3','4'].indexOf(orderData.transportId+'') > -1">{{$lang.lang.create.nowChange}}：{{orderData.isSingleTicketTransport?$lang.lang.create.is:$lang.lang.create.fou}}</view>
<view style="height: 36px;">{{$lang.lang.orderInfo.tidanPrice}}:{{orderData.displayBillLadingPrice?$lang.lang.orderInfo.show:$lang.lang.orderInfo.noShow}}</view>
<view style="height: 36px;">{{$lang.lang.create.quickNo}}:{{orderData.number}}</view>
<view style="height: 36px;">{{$lang.lang.orderInfo.createTime}}：{{orderData.createTime}}</view>
<view style="height: 36px;">{{$lang.lang.orderInfo.createTime}}：{{orderData.createTime|$parseTime}}</view>
</view>
</view>
</view>
......@@ -226,7 +232,7 @@
<view class="order-table" v-if="activeIndex==0&&orderData.orderItemVOList&&orderData.orderItemVOList.length>0">
<view style="width: 100%;" v-for="(item,index) in orderData.orderItemVOList" :key="index">
<view class="number_shop">{{parseInt(index)+1}}</view>
<view class="order-info-line" >
<view class="order-info-line" >
<view class="order-info-line-v">
<view class="order-table-v">
<text>{{$lang.lang.orderInfo.prodZh}}:{{item.prodTitleZh}}/{{item.prodTitleEn}}</text>
......@@ -235,7 +241,7 @@
<text>{{$lang.lang.orderInfo.formInfo}}:{{item.num}}{{$lang.lang.orderInfo.box}}{{item.weight}}KG{{item.volume}}m³{{item.quantity}}{{$lang.lang.create.aunit}}</text>
</view>
<view class="order-table-v">
<text>{{$lang.lang.orderInfo.works}}:{{item.worth}}</text>
<text>{{$lang.lang.orderInfo.works}}:{{item.worth}}RMB</text>
</view>
</view>
<view class="order-info-line-v">
......@@ -404,22 +410,22 @@
objectCity:'',
typeName:'',
packageTypeName:'',
basicShowMore:false,
shopShowMore:false
}
},
onLoad(options) {
let that = this
    uni.getSystemInfo({
         success: function (res) {
            that.tdWidth=res.windowWidth*0.72;
that.widowsWidth=res.windowWidth*0.72;
that.windowsHeight = res.windowHeight*0.8;
that.phoneHeight = res.windowHeight
that.phoneWidth = res.windowWidth
          }
    });
uni.getSystemInfo({
success: function (res) {
that.tdWidth=res.windowWidth*0.72;
that.widowsWidth=res.windowWidth*0.72;
that.windowsHeight = res.windowHeight*0.8;
that.phoneHeight = res.windowHeight
that.phoneWidth = res.windowWidth
}
});
this.getTreeList()
this.getcurrency()
this.orderConfig('transport_type', 'transport')
......@@ -500,7 +506,7 @@
}
if(res.data.packageType){
that.config.packageType.forEach(item=>{
if(res.data.packageType.includes(item.value)){
that.packageTypeName += that.$lang.locale=='zh'?item.label:item.labelEn
}
......@@ -872,4 +878,7 @@
<style>
@import url("../../static/css/orderInfo.css");
.corder-goods-v-item view text:nth-child(2){
line-height: unset;
}
</style>
src/pages/register/register.vue
View file @ 133801e3
<template>
<view class="main">
<!-- #ifdef H5 -->
<view class="downloadBox" v-if="closePopup">
<image class="logoImg"
src="/static/img/logo.76c4d986.png"
></image>
<view class="textAlert">捷道国际货运APP</view>
<view class="downloadBtn" @click="handleDownload">立即下载</view>
<view class="closeBtn-l" @click="closePopup= false">X</view>
</view>
<!-- #endif -->
<view class="login-top">
<image
src="../../static/img/back.png"
......@@ -126,6 +136,7 @@ export default {
},
data() {
return {
closePopup: true,
areaIndex: 0,
mobile: "",
password: "",
......@@ -140,8 +151,18 @@ export default {
},
onLoad() {
this.Country();
this.referralCode= this.$route.query.code
},
methods: {
handleDownload(){
if (uni.getSystemInfoSync().platform === 'android') {
console.log('运行Android上')
window.open('https://www.pgyer.com/qHcSOD1F', "_blank")
} else {
window.open('https://apps.apple.com/cn/app/e-c-logistics/id6466407990', "_blank")
console.log('运行iOS上')
}
},
showUser() {
this.$refs.userment.open();
},
......@@ -289,4 +310,39 @@ export default {
</script>
<style>
@import url(../../static/css/register.css);
.downloadBox{
height: 100upx;
position: absolute;
top: 0;
left: 0;
width: 100%;
background: #373333c7;
padding: 10upx 54upx;
display: flex;
z-index: 10;
align-items: center;
}
.textAlert{
padding: 0 40upx;
color: #fff;
}
.logoImg{
height: 60upx;
width: 60upx;
}
.downloadBtn{
background: #5BA8DC;
padding: 4upx 20upx;
color:#fff ;
font-size: 36upx;
border-radius: 100px;
}
.closeBtn-l{
color: #fff;
font-size: 24upx;
padding: 8px;
top: 0px;
position: absolute;
right: 70px;
}
</style>
src/static/css/create_order.css
View file @ 133801e3
......@@ -164,15 +164,22 @@ radio{
color: var(--c6);
font-size: var(--f24);
}
.corder-goods-v-item{
.corder-goods-v-item, .corder-goods-v-item2{
flex: 1;
margin-bottom: 20rpx;
}
.corder-goods-v-item view{
padding: 0;
}
.corder-goods-v-item2 view{
margin-bottom: 20rpx;
}
.corder-goods-v-item2 view:last-child{
margin-bottom: 0;
}
.corder-goods-v-item view text:nth-child(2){
color: var(--c-1);
line-height: 30px;
/*line-height: 30px;*/
}
.corder-bom{
width: 100%;
......
src/static/css/orderInfo.css
View file @ 133801e3
......@@ -208,6 +208,7 @@ page{
font-size: var(--f24);
color: var(--c3);
display: flex;
flex-wrap: wrap;
line-height: 70upx;
border-top-left-radius: 12upx;
border-top-right-radius: 12upx;
......@@ -219,9 +220,9 @@ page{
}
.twotext{
overflow: hidden;
text-overflow: ellipsis;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
}
.order-table-v{
......@@ -348,5 +349,5 @@ page{
border-bottom: none;
margin-bottom: -20upx;
padding-left: 8rpx;
}
\ No newline at end of file
}
src/static/lang/en.js
View file @ 133801e3
......@@ -31,38 +31,38 @@ import finsh from './en/finsh.js'
import orderInfo from './en/orderInfo.js'
import price from './en/price.js'
import site from './en/site.js'
export default{
notices,
auth,
addressInfo,
boxException,
changeTel,
companyInfo,
complaint,
complaintAdd,
consult,
coupon,
create,
docException,
detail,
ecash,
editEmail,
editPsd,
exception,
forget,
help,
index,
integral,
levite,
light,
login,
log,
msg,
myInfo,
notice,
order,
finsh,
orderInfo,
price,
site,
export default {
notices,
auth,
addressInfo,
boxException,
changeTel,
companyInfo,
complaint,
complaintAdd,
consult,
coupon,
create,
docException,
detail,
ecash,
editEmail,
editPsd,
exception,
forget,
help,
index,
integral,
levite,
light,
login,
log,
msg,
myInfo,
notice,
order,
finsh,
orderInfo,
price,
site,
}
src/static/lang/en/detail.js
View file @ 133801e3
export default {
"activity": "Event Details",
"illustrate": "Points Description",
"maxIntegral": "Accumulate the highest number of points",
"date": "expiration date",
"rulesIllustrate": "Rule Description",
"total": "total",
"integral": "integral",
"exchangeTitle": "Redemption details",
"activityTime": "Event time",
"exchangeOutlets": "Redemption outlets",
"exchangeType": "Redemption Method",
"address": "Delivery address",
"courierNum": "The tracking number",
"courierCompany": "Courier companies",
"courierTime": "The date of delivery",
"remark": "remark",
"errorMsg": "The address cannot be modified after submission, if you need to modify the address, please contact customer service",
"to": "to"
}
\ No newline at end of file
activity: 'Event Details',
illustrate: 'Points Description',
maxIntegral: 'Accumulate the highest number of points',
date: 'expiration date',
rulesIllustrate: 'Rule Description',
total: 'total',
integral: 'integral',
num: val => {
return `'total ${val} pieces'`
},
exchangeTitle: 'Redemption details',
activityTime: 'Event time',
exchangeOutlets: 'Redemption outlets',
exchangeType: 'Redemption Method',
address: 'Delivery address',
courierNum: 'The tracking number',
courierCompany: 'Courier companies',
courierTime: 'The date of delivery',
remark: 'remark',
errorMsg:
'The address cannot be modified after submission, if you need to modify the address, please contact customer service',
registerLabel: val => `${val} points for successful registration`,
referralCodeLabel: val => `Earn ${val} points for each person invited to register and log in`,
shareLabel: val => `Get ${val} points per click after sharing on social platforms`,
orderRuleLabel: params => `${params.low}${params.unit}-${params.high}${params.unit} Get ${params.score}`,
to: 'to',
}
src/static/lang/en/integral.js
View file @ 133801e3
export default {
"info": "my integral",
"headerTitle": "Honorable",
"spend": "redeemed points are",
"available": "The available credits are",
"logPoints": "points log",
"logExchange": "exchange log",
"redeemGifts": "redeem gifts",
"pointsCampaign": "points campaign",
"pointsRemark": "Points can be redeemed differently at different outlets",
"outlets": "Please select a location",
"orderMail": "Confirm the order",
"code": "Get a verification code",
"codePlaceloader": "Please enter a verification code",
"codeError": "The verification code is incorrect",
"remark": "Please enter a comment",
"submitOrder": "Submit your order",
"redeemType": "Redemption Method",
"activityTime": "Event time",
"textLength": "Enter up to 100 words",
"totalScore1": "integral",
"addAddress": "new address for additional shipments",
"totalScoreError": "Insufficient points",
"to": "to"
}
\ No newline at end of file
copy: 'copy',
info: 'my integral',
headerTitle: 'Honorable',
spend: 'redeemed points are',
available: 'The available credits are',
logPoints: 'points log',
logExchange: 'exchange log',
redeemGifts: 'redeem gifts',
pointsCampaign: 'points campaign',
pointsRemark: 'Redemption points are different at different pick-up points',
outlets: 'Please select the pick-up point',
remainder: val => {
return `剩余${val}份`
},
orderMail: 'Confirm the order',
code: 'Get a verification code',
codePlaceloader: 'Please enter a verification code',
codeError: 'The verification code is incorrect',
codeTimeText: val => {
return `${val}秒后重新获取`
},
remark: 'Please enter a comment',
submitOrder: 'Submit your order',
redeemType: 'Redemption Method',
activityTime: 'Event time',
textLength: 'Enter up to 100 words',
totalScore: num => {
return `已选${num}件，合计积分：`
},
totalScore1: 'integral',
addAddress: 'new address for additional shipments',
totalScoreError: 'Insufficient points',
to: 'to',
}
src/static/lang/zh.js
View file @ 133801e3
......@@ -31,38 +31,38 @@ import finsh from './zh/finsh.js'
import orderInfo from './zh/orderInfo.js'
import price from './zh/price.js'
import site from './zh/site.js'
export default{
notices,
auth,
addressInfo,
boxException,
changeTel,
companyInfo,
complaint,
complaintAdd,
consult,
coupon,
create,
docException,
detail,
ecash,
editEmail,
editPsd,
exception,
forget,
help,
index,
integral,
levite,
light,
login,
log,
msg,
myInfo,
notice,
order,
finsh,
orderInfo,
price,
site,
export default {
notices,
auth,
addressInfo,
boxException,
changeTel,
companyInfo,
complaint,
complaintAdd,
consult,
coupon,
create,
docException,
detail,
ecash,
editEmail,
editPsd,
exception,
forget,
help,
index,
integral,
levite,
light,
login,
log,
msg,
myInfo,
notice,
order,
finsh,
orderInfo,
price,
site,
}
src/static/lang/zh/create.js
View file @ 133801e3
export default {
"create": "我要发货",
"transport": "订单运输",
"type": "订单类型",
"service": "集运服务",
"transport": "运输",
"type": "服务",
"service": "集运",
"oversears": "海外仓",
"toRoom": "送货上门",
"exception": " 提货异常",
......@@ -11,8 +11,8 @@ export default {
"endCity": "目的城市",
"method": "运输方式",
"channel": "出货渠道",
"info": "商品信息",
"addShop": "添加商品",
"info": "商品",
"addShop": "添加",
"prodZh": "中文品名",
"brand": "品牌",
"num": "数量",
......@@ -65,7 +65,7 @@ export default {
"nowNotice": "注：若只有一件，货到仓库立即发，选“是”，多件需仓库集运待发，选“否”",
"specialNote": "特需备注",
"special": "特殊要求",
"orderInfo": "订单信息",
"orderInfo": "通用",
"marks": "唛头",
"isCargoControl": "是否控货",
"customsType": "单证报关",
......@@ -82,7 +82,7 @@ export default {
"addressInfo": "收货详细地址",
"name": "姓名",
"nameEn": "英文名",
"choiceConsignee": "选择收货人",
"choiceConsignee": "收货人",
"phone": "电话",
"email": "邮箱",
"company": "公司名称",
......@@ -113,4 +113,4 @@ export default {
"cnotice5": "该货物有以上两种情况出现",
"overSeaWarehouseTips": "如需海外仓服务，请联系客服，服务热线：400-900-9962",
"other": "其他"
}
\ No newline at end of file
}
src/static/lang/zh/detail.js
View file @ 133801e3
export default {
"activity": "活动详情",
"illustrate": "积分说明",
"maxIntegral": "累计最高积分",
"date": "有效期",
"rulesIllustrate": "规则说明",
"total": "共计",
"integral": "积分",
"exchangeTitle": "兑换详情",
"activityTime": "活动时间",
"exchangeOutlets": "兑换网点",
"exchangeType": "兑换方式",
"address": "收货地址",
"courierNum": "快递单号",
"courierCompany": "快递公司",
"courierTime": "快递日期",
"remark": "备注",
"errorMsg": "地址提交后无法修改，如需修改地址请联系客服",
"to": "至"
}
\ No newline at end of file
activity: '活动详情',
illustrate: '积分说明',
maxIntegral: '累计最高积分',
date: '有效期',
rulesIllustrate: '规则说明',
total: '共计',
integral: '积分',
num: val => {
return `共${val}件`
},
exchangeTitle: '兑换详情',
activityTime: '活动时间',
exchangeOutlets: '兑换网点',
exchangeType: '兑换方式',
address: '收货地址',
courierNum: '快递单号',
courierCompany: '快递公司',
courierTime: '快递日期',
remark: '备注',
errorMsg: '地址提交后无法修改，如需修改地址请联系客服',
registerLabel: val => `注册成功即可获得${val}积分`,
referralCodeLabel: val => `每邀请1人注册并登录获得${val}积分`,
shareLabel: val => `分享到社交平台后，每次点击获得${val}积分`,
orderRuleLabel: params => `${params.low}${params.unit}-${params.high}${params.unit}获得${params.score}积分`,
to: '至',
}
src/static/lang/zh/integral.js
View file @ 133801e3
export default {
"info": "我的积分",
"headerTitle": "尊贵的",
"spend": "已兑换积分为",
"available": "可用积分为",
"logPoints": "积分日志",
"logExchange": "兑换日志",
"redeemGifts": "兑换礼品",
"pointsCampaign": "积分活动",
"pointsRemark": "不同网点兑换积分不同",
"outlets": "请选择网点",
"orderMail": "确定订单",
"code": "获取验证码",
"codePlaceloader": "请输入验证码",
"codeError": "验证码错误",
"remark": "请输入备注",
"submitOrder": "提交订单",
"redeemType": "兑换方式",
"activityTime": "活动时间",
"textLength": "最多输入100字",
"totalScore1": "积分",
"addAddress": "新增收货地址",
"totalScoreError": "积分不足",
"to": "至"
}
\ No newline at end of file
copy: '复制',
info: '我的积分',
headerTitle: '尊贵的',
spend: '已兑换积分为',
available: '可用积分为',
logPoints: '积分日志',
logExchange: '兑换日志',
redeemGifts: '兑换礼品',
pointsCampaign: '积分活动',
pointsRemark: '不同提货点兑换积分不同',
outlets: '请选择提货点',
remainder: val => {
return `剩余${val}份`
},
orderMail: '确定订单',
code: '获取验证码',
codePlaceloader: '请输入验证码',
codeError: '验证码错误',
codeTimeText: val => {
return `${val}秒后重新获取`
},
remark: '请输入备注',
submitOrder: '提交订单',
redeemType: '兑换方式',
activityTime: '活动时间',
textLength: '最多输入100字',
totalScore: num => {
return `已选${num}件，合计积分：`
},
totalScore1: '积分',
addAddress: '新增收货地址',
totalScoreError: '积分不足',
to: '至',
}
src/static/lang/zh/orderInfo.js
View file @ 133801e3
......@@ -16,7 +16,7 @@ export default {
"toRoom": "送货上门",
"consigneeCity": "收货地区",
"consigneeAdd": "收货地址",
"logistics": "物流信息",
"logistics": "运输",
"endCity": "目的仓",
"startCity": "始发仓",
"address": "地址",
......@@ -87,5 +87,6 @@ export default {
"createTime":"创建时间",
"inWarehouseInfo":"入仓信息",
"quickNos":"填单快递单号",
"unitType":"包装类型"
}
\ No newline at end of file
"unitType":"包装类型",
"is": "是"
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment