Commit cbb052b1 authored by Mac's avatar Mac

1

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