Skip to content

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

addxx

parent 1b70013f
Hide whitespace changes
Inline Side-by-side
Showing with 179 additions and 81 deletions
components/dialog/address_list/address_list.wxml
View file @ 103319e8
<!--components/dialog/address_list/address_list.wxml--> <!--components/dialog/address_list/address_list.wxml-->
<!-- 弹窗 --> <!-- 弹窗 -->
<view class="modals modals-bottom-dialog" hidden="{{hideModal}}"> <view class="modals modals-bottom-dialog" hidden="{{hideModal}}">
<view class="modals-cancel" bindtap="hideModal"></view> <view class="modals-cancel" bindtap="hideModal"></view>
<view class="bottom-dialog-body bottom-pos" style="bottom:0;" animation="{{animationData}}"> <view class="bottom-dialog-body bottom-pos" style="bottom:0;" animation="{{animationData}}">
<view class="dspjc mb-40"> <view class="dspjc mb-40">
<view class="bt_text">请选择您的地址</view> <view class="bt_text">请选择您的地址</view>
<navigator hover-class="none" url="/pages/personal/set/new_address/new_address?type={{type}}"> <navigator hover-class="none" url="/pages/new_address/new_address?type={{type}}">
<view class="tianjtext">点击添加新地址</view> <view class="tianjtext">点击添加新地址</view>
</navigator> </navigator>
<view class="quxiaoimg" bindtap="hideModal"><image src="{{clientImgPath}}/images/sc/guanbi@2x.png"></image></view> <view class="quxiaoimg" bindtap="hideModal">
</view> <image src="{{clientImgPath}}/images/sc/guanbi@2x.png"></image>
<view class="imgbox"> </view>
<form bindsubmit="form" report-submit="true"> </view>
<radio-group bindchange="radiochange"> <view class="imgbox">
<!-- 可以使用 --> <form bindsubmit="form" report-submit="true">
<black wx:for='{{addr_list}}' wx:key='index'> <radio-group bindchange="radiochange">
<view class=""> <!-- 可以使用 -->
<view class="dspla"> <black wx:for='{{addr_list}}' wx:key='index'>
<view class="dizhibox"> <label for="">
<view class="{{item.is_use==2?'colorgray':''}}">您的姓名：{{item.name}}</view> <view class="">
<view class="mt-10 mb-10 {{item.is_use==2?'colorgray':''}}">联系电话：{{item.mobile}}</view> <view class="dspla">
<view class="{{item.is_use==2?'colorgray':''}}">用户地址：{{item.addr}}</view> <view class="dizhibox">
</view> <view class="{{item.is_use==2?'colorgray':''}}">您的姓名：{{item.name}}</view>
<view class="ml-20"> <view class="mt-10 mb-10 {{item.is_use==2?'colorgray':''}}">联系电话：{{item.mobile}}
<radio value="{{item.addr_id}}" checked="{{addr_id==index}}"/> </view>
</view> <view class="{{item.is_use==2?'colorgray':''}}">用户地址：{{item.addr}}</view>
</view> </view>
</view> <view class="ml-20">
<view class="xian mb-20 mt-20"></view> <radio value="{{item.addr_id}}" checked="{{addr_id==index}}" />
</black> </view>
</radio-group> </view>
</form> </view>
<view class="xian mb-20 mt-20"></view>
</label>
</black>
</radio-group>
</form>
</view>
</view>
</view>
</view>
</view>
</view>
\ No newline at end of file
components/dialog/paymentCode/paymentCode.wxml
View file @ 103319e8
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<text wx:if='{{pwdVal.length>i}}'></text> <text wx:if='{{pwdVal.length>i}}'></text>
</view> </view>
</view> </view>
<navigator url="/pages/personal/set/payment_code/payment_code?type=1" class='forget_pwd' hover-class="none">忘记密码</navigator> <navigator url="/pages/payment_code/payment_code?type=1" class='forget_pwd' hover-class="none">忘记密码</navigator>
<input class='input_control' password type='number' focus='{{payFocus}}' bindinput='inputPwd' maxlength='6'/> <input class='input_control' password type='number' focus='{{payFocus}}' bindinput='inputPwd' maxlength='6'/>
</view> </view>
</view> </view>
......
components/dialog/paymentCodeTwo/paymentCodeTwo.wxml
View file @ 103319e8
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<text wx:if='{{pwdVal.length>i}}'></text> <text wx:if='{{pwdVal.length>i}}'></text>
</view> </view>
</view> </view>
<navigator url="/pages/personal/set/payment_code/payment_code?type=1" class='forget_pwd' hover-class="none">忘记密码</navigator> <navigator url="/pages/payment_code/payment_code?type=1" class='forget_pwd' hover-class="none">忘记密码</navigator>
<input class='input_control' password type='number' focus='{{payFocus}}' bindinput='inputPwd' maxlength='6'/> <input class='input_control' password type='number' focus='{{payFocus}}' bindinput='inputPwd' maxlength='6'/>
</view> </view>
</view> </view>
......
components/login/login.js
View file @ 103319e8
...@@ -93,7 +93,7 @@ Component({ ...@@ -93,7 +93,7 @@ Component({
console.log(err,'信息获取失败'); console.log(err,'信息获取失败');
}) })
} }
app.showToast({title:data.msg,icon:'none'}); // app.showToast({title:data.msg,icon:'none'}); 不要提示
}).catch(err=>{ }).catch(err=>{
wx.hideLoading(); wx.hideLoading();
if(err.code=='-99999' || err.code=='-10800'){ if(err.code=='-99999' || err.code=='-10800'){
......
pages/Ishop/Ishop.js
View file @ 103319e8
...@@ -305,6 +305,11 @@ Page({ ...@@ -305,6 +305,11 @@ Page({
//tooltiptextTwo //tooltiptextTwo
console.info("12"); console.info("12");
//this.selectComponent("#prizemodel").showModal(); //this.selectComponent("#prizemodel").showModal();
this.selectComponent("#tooltiptextTwo").showModal(); // this.selectComponent("#tooltiptextTwo").showModal();
},
towithdrawal(){
wx.navigateTo({
url: '/pages/withdraw/withdraw?type=2',
})
} }
}); });
\ No newline at end of file
pages/Ishop/Ishop.wxml
View file @ 103319e8
...@@ -43,20 +43,22 @@ ...@@ -43,20 +43,22 @@
</view> </view>
</view> --> </view> -->
<!-- <view class="topbox_20 mt-20"> <view class="topbox_20 mt-20">
<view class="ali-z mt-10 mb-10"> <view class="ali-z mt-10 mb-10">
<view class="sz_30 bt_hei"> <view class="sz_30 bt_hei">
<view class="mb-10 ali-c" bindtap="showmsgtx">可提现 <image class="msgsiocns" src="{{clientImgPath}}/images/uts/msgsicons.png"></image> <view class="mb-10 ali-c" bindtap="showmsgtx">可提现
<!-- <image class="msgsiocns" src="{{clientImgPath}}/images/uts/msgsicons.png"></image> -->
</view> </view>
<view class="balanceiocn">{{gold}}</view> <view class="balanceiocn">{{gold}}</view>
</view> </view>
<view class="ali-c sz_30 c_bi" data-gold="{{gold}}" bindtap="cremacteric" > <view class="ali-c sz_30 c_bi" data-gold="{{gold}}" bindtap="towithdrawal" >
<view class="btn1 mr-10">提现</view> <view class="btn1 mr-10">提现</view>
</view> </view>
</view> </view>
</view> --> </view>
<!-- 提现弹窗 --> <!-- 提现弹窗 -->
<!-- bindtap="cremacteric" -->
<cremacteric id="cremacteric" /> <cremacteric id="cremacteric" />
<!-- <view class="topbox_20 mt-20"> <!-- <view class="topbox_20 mt-20">
......
pages/address_list/address_list.js
View file @ 103319e8
...@@ -10,6 +10,8 @@ Page({ ...@@ -10,6 +10,8 @@ Page({
clientImgPath: app.globalData.clientImgPath, clientImgPath: app.globalData.clientImgPath,
type:'0', //0普通进入 1外卖地址进入 2商城地址进入 type:'0', //0普通进入 1外卖地址进入 2商城地址进入
hidden:false,
}, },
/** /**
...@@ -22,8 +24,26 @@ Page({ ...@@ -22,8 +24,26 @@ Page({
* 生命周期函数--监听页面显示 * 生命周期函数--监听页面显示
*/ */
onShow: function () { onShow: function () {
//授权弹窗
if(!wx.getStorageSync('userInfo')){
this.setData({
hidden:true,
});
return;
}
this.init(); this.init();
}, },
setUserInfo(e) { //点击了授权
if (e.detail) {
this.setData({
hidden: false,
});
this.init();
}
},
init(){ init(){
addrList({type:this.data.type}).then(res=>{ addrList({type:this.data.type}).then(res=>{
this.setData({ this.setData({
......
pages/address_list/address_list.wxml
View file @ 103319e8
...@@ -35,4 +35,7 @@ ...@@ -35,4 +35,7 @@
<view class="ml-30">添加新地址</view> <view class="ml-30">添加新地址</view>
</button> </button>
<login hidden="{{hidden}}" bind:setUserInfo="setUserInfo" />
</view> </view>
pages/index/index.js
View file @ 103319e8
...@@ -2,13 +2,11 @@ ...@@ -2,13 +2,11 @@
const app = getApp(); const app = getApp();
var clientImgPath = app.globalData.clientImgPath; var clientImgPath = app.globalData.clientImgPath;
var staticUrl = app.globalData.staticUrl; var staticUrl = app.globalData.staticUrl;
import luma from '../../utils/luma.js';
import {getGroupList,getShareUser} from "../../api/lmping"; import {getGroupList,getShareUser} from "../../api/lmping";
import { getUserInfo } from '../../api/user.js'; import { getUserInfo } from '../../api/user.js';
import {
setsubscript
} from "../../utils/setsubscript";
Page({ Page({
...@@ -19,7 +17,7 @@ Page({ ...@@ -19,7 +17,7 @@ Page({
clientImgPath, clientImgPath,
staticUrl, staticUrl,
lundata:["A","B","c","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z"], lundata:["A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z"],
showModal:false, showModal:false,
uid:"", uid:"",
userInfo:{}, userInfo:{},
...@@ -35,6 +33,8 @@ Page({ ...@@ -35,6 +33,8 @@ Page({
* 生命周期函数--监听页面加载 * 生命周期函数--监听页面加载
*/ */
onLoad: function (options) { onLoad: function (options) {
luma.scenego(options); //扫码过来跳转
this.setData({ //顶部通知栏高度 this.setData({ //顶部通知栏高度
statusBarHeight: wx.getSystemInfoSync().statusBarHeight, statusBarHeight: wx.getSystemInfoSync().statusBarHeight,
}) })
......
pages/index/index.wxml
View file @ 103319e8
...@@ -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[index]}}轮</view> <view class="pingttexts">悦想拼{{lundata[item.type-1]}}轮</view>
</view> </view>
</view> </view>
<view class="promains"> <view class="promains">
......
pages/index/index.wxss
View file @ 103319e8
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
.sigins{ .sigins{
text-align: center; text-align: center;
margin-top: -280rpx; margin-top: -280rpx;
margin-bottom: 10rpx;
} }
.sigins .imgsig{ .sigins .imgsig{
width: 507rpx; width: 507rpx;
...@@ -38,8 +39,10 @@ ...@@ -38,8 +39,10 @@
/* // 产品了 列表 */ /* // 产品了 列表 */
.projuctlists{ .projuctlists{
padding: 24rpx; /* padding: 24rpx;
margin-bottom: 50rpx; margin-bottom: 50rpx; */
padding: 10rpx 24rpx;
margin-bottom: 0rpx;
} }
.prosheadbox{ .prosheadbox{
text-align: center; text-align: center;
......
pages/lmping/hometwo/hometwo.json
View file @ 103319e8
{ {
"usingComponents": { "usingComponents": {
"van-count-down": "/vant/weapp/lib/count-down/index" "van-count-down": "/vant/weapp/lib/count-down/index",
"empty":"/vant/weapp/lib/empty/index"
}, },
"navigationBarTitleText": "产品场次区" "navigationBarTitleText": "产品场次区"
} }
\ No newline at end of file
pages/lmping/hometwo/hometwo.wxml
View file @ 103319e8
...@@ -5,6 +5,8 @@ ...@@ -5,6 +5,8 @@
<image bindtap="tobreak" class="imgs" src="{{clientImgPath}}/images/lmping/breaks.png"></image> <image bindtap="tobreak" class="imgs" src="{{clientImgPath}}/images/lmping/breaks.png"></image>
</view> --> </view> -->
<empty wx:if="{{goodslist.length==0}}"></empty>
<!-- style="padding-top:{{statusBarHeight+20}}px;" --> <!-- style="padding-top:{{statusBarHeight+20}}px;" -->
<view class="pingheads" > <view class="pingheads" >
<!-- <image class="headsimg" src="{{clientImgPath}}/images/lmping/pinghead.png" mode=""></image> --> <!-- <image class="headsimg" src="{{clientImgPath}}/images/lmping/pinghead.png" mode=""></image> -->
......
pages/lmping/order/order.wxml
View file @ 103319e8
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
<view class="titles twoline">{{item.goods_info.title}}</view> <view class="titles twoline">{{item.goods_info.title}}</view>
<view class="ptprices flex ali-c"> <view class="ptprices flex ali-c">
<view class="lsprice">零售价¥{{item.goods_info.price}}</view> <view class="lsprice">零售价¥{{item.goods_info.price}}</view>
<view class="yfprice ml-30"> <view class="yfprice ali-c ml-30">
<text class="yifup">已付¥</text> <text class="yifup">已付¥</text>
<text class="prnums">{{item.spell_price}}</text> <text class="prnums">{{item.spell_price}}</text>
</view> </view>
......
pages/lmping/pushcard/pushcard.js
View file @ 103319e8
...@@ -30,6 +30,7 @@ Page({ ...@@ -30,6 +30,7 @@ Page({
secret_key:"",//邀请码 secret_key:"",//邀请码
hidden: false,
}, },
...@@ -48,6 +49,21 @@ Page({ ...@@ -48,6 +49,21 @@ Page({
this.shareFc();//去画图 this.shareFc();//去画图
}, },
setUserInfo(e) { //点击了授权
if (e.detail) {
this.setData({
hidden: false,
});
let userInfo = wx.getStorageSync('userInfo');
this.setData({
userInfo: userInfo.info,
secret_key:options.secret_key,//邀请码
})
this.caerteqrcode();
this.shareFc();//去画图
}
},
//复制邀请码 //复制邀请码
cpoesharecode(){ cpoesharecode(){
wx.setClipboardData({ wx.setClipboardData({
...@@ -67,8 +83,8 @@ Page({ ...@@ -67,8 +83,8 @@ Page({
x: 5, x: 5,
y: 5, y: 5,
canvasId: 'tki-qrcode-canvas', canvasId: 'tki-qrcode-canvas',
//typeNumber: 10, // typeNumber: 10,
text: `https://pindev.jxdsy.cn/qrcode?uid=${this.data.userInfo.user_id}&type=10`, text: `https://pindev.jxdsy.cn/qrcodetwo?uid=${this.data.userInfo.user_id}&type=10&secret_key=${this.data.secret_key}`,
image: { image: {
// imageResource: "",//res.path, // imageResource: "",//res.path,
// dx: 85, // dx: 85,
...@@ -92,8 +108,15 @@ Page({ ...@@ -92,8 +108,15 @@ Page({
* 生命周期函数--监听页面显示 * 生命周期函数--监听页面显示
*/ */
onShow: function () { onShow: function () {
//授权弹窗
if(!wx.getStorageSync('userInfo')){
this.setData({
hidden:true,
});
return;
}
}, },
/** /**
* 生命周期函数--监听页面隐藏 * 生命周期函数--监听页面隐藏
...@@ -214,7 +237,7 @@ Page({ ...@@ -214,7 +237,7 @@ Page({
console.info(len,"len"); console.info(len,"len");
let qcodeobj = { let qcodeobj = {
text: `https://pindev.jxdsy.cn/qrcode?uid=${this.data.userInfo.user_id}&type=10`, text: `https://pindev.jxdsy.cn/qrcodetwo?uid=${this.data.userInfo.user_id}&type=10&secret_key=${this.data.secret_key}`,
size: 220,//bgObj.width*0.2 size: 220,//bgObj.width*0.2
dx: 170,//bgObj.width*0.05 dx: 170,//bgObj.width*0.05
dy: 410//bgObj.height - bgObj.width*0.25 dy: 410//bgObj.height - bgObj.width*0.25
......
pages/lmping/pushcard/pushcard.wxml
View file @ 103319e8
...@@ -48,3 +48,6 @@ ...@@ -48,3 +48,6 @@
</view> </view>
</view> </view>
<login hidden="{{hidden}}" bind:setUserInfo="setUserInfo" />
pages/lmping/user/user.wxml
View file @ 103319e8
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<!-- <navigator url="/pages/lmping/activitydescri/activitydescri" hover-class="none" class="Ruledescription ali-c jus-c">规则说明</navigator> --> <!-- <navigator url="/pages/lmping/activitydescri/activitydescri" hover-class="none" class="Ruledescription ali-c jus-c">规则说明</navigator> -->
<view class="pinguserinfo flex"> <view class="pinguserinfo flex ali-c">
<image class="userstxs" src="{{userInfo.face}}" mode=""></image> <image class="userstxs" src="{{userInfo.face}}" mode=""></image>
<view class="userdetaile"> <view class="userdetaile">
<view class="infoonelin flex ali-c"> <view class="infoonelin flex ali-c">
...@@ -166,7 +166,7 @@ ...@@ -166,7 +166,7 @@
<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" mode=""></image>
<view class="navnames">发货订单</view> <view class="navnames">物流订单</view>
</navigator> </navigator>
......
pages/new_address/new_address.js
View file @ 103319e8
...@@ -54,7 +54,7 @@ Page({ ...@@ -54,7 +54,7 @@ Page({
}else{ }else{
addressData.doorplate=value; //详细地址 addressData.doorplate=value; //详细地址
} }
console.log(addressData) // console.log(addressData)
this.setData({addressData}); this.setData({addressData});
}, },
bindPickerChange(e){ //选择省市区 点击确定 bindPickerChange(e){ //选择省市区 点击确定
......
pages/new_address/new_address.wxml
View file @ 103319e8
...@@ -18,13 +18,14 @@ ...@@ -18,13 +18,14 @@
<view class="lieboxs ali-c"> <view class="lieboxs ali-c">
<view class="biqim">手机号码</view> <view class="biqim">手机号码</view>
<view class="inptbox"> <view class="inptbox">
<input value="{{addressData.mobile}}" name='mobile' placeholder="请填写手机号码" <input type="number" value="{{addressData.mobile}}" name='mobile' placeholder="请填写手机号码"
placeholder-class="sz_30 inp_hui" bindinput="bindinput" data-type="2"> placeholder-class="sz_30 inp_hui" bindinput="bindinput" data-type="2">
</input> </input>
</view> </view>
</view> </view>
<view class="xian"></view> <!-- <view class="xian"></view> -->
<!-- <view class="lieboxs ali-c"> <!-- <view class="lieboxs ali-c">
<view class="biqim">地址类型</view> <view class="biqim">地址类型</view>
<radio-group class="inptbox ali-c" bindchange="radioChange"> <radio-group class="inptbox ali-c" bindchange="radioChange">
......
pages/order/order.js
View file @ 103319e8
...@@ -710,15 +710,17 @@ Page({ ...@@ -710,15 +710,17 @@ Page({
title: res.msg, title: res.msg,
icon: 'none' icon: 'none'
}); });
if (that.data.status != "all") { setTimeout(() => {
let order = that.data.order; if (that.data.status != "all") {
order.splice(index, 1); //删除某项 let order = that.data.order;
that.setData({ order.splice(index, 1); //删除某项
order that.setData({
}); order
} else { });
that.listDeal(); } else {
} that.listDeal();
}
}, 1000);
} }
}) })
......
pages/register/register.js
View file @ 103319e8
...@@ -167,7 +167,12 @@ Page({ ...@@ -167,7 +167,12 @@ Page({
* 生命周期函数--监听页面显示 * 生命周期函数--监听页面显示
*/ */
onShow: function () { onShow: function () {
let secret_key = wx.getStorageSync('secret_key');
if(secret_key){
this.setData({
invitation:secret_key,//设置默认邀请码
})
}
}, },
/** /**
* 生命周期函数--监听页面初次渲染完成 * 生命周期函数--监听页面初次渲染完成
......
pages/register/register.json
View file @ 103319e8
{ {
"usingComponents": {}, "usingComponents": {},
"navigationBarTitleText": "登录" "navigationBarTitleText": "注册"
} }
\ No newline at end of file
pages/register/register.wxml
View file @ 103319e8
...@@ -23,11 +23,16 @@ ...@@ -23,11 +23,16 @@
</view> </view>
<view wx:if="{{isloagin==1}}" class="button-login" hover-class="button-hover" bindtap="bindLogin"> <!-- <view wx:if="{{isloagin==1}}" class="button-login" hover-class="button-hover" bindtap="bindLogin">
<text>登录</text> <text>登录</text>
</view> </view>
<view wx:else class="button-login" hover-class="button-hover" bindtap="bindLogin"> <view wx:else class="button-login" hover-class="button-hover" bindtap="bindLogin">
<text>注册</text> <text>注册</text>
</view> -->
<view class="button-login" hover-class="button-hover" bindtap="bindLogin">
<text>注册</text>
</view> </view>
<view class="agreement"> <view class="agreement">
......
pages/shop/shops/weidian/ping_details/ping_details.js
View file @ 103319e8
...@@ -234,9 +234,7 @@ Page({ ...@@ -234,9 +234,7 @@ Page({
//分享朋友 //分享朋友
onShareAppMessage() { onShareAppMessage() {
return { return {
// title: this.data.goods.title.substring(0, 25),
// imageUrl: this.data.staticUrl + '' + this.data.imgUrls[0].photo,
// path: 'pages/shop/shops/weidian/weidian_details/weidian_details?goods_id=' + this.data.goods_id + '&fxuser_id=' + this.data.user_id + '&productType=wechat'
} }
}, },
// 分享到朋友圈 // 分享到朋友圈
...@@ -350,7 +348,9 @@ Page({ ...@@ -350,7 +348,9 @@ Page({
items_id: res.data.items_id ? res.data.items_id : {}, items_id: res.data.items_id ? res.data.items_id : {},
}) })
let details = res.data.goods.details;
let details = res.data.goods.details;
//let details = `"<p><img src="https://luma.jxdsy.cn/attachs/editor/2020/10/12/5f83bbc972e2e.jpg" _src="https://luma.jxdsy.cn/attachs/editor/2020/10/12/5f83bbc972e2e.jpg"/></p>"<p><img src="https://luma.jxdsy.cn/attachs/editor/2020/10/12/5f83bbc972e2e.jpg" _src="https://luma.jxdsy.cn/attachs/editor/2020/10/12/5f83bbc972e2e.jpg"/></p>`
wxParse.wxParse('details', 'html', details, that, 15); wxParse.wxParse('details', 'html', details, that, 15);
} }
......
pages/shop/shops/weidian/ping_details/ping_details.wxml
View file @ 103319e8
...@@ -138,13 +138,13 @@ ...@@ -138,13 +138,13 @@
<!-- 顶部固定 --> <!-- 顶部固定 -->
<view class="topbais po_f {{scrollTop==0?'hidden':'show'}}" style="top:0;width:100%;"> <!-- <view class="topbais po_f {{scrollTop==0?'hidden':'show'}}" style="top:0;width:100%;">
<view class="jus-a"> <view class="jus-a">
<view class="tpaszi" bindtap="goTop" data-type="1">商品</view> <view class="tpaszi" bindtap="goTop" data-type="1">商品</view>
<view class="tpaszi" bindtap="goTop" data-type="2">评价</view> <view class="tpaszi" bindtap="goTop" data-type="2">评价</view>
<view class="tpaszi" bindtap="goTop" data-type="3">详情</view> <view class="tpaszi" bindtap="goTop" data-type="3">详情</view>
</view> </view>
</view> </view> -->
<!-- 底部固定 --> <!-- 底部固定 -->
<view class="db_box flex ali-c jus-b"> <view class="db_box flex ali-c jus-b">
......
pages/withdraw/withdraw.js
View file @ 103319e8
...@@ -37,6 +37,20 @@ Page({ ...@@ -37,6 +37,20 @@ Page({
currentTab: options.bank_id ? 2 : 0, currentTab: options.bank_id ? 2 : 0,
}) })
if(options.type==2){
wx.setNavigationBarTitle({
title: '商家提现'
})
}
if( !wx.getStorageSync('userInfo') ){
this.setData({ hidden:true });
return;
}
this.setData({ hidden:false });
this.onLoadFun();
this.getfundata(); this.getfundata();
}, },
//获取基础用户信息 //获取基础用户信息
...@@ -90,7 +104,7 @@ Page({ ...@@ -90,7 +104,7 @@ Page({
return; return;
} }
this.setData({ hidden:false }); this.setData({ hidden:false });
this.onLoadFun(); // this.onLoadFun();
//选银行卡 //选银行卡
let selbankcard = wx.getStorageSync('selbankcard'); let selbankcard = wx.getStorageSync('selbankcard');
...@@ -175,12 +189,12 @@ Page({ ...@@ -175,12 +189,12 @@ Page({
}) })
} else if (type == 1) { } else if (type == 1) {
that.setData({ that.setData({
money: e.currentTarget.dataset.agent_brokerage, money: this.data.userInfo.agent_brokerage,
ismoneyshow: !that.data.ismoneyshow ismoneyshow: !that.data.ismoneyshow
}) })
} else if (type == 2) { } else if (type == 2) {
that.setData({ that.setData({
money: e.currentTarget.dataset.gold, //这里商户全部提现减少100元的保证金 money: this.data.userInfo.gold, //这里商户全部提现减少100元的保证金
ismoneyshow: !that.data.ismoneyshow ismoneyshow: !that.data.ismoneyshow
}) })
} }
...@@ -197,6 +211,8 @@ Page({ ...@@ -197,6 +211,8 @@ Page({
bank_id: this.data.bank_id, bank_id: this.data.bank_id,
hasuser:true, hasuser:true,
}; };
//获取银行卡
cashBank(params).then(res => { cashBank(params).then(res => {
let banklist = res.data.bank; let banklist = res.data.bank;
if (banklist) { if (banklist) {
......
pages/withdraw/withdraw.wxml
View file @ 103319e8
...@@ -2,10 +2,10 @@ ...@@ -2,10 +2,10 @@
<view class="boxs"> <view class="boxs">
<view class="sz_30 c_bi te_ct mb-20">可提现佣金</view> <view class="sz_30 c_bi te_ct mb-20">可提现佣金</view>
<view class="sz_72 c_bi te_ct mb-50" style="font-weight:bold;"> <view class="sz_72 c_bi te_ct mb-50" style="font-weight:bold;">
<!-- <block wx:if="{{type==0}}">{{member.commission}}</block> <block wx:if="{{type==0}}">{{userInfo.commission?userInfo.commission:0}}</block>
<block wx:elif="{{type==1}}">{{member.agent_brokerage}}</block> <block wx:elif="{{type==1}}">{{userInfo.agent_brokerage?userInfo.agent_brokerage:0}}</block>
<block wx:elif="{{type==2}}">{{gold}}</block> --> <block wx:elif="{{type==2}}">{{userInfo.gold?userInfo.gold:0}}</block>
<block>{{userInfo.commission?userInfo.commission:0}}</block> <!-- <block>{{userInfo.commission?userInfo.commission:0}}</block> -->
</view> </view>
<view class="topboxs ov" style="padding: 0;"> <view class="topboxs ov" style="padding: 0;">
<view class="flex"> <view class="flex">
......
utils/luma.js
View file @ 103319e8
...@@ -242,8 +242,11 @@ function scenego(options) { ...@@ -242,8 +242,11 @@ function scenego(options) {
break; break;
//扫码点餐页跳转 //扫码点餐页跳转
case "10": case "10":
console.info("处理扫码哦~~~~",uids);
let uids = Utilc.getQueryString(qrUrl, 'uid'); let uids = Utilc.getQueryString(qrUrl, 'uid');
let secret_key = Utilc.getQueryString(qrUrl, 'secret_key');
wx.setStorageSync('share_uid', uids); wx.setStorageSync('share_uid', uids);
wx.setStorageSync('secret_key', secret_key);
wx.switchTab({ wx.switchTab({
url: `/pages/index/index`, url: `/pages/index/index`,
}) })
......
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