xt / xcx-book · Commits

Go to a project

Commit 927f387a276a6019c6fa6faca35f395a32581f84

Authored by “pengye”
1 parent 14dc2753
build: skipped

邀请函、商家详情弹框领券样式调整

Inline Side-by-side
Showing 25 changed files with 97 additions and 71 deletions
@@ -322,7 +322,7 @@ @@ -322,7 +322,7 @@
322 </view> 322 </view>
323 </my-modal> 323 </my-modal>
324 <my-modal id="couponModal" fadeStyle="slideUp" height="240px"> 324 <my-modal id="couponModal" fadeStyle="slideUp" height="240px">
325 - <view slot="modalName" class="titleModal titleModal2"> 325 + <view slot="modalName" class="titleModal">
326 <image bindtap="closeCouponModal" class="closeImg" src="https://qn.colorcun.com/closeOutline.png" mode=""/> 326 <image bindtap="closeCouponModal" class="closeImg" src="https://qn.colorcun.com/closeOutline.png" mode=""/>
327 <view class="nameInfo">{{seller.name||reserve.seller_name}}</view> 327 <view class="nameInfo">{{seller.name||reserve.seller_name}}</view>
328 <view class="couponTotal" wx:if="{{totalPrice}}"> 328 <view class="couponTotal" wx:if="{{totalPrice}}">
@@ -798,8 +798,9 @@ @@ -798,8 +798,9 @@
798 } 798 }
799 799
800 #couponModal .titleModal { 800 #couponModal .titleModal {
801 - margin-top: 30%; 801 + margin-top: 60%;
802 position: relative; 802 position: relative;
  803 + width: 100%;
803 } 804 }
804 805
805 #couponModal .titleModal2 { 806 #couponModal .titleModal2 {
@@ -830,6 +831,7 @@ @@ -830,6 +831,7 @@
830 color: #fff; 831 color: #fff;
831 margin-bottom: 40rpx; 832 margin-bottom: 40rpx;
832 padding-top: 60rpx; 833 padding-top: 60rpx;
  834 + text-align: center;
833 } 835 }
834 836
835 .couponTotal { 837 .couponTotal {
@@ -842,6 +844,7 @@ @@ -842,6 +844,7 @@
842 display: flex; 844 display: flex;
843 align-items: center; 845 align-items: center;
844 justify-content: center; 846 justify-content: center;
  847 + margin: 20% 0 10% 0;
845 } 848 }
846 849
847 .counterText { 850 .counterText {
@@ -854,7 +857,7 @@ @@ -854,7 +857,7 @@
854 .couponInfo { 857 .couponInfo {
855 color: #DFDFDF; 858 color: #DFDFDF;
856 text-align: center; 859 text-align: center;
857 - margin-bottom: 30rpx; 860 + margin-bottom: 40rpx;
858 } 861 }
859 862
860 .couponBox { 863 .couponBox {
@@ -938,6 +941,6 @@ @@ -938,6 +941,6 @@
938 width: 60rpx; 941 width: 60rpx;
939 height: 60rpx; 942 height: 60rpx;
940 position: absolute; 943 position: absolute;
941 - right: 0;  
942 - top: 0; 944 + right: 5%;
  945 + top: -10%;
943 } 946 }
@@ -483,7 +483,7 @@ @@ -483,7 +483,7 @@
483 </view> 483 </view>
484 </my-modal> 484 </my-modal>
485 <my-modal id="couponModal" fadeStyle="slideUp" height="240px"> 485 <my-modal id="couponModal" fadeStyle="slideUp" height="240px">
486 - <view slot="modalName" class="titleModal titleModal2"> 486 + <view slot="modalName" class="titleModal">
487 <image bindtap="closeCouponModal" class="closeImg" src="https://qn.colorcun.com/closeOutline.png" mode=""/> 487 <image bindtap="closeCouponModal" class="closeImg" src="https://qn.colorcun.com/closeOutline.png" mode=""/>
488 <view class="nameInfo">{{seller.name||reserve.seller_name}}</view> 488 <view class="nameInfo">{{seller.name||reserve.seller_name}}</view>
489 <view class="couponTotal" wx:if="{{totalPrice}}"> 489 <view class="couponTotal" wx:if="{{totalPrice}}">
@@ -896,8 +896,9 @@ @@ -896,8 +896,9 @@
896 } 896 }
897 897
898 #couponModal .titleModal { 898 #couponModal .titleModal {
899 - margin-top: 30%; 899 + margin-top: 60%;
900 position: relative; 900 position: relative;
  901 + width: 100%;
