Merge branch 'test' into 'wyz'

Test

See merge request !118

api/api.ts

 import request from "../util/request";
 import request from "../util/request";
-import {baseURL,apiURL,cffpURL,sfpUrl,imgUrl,scrmUrl,	csfUrl
+import {baseURL,apiURL,cffpURL,sfpUrl,imgUrl,scrmUrl,csfUrl,
 } from "../environments/environment";
 } from "../environments/environment";
 
 
 export default {
 export default {
@@ -474,10 +474,16 @@ export default {
 	},
 	},
 	//薪资信息
 	//薪资信息
 	salaryCondition(params) {
 	salaryCondition(params) {
-		return request(`${csfUrl}/csf/api/salary/condition/list`, 'POST', params)
+		// 只有当地址栏是 HTTP 时，才允许用 HTTP 绝对路径
+		    if (location.protocol === 'http:') {
+		        return request(`${csfUrl}/csf/api/salary/condition/list`, 'POST', params);
+		    } else {
+		        // HTTPS 下只能走相对路径（依赖 Nginx 代理转发）
+		        return request(`/csf/api/salary/condition/list`, 'POST', params);
+		    }
 	},
 	},
 	//薪资信息
 	//薪资信息
 	salaryDetail(salaryBizId) {
 	salaryDetail(salaryBizId) {
-		return request(`${csfUrl}/csf/api/salary/detail?salaryBizId=${salaryBizId}`,'GET')
+		return request(`/csf/api/salary/detail?salaryBizId=${salaryBizId}`,'GET')
 	},
 	},
 }
 }

myPackageA/salary/salaryList.vue

@@ -46,19 +46,19 @@
 
 
 							<view class="grid-row">
 							<view class="grid-row">
 								<text class="label">应发金额</text>
 								<text class="label">应发金额</text>
-								<text class="value">¥{{ item.detail.grossAmount.toFixed(2) }}</text>
+								<text class="value">{{ item.detail.grossAmount.toFixed(2) }} (HKD)</text>
 							</view>
 							</view>
 							<view class="grid-row">
 							<view class="grid-row">
 								<text class="label">MPF事项金额</text>
 								<text class="label">MPF事项金额</text>
-								<text class="value">¥{{ item.detail.mpfAmount.toFixed(2) }}</text>
+								<text class="value">{{ item.detail.mpfAmount.toFixed(2) }} (HKD)</text>
 							</view>
 							</view>
 							<view class="grid-row">
 							<view class="grid-row">
 								<text class="label">其他调整总金额</text>
 								<text class="label">其他调整总金额</text>
-								<text class="value">¥{{ item.detail.otherAmount.toFixed(2) }}</text>
+								<text class="value">{{ item.detail.otherAmount.toFixed(2) }} (HKD)</text>
 							</view>
 							</view>
 							<view class="grid-row">
 							<view class="grid-row">
 								<text class="label">实发金额</text>
 								<text class="label">实发金额</text>
-								<text class="value">¥{{ item.detail.paidAmount.toFixed(2) }}</text>
+								<text class="value">{{ item.detail.paidAmount.toFixed(2) }}(HKD)</text>
 							</view>
 							</view>
 							<view class="grid-row">
 							<view class="grid-row">
 								<text class="label">备注</text>
 								<text class="label">备注</text>
@@ -97,7 +97,7 @@
 							</view>
 							</view>
 							<view class="grid-row">
 							<view class="grid-row">
 								<text class="label">收款银行</text>
 								<text class="label">收款银行</text>
-								<text class="value">{{ bank.bankName}}</text>
+								<text class="value txtValue">{{ bank.bankName}}</text>
 							</view>
 							</view>
 							<view class="grid-row">
 							<view class="grid-row">
 								<text class="label">账户尾号</text>
 								<text class="label">账户尾号</text>
@@ -105,7 +105,7 @@
 							</view>
 							</view>
 							<view class="grid-row">
 							<view class="grid-row">
 								<text class="label">发放金额</text>
 								<text class="label">发放金额</text>
-								<text class="value">¥{{ bank.amount.toFixed(2) }}</text>
+								<text class="value">{{ bank.amount.toFixed(2) }} <text v-if="bank.currency">({{bank.currency}}) </text></text>
 							</view>
 							</view>
 							<view class="grid-row">
 							<view class="grid-row">
 								<text class="label">币种</text>
 								<text class="label">币种</text>
@@ -558,8 +558,9 @@
 	}
 	}
 
 
 	.grid-row .txtValue {
 	.grid-row .txtValue {
-		width: 60%;
+		width: 70%;
 		text-align: right;
 		text-align: right;
+		
 	}
 	}
 
 
 	.value.positive {
 	.value.positive {