shish il y a 11 mois
Parent
commit
6cec9291ac
4 fichiers modifiés avec 15 ajouts et 13 suppressions
  1. 3 3
      hdApp/src/config.js
  2. 2 2
      hdApp/src/ext.json
  3. 4 2
      hdApp/src/mixins/hs.js
  4. 6 6
      hdApp/src/static/iconfont/iconfont.css

+ 3 - 3
hdApp/src/config.js

@@ -1,5 +1,5 @@
 export const ProjectName = 'hd'
-export const APIHOST = 'https://api.shop.huaml.com'
-export const FORMALHOST = 'https://shop.huaml.com'
-export const IMGHOST = 'https://img.huaml.com'
+export const APIHOST = 'http://api.shop.huaml.com'
+export const FORMALHOST = 'http://shop.huaml.com'
+export const IMGHOST = 'http://img.huaml.com'
 export const CURRENT_ENV = 'dev'

+ 2 - 2
hdApp/src/ext.json

@@ -4,9 +4,9 @@
   "directCommit": false,
   "ext": {
     "account": 12362,
-    "apiHost": "https://api.shop.huaml.com",
+    "apiHost": "http://api.shop.huaml.com",
     "socketApiHost": "api.shop.huaml.com",
-    "imgHost": "https://img.huaml.com",
+    "imgHost": "http://img.huaml.com",
     "name":"花美玲"
   }
 }

+ 4 - 2
hdApp/src/mixins/hs.js

@@ -233,8 +233,10 @@ export default {
 					//无操作
 				}else{
 					let currentClass = this.globalClassDataIndex[currentClassId] ? this.globalClassDataIndex[currentClassId] : null
-					cName = currentClass.categoryName ? currentClass.categoryName : ''
-					hasExists[currentClassId] = 1
+					if(currentClass){
+						cName = currentClass.categoryName ? currentClass.categoryName : ''
+						hasExists[currentClassId] = 1
+					}
 				}
 				that.globalItemData[i].className = cName
 			}

+ 6 - 6
hdApp/src/static/iconfont/iconfont.css

@@ -1,11 +1,11 @@
 @font-face {
   font-family: 'iconfont';  /* project id 1525256 */
-  src: url('https://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.eot');
-  src: url('https://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.eot?#iefix') format('embedded-opentype'),
-  url('https://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.woff2') format('woff2'),
-  url('https://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.woff') format('woff'),
-  url('https://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.ttf') format('truetype'),
-  url('https://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.svg#iconfont') format('svg');
+  src: url('http://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.eot');
+  src: url('http://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.eot?#iefix') format('embedded-opentype'),
+  url('http://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.woff2') format('woff2'),
+  url('http://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.woff') format('woff'),
+  url('http://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.ttf') format('truetype'),
+  url('http://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.svg#iconfont') format('svg');
 }
 
 .iconfont {