901 } 902 }
902 903
903 #couponModal .titleModal2 { 904 #couponModal .titleModal2 {
@@ -928,6 +929,7 @@ @@ -928,6 +929,7 @@
928 color: #fff; 929 color: #fff;
929 margin-bottom: 40rpx; 930 margin-bottom: 40rpx;
930 padding-top: 60rpx; 931 padding-top: 60rpx;
  932 + text-align: center;
931 } 933 }
932 934
933 .couponTotal { 935 .couponTotal {
@@ -940,6 +942,7 @@ @@ -940,6 +942,7 @@
940 display: flex; 942 display: flex;
941 align-items: center; 943 align-items: center;
942 justify-content: center; 944 justify-content: center;
  945 + margin: 20% 0 10% 0;
943 } 946 }
944 947
945 .counterText { 948 .counterText {
@@ -952,7 +955,7 @@ @@ -952,7 +955,7 @@
952 .couponInfo { 955 .couponInfo {
953 color: #DFDFDF; 956 color: #DFDFDF;
954 text-align: center; 957 text-align: center;
955 - margin-bottom: 30rpx; 958 + margin-bottom: 40rpx;
956 } 959 }
957 960
958 .couponBox { 961 .couponBox {
@@ -1036,8 +1039,8 @@ @@ -1036,8 +1039,8 @@
1036 width: 60rpx; 1039 width: 60rpx;
1037 height: 60rpx; 1040 height: 60rpx;
1038 position: absolute; 1041 position: absolute;
1039 - right: 0;  
1040 - top: 0; 1042 + right: 5%;
  1043 + top: -10%;
1041 } 1044 }
1042 1045
1043 /* 商务宴会 */ 1046 /* 商务宴会 */
@@ -456,7 +456,7 @@ @@ -456,7 +456,7 @@
456 </view> 456 </view>
457 </my-modal> 457 </my-modal>
458 <my-modal id="couponModal" fadeStyle="slideUp" height="240px"> 458 <my-modal id="couponModal" fadeStyle="slideUp" height="240px">
459 - <view slot="modalName" class="titleModal titleModal2"> 459 + <view slot="modalName" class="titleModal">
460 <image bindtap="closeCouponModal" class="closeImg" src="https://qn.colorcun.com/closeOutline.png" mode=""/> 460 <image bindtap="closeCouponModal" class="closeImg" src="https://qn.colorcun.com/closeOutline.png" mode=""/>
461 <view class="nameInfo">{{seller.name||reserve.seller_name}}</view> 461 <view class="nameInfo">{{seller.name||reserve.seller_name}}</view>
462 <view class="couponTotal" wx:if="{{totalPrice}}"> 462 <view class="couponTotal" wx:if="{{totalPrice}}">
@@ -950,8 +950,9 @@ @@ -950,8 +950,9 @@
950 } 950 }
951 951
952 #couponModal .titleModal { 952 #couponModal .titleModal {
953 - margin-top: 30%; 953 + margin-top: 60%;
954 position: relative; 954 position: relative;
  955 + width: 100%;
955 } 956 }
956 957
957 #couponModal .titleModal2 { 958 #couponModal .titleModal2 {
@@ -982,6 +983,7 @@ @@ -982,6 +983,7 @@
982 color: #fff; 983 color: #fff;
983 margin-bottom: 40rpx; 984 margin-bottom: 40rpx;
984 padding-top: 60rpx; 985 padding-top: 60rpx;
  986 + text-align: center;
985 } 987 }
986 988
987 .couponTotal { 989 .couponTotal {
@@ -994,6 +996,7 @@ @@ -994,6 +996,7 @@
994 display: flex; 996 display: flex;
995 align-items: center; 997 align-items: center;
996 justify-content: center; 998 justify-content: center;
  999 + margin: 20% 0 10% 0;
997 } 1000 }
998 1001
999 .counterText { 1002 .counterText {
@@ -1006,7 +1009,7 @@ @@ -1006,7 +1009,7 @@
1006 .couponInfo { 1009 .couponInfo {
1007 color: #DFDFDF; 1010 color: #DFDFDF;
1008 text-align: center; 1011 text-align: center;
1009 - margin-bottom: 30rpx; 1012 + margin-bottom: 40rpx;
1010 } 1013 }
1011 1014
1012 .couponBox { 1015 .couponBox {
@@ -1090,8 +1093,8 @@ @@ -1090,8 +1093,8 @@
1090 width: 60rpx; 1093 width: 60rpx;
1091 height: 60rpx; 1094 height: 60rpx;
1092 position: absolute; 1095 position: absolute;
1093 - right: 0;  
1094 - top: 0; 1096 + right: 5%;
  1097 + top: -10%;
1095 } 1098 }
1096 1099
1097 /* 商务宴会 */ 1100 /* 商务宴会 */
@@ -350,7 +350,7 @@ @@ -350,7 +350,7 @@
350 </view> 350 </view>
351 </my-modal> 351 </my-modal>
352 <my-modal id="couponModal" fadeStyle="slideUp" height="240px"> 352 <my-modal id="couponModal" fadeStyle="slideUp" height="240px">
353 - <view slot="modalName" class="titleModal titleModal2"> 353 + <view slot="modalName" class="titleModal">
354 <image bindtap="closeCouponModal" class="closeImg" src="https://qn.colorcun.com/closeOutline.png" mode=""/> 354 <image bindtap="closeCouponModal" class="closeImg" src="https://qn.colorcun.com/closeOutline.png" mode=""/>
355 <view class="nameInfo">{{seller.name||reserve.seller_name}}</view> 355 <view class="nameInfo">{{seller.name||reserve.seller_name}}</view>
356 <view class="couponTotal" wx:if="{{totalPrice}}"> 356 <view class="couponTotal" wx:if="{{totalPrice}}">
@@ -810,8 +810,9 @@ @@ -810,8 +810,9 @@
810 } 810 }
811 811
812 #couponModal .titleModal { 812 #couponModal .titleModal {
813 - margin-top: 30%; 813 + margin-top: 60%;
814 position: relative; 814 position: relative;
  815 + width: 100%;
