delete assu, order status

@@ -36,7 +36,7 @@ class OrderModel
                 if($orderV['is_cancel'] == 'Y' || $orderV['status'] === 6) {
                     $orders[$orderK]['canDelete'] = true; //删除订单
                 }
-                $statusInfo = self::getOrderStatus($orderV['is_cancel'], $orderV['status'], $orderV['payment_type'], $orderV['payment_status']);
+                $statusInfo = self::getOrderStatus($orderV['is_cancel'], $orderV['status'], $orderV['payment_type'], $orderV['payment_status'], $orderV['status_str']);
                 //订单状态
                 if ($statusInfo['cancel']) {
                     $orders[$orderK]['cancel'] = $statusInfo['cancel'];
@@ -507,9 +507,10 @@ class OrderModel
      * @param type $status
      * @param type $payType
      * @param type $payStatus
+     * @param type $statusStr
      * @return string
      */
-    protected static function getOrderStatus($isCancel, $status, $payType, $payStatus)
+    protected static function getOrderStatus($isCancel, $status, $payType, $payStatus, $statusStr = '')
     {
         //初始化:未取消，待付款
         $ret = array('cancel' => FALSE, 'keyName' => 'noPay', 'statusStr' => '待付款');
@@ -556,6 +557,9 @@ class OrderModel
                     break;
             }
         }
+        if ($statusStr) {
+            $ret['statusStr'] = $statusStr;
+        }
         return $ret;
     }
 
@@ -630,7 +634,7 @@ class OrderModel
 
         // 预售商品提示app操作
         if ($attribute == 9) {
-            $operation = array('name' => '定金预售商品只能在APP端购买');
+            $operation = array('name' => '定金预售商品只能在APP端操作');
         }
         return $operation;
     }

@@ -95,10 +95,10 @@ class UserModel
                         'name' => '我的评论',
                         'href' => Helpers::url('/home/comment')
                     ),
-                    array(
-                        'name' => '我的投诉',
-                        'href' => Helpers::url('/home/complaints')
-                    ),
+//                    array(
+//                        'name' => '我的投诉',
+//                        'href' => Helpers::url('/home/complaints')
+//                    ),
                     array(
                         'name' => '我的信息',
                         'count' => self::unredTotal($uid), //获取未读消息数量