Merge remote-tracking branch 'origin/master'

apps/basic/Lib/Action/PassportAction.class.php

@@ -514,7 +514,8 @@ class PassportAction extends CommonAction
         if ($res) {
         if ($res) {
             $this->mzError('此手机号已被注册,请更换！');
             $this->mzError('此手机号已被注册,请更换！');
         }
         }
-        $rnum    = rand(100000, 999900);
+//        $rnum    = rand(100000, 999900);
+        $rnum = 123456;
 //        $sendres = SmsService::send($phone,$rnum);
 //        $sendres = SmsService::send($phone,$rnum);
         $sendres = 1;
         $sendres = 1;
         if ($sendres) {
         if ($sendres) {

apps/basic/Lib/Action/SingleAction.class.php

@@ -47,8 +47,6 @@ class SingleAction extends CommonAction
                 $res = M('single')->where($map)->find();
                 $res = M('single')->where($map)->find();
             }
             }
         }
         }
-        var_dump($res);
-        di;
         $this->assign('data', $res);
         $this->assign('data', $res);
         $this->display();
         $this->display();
 
 

apps/basic/Tpl/default/Single/info_w3g.html

@@ -8,13 +8,14 @@
 
 
 <div id="app">
 <div id="app">
 	<div class="layout_v">
 	<div class="layout_v">
-
-		{$data.text}
-
+		<if condition="$data.text eq null">
 			<van-cell @click="onChangePwd" title="修改密码" is-link ></van-cell>
 			<van-cell @click="onChangePwd" title="修改密码" is-link ></van-cell>
 			<!--		<van-cell @click="onFeedback" title="意见反馈" is-link ></van-cell>-->
 			<!--		<van-cell @click="onFeedback" title="意见反馈" is-link ></van-cell>-->
 			<!--		<van-cell @click="onAboutUs" title="关于我们" is-link ></van-cell>-->
 			<!--		<van-cell @click="onAboutUs" title="关于我们" is-link ></van-cell>-->
 			<van-cell @click="onQuit" title="退出账号" is-link ></van-cell>
 			<van-cell @click="onQuit" title="退出账号" is-link ></van-cell>
+			<else/>
+			{$data.text}
+		</if>
 	</div>
 	</div>
 </div>
 </div>