Skip to content

J
jiedao-app-customer-new-master
Commit a4a0032f authored by dragondean@qq.com's avatar dragondean@qq.com
Browse files
Options

订单编辑适配

parent 288dedd9
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 631 additions and 426 deletions
src/App.vue
View file @ a4a0032f
......@@ -8,8 +8,11 @@
url: './pages/login/login'
})
}
if(Authorization && !this.$store.state.userInfo){
this.$store.dispatch('updateUserInfo')
}
//#ifdef APP-PLUS
plus.runtime.getProperty( plus.runtime.appid, function ( wgtinfo ) {
plus.runtime.getProperty( plus.runtime.appid, function ( wgtinfo ) {
// 获取 app的version
let appversion = wgtinfo.version;
let versionCode = wgtinfo.versionCode
......
src/common/lang.js
View file @ a4a0032f
......@@ -3,9 +3,9 @@ import Zh from '@/static/lang/zh.js'
export default {
lang: uni.getStorageSync('locale') ? (uni.getStorageSync('locale')=='zh'?Zh:En) : Zh,
locale:uni.getStorageSync('locale') ? uni.getStorageSync('locale') : 'zh',
setLang(msg) {
this.lang = msg=='zh'?Zh:En;
this.locale = msg
locale:uni.getStorageSync('locale') ? uni.getStorageSync('locale') : 'zh',
setLang(msg) {
this.lang = msg=='zh'?Zh:En;
this.locale = msg
}
}
\ No newline at end of file
}
src/manifest.json
View file @ a4a0032f
......@@ -2,8 +2,8 @@
"name" : "E&C logistics",
"appid" : "__UNI__B690450",
"description" : "",
"versionName" : "221",
"versionCode" : 221,
"versionName" : "225",
"versionCode" : 225,
"transformPx" : false,
"app-plus" : {
/* 5+App特有相关 */
......@@ -19,7 +19,8 @@
},
"modules" : {
"VideoPlayer" : {},
"Barcode" : {}
"Barcode" : {},
"Camera" : {}
},
/* 模块配置 */
"distribute" : {
......
src/pages/create_order/create_order.vue
View file @ a4a0032f
This diff is collapsed.
src/static/css/create_order.css
View file @ a4a0032f
......@@ -104,7 +104,7 @@ radio{
margin: 0 20upx 16upx 0;
}
.corder-tab-top view{
display: block;
/*display: block;*/
width: 90%;
border-bottom: 1px solid var(--cdf);
padding-bottom: 16upx;
......
src/static/css/main.css
View file @ a4a0032f
......@@ -82,3 +82,34 @@ view{
width: 100%;
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;
}
src/static/lang/en.js
View file @ a4a0032f
export default{
tips: 'Tips',
notices:{
name:'your name',
nameEn:'your English name',
......@@ -8,7 +9,6 @@ export default{
Id1:'Please upload frontal photo of ID',
Id2:'Please upload back side photo of ID',
success:'Submitted successfully',
loading:'Uploading..',
newPhone: 'new phone',
edited:'Edited Success',
company:'company name',
......@@ -347,6 +347,7 @@ export default{
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',
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: {
doc:'Document abnormal',
......@@ -621,7 +622,7 @@ export default{
consigneeTel:"consignee's phone number",
consigneeEmail:"consignee's Email",
consigneeCom:"consignee's company Chinese name",
consigneeComEn:"consignee's company English name",
consigneeComEn:"consignee's company English name",
consigneeType:'consign way',
own:'selp pickup',
toRoom:'to door',
......@@ -729,4 +730,4 @@ export default{
offSuccess:'Logged out successfully',
logNotice:'Are you sure you want to log out? After cancellation, all data related to the account will be deleted and cannot be restored. Are you sure to cancel?'
}
}
\ No newline at end of file
}
src/static/lang/zh.js
View file @ a4a0032f
export default{
tips: "温馨提示",
notices:{
name:'请输入姓名',
nameEn:'请输入英文名',
......@@ -8,7 +9,6 @@ export default{
Id1:'请上传证件正面照',
Id2:'请上传证件反面照',
success:'提交成功',
loading:'上传中..',
newPhone: '请输入您的新手机号',
edited:'修改成功',
company:'请输入公司名称',
......@@ -23,7 +23,7 @@ export default{
content:'请输入内容',
type:'请选择类型',
please:'请选择',
lined:'请选择线路',
lined:'请选择线路',
numbers:'请输入商品的快递单号,多个用(,)隔开',
clearRemark:'请输入清关证书备注',
specialNote:'请输入特需备注',
......@@ -55,10 +55,10 @@ export default{
works:'请输入货值',
add:'添加成功',
delete:'确定删除商品吗',
notice:'提示',
notice:'提示',
newEmail:'请输入新邮箱地址',
email:'请输入邮箱',
bind:'绑定成功',
bind:'绑定成功',
phone: '请输入您的手机号',
password:'请输入您的密码',
code:'请输入验证码',
......@@ -69,26 +69,26 @@ export default{
nextPsd:'请再次确认密码',
read:'我已仔细阅读并同意',
service:'用户服务协议',
contact: '遇到问题？您可以联系客服',
contact: '遇到问题？您可以联系客服',
psd6:'密码不能少于6位',
different:'两次输入的密码不一致',
different:'两次输入的密码不一致',
nickName:'请输入昵称',
contactPhone:'请输入联系电话',
address:'请输入地址',
department:'请输入部门',
job: '请输入工作职位',
job: '请输入工作职位',
moreKey:'订单号，提单号，唛头或收货人姓名电话',
reason:'请告知我们您的退仓原因',
sum:'请输入箱数',
note:'请输入备注',
note:'请输入备注',
oldControl:'请输入原控货人',
newControl:'请输入新控货人',
deleteSuccess:'删除成功',
cancel:'取消成功',
delOrder:'确定删除订单吗',
cancelOrder: '确定取消订单吗',
cancelOrder: '确定取消订单吗',
weight:'请输入货物重量',
goodsSum:'请输入货物总数量',
goodsSum:'请输入货物总数量',
operation:'操作成功',
openError:'打开文件失败',
noLined:'无可用线路',
......@@ -129,7 +129,7 @@ export default{
deleteFile:'是否删除附件?',
customsRefund:'报关退税，请备齐资料。',
nofile:'上传文件格式不对',
loading:'加载中......'
loading:'加载中...'
},
auth:{
auth:'实名认证',
......@@ -236,9 +236,9 @@ export default{
},
create:{
create:'我要发货',
transport:'订单运输',
type:'订单类型',
service: '集运服务',
transport:'运输',
type:'服务',
service: '集运',
oversears:'海外仓',
toRoom:'送货上门',
exception:' 提货异常',
......@@ -247,8 +247,8 @@ export default{
endCity:'目的城市',
method:'运输方式',
channel: '出货渠道',
info:'商品信息',
addShop:'添加商品',
info:'商品',
addShop:'添加',
prodZh:'中文品名',
brand:'品牌',
num:'数量',
......@@ -301,7 +301,7 @@ export default{
nowNotice:'注：若只有一件，货到仓库立即发，选“是”，多件需仓库集运待发，选“否”',
specialNote:'特需备注',
special:'特殊要求',
orderInfo:'订单信息',
orderInfo:'通用',
marks:'唛头',
isCargoControl:'是否控货',
customsType:'单证报关',
......@@ -318,7 +318,7 @@ export default{
addressInfo:'收货详细地址',
name:'姓名',
nameEn:'英文名',
choiceConsignee:'选择收货人',
choiceConsignee:'收货人',
phone:'电话',
email:'邮箱',
company:'公司名称',
......@@ -347,6 +347,8 @@ export default{
cnotice3:'该货物的出口手续由我司代为办理',
cnotice4:'该货物由发货人提供相关出口单证并委托我司代为办理',
cnotice5:'该货物有以上两种情况出现',
overSeaWarehouseTips: '如需海外仓服务，请联系客服，服务热线：400-900-9962',
other: '其他'
},
docException: {
doc:'单证异常',
......@@ -355,7 +357,7 @@ export default{
form:'从',
to:'发往',
prodZh:'中文品名',
prodEn:'英文品名',
prodEn:'英文品名',
brand:'品牌',
is:'是',
no: '否',
......@@ -396,7 +398,7 @@ export default{
marks:'唛头',
sum:'已到箱数/总箱数',
orderStatus:'订单状态',
consignor:'发货人',
consignor:'发货人',
transport:'运输方式',
startCity:'始发地',
endCity: '目的地',
......@@ -448,7 +450,7 @@ export default{
marks:'唛头',
sum:'已到箱数/总箱数',
orderStatus:'订单状态',
consignor:'发货人',
consignor:'发货人',
transport:'运输方式',
startCity:'始发地',
endCity: '目的地',
......
src/store/index.js
View file @ a4a0032f
......@@ -41,7 +41,7 @@ const store = new Vuex.Store({
updateUserInfo({
commit
}) {
http.get("/profile").then(res => {
http.get("/app-api/member/user/get").then(res => {
console.log('更新用户信息', res)
commit('setUser', res.data)
}).catch(res => {
......
src/utils/config.js
View file @ a4a0032f
const domain = 'https://api2.groupage.cn'
const domain = 'https://apitest.groupage.cn'
// const domain = 'https://api.jd.jdshangmen.com'
// const domain = 'https://api.sit.jdshangmen.com'
// 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