order

Binary files a/static/dist/myohobuy/assets/font/iconfont.ttf and b/static/dist/myohobuy/assets/font/iconfont.ttf differ

Binary files a/static/dist/myohobuy/assets/img/close-icon.png and b/static/dist/myohobuy/assets/img/close-icon.png differ

+require("jquery");require("yoho.iswiper");require("iscroll/iscroll-probe");require("import-style");require("yoho.lazyload");require("yoho.handlebars");require("yoho.hammer");require("yoho.mlellipsis");
\ No newline at end of file

+{
+  "name": "yohobuy",
+  "version": "4.9.01",
+  "description": "yohobuy statics",
+  "keywords": [],
+  "homepage": "",
+  "author": "xuqi <xuqi9010@gmail.com>",
+  "repository": {
+    "type": "git",
+    "url": ""
+  },
+  "bugs": {
+    "url": ""
+  },
+  "licenses": "MIT",
+  "spm": {
+    "main": "index.js",
+    "dependencies": {
+      "jquery": "2.1.4",
+      "yoho.iswiper": "3.0.1",
+      "iscroll": "5.1.2",
+      "import-style": "1.0.0",
+      "yoho.lazyload": "1.1.4",
+      "yoho.handlebars": "3.0.3",
+      "yoho.hammer": "2.0.4",
+      "yoho.mlellipsis": "0.0.7"
+    },
+    "devDependencies": {
+      "expect.js": "0.3.1"
+    },
+    "buildArgs": "--idleading {{}}",
+    "inside": {
+      "iscroll": "iscroll/iscroll-probe"
+    }
+  },
+  "devDependencies": {
+    "autoprefixer": "^6.3.3",
+    "father": "^1.0.0",
+    "gulp": "^3.9.0",
+    "gulp-compass": "^2.1.0",
+    "gulp-concat": "^2.6.0",
+    "gulp-cssnano": "^2.1.1",
+    "gulp-ftp": "^1.0.4",
+    "gulp-postcss": "^6.1.0",
+    "gulp-sourcemaps": "^1.6.0",
+    "gulp-spm": "^0.11.3",
+    "gulp-uglify": "^1.4.2",
+    "gulp-util": "^3.0.6",
+    "postcss-assets": "^4.0.1",
+    "postcss-calc": "^5.2.0",
+    "postcss-center": "^1.0.0",
+    "postcss-clearfix": "^0.2.1",
+    "postcss-crip": "^2.0.0",
+    "postcss-position": "^0.4.0",
+    "postcss-pxtorem": "^3.3.1",
+    "postcss-short": "^1.4.0",
+    "postcss-sprites": "^3.1.0",
+    "postcss-use": "^2.0.2",
+    "precss": "^1.4.0"
+  },
+  "scripts": {
+    "test": "spm test",
+    "build": "spm build"
+  }
+}
\ No newline at end of file

-{
-  "name": "yohobuy",
-  "version": "4.9.01",
-  "description": "yohobuy statics",
-  "keywords": [],
-  "homepage": "",
-  "author": "xuqi <xuqi9010@gmail.com>",
-  "repository": {
-    "type": "git",
-    "url": ""
-  },
-  "bugs": {
-    "url": ""
-  },
-  "licenses": "MIT",
-  "spm": {
-    "main": "index.js",
-    "dependencies": {
-      "jquery": "2.1.4",
-      "yoho.iswiper": "3.0.1",
-      "iscroll": "5.1.2",
-      "import-style": "1.0.0",
-      "yoho.lazyload": "1.1.4",
-      "yoho.handlebars": "3.0.3",
-      "yoho.hammer": "2.0.4",
-      "yoho.mlellipsis": "0.0.7"
-    },
-    "devDependencies": {
-      "expect.js": "0.3.1"
-    },
-    "buildArgs": "--idleading {{}}",
-    "inside": {
-      "iscroll": "iscroll/iscroll-probe"
-    }
-  },
-  "devDependencies": {
-    "autoprefixer": "^6.3.3",
-    "father": "^1.0.0",
-    "gulp": "^3.9.0",
-    "gulp-compass": "^2.1.0",
-    "gulp-concat": "^2.6.0",
-    "gulp-cssnano": "^2.1.1",
-    "gulp-ftp": "^1.0.4",
-    "gulp-postcss": "^6.1.0",
-    "gulp-sourcemaps": "^1.6.0",
-    "gulp-spm": "^0.11.3",
-    "gulp-uglify": "^1.4.2",
-    "gulp-util": "^3.0.6",
-    "postcss-assets": "^4.0.1",
-    "postcss-calc": "^5.2.0",
-    "postcss-center": "^1.0.0",
-    "postcss-clearfix": "^0.2.1",
-    "postcss-crip": "^2.0.0",
-    "postcss-position": "^0.4.0",
-    "postcss-pxtorem": "^3.3.1",
-    "postcss-short": "^1.4.0",
-    "postcss-sprites": "^3.1.0",
-    "postcss-use": "^2.0.2",
-    "precss": "^1.4.0"
-  },
-  "scripts": {
-    "test": "spm test",
-    "build": "spm build"
-  }
-}
\ No newline at end of file
+{"name":"","version":"4.9.01","spm":{"main":"libs.js","dependencies":{"jquery":"2.1.4","yoho.iswiper":"3.0.1","iscroll":"5.1.2","import-style":"1.0.0","yoho.lazyload":"1.1.4","yoho.handlebars":"3.0.3","yoho.hammer":"2.0.4","yoho.mlellipsis":"0.0.7"},"devDependencies":{"expect.js":"0.3.1"},"buildArgs":"--idleading {{}} --include all","inside":{"iscroll":"iscroll/iscroll-probe"}}}
\ No newline at end of file

@@ -577,10 +577,11 @@ class CartModel
 //                $result['goodsPrice'] = $payReturn['shopping_cart_data']['str_order_amount'];
 
                 //有货币
-                if($payReturn['shopping_cart_data']['gain_yoho_coin'] > 0) {
+                if((int)$payReturn['shopping_cart_data']['gain_yoho_coin'] > 0) {
+                    
                     $result['yohoCoinNum'] = $payReturn['shopping_cart_data']['gain_yoho_coin'];
                     $result['returnYohoCoin'] = true;
-                } 
+                }
             }
 
             // 发票有关数据