From 73d29eb35ce600089464c4eb1116fbaea51a79a7 Mon Sep 17 00:00:00 2001 From: System Administrator Date: Sat, 30 Jan 2016 15:38:43 +0800 Subject: [PATCH 1/4] 1 --- templates/common.html | 0 templates/common/booking_menu.html | 0 templates/common/order_detail.html | 0 templates/common/order_menu.html | 0 templates/common/product1.html | 0 templates/common/product_option.html | 0 templates/common/product_option1.html | 0 templates/common/register.html | 0 templates/exam/exam_customer.html | 0 templates/exam/exam_menu.html | 0 templates/main/guest.html | 0 templates/main/index.html | 2 +- templates/main/my_order_list.html | 0 13 files changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 templates/common.html mode change 100644 => 100755 templates/common/booking_menu.html mode change 100644 => 100755 templates/common/order_detail.html mode change 100644 => 100755 templates/common/order_menu.html mode change 100644 => 100755 templates/common/product1.html mode change 100644 => 100755 templates/common/product_option.html mode change 100644 => 100755 templates/common/product_option1.html mode change 100644 => 100755 templates/common/register.html mode change 100644 => 100755 templates/exam/exam_customer.html mode change 100644 => 100755 templates/exam/exam_menu.html mode change 100644 => 100755 templates/main/guest.html mode change 100644 => 100755 templates/main/my_order_list.html diff --git a/templates/common.html b/templates/common.html old mode 100644 new mode 100755 diff --git a/templates/common/booking_menu.html b/templates/common/booking_menu.html old mode 100644 new mode 100755 diff --git a/templates/common/order_detail.html b/templates/common/order_detail.html old mode 100644 new mode 100755 diff --git a/templates/common/order_menu.html b/templates/common/order_menu.html old mode 100644 new mode 100755 diff --git a/templates/common/product1.html b/templates/common/product1.html old mode 100644 new mode 100755 diff --git a/templates/common/product_option.html b/templates/common/product_option.html old mode 100644 new mode 100755 diff --git a/templates/common/product_option1.html b/templates/common/product_option1.html old mode 100644 new mode 100755 diff --git a/templates/common/register.html b/templates/common/register.html old mode 100644 new mode 100755 diff --git a/templates/exam/exam_customer.html b/templates/exam/exam_customer.html old mode 100644 new mode 100755 diff --git a/templates/exam/exam_menu.html b/templates/exam/exam_menu.html old mode 100644 new mode 100755 diff --git a/templates/main/guest.html b/templates/main/guest.html old mode 100644 new mode 100755 diff --git a/templates/main/index.html b/templates/main/index.html index 11c10b9..9ed6e67 100755 --- a/templates/main/index.html +++ b/templates/main/index.html @@ -42,7 +42,7 @@
-

【首席金服消息】粤财·瀚信中鼎盈丰2期，强势登场！

+

