Skip to content

M
mallapp
Commit 0e73da29 authored by youjie's avatar youjie
Browse files
Options

no message

parents f4eb07b8 ecb92346
Hide whitespace changes
Inline Side-by-side
Showing with 583 additions and 229 deletions
components/cats/style4.vue
View file @ 0e73da29
......@@ -46,6 +46,9 @@
<div v-if="u.TenantId!=27" class="price" :style="{ color: mainColor }">
{{ cx.price_content }}
</div>
<view v-if="u.TenantId!=27" class="origin">
{{ cx.original_price_content }}
</view>
<div v-if="u.TenantId!=27" class="sell">{{ cx.sales }}</div>
</div>
......@@ -69,6 +72,9 @@
<view class="vip2" :style="{ color: mainColor }">
{{ cx.price_content }}
</view>
<view v-if="cx.original_price_content && cx.original_price > 0" class="origin" :style="{ color: mainColor }">
{{ cx.original_price_content }}
</view>
<div @click.stop="showSkuHandler(cx)" class="right">
<!-- todo 点击加入购物车-->
......@@ -248,6 +254,13 @@
</script>
<style>
.origin {
font-family: "oswald";
font-size: 28rpx;
color: #999;
text-decoration: line-through;
margin-left: 10rpx;
}
.vip2{
font-size: 16px;
margin-right: 10rpx;
......
components/cats/style44.vue
View file @ 0e73da29
......@@ -52,14 +52,14 @@
<!-- 内容 -->
</view>
<!-- 新增分类科目结束 -->
<view class="catstyle4" style="height: 100%;">
<view class="catstyle4" style="height: 100%;margin-bottom: 20rpx;">
<!-- <div class="left-slider">
<sidebar :active="tid" name="Name" :active-color="mainColor" :border="false" :list="d"
@change="changeHandler" @change2="changeHandler2"></sidebar>
</div> -->
<div class="right-slider">
<scroll-view :scroll-y="true" @scrolltolower="lower" :enable-back-to-top="true" :enable-flex="true"
:style="{ height: '100%' }">
style="height:calc(100vh - 35rpx);">
<div class="adbox" v-if="d[tid].advert_pic" @click="clickHandler(d[tid].advert_url)">
<image mode="aspectFit" :src="d[tid].advert_url" style="width: 100%; height: 100%;" />
</div>
......@@ -75,7 +75,7 @@
</image>
</div>
<div class="good-info">
<div class="good-name">
<div class="good-name" :class="[cx.edudata.ClassCondition.length>0?'good-namee2':'']">
<view
v-if="cx.marketingLogo.iswords && cx.marketingLogo.iswords==1&& cx.marketingLogo.words!=''"
class="Logo" :style="{color: cx.marketingLogo.wordsColor,
......@@ -90,7 +90,16 @@
{{cx.freeShippingFullMoneyPinkage>0 && cx.freeShippingFullNumPinkage==0?cx.freeShippingFullMoneyPinkage+'元包邮':''}}
{{cx.freeShippingFullMoneyPinkage==0 && cx.freeShippingFullNumPinkage>0?cx.freeShippingFullNumPinkage+'件包邮':''}}
</view>
{{ cx.name }}
<view class="The-title">
{{ cx.name }}
</view>
<view v-if="cx.edudata.ClassCondition.length>0" class="limit" @touchstart="mouseover()" @touchend="mouseLeave()">
<u-icon name="lock" size="44" :color="mainColor" />
<view class="limit-box" v-show="limitShow">
此课程有报名限制，请点击详情查看
</view>
</view>
</div>
<div class="goodprice">
<div class="left">
......@@ -164,6 +173,9 @@
<div v-if="u.TenantId!=27" class="price" :style="{ color: mainColor }">
{{ cx.price_content }}
</div>
<view v-if="u.TenantId!=27 && cx.price_content !== cx.original_price_content" class="origin">
{{ cx.original_price_content }}
</view>
<div v-if="u.TenantId!=27" class="sell">{{ cx.sales }}</div>
</div>
<div v-if="u.TenantId!=27" @click.stop="showSkuHandler(cx)" class="right">
......@@ -186,6 +198,9 @@
<view class="vip2" :style="{ color: mainColor }">
{{ cx.price_content }}
</view>
<view v-if="cx.original_price_content && cx.original_price > 0 &&cx.original_price>cx.level_price && cx.price_content !== cx.original_price_content" class="origin">
{{ cx.original_price_content }}
</view>
<div @click.stop="showSkuHandler(cx)" class="right">
<!-- todo 点击加入购物车-->
......@@ -195,7 +210,7 @@
</view>
</template>
</div>
<u-divider v-if="isover" :margin-top="20" :margin-bottom="20">没有更多商品了</u-divider>
<u-divider class="The-tail" v-if="isover" :margin-top="20" :margin-bottom="20" bg-color="transparent" >没有更多商品了</u-divider>
</scroll-view>
</div>
<template v-if="u&&u.TenantId==27">
......@@ -222,6 +237,7 @@
props: ["d", "h"],
data() {
return {
limitShow:false,
ind: 1,
show: false,
Theclass: [{
......@@ -294,6 +310,14 @@
// this.u = uni.getStorageSync('mall_UserInfo5')
},
methods: {
// 鼠标移进时间
mouseover(){
// console.log('44444')
this.limitShow = true
},
mouseLeave() {
this.limitShow = false
},
remaining(i) {
this.$nextTick(function() {
i.show = !i.show
......@@ -513,6 +537,7 @@
);
},
lower(e) {
// console.log('4444')
if (this.msg.pageIndex < this.page_count) {
if (!this.loading) {
this.msg.pageIndex++;
......@@ -533,7 +558,38 @@
};
</script>
<style>
<style >
.origin {
font-family: "oswald";
font-size: 24rpx;
color: #999;
text-decoration: line-through;
margin: 0 10rpx;
}
/* .The-tail >>> .u-divider{
background-color: transparent !important;
} */
.The-title{
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.limit{
/* position: relative; */
}
.limit-box{
position: absolute;
right: 0px;
font-size: 12px;
color: #fff;
background-color: rgba(0, 0, 0, 0.6);
padding: 10px;
border-radius: 10rpx;
}
.good-namee2{
display: flex !important;
position: relative;
}
.rema3{
margin-bottom: 8rpx;
}
......
components/goods/goodsku.vue
View file @ 0e73da29
......@@ -16,6 +16,7 @@
</view>
</view>
</view>
<scroll-view scroll-y class="sku-box">
<view class="sku-item" v-for="(x, i) in g.attr_groups" :key="i">
<view class="sku-title">{{ x.attr_group_name }}</view>
......@@ -491,6 +492,13 @@
</script>
<style>
.origin {
font-family: "oswald";
font-size: 14px;
color: #999;
text-decoration: line-through;
margin-left: 10rpx;
}
.goodsku {
position: relative;
padding: 10px;
......
components/goods/goodsku2.vue
View file @ 0e73da29
<template>
<u-popup mode="bottom" :border-radius="borderRadius" :popup="false" v-model="value" :maskCloseAble="maskCloseAble"
length="auto" :safeAreaInsetBottom="true" @close="popupClose" :z-index="9999" close-icon="close">
length="auto" :safeAreaInsetBottom="true" @close="popupClose" :z-index="9999" close-icon="close">
<view class="goodsku">
<view class="goods">
<image :src="goodimage" class="img" @click="previewImage(0,goodimage)"></image>
......@@ -9,6 +9,10 @@
<text class="small">￥</text>
<text>{{ goodprice }}</text>
</view>
<view class="origin" v-if="good_original_price && good_original_price >0 && good_original_price > goodprice">
<text class="small">￥</text>
<text>{{ good_original_price }}</text>
</view>
<view class="amount amount2">可报名额 {{ goodamount }}人</view>
<view class="sku_close">
<u-icon name="cross" color="#9F9F9F" @click="cloGood()" size="40" />
......@@ -31,17 +35,15 @@
说明:以下物品需与当前课程绑定购买
</text>
</text>
</view>
<view class="val3 sku-chi2" :style="{
background: y.attr_id == x.checkId ? mc : '#eee',
color: y.attr_id == x.checkId ? '#FFF' : '#333'
}" v-if="notes" v-for="(item, index) in g.goodsRelevanceList" :key="index">
}"
v-if="notes" v-for="(item, index) in g.goodsRelevanceList" :key="index">
<text>{{item.RelevanceName}}</text>
<text>￥</text>
<text>{{item.RelevancePrice}}</text>
</view>
<view class="btn-box" v-if="g.totalStock>0&& g.status==1 && (g.form_id == -1 || g.form_id ==0)">
<view style="flex: 1;" v-if="optionType != 1">
......@@ -114,6 +116,7 @@
notes: true,
goodimage: '',
goodprice: '',
good_original_price: 0.00,
goodamount: '',
mc: '',
fu: '',
......@@ -182,7 +185,6 @@
GoodsId: this.good.id
}
},
res => {
this.g = res.data.goods;
this.g.totalStock = 0;
......@@ -193,43 +195,52 @@
this.mc = this.$uiConfig.mainColor;
this.fu = this.$uiConfig.secondary;
this.secondary = this.$uiConfig.secondary;
var jjxkt_original_price = 0; //原价
if (this.g.jjxkt_original_price && this.g.jjxkt_original_price > 0) {
jjxkt_original_price = this.g.jjxkt_original_price;
}
this.skuObj = this.skued.id ? this.skued : null;
if (this.skuObj) {
this.goodimage = this.skuObj.pic_url || this.g.cover_pic;
this.goodamount = this.skuObj.stock;
// var tempGoodprice = (parseFloat(this.skuObj.price) * parseFloat(this.g.attr_groups[0].service_time)).toFixed(2);
// var tempGoodprice = (this.skuObj.price).toFixed(2);
if (this.g.goodsRelevanceList && this.g.goodsRelevanceList.length > 0) {
this.$nextTick(() => {
this.g.goodsRelevanceList.forEach(item => {
// tempGoodprice += parseFloat(item.RelevancePrice).toFixed(2)
this.goodprice = (parseFloat(this.skuObj.price) + parseFloat(item
.RelevancePrice)).toFixed(2)
.RelevancePrice)).toFixed(2);
//计算原价
if (jjxkt_original_price > 0) {
this.good_original_price = (parseFloat(jjxkt_original_price) + parseFloat(item
.RelevancePrice)).toFixed(2);
}
});
})
} else {
this.$nextTick(() => {
this.goodprice = (parseFloat(this.g.price)).toFixed(2);
this.good_original_price = (parseFloat(jjxkt_original_price)).toFixed(2);
})
}
// this.goodprice = tempGoodprice
} else {
this.goodimage = this.g.cover_pic;
// var tempGoodprice = (this.g.price).toFixed(2);
this.goodamount = this.g.goods_stock;
if (this.g.goodsRelevanceList && this.g.goodsRelevanceList.length > 0) {
this.$nextTick(() => {
this.g.goodsRelevanceList.forEach(item => {
// tempGoodprice += parseFloat(item.RelevancePrice).toFixed(2)
this.goodprice = (parseFloat(this.g.price) + parseFloat(item
.RelevancePrice)).toFixed(2)
.RelevancePrice)).toFixed(2);
//计算原价
if (jjxkt_original_price > 0) {
this.good_original_price = (parseFloat(jjxkt_original_price) + parseFloat(item
.RelevancePrice)).toFixed(2);
}
});
})
} else {
this.$nextTick(() => {
this.goodprice = (parseFloat(this.g.price)).toFixed(2);
this.good_original_price = (parseFloat(jjxkt_original_price)).toFixed(2);
})
}
}
......@@ -554,6 +565,14 @@
</script>
<style>
.origin {
font-family: "oswald";
font-size: 14px;
color: #999;
text-decoration: line-through;
margin-left: 10rpx;
}
.amount2 {
margin-top: 40rpx;
}
......
components/pay/pay.vue
View file @ 0e73da29
......@@ -32,8 +32,6 @@ export default {
return {
show: true,
orderInfo: {},
};
},
created() {
......
components/pay/submit2Pay.vue
View file @ 0e73da29
......@@ -14,7 +14,8 @@
<img style="width:50rpx;height:50rpx;margin-right:10px" :src="item.src" alt="" />
<span style="position:relative;top:-7px">{{item.Name}}</span>
</p> -->
<u-radio-group v-model="payment" :size="36" :active-color='mc' @change="radioChange" :wrap="true">
<u-radio-group v-model="payment" :size="36" :active-color='mc' @change="radioChange"
:wrap="true">
<u-radio shape="circle" :name="0" :wrap="true">
<img style="width:50rpx;height:50rpx;margin-right:10px"
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/wx.png" alt="" />
......@@ -53,12 +54,14 @@
<view class="Alipay-box33">
<image class="Alipay-image" src="../../static/images/zhifu.png"></image>
</view>
<view class="Alipay-text4" @click="send()" style="margin-bottom: 86rpx;">
去发送
<button open-type="contact" send-message-title="支付" style="position: absolute;left: 0;top: 0;width: 100%;height: 100%;opacity: 0;" :show-message-card="true">0</button>
</view>
<view class="Alipay-text4" @click="send()" style="margin-bottom: 86rpx;">
去发送
<button open-type="contact" send-message-title="支付"
style="position: absolute;left: 0;top: 0;width: 100%;height: 100%;opacity: 0;"
:show-message-card="true">0</button>
</view>
<view>
<view class="Alipay-box3">
<view class="fangs">
......@@ -84,7 +87,8 @@
props: ['payInfo', 'isAlipay', 'StuId', 'TeacherIds'],
data() {
return {
url:'',
times: null,
url: '',
AlipayMask: false,
mc: {},
payment: 0,
......@@ -109,9 +113,21 @@
};
},
created() {
console.log(wx)
// console.log(wx)
this.getDataInfo();
this.u = uni.getStorageSync('mall_UserInfo')
this.mc = this.$uiConfig.mainColor;
this.TimingState();
this.times = setInterval(() => {
this.TimingState();
}, 30000);
},
onShow() {
this.TimingState();
this.times = setInterval(() => {
this.TimingState();
}, 30000);
},
wacth: {
payInfo: {
......@@ -122,6 +138,52 @@
}
},
methods: {
// 定时查询状态
TimingState() {
let that = this
this.request2({
url: '/api/AppletOrder/GetAppletMyOrderInfo',
data: {
OrderId: this.payInfo.OrderId,
NewUserId: 0
}
},
(res) => {
if (res.data.OrderStatus == 5) {
clearInterval(this.times);
uni.navigateTo({
url: `/pages/order-submit/pay-success2?payInfo=${JSON.stringify(that.payInfo)}&StuId=${that.StuId}&TeacherIds=${that.TeacherIds}`
// url: '/pages/order-submit/pay-success2?payInfo='+JSON.stringify(that.payInfo)
});
that.pay = false
}
// console.log('状态',res.data.OrderStatus)
}
);
},
// 微信支付一开始的请求
getDataInfo() {
let that=this;
// console.log("要发送的参数",that.payInfo)
let msg = {
OpenId: that.payInfo.OpenId,
OrderId: that.payInfo.OrderId,
OrderPayType:that.payInfo.OrderPayType,
GoodsName: that.payInfo.GoodsName
};
this.request2(
{
url: '/api/WeChatPay/GetPayInfo',
data: msg
},
res => {
if (res.resultCode == 1) {
this.orderInfo = JSON.parse(res.data);
}
uni.hideNavigationBarLoading();
}
);
},
radioChange(e) {
if (e == 0) {
this.payType = 'wx_lite'
......@@ -135,7 +197,6 @@
},
// 支付宝发送发送
send() {
},
copy() {
uniCopy({
......@@ -145,7 +206,7 @@
title: res,
icon: 'none'
})
},
error: (e) => {
uni.showToast({
......@@ -159,8 +220,11 @@
closePay() {
this.$emit('closePay');
},
// 支付宝支付
Pay() {
// if (this.payment == 0) {
if(this.payType == 'wx_lite') {
this.wxPay()
} else {
let msg = {
'pay_channel': this
.payType, //网页打开支付宝支付：alipay_wap 支付宝正扫：alipay_qr 支付宝app：alipay 微信小程序：wx_lite 微信公众号：wx_pub
......@@ -182,7 +246,7 @@
if (res.data != '') {
if (this.payType != 'wx_lite') {
this.aliPay(res.data)
this.AlipayMask =true
this.AlipayMask = true
this.pay = false
} else {
this.wxPay(JSON.parse(res.data))
......@@ -193,40 +257,36 @@
icon: 'error'
})
}
// uni.hideNavigationBarLoading();
}
);
// }
// else {
// this.AlipayMask = true
// this.pay = false
// }
}
},
// 支付宝支付
aliPay(url) {
// window.location.href = url
this.url = `http://jj.kookaku.com/pages/pay/transition?aliuri=${encodeURIComponent(url)}`
},
// 微信支付
wxPay(payData) {
let that = this
let orderInfo = this.orderInfo;
uni.showLoading({
title: '支付中...'
})
wx.requestPayment({
"timeStamp": payData.timeStamp, //时间戳，自1970年以来的秒数
"nonceStr": payData.nonceStr, //随机串
"package": payData.package,
"signType": payData.signType, //微信签名方式：
"paySign": payData.paySign, //微信签名
'success': function(res) {
uni.requestPayment({
provider: 'wxpay',
timeStamp: that.orderInfo.timeStamp,
nonceStr: that.orderInfo.nonceStr,
package: that.orderInfo.package,
signType: that.orderInfo.signType,
paySign: that.orderInfo.sign,
success: function(res) {
uni.hideLoading()
if (that.u && that.u.TenantId == 27) {
uni.navigateTo({
url: `/pages/order-submit/pay-success2?payInfo=${JSON.stringify(that.payInfo)}&StuId=${that.StuId}&TeacherIds=${that.TeacherIds}`
// url: '/pages/order-submit/pay-success2?payInfo='+JSON.stringify(that.payInfo)
});
that.pay = false
} else {
......@@ -236,22 +296,15 @@
});
that.pay = false
}
// uni.showToast({
// title:'支付成功'
// })
},
'fail': function(res) {
fail: function(res) {
uni.hideLoading()
uni.navigateTo({
// url: `/pages/order-submit/pay-success2?payInfo=${JSON.stringify(that.payInfo)}&StuId=${that.StuId}&TeacherIds=${that.TeacherIds}`
url: '/pages/order/index/index?status=1'
});
that.pay = false
},
'complete': function(res) {
// uni.showToast({
// title:res.errMsg
// })
complete: function(res) {
}
})
},
......@@ -260,7 +313,7 @@
</script>
<style>
.fangs{
.fangs {
font-size: 26rpx;
font-family: PingFang SC;
font-weight: bold;
......@@ -268,9 +321,11 @@
margin-right: 10rpx;
width: 60rpx;
}
.item-box{
.item-box {
position: relative;
}
.Alipay-box {
/* height: 930rpx; */
background: #FFFFFF;
......
pages.json
View file @ 0e73da29
......@@ -256,9 +256,6 @@
},{
"path": "pay-success2"
},
{
"path": "pay-success2"
},
{
"path": "order-submit"
}, {
......@@ -897,6 +894,7 @@
// }
// ]
// }
],
"globalStyle": {
"navigationBarTextStyle": "black",
"navigationBarTitleText": "",
......
pages/address/address2.vue
View file @ 0e73da29
......@@ -214,11 +214,6 @@
that.requestJJSWAdmin(testCmd, postMsg,
(res) => {
if (res.data.Code == 1) {
// uni.showToast({
// title: '提交成功',
// icon: 'exception',
// duration: 2000
// });
uni.navigateBack({
delta: 1
});
......
pages/cart/cart.vue
View file @ 0e73da29
......@@ -73,7 +73,18 @@
v-if="item.MarketingLogo.iswords&&item.MarketingLogo.iswords==2&& item.MarketingLogo.ico!=''"
mode="heightFix" :src="item.MarketingLogo.ico"
style=" height: 12px;margin-right: 5px" />
{{ item.GoodsName}}
<view class="The-box">
<view class="The-title">
{{ item.GoodsName}}
</view>
<view v-if="item.EduData.ClassCondition.length>0" class="limit" @touchstart="mouseover()" @touchend="mouseLeave()">
<u-icon name="lock" size="44" :color="mc" />
<view class="limit-box" v-show="limitShow">
此课程有报名限制，请点击详情查看
</view>
</view>
</view>
</view>
<view
style="width: 440rpx;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;"
......@@ -241,6 +252,7 @@
export default {
data() {
return {
limitShow:false,
isloading: false,
pageTitle: '购物车',
navHeight: 0,
......@@ -321,6 +333,13 @@
});
},
methods: {
mouseover(){
// console.log('44444')
this.limitShow = true
},
mouseLeave() {
this.limitShow = false
},
remaining(i) {
this.$nextTick(function() {
i.show = !i.show
......@@ -723,6 +742,26 @@
</script>
<style>
.limit{
/* position: relative; */
}
.limit-box{
position: absolute;
right: 0px;
font-size: 12px;
color: #fff;
background-color: rgba(0, 0, 0, 0.6);
padding: 10px;
border-radius: 10rpx;
}
.The-box{
display: flex;
}
.The-title{
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.rema {
display: flex;
flex-wrap: wrap;
......@@ -899,6 +938,7 @@
width: 440rpx;
height: 150rpx;
margin-left: 20rpx;
position: relative;
}
.cartStyle .item-r-n2 {
......
pages/goods/goods.vue
View file @ 0e73da29
......@@ -14,20 +14,17 @@
<swiper indicator-dots :autoplay="false" :interval="1000" style="height:100vw;">
<block v-for="(item, index) in g.pic_url" :key="index">
<swiper-item>
<video @click="startPlay(item)" style="width:100%;height:100%" id="myVideo"
v-if="item.type==1" :src="item.pic_url" :autoplay="false" loop muted show-play-btn
:enable-progress-gesture="true" :controls="true" :show-progress="true"
:show-mute-btn="true" objectFit="cover"></video>
<image @click="previewImage(index)" style="width:100%;height:100%;" v-else
:src="item.pic_url" :mode="u.TenantId==27 ? 'scaleToFill' : 'aspectFill'"></image>
<video @click="startPlay(item)" style="width:100%;height:100%" id="myVideo" v-if="item.type==1" :src="item.pic_url"
:autoplay="false" loop muted show-play-btn :enable-progress-gesture="true" :controls="true" :show-progress="true"
:show-mute-btn="true" objectFit="cover"></video>
<image @click="previewImage(index)" style="width:100%;height:100%;" v-else :src="item.pic_url" :mode="u.TenantId==27 ? 'scaleToFill' : 'aspectFill'"></image>
</swiper-item>
</block>
</swiper>
<!-- TODO 分销价格未做 is_share_price -->
<view class="is_share" v-if="g.share > 0 && hideshare == false&&setting.is_show_korea==0"
style="top:240px;">
<image src="@/static/images/icon/WechatIMG424.png"
style="width: 20px; margin-left: 12px; opacity: 1;height: auto;" mode="widthFix" />
<view class="is_share" v-if="g.share > 0 && hideshare == false&&setting.is_show_korea==0" style="top:240px;">
<image src="@/static/images/icon/WechatIMG424.png" style="width: 20px; margin-left: 12px; opacity: 1;height: auto;"
mode="widthFix" />
<view style="
display: flex;
flex-direction: column;
......@@ -39,12 +36,11 @@
<Text>即刻分享赚</Text>
<Text>￥ {{ g.share }}</Text>
</view>
<u-icon name="close" style='position: absolute;right: 4px;top: 12.5px;z-index: 999;' color="#fff"
size="40" @click='goclose'></u-icon>
<u-icon name="close" style='position: absolute;right: 4px;top: 12.5px;z-index: 999;' color="#fff" size="40" @click='goclose'></u-icon>
</view>
<view class="is_share" v-if="g.myBuyCommission > 0 && hideshare == false&&setting.is_show_korea==0">
<image src="@/static/images/icon/WechatIMG424.png"
style="width: 20px; margin-left: 12px; opacity: 1;height: auto;" mode="widthFix" />
<image src="@/static/images/icon/WechatIMG424.png" style="width: 20px; margin-left: 12px; opacity: 1;height: auto;"
mode="widthFix" />
<view style="
display: flex;
flex-direction: column;
......@@ -56,25 +52,23 @@
<Text>即刻购买省</Text>
<Text>￥ {{ g.myBuyCommission }}</Text>
</view>
<u-icon v-if='g.share ==0' name="close" style='position: absolute;right: 4px;top: 12.5px;'
color="#fff" size="40" @click='hideshare=true'></u-icon>
<u-icon v-if='g.share ==0' name="close" style='position: absolute;right: 4px;top: 12.5px;' color="#fff" size="40"
@click='hideshare=true'></u-icon>
</view>
</view>
<!-- 非id27开始 -->
<view class="g-info" v-if="u.TenantId!=27">
<view class="g-name u-skeleton-rect">
<view v-if="g.marketingLogo.iswords&&g.marketingLogo.iswords==1 && g.marketingLogo.words!=''"
class="Logo" :style="{color: g.marketingLogo.wordsColor,
<view v-if="g.marketingLogo.iswords&&g.marketingLogo.iswords==1 && g.marketingLogo.words!=''" class="Logo" :style="{color: g.marketingLogo.wordsColor,
background:g.marketingLogo.wordsBack ,}">{{g.marketingLogo.words}}</view>
<image v-if="g.marketingLogo.iswords&&g.marketingLogo.iswords==2&& g.marketingLogo.ico!=''"
mode="heightFix" :src="g.marketingLogo.ico" style=" height: 12px;margin-right: 5px" />
<image v-if="g.marketingLogo.iswords&&g.marketingLogo.iswords==2&& g.marketingLogo.ico!=''" mode="heightFix" :src="g.marketingLogo.ico"
style=" height: 12px;margin-right: 5px" />
{{ g.name }}
</view>
<view class="g-price-box" v-if="setting.is_show_korea==0">
<view class="left">
<view class="price u-skeleton-rect" :style="{ color: mc }">
<u-tag v-if='g.price_min!=g.original_price' text="心动价" mode="light" size='mini' type="error"
style='font-size: 12px;font-family: aa;margin-right: 10px;' />
<u-tag v-if='g.price_min!=g.original_price' text="心动价" mode="light" size='mini' type="error" style='font-size: 12px;font-family: aa;margin-right: 10px;' />
<text class="small">￥</text>
<text class="numfont" v-if="g.form_id!=1">
{{ g.price_min == g.price_max ? g.price_min : g.price_min + '-' + g.price_max }}
......@@ -99,8 +93,7 @@
<template v-if="setting.is_show_korea==1">
<view style="height:50px;margin:10px 10px 0 0;display:none;">
<view style="float:right;" @click="openShare" v-if="isAllowShare == 1">
<image src="@/static/images/icon/icon-share.png" style="width:20px;height:20px;"
class="share-icon" />
<image src="@/static/images/icon/icon-share.png" style="width:20px;height:20px;" class="share-icon" />
</view>
</view>
<view class="koarea_Country" style="display:none;">
......@@ -115,13 +108,11 @@
<view style="text-align: left;padding:15px 0;border-bottom:1px solid #F2F3F6;display:none;">
卖点：<text v-if="g.subname">{{g.subname}}</text>
</view>
<view
style="text-align: left;border-bottom:1px solid #F2F3F6;padding:15px 0;display:flex;font-size:13px;color:#737373;">
<view style="text-align: left;border-bottom:1px solid #F2F3F6;padding:15px 0;display:flex;font-size:13px;color:#737373;">
<u-icon name="location" color="#D4D4D4" size="30"></u-icon>
地址：<text v-if="g.fatcode">{{g.fatcode}}</text>
</view>
<view
style="display:flex;text-align: left;padding:10px;background-color: #F3F3F3;color:#404040;min-height:100px;line-height: 25px;font-size:13px;">
<view style="display:flex;text-align: left;padding:10px;background-color: #F3F3F3;color:#404040;min-height:100px;line-height: 25px;font-size:13px;">
<text style="flex-shrink: 0;width:45px;">简介：</text><text v-if="g.goodsurl">{{g.goodsurl}}</text>
</view>
</template>
......@@ -130,9 +121,8 @@
<!-- id27开始 -->
<view class="g-info" v-if="u.TenantId==27" style="position: relative;">
<!-- 标题 -->
<view class="g-name u-skeleton-rect" style="height: 60rpx;">
<view v-if="g.marketingLogo.iswords&&g.marketingLogo.iswords==1 && g.marketingLogo.words!=''"
class="Logo" :style="{color: g.marketingLogo.wordsColor,
<view class="g-name u-skeleton-rect">
<view v-if="g.marketingLogo.iswords&&g.marketingLogo.iswords==1 && g.marketingLogo.words!=''" class="Logo" :style="{color: g.marketingLogo.wordsColor,
background:g.marketingLogo.wordsBack ,}">{{g.marketingLogo.words}}</view>
{{ g.name }}
</view>
......@@ -142,6 +132,41 @@
<text v-if="g.edu_data.EndOrderTime" class="sign-dian"></text>
<text v-if="g.edu_data.ClassNum">{{g.edu_data.ClassNum}}次</text>
</view>
<!-- 报名限制 -->
<view v-if='g.edu_data.ClassCondition.length>0'>
<view class="limit">
<view v-if="ItemType1 && ItemType1.length > 0" class="box-title">
只允许以下学员报名
</view>
<text v-for="(item, index) in ItemType1" class="box-name">
{{ index + 1 }}:{{ item.ItemName }}。
</text>
<view v-if="ItemType2 && ItemType2.length > 0" class="box-title">
只允许以下年级学员报名
</view>
<text v-for="(item, index) in ItemType2" class="box-name">
{{ index + 1 }}:{{ item.ItemName }}。
</text>
<view v-if="ItemType3 && ItemType3.length > 0" class="box-title">
只允许曾报以下课程学员报名
</view>
<text v-for="(item, index) in ItemType3" class="box-name">
{{ index + 1 }}:{{ item.ItemName }}。
</text>
<view v-if="ItemType4 && ItemType4.length > 0" class="box-title">
只允许曾报以下班级学员报名
</view>
<text v-for="(item, index) in ItemType4" class="box-name">
{{ index + 1 }}:{{ item.ItemName }}。
</text>
<view v-if="ItemType5 && ItemType5.length > 0" class="box-title">
只允许以下考试成绩报名:
</view>
<text v-for="(item, index) in ItemType5" class="box-name">
{{ index + 1 }}:{{ item.ItemName }}({{item.LowScore}}-{{item.HighScore}})。
</text>
</view>
</view>
<!-- 价格 -->
<view :style="{ color: mc }" class="the-price">
<text class="small22">￥</text>
......@@ -151,14 +176,19 @@
<text class="numfont22" v-if="g.form_id!=1&&g.edu_data.BookPrice">
{{ g.price_min == g.price_max ? parseFloat(g.price_min)+parseFloat(g.edu_data.BookPrice) : g.price_min + '-' + g.price_max }}
</text>
<text class="origin" v-if="g.form_id!=1&&!g.edu_data.BookPrice&& g.jjxkt_original_price && g.jjxkt_original_price > 0 && g.jjxkt_original_price>g.price">
￥{{ g.jjxkt_original_price.toFixed(2)}}
</text>
<text class="origin" v-if="g.form_id!=1&& g.edu_data.BookPrice&& g.jjxkt_original_price && g.jjxkt_original_price > 0 && g.jjxkt_original_price>g.price">
￥{{parseFloat(g.jjxkt_original_price)+parseFloat(g.edu_data.BookPrice)}}
</text>
<!-- <text class="numfont" v-if="g.form_id==1">
{{ g.price_min }}
</text> -->
</view>
<!-- top切换 -->
<view class="top-switch" id="productId">
<u-tabs :list="list" :is-scroll="false" :current="current" inactive-color='#999' :active-color='mc'
@change="change"></u-tabs>
<u-tabs :list="list" :is-scroll="false" :current="current" inactive-color='#999' :active-color='mc' @change="change"></u-tabs>
</view>
<!-- 内容1 -->
<view v-if="current==0">
......@@ -167,8 +197,7 @@
<text class="introduce2">老师介绍</text>
</view>
<view class="teacher">
<image :src="g.edu_data.TeacherIcon" mode="aspectFill" style="width:30px;height:30px;"
class="share-icon" />
<image :src="g.edu_data.TeacherIcon" mode="aspectFill" style="width:30px;height:30px;" class="share-icon" />
<view class="teacher2">
<view class="teacher3">
<view class="teacher4" v-if='g.edu_data.TeacherName'>{{g.edu_data.TeacherName}}</view>
......@@ -238,34 +267,26 @@
</view> -->
</view>
<!-- id27结束 -->
<view class="sku-box u-skeleton-rect" style="margin: 0;padding: 10px;"
v-if="g.friendUrl!=null && g.friendUrl!=''&&setting.is_show_korea==0 &&u.TenantId!=27"
@click="goCoiling(g.friendUrl)">
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/goodsCoiling.png"
style="width: 100%;height: 68px;" />
<view class="sku-box u-skeleton-rect" style="margin: 0;padding: 10px;" v-if="g.friendUrl!=null && g.friendUrl!=''&&setting.is_show_korea==0 &&u.TenantId!=27"
@click="goCoiling(g.friendUrl)">
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/goodsCoiling.png" style="width: 100%;height: 68px;" />
</view>
<view class="sku-box u-skeleton-rect" style="align-items: flex-start;"
v-if="(g.goods_marketing_award.integral.title != '')|| (g.goods_marketing_award.PresentFXGradeMsg != '')|| g.freeShippingName != null && g.freeShippingName != '' && (g.fullMoneyPinkage > 0 || g.fullNumPinkage > 0)&&u.TenantId!=27">
<view class="sku-box u-skeleton-rect" style="align-items: flex-start;" v-if="(g.goods_marketing_award.integral.title != '')|| (g.goods_marketing_award.PresentFXGradeMsg != '')|| g.freeShippingName != null && g.freeShippingName != '' && (g.fullMoneyPinkage > 0 || g.fullNumPinkage > 0)&&u.TenantId!=27">
<view class="label" style="margin-top: 5px;">活动</view>
<view class="content" style="display: flex;flex-direction: column">
<view style="display: flex;flex-direction: row;align-items: center;margin-bottom: 5px;"
v-if="g.goods_marketing_award.integral.title != ''">
<view style="display: flex;flex-direction: row;align-items: center;margin-bottom: 5px;" v-if="g.goods_marketing_award.integral.title != ''">
<u-tag text="送积分" type="error" />
<text
style="margin-left: 5px; font-size: 12px;">{{ g.goods_marketing_award.integral.title }}</text>
<text style="margin-left: 5px; font-size: 12px;">{{ g.goods_marketing_award.integral.title }}</text>
</view>
<view style="display: flex;flex-direction: row;align-items: center"
v-if="g.goods_marketing_award.PresentFXGradeMsg != ''" @click="goVIP">
<view style="display: flex;flex-direction: row;align-items: center" v-if="g.goods_marketing_award.PresentFXGradeMsg != ''"
@click="goVIP">
<u-tag text="送会员" type="error" />
<text
style="margin-left: 5px; font-size: 12px;">{{ g.goods_marketing_award.PresentFXGradeMsg }}</text>
<text style="margin-left: 5px; font-size: 12px;">{{ g.goods_marketing_award.PresentFXGradeMsg }}</text>
</view>
<view style="display: flex;flex-direction: row;align-items: center;margin-top: 5px;"
@click="goUrl(g.FreeShippingUrl)"
v-if="g.freeShippingName != null && g.freeShippingName != '' && (g.fullMoneyPinkage > 0 || g.fullNumPinkage > 0)">
<view
style="color: #fa3534;background: #fef0f0;padding: 12rpx 22rpx; font-size: 22rpx;margin-right: 5px;border: 1px solid #fde2e2;border-radius: 6rpx;">
<view style="display: flex;flex-direction: row;align-items: center;margin-top: 5px;" @click="goUrl(g.FreeShippingUrl)"
v-if="g.freeShippingName != null && g.freeShippingName != '' && (g.fullMoneyPinkage > 0 || g.fullNumPinkage > 0)">
<view style="color: #fa3534;background: #fef0f0;padding: 12rpx 22rpx; font-size: 22rpx;margin-right: 5px;border: 1px solid #fde2e2;border-radius: 6rpx;">
{{ g.freeShippingName != null ? g.freeShippingName : '' }}
</view>
{{ g.fullMoneyPinkage > 0 && g.fullNumPinkage == 0 ? g.fullMoneyPinkage + '元包邮' : '' }}
......@@ -281,8 +302,7 @@
</view>-->
</view>
</view>
<view class="sku-box u-skeleton-rect" style="align-items: flex-start;"
v-if="sku.length > 0&&setting.is_show_korea==0&&u.TenantId!=27">
<view class="sku-box u-skeleton-rect" style="align-items: flex-start;" v-if="sku.length > 0&&setting.is_show_korea==0&&u.TenantId!=27">
<view class="label">选择</view>
<view class="content">
<view class="sku-chosen" @click="chosenSku">
......@@ -315,19 +335,16 @@
<view class="label">发货地</view>
<view class="content">{{g.sendArea }}</view>
</view>
<view class="sku-box u-skeleton-rect"
v-if="setting.is_express == '1'&&setting.is_show_korea==0&&u.TenantId!=27">
<view class="sku-box u-skeleton-rect" v-if="setting.is_express == '1'&&setting.is_show_korea==0&&u.TenantId!=27">
<view class="label">快递</view>
<view class="content">{{ g.express == '' ? '免运费' : '￥' + g.express }}</view>
</view>
<view class="sku-box u-skeleton-rect" style="margin-top: -10;"
v-if="g.goods_marketing.shipping != ''&&u.TenantId!=27">
<view class="sku-box u-skeleton-rect" style="margin-top: -10;" v-if="g.goods_marketing.shipping != ''&&u.TenantId!=27">
<view class="label">包邮</view>
<view class="content">{{ g.goods_marketing.shipping }}</view>
</view>
<view class="sku-box u-skeleton-rect" style="margin-top: -10;"
v-if="g.goods_marketing.limit != ''&&setting.is_show_korea==0&&u.TenantId!=27">
<view class="sku-box u-skeleton-rect" style="margin-top: -10;" v-if="g.goods_marketing.limit != ''&&setting.is_show_korea==0&&u.TenantId!=27">
<view class="label">限购</view>
<view class="content">{{ g.goods_marketing.limit }}</view>
</view>
......@@ -346,23 +363,21 @@
</view>
</view>
<view class="sku-box u-skeleton-rect"
v-if="comments.length == 0 && setting.is_comment == 1&&setting.is_show_korea==0&&u.TenantId!=27">
<view class="sku-box u-skeleton-rect" v-if="comments.length == 0 && setting.is_comment == 1&&setting.is_show_korea==0&&u.TenantId!=27">
<view class="label">暂无评论信息</view>
</view>
<view class="comment" v-if="comments.length > 0">
<view class="chead">
<u-section :bold="false" :sub-color="secondary" :show-split="false"
:title="`商品评价(${comments.length})`" sub-title="查看更多" @click="clickCommentHandler"
font-size="24"></u-section>
<u-section :bold="false" :sub-color="secondary" :show-split="false" :title="`商品评价(${comments.length})`" sub-title="查看更多"
@click="clickCommentHandler" font-size="24"></u-section>
</view>
<view class="content">
<view class="u-box">
<view class="user">
<u-avatar :src="comments[0].UserPhotoPath" :size="50"></u-avatar>
<text style="margin-left: 10px;">{{ comments[0].UserName }}</text>
<u-rate :current="comments[0].CommentScore" active-color="#FA3534" inactive-color="#b2b2b2"
active-icon="star" inactive-icon="star-o" size="20" :disabled="true"></u-rate>
<u-rate :current="comments[0].CommentScore" active-color="#FA3534" inactive-color="#b2b2b2" active-icon="star"
inactive-icon="star-o" size="20" :disabled="true"></u-rate>
</view>
<view class="timer">{{ comments[0].CreateDate }}</view>
</view>
......@@ -398,7 +413,8 @@
<view style="margin:10px 0;">留言(至少填写10个文字)</view>
<view>
<textarea placeholder="请输入评论信息" style="width: 94.5%;height: 100px;border:1px solid #d1d1d1;
padding:10px;background-color: #fff;" confirm-type='done' v-model="comentMsg.Content">
padding:10px;background-color: #fff;"
confirm-type='done' v-model="comentMsg.Content">
</textarea>
</view>
<view class="goodComentBtn" @click="submitCommit">提交留言</view>
......@@ -411,36 +427,31 @@
</view>
<u-skeleton v-if="loading" :loading="true" :animation="true" bgcolor="#FFF"></u-skeleton>
<template v-if="setting&&setting.is_show_korea==0">
<goodsaction v-if="!loading" :good-name="g.name" :cover-pic="g.cover_pic" :favorite="g.favorite"
:good-id="id" :total-stock="g.totalStock" :status="g.status" :formid='g.form_id' @joincar="joinCar"
@buy="buy"></goodsaction>
<goodsaction v-if="!loading" :good-name="g.name" :cover-pic="g.cover_pic" :favorite="g.favorite" :good-id="id"
:total-stock="g.totalStock" :status="g.status" :formid='g.form_id' @joincar="joinCar" @buy="buy"></goodsaction>
</template>
<template v-if="setting&&setting.is_show_korea==1">
<kotragoodsaction v-if="!loading" :good-name="g.name" :cover-pic="g.pic_url" :favorite="g.favorite"
:good-id="id" :total-stock="g.totalStock" :status="g.status" @buy="buy">
<kotragoodsaction v-if="!loading" :good-name="g.name" :cover-pic="g.pic_url" :favorite="g.favorite" :good-id="id"
:total-stock="g.totalStock" :status="g.status" @buy="buy">
</kotragoodsaction>
</template>
<goodsku v-if="!loading && showSku&&u.TenantId!=27" border-radius="10" v-model="showSku"
:mask-close-able="true" :safe-area-inset-bottom="true" :good="g" :option-type="ot" :skued="currentSku"
@close="closeSkuChosen">
<goodsku v-if="!loading && showSku&&u.TenantId!=27" border-radius="10" v-model="showSku" :mask-close-able="true"
:safe-area-inset-bottom="true" :good="g" :option-type="ot" :skued="currentSku" @close="closeSkuChosen">
</goodsku>
<template v-if="u&&u.TenantId==27">
<goodsku2 v-if="!loading && showSku" border-radius="10" v-model="showSku" :mask-close-able="true"
:safe-area-inset-bottom="true" :good="g" :option-type="ot" :skued="currentSku"
@close="closeSkuChosen">
:safe-area-inset-bottom="true" :good="g" :option-type="ot" :skued="currentSku" @close="closeSkuChosen">
</goodsku2>
</template>
<template v-else>
<goodsku v-if="!loading && showSku" border-radius="10" v-model="showSku" :mask-close-able="true"
:safe-area-inset-bottom="true" :good="g" :option-type="ot" :skued="currentSku"
@close="closeSkuChosen">
:safe-area-inset-bottom="true" :good="g" :option-type="ot" :skued="currentSku" @close="closeSkuChosen">
</goodsku>
</template>
</view>
<u-empty text="没有找到商品，或商品已下架" mode="favor" v-if="!isExsitGoods"></u-empty>
<share :good-id="id" v-if="showShare" :good-name="g.name" :images="g.pic_url" :advertising="g.advertising"
@close="closeShare"></share>
<share :good-id="id" v-if="showShare" :good-name="g.name" :images="g.pic_url" :advertising="g.advertising" @close="closeShare"></share>
<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
<coupon v-if="showCoupons" :coupon-message="couponMessage" @goLook="goLook" @closeBtn="closeBtn"></coupon>
</view>
......@@ -462,6 +473,11 @@
export default {
data() {
return {
ItemType1: [],
ItemType2: [],
ItemType3: [],
ItemType4: [],
ItemType5: [],
barStyle: {
height: 'mc ',
},
......@@ -541,12 +557,17 @@
this.scrollTop = e.scrollTop;
},
onLoad(option) {
this.opTionObj = option;
this.ItemType1 = [],
this.ItemType2 = [],
this.ItemType3 = [],
this.ItemType4 = [],
this.ItemType5 = [],
this.opTionObj = option;
console.log(option, "option");
if (option && option.id) {
this.id = option.id ? option.id : 29; //40887 59512 46942
} else {
this.id = option.GoodsId ? option.GoodsId : 29; //40887 59512 46942
this.id = option.GoodsId ? option.GoodsId : 774192; //774192
}
if (option && option.custom_params) {
let custom_params = JSON.parse(decodeURIComponent(option.custom_params));
......@@ -602,7 +623,7 @@
// this.init();
// this.initPage();
// }
this.init();
this.initPage();
this.getVipId();
this.mc = this.$uiConfig.mainColor;
......@@ -677,6 +698,7 @@
setTimeout(() => {
this.initImages();
}, 3000);
this.init();
},
methods: {
// counter() {
......@@ -772,6 +794,21 @@
(res) => {
if (res.resultCode == 1) {
this.g = res.data.goods;
// 报名限制数组
res.data.goods.edu_data.ClassCondition.forEach(item2 => {
if (item2.ItemType == 1) {
this.ItemType1.push(item2)
} else if (item2.ItemType == 2) {
this.ItemType2.push(item2)
} else if (item2.ItemType == 3) {
this.ItemType3.push(item2)
} else if (item2.ItemType == 4) {
this.ItemType4.push(item2)
} else if (item2.ItemType == 5) {
this.ItemType5.push(item2)
}
})
// 报名限制数组结束
this.g.totalStock = 0;
this.g.attr.forEach((x) => {
this.g.totalStock += x.stock;
......@@ -1087,6 +1124,18 @@
</script>
<style>
.limit {
margin-top: 20rpx;
}
.box-title {
font-weight: bold;
}
.box-name {
font-size: 22rpx;
}
.the-top {
position: absolute;
top: 82%;
......@@ -1177,6 +1226,14 @@
font-weight: bold;
}
.origin {
font-family: "oswald";
font-size: 28rpx;
color: #999;
text-decoration: line-through;
margin-left: 10rpx;
}
.sign-up {
font-size: 20rpx;
color: #999;
......@@ -1218,7 +1275,8 @@
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
font-size: 16px;
height: 45px;
/* height: 45px; */
margin-bottom: 10rpx;
}
.goods .g-info .g-price-box {
......
pages/order-submit/order-submit2.vue
View file @ 0e73da29
......@@ -3,8 +3,8 @@
<!-- @click="chosenAddress(ds.address.id)" -->
<view class="add-box">
<!-- <view v-if="address.province && address.province != ''" class="add-info"> -->
<view v-if="namelist&&namelist.length>0" class="add-info">
<view class="area">
<view v-if="namelist&&namelist.length>0" class="add-info">
<view class="area">
<view class="name-top">
<view class="mask-lit22" :style="{ 'background-color': mc }">{{Thename.substr(0,1)}}
</view>
......@@ -17,7 +17,7 @@
<view class="address">
</view>
</view>
<view v-if="namelist.length<=0" class="add-info2" >
<view v-if="namelist.length<=0" class="add-info2">
<view @click="chosenAddress()">请添加学员</view>
</view>
<view class="arrow" @click="chosenAddress()">
......@@ -241,7 +241,9 @@
<view class="notOption" v-if="submitOrder"></view>
<good-list :list="goodData" v-if="showGoodList" @close="closeGoodListHandler"></good-list>
<payCom v-if="payBtn" :payInfo="payInfo" :isAlipay="isAlipay" :StuId='JJSWStuId' :TeacherIds='mrk' @closePay="closePay"></payCom>
<payCom v-if="payBtn" :payInfo="payInfo" :isAlipay="isAlipay" :StuId='JJSWStuId' :TeacherIds='EduTeacherId'
@closePay="closePay"></payCom>
<u-toast ref="uToast" />
<u-popup v-model="payExit" mode="center" :mask-close-able="false">
<view style="background:#fff;width:500rpx">
......@@ -312,9 +314,27 @@
</view>
</u-popup>
<!-- 支付宝弹窗 -->
<!-- <Alipay v-if="AlipayMask" :AlipayMask='AlipayMask' :payInfo="payInfo" :isAlipay="isAlipay" :StuId='JJSWStuId' :TeacherIds='mrk' @closePay="closePay">
<!-- <Alipay v-if="AlipayMask" :AlipayMask='AlipayMask' :payInfo="payInfo" :isAlipay="isAlipay" :StuId='JJSWStuId' :TeacherIds='mrk' @closePay="closePay">
</Alipay> -->
<u-popup mode="center" v-model="showExame">
<view style="width: 577rpx;padding-top:129rpx;text-align:center;height: 509rpx;background: #FFFFFF;border-radius: 50rpx; position: relative;">
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/exambg.png" mode="widthFix" style="width:220rpx;height:118px;position: absolute; top:-52rpx;right:27rpx;"></image>
<view style="font-size: 34rpx;font-weight: bold;color: #10100F;">
测验提醒
</view>
<view style="margin-top:32rpx; font-size: 28rpx;font-weight: 500;color: #959595;">
此课程需要学员完成测验<br/>通过后才能报名
</view>
<view style="margin-top:50rpx">
<view style="width:50%;margin:0 auto;">
<u-button type="error" shape="circle" @click="goExameHandler">立即测验</u-button>
</view>
</view>
<view style="margin-top:30rpx;color:#FA5B23;font-size:30rpx" @click="showExame=false">
取消报名
</view>
</view>
</u-popup>
</view>
</template>
......@@ -325,7 +345,7 @@
import coupon from '@/components/coupon/index';
import cashCard from '@/components/coupon/cashCard'; //储蓄卡
import goodList from '@/components/goods/order-good-list';
export default {
components: {
payCom,
......@@ -337,10 +357,15 @@
},
data() {
return {
AlipayMask:false,
IsQZJC:0,
mrk:'',
isAlipay: 2,//1微信 2微信支付宝
limits: false,
AlipayMask: false,
IsQZJC: 0,
EduTeacherId: '',
ClassId: '',
PaperId:'',
PublishId:'',
// mrk3: '',
isAlipay: 2, //1微信 2微信支付宝
JJSWStuId: "",
Thename2: '',
u: {},
......@@ -402,7 +427,7 @@
IsFormShoppingCart: 2,
adressInfo: {},
payInfo: {
OpenId: '',//ow_7I5XC1-RGwwk8QANBmWKYKmOc
OpenId: '', //ow_7I5XC1-RGwwk8QANBmWKYKmOc
OrderId: '',
OrderPayType: 1,
GoodsName: ''
......@@ -416,6 +441,8 @@
showcashcard: false,
onecoupon: true, //第一次进页面的时候选最优的优惠券
IsDeposit: 0, //是否开启储蓄卡功能
showExame:false,
examInfo:''
};
},
onLoad(option) {
......@@ -440,6 +467,7 @@
this.mc = this.$uiConfig.mainColor;
this.secondary = this.$uiConfig.secondary;
},
onShow() {
this.init();
if (this.isLeave) {
......@@ -458,11 +486,11 @@
}
this.requestJJSWAdmin(testCmd, postMsg,
(res) => {
console.log("111",res);
// console.log("111",res);
if (res.data.Data.length > 0) {
this.namelist = res.data.Data
this.Thename = res.data.Data[0].StuName
this.Thename2 = res.data.Data[0].StuName
this.Thename2 = res.data.Data[0].StuName
this.JJSWStuId = res.data.Data[0].StuId
}
}
......@@ -500,7 +528,7 @@
closePay() {
this.payBtn = false;
this.payExit = true;
this.AlipayMask =false
this.AlipayMask = false
},
closeGoodListHandler() {
this.goodData = [];
......@@ -513,9 +541,53 @@
submitModel() {
this.showReviceModal = true;
},
// 提交订单
submitOrderHandler() {
let that = this;
// 报名限制
Registration() {
let postMsg = {
StuId: this.JJSWStuId,
ClassIds: this.ClassId
}
let that = this
let obj={
// PaperId:this.PaperId,
// PublishId:this.PublishId,
// GuestId:this.JJSWStuId
}
this.requestJJSWAdmin("/api/WeChatPublic/CheckStuSubmitOrder", postMsg,
(res) => {
if (res.data.Code != 1) {
that.limits = true
if(res.data.Message&&res.data.Message!='')
{
uni.showToast({
title: res.data.Message,
icon: "none",
});
}
if(res.data.Data.PaperId>0&&res.data.Data.PublishId>0&&res.data.Data.StuId){
obj.PaperId=res.data.Data.PaperId
obj.PublishId=res.data.Data.PublishId
obj.StuId=res.data.Data.StuId
this.showExame=true
this.examInfo = JSON.stringify(obj)
// 跳转入学考试
}
} else {
that.limits = false
this.OrderInterface()
}
// console.log('llll',that.limits)
}
);
},
goExameHandler(){
uni.redirectTo({
url: `/pages/webbox/webbox?limit=${this.examInfo}`
});
},
// 提交订单接口
OrderInterface() {
// that.adressInfo.Consignee = '测试'
// that.adressInfo.ShoppingAddress = '四川成都龙泉驿1'
// that.JJSWStuId = '10724';
......@@ -527,18 +599,13 @@
// });
// return;
// }
if (that.JJSWStuId == '' || that.Thename == '') {
this.$refs.uToast.show({
title: '请添加学员！',
type: 'warning'
});
return;
}
if (!this.submitOrder) {
let that =this
if (!this.submitOrder && !that.limits) {
this.submitOrder = true;
uni.requestSubscribeMessage({
tmplIds: this.ds.template_message_list,
complete(res) {
// console.log('44444444444444444')
that.submitOrder = false;
let form = {};
// form.Consignee = that.adressInfo.Consignee;
......@@ -558,12 +625,13 @@
form.CouponMoney = that.couponPrice;
form.FreightMoney = that.expressPrice;
form.Income = that.ds.total_price;
form.IsFormShoppingCart = that.IsFormShoppingCart;
form.Use_Integral = that.formdata.Use_Integral;
form.ShoppingCartIdList = that.ShoppingCartIdList;
form.JJSWStuId = that.JJSWStuId;
form.AnchorName = uni.getStorageSync("AnchorName") ? uni.getStorageSync("AnchorName")
form.AnchorName = uni.getStorageSync("AnchorName") ? uni.getStorageSync(
"AnchorName")
.AnchorName : ''; //直播名称
if (that.mchs && that.mchs.length > 0) {
that.deduction_commission = that.mchs[0].deduction_commission;
......@@ -574,21 +642,22 @@
data: form
},
res => {
// console.log('7777777777')
if (res.resultCode == 1) {
that.payInfo.OrderId = res.data.OrderId;
that.payInfo.total_price = that.ds.total_price;
if(res.data.OrderStatus==5){
if (res.data.OrderStatus == 5) {
let info = {
OrderId:that.payInfo.OrderId,
OrderId: that.payInfo.OrderId,
total_price: that.ds.total_price,
StuId:that.JJSWStuId,
TeacherIds:that.mrk,
StuId: that.JJSWStuId,
TeacherIds: that.EduTeacherId,
}
uni.reLaunch({
url: '/pages/order-submit/pay-success2?payInfo=' +
JSON.stringify(info)
})
}else {
} else {
if (that.checked == true) {
that.zhaoren = true;
let u = uni.getStorageSync("mall_UserInfo");
......@@ -597,30 +666,33 @@
let SmallShopId = u.SmallShopId ? u.SmallShopId : 0;
if (SmallShopId == 0) {
//如果微店id为0 去找所属微店id
SmallShopId = u.UserSmallShopId ? u.UserSmallShopId : 0;
SmallShopId = u.UserSmallShopId ? u.UserSmallShopId :
0;
}
that.path = '/pages/index/index?OrderId=' + res.data.OrderId +
that.path = '/pages/index/index?OrderId=' + res.data
.OrderId +
"&user_id=" + uid + "&Up=" + Up +
"&SmallShopId=" + SmallShopId + '&JumpType=4';
} else {
if (that.formdata.Use_Deposit_Id != 0 && that.ds.total_price ==
if (that.formdata.Use_Deposit_Id != 0 && that.ds
.total_price ==
0) { //如果使用了储蓄卡 就直接支付成功 跳入支付结果
uni.reLaunch({
url: '/pages/order-submit/pay-success?payInfo=' +
JSON.stringify(that.payInfo)
})
} else { //没使用的话 就弹出支付页面
if(that.IsQZJC==1) {
that.AlipayMask =true
if (that.IsQZJC == 1) {
that.AlipayMask = true
} else {
that.payBtn = true;
}
}
}
}
} else {
that.$refs.uToast.show({
title: res.data.message,
......@@ -634,6 +706,18 @@
});
}
},
// 提交订单按钮
submitOrderHandler() {
let that = this;
if (that.JJSWStuId == '' || that.Thename == '') {
this.$refs.uToast.show({
title: '请添加学员！',
type: 'warning'
});
return;
}
that.Registration()
},
closeCouponHandler(e) {
if (e != -1) {
this.formdata.User_Coupon_Id = e;
......@@ -754,7 +838,10 @@
});
},
init() {
let list =[]
// 获取跳转接口
let EduTeacherIdlist = []
let ClassIdlist = []
// let list3 = []
this.loading = true;
this.request2({
url: '/api/AppletOrder/GetAppletGoodsSettlementInfoForZY',
......@@ -769,10 +856,15 @@
this.mchs.forEach(x => {
x.goods_list.forEach(j => {
j.marketingLogo = JSON.parse(j.marketingLogo)
list.push(j.EduTeacherId)
EduTeacherIdlist.push(j.EduTeacherId)
ClassIdlist.push(j.EduData.ClassId)
// list3.push(j.EduData.ClassPersion)
})
})
this.mrk = list.toString()
this.EduTeacherId = EduTeacherIdlist.toString()
this.ClassId = ClassIdlist.toString()
// this.mrk3 = list3.toString()
this.payInfo.GoodsName = this.mchs[0].goods_list[0].name.slice(0, 10);
this.formdata.DeliveryMethod = this.mchs[0].delivery.send_type;
this.ds = res.data;
......@@ -868,16 +960,19 @@
</script>
<style>
.add-info2{
.u-toast{
height: auto !important;
}
.add-info2 {
width: 1px;
flex: 1;
min-height: 60px;
display: block;
padding: 10px 0;
display: flex;
align-items: center;
flex: 1;
min-height: 60px;
display: block;
padding: 10px 0;
display: flex;
align-items: center;
}
.determine-box {
margin: auto;
height: 80rpx;
......
pages/order/index/index.vue
View file @ 0e73da29
......@@ -96,7 +96,8 @@
<good-list :list="goodData" v-if="showGoodList" @close="closeGoodListHandler"></good-list>
<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth='goback'></auth>
<payCom v-if="payBtn&&u.TenantId!=27" :payInfo="payInfo" @closePay="closePay"></payCom>
<submit2PayCom v-if="payBtn&&u.TenantId==27" :payInfo="payInfo" :isAlipay="isAlipay" :StuId='StuId' :TeacherIds='TeacherIds' @closePay="closePay"></submit2PayCom>
<submit2PayCom v-if="payBtn&&u.TenantId==27" :payInfo="payInfo" :isAlipay="isAlipay" :StuId='StuId' :TeacherIds='TeacherIds' @closePay="closePay"></submit2PayCom>
<u-popup v-model="payExit" mode="center" :mask-close-able="false">
<view style="background:#fff;width:500rpx">
<view style="padding:10px 0 0 10px">提交失败</view>
......@@ -322,6 +323,8 @@
this.Cancelmsg.OrderId = e.OrderId;
this.Cancelmsg.Type = e.OrderStatus == 1 ? 1 : 2;
},
// 待付款立即支付
payment(e) {
let list =[]
this.payInfo.OrderId = e.OrderId;
......
pages/webbox/webbox.vue
View file @ 0e73da29
<template>
<web-view :src="url" v-if="!showPhone"></web-view>
<view v-else class="indexassembly" >
<web-view :src="url"></web-view>
<!-- <view v-else class="indexassembly" >
<u-popup v-model="showPhone" mode="center" length="auto">
<view style="width: 70vw;" class="mask">
<view
......@@ -21,12 +21,14 @@
</view>
</view>
</u-popup>
</view>
</view> -->
</template>
<script>
export default {
data() {
return {
info:{},
show:false,
showPhone:true,
showLogin: true, //多次点击
......@@ -44,11 +46,19 @@
this.getCode()
},
onLoad: function(option) { //option为object类型，会序列化上个页面传递的参数
this.url = decodeURIComponent(option.u)
if(option.auth){
// this.url = decodeURIComponent(option.u)
if(option.auth||option.limit){
this.showPhone =true
if(option.limit) {
this.info=option.limit
// console.log('参数',this.info)
let limiturls =`https://jj.kookaku.com?limit=${this.info}`
this.url=decodeURIComponent(limiturls)
console.log('要跳转的链接',this.url)
}
} else {
this.showPhone =false
this.url = decodeURIComponent(option.u)
// this.showPhone =false
}
},
methods: {
......@@ -133,8 +143,15 @@
(res) => {
if (res.resultCode == 1) {
that.obj.phoneNum =JSON.parse(res.data).phoneNumber
let urls =`https://jj.kookaku.com?phoneNum=${that.obj.phoneNum}`
that.url=decodeURIComponent(urls)
if(that.info) {
let limiturls =`https://jj.kookaku.com?phoneNum=${that.obj.phoneNum}&limit=${that.info}`
that.url=decodeURIComponent(limiturls)
} else {
let urls =`https://jj.kookaku.com?phoneNum=${that.obj.phoneNum}`
that.url=decodeURIComponent(urls)
}
that.showPhone =false
console.log('要跳转的链接',that.url)
// that.goUrl(`https://jj.kookaku.com?phoneNum=${that.obj.phoneNum}`)
......
plugin/api.js
View file @ 0e73da29
export default {
install(Vue, options) {
Vue.prototype.host = "https://wx.weibaoge.cn/web/index.php?_mall_id=1285"
Vue.prototype.host2 = "http://192.168.10.128:8200"//本地
// Vue.prototype.host2 = "http://192.168.10.46:8200"
//Vue.prototype.host2 = "http://192.168.10.128:8200"
//Vue.prototype.host3 = "http://192.168.10.128:8900"//本地
Vue.prototype.host2 = "https://mallApi.oytour.com"//测试
//进阶思维后台地址
// Vue.prototype.host3 = "http://192.168.10.128:8900"//本地
//Vue.prototype.host3 = "http://192.168.10.128:8900"//本地
Vue.prototype.host3 = "https://jjeduapi.oytour.com"//测试
Vue.prototype.UploadConfig = function() { //本地上传配置
return {
......@@ -140,13 +138,14 @@ export default {
msg: postMsg
},
success: res => {
typeof success == "function" && success(res);
if (res.data.Code == 10000) {
let u = uni.getStorageSync("mall_UserInfo");
if (u) {
this.getLogin_t(u)
}
} else if (res.Code == 1) {
} else if (res.data.Code == 0) {
} else if (res.data.Code != 1) {
......@@ -213,7 +212,7 @@ export default {
// 获取小程序APPID
Vue.prototype.GetMiniAppId = function() {
let appObj = {};
let appType = 4;
let appType = 13;
switch (appType) {
case 1: //赞羊
appObj = {
......
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