815 } 816 }
816 817
817 #couponModal .titleModal2 { 818 #couponModal .titleModal2 {
@@ -842,6 +843,7 @@ @@ -842,6 +843,7 @@
842 color: #fff; 843 color: #fff;
843 margin-bottom: 40rpx; 844 margin-bottom: 40rpx;
844 padding-top: 60rpx; 845 padding-top: 60rpx;
  846 + text-align: center;
845 } 847 }
846 848
847 .couponTotal { 849 .couponTotal {
@@ -854,6 +856,7 @@ @@ -854,6 +856,7 @@
854 display: flex; 856 display: flex;
855 align-items: center; 857 align-items: center;
856 justify-content: center; 858 justify-content: center;
  859 + margin: 20% 0 10% 0;
857 } 860 }
858 861
859 .counterText { 862 .counterText {
@@ -866,7 +869,7 @@ @@ -866,7 +869,7 @@
866 .couponInfo { 869 .couponInfo {
867 color: #DFDFDF; 870 color: #DFDFDF;
868 text-align: center; 871 text-align: center;
869 - margin-bottom: 30rpx; 872 + margin-bottom: 40rpx;
870 } 873 }
871 874
872 .couponBox { 875 .couponBox {
@@ -950,8 +953,8 @@ @@ -950,8 +953,8 @@
950 width: 60rpx; 953 width: 60rpx;
951 height: 60rpx; 954 height: 60rpx;
952 position: absolute; 955 position: absolute;
953 - right: 0;  
954 - top: 0; 956 + right: 5%;
  957 + top: -10%;
955 } 958 }
956 959
957 /* 深中国红 */ 960 /* 深中国红 */
@@ -355,7 +355,7 @@ @@ -355,7 +355,7 @@
355 </view> 355 </view>
356 </my-modal> 356 </my-modal>
357 <my-modal id="couponModal" fadeStyle="slideUp" height="240px"> 357 <my-modal id="couponModal" fadeStyle="slideUp" height="240px">
358 - <view slot="modalName" class="titleModal titleModal2"> 358 + <view slot="modalName" class="titleModal">
359 <image bindtap="closeCouponModal" class="closeImg" src="https://qn.colorcun.com/closeOutline.png" mode=""/> 359 <image bindtap="closeCouponModal" class="closeImg" src="https://qn.colorcun.com/closeOutline.png" mode=""/>
360 <view class="nameInfo">{{seller.name||reserve.seller_name}}</view> 360 <view class="nameInfo">{{seller.name||reserve.seller_name}}</view>
361 <view class="couponTotal" wx:if="{{totalPrice}}"> 361 <view class="couponTotal" wx:if="{{totalPrice}}">
@@ -842,8 +842,9 @@ @@ -842,8 +842,9 @@
842 } 842 }
843 843
844 #couponModal .titleModal { 844 #couponModal .titleModal {
845 - margin-top: 30%; 845 + margin-top: 60%;
846 position: relative; 846 position: relative;
  847 + width: 100%;
847 } 848 }
848 849
849 #couponModal .titleModal2 { 850 #couponModal .titleModal2 {
@@ -874,6 +875,7 @@ @@ -874,6 +875,7 @@
874 color: #fff; 875 color: #fff;
875 margin-bottom: 40rpx; 876 margin-bottom: 40rpx;
876 padding-top: 60rpx; 877 padding-top: 60rpx;
  878 + text-align: center;
