Skip to content

E
eduline
Commit 8f17ca33 by 冷斌
Options

Merge remote-tracking branch 'origin/master'

parents 25749fea 4fd00d74
Showing with 87 additions and 62 deletions
apps/classroom/Tpl/default/Index/search_w3g.html
...@@ -36,62 +36,52 @@ ...@@ -36,62 +36,52 @@
<script src="__THEMEW3G__/js/extension.js" charset="utf-8"></script> <script src="__THEMEW3G__/js/extension.js" charset="utf-8"></script>
<script> <script>
$(function(){ // $(function(){
$('#btn_search_site').click(function(){ // $('#btn_search_site').click(function(){
var search_cate = $('#search_cate').val(); // var search_cate = $('#search_cate').val();
var search_combo_input = $('#search_combo_input').val(); // var search_combo_input = $('#search_combo_input').val();
if(search_combo_input != ''){ // if(search_combo_input != ''){
if(search_cate == 'course'){ // if(search_cate == 'course'){
window.open("{:U('course/Video/index')}"+"?search="+search_combo_input); // window.open("{:U('course/Video/index')}"+"?search="+search_combo_input);
}else if(search_cate == 'school'){ // }else if(search_cate == 'school'){
window.open("{:U('school/Index/index')}"+"?search="+search_combo_input); // window.open("{:U('school/Index/index')}"+"?search="+search_combo_input);
}else if(search_cate == 'teacher'){ // }else if(search_cate == 'teacher'){
window.open("{:U('classroom/Teacher/index')}"+"?search="+search_combo_input); // window.open("{:U('classroom/Teacher/index')}"+"?search="+search_combo_input);
}else if(search_cate == 'exams'){ // }else if(search_cate == 'exams'){
window.open("{:U('exams/Index/paper')}"+"&search="+search_combo_input); // window.open("{:U('exams/Index/paper')}"+"&search="+search_combo_input);
}else if(search_cate == 'goods'){ // }else if(search_cate == 'goods'){
window.open("{:U('mall/Goods/index')}"+"?search="+search_combo_input); // window.open("{:U('mall/Goods/index')}"+"?search="+search_combo_input);
}else if(search_cate == 'wenda'){ // }else if(search_cate == 'wenda'){
window.open("{:U('wenda/Index/index')}"+"?search="+search_combo_input); // window.open("{:U('wenda/Index/index')}"+"?search="+search_combo_input);
}else if(search_cate == 'news'){ // }else if(search_cate == 'news'){
window.open("{:U('news/Topic/index')}"+"?search="+search_combo_input); // window.open("{:U('news/Topic/index')}"+"?search="+search_combo_input);
} // }
} // }
}); // });
$(document).keydown(function(event){ // $(document).keydown(function(event){
var search_cate = $('#search_cate').val(); // var search_cate = $('#search_cate').val();
var search_combo_input = $('#search_combo_input').val(); // var search_combo_input = $('#search_combo_input').val();
if(search_combo_input != '') { // if(search_combo_input != '') {
if (event.keyCode == 13) { // if (event.keyCode == 13) {
if(search_cate == 'course'){ // if(search_cate == 'course'){
window.open("{:U('course/Video/index')}"+"?search="+search_combo_input); // window.open("{:U('course/Video/index')}"+"?search="+search_combo_input);
}else if(search_cate == 'school'){ // }else if(search_cate == 'school'){
window.open("{:U('school/Index/index')}"+"?search="+search_combo_input); // window.open("{:U('school/Index/index')}"+"?search="+search_combo_input);
}else if(search_cate == 'teacher'){ // }else if(search_cate == 'teacher'){
window.open("{:U('classroom/Teacher/index')}"+"?search="+search_combo_input); // window.open("{:U('classroom/Teacher/index')}"+"?search="+search_combo_input);
}else if(search_cate == 'exams'){ // }else if(search_cate == 'exams'){
window.open("{:U('exams/Index/paper')}"+"&search="+search_combo_input); // window.open("{:U('exams/Index/paper')}"+"&search="+search_combo_input);
}else if(search_cate == 'goods'){ // }else if(search_cate == 'goods'){
window.open("{:U('mall/Goods/index')}"+"?search="+search_combo_input); // window.open("{:U('mall/Goods/index')}"+"?search="+search_combo_input);
}else if(search_cate == 'wenda'){ // }else if(search_cate == 'wenda'){
window.open("{:U('wenda/Index/index')}"+"?search="+search_combo_input); // window.open("{:U('wenda/Index/index')}"+"?search="+search_combo_input);
}else if(search_cate == 'news'){ // }else if(search_cate == 'news'){
window.open("{:U('news/Topic/index')}"+"?search="+search_combo_input); // window.open("{:U('news/Topic/index')}"+"?search="+search_combo_input);
} // }
} // }
} // }
}); // });
}); // });
$(function(){
$(".aingstoit p").click(function(){
if ($(".aingstoit span").css("display")=="none") {
$(".aingstoit span").show();
} else {
$(".aingstoit span").hide();
}
})
})
</script> </script>
</head> </head>
<body> <body>
...@@ -333,6 +323,7 @@ ...@@ -333,6 +323,7 @@
let url = "{:U('mall/Goods/view')}" let url = "{:U('mall/Goods/view')}"
window.location.href = url.replace(/\[.*?\]/g, item.id) window.location.href = url.replace(/\[.*?\]/g, item.id)
}, },
//搜索课程
searchCourse: function() { searchCourse: function() {
let that = this let that = this
let on = "{$marketConf['order_switch']}" == 1 let on = "{$marketConf['order_switch']}" == 1
...@@ -355,6 +346,7 @@ ...@@ -355,6 +346,7 @@
} }
}) })
}, },
//搜索题目
searchQuestion: function() { searchQuestion: function() {
let that = this let that = this
$.ajax({ $.ajax({
...@@ -376,6 +368,7 @@ ...@@ -376,6 +368,7 @@
} }
}) })
}, },
//搜索物品
searchGoods: function() { searchGoods: function() {
let that = this let that = this
$.ajax({ $.ajax({
......
apps/mall/Tpl/default/Goods/index_w3g.html
...@@ -194,7 +194,6 @@ ...@@ -194,7 +194,6 @@
} }
}, },
onLoad: function() { onLoad: function() {
console.log('onLoad')
let that = this let that = this
let opt = that.options[that.tab] let opt = that.options[that.tab]
if(that.tab == 2) { if(that.tab == 2) {
...@@ -219,6 +218,10 @@ ...@@ -219,6 +218,10 @@
that.finished = res.nowPage >= res.totalPages that.finished = res.nowPage >= res.totalPages
} }
}) })
} else if(that.tab == 1) {
} else {
} }
} }
} }
......
apps/mall/Tpl/default/Goods/view_w3g.html
...@@ -7,10 +7,30 @@ ...@@ -7,10 +7,30 @@
<div id="app"> <div id="app">
<div class="layout_v"> <div class="layout_v">
<div class="goods_detail_top"> <div class="goods_detail_top layout_v">
<van-image ></van-image> <van-image width="100%" height="160" :src="info.cover" ></van-image>
<span class="text_18_600 color_333333" style="margin: 0.75rem;margin-bottom: 0;">{{info.title}}</span>
<span class="text_12_400 color_999999" style="margin: 0.75rem;margin-top: 0.5rem;">库存：{{info.stock}}</span>
</div>
<div class="normal_gap"></div>
<div class="layout_v">
<span class="self_center color_333333 text_14_600" style="margin-top: 0.625rem;margin-bottom: 0.5rem;">教材介绍</span>
<div class="divider"></div>
<div v-html="info.details"></div>
</div> </div>
</div> </div>
<div class="fixed_bottom_bar layout_h_v_c">
<span class="text_14_600 color_FF3B3B">
¥{{info.price}}
</span>
<div class="weight_full layout_h_r">
<div @click="onBuy" class="vip_buy_pay_button layout_center"><span class="text_14_400 color_white">立即购买</span></div>
<span style="margin-right: 0.75rem;" class="text_12_400 color_999999 self_center">0</span>
</div>
</div>
</div> </div>
<script> <script>
...@@ -18,13 +38,22 @@ ...@@ -18,13 +38,22 @@
el: "#app", el: "#app",
created:function(){ created:function(){
let d = {:json_encode($data)}; this.info = {:json_encode($data)};
console.log(d) this.order = {:json_encode($goodsOrder)};
console.log(this.info)
console.log(this.order)
}, },
data: function() { data: function() {
return { return {
info: "" info: "",
order: ""
}
},
methods: {
onBuy: function() {
} }
} }
}) })
......
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