Skip to content

E
eduline
Commit 14e72d5f by 冷斌
Options

Merge remote-tracking branch 'origin/master'

parents 43c92228 4b3f69b6
Showing with 721 additions and 119 deletions
addons/theme/stv1/_static/js/Area.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
addons/theme/stv1/_static_w3g/css/common.css
...@@ -139,11 +139,21 @@ div::-webkit-scrollbar { ...@@ -139,11 +139,21 @@ div::-webkit-scrollbar {
font-weight: 600; font-weight: 600;
} }
.text_18_600 {
font-size: 1.125rem;
font-weight: 600;
}
.text_26_600 { .text_26_600 {
font-size: 1.625rem; font-size: 1.625rem;
font-weight: 600; font-weight: 600;
} }
.text_apple {
font-size: 1.25rem;
color: #007AFF;
}
.divider { .divider {
height: 0.0625rem; height: 0.0625rem;
background: #E6E6E6; background: #E6E6E6;
...@@ -298,6 +308,14 @@ div::-webkit-scrollbar { ...@@ -298,6 +308,14 @@ div::-webkit-scrollbar {
color:rgba(255,255,255,1); color:rgba(255,255,255,1);
} }
.confirm_button:hover {
background: rgba(163,228,96,0.5);
}
.confirm_button:focus {
background: rgba(163,228,96,0.5);
}
.confirm_button_disable { .confirm_button_disable {
box-sizing: border-box; box-sizing: border-box;
height:44px; height:44px;
...@@ -316,12 +334,20 @@ div::-webkit-scrollbar { ...@@ -316,12 +334,20 @@ div::-webkit-scrollbar {
color:rgba(255,255,255,1); color:rgba(255,255,255,1);
} }
.confirm_button:hover { .item_green_button {
background: rgba(163,228,96,0.5); display: flex;
} box-sizing: border-box;
flex-direction: column;
.confirm_button.focus { justify-content: center;
background: rgba(163,228,96,0.5); align-items: center;
height: 1.5rem;
flex-direction: row;
background: rgba(163,228,96,1);
border-radius: 0.75rem;
min-width: 3rem;
font-size: 0.75rem;
font-weight: 400;
color:rgba(255,255,255,1);
} }
.tabs_container { .tabs_container {
...@@ -355,6 +381,62 @@ div::-webkit-scrollbar { ...@@ -355,6 +381,62 @@ div::-webkit-scrollbar {
color:rgba(101,192,0,1); color:rgba(101,192,0,1);
} }
.popup_top_button {
display: flex;
flex-direction: row;
justify-content: center;
align-items: center;
background:rgba(248,248,248,0.82);
border-radius:14px 14px 0px 0px;
margin-left: 0.625rem;
margin-right: 0.625rem;
margin-bottom: 0.0625rem;
height:3.5625rem;
}
.popup_bottom_button {
display: flex;
flex-direction: row;
justify-content: center;
align-items: center;
background:rgba(248,248,248,0.82);
border-radius:0px 0px 14px 14px;
height:3.5625rem;
margin-left: 0.625rem;
margin-right: 0.625rem;
}
.popup_cancel {
display: flex;
flex-direction: row;
justify-content: center;
align-items: center;
height:3.5rem;
background:rgba(255,255,255,1);
border-radius:0.875rem;
margin: 0.625rem;
}
.area_title_style {
width: 5.625rem;
flex-grow: 0 !important;
flex-basis: auto !important;
}
.area_value_style {
flex: 1;
display: flex;
flex-direction: row-reverse;
color: #969799;
}
.area_value_style_normal {
flex: 1;
display: flex;
flex-direction: row-reverse;
color: #323233;
}
/* /*
* Home * Home
*/ */
...@@ -423,6 +505,11 @@ div::-webkit-scrollbar { ...@@ -423,6 +505,11 @@ div::-webkit-scrollbar {
background: #F5A623; background: #F5A623;
} }
.home_item_goods {
padding: 0.75rem;
box-sizing: border-box;
}
.home_button_green { .home_button_green {
width:80px; width:80px;
height:28px; height:28px;
......
apps/classroom/Tpl/default/Index/search_w3g.html
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<meta name="full-screen" content="yes"> <meta name="full-screen" content="yes">
<link href="__THEME__/image/favicon.ico?v={$site.sys_version}" type="image/x-icon" rel="shortcut icon"> <link href="__THEME__/image/favicon.ico?v={$site.sys_version}" type="image/x-icon" rel="shortcut icon">
<!-- 引入 Bootstrap --> <!-- 引入 Bootstrap -->
<link rel="stylesheet" type="text/css" href="__THEME__/icon/iconfont.css"> <!-- <link rel="stylesheet" type="text/css" href="__THEME__/icon/iconfont.css">
<link rel="stylesheet" type="text/css" href="__APP__/css/search_3g.css"> <link rel="stylesheet" type="text/css" href="__APP__/css/search_3g.css">
<style> <style>
@font-face {font-family: 'iconfontNEW';src: url('__THEME__/icon/iconfontNEW.woff?v={$site.sys_version}');} @font-face {font-family: 'iconfontNEW';src: url('__THEME__/icon/iconfontNEW.woff?v={$site.sys_version}');}
...@@ -26,9 +26,9 @@ ...@@ -26,9 +26,9 @@
<style media="screen"> <style media="screen">
</style> </style>
<script src="__THEMEW3G__/js/jquery-1.8.3.min.js"></script> <script src="__THEMEW3G__/js/search_media.js"></script> -->
<script src="__THEMEW3G__/js/search_media.js"></script>
<script src="__THEMEW3G__/js/jquery-1.8.3.min.js"></script>
<link href="__THEMEW3G__/css/common.css" rel="stylesheet"> <link href="__THEMEW3G__/css/common.css" rel="stylesheet">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/vant@2.6/lib/index.css" /> <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/vant@2.6/lib/index.css" />
<script src="https://cdn.jsdelivr.net/npm/vue/dist/vue.min.js"></script> <script src="https://cdn.jsdelivr.net/npm/vue/dist/vue.min.js"></script>
...@@ -121,12 +121,65 @@ ...@@ -121,12 +121,65 @@
</van-sticky> </van-sticky>
<template v-if="showList(0)">
<div v-for="(item, idx) in options[0].items" :key="idx" class="home_class_item layout_v">
<div class="layout_h">
<van-image
style="margin-right: 0.75rem;"
height="72"
width="128"
fit="cover"
src="https://img.yzcdn.cn/vant/cat.jpeg">
</van-image>
<div class="weight_full layout_v">
<span class="text_14_600 color_333333 van-multi-ellipsis--l2">H5互动广告邀请函</span>
<span class="text_14_600 color_FF3B3B" style="margin-top: 0.5rem;">¥565</span>
<span class="text_12_400 color_999999">112人正在学习</span>
</div>
</div>
</div>
</template>
<template v-if="showList(1)">
<div v-for="(item, idx) in options[1].items" :key="idx" class="layout_v home_question_item">
<div class="layout_h">
<div class="home_item_mark_green layout_center">免费</div>
<span class="text_14_600 color_333333 weight_full van-multi-ellipsis--l2" style="margin-right: 1.5rem;margin-left: 0.625rem;">2020年国家公务员《行测》试卷（省级）-名师版</span>
<div class="home_button_green layout_center">开始做题</div>
</div>
<div class="layout_h_b" style="margin-top: 0.5rem;">
<span class="text_14_600 color_FF3B3B">¥0</span>
<van-image src="__THEME__/img/down_load_icon.png" width="13" height="16" ></van-image>
</div>
<div class="home_divider divider"></div>
</div>
</template>
<template v-if="showList(2)">
<div v-for="(item, idx) in options[2].items" :key="idx" class="home_item_goods layout_h">
<van-image
style="margin-right: 0.75rem;"
height="68"
width="128"
fit="cover"
src="https://img.yzcdn.cn/vant/cat.jpeg">
</van-image>
<div class="weight_full layout_v">
<span class="text_14_600 color_333333 van-multi-ellipsis--l2">[优惠大礼包]5年高考3年模拟理综全套</span>
<div class="layout_h_b" style="margin-top: 0.5rem;">
<span class="text_14_600 color_FF3B3B self_center">¥0</span>
<div class="item_green_button">购买</div>
</div>
</div>
</div>
</template>
<!-- 热门搜索 --> <!-- 热门搜索 -->
<div v-if="showHistory" class="layout_v"> <div v-if="showHistory" class="layout_v">
<span class="search_hot_title text_12_400 color_999999">历史搜索：</span> <span class="search_hot_title text_12_400 color_999999">历史搜索：</span>
<div class="layout_h_wrap search_hot_title_flow"> <div class="layout_h_wrap search_hot_title_flow">
<volist name="video" id="vo"> <volist name="video" id="vo">
<div @click="onHotKeyword({$vo.video_title|mStr=10})" class="search_flex_item layout_center"> <div @click="onHotKeyword('{$vo.video_title|mStr=10}')" class="search_flex_item layout_center">
<span class="text_14_400 color_999999">{$vo.video_title|mStr=10}</span> <span class="text_14_400 color_999999">{$vo.video_title|mStr=10}</span>
</div> </div>
<!-- <li><a <eq name="vo.type" value="1">href="{:U('course/Video/view',array('id'=>$vo['id']))}"<else/>href="{:U('live/Index/view',array('id'=>$vo['id']))}"</eq>>{$vo.video_title|mStr=10}</a></li> --> <!-- <li><a <eq name="vo.type" value="1">href="{:U('course/Video/view',array('id'=>$vo['id']))}"<else/>href="{:U('live/Index/view',array('id'=>$vo['id']))}"</eq>>{$vo.video_title|mStr=10}</a></li> -->
...@@ -221,20 +274,33 @@ ...@@ -221,20 +274,33 @@
showHistory: true, showHistory: true,
tab: 0, tab: 0,
options: [{ options: [{
title: '视频' title: '视频',
items: [1,2]
},{ },{
title: '真题' title: '真题',
items: [1,2]
},{ },{
title: '实物' title: '实物',
items: [1,2]
}] }]
} }
}, },
computed: {
showList: function() {
let tab = this.tab
let showHot = this.showHistory
return function(idx) {
return (idx == tab) && !showHot
}
}
},
methods: { methods: {
onFocus: function() { onFocus: function() {
this.showHistory = true this.showHistory = true
}, },
onHotKeyword: function(keyword) { onHotKeyword: function(key) {
this.keyword = key
this.onSearch()
}, },
onSearch: function() { onSearch: function() {
this.showHistory = false this.showHistory = false
......
apps/home/Lib/Action/UserAction.class.php
...@@ -1692,26 +1692,26 @@ class UserAction extends CommonAction ...@@ -1692,26 +1692,26 @@ class UserAction extends CommonAction
//地区 //地区
// $cityIds = t($_POST['city_ids']); // $cityIds = t($_POST['city_ids']);
// $cityIds = explode(',', $cityIds); // $cityIds = explode(',', $cityIds);
$this->assign('isAdmin', 1); // $this->assign('isAdmin', 1);
if ($_POST['city_ids_hidden']) { // if ($_POST['city_ids_hidden']) {
@list($province, $city, $area) = array_filter(explode(',', $_POST['city_ids_hidden'])); // @list($province, $city, $area) = array_filter(explode(',', $_POST['city_ids_hidden']));
//位置信息 // //位置信息
$save['location'] = model('Area')->getAreaName($_POST['city_ids_hidden']); // $save['location'] = model('Area')->getAreaName($_POST['city_ids_hidden']);
} else { // } else {
$province = intval($_POST['province']); // $province = intval($_POST['province']);
$city = intval($_POST['city']); // $city = intval($_POST['city']);
$area = intval($_POST['area']); // $area = intval($_POST['area']);
//位置信息 // //位置信息
$save['location'] = model('Area')->getAreaName([$province, $city, $area]); // $save['location'] = model('Area')->getAreaName([$province, $city, $area]);
} // }
if (!$province || !$city) { // if (!$province || !$city) {
$this->error('请选择完整地区'); // $this->error('请选择完整地区');
} // }
$save['province'] = $province; // $save['province'] = $province;
$save['city'] = $city; // $save['city'] = $city;
$save['area'] = $area; // $save['area'] = $area;
//昵称 //昵称
$user = $this->get('user'); $user = $this->get('user');
......
apps/home/Tpl/default/User/address_w3g.html
<include file="__THEME__/public_header_w3g"/> <include file="__THEME__/public_header_w3g"/>
<script type="text/javascript" src="__THEME__/js/Area.js"></script>
<link rel="stylesheet" href="__APP__/css/address_w3g.css"> <link rel="stylesheet" href="__APP__/css/address_w3g.css">
<!--<div class="header2"> <div id="app" class="body">
<a href="{:U('home/UserShow/index',array('uid'=>$_SESSION['mid']))}" class="icon-back"></a> <div class="layout_v">
<div>管理收货地址</div> <van-cell-group>
</div>--> <van-field v-model="name" label="收货人" placeholder="收货人" input-align="right" ></van-field>
<van-field v-model="phone" label="联系方式" type="digit" input-align="right" placeholder="请输入联系电话" ></van-field>
<van-cell @click="onArea" title-class="area_title_style" :value-class="areaStyle" title="所在地区" is-link :value="areaDisplay" ></van-cell>
<van-field
v-model="address"
rows="1"
autosize
label="详细地址"
type="textarea"
input-align="right"
placeholder="请输入详细地址"
></van-field>
<div @click="saveAddress" class="confirm_button" style="margin-top: 1rem;">
<span>保存</span>
</div>
</van-cell-group>
</div>
<div class="body"> <van-popup v-model="showPicker" round position="bottom">
<div class="covers"></div> <van-area @confirm="onAreaConfirm" @cancel="showPicker = false" title="收货地址" :area-list="areaList" />
<if condition="($data['usedCounts'] lt 10) OR ($_GET['id'] gt 0)"> </van-popup>
<form class="addressbox" id="addressbox" method="POST" action="" onsubmit="return false;">
<div class="content"> <!-- <div id="provinceData" style="display: none;">
<div class="header2"> <volist name="area" id="arc" >
<input class="inp01" name="{$arc['area_id']}" type="hidden" value="{$arc.title}" >
</volist>
</div> -->
<!-- <div class="covers"></div> -->
<!-- <div class="header2">
<a <if condition="$_GET['param']"> href="{:U('mall/Goods/pay',['vst'=>$_GET['param']])}" <else/> href="{:U('home/User/index')}" </if>class="icon-back"></a> <a <if condition="$_GET['param']"> href="{:U('mall/Goods/pay',['vst'=>$_GET['param']])}" <else/> href="{:U('home/User/index')}" </if>class="icon-back"></a>
<div>新增收货地址</div> <div>新增收货地址</div>
<if condition="($data['usedCounts'] lt 10) OR ($_GET['id'] gt 0)"> <if condition="($data['usedCounts'] lt 10) OR ($_GET['id'] gt 0)">
<a href="javascript:;" class="save" onclick="saveAddress()" >保存</a> <a href="javascript:;" class="save" onclick="saveAddress()" >保存</a>
</if> </if>
</div> </div> -->
<!-- <if condition="($data['usedCounts'] lt 10) OR ($_GET['id'] gt 0)">
<form class="addressbox" id="addressbox" method="POST" action="" onsubmit="return false;">
<div class="content">
<div class="jgzlbox"> <div class="jgzlbox">
<dl> <dl>
<dd> <dd>
<label for="name">收货人</label>
<input class="inp01" placeholder="收货人" name="name" id="name" type="text" value="{$address['name']}" maxlength="10" > <input class="inp01" placeholder="收货人" name="name" id="name" type="text" value="{$address['name']}" maxlength="10" >
</input>
<input class="inp01" name="id" id="address_id" type="hidden" value="{$address['id']}" > <input class="inp01" name="id" id="address_id" type="hidden" value="{$address['id']}" >
</input>
</dd> </dd>
</dl> </dl>
<dl> <dl>
...@@ -43,11 +73,9 @@ ...@@ -43,11 +73,9 @@
<dl class="gender-box"> <dl class="gender-box">
<dt><span class="cancel">取消</span><span class="confirm" id="ConSelect">确定</span></dt> <dt><span class="cancel">取消</span><span class="confirm" id="ConSelect">确定</span></dt>
<dd> <dd>
<!--menu01-->
<ul class="menu01"> <ul class="menu01">
<volist name="area" id="arc" > <volist name="area" id="arc" >
<li><a href="javascript:(0)" onclick="choiceCity(this,{$arc['area_id']})" value="{$arc['area_id']}">{$arc.title}</a> <li><a href="javascript:(0)" onclick="choiceCity(this,{$arc['area_id']})" value="{$arc['area_id']}">{$arc.title}</a>
<!--menu02-->
<ul class="menu02" id="city"> <ul class="menu02" id="city">
</ul> </ul>
</li> </li>
...@@ -64,7 +92,7 @@ ...@@ -64,7 +92,7 @@
<div class="jgzlbox"> <div class="jgzlbox">
<dl> <dl>
<dd style="color: #393939;">设为默认地址<!--<input class="checkbox" type="checkbox" <eq name="address.is_default" value="1">checked</eq> >--> <dd style="color: #393939;">设为默认地址
<div <eq name="address.is_default" value="1">type="true"<else/>type="flase"</eq> class="checkboxtrue"><p></p></div> <div <eq name="address.is_default" value="1">type="true"<else/>type="flase"</eq> class="checkboxtrue"><p></p></div>
</dd> </dd>
</dl> </dl>
...@@ -76,7 +104,7 @@ ...@@ -76,7 +104,7 @@
<a href="{:U('home/User/index')}" class="icon-back"></a> <a href="{:U('home/User/index')}" class="icon-back"></a>
<div>收货地址</div> <div>收货地址</div>
</div> </div>
</if> </if> -->
<div class="adressbox"> <div class="adressbox">
<volist name="data['data']" id="vo"> <volist name="data['data']" id="vo">
...@@ -93,7 +121,7 @@ ...@@ -93,7 +121,7 @@
<div class="bot">{$vo.location} {$vo.address}</div> <div class="bot">{$vo.location} {$vo.address}</div>
</dt> </dt>
<dd> <dd>
<label><i style="color: <eq name="vo.is_default" value="1">#57BC4C; <else/>rgb(237, 237, 237);</eq>;" class="iconfontNEW"><eq name="vo.is_default" value="1">&#xe6ab;<else/>&#x15fd;</eq></i><!--<input type="checkbox" disabled <eq name="vo.is_default" value="1">checked</eq>>-->默认地址</label> <!-- <label><i style="color: <eq name="vo.is_default" value="1">#57BC4C; <else/>rgb(237, 237, 237);</eq>;" class="iconfontNEW"><eq name="vo.is_default" value="1">&#xe6ab;<else/>&#x15fd;</eq></i>默认地址</label> -->
<a href="javascript:;" onclick ="delAddress(this,{$vo['id']})"><i class="iconfontNEW">&#xe690;</i>删除</a> <a href="javascript:;" onclick ="delAddress(this,{$vo['id']})"><i class="iconfontNEW">&#xe690;</i>删除</a>
<a <if condition="$_GET['param']"> href="{:U('home/User/address',['id'=>$vo['id'],'param'=>$_GET['param']])}" <else/> href="{:U('home/User/address',array('id'=>$vo['id']))}" </if> ><i class="iconfontNEW">&#xe64b;</i>编辑</a> <a <if condition="$_GET['param']"> href="{:U('home/User/address',['id'=>$vo['id'],'param'=>$_GET['param']])}" <else/> href="{:U('home/User/address',array('id'=>$vo['id']))}" </if> ><i class="iconfontNEW">&#xe64b;</i>编辑</a>
</dd> </dd>
...@@ -105,6 +133,110 @@ ...@@ -105,6 +133,110 @@
</div> </div>
<script> <script>
new Vue({
el: '#app',
data: function() {
return {
id: "{$address['id']}",
name: "{$address['name']}",
phone: "{$address['phone']}",
area: "{$address.location}",
provinceCode: "{$address['province']}",
cityCode: "{$address['city']}",
areaCode: "{$address['area']}",
address: "{$address['address']}",
showPicker: false,
areaList: areaList,
selected: []
}
},
created:function(){
document.title = "我的地址"
},
computed: {
areaStyle: function() {
return this.area.length > 0 ? 'area_value_style' : 'area_value_style_normal'
},
areaDisplay: function() {
return this.area.length == 0 ? "请选择收货地区" : this.area
}
},
methods: {
onArea: function() {
let that = this
that.showPicker = true
},
onAreaConfirm: function(values) {
let that = this
that.showPicker = false
that.area = values.reduce( (v, e) => { return v.length == 0 ? e.name : (v + " " + e.name) }, "")
if(values.length > 2) {
that.provinceCode = values[0].code
that.cityCode = values[1].code
that.areaCode = values[2].code
}
if(values.lengths > 1) {
that.provinceCode = values[0].code
that.cityCode = values[1].code
that.areaCode = ''
}
},
saveAddress: function() {
let that = this
let address = that.address
let name = that.name
let phone = that.phone
let province = that.provinceCode
let city = that.cityCode
let area = that.areaCode
if(!name) {
ui.error('请输入收货人姓名')
return
}
if(!phone){
ui.error('请输入联系电话')
return
}
if(!PHONE_MATCH.test(phone)){
ui.error('请输入正确的联系电话')
return
}
if(province<=0||city<=0){
ui.error('请选择收货地区')
return
}
if(!address){
ui.error('请输入详细地址')
return
}
let data = "address=" + address + "&"
data = data + "name=" + name + "&"
data = data + "phone=" + phone + "&"
data = data + "province=" + province + "&"
data = data + "city=" + city + "&"
data = data + "area=" + area + "&"
let is_default = 0
let id = that.id
let param = "{$_GET['param']}"
$.post(U('home/User/updateAddress'), data+"&is_default="+is_default+"&id="+id , function(data){
if(data.status){
ui.success(data.info)
setTimeout(function(){
location.href="{:U('home/User/address')}"+'?'+'param'+'='+param
}, 1000)
return false
}else{
ui.error(data.info)
}
}, 'json')
},
}
})
$(function(){ $(function(){
$(".header").hide(); $(".header").hide();
......
apps/home/Tpl/default/User/index_w3g.html
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
<van-icon name="__THEME__/img/collect.png" size="24"></van-icon> <van-icon name="__THEME__/img/collect.png" size="24"></van-icon>
</template> </template>
</van-cell> </van-cell>
<van-cell class="center_bottom_cell" title-class="text_14_400 color_333333 center_bottom_cell_text" title="会员信息" is-link > <van-cell @click="onCellTap('{:U('home/User/vipCard')}')" class="center_bottom_cell" title-class="text_14_400 color_333333 center_bottom_cell_text" title="会员信息" is-link >
<template #icon> <template #icon>
<van-icon name="__THEME__/img/membership.png" size="24"></van-icon> <van-icon name="__THEME__/img/membership.png" size="24"></van-icon>
</template> </template>
...@@ -446,6 +446,9 @@ ...@@ -446,6 +446,9 @@
methods: { methods: {
onChange: function(tab) { onChange: function(tab) {
},
onCellTap: function(url) {
window.location.href = url
} }
} }
}) })
......
apps/home/Tpl/default/UserShow/index_w3g.html
<include file="__THEME__/public_header_w3g"/> <include file="__THEME__/public_header_w3g" />
<link rel="stylesheet" href="__APP__/css/userShowIndex.css"> <!-- <link rel="stylesheet" href="__APP__/css/userShowIndex.css">
<style media="screen"> <style media="screen">
.bot_box #con_num, .bot_box img,.bot_box div{ .bot_box #con_num, .bot_box img,.bot_box div{
display: none; display: none;
} }
</style> -->
<style type="text/css">
body {
padding: 0 !important;
}
.van-cell__title {
display: flex;
align-items: center;
}
.van-cell__title {
display: flex;
align-items: center;
}
.van-cell__value[content-container] {
display: flex;
flex-direction: row-reverse;
}
.van-cell[avatar-container] {
align-items: center;
}
.van-cell[content-container]::after {
right: 1rem;
}
.edit_popup_overlay {
display: flex;
justify-content: center;
}
.edit_popup_content_container {
align-self: center;
width: 80%;
overflow: hidden;
border-radius: 0.625rem;
background: #fff;
position: relative;
}
.edit_popup_close_icon {
position: absolute;
top: 1.25rem;
right: 1.25rem;
}
.edit_popup_title_text {
margin-top: 0.9375rem;
}
.edit_popup_input_content {
align-self: center;
margin-top: 1.5rem;
background: #f3f3f3;
border-radius: 0.375rem;
width: 90% !important;
}
.edit_popup_confirm_button {
height: 2.75rem;
margin-top: 2.75rem;
border-radius: 0px 0px 0.625rem 0.625rem;
background: #A3E460;
}
.edit_popup_content_holder {
box-sizing: border-box;
}
</style> </style>
<!-- 新的 --> <div id="app">
<div class="my-info-imgTop"> <div content-container class="layout_v">
<div class="my-info-min"> <van-cell avatar-container title="头像" is-link>
<div> <slot>
<img class="my-info-headImg" src="{:getUserFace($user['uid'],'b')}" alt="{:getUserName($user['uid'])}"> <van-uploader result-type="file" :after-read="onRead">
<van-image @error="onError" height="44" width="44" fit="cover" round :src="currentAvatar" />
</van-uploader>
</slot>
</van-cell>
<van-cell @click="onNickName" title="昵称" is-link :value="currentNickName"></van-cell>
<van-cell @click="onGender" title="性别" is-link :value="currentGender"></van-cell>
<van-cell @click="onAddress" title="收货信息" is-link></van-cell>
<div @click="onConfirm" class="confirm_button" style="margin-top: 7.125rem;">
<span>确认修改</span>
</div> </div>
<div class="my-info-column">
<h3 class="my-info-name">{:getUserName($user['uid'])}</h3>
<p class="my-info-brief">
<if condition="$user['intro']">
{:mStr(t($user['intro']),15)}
<else/>
这个人不懒，什么都没留下。。
</if></p>
<?php $credits = getUserCredit($userid);?>
<?php $tmp = getFollowCount(array($userid));?>
<div class="my-info-right" style="height: 36px;">
<php>if($_GET['uid'] == $_SESSION['mid']){</php>
<div class="signIn">
<img src="__APP__/icon/homePage/signIn.png" alt="">
{:W('CheckIn', array('tpl'=>'zy'))}
</div> </div>
<!-- <div class="collar">
<img src="__APP__/icon/homePage/integral.png" alt=""> <van-overlay class="edit_popup_overlay" :show="show">
<p>领积分</p> <div class="layout_v edit_popup_content_holder edit_popup_content_container">
</div> --> <div class="text_18_600 layout_h_c edit_popup_title_text">修改昵称</div>
<php>}</php> <van-icon @click="show = false" class="edit_popup_close_icon" size="16" name="__THEME__/img/guanbi@2x.png" ></van-icon>
<van-field
class="edit_popup_input_content"
v-model="value"
clearable >
</van-field>
<div @click="onEditConfirm" class="layout_h_c edit_popup_confirm_button">
<span class="text_16_400 self_center color_white">确定</span>
</div> </div>
</div> </div>
</van-overlay>
<van-popup
v-model="innerShow"
:style="{ background: 'transparent' }"
@close="onPopupClose"
position="bottom">
<div class="layout_v">
<div @click="onChooseGender(1)" class="text_apple popup_top_button">男</div>
<div @click="onChooseGender(0)" class="text_apple popup_bottom_button">女</div>
<div @click="onGenderCancel" class="text_apple popup_cancel">取消</div>
</div> </div>
<div class="my-info-three">
</van-popup>
</div>
<!-- <div class="my-info-three">
<div class="my-info-threeMin"> <div class="my-info-threeMin">
<div> <div>
<h3 class="my-info-num">{$user['credit_user']}</h3> <h3 class="my-info-num">{$user['credit_user']}</h3>
...@@ -74,8 +166,8 @@ ...@@ -74,8 +166,8 @@
</p> </p>
</div> </div>
</div> </div>
</div> </div> -->
<dl class="my-data-list"> <!-- <dl class="my-data-list">
<dd> <dd>
<div class="leftColor"> <div class="leftColor">
<div class="textColor"> <div class="textColor">
...@@ -116,9 +208,9 @@ ...@@ -116,9 +208,9 @@
<i class="icon icon-youjiantou"></i> <i class="icon icon-youjiantou"></i>
</div> </div>
</dd> </dd>
<?php $tmp = getFollowCount(array($userid));?>
</dl> </dl> -->
<div class="my-course"> <!-- <div class="my-course">
<h3 class="my-course-title">我的点播 <a href="{:U('home/UserShow/course',array('uid'=>$userid))}">更多</a></h3> <h3 class="my-course-title">我的点播 <a href="{:U('home/UserShow/course',array('uid'=>$userid))}">更多</a></h3>
<div class="my-course-content"> <div class="my-course-content">
<if condition="$video_data['data']"> <if condition="$video_data['data']">
...@@ -132,7 +224,7 @@ ...@@ -132,7 +224,7 @@
<div class="my-course-text"> <div class="my-course-text">
<h3 class="my-course-name">{:mStr(t($dtt['video_title']),12)}</h3> <h3 class="my-course-name">{:mStr(t($dtt['video_title']),12)}</h3>
<div class="my-spw"> <div class="my-spw">
<p><span>￥{$dtt['t_price']}</span><!-- <em>￥{$dtt['v_price']}</em> --></p> <p><span>￥{$dtt['t_price']}</span></p>
<p><php>if($marketConf['order_switch']){</php>{$dtt['video_order_count_mark']}<php>}else{</php>{$dtt['video_order_count']}<php>}</php>人已购买</p> <p><php>if($marketConf['order_switch']){</php>{$dtt['video_order_count_mark']}<php>}else{</php>{$dtt['video_order_count']}<php>}</php>人已购买</p>
</div> </div>
</div> </div>
...@@ -143,8 +235,8 @@ ...@@ -143,8 +235,8 @@
<include file="__THEME__/no_data_w3g" /> <include file="__THEME__/no_data_w3g" />
</if> </if>
</div> </div>
</div> </div> -->
<div class="my-course"> <!-- <div class="my-course">
<h3 class="my-course-title">我的直播 <a href="{:U('home/UserShow/live',array('uid'=>$userid))}">更多</a></h3> <h3 class="my-course-title">我的直播 <a href="{:U('home/UserShow/live',array('uid'=>$userid))}">更多</a></h3>
<div class="my-course-content"> <div class="my-course-content">
<if condition="$live_data['data']"> <if condition="$live_data['data']">
...@@ -158,7 +250,7 @@ ...@@ -158,7 +250,7 @@
<div class="my-course-text"> <div class="my-course-text">
<h3 class="my-course-name">{:mStr(t($dtt['video_title']),12)}</h3> <h3 class="my-course-name">{:mStr(t($dtt['video_title']),12)}</h3>
<div class="my-spw"> <div class="my-spw">
<p><span>￥{$dtt['t_price']}</span> <!-- <em>￥96</em> --></p> <p><span>￥{$dtt['t_price']}</span></p>
<p><php>if($marketConf['order_switch']){</php>{$dtt['video_order_count_mark']}<php>}else{</php>{$dtt['video_order_count']}<php>}</php>已购买</p> <p><php>if($marketConf['order_switch']){</php>{$dtt['video_order_count_mark']}<php>}else{</php>{$dtt['video_order_count']}<php>}</php>已购买</p>
</div> </div>
</div> </div>
...@@ -169,22 +261,142 @@ ...@@ -169,22 +261,142 @@
<include file="__THEME__/no_data_w3g" /> <include file="__THEME__/no_data_w3g" />
</if> </if>
</div> </div>
</div> </div> -->
</div> </div>
<script> <script type="text/javascript">
var _ifpcorh5=true; // var _ifpcorh5=true;
function setCreditScore(num){ // function setCreditScore(num){
if(!num) return ; // if(!num) return ;
// setTimeout(function(){
// var val = parseInt($('#setCreditScore').text());
// $('#setCreditScore').text(val+num);
// }, 2000);
// }
new Vue({
el: '#app',
data: function() {
return {
show: false,
innerShow: false,
value: "",
savedUrl: "",
currentAvatar: "{:getUserFace($user['uid'],'b')}",
currentNickName: "{:getUserName($user['uid'])}",
currentGender: "{$user['sex'] ==1 ? 男 : 女}"
}
},
methods: {
onConfirm: function() {
let that = this
if (that.currentNickName.length == 0) {
ui.error('昵称必须要填写')
return
}
if (!/^[\u4E00-\u9FA5\w]{1,}$/.test(that.currentNickName)) {
ui.error('昵称仅支持中英文、数字、下划线')
return
}
if(that.savedUrl.length > 0) {
that.saveAvatar(this.saveInfo)
} else {
that.saveInfo()
}
},
saveInfo: function() {
$.post(U('home/User/saveUser'), {
uname: this.currentNickName,
sex: this.currentGender == "男" ? 1 : 2,
province: '四川省',
city: "成都市",
area: "高新区"
}, function(data) {
if (data.status) {
ui.success('基本信息更改成功')
} else {
ui.error(data.info)
}
}, 'json')
},
saveAvatar: function(call) {
let that = this
$.ajax({
type: "POST",
url: "{:U('basic/Account/doSaveAvatar',array('step'=>'save'))}",
data: "picurl=" + that.savedUrl + "&picwidth=" + 300 + "&x1=" + 300 + "&y1=" + 300 + "&x2=" + 300 + "&y2=" + 300 + "&w=" + 300 + "&h=" + 300,
async: false,
dataType: "text",
success: function (data) {
if (data) {
call && call()
} else {
ui.error('头像修改失败');
}
}
})
},
onRead: function(r) {
let that = this
let formData = new FormData()
formData.append('file', r.file)
let url = U('widget/Upload/save') + '&attach_type=avatar&upload_type=image&thumb=1&width=44&height=44&cut=false'
$.ajax({
url: url,
type: "post",
data: formData,
contentType: false,
processData: false,
success: function(res) {
let result = JSON.parse(res)
if(result.status == 1) {
that.savedUrl = result.data.save_path + result.data.save_name
that.currentAvatar = result.data.src
} else {
ui.error('上传失败')
}
},
error: function(data) {
ui.error('上传失败')
}
})
},
onNickName: function() {
this.value = this.currentNickName
this.show = true
},
onGender: function() {
this.innerShow = true
},
onChooseGender: function(id) {
this.currentGender = id == 1 ? '男' : '女',
this.innerShow = false
},
onGenderCancel: function() {
this.innerShow = false
},
onAddress: function() {
window.location.href = "{:U('home/User/address')}"
},
onEditConfirm: function() {
this.currentNickName = this.value
this.show = false
},
onPopupClose: function() {
setTimeout(function(){ },
var val = parseInt($('#setCreditScore').text()); onError: function() {
$('#setCreditScore').text(val+num);
}, 2000);
},
} }
})
</script> </script>
<include file="__THEME__/public_footer_w3g"/> <include file="__THEME__/public_footer_w3g" />
apps/mall/Tpl/default/Goods/index_w3g.html
<include file="__THEME__/public_header_w3g"/> <include file="__THEME__/public_header_w3g"/>
<!-- <style>
<style>
.maskbox{position:fixed;left:0;top:100px;width:100%;height:100%;z-index:99;display:none} .maskbox{position:fixed;left:0;top:100px;width:100%;height:100%;z-index:99;display:none}
.one-nav-layer{width:100%;overflow:hidden;background-color:#fff;padding-bottom:20px;overflow-y:auto;height:246px;position:relative} .one-nav-layer{width:100%;overflow:hidden;background-color:#fff;padding-bottom:20px;overflow-y:auto;height:246px;position:relative}
.one-nav-layer ul{float:left;width:33%;line-height:40px} .one-nav-layer ul{float:left;width:33%;line-height:40px}
...@@ -15,8 +14,64 @@ ...@@ -15,8 +14,64 @@
.malllist .info .num{font-size:13px;line-height:13px} .malllist .info .num{font-size:13px;line-height:13px}
.malllist .info .num:nth-child(2){font-size:12px} .malllist .info .num:nth-child(2){font-size:12px}
</style> </style>
<div class="maskbox"></div> <div class="maskbox"></div> -->
<div class="body"> <style>
body {
padding: 0 !important;
}
</style>
<div id="app" style="height: 100%;">
<div class="layout_v">
<van-sticky>
<div class="tabs_container">
<div @click="onTab(idx)" v-for="(opt, idx) in options" :key="idx" :class="idx == tab ? 'tab_item_selected' : 'tab_item_normal'">
<span>{{opt.title}}</span>
</div>
</div>
</van-sticky>
<van-list
v-model="loading"
:finished="finished"
finished-text="没有更多了"
@load="onLoad">
<template v-if="tab == 2">
<volist name="listData" id="vo">
<!-- <li style="width: 48%;margin:6px 1% 0">
<a href="{:U("mall/Goods/view",array('id'=>$vo['goods_id']))}">
<img src="{:getCover($vo['cover_ids'],360,360)}" class="lazyloading" alt="{$vo.title}" />
<h3>{$vo.title}</h3>
<div class="info">
<div class="num"><span><if condition="in_array('credpay',$payConfig['pay'])">{$vo.price}积分<else/>￥{$vo['price']/$sple_score}</if></span></div>
<div class="num" style="float:right;">库存:{$vo.stock}</div>
</div>
</a>
</li> -->
<a href="{:U('mall/Goods/view',array('id'=>$vo['goods_id']))}" v-for="(item, idx) in options[2].items" :key="idx" class="home_item_goods layout_h">
<van-image
style="margin-right: 0.75rem;"
height="68"
width="128"
fit="cover"
src="{:getCover($vo['cover_ids'],360,360)}">
</van-image>
<div class="weight_full layout_v">
<span class="text_14_600 color_333333 van-multi-ellipsis--l2">{$vo.title}</span>
<div class="layout_h_b" style="margin-top: 0.5rem;">
<span class="text_14_600 color_FF3B3B self_center">¥{$vo.price}</span>
<div class="item_green_button">购买</div>
</div>
</div>
</a>
</volist>
</template>
</van-list>
</div>
</div>
<!-- <div class="maskbox"></div> -->
<!-- <div class="body">
<ul class="selectul"> <ul class="selectul">
<li class="r02 border_sx" name="list_dl" style="width: 50%"> <li class="r02 border_sx" name="list_dl" style="width: 50%">
...@@ -84,12 +139,10 @@ ...@@ -84,12 +139,10 @@
<a href="{:U("mall/Goods/view",array('id'=>$vo['goods_id']))}"> <a href="{:U("mall/Goods/view",array('id'=>$vo['goods_id']))}">
<img src="{:getCover($vo['cover_ids'],360,360)}" class="lazyloading" alt="{$vo.title}" /> <img src="{:getCover($vo['cover_ids'],360,360)}" class="lazyloading" alt="{$vo.title}" />
<h3>{$vo.title}</h3> <h3>{$vo.title}</h3>
<!--<p>{$vo.info|msubstr=0,10, 'utf-8',true}</p>-->
<div class="info"> <div class="info">
<div class="num"><span><if condition="in_array('credpay',$payConfig['pay'])">{$vo.price}积分<else/>￥{$vo['price']/$sple_score}</if></span></div> <div class="num"><span><if condition="in_array('credpay',$payConfig['pay'])">{$vo.price}积分<else/>￥{$vo['price']/$sple_score}</if></span></div>
<div class="num" style="float:right;">库存:{$vo.stock}</div> <div class="num" style="float:right;">库存:{$vo.stock}</div>
</div> </div>
<!--<div class="places">剩余<span>{$vo.stock}</span>名额</div>-->
</a> </a>
</li> </li>
</volist> </volist>
...@@ -101,28 +154,76 @@ ...@@ -101,28 +154,76 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div> -->
<script> <script>
/*确定点击*/
(function () {
$(".bd").on("click",".one-nav-layer ul li a",function () {
$(this).parent().parent().children().children().attr("type","");
$(this).attr("type","chick"); new Vue({
}); el: '#app',
data: function() {
return {
tab: 0,
loading: false,
finished: false,
options: [{
title: '视频',
items: [1,2],
page: 1,
},{
title: '真题',
items: [1,2],
page: 1,
},{
title: '实物',
items: [1,2],
page: 1,
}]
}
},
created:function(){
document.title = "商城"
},
computed: {
$(".bd").on("click",".one-nav-layer [type=button]",function(){ },
var typedata=[]; methods: {
for (var i=0;i<$("[type=chick]").length;i++){ onTab: function(idx) {
typedata[i]=$($("[type=chick]")[i]).attr("uid") this.tab = idx
},
onLoad: function() {
$.ajax({
type: "GET",
url: "{:U('mall/Goods/index')}",
data: "p=" + 1 +
"&sort_type={$_GET['sort_type']}&cateId={$_GET['cateId']}",
dataType: "json",
success: function (data) {
console.log(data)
}
})
} }
/*typedata 为uid 分类识别凭证*/ }
/* 请求处理程序..*/ })
/*确定点击*/
// $(function () {
// $(".bd").on("click",".one-nav-layer ul li a",function () {
// $(this).parent().parent().children().children().attr("type","");
// $(this).attr("type","chick");
// });
}); // $(".bd").on("click",".one-nav-layer [type=button]",function(){
})(); // var typedata=[];
// for (var i=0;i<$("[type=chick]").length;i++){
// typedata[i]=$($("[type=chick]")[i]).attr("uid")
// }
// /*typedata 为uid 分类识别凭证*/
// /* 请求处理程序..*/
// });
// })();
$(function(){ $(function(){
$(".hd").click(function(){ $(".hd").click(function(){
...@@ -188,6 +289,7 @@ ...@@ -188,6 +289,7 @@
} }
window.location.href = getRequestUrl(type,value,baseUrl); window.location.href = getRequestUrl(type,value,baseUrl);
}); });
function getRequestUrl(field,value,baseUrl){ function getRequestUrl(field,value,baseUrl){
//匹配是否有该参数 //匹配是否有该参数
var reg = new RegExp("(^|&)" + field + "=([^&]*)(&|$)", "i"); var reg = new RegExp("(^|&)" + field + "=([^&]*)(&|$)", "i");
......
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