fix 首页产品名称

www/protected/controllers/RechargeController.php

@@ -76,6 +76,7 @@ class RechargeController extends AdminController {
         $cash_back = intval(Yii::app()->request->getParam('cash_back', 0));
         $status = intval(Yii::app()->request->getParam('status', 0));
         $desc = Yii::app()->request->getParam('desc', '');
+        $order = intval(Yii::app()->request->getParam('order', 1));
         $coupons = array();
         $select_fun = Yii::app()->request->getParam('add_select_fun', '');
         $flag = empty($denomination);
@@ -135,8 +136,8 @@ class RechargeController extends AdminController {
         $recharge->coupons = $coupons_obj;
         $recharge->desc = $desc;//描述
         $recharge->status = intval($status);//状态
-
-        $addRecharge_arr = array('denomination','cash_back','status','desc','coupons');
+        $recharge->order = $order;
+        $addRecharge_arr = array('denomination','cash_back','status','desc','coupons','order');
         $success = $recharge->save(true, $addRecharge_arr);
 
         CommonFn::requestAjax($success, '', array());
@@ -147,7 +148,8 @@ class RechargeController extends AdminController {
     public function actionEdit() {
         $denomination = intval(Yii::app()->request->getParam('denomination',''));//面额
         $desc = Yii::app()->request->getParam('desc', '');//描述
-        $status = intval(Yii::app()->request->getParam('status', '0'));
+        $status = intval(Yii::app()->request->getParam('status', 0));//状态
+        $order = intval(Yii::app()->request->getParam('order', 1));
         $id = Yii::app()->request->getParam('id', '');
         $coupons = array();//代金券
         $select_fun = Yii::app()->request->getParam('select_fun', '');
@@ -160,9 +162,6 @@ class RechargeController extends AdminController {
         if (!isset($denomination)) {
             CommonFn::requestAjax(false, '必须填写面额！');
         }
-
-
-
         $cash_back = 0;
         if ($select_fun == 'coupon') {
             //数组分割处理
@@ -201,14 +200,14 @@ class RechargeController extends AdminController {
         $criteria = new EMongoCriteria();
         $criteria->_id = new MongoId($id);
         $recharge = Recharge::model()->find($criteria);
-
+        $recharge->order = $order;
         $recharge->coupons = $coupons_obj;
         $recharge->cash_back = $cash_back;
         $recharge->desc = $desc;
         $recharge->denomination = $denomination;
         $recharge->status = $status;
         //保存修改的充值券信息
-        $addRecharge_arr = array('denomination','cash_back','status','desc','coupons');
+        $addRecharge_arr = array('denomination','cash_back','status','desc','coupons','order');
         $success = $recharge->save(true, $addRecharge_arr);
         CommonFn::requestAjax($success, '', array());
 

www/protected/views/recharge/index.php

@@ -107,6 +107,16 @@
                                         </div>
                                     </div>
                                 </li>
+                                <li class="f_item">
+                                    <div class="box">
+                                        <div class="f_label">
+                                            <span>排序权重: </span>
+                                        </div>
+                                        <div class="box_flex f_content">
+                                            <input id="edit_order" name="order" />
+                                        </div>
+                                    </div>
+                                </li>
                                 <li class="f_item">
                                     <div class="box">
                                         <div class="f_label">
@@ -194,7 +204,16 @@
                         </div>
                     </div>
                 </li>
-
+                <li class="f_item">
+                    <div class="box">
+                        <div class="f_label">
+                            <span>排序权重: </span>
+                        </div>
+                        <div class="box_flex f_content">
+                           <input id="add_order" name="order"/>
+                        </div>
+                    </div>
+                </li>
 
 
             </ul>
@@ -374,7 +393,8 @@
                 formatter: function(value, row){
                     return get_filed_text(value, status_data);
                 }
-            }
+            },
+            {field:'order', title:'排序', width:25,sortable:true}
         ]],
 
         onSelect: function(index, row){
@@ -396,8 +416,9 @@
             }
             coupon = '';
             for(var i in data.coupons){
-                coupon += data['coupons'][i]['id']+'<br/>';
+                coupon += '<a href="javascript:;" onclick="parent.load_url(\'<?php echo Yii::app()->request->baseUrl; ?>/index.php?r=coupon&id='+data['coupons'][i]['id']+'\')">'+data['coupons'][i]['id']+'</a><br/>';
             }
+
             $('#coupons_items').html(coupon);
             jq_content_form.form('load', data);
             $('#admins_edit_info').html('');
@@ -523,7 +544,7 @@ function save_content(){
     }
 
     if (jq_setStatus.combobox('getValue') <0 ){
-        $.messager.confirm('注意', '确认 取消/退款 该订单吗？', function(r){
+        $.messager.confirm('注意', '确认删除 该充值券吗？', function(r){
             $.messager.progress();
             jq_content_form.submit();
         });

www/webapp/o2o/tpl/home/index.html

@@ -53,11 +53,11 @@
                                 </li>
                                 <li class="btn-product" style="border-right: 1px solid rgb(241, 241, 241);border-bottom: 1px solid rgb(241, 241, 241);width: 49%; text-align: center; padding-top: 10px; padding-bottom: 10px" data-product-type="5">
                                     <img src="http://oduj3utzz.bkt.clouddn.com/Home_btn_clean%20%286%29.png"  width="50px" height="50px">
-                                    <div class="extra-service-name">民宿保洁</div>
+                                    <div class="extra-service-name">新居开荒</div>
                                 </li>
                                 <li class="btn-product" style="border-bottom: 1px solid rgb(241, 241, 241);width: 49%; text-align: center; padding-top: 10px; padding-bottom: 10px" data-product-type="6">
                                     <img src="http://oduj3utzz.bkt.clouddn.com/Home_btn_pre_clean%20%285%29.png"  width="50px" height="50px">
-                                    <div class="extra-service-name">新居开荒</div>
+                                    <div class="extra-service-name">母婴房清洁</div>
                                 </li>
                             </ul>
                         </div>