Skip to content

M
mallapp
Commit 3763a45f authored by zhangjianguo's avatar zhangjianguo
Browse files
Options

1

parent a2326672
Hide whitespace changes
Inline Side-by-side
Showing with 92 additions and 67 deletions
components/tabbar/index.vue
View file @ 3763a45f
......@@ -158,9 +158,18 @@ export default {
}
// #endif
});
this.navs = uni.getStorageSync("basedata")
? uni.getStorageSync("basedata").navbar.navs
: [];
if(uni.getStorageSync("basedata")){
this.navs = uni.getStorageSync("basedata")
? uni.getStorageSync("basedata").navbar.navs
: [];
}else{
setTimeout(()=>{
this.navs = uni.getStorageSync("basedata")
? uni.getStorageSync("basedata").navbar.navs
: [];
},500)
}
this.activeHandler();
},
methods: {
......
pages/balance/balance.vue
View file @ 3763a45f
......@@ -2,7 +2,7 @@
<view class="balanceStyle" :style="{'height':contentHeight}" >
<view :style="{'backgroundImage':'url('+(g.setting.bj_pic_url.url?g.setting.bj_pic_url.url:'')+')',backgroundSize: 'cover'}" class="balance_top" >
<Text style='margin-top:50rpx ;color: #fff;;font-size: 24rpx;'>账户余额(元)</Text>
<Text style='margin-top:50rpx ;color: #fff;;font-size: 36px;'>{{g.balance}}</Text>
<Text style='margin-top:50rpx ;color: #fff;;font-size: 36px;'>{{g.balance?g.balance:0}}</Text>
<view class="recharge" @click="goUrl('/pages/balance/recharge')">
<Text style='color: #fff;;font-size: 28rpx;'>充值</Text>
</view>
......@@ -143,22 +143,22 @@
uni.navigateBack()
},
balancedata(){
uni.showNavigationBarLoading();
let h=this.apiheader()
this.request(
{
url: "",
header:h,
data: {
r: "api/balance/index",
}
},
res => {
uni.hideNavigationBarLoading()
this.g = res.data;
// uni.showNavigationBarLoading();
// let h=this.apiheader()
// this.request(
// {
// url: "",
// header:h,
// data: {
// r: "api/balance/index",
// }
// },
// res => {
// uni.hideNavigationBarLoading()
// this.g = res.data;
}
);
// }
// );
},
getlogs(){
......
pages/order/after-sale/refunds-detail.vue
View file @ 3763a45f
......@@ -31,10 +31,10 @@
<view class="content" v-else-if="d.ReOrderStatus == 2">
尊敬的客户，让您久等了，很抱歉出现了让您不满意的情况，我们将配合您尽快完成本次售后申请
</view>
<view v-if="d.ReOrderStatus == 5 || d.Type==1">申请退款金额:{{d.Refund}}</view>
<view v-if="d.ReOrderStatus == 5 || d.Type==1">实退金额:{{d.Refund}}</view>
<view v-if="d.ReOrderStatus == 5 || d.Type==1">退款方式:原路退回</view>
<view v-if="d.ReOrderStatus == 5 || d.Type==1">退款时间:{{d.FinishTime}}</view>
<view v-if="d.ReOrderStatus == 5 || d.Type==1" class="marginT">申请退款金额:{{d.Refund}}元</view>
<view v-if="d.ReOrderStatus == 5 || d.Type==1" class="marginT">实退金额:{{d.Refund}}元</view>
<view v-if="d.ReOrderStatus == 5 || d.Type==1" class="marginT">退款方式:原路退回</view>
<view v-if="d.ReOrderStatus == 5 || d.Type==1" class="marginT">退款时间:{{d.FinishTime}}</view>
<!-- TODO字段没有 -->
<!-- <view class="content" v-else>
......@@ -626,4 +626,7 @@ export default {
border: none;
outline: none;
}
.refundsDetails .marginT{
margin-top: 5px;
}
</style>
pages/order/order-detail.vue
View file @ 3763a45f
......@@ -149,12 +149,12 @@
<view class="content">{{ orders.pay_time }}</view>
</view> -->
</view>
<view class="order-info-item" >
<!-- <view class="order-info-item" >
<view class="field" >
<view class="label">配送方式：</view>
<view class="content">{{orders.DeliveryMethodName}}</view>
</view>
</view>
</view> -->
</view>
<view class="block">
<view class="order-info-item">
......
pages/share-qrcode/share-qrcode.vue
View file @ 3763a45f
......@@ -30,9 +30,12 @@
this.mainColor = this.$uiConfig.mainColor;
this.secondary = this.$uiConfig.secondary;
this.UserInfo = uni.getStorageSync('mall_UserInfo') ?uni.getStorageSync('mall_UserInfo'):{}
console.log(this.UserInfo)
this.init()
},
onReady(){
this.init()
},
mounted() {
......@@ -61,22 +64,21 @@
{
url: '/api/AppletUser/GetWeiXinQRCodeForApplet',
data: {
Path:'pages/index/index/?pid=' + this.UserInfo.UserId,
Path:'/pages/index/index?pid=' + this.UserInfo.UserId,
With:this.qrcode.QrCodeSize,
}
},
(res) => {
uni.hideNavigationBarLoading()
this.fenxqrcode = this.host2+res.data;
// this.fenxqrcode = 'https://mallApi.oytour.com'+res.data;
console.log(this.fenxqrcode)
this.drawCtx();
}
);
},
drawCtx(){
uni.showLoading({
title: "正在生成海报",
title: "正在生成",
});
let ctx = uni.createCanvasContext("firstCanvas", this);
let that = this;
......@@ -92,7 +94,8 @@
uni.getImageInfo({//头像
src: that.UserInfo.Photo,
success: function (image) {
ctx.save(); // 先保存状态 已便于画完圆再用
ctx.save(); // 先保存状态 已便于画完圆再用
ctx.beginPath(); //开始绘制
//先画个圆
ctx.arc(that.qrcode.HeadSize/2+that.qrcode.HeadPaddingLeft, that.qrcode.HeadSize/2+that.qrcode.HeadPaddingTop, that.qrcode.HeadSize/2, 0, Math.PI * 2, false);
......@@ -104,8 +107,10 @@
if(that.qrcode.IsShowQrCode==0){ //二维码
uni.getImageInfo({//头像
src: that.UserInfo.Photo,
uni.getImageInfo({
// src: that.UserInfo.Photo,
src: that.fenxqrcode,
success: function (image) {
ctx.drawImage(image.path, that.qrcode.QrCodePaddingLeft, that.qrcode.QrCodePaddingTop, that.qrcode.QrCodeSize, that.qrcode.QrCodeSize);//绘制头像
......@@ -119,7 +124,7 @@
if(that.qrcode.IsShowQrCode==0){
uni.getImageInfo({//头像
src: that.UserInfo.Photo,
src: that.fenxqrcode,
success: function (image) {
ctx.drawImage(image.path, that.qrcode.QrCodePaddingLeft, that.qrcode.QrCodePaddingTop, that.qrcode.QrCodeSize, that.qrcode.QrCodeSize);//绘制头像
......@@ -147,35 +152,39 @@
},
drawQrCode(ctx) {
let that = this;
ctx.draw(false, () => {
uni.canvasToTempFilePath(
{
x: 0,
y: 0,
width: 750,
height: 1344,
destWidth: 750.0 ,
destHeight: 1344.0 ,
canvasId: "firstCanvas",
success: (res) => {
uni.hideLoading();
that.tempPic = res.tempFilePath;
},
fail(e) {
console.log(e);
},
},
that
);
});
console.log('生成海报12')
setTimeout(()=>{
ctx.draw(false, () => {
uni.canvasToTempFilePath(
{
x: 0,
y: 0,
width: 750,
height: 1344,
destWidth: 750.0 ,
destHeight: 1344.0 ,
canvasId: "firstCanvas",
success: (res) => {
uni.hideLoading();
that.tempPic = res.tempFilePath;
},
fail(e) {
console.log(e);
},
},
that
);
});
},200)
},
preservation(){
uni.showLoading({
title: "正在生成海报",
title: "正在生成",
});
let that = this;
uni.canvasToTempFilePath(
......@@ -184,7 +193,7 @@
success: (res) => {
uni.hideLoading();
uni.showLoading({
title: "正在保存海报",
title: "正在保存",
});
uni.saveImageToPhotosAlbum({
filePath: res.tempFilePath,
......
pages/share/cash/cash.vue
View file @ 3763a45f
......@@ -4,7 +4,7 @@
<view class="cashBox_top">
<Text style='font-size: 18px;margin-top: 10px;'>账户剩余余额：{{cash.CommissionWithdrawal}}元</Text>
<Text style='font-size: 14px;color:#333 ;margin-top: 10px;'>今日剩余提现金额:{{cash.CanRemitMoney}}元</Text>
<Text style='font-size: 14px;color:#333 ;margin-top: 10px;'>最少提现额度:{{cash.MinimumWithdrawalLimit}}元</Text>
<Text style='font-size: 14px;color:#333 ;margin-top: 10px;'>最少提现额度:{{cash.MinimumWithdrawalLimit!=-1?cash.MinimumWithdrawalLimit+'元':'不限'}}</Text>
<Text style='font-size: 14px;color:#333 ;margin-top: 10px;'>手续费 百分比:{{cash.WithdrawFee}}%</Text>
<!-- <view style="display: flex;flex-direction: row;align-items: center;margin-top: 10px;">
<Text style='font-size: 12px;color:#333 '>今日提现金额无限制</Text>
......@@ -242,14 +242,18 @@
return false
}
}
if(this.msg.AppliedMoney<this.cash.MinimumWithdrawalLimit){
uni.showToast({
title: "提现金额大于等于"+this.cash.MinimumWithdrawalLimit,
icon: "none"
});
return false
if(this.cash.MinimumWithdrawalLimit!=-1){
if(this.msg.AppliedMoney<this.cash.MinimumWithdrawalLimit){
uni.showToast({
title: "提现金额大于等于"+this.cash.MinimumWithdrawalLimit,
icon: "none"
});
return false
}
}
this.msg.Fee = this.msg.AppliedMoney - (this.cash.WithdrawFee*0.01*this.msg.AppliedMoney);
this.msg.Fee = this.cash.WithdrawFee*0.01*this.msg.AppliedMoney;
uni.showNavigationBarLoading();
this.request2(
......
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