统计

ghsApp/src/admin/stat/profit.vue

@@ -32,20 +32,11 @@
 								<view style="font-weight:bold;color:black;font-size:32upx;">利润 ¥{{profit.balance||0}}</view>
 							</t-td>
 						</t-tr>
-						<block v-if="Number(profit.payCodeIncome)>0">
-							<t-tr>
-								<t-td align="center">
-									<view style="font-weight:bold;color:red;font-size:30upx;">
-										以上利润还要减掉收款码收入的 ￥{{ profit.payCodeIncome }}
-									</view>
-								</t-td>
-							</t-tr>
-						</block>
 						<block v-if="profit.wastagePrice && Number(profit.wastagePrice)>0">
 							<t-tr>
 								<t-td align="center">
-									<view style="font-weight:bold;color:red;font-size:30upx;">
-										由于花材损耗，少赚了 ¥{{profit.wastagePrice||0}}
+									<view style="font-weight:bold;font-size:30upx;">
+										花材损耗损失 ¥{{profit.wastagePrice||0}}
 									</view>
 								</t-td>
 							</t-tr>

ghsApp/src/config.js

@@ -1,4 +1,4 @@
 export const ProjectName = 'ghs'
-export const APIHOST = 'https://api.shop.hzghd.com'
-export const IMGHOST = 'https://img.hzghd.com'
+export const APIHOST = 'http://api.shop.hzghd.com'
+export const IMGHOST = 'http://img.hzghd.com'
 export const CURRENT_ENV = 'dev'

ghsApp/src/ext.json

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

ghsApp/src/static/iconfont/iconfont.css

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

hdApp/src/admin/stat/profit.vue

@@ -36,25 +36,15 @@
 								<view style="font-weight:bold;color:black;font-size:32upx;">利润 ¥{{profit.balance||0}}</view>
 							</t-td>
 						</t-tr>
-						<block v-if="Number(profit.payCodeIncome)>0">
-							<t-tr>
-								<t-td align="center">
-									<view style="font-weight:bold;color:red;font-size:30upx;">
-										以上利润还要减掉收款码收入的 ￥{{ profit.payCodeIncome }}
-									</view>
-								</t-td>
-							</t-tr>
-						</block>
 						<block v-if="profit.wastagePrice && Number(profit.wastagePrice)>0">
 							<t-tr>
 								<t-td align="center">
 									<view style="font-weight:bold;font-size:30upx;">
-										由于花材损耗，少赚了 ¥{{profit.wastagePrice||0}}
+										花材损耗损失 ¥{{profit.wastagePrice||0}}
 									</view>
 								</t-td>
 							</t-tr>
 						</block>
-
 					</t-table>
 				</block>
 			</view>