Domů Procházet Nápověda
Registrovat se Přihlásit se
yiguanjia
/
php
2
0
Rozštěpit 0
Soubory Úkoly 0 Pull Requesty 0 Wiki
Procházet zdrojové kódy

修改界面体验

洪海涛 před 8 roky
rodič
7c2011561e
revize
4c742dc1c5
11 změnil soubory, kde provedl 14 přidání a 18 odebrání
Rozdělené zobrazení Ukázat statistiku rozdílových dat
  1. 1 1
      www/protected/modules/o2o/controllers/OrderController.php
  2. 4 4
      www/protected/modules/o2o/views/advisory/SinglesDay.php
  3. 5 5
      www/protected/modules/o2o/views/advisory/enterprise.php
  4. 1 1
      www/webapp/common/js/bdmapapi.js
  5. 0 0
      www/webapp/o2o/dist/js/api.js
  6. 1 1
      www/webapp/o2o/dist/js/bdmapapi.js
  7. 0 0
      www/webapp/o2o/dist/js/main.js
  8. 0 0
      www/webapp/o2o/dist/js/page/home.js
  9. 1 1
      www/webapp/o2o/js/api.js
  10. 0 4
      www/webapp/o2o/js/build/template.js
  11. 1 1
      www/webapp/o2o/js/page/home.js

+ 1 - 1
www/protected/modules/o2o/controllers/OrderController.php
Zobrazit soubor 

@@ -45,7 +45,7 @@ class  OrderController extends O2oBaseController{
 
                     $t = ROrder::model()->get($value['_id']);
 
                     $t->delete();
 
                 } else {
 
-                    CommonFn::requestAjax(false, '对不起，你已经下过单');
 
+                    CommonFn::requestAjax(false, '对不起，双十一活动只能抢购一单，你已经抢购过');
 
                 }
 
             }

+ 4 - 4
www/protected/modules/o2o/views/advisory/SinglesDay.php
Zobrazit soubor 

@@ -77,16 +77,16 @@
 
         <div style="display: inline-block;max-width: 100%;margin-bottom: 5px;font-weight: 700;">性别:</div>
 
         <div>
 
           <label class="radio-inline">
 
-            <input type="radio" name="sex" value="男" ng-model="sex">先生
 
+            <input type="radio" name="sex" value="先生" ng-model="sex">先生
 
           </label>
 
           <label class="radio-inline">
 
-            <input type="radio" name="sex" value="女" ng-model="sex">女
 
+            <input type="radio" name="sex" value="女士" ng-model="sex">女士
 
           </label>
 
         </div>
 
       </div>
 
       <!--按钮-->
 
       <div class="form-group">
 
-        <a
 
+        <a id="SinglesDayBtn"
 
           style="background: rgb(42,36,0);color:rgb(178,143,0);border: 0"
 
           class="btn btn-success col-xs-12"
 
           data-container="body"
 
@@ -154,7 +154,7 @@
 
       }
 
     });
 
     /*表单提交进行判断*/
 