877 } 879 }
878 880
879 .couponTotal { 881 .couponTotal {
@@ -886,6 +888,7 @@ @@ -886,6 +888,7 @@
886 display: flex; 888 display: flex;
887 align-items: center; 889 align-items: center;
888 justify-content: center; 890 justify-content: center;
  891 + margin: 20% 0 10% 0;
889 } 892 }
890 893
891 .counterText { 894 .counterText {
@@ -898,7 +901,7 @@ @@ -898,7 +901,7 @@
898 .couponInfo { 901 .couponInfo {
899 color: #DFDFDF; 902 color: #DFDFDF;
900 text-align: center; 903 text-align: center;
901 - margin-bottom: 30rpx; 904 + margin-bottom: 40rpx;
902 } 905 }
903 906
904 .couponBox { 907 .couponBox {
@@ -982,8 +985,8 @@ @@ -982,8 +985,8 @@
982 width: 60rpx; 985 width: 60rpx;
983 height: 60rpx; 986 height: 60rpx;
984 position: absolute; 987 position: absolute;
985 - right: 0;  
986 - top: 0; 988 + right: 5%;
  989 + top: -10%;
987 } 990 }
988 991
989 /* 深中国红 */ 992 /* 深中国红 */
@@ -338,7 +338,7 @@ @@ -338,7 +338,7 @@
338 </view> 338 </view>
339 </my-modal> 339 </my-modal>
340 <my-modal id="couponModal" fadeStyle="slideUp" height="240px"> 340 <my-modal id="couponModal" fadeStyle="slideUp" height="240px">
341 - <view slot="modalName" class="titleModal titleModal2"> 341 + <view slot="modalName" class="titleModal">
342 <image bindtap="closeCouponModal" class="closeImg" src="https://qn.colorcun.com/closeOutline.png" mode=""/> 342 <image bindtap="closeCouponModal" class="closeImg" src="https://qn.colorcun.com/closeOutline.png" mode=""/>
343 <view class="nameInfo">{{seller.name||reserve.seller_name}}</view> 343 <view class="nameInfo">{{seller.name||reserve.seller_name}}</view>
344 <view class="couponTotal" wx:if="{{totalPrice}}"> 344 <view class="couponTotal" wx:if="{{totalPrice}}">
@@ -832,8 +832,9 @@ @@ -832,8 +832,9 @@
832 } 832 }
833 833
834 #couponModal .titleModal { 834 #couponModal .titleModal {
835 - margin-top: 30%; 835 + margin-top: 60%;
836 position: relative; 836 position: relative;
  837 + width: 100%;
837 } 838 }
838 839
839 #couponModal .titleModal2 { 840 #couponModal .titleModal2 {
@@ -864,6 +865,7 @@ @@ -864,6 +865,7 @@
864 color: #fff; 865 color: #fff;
865 margin-bottom: 40rpx; 866 margin-bottom: 40rpx;
866 padding-top: 60rpx; 867 padding-top: 60rpx;
  868 + text-align: center;
867 } 869 }
868 870
869 .couponTotal { 871 .couponTotal {
@@ -876,6 +878,7 @@ @@ -876,6 +878,7 @@
876 display: flex; 878 display: flex;
877 align-items: center; 879 align-items: center;
878 justify-content: center; 880 justify-content: center;
  881 + margin: 20% 0 10% 0;
879 } 882 }
880 883
881 .counterText { 884 .counterText {
@@ -888,7 +891,7 @@ @@ -888,7 +891,7 @@
888 .couponInfo { 891 .couponInfo {
889 color: #DFDFDF; 892 color: #DFDFDF;
890 text-align: center; 893 text-align: center;
891 - margin-bottom: 30rpx; 894 + margin-bottom: 40rpx;
892 } 895 }
893 896
894 .couponBox { 897 .couponBox {
@@ -972,8 +975,8 @@ @@ -972,8 +975,8 @@
972 width: 60rpx; 975 width: 60rpx;
973 height: 60rpx; 976 height: 60rpx;
974 position: absolute; 977 position: absolute;
975 - right: 0;  
976 - top: 0; 978 + right: 5%;
  979 + top: -10%;
977 } 980 }
978 981
979 /* 深中国红 */ 982 /* 深中国红 */
@@ -337,7 +337,7 @@ @@ -337,7 +337,7 @@
337 </view> 337 </view>
338 </my-modal> 338 </my-modal>
339 <my-modal id="couponModal" fadeStyle="slideUp" height="240px"> 339 <my-modal id="couponModal" fadeStyle="slideUp" height="240px">
340 - <view slot="modalName" class="titleModal titleModal2"> 340 + <view slot="modalName" class="titleModal">
341 <image bindtap="closeCouponModal" class="closeImg" src="https://qn.colorcun.com/closeOutline.png" mode=""/> 341 <image bindtap="closeCouponModal" class="closeImg" src="https://qn.colorcun.com/closeOutline.png" mode=""/>
342 <view class="nameInfo">{{seller.name||reserve.seller_name}}</view> 342 <view class="nameInfo">{{seller.name||reserve.seller_name}}</view>
343 <view class="couponTotal" wx:if="{{totalPrice}}"> 343 <view class="couponTotal" wx:if="{{totalPrice}}">
@@ -831,8 +831,9 @@ @@ -831,8 +831,9 @@
831 } 831 }
832 832
833 #couponModal .titleModal { 833 #couponModal .titleModal {
834 - margin-top: 30%; 834 + margin-top: 60%;
835 position: relative; 835 position: relative;
  836 + width: 100%;
