Commit a4a0032f authored by dragondean@qq.com's avatar dragondean@qq.com

订单编辑适配

parent 288dedd9
...@@ -8,6 +8,9 @@ ...@@ -8,6 +8,9 @@
url: './pages/login/login' url: './pages/login/login'
}) })
} }
if(Authorization && !this.$store.state.userInfo){
this.$store.dispatch('updateUserInfo')
}
//#ifdef APP-PLUS //#ifdef APP-PLUS
plus.runtime.getProperty( plus.runtime.appid, function ( wgtinfo ) { plus.runtime.getProperty( plus.runtime.appid, function ( wgtinfo ) {
// 获取 app的version // 获取 app的version
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
"name" : "E&C logistics", "name" : "E&C logistics",
"appid" : "__UNI__B690450", "appid" : "__UNI__B690450",
"description" : "", "description" : "",
"versionName" : "221", "versionName" : "225",
"versionCode" : 221, "versionCode" : 225,
"transformPx" : false, "transformPx" : false,
"app-plus" : { "app-plus" : {
/* 5+App特有相关 */ /* 5+App特有相关 */
...@@ -19,7 +19,8 @@ ...@@ -19,7 +19,8 @@
}, },
"modules" : { "modules" : {
"VideoPlayer" : {}, "VideoPlayer" : {},
"Barcode" : {} "Barcode" : {},
"Camera" : {}
}, },
/* 模块配置 */ /* 模块配置 */
"distribute" : { "distribute" : {
......
This diff is collapsed.
...@@ -104,7 +104,7 @@ radio{ ...@@ -104,7 +104,7 @@ radio{
margin: 0 20upx 16upx 0; margin: 0 20upx 16upx 0;
} }
.corder-tab-top view{ .corder-tab-top view{
display: block; /*display: block;*/
width: 90%; width: 90%;
border-bottom: 1px solid var(--cdf); border-bottom: 1px solid var(--cdf);
padding-bottom: 16upx; padding-bottom: 16upx;
......
...@@ -82,3 +82,34 @@ view{ ...@@ -82,3 +82,34 @@ view{
width: 100%; width: 100%;
height: var(--status-bar-height); height: var(--status-bar-height);
} */ } */
.flex{
display: flex;
}
.items-center{
align-items: center;
}
.items-start{
align-items: start;
}
.items-end{
align-items: end;
}
.justify-center{
justify-content: center;
}
.justify-start{
justify-content: start;
}
.justify-end{
justify-content: end;
}
.justify-between{
justify-content: space-between;
}
.justify-around{
justify-content: space-around;
}
.flex-1{
flex: 1;
}
export default{ export default{
tips: 'Tips',
notices:{ notices:{
name:'your name', name:'your name',
nameEn:'your English name', nameEn:'your English name',
...@@ -8,7 +9,6 @@ export default{ ...@@ -8,7 +9,6 @@ export default{
Id1:'Please upload frontal photo of ID', Id1:'Please upload frontal photo of ID',
Id2:'Please upload back side photo of ID', Id2:'Please upload back side photo of ID',
success:'Submitted successfully', success:'Submitted successfully',
loading:'Uploading..',
newPhone: 'new phone', newPhone: 'new phone',
edited:'Edited Success', edited:'Edited Success',
company:'company name', company:'company name',
...@@ -347,6 +347,7 @@ export default{ ...@@ -347,6 +347,7 @@ export default{
cnotice3:'The export procedures for the goods will be handled by our company on behalf of us', cnotice3:'The export procedures for the goods will be handled by our company on behalf of us',
cnotice4:'The goods are provided by the shipper with relevant export documents and entrusted to our company for processing', cnotice4:'The goods are provided by the shipper with relevant export documents and entrusted to our company for processing',
cnotice5:'The goods have two situations mentioned above', cnotice5:'The goods have two situations mentioned above',
overSeaWarehouseTips:'If you need overseas warehouse services, please contact customer service, service hotline: 400-900-9962',
}, },
docException: { docException: {
doc:'Document abnormal', doc:'Document abnormal',
......
export default{ export default{
tips: "温馨提示",
notices:{ notices:{
name:'请输入姓名', name:'请输入姓名',
nameEn:'请输入英文名', nameEn:'请输入英文名',
...@@ -8,7 +9,6 @@ export default{ ...@@ -8,7 +9,6 @@ export default{
Id1:'请上传证件正面照', Id1:'请上传证件正面照',
Id2:'请上传证件反面照', Id2:'请上传证件反面照',
success:'提交成功', success:'提交成功',
loading:'上传中..',
newPhone: '请输入您的新手机号', newPhone: '请输入您的新手机号',
edited:'修改成功', edited:'修改成功',
company:'请输入公司名称', company:'请输入公司名称',
...@@ -129,7 +129,7 @@ export default{ ...@@ -129,7 +129,7 @@ export default{
deleteFile:'是否删除附件?', deleteFile:'是否删除附件?',
customsRefund:'报关退税,请备齐资料。', customsRefund:'报关退税,请备齐资料。',
nofile:'上传文件格式不对', nofile:'上传文件格式不对',
loading:'加载中......' loading:'加载中...'
}, },
auth:{ auth:{
auth:'实名认证', auth:'实名认证',
...@@ -236,9 +236,9 @@ export default{ ...@@ -236,9 +236,9 @@ export default{
}, },
create:{ create:{
create:'我要发货', create:'我要发货',
transport:'订单运输', transport:'运输',
type:'订单类型', type:'服务',
service: '集运服务', service: '集运',
oversears:'海外仓', oversears:'海外仓',
toRoom:'送货上门', toRoom:'送货上门',
exception:' 提货异常', exception:' 提货异常',
...@@ -247,8 +247,8 @@ export default{ ...@@ -247,8 +247,8 @@ export default{
endCity:'目的城市', endCity:'目的城市',
method:'运输方式', method:'运输方式',
channel: '出货渠道', channel: '出货渠道',
info:'商品信息', info:'商品',
addShop:'添加商品', addShop:'添加',
prodZh:'中文品名', prodZh:'中文品名',
brand:'品牌', brand:'品牌',
num:'数量', num:'数量',
...@@ -301,7 +301,7 @@ export default{ ...@@ -301,7 +301,7 @@ export default{
nowNotice:'注:若只有一件,货到仓库立即发,选“是”,多件需仓库集运待发,选“否”', nowNotice:'注:若只有一件,货到仓库立即发,选“是”,多件需仓库集运待发,选“否”',
specialNote:'特需备注', specialNote:'特需备注',
special:'特殊要求', special:'特殊要求',
orderInfo:'订单信息', orderInfo:'通用',
marks:'唛头', marks:'唛头',
isCargoControl:'是否控货', isCargoControl:'是否控货',
customsType:'单证报关', customsType:'单证报关',
...@@ -318,7 +318,7 @@ export default{ ...@@ -318,7 +318,7 @@ export default{
addressInfo:'收货详细地址', addressInfo:'收货详细地址',
name:'姓名', name:'姓名',
nameEn:'英文名', nameEn:'英文名',
choiceConsignee:'选择收货人', choiceConsignee:'收货人',
phone:'电话', phone:'电话',
email:'邮箱', email:'邮箱',
company:'公司名称', company:'公司名称',
...@@ -347,6 +347,8 @@ export default{ ...@@ -347,6 +347,8 @@ export default{
cnotice3:'该货物的出口手续由我司代为办理', cnotice3:'该货物的出口手续由我司代为办理',
cnotice4:'该货物由发货人提供相关出口单证并委托我司代为办理', cnotice4:'该货物由发货人提供相关出口单证并委托我司代为办理',
cnotice5:'该货物有以上两种情况出现', cnotice5:'该货物有以上两种情况出现',
overSeaWarehouseTips: '如需海外仓服务,请联系客服,服务热线:400-900-9962',
other: '其他'
}, },
docException: { docException: {
doc:'单证异常', doc:'单证异常',
......
...@@ -41,7 +41,7 @@ const store = new Vuex.Store({ ...@@ -41,7 +41,7 @@ const store = new Vuex.Store({
updateUserInfo({ updateUserInfo({
commit commit
}) { }) {
http.get("/profile").then(res => { http.get("/app-api/member/user/get").then(res => {
console.log('更新用户信息', res) console.log('更新用户信息', res)
commit('setUser', res.data) commit('setUser', res.data)
}).catch(res => { }).catch(res => {
......
const domain = 'https://api2.groupage.cn' const domain = 'https://apitest.groupage.cn'
// const domain = 'https://api.jd.jdshangmen.com' // const domain = 'https://api.jd.jdshangmen.com'
// const domain = 'https://api.sit.jdshangmen.com' // const domain = 'https://api.sit.jdshangmen.com'
// const domain = 'https://api2.groupage.cn' // const domain = 'https://api2.groupage.cn'
......
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