Merge remote-tracking branch 'origin/master'

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

@@ -47,6 +47,8 @@ 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,7 +8,13 @@
 
 
 <div id="app">
 <div id="app">
 	<div class="layout_v">
 	<div class="layout_v">
+
 		{$data.text}
 		{$data.text}
+
+		<van-cell @click="onChangePwd" 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="onQuit" title="退出账号" is-link ></van-cell>
 	</div>
 	</div>
 </div>
 </div>
 
 
@@ -25,7 +31,18 @@
 			document.title = "{$data.title}"
 			document.title = "{$data.title}"
 		},
 		},
 		methods: {
 		methods: {
+			onChangePwd: function() {
+				window.location.href = "{:U('home/User/changepsw')}"
+			},
+			onFeedback: function() {
 
 
+			},
+			onAboutUs: function() {
+
+			},
+			onQuit: function() {
+				logout()
+			}
 		}
 		}
 	})
 	})
 
 

apps/classroom/Tpl/default/Index/theme_x7_w3g.html

@@ -103,7 +103,7 @@
 									<if condition="$vo['price'] eq 0">免费
 									<if condition="$vo['price'] eq 0">免费
 										<else />¥{$vo['price']}</if>
 										<else />¥{$vo['price']}</if>
 								</span>
 								</span>
-								<van-image @click="onDownload({$vo})" src="__THEME__/img/down_load_icon.png" width="13" height="16">
+								<van-image @click="onDownload({$vo['is_buy']}, {$vo['price']}, '{$vo[attach]}')" src="__THEME__/img/down_load_icon.png" width="13" height="16">
 								</van-image>
 								</van-image>
 									</van-icon>
 									</van-icon>
 							</div>
 							</div>
@@ -175,8 +175,10 @@
 			onChange: function(tab) {
 			onChange: function(tab) {
 
 
 			},
 			},
-			onDownload: function (item) {
-				console.log(item);
+			onDownload: function (isBuy, price, path) {
+				if ( (isBuy || price == 0) && path ) {
+					window.location.href = path;
+				}
 			},
 			},
 			onPay: function(id) {
 			onPay: function(id) {
 				console.log("Id = " + id)
 				console.log("Id = " + id)