Skip to content

G
GangShi-un2
提交 d0611a7f authored 作者: 彭涛's avatar 彭涛
浏览文件
操作

bug修复

上级 fa46f57b
全部展开 显示空白字符变更
内嵌 并排
正在显示 包含 14 行增加 和 8 行删除
pages/group/group.vue
浏览文件 @ d0611a7f
......@@ -58,7 +58,8 @@
<text v-if="item.intermediateProfitCeiling&&rangli&&(item.type==4||item.type==5)">
居间让利上限: <text class="text_item">{{item.intermediateProfitCeiling}}厘</text>
</text>
<view v-if="!item.intermediateProfitCeiling&&rangli&&(item.type==4||item.type==5)"style="height: 38rpx;"></view>
<view v-if="!item.intermediateProfitCeiling&&rangli&&(item.type==4||item.type==5)"
style="height: 38rpx;"></view>
<view v-if="!rangli&&(item.type==4||item.type==5)" style="height: 38rpx;"></view>
<text style="margin-bottom: 0;">{{item.year}}
<text v-if="!remainder2[index]||remainder2[index] == 0" class="count">拼团已结束</text>
......@@ -419,6 +420,7 @@
//现货拼团数据
getCashFilter() {
let that = this
that.setmealList = []
clearInterval(that.setIntervaltimer2)
get(api.joinInPackageSpotList, {
electricityCompany: that.electricityCompany,
......@@ -467,6 +469,7 @@
//价差拼团数据
getDifferenceFilter() {
let that = this
that.setmealList = []
clearInterval(that.setIntervaltimer2)
get(api.joinInPackageSpreadList, {
electricityCompany: that.electricityCompany,
......
pagesA/PromotionCenter/PromotionCenter.vue
浏览文件 @ d0611a7f
......@@ -6,12 +6,12 @@
<view class="top_content_one">
<view class="row">
<view class="row_title">累计推广奖励金</view>
<view class="money"><text class="symbol">￥</text><text>{{CumulativeMoney}}</text></view>
<view class="money">￥{{CumulativeMoney}}</view>
<view class="row_title" @click="linktoRewardDetail">查看明细></view>
</view>
<view class="row">
<view class="row_title">可提现余额</view>
<view class="money"><text class="symbol">￥</text><text>{{withdrawal}}</text></view>
<view class="money">￥{{withdrawal}}</view>
<view class="row_title" @click="linktowithdrawal">去提现></view>
</view>
</view>
......
unpackage/dist/dev/mp-weixin/pages/group/group.js
浏览文件 @ d0611a7f
......@@ -281,6 +281,7 @@ __webpack_require__.r(__webpack_exports__);
......@@ -428,6 +429,7 @@ var _api = _interopRequireDefault(__webpack_require__(/*! ../../static/util/api.
//
//
//
//
var _default = { created: function created() {var _this = this; // this.getCashData()
this.getCashFilter(); // 获取售电公司列表
(0, _fun.get)(_api.default.electricitySalesCompaniesList).then(function (res) {if (res.code == 200) {res.data.map(function (item, index) {var obj = {};obj.value = index + 1;obj.label = item.eName;_this.electricityCompanys.push(obj);}); // console.log(this.electricityCompanys)
......@@ -451,8 +453,7 @@ var _default = { created: function created() {var _this = this; // this.getCashD
{ label: '全部', value: 0 }], ratio_xianhuo: [//现货拼团-收益比例
{ label: '全部', value: 0 }, { label: '50%以上', value: 50 }, { label: '60%以上', value: 60 }, { label: '70%以上', value: 70 }, { label: '80%以上', value: 80 }, { label: '90%以上', value: 90 }], prices_jiacha: [//价差拼团-价差
{ label: '全部', value: 0 }, { label: '3分以上', value: 3 }, { label: '4分以上', value: 4 }, { label: '5分以上', value: 5 }, { label: '6分以上', value: 6 }], groupTypes_xianhuo: [//现货拼团类型
{ label: '全部', value: 0 }, {
label: '月竞分成现货拼团',
{ label: '全部', value: 0 }, { label: '月竞分成现货拼团',
value: 1 },
{
......@@ -604,6 +605,7 @@ var _default = { created: function created() {var _this = this; // this.getCashD
//现货拼团数据
getCashFilter: function getCashFilter() {
var that = this;
that.setmealList = [];
clearInterval(that.setIntervaltimer2);
(0, _fun.get)(_api.default.joinInPackageSpotList, {
electricityCompany: that.electricityCompany,
......@@ -652,6 +654,7 @@ var _default = { created: function created() {var _this = this; // this.getCashD
//价差拼团数据
getDifferenceFilter: function getDifferenceFilter() {
var that = this;
that.setmealList = [];
clearInterval(that.setIntervaltimer2);
(0, _fun.get)(_api.default.joinInPackageSpreadList, {
electricityCompany: that.electricityCompany,
......
unpackage/dist/dev/mp-weixin/pagesA/PromotionCenter/PromotionCenter.wxml
浏览文件 @ d0611a7f
<view class="PromotionCenter"><view class="PromotionCenter_top"><view class="top_content"><text data-event-opts="{{[['tap',[['linkto',['$event']]]]]}}" class="rule" bindtap="__e">推广规则</text><view class="top_content_one"><view class="row"><view class="row_title">累计推广奖励金</view><view class="money"><text class="symbol">￥</text><text>{{CumulativeMoney}}</text></view><view data-event-opts="{{[['tap',[['linktoRewardDetail',['$event']]]]]}}" class="row_title" bindtap="__e">查看明细></view></view><view class="row"><view class="row_title">可提现余额</view><view class="money"><text class="symbol">￥</text><text>{{withdrawal}}</text></view><view data-event-opts="{{[['tap',[['linktowithdrawal',['$event']]]]]}}" class="row_title" bindtap="__e">去提现></view></view></view><view class="top_content_two"><view class="user_info_code">{{'邀请码: '+(inviteCode?inviteCode:'需实名认证')+''}}<text data-event-opts="{{[['tap',[['getInviteCode']]]]}}" class="item-btn" bindtap="__e">复制</text></view></view></view></view><view class="promotedata"><view class="promote_title"><text>我推广的电客</text><text>帮我赚的钱</text></view><block wx:for="{{passenger}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="list"><text class="num">{{index+1}}</text><image src="{{item.headImgUrl}}" mode></image><text>{{item.wxName}}</text><text class="shouyi">{{"￥"+item.money}}</text><view class="hexian"></view></view></block></view><view class="button_box"><button type="default" data-event-opts="{{[['tap',[['openmakemoney',['$event']]]]]}}" bindtap="__e">开启赚钱之路</button></view><block wx:if="{{isshare}}"><bottom-window vue-id="4250ae6e-1" type="{{3}}" data-event-opts="{{[['^closeModel',[['closeModel']]]]}}" bind:closeModel="__e" bind:__l="__l"></bottom-window></block></view>
\ No newline at end of file
<view class="PromotionCenter"><view class="PromotionCenter_top"><view class="top_content"><text data-event-opts="{{[['tap',[['linkto',['$event']]]]]}}" class="rule" bindtap="__e">推广规则</text><view class="top_content_one"><view class="row"><view class="row_title">累计推广奖励金</view><view class="money">{{"￥"+CumulativeMoney}}</view><view data-event-opts="{{[['tap',[['linktoRewardDetail',['$event']]]]]}}" class="row_title" bindtap="__e">查看明细></view></view><view class="row"><view class="row_title">可提现余额</view><view class="money">{{"￥"+withdrawal}}</view><view data-event-opts="{{[['tap',[['linktowithdrawal',['$event']]]]]}}" class="row_title" bindtap="__e">去提现></view></view></view><view class="top_content_two"><view class="user_info_code">{{'邀请码: '+(inviteCode?inviteCode:'需实名认证')+''}}<text data-event-opts="{{[['tap',[['getInviteCode']]]]}}" class="item-btn" bindtap="__e">复制</text></view></view></view></view><view class="promotedata"><view class="promote_title"><text>我推广的电客</text><text>帮我赚的钱</text></view><block wx:for="{{passenger}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="list"><text class="num">{{index+1}}</text><image src="{{item.headImgUrl}}" mode></image><text>{{item.wxName}}</text><text class="shouyi">{{"￥"+item.money}}</text><view class="hexian"></view></view></block></view><view class="button_box"><button type="default" data-event-opts="{{[['tap',[['openmakemoney',['$event']]]]]}}" bindtap="__e">开启赚钱之路</button></view><block wx:if="{{isshare}}"><bottom-window vue-id="4250ae6e-1" type="{{3}}" data-event-opts="{{[['^closeModel',[['closeModel']]]]}}" bind:closeModel="__e" bind:__l="__l"></bottom-window></block></view>
\ No newline at end of file
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论