836 } 837 }
837 838
838 #couponModal .titleModal2 { 839 #couponModal .titleModal2 {
@@ -863,6 +864,7 @@ @@ -863,6 +864,7 @@
863 color: #fff; 864 color: #fff;
864 margin-bottom: 40rpx; 865 margin-bottom: 40rpx;
865 padding-top: 60rpx; 866 padding-top: 60rpx;
  867 + text-align: center;
866 } 868 }
867 869
868 .couponTotal { 870 .couponTotal {
@@ -875,6 +877,7 @@ @@ -875,6 +877,7 @@
875 display: flex; 877 display: flex;
876 align-items: center; 878 align-items: center;
877 justify-content: center; 879 justify-content: center;
  880 + margin: 20% 0 10% 0;
878 } 881 }
879 882
880 .counterText { 883 .counterText {
@@ -887,7 +890,7 @@ @@ -887,7 +890,7 @@
887 .couponInfo { 890 .couponInfo {
888 color: #DFDFDF; 891 color: #DFDFDF;
889 text-align: center; 892 text-align: center;
890 - margin-bottom: 30rpx; 893 + margin-bottom: 40rpx;
891 } 894 }
892 895
893 .couponBox { 896 .couponBox {
@@ -971,8 +974,8 @@ @@ -971,8 +974,8 @@
971 width: 60rpx; 974 width: 60rpx;
972 height: 60rpx; 975 height: 60rpx;
973 position: absolute; 976 position: absolute;
974 - right: 0;  
975 - top: 0; 977 + right: 5%;
  978 + top: -10%;
976 } 979 }
977 980
978 /* 深中国红 */ 981 /* 深中国红 */
@@ -325,7 +325,7 @@ @@ -325,7 +325,7 @@
325 </view> 325 </view>
326 </my-modal> 326 </my-modal>
327 <my-modal id="couponModal" fadeStyle="slideUp" height="240px"> 327 <my-modal id="couponModal" fadeStyle="slideUp" height="240px">
328 - <view slot="modalName" class="titleModal titleModal2"> 328 + <view slot="modalName" class="titleModal">
329 <image bindtap="closeCouponModal" class="closeImg" src="https://qn.colorcun.com/closeOutline.png" mode=""/> 329 <image bindtap="closeCouponModal" class="closeImg" src="https://qn.colorcun.com/closeOutline.png" mode=""/>
330 <view class="nameInfo">{{seller.name||reserve.seller_name}}</view> 330 <view class="nameInfo">{{seller.name||reserve.seller_name}}</view>
331 <view class="couponTotal" wx:if="{{totalPrice}}"> 331 <view class="couponTotal" wx:if="{{totalPrice}}">
@@ -981,8 +981,9 @@ @@ -981,8 +981,9 @@
981 } 981 }
982 982
983 #couponModal .titleModal { 983 #couponModal .titleModal {
984 - margin-top: 30%; 984 + margin-top: 60%;
985 position: relative; 985 position: relative;
  986 + width: 100%;
986 } 987 }
987 988
988 #couponModal .titleModal2 { 989 #couponModal .titleModal2 {
@@ -1013,6 +1014,7 @@ @@ -1013,6 +1014,7 @@
1013 color: #fff; 1014 color: #fff;
1014 margin-bottom: 40rpx; 1015 margin-bottom: 40rpx;
1015 padding-top: 60rpx; 1016 padding-top: 60rpx;
  1017 + text-align: center;
