anyv / xkeasy · 提交

转到一个项目

作者 anyv
提交 574263b0f4d4817604a12a3dec96c3e3770b5f1f 1 个父辈 c514cf90

54

内嵌 并排对比
正在显示 7 个修改的文件 包含 43 行增加 和 7 行删除
... ... @@ -133,6 +133,7 @@ class IndexController extends WeChatBaseController
if($data_id['status_id'] == 2){
//业务员分享 添加老师
$my_user_phone = Db::name('my_user') -> where('id',$data_id['my_user_id']) -> find();
dump($my_user_phone);die;
$data_inser['status'] = 3;
$data_inser['uid'] = $uid;
$data_inser['inviter_phone'] = $my_user_phone['phone'];
... ...
... ... @@ -25,7 +25,7 @@
<!-- 内容 -->
<div class="ad_content">
<ul id="ad_contentUl">
<volist name="data" id="vo">
<!--<volist name="data" id="vo">
<li ontouchstart="fors()">
<div class="ad_conBox">
<div class="ad_con1">
... ... @@ -46,14 +46,49 @@
<div class="ad_move" ontouchstart="address_del({$vo.id})">删除</div>
</div>
</li>
</volist>-->
<volist name="data" id="vo">
<li>
<div id="" style="display: flex;justify-content: flex-start;align-items: center;">
<div style="width: 0.4rem;height: 0.4rem;margin-right: 0.25rem;" class="select_img">
<img src="__TMPL__/public/assets/images/39_0.png" style="width:100%;height: 100%;" />
</div>
<div class="contant" style="width: 6rem;">
<div class="ad_conBox">
<div class="ad_con1">
<p class="ad_conName">{$vo.name}</p>
<if condition="$vo.default_address eq 1">
<p class="ad_conMo" style="display:block;">默认</p>
<else/>
<p class="ad_conMo">默认</p>
</if>
<p class="ad_conPhone">{$vo.phone}</p>
<img class="ad_conImg" src="__TMPL__/public/assets/images/35.png" alt="">
</div>
</div>
<p class="ad_conAddress">收货地址：{$vo.region}{$vo.detailed}</p>
<div class="ad_MoRemove">
<div class="ad_mo" ontouchstart="set_default({$vo.id})">设为默认</div>
<div class="ad_move" ontouchstart="address_del({$vo.id})">删除</div>
</div>
</div>
</div>
</li>
</volist>
</ul>
</div>
<div id='btn' style="width: 1.5rem;height: 0.8rem;background:linear-gradient(344deg,rgba(255,78,0,1) 0%,rgba(255,157,45,1) 100%);border-radius: 0.025rem;text-align: center;line-height: 0.8rem;font-size: 0.3rem;color: #fff;margin: 0.5rem 0.5rem 0 auto;">确定</div>
</div>
<script src="__TMPL__/public/assets/js/base.js"></script>
<script src="__TMPL__/public/assets/js/address.js"></script>
<script src="__TMPL__/public/assets/js/address(1).js"></script>
<script src="__TMPL__/public/assets/js/jquery.js"></script>
<script>
$("#btn").click(function(){
console.log("确定成功")
})
</script>
<script>
function fors() {
console.log(111)
}
... ...
... ... @@ -37,7 +37,7 @@
<div class="order_adImg">
<img src="__TMPL__/public/assets/images/31.png" alt="">
</div>
<p class="order_addressGo">暂无默认收货地址，<a href="{:url('Personalcenter/shop_address')}">去添加</a></p>
<p class="order_addressGo">暂无默认收货地址，<a href="{:url('Orderpage/go_add_address')}">去添加</a></p>
</div>
<else/>
<div class="order_addressYes">
... ...
... ... @@ -43,7 +43,7 @@
<div class="order_adImg">
<img src="__TMPL__/public/assets/images/31.png" alt="">
</div>
<p class="order_addressGo">暂无默认收货地址，<a href="{:url('Personalcenter/shop_address')}">去添加</a></p>
<p class="order_addressGo">暂无默认收货地址，<a href="{:url('Orderpage/go_add_address')}">去添加</a></p>
</div>
<else/>
<div class="order_addressYes">
... ...
... ... @@ -33,7 +33,7 @@
<div class="log_top_co">
<!-- 顶部 -->
<div class=" order_top log_top_co">
<a href="javascript:history.back(-1)">
<a href="{:url('School/school')}">
<img src="__TMPL__/public/assets/images/left.png" alt="" />
</a>
<p>添加学校</p>
... ...
... ... @@ -16,7 +16,7 @@
<div class="log_top_co">
<!-- 顶部 -->
<div class=" order_top log_top_co">
<a href="javascript:history.back(-1)">
<a href="{:url('personalcenter/personal_center')}">
<img src="__TMPL__/public/assets/images/left.png" alt="" />
</a>
<p>学校管理</p>
... ...
... ... @@ -204,8 +204,8 @@ class WeChatBaseController extends BaseController
*/
public function checkWeChatUserLogin()
{
/*$user = Db::name('user')->where('id',2)->find();
cmf_update_current_user($user);*/
$user = Db::name('user')->where('id',2)->find();
cmf_update_current_user($user);
$userId = cmf_get_current_user_id();
if (empty($userId)) {
$config = [
... ...