Commit 7cc177a92956165f0633b35637a0f0a92f1710e6

Authored by vking
1 parent d6fff2aa

sms20200107

@@ -39,15 +39,10 @@ Component({ @@ -39,15 +39,10 @@ Component({
39 }) 39 })
40 }, 40 },
41 async sendMsg(e){ 41 async sendMsg(e){
42 - let sign_name = '周到安排';  
43 let item = this.data.item; 42 let item = this.data.item;
44 let ss = await App.Reserve.SmsInfo({seller_id: item.sid}, true); 43 let ss = await App.Reserve.SmsInfo({seller_id: item.sid}, true);
45 let id = item.id; 44 let id = item.id;
46 - let reduce_num = item.send_total;  
47 - let sl = (item.send_msg + sign_name).length  
48 - if (sl > 70) {  
49 - reduce_num = Math.ceil(sl / 67) * reduce_num;  
50 - } 45 + let reduce_num = item.reduce_num;
51 if (parseInt(reduce_num) > parseInt(ss.data.last_num)) { 46 if (parseInt(reduce_num) > parseInt(ss.data.last_num)) {
52 this.setData({ 47 this.setData({
53 reduce_num: reduce_num, 48 reduce_num: reduce_num,
@@ -68,10 +63,7 @@ Component({ @@ -68,10 +63,7 @@ Component({
68 } 63 }
69 let param = { 64 let param = {
70 id: id, 65 id: id,
71 - sid: item.sid,  
72 sender: note_name, 66 sender: note_name,
73 - reduce_num: reduce_num,  
74 - sign_name: sign_name,  
75 } 67 }
76 if (!note_name) { 68 if (!note_name) {
77 param.sender = e.detail.nickName 69 param.sender = e.detail.nickName
@@ -80,6 +72,7 @@ Component({ @@ -80,6 +72,7 @@ Component({
80 if (res.ret != 200) { 72 if (res.ret != 200) {
81 return util.toast(res.msg || '发送失败,请联系客服', 'none'); 73 return util.toast(res.msg || '发送失败,请联系客服', 'none');
82 } 74 }
  75 + App.SendSMS.SyncSmsBatchSend(res.data)
83 this.triggerEvent('send'); 76 this.triggerEvent('send');
84 util.toast('已发送'); 77 util.toast('已发送');
85 }).catch(res => { 78 }).catch(res => {
@@ -13,6 +13,7 @@ @@ -13,6 +13,7 @@
13 box-shadow: 0 2rpx 8rpx 0 #E0E0E0; 13 box-shadow: 0 2rpx 8rpx 0 #E0E0E0;
14 padding: 32rpx; 14 padding: 32rpx;
15 margin-bottom: 40rpx; 15 margin-bottom: 40rpx;
  16 + word-break:break-all;
16 } 17 }
17 .rows{ 18 .rows{
18 height: 88rpx; 19 height: 88rpx;
@@ -29,7 +29,9 @@ @@ -29,7 +29,9 @@
29 "projectname": "c%E7%AB%AF%E9%A2%84%E5%AE%9A", 29 "projectname": "c%E7%AB%AF%E9%A2%84%E5%AE%9A",
30 "isGameTourist": false, 30 "isGameTourist": false,
31 "simulatorType": "wechat", 31 "simulatorType": "wechat",
32 - "simulatorPluginLibVersion": {}, 32 + "simulatorPluginLibVersion": {
  33 + "qywx_simulator_plugin": "1.2.0"
  34 + },
33 "condition": { 35 "condition": {
34 "search": { 36 "search": {
35 "current": -1, 37 "current": -1,
@@ -142,9 +142,12 @@ export default { @@ -142,9 +142,12 @@ export default {
142 'App.Reserve.GetReservePhones': null, 142 'App.Reserve.GetReservePhones': null,
143 //App.Reserve.SmsBatchSend 短信发送 143 //App.Reserve.SmsBatchSend 短信发送
144 'App.Reserve.SmsBatchSend': { 144 'App.Reserve.SmsBatchSend': {
145 - alias:'App.SendSMS.SmsBatchSend', 145 + alias:'App.SendSMS.NewSmsBatchSend',
146 silence: false, 146 silence: false,
147 }, 147 },
  148 + //真实发送短信
  149 + 'App.SendSMS.SyncSmsBatchSend':null,
  150 +
148 //统计某个商家某天预订总数 151 //统计某个商家某天预订总数
149 'App.Reserve.ReservesCountDay':{ 152 'App.Reserve.ReservesCountDay':{
150 alias:'App.Reserve.NewReservesCountDay', 153 alias:'App.Reserve.NewReservesCountDay',