Skip to content

G
garden_merchant
提交 a925b5d8 authored 作者: 彭涛's avatar 彭涛
浏览文件
操作

修复bug

上级 702e6714
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 95 行增加 和 71 行删除
App.vue
浏览文件 @ a925b5d8
...@@ -9,48 +9,48 @@ ...@@ -9,48 +9,48 @@
created() { created() {
let that=this let that=this
//请求接口获取签名时间戳 //请求接口获取签名时间戳
post(api.sign).then(res=>{ // post(api.sign).then(res=>{
if(res.code==200){ // if(res.code==200){
that.timestamp=res.data.timestamp // that.timestamp=res.data.timestamp
that.nonceStr=res.data.nonceStr // that.nonceStr=res.data.nonceStr
that.signature=res.data.signature // that.signature=res.data.signature
jweixin.config({ // jweixin.config({
debug: false, // debug: false,
appId: 'wx85eaf2734af145bd', // appId: 'wx85eaf2734af145bd',
timestamp: that.timestamp, // timestamp: that.timestamp,
nonceStr: that.nonceStr, // nonceStr: that.nonceStr,
signature:that.signature, // signature:that.signature,
jsApiList: ['updateTimelineShareData','updateAppMessageShareData','scanQRCode'] // jsApiList: ['updateTimelineShareData','updateAppMessageShareData','scanQRCode']
}); // });
jweixin.ready(function() { // jweixin.ready(function() {
if(that.ispause){ // if(that.ispause){
innerAudioContext.pause(); // innerAudioContext.pause();
}else{ // }else{
innerAudioContext.play(); // innerAudioContext.play();
} // }
//分享给朋友接口 // //分享给朋友接口
jweixin.updateAppMessageShareData({ // jweixin.updateAppMessageShareData({
title: '敏捷集团党史知识竞赛', // 分享标题 // title: '敏捷集团党史知识竞赛', // 分享标题
desc: '我在参加敏捷集团党史知识竞赛，一起来战吧！', // 分享描述 // desc: '我在参加敏捷集团党史知识竞赛，一起来战吧！', // 分享描述
link: 'https://faces.diaosaas.com/party-history-h5/', // 分享链接，该链接域名或路径必须与当前页面对应的公众号JS安全域名一致 // link: 'https://faces.diaosaas.com/party-history-h5/', // 分享链接，该链接域名或路径必须与当前页面对应的公众号JS安全域名一致
imgUrl: 'https://faces.diaosaas.com/party-history-h5/mp3/wxshare.png', // 分享图标 // imgUrl: 'https://faces.diaosaas.com/party-history-h5/mp3/wxshare.png', // 分享图标
success: function () { // success: function () {
console.log('分享成功！') // console.log('分享成功！')
} // }
}) // })
//分享到朋友圈接口 // //分享到朋友圈接口
jweixin.updateTimelineShareData({ // jweixin.updateTimelineShareData({
title: '敏捷集团党史知识竞赛', // 分享标题 // title: '敏捷集团党史知识竞赛', // 分享标题
link: 'https://faces.diaosaas.com/party-history-h5/', // 分享链接，该链接域名或路径必须与当前页面对应的公众号JS安全域名一致 // link: 'https://faces.diaosaas.com/party-history-h5/', // 分享链接，该链接域名或路径必须与当前页面对应的公众号JS安全域名一致
imgUrl: 'https://faces.diaosaas.com/party-history-h5/mp3/wxshare.png', // 分享图标 // imgUrl: 'https://faces.diaosaas.com/party-history-h5/mp3/wxshare.png', // 分享图标
success: function () { // success: function () {
// 设置成功 // // 设置成功
console.log('分享成功！') // console.log('分享成功！')
} // }
}) // })
}); // });
} // }
}) // })
}, },
onShow: function() { onShow: function() {
console.log('App Show') console.log('App Show')
......
pages/shopdetail/shopdetail.vue
浏览文件 @ a925b5d8
...@@ -33,12 +33,12 @@ ...@@ -33,12 +33,12 @@
</view> </view>
</view> </view>
<view class="income_tab"> <view class="income_tab">
<view class="income_flex" :class="{'income_active':tabindex==0}" @click="tabindex=0"> <view class="income_flex" :class="{'income_active':tabindex==0}" @click="handleTab(0)">
<text class="income_title">收入明细</text> <text class="income_title">收入明细</text>
<view class="xian"></view> <view class="xian"></view>
<view class="heng"></view> <view class="heng"></view>
</view> </view>
<view class="income_flex" :class="{'income_active':tabindex==1}" @click="tabindex=1"> <view class="income_flex" :class="{'income_active':tabindex==1}" @click="handleTab(1)">
<text class="income_title">收入统计</text> <text class="income_title">收入统计</text>
<view class="xian"></view> <view class="xian"></view>
</view> </view>
...@@ -46,13 +46,14 @@ ...@@ -46,13 +46,14 @@
<!-- 收入明细 --> <!-- 收入明细 -->
<view class="earnings_box" v-if="tabindex==0"> <view class="earnings_box" v-if="tabindex==0">
<view class="Filter"> <view class="Filter">
<view class="Filter_box" @click="monthall=true"> <view class="Filter_box" @click="monthall=!monthall">
<text>{{select_month}}</text> <text>{{select_month}}</text>
<view class="jiantou" :class="{'isroate':monthall}"></view> <view class="jiantou" :class="{'isroate':monthall}"></view>
</view> </view>
<view class="select_month" v-if="monthall"> <view class="select_month" v-if="monthall">
<view class="sanjiao"></view> <view class="sanjiao"></view>
<view @click="selectmonth(m,index)" class="options_child" v-for="(m,index) in monthlist" :key="index"> <view @click="selectmonth(m,index)" class="options_child" v-for="(m,index) in monthlist"
:key="index">
{{m}} {{m}}
</view> </view>
</view> </view>
...@@ -94,8 +95,12 @@ ...@@ -94,8 +95,12 @@
<!-- 保存图片框 --> <!-- 保存图片框 -->
<view class="save_box" v-if="issave"> <view class="save_box" v-if="issave">
<view class="save_title">收款码</view> <view class="save_title">收款码</view>
<view class="close_box" @click="issave=false"><image src="../../static/images/close2.png" mode="widthFix"></image></view> <view class="close_box" @click="issave=false">
<view class="code_img"><image :src="collectionCodeUrl" mode="widthFix"></image></view> <image src="../../static/images/close2.png" mode="widthFix"></image>
</view>
<view class="code_img">
<image :src="collectionCodeUrl" mode="widthFix"></image>
</view>
<view class="save_btn" @click="Location">长按保存到手机</view> <view class="save_btn" @click="Location">长按保存到手机</view>
</view> </view>
<!-- 保存图片框end --> <!-- 保存图片框end -->
...@@ -108,12 +113,14 @@ ...@@ -108,12 +113,14 @@
post, post,
get get
} from '@/static/util/fun.js' } from '@/static/util/fun.js'
import {getLocation} from '@/static/util/getlocation.js' import {
getLocation
} from '@/static/util/getlocation.js'
export default { export default {
data() { data() {
return { return {
issave:false, issave: false,
collectionCodeUrl:'',//收款码 collectionCodeUrl: '', //收款码
today: '', today: '',
month: '', month: '',
total: '', total: '',
...@@ -133,14 +140,23 @@ ...@@ -133,14 +140,23 @@
created() { created() {
let that = this let that = this
that.userdata = uni.getStorageSync('userdata'); that.userdata = uni.getStorageSync('userdata');
that.collectionCodeUrl=that.userdata.tMerchant.collectionCodeUrl that.collectionCodeUrl = that.userdata.tMerchant.collectionCodeUrl
that.getearnings() that.getearnings()
}, },
methods: { methods: {
// //
Location(){ Location() {
getLocation() getLocation()
}, },
// tab栏点击
handleTab(i) {
this.tabindex = i
if (i == 0) {
this.getearnings()
} else {
this.getstatistics()
}
},
//查询收入明细 //查询收入明细
getearnings() { getearnings() {
let that = this let that = this
...@@ -166,7 +182,7 @@ ...@@ -166,7 +182,7 @@
sign: that.sign, sign: that.sign,
}).then(res => { }).then(res => {
if (res.code == 200) { if (res.code == 200) {
that.statisticslist=res.data that.statisticslist = res.data
} else { } else {
uni.showToast({ uni.showToast({
title: res.msg, title: res.msg,
...@@ -176,8 +192,8 @@ ...@@ -176,8 +192,8 @@
}) })
}, },
//收入统计年月日筛选 //收入统计年月日筛选
changesign(index){ changesign(index) {
this.sign=index this.sign = index
this.getstatistics() this.getstatistics()
}, },
change() { change() {
...@@ -206,29 +222,32 @@ ...@@ -206,29 +222,32 @@
width: 100%; width: 100%;
height: 100%; height: 100%;
position: relative; position: relative;
.save_box{ .save_box {
width: 66%; width: 66%;
height: 578rpx; height: 578rpx;
background: #FFFFFF; background: #FFFFFF;
border-radius: 20rpx; border-radius: 20rpx;
position:absolute; position: absolute;
left:17%; left: 17%;
top: 264rpx; top: 264rpx;
z-index: 100; z-index: 100;
.code_img{
.code_img {
width: 100%; width: 100%;
position: absolute; position: absolute;
left: 0; left: 0;
top: 150rpx; top: 150rpx;
image{
image {
width: 264rpx; width: 264rpx;
height: 264rpx; height: 264rpx;
display: block; display: block;
margin: auto; margin: auto;
} }
} }
.save_title{
.save_title {
width: 100%; width: 100%;
text-align: center; text-align: center;
position: absolute; position: absolute;
...@@ -237,17 +256,20 @@ ...@@ -237,17 +256,20 @@
color: #2D2D2D; color: #2D2D2D;
font-size: 36rpx; font-size: 36rpx;
} }
.close_box{
.close_box {
width: 40rpx; width: 40rpx;
height: 40rpx; height: 40rpx;
position: absolute; position: absolute;
right: 28rpx; right: 28rpx;
top: 28rpx; top: 28rpx;
image{
image {
width: 100%; width: 100%;
} }
} }
.save_btn{
.save_btn {
width: 60%; width: 60%;
position: absolute; position: absolute;
left: 20%; left: 20%;
...@@ -389,8 +411,8 @@ ...@@ -389,8 +411,8 @@
} }
} }
} }
.statistics_box .income_list .list_flex .who{ .statistics_box .income_list .list_flex .who {
font-weight: 500; font-weight: 500;
} }
...@@ -497,7 +519,8 @@ ...@@ -497,7 +519,8 @@
height: 100%; height: 100%;
display: block; display: block;
} }
.collectionCode{
.collectionCode {
width: 88rpx; width: 88rpx;
height: 38rpx; height: 38rpx;
background-color: #11D183; background-color: #11D183;
......
unpackage/dist/build/h5/index.html
浏览文件 @ a925b5d8
<!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>腾冲 · 花缘商家</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)')) <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>腾冲 · 花缘商家</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=./static/index.f4fc78fe.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=./static/js/chunk-vendors.d2b2168a.js></script><script src=./static/js/index.3bf44ac7.js></script></body></html> document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=./static/index.f4fc78fe.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=./static/js/chunk-vendors.d2b2168a.js></script><script src=./static/js/index.62c03daf.js></script></body></html>
\ No newline at end of file \ No newline at end of file
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论