瀏覽代碼

Merge branch 'test' of git.oschina.net:yiguanjia/php into test

DengTao 8 年之前
父節點
當前提交
aaf5bd60d8

File diff suppressed because it is too large
+ 4 - 0
www/css/bootstrap-3.3.7.min.css


File diff suppressed because it is too large
+ 233 - 0
www/js/AngularJS v1.4.3.min.js


File diff suppressed because it is too large
+ 5 - 0
www/js/bootstrap-3.3.7.min.js


File diff suppressed because it is too large
+ 1 - 0
www/js/jquery-3.1.1.min.js


+ 1 - 1
www/protected/modules/common/controllers/ActivityController.php

@@ -31,7 +31,7 @@ class ActivityController extends O2oBaseController  {
     }
     }
     //扫码跳转11元订单页面,回掉微信接口,注册用户信息,然后生成订单
     //扫码跳转11元订单页面,回掉微信接口,注册用户信息,然后生成订单
     public function actionScanCoupon(){
     public function actionScanCoupon(){
-        echo "hello world";
+        $this->renderpartial('SinglesDay');
     }
     }
 
 
 
 

+ 127 - 0
www/protected/modules/common/views/activity/SinglesDay.php

@@ -0,0 +1,127 @@
+<!DOCTYPE html>
+<!--HTML5 doctype-->
+<html ng-app="myapp">
+<head>
+  <title>壹管家</title>
+  <meta http-equiv="Content-type" content="text/html; charset=utf-8">
+  <meta name="viewport"
+        content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no">
+  <meta name="apple-mobile-web-app-capable" content="yes">
+  <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"/>
+  <meta http-equiv="Pragma" content="no-cache">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <!--引入css文件-->
+  <link href="//cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
+  <link rel="stylesheet" href="<?php echo Yii::app()->request->baseUrl; ?>/css/bootstrap-3.3.7.min.css">
+  <!--引入js文件-->
+  <script src="<?php echo Yii::app()->request->baseUrl; ?>/js/jquery-3.1.1.min.js"></script>
+  <script src="<?php echo Yii::app()->request->baseUrl; ?>/js/AngularJS v1.4.3.min.js"></script>
+  <script src="<?php echo Yii::app()->request->baseUrl; ?>/js/bootstrap-3.3.7.min.js"></script>
+
+</head>
+<body ng-controller="myctrl">
+<div class="">
+  <img style="width: 100%"
+       src="http://odulvej8l.bkt.clouddn.com/%E6%B0%91%E5%AE%BF%E4%BF%9D%E6%B4%81%E8%AF%A6%E6%83%85%E9%A1%B5.jpg"
+       alt="">
+  <form action="<?php echo Yii::app()->request->baseUrl; ?>" method = 'post'  class="container  form-horizontal  ng-valid ng-dirty ng-valid-parse">
+    <div class="container">
+      <div class="form-group">
+        <label>姓名:</label>
+        <input type="text" class="form-control" placeholder="请输入您的姓名" ng-model="username">
+      </div>
+      <div class="form-group">
+        <label>手机号码:</label>
+        <input type="text" class="form-control"
+               placeholder="请输入您的手机号码" ng-model="phone"/>
+      </div>
+      <div class="form-group">
+        <label>选择区域:</label>
+        <select name="area" class="form-control" ng-model="Area" ng-init="Area=AreaList[5-1].id"
+                ng-options="info.id as info.name for info in AreaList" id="">
+          <option value="">--选择区域--</option>
+        </select>
+      </div>
+      <div class="form-group">
+        <label>地址:</label>
+        <input type="text" class="form-control" placeholder="请输入您的详细地址">
+      </div>
+      <div class="form-group">
+        <button class="btn btn-success col-xs-12"
+                data-container="body"
+                data-toggle="popover"
+                data-placement="top"
+                data-content="{{btnContent}}">
+          预约服务
+        </button>
+      </div>
+    </div>
+  </form>
+</div>
+
+
+<!--模态框-->
+<div class="model" style="width: 100%;position: fixed;top: 0;background: rgba(0,0,0,0.4)">
+ <!--错误提示容器-->
+  <div class="model-box"style="border-radius: 10px;height: 15%;display:none;width: 70%;background: #fff;margin: 0 auto;top:50%;left:15%;position: fixed;">
+    <div class="model-title" style="font-family: '微软雅黑', 'Microsoft YaHei', 'STHeiti Light';width: 100%;text-align: center;font-size: 2.2rem;margin-top: 5%;"></div>
+      <div class="model-content" style="font-family: '微软雅黑', 'Microsoft YaHei', 'STHeiti Light';margin: 0 auto;width: 80%;background: #007aff;font-size: 1.3rem;margin-top: 5%;color: #fff;text-align: center;padding: 5px 0 5px 0"></div>
+  </div>
+</div>
+</body>
+
+</html>
+<script>
+  var myapp = angular.module('myapp', []);
+  myapp.controller('myctrl', ['$scope', function ($scope) {
+
+    $('.model').on('click', function () {
+      $('.model').css('height', '0');
+      $('.model-box').css('display', 'none');
+    });
+
+    $('button').on('click', function () {
+      /*调用模态框*/
+      /*姓名输入错误*/
+      /*验证手机号码*/
+      if(!(/^1[34578]\d{9}$/.test($scope.phone))){
+        model('请重填','手机号码有误');
+        return false;
+      }
+      /*验证服务范围内*/
+      if ($scope.Area != 6) {
+        model('抱歉','您所在区域不再服务范围之内');
+        return false;
+      }
+      /*model*/
+      function model(title,content) {
+       /* title=null;
+        content=null;*/
+        $('.model-box').css('display','inline');
+        $('.model').height(window.screen.height);
+        $('.model-title').html(title);
+        $('.model-content').html(content);
+      }
+      console.log($('.model'));
+//      alert('测试');
+    });
+
+    $scope.AreaList = [
+      {'id': 1, 'name': '黄浦区', 'parent': 1, type: '2'},
+      {'id': 2, 'name': '徐汇区', 'parent': 1, type: '2'},
+      {'id': 3, 'name': '长宁区', 'parent': 1, type: '2'},
+      {'id': 4, 'name': '静安区', 'parent': 1, type: '2'},
+      {'id': 5, 'name': '普陀区', 'parent': 1, type: '2'},
+      {'id': 6, 'name': '虹口区', 'parent': 1, type: '2'},
+      {'id': 7, 'name': '杨浦区', 'parent': 1, type: '2'},
+      {'id': 8, 'name': '闵行区', 'parent': 1, type: '2'},
+      {'id': 9, 'name': '宝山区', 'parent': 1, type: '2'},
+      {'id': 10, 'name': '嘉定区', 'parent': 1, type: '2'},
+      {'id': 11, 'name': '浦东新区', 'parent': 1, type: '2'},
+      {'id': 12, 'name': '金山区', 'parent': 1, type: '2'},
+      {'id': 13, 'name': '松江区', 'parent': 1, type: '2'},
+      {'id': 14, 'name': '青浦区', 'parent': 1, type: '2'},
+      {'id': 15, 'name': '奉贤区', 'parent': 1, type: '2'}
+    ];
+  }])
+</script>

Some files were not shown because too many files changed in this diff