anyv / xkeasy · 提交

转到一个项目

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

54

内嵌 并排对比
正在显示 7 个修改的文件 包含 43 行增加 和 7 行删除
@@ -133,6 +133,7 @@ class IndexController extends WeChatBaseController @@ -133,6 +133,7 @@ class IndexController extends WeChatBaseController
133 if($data_id['status_id'] == 2){ 133 if($data_id['status_id'] == 2){
134 //业务员分享 添加老师 134 //业务员分享 添加老师
135 $my_user_phone = Db::name('my_user') -> where('id',$data_id['my_user_id']) -> find(); 135 $my_user_phone = Db::name('my_user') -> where('id',$data_id['my_user_id']) -> find();
  136 + dump($my_user_phone);die;
136 $data_inser['status'] = 3; 137 $data_inser['status'] = 3;
137 $data_inser['uid'] = $uid; 138 $data_inser['uid'] = $uid;
138 $data_inser['inviter_phone'] = $my_user_phone['phone']; 139 $data_inser['inviter_phone'] = $my_user_phone['phone'];
@@ -25,7 +25,7 @@ @@ -25,7 +25,7 @@
25 <!-- 内容 --> 25 <!-- 内容 -->
26 <div class="ad_content"> 26 <div class="ad_content">
27 <ul id="ad_contentUl"> 27 <ul id="ad_contentUl">
28 - <volist name="data" id="vo"> 28 + <!--<volist name="data" id="vo">
29 <li ontouchstart="fors()"> 29 <li ontouchstart="fors()">
30 <div class="ad_conBox"> 30 <div class="ad_conBox">
31 <div class="ad_con1"> 31 <div class="ad_con1">
@@ -46,14 +46,49 @@ @@ -46,14 +46,49 @@
46 <div class="ad_move" ontouchstart="address_del({$vo.id})">删除</div> 46 <div class="ad_move" ontouchstart="address_del({$vo.id})">删除</div>
47 </div> 47 </div>
48 </li> 48 </li>
  49 + </volist>-->
  50 + <volist name="data" id="vo">
  51 + <li>
  52 + <div id="" style="display: flex;justify-content: flex-start;align-items: center;">
  53 + <div style="width: 0.4rem;height: 0.4rem;margin-right: 0.25rem;" class="select_img">
  54 + <img src="__TMPL__/public/assets/images/39_0.png" style="width:100%;height: 100%;" />
  55 + </div>
  56 + <div class="contant" style="width: 6rem;">
  57 + <div class="ad_conBox">
  58 + <div class="ad_con1">
  59 + <p class="ad_conName">{$vo.name}</p>
  60 + <if condition="$vo.default_address eq 1">
  61 + <p class="ad_conMo" style="display:block;">默认</p>
  62 + <else/>
  63 + <p class="ad_conMo">默认</p>
  64 + </if>
  65 + <p class="ad_conPhone">{$vo.phone}</p>
  66 + <img class="ad_conImg" src="__TMPL__/public/assets/images/35.png" alt="">
  67 + </div>
  68 + </div>
  69 + <p class="ad_conAddress">收货地址：{$vo.region}{$vo.detailed}</p>
  70 + <div class="ad_MoRemove">
  71 + <div class="ad_mo" ontouchstart="set_default({$vo.id})">设为默认</div>
  72 + <div class="ad_move" ontouchstart="address_del({$vo.id})">删除</div>
  73 + </div>
  74 + </div>
  75 + </div>
  76 + </li>
49 </volist> 77 </volist>
50 </ul> 78 </ul>
51 </div> 79 </div>
  80 + <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>
52 </div> 81 </div>
53 <script src="__TMPL__/public/assets/js/base.js"></script> 82 <script src="__TMPL__/public/assets/js/base.js"></script>
54 <script src="__TMPL__/public/assets/js/address.js"></script> 83 <script src="__TMPL__/public/assets/js/address.js"></script>
  84 +<script src="__TMPL__/public/assets/js/address(1).js"></script>
55 <script src="__TMPL__/public/assets/js/jquery.js"></script> 85 <script src="__TMPL__/public/assets/js/jquery.js"></script>
56 <script> 86 <script>
  87 + $("#btn").click(function(){
  88 + console.log("确定成功")
  89 + })
  90 +</script>
  91 +<script>
57 function fors() { 92 function fors() {
58 console.log(111) 93 console.log(111)
59 } 94 }
@@ -37,7 +37,7 @@ @@ -37,7 +37,7 @@
37 <div class="order_adImg"> 37 <div class="order_adImg">
38 <img src="__TMPL__/public/assets/images/31.png" alt=""> 38 <img src="__TMPL__/public/assets/images/31.png" alt="">
39 </div> 39 </div>
40 - <p class="order_addressGo">暂无默认收货地址，<a href="{:url('Personalcenter/shop_address')}">去添加</a></p> 40 + <p class="order_addressGo">暂无默认收货地址，<a href="{:url('Orderpage/go_add_address')}">去添加</a></p>
41 </div> 41 </div>
42 <else/> 42 <else/>
43 <div class="order_addressYes"> 43 <div class="order_addressYes">
@@ -43,7 +43,7 @@ @@ -43,7 +43,7 @@
43 <div class="order_adImg"> 43 <div class="order_adImg">
44 <img src="__TMPL__/public/assets/images/31.png" alt=""> 44 <img src="__TMPL__/public/assets/images/31.png" alt="">
45 </div> 45 </div>
46 - <p class="order_addressGo">暂无默认收货地址，<a href="{:url('Personalcenter/shop_address')}">去添加</a></p> 46 + <p class="order_addressGo">暂无默认收货地址，<a href="{:url('Orderpage/go_add_address')}">去添加</a></p>
47 </div> 47 </div>
48 <else/> 48 <else/>
49 <div class="order_addressYes"> 49 <div class="order_addressYes">
@@ -33,7 +33,7 @@ @@ -33,7 +33,7 @@
33 <div class="log_top_co"> 33 <div class="log_top_co">
34 <!-- 顶部 --> 34 <!-- 顶部 -->
35 <div class=" order_top log_top_co"> 35 <div class=" order_top log_top_co">
36 - <a href="javascript:history.back(-1)"> 36 + <a href="{:url('School/school')}">
37 <img src="__TMPL__/public/assets/images/left.png" alt="" /> 37 <img src="__TMPL__/public/assets/images/left.png" alt="" />
38 </a> 38 </a>
39 <p>添加学校</p> 39 <p>添加学校</p>
@@ -16,7 +16,7 @@ @@ -16,7 +16,7 @@
16 <div class="log_top_co"> 16 <div class="log_top_co">
17 <!-- 顶部 --> 17 <!-- 顶部 -->
18 <div class=" order_top log_top_co"> 18 <div class=" order_top log_top_co">
19 - <a href="javascript:history.back(-1)"> 19 + <a href="{:url('personalcenter/personal_center')}">
20 <img src="__TMPL__/public/assets/images/left.png" alt="" /> 20 <img src="__TMPL__/public/assets/images/left.png" alt="" />
21 </a> 21 </a>
22 <p>学校管理</p> 22 <p>学校管理</p>
@@ -204,8 +204,8 @@ class WeChatBaseController extends BaseController @@ -204,8 +204,8 @@ class WeChatBaseController extends BaseController
204 */ 204 */
205 public function checkWeChatUserLogin() 205 public function checkWeChatUserLogin()
206 { 206 {
207 - /*$user = Db::name('user')->where('id',2)->find();  
208 - cmf_update_current_user($user);*/ 207 + $user = Db::name('user')->where('id',2)->find();
  208 + cmf_update_current_user($user);
209 $userId = cmf_get_current_user_id(); 209 $userId = cmf_get_current_user_id();
210 if (empty($userId)) { 210 if (empty($userId)) {
211 $config = [ 211 $config = [