最新版本2.0

lihan
PersonCenter/PersonCenter.html
PersonCenter/topus.html
hopeaddress.html
js/order.js
order.html
share.html
--- a/PersonCenter/PersonCenter.html
查看文件 @9187fb8
+++ b/PersonCenter/PersonCenter.html
查看文件 @9187fb8
@@ -59,7 +59,7 @@
 					<p>我的优惠券</p>
 					<span>&gt;</span>
 				</div>
-				<div class="menu_item">
+				<div class="menu_item liwu">
 					<i class="iconfont icon-liwu"></i>
 					<p>分享有礼</p>
 					<span>&gt;</span>
@@ -125,6 +125,11 @@
 				window.location.href = "{:U('Template/discount')}";
 			}
+            var liwu = document.getElementsByClassName('liwu')[0];
+            liwu.onclick = function() {
+                window.location.href = "{:U('SceneQrCode/index')}";
+            }
+
 			//待支付，制作中等跳转页面
 			var pend_make = document.getElementsByClassName('pend_make')[0];
 			var pend_pay = document.getElementsByClassName('pend_pay')[0];
--- a/PersonCenter/topus.html
查看文件 @9187fb8
+++ b/PersonCenter/topus.html
查看文件 @9187fb8
@@ -2,11 +2,10 @@
 <html>
 	<head>
 		<meta charset="UTF-8">
-		<meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests" />
+		<!--<meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests" />-->
 		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
 		<link rel="stylesheet" type="text/css" href="/themes/simplebootx/Portal/Template/css/swiper-3.4.2.min.css" />
 		<link rel="stylesheet" type="text/css" href="/themes/simplebootx/Portal/Template/css/init.css" />
-		<link rel="stylesheet" type="text/css" href="http://at.alicdn.com/t/font_647640_n3cow34ja3gzaor.css" />
 		<link rel="stylesheet" type="text/css" href="/themes/simplebootx/Portal/Template/css/PersonCenter/topus.css" />
 		<script src="/themes/simplebootx/Portal/Template/js/base.js" type="text/javascript" charset="utf-8"></script>
 		<script src="http://res.wx.qq.com/open/js/jweixin-1.2.0.js"></script>