1016 } 1018 }
1017 1019
1018 .couponTotal { 1020 .couponTotal {
@@ -1025,6 +1027,7 @@ @@ -1025,6 +1027,7 @@
1025 display: flex; 1027 display: flex;
1026 align-items: center; 1028 align-items: center;
1027 justify-content: center; 1029 justify-content: center;
  1030 + margin: 20% 0 10% 0;
1028 } 1031 }
1029 1032
1030 .counterText { 1033 .counterText {
@@ -1037,7 +1040,7 @@ @@ -1037,7 +1040,7 @@
1037 .couponInfo { 1040 .couponInfo {
1038 color: #DFDFDF; 1041 color: #DFDFDF;
1039 text-align: center; 1042 text-align: center;
1040 - margin-bottom: 30rpx; 1043 + margin-bottom: 40rpx;
1041 } 1044 }
1042 1045
1043 .couponBox { 1046 .couponBox {
@@ -1121,8 +1124,8 @@ @@ -1121,8 +1124,8 @@
1121 width: 60rpx; 1124 width: 60rpx;
1122 height: 60rpx; 1125 height: 60rpx;
1123 position: absolute; 1126 position: absolute;
1124 - right: 0;  
1125 - top: 0; 1127 + right: 5%;
  1128 + top: -10%;
1126 } 1129 }
1127 1130
1128 .arrivalBox{ 1131 .arrivalBox{
@@ -350,7 +350,7 @@ @@ -350,7 +350,7 @@
350 </view> 350 </view>
351 </my-modal> 351 </my-modal>
352 <my-modal id="couponModal" fadeStyle="slideUp" height="240px"> 352 <my-modal id="couponModal" fadeStyle="slideUp" height="240px">
353 - <view slot="modalName" class="titleModal titleModal2"> 353 + <view slot="modalName" class="titleModal">
354 <image bindtap="closeCouponModal" class="closeImg" src="https://qn.colorcun.com/closeOutline.png" mode=""/> 354 <image bindtap="closeCouponModal" class="closeImg" src="https://qn.colorcun.com/closeOutline.png" mode=""/>
355 <view class="nameInfo">{{seller.name||reserve.seller_name}}</view> 355 <view class="nameInfo">{{seller.name||reserve.seller_name}}</view>
356 <view class="couponTotal" wx:if="{{totalPrice}}"> 356 <view class="couponTotal" wx:if="{{totalPrice}}">
@@ -830,8 +830,9 @@ @@ -830,8 +830,9 @@
830 } 830 }
831 831
832 #couponModal .titleModal { 832 #couponModal .titleModal {
833 - margin-top: 30%; 833 + margin-top: 60%;
834 position: relative; 834 position: relative;
  835 + width: 100%;
835 } 836 }
836 837
837 #couponModal .titleModal2 { 838 #couponModal .titleModal2 {
@@ -862,6 +863,7 @@ @@ -862,6 +863,7 @@
862 color: #fff; 863 color: #fff;
863 margin-bottom: 40rpx; 864 margin-bottom: 40rpx;
864 padding-top: 60rpx; 865 padding-top: 60rpx;
  866 + text-align: center;
865 } 867 }
866 868
867 .couponTotal { 869 .couponTotal {
@@ -874,6 +876,7 @@ @@ -874,6 +876,7 @@
874 display: flex; 876 display: flex;
875 align-items: center; 877 align-items: center;
876 justify-content: center; 878 justify-content: center;
  879 + margin: 20% 0 10% 0;
877 } 880 }
878 881
879 .counterText { 882 .counterText {
@@ -886,7 +889,7 @@ @@ -886,7 +889,7 @@
886 .couponInfo { 889 .couponInfo {
887 color: #DFDFDF; 890 color: #DFDFDF;
888 text-align: center; 891 text-align: center;
889 - margin-bottom: 30rpx; 892 + margin-bottom: 40rpx;
890 } 893 }
891 894
892 .couponBox { 895 .couponBox {
@@ -970,8 +973,8 @@ @@ -970,8 +973,8 @@
970 width: 60rpx; 973 width: 60rpx;
971 height: 60rpx; 974 height: 60rpx;
972 position: absolute; 975 position: absolute;
973 - right: 0;  
974 - top: 0; 976 + right: 5%;
  977 + top: -10%;
975 } 978 }
976 979
977 /* 深中国红 */ 980 /* 深中国红 */
@@ -349,7 +349,7 @@ @@ -349,7 +349,7 @@
349 </my-modal> 349 </my-modal>
350 350
351 <my-modal id="couponModal" fadeStyle="slideUp" height="240px"> 351 <my-modal id="couponModal" fadeStyle="slideUp" height="240px">
352 - <view slot="modalName" class="titleModal titleModal2"> 352 + <view slot="modalName" class="titleModal">
353 <image bindtap="closeCouponModal" class="closeImg" src="https://qn.colorcun.com/closeOutline.png" mode=""/> 353 <image bindtap="closeCouponModal" class="closeImg" src="https://qn.colorcun.com/closeOutline.png" mode=""/>
354 <view class="nameInfo">{{seller.name||reserve.seller_name}}</view> 354 <view class="nameInfo">{{seller.name||reserve.seller_name}}</view>
355 <view class="couponTotal" wx:if="{{totalPrice}}"> 355 <view class="couponTotal" wx:if="{{totalPrice}}">
@@ -830,8 +830,9 @@ @@ -830,8 +830,9 @@
830 } 830 }
831 831
832 #couponModal .titleModal { 832 #couponModal .titleModal {
833 - margin-top: 30%; 833 + margin-top: 60%;
834 position: relative; 834 position: relative;
  835 + width: 100%;
