Merge remote-tracking branch 'origin/master'

ghsApp/src/admin/staff/list.vue

@@ -18,12 +18,12 @@
 								</div>
 								<div class="flex-center">
 									<div class="status-list">
-										<i class="iconfont icondagou" :class="[item.remind ? 'app-color-1' : '' ]"></i>
-										<span :class="[item.remind ? 'app-color-1' : 'app-color-3' ]">收款通知</span>
+										<i class="iconfont icondagou" :class="[item.remind == 1 ? 'app-color-1' : '' ]"></i>
+										<span :class="[item.remind == 1 ? 'app-color-1' : 'app-color-3' ]">收款通知</span>
 									</div>
 									<div class="status-list">
-										<i class="iconfont icondagou" :class="[item.status ? 'app-color-1' : '' ]"></i>
-										<span :class="[item.status ? 'app-color-1' : 'app-color-3' ]">启用</span>
+										<i class="iconfont icondagou" :class="[item.status == 1 ? 'app-color-1' : '' ]"></i>
+										<span :class="[item.status == 1 ? 'app-color-1' : 'app-color-3' ]">启用</span>
 									</div>
 								</div>
 							</div>

ghsApp/src/ext.json

@@ -4,7 +4,7 @@
   "directCommit": false,
   "ext": {
     "account": 0,
-    "apiHost": "https://api.shop.hzghd.com",
+    "apiHost": "http://api.shop.hzghd.com",
     "imgHost": "https://img.hzghd.com",
     "name":"花掌柜"
   }