xt / xcx-book · Commits

Go to a project

Commit c79eb751dd11ea9aca239715b46cf4146c920019

Authored by pengye
1 parent cfc4402f
build: skipped

邀请函新增修改到店时间

Inline Side-by-side
Showing 10 changed files with 20 additions and 108 deletions
@@ -968,21 +968,10 @@ Page({ @@ -968,21 +968,10 @@ Page({
968 let times=new Date( 968 let times=new Date(
969 reserveTime + " " + temp_ddate 969 reserveTime + " " + temp_ddate
970 ).getTime() / 1000 970 ).getTime() / 1000
971 - let form = { 971 + App.Reserve.SetReserveTempDdate({
972 rid:this.id, 972 rid:this.id,
973 - sid:this.data.seller.sid,  
974 temp_ddate:times, 973 temp_ddate:times,
975 - tid:detailInfo.tid,  
976 - rname:detailInfo.rname,  
977 - sex:detailInfo.sex,  
978 - phone:detailInfo.phone,  
979 - rdate:detailInfo.rdate+'-'+detailInfo.edate,  
980 - ddate:detailInfo.ddate,  
981 - ddate_solt:detailInfo.ddate_solt,  
982 - is_set_ddate:detailInfo.ddate_solt,  
983 - cusdem:detailInfo.cusdem,  
984 - }  
985 - App.Reserve.AndroidSetReserveInfo(form).then(res => { 974 + }).then(res => {
986 if (res.ret == 200) { 975 if (res.ret == 200) {
987 if (this.data.lite_style == '2') { 976 if (this.data.lite_style == '2') {
988 let time = (util.unixtoTime(detailInfo.ddate, '周WW') + temp_ddate) || (util.unixtoTime(detailInfo.ddate, '周WW') + this.data.timeList[index]) 977 let time = (util.unixtoTime(detailInfo.ddate, '周WW') + temp_ddate) || (util.unixtoTime(detailInfo.ddate, '周WW') + this.data.timeList[index])
@@ -923,21 +923,10 @@ Page({ @@ -923,21 +923,10 @@ Page({
923 let times=new Date( 923 let times=new Date(
924 reserveTime + " " + temp_ddate 924 reserveTime + " " + temp_ddate
925 ).getTime() / 1000 925 ).getTime() / 1000
926 - let form = { 926 + App.Reserve.SetReserveTempDdate({
927 rid:this.id, 927 rid:this.id,
928 - sid:this.data.seller.sid,  
929 temp_ddate:times, 928 temp_ddate:times,
930 - tid:detailInfo.tid,  
931 - rname:detailInfo.rname,  
932 - sex:detailInfo.sex,  
933 - phone:detailInfo.phone,  
934 - rdate:detailInfo.rdate+'-'+detailInfo.edate,  
935 - ddate:detailInfo.ddate,  
936 - ddate_solt:detailInfo.ddate_solt,  
937 - is_set_ddate:detailInfo.ddate_solt,  
938 - cusdem:detailInfo.cusdem,  
939 - }  
940 - App.Reserve.AndroidSetReserveInfo(form).then(res => { 929 + }).then(res => {
941 if (res.ret == 200) { 930 if (res.ret == 200) {
942 if (this.data.lite_style == '2') { 931 if (this.data.lite_style == '2') {
943 let time = (util.unixtoTime(detailInfo.ddate, '周WW') + temp_ddate) || (util.unixtoTime(detailInfo.ddate, '周WW') + this.data.timeList[index]) 932 let time = (util.unixtoTime(detailInfo.ddate, '周WW') + temp_ddate) || (util.unixtoTime(detailInfo.ddate, '周WW') + this.data.timeList[index])
@@ -923,21 +923,10 @@ Page({ @@ -923,21 +923,10 @@ Page({
923 let times=new Date( 923 let times=new Date(
924 reserveTime + " " + temp_ddate 924 reserveTime + " " + temp_ddate
925 ).getTime() / 1000 925 ).getTime() / 1000
926 - let form = { 926 + App.Reserve.SetReserveTempDdate({
927 rid:this.id, 927 rid:this.id,
928 - sid:this.data.seller.sid,  
929 temp_ddate:times, 928 temp_ddate:times,
930 - tid:detailInfo.tid,  
931 - rname:detailInfo.rname,  
932 - sex:detailInfo.sex,  
933 - phone:detailInfo.phone,  
934 - rdate:detailInfo.rdate+'-'+detailInfo.edate,  
935 - ddate:detailInfo.ddate,  
936 - ddate_solt:detailInfo.ddate_solt,  
937 - is_set_ddate:detailInfo.ddate_solt,  
938 - cusdem:detailInfo.cusdem,  
939 - }  
940 - App.Reserve.AndroidSetReserveInfo(form).then(res => { 929 + }).then(res => {
941 if (res.ret == 200) { 930 if (res.ret == 200) {
942 if (this.data.lite_style == '2') { 931 if (this.data.lite_style == '2') {
943 let time = (util.unixtoTime(detailInfo.ddate, '周WW') + temp_ddate) || (util.unixtoTime(detailInfo.ddate, '周WW') + this.data.timeList[index]) 932 let time = (util.unixtoTime(detailInfo.ddate, '周WW') + temp_ddate) || (util.unixtoTime(detailInfo.ddate, '周WW') + this.data.timeList[index])
@@ -922,21 +922,10 @@ Page({ @@ -922,21 +922,10 @@ Page({
922 let times=new Date( 922 let times=new Date(
923 reserveTime + " " + temp_ddate 923 reserveTime + " " + temp_ddate
924 ).getTime() / 1000 924 ).getTime() / 1000
925 - let form = { 925 + App.Reserve.SetReserveTempDdate({
926 rid:this.id, 926 rid:this.id,
927 - sid:this.data.seller.sid,  
928 temp_ddate:times, 927 temp_ddate:times,
929 - tid:detailInfo.tid,  
930 - rname:detailInfo.rname,  
931 - sex:detailInfo.sex,  
932 - phone:detailInfo.phone,  
933 - rdate:detailInfo.rdate+'-'+detailInfo.edate,  
934 - ddate:detailInfo.ddate,  
935 - ddate_solt:detailInfo.ddate_solt,  
936 - is_set_ddate:detailInfo.ddate_solt,  
937 - cusdem:detailInfo.cusdem,  
938 - }  
939 - App.Reserve.AndroidSetReserveInfo(form).then(res => { 928 + }).then(res => {
940 if (res.ret == 200) { 929 if (res.ret == 200) {
941 if (this.data.lite_style == '2') { 930 if (this.data.lite_style == '2') {
942 let time = (util.unixtoTime(detailInfo.ddate, '周WW') + temp_ddate) || (util.unixtoTime(detailInfo.ddate, '周WW') + this.data.timeList[index]) 931 let time = (util.unixtoTime(detailInfo.ddate, '周WW') + temp_ddate) || (util.unixtoTime(detailInfo.ddate, '周WW') + this.data.timeList[index])
@@ -878,21 +878,10 @@ Page({ @@ -878,21 +878,10 @@ Page({
878 let times=new Date( 878 let times=new Date(
879 reserveTime + " " + temp_ddate 879 reserveTime + " " + temp_ddate
880 ).getTime() / 1000 880 ).getTime() / 1000
881 - let form = { 881 + App.Reserve.SetReserveTempDdate({
882 rid:this.id, 882 rid:this.id,
883 - sid:this.data.seller.sid,  
884 temp_ddate:times, 883 temp_ddate:times,
885 - tid:detailInfo.tid,  
886 - rname:detailInfo.rname,  
887 - sex:detailInfo.sex,  
888 - phone:detailInfo.phone,  
889 - rdate:detailInfo.rdate+'-'+detailInfo.edate,  
890 - ddate:detailInfo.ddate,  
891 - ddate_solt:detailInfo.ddate_solt,  
892 - is_set_ddate:detailInfo.ddate_solt,  
893 - cusdem:detailInfo.cusdem,  
894 - }  
895 - App.Reserve.AndroidSetReserveInfo(form).then(res => { 884 + }).then(res => {
896 if (res.ret == 200) { 885 if (res.ret == 200) {
897 if (this.data.lite_style == '2') { 886 if (this.data.lite_style == '2') {
898 let time = (util.unixtoTime(detailInfo.ddate, '周WW') + temp_ddate) || (util.unixtoTime(detailInfo.ddate, '周WW') + this.data.timeList[index]) 887 let time = (util.unixtoTime(detailInfo.ddate, '周WW') + temp_ddate) || (util.unixtoTime(detailInfo.ddate, '周WW') + this.data.timeList[index])
@@ -923,21 +923,10 @@ Page({ @@ -923,21 +923,10 @@ Page({
923 let times=new Date( 923 let times=new Date(
924 reserveTime + " " + temp_ddate 924 reserveTime + " " + temp_ddate
925 ).getTime() / 1000 925 ).getTime() / 1000
926 - let form = { 926 + App.Reserve.SetReserveTempDdate({
927 rid:this.id, 927 rid:this.id,
928 - sid:this.data.seller.sid,  
929 temp_ddate:times, 928 temp_ddate:times,
930 - tid:detailInfo.tid,  
931 - rname:detailInfo.rname,  
932 - sex:detailInfo.sex,  
933 - phone:detailInfo.phone,  
934 - rdate:detailInfo.rdate+'-'+detailInfo.edate,  
935 - ddate:detailInfo.ddate,  
936 - ddate_solt:detailInfo.ddate_solt,  
937 - is_set_ddate:detailInfo.ddate_solt,  
938 - cusdem:detailInfo.cusdem,  
939 - }  
940 - App.Reserve.AndroidSetReserveInfo(form).then(res => { 929 + }).then(res => {
941 if (res.ret == 200) { 930 if (res.ret == 200) {
942 if (this.data.lite_style == '2') { 931 if (this.data.lite_style == '2') {
943 let time = (util.unixtoTime(detailInfo.ddate, '周WW') + temp_ddate) || (util.unixtoTime(detailInfo.ddate, '周WW') + this.data.timeList[index]) 932 let time = (util.unixtoTime(detailInfo.ddate, '周WW') + temp_ddate) || (util.unixtoTime(detailInfo.ddate, '周WW') + this.data.timeList[index])
@@ -922,21 +922,10 @@ Page({ @@ -922,21 +922,10 @@ Page({
922 let times=new Date( 922 let times=new Date(
923 reserveTime + " " + temp_ddate 923 reserveTime + " " + temp_ddate
924 ).getTime() / 1000 924 ).getTime() / 1000
925 - let form = { 925 + App.Reserve.SetReserveTempDdate({
926 rid:this.id, 926 rid:this.id,
927 - sid:this.data.seller.sid,  
928 temp_ddate:times, 927 temp_ddate:times,
929 - tid:detailInfo.tid,  
930 - rname:detailInfo.rname,  
931 - sex:detailInfo.sex,  
932 - phone:detailInfo.phone,  
933 - rdate:detailInfo.rdate+'-'+detailInfo.edate,  
934 - ddate:detailInfo.ddate,  
935 - ddate_solt:detailInfo.ddate_solt,  
936 - is_set_ddate:detailInfo.ddate_solt,  
937 - cusdem:detailInfo.cusdem,  
938 - }  
939 - App.Reserve.AndroidSetReserveInfo(form).then(res => { 928 + }).then(res => {
940 if (res.ret == 200) { 929 if (res.ret == 200) {
941 if (this.data.lite_style == '2') { 930 if (this.data.lite_style == '2') {
942 let time = (util.unixtoTime(detailInfo.ddate, '周WW') + temp_ddate) || (util.unixtoTime(detailInfo.ddate, '周WW') + this.data.timeList[index]) 931 let time = (util.unixtoTime(detailInfo.ddate, '周WW') + temp_ddate) || (util.unixtoTime(detailInfo.ddate, '周WW') + this.data.timeList[index])
@@ -959,21 +959,10 @@ Page({ @@ -959,21 +959,10 @@ Page({
959 let times=new Date( 959 let times=new Date(
960 reserveTime + " " + temp_ddate 960 reserveTime + " " + temp_ddate
961 ).getTime() / 1000 961 ).getTime() / 1000
962 - let form = { 962 + App.Reserve.SetReserveTempDdate({
963 rid:this.id, 963 rid:this.id,
964 - sid:this.data.seller.sid,  
965 temp_ddate:times, 964 temp_ddate:times,
966 - tid:detailInfo.tid,  
967 - rname:detailInfo.rname,  
968 - sex:detailInfo.sex,  
969 - phone:detailInfo.phone,  
970 - rdate:detailInfo.rdate+'-'+detailInfo.edate,  
971 - ddate:detailInfo.ddate,  
972 - ddate_solt:detailInfo.ddate_solt,  
973 - is_set_ddate:detailInfo.ddate_solt,  
974 - cusdem:detailInfo.cusdem,  
975 - }  
976 - App.Reserve.AndroidSetReserveInfo(form).then(res => { 965 + }).then(res => {
977 if (res.ret == 200) { 966 if (res.ret == 200) {
978 if (this.data.lite_style == '2') { 967 if (this.data.lite_style == '2') {
979 let time = (util.unixtoTime(detailInfo.ddate, '周WW') + temp_ddate) || (util.unixtoTime(detailInfo.ddate, '周WW') + this.data.timeList[index]) 968 let time = (util.unixtoTime(detailInfo.ddate, '周WW') + temp_ddate) || (util.unixtoTime(detailInfo.ddate, '周WW') + this.data.timeList[index])
@@ -104,7 +104,7 @@ Page({ @@ -104,7 +104,7 @@ Page({
104 sid 104 sid
105 }).then(res => { 105 }).then(res => {
106 let is_online_reserve = res.data.is_online_reserve; 106 let is_online_reserve = res.data.is_online_reserve;
107 - let isDeposit = res.data.is_show_notice_deposit; 107 + let isDeposit = res.data.seller_config_info?res.data.seller_config_info.is_show_notice_deposit:'0';
108 this.getSellerTemplateConfFun(sid, isOrder, status,is_online_reserve,isDeposit); 108 this.getSellerTemplateConfFun(sid, isOrder, status,is_online_reserve,isDeposit);
109 }).catch(res => { 109 }).catch(res => {
110 console.log(res, '商家详情请求失败'); 110 console.log(res, '商家详情请求失败');
@@ -756,9 +756,9 @@ export default { @@ -756,9 +756,9 @@ export default {
756 openid:'openid' 756 openid:'openid'
757 }, 757 },
758 758
759 - //录入预订  
760 - 'App.Reserve.AndroidSetReserveInfo':{  
761 - alias:'Android.Reserve.SetReserveInfo', 759 + //修改预订订单邀请函到店时间
  760 + 'App.Reserve.SetReserveTempDdate':{
  761 + alias:'Android.Reserve.SetReserveTempDdate',
762 msgSecCheck:true, 762 msgSecCheck:true,
763 }, 763 },
764 } 764 }