mirror of
https://github.com/crmeb/CRMEB.git
synced 2025-12-20 01:12:50 +00:00
Merge remote-tracking branch 'origin/master'
This commit is contained in:
xurongyao
commit
3e28aee589
@ -1273,29 +1273,17 @@ class AuthApi extends AuthController{
|
||||
->join('__STORE_ORDER__ B','A.link_id = B.id AND B.uid = '.$uid)->select()->toArray();
|
||||
return JsonService::successful($list);
|
||||
}
|
||||
/*
|
||||
* 申请提现
|
||||
*/
|
||||
// public function user_extract()
|
||||
// {
|
||||
// if(UserExtract::userExtract($this->userInfo,UtilService::postMore([
|
||||
// ['type','','','extract_type'],'real_name','alipay_code','bank_code','bank_address',['price','','','extract_price']
|
||||
// ])))
|
||||
// return JsonService::successful('申请提现成功!');
|
||||
// else
|
||||
// return JsonService::fail(Extract::getErrorInfo());
|
||||
// }
|
||||
|
||||
public function user_extract()
|
||||
{ $request = Request::instance();
|
||||
$list=$request->param();
|
||||
$data=$list['lists'];
|
||||
// dump($data);
|
||||
// dump($this->userInfo);
|
||||
if(UserExtract::userExtract($this->userInfo,$data))
|
||||
return JsonService::successful('申请提现成功!');
|
||||
else
|
||||
return JsonService::fail(UserExtract::getErrorInfo());
|
||||
}
|
||||
|
||||
/*
|
||||
* 提现列表
|
||||
*/
|
||||
@ -1315,28 +1303,20 @@ class AuthApi extends AuthController{
|
||||
* @param int $first
|
||||
* @param int $limit
|
||||
*/
|
||||
public function subordinateOrderlist($first = 0, $limit = 8)
|
||||
{ $request = Request::instance();
|
||||
public function subordinateOrderlist($first = 0, $limit = 8){
|
||||
$request = Request::instance();
|
||||
$lists=$request->param();
|
||||
$xuid=$lists['uid'];$status=$lists['status'];
|
||||
if($status==0){
|
||||
$type='';
|
||||
}elseif($status==1){
|
||||
$type=4;
|
||||
}elseif($status==2){
|
||||
$type=3;
|
||||
}else{
|
||||
return false;
|
||||
}
|
||||
if($xuid==0){
|
||||
$xUid = $lists['uid'];
|
||||
$status = $lists['status'];
|
||||
if($status == 0) $type='';
|
||||
elseif($status == 1) $type=4;
|
||||
elseif($status == 2) $type=3;
|
||||
else return false;
|
||||
$list = [];
|
||||
if(!$xUid){
|
||||
$arr = User::where('spread_uid',$this->userInfo['uid'])->column('uid');
|
||||
foreach($arr as $v){
|
||||
|
||||
$list = StoreOrder::getUserOrderList($v,$type,$first,$limit);
|
||||
}
|
||||
}else{
|
||||
$list = StoreOrder::getUserOrderList($xuid,$type,$first,$limit);
|
||||
}
|
||||
foreach($arr as $v) $list = StoreOrder::getUserOrderList($v,$type,$first,$limit);
|
||||
}else $list = StoreOrder::getUserOrderList($xUid,$type,$first,$limit);
|
||||
foreach ($list as $k=>$order){
|
||||
$list[$k] = StoreOrder::tidyOrder($order,true);
|
||||
if($list[$k]['_status']['_type'] == 3){
|
||||
@ -1354,16 +1334,18 @@ class AuthApi extends AuthController{
|
||||
*/
|
||||
public function subordinateOrderlistmoney()
|
||||
{
|
||||
$request = Request::instance();
|
||||
$lists=$request->param();
|
||||
$status = $lists['status'];
|
||||
$type = '';
|
||||
if($status == 1) $type = 4;
|
||||
elseif($status == 2) $type = 3;
|
||||
$arr = User::where('spread_uid',$this->userInfo['uid'])->column('uid');
|
||||
foreach($arr as $v){
|
||||
$list = StoreOrder::getUserOrderList($v,$type='');
|
||||
}
|
||||
|
||||
foreach ($list as $k=>$v){
|
||||
$arr[]=$v['pay_price'];
|
||||
}
|
||||
$list = StoreOrder::getUserOrderCount(implode(',',$arr),$type);
|
||||
$price = [];
|
||||
foreach ($list as $k=>$v) $price[]=$v['pay_price'];
|
||||
$cont = count($list);
|
||||
$sum=array_sum($arr);
|
||||
$sum = array_sum($price);
|
||||
return JsonService::successful(['cont'=>$cont,'sum'=>$sum]);
|
||||
}
|
||||
/*
|
||||
|
||||
@ -644,6 +644,17 @@ class StoreOrder extends ModelBasic
|
||||
return $list;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取推广人地下用户的订单金额
|
||||
* @param string $uid
|
||||
* @param string $status
|
||||
* @return array
|
||||
*/
|
||||
public static function getUserOrderCount($uid = '',$status = ''){
|
||||
$res = self::statusByWhere($status)->where('uid','IN',$uid)->column('pay_price');
|
||||
return $res;
|
||||
}
|
||||
|
||||
public static function searchUserOrder($uid,$order_id)
|
||||
{
|
||||
$order = self::where('uid',$uid)->where('order_id',$order_id)->where('is_del',0)->field('seckill_id,bargain_id,combination_id,id,order_id,pay_price,total_num,total_price,pay_postage,total_postage,paid,status,refund_status,pay_type,coupon_price,deduction_price,delivery_type')
|
||||
|
||||
@ -38,7 +38,9 @@ class UserExtract extends ModelBasic
|
||||
public static function userExtract($userInfo,$data){
|
||||
if(!in_array($data['extract_type'],self::$extractType))
|
||||
return self::setErrorInfo('提现方式不存在');
|
||||
$balance = bcsub($userInfo['now_money'],$data['money']);
|
||||
$userInfo = User::get($userInfo['uid']);
|
||||
if($data['money'] > $userInfo['now_money']) return self::setErrorInfo('余额不足');;
|
||||
$balance = bcsub($userInfo['now_money'],$data['money'],2);
|
||||
$insertData = [
|
||||
'uid'=>$userInfo['uid'],
|
||||
'extract_type'=>$data['extract_type'],
|
||||
@ -84,24 +86,13 @@ class UserExtract extends ModelBasic
|
||||
if(!$res1) return self::setErrorInfo('提现失败');
|
||||
$res2 = User::edit(['now_money'=>$balance],$userInfo['uid'],'uid');
|
||||
$res3 = UserBill::expend('余额提现',$userInfo['uid'],'now_money','extract',$data['money'],$res1['id'],$balance,$mark);
|
||||
|
||||
$res = $res2 && $res3;
|
||||
// WechatTemplateService::sendTemplate(
|
||||
// WechatUser::uidToOpenid($userInfo['uid']),
|
||||
// WechatTemplateService::USER_BALANCE_CHANGE,
|
||||
// [
|
||||
// 'first'=>'你好,申请余额提现成功!',
|
||||
// 'keyword1'=>'余额提现',
|
||||
// 'keyword2'=>date('Y-m-d'),
|
||||
// 'keyword3'=>$data['money'],
|
||||
// 'remark'=>'点击查看我的余额明细'
|
||||
// ],
|
||||
// Url::build('wap/My/balance',[],true,true)
|
||||
// );
|
||||
if($res)
|
||||
self::checkTrans($res);
|
||||
if($res){
|
||||
//发送模板消息
|
||||
return true;
|
||||
else
|
||||
return self::setErrorInfo('提现失败!');
|
||||
}
|
||||
else return self::setErrorInfo('提现失败!');
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -78,7 +78,7 @@ App({
|
||||
})
|
||||
}
|
||||
if (that.globalData.openPages != '') {
|
||||
wx.reLaunch({
|
||||
wx.navigateTo({
|
||||
url: that.globalData.openPages
|
||||
})
|
||||
} else {
|
||||
@ -135,7 +135,7 @@ App({
|
||||
success: function (res) {
|
||||
that.globalData.uid = res.data.data.uid;
|
||||
if (that.globalData.openPages != '') {
|
||||
wx.reLaunch({
|
||||
wx.navigateTo({
|
||||
url: that.globalData.openPages
|
||||
})
|
||||
} else {
|
||||
@ -148,8 +148,22 @@ App({
|
||||
} else {
|
||||
console.log('登录失败！' + res.errMsg)
|
||||
}
|
||||
},
|
||||
fail: function (res) {
|
||||
wx.showToast({
|
||||
title: '授权失败，请重新打开小程序',
|
||||
icon: 'none',
|
||||
duration: 1500,
|
||||
})
|
||||
}
|
||||
})
|
||||
},
|
||||
fail: function (res) {
|
||||
wx.showToast({
|
||||
title: '授权失败，请重新授权',
|
||||
icon: 'none',
|
||||
duration: 1500,
|
||||
})
|
||||
}
|
||||
})
|
||||
},
|
||||
|
||||
@ -18,6 +18,7 @@
|
||||
"pages/spread/spread",
|
||||
"pages/promotion-order/promotion-order",
|
||||
"pages/coupon/coupon",
|
||||
"pages/cut-list/cut-list",
|
||||
"pages/news-list/news-list",
|
||||
"pages/product-con/index",
|
||||
"pages/product-pinke/index",
|
||||
@ -33,6 +34,7 @@
|
||||
"pages/integral-con/integral-con",
|
||||
"pages/orders-con/orders-con",
|
||||
"pages/order-confirm/order-confirm",
|
||||
"pages/pink-list/index",
|
||||
"pages/productSort/productSort",
|
||||
"pages/address/address",
|
||||
"pages/feree/feree",
|
||||
|
||||
@ -7,7 +7,6 @@ Page({
|
||||
url: app.globalData.urlImages,
|
||||
hiddentap: true,
|
||||
hidde: true,
|
||||
minmoney:'',
|
||||
money:'',
|
||||
index:0,
|
||||
array:["请选择银行","招商银行","建设银行","农业银行"]
|
||||
@ -17,11 +16,8 @@ Page({
|
||||
*/
|
||||
onLoad:function (opends) {
|
||||
app.setBarColor();
|
||||
var money = opends.money;
|
||||
var that = this;
|
||||
that.setData({
|
||||
money: money
|
||||
})
|
||||
this.getUserInfo();
|
||||
this.getUserExtractBank();
|
||||
wx.request({
|
||||
url: app.globalData.url + '/routine/auth_api/minmoney?uid=' + app.globalData.uid,
|
||||
@ -33,6 +29,18 @@ Page({
|
||||
}
|
||||
})
|
||||
},
|
||||
getUserInfo:function(){
|
||||
var that = this;
|
||||
wx.request({
|
||||
url: app.globalData.url + '/routine/auth_api/my?uid=' + app.globalData.uid,
|
||||
method: 'POST',
|
||||
success: function (res) {
|
||||
that.setData({
|
||||
money: res.data.data.now_money
|
||||
})
|
||||
}
|
||||
});
|
||||
},
|
||||
getUserExtractBank:function () {
|
||||
var that = this;
|
||||
wx.request({
|
||||
@ -118,6 +126,7 @@ Page({
|
||||
title: '提示',
|
||||
content: warn
|
||||
})
|
||||
return false;
|
||||
}
|
||||
} else {
|
||||
list.weixin = e.detail.value.weixin;
|
||||
@ -138,6 +147,7 @@ Page({
|
||||
title: '提示',
|
||||
content: warn
|
||||
})
|
||||
return false;
|
||||
}
|
||||
}
|
||||
wx.request({
|
||||
@ -146,18 +156,15 @@ Page({
|
||||
method: 'POST',
|
||||
header: header,
|
||||
success: function (res) {
|
||||
// console.log(res);
|
||||
that.setData({
|
||||
money: (that.data.money - list.money).toFixed(2)
|
||||
})
|
||||
wx.showToast({
|
||||
title: res.data.msg,
|
||||
icon: 'success',
|
||||
duration: 1500
|
||||
})
|
||||
// that.setData({
|
||||
// mainArray: res.data.data
|
||||
// })
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
})
|
||||
@ -9,7 +9,7 @@ Page({
|
||||
xinghidden:true,
|
||||
xinghidden2:true,
|
||||
xinghidden3: true,
|
||||
url: app.globalData.urlImages,
|
||||
url: '',
|
||||
hidden:false,
|
||||
unique:'',
|
||||
uni:'',
|
||||
@ -83,6 +83,16 @@ Page({
|
||||
xing3: index
|
||||
})
|
||||
},
|
||||
delImages:function(e){
|
||||
var that = this;
|
||||
var dataimg = that.data.dataimg;
|
||||
var index = e.currentTarget.dataset.id;
|
||||
dataimg.splice(index,1);
|
||||
that.setData({
|
||||
dataimg: dataimg
|
||||
})
|
||||
|
||||
},
|
||||
uploadpic:function(e){
|
||||
var that = this;
|
||||
wx.chooseImage({
|
||||
@ -96,7 +106,6 @@ Page({
|
||||
wx.showLoading({
|
||||
title: '图片上传中',
|
||||
})
|
||||
console.log(tempFilePaths);
|
||||
var len = tempFilePaths.length;
|
||||
for (var i = 0; i < len; i++) {
|
||||
wx.uploadFile({
|
||||
@ -111,7 +120,6 @@ Page({
|
||||
},
|
||||
success: function (res) {
|
||||
wx.hideLoading();
|
||||
console.log(res);
|
||||
if(res.statusCode == 403){
|
||||
wx.showToast({
|
||||
title: res.data,
|
||||
@ -120,6 +128,7 @@ Page({
|
||||
})
|
||||
} else {
|
||||
var data = JSON.parse(res.data);
|
||||
data.data.url = app.globalData.url + data.data.url;
|
||||
that.data.dataimg.push(data);
|
||||
that.setData({
|
||||
dataimg: that.data.dataimg
|
||||
|
||||
@ -1,18 +1,52 @@
|
||||
// pages/integral-con/integral-con.js
|
||||
var app = getApp();
|
||||
Page({
|
||||
|
||||
/**
|
||||
* 页面的初始数据
|
||||
*/
|
||||
data: {
|
||||
|
||||
userInfo:[],
|
||||
integralInfo:[],
|
||||
first:0,
|
||||
limit:8,
|
||||
},
|
||||
|
||||
/**
|
||||
* 生命周期函数--监听页面加载
|
||||
*/
|
||||
onLoad: function (options) {
|
||||
|
||||
this.getUserInfo();
|
||||
this.getList();
|
||||
},//user_integral_list
|
||||
getList:function(){
|
||||
var that = this;
|
||||
wx.request({
|
||||
url: app.globalData.url + '/routine/auth_api/user_integral_list?uid=' + app.globalData.uid,
|
||||
method: 'GET',
|
||||
data:{
|
||||
first: that.data.first,
|
||||
limit: that.data.limit,
|
||||
},
|
||||
success: function (res) {
|
||||
that.setData({
|
||||
integralInfo: res.data.data,
|
||||
})
|
||||
}
|
||||
});
|
||||
},
|
||||
getUserInfo:function(){
|
||||
var that = this;
|
||||
wx.request({
|
||||
url: app.globalData.url + '/routine/auth_api/my?uid=' + app.globalData.uid,
|
||||
method: 'POST',
|
||||
success: function (res) {
|
||||
that.setData({
|
||||
userInfo: res.data.data,
|
||||
})
|
||||
console.log(that.data.userInfo);
|
||||
}
|
||||
});
|
||||
},
|
||||
|
||||
/**
|
||||
@ -54,7 +88,29 @@ Page({
|
||||
* 页面上拉触底事件的处理函数
|
||||
*/
|
||||
onReachBottom: function () {
|
||||
|
||||
var that = this;
|
||||
var first = that.data.first;
|
||||
var limit = that.data.limit;
|
||||
if (!first) first = 1;
|
||||
var startpage = limit * first;
|
||||
wx.request({
|
||||
url: app.globalData.url + '/routine/auth_api/user_integral_list?uid=' + app.globalData.uid,
|
||||
method: 'GET',
|
||||
data: {
|
||||
first: startpage,
|
||||
limit: that.data.limit,
|
||||
},
|
||||
success: function (res) {
|
||||
var len = res.data.data.length;
|
||||
for (var i = 0; i < len; i++) {
|
||||
that.data.integralInfo.push(res.data.data[i])
|
||||
}
|
||||
that.setData({
|
||||
first: first + 1,
|
||||
integralInfo: that.data.integralInfo
|
||||
});
|
||||
}
|
||||
});
|
||||
},
|
||||
|
||||
/**
|
||||
|
||||
@ -1,28 +1,30 @@
|
||||
<view class='header flex'>
|
||||
<text class='text'>我的积分</text>
|
||||
<view class='count'>10000</view>
|
||||
<navigator hover-class='none'>获取积分</navigator>
|
||||
<view class='count'>{{userInfo.integral}}</view>
|
||||
<navigator hover-class='none' url="/pages/index/index" open-type='switchTab'>获取积分</navigator>
|
||||
</view>
|
||||
<view class='details-list'>
|
||||
<view class='title'><text>积分明细</text></view>
|
||||
<view class='list-wrapper'>
|
||||
<view class='list-item flex expenditure'>
|
||||
<block wx:for="{{integralInfo}}">
|
||||
<view class='list-item flex expenditure' wx:if="{{item.pm == 1}}">
|
||||
<view class='left-wrapper'>
|
||||
<view class='order-num'>支付订单，订单编号178954654145</view>
|
||||
<view class='time-bar'>2017/10/10 14:50</view>
|
||||
<view class='order-num'>{{item.mark}}</view>
|
||||
<view class='time-bar'>{{item.add_time}}</view>
|
||||
</view>
|
||||
<view class='right-wrapper'>
|
||||
<text class='status-txt'>-1666</text>积分
|
||||
<text class='status-txt'>+{{item.number}}</text>积分
|
||||
</view>
|
||||
</view>
|
||||
<view class='list-item flex'>
|
||||
<view class='list-item flex' wx:else>
|
||||
<view class='left-wrapper'>
|
||||
<view class='order-num'>支付订单，订单编号178954654145</view>
|
||||
<view class='time-bar'>2017/10/10 14:50</view>
|
||||
<view class='order-num'>{{item.mark}}</view>
|
||||
<view class='time-bar'>{{item.add_time}}</view>
|
||||
</view>
|
||||
<view class='right-wrapper'>
|
||||
<text class='status-txt'>-1666</text>积分
|
||||
<text class='status-txt'>-{{item.number}}</text>积分
|
||||
</view>
|
||||
</view>
|
||||
</block>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
@ -316,8 +316,9 @@ Page({
|
||||
});
|
||||
},
|
||||
toAddress: function () {
|
||||
var that = this;
|
||||
wx.navigateTo({ //跳转至指定页面并关闭其他打开的所有页面（这个最好用在返回至首页的的时候）
|
||||
url: '/pages/addaddress/addaddress?cartId=' + this.data.cartId + '&pinkId=' + that.data.pinkId + '&couponId=' + that.data.couponId
|
||||
url: '/pages/addaddress/addaddress?cartId=' + that.data.cartId + '&pinkId=' + that.data.pinkId + '&couponId=' + that.data.couponId
|
||||
})
|
||||
},
|
||||
getConfirm: function (cartIdsStr){
|
||||
|
||||
@ -148,6 +148,11 @@ Page({
|
||||
icon: 'success',
|
||||
duration: 2000
|
||||
})
|
||||
setTimeout(function(){
|
||||
wx.navigateTo({
|
||||
url: '/pages/orders-list/orders-list',
|
||||
})
|
||||
},1500)
|
||||
} else {
|
||||
wx.showToast({
|
||||
title: res.data.msg,
|
||||
|
||||
@ -39,6 +39,14 @@ Page({
|
||||
},
|
||||
success: function (res) { }
|
||||
})
|
||||
if (!e.detail.value.number) {
|
||||
wx.showToast({
|
||||
title: '请输入充值金额',
|
||||
icon: 'none',
|
||||
duration: 1000,
|
||||
})
|
||||
return false;
|
||||
}
|
||||
wx.request({
|
||||
url: app.globalData.url + '/routine/auth_api/user_wechat_recharge?uid=' + app.globalData.uid,
|
||||
method: 'GET',
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<form bindsubmit='submitSub' report-submit='true'>
|
||||
<view class="pay-bg">
|
||||
<view class='title'>输入金额</view>
|
||||
<view class='input flex'><text>￥</text><input type='number' placeholder='0.00' placeholder-class='placeholder' name='number'></input></view>
|
||||
<view class='input flex'><text>￥</text><input type='digit' placeholder='0.00' placeholder-class='placeholder' name='number'></input></view>
|
||||
<view class='tip'>提示：当前余额为 <text>￥{{userinfo.now_money}}</text></view>
|
||||
<button class='but' form-type='submit'>立即充值</button>
|
||||
</view>
|
||||
|
||||
@ -38,10 +38,10 @@
|
||||
<view>销量:{{storeInfo.sales}}{{storeInfo.unit_name}}</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class='block-bar' bindtap='goCoupon'>
|
||||
<!-- <view class='block-bar' bindtap='goCoupon'>
|
||||
<text class='title'>领券</text>
|
||||
<text>领取优惠券 </text>
|
||||
</view>
|
||||
</view> -->
|
||||
<!-- <view class='block-bar integral' wx:if="{{storeInfo.give_integral > 0}}">
|
||||
<text class='title'>积分</text>
|
||||
<text>购买可获得{{storeInfo.give_integral}}积分</text>
|
||||
|
||||
@ -77,10 +77,6 @@
|
||||
<text>客服</text>
|
||||
</view>
|
||||
</button>
|
||||
<view class='item' bindtap='setCollect'>
|
||||
<view class='iconfont icon-pingjia {{collect==true?"icon-xingxing":""}}'></view>
|
||||
<text>收藏</text>
|
||||
</view>
|
||||
<view class='item' bindtap='getCar'>
|
||||
<view class='iconfont icon-gouwuche'><span class='item-span'>{{CartCount}}</span></view>
|
||||
<text>购物车</text>
|
||||
@ -104,5 +100,3 @@
|
||||
|
||||
<include src="/pages/foo-tan/foo-tan.wxml"/>
|
||||
<import src="/wxParse/wxParse.wxml"/>
|
||||
|
||||
|
||||
|
||||
@ -34,7 +34,7 @@ swiper-item{position: relative; width: 100%;}
|
||||
.foot .fn-btns .item .iconfont.icon-xingxing{color: #ff7000;}
|
||||
|
||||
|
||||
.foot .btns-wrapper{width: 446rpx; height: 100%; line-height: 110rpx; color: #fff; font-size: 30rpx;}
|
||||
.foot .btns-wrapper{width: 688rpx; height: 100%; line-height: 110rpx; color: #fff; font-size: 30rpx;}
|
||||
.foot .btns-wrapper view{flex: 1; text-align: center;}
|
||||
.foot .btns-wrapper .buy-btn{background-color: #ff7000;}
|
||||
.foot .btns-wrapper .payment-btn{background-color: #ff3d3d;}
|
||||
@ -54,6 +54,3 @@ swiper-item{position: relative; width: 100%;}
|
||||
.countdown-time text{height:35rpx;padding:0 8rpx;display:inline-block;background-color:#fff;color:#ff3d3d;line-height:35rpx;border-radius:5rpx;margin-top:8rpx;}
|
||||
@import "/pages/foo-tan/foo-tan.wxss";
|
||||
@import "/wxParse/wxParse.wxss";
|
||||
|
||||
|
||||
|
||||
|
||||
@ -84,24 +84,18 @@
|
||||
<view class='iconfont icon-kefu'></view>
|
||||
<text>客服</text>
|
||||
</view>
|
||||
<view class='item' bindtap='setCollect'>
|
||||
<view class="iconfont icon-pingjia {{collect==true?'icon-xingxing':''}}"></view>
|
||||
<text>收藏</text>
|
||||
</view>
|
||||
<view class='item' bindtap='getCar'>
|
||||
<view class='iconfont icon-gouwuche'><span class='item-span'>{{CartCount}}</span></view>
|
||||
<text>购物车</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class='btns-wrapper flex'>
|
||||
<!-- <view class='buy-btn'>加入购物车</view> -->
|
||||
<form class="form-btn" bindsubmit="parameterShow" report-submit='true'>
|
||||
<input type='text' style="display:none" name="pinkId" value='0'></input>
|
||||
<button class='payment-btn' form-type='submit'>确认下单</button>
|
||||
</form>
|
||||
</view>
|
||||
</view>
|
||||
<!-- <view class="model-bg {{show==true ? 'show':''}} {{prostatus==true ? 'show':''}}" bindtap='modelbg'></view> -->
|
||||
<view class="pinklist-model {{show==true ? 'show':''}}">
|
||||
<view class='tit-bar'>正在拼单</view>
|
||||
<scroll-view scroll-y style="max-height:635rpx;">
|
||||
@ -126,4 +120,3 @@
|
||||
</view>
|
||||
<include src="/pages/foo-tan/foo-tan.wxml"/>
|
||||
<import src="/wxParse/wxParse.wxml"/>
|
||||
|
||||
|
||||
@ -36,7 +36,7 @@ swiper-item{position: relative; width: 100%;}
|
||||
.foot .fn-btns .item{flex: 1; text-align: center; font-size: 22rpx; color: #666;}
|
||||
.foot .fn-btns .item .iconfont{font-size: 35rpx; color: #999;position:relative;}
|
||||
.foot .fn-btns .item .iconfont.icon-xingxing{color: #ff7000;}
|
||||
.foot .btns-wrapper{width: 445rpx; height: 100%; line-height: 110rpx; color: #fff; font-size: 30rpx;}
|
||||
.foot .btns-wrapper{width: 688rpx; height: 100%; line-height: 110rpx; color: #fff; font-size: 30rpx;}
|
||||
.foot .btns-wrapper view{flex: 1; text-align: center;}
|
||||
.foot .btns-wrapper .buy-btn{background-color: #ff7000;}
|
||||
.foot .btns-wrapper .payment-btn{background-color: #ff3d3d;}
|
||||
|
||||
@ -78,6 +78,7 @@ Page({
|
||||
currentTab: -1
|
||||
})
|
||||
that.orderlist();
|
||||
this.orderlistmoney();
|
||||
},
|
||||
icondui2:function(e){
|
||||
var that = this;
|
||||
@ -133,7 +134,7 @@ Page({
|
||||
var that = this;
|
||||
wx.request({
|
||||
url: app.globalData.url + '/routine/auth_api/subordinateOrderlistmoney?uid=' + app.globalData.uid,
|
||||
data: { uid: 0, status: 0 },
|
||||
data: { status: that.data.icondui},
|
||||
method: 'POST',
|
||||
success: function (res) {
|
||||
if (res.data.code == 200) {
|
||||
@ -150,5 +151,4 @@ Page({
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
})
|
||||
@ -33,13 +33,13 @@ Page({
|
||||
search: e.detail.value
|
||||
});
|
||||
},
|
||||
getorderlist: function (e) {
|
||||
getorderlist: function () {
|
||||
var header = {
|
||||
'content-type': 'application/x-www-form-urlencoded',
|
||||
};
|
||||
var that = this;
|
||||
var search = that.data.search;
|
||||
var limit = 4;
|
||||
var limit = 8;
|
||||
var orderType = that.data.orderType;
|
||||
var first = that.data.first;
|
||||
var startpage = limit * first;
|
||||
@ -49,7 +49,6 @@ Page({
|
||||
method: 'get',
|
||||
header: header,
|
||||
success: function (res) {
|
||||
console.log(res);
|
||||
var $data = res.data.data;
|
||||
if (!startpage && !$data.length){
|
||||
wx.showToast({
|
||||
@ -115,7 +114,7 @@ Page({
|
||||
* 页面上拉触底事件的处理函数
|
||||
*/
|
||||
onReachBottom: function () {
|
||||
|
||||
this.getorderlist();
|
||||
},
|
||||
|
||||
/**
|
||||
|
||||
@ -103,9 +103,8 @@ Page({
|
||||
success: function (res) {
|
||||
wx.hideLoading();
|
||||
var data = JSON.parse(res.data);
|
||||
console.log(data);
|
||||
if (data.code == 200) {
|
||||
that.data.dataimg.push(data.data.url);
|
||||
that.data.dataimg.push(app.globalData.url+data.data.url);
|
||||
}
|
||||
that.setData({
|
||||
dataimg: that.data.dataimg
|
||||
@ -184,6 +183,11 @@ Page({
|
||||
icon: 'success',
|
||||
duration: 2000
|
||||
})
|
||||
setTimeout(function(){
|
||||
wx.navigateTo({
|
||||
url: '/pages/orders-con/orders-con?order_id=' + that.data.orderId
|
||||
})
|
||||
},1500)
|
||||
}else{
|
||||
wx.showToast({
|
||||
title: res.data.msg,
|
||||
|
||||
@ -32,8 +32,6 @@ Page({
|
||||
userinfo: res.data.data,
|
||||
orderStatusNum: res.data.data.orderStatusNum
|
||||
})
|
||||
that.coupon();
|
||||
that.collect();
|
||||
}
|
||||
});
|
||||
},
|
||||
@ -55,50 +53,8 @@ Page({
|
||||
that.setData({
|
||||
userinfo: res.data.data
|
||||
})
|
||||
that.coupon();
|
||||
that.collect();
|
||||
}
|
||||
});
|
||||
},
|
||||
/**
|
||||
* 生命周期函数--优惠卷个数
|
||||
*/
|
||||
coupon: function () {
|
||||
var header = {
|
||||
'content-type': 'application/x-www-form-urlencoded',
|
||||
};
|
||||
var that = this;
|
||||
wx.request({
|
||||
url: app.globalData.url + '/routine/auth_api/get_use_coupons?uid=' + app.globalData.uid,
|
||||
data:{types:0},
|
||||
method: 'GET',
|
||||
header: header,
|
||||
success: function (res) {
|
||||
that.setData({
|
||||
// coupon: res.data.data.length
|
||||
})
|
||||
}
|
||||
})
|
||||
},
|
||||
/**
|
||||
* 生命周期函数--收藏个数
|
||||
*/
|
||||
collect: function () {
|
||||
var header = {
|
||||
'content-type': 'application/x-www-form-urlencoded',
|
||||
'cookie': app.globalData.sessionId//读取cookie
|
||||
};
|
||||
var that = this;
|
||||
wx.request({
|
||||
url: app.globalData.url + '/routine/auth_api/get_user_collect_product?uid=' + app.globalData.uid,
|
||||
method: 'GET',
|
||||
header: header,
|
||||
success: function (res) {
|
||||
that.setData({
|
||||
// collect: res.data.data.length
|
||||
})
|
||||
}
|
||||
})
|
||||
},
|
||||
/**
|
||||
* 生命周期函数--我的余额
|
||||
@ -139,9 +95,6 @@ Page({
|
||||
collects: function () {
|
||||
wx.navigateTo({
|
||||
url: '/pages/collect/collect',
|
||||
success: function (res) { },
|
||||
fail: function (res) { },
|
||||
complete: function (res) { },
|
||||
})
|
||||
},
|
||||
/**
|
||||
|
||||
@ -19,11 +19,11 @@
|
||||
<view class='text' >我的积分</view>
|
||||
</view>
|
||||
<view class='amount-item' bindtap='coupons'>
|
||||
<view class='count'>{{coupon ? coupon : 0}}</view>
|
||||
<view class='count'>{{userinfo.couponCount ? userinfo.couponCount : 0}}</view>
|
||||
<view class='text' >优惠券</view>
|
||||
</view>
|
||||
<view class='amount-item' bindtap='collects'>
|
||||
<view class='count'>{{collect ? collect : 0}}</view>
|
||||
<view class='count'>{{userinfo.like ? userinfo.like : 0}}</view>
|
||||
<view class='text' >收藏商品</view>
|
||||
</view>
|
||||
</view>
|
||||
@ -56,6 +56,7 @@
|
||||
</view>
|
||||
<view class='item'>
|
||||
<navigator hover-class="none" url='/pages/refund-order/refund-order'>
|
||||
<view class='item-span' wx:if="{{orderStatusNum.noRefund}}">{{orderStatusNum.noRefund}}</view>
|
||||
<image src='/images/dfh.png'></image>
|
||||
<view class='text'>退款/售后</view>
|
||||
</navigator>
|
||||
@ -153,7 +154,3 @@
|
||||
</navigator>
|
||||
</movable-view>
|
||||
</movable-area>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
"compileType": "miniprogram",
|
||||
"libVersion": "1.9.94",
|
||||
"appid": "wx7bc36cccc15e4be2",
|
||||
"projectname": "crmebn_831",
|
||||
"projectname": "crmebn",
|
||||
"condition": {
|
||||
"search": {
|
||||
"current": -1,
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user