Merge branch 'feature/improve' into develop

takeout/view/newdetailform.h

@@ -86,6 +86,7 @@ private slots:
      * */
     bool getOtherOrderOptAndName(OrderObject *order, QString &optname, QString &name);
 
+    void on_closeButton_clicked();
 };
 
 #endif // NEWDETAILFORM_H

takeout/view/newdetailform.ui

@@ -103,7 +103,8 @@
 
 #closeBtn
 {
-	border-image: url(:detailBtn_close_normal.png);
+	border-image: url(:newmainhide.png);
+	border:0px solid;
 }
 
 #productLb,#product_numLb,#product_price_Lb,#packageLb,#package_num_Lb,#package_price_Lb,#deliveryLb,#delivery_num_Lb,#delivery_price_Lb,#promotionLb,#promotion_num_Lb,#promotion_price_Lb