Commit c8b8d111 authored by Mac's avatar Mac

1

parent efcb83c2
...@@ -141,6 +141,7 @@ export default { ...@@ -141,6 +141,7 @@ export default {
searchData:{}, //传递给search data searchData:{}, //传递给search data
isNavPosition:0, //设置搜索框位置 isNavPosition:0, //设置搜索框位置
IsOpenSchool:0, IsOpenSchool:0,
OrderId:0,
}; };
}, },
components: { components: {
...@@ -277,6 +278,9 @@ export default { ...@@ -277,6 +278,9 @@ export default {
} else { } else {
this.GoodsId = options.GoodsId ? options.GoodsId : 29; this.GoodsId = options.GoodsId ? options.GoodsId : 29;
} }
if(options && options.OrderId){//代付订单id
this.OrderId = options.OrderId;
}
that.u = uni.getStorageSync("mall_UserInfo"); that.u = uni.getStorageSync("mall_UserInfo");
wx.getUserInfo({ wx.getUserInfo({
success: function (res) { success: function (res) {
...@@ -302,6 +306,9 @@ export default { ...@@ -302,6 +306,9 @@ export default {
}else if (that.JumpType == 3) { }else if (that.JumpType == 3) {
//司导详情 //司导详情
that.goguidecar() that.goguidecar()
}else if (that.JumpType == 4) {
//代付页面
uni.navigateTo({ url: "/pages/order/payment-order?GoodsId="+that.OrderId });
} }
}, 500); }, 500);
} else { } else {
...@@ -505,7 +512,11 @@ export default { ...@@ -505,7 +512,11 @@ export default {
}else if (that.JumpType == 3) { }else if (that.JumpType == 3) {
//司导详情 //司导详情
that.goguidecar() that.goguidecar()
}else if (that.JumpType == 4) {
//代付页面
uni.navigateTo({ url: "/pages/order/payment-order?GoodsId="+that.OrderId });
} }
}, 500); }, 500);
} else { } else {
if (!that.u) { if (!that.u) {
...@@ -834,6 +845,9 @@ export default { ...@@ -834,6 +845,9 @@ export default {
}else if (this.JumpType == 3) { }else if (this.JumpType == 3) {
//司导详情 //司导详情
this.goguidecar() this.goguidecar()
}else if (this.JumpType == 4) {
//代付页面
uni.navigateTo({ url: "/pages/order/payment-order?GoodsId="+this.OrderId });
} }
}, 500); }, 500);
}, },
......
...@@ -18,6 +18,21 @@ ...@@ -18,6 +18,21 @@
<view>支付方式</view> <view>支付方式</view>
<view style="text-align: right;">在线支付</view> <view style="text-align: right;">在线支付</view>
</view> </view>
<view class="discountbox" style="padding: 15px 0;margin-bottom: 12px;">
<view class="filed" style="justify-content: space-between;">
<view class="left" style="display: flex;flex-direction: row;align-items: center;">
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/lvqian.png" style="width: 15px;height: 15px;margin-right: 3px;"></image>
找人代付</view>
<u-checkbox-group >
<u-checkbox
@change="checkboxChange"
shape="circle"
:active-color='mc'
v-model="checked"
></u-checkbox>
</u-checkbox-group>
</view>
</view>
<view class="goods" v-for="(x, i) in mchs" :key="i"> <view class="goods" v-for="(x, i) in mchs" :key="i">
<view class="store"> <view class="store">
<u-icon name="shop-o" size="30" color="#232323"></u-icon> <u-icon name="shop-o" size="30" color="#232323"></u-icon>
...@@ -154,6 +169,7 @@ ...@@ -154,6 +169,7 @@
</view> </view>
</view> </view>
</view> </view>
<view class="btton-box"> <view class="btton-box">
<view class="left" :style="{ color: mc }"> <view class="left" :style="{ color: mc }">
<text></text> <text></text>
...@@ -175,7 +191,8 @@ ...@@ -175,7 +191,8 @@
}" }"
> >
<u-loading mode="circle" style="margin-right: 5px;" v-if="submitOrder"></u-loading> <u-loading mode="circle" style="margin-right: 5px;" v-if="submitOrder"></u-loading>
提交订单
{{btntext}}
</u-button> </u-button>
</view> </view>
</view> </view>
...@@ -193,6 +210,39 @@ ...@@ -193,6 +210,39 @@
</view> </view>
</view> </view>
</u-popup> </u-popup>
<u-popup v-model="zhaoren" mode="center" :mask-close-able="false">
<view style="background:#fff;width:500rpx;font-family: aa;border-radius: 10px;">
<view style="width: 88%;height: 35px;display: flex;flex-direction: row;align-items: flex-end;justify-content: flex-end;margin-left: 6%;" @click="exitPay">
<u-icon name="close" size="40"></u-icon>
</view>
<view style="padding:10px 0 0 10px;text-align:center;">代付金额</view>
<view style="text-align:center;padding-bottom:40rpx;">
<view class="daif" :style="{'color': mc}">
<text style="margin-bottom: 2px;">
</text>
<span :style="{'font-size': '30px','color': mc}">{{ds.total_price}}</span>
</view>
<u-button
:disabled="!address_enable"
size="30"
:ripple="true"
shape="circle"
open-type="share"
send-message-title="是好友就帮忙代付" :send-message-path="path" send-message-img="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/zhaoren.png"
:custom-style="{
backgroundColor: mc,
width:'350rpx',
height: '80rpx',
color: '#FFF',
fontSize: '14px'
}"
>
发送给微信好友
</u-button>
</view>
</view>
</u-popup>
<u-modal <u-modal
v-model="showReviceModal" v-model="showReviceModal"
content="您的上级不存在,当前订单不会返佣,是否继续?" content="您的上级不存在,当前订单不会返佣,是否继续?"
...@@ -221,6 +271,9 @@ export default { ...@@ -221,6 +271,9 @@ export default {
address_enable:'', address_enable:'',
payExit: false, payExit: false,
payBtn: false, payBtn: false,
checked:false,
btntext:'提交订单',
zhaoren:false,
formData: { formData: {
list: [ list: [
{ {
...@@ -260,6 +313,7 @@ export default { ...@@ -260,6 +313,7 @@ export default {
use_num: 0, use_num: 0,
deduction_price: 0 deduction_price: 0
}, },
path: '',
secondary: '', secondary: '',
userInt: false, userInt: false,
loading: true, loading: true,
...@@ -381,10 +435,26 @@ export default { ...@@ -381,10 +435,26 @@ export default {
}, },
res => { res => {
if (res.resultCode == 1) { if (res.resultCode == 1) {
if(that.checked==true){
that.zhaoren = true;
let u = uni.getStorageSync("mall_UserInfo");
let uid = u.UserId ? u.UserId : 0;
let Up = u.UserPageType ? u.UserPageType:0;
let SmallShopId = u.SmallShopId ? u.SmallShopId : 0;
if (SmallShopId == 0) {
//如果微店id为0 去找所属微店id
SmallShopId = u.UserSmallShopId ? u.UserSmallShopId : 0;
}
that.path = '/pages/index/index?OrderId=' + res.data.OrderId + "&user_id=" + uid+ "&Up=" + Up+ "&SmallShopId=" + SmallShopId+'&JumpType=4' ;
console.log(that.path)
}else{
that.payBtn = true; that.payBtn = true;
that.payInfo.OrderId = res.data.OrderId; that.payInfo.OrderId = res.data.OrderId;
that.payInfo.total_price = that.ds.total_price; that.payInfo.total_price = that.ds.total_price;
} }
}
else{ else{
that.$refs.uToast.show({ that.$refs.uToast.show({
title: res.data.message, title: res.data.message,
...@@ -622,7 +692,16 @@ export default { ...@@ -622,7 +692,16 @@ export default {
y.attrStr = attrStr; y.attrStr = attrStr;
}); });
}); });
},
checkboxChange(val){
console.log(val)
if(val.value==true){
this.btntext = '找人代付'
}else{
this.btntext = '提交订单'
} }
},
} }
}; };
</script> </script>
...@@ -677,6 +756,9 @@ button[disabled]{ ...@@ -677,6 +756,9 @@ button[disabled]{
margin-bottom: 5px; margin-bottom: 5px;
font-weight: 600; font-weight: 600;
} }
.ordersubmit .daif{
margin:40rpx 0;font-size: 20px;display: flex;flex-direction: row;align-items: flex-end;width: 100%;justify-content: center;
}
.ordersubmit .add-box::before { .ordersubmit .add-box::before {
position: absolute; position: absolute;
right: 0; right: 0;
......
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