Showing
10 changed files
with
20 additions
and
10 deletions
| @@ -77,8 +77,6 @@ PODS: | @@ -77,8 +77,6 @@ PODS: | ||
| 77 | - Flutter | 77 | - Flutter |
| 78 | - flutter_statusbarcolor_ns (0.0.1): | 78 | - flutter_statusbarcolor_ns (0.0.1): |
| 79 | - Flutter | 79 | - Flutter |
| 80 | - - flutter_wxwork (0.0.1): | ||
| 81 | - - Flutter | ||
| 82 | - fluttertoast (0.0.2): | 80 | - fluttertoast (0.0.2): |
| 83 | - Flutter | 81 | - Flutter |
| 84 | - fluwx (0.0.1): | 82 | - fluwx (0.0.1): |
| @@ -189,7 +187,6 @@ DEPENDENCIES: | @@ -189,7 +187,6 @@ DEPENDENCIES: | ||
| 189 | - flutter_native_image (from `.symlinks/plugins/flutter_native_image/ios`) | 187 | - flutter_native_image (from `.symlinks/plugins/flutter_native_image/ios`) |
| 190 | - flutter_sms (from `.symlinks/plugins/flutter_sms/ios`) | 188 | - flutter_sms (from `.symlinks/plugins/flutter_sms/ios`) |
| 191 | - flutter_statusbarcolor_ns (from `.symlinks/plugins/flutter_statusbarcolor_ns/ios`) | 189 | - flutter_statusbarcolor_ns (from `.symlinks/plugins/flutter_statusbarcolor_ns/ios`) |
| 192 | - - flutter_wxwork (from `.symlinks/plugins/flutter_wxwork/ios`) | ||
| 193 | - fluttertoast (from `.symlinks/plugins/fluttertoast/ios`) | 190 | - fluttertoast (from `.symlinks/plugins/fluttertoast/ios`) |
| 194 | - fluwx (from `.symlinks/plugins/fluwx/ios`) | 191 | - fluwx (from `.symlinks/plugins/fluwx/ios`) |
| 195 | - foundation_fluttify (from `.symlinks/plugins/foundation_fluttify/ios`) | 192 | - foundation_fluttify (from `.symlinks/plugins/foundation_fluttify/ios`) |
| @@ -282,8 +279,6 @@ EXTERNAL SOURCES: | @@ -282,8 +279,6 @@ EXTERNAL SOURCES: | ||
| 282 | :path: ".symlinks/plugins/flutter_sms/ios" | 279 | :path: ".symlinks/plugins/flutter_sms/ios" |
| 283 | flutter_statusbarcolor_ns: | 280 | flutter_statusbarcolor_ns: |
| 284 | :path: ".symlinks/plugins/flutter_statusbarcolor_ns/ios" | 281 | :path: ".symlinks/plugins/flutter_statusbarcolor_ns/ios" |
| 285 | - flutter_wxwork: | ||
| 286 | - :path: ".symlinks/plugins/flutter_wxwork/ios" | ||
| 287 | fluttertoast: | 282 | fluttertoast: |
| 288 | :path: ".symlinks/plugins/fluttertoast/ios" | 283 | :path: ".symlinks/plugins/fluttertoast/ios" |
| 289 | fluwx: | 284 | fluwx: |
| @@ -360,7 +355,6 @@ SPEC CHECKSUMS: | @@ -360,7 +355,6 @@ SPEC CHECKSUMS: | ||
| 360 | flutter_native_image: c0f200e4bc5da392b15878df38654cc85a78b090 | 355 | flutter_native_image: c0f200e4bc5da392b15878df38654cc85a78b090 |
| 361 | flutter_sms: bb63bc226f41fad2b7cc9f0b1d0c15f7730a8310 | 356 | flutter_sms: bb63bc226f41fad2b7cc9f0b1d0c15f7730a8310 |
| 362 | flutter_statusbarcolor_ns: 28ea17050f37c962fe05a4722a6d43afc4fca76b | 357 | flutter_statusbarcolor_ns: 28ea17050f37c962fe05a4722a6d43afc4fca76b |
| 363 | - flutter_wxwork: 544263eeacf44361e64b749e4ff62b5f680cbc14 | ||
| 364 | fluttertoast: 2c67e14dce98bbdb200df9e1acf610d7a6264ea1 | 358 | fluttertoast: 2c67e14dce98bbdb200df9e1acf610d7a6264ea1 |
| 365 | fluwx: 6bf9c5a3a99ad31b0de137dd92370a0d10a60f4b | 359 | fluwx: 6bf9c5a3a99ad31b0de137dd92370a0d10a60f4b |
| 366 | foundation_fluttify: f4349a7e72691ddf460062127ef64f3a221868a5 | 360 | foundation_fluttify: f4349a7e72691ddf460062127ef64f3a221868a5 |
| @@ -758,6 +758,7 @@ class Cancel { | @@ -758,6 +758,7 @@ class Cancel { | ||
| 758 | String? actionType; | 758 | String? actionType; |
| 759 | dynamic logPhoto; | 759 | dynamic logPhoto; |
| 760 | String? cdate; | 760 | String? cdate; |
| 761 | + String? account; | ||
| 761 | String get cdateStr { | 762 | String get cdateStr { |
| 762 | DateTime dateTime = | 763 | DateTime dateTime = |
| 763 | DateTime.fromMillisecondsSinceEpoch(int.parse(cdate!) * 1000); | 764 | DateTime.fromMillisecondsSinceEpoch(int.parse(cdate!) * 1000); |
| @@ -783,7 +784,8 @@ class Cancel { | @@ -783,7 +784,8 @@ class Cancel { | ||
| 783 | this.upRid, | 784 | this.upRid, |
| 784 | this.actionType, | 785 | this.actionType, |
| 785 | this.logPhoto, | 786 | this.logPhoto, |
| 786 | - this.cdate}); | 787 | + this.cdate, |
| 788 | + this.account}); | ||
| 787 | 789 | ||
| 788 | Cancel.fromJson(Map<String, dynamic> json) { | 790 | Cancel.fromJson(Map<String, dynamic> json) { |
| 789 | if (json["id"] is String) { | 791 | if (json["id"] is String) { |
| @@ -811,6 +813,11 @@ class Cancel { | @@ -811,6 +813,11 @@ class Cancel { | ||
| 811 | if (json["cdate"] is String) { | 813 | if (json["cdate"] is String) { |
| 812 | cdate = json["cdate"]; | 814 | cdate = json["cdate"]; |
| 813 | } | 815 | } |
| 816 | +if (json["account"] is String) { | ||
| 817 | + account = json["account"]; | ||
| 818 | + } | ||
| 819 | + | ||
| 820 | + | ||
| 814 | } | 821 | } |
| 815 | 822 | ||
| 816 | Map<String, dynamic> toJson() { | 823 | Map<String, dynamic> toJson() { |
| @@ -824,6 +831,7 @@ class Cancel { | @@ -824,6 +831,7 @@ class Cancel { | ||
| 824 | _data["action_type"] = actionType; | 831 | _data["action_type"] = actionType; |
| 825 | _data["log_photo"] = logPhoto; | 832 | _data["log_photo"] = logPhoto; |
| 826 | _data["cdate"] = cdate; | 833 | _data["cdate"] = cdate; |
| 834 | + _data['account'] = account; | ||
| 827 | return _data; | 835 | return _data; |
| 828 | } | 836 | } |
| 829 | } | 837 | } |
| @@ -360,6 +360,7 @@ class HandleOnlinePageState extends State<HandleOnlinePage> { | @@ -360,6 +360,7 @@ class HandleOnlinePageState extends State<HandleOnlinePage> { | ||
| 360 | "uid": userModel.user!.openid, | 360 | "uid": userModel.user!.openid, |
| 361 | "uname": userModel.user!.nickName, | 361 | "uname": userModel.user!.nickName, |
| 362 | "desc": "", | 362 | "desc": "", |
| 363 | + "account":userModel.user!.account, | ||
| 363 | }; | 364 | }; |
| 364 | Map<String, String?> params = { | 365 | Map<String, String?> params = { |
| 365 | "rid": widget.rid, | 366 | "rid": widget.rid, |
| @@ -998,6 +998,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> | @@ -998,6 +998,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> | ||
| 998 | Map<String, String?> causeMap = { | 998 | Map<String, String?> causeMap = { |
| 999 | "uid": userModel.user!.openid, | 999 | "uid": userModel.user!.openid, |
| 1000 | "uname": userModel.user!.nickName, | 1000 | "uname": userModel.user!.nickName, |
| 1001 | + "account": userModel.user!.account, | ||
| 1001 | "desc": desc, | 1002 | "desc": desc, |
| 1002 | }; | 1003 | }; |
| 1003 | Map<String, String?> params = { | 1004 | Map<String, String?> params = { |
| @@ -2776,7 +2777,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> | @@ -2776,7 +2777,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> | ||
| 2776 | ), | 2777 | ), |
| 2777 | Spacer(), | 2778 | Spacer(), |
| 2778 | Text( | 2779 | Text( |
| 2779 | - '${detailModel!.detailModelAllSunModel!.abolition == '2' ? '顾客在线取消' : detailModel!.detailModelAllSunModel!.cancel?.uname ?? ""} ${detailModel!.detailModelAllSunModel!.cancel?.cdateStr ?? ""}', | 2780 | + '${detailModel!.detailModelAllSunModel!.abolition == '2' ? '顾客在线取消' : detailModel!.detailModelAllSunModel!.cancel?.uname ?? detailModel!.detailModelAllSunModel!.cancel?.account ?? ''} ${detailModel!.detailModelAllSunModel!.cancel?.cdateStr ?? ""}', |
| 2780 | overflow: TextOverflow.ellipsis, | 2781 | overflow: TextOverflow.ellipsis, |
| 2781 | // textAlign: TextAlign.right, | 2782 | // textAlign: TextAlign.right, |
| 2782 | style: TextStyle( | 2783 | style: TextStyle( |
| @@ -61,7 +61,7 @@ class MessageTreatedPageState extends State<MessageTreatedPage> { | @@ -61,7 +61,7 @@ class MessageTreatedPageState extends State<MessageTreatedPage> { | ||
| 61 | WidgetsBinding.instance.addPostFrameCallback((_) { | 61 | WidgetsBinding.instance.addPostFrameCallback((_) { |
| 62 | messageModel.pageState = PageState.Loading; | 62 | messageModel.pageState = PageState.Loading; |
| 63 | messageModel.notifyListeners(); | 63 | messageModel.notifyListeners(); |
| 64 | - getMessage(typeid); | 64 | + getMessage(typeid,showLoading: false); |
| 65 | getSellerVersion(); | 65 | getSellerVersion(); |
| 66 | }); | 66 | }); |
| 67 | bus.on("refresh_treated_list", (arg) { | 67 | bus.on("refresh_treated_list", (arg) { |
| @@ -70,7 +70,7 @@ class MessageTreatedPageState extends State<MessageTreatedPage> { | @@ -70,7 +70,7 @@ class MessageTreatedPageState extends State<MessageTreatedPage> { | ||
| 70 | } | 70 | } |
| 71 | 71 | ||
| 72 | getSellerVersion() async { | 72 | getSellerVersion() async { |
| 73 | - await collectStoreProvider!.getSellerVersion(context); | 73 | + await collectStoreProvider!.getSellerVersion(context,showLoading: false); |
| 74 | 74 | ||
| 75 | setState(() {}); | 75 | setState(() {}); |
| 76 | } | 76 | } |
| @@ -691,6 +691,8 @@ class NoteBookPageState extends State<NoteBookPage> { | @@ -691,6 +691,8 @@ class NoteBookPageState extends State<NoteBookPage> { | ||
| 691 | "uid": userModel.user!.openid, | 691 | "uid": userModel.user!.openid, |
| 692 | "uname": userModel.user!.nickName, | 692 | "uname": userModel.user!.nickName, |
| 693 | "desc": desc, | 693 | "desc": desc, |
| 694 | + "account":userModel.user!.account, | ||
| 695 | + | ||
| 694 | }; | 696 | }; |
| 695 | params["cause"] = json.encode(causeMap); | 697 | params["cause"] = json.encode(causeMap); |
| 696 | } | 698 | } |
| @@ -360,6 +360,7 @@ class HandleOnlinePageSimState extends State<HandleOnlinePageSim> { | @@ -360,6 +360,7 @@ class HandleOnlinePageSimState extends State<HandleOnlinePageSim> { | ||
| 360 | "uid": userModel.user!.openid, | 360 | "uid": userModel.user!.openid, |
| 361 | "uname": userModel.user!.nickName, | 361 | "uname": userModel.user!.nickName, |
| 362 | "desc": "", | 362 | "desc": "", |
| 363 | + "account":userModel.user!.account, | ||
| 363 | }; | 364 | }; |
| 364 | Map<String, String?> params = { | 365 | Map<String, String?> params = { |
| 365 | "rid": widget.rid, | 366 | "rid": widget.rid, |
| @@ -771,6 +771,7 @@ class NotebookDetailPageSimState extends State<NotebookDetailPageSim> | @@ -771,6 +771,7 @@ class NotebookDetailPageSimState extends State<NotebookDetailPageSim> | ||
| 771 | "uid": userModel.user!.openid, | 771 | "uid": userModel.user!.openid, |
| 772 | "uname": userModel.user!.nickName, | 772 | "uname": userModel.user!.nickName, |
| 773 | "desc": desc, | 773 | "desc": desc, |
| 774 | + "account":userModel.user!.account, | ||
| 774 | }; | 775 | }; |
| 775 | Map<String, String?> params = { | 776 | Map<String, String?> params = { |
| 776 | "rid": widget.rid, | 777 | "rid": widget.rid, |
| @@ -133,6 +133,7 @@ class NoteBookItemFSimState extends State<NoteBookItemFSim> | @@ -133,6 +133,7 @@ class NoteBookItemFSimState extends State<NoteBookItemFSim> | ||
| 133 | "uid": userModel.user!.openid, | 133 | "uid": userModel.user!.openid, |
| 134 | "uname": userModel.user!.nickName, | 134 | "uname": userModel.user!.nickName, |
| 135 | "desc": desc, | 135 | "desc": desc, |
| 136 | + "account":userModel.user!.account, | ||
| 136 | }; | 137 | }; |
| 137 | params["cause"] = json.encode(causeMap); | 138 | params["cause"] = json.encode(causeMap); |
| 138 | } | 139 | } |
| @@ -145,6 +145,7 @@ class NoteBookItemSimpleSimState extends State<NoteBookItemSimpleSim> | @@ -145,6 +145,7 @@ class NoteBookItemSimpleSimState extends State<NoteBookItemSimpleSim> | ||
| 145 | "uid": userModel.user!.openid, | 145 | "uid": userModel.user!.openid, |
| 146 | "uname": userModel.user!.nickName, | 146 | "uname": userModel.user!.nickName, |
| 147 | "desc": desc, | 147 | "desc": desc, |
| 148 | + "account":userModel.user!.account, | ||
| 148 | }; | 149 | }; |
| 149 | params["cause"] = json.encode(causeMap); | 150 | params["cause"] = json.encode(causeMap); |
| 150 | } | 151 | } |
-
Please register or login to post a comment