Skip to content

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

addxx

parent caa203db
Hide whitespace changes
Inline Side-by-side
Showing with 305 additions and 158 deletions
components/Calendartwo/Calendartwo.js
View file @ 2bffd0f8
...@@ -2,19 +2,19 @@ ...@@ -2,19 +2,19 @@
const app = getApp(); const app = getApp();
var clientImgPath = app.globalData.clientImgPath; var clientImgPath = app.globalData.clientImgPath;
var img_host = app.globalData.ImgPath; var img_host = app.globalData.ImgPath;
var staticUrl=app.globalData.staticUrl; var staticUrl = app.globalData.staticUrl;
import {formatZero} from "../../utils/util"; import { formatZero } from "../../utils/util";
import {Spellsign,getSignInfo} from "../../api/lmping.js"; import { Spellsign, getSignInfo } from "../../api/lmping.js";
Component({ Component({
/** /**
* 组件的属性列表 * 组件的属性列表
*/ */
properties: { properties: {
signdates:{ signdates: {
type:Array, type: Array,
value:[], value: [],
}, },
sendYear: { sendYear: {
...@@ -35,19 +35,19 @@ Component({ ...@@ -35,19 +35,19 @@ Component({
}, },
}, },
observers: { observers: {
'signdates': function(field) { 'signdates': function (field) {
this.properties.signdates = field this.properties.signdates = field
}, },
}, },
attached() { attached() {
// this.data.cur_year = this.properties.sendYear; // this.data.cur_year = this.properties.sendYear;
// this.data.cur_month = this.properties.sendMonth; // this.data.cur_month = this.properties.sendMonth;
// this.data.SignUp = this.properties.dataSource; // this.data.SignUp = this.properties.dataSource;
console.log(this.data.days) console.log(this.data.days)
console.log(this.properties.signdates) console.log(this.properties.signdates)
this.setData({ this.setData({
cur_year: this.properties.sendYear, cur_year: this.properties.sendYear,
cur_month: this.properties.sendMonth, cur_month: this.properties.sendMonth,
...@@ -77,16 +77,16 @@ Component({ ...@@ -77,16 +77,16 @@ Component({
toYear: parseInt(new Date().getFullYear()), //本年 toYear: parseInt(new Date().getFullYear()), //本年
weeks_ch: ['日', '一', '二', '三', '四', '五', '六'], weeks_ch: ['日', '一', '二', '三', '四', '五', '六'],
weeks_en: ['Sun', 'Mon', 'Tues', 'Wed', 'Thur', 'Fri', 'Sat'], weeks_en: ['Sun', 'Mon', 'Tues', 'Wed', 'Thur', 'Fri', 'Sat'],
total_count:'', total_count: '',
showeggs:true, showeggs: true,
clientImgPath, clientImgPath,
img_host, img_host,
staticUrl, staticUrl,
showpuptwos:false, showpuptwos: false,
datesindex:0, datesindex: 0,
huodecup:5, huodecup: 5,
}, },
/** /**
...@@ -94,32 +94,32 @@ Component({ ...@@ -94,32 +94,32 @@ Component({
*/ */
methods: { methods: {
//快速签到事件 父组件调用 //快速签到事件 父组件调用
tosigs(){ tosigs() {
// console.info("触发进来了~"); // console.info("触发进来了~");
this.clickSignUp({currentTarget:{dataset:{type:1,date:1,index:1}}}); this.clickSignUp({ currentTarget: { dataset: { type: 1, date: 1, index: 1 } } });
}, },
showpupfun(){ showpupfun() {
this.setData({ this.setData({
showpuptwos:true showpuptwos: true
}) })
}, },
onClosetwos(){ onClosetwos() {
this.setData({ this.setData({
showpuptwos:false, showpuptwos: false,
}) })
}, },
alreadySign(){ alreadySign() {
wx.showToast({ wx.showToast({
title: '不能重复签到', title: '不能重复签到',
icon:'none' icon: 'none'
}) })
}, },
beforesign(){ beforesign() {
wx.showToast({ wx.showToast({
title: '不能提前签到', title: '不能提前签到',
icon:'none' icon: 'none'
}) })
}, },
// 获取当月共多少天 // 获取当月共多少天
...@@ -153,7 +153,7 @@ Component({ ...@@ -153,7 +153,7 @@ Component({
// 绘制当月天数占的格子，并把它放到days数组中 // 绘制当月天数占的格子，并把它放到days数组中
calculateDays(year, month) { calculateDays(year, month) {
this.triggerEvent('counts',this.data.total_count) this.triggerEvent('counts', this.data.total_count)
let that = this let that = this
console.log(year, month) console.log(year, month)
const thisMonthDays = this.getThisMonthDays(year, month); const thisMonthDays = this.getThisMonthDays(year, month);
...@@ -171,39 +171,48 @@ Component({ ...@@ -171,39 +171,48 @@ Component({
} }
console.log(this.properties.dataSource) console.log(this.properties.dataSource)
this.getSignInfofun(); this.getSignInfofun();
}, },
getSignInfofun(){ getSignInfofun() {
console.info(`${this.data.cur_year}-${formatZero(this.data.cur_month,2)}`,"666"); console.info(`${this.data.cur_year}-${formatZero(this.data.cur_month, 2)}`, "666");
getSignInfo({ getSignInfo({
month:`${this.data.cur_year}-${formatZero(this.data.cur_month,2)}` month: `${this.data.cur_year}-${formatZero(this.data.cur_month, 2)}`
}).then(res=>{ }).then(res => {
if(res.code == 0){ if (res.code == 0) {
let daysdata = res.data.list let daysdata = res.data.list
let days = this.data.days.map((item,index)=>{ let days = this.data.days.map((item, index) => {
// console.log(item) // console.log(item)
daysdata.map((itm)=>{ daysdata.map((itm) => {
if(item.date == itm.day){ if (item.date == itm.day) {
item.isSign = true item.isSign = true
} }
})
if (item.date == this.data.today && this.data.cur_month == this.data.toMonth && this.data.cur_year == this.data.toYear && item.date == itm.day) {
// // this.setData({
if(item.date==this.data.today && this.data.cur_month==this.data.toMonth && this.data.cur_year==this.data.toYear){ // datesindex:index,
this.setData({ // })
datesindex:index, console.info("开发测试", "今日已签到");
}) this.triggerEvent('changestate', 1);//修改状态
} }
return item; })
})
//
if (item.date == this.data.today && this.data.cur_month == this.data.toMonth && this.data.cur_year == this.data.toYear) {
this.setData({ this.setData({
days datesindex: index,
}) })
let obj = {signCount:res.data.signCount,continuity_day:res.data.continuity_day,couponNum:res.data.couponNum}; }
this.triggerEvent('setcounts',obj)
} return item;
})
this.setData({
days
})
let obj = { signCount: res.data.signCount, continuity_day: res.data.continuity_day, couponNum: res.data.couponNum };
this.triggerEvent('setcounts', obj)
}
}) })
}, },
...@@ -226,6 +235,8 @@ Component({ ...@@ -226,6 +235,8 @@ Component({
if (year == this.cur_year && month == this.cur_month && daysArr[j].date == day) { //&& signs[i].isSign == "今日已打卡" if (year == this.cur_year && month == this.cur_month && daysArr[j].date == day) { //&& signs[i].isSign == "今日已打卡"
// console.log(daysArr[j].date, day); // console.log(daysArr[j].date, day);
daysArr[j].isSign = true; daysArr[j].isSign = true;
console.info("开发测试123");
} }
} }
} }
...@@ -237,12 +248,12 @@ Component({ ...@@ -237,12 +248,12 @@ Component({
// 切换控制年月，上一个月，下一个月 // 切换控制年月，上一个月，下一个月
handleCalendar(event) { handleCalendar(event) {
var type = event.currentTarget.dataset.type; var type = event.currentTarget.dataset.type;
const cur_year = parseInt(this.data.cur_year); const cur_year = parseInt(this.data.cur_year);
const cur_month = parseInt(this.data.cur_month); const cur_month = parseInt(this.data.cur_month);
var newMonth; var newMonth;
var newYear = cur_year; var newYear = cur_year;
...@@ -269,8 +280,8 @@ Component({ ...@@ -269,8 +280,8 @@ Component({
newYear, newYear,
newMonth, newMonth,
cur_month:newMonth,//addxx cur_month: newMonth,//addxx
cur_year:newYear, cur_year: newYear,
}) })
...@@ -295,7 +306,7 @@ Component({ ...@@ -295,7 +306,7 @@ Component({
let type = value.currentTarget.dataset.type let type = value.currentTarget.dataset.type
let date = value.currentTarget.dataset.date let date = value.currentTarget.dataset.date
let index = value.currentTarget.dataset.index let index = value.currentTarget.dataset.index
console.info("index",this.data.datesindex); console.info("index", this.data.datesindex);
// return false // return false
var str = "签到"; var str = "签到";
if (type == 0) { //如果不需要补签功能直接在这阻止不执行后面的代码就行。 if (type == 0) { //如果不需要补签功能直接在这阻止不执行后面的代码就行。
...@@ -319,14 +330,14 @@ Component({ ...@@ -319,14 +330,14 @@ Component({
// }) // })
this.setData({ this.setData({
showpuptwos:true, showpuptwos: true,
}) })
this.getSignInfofun(); this.getSignInfofun();
this.onJudgeSign(); this.onJudgeSign();
} else { } else {
//测试 //测试
wx.showToast({ wx.showToast({
title: res.msg, title: res.msg,
......
pages/index/index.wxml
View file @ 2bffd0f8
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<view class="prosheadbox"> <view class="prosheadbox">
<view class="titboxsd"> <view class="titboxsd">
<image class="proshead" src="{{clientImgPath}}/images/lmping/groupbgs.png" mode=""></image> <image class="proshead" src="{{clientImgPath}}/images/lmping/groupbgs.png" mode=""></image>
<view class="pingttexts">悦想拼{{lundata[item.type-1]}}轮</view> <view class="pingttexts">{{lundata[item.type-1]}}礼包</view>
</view> </view>
</view> </view>
<view class="promains"> <view class="promains">
......
pages/lmping/hometwo/hometwo.js
View file @ 2bffd0f8
...@@ -61,7 +61,7 @@ Page({ ...@@ -61,7 +61,7 @@ Page({
return ; return ;
} }
wx.navigateTo({ wx.navigateTo({
url:`/pages/shop/shops/weidian/ping_details/ping_details?goods_id=${item.goods_id}&group_id=${item.group_id}&rentersum=${item.is_join}&ppj=${item.spell_price}`, url:`/pages/shop/shops/weidian/ping_details/ping_details?goods_id=${item.goods_id}&group_id=${item.group_id}&rentersum=${item.join_num}&ppj=${item.spell_price}`,
}) })
}, },
//通过字符串小时 获取当前时间戳 //通过字符串小时 获取当前时间戳
......
pages/lmping/hometwo/hometwo.wxml
View file @ 2bffd0f8
...@@ -80,7 +80,8 @@ ...@@ -80,7 +80,8 @@
<view class="pingprice flex ali-c"><text>拼拼价¥</text><text class="num">{{item.spell_price}}</text></view> <view class="pingprice flex ali-c"><text>拼拼价¥</text><text class="num">{{item.spell_price}}</text></view>
</view> </view>
<view class="pings flex ali-c jus-b"> <view class="pings flex ali-c jus-b">
<text class="count">{{item.is_join}}人正在拼</text> <text wx:if="{{item.timestate==2}}" class="count">{{item.join_num}}人已拼过</text>
<text wx:if="{{item.timestate!=2}}" class="count">{{item.join_num}}人正在拼</text>
<view wx:if="{{item.timestate==2}}" class="pingbtns pingbtns1">已结束</view> <view wx:if="{{item.timestate==2}}" class="pingbtns pingbtns1">已结束</view>
<view wx:if="{{item.timestate!=2}}" class="pingbtns">马上拼</view> <view wx:if="{{item.timestate!=2}}" class="pingbtns">马上拼</view>
......
pages/lmping/hometwo/hometwo.wxss
View file @ 2bffd0f8
...@@ -128,7 +128,9 @@ ...@@ -128,7 +128,9 @@
} }
.pings .pingbtns1{ .pings .pingbtns1{
background: linear-gradient(247deg, #bfa0a2, #000000); /* background: linear-gradient(247deg, #ff7241, #ff7241); */
background: #f79956;
} }
......
pages/lmping/order/order.js
View file @ 2bffd0f8
// pages/lmping/order/order.js // pages/lmping/order/order.js
const app = getApp(); const app = getApp();
var clientImgPath = app.globalData.clientImgPath; var clientImgPath = app.globalData.clientImgPath;
import {getSpellWinList} from "../../../api/lmping.js"; import { getSpellWinList } from "../../../api/lmping.js";
var staticUrl = app.globalData.staticUrl; var staticUrl = app.globalData.staticUrl;
Page({ Page({
// 0 正在拼团 // 0 正在拼团
// 1 拼团失败 // 1 拼团失败
// 2 拼团成功 // 2 拼团成功
/** /**
* 页面的初始数据 * 页面的初始数据
*/ */
data: { data: {
scrleft:0, scrleft: 0,
classid:0, classid: 0,
showtis:false, showtis: false,
clientImgPath, clientImgPath,
staticUrl, staticUrl,
page:0, page: 0,
isshowall:false, isshowall: false,
datalist: [],
datalist:[], thisYMD:"",//当天时间
hidden:false,
}, },
/** /**
* 生命周期函数--监听页面加载 * 生命周期函数--监听页面加载
*/ */
onLoad: function (options) { onLoad: function (options) {
if(options.tab==0){ if (options.tab == 0) {
this.setData({ this.setData({
classid:0, classid: 0,
}) })
//... //...
}else if(options.tab==2){ } else if (options.tab == 2) {
this.setData({ this.setData({
classid:2, classid: 2,
})
//...
}else if (options.tab == 1) {
this.setData({
classid: 1,
}) })
//... //...
} }
this.getSpellWinListFun(); this.getSpellWinListFun();
//获取当前年月日
var date = new Date();
var year = date.getFullYear(); //获取当前年份(2位)
var MM = date.getMonth() + 1;
if (MM < 10) {
MM = "0" + MM;
}
var DD = date.getDate();
this.setData({
thisYMD: `${year}-${MM}-${DD}`,
})
},
setUserInfo(){
this.setData({
page: 0,
isshowall: false,
datalist: [],
})
this.getSpellWinListFun();
}, },
//点击中奖的产品 //点击中奖的产品
clickitems(){ clickitems() {
if(this.data.classid==2){ if (this.data.classid == 2) {
this.onClosetis1();//去查看订单详情~ this.onClosetis1();//去查看订单详情~
} }
}, },
changeClass(e){ changeClass(e) {
this.setData({ this.setData({
classid:e.currentTarget.dataset.id, classid: e.currentTarget.dataset.id,
isshowall:false, isshowall: false,
page:0, page: 0,
datalist:[], datalist: [],
}) })
this.getSpellWinListFun();//重新请求数据 this.getSpellWinListFun();//重新请求数据
}, },
//显示提示 //显示提示
showtis(){ showtis() {
this.setData({ this.setData({
showtis:true, showtis: true,
}) })
}, },
onClosetis(){ onClosetis() {
this.setData({ this.setData({
showtis:false, showtis: false,
}) })
}, },
//查看订单 //查看订单
onClosetis1(){ onClosetis1() {
this.setData({ this.setData({
showtis:false, showtis: false,
}) })
wx.navigateTo({ wx.navigateTo({
url: '/pages/order/order?currentTab=1&status=1,2', url: '/pages/order/order?currentTab=1&status=1,2',
}) })
}, },
//参团列表 //参团列表
getSpellWinListFun(){ getSpellWinListFun() {
this.data.page++; this.data.page++;
getSpellWinList({ getSpellWinList({
is_win:this.data.classid,//？ 0 参与中 1是已中奖 1未中奖 is_win: this.data.classid,//？ 0 参与中 1是已中奖 1未中奖
page:this.data.page, page: this.data.page,
}).then((res)=>{ }).then((res) => {
if(res.code==0){ if (res.code == 0) {
if(res.data.length==0){ if (res.data.length == 0) {
this.setData({ this.setData({
isshowall:true, isshowall: true,
}) })
wx.showToast({ wx.showToast({
title: '没有更多了~', title: '没有更多了~',
icon:"none" icon: "none"
}) })
} }
this.setData({ this.setData({
datalist:[...this.data.datalist,...res.data] datalist: [...this.data.datalist, ...res.data]
}) })
} }
}) })
...@@ -112,7 +142,12 @@ Page({ ...@@ -112,7 +142,12 @@ Page({
* 生命周期函数--监听页面显示 * 生命周期函数--监听页面显示
*/ */
onShow: function () { onShow: function () {
if(!wx.getStorageSync('userInfo')){
this.setData({
hidden:true,
});
return;
}
}, },
/** /**
...@@ -140,7 +175,7 @@ Page({ ...@@ -140,7 +175,7 @@ Page({
* 页面上拉触底事件的处理函数 * 页面上拉触底事件的处理函数
*/ */
onReachBottom: function () { onReachBottom: function () {
if(this.data.isshowall==false){ if (this.data.isshowall == false) {
this.getSpellWinListFun(); this.getSpellWinListFun();
} }
}, },
......
pages/lmping/order/order.wxml
View file @ 2bffd0f8
...@@ -22,6 +22,10 @@ ...@@ -22,6 +22,10 @@
<!-- 拼团记录列表 --> <!-- 拼团记录列表 -->
<view class="ptorderbody"> <view class="ptorderbody">
<view class="ptorderitem" wx:for="{{datalist}}" wx:key="index"> <view class="ptorderitem" wx:for="{{datalist}}" wx:key="index">
<view class="ordertisline flex ali-c jus-b" wx:if="{{classid == 0}}" >
<view class="tistitle tistitle11">开团时间: {{thisYMD}} {{item.end_time}}</view>
</view>
<view wx:if="{{classid == 2}}" bindtap="showtis" class="ordertisline flex ali-c jus-b"> <view wx:if="{{classid == 2}}" bindtap="showtis" class="ordertisline flex ali-c jus-b">
<view class="tistitle">恭喜您拼团成功，请等待发货</view> <view class="tistitle">恭喜您拼团成功，请等待发货</view>
<image class="titsicons" src="{{clientImgPath}}/images/lmping/ordertis.png" mode=""></image> <image class="titsicons" src="{{clientImgPath}}/images/lmping/ordertis.png" mode=""></image>
...@@ -47,6 +51,7 @@ ...@@ -47,6 +51,7 @@
</view> </view>
</view> </view>
</view> </view>
<empty wx:if="{{datalist.length==0}}"></empty> <empty wx:if="{{datalist.length==0}}"></empty>
...@@ -64,4 +69,7 @@ ...@@ -64,4 +69,7 @@
</van-popup> </van-popup>
</view> </view>
\ No newline at end of file
<!-- 登陆授权弹窗 -->
<login hidden="{{hidden}}" bind:setUserInfo="setUserInfo" />
\ No newline at end of file
pages/lmping/order/order.wxss
View file @ 2bffd0f8
...@@ -58,7 +58,7 @@ page { ...@@ -58,7 +58,7 @@ page {
} }
.ptorderbody { .ptorderbody {
padding: 20rpx 24rpx; padding: 35rpx 24rpx;
} }
.ptorderitem { .ptorderitem {
......
pages/lmping/pushcard/pushcard.wxss
View file @ 2bffd0f8
...@@ -44,7 +44,7 @@ page { ...@@ -44,7 +44,7 @@ page {
} }
.yaoqingma{ .yaoqingma{
padding-top: 220rpx; padding-top: 210rpx;
padding-bottom: 20rpx; padding-bottom: 20rpx;
text-align: center; text-align: center;
font-size: 30rpx; font-size: 30rpx;
......
pages/lmping/signin/signin.js
View file @ 2bffd0f8
...@@ -13,10 +13,55 @@ Page({ ...@@ -13,10 +13,55 @@ Page({
continuity_day: 0,//连续签到天数 continuity_day: 0,//连续签到天数
couponNum: 0,//优惠券数量 couponNum: 0,//优惠券数量
signCount: 0,//共签到天数 signCount: 0,//共签到天数
issignin:0,// 是否已签到 1是 0否
}, },
//点击签到按钮 签到 //点击签到按钮 签到
tosigs(){ tosigs(){
this.selectComponent("#Calendartwo").tosigs();//去签到 if(this.data.issignin==1){
return false;
}
wx.requestSubscribeMessage({
tmplIds: [
'9xeKmbrizAedCEgCdAjD7_Qt0GdYHs1dTEvL9ZEY_NI',//中奖结果通知
'8TkrhjwrRTw1gGd7xwQoGlfR7CNshUrVM6f2HuRh6hk',//活动开始提醒模板ID
't5ktB2Cg_dxPHnHLmMoRJ2aIErp3Uv6yzsTjctgYCGY',////积分变动通知
],
success:(res1)=> {
console.info(res1,"res1");
var model_id_list = [];
for(var i in res1 ){
if(res1[i]=='accept'){
model_id_list.push(i)
}
};
console.info("model_id_list",model_id_list);
this.setData({
model_id_list:model_id_list,//授权的模板id
})
//model_id_list
//继续执行
this.selectComponent("#Calendartwo").tosigs();//去签到
//允许的 accept "reject" 是拒绝
},
fail:(res)=> {
//继续执行
this.selectComponent("#Calendartwo").tosigs();//去签到
console.log(res);
}
})
//完事后调用下面的方法就行
},
//组件修改页面是否签到状态
changestate(e){
console.info(e,"eee");
this.setData({
issignin:e.detail,
})
}, },
showguize(){ showguize(){
this.setData({ this.setData({
...@@ -36,7 +81,7 @@ Page({ ...@@ -36,7 +81,7 @@ Page({
}, },
//签到子组件调用 //签到子组件调用
setcounts(e){ setcounts(e){
console.info(e); // console.info(e);
this.setData({ this.setData({
continuity_day: e.detail.continuity_day,//连续签到天数 continuity_day: e.detail.continuity_day,//连续签到天数
couponNum: e.detail.couponNum,//悦想券数量 couponNum: e.detail.couponNum,//悦想券数量
......
pages/lmping/signin/signin.wxml
View file @ 2bffd0f8
...@@ -8,7 +8,9 @@ ...@@ -8,7 +8,9 @@
<view bindtap="tosigs" class="Partakeboxmain ali-c" > <view bindtap="tosigs" class="Partakeboxmain ali-c" >
<view class="Partake ali-c jus-c"> <view class="Partake ali-c jus-c">
<view class="texts texts1">签到</view>
<view wx:if="{{issignin==1}}">已签到</view>
<view wx:else class="texts texts1">签到</view>
</view> </view>
<view class="Partakebox ali-c"></view> <view class="Partakebox ali-c"></view>
</view> </view>
...@@ -39,7 +41,7 @@ ...@@ -39,7 +41,7 @@
<!-- 签到日历 --> <!-- 签到日历 -->
<view class="signinmain"> <view class="signinmain">
<!-- <Calendartwo @counts="counts"></Calendartwo> --> <!-- <Calendartwo @counts="counts"></Calendartwo> -->
<Calendartwo id="Calendartwo" bind:setcounts="setcounts" bind:popshows="popshows"></Calendartwo> <Calendartwo id="Calendartwo" bind:changestate="changestate" bind:setcounts="setcounts" bind:popshows="popshows"></Calendartwo>
</view> </view>
<!-- 签到日历end --> <!-- 签到日历end -->
......
pages/lmping/user/user.js
View file @ 2bffd0f8
...@@ -26,13 +26,16 @@ Page({ ...@@ -26,13 +26,16 @@ Page({
is_shop:2,//1 商家 2不是商家 is_shop:2,//1 商家 2不是商家
timedatas:0,
}, },
/** /**
* 生命周期函数--监听页面加载 * 生命周期函数--监听页面加载
*/ */
onLoad: function (options) { onLoad: function (options) {
this.setData({
timedatas: Math.round(new Date() / 1000),
})
}, },
setUserInfo(e) { //点击了授权 setUserInfo(e) { //点击了授权
if (e.detail) { if (e.detail) {
......
pages/lmping/user/user.wxml
View file @ 2bffd0f8
...@@ -91,22 +91,22 @@ ...@@ -91,22 +91,22 @@
</view> </view>
<view class="servehall_body flex ali-c flex-wrap"> <view class="servehall_body flex ali-c flex-wrap">
<navigator url="/pages/lmping/myfans/myfans" class="navitem" hover-class="none"> <navigator url="/pages/lmping/myfans/myfans" class="navitem" hover-class="none">
<image class="imgiocn imgiocn1" src="{{clientImgPath}}/images/lmping/fensi.png" mode=""></image> <image class="imgiocn imgiocn1" src="{{clientImgPath}}/images/lmping/fensi.png?a={{timedatas}}" mode=""></image>
<view class="navnames">我的粉丝</view> <view class="navnames">我的粉丝</view>
</navigator> </navigator>
<navigator url="/pages/withdraw_record/withdraw_record" class="navitem" hover-class="none"> <navigator url="/pages/withdraw_record/withdraw_record" class="navitem" hover-class="none">
<image class="imgiocn imgiocn2" src="{{clientImgPath}}/images/lmping/witlog.png" mode=""></image> <image class="imgiocn imgiocn2" src="{{clientImgPath}}/images/lmping/witlog.png?a={{timedatas}}" mode=""></image>
<view class="navnames">提现记录</view> <view class="navnames">提现记录</view>
</navigator> </navigator>
<navigator url="/pages/withdraw/withdraw" class="navitem" hover-class="none"> <navigator url="/pages/withdraw/withdraw" class="navitem" hover-class="none">
<image class="imgiocn imgiocn11" src="{{clientImgPath}}/images/lmping/withdraw.png" mode=""></image> <image class="imgiocn imgiocn11" src="{{clientImgPath}}/images/lmping/withdraw.png?a={{timedatas}}" mode=""></image>
<view class="navnames">前往提现</view> <view class="navnames">前往提现</view>
</navigator> </navigator>
<navigator url="/pages/lmping/lmvallog/lmvallog" class="navitem" style="margin-top: 57rpx;" hover-class="none"> <navigator url="/pages/lmping/lmvallog/lmvallog" class="navitem" style="margin-top: 57rpx;" hover-class="none">
<image class="imgiocn imgiocn3" src="{{clientImgPath}}/images/lmping/toplog.png" mode=""></image> <image class="imgiocn imgiocn3" src="{{clientImgPath}}/images/lmping/toplog.png?a={{timedatas}}" mode=""></image>
<view class="navnames">悦想值记录</view> <view class="navnames">悦想值记录</view>
</navigator> </navigator>
<!-- <view class="navitem" style="margin-top: 57rpx;"> <!-- <view class="navitem" style="margin-top: 57rpx;">
...@@ -115,43 +115,43 @@ ...@@ -115,43 +115,43 @@
</view> --> </view> -->
<navigator url="/pages/lmping/pushcard/pushcard?secret_key={{secret_key}}" class="navitem" style="margin-top: 57rpx;" hover-class="none"> <navigator url="/pages/lmping/pushcard/pushcard?secret_key={{secret_key}}" class="navitem" style="margin-top: 57rpx;" hover-class="none">
<image class="imgiocn imgiocn5" src="{{clientImgPath}}/images/lmping/tmingp.png" mode=""></image> <image class="imgiocn imgiocn5" src="{{clientImgPath}}/images/lmping/tmingp.png?a={{timedatas}}" mode=""></image>
<view class="navnames">推广名片</view> <view class="navnames">推广名片</view>
</navigator> </navigator>
<navigator url="/pages/lmping/order/order" class="navitem" style="margin-top: 57rpx;" hover-class="none"> <navigator url="/pages/lmping/order/order" class="navitem" style="margin-top: 57rpx;" hover-class="none">
<image class="imgiocn imgiocn6" src="{{clientImgPath}}/images/lmping/tuanimg.png" mode=""></image> <image class="imgiocn imgiocn6" src="{{clientImgPath}}/images/lmping/tuantwoicon.png?a={{timedatas}}" mode=""></image>
<view class="navnames">拼团订单</view> <view class="navnames">拼团订单</view>
</navigator> </navigator>
<navigator url="/pages/lmping/rechargelog/rechargelog" class="navitem" style="margin-top: 57rpx;" hover-class="none"> <navigator url="/pages/lmping/rechargelog/rechargelog" class="navitem" style="margin-top: 57rpx;" hover-class="none">
<image class="imgiocn imgiocn7" src="{{clientImgPath}}/images/lmping/gmlogs.png" mode=""></image> <image class="imgiocn imgiocn7" src="{{clientImgPath}}/images/lmping/gmlogs.png?a={{timedatas}}" mode=""></image>
<view class="navnames">购买记录</view> <view class="navnames">购买记录</view>
</navigator> </navigator>
<navigator url="/pages/address_list/address_list?type=0" class="navitem" style="margin-top: 57rpx;" hover-class="none"> <navigator url="/pages/address_list/address_list?type=0" class="navitem" style="margin-top: 57rpx;" hover-class="none">
<image class="imgiocn imgiocn8" src="{{clientImgPath}}/images/lmping/addressicon.png" mode=""></image> <image class="imgiocn imgiocn8" src="{{clientImgPath}}/images/lmping/addressicon.png?a={{timedatas}}" mode=""></image>
<view class="navnames">收货地址</view> <view class="navnames">收货地址</view>
</navigator> </navigator>
<!-- <navigator url="/pages/lmping/activitydescri/activitydescri" class="navitem" style="margin-top: 57rpx;" hover-class="none"> <!-- <navigator url="/pages/lmping/activitydescri/activitydescri" class="navitem" style="margin-top: 57rpx;" hover-class="none">
<image class="imgiocn imgiocn9" src="{{clientImgPath}}/images/lmping/ruleicon.png" mode=""></image> <image class="imgiocn imgiocn9" src="{{clientImgPath}}/images/lmping/ruleicon.png?a={{timedatas}}" mode=""></image>
<view class="navnames">规则说明</view> <view class="navnames">规则说明</view>
</navigator> --> </navigator> -->
<!-- <navigator open-type="switchTab" url="/pages/index/index" class="navitem" style="margin-top: 57rpx;" hover-class="none"> <!-- <navigator open-type="switchTab" url="/pages/index/index" class="navitem" style="margin-top: 57rpx;" hover-class="none">
<image class="imgiocn imgiocn10" src="{{clientImgPath}}/images/lmping/proto.png" mode=""></image> <image class="imgiocn imgiocn10" src="{{clientImgPath}}/images/lmping/proto.png?a={{timedatas}}" mode=""></image>
<view class="navnames">前往产品区</view> <view class="navnames">前往产品区</view>
</navigator> --> </navigator> -->
<navigator url="/pages/set/set" class="navitem" style="margin-top: 57rpx;" hover-class="none"> <navigator url="/pages/set/set" class="navitem" style="margin-top: 57rpx;" hover-class="none">
<image class="imgiocn imgiocn14" src="{{clientImgPath}}/images/lmping/seticon.png" mode=""></image> <image class="imgiocn imgiocn14" src="{{clientImgPath}}/images/lmping/seticon.png?a={{timedatas}}" mode=""></image>
<view class="navnames">设置中心</view> <view class="navnames">设置中心</view>
</navigator> </navigator>
<navigator url="/pages/lmping/profitlog/profitlog" class="navitem" style="margin-top: 57rpx;" hover-class="none"> <navigator url="/pages/lmping/profitlog/profitlog" class="navitem" style="margin-top: 57rpx;" hover-class="none">
<image class="imgiocn imgiocn13" src="{{clientImgPath}}/images/lmping/profitlog.png" mode=""></image> <image class="imgiocn imgiocn13" src="{{clientImgPath}}/images/lmping/profitlog.png?a={{timedatas}}" mode=""></image>
<view class="navnames">收益明细</view> <view class="navnames">收益明细</view>
</navigator> </navigator>
...@@ -160,19 +160,19 @@ ...@@ -160,19 +160,19 @@
<!-- /pages/Ishop/Ishop --> <!-- /pages/Ishop/Ishop -->
<navigator wx:if="{{is_shop==1}}" url="/pages/Ishop/Ishop" class="navitem" style="margin-top: 57rpx;" hover-class="none"> <navigator wx:if="{{is_shop==1}}" url="/pages/Ishop/Ishop" class="navitem" style="margin-top: 57rpx;" hover-class="none">
<image class="imgiocn imgiocn16" src="{{clientImgPath}}/images/lmping/mystoreicon.png" mode=""></image> <image class="imgiocn imgiocn16" src="{{clientImgPath}}/images/lmping/mystoreicon.png?a={{timedatas}}" mode=""></image>
<view class="navnames">我的店铺</view> <view class="navnames">我的店铺</view>
</navigator> </navigator>
<navigator url="/pages/order/order" class="navitem" style="margin-top: 57rpx;" hover-class="none"> <navigator url="/pages/order/order" class="navitem" style="margin-top: 57rpx;" hover-class="none">
<image class="imgiocn imgiocn15" src="{{clientImgPath}}/images/lmping/snedorder.png" mode=""></image> <image class="imgiocn imgiocn15" src="{{clientImgPath}}/images/lmping/snedorder.png?a={{timedatas}}" mode=""></image>
<view class="navnames">物流订单</view> <view class="navnames">物流订单</view>
</navigator> </navigator>
<navigator url="/pages/aboutus/aboutusnav/aboutusnav" class="navitem" style="margin-top: 57rpx;" hover-class="none"> <navigator url="/pages/aboutus/aboutusnav/aboutusnav" class="navitem" style="margin-top: 57rpx;" hover-class="none">
<image class="imgiocn imgiocn12" src="{{clientImgPath}}/images/lmping/aboutus.png" mode=""></image> <image class="imgiocn imgiocn12" src="{{clientImgPath}}/images/lmping/aboutus.png?a={{timedatas}}" mode=""></image>
<view class="navnames">关于我们</view> <view class="navnames">关于我们</view>
</navigator> </navigator>
......
pages/lmping/user/user.wxss
View file @ 2bffd0f8
...@@ -167,18 +167,18 @@ page { ...@@ -167,18 +167,18 @@ page {
margin: 0 auto; margin: 0 auto;
} }
.servehall .servehall_body .imgiocn1 { .servehall .servehall_body .imgiocn1 {
width: 62rpx; width: 58rpx;
height: 56rpx; height: 53rpx;
} }
.servehall .servehall_body .imgiocn2 { .servehall .servehall_body .imgiocn2 {
width: 58rpx; width: 59rpx;
height: 58rpx; height: 58rpx;
} }
.servehall .servehall_body .imgiocn3 { .servehall .servehall_body .imgiocn3 {
width: 57rpx; width: 54rpx;
height: 57rpx; height: 54rpx;
} }
.servehall .servehall_body .imgiocn4 { .servehall .servehall_body .imgiocn4 {
...@@ -187,22 +187,22 @@ page { ...@@ -187,22 +187,22 @@ page {
} }
.servehall .servehall_body .imgiocn5 { .servehall .servehall_body .imgiocn5 {
width: 62rpx; width: 59rpx;
height: 56rpx; height: 53rpx;
} }
.servehall .servehall_body .imgiocn6 { .servehall .servehall_body .imgiocn6 {
width: 50rpx; width: 52rpx;
height: 56rpx; height: 57rpx;
} }
.servehall .servehall_body .imgiocn7{ .servehall .servehall_body .imgiocn7{
width: 56rpx; width: 59rpx;
height: 55rpx; height: 58rpx;
} }
.servehall .servehall_body .imgiocn8{ .servehall .servehall_body .imgiocn8{
width: 57rpx; width: 59rpx;
height: 56rpx; height: 58rpx;
} }
.servehall .servehall_body .imgiocn9{ .servehall .servehall_body .imgiocn9{
width: 53rpx; width: 53rpx;
...@@ -214,17 +214,17 @@ page { ...@@ -214,17 +214,17 @@ page {
} }
.servehall .servehall_body .imgiocn11{ .servehall .servehall_body .imgiocn11{
width: 60rpx; width: 63rpx;
height: 45rpx; height: 48rpx;
} }
.servehall .servehall_body .imgiocn12{ .servehall .servehall_body .imgiocn12{
width: 55rpx; width: 58rpx;
height: 49rpx; height: 52rpx;
} }
.servehall .servehall_body .imgiocn13{ .servehall .servehall_body .imgiocn13{
width: 50rpx; width: 52rpx;
height: 55rpx; height: 57rpx;
} }
.servehall .servehall_body .imgiocn14{ .servehall .servehall_body .imgiocn14{
...@@ -233,12 +233,12 @@ page { ...@@ -233,12 +233,12 @@ page {
} }
.servehall .servehall_body .imgiocn15{ .servehall .servehall_body .imgiocn15{
width: 50rpx; width: 55rpx;
height: 54rpx; height: 59rpx;
} }
.servehall .servehall_body .imgiocn16{ .servehall .servehall_body .imgiocn16{
width: 53rpx; width: 55rpx;
height: 53rpx; height: 55rpx;
} }
.servehall .servehall_body .navnames { .servehall .servehall_body .navnames {
......
pages/shop/shops/weidian/ping_details/ping_details.js
View file @ 2bffd0f8
...@@ -102,6 +102,8 @@ Page({ ...@@ -102,6 +102,8 @@ Page({
showpuptwos:false, showpuptwos:false,
model_id_list:[],//授权成功的模板id
}, },
//关闭拼团弹窗 //关闭拼团弹窗
onClosetwos(){ onClosetwos(){
...@@ -112,12 +114,46 @@ Page({ ...@@ -112,12 +114,46 @@ Page({
url: '/pages/lmping/user/user', url: '/pages/lmping/user/user',
}) })
}, },
//显示模板id 涂上
topingfunone(e){
//授权
//消息提示
wx.requestSubscribeMessage({
tmplIds: [
'9xeKmbrizAedCEgCdAjD7_Qt0GdYHs1dTEvL9ZEY_NI',//中奖结果通知
'8TkrhjwrRTw1gGd7xwQoGlfR7CNshUrVM6f2HuRh6hk',//活动开始提醒模板ID
't5ktB2Cg_dxPHnHLmMoRJ2aIErp3Uv6yzsTjctgYCGY',////积分变动通知
],
success:(res1)=> {
console.info(res1,"res1");
var model_id_list = [];
for(var i in res1 ){
if(res1[i]=='accept'){
model_id_list.push(i)
}
};
console.info("model_id_list",model_id_list);
this.setData({
model_id_list:model_id_list,//授权的模板id
})
//model_id_list
this.topingfun(e.currentTarget.dataset.type);//继续执行
//允许的 accept "reject" 是拒绝
},
fail:(res)=> {
this.topingfun(e.currentTarget.dataset.type);//继续执行
console.log(res);
}
})
//完事后调用下面的方法就行
},
//点击拼都到这里面 //点击拼都到这里面
topingfun(e) { topingfun(types) {
//自动 1 马上2 //自动 1 马上2
console.info(e);
this.setData({ this.setData({
pingtype: e.currentTarget.dataset.type, pingtype: types,//e.currentTarget.dataset.type,
}) })
//去选地址 //去选地址
...@@ -130,6 +166,7 @@ Page({ ...@@ -130,6 +166,7 @@ Page({
group_id: this.data.group_id, group_id: this.data.group_id,
addr_id: this.data.submitaddrid, addr_id: this.data.submitaddrid,
is_auto:is_auto, is_auto:is_auto,
model_id_list:this.data.model_id_list,
}).then((res) => { }).then((res) => {
if (res.code == 0) { if (res.code == 0) {
// wx.showToast({ // wx.showToast({
......
pages/shop/shops/weidian/ping_details/ping_details.wxml
View file @ 2bffd0f8
...@@ -165,9 +165,9 @@ ...@@ -165,9 +165,9 @@
</view> </view>
<view class="db_box_right flex ali-c"> <view class="db_box_right flex ali-c">
<button bindtap="topingfun" data-type="1" class="ping1" type="primary">自动拼团</button> <button bindtap="topingfunone" data-type="1" class="ping1" type="primary">自动拼团</button>
<!-- <button class="ping1" type="primary">自动拼团</button> --> <!-- <button class="ping1" type="primary">自动拼团</button> -->
<button bindtap="topingfun" data-type="2" class="ping2" type="primary">马上拼团</button> <button bindtap="topingfunone" data-type="2" class="ping2" type="primary">马上拼团</button>
</view> </view>
</view> </view>
......
pages/withdraw/withdraw.wxml
View file @ 2bffd0f8
...@@ -69,7 +69,10 @@ ...@@ -69,7 +69,10 @@
</view> </view>
<view class="sz_24 inp_hui mt-30" style="color:#f64f15"> <view class="sz_24 inp_hui mt-30" style="color:#f64f15">
提现规则：500元以下预计秒到；500元以上T+1到账；节假日顺延；提现时间为：8:00—21:00；提现最低额度为：50元；每日最多提现三次，提现间隔最少15分钟一次。 提现规则：到账时间为T+1；节假日顺延；
<view>
提现时间为：8:00—21:00；提现最低额度为：50元；每日最多提现三次，提现间隔最少15分钟一次。
</view>
<view> <view>
提现手续费：个人提现5%。 提现手续费：个人提现5%。
</view> </view>
......
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