【首席】粤财·瀚信中鼎盈丰2期，强势登场！

    diff --git a/templates/main/my_order_list.html b/templates/main/my_order_list.html old mode 100644 new mode 100755 From fa723087191ebd374e50fcddca42337ef89a38ab Mon Sep 17 00:00:00 2001 From: System Administrator Date: Sat, 30 Jan 2016 15:56:47 +0800 Subject: [PATCH 2/4] 1 --- templates/main/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/main/index.html b/templates/main/index.html index 9ed6e67..0c53e9b 100755 --- a/templates/main/index.html +++ b/templates/main/index.html @@ -42,7 +42,7 @@
    -

    【首席】粤财·瀚信中鼎盈丰2期，强势登场！

    +

    【首席金服】粤财·瀚信中鼎盈丰2期，强势登场！

      @@ -81,7 +81,7 @@
      - 精选私募产品 + 精选私募产品1
      From 53de2a89ad3ae086d76a533d5029b6daef703993 Mon Sep 17 00:00:00 2001 From: 2012shenghua Date: Tue, 16 Feb 2016 15:12:05 +0800 Subject: [PATCH 3/4] update --- css/ionic.app.css | 64 +++++++++++- js/controllers.js | 6 +- templates/exam/shenghua.html | 6 ++ templates/main.html | 9 ++ templates/main/index.html | 120 +++++----------------- templates/main/ipad.sublime-project | 8 ++ templates/main/ipad.sublime-workspace | 138 ++++++++++++++++++++++++++ 7 files changed, 253 insertions(+), 98 deletions(-) create mode 100644 templates/exam/shenghua.html create mode 100644 templates/main/ipad.sublime-project create mode 100644 templates/main/ipad.sublime-workspace diff --git a/css/ionic.app.css b/css/ionic.app.css index 021c363..11964b1 100755 --- a/css/ionic.app.css +++ b/css/ionic.app.css @@ -7574,6 +7574,65 @@ a.button { -webkit-transition: all ease-in-out 250ms; transition: all ease-in-out 250ms; } +.common-main-view .sytjdv1, .common-main-view .sytjdv2, .common-main-view .sytjdv3 { + width: 96%; + height: 2.5rem; + margin: 0.4rem auto; + padding-top: 0.45rem; + border-radius: 3px; + overflow: hidden; } + + + .common-main-view .sytjdv1 { + background: url(../teImg/jwtz.png) no-repeat; + background-size: cover; } + .common-main-view .sytjdv2 { + background: url(../teImg/jzbgs.png) repeat-x; + background-size: cover; } + .common-main-view .sytjdv3 { + background: url(../teImg/hwbx.png) repeat-x; + background-size: cover; } + .common-main-view .sytjdv1 > span, .common-main-view .sytjdv1 > em, .common-main-view .sytjdv1 > i, .common-main-view .sytjdv2 > span, .common-main-view .sytjdv2 > em, .common-main-view .sytjdv2 > i, .common-main-view .sytjdv3 > span, .common-main-view .sytjdv3 > em, .common-main-view .sytjdv3 > i { + width: 100%; + padding: 0rem 2%; + display: block; } + .common-main-view .sytjdv1 > span, .common-main-view .sytjdv2 > span, .common-main-view .sytjdv3 > span { + font-size: 0.52rem; + line-height: 0.52rem; + height: 0.54rem; + overflow: hidden; + font-weight: bold; } + .common-main-view .sytjdv1 > em, .common-main-view .sytjdv2 > em, .common-main-view .sytjdv3 > em { + font-size: 0.3rem; + line-height: 0.3rem; + height: 0.32rem; + overflow: hidden; + margin-top: 0.22rem; } + .common-main-view .sytjdv1 > i, .common-main-view .sytjdv2 > i, .common-main-view .sytjdv3 > i { + font-size: 0.2rem; + line-height: 0.2rem; + height: 0.24rem; + overflow: hidden; + margin-top: 0.16rem; } + .common-main-view .sytjdv1 > span { + color: #8491a4; } + .common-main-view .sytjdv2 > span { + color: #8491a4; } + .common-main-view .sytjdv3 > span { + color: #8491a4; } + .common-main-view .sytjdv1 > em { + color: #e89440; } + .common-main-view .sytjdv2 > em { + color: #e89440; } + .common-main-view .sytjdv3 > em { + color: #e89440; } + .common-main-view .sytjdv1 > i { + color: #88aec9; } + .common-main-view .sytjdv2 > i { + color: #88aec9; } + .common-main-view .sytjdv3 > i { + color: #88aec9; } + @-webkit-keyframes scaleOut { from { -webkit-transform: scale(1); @@ -7692,4 +7751,7 @@ a.button { position: absolute; opacity: 0; -webkit-transition-duration: 0s; - transition-duration: 0s; } + transition-duration: 0s; + +} + diff --git a/js/controllers.js b/js/controllers.js index 33d3b0d..542e756 100755 --- a/js/controllers.js +++ b/js/controllers.js @@ -13,7 +13,9 @@ angular.module('starter.controllers', []) //}); }) - +.controller('mainShenghuaCtrl',function($scope) { + +}) .controller('examCtrl', function($scope) { $scope.win = { @@ -420,7 +422,9 @@ angular.module('starter.controllers', []) //Rest.getProducts({type:'privatefunds'}); //Rest.login('customer','password'); + $scope.data.categories = Main.getCategories(); + }) diff --git a/templates/exam/shenghua.html b/templates/exam/shenghua.html new file mode 100644 index 0000000..d3e761f --- /dev/null +++ b/templates/exam/shenghua.html @@ -0,0 +1,6 @@ + + +

      我的

      +       +       + diff --git a/templates/main.html b/templates/main.html index 6863277..a8264fc 100755 --- a/templates/main.html +++ b/templates/main.html @@ -15,6 +15,11 @@ --> + + + + +
      @@ -194,6 +199,10 @@ + + + + - -
      - 推荐 - 热销 - 粤财·瀚信中鼎盈丰2期 -
      - -
      - 63% -

      10.50% 预期年化

      -

      120天 理财期限

      -
      - 目标规模 36,500.00 万元 - 认购费用 100 万起 - 剩余时间 21 天 -
      -
      - -
      - - - -
      - -
      - 推荐 - 热销 - 粤财·瀚信中鼎盈丰2期 -
      - -
      - 63% -

      10.50% 预期年化

      -

      120天 理财期限

      -
      - 目标规模 36,500.00 万元 - 认购费用 100 万起 - 剩余时间 21 天 -
      -
      - -
      - - - 精选信托产品 - -
      - -
      - 推荐 - 热销 - 粤财·瀚信中鼎盈丰2期 -
      - -
      - 63% -

      10.50% 预期年化

      -

      120天 理财期限

      -
      - 目标规模 36,500.00 万元 - 认购费用 100 万起 - 剩余时间 21 天 -
      -
      - -
      - - - -
      - -
      - 推荐 - 热销 - 粤财·瀚信中鼎盈丰2期 -
      - -
      - 63% -

      10.50% 预期年化

      -

      120天 理财期限

      -
      - 目标规模 36,500.00 万元 - 认购费用 100 万起 - 剩余时间 21 天 -
      -
      - -
      -
      - + + +
      + + 海外投资 + 分散风险•分享成长 + +
      + +
      + + 家族办公室 + 全方位的财富保护•管理•传承 + +
      + +
      + + 海外保险 + 关爱家庭•呵护人生 + +
      + + - - + +