Commit cbb052b1 authored by Mac's avatar Mac

1

parent 25dc8fad
......@@ -353,8 +353,9 @@
this.OrderId = options.OrderId;
}
that.u = uni.getStorageSync("mall_UserInfo");
wx.getUserInfo({
success: function(res) {
wx.getUserProfile({//4-9修改 不使用getUserInfo 会造成获取回来的微信默认名称和头像
success: function(res) {//4-9之后的好像这里不能静默登录了需要弹出登录
console.log(res,'getUserInfo')
if (uni.getStorageSync("mall_UserInfo")) {
let uid = uni.getStorageSync("mall_UserInfo").UserId;
let msg = {
......@@ -385,6 +386,8 @@
avatarUrl: "",
};
that.showAuth = true;
}else{
that.sharejump();//4-9新加
}
},
});
......@@ -734,9 +737,8 @@
},10)
},
sharejump(){//分享的总跳转
let that = this
this.
// getorderPupop()//4-9新加
let that = this
// this.getorderPupop()//4-9号新加
setTimeout(() => {
if (that.JumpType == 1) {
//商品详情
......@@ -1201,8 +1203,8 @@
yj(){
uni.navigateTo({
// url: '/pages/coupon/cards/purchase'
url: '/pages/share/index/index'
url: '/pages/coupon/cards/purchase'
// url: '/pages/share/index/index'
})
}
},
......
......@@ -20,7 +20,7 @@
color: #FFF;
}
.salesvolume .top-b{
margin-top: 30rpx;
margin-top: 25rpx;
width: 100%;
display: flex;
align-items: center;
......@@ -79,7 +79,7 @@
</view>
<view class="disc zongxiaos" >
<text class="distext">总销售额</text>
<view class="dised" style="margin-top: 10px;">{{data.Total?data.Total.toFixed(2):0}} <text style="font-size: 15px;margin-bottom: 16rpx;">(元)</text> </view>
<view class="dised" style="margin-top: 10rpx;">{{data.Total?data.Total.toFixed(2):0}} <text style="font-size: 15px;margin-bottom: 16rpx;">(元)</text> </view>
</view>
<view class="top-b">
<view class="top-b-item">
......@@ -103,7 +103,7 @@
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/salesxiala.png" style="width: 17px;height: 17px;margin-left: 7px;"></image>
</view>
</view>
<canvas canvas-id="canvasColumn" id="canvasColumn" class="charts" disable-scroll=true
<canvas type="2d" canvas-id="canvasColumn" id="canvasColumn" class="charts" disable-scroll=true
@touchstart="touchColumn" @touchmove="moveColumn" @touchend="touchEndColumn">
</canvas>
......@@ -190,7 +190,8 @@
this.headStyle.paddingTop = this.nav + 'px';
},
},
mounted() {
uni.setNavigationBarTitle({
......
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