Merge pull request 'gdpao' (#89) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/89
This commit is contained in:
commit
af908a3dda
@ -108,9 +108,9 @@
|
||||
},
|
||||
"androidStyle" : "default",
|
||||
"android" : {
|
||||
"hdpi" : "E:/Source-code/deming/static/app/start/480x762.png",
|
||||
"xhdpi" : "E:/Source-code/deming/static/app/start/720x1242.png",
|
||||
"xxhdpi" : "E:/Source-code/deming/static/app/start/1080x1882.png"
|
||||
"hdpi" : "E:/Source-code/deming/static/app/start/480x762.PNG",
|
||||
"xhdpi" : "E:/Source-code/deming/static/app/start/720x1242.PNG",
|
||||
"xxhdpi" : "E:/Source-code/deming/static/app/start/1080x1882.PNG"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -97,7 +97,7 @@
|
||||
<view class="pushtimeline" v-if="type == 2">
|
||||
<view class="timelinetitle">物流信息</view>
|
||||
<view class="timelineid">订单单号: {{ info.order_sn }}</view>
|
||||
<view class="timelinebox" v-for="list in info.express_list">
|
||||
<view class="timelinebox" v-for="(list,index) in info.express_list" :key="index">
|
||||
<view class="timelinecontent">{{list.content}}</view>
|
||||
<view class="timelinetime">{{list.kd_time}}</view>
|
||||
</view>
|
||||
@ -163,13 +163,13 @@
|
||||
<view class="info">
|
||||
<view>
|
||||
<text>发票抬头：</text>
|
||||
<text>{{ invoiceList.invoice_title }}</text>
|
||||
<view class="u-line-2">{{ invoiceList.invoice_title }}</view>
|
||||
</view>
|
||||
<view v-if="invoice_type!=2">
|
||||
<view v-if="invoice_type==2">
|
||||
<text>税号：</text>
|
||||
<text>{{ invoiceList.invoice_code }}</text>
|
||||
</view>
|
||||
<view v-if="invoice_type!=2">
|
||||
<view v-if="invoice_type==2">
|
||||
<text>单位地址：</text>
|
||||
<view class="u-line-2">{{ invoiceList.invoice_goto_addr }}</view>
|
||||
</view>
|
||||
@ -177,17 +177,17 @@
|
||||
<text>电话号码：</text>
|
||||
<text>{{ invoiceList.invoice_reg_mobphone }}</text>
|
||||
</view>
|
||||
<view v-if="invoice_type!=2">
|
||||
<view v-if="invoice_type==2">
|
||||
<text>开户银行：</text>
|
||||
<text>{{ invoiceList.invoice_reg_bname }}</text>
|
||||
</view>
|
||||
<view v-if="invoice_type!=2">
|
||||
<view v-if="invoice_type==2">
|
||||
<text>银行账户：</text>
|
||||
<text>{{ invoiceList.invoice_reg_baccount }}</text>
|
||||
</view>
|
||||
<view v-if="invoice_type==2">
|
||||
<view v-if="invoice_type==1">
|
||||
<text>省份证号：</text>
|
||||
<text>111</text>
|
||||
<text>{{ invoiceList.invoice_code }}</text>
|
||||
</view>
|
||||
</view>
|
||||
</u-popup>
|
||||
@ -238,7 +238,7 @@ export default {
|
||||
},
|
||||
onLoad(option) {
|
||||
this.type = option.type;
|
||||
console.log(this.type)
|
||||
// console.log(this.type)
|
||||
this.orderid = option.id;
|
||||
this.resetinfo();
|
||||
if (this.type == 1) {
|
||||
@ -247,7 +247,7 @@ export default {
|
||||
}
|
||||
if (this.type == 2) {
|
||||
// 获取物流信息
|
||||
this.getcarinfo();
|
||||
// this.getcarinfo();
|
||||
}
|
||||
// 订单状态： 0:全部 1已付款未发货 2已发货 3已完成 4申请退款/退货 5已退款/退货 6拒绝退款/退货
|
||||
},
|
||||
@ -319,13 +319,13 @@ export default {
|
||||
});
|
||||
},
|
||||
// 查询物流
|
||||
getcarinfo() {
|
||||
this.$u.api.getcarinfo({
|
||||
order_id: this.orderid
|
||||
}).then(res => {
|
||||
console.log(res);
|
||||
})
|
||||
},
|
||||
// getcarinfo() {
|
||||
// this.$u.api.getcarinfo({
|
||||
// order_id: this.orderid
|
||||
// }).then(res => {
|
||||
// console.log(res);
|
||||
// })
|
||||
// },
|
||||
// 保存订单号
|
||||
saveDelivery() {
|
||||
if (!this.pushid) {
|
||||
|
||||
@ -137,7 +137,8 @@ export default {
|
||||
selectarr: [], //选中标签
|
||||
tagcontent: '',
|
||||
is_edit: false, // 编辑
|
||||
userinfo:{}
|
||||
userinfo:{},
|
||||
device: null, // 手机信息
|
||||
};
|
||||
},
|
||||
onLoad() {
|
||||
@ -146,6 +147,9 @@ export default {
|
||||
|
||||
this.tosign();
|
||||
this.getLiveSpec();
|
||||
|
||||
this.device = uni.getSystemInfoSync(); // 获取信息
|
||||
console.log(this.device);
|
||||
},
|
||||
methods: {
|
||||
publish() {
|
||||
@ -277,7 +281,18 @@ export default {
|
||||
},
|
||||
// 上传封面
|
||||
uploadcover(data) {
|
||||
console.log(data);
|
||||
// console.log(data.data);
|
||||
// #ifdef APP-PLUS
|
||||
plus.io.getImageInfo({
|
||||
src: data.data.file_path,
|
||||
success: (res) => {
|
||||
console.log(res);
|
||||
},
|
||||
fail: (err) => {
|
||||
console.log(err);
|
||||
}
|
||||
})
|
||||
// #endif
|
||||
if (data.errCode != 0) {
|
||||
this.$refs.uToast.show({
|
||||
title: '上传失败',
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
<text class="title">个性签名</text>
|
||||
<input type="text" value="" v-model="info.signature" placeholder="请输入个性签名"/>
|
||||
</view>
|
||||
<view class="password" @click="updatePwd">
|
||||
<view class="password" @click="updatePwd" v-if="role != 4">
|
||||
<text>修改密码</text>
|
||||
<image src="/static/image/user/1.png"></image>
|
||||
</view>
|
||||
@ -27,11 +27,15 @@ export default {
|
||||
fileurl: "",
|
||||
filename:"",
|
||||
info:{},
|
||||
num:0
|
||||
num:0,
|
||||
role: 0,
|
||||
};
|
||||
},
|
||||
onLoad() {
|
||||
this.getmyinfo()
|
||||
this.getmyinfo();
|
||||
let userinfo = uni.getStorageSync("userinfo");
|
||||
this.role = userinfo.role;
|
||||
// console.log(this.role);
|
||||
},
|
||||
onNavigationBarButtonTap() {
|
||||
let that = this;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user