Showing
12 changed files
with
295 additions
and
282 deletions
| @@ -164,10 +164,10 @@ class _CouponPageState extends State<CouponPage> with TickerProviderStateMixin { | @@ -164,10 +164,10 @@ class _CouponPageState extends State<CouponPage> with TickerProviderStateMixin { | ||
| 164 | 164 | ||
| 165 | Navigator.of(context).pop(); | 165 | Navigator.of(context).pop(); |
| 166 | }, | 166 | }, |
| 167 | - rightImgName: 'scan.png', | ||
| 168 | - onTapRight: () { | ||
| 169 | - _scan(); | ||
| 170 | - }, | 167 | + // rightImgName: 'scan.png', |
| 168 | + // onTapRight: () { | ||
| 169 | + // _scan(); | ||
| 170 | + // }, | ||
| 171 | ), | 171 | ), |
| 172 | body: WillPopScope( | 172 | body: WillPopScope( |
| 173 | onWillPop: () { | 173 | onWillPop: () { |
| @@ -2028,7 +2028,7 @@ class InvicationPageState extends State<InvicationPage> | @@ -2028,7 +2028,7 @@ class InvicationPageState extends State<InvicationPage> | ||
| 2028 | listen: false) | 2028 | listen: false) |
| 2029 | .user | 2029 | .user |
| 2030 | .sellerid, | 2030 | .sellerid, |
| 2031 | - 'id': Provider.of<UserModel>(context, | 2031 | + 'uid': Provider.of<UserModel>(context, |
| 2032 | listen: false) | 2032 | listen: false) |
| 2033 | .user | 2033 | .user |
| 2034 | .openid, | 2034 | .openid, |
| @@ -2074,65 +2074,65 @@ class InvicationPageState extends State<InvicationPage> | @@ -2074,65 +2074,65 @@ class InvicationPageState extends State<InvicationPage> | ||
| 2074 | )) | 2074 | )) |
| 2075 | : SizedBox(), | 2075 | : SizedBox(), |
| 2076 | //餐单类型 | 2076 | //餐单类型 |
| 2077 | - enterMore | ||
| 2078 | - ? Container( | ||
| 2079 | - margin: EdgeInsets.only( | ||
| 2080 | - // top: ScreenUtil().setWidth(40), | ||
| 2081 | - bottom: ScreenUtil().setWidth(40)), | ||
| 2082 | - height: ScreenUtil().setWidth(68), | ||
| 2083 | - padding: EdgeInsets.symmetric( | ||
| 2084 | - horizontal: ScreenUtil().setWidth(16)), | ||
| 2085 | - decoration: BoxDecoration( | ||
| 2086 | - borderRadius: BorderRadius.circular( | ||
| 2087 | - ScreenUtil().setWidth(12)), | ||
| 2088 | - // color: Colors.red, | ||
| 2089 | - border: Border.all( | ||
| 2090 | - width: ScreenUtil().setWidth(2), | ||
| 2091 | - color: MyColours.color_DBDBDB)), | ||
| 2092 | - child: Row( | ||
| 2093 | - mainAxisAlignment: MainAxisAlignment.spaceBetween, | ||
| 2094 | - crossAxisAlignment: CrossAxisAlignment.center, | ||
| 2095 | - children: [ | ||
| 2096 | - Text( | ||
| 2097 | - '餐单类型', | ||
| 2098 | - | ||
| 2099 | - //输入文本的样式 | ||
| 2100 | - style: TextStyle( | ||
| 2101 | - fontSize: ScreenUtil().setSp(28), | ||
| 2102 | - color: MyColours.color_353535), | ||
| 2103 | - ), | ||
| 2104 | - InkWell( | ||
| 2105 | - onTap: () { | ||
| 2106 | - FocusScope.of(context) | ||
| 2107 | - .requestFocus(FocusNode()); //隐藏键盘 | ||
| 2108 | - | ||
| 2109 | - DialogUtil.showSelectCusmanDialog( | ||
| 2110 | - context, styleList, (value) async { | ||
| 2111 | - if (value != null) { | ||
| 2112 | - styleIndex = value.first; | ||
| 2113 | - styleShow = styleList[styleIndex]; | ||
| 2114 | - | ||
| 2115 | - setState(() {}); | ||
| 2116 | - } | ||
| 2117 | - }, selecteds: [styleIndex ?? 0]) | ||
| 2118 | - .then((value) {}); | ||
| 2119 | - }, | ||
| 2120 | - child: Row(children: [ | ||
| 2121 | - Text( | ||
| 2122 | - styleShow, | ||
| 2123 | - style: TextStyle( | ||
| 2124 | - color: MyColours.color_515151, | ||
| 2125 | - fontSize: ScreenUtil().setSp(28), | ||
| 2126 | - ), | ||
| 2127 | - ), | ||
| 2128 | - Image.asset(Utils.getImgPath('quan_down_f'), | ||
| 2129 | - width: ScreenUtil().setWidth(28), | ||
| 2130 | - height: ScreenUtil().setWidth(28)), | ||
| 2131 | - ]), | ||
| 2132 | - ) | ||
| 2133 | - ], | ||
| 2134 | - )) | ||
| 2135 | - : SizedBox(), | 2077 | + // enterMore |
| 2078 | + // ? Container( | ||
| 2079 | + // margin: EdgeInsets.only( | ||
| 2080 | + // // top: ScreenUtil().setWidth(40), | ||
| 2081 | + // bottom: ScreenUtil().setWidth(40)), | ||
| 2082 | + // height: ScreenUtil().setWidth(68), | ||
| 2083 | + // padding: EdgeInsets.symmetric( | ||
| 2084 | + // horizontal: ScreenUtil().setWidth(16)), | ||
| 2085 | + // decoration: BoxDecoration( | ||
| 2086 | + // borderRadius: BorderRadius.circular( | ||
| 2087 | + // ScreenUtil().setWidth(12)), | ||
| 2088 | + // // color: Colors.red, | ||
| 2089 | + // border: Border.all( | ||
| 2090 | + // width: ScreenUtil().setWidth(2), | ||
| 2091 | + // color: MyColours.color_DBDBDB)), | ||
| 2092 | + // child: Row( | ||
| 2093 | + // mainAxisAlignment: MainAxisAlignment.spaceBetween, | ||
| 2094 | + // crossAxisAlignment: CrossAxisAlignment.center, | ||
| 2095 | + // children: [ | ||
| 2096 | + // Text( | ||
| 2097 | + // '餐单类型', | ||
| 2098 | + | ||
| 2099 | + // //输入文本的样式 | ||
| 2100 | + // style: TextStyle( | ||
| 2101 | + // fontSize: ScreenUtil().setSp(28), | ||
| 2102 | + // color: MyColours.color_353535), | ||
| 2103 | + // ), | ||
| 2104 | + // InkWell( | ||
| 2105 | + // onTap: () { | ||
| 2106 | + // FocusScope.of(context) | ||
| 2107 | + // .requestFocus(FocusNode()); //隐藏键盘 | ||
| 2108 | + | ||
| 2109 | + // DialogUtil.showSelectCusmanDialog( | ||
| 2110 | + // context, styleList, (value) async { | ||
| 2111 | + // if (value != null) { | ||
| 2112 | + // styleIndex = value.first; | ||
| 2113 | + // styleShow = styleList[styleIndex]; | ||
| 2114 | + | ||
| 2115 | + // setState(() {}); | ||
| 2116 | + // } | ||
| 2117 | + // }, selecteds: [styleIndex ?? 0]) | ||
| 2118 | + // .then((value) {}); | ||
| 2119 | + // }, | ||
| 2120 | + // child: Row(children: [ | ||
| 2121 | + // Text( | ||
| 2122 | + // styleShow, | ||
| 2123 | + // style: TextStyle( | ||
| 2124 | + // color: MyColours.color_515151, | ||
| 2125 | + // fontSize: ScreenUtil().setSp(28), | ||
| 2126 | + // ), | ||
| 2127 | + // ), | ||
| 2128 | + // Image.asset(Utils.getImgPath('quan_down_f'), | ||
| 2129 | + // width: ScreenUtil().setWidth(28), | ||
| 2130 | + // height: ScreenUtil().setWidth(28)), | ||
| 2131 | + // ]), | ||
| 2132 | + // ) | ||
| 2133 | + // ], | ||
| 2134 | + // )) | ||
| 2135 | + // : SizedBox(), | ||
| 2136 | 2136 | ||
| 2137 | //备注: | 2137 | //备注: |
| 2138 | Column( | 2138 | Column( |
| @@ -173,7 +173,7 @@ | @@ -173,7 +173,7 @@ | ||
| 173 | // ///获取微信登录access_token | 173 | // ///获取微信登录access_token |
| 174 | // _getAccessToken(String code) async { | 174 | // _getAccessToken(String code) async { |
| 175 | // Response response = await DioUtil.getInstance().getDio().get( | 175 | // Response response = await DioUtil.getInstance().getDio().get( |
| 176 | -// "https://api.weixin.qq.com/sns/oauth2/access_token?appid=wx85aa3cdd0f791e65&secret=87c9a23c2e6032b2da75af6b0efc5424&code=$code&grant_type=authorization_code"); | 176 | +// "https://api.weixin.qq.com/sns/oauth2/access_token?appid=wx85aa3cdd0f791e65&secret=90ba794b30d2fe388309149174874603&code=$code&grant_type=authorization_code"); |
| 177 | // LogUtil.v("access_token:${response.toString()}"); | 177 | // LogUtil.v("access_token:${response.toString()}"); |
| 178 | // Map<String, dynamic> responseData = json.decode(response.data.toString()); | 178 | // Map<String, dynamic> responseData = json.decode(response.data.toString()); |
| 179 | // if (responseData["errcode"] != null) { | 179 | // if (responseData["errcode"] != null) { |
| @@ -434,35 +434,40 @@ class _MyContactListPageState extends State<MyContactListPage> { | @@ -434,35 +434,40 @@ class _MyContactListPageState extends State<MyContactListPage> { | ||
| 434 | ), | 434 | ), |
| 435 | child: Row( | 435 | child: Row( |
| 436 | children: [ | 436 | children: [ |
| 437 | - model.rnameStr != null && model.rnameStr != '' | ||
| 438 | - ? Row( | ||
| 439 | - // crossAxisAlignment: CrossAxisAlignment.end, | ||
| 440 | - children: [ | ||
| 441 | - Container( | ||
| 442 | - width: w(72), | ||
| 443 | - child: Text( | ||
| 444 | - model.rnameStr, | ||
| 445 | - overflow: TextOverflow.ellipsis, | ||
| 446 | - style: TextStyle( | ||
| 447 | - color: MyColours.color_515151, | ||
| 448 | - fontSize: ScreenUtil().setSp(36), | ||
| 449 | - fontWeight: FontWeight.bold), | ||
| 450 | - )), | ||
| 451 | - HEmptyView(10), | ||
| 452 | - Text( | ||
| 453 | - model.sexStr != '' && model.sexStr != null | ||
| 454 | - ? '${model.sexStr}' | ||
| 455 | - : '', | ||
| 456 | - style: TextStyle( | 437 | + Row( |
| 438 | + // crossAxisAlignment: CrossAxisAlignment.end, | ||
| 439 | + children: [ | ||
| 440 | + Container( | ||
| 441 | + width: w(72), | ||
| 442 | + child: Text( | ||
| 443 | + model.rnameStr != null && model.rnameStr != '' | ||
| 444 | + ? model.rnameStr | ||
| 445 | + : '', | ||
| 446 | + overflow: TextOverflow.ellipsis, | ||
| 447 | + style: TextStyle( | ||
| 457 | color: MyColours.color_515151, | 448 | color: MyColours.color_515151, |
| 458 | - fontWeight: FontWeight.bold, | ||
| 459 | - fontSize: ScreenUtil().setSp(20), | ||
| 460 | - ), | 449 | + fontSize: ScreenUtil().setSp(36), |
| 450 | + fontWeight: FontWeight.bold), | ||
| 451 | + )), | ||
| 452 | + HEmptyView(10), | ||
| 453 | + Container( | ||
| 454 | + width: w(26), | ||
| 455 | + child: Text( | ||
| 456 | + model.rnameStr != null && | ||
| 457 | + model.rnameStr != '' && | ||
| 458 | + model.sexStr != '' && | ||
| 459 | + model.sexStr != null | ||
| 460 | + ? '${model.sexStr}' | ||
| 461 | + : '', | ||
| 462 | + style: TextStyle( | ||
| 463 | + color: MyColours.color_515151, | ||
| 464 | + fontWeight: FontWeight.bold, | ||
| 465 | + fontSize: ScreenUtil().setSp(20), | ||
| 461 | ), | 466 | ), |
| 462 | - HEmptyView(10), | ||
| 463 | - ], | ||
| 464 | - ) | ||
| 465 | - : SizedBox(), | 467 | + )), |
| 468 | + HEmptyView(10), | ||
| 469 | + ], | ||
| 470 | + ), | ||
| 466 | Spacer(), | 471 | Spacer(), |
| 467 | Container( | 472 | Container( |
| 468 | width: w(70), | 473 | width: w(70), |
| @@ -210,7 +210,7 @@ class _MyCustomerDetailEditPageState extends State<MyCustomerDetailEditPage> { | @@ -210,7 +210,7 @@ class _MyCustomerDetailEditPageState extends State<MyCustomerDetailEditPage> { | ||
| 210 | if (name == nameController.text && nameController.text.endsWith(suffix)) { | 210 | if (name == nameController.text && nameController.text.endsWith(suffix)) { |
| 211 | return; | 211 | return; |
| 212 | } | 212 | } |
| 213 | - nameController.text = name + suffix ?? ""; | 213 | + nameController.text = name.trim() == '' || name == null ? '' : name + suffix ?? ""; |
| 214 | } | 214 | } |
| 215 | 215 | ||
| 216 | //姓名后缀 | 216 | //姓名后缀 |
| @@ -292,30 +292,33 @@ class _MyCustomerDetailPageState extends State<MyCustomerDetailPage> { | @@ -292,30 +292,33 @@ class _MyCustomerDetailPageState extends State<MyCustomerDetailPage> { | ||
| 292 | Column(crossAxisAlignment: CrossAxisAlignment.start, children: [ | 292 | Column(crossAxisAlignment: CrossAxisAlignment.start, children: [ |
| 293 | Row( | 293 | Row( |
| 294 | children: [ | 294 | children: [ |
| 295 | - Container( | ||
| 296 | - constraints: BoxConstraints( | ||
| 297 | - maxWidth: ScreenUtil().setWidth(260)), | ||
| 298 | - child: Text( | ||
| 299 | - customerProvider.guestInfoSunModel.guest.rnameStr, | ||
| 300 | - overflow: TextOverflow.ellipsis, | ||
| 301 | - style: TextStyle( | ||
| 302 | - color: MyColours.color_515151, | ||
| 303 | - fontWeight: FontWeight.bold, | ||
| 304 | - fontSize: ScreenUtil().setSp(36)), | ||
| 305 | - )), | ||
| 306 | - HEmptyView(10), | ||
| 307 | - Container( | ||
| 308 | - child: Text( | ||
| 309 | - customerProvider.guestInfoSunModel.guest.sexStr != '' | ||
| 310 | - ? '${customerProvider.guestInfoSunModel.guest.sexStr}' | ||
| 311 | - : '', | ||
| 312 | - style: TextStyle( | ||
| 313 | - color: MyColours.color_515151, | ||
| 314 | - fontWeight: FontWeight.bold, | ||
| 315 | - fontSize: ScreenUtil().setSp(20), | ||
| 316 | - ), | ||
| 317 | - )), | ||
| 318 | - HEmptyView(6), | 295 | + if (customerProvider.guestInfoSunModel.guest.rnameStr != '') |
| 296 | + Container( | ||
| 297 | + constraints: BoxConstraints( | ||
| 298 | + maxWidth: ScreenUtil().setWidth(260)), | ||
| 299 | + child: Text( | ||
| 300 | + customerProvider.guestInfoSunModel.guest.rnameStr, | ||
| 301 | + overflow: TextOverflow.ellipsis, | ||
| 302 | + style: TextStyle( | ||
| 303 | + color: MyColours.color_515151, | ||
| 304 | + fontWeight: FontWeight.bold, | ||
| 305 | + fontSize: ScreenUtil().setSp(36)), | ||
| 306 | + )), | ||
| 307 | + if (customerProvider.guestInfoSunModel.guest.rnameStr != '') | ||
| 308 | + HEmptyView(10), | ||
| 309 | + if (customerProvider.guestInfoSunModel.guest.rnameStr != '') | ||
| 310 | + Container( | ||
| 311 | + child: Text( | ||
| 312 | + customerProvider.guestInfoSunModel.guest.sexStr != '' | ||
| 313 | + ? '${customerProvider.guestInfoSunModel.guest.sexStr}' | ||
| 314 | + : '', | ||
| 315 | + style: TextStyle( | ||
| 316 | + color: MyColours.color_515151, | ||
| 317 | + fontWeight: FontWeight.bold, | ||
| 318 | + fontSize: ScreenUtil().setSp(20), | ||
| 319 | + ), | ||
| 320 | + )), | ||
| 321 | + if (customerProvider.guestInfoSunModel.guest.rnameStr != '') HEmptyView(6), | ||
| 319 | Text( | 322 | Text( |
| 320 | customerProvider.guestInfoSunModel.guest.phone, | 323 | customerProvider.guestInfoSunModel.guest.phone, |
| 321 | overflow: TextOverflow.ellipsis, | 324 | overflow: TextOverflow.ellipsis, |
| @@ -419,35 +419,40 @@ class _ContactListPageState extends State<ContactListPage> { | @@ -419,35 +419,40 @@ class _ContactListPageState extends State<ContactListPage> { | ||
| 419 | ), | 419 | ), |
| 420 | child: Row( | 420 | child: Row( |
| 421 | children: [ | 421 | children: [ |
| 422 | - model.rnameStr != null && model.rnameStr != '' | ||
| 423 | - ? Row( | ||
| 424 | - // crossAxisAlignment: CrossAxisAlignment.end, | ||
| 425 | - children: [ | ||
| 426 | - Container( | ||
| 427 | - width: w(72), | ||
| 428 | - child: Text( | ||
| 429 | - model.rnameStr, | ||
| 430 | - overflow: TextOverflow.ellipsis, | ||
| 431 | - style: TextStyle( | ||
| 432 | - color: MyColours.color_515151, | ||
| 433 | - fontSize: ScreenUtil().setSp(36), | ||
| 434 | - fontWeight: FontWeight.bold), | ||
| 435 | - )), | ||
| 436 | - HEmptyView(10), | ||
| 437 | - Text( | ||
| 438 | - model.sexStr != '' && model.sexStr != null | ||
| 439 | - ? '${model.sexStr}' | ||
| 440 | - : '', | ||
| 441 | - style: TextStyle( | 422 | + Row( |
| 423 | + // crossAxisAlignment: CrossAxisAlignment.end, | ||
| 424 | + children: [ | ||
| 425 | + Container( | ||
| 426 | + width: w(72), | ||
| 427 | + child: Text( | ||
| 428 | + model.rnameStr != null && model.rnameStr != '' | ||
| 429 | + ? model.rnameStr | ||
| 430 | + : '', | ||
| 431 | + overflow: TextOverflow.ellipsis, | ||
| 432 | + style: TextStyle( | ||
| 442 | color: MyColours.color_515151, | 433 | color: MyColours.color_515151, |
| 443 | - fontWeight: FontWeight.bold, | ||
| 444 | - fontSize: ScreenUtil().setSp(20), | ||
| 445 | - ), | 434 | + fontSize: ScreenUtil().setSp(36), |
| 435 | + fontWeight: FontWeight.bold), | ||
| 436 | + )), | ||
| 437 | + HEmptyView(10), | ||
| 438 | + Container( | ||
| 439 | + width: w(26), | ||
| 440 | + child: Text( | ||
| 441 | + model.rnameStr != null && | ||
| 442 | + model.rnameStr != '' && | ||
| 443 | + model.sexStr != '' && | ||
| 444 | + model.sexStr != null | ||
| 445 | + ? '${model.sexStr}' | ||
| 446 | + : '', | ||
| 447 | + style: TextStyle( | ||
| 448 | + color: MyColours.color_515151, | ||
| 449 | + fontWeight: FontWeight.bold, | ||
| 450 | + fontSize: ScreenUtil().setSp(20), | ||
| 446 | ), | 451 | ), |
| 447 | - HEmptyView(10), | ||
| 448 | - ], | ||
| 449 | - ) | ||
| 450 | - : SizedBox(), | 452 | + )), |
| 453 | + HEmptyView(10), | ||
| 454 | + ], | ||
| 455 | + ), | ||
| 451 | HEmptyView(74), | 456 | HEmptyView(74), |
| 452 | Container( | 457 | Container( |
| 453 | width: w(70), | 458 | width: w(70), |
| @@ -273,102 +273,102 @@ class _CustomerSettingPageState extends State<CustomerSettingPage> { | @@ -273,102 +273,102 @@ class _CustomerSettingPageState extends State<CustomerSettingPage> { | ||
| 273 | spacing: ScreenUtil().setWidth(20), | 273 | spacing: ScreenUtil().setWidth(20), |
| 274 | runSpacing: ScreenUtil().setWidth(10), | 274 | runSpacing: ScreenUtil().setWidth(10), |
| 275 | children: _buildLabelItem(customerProvider.labelList)), | 275 | children: _buildLabelItem(customerProvider.labelList)), |
| 276 | - VEmptyView(34), | ||
| 277 | - MyDivider( | ||
| 278 | - double.infinity, | ||
| 279 | - w(1), | ||
| 280 | - color: MyColours.color_DBDBDB, | ||
| 281 | - ), | ||
| 282 | - VEmptyView(52), | ||
| 283 | - InkWell( | ||
| 284 | - onTap: () { | ||
| 285 | - setState(() { | ||
| 286 | - swichSync = !swichSync; | ||
| 287 | - }); | ||
| 288 | - // _sellerGuestSet(); | ||
| 289 | - }, | ||
| 290 | - child: Row( | ||
| 291 | - mainAxisAlignment: MainAxisAlignment.spaceBetween, | ||
| 292 | - crossAxisAlignment: CrossAxisAlignment.center, | ||
| 293 | - children: [ | ||
| 294 | - Text('是否与会员系统同步', | ||
| 295 | - style: TextStyle( | ||
| 296 | - color: MyColours.color_515151, | ||
| 297 | - fontSize: ScreenUtil().setSp(32))), | ||
| 298 | - Image.asset( | ||
| 299 | - swichSync | ||
| 300 | - ? Utils.getImgPath('f_swich_on') | ||
| 301 | - : Utils.getImgPath('f_swich_off'), | ||
| 302 | - width: ScreenUtil().setWidth(70), | ||
| 303 | - // height: ScreenUtil().setWidth(82), | ||
| 304 | - ), | ||
| 305 | - ], | ||
| 306 | - ), | ||
| 307 | - ), | ||
| 308 | - VEmptyView(48), | ||
| 309 | - InkWell( | ||
| 310 | - onTap: () { | ||
| 311 | - FocusScope.of(context).requestFocus(FocusNode()); //隐藏键盘 | ||
| 312 | - // DialogUtil.showSelectCusmanDialog(context, memberList, | ||
| 313 | - // (value) { | ||
| 314 | - // if (value != null) { | ||
| 315 | - // setState(() { | ||
| 316 | - // memberIndex = value.first; | ||
| 317 | - // memberShow = memberList[memberIndex]; | ||
| 318 | - // }); | ||
| 319 | - // } | ||
| 320 | - // }, selecteds: memberIndex == null ? [] : [memberIndex]) | ||
| 321 | - // .then((value) {}); | ||
| 322 | - }, | ||
| 323 | - child: Container( | ||
| 324 | - // height: ScreenUtil().setWidth(60), | ||
| 325 | - padding: EdgeInsets.only(bottom: ScreenUtil().setWidth(50)), | ||
| 326 | - child: Row( | ||
| 327 | - mainAxisAlignment: MainAxisAlignment.spaceBetween, | ||
| 328 | - crossAxisAlignment: CrossAxisAlignment.center, | ||
| 329 | - children: [ | ||
| 330 | - Container( | ||
| 331 | - // color: Colors.red, | ||
| 332 | - width: ScreenUtil().setWidth(150), | ||
| 333 | - height: ScreenUtil().setWidth(35), | ||
| 334 | - child: Text( | ||
| 335 | - '会员系统选择', | ||
| 336 | - style: TextStyle( | ||
| 337 | - fontSize: ScreenUtil().setSp(32), | ||
| 338 | - color: MyColours.color_515151), | ||
| 339 | - ), | ||
| 340 | - ), | ||
| 341 | - Expanded( | ||
| 342 | - child: Text( | ||
| 343 | - memberShow, | ||
| 344 | - overflow: TextOverflow.ellipsis, | ||
| 345 | - style: TextStyle( | ||
| 346 | - color: MyColours.color_353535, | ||
| 347 | - fontSize: ScreenUtil().setSp(28), | ||
| 348 | - ), | ||
| 349 | - )), | ||
| 350 | - HEmptyView(10), | ||
| 351 | - Image.asset( | ||
| 352 | - Utils.getImgPath( | ||
| 353 | - showLabel ? 'c_arrow_up' : 'c_arrow_down'), | ||
| 354 | - width: ScreenUtil().setWidth(24), | ||
| 355 | - // height: ScreenUtil().setWidth(10), | ||
| 356 | - ) | ||
| 357 | - ], | ||
| 358 | - ), | ||
| 359 | - )), | ||
| 360 | - _itemWidget('企业代码或账号', "点击这里输入企业代码或账号", null, null), | ||
| 361 | - VEmptyView(50), | ||
| 362 | - _itemWidget('管理员账号', "点击这里输入管理员账号", null, null), | ||
| 363 | - VEmptyView(50), | ||
| 364 | - _itemWidget('密码', "点击这里输入管理员密码", null, null), | ||
| 365 | - VEmptyView(40), | ||
| 366 | - Center( | ||
| 367 | - child: Text( | ||
| 368 | - '请与纳极客服400-000-9690 联系对接事宜', | ||
| 369 | - style: TextStyle( | ||
| 370 | - color: MyColours.color_999999, fontSize: font(12)), | ||
| 371 | - )) | 276 | + // VEmptyView(34), |
| 277 | + // MyDivider( | ||
| 278 | + // double.infinity, | ||
| 279 | + // w(1), | ||
| 280 | + // color: MyColours.color_DBDBDB, | ||
| 281 | + // ), | ||
| 282 | + // VEmptyView(52), | ||
| 283 | + // InkWell( | ||
| 284 | + // onTap: () { | ||
| 285 | + // setState(() { | ||
| 286 | + // swichSync = !swichSync; | ||
| 287 | + // }); | ||
| 288 | + // // _sellerGuestSet(); | ||
| 289 | + // }, | ||
| 290 | + // child: Row( | ||
| 291 | + // mainAxisAlignment: MainAxisAlignment.spaceBetween, | ||
| 292 | + // crossAxisAlignment: CrossAxisAlignment.center, | ||
| 293 | + // children: [ | ||
| 294 | + // Text('是否与会员系统同步', | ||
| 295 | + // style: TextStyle( | ||
| 296 | + // color: MyColours.color_515151, | ||
| 297 | + // fontSize: ScreenUtil().setSp(32))), | ||
| 298 | + // Image.asset( | ||
| 299 | + // swichSync | ||
| 300 | + // ? Utils.getImgPath('f_swich_on') | ||
| 301 | + // : Utils.getImgPath('f_swich_off'), | ||
| 302 | + // width: ScreenUtil().setWidth(70), | ||
| 303 | + // // height: ScreenUtil().setWidth(82), | ||
| 304 | + // ), | ||
| 305 | + // ], | ||
| 306 | + // ), | ||
| 307 | + // ), | ||
| 308 | + // VEmptyView(48), | ||
| 309 | + // InkWell( | ||
| 310 | + // onTap: () { | ||
| 311 | + // FocusScope.of(context).requestFocus(FocusNode()); //隐藏键盘 | ||
| 312 | + // // DialogUtil.showSelectCusmanDialog(context, memberList, | ||
| 313 | + // // (value) { | ||
| 314 | + // // if (value != null) { | ||
| 315 | + // // setState(() { | ||
| 316 | + // // memberIndex = value.first; | ||
| 317 | + // // memberShow = memberList[memberIndex]; | ||
| 318 | + // // }); | ||
| 319 | + // // } | ||
| 320 | + // // }, selecteds: memberIndex == null ? [] : [memberIndex]) | ||
| 321 | + // // .then((value) {}); | ||
| 322 | + // }, | ||
| 323 | + // child: Container( | ||
| 324 | + // // height: ScreenUtil().setWidth(60), | ||
| 325 | + // padding: EdgeInsets.only(bottom: ScreenUtil().setWidth(50)), | ||
| 326 | + // child: Row( | ||
| 327 | + // mainAxisAlignment: MainAxisAlignment.spaceBetween, | ||
| 328 | + // crossAxisAlignment: CrossAxisAlignment.center, | ||
| 329 | + // children: [ | ||
| 330 | + // Container( | ||
| 331 | + // // color: Colors.red, | ||
| 332 | + // width: ScreenUtil().setWidth(150), | ||
| 333 | + // height: ScreenUtil().setWidth(35), | ||
| 334 | + // child: Text( | ||
| 335 | + // '会员系统选择', | ||
| 336 | + // style: TextStyle( | ||
| 337 | + // fontSize: ScreenUtil().setSp(32), | ||
| 338 | + // color: MyColours.color_515151), | ||
| 339 | + // ), | ||
| 340 | + // ), | ||
| 341 | + // Expanded( | ||
| 342 | + // child: Text( | ||
| 343 | + // memberShow, | ||
| 344 | + // overflow: TextOverflow.ellipsis, | ||
| 345 | + // style: TextStyle( | ||
| 346 | + // color: MyColours.color_353535, | ||
| 347 | + // fontSize: ScreenUtil().setSp(28), | ||
| 348 | + // ), | ||
| 349 | + // )), | ||
| 350 | + // HEmptyView(10), | ||
| 351 | + // Image.asset( | ||
| 352 | + // Utils.getImgPath( | ||
| 353 | + // showLabel ? 'c_arrow_up' : 'c_arrow_down'), | ||
| 354 | + // width: ScreenUtil().setWidth(24), | ||
| 355 | + // // height: ScreenUtil().setWidth(10), | ||
| 356 | + // ) | ||
| 357 | + // ], | ||
| 358 | + // ), | ||
| 359 | + // )), | ||
| 360 | + // _itemWidget('企业代码或账号', "点击这里输入企业代码或账号", null, null), | ||
| 361 | + // VEmptyView(50), | ||
| 362 | + // _itemWidget('管理员账号', "点击这里输入管理员账号", null, null), | ||
| 363 | + // VEmptyView(50), | ||
| 364 | + // _itemWidget('密码', "点击这里输入管理员密码", null, null), | ||
| 365 | + // VEmptyView(40), | ||
| 366 | + // Center( | ||
| 367 | + // child: Text( | ||
| 368 | + // '请与纳极客服400-000-9690 联系对接事宜', | ||
| 369 | + // style: TextStyle( | ||
| 370 | + // color: MyColours.color_999999, fontSize: font(12)), | ||
| 371 | + // )) | ||
| 372 | ], | 372 | ], |
| 373 | ), | 373 | ), |
| 374 | ), | 374 | ), |
| @@ -107,41 +107,41 @@ class _MarketingCenterHomePageState extends State<MarketingCenterHomePage> { | @@ -107,41 +107,41 @@ class _MarketingCenterHomePageState extends State<MarketingCenterHomePage> { | ||
| 107 | child: SingleChildScrollView( | 107 | child: SingleChildScrollView( |
| 108 | child: Column( | 108 | child: Column( |
| 109 | children: [ | 109 | children: [ |
| 110 | - InkWell( | ||
| 111 | - onTap: () { | ||
| 112 | - NavigatorUtil.goRechargeHomePage(context); | ||
| 113 | - }, | ||
| 114 | - child: Padding( | ||
| 115 | - padding: EdgeInsets.only( | ||
| 116 | - left: w(16), | ||
| 117 | - top: w(12), | ||
| 118 | - bottom: w(12), | ||
| 119 | - right: w(12)), | ||
| 120 | - child: Row( | ||
| 121 | - children: [ | ||
| 122 | - Text( | ||
| 123 | - '会员充值优惠活动', | ||
| 124 | - style: TextStyle( | ||
| 125 | - color: MyColours.color_515151, | ||
| 126 | - fontSize: ScreenUtil().setWidth(32)), | ||
| 127 | - ), | ||
| 128 | - Spacer(), | ||
| 129 | - Container( | ||
| 130 | - padding: EdgeInsets.symmetric( | ||
| 131 | - horizontal: w(7), vertical: w(4)), | ||
| 132 | - child: Image.asset( | ||
| 133 | - "assets/arrow_right_new.png", | ||
| 134 | - width: ScreenUtil().setWidth(18), | ||
| 135 | - height: ScreenUtil().setWidth(32), | ||
| 136 | - ), | ||
| 137 | - ) | ||
| 138 | - ], | ||
| 139 | - ))), | ||
| 140 | - Padding( | ||
| 141 | - padding: EdgeInsets.only(left: w(16)), | ||
| 142 | - child: MyDivider(double.infinity, w(0.5), | ||
| 143 | - color: MyColours.color_E7E7E7)), | ||
| 144 | - VEmptyView(24), | 110 | + // InkWell( |
| 111 | + // onTap: () { | ||
| 112 | + // NavigatorUtil.goRechargeHomePage(context); | ||
| 113 | + // }, | ||
| 114 | + // child: Padding( | ||
| 115 | + // padding: EdgeInsets.only( | ||
| 116 | + // left: w(16), | ||
| 117 | + // top: w(12), | ||
| 118 | + // bottom: w(12), | ||
| 119 | + // right: w(12)), | ||
| 120 | + // child: Row( | ||
| 121 | + // children: [ | ||
| 122 | + // Text( | ||
| 123 | + // '会员充值优惠活动', | ||
| 124 | + // style: TextStyle( | ||
| 125 | + // color: MyColours.color_515151, | ||
| 126 | + // fontSize: ScreenUtil().setWidth(32)), | ||
| 127 | + // ), | ||
| 128 | + // Spacer(), | ||
| 129 | + // Container( | ||
| 130 | + // padding: EdgeInsets.symmetric( | ||
| 131 | + // horizontal: w(7), vertical: w(4)), | ||
| 132 | + // child: Image.asset( | ||
| 133 | + // "assets/arrow_right_new.png", | ||
| 134 | + // width: ScreenUtil().setWidth(18), | ||
| 135 | + // height: ScreenUtil().setWidth(32), | ||
| 136 | + // ), | ||
| 137 | + // ) | ||
| 138 | + // ], | ||
| 139 | + // ))), | ||
| 140 | + // Padding( | ||
| 141 | + // padding: EdgeInsets.only(left: w(16)), | ||
| 142 | + // child: MyDivider(double.infinity, w(0.5), | ||
| 143 | + // color: MyColours.color_E7E7E7)), | ||
| 144 | + // VEmptyView(24), | ||
| 145 | InkWell( | 145 | InkWell( |
| 146 | onTap: () { | 146 | onTap: () { |
| 147 | setState(() { | 147 | setState(() { |
| @@ -282,7 +282,7 @@ class _PersonnelDetailPageState extends State<PersonnelDetailPage> { | @@ -282,7 +282,7 @@ class _PersonnelDetailPageState extends State<PersonnelDetailPage> { | ||
| 282 | // Response response = await DioUtil.getInstance().getDio().get( | 282 | // Response response = await DioUtil.getInstance().getDio().get( |
| 283 | // "https://xt.colorcun.com/WechatApi/WechatApi/CreateDcSubQrcode?sellerid=$sid&uid=$uid"); | 283 | // "https://xt.colorcun.com/WechatApi/WechatApi/CreateDcSubQrcode?sellerid=$sid&uid=$uid"); |
| 284 | // Response response = await DioUtil.getInstance().getDio().get( | 284 | // Response response = await DioUtil.getInstance().getDio().get( |
| 285 | - // "https://api.weixin.qq.com/sns/oauth2/access_token?appid=wx85aa3cdd0f791e65&secret=87c9a23c2e6032b2da75af6b0efc5424&code=$code&grant_type=authorization_code"); | 285 | + // "https://api.weixin.qq.com/sns/oauth2/access_token?appid=wx85aa3cdd0f791e65&secret=90ba794b30d2fe388309149174874603&code=$code&grant_type=authorization_code"); |
| 286 | LogUtil.v("access_token:${response.toString()}"); | 286 | LogUtil.v("access_token:${response.toString()}"); |
| 287 | Map<String, dynamic> responseData = json.decode(response.toString()); | 287 | Map<String, dynamic> responseData = json.decode(response.toString()); |
| 288 | print(responseData); | 288 | print(responseData); |
| @@ -224,7 +224,7 @@ | @@ -224,7 +224,7 @@ | ||
| 224 | // // Response response = await DioUtil.getInstance().getDio().get( | 224 | // // Response response = await DioUtil.getInstance().getDio().get( |
| 225 | // // "https://xt.colorcun.com/WechatApi/WechatApi/CreateDcSubQrcode?sellerid=$sid&uid=$uid"); | 225 | // // "https://xt.colorcun.com/WechatApi/WechatApi/CreateDcSubQrcode?sellerid=$sid&uid=$uid"); |
| 226 | // // Response response = await DioUtil.getInstance().getDio().get( | 226 | // // Response response = await DioUtil.getInstance().getDio().get( |
| 227 | -// // "https://api.weixin.qq.com/sns/oauth2/access_token?appid=wx85aa3cdd0f791e65&secret=87c9a23c2e6032b2da75af6b0efc5424&code=$code&grant_type=authorization_code"); | 227 | +// // "https://api.weixin.qq.com/sns/oauth2/access_token?appid=wx85aa3cdd0f791e65&secret=90ba794b30d2fe388309149174874603&code=$code&grant_type=authorization_code"); |
| 228 | // LogUtil.v("access_token:${response.toString()}"); | 228 | // LogUtil.v("access_token:${response.toString()}"); |
| 229 | // Map<String, dynamic> responseData = json.decode(response.toString()); | 229 | // Map<String, dynamic> responseData = json.decode(response.toString()); |
| 230 | // print(responseData); | 230 | // print(responseData); |
| @@ -646,7 +646,7 @@ class _CreateStoreWinePageState extends State<CreateStoreWinePage> { | @@ -646,7 +646,7 @@ class _CreateStoreWinePageState extends State<CreateStoreWinePage> { | ||
| 646 | Provider.of<UserModel>(context, listen: false) | 646 | Provider.of<UserModel>(context, listen: false) |
| 647 | .user | 647 | .user |
| 648 | .sellerid, | 648 | .sellerid, |
| 649 | - 'id': Provider.of<UserModel>(context, listen: false) | 649 | + 'uid': Provider.of<UserModel>(context, listen: false) |
| 650 | .user | 650 | .user |
| 651 | .openid, | 651 | .openid, |
| 652 | }; | 652 | }; |
| @@ -657,10 +657,10 @@ class _CreateStoreWinePageState extends State<CreateStoreWinePage> { | @@ -657,10 +657,10 @@ class _CreateStoreWinePageState extends State<CreateStoreWinePage> { | ||
| 657 | pramas['is_member'] = memberIndex == 0 ? '1' : '0'; | 657 | pramas['is_member'] = memberIndex == 0 ? '1' : '0'; |
| 658 | } | 658 | } |
| 659 | 659 | ||
| 660 | - if (nameC.text.trim().length > 0) { | ||
| 661 | - pramas['rname'] = nameC.text; | ||
| 662 | - pramas['sex'] = '${sexSelectIndex + 1}'; | ||
| 663 | - } | 660 | + // if (nameC.text.trim().length > 0) { |
| 661 | + // pramas['rname'] = nameC.text; | ||
| 662 | + // pramas['sex'] = '${sexSelectIndex + 1}'; | ||
| 663 | + // } | ||
| 664 | 664 | ||
| 665 | await customerProvider.setInsGuest(context, pramas); | 665 | await customerProvider.setInsGuest(context, pramas); |
| 666 | } | 666 | } |
-
Please register or login to post a comment