Skip to content

M
mallapp
Commit a4621c31 authored by Mac's avatar Mac
Browse files
Options

1

parent 336da235
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 125 additions and 187 deletions
components/school/list.vue
View file @ a4621c31
......@@ -32,14 +32,15 @@
></u-rate>
<text class="good-rb-text">{{cx.course_score!=null &&cx.course_score>0?cx.course_score.toFixed(1):'5.0'}}分</text>
</view>
<view class="good-rb-box" v-if="cx.is_pay==false">
<view class="good-rb-box" v-if="cx.is_pay==false && cx.price!=0">
<text style="font-size: 10px;color: #999999;text-decoration:line-through;margin-right: 2px;margin-top: 2px;">￥{{cx.original_price}}</text>
<text :style="{'font-size': '11px','color': pricecolor,'margin-top':'2px'}">￥</text>
<text :style="{'font-size': '16px','color': pricecolor}">{{cx.price.split('.')[0]}}</text>
</view>
<view class="good-rb-box" v-if="cx.is_pay==true">
<view class="good-rb-box" v-if="cx.is_pay==true&& cx.price!=0">
<text :style="{'font-size': '14px','color': pricecolor}">已购买</text>
</view>
<view v-if="cx.price==0" style="font-size: 12px;color: #999999;">免费</view>
</view>
</view>
</view>
......
pages/cart/cart.vue
View file @ a4621c31
This diff is collapsed.
pages/school/course-submit.vue
View file @ a4621c31
......@@ -95,13 +95,13 @@
</view>
</view>
<view class="filed" style="margin-top: 20px;" >
<view class="left">优惠</view>
<view class="left">优惠券优惠</view>
<view class="right">
<text class="price" :style="{ color: pricecolor }">-￥{{ couponPrice.toFixed(2) }}</text>
</view>
</view>
<view class="filed" style="margin-top: 20px;" >
<view class="left">课程卡优惠</view>
<view class="left">学习卡优惠</view>
<view class="right">
<text class="price" :style="{ color: pricecolor }">-￥{{ EducationMoney.toFixed(2) }}</text>
</view>
......@@ -264,6 +264,12 @@
if (option.DetailList) {
this.formdata.DetailList = JSON.parse(decodeURIComponent(option.DetailList));
}
if (option.IsFormShoppingCart) {
this.IsFormShoppingCart = option.IsFormShoppingCart;
}
if (option.ShoppingCartIdList) {
this.ShoppingCartIdList = JSON.parse(option.ShoppingCartIdList);
}
this.mc = this.$uiConfig.mainColor;
this.secondary = this.$uiConfig.secondary;
this.pricecolor = this.$uiConfig.pricecolor;
......
pages/school/courseContent.vue
View file @ a4621c31
......@@ -2,20 +2,18 @@
<view class="courseContent">
<view class="course-top">
<!-- <video id="myVideo" :src="selectcourse.FilePath"
@error="videoErrorCallback" controls></video> -->
<video id="myVideo" src="https://img.cdn.aliyun.dcloud.net.cn/guide/uniapp/%E7%AC%AC1%E8%AE%B2%EF%BC%88uni-app%E4%BA%A7%E5%93%81%E4%BB%8B%E7%BB%8D%EF%BC%89-%20DCloud%E5%AE%98%E6%96%B9%E8%A7%86%E9%A2%91%E6%95%99%E7%A8%8B@20181126-lite.m4v"
@error="videoErrorCallback" controls duration='70'></video>
<video id="myVideo" v-if="selectcourse.Type==1" :src="selectcourse.FilePath"
@error="videoErrorCallback" controls duration='selectcourse.VideoTime'></video>
</view>
<view class="course-t">
<view class="course-t-item">
<button open-type="share" class="course-t-item">
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/fengx.png" class="share-icon" />
<text>分享</text>
</view>
</button>
<view class="course-t-item" @click="setFavorite">
<u-icon :name="favorite ? 'like' : 'like-o'" size="44" :color="favorite ? mc : '#333'"></u-icon>
<!-- <u-icon name="like-o" size="44" style='margin-bottom: 12rpx;'></u-icon> -->
<u-icon :name="favorite ? 'like' : 'like-o'" size="44" :color="favorite ? pricecolor : '#333'"></u-icon>
<text>收藏</text>
</view>
<view class="course-t-item">
......
pages/school/courseInfo.vue
View file @ a4621c31
......@@ -63,7 +63,7 @@
</view>
<view class="g-price-box">
<view class="left">
<view class="price u-skeleton-rect" >
<view class="price u-skeleton-rect" v-if=" g.price!=0" >
<text class="small" :style="{ color: pricecolor }">￥</text>
<text
class="numfont" :style="{ color: pricecolor }"
......@@ -185,22 +185,26 @@
</view>
<view class="actionsheet" >
<view style="display: flex;flex-direction: row;align-items: center;">
<view class="price-btn " :style="{ color: pricecolor }" >
<view class="price-btn " :style="{ color: pricecolor }" v-if="g.price!=0">
<text style="font-size: 11px;" >￥</text>
<text style="font-family: oswald; font-weight: unset;font-size: 20px;">{{ g.price }}</text>
</view>
<view class="price-btn " v-if="g.price==0">免费课程</view>
</view>
<view style="display: flex;flex-direction: row;align-items: center;font-size: 14px;">
<view style="width: 22px; margin: auto;margin-right: 15px;" @click="setFavorite"><u-icon :name="g.favorite ? 'like' : 'like-o'" size="44" :color="g.favorite ? mc : '#333'"></u-icon></view>
<view class="gwuche" :style="{'border':'1px solid'+mc}" @click="joinCar()">
<view style="width: 22px; margin: auto;margin-right: 15px;" @click="setFavorite"><u-icon :name="g.favorite ? 'like' : 'like-o'" size="44" :color="g.favorite ? pricecolor : '#333'"></u-icon></view>
<view class="gwuche" :style="{'border':'1px solid'+mc}" @click="joinCar()" v-if="g.price!=0 && g.is_pay==false && g.is_orders==false">
<text :style="{color:mc}">加入购物车</text>
</view>
<view class="gwuche" :style="{background:mc,'border':'1px solid'+mc}" v-if='g.is_pay==false && g.is_orders==true'>
<view class="gwuche" :style="{background:mc,'border':'1px solid'+mc}" v-if='g.is_pay==false && g.is_orders==true && g.price!=0'>
<text style="color: #fff;" >去支付</text>
</view>
<view class="gwuche" :style="{background:mc,'border':'1px solid'+mc}" v-if='g.is_pay==false && g.is_orders==false' @click="goSettlement">
<view class="gwuche" :style="{background:mc,'border':'1px solid'+mc}" v-if='g.is_pay==false && g.is_orders==false && g.price!=0' @click="goSettlement">
<text style="color: #fff;" >立即购买</text>
</view>
<view class="gwuche" :style="{background:mc,'border':'1px solid'+mc}" v-if='g.price==0||g.is_pay==true' >
<text style="color: #fff;" >学习中心</text>
</view>
</view>
</view>
......@@ -549,7 +553,6 @@ export default {
icon: 'success',
duration: 2000
});
this.popupClose();
}
);
},
......
plugin/api.js
View file @ a4621c31
......@@ -3,7 +3,7 @@ export default {
Vue.prototype.host = "https://wx.weibaoge.cn/web/index.php?_mall_id=1285"
// Vue.prototype.host2 = "http://192.168.0.110:8200"
// Vue.prototype.host2 = "https://mallApi.oytour.com"
Vue.prototype.host2 = "http://192.168.1.9:8088"
Vue.prototype.host2 = "http://192.168.1.5:8088"
// Vue.prototype.host2 = "http://192.168.1.21"
// Vue.prototype.host2 = "http://192.168.1.27:8200"
Vue.prototype.request = function(param, success, failed) {
......
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