Commit 7f8c59db594c0f1f7c03922b5826c89a8be0b247
1 parent
20e9c64b
oa单
Showing
7 changed files
with
253 additions
and
179 deletions
components/diy_pingd_buy/diy_pingd_buy.js
| @@ -85,22 +85,36 @@ Component({ | @@ -85,22 +85,36 @@ Component({ | ||
| 85 | 85 | ||
| 86 | var app = getApp(), all_array = [], | 86 | var app = getApp(), all_array = [], |
| 87 | index = 0, | 87 | index = 0, |
| 88 | - goodsidlist=""; | ||
| 89 | - | 88 | + goodsidlist="",new_idlist=""; |
| 89 | + | ||
| 90 | //-- 当是默认的调用的时候 -- | 90 | //-- 当是默认的调用的时候 -- |
| 91 | if(!g_id || g_id.length<=0 ){ | 91 | if(!g_id || g_id.length<=0 ){ |
| 92 | th.no_gid_set(); | 92 | th.no_gid_set(); |
| 93 | }else{ | 93 | }else{ |
| 94 | //--先把商品ID串起来-- | 94 | //--先把商品ID串起来-- |
| 95 | g_id.forEach(function(val, ind) { | 95 | g_id.forEach(function(val, ind) { |
| 96 | - var item = {}; | ||
| 97 | - goodsidlist+=val.goodsid+","; | 96 | + var item = {}; |
| 97 | + goodsidlist+=val.goodsid+","; | ||
| 98 | + if (val.idlist) { | ||
| 99 | + new_idlist += val.idlist + ","; | ||
| 100 | + } | ||
| 101 | + // new_idlist += val.idlist + ","; | ||
| 98 | }) | 102 | }) |
| 99 | - goodsidlist= goodsidlist.substr(0,goodsidlist.length-1); | 103 | + goodsidlist= goodsidlist.substr(0,goodsidlist.length-1); |
| 104 | + if (new_idlist) { | ||
| 105 | + new_idlist= new_idlist.substr(0,new_idlist.length-1); | ||
| 106 | + } | ||
| 107 | + | ||
| 108 | + | ||
| 109 | + let url="" | ||
| 110 | + if (new_idlist) { | ||
| 111 | + url="/api/weshop/teamlist/getGoodsList?store_id=" +os.stoid+"&isnew=1&idlist="+new_idlist | ||
| 112 | + }else{ | ||
| 113 | + url="/api/weshop/teamlist/getGoodsList?store_id=" +os.stoid+"&goodsidlist="+goodsidlist | ||
| 114 | + } | ||
| 100 | 115 | ||
| 101 | //--调用接口,读取拼单-- | 116 | //--调用接口,读取拼单-- |
| 102 | - app.request.promiseGet("/api/weshop/teamlist/getGoodsList?store_id=" | ||
| 103 | - +os.stoid+"&goodsidlist="+goodsidlist, {}).then(res => { | 117 | + app.request.promiseGet(url, {}).then(res => { |
| 104 | //如果拼单的数组为空的时候 | 118 | //如果拼单的数组为空的时候 |
| 105 | var goodslist=res.data.data; | 119 | var goodslist=res.data.data; |
| 106 | if(goodslist && goodslist.length>0){ | 120 | if(goodslist && goodslist.length>0){ |
components/diy_pregoods/diy_pregoods.js
| 1 | -var t = getApp(), os = t.globalData.setting,ut = require("../../utils/util.js"); | 1 | +var t = getApp(), os = t.globalData.setting, ut = require("../../utils/util.js"); |
| 2 | var regeneratorRuntime = require('../../utils/runtime.js'); | 2 | var regeneratorRuntime = require('../../utils/runtime.js'); |
| 3 | Component({ | 3 | Component({ |
| 4 | properties: { | 4 | properties: { |
| @@ -15,124 +15,136 @@ Component({ | @@ -15,124 +15,136 @@ Component({ | ||
| 15 | someData: null, | 15 | someData: null, |
| 16 | imghost: os.imghost, | 16 | imghost: os.imghost, |
| 17 | }, | 17 | }, |
| 18 | - | ||
| 19 | - ready: function() { | 18 | + |
| 19 | + ready: function () { | ||
| 20 | var g_id = this.data.object.data; | 20 | var g_id = this.data.object.data; |
| 21 | - this.data.g_id=g_id; | 21 | + this.data.g_id = g_id; |
| 22 | this.init(g_id); | 22 | this.init(g_id); |
| 23 | }, | 23 | }, |
| 24 | 24 | ||
| 25 | - pageLifetimes: { | ||
| 26 | - //游客登录后，只要更新卡的情况 | ||
| 27 | - show: function () { | ||
| 28 | - //--初始化卡类-- | ||
| 29 | - this.init(this.data.g_id); | ||
| 30 | - }, | 25 | + pageLifetimes: { |
| 26 | + //游客登录后，只要更新卡的情况 | ||
| 27 | + show: function () { | ||
| 28 | + //--初始化卡类-- | ||
| 29 | + this.init(this.data.g_id); | ||
| 31 | }, | 30 | }, |
| 31 | + }, | ||
| 32 | 32 | ||
| 33 | methods: { | 33 | methods: { |
| 34 | // 这里是一个自定义方法 | 34 | // 这里是一个自定义方法 |
| 35 | - init: function(g_id) { | 35 | + init: function (g_id) { |
| 36 | var th = this; | 36 | var th = this; |
| 37 | 37 | ||
| 38 | - getApp().getConfig2(function (e) { | ||
| 39 | - var swithc_list = e.switch_list; | ||
| 40 | - var sw_arr = JSON.parse(swithc_list); | 38 | + getApp().getConfig2(function (e) { |
| 39 | + var swithc_list = e.switch_list; | ||
| 40 | + var sw_arr = JSON.parse(swithc_list); | ||
| 41 | 41 | ||
| 42 | - if(sw_arr.is_retail_price){ | ||
| 43 | - th.setData({is_retail_price:1}); | ||
| 44 | - } | 42 | + if (sw_arr.is_retail_price) { |
| 43 | + th.setData({ is_retail_price: 1 }); | ||
| 44 | + } | ||
| 45 | + }) | ||
| 46 | + | ||
| 47 | + | ||
| 48 | + var app = getApp(), goodsidlist = "",new_idlist=""; | ||
| 49 | + if (g_id && g_id.length > 0) { | ||
| 50 | + //--先把商品ID串起来-- | ||
| 51 | + g_id.forEach(function (val, ind) { | ||
| 52 | + var item = {}; | ||
| 53 | + goodsidlist += val.goodsid + ","; | ||
| 54 | + if (val.idlist) { | ||
| 55 | + new_idlist += val.idlist + ","; | ||
| 56 | + } | ||
| 45 | }) | 57 | }) |
| 58 | + goodsidlist = ut.sub_last(goodsidlist); | ||
| 59 | + | ||
| 60 | + if (new_idlist) { | ||
| 61 | + new_idlist = ut.sub_last(new_idlist); | ||
| 62 | + } | ||
| 46 | 63 | ||
| 64 | + var user_id = getApp().globalData.user_id; | ||
| 65 | + var pre_data = { store_id: os.stoid, is_end: 0, timetype: 3, isuse: 1 }; | ||
| 66 | + if (user_id) { | ||
| 67 | + pre_data.user_id = user_id; | ||
| 68 | + } | ||
| 69 | + let url='' | ||
| 70 | + if (new_idlist) { | ||
| 71 | + url="/api/weshop/marketing/marketingPresellList/page?isnew=1&idlist="+new_idlist | ||
| 72 | + }else{ | ||
| 73 | + url="/api/weshop/marketing/marketingPresellList/page?goodsidlist=" + goodsidlist | ||
| 74 | + } | ||
| 75 | + //--调用接口,读取秒杀-- | ||
| 76 | + app.request.promiseGet(url, { | ||
| 77 | + data: pre_data | ||
| 78 | + }).then(res => { | ||
| 79 | + | ||
| 80 | + if (res.data.code == 0 && res.data.data.pageData && res.data.data.pageData.length > 0) { | ||
| 81 | + //如果数组为空的时候 | ||
| 82 | + var goodslist = res.data.data.pageData; | ||
| 83 | + //就算是添加的活动已经过期，就要用最新的进行中活动 | ||
| 84 | + if (goodslist && goodslist.length > 0) { | ||
| 85 | + th.set_goods_list(g_id, goodslist); | ||
| 86 | + } | ||
| 87 | + | ||
| 88 | + th.data.timer = setInterval(function () { | ||
| 89 | + th.countDown2(th); | ||
| 90 | + }, 1000); | ||
| 91 | + } | ||
| 47 | 92 | ||
| 48 | - var app = getApp(), goodsidlist=""; | ||
| 49 | - if(g_id && g_id.length>0){ | ||
| 50 | - //--先把商品ID串起来-- | ||
| 51 | - g_id.forEach(function(val, ind) { | ||
| 52 | - var item = {}; | ||
| 53 | - goodsidlist+=val.goodsid+","; | ||
| 54 | - }) | ||
| 55 | - goodsidlist=ut.sub_last(goodsidlist); | ||
| 56 | - | ||
| 57 | - var user_id=getApp().globalData.user_id; | ||
| 58 | - var pre_data={store_id:os.stoid,is_end:0,timetype:3,isuse:1}; | ||
| 59 | - if(user_id){ | ||
| 60 | - pre_data.user_id=user_id; | ||
| 61 | - } | ||
| 62 | - | ||
| 63 | - //--调用接口,读取秒杀-- | ||
| 64 | - app.request.promiseGet("/api/weshop/marketing/marketingPresellList/page?goodsidlist="+goodsidlist, { | ||
| 65 | - data:pre_data | ||
| 66 | - }).then(res => { | ||
| 67 | - | ||
| 68 | - if(res.data.code==0 && res.data.data.pageData && res.data.data.pageData.length>0) { | ||
| 69 | - //如果数组为空的时候 | ||
| 70 | - var goodslist = res.data.data.pageData; | ||
| 71 | - //就算是添加的活动已经过期，就要用最新的进行中活动 | ||
| 72 | - if (goodslist && goodslist.length > 0) { | ||
| 73 | - th.set_goods_list(g_id, goodslist); | ||
| 74 | - } | ||
| 75 | - | ||
| 76 | - th.data.timer = setInterval(function () { | ||
| 77 | - th.countDown2(th); | ||
| 78 | - }, 1000); | ||
| 79 | - } | ||
| 80 | - | ||
| 81 | - | ||
| 82 | - }); | ||
| 83 | - }else{ | ||
| 84 | - th.no_gid_set(); | ||
| 85 | - } | 93 | + |
| 94 | + }); | ||
| 95 | + } else { | ||
| 96 | + th.no_gid_set(); | ||
| 97 | + } | ||
| 86 | }, | 98 | }, |
| 87 | - | ||
| 88 | - //当是默认的情况 | ||
| 89 | - no_gid_set(){ | ||
| 90 | - var th=this; | ||
| 91 | - var user_id=getApp().globalData.user_id; | ||
| 92 | - var pre_data={store_id:os.stoid,is_end:0,timetype:3,isuse:1,page:1,pageSize:9}; | ||
| 93 | - if(user_id){ | ||
| 94 | - pre_data.user_id=user_id; | 99 | + |
| 100 | + //当是默认的情况 | ||
| 101 | + no_gid_set() { | ||
| 102 | + var th = this; | ||
| 103 | + var user_id = getApp().globalData.user_id; | ||
| 104 | + var pre_data = { store_id: os.stoid, is_end: 0, timetype: 3, isuse: 1, page: 1, pageSize: 9 }; | ||
| 105 | + if (user_id) { | ||
| 106 | + pre_data.user_id = user_id; | ||
| 107 | + } | ||
| 108 | + getApp().request.promiseGet("/api/weshop/marketing/marketingPresellList/page", { data: pre_data } | ||
| 109 | + ).then(res => { | ||
| 110 | + if (res.data.code == 0 && res.data.data.pageData && res.data.data.pageData.length > 0) { | ||
| 111 | + var goodsidlist = res.data.data.pageData; | ||
| 112 | + this.set_goods_list(null, goodsidlist); | ||
| 113 | + | ||
| 114 | + th.data.timer = setInterval(function () { | ||
| 115 | + th.countDown2(th); | ||
| 116 | + }, 1000); | ||
| 95 | } | 117 | } |
| 96 | - getApp().request.promiseGet("/api/weshop/marketing/marketingPresellList/page",{data:pre_data} | ||
| 97 | - ).then(res=>{ | ||
| 98 | - if(res.data.code==0 && res.data.data.pageData && res.data.data.pageData.length>0) { | ||
| 99 | - var goodsidlist=res.data.data.pageData; | ||
| 100 | - this.set_goods_list(null,goodsidlist); | ||
| 101 | - | ||
| 102 | - th.data.timer = setInterval(function () { | ||
| 103 | - th.countDown2(th); | ||
| 104 | - }, 1000); | ||
| 105 | - } | ||
| 106 | - }); | ||
| 107 | - }, | ||
| 108 | - | ||
| 109 | - //就算是添加的活动已经过期，就要用最新的活动 | ||
| 110 | - set_goods_list(g_id,goodslist){ | ||
| 111 | - // 判断火热，预热 | ||
| 112 | - var newTime = ut.gettimestamp(),all_array = [],th=this; | ||
| 113 | - th.setData({newTime:newTime}); | ||
| 114 | - if(g_id){ | ||
| 115 | - /*--商品队列按照添加的顺序排列--*/ | ||
| 116 | - goodslist.forEach(function (vy,indy) { | ||
| 117 | - all_array.push(vy); | ||
| 118 | - }) | ||
| 119 | - | ||
| 120 | - }else{ | ||
| 121 | - all_array=goodslist; | ||
| 122 | - } | ||
| 123 | - | ||
| 124 | - if(all_array.length==0){ all_array=goodslist;} | ||
| 125 | - | ||
| 126 | - var arr = new Array(); | ||
| 127 | - //--三个三个一组--- | ||
| 128 | - for(var i=0;i< all_array.length;i+=3){ | ||
| 129 | - arr.push(all_array.slice(i,i+3)); | ||
| 130 | - } | ||
| 131 | - /*--熏染到前台--*/ | ||
| 132 | - th.setData({goods_array:arr}); | ||
| 133 | - }, | ||
| 134 | - | ||
| 135 | - //图片失败，默认图片 | 118 | + }); |
| 119 | + }, | ||
| 120 | + | ||
| 121 | + //就算是添加的活动已经过期，就要用最新的活动 | ||
| 122 | + set_goods_list(g_id, goodslist) { | ||
| 123 | + // 判断火热，预热 | ||
| 124 | + var newTime = ut.gettimestamp(), all_array = [], th = this; | ||
| 125 | + th.setData({ newTime: newTime }); | ||
| 126 | + if (g_id) { | ||
| 127 | + /*--商品队列按照添加的顺序排列--*/ | ||
| 128 | + goodslist.forEach(function (vy, indy) { | ||
| 129 | + all_array.push(vy); | ||
| 130 | + }) | ||
| 131 | + | ||
| 132 | + } else { | ||
| 133 | + all_array = goodslist; | ||
| 134 | + } | ||
| 135 | + | ||
| 136 | + if (all_array.length == 0) { all_array = goodslist; } | ||
| 137 | + | ||
| 138 | + var arr = new Array(); | ||
| 139 | + //--三个三个一组--- | ||
| 140 | + for (var i = 0; i < all_array.length; i += 3) { | ||
| 141 | + arr.push(all_array.slice(i, i + 3)); | ||
| 142 | + } | ||
| 143 | + /*--熏染到前台--*/ | ||
| 144 | + th.setData({ goods_array: arr }); | ||
| 145 | + }, | ||
| 146 | + | ||
| 147 | + //图片失败，默认图片 | ||
| 136 | bind_bnerr3: function (e) { | 148 | bind_bnerr3: function (e) { |
| 137 | var _errImg = e.target.dataset.errorimg; | 149 | var _errImg = e.target.dataset.errorimg; |
| 138 | var _errObj = {}; | 150 | var _errObj = {}; |
| @@ -140,64 +152,64 @@ Component({ | @@ -140,64 +152,64 @@ Component({ | ||
| 140 | this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; | 152 | this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; |
| 141 | }, | 153 | }, |
| 142 | 154 | ||
| 143 | - go_to_skill:function () { | 155 | + go_to_skill: function () { |
| 144 | wx.navigateTo({ | 156 | wx.navigateTo({ |
| 145 | - url:"/packageC/pages/presell/list/list" | 157 | + url: "/packageC/pages/presell/list/list" |
| 146 | }); | 158 | }); |
| 147 | }, | 159 | }, |
| 148 | 160 | ||
| 149 | - //----秒杀倒计时函数----- | ||
| 150 | - countDown2: function (ob) { | ||
| 151 | - if (ob == undefined) return false; | ||
| 152 | - var ee = ob; | ||
| 153 | - // 获取当前时间，同时得到活动结束时间数组 | ||
| 154 | - var newTime = ut.gettimestamp(); | ||
| 155 | - this.setData({ newTime: newTime }); | ||
| 156 | - | ||
| 157 | - var List = ee.data.goods_array; | ||
| 158 | - if (List.length == 0) return false; | ||
| 159 | - for (var j = 0; j < List.length; j++) { | ||
| 160 | - // 对结束时间进行处理渲染到页面 | ||
| 161 | - var endTimeList = List[j]; | ||
| 162 | - for (var i = 0; i < endTimeList.length; i++) { | ||
| 163 | - var o = endTimeList[i]; | ||
| 164 | - var endTime = o.end_time; | ||
| 165 | - if (newTime < o.start_time) endTime = o.start_time; | ||
| 166 | - let obj = null; | ||
| 167 | - // 如果活动未结束，对时间进行处理 | ||
| 168 | - if (endTime - newTime > 0) { | ||
| 169 | - let time = (endTime - newTime); | ||
| 170 | - // 获取天、时、分、秒 | ||
| 171 | - let day = parseInt(time / (60 * 60 * 24)); | ||
| 172 | - let hou = parseInt(time % (60 * 60 * 24) / 3600); | ||
| 173 | - let min = parseInt(time % (60 * 60 * 24) % 3600 / 60); | ||
| 174 | - let sec = parseInt(time % (60 * 60 * 24) % 3600 % 60); | ||
| 175 | - obj = { | ||
| 176 | - day: this.timeFormat(day), | ||
| 177 | - hou: this.timeFormat(hou), | ||
| 178 | - min: this.timeFormat(min), | ||
| 179 | - sec: this.timeFormat(sec) | ||
| 180 | - } | ||
| 181 | - } else { | ||
| 182 | - //活动已结束，全部设置为'00' | ||
| 183 | - obj = { | ||
| 184 | - day: '00', | ||
| 185 | - hou: '00', | ||
| 186 | - min: '00', | ||
| 187 | - sec: '00' | ||
| 188 | - } | ||
| 189 | - } | ||
| 190 | - var txt = "goods_array[" + j + "][" + i + "].djs"; | ||
| 191 | - ee.setData({ | ||
| 192 | - [txt]: obj | ||
| 193 | - }); | ||
| 194 | - } | 161 | + //----秒杀倒计时函数----- |
| 162 | + countDown2: function (ob) { | ||
| 163 | + if (ob == undefined) return false; | ||
| 164 | + var ee = ob; | ||
| 165 | + // 获取当前时间，同时得到活动结束时间数组 | ||
| 166 | + var newTime = ut.gettimestamp(); | ||
| 167 | + this.setData({ newTime: newTime }); | ||
| 168 | + | ||
| 169 | + var List = ee.data.goods_array; | ||
| 170 | + if (List.length == 0) return false; | ||
| 171 | + for (var j = 0; j < List.length; j++) { | ||
| 172 | + // 对结束时间进行处理渲染到页面 | ||
| 173 | + var endTimeList = List[j]; | ||
| 174 | + for (var i = 0; i < endTimeList.length; i++) { | ||
| 175 | + var o = endTimeList[i]; | ||
| 176 | + var endTime = o.end_time; | ||
| 177 | + if (newTime < o.start_time) endTime = o.start_time; | ||
| 178 | + let obj = null; | ||
| 179 | + // 如果活动未结束，对时间进行处理 | ||
| 180 | + if (endTime - newTime > 0) { | ||
| 181 | + let time = (endTime - newTime); | ||
| 182 | + // 获取天、时、分、秒 | ||
| 183 | + let day = parseInt(time / (60 * 60 * 24)); | ||
| 184 | + let hou = parseInt(time % (60 * 60 * 24) / 3600); | ||
| 185 | + let min = parseInt(time % (60 * 60 * 24) % 3600 / 60); | ||
| 186 | + let sec = parseInt(time % (60 * 60 * 24) % 3600 % 60); | ||
| 187 | + obj = { | ||
| 188 | + day: this.timeFormat(day), | ||
| 189 | + hou: this.timeFormat(hou), | ||
| 190 | + min: this.timeFormat(min), | ||
| 191 | + sec: this.timeFormat(sec) | ||
| 192 | + } | ||
| 193 | + } else { | ||
| 194 | + //活动已结束，全部设置为'00' | ||
| 195 | + obj = { | ||
| 196 | + day: '00', | ||
| 197 | + hou: '00', | ||
| 198 | + min: '00', | ||
| 199 | + sec: '00' | ||
| 200 | + } | ||
| 195 | } | 201 | } |
| 196 | - }, | ||
| 197 | - //---小于10的格式化函数---- | ||
| 198 | - timeFormat: function (param) { | ||
| 199 | - return param < 10 ? '0' + param : param; | ||
| 200 | - }, | 202 | + var txt = "goods_array[" + j + "][" + i + "].djs"; |
| 203 | + ee.setData({ | ||
| 204 | + [txt]: obj | ||
| 205 | + }); | ||
| 206 | + } | ||
| 207 | + } | ||
| 208 | + }, | ||
| 209 | + //---小于10的格式化函数---- | ||
| 210 | + timeFormat: function (param) { | ||
| 211 | + return param < 10 ? '0' + param : param; | ||
| 212 | + }, | ||
| 201 | 213 | ||
| 202 | }, | 214 | }, |
| 203 | 215 |
components/diy_public/diy_public.js
| @@ -143,7 +143,7 @@ Component({ | @@ -143,7 +143,7 @@ Component({ | ||
| 143 | }) | 143 | }) |
| 144 | 144 | ||
| 145 | 145 | ||
| 146 | - var app = getApp(), goodsidlist = "", idlist = ""; | 146 | + var app = getApp(), goodsidlist = "", idlist = "",new_idlist=""; |
| 147 | if (g_id.data_type == 2) { | 147 | if (g_id.data_type == 2) { |
| 148 | if (g_id.data && g_id.data.length > 0) { | 148 | if (g_id.data && g_id.data.length > 0) { |
| 149 | //--先把商品ID串起来-- | 149 | //--先把商品ID串起来-- |
| @@ -151,9 +151,16 @@ Component({ | @@ -151,9 +151,16 @@ Component({ | ||
| 151 | var item = {}; | 151 | var item = {}; |
| 152 | goodsidlist += val.goodsid + ","; | 152 | goodsidlist += val.goodsid + ","; |
| 153 | idlist += val.flashid + ","; | 153 | idlist += val.flashid + ","; |
| 154 | + if (val.idlist) { | ||
| 155 | + new_idlist += val.idlist + ","; | ||
| 156 | + } | ||
| 157 | + | ||
| 154 | }) | 158 | }) |
| 155 | goodsidlist = ut.sub_last(goodsidlist); | 159 | goodsidlist = ut.sub_last(goodsidlist); |
| 156 | idlist = ut.sub_last(idlist); | 160 | idlist = ut.sub_last(idlist); |
| 161 | + if (new_idlist) { | ||
| 162 | + new_idlist = ut.sub_last(new_idlist); | ||
| 163 | + } | ||
| 157 | 164 | ||
| 158 | var user_id=getApp().globalData.user_id; | 165 | var user_id=getApp().globalData.user_id; |
| 159 | if(!user_id){ user_id=0;} | 166 | if(!user_id){ user_id=0;} |
| @@ -162,9 +169,14 @@ Component({ | @@ -162,9 +169,14 @@ Component({ | ||
| 162 | // var gUrl = "/api/ms/flash_sale/getGoodsList?store_id=" + os.stoid + "&goodsidlist=" + goodsidlist+"&user_id="+user_id+"&type=1"; | 169 | // var gUrl = "/api/ms/flash_sale/getGoodsList?store_id=" + os.stoid + "&goodsidlist=" + goodsidlist+"&user_id="+user_id+"&type=1"; |
| 163 | let gUrl = "/api/ms/flash_sale/getGoodsList?store_id=" + os.stoid + "&idlist=" + idlist + "&user_id="+user_id+"&type=1"; | 170 | let gUrl = "/api/ms/flash_sale/getGoodsList?store_id=" + os.stoid + "&idlist=" + idlist + "&user_id="+user_id+"&type=1"; |
| 164 | 171 | ||
| 165 | - if (th.data.prom_type==6) { //天天拼单 | ||
| 166 | - gUrl="/api/weshop/teamlist/getGoodsList?store_id=" | ||
| 167 | - +os.stoid+"&goodsidlist="+goodsidlist; | 172 | + if (th.data.prom_type==6) { //天天拼单 |
| 173 | + if (new_idlist) { | ||
| 174 | + gUrl="/api/weshop/teamlist/getGoodsList?store_id=" | ||
| 175 | + +os.stoid+"&isnew=1&idlist="+new_idlist; | ||
| 176 | + }else{ | ||
| 177 | + gUrl="/api/weshop/teamlist/getGoodsList?store_id=" | ||
| 178 | + +os.stoid+"&goodsidlist="+goodsidlist; | ||
| 179 | + } | ||
| 168 | } | 180 | } |
| 169 | 181 | ||
| 170 | if (th.data.prom_type==2) { //团购 | 182 | if (th.data.prom_type==2) { //团购 |
| @@ -173,8 +185,14 @@ Component({ | @@ -173,8 +185,14 @@ Component({ | ||
| 173 | } | 185 | } |
| 174 | 186 | ||
| 175 | if (th.data.prom_type==8) { //预售 | 187 | if (th.data.prom_type==8) { //预售 |
| 176 | - gUrl="/api/weshop/marketing/marketingPresellList/page?store_id=" | ||
| 177 | - +os.stoid+"&goodsidlist="+goodsidlist + "&user_id="+user_id+'&is_end=0&timetype=3&isuse=1'; | 188 | + if (new_idlist) { |
| 189 | + gUrl="/api/weshop/marketing/marketingPresellList/page?store_id=" | ||
| 190 | + +os.stoid+"&isnew=1&idlist="+new_idlist + "&user_id="+user_id+'&is_end=0&timetype=3&isuse=1'; | ||
| 191 | + // gUrl+="&isnew=1&idlist="+new_idlist | ||
| 192 | + }else{ | ||
| 193 | + gUrl="/api/weshop/marketing/marketingPresellList/page?store_id=" | ||
| 194 | + +os.stoid+"&goodsidlist="+goodsidlist + "&user_id="+user_id+'&is_end=0&timetype=3&isuse=1'; | ||
| 195 | + } | ||
| 178 | } | 196 | } |
| 179 | if (th.data.prom_type==9) { //幸运购 | 197 | if (th.data.prom_type==9) { //幸运购 |
| 180 | gUrl="/api/weshop/prom/luckyActivity/getGoodsList?store_id=" | 198 | gUrl="/api/weshop/prom/luckyActivity/getGoodsList?store_id=" |
packageA/pages/checkin/checkin.js
packageB/pages/evaluate/evaluate.js
| @@ -102,13 +102,16 @@ Page({ | @@ -102,13 +102,16 @@ Page({ | ||
| 102 | query_bea: function() { | 102 | query_bea: function() { |
| 103 | var th = this; | 103 | var th = this; |
| 104 | var url = "/api/weshop/order/pagePosOrder"; | 104 | var url = "/api/weshop/order/pagePosOrder"; |
| 105 | - | 105 | + //ftype =5 退款 |
| 106 | switch (this.data.ftype){ | 106 | switch (this.data.ftype){ |
| 107 | case 3: | 107 | case 3: |
| 108 | break; | 108 | break; |
| 109 | case 4: | 109 | case 4: |
| 110 | url = "/api/weshop/serviceCard/pagePos"; | 110 | url = "/api/weshop/serviceCard/pagePos"; |
| 111 | - break; | 111 | + break; |
| 112 | + case 5: | ||
| 113 | + url = "/api/weshop/serviceCard/pageCardOut"; | ||
| 114 | + break; | ||
| 112 | default: | 115 | default: |
| 113 | break | 116 | break |
| 114 | } | 117 | } |
| @@ -124,6 +127,15 @@ Page({ | @@ -124,6 +127,15 @@ Page({ | ||
| 124 | if (res.data.code == 0) { | 127 | if (res.data.code == 0) { |
| 125 | var data = res.data.data.pageData; | 128 | var data = res.data.data.pageData; |
| 126 | var arrangeTime = data[0].ArrangeTime; | 129 | var arrangeTime = data[0].ArrangeTime; |
| 130 | + if (this.data.ftype==5 && data && data.length >0) { //退款是项目名称赋值到list里 | ||
| 131 | + data.map((item,i)=>{ | ||
| 132 | + if (item.list && item.list.length>0) { | ||
| 133 | + item.list.map((ite,j)=>{ | ||
| 134 | + data[j].list[j].ItemName = item.ItemName | ||
| 135 | + }) | ||
| 136 | + } | ||
| 137 | + }) | ||
| 138 | + } | ||
| 127 | th.setData({ | 139 | th.setData({ |
| 128 | beautician: data, | 140 | beautician: data, |
| 129 | arrangeTime: arrangeTime | 141 | arrangeTime: arrangeTime |
| @@ -147,8 +159,20 @@ Page({ | @@ -147,8 +159,20 @@ Page({ | ||
| 147 | }).then(res => { | 159 | }).then(res => { |
| 148 | if (res.data.code == 0) { | 160 | if (res.data.code == 0) { |
| 149 | var list=[]; | 161 | var list=[]; |
| 150 | - res.data.data.BillDate=res.data.data.BillDate.replace(".0",''); | ||
| 151 | - list.push(res.data.data); | 162 | + res.data.data.BillDate=res.data.data.BillDate.substring(0, 19); |
| 163 | + | ||
| 164 | + | ||
| 165 | + list.push(res.data.data); | ||
| 166 | + | ||
| 167 | + if (th.data.ftype==5 && list && list.length>0) { //退款时赋值项目名称到list | ||
| 168 | + list.map((item,i)=>{ | ||
| 169 | + if (item.list && item.list.length>0) { | ||
| 170 | + item.list.map((ite,j)=>{ | ||
| 171 | + list[j].list[j].ItemName = item.ItemName | ||
| 172 | + }) | ||
| 173 | + } | ||
| 174 | + }) | ||
| 175 | + } | ||
| 152 | 176 | ||
| 153 | th.setData({ | 177 | th.setData({ |
| 154 | stars_index: res.data.data.Star-1, | 178 | stars_index: res.data.data.Star-1, |
| @@ -213,7 +237,7 @@ Page({ | @@ -213,7 +237,7 @@ Page({ | ||
| 213 | var namber=th.data.number; | 237 | var namber=th.data.number; |
| 214 | 238 | ||
| 215 | var url="/packageB/pages/evaluate_list/evaluate_list?IsEvaluate=1"; | 239 | var url="/packageB/pages/evaluate_list/evaluate_list?IsEvaluate=1"; |
| 216 | - if(th.data.ftype==4){ | 240 | + if(th.data.ftype==4 || th.data.ftype==5){ |
| 217 | url="/pages/user/index/index"; | 241 | url="/pages/user/index/index"; |
| 218 | } | 242 | } |
| 219 | 243 |
packageB/pages/evaluate/evaluate.wxml
| @@ -17,7 +17,7 @@ | @@ -17,7 +17,7 @@ | ||
| 17 | <!-- 项目 --> | 17 | <!-- 项目 --> |
| 18 | <view class="flex-center item" bindtap="show_goods" data-index="{{index}}"> | 18 | <view class="flex-center item" bindtap="show_goods" data-index="{{index}}"> |
| 19 | <view class="itemlf fs32 flex-level-right">购买商品：</view> | 19 | <view class="itemlf fs32 flex-level-right">购买商品：</view> |
| 20 | - <view class="itemlr fs30 ellipsis-1 go_right">{{it.list[0].WareName?it.list[0].WareName:it.list[0].ItemName}}</view> | 20 | + <view class="itemlr fs30 ellipsis-2 go_right" style="position: relative;padding-right: 35rpx;">{{it.list[0].WareName?it.list[0].WareName:it.list[0].ItemName}}</view> |
| 21 | </view> | 21 | </view> |
| 22 | 22 | ||
| 23 | <!-- 时间 --> | 23 | <!-- 时间 --> |
| @@ -94,7 +94,7 @@ | @@ -94,7 +94,7 @@ | ||
| 94 | </navigator> | 94 | </navigator> |
| 95 | <view wx:else> | 95 | <view wx:else> |
| 96 | 96 | ||
| 97 | -<block wx:if="{{ftype!=4}}"> | 97 | +<block wx:if="{{ftype!=4 || ftype!=5}}"> |
| 98 | <view style="margin: auto;margin-bottom: 30rpx;" class="Submission flex-center" bindtap="evaluate_qt"> | 98 | <view style="margin: auto;margin-bottom: 30rpx;" class="Submission flex-center" bindtap="evaluate_qt"> |
| 99 | <view>评价其他</view> | 99 | <view>评价其他</view> |
| 100 | </view> | 100 | </view> |
| @@ -137,8 +137,8 @@ | @@ -137,8 +137,8 @@ | ||
| 137 | <view class="title">商品详情</view> | 137 | <view class="title">商品详情</view> |
| 138 | <view style="padding: 0 20rpx;"> | 138 | <view style="padding: 0 20rpx;"> |
| 139 | <view class="flex jc_sb fs30" style="margin-top: 20rpx;" wx:for="{{show_goods_list}}"> | 139 | <view class="flex jc_sb fs30" style="margin-top: 20rpx;" wx:for="{{show_goods_list}}"> |
| 140 | - <view>{{item.WareName?item.WareName:item.ItemName}}</view> | ||
| 141 | - <view>{{item.Qty}}</view> | 140 | + <view class="ellipsis-2">{{item.WareName?item.WareName:item.ItemName}}</view> |
| 141 | + <!-- <view>{{item.Qty}}</view> --> | ||
| 142 | </view> | 142 | </view> |
| 143 | </view> | 143 | </view> |
| 144 | </view> | 144 | </view> |
packageB/pages/evaluate/evaluate.wxss
| @@ -155,6 +155,11 @@ | @@ -155,6 +155,11 @@ | ||
| 155 | } | 155 | } |
| 156 | 156 | ||
| 157 | .go_right::after{ | 157 | .go_right::after{ |
| 158 | + position: absolute; | ||
| 159 | + right: 5px; | ||
| 160 | + top: 0; | ||
| 161 | + bottom: 0; | ||
| 162 | + margin: auto; | ||
| 158 | content: ''; | 163 | content: ''; |
| 159 | display: inline-block; | 164 | display: inline-block; |
| 160 | width: 20rpx; | 165 | width: 20rpx; |