835 } 836 }
836 837
837 #couponModal .titleModal2 { 838 #couponModal .titleModal2 {
@@ -862,6 +863,7 @@ @@ -862,6 +863,7 @@
862 color: #fff; 863 color: #fff;
863 margin-bottom: 40rpx; 864 margin-bottom: 40rpx;
864 padding-top: 60rpx; 865 padding-top: 60rpx;
  866 + text-align: center;
865 } 867 }
866 868
867 .couponTotal { 869 .couponTotal {
@@ -874,6 +876,7 @@ @@ -874,6 +876,7 @@
874 display: flex; 876 display: flex;
875 align-items: center; 877 align-items: center;
876 justify-content: center; 878 justify-content: center;
  879 + margin: 20% 0 10% 0;
877 } 880 }
878 881
879 .counterText { 882 .counterText {
@@ -886,7 +889,7 @@ @@ -886,7 +889,7 @@
886 .couponInfo { 889 .couponInfo {
887 color: #DFDFDF; 890 color: #DFDFDF;
888 text-align: center; 891 text-align: center;
889 - margin-bottom: 30rpx; 892 + margin-bottom: 40rpx;
890 } 893 }
891 894
892 .couponBox { 895 .couponBox {
@@ -970,8 +973,8 @@ @@ -970,8 +973,8 @@
970 width: 60rpx; 973 width: 60rpx;
971 height: 60rpx; 974 height: 60rpx;
972 position: absolute; 975 position: absolute;
973 - right: 0;  
974 - top: 0; 976 + right: 5%;
  977 + top: -10%;
975 } 978 }
976 979
977 /* 深中国红 */ 980 /* 深中国红 */
@@ -348,7 +348,7 @@ @@ -348,7 +348,7 @@
348 </view> 348 </view>
349 </my-modal> 349 </my-modal>
350 <my-modal id="couponModal" fadeStyle="slideUp" height="240px"> 350 <my-modal id="couponModal" fadeStyle="slideUp" height="240px">
351 - <view slot="modalName" class="titleModal titleModal2"> 351 + <view slot="modalName" class="titleModal">
352 <image bindtap="closeCouponModal" class="closeImg" src="https://qn.colorcun.com/closeOutline.png" mode=""/> 352 <image bindtap="closeCouponModal" class="closeImg" src="https://qn.colorcun.com/closeOutline.png" mode=""/>
353 <view class="nameInfo">{{seller.name||reserve.seller_name}}</view> 353 <view class="nameInfo">{{seller.name||reserve.seller_name}}</view>
354 <view class="couponTotal" wx:if="{{totalPrice}}"> 354 <view class="couponTotal" wx:if="{{totalPrice}}">
@@ -946,8 +946,9 @@ @@ -946,8 +946,9 @@
946 } 946 }
947 947
948 #couponModal .titleModal { 948 #couponModal .titleModal {
949 - margin-top: 30%; 949 + margin-top: 60%;
950 position: relative; 950 position: relative;
  951 + width: 100%;
951 } 952 }
952 953
953 #couponModal .titleModal2 { 954 #couponModal .titleModal2 {
@@ -978,6 +979,7 @@ @@ -978,6 +979,7 @@
978 color: #fff; 979 color: #fff;
979 margin-bottom: 40rpx; 980 margin-bottom: 40rpx;
980 padding-top: 60rpx; 981 padding-top: 60rpx;
  982 + text-align: center;