-    $('a').on('click', function () {
 
+    $('#SinglesDayBtn').on('click', function () {
 
         /*姓名是否为空*/
 
         if ($scope.username == undefined) {
 
           model('请重填', '确认您的姓名');

+ 5 - 5
www/protected/modules/o2o/views/advisory/enterprise.php
Zobrazit soubor 

@@ -24,7 +24,7 @@
 
   </script>
 
 </head>
 
 <body ng-controller="myctrl">
 
-<div class="">
 
+<div class="container" style="margin-top: 2rem">
 
   <form action="" method='post'
 
         class="container  form-horizontal  ng-valid ng-dirty ng-valid-parse" id='enterprise'
 
         style="margin-bottom: 15%; ">
 
@@ -61,16 +61,16 @@
 
         <div style="display: inline-block;max-width: 100%;margin-bottom: 5px;font-weight: 700;">性别:</div>
 
         <div>
 
           <label class="radio-inline">
 
-            <input type="radio" name="sex" value="男" ng-model="sex">男
 
+            <input type="radio" name="sex" value="先生" ng-model="sex">先生
 
           </label>
 
           <label class="radio-inline">
 
-            <input type="radio" name="sex" value="女" ng-model="sex">女
 
+            <input type="radio" name="sex" value="女士" ng-model="sex">女士
 
           </label>
 
         </div>
 
       </div>
 
       <!--按钮-->
 
       <div class="form-group">
 
-        <a
 
+        <a id="enterpriseBtn"
 
             style="background: rgb(42,36,0);color:rgb(178,143,0);border: 0"
 
             class="btn btn-success col-xs-12"
 
             data-container="body"
 
@@ -139,7 +139,7 @@
 
       }
 
     });
 
     /*表单提交进行判断*/
 
-    $('a').on('click', function () {
 
+    $('#enterpriseBtn').on('click', function () {
 
 
           /*姓名是否为空*/
 
           if ($scope.username == undefined) {

+ 1 - 1
www/webapp/common/js/bdmapapi.js
Zobrazit soubor 

@@ -22,7 +22,7 @@ define(['$','base'], function($, base) {
 
     var apiErrorResult = {
 
 
         success: false,
 
-        message: '加载哥遇到瓶颈再来一遍嘛 <(￣︶￣)>'
 
+        message: '当前页面加载失败，请您重新加载'
 
     };
 
 
     MapApi.prototype = {

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 0
www/webapp/o2o/dist/js/api.js


+ 1 - 1
www/webapp/o2o/dist/js/bdmapapi.js
Zobrazit soubor 

@@ -1 +1 @@
 
-define(["$","base"],function(e,t){var n={suggestion:"http://api.map.baidu.com/place/v2/suggestion",search:"http://api.map.baidu.com/place/v2/search",ak:"B349f0b32ef6e78b2e678f45cb9fddaf",output:"json",query:"",region:""},r=function(){if(typeof r.instance=="object")return r.instance;r.instance=this,this.isLoading=!1};r.prototype=new t;var i={success:!1,message:"加载哥遇到瓶颈再来一遍嘛 <(￣︶￣)>"};return r.prototype={getSuggestionList:function(t,r,s){var o=this;this.isLoading=!0,e.autoAjax({url:n.suggestion,data:{ak:n.ak,output:n.output,query:t,region:r},dataType:"JSON",success:function(e){o.isLoading=!1,s&&s(e)},error:function(e){o.isLoading=!1,s&&s(i)}})},getPlaceList:function(t,r,s){var o=this;this.isLoading=!0,e.autoAjax({url:n.search,data:{ak:n.ak,output:n.output,query:t,page_size:"10",page_num:"0",scope:"1",location:r,radius:"2000"},dataType:"JSON",success:function(e){o.isLoading=!1,s&&s(e)},error:function(e){o.isLoading=!1,s&&s(i)}})},getSearchList:function(t,r,s){var o=this;this.isLoading=!0,e.autoAjax({url:n.search,data:{ak:n.ak,output:n.output,q:t,region:r},dataType:"JSON",success:function(e){o.isLoading=!1,s&&s(e)},error:function(e){o.isLoading=!1,s&&s(i)}})}},new r});
 
+define(["$","base"],function(e,t){var n={suggestion:"http://api.map.baidu.com/place/v2/suggestion",search:"http://api.map.baidu.com/place/v2/search",ak:"B349f0b32ef6e78b2e678f45cb9fddaf",output:"json",query:"",region:""},r=function(){if(typeof r.instance=="object")return r.instance;r.instance=this,this.isLoading=!1};r.prototype=new t;var i={success:!1,message:"当前页面加载失败，请您重新加载"};return r.prototype={getSuggestionList:function(t,r,s){var o=this;this.isLoading=!0,e.autoAjax({url:n.suggestion,data:{ak:n.ak,output:n.output,query:t,region:r},dataType:"JSON",success:function(e){o.isLoading=!1,s&&s(e)},error:function(e){o.isLoading=!1,s&&s(i)}})},getPlaceList:function(t,r,s){var o=this;this.isLoading=!0,e.autoAjax({url:n.search,data:{ak:n.ak,output:n.output,query:t,page_size:"10",page_num:"0",scope:"1",location:r,radius:"2000"},dataType:"JSON",success:function(e){o.isLoading=!1,s&&s(e)},error:function(e){o.isLoading=!1,s&&s(i)}})},getSearchList:function(t,r,s){var o=this;this.isLoading=!0,e.autoAjax({url:n.search,data:{ak:n.ak,output:n.output,q:t,region:r},dataType:"JSON",success:function(e){o.isLoading=!1,s&&s(e)},error:function(e){o.isLoading=!1,s&&s(i)}})}},new r});

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 0
www/webapp/o2o/dist/js/main.js


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 0
www/webapp/o2o/dist/js/page/home.js


+ 1 - 1
www/webapp/o2o/js/api.js
Zobrazit soubor 

@@ -17,7 +17,7 @@ define(['config', 'base'], function (config, base) {
 
 
     var apiErrorResult = {
 
         success: false,
 
-        message: '加载哥遇到瓶颈再来一遍嘛 <(￣︶￣)>'
 
+        message: '网页加载失败，请您返回首页重新访问 <(￣︶￣)>'
 
     };
 
 
     //获取用户信息

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 4
www/webapp/o2o/js/build/template.js


+ 1 - 1
www/webapp/o2o/js/page/home.js
Zobrazit soubor 

@@ -354,7 +354,7 @@ define(['$', 'template', 'IScroll', 'product', 'user', 'native', 'config', 'addr
 
 						loop: true,
 
 						paginationClickable: true,
 
 						centeredSlides: true,
 
-						autoplay: 5000,
 
+						// autoplay: 5000,
 
 						autoplayDisableOnInteraction: false
 
 					});
 
 					// $('.swiper-container').height($('.swiper-container img').height());

Některé soubory nejsou zobrazeny, neboť je v těchto rozdílových datech změněno mnoho souborů