开发

ghsApp/src/admin/custom/showTotalBalance.vue

@@ -4,23 +4,13 @@
 			<view class="module-com input-line-wrap">
 
 				<tui-list-cell class="line-cell" :hover="false">
-					<view class="tui-title">批发总赊账</view>
-					<view>{{ pfDebt }}</view>
+					<view class="tui-title">批发</view>
+					<view>{{ pfAmount }}</view>
 				</tui-list-cell>
 
 				<tui-list-cell class="line-cell" :hover="false">
-					<view class="tui-title">批发总余额</view>
-					<view>{{ pfBalance }}</view>
-				</tui-list-cell>
-
-				<tui-list-cell class="line-cell" :hover="false">
-					<view class="tui-title">零售总赊账</view>
-					<view>{{ lsDebt }}</view>
-				</tui-list-cell>
-
-				<tui-list-cell class="line-cell" :hover="false">
-					<view class="tui-title">零售总余额</view>
-					<view>{{ lsBalance }}</view>
+					<view class="tui-title">零售</view>
+					<view>{{ lsAmount }}</view>
 				</tui-list-cell>
 
 			</view>
@@ -41,10 +31,8 @@ export default {
 	},
 	data() {
 		return {
-			lsBalance:0,
-			lsDebt:0,
-			pfBalance:0,
-			pfDebt:0
+			lsAmount:0,
+			pfAmount:0
 		}
 	},
 	onLoad() {
@@ -56,10 +44,8 @@ export default {
 		init() {
 			showTotalBalance().then(res=>{
 				if(res.code == 1){
-					this.lsBalance = res.data.ls.balance||0
-					this.lsDebt = res.data.ls.debt||0
-					this.pfBalance = res.data.pf.balance||0
-					this.pfDebt = res.data.pf.debt||0
+					this.lsAmount = res.data.lsAmount||0
+					this.pfAmount = res.data.pfAmount||0
 				}
 			})
 		}

ghsApp/src/config.js

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

ghsApp/src/ext.json

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

ghsApp/src/static/iconfont/iconfont.css

@@ -1,11 +1,11 @@
 @font-face {
   font-family: 'iconfont';  /* project id 1525256 */
-  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');
+  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');
 }
 
 .iconfont {

hdApp/src/admin/billing/affirm.vue

@@ -31,10 +31,6 @@
 
                       <text style="position: absolute;right:300upx;top:2upx;font-size:28upx;color:green;font-weight:bold;" v-if="item.bigCount > 0">¥{{ parseFloat((Number(item.bigCount)*Number(item.userPrice)).toFixed(2)) }}</text>
                       <text style="position: absolute;right:300upx;top:2upx;font-size:28upx;color:green;font-weight:bold;" v-else>¥{{ parseFloat((Number(item.smallCount)*Number(item.userPrice)).toFixed(2)) }}</text>
-                      <text :class="[Number(item.cost) > Number(item.userPrice) && item.bigCount > 0 ? 'warning-price' : 'normal-price']" style="position: absolute;right:0upx;top:55upx;font-size:24upx;font-weight:bold;width:350upx;text-align:right;">
-                        ¥{{ item.cost?parseFloat(item.cost):0 }}
-                        <text style="margin-left:8upx;" v-if="Number(item.cost) > Number(item.userPrice) && item.bigCount > 0">售价过低</text>
-                      </text>
 
                       <view class="open-bx" >
                         <i class="iconfont iconjian" @click="reduceItemFn(item)" v-if="item.bigCount > 0 || item.smallCount > 0"></i>

hdApp/src/admin/custom/showTotalBalance.vue

@@ -3,24 +3,14 @@
 		<form>
 			<view class="module-com input-line-wrap">
 
-				<tui-list-cell class="line-cell" :hover="false" v-if="Number(pfShopId)>0">
-					<view class="tui-title">批发总赊账</view>
-					<view>{{ pfDebt }}</view>
-				</tui-list-cell>
-
-				<tui-list-cell class="line-cell" :hover="false" v-if="Number(pfShopId)>0">
-					<view class="tui-title">批发总余额</view>
-					<view>{{ pfBalance }}</view>
-				</tui-list-cell>
-
 				<tui-list-cell class="line-cell" :hover="false">
-					<view class="tui-title">零售总赊账</view>
-					<view>{{ lsDebt }}</view>
+					<view class="tui-title">批发</view>
+					<view>{{ pfAmount }}</view>
 				</tui-list-cell>
 
 				<tui-list-cell class="line-cell" :hover="false">
-					<view class="tui-title">零售总余额</view>
-					<view>{{ lsBalance }}</view>
+					<view class="tui-title">零售</view>
+					<view>{{ lsAmount }}</view>
 				</tui-list-cell>
 
 			</view>
@@ -41,11 +31,8 @@ export default {
 	},
 	data() {
 		return {
-			lsBalance:0,
-			lsDebt:0,
-			pfBalance:0,
-			pfDebt:0,
-			pfShopId:0
+			lsAmount:0,
+			pfAmount:0
 		}
 	},
 	onLoad() {
@@ -57,11 +44,8 @@ export default {
 		init() {
 			showTotalBalance().then(res=>{
 				if(res.code == 1){
-					this.lsBalance = res.data.ls.balance||0
-					this.lsDebt = res.data.ls.debt||0
-					this.pfBalance = res.data.pf.balance||0
-					this.pfDebt = res.data.pf.debt||0
-					this.pfShopId = res.data.pfShopId||0
+					this.lsAmount = res.data.lsAmount||0
+					this.pfAmount = res.data.pfAmount||0
 				}
 			})
 		}

hdApp/src/config.js

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

hdApp/src/ext.json

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

hdApp/src/static/iconfont/iconfont.css

@@ -1,11 +1,11 @@
 @font-face {
   font-family: 'iconfont';  /* project id 1525256 */
-  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');
+  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');
 }
 
 .iconfont {