wangyu / naturalPersonTax · 提交

提交 dfca6e422a407813921471dc0a771e57928f01a9

作者 wangyu
1 个父辈 d9b51600
构建： 未知

修复薪资相关问题

内嵌 并排对比
正在显示 7 个修改的文件 包含 67 行增加 和 62 行删除
@@ -143,9 +143,9 @@ App({ @@ -143,9 +143,9 @@ App({
143 // baseUrl: "http://47.96.75.229:20000/", 143 // baseUrl: "http://47.96.75.229:20000/",
144 // baseUrl: "http://192.144.144.220:20000/", 144 // baseUrl: "http://192.144.144.220:20000/",
145 // baseUrl: "http://154.8.229.55:20000/", 145 // baseUrl: "http://154.8.229.55:20000/",
146 - baseUrl: "http://47.110.250.177:20000/", 146 + // baseUrl: "http://47.110.250.177:20000/",
147 // baseUrl: "http://47.110.158.110:20000/", 147 // baseUrl: "http://47.110.158.110:20000/",
148 - // baseUrl: "https://api.workai.com.cn/", 148 + baseUrl: "https://api.workai.com.cn/",
149 OSSUrl: "", //"https://oss.workai.com.cn/", 149 OSSUrl: "", //"https://oss.workai.com.cn/",
150 OSSImgHeader:"https://hropublic.oss-cn-beijing.aliyuncs.com/weixin/", 150 OSSImgHeader:"https://hropublic.oss-cn-beijing.aliyuncs.com/weixin/",
151 userInfo: null, 151 userInfo: null,
1 { 1 {
2 "pages": [ 2 "pages": [
3 - "pages/main/rewardpoint/cashout/cashout",  
4 "pages/main/guide/guide", 3 "pages/main/guide/guide",
5 "pages/getPhone/getPhone", 4 "pages/getPhone/getPhone",
6 "pages/main/smartchat/chat", 5 "pages/main/smartchat/chat",
@@ -49,6 +48,8 @@ @@ -49,6 +48,8 @@
49 "pages/main/verify/verify_info", 48 "pages/main/verify/verify_info",
50 "pages/main/verify/verify_result/verify_result", 49 "pages/main/verify/verify_result/verify_result",
51 "pages/main/verify/verify_idcard/verify_idcard", 50 "pages/main/verify/verify_idcard/verify_idcard",
  51 + "pages/main/rewardpoint/cashout/cashout",
  52 +
52 "pages/common/webview" 53 "pages/common/webview"
53 ], 54 ],
54 "window": { 55 "window": {
@@ -196,8 +196,8 @@ Page({ @@ -196,8 +196,8 @@ Page({
196 196
197 handleDetailsData: function (data) { 197 handleDetailsData: function (data) {
198 198
199 - // let titles = JSON.parse(data['slip_titles'])  
200 - let titles = JSON.parse(data['salary_columns']) 199 + let titles = JSON.parse(data['slip_titles'])
  200 + // let titles = JSON.parse(data['salary_columns'])
201 let detail = JSON.parse(data['detail']) 201 let detail = JSON.parse(data['detail'])
202 let mapping_keys = data["mapping_keys"] ? data["mapping_keys"]:[] 202 let mapping_keys = data["mapping_keys"] ? data["mapping_keys"]:[]
203 console.log(titles,detail,mapping_keys) 203 console.log(titles,detail,mapping_keys)
@@ -46,7 +46,7 @@ @@ -46,7 +46,7 @@
46 <image class='arrow_wrap float_right' src='/images/arrow_right.png'></image> 46 <image class='arrow_wrap float_right' src='/images/arrow_right.png'></image>
47 </view> 47 </view>
48 48
49 - <view class='card_rectangle_bg_row' style='margin-top:30rpx;padding:30rpx' bindtap='goRewardPoint'> 49 + <view hidden="true" class='card_rectangle_bg_row' style='margin-top:30rpx;padding:30rpx' bindtap='goRewardPoint'>
50 <image class="icon_wrap" src="/images/reward_point.png"></image> 50 <image class="icon_wrap" src="/images/reward_point.png"></image>
51 <view style='width:1px;height:140rpx;background-color:#e5e5e5;margin-left:40rpx'></view> 51 <view style='width:1px;height:140rpx;background-color:#e5e5e5;margin-left:40rpx'></view>
52 <view style='display:flex;flex-direction: column;width:432rpx;margin-left:30rpx;align-self:center;'> 52 <view style='display:flex;flex-direction: column;width:432rpx;margin-left:30rpx;align-self:center;'>
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 <text style="font-size:48rpx;color:#333;margin-right:6rpx">￥</text> 20 <text style="font-size:48rpx;color:#333;margin-right:6rpx">￥</text>
21 <input placeholder-class="placeholder_input_wrap" class="input_wrap" type="digit" maxlength="14" placeholder="当前余额{{cashNum}}元" value="{{inputNum}}" bindinput="getInput" /> 21 <input placeholder-class="placeholder_input_wrap" class="input_wrap" type="digit" maxlength="14" placeholder="当前余额{{cashNum}}元" value="{{inputNum}}" bindinput="getInput" />
22 <image wx:if="{{inputNum&&inputNum>0}}" src="/images/clear.png" style="width:32rpx;height:32rpx;padding:36rpx" bindtap="clear"></image> 22 <image wx:if="{{inputNum&&inputNum>0}}" src="/images/clear.png" style="width:32rpx;height:32rpx;padding:36rpx" bindtap="clear"></image>
23 - <text style="height:100%;font-size:30rpx;color: #357AEB;line-height:112rpx;margin: auto;" bindtap="cashAll">全部提现</text> 23 + <text style="height:100%;font-size:30rpx;color: #357AEB;line-height:112rpx;margin: auto;margin-right: 4rpx;" bindtap="cashAll">全部提现</text>
24 </view> 24 </view>
25 25
26 <view wx:if="{{inputNum&&inputNum>cashNum}}"> 26 <view wx:if="{{inputNum&&inputNum>cashNum}}">
@@ -16,7 +16,6 @@ page{ @@ -16,7 +16,6 @@ page{
16 .placeholder_input_wrap{ 16 .placeholder_input_wrap{
17 color:#ccc; 17 color:#ccc;
18 font-size:32rpx; 18 font-size:32rpx;
19 - height: 112rpx;  
20 } 19 }
21 20
22 .input_wrap{ 21 .input_wrap{
1 { 1 {
2 - "description": "项目配置文件",  
3 - "packOptions": {  
4 - "ignore": []  
5 - },  
6 - "setting": {  
7 - "urlCheck": false,  
8 - "es6": true,  
9 - "postcss": true,  
10 - "minified": true,  
11 - "newFeature": true,  
12 - "coverView": true,  
13 - "autoAudits": false,  
14 - "showShadowRootInWxmlPanel": true,  
15 - "scopeDataCheck": false,  
16 - "checkInvalidKey": true,  
17 - "checkSiteMap": true,  
18 - "uploadWithSourceMap": true,  
19 - "babelSetting": {  
20 - "ignore": [],  
21 - "disablePlugins": [],  
22 - "outputPath": ""  
23 - },  
24 - "useIsolateContext": true,  
25 - "useCompilerModule": false,  
26 - "userConfirmedUseCompilerModuleSwitch": false  
27 - },  
28 - "compileType": "miniprogram",  
29 - "libVersion": "2.4.2",  
30 - "appid": "wxe7d4efda23782b49",  
31 - "projectname": "%E7%A4%BE%E7%A8%8E%E6%9C%BA%E5%99%A8%E4%BA%BA",  
32 - "debugOptions": {  
33 - "hidedInDevtools": []  
34 - },  
35 - "isGameTourist": false,  
36 - "simulatorType": "wechat",  
37 - "simulatorPluginLibVersion": {},  
38 - "condition": {  
39 - "search": {  
40 - "current": -1,  
41 - "list": []  
42 - },  
43 - "conversation": {  
44 - "current": -1,  
45 - "list": []  
46 - },  
47 - "game": {  
48 - "currentL": -1,  
49 - "list": []  
50 - },  
51 - "miniprogram": {  
52 - "current": -1,  
53 - "list": []  
54 - }  
55 - } 2 + "description": "项目配置文件",
  3 + "packOptions": {
  4 + "ignore": []
  5 + },
  6 + "setting": {
  7 + "urlCheck": false,
  8 + "es6": true,
  9 + "postcss": true,
  10 + "minified": true,
  11 + "newFeature": true,
  12 + "coverView": true,
  13 + "autoAudits": false,
  14 + "showShadowRootInWxmlPanel": true,
  15 + "scopeDataCheck": false,
  16 + "checkInvalidKey": true,
  17 + "checkSiteMap": true,
  18 + "uploadWithSourceMap": true,
  19 + "babelSetting": {
  20 + "ignore": [],
  21 + "disablePlugins": [],
  22 + "outputPath": ""
  23 + },
  24 + "useIsolateContext": true,
  25 + "useCompilerModule": false,
  26 + "userConfirmedUseCompilerModuleSwitch": false,
  27 + "userConfirmedBundleSwitch": false,
  28 + "packNpmManually": false,
  29 + "packNpmRelationList": [],
  30 + "minifyWXSS": true,
  31 + "useMultiFrameRuntime": true,
  32 + "bundle": false,
  33 + "useApiHook": true,
  34 + "useApiHostProcess": true
  35 + },
  36 + "compileType": "miniprogram",
  37 + "libVersion": "2.4.2",
  38 + "appid": "wxe7d4efda23782b49",
  39 + "projectname": "%E7%A4%BE%E7%A8%8E%E6%9C%BA%E5%99%A8%E4%BA%BA",
  40 + "debugOptions": {
  41 + "hidedInDevtools": []
  42 + },
  43 + "isGameTourist": false,
  44 + "simulatorType": "wechat",
  45 + "simulatorPluginLibVersion": {},
  46 + "condition": {
  47 + "search": {
  48 + "list": []
  49 + },
  50 + "conversation": {
  51 + "list": []
  52 + },
  53 + "game": {
  54 + "currentL": -1,
  55 + "list": []
  56 + },
  57 + "miniprogram": {
  58 + "list": []
  59 + }
  60 + }
56 } 61 }
请 注册 或 登录 后发表评论