@@ -145,7 +144,7 @@
 		<script>
             wx.config({
-                debug: true, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
+                debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
                 appId: '{$sdk.appId}', // 必填，公众号的唯一标识
                 timestamp: '{$sdk.timestamp}', // 必填，生成签名的时间戳
                 nonceStr: '{$sdk.nonceStr}', // 必填，生成签名的随机串
--- a/hopeaddress.html
查看文件 @9187fb8
+++ b/hopeaddress.html
查看文件 @9187fb8
@@ -4,16 +4,15 @@
 	<head>
 		<meta charset="UTF-8">
 		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
-		<link rel="stylesheet" type="text/css" href="css/swiper-3.4.2.min.css" />
-		<link rel="stylesheet" type="text/css" href="css/init.css" />
-		<link rel="stylesheet" type="text/css" href="http://at.alicdn.com/t/font_647640_to180rktm1butyb9.css" />
-		<link rel="stylesheet" type="text/css" href="css/hopeaddress.css" />
+		<link rel="stylesheet" type="text/css" href="/themes/simplebootx/Portal/Template/css/swiper-3.4.2.min.css" />
+		<link rel="stylesheet" type="text/css" href="/themes/simplebootx/Portal/Template/css/init.css" />
+		<link rel="stylesheet" type="text/css" href="/themes/simplebootx/Portal/Template/css/hopeaddress.css" />
-		<link rel="stylesheet" type="text/css" href="css/demo.css" />
+		<link rel="stylesheet" type="text/css" href="/themes/simplebootx/Portal/Template/css/demo.css" />
-		<script src="js/base.js" type="text/javascript" charset="utf-8"></script>
+		<script src="/themes/simplebootx/Portal/Template/js/base.js" type="text/javascript" charset="utf-8"></script>
 		<title>期望地址</title>
 		<style>
 			*{padding:0;margin:0;}
@@ -52,33 +51,16 @@
 				<div class="question_item_wrap">
 					<p class="question_text">请写出您最方便的提货地点，下一个自提点很快就在您的公司楼下，家门口或你上班路过的十字路口。</p>
 					<div class="question_answer_arr">
-						<!--<span class="question_answer_item">省 &gt;<span></span></span>
-						<span class="question_answer_item">市 &gt;<span></span></span>
-						<span class="question_answer_street"><p>区县</p> &gt;</span>
-						<span class="question_answer_street"><p>街道</p> &gt;</span>
-						<input class="question_answer_item_details" placeholder="详细地址"></input>-->
-						<!--<div class="question_answer_item">
-							<select name="state" id="state" class="state pickout" placeholder="省">
-							<option value="pe" :id="item.province_id" v-for="item in province">{{item.province_name}}</option>
-							
-						</select>
-						</div>-->
-
 						<select class="question_answer_item" :value="'省'"  v-on:change="selectcity($event.target)"  style="font-size:0.26rem;border:none;outline:none;width:1.6rem;" v-model="proce">
-							<!--<option value="" style="font-size:0.26rem">省</option>-->
 							<option value="" style="font-size:0.26rem" v-for="item in province" :value="item">{{item.province_name}}</option>
 						</select>
-
 						<select class="question_answer_item" v-on:change="selectcounty($event.target)" style="font-size:0.26rem;border:none;outline:none;width:1.6rem;" v-model="ci">
-							<!--<option value="" style="font-size:0.26rem">市</option>-->
 							<option :value="item" style="font-size:0.26rem" v-for="item in city">{{item.city_name}}</option>
 						</select>
 						<select class="question_answer_item" v-on:change="selectstreet($event.target)" style="font-size:0.26rem;border:none;outline:none;width:1.6rem;" v-model="coun">
-							<!--<option value="" style="font-size:0.26rem">区</option>-->
 							<option style="font-size:0.26rem" :value="item" v-for="item in county">{{item.county_name}}</option>
 						</select>
 						<select class="question_answer_item" style="font-size:0.26rem;border:none;outline:none;width:1.6rem;" v-on:change="select($event.target)" v-model="stre">
-							<!--<option value="" style="font-size:0.26rem">街道</option>-->
 							<option :value="item" style="font-size:0.26rem" v-for="item in street">{{item.town_name}}</option>
 						</select>
 						<input class="question_answer_item_details" v-model="detailaddress" placeholder="详细地址">
@@ -90,32 +72,12 @@
 			</div>
 		</div>
-		<script src="js/vue.min.js" type="text/javascript" charset="utf-8"></script>
-		<script src="js/jquery.min.js" type="text/javascript" charset="utf-8"></script>
-		<script src="js/swiper-3.4.2.jquery.min.js" type="text/javascript" charset="utf-8"></script>
-		<script src="js/pickout.js"></script>
-		<script src="js/hopeaddress.js"></script>
+		<script src="/themes/simplebootx/Portal/Template/js/vue.min.js" type="text/javascript" charset="utf-8"></script>
+		<script src="/themes/simplebootx/Portal/Template/js/jquery.min.js" type="text/javascript" charset="utf-8"></script>
+		<script src="/themes/simplebootx/Portal/Template/js/swiper-3.4.2.jquery.min.js" type="text/javascript" charset="utf-8"></script>
+		<script src="/themes/simplebootx/Portal/Template/js/pickout.js"></script>
+		<script src="/themes/simplebootx/Portal/Template/js/hopeaddress.js"></script>
-<script>
-
-	// Preparar o select
-	//pickout.to('.pickout');
-//	pickout.to({
-//		el:'.city',
-//		theme: 'dark', 
-//		search: true
-//	});
-	pickout.to({
-		el:'.state',
-		theme: 'clean',
-	});
-
-	// Caso o valor já venha do servidor, já atribui a seleção automaticamente
-//	pickout.updated('.city');
-	
-</script>
-	    
-	    
 	</body>
 </html>
--- a/js/order.js
查看文件 @9187fb8
+++ b/js/order.js
查看文件 @9187fb8
@@ -251,7 +251,7 @@ new Vue({
 		hopeaddress:function(){
 			window.event.stopPropagation();
-			window.location.href=linkPath+'/hopeaddress.html';
+			window.location.href="/index.php/Portal/Template/hopeaddress";
 		},
 		//微信支付或余额支付
 		wexinpay:function(){
--- a/order.html
查看文件 @9187fb8
+++ b/order.html
查看文件 @9187fb8
@@ -5,8 +5,6 @@
 		<meta charset="UTF-8">
 		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
 		<link rel="stylesheet" type="text/css" href="/themes/simplebootx/Portal/Template/css/swiper-3.4.2.min.css" />
-		<meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests" />
-		<link rel="stylesheet" type="text/css" href="http://at.alicdn.com/t/font_647640_rgou3w6dip.css" />
 		<link rel="stylesheet" type="text/css" href="/themes/simplebootx/Portal/Template/css/order.css" />
 		<script src="/themes/simplebootx/Portal/Template/js/base.js" type="text/javascript" charset="utf-8"></script>
--- a/share.html 0 → 100644
查看文件 @9187fb8
+++ b/share.html 0 → 100644
查看文件 @9187fb8
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
+    <link rel="stylesheet" type="text/css" href="/themes/simplebootx/Portal/Template/css/swiper-3.4.2.min.css" />
+    <link rel="stylesheet" type="text/css" href="/themes/simplebootx/Portal/Template/css/init.css" />
+    <link rel="stylesheet" type="text/css" href="http://at.alicdn.com/t/font_647640_to180rktm1butyb9.css" />
+    <link rel="stylesheet" type="text/css" href="/themes/simplebootx/Portal/Template/css/about.css" />
+    <script src="/themes/simplebootx/Portal/Template/js/base.js" type="text/javascript" charset="utf-8"></script>
+    <title>分享有礼</title>
+</head>
+
+<body>
+<div class="container" id="aboutus">
+    <!--banner-->
+    <div class="about_banner">
+        <!--<img src="img/矩形10@2x.png" />-->
+        <img :src="about.thumb" />
+    </div>
+    <!--文字-->
+    <div class="about_text">
+        <h1>{{about.post_title}}</h1>
+        <div v-html="about.post_content">
+            <!--<p>胡辣汤由多种天然中草药按比例配制的汤料再加入胡椒和辣椒又用骨头汤做底料的胡辣汤，其特点是汤味浓郁、汤色靓丽、汤汁粘稠，香辣可口，十分适合配合其它早点进餐。
+            </p>
+            <p>目前，已经发展成为河南及陕西等周边省份都喜爱和知晓的小吃之一。
+            </p>
+            <p>是中国河南的特色汤类食品，后传入陕西，被大家所喜爱，常作为早餐，其特点是麻辣鲜香，营养开胃，适合搭配油条、包子、葱油饼、锅盔，千层饼等面点。
+            </p>
+            <p>可与豆腐脑约1:1混合，称为“两掺”，降低了麻辣程度，不仅卖相更好看了，而且也很受欢迎。</p>-->
+        </div>
+
+    </div>
+    <!--<div class="edit">
+        文本编辑区
+    </div>-->
+</div>
+
+<script src="/themes/simplebootx/Portal/Template/js/vue.min.js" type="text/javascript" charset="utf-8"></script>
+<script src="/themes/simplebootx/Portal/Template/js/jquery.min.js" type="text/javascript" charset="utf-8"></script>
+<script src="/themes/simplebootx/Portal/Template/js/cookie.js" type="text/javascript" charset="utf-8"></script>
+<script src="/themes/simplebootx/Portal/Template/js/swiper-3.4.2.jquery.min.js" type="text/javascript" charset="utf-8"></script>
+<script src="/themes/simplebootx/Portal/Template/js/aboutus.js" type="text/javascript" charset="utf-8"></script>
+</body>
+
+</html>