Skip to content

拼
拼时代
Commit f5bb8f59 authored by xieyishang's avatar xieyishang
Browse files
Options

addxx

parent 8c1e478e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 58 additions and 58 deletions
api/lmping.js
View file @ f5bb8f59
......@@ -2,13 +2,13 @@ import request from "./../utils/request.js";
/**
* 鹿马拼相关
* 时代拼相关
*/
/***
* 鹿马拼 个人中心
* 时代拼 个人中心
*/
export function Spellhome(data) {
return request.post("Spell/home", data,{ noAuth: false,noVerify:false,isLoading:false });
......@@ -51,7 +51,7 @@ export function getSpellRewardList(data) {
return request.post("Spell/getSpellRewardList", data,{ noAuth: false,noVerify:false,isLoading:false });
}
//获取鹿马值记录
//获取时代值记录
export function getSpellValueList(data) {
return request.post("Spell/getSpellValueList", data,{ noAuth: false,noVerify:false,isLoading:false });
}
......
components/Calendartwo/Calendartwo.json
View file @ f5bb8f59
{
"component": true,
"usingComponents": {
"van-popup":"/@vant/weapp/lib/popup/index"
"van-popup":"/vant/weapp/lib/popup/index"
}
}
\ No newline at end of file
components/Calendartwo/Calendartwo.wxml
View file @ f5bb8f59
<!-- 打卡日历页面 -->
<!-- cope 签到送鸡蛋 改成 鹿马拼的签到 -->
<!-- cope 签到送鸡蛋 改成 时代拼的签到 -->
<view class='all'>
<view class="bar">
<!-- 上一个月 -->
......@@ -78,6 +78,6 @@
<van-popup show="{{ showpuptwos }}" bind:close="onClosetwos">
<view bindtap="onClosetwos" class="siginsuccbody">
<image class="imgs" src="{{clientImgPath}}/images/lmping/signinsucc.png" mode=""></image>
<view class="pricepups">+{{huodecup}}鹿马券</view>
<view class="pricepups">+{{huodecup}}时代券</view>
</view>
</van-popup>
components/dialog/method_payment/method_payment.wxml
View file @ f5bb8f59
......@@ -19,7 +19,7 @@
佣金已抵扣{{totals||applet||discounts}}元</view>
<view class="btitext "> <text> ￥ </text><text
class="sz_60">{{indent==0?need_pay:number!=-1?number:need_pay}}</text></view>
<!-- <view class="btitext_ff " wx:if="{{pay_way=='money' && disprice>0}}">鹿马优惠 -¥{{disprice}} </view>
<!-- <view class="btitext_ff " wx:if="{{pay_way=='money' && disprice>0}}">时代优惠 -¥{{disprice}} </view>
<view class="btitext_ff " wx:if="{{pay_way=='money' && coupon_price>0}}">满减优惠 -¥{{coupon_price}}</view> -->
</view>
<view>
......@@ -29,7 +29,7 @@
<view class="tubiaoimg">
<image src="{{clientImgPath}}/images/payment/payment2.png"></image>
</view>
<view class="sz_30 ml-20 ">鹿马余额</view>
<view class="sz_30 ml-20 ">时代余额</view>
</view>
<radio value='money' checked="{{pay_way =='money'}}"></radio>
</view>
......@@ -38,7 +38,7 @@
<view class="tubiaoimg">
<image src="{{clientImgPath}}/images/payment/payment1.png"></image>
</view>
<view class="sz_30 ml-20 ">鹿马佣金</view>
<view class="sz_30 ml-20 ">时代佣金</view>
</view>
<radio value='commission' checked="{{pay_way =='commission'}}"></radio>
</view>
......
components/login/login.wxml
View file @ f5bb8f59
......@@ -2,7 +2,7 @@
<view style="height:80rpx;width:80rpx;right: 0;position: absolute;" bindtap='close'>
<image src="/images/close.png"></image>
</view>
<view class='title'>欢迎使用鹿马108小程序</view>
<view class='title'>欢迎使用时代拼小程序</view>
<image class="backgroundimage" src='/images/backgroud.png'>
</image>
......
pages/lmping/home/home.json
View file @ f5bb8f59
{
"usingComponents": {},
"navigationBarTitleText": "鹿马拼",
"navigationBarTitleText": "时代拼",
"navigationStyle": "custom",
"navigationBarTextStyle": "white"
}
\ No newline at end of file
pages/lmping/home/home.wxml
View file @ f5bb8f59
......@@ -23,7 +23,7 @@
<view class="prosheadbox">
<view class="titboxsd">
<image class="proshead" src="{{clientImgPath}}/images/lmping/groupbgs.png" mode=""></image>
<view class="pingttexts">鹿马拼{{lundata[index]}}轮</view>
<view class="pingttexts">时代拼{{lundata[index]}}轮</view>
</view>
</view>
<view class="promains">
......
pages/lmping/hometwo/hometwo.json
View file @ f5bb8f59
{
"usingComponents": {
"van-count-down": "/@vant/weapp/lib/count-down/index"
"van-count-down": "/vant/weapp/lib/count-down/index"
},
"navigationBarTitleText": "产品场次区"
}
\ No newline at end of file
pages/lmping/hometwo/hometwo.wxml
View file @ f5bb8f59
......@@ -15,7 +15,7 @@
<view class="titboxsd">
<image class="proshead" src="{{clientImgPath}}/images/lmping/groupbgs.png" mode=""></image>
<view class="pingttexts">{{item.end_time1}}场次</view>
<!-- 鹿马拼产品{{pronum[index]}} -->
<!-- 时代拼产品{{pronum[index]}} -->
</view>
</view>
<view class="promains">
......
pages/lmping/lmvallog/lmvallog.json
View file @ f5bb8f59
{
"usingComponents": {
"empty":"/@vant/weapp/lib/empty/index"
"empty":"/vant/weapp/lib/empty/index"
},
"navigationBarBackgroundColor": "#FD633B",
"navigationBarTextStyle": "white",
"navigationBarTitleText": "鹿马值明细",
"navigationBarTitleText": "时代值明细",
"enablePullDownRefresh": false
}
\ No newline at end of file
pages/lmping/lmvallog/lmvallog.wxml
View file @ f5bb8f59
<!--pages/lmping/lmvallog/lmvallog.wxml-->
<!-- 鹿马值记录 -->
<!-- 时代值记录 -->
<view class="lmvallog">
<view class="lmlogsss">
<view class="logvoalsdff">
您目前已累计 <text class="valnum">{{countss}}</text> 鹿马值
您目前已累计 <text class="valnum">{{countss}}</text> 时代值
</view>
<image class="logbgs" src="{{clientImgPath}}/images/lmping/fansbg.png" mode=""></image>
</view>
......
pages/lmping/myfans/myfans.json
View file @ f5bb8f59
{
"usingComponents": {
"empty":"/@vant/weapp/lib/empty/index"
"empty":"/vant/weapp/lib/empty/index"
},
"navigationBarBackgroundColor": "#FD633B",
"navigationBarTextStyle": "white",
......
pages/lmping/order/order.json
View file @ f5bb8f59
{
"usingComponents": {
"van-popup": "/@vant/weapp/lib/popup/index",
"empty":"/@vant/weapp/lib/empty/index"
"van-popup": "/vant/weapp/lib/popup/index",
"empty":"/vant/weapp/lib/empty/index"
},
"navigationBarTitleText": "我的拼团"
}
\ No newline at end of file
pages/lmping/profitlog/profitlog.json
View file @ f5bb8f59
{
"usingComponents": {
"empty":"/@vant/weapp/lib/empty/index"
"empty":"/vant/weapp/lib/empty/index"
},
"navigationBarBackgroundColor": "#FD633B",
"navigationBarTextStyle": "white",
......
pages/lmping/rechargelog/rechargelog.json
View file @ f5bb8f59
{
"usingComponents": {
"empty":"/@vant/weapp/lib/empty/index"
"empty":"/vant/weapp/lib/empty/index"
},
"navigationBarBackgroundColor": "#FD633B",
"navigationBarTextStyle": "white",
......
pages/lmping/signin/signin.js
View file @ f5bb8f59
......@@ -39,7 +39,7 @@ Page({
console.info(e);
this.setData({
continuity_day: e.detail.continuity_day,//连续签到天数
couponNum: e.detail.couponNum,//鹿马券数量
couponNum: e.detail.couponNum,//时代券数量
signCount: e.detail.signCount,//共签到天数
})
},
......
pages/lmping/signin/signin.json
View file @ f5bb8f59
{
"usingComponents": {
"van-popup":"/@vant/weapp/lib/popup/index",
"van-popup":"/vant/weapp/lib/popup/index",
"Calendartwo":"/components/Calendartwo/Calendartwo"
},
"navigationBarTitleText": "签到"
......
pages/lmping/signin/signin.wxml
View file @ f5bb8f59
<!--pages/lmping/signin/signin.wxml-->
<!-- 签到页面 鹿马拼 -->
<!-- 签到页面 时代拼 -->
<view class="signin">
<view class="sighbgshead">
<image class="signinbg" src="{{clientImgPath}}/images/lmping/sigbgs.png" mode=""></image>
......@@ -23,7 +23,7 @@
<view class="conutnum">{{couponNum?couponNum:0}}</view>
<view class="counttits flex ali-c jus-c">
<image class="titcions" src="{{clientImgPath}}/images/lmping/couponsicon.png" mode=""></image>
<text>鹿马券</text>
<text>时代券</text>
</view>
</view>
<view class="statistics_item flex1">
......@@ -46,8 +46,8 @@
<view class="signirule">
<view class="siginitext">签到规则：</view>
<view class="siginitext">1、静态参与（消费者最终可享受免费使用产品）消费者唯一做的就是每天签到，领取鹿马券参与自动拼团；</view>
<view class="siginitext">2、签到即获得5个鹿马券，由此取得参与拼团资格每次拼团消耗1个鹿马券。</view>
<view class="siginitext">1、静态参与（消费者最终可享受免费使用产品）消费者唯一做的就是每天签到，领取时代券参与自动拼团；</view>
<view class="siginitext">2、签到即获得5个时代券，由此取得参与拼团资格每次拼团消耗1个时代券。</view>
</view>
......@@ -57,8 +57,8 @@
<view class="msgsinfopup">
<view class="texbody">
<view class="tetxmsg tetxmsg_h2">签到规则：</view>
<view class="tetxmsg">1、静态参与（消费者最终可享受免费使用产品）消费者唯一做的就是每天签到，领取鹿马券参与自动拼团；</view>
<view class="tetxmsg">2、签到即获得5个鹿马券，由此取得参与拼团资格每次拼团消耗1个鹿马券。</view>
<view class="tetxmsg">1、静态参与（消费者最终可享受免费使用产品）消费者唯一做的就是每天签到，领取时代券参与自动拼团；</view>
<view class="tetxmsg">2、签到即获得5个时代券，由此取得参与拼团资格每次拼团消耗1个时代券。</view>
</view>
<image bindtap="onClosetwo" class="closeicon" src="{{clientImgPath}}/images/images/colse.png" mode=""></image>
</view>
......
pages/lmping/user/user.js
View file @ f5bb8f59
......@@ -12,10 +12,10 @@ Page({
clientImgPath,
join_income: 0,//参团收益
spell_gold: { is_pay: 0, money: 0 },//鹿马杯
spell_gold: { is_pay: 0, money: 0 },//时代杯
spell_money: { status: 3, money: 0 },//拼团余额集合
spell_value: 0,//当日鹿马值
total_spell_value: 0,//累计鹿马值
spell_value: 0,//当日时代值
total_spell_value: 0,//累计时代值
coupon_num: 0,
spell_vip: 0,
......@@ -78,8 +78,8 @@ Page({
transferAccountsFun(e) {
let types = e.currentTarget.dataset.type;
// 1 鹿马拼余额
// 2 鹿马杯
// 1 时代拼余额
// 2 时代杯
// is_pay==1 才可以转
// status==4 可以转
......@@ -92,7 +92,7 @@ Page({
return;
}else if(types==2 && this.data.spell_gold.money ==0){
wx.showToast({
title: "鹿马杯金额不足!!",
title: "时代杯金额不足!!",
icon:"none"
})
return;
......@@ -100,7 +100,7 @@ Page({
if (types == 1 && this.data.spell_money.status != 4) {
//鹿马拼余额
//时代拼余额
wx.showToast({
title: "您暂时不可转到佣金",
icon:"none"
......@@ -108,7 +108,7 @@ Page({
return false;
} else if (types == 2 && this.data.spell_gold.is_pay != 1) {
// 鹿马杯
// 时代杯
wx.showToast({
title: "您暂时不可转到佣金",
icon:"none"
......
pages/lmping/user/user.wxml
View file @ f5bb8f59
<!--pages/lmping/user/user.wxml-->
<!-- 鹿马拼个人中心 -->
<!-- 时代拼个人中心 -->
<view class="lmpinguser">
<view class="pinguhead">
<!-- {{clientImgPath}} -->
......@@ -18,7 +18,7 @@
</view>
</view>
<view class="infotwos flex">
<view class="cumpsum">鹿马券 +{{coupon_num?coupon_num:0}}</view>
<view class="cumpsum">时代券 +{{coupon_num?coupon_num:0}}</view>
<image bindtap="getqiaodao" class="sigbbb" src="{{clientImgPath}}/images/lmping/sigbbb.png" mode=""></image>
</view>
</view>
......@@ -31,11 +31,11 @@
<view class="tatisticsbox">
<view class="tongjilines flex ali-c jus-a">
<navigator hover-class="none" url="/pages/lmping/lmvallog/lmvallog" class="tongjiitems" style="border-right: 1px solid rgba(255, 255, 255, 0.5);">
<view class="tjtitle">当日鹿马值</view>
<view class="tjtitle">当日时代值</view>
<view class="tongjival">{{spell_value?spell_value:0}}</view>
</navigator>
<navigator hover-class="none" url="/pages/lmping/lmvallog/lmvallog" class="tongjiitems" style="border-right: 1px solid rgba(255, 255, 255, 0.5);">
<view class="tjtitle">累计鹿马值</view>
<view class="tjtitle">累计时代值</view>
<view class="tongjival">{{total_spell_value?total_spell_value:0}}</view>
</navigator>
<!-- /pages/personal/I_bill/I_bill?current=7&source=7 -->
......@@ -62,7 +62,7 @@
<view class="contsitemsbox flex1 jus-c">
<view class="contsitems ">
<view class="pricesm">
<text class="prttt">鹿马杯</text>
<text class="prttt">时代杯</text>
<text class="prval">{{spell_gold.money}}</text>
</view>
<!-- <view bindtap="toyjWithdraw" class="prbtns">立即提现</view> -->
......@@ -90,7 +90,7 @@
</navigator>
<navigator url="/pages/lmping/lmvallog/lmvallog" class="navitem" hover-class="none">
<image class="imgiocn imgiocn3" src="{{clientImgPath}}/images/lmping/toplog.png" mode=""></image>
<view class="navnames">鹿马值记录</view>
<view class="navnames">时代值记录</view>
</navigator>
<!-- <view class="navitem" style="margin-top: 57rpx;">
<image class="imgiocn imgiocn4" src="{{clientImgPath}}/images/lmping/pingprice.png" mode=""></image>
......
pages/order/order.json
View file @ f5bb8f59
{
"usingComponents": {
"method_payment": "/components/dialog/method_payment/method_payment",
"van-tab": "/@vant/weapp/lib/tab/index",
"van-tabs": "/@vant/weapp/lib/tabs/index",
"mp-dialog": "/@vant/weapp/lib/popup/index"
"van-tab": "/vant/weapp/lib/tab/index",
"van-tabs": "/vant/weapp/lib/tabs/index",
"mp-dialog": "/vant/weapp/lib/popup/index"
},
"navigationBarTitleText": "我的订单",
"enablePullDownRefresh": true
......
pages/shop/shops/weidian/ping_details/ping_details.js
View file @ f5bb8f59
......@@ -126,7 +126,7 @@ Page({
}else if(res.code == 1){
wx.showModal({
title: '温馨提示',
content: '鹿马券已不足,请先去签到',
content: '时代券已不足,请先去签到',
cancelText: "先逛逛",
confirmText: "去签到",
success: (res) => {
......
pages/shop/shops/weidian/ping_details/ping_details.wxml
View file @ f5bb8f59
......@@ -65,7 +65,7 @@
<view class="bt_box">
<view class="mb-30 titleboxs" >
<text class="pingtst">鹿马拼</text>
<text class="pingtst">时代拼</text>
<text class="twolines">{{goods.title}}</text>
</view>
<view class="bt_ys xi_hui pb-15">
......
project.private.config.json
View file @ f5bb8f59
......@@ -654,19 +654,19 @@
"scene": null
},
{
"name": "鹿马拼",
"name": "时代拼",
"pathName": "pages/lmping/home/home",
"query": "log_id=65035&amount=100&order_id=57354",
"scene": null
},
{
"name": "鹿马拼签到",
"name": "时代拼签到",
"pathName": "pages/lmping/signin/signin",
"query": "log_id=65035&amount=100&order_id=57354",
"scene": null
},
{
"name": "鹿马拼 拼团产品详情",
"name": "时代拼 拼团产品详情",
"pathName": "pages/shop/shops/weidian/ping_details/ping_details",
"query": "goods_id=48916&cate_id=36",
"scene": null
......@@ -684,25 +684,25 @@
"scene": null
},
{
"name": "我的粉丝-鹿马拼",
"name": "我的粉丝-时代拼",
"pathName": "pages/lmping/myfans/myfans",
"query": "",
"scene": null
},
{
"name": "鹿马拼-推广名片",
"name": "时代拼-推广名片",
"pathName": "pages/lmping/pushcard/pushcard",
"query": "",
"scene": null
},
{
"name": "鹿马值记录~",
"name": "时代值记录~",
"pathName": "pages/lmping/lmvallog/lmvallog",
"query": "",
"scene": null
},
{
"name": "鹿马拼商城子列表",
"name": "时代拼商城子列表",
"pathName": "pages/lmping/hometwo/hometwo",
"query": "type=2",
"scene": null
......
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