wangyu / naturalPersonTax · 提交

提交 31a90dfed5d359292960ae4f60bec10ae57bfb00

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

优化

内嵌 并排对比
正在显示 36 个修改的文件 包含 468 行增加 和 44 行删除

166.8 KB | 宽: | 高:

55.1 KB | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖

61.1 KB | 宽: | 高:

83.8 KB | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖

184.3 KB | 宽: | 高:

53.2 KB | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖
1 // pages/main/addtionalreduce/addextrainfo/addextrainfo.js 1 // pages/main/addtionalreduce/addextrainfo/addextrainfo.js
2 var OSSInit; 2 var OSSInit;
3 -var baseUrl = getApp().globalData.baseUrl; 3 +var app = getApp();
  4 +var baseUrl = app.globalData.baseUrl;
4 Page({ 5 Page({
5 6
6 /** 7 /**
1 // pages/main/addtionalreduce/godeclare/godeclare.js 1 // pages/main/addtionalreduce/godeclare/godeclare.js
  2 +
  3 +var app = getApp();
  4 +var baseUrl = app.globalData.baseUrl;
2 Page({ 5 Page({
3 6
4 /** 7 /**
1 // pages/main/addtionalreduce/godetail/godetail.js 1 // pages/main/addtionalreduce/godetail/godetail.js
  2 +
  3 +var app = getApp();
  4 +var baseUrl = app.globalData.baseUrl;
2 Page({ 5 Page({
3 6
4 /** 7 /**
1 // pages/main/addtionalreduce/home.js 1 // pages/main/addtionalreduce/home.js
  2 +var app = getApp();
  3 +var baseUrl = app.globalData.baseUrl;
2 Page({ 4 Page({
3 5
4 /** 6 /**
@@ -51,8 +53,8 @@ Page({ @@ -51,8 +53,8 @@ Page({
51 var that = this 53 var that = this
52 // wx.clearStorage() 54 // wx.clearStorage()
53 wx.getStorage({ 55 wx.getStorage({
54 - key: 'is_declared',  
55 - success: function (res) { 56 + key: 'is_declared',
  57 + success: function(res) {
56 console.log("is_declared", res.data) 58 console.log("is_declared", res.data)
57 that.setData({ 59 that.setData({
58 is_declared: res.data 60 is_declared: res.data
@@ -62,13 +64,33 @@ Page({ @@ -62,13 +64,33 @@ Page({
62 64
63 wx.getStorage({ 65 wx.getStorage({
64 key: 'selectitems', 66 key: 'selectitems',
65 - success: function (res) { 67 + success: function(res) {
66 console.log("selectitems", res.data) 68 console.log("selectitems", res.data)
67 that.setData({ 69 that.setData({
68 datas02: res.data 70 datas02: res.data
69 }) 71 })
70 }, 72 },
71 }) 73 })
  74 + this.getAdditionList()
  75 + },
  76 +
  77 + getAdditionList: function() {
  78 + var that = this;
  79 + var Authorization = getApp().globalData.Authorization;
  80 + wx.request({
  81 + url: baseUrl + 'persontax/v1/additional-settings',
  82 + data: {
  83 + limit: 10,
  84 + offset: 0
  85 + },
  86 + header: {
  87 + 'content-type': 'application/json',
  88 + "Authorization": Authorization
  89 + },
  90 + success: function(res) {
  91 +
  92 + }
  93 + })
72 }, 94 },
73 95
74 /** 96 /**
1 // pages/main/addtionalreduce/childreneducate/childreneducate.js 1 // pages/main/addtionalreduce/childreneducate/childreneducate.js
  2 +var app = getApp();
  3 +var baseUrl = app.globalData.baseUrl;
  4 +
2 Page({ 5 Page({
3 6
4 /** 7 /**
@@ -10,6 +13,8 @@ Page({ @@ -10,6 +13,8 @@ Page({
10 title: '', 13 title: '',
11 imgpath: '', 14 imgpath: '',
12 new_data: null, 15 new_data: null,
  16 + modal_images: ["/images/childedu_declare.png", "/images/continueedu_declare.png", "/images/support_older_declare.png", "/images/health_declare.png", "/images/house_declare.png"],
  17 + showModal: false,
13 datas02: [] 18 datas02: []
14 }, 19 },
15 20
@@ -77,11 +82,25 @@ Page({ @@ -77,11 +82,25 @@ Page({
77 goadd: function(e) { //添加 82 goadd: function(e) { //添加
78 var that = this 83 var that = this
79 wx.navigateTo({ 84 wx.navigateTo({
80 - url: '../addextrainfo/addextrainfo?index=' + this.data.cur_index +'&title=' + that.data.title, 85 + url: '../addextrainfo/addextrainfo?index=' + this.data.cur_index + '&title=' + that.data.title,
81 }) 86 })
82 87
83 }, 88 },
84 89
  90 + showdeclare: function(e) {
  91 + console.log("showdeclare", e)
  92 + this.setData({
  93 + showModal: true
  94 + })
  95 + },
  96 +
  97 + closeModal: function(e) {
  98 + console.log("closeModal", e)
  99 + this.setData({
  100 + showModal: false
  101 + })
  102 + },
  103 +
85 /** 104 /**
86 * Lifecycle function--Called when page hide 105 * Lifecycle function--Called when page hide
87 */ 106 */
1 <!--pages/main/addtionalreduce/childreneducate/childreneducate.wxml--> 1 <!--pages/main/addtionalreduce/childreneducate/childreneducate.wxml-->
2 2
3 <view class='page'> 3 <view class='page'>
4 - <view style='display:flex;flex-direction:column'> 4 + <view style='display:flex;flex-direction:column' hidden="{{showModal}}">
5 <view style='height:180rpx'> 5 <view style='height:180rpx'>
6 - <image style='width:100%;height:180rpx;position:absolute;z-index: 1;' src='/images/extra_img_bg.png'></image> 6 + <image style='width:100%;height:180rpx;position:absolute;' src='/images/extra_img_bg.png'></image>
7 <view class='view_bg_wrap' style='margin-top: 48rpx;'> 7 <view class='view_bg_wrap' style='margin-top: 48rpx;'>
8 <view style='flex-grow: 1;text-align:center;display: flex;flex-direction: column;'> 8 <view style='flex-grow: 1;text-align:center;display: flex;flex-direction: column;'>
9 <text class='text_text_wrap'>累计使用额度</text> 9 <text class='text_text_wrap'>累计使用额度</text>
@@ -18,12 +18,10 @@ @@ -18,12 +18,10 @@
18 </view> 18 </view>
19 <view style='width:100%;height:20rpx;background:#f5f5f5'></view> 19 <view style='width:100%;height:20rpx;background:#f5f5f5'></view>
20 20
21 - <view style='padding-left:30rpx;background:#ffffff;height:100rpx;'>  
22 - <image class='icon_wrap' src="/images/rectangle_icon.png"></image>  
23 - <text style='padding-left:20rpx;line-height:100rpx' class='text_gray_32' wx:if="{{cur_index==0}}">子女教育</text>  
24 - <text style='padding-left:20rpx;line-height:100rpx' class='text_gray_32' wx:if="{{cur_index!=0}}">专项附加扣除概览</text> 21 + <view style='padding-left:30rpx;background:#ffffff;padding-top:30rpx' bindtap='showdeclare'>
  22 + <image class='icon_declare_wrap' src="/images/icon_declare.png"></image>
  23 + <text style='padding-left:15rpx;' class='text_blue_28'>申报说明</text>
25 </view> 24 </view>
26 - <view class='divide_line_f5f5f5'></view>  
27 <view wx:if='{{new_data&&new_data!=null}}' style='margin:30rpx;' class='card_rectangle_bg_column'> 25 <view wx:if='{{new_data&&new_data!=null}}' style='margin:30rpx;' class='card_rectangle_bg_column'>
28 <!-- 子女教育 --> 26 <!-- 子女教育 -->
29 <view wx:if="{{cur_index==0}}" style='display:flex;flex-direction:column;padding: 30rpx 30rpx 0 30rpx;'> 27 <view wx:if="{{cur_index==0}}" style='display:flex;flex-direction:column;padding: 30rpx 30rpx 0 30rpx;'>
@@ -173,7 +171,7 @@ @@ -173,7 +171,7 @@
173 </view> 171 </view>
174 172
175 <!-- 大病医疗 --> 173 <!-- 大病医疗 -->
176 - <view wx:if="{{title=='大病医疗'}}" style='display:flex;flex-direction:column;padding:30rpx 30rpx 0 30rpx;'> 174 + <view wx:if="{{cur_index==3}}" style='display:flex;flex-direction:column;padding:30rpx 30rpx 0 30rpx;'>
177 <view style='height:40rpx'> 175 <view style='height:40rpx'>
178 <text class='text_999_28 float_left'>姓名</text> 176 <text class='text_999_28 float_left'>姓名</text>
179 <text class='text_333_28 float_right'>{{new_data.name}}</text> 177 <text class='text_333_28 float_right'>{{new_data.name}}</text>
@@ -311,9 +309,16 @@ @@ -311,9 +309,16 @@
311 </view> 309 </view>
312 310
313 <view class='rectangle_dashed_bg' bindtap='goadd'> 311 <view class='rectangle_dashed_bg' bindtap='goadd'>
314 - <view class='text_blue_28' style='line-height:90rpx'> 312 + <view class='text_blue_28' style='line-height:90rpx;text-align:center'>
315 十 添加{{title}} 313 十 添加{{title}}
316 </view> 314 </view>
317 </view> 315 </view>
318 </view> 316 </view>
319 -</view>  
  317 +</view>
  318 +
  319 + <view class="mask" catchtouchmove="preventTouchMove" hidden="{{!showModal}}"></view>
  320 + <view style='top:250rpx;position:absolute;z-index:10;width:100%' hidden="{{!showModal}}">
  321 + <image class='modal_img' src="{{modal_images[cur_index]}}" ></image>
  322 + <text style='position:absolute;font-size:20px;color:#fff;float:right;top:0;right:100rpx' bindtap='closeModal'>x</text>
  323 + </view>
  324 +
@@ -2,7 +2,6 @@ @@ -2,7 +2,6 @@
2 2
3 .view_bg_wrap { 3 .view_bg_wrap {
4 position: absolute; 4 position: absolute;
5 - z-index: 2;  
6 display: flex; 5 display: flex;
7 width: 100%; 6 width: 100%;
8 flex-wrap: nowrap; 7 flex-wrap: nowrap;
@@ -27,6 +26,11 @@ @@ -27,6 +26,11 @@
27 height: 28rpx; 26 height: 28rpx;
28 } 27 }
29 28
  29 +.icon_declare_wrap {
  30 + width: 23rpx;
  31 + height: 26rpx;
  32 +}
  33 +
30 .text_gray_32 { 34 .text_gray_32 {
31 font-size: 32rpx; 35 font-size: 32rpx;
32 color: #6c7596; 36 color: #6c7596;
@@ -62,3 +66,23 @@ @@ -62,3 +66,23 @@
62 border: 1px dashed #d7e4fb; 66 border: 1px dashed #d7e4fb;
63 border-radius: 4px; 67 border-radius: 4px;
64 } 68 }
  69 +
  70 +/* 遮罩层 */
  71 +.mask {
  72 + width: 100%;
  73 + height: 100%;
  74 + position: fixed;
  75 + top: 0;
  76 + left: 0;
  77 + background: #000;
  78 + opacity: 0.7;
  79 + z-index: 10;
  80 +}
  81 +
  82 +.modal_img{
  83 + width: 325px;
  84 + height: 390px;
  85 + margin:0 auto;
  86 +display:block;
  87 +
  88 +}
1 // pages/main/advancepayment/home.js 1 // pages/main/advancepayment/home.js
2 var format = require('../../../utils/util.js'); 2 var format = require('../../../utils/util.js');
  3 +var app = getApp();
  4 +var baseUrl = app.globalData.baseUrl;
  5 +
3 Page({ 6 Page({
4 7
5 /** 8 /**
6 * Page initial data 9 * Page initial data
7 */ 10 */
8 data: { 11 data: {
  12 + // tab切换
  13 + isshow : false,
  14 + currentTab: 0,
  15 + datas:["","",""],
9 choosed_date: '', 16 choosed_date: '',
10 long_date: 0 17 long_date: 0
11 }, 18 },
@@ -45,6 +52,37 @@ Page({ @@ -45,6 +52,37 @@ Page({
45 }) 52 })
46 }, 53 },
47 54
  55 + /**
  56 + * 点击tab切换
  57 + */
  58 + swichNav: function (e) {
  59 + var that = this;
  60 +
  61 + if (this.data.currentTab === e.target.dataset.current) {
  62 + return false;
  63 + } else {
  64 + that.setData({
  65 + currentTab: e.target.dataset.current
  66 + })
  67 + }
  68 + },
  69 +
  70 + /**
  71 + * 滑动切换tab
  72 + */
  73 + bindChange: function (e) {
  74 +
  75 + var that = this;
  76 + that.setData({ currentTab: e.detail.current });
  77 + },
  78 +
  79 + gospan:function(e){
  80 + console.log(e)
  81 + this.setData({
  82 + isshow: !this.data.isshow
  83 + })
  84 + },
  85 +
48 /** 86 /**
49 * Lifecycle function--Called when page hide 87 * Lifecycle function--Called when page hide
50 */ 88 */
1 <!--pages/main/advancepayment/home.wxml--> 1 <!--pages/main/advancepayment/home.wxml-->
2 -<view class='page'>  
3 - <scroll-view style='margin-bottom:40rpx'> 2 +<view>
  3 + <!-- <scroll-view style='margin-bottom:40rpx'>
4 <view style='padding:30rpx;background:#ffffff'> 4 <view style='padding:30rpx;background:#ffffff'>
5 <picker mode="date" fields="month" start="1970-01" end="2100-01" bindchange="datePickerChange"> 5 <picker mode="date" fields="month" start="1970-01" end="2100-01" bindchange="datePickerChange">
6 <view> 6 <view>
@@ -103,5 +103,62 @@ @@ -103,5 +103,62 @@
103 <text class='text_wrap_right'>13860.00</text> 103 <text class='text_wrap_right'>13860.00</text>
104 </view> 104 </view>
105 </view> 105 </view>
106 - </scroll-view> 106 + </scroll-view> -->
  107 +
  108 + <picker mode="date" fields="month" start="1970-01" end="2100-01" bindchange="datePickerChange">
  109 + <view style='padding: 0 30rpx;background:#2F72E0'>
  110 + <text class='text_white_28'>{{choosed_date}}</text>
  111 + <view class='float_right'>
  112 + <image class='arrow_wrap' src='/images/arrow_down.png'></image>
  113 + </view>
  114 + </view>
  115 + </picker>
  116 + <view class="swiper-tab" style='display:flex'>
  117 + <view class="swiper-tab-list {{currentTab==0 ? 'on' : ''}}" style="margin:0 90rpx" data-current="0" bindtap="swichNav">预扣预缴</view>
  118 + <view class="swiper-tab-list {{currentTab==1 ? 'on' : ''}}" style="margin:0 90rpx" data-current="1" bindtap="swichNav">工资明细</view>
  119 + </view>
  120 + <view style='height:10rpx;background:#f8f8f8'></view>
  121 + <view class="swiper-box page" style="height:100%;margin-top:20rpx" bindchange="bindChange">
  122 + <view wx:if="{{currentTab==0}}">
  123 + <view wx:for="{{datas}}" style='margin-bottom:20rpx'>
  124 + <view class='card_rectangle_bg_column' style='padding:30rpx'>
  125 + <text style='text-align:left;font-size: 28rpx;color: #333;font-family: PingFangSC-Semibold;'>所得项目:工资薪金</text>
  126 + <view class='divide_line_f5f5f5' style='margin:30rpx 0'></view>
  127 + <text class='text_666_28'>累计收入额:10800.00</text>
  128 + <text class='text_666_28'>累计应缴纳所得额:43800.00</text>
  129 + <text class='text_666_28'>累计应扣缴税额:1860.00</text>
  130 + <text class='text_666_28'>已预交税额:1130.00</text>
  131 + <text class='text_666_28'>本期应缴税额:730.00</text>
  132 + </view>
  133 + </view>
  134 + </view>
  135 + <view wx:else>
  136 + <view wx:for="{{datas}}" style='margin-bottom:20rpx'>
  137 + <view class='card_rectangle_bg_column' style='padding:30rpx'>
  138 + <text style='text-align:left;font-size: 28rpx;color: #333;font-family: PingFangSC-Semibold;'>薪酬批次工资:业务部八月工资</text>
  139 + <view class='divide_line_f5f5f5' style='margin:20rpx 0'></view>
  140 + <text class='text_666_28'>发薪日:2018、10、31</text>
  141 + <text class='text_666_28'>计薪时间:2018/10/01-2018/10/31</text>
  142 + <text class='text_666_28'>应发额度:23460.00</text>
  143 + <text class='text_666_28'>实发:13980.00</text>
  144 + <view class='divide_line_f5f5f5' style='margin:20rpx 0'></view>
  145 + <view wx:if="{{!isshow}}" bindtap='gospan'>
  146 + <text style='font-size:28rpx;color:#4e8fe7;text-align:left'>展开</text>
  147 + <image class='head_image_wrap_down' src='/images/arrow_blue_down.png'></image>
  148 + </view>
  149 + <view wx:if="{{isshow}}" bindtap='gospan'>
  150 + <text style='font-size:28rpx;color:#4e8fe7;text-align:left'>收起</text>
  151 + <image class='head_image_wrap_up' src='/images/arrow_blue_up.png'></image>
  152 + </view>
  153 + <view wx:if="{{isshow}}" wx:for="{{datas}}">
  154 + <view>
  155 + <text style='font-size:28rpx;color:#999;text-align:left'>中文姓名</text>
  156 + <text style='font-size:28rpx;color:#999;text-align:right'>嘎嘎</text>
  157 + </view>
  158 + </view>
  159 + </view>
  160 + </view>
  161 +
  162 + </view>
  163 + </view>
107 </view> 164 </view>
1 /* pages/main/advancepayment/home.wxss */ 1 /* pages/main/advancepayment/home.wxss */
2 -  
3 -.page {  
4 - background-color: #fcfcfc; 2 +.text_white_28 {
  3 + font-size: 28rpx;
  4 + color: #fff;
  5 + font-family: PingFangSC-Regular;
  6 + line-height: 70rpx;
5 } 7 }
6 8
7 -.text_gray_32 {  
8 - font-size: 32rpx;  
9 - color: #6c7596;  
10 - font-family: PingFangSC-Semibold;  
11 - line-height: 100rpx; 9 +.text_666_28 {
  10 + font-size: 28rpx;
  11 + color: #666;
  12 + font-family: PingFangSC-Regular;
12 } 13 }
13 14
14 .arrow_wrap { 15 .arrow_wrap {
15 position: relative; 16 position: relative;
16 - width: 40rpx;  
17 - height: 40rpx;  
18 - margin-top: 30rpx; 17 + width: 20rpx;
  18 + height: 14rpx;
  19 + margin-top: 28rpx;
19 align-self: center; 20 align-self: center;
20 } 21 }
21 22
22 -.payment_img_bg { 23 +.swiper-tab {
  24 + width: 100%;
  25 + text-align: center;
  26 + line-height: 88rpx;
  27 + background: #fff;
  28 + box-sizing: border-box;
  29 +}
  30 +
  31 +.swiper-tab-list {
  32 + font-size: 28rpx;
  33 + display: inline-block;
  34 + color: #999;
  35 + flex: 1
  36 +}
  37 +
  38 +.on {
  39 + color: #4e8fe7;
  40 + border-bottom: 6rpx solid #4e8fe7;
  41 +}
  42 +
  43 +.head_image_wrap_down {
  44 + width: 24rpx;
  45 + height: 16rpx;
  46 + margin-top: 24rpx;
  47 + float:right;
  48 +}
  49 +
  50 +.head_image_wrap_up {
  51 + width: 26rpx;
  52 + height: 20rpx;
  53 + float:right;
  54 + margin-top:20rpx
  55 +}
  56 +
  57 +/* .payment_img_bg {
23 width: 92%; 58 width: 92%;
24 height: 312rpx; 59 height: 312rpx;
25 } 60 }
26 61
  62 +.text_gray_32 {
  63 + font-size: 32rpx;
  64 + color: #6c7596;
  65 + font-family: PingFangSC-Semibold;
  66 + line-height: 100rpx;
  67 +}
  68 +
27 .icon_wrap { 69 .icon_wrap {
28 width: 8rpx; 70 width: 8rpx;
29 height: 28rpx; 71 height: 28rpx;
@@ -64,4 +106,4 @@ @@ -64,4 +106,4 @@
64 color: #000; 106 color: #000;
65 text-align: right; 107 text-align: right;
66 float: right 108 float: right
67 -} 109 +} */
@@ -2,6 +2,7 @@ @@ -2,6 +2,7 @@
2 var format = require('../../../../utils/util.js'); 2 var format = require('../../../../utils/util.js');
3 var wxCharts = require('../../../../utils/wxcharts02.js'); 3 var wxCharts = require('../../../../utils/wxcharts02.js');
4 var app = getApp(); 4 var app = getApp();
  5 +var baseUrl = app.globalData.baseUrl;
5 var pieChart = null; 6 var pieChart = null;
6 Page({ 7 Page({
7 8
1 // pages/main/finalpayment/historylist/historylist.js 1 // pages/main/finalpayment/historylist/historylist.js
2 var format = require('../../../../utils/util.js'); 2 var format = require('../../../../utils/util.js');
  3 +var app = getApp();
  4 +var baseUrl = app.globalData.baseUrl;
3 Page({ 5 Page({
4 6
5 /** 7 /**
@@ -2,6 +2,7 @@ @@ -2,6 +2,7 @@
2 var format = require('../../../utils/util.js'); 2 var format = require('../../../utils/util.js');
3 var wxCharts = require('../../../utils/wxcharts01.js'); 3 var wxCharts = require('../../../utils/wxcharts01.js');
4 var app = getApp(); 4 var app = getApp();
  5 +var baseUrl = app.globalData.baseUrl;
5 var pieChart = null; 6 var pieChart = null;
6 Page({ 7 Page({
7 8
1 // pages/main/finalpayment/inputinfo/inputinfo.js 1 // pages/main/finalpayment/inputinfo/inputinfo.js
  2 +var app = getApp();
  3 +var baseUrl = app.globalData.baseUrl;
2 Page({ 4 Page({
3 5
4 /** 6 /**
1 // pages/main/guide/guide.js 1 // pages/main/guide/guide.js
  2 +
2 Page({ 3 Page({
3 4
4 /** 5 /**
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 <scroll-view> 4 <scroll-view>
5 <view class="bg_wrap"> 5 <view class="bg_wrap">
6 6
7 - <image class='bgimg' src='/images/guide_bg.jpg'></image> 7 + <image class='bgimg' src='/images/guide_bg.png'></image>
8 8
9 <view class='card_rectangle_bg_row' style='margin-top:280rpx;padding:30rpx' bindtap='gotaxPerson'> 9 <view class='card_rectangle_bg_row' style='margin-top:280rpx;padding:30rpx' bindtap='gotaxPerson'>
10 <image class="icon_wrap" src="/images/tax_person.png"></image> 10 <image class="icon_wrap" src="/images/tax_person.png"></image>
@@ -58,6 +58,6 @@ @@ -58,6 +58,6 @@
58 </view> 58 </view>
59 </scroll-view> 59 </scroll-view>
60 60
61 - <!-- <image class='chat-img' bindtap='gochat' src='/images/selected02.png'></image> --> 61 + <image class='chat-img' bindtap='gochat' src='/images/icon_chat.png'></image>
62 62
63 </view> 63 </view>
@@ -28,6 +28,7 @@ @@ -28,6 +28,7 @@
28 display: flex; 28 display: flex;
29 flex-direction: column; 29 flex-direction: column;
30 width: 100%; 30 width: 100%;
  31 + padding-bottom: 40rpx
31 } 32 }
32 33
33 .icon_wrap{ 34 .icon_wrap{
@@ -58,9 +59,9 @@ text-align: left; @@ -58,9 +59,9 @@ text-align: left;
58 } 59 }
59 60
60 .chat-img{ 61 .chat-img{
61 - width: 66rpx;  
62 - height: 66rpx; 62 + width: 96rpx;
  63 + height: 96rpx;
63 position: fixed; 64 position: fixed;
64 right: 40rpx; 65 right: 40rpx;
65 - bottom: 60rpx; 66 + bottom: 40rpx;
66 } 67 }
1 // pages/main/smartchat/chat.js 1 // pages/main/smartchat/chat.js
  2 +var app = getApp();
  3 +var baseUrl = app.globalData.baseUrl;
2 Page({ 4 Page({
3 5
4 /** 6 /**
5 * Page initial data 7 * Page initial data
6 */ 8 */
7 data: { 9 data: {
8 - 10 + showModal:true,
  11 + datas: ["", "", "", "", ""]
9 }, 12 },
10 13
11 /** 14 /**
@@ -29,6 +32,20 @@ Page({ @@ -29,6 +32,20 @@ Page({
29 32
30 }, 33 },
31 34
  35 + cancelhandle:function(e){
  36 + console.log("cancelhandle", e)
  37 + this.setData({
  38 + showModal: false
  39 + })
  40 + },
  41 +
  42 + confirmhandle: function (e) {
  43 + console.log("confirmhandle",e)
  44 + this.setData({
  45 + showModal: false
  46 + })
  47 + },
  48 +
32 /** 49 /**
33 * Lifecycle function--Called when page hide 50 * Lifecycle function--Called when page hide
34 */ 51 */
1 <!--pages/main/smartchat/chat.wxml--> 1 <!--pages/main/smartchat/chat.wxml-->
2 -<view>  
3 - <scroll-view> 2 +<view hidden='{{showModal}}'>
  3 + <scroll-view style='background:#fff;margin-bottom:150rpx'>
4 <view wx:for="{{datas}}"> 4 <view wx:for="{{datas}}">
5 - <view >666</view> 5 + <view style='margin:50rpx 60rpx 0 36rpx;display:flex;flex-direction:row'>
  6 + <image style='width:136rpx;height:92rpx' src="/images/icon_robot.png"></image>
  7 + <view class='receive_bg'>
  8 + <text class='text_receive_wrap'>您要计算工资薪金的还是劳务报酬的个您要计算工资薪金的还是劳务报酬的</text>
  9 + </view>
  10 +
  11 + </view>
  12 + <view style='margin:50rpx 36rpx 0 60rpx;display:flex;flex-direction:row'>
  13 + <view class='send_bg'>
  14 + <text class='text_send_wrap'>您要计算工资薪金的还是劳务报酬的个您要计算工资薪金的还是劳务报酬的</text>
  15 + </view>
  16 + <view style='width:136rpx;height:92rpx'>
  17 + <open-data type="userAvatarUrl"></open-data>
  18 + </view>
  19 + </view>
6 </view> 20 </view>
7 </scroll-view> 21 </scroll-view>
8 - <view style=' width: 100%;height: 50rpx;position: fixed; bottom: 0rpx;text-align:center'>  
9 - <text>发送</text> 22 + <view class='bottom_wrap'>
  23 + <input class='input_wrap'></input>
  24 + <text class='btn_send_wrap '>发送</text>
  25 + </view>
  26 +</view>
  27 +
  28 +<!-- 自定义弹窗 -->
  29 +<view class="mask" catchtouchmove="preventTouchMove" hidden="{{!showModal}}"></view>
  30 +<view class='modal_lg' hidden="{{!showModal}}">
  31 + <text class="text_title">您在多个单位有任职信息，请选择您要在哪家单位资讯问题。</text>
  32 + <view class='divide_line_f5f5f5'></view>
  33 + <view style='width:100%;display:flex;flex-direction:column;align-items:center;max-height:450rpx'>
  34 + <block wx:for="{{datas}}" wx:for-index="idx">
  35 + <view wx:if="{{idx!=1}}">
  36 + <text class='text_item_black float_left'>北京小爱智能科技有限公司</text>
  37 + </view>
  38 + <view wx:else>
  39 + <text class='text_item_blue float_left'>北京小爱智能科技有限公司</text>
  40 + <image class='icon_choosed' src="/images/icon_chat_choosed.png"></image>
  41 + </view>
  42 + <view class='divide_line_f5f5f5'></view>
  43 + </block>
  44 + </view>
  45 +
  46 + <view class='divide_line_f5f5f5'></view>
  47 + <view style='width:100%;display: flex;'>
  48 + <text class='text_cancel' bindtap='cancelhandle'>取消</text>
  49 + <view style='width:1px;background:#F5F5F5;margin:20rpx 0'></view>
  50 + <text class='text_confirm' bindtap='confirmhandle'>确定</text>
10 </view> 51 </view>
11 </view> 52 </view>
1 -/* pages/main/smartchat/chat.wxss */  
  1 +/* pages/main/smartchat/chat.wxss */
  2 +
  3 +/* 遮罩层 */
  4 +.mask {
  5 + width: 100%;
  6 + height: 100%;
  7 + position: fixed;
  8 + top: 0;
  9 + left: 0;
  10 + background: #000;
  11 + opacity: 0.7;
  12 +}
  13 +
  14 +.modal_lg {
  15 + width: 72%;
  16 + position: fixed;
  17 + top: 120px;
  18 + left: 0;
  19 + right: 0;
  20 + margin: 0 auto;
  21 + background-color: #fff;
  22 + border-radius: 7px;
  23 + display: flex;
  24 + flex-direction: column;
  25 + align-items: center;
  26 +}
  27 +
  28 +.text_title {
  29 + font-family: PingFangSC-Regular;
  30 + font-size: 15px;
  31 + color: #000;
  32 + letter-spacing: 0;
  33 + text-align: center;
  34 + line-height: 45rpx;
  35 + margin: 42rpx 42rpx 30rpx 42rpx;
  36 +}
  37 +
  38 +.icon_choosed {
  39 + width: 24rpx;
  40 + height: 26rpx;
  41 + margin-top: 30rpx;
  42 + margin-right: 20rpx;
  43 + float: right;
  44 +}
  45 +
  46 +.text_item_blue {
  47 + font-family: PingFangSC-Regular;
  48 + font-size: 16px;
  49 + color: #108ee9;
  50 + letter-spacing: 0;
  51 + line-height: 18px;
  52 + padding: 30rpx;
  53 +}
  54 +
  55 +.text_item_black {
  56 + font-family: PingFangSC-Regular;
  57 + font-size: 16px;
  58 + color: #333;
  59 + letter-spacing: 0;
  60 + line-height: 18px;
  61 + padding: 30rpx;
  62 +}
  63 +
  64 +.text_cancel {
  65 + font-family: PingFangSC-Regular;
  66 + font-size: 36rpx;
  67 + color: #999;
  68 + letter-spacing: 0;
  69 + text-align: center;
  70 + line-height: 100rpx;
  71 + flex: 1;
  72 +}
  73 +
  74 +.text_confirm {
  75 + font-family: PingFangSC-Regular;
  76 + font-size: 36rpx;
  77 + color: #108ee9;
  78 + letter-spacing: 0;
  79 + text-align: center;
  80 + line-height: 100rpx;
  81 + flex: 1;
  82 +}
  83 +
  84 +/* 聊天页面 */
  85 +
  86 +.bottom_wrap {
  87 + width: 100%;
  88 + height: 120rpx;
  89 + position: fixed;
  90 + bottom: 0rpx;
  91 + background: #fcfcfc;
  92 +}
  93 +
  94 +.btn_send_wrap {
  95 + background: #6db1ff;
  96 + border-radius: 4px;
  97 + height: auto;
  98 + width: 86px;
  99 + color: #fff;
  100 + font-size: 32rpx;
  101 + float: right;
  102 + text-align: center;
  103 + line-height: 80rpx;
  104 + margin-top: 20rpx;
  105 + margin-bottom: 20rpx;
  106 + margin-right: 30rpx;
  107 +}
  108 +
  109 +.input_wrap {
  110 + background: #fff;
  111 + width: 486rpx;
  112 + height: 40px;
  113 + float: left;
  114 + margin: 24rpx 30rpx;
  115 + border: 1px solid #e7e7e7;
  116 + border-radius: 4px;
  117 +}
  118 +
  119 +.receive_bg{
  120 + border: 1px solid #e7e7e7;
  121 + border-radius: 8px;
  122 + padding: 24rpx 28rpx;
  123 + margin-left: 28rpx;
  124 +}
  125 +
  126 +.text_receive_wrap {
  127 + font-family: PingFangSC-Regular;
  128 + font-size: 14px;
  129 + color: #4a4a4a;
  130 + letter-spacing: 0;
  131 +}
  132 +
  133 +.send_bg{
  134 + background: #6DB1FF;
  135 +border-radius: 8px;
  136 + padding: 24rpx 28rpx;
  137 + margin-right: 28rpx;
  138 +}
  139 +
  140 +.text_send_wrap {
  141 + font-family: PingFangSC-Regular;
  142 + font-size: 14px;
  143 + color: #4a4a4a;
  144 + letter-spacing: 0;
  145 +}
请 注册 或 登录 后发表评论