Merge branch 'master' of http://192.168.40.220/dmc/jz_applet

subpackage/personal-center/excel.vue

@@ -6,30 +6,35 @@
 				<view class="th">设备类型</view>
 				<view class="th">库存数量</view>
 				<view class="th">剩余可用数量</view>
+				<view class="th">余量</view>
 			</view>
 			<view class="tr">
-				<view class="td">黔通智联仓库1</view>
+				<view class="td overflow">黔通智联仓库1</view>
 				<view class="td">2X储值卡</view>
 				<view class="td">10000</view>
-				<view class="td">100001</view>
+				<view class="td">8500</view>
+				<view class="td">85%</view>
 			</view>
 			<view class="tr">
 				<view class="td">黔通智联仓库2</view>
 				<view class="td">2X储值卡</view>
 				<view class="td">10000</view>
-				<view class="td">100001</view>
+				<view class="td">7510</view>
+				<view class="td">75.1%</view>
 			</view>
 			<view class="tr">
 				<view class="td">黔通智联仓库3</view>
 				<view class="td">2X储值卡</view>
-				<view class="td">100022</view>
 				<view class="td">10000</view>
+				<view class="td">10000</view>
+				<view class="td">100%</view>
 			</view>
 			<view class="tr">
 				<view class="td">黔通智联仓库4</view>
 				<view class="td">2X储值卡</view>
 				<view class="td">188000</view>
 				<view class="td">100001</view>
+				<view class="td">{{(100001/188000*100).toFixed(2)}}%</view>
 			</view>
 		</view>
 	</view>
@@ -46,7 +51,7 @@
 </style>
 <style scoped>
 	.wrapper {
-		padding: 30rpx;
+		padding: 30rpx 20rpx;
 	}
 
 	.tabel {
@@ -79,7 +84,7 @@
 	}
 
 	.tabel .tr .td {
-		padding: 0rpx 10rpx;
+		padding: 0rpx 8rpx;
 		display: table-cell;
 		height: 60rpx;
 		line-height: 60rpx;

utils/network/api.js

@@ -17,9 +17,9 @@ export const envs = {
 
 export const appId = "52030131"; //应用appid 综合业务支撑平台使用
 export const loginTime = 86400; //登录有效时间（单位s） 1天
-export const wechatPayConfigId = "6a9a54bc01f6443faea7ffe132b19f6"; //支付配置编号 微信小程序支付
-export const wechatAppID = "wx008c60533388527a"; //小程序APPid
-export const wechatSecret = "95197718b43b497f02732bd9f8011080"; //小程序AppSecret
+export const wechatPayConfigId = "6a9a54bc01f6443faea7ffe132b19f6"; //支付配置编号 微信小程序支付:6a9a54bc01f6443faea7ffe132b19f6
+export const wechatAppID = "wx8fba957179c1329a"; //九州小程序APPid:wx008c60533388527a
+export const wechatSecret = "699c10826113ddb350fbe58a96e2b015"; //九州小程序AppSecret:95197718b43b497f02732bd9f8011080
 // export const sm4Key = "5dc11f854ceca1473e1a5075ed16eb226b4543a9a05fe50f7fba40f898099ce34abba69a07a20509f315f94d808a4d0e988935588858f65a";
 export const sm4Key = "5dc11f854ceca147";