981 } 983 }
982 984
983 .couponTotal { 985 .couponTotal {
@@ -990,6 +992,7 @@ @@ -990,6 +992,7 @@
990 display: flex; 992 display: flex;
991 align-items: center; 993 align-items: center;
992 justify-content: center; 994 justify-content: center;
  995 + margin: 20% 0 10% 0;
993 } 996 }
994 997
995 .counterText { 998 .counterText {
@@ -1002,7 +1005,7 @@ @@ -1002,7 +1005,7 @@
1002 .couponInfo { 1005 .couponInfo {
1003 color: #DFDFDF; 1006 color: #DFDFDF;
1004 text-align: center; 1007 text-align: center;
1005 - margin-bottom: 30rpx; 1008 + margin-bottom: 40rpx;
1006 } 1009 }
1007 1010
1008 .couponBox { 1011 .couponBox {
@@ -1086,8 +1089,8 @@ @@ -1086,8 +1089,8 @@
1086 width: 60rpx; 1089 width: 60rpx;
1087 height: 60rpx; 1090 height: 60rpx;
1088 position: absolute; 1091 position: absolute;
1089 - right: 0;  
1090 - top: 0; 1092 + right: 5%;
  1093 + top: -10%;
1091 } 1094 }
1092 1095
1093 /* 模板9 */ 1096 /* 模板9 */
@@ -199,7 +199,6 @@ Page({ @@ -199,7 +199,6 @@ Page({
199 reserve, 199 reserve,
200 marketing, 200 marketing,
201 coupon, 201 coupon,
202 - couponList,  
203 StyleType, 202 StyleType,
204 titleType, 203 titleType,
205 couponList, 204 couponList,
@@ -211,16 +210,7 @@ Page({ @@ -211,16 +210,7 @@ Page({
211 if (marketing && marketing.is_recharge == '1' && marketing.recharge_data) { 210 if (marketing && marketing.is_recharge == '1' && marketing.recharge_data) {
212 this.getRechargeDetail(marketing.recharge_data.id) 211 this.getRechargeDetail(marketing.recharge_data.id)
213 } 212 }
214 - this.setData({  
215 - chef,  
216 - reserve,  
217 - signboard,  
218 - store,  
219 - home,  
220 - marketing,  
221 - StyleType,  
222 - titleType,  
223 - }) 213 + this.setData({...obj})
224 }).catch(res => { 214 }).catch(res => {
225 console.log('GetSellerTemplateConf请求失败'); 215 console.log('GetSellerTemplateConf请求失败');
226 }) 216 })
@@ -232,7 +232,7 @@ @@ -232,7 +232,7 @@
232 </view> 232 </view>
233 </view> 233 </view>
234 <my-modal id="couponModal" fadeStyle="slideUp" height="240px"> 234 <my-modal id="couponModal" fadeStyle="slideUp" height="240px">
235 - <view slot="modalName" class="titleModal titleModal2"> 235 + <view slot="modalName" class="titleModal">
236 <image bindtap="closeCouponModal" class="closeImg" src="https://qn.colorcun.com/closeOutline.png" mode=""/> 236 <image bindtap="closeCouponModal" class="closeImg" src="https://qn.colorcun.com/closeOutline.png" mode=""/>
237 <view class="nameInfo">{{seller.sellName}}</view> 237 <view class="nameInfo">{{seller.sellName}}</view>
238 <view class="couponTotal" wx:if="{{totalPrice}}"> 238 <view class="couponTotal" wx:if="{{totalPrice}}">
@@ -480,8 +480,9 @@ @@ -480,8 +480,9 @@
480 } 480 }
481 481
482 #couponModal .titleModal { 482 #couponModal .titleModal {
483 - margin-top: 30%; 483 + margin-top: 60%;
484 position: relative; 484 position: relative;
  485 + width: 100%;
485 } 486 }
486 487
487 #couponModal .titleModal2 { 488 #couponModal .titleModal2 {
@@ -512,6 +513,7 @@ @@ -512,6 +513,7 @@
512 color: #fff; 513 color: #fff;
513 margin-bottom: 40rpx; 514 margin-bottom: 40rpx;
514 padding-top: 60rpx; 515 padding-top: 60rpx;
  516 + text-align: center;
515 } 517 }
516 518
517 .couponTotal { 519 .couponTotal {
@@ -524,6 +526,7 @@ @@ -524,6 +526,7 @@
524 display: flex; 526 display: flex;
525 align-items: center; 527 align-items: center;
526 justify-content: center; 528 justify-content: center;
  529 + margin: 20% 0 10% 0;
527 } 530 }
528 531
529 .counterText { 532 .counterText {
@@ -536,7 +539,7 @@ @@ -536,7 +539,7 @@
536 .couponInfo { 539 .couponInfo {
537 color: #DFDFDF; 540 color: #DFDFDF;
538 text-align: center; 541 text-align: center;
539 - margin-bottom: 30rpx; 542 + margin-bottom: 40rpx;
540 } 543 }
541 544
542 .couponBox { 545 .couponBox {
@@ -620,6 +623,6 @@ @@ -620,6 +623,6 @@
620 width: 60rpx; 623 width: 60rpx;
621 height: 60rpx; 624 height: 60rpx;
622 position: absolute; 625 position: absolute;
623 - right: 0;  
624 - top: 0; 626 + right: 5%;
  627 + top: -10%;
625 } 628 }