wxd / MShopWeApp

Commit 70ab945873048f0aa4c4e7f7910ec879c85f5b53

Authored by yvan.ni
1 parent e352ca04

预售的功能优化

Inline Side-by-side
Showing 14 changed files with 275 additions and 169 deletions
... ... @@ -51,7 +51,7 @@ App({
51 51 config2: null, //门店配置
52 52 code: null,
53 53 heigth:0,
54   - user_id:null,//13324010,//4755274,
  54 + user_id:null,//5682094,
55 55 buy_now:null,
56 56 picklist:null, //门店列表
57 57 wuliuprice: null, //物流价格表
... ... @@ -129,47 +129,70 @@ App({
129 129 var th=this;
130 130 var pages = getCurrentPages(); //获取加载的页面
131 131 var currentPage = pages[pages.length - 1]; //获取当前页面的对象
132   - var turl="/api/weshop/storeconfig/get/" + th.globalData.setting.stoid;
133   -
134   - th.promiseGet(turl,{}).then(res=>{
135   - var o=res;
136   - if(o.data.code==0){
137   - th.globalData.config2 = o.data.data;
138   - //有配置成要验证过期，因为过期的小程序没有办法审核
139   - if(th.globalData.config2 && th.globalData.config2.is_overdue){
140   -
141   - //要开始验证，小程序有没有购买和过期
142   - if(!currentPage || currentPage.route.indexOf('error/error')==-1 || currentPage.route.indexOf('index/index')==-1){
143   - var tt=this.globalData.wxapp_buy_obj;
144   - if (!tt){
145   - this.get_isbuy(function (){
146   - tt=th.globalData.wxapp_buy_obj;
147   - if (tt.isout == 1){
148   - th.promiseGet('/api/weshop/store/get/'+t.stoid,{}).then(res=>{
149   -
150   - if(!th.err_going){
151   - wx.reLaunch({
152   - url: "/pages/error/error?msg=该商城已到期，暂停浏览1！\r\n可联系:"+res.data.data.store_tel,
153   - });
154   - }
155   - })
156   - }
157   - else if (tt.isbuy == 0){
158   -
159   - if(!th.err_going){
160   - wx.reLaunch({
161   - url: "/pages/error/error?msg=还未购买小程序",
162   - });
163   - }
164   -
165   - }
166   -
167   - })
168   - }
169   - }
170   - }
171   - }
172   - })
  132 +
  133 + if(!th.globalData.wxapp_buy_obj) {
  134 + var turl = "/api/weshop/storeconfig/get/" + th.globalData.setting.stoid;
  135 + th.promiseGet(turl, {}).then(res => {
  136 + var o = res;
  137 + if (o.data.code == 0) {
  138 + th.globalData.config2 = o.data.data;
  139 + //有配置成要验证过期，因为过期的小程序没有办法审核
  140 + if (th.globalData.config2 && th.globalData.config2.is_overdue) {
  141 +
  142 + //要开始验证，小程序有没有购买和过期
  143 + if (!currentPage || currentPage.route.indexOf('error/error') == -1 || currentPage.route.indexOf('index/index') == -1) {
  144 + var tt = this.globalData.wxapp_buy_obj;
  145 + if (!tt) {
  146 + this.get_isbuy(function () {
  147 + tt = th.globalData.wxapp_buy_obj;
  148 + if (tt && tt.isout == 1) {
  149 + th.promiseGet('/api/weshop/store/get/' + t.stoid, {}).then(res => {
  150 +
  151 + if (!th.err_going) {
  152 + wx.reLaunch({
  153 + url: "/pages/error/error?msg=该商城已到期，暂停浏览1！\r\n可联系:" + res.data.data.store_tel,
  154 + });
  155 + }
  156 + })
  157 + }
  158 + else if (tt && tt.isbuy == 0) {
  159 +
  160 + if (!th.err_going) {
  161 + wx.reLaunch({
  162 + url: "/pages/error/error?msg=还未购买小程序",
  163 + });
  164 + }
  165 +
  166 + }
  167 +
  168 + })
  169 + }
  170 + }
  171 + }
  172 + }
  173 + })
  174 +
  175 + }
  176 + else{
  177 + var tt = th.globalData.wxapp_buy_obj;
  178 + if (tt && tt.isout == 1) {
  179 + th.promiseGet('/api/weshop/store/get/' + t.stoid, {}).then(res => {
  180 + if (!th.err_going) {
  181 + wx.reLaunch({
  182 + url: "/pages/error/error?msg=该商城已到期，暂停浏览1！\r\n可联系:" + res.data.data.store_tel,
  183 + });
  184 + }
  185 + })
  186 + }
  187 + else if (tt && tt.isbuy == 0) {
  188 + if (!th.err_going) {
  189 + wx.reLaunch({
  190 + url: "/pages/error/error?msg=还未购买小程序",
  191 + });
  192 + }
  193 +
  194 + }
  195 + }
173 196  
174 197 //获取一下门店的基本信息
175 198 this.getConfig();
... ... @@ -417,11 +440,11 @@ App({
417 440 arr.splice(0, 2);
418 441 }
419 442 var arr_tabbar=["/pages/index/index/index",
420   - "/pages/goods/categoryList/categoryList",
  443 + "/pages/goods/categoryList/categoryList",
421 444 "/pages/goods/categoryList/categoryList?type=2",
422 445 "/pages/goods/categoryList/categoryList?type=1",
423 446 "/pages/cart/cart/cart","/pages/user/index/index",
424   - "/pages/distribution/distribution"];
  447 + "/pages/distribution/distribution"];
425 448 if(arr_tabbar.indexOf(url)!=-1){
426 449 if(url.indexOf("categoryList?type=1")!=-1) this.globalData.cat_type=1;
427 450 if(url.indexOf("categoryList?type=2")!=-1) this.globalData.cat_type=2;
... ... @@ -481,8 +504,8 @@ App({
481 504 success:function (res) {
482 505 th.globalData.pk_store=null;
483 506 if(res.data.code==0 && res.data.data && res.data.data.isstop==0){
484   - //--门店的数量大于5个才要关心门店的分类有没有关闭--
485   - if(res.data.data.category_id && num>5){
  507 + //--门店的数量大于10个才要关心门店的分类有没有关闭--
  508 + if(res.data.data.category_id && num>10){
486 509 th.request.get( "/api/weshop/storagecategory/get/"+os.stoid+"/"+res.data.data.category_id, {
487 510 data: {},
488 511 success: function (ee) {
... ... @@ -537,7 +560,8 @@ App({
537 560 store_id: this.globalData.setting.stoid,
538 561 user_id: this.globalData.user_id,
539 562 state:0,
540   - is_gift:0
  563 + is_gift:0,
  564 + pageSize:300
541 565 },
542 566 success: function(e) {
543 567 var num = 0;
... ... @@ -546,13 +570,11 @@ App({
546 570 num += e.data.data.pageData[i].goods_num;
547 571 }
548 572 }
549   -
550 573 /*---
551 574 wx.setTabBarBadge({ //tabbar右上角添加文本
552 575 index: 2, ////tabbar下标
553 576 text: '' + num //显示的内容
554 577 });--*/
555   -
556 578 //-- 读取服务卡的数量 --
557 579 that.promiseGet("/api/weshop/cartService/page",{
558 580 data:{
... ... @@ -619,6 +641,7 @@ App({
619 641 this.globalData.config=null; //清除config的缓存
620 642 this.globalData.gr_index=0; //商品分组的序列
621 643 this.globalData.pk_store=null;
  644 + this.globalData.wxapp_buy_obj=null
622 645  
623 646 },
624 647  
... ... @@ -719,12 +742,6 @@ App({
719 742 resolve(user_info);
720 743 };
721 744 });
722   -
723   -
724   -
725   -
726   -
727   -
728 745 },
729 746  
730 747  
... ...
packageC/pages/presell/cart/cart.js
  View file @70ab945
... ... @@ -404,9 +404,9 @@ Page({
404 404  
405 405 var pre_data = { store_id: os.stoid, is_end: 0, timetype: 1, isuse: 1, goods_id: order_goods.goods_id };
406 406 if(presell.deposit_pay_time>0){
407   - pre_data.timetype=2;
  407 + pre_data.timetype=12;
408 408 }
409   -
  409 +
410 410 pre_data.user_id = order.user_id;
411 411 var isok=1;
412 412 await getApp().request.promiseGet("/api/weshop/marketing/marketingPresellList/page", {
... ... @@ -423,11 +423,6 @@ Page({
423 423 return false;
424 424 }
425 425  
426   -
427   -
428   -
429   -
430   -
431 426 //等待定金
432 427 if(order.order_status<2 && presell.deposit_pay_time<=0 ){
433 428 th.setData({wait_dj:1})
... ... @@ -447,6 +442,17 @@ Page({
447 442 }
448 443  
449 444  
  445 + //------获取预售主表----------
  446 + await getApp().request.promiseGet("/api/weshop/marketing/marketingPresellForm/get/"+os.stoid+"/"+presell.prom_id, {}).then(res => {
  447 + if (res.data.code == 0 && res.data.data) {
  448 + th.setData({
  449 + act: res.data.data,
  450 + });
  451 +
  452 + }
  453 + })
  454 +
  455 +
450 456 //---获取商品---
451 457 await getApp().request.promiseGet("/api/weshop/goods/get/" + oo.stoid + "/" + order_goods.goods_id, {}).then(res => {
452 458 goods = res.data.data;
... ... @@ -1939,21 +1945,47 @@ Page({
1939 1945  
1940 1946 //-- 获取时间差 --
1941 1947 get_diff(){
1942   - if(this.data.presell.kw_start_time>ut.gettimestamp()){
1943   - this.setData({no_start:1})
1944   - }else if(this.data.presell.kw_end_time<ut.gettimestamp()){
1945   - this.setData({is_end:1})
1946   - }else {
1947   - var end_time=this.data.presell.kw_end_time;
1948   - var e_str=ut.formatTime(end_time);
1949   - var new_date = new Date(); //新建一个日期对象，默认现在的时间
1950   - var old_date = new Date(e_str.replace(/-/g,'/')); //设置过去的一个时间点，"yyyy-MM-dd HH:mm:ss"格式化日期
1951   - var difftime = (new_date - old_date)/1000; //计算时间差,并把毫秒转换成秒
1952   - var days = parseInt(difftime/86400); // 天 24*60*60*1000
1953   - var hours = parseInt(difftime/3600)-24*days; // 小时 60*60 总小时数-过去的小时数=现在的小时数
1954   - var minutes = parseInt(difftime%3600/60); // 分钟 -(day*24) 以60秒为一整份 取余 剩下秒数 秒数/60 就是分钟数
1955   - var seconds = parseInt(difftime%60); // 以60秒为一整份 取余 剩下秒数
1956   - this.setData({days:days,hours:hours,minutes:minutes,seconds:seconds})
  1948 +
  1949 + switch (this.data.act.presell_type) {
  1950 + //部分定金
  1951 + case 0:
  1952 + if (this.data.act.pay_begindate > ut.gettimestamp()) {
  1953 + this.setData({no_start: 1})
  1954 + } else if (this.data.act.pay_enddate < ut.gettimestamp()) {
  1955 + this.setData({is_end: 1})
  1956 + } else {
  1957 + var end_time = this.data.act.pay_enddate;
  1958 + var e_str = ut.formatTime(end_time);
  1959 + var new_date = new Date(); //新建一个日期对象，默认现在的时间
  1960 + var old_date = new Date(e_str.replace(/-/g, '/')); //设置过去的一个时间点，"yyyy-MM-dd HH:mm:ss"格式化日期
  1961 + var difftime = (new_date - old_date) / 1000; //计算时间差,并把毫秒转换成秒
  1962 + var days = parseInt(difftime / 86400); // 天 24*60*60*1000
  1963 + var hours = parseInt(difftime / 3600) - 24 * days; // 小时 60*60 总小时数-过去的小时数=现在的小时数
  1964 + var minutes = parseInt(difftime % 3600 / 60); // 分钟 -(day*24) 以60秒为一整份 取余 剩下秒数 秒数/60 就是分钟数
  1965 + var seconds = parseInt(difftime % 60); // 以60秒为一整份 取余 剩下秒数
  1966 + this.setData({days: days, hours: hours, minutes: minutes, seconds: seconds})
  1967 + }
  1968 + break;
  1969 + //全额付款
  1970 + case 1:
  1971 + if (this.data.act.start_time > ut.gettimestamp()) {
  1972 + this.setData({no_start: 1})
  1973 + } else if (this.data.act.end_time < ut.gettimestamp()) {
  1974 + this.setData({is_end: 1})
  1975 + } else {
  1976 + var end_time = this.data.act.end_time;
  1977 + var e_str = ut.formatTime(end_time);
  1978 + var new_date = new Date(); //新建一个日期对象，默认现在的时间
  1979 + var old_date = new Date(e_str.replace(/-/g, '/')); //设置过去的一个时间点，"yyyy-MM-dd HH:mm:ss"格式化日期
  1980 + var difftime = (new_date - old_date) / 1000; //计算时间差,并把毫秒转换成秒
  1981 + var days = parseInt(difftime / 86400); // 天 24*60*60*1000
  1982 + var hours = parseInt(difftime / 3600) - 24 * days; // 小时 60*60 总小时数-过去的小时数=现在的小时数
  1983 + var minutes = parseInt(difftime % 3600 / 60); // 分钟 -(day*24) 以60秒为一整份 取余 剩下秒数 秒数/60 就是分钟数
  1984 + var seconds = parseInt(difftime % 60); // 以60秒为一整份 取余 剩下秒数
  1985 + this.setData({days: days, hours: hours, minutes: minutes, seconds: seconds})
  1986 + }
  1987 + break;
  1988 +
1957 1989 }
1958 1990 },
1959 1991  
... ... @@ -2028,7 +2060,7 @@ Page({
2028 2060 if(th.data.user_note){
2029 2061 dd.user_note=th.data.user_note;
2030 2062 }
2031   - dd.order_amount=th.data.order_m-th.data.presell.presell_deposit;
  2063 + dd.order_amount= parseFloat(th.data.order_m-th.data.presell.presell_deposit).toFixed(2);
2032 2064  
2033 2065 console.log(JSON.stringify(dd));
2034 2066 wx.request({
... ... @@ -2048,23 +2080,31 @@ Page({
2048 2080 function () {
2049 2081 //---用余额支付---
2050 2082 getApp().my_warnning("支付成功", 1, th);
  2083 +
  2084 +
  2085 + var send_time=th.data.pre_arr.delivery_date;
  2086 + if(th.data.pre_arr.delivery_type==2){
  2087 + send_time=th.data.pre_arr.delivery_daynum*3600;
  2088 + }
  2089 +
2051 2090 setTimeout(function () {
2052   - th.setData({isclose: 0});
2053   - th.onShow();
  2091 + th.setData({isclose: 0,'order.order_status':1,'order.pay_status':1,'wait_wk':0,'presell.tail_pay_state':1,'wait_sh':1,send_time:send_time});
2054 2092 }, 1000)
2055 2093  
2056   -
2057 2094 }, function () {
2058 2095 getApp().my_warnning("支付失败", 0, th);
2059 2096 })
2060 2097 } else {
2061 2098 if (t.data.code == 0) {
  2099 +
  2100 + var send_time=th.data.pre_arr.delivery_date;
  2101 + if(th.data.pre_arr.delivery_type==2){
  2102 + send_time=th.data.pre_arr.delivery_daynum*3600;
  2103 + }
2062 2104 //---用余额支付---
2063 2105 getApp().my_warnning("支付成功", 1, th);
2064 2106 setTimeout(function () {
2065   - th.setData({isclose: 0});
2066   -
2067   - th.onShow();
  2107 + th.setData({isclose: 0,'order.order_status':1,'order.pay_status':1,'wait_wk':0,'presell.tail_pay_state':1,'wait_sh':1,send_time:send_time});
2068 2108 }, 1000)
2069 2109 } else {
2070 2110 getApp().my_warnning(t.data.msg, 1, th);
... ...
packageC/pages/presell/goodsInfo/g_filter.wxs
  View file @70ab945
... ... @@ -97,10 +97,24 @@ var g_filters = {
97 97 } else {
98 98 return value.toFixed(0);
99 99 };
100   - },
  100 + },
  101 +
  102 + //跳转的接口
  103 + get_goods_url:function(item){
  104 +
  105 + console.log(item,111)
  106 + var url1="/pages/goods/goodsInfo/goodsInfo?goods_id="+item.goods_id
  107 + if(item.prom_type==8){
  108 + url1="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id="+item.goods_id+"&pre_id="+item.id
  109 + }
  110 + return url1;
  111 + }
  112 +
  113 +
101 114 }
102 115 module.exports = {
103 116 is_has_rank:g_filters.is_has_rank,
104 117 get_card_price:g_filters.get_card_price,
105   - num:g_filters.num,
  118 + num:g_filters.num,
  119 + get_goods_url:g_filters.get_goods_url,
106 120 }
107 121 \ No newline at end of file
... ...
packageC/pages/presell/goodsInfo/goodsInfo.js
  View file @70ab945
... ... @@ -255,6 +255,7 @@ Page({
255 255 var ee = this, that = ee, th = ee,
256 256 pre_id = t.pre_id,
257 257 gid = t.goods_id,
  258 + presell_id = t.prom_id,
258 259 first_leader = t.first_leader,
259 260 room_id = t.room_id,
260 261 room_user_share = t.room_user_share; //如果是会员分享带有room_id的话，那么接下来会员分享就不传room_id
... ... @@ -306,7 +307,7 @@ Page({
306 307 }
307 308  
308 309 this.setData({
309   - gid:gid,pre_id:pre_id
  310 + gid:gid,pre_id:pre_id,presell_id:presell_id
310 311 })
311 312  
312 313 if (first_leader) {
... ... @@ -3557,7 +3558,6 @@ Page({
3557 3558 //s.showWarning("设置默认门店地址失败", null, 500, !1);
3558 3559 getApp().my_warnning("设置默认门店地址失败", 0, th)
3559 3560 }
3560   -
3561 3561 }
3562 3562 });
3563 3563  
... ... @@ -3904,16 +3904,43 @@ Page({
3904 3904 var th = this;
3905 3905 var presell_id = null;
3906 3906 var pre_arr = null;
3907   - //------获取预售从表----------
3908   - await getApp().request.promiseGet("/api/weshop/marketing/marketingPresellList/get/" + os.stoid + "/" + th.data.pre_id, {}).then(res => {
3909   - if (res.data.code == 0 && res.data.data) {
3910   - var arr = res.data.data;
3911   - presell_id = arr.presell_id;
3912   - th.setData({
3913   - presellList: arr,
  3907 +
  3908 + if(!th.data.pre_id){
  3909 + var presell_id=th.data.presell_id;
  3910 + var url="/api/weshop/marketing/marketingPresellList/list"
  3911 + var rd={
  3912 + store_id:os.stoid,
  3913 + presell_id:presell_id,
  3914 + goods_id:th.data.gid
  3915 + }
  3916 + //------获取预售从表----------
  3917 + await getApp().request.promiseGet(url, {
  3918 + data:rd
  3919 + }).then(res => {
  3920 + if (res.data.code == 0 && res.data.data && res.data.data.length>0) {
  3921 + var arr =res.data.data[0];
  3922 + presell_id = arr.presell_id;
  3923 + th.setData({
  3924 + presellList: arr,
  3925 + })
  3926 + }
3914 3927 })
3915   - }
3916   - })
  3928 +
  3929 +
  3930 + }else{
  3931 + //------获取预售从表----------
  3932 + await getApp().request.promiseGet("/api/weshop/marketing/marketingPresellList/get/" + os.stoid + "/" + th.data.pre_id, {}).then(res => {
  3933 + if (res.data.code == 0 && res.data.data) {
  3934 + var arr = res.data.data;
  3935 + presell_id = arr.presell_id;
  3936 + th.setData({
  3937 + presellList: arr,
  3938 + })
  3939 + }
  3940 + })
  3941 + }
  3942 +
  3943 +
3917 3944 if (!presell_id) {
3918 3945 wx.showToast({ title: "未找到活动商品", icon: 'none', duration: 3000 })
3919 3946 return false;
... ... @@ -3940,7 +3967,7 @@ Page({
3940 3967 th.data.all_pre_goods=e.data.data.pageData;
3941 3968  
3942 3969 var idx=e.data.data.pageData.findIndex(function (ele) {
3943   - return ele.id== th.data.pre_id;
  3970 + return ele.id== th.data.presellList.id;
3944 3971 })
3945 3972 pre_arr = e.data.data.pageData[idx];
3946 3973 th.setData({ pre_arr: pre_arr })
... ...
packageC/pages/presell/goodsInfo/goodsInfo.wxml
  View file @70ab945
... ... @@ -495,15 +495,15 @@
495 495 </navigator>
496 496 </view>
497 497  
498   - <view class="fs24 f1 flex ai-center bg-FF4732 t-c white" style="border-radius:10rpx ">
499   - <view class="pdh20">
  498 + <view class="fs24 f1 flex ai-center bg-FF4732 t-c white" style="border-radius:10rpx;justify-content: center">
  499 + <view style="padding: 0 6rpx">
500 500 <view class="">{{filters.format_time(presellForm.end_time,2)}} 预售结束</view>
501 501 <!-- <view class="">08.30 23:59:59 开始发货</view> -->
502 502 <view class="" wx:if="{{presellForm.delivery_type==1}}">{{filters.format_time(presellForm.delivery_date,2)}} 开始发货</view>
503 503 <view class="" wx:else>付款{{presellForm.delivery_daynum}} 天后发货</view>
504 504 </view>
505 505  
506   - <view class="pdh20 line" bindtap="openSpecModel" data-ind="2">
  506 + <view class="line" bindtap="openSpecModel" data-ind="2" style="margin-left: 10rpx; padding-left: 10rpx">
507 507 <view class="">支付定金</view>
508 508 <view class="flex">
509 509 定金
... ...
packageC/pages/presell/list/list.js
  View file @70ab945
... ... @@ -51,7 +51,7 @@ Page({
51 51 })
52 52  
53 53 var userInfo=getApp().globalData.userInfo;
54   - if(userInfo && goodlist.length==0){
  54 + if(userInfo && this.data.goodlist.length==0){
55 55 //调用列表
56 56 this.get_list();
57 57 }else{
... ...
packageC/pages/presell/list/list.wxml
  View file @70ab945
... ... @@ -62,7 +62,7 @@
62 62  
63 63 </view>
64 64 <view class="kill-btn ">
65   - <navigator url="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id={{item.goods_id}}">去抢购</navigator>
  65 + <navigator url="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&pre_id={{item.id}}">去抢购</navigator>
66 66 </view>
67 67 </view>
68 68 </view>
... ...
pages/goods/goodsList/g_filter.wxs
  View file @70ab945
... ... @@ -79,8 +79,20 @@ var g_filters = {
79 79 if(min_name.length>4) min_name=min_name.substring(0, 8);
80 80 return min_name;
81 81 },
  82 + //跳转的接口
  83 + get_goods_url:function(item){
  84 +
  85 + console.log(item,111)
  86 + var url1="/pages/goods/goodsInfo/goodsInfo?goods_id="+item.goods_id
  87 + if(item.prom_type==8){
  88 + url1="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id="+item.goods_id+"&prom_id="+item.prom_id
  89 + }
  90 + return url1;
  91 + }
82 92 }
  93 +
83 94 module.exports = {
84 95 is_has_rank:g_filters.is_has_rank,
85 96 get_card_price:g_filters.get_card_price,
  97 + get_goods_url:g_filters.get_goods_url,
86 98 }
87 99 \ No newline at end of file
... ...
pages/goods/search/g_filter.wxs
  View file @70ab945
... ... @@ -80,8 +80,20 @@ var g_filters = {
80 80 if(min_name.length>7 ) min_name=min_name.substring(0, 8);
81 81 return min_name;
82 82 },
  83 +
  84 +
  85 + get_goods_url:function(item){
  86 + console.log(item,111)
  87 + var url1="/pages/goods/goodsInfo/goodsInfo?goods_id="+item.goods_id
  88 + if(item.prom_type==8){
  89 + url1="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id="+item.goods_id+"&prom_id="+item.prom_id
  90 + }
  91 + return url1;
  92 + }
83 93 }
  94 +
84 95 module.exports = {
85 96 is_has_rank:g_filters.is_has_rank,
86   - get_card_price:g_filters.get_card_price,
  97 + get_card_price:g_filters.get_card_price,
  98 + get_goods_url:g_filters.get_goods_url
87 99 }
88 100 \ No newline at end of file
... ...
pages/goods/search/search.wxml
  View file @70ab945
... ... @@ -28,7 +28,7 @@
28 28 </navigator>
29 29 </view>
30 30 <view class="choice_list">
31   - <navigator class="choice_item flex ai-center" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" wx:for="{{requestData}}" wx:key="{{index}}">
  31 + <navigator class="choice_item flex ai-center" url="{{g_filter.get_goods_url(item)}}" wx:for="{{requestData}}" wx:key="{{index}}">
32 32 <view class="img-wrap">
33 33 <image src="{{item.original_img}}" lazy-load="true" binderror="bind_bnerr" data-errorimg="requestData[{{index}}].original_img"></image>
34 34 </view>
... ...
pages/index/index/index.js
  View file @70ab945
... ... @@ -292,38 +292,45 @@ Page({
292 292 },
293 293  
294 294 async onShow() {
295   - var th = this;
296   - //-- 登录回来判断弹框 --
297   - var userInfo = getApp().globalData.userInfo;
298   - if (userInfo) {
299   - th.is_festival();
300   - var new_nav = th.data.new_nav;
301   - if (new_nav == "") {
302   - th.is_new();
303   - }
304   - }
  295 + var th = this;
  296 + //-- 登录回来判断弹框 --
  297 + var user_id=getApp().globalData.user_id;
305 298  
306   - var pre_data={store_id:os.stoid,is_end:0,timetype:1,isuse:1};
307   - if(userInfo){
308   - pre_data.user_id= userInfo.user_id;
309   - }
  299 + if(!user_id){
  300 + var userinfo=wx.getStorageSync('userinfo');
  301 + if(userinfo) user_id=userinfo.user_id
  302 + }
310 303  
311   - getApp().request.get("/api/weshop/marketing/marketingPresellList/page",{
312   - data:pre_data,
313   - success:function (e) {
314   - if(e.data.code==0 && e.data.data.pageData && e.data.data.pageData.length>0 ){
315   - var pre_data=e.data.data.pageData;
316   - var arr = new Array();
317   - //--三个三个一组---
318   - for (var i = 0; i < pre_data.length; i += 3) {
319   - arr.push(pre_data.slice(i, i + 3));
320   - }
321   - th.setData({
322   - preGoods: arr
323   - });
324   - }
  304 + if (user_id) {
  305 + th.is_festival();
  306 + var new_nav = th.data.new_nav;
  307 + if (new_nav == "") {
  308 + th.is_new();
325 309 }
326   - })
  310 + }
  311 +
  312 + var pre_data={store_id:os.stoid,is_end:0,timetype:1,isuse:1};
  313 + if(user_id){
  314 + pre_data.user_id= user_id;
  315 + }
  316 +
  317 + getApp().request.get("/api/weshop/marketing/marketingPresellList/page",{
  318 + data:pre_data,
  319 + success:function (e) {
  320 + if(e.data.code==0 && e.data.data.pageData && e.data.data.pageData.length>0 ){
  321 + var pre_data=e.data.data.pageData;
  322 + var arr = new Array();
  323 + //--三个三个一组---
  324 + for (var i = 0; i < pre_data.length; i += 3) {
  325 + arr.push(pre_data.slice(i, i + 3));
  326 + }
  327 + th.setData({
  328 + preGoods: arr
  329 + });
  330 + }
  331 + }
  332 + })
  333 +
327 334  
328 335  
329 336 //优惠券要实时更新
... ... @@ -367,7 +374,7 @@ Page({
367 374 } else {
368 375 getApp().globalData.isLoad_ad = 1;
369 376 }
370   - }, 500)
  377 + }, 1500)
371 378  
372 379  
373 380  
... ... @@ -485,34 +492,7 @@ Page({
485 492 //th.countDown();
486 493 }
487 494 });
488   - //-----预售----
489   - //调用接口获取数据
490   - await getApp().request.get("/api/weshop/marketing/marketingPresellList/page", {
491   - data: {
492   - is_end: 0,
493   - store_id: os.stoid,
494   - pageSize: 10,
495   - timetype: 1
496   - },
497   - success: function (res) {
498   - if (res.data.code == 0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length > 0) {
499   - var list = th.data.goodlist ? th.data.goodlist : [];
500   - var arr = res.data.data.pageData;
501   - //数组合起来
502   - for (var i in arr) {
503   - list.push(arr[i]);
504   - }
505   - th.setData({ goodlist: list });
506   - if (arr.length < 10) {
507   - th.setData({ no_more: 1 })
508   - }
509   - } else {
510   - th.setData({ no_more: 1 })
511   - }
512   - th.setData({ is_get: 1 })
513 495  
514   - }
515   - });
516 496  
517 497 //----拼单-----
518 498 await getApp().request.promiseGet("/api/weshop/teamlist/pageteam/2", {
... ...
pages/index/index/index.wxml
  View file @70ab945
... ... @@ -153,8 +153,8 @@
153 153 </view>
154 154 </navigator>
155 155 <view class="seckill-list">
156   - <swiper class="s_prom" indicator-dots="{{false}}" bindchange="flashSwiperChange" next-margin="25rpx">
157   - <swiper-item wx:for="{{saleGoods}}" wx:key="{{index}}" class="p_swiper" wx:key="saleGoods">
  156 + <swiper class="s_prom" indicator-dots="{{false}}" bindchange="flashSwiperChange" next-margin="105rpx">
  157 + <swiper-item wx:for="{{saleGoods}}" wx:key="{{index}}" class="p_swiper" wx:key="saleGoods" style="750rpx !important;">
158 158 <navigator class="nav" hover-class="none" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{aitem.goods_id}}&title={{aitem.goods_name}}" wx:for="{{item}}" wx:key="item" wx:for-item="aitem" wx:for-index="aind">
159 159 <view class="imgview ">
160 160 <image src="{{url+aitem.original_img}}" mode="aspectFill" lazy-load="true" data-errorimg="saleGoods[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3" data-img="{{aitem.original_img}}"></image>
... ... @@ -203,7 +203,7 @@
203 203 <view class="imgview presell">
204 204 <image src="{{url+aitem.original_img}}" mode="aspectFill" lazy-load="true" data-errorimg="preGoods[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3" data-img="{{aitem.original_img}}"></image>
205 205 </view>
206   - <view class="ellipsis-2 mar-top10" style="height: 70rpx;">{{aitem.goods_name}}</view>
  206 + <view class="ellipsis-2 mar-top10" style="height: 75rpx; width: 200rpx">{{aitem.goods_name}}</view>
207 207 <view class="co-red mar-top10 flex jc_sb ali-c">
208 208 <view>
209 209 <text><text class="fs20">￥</text>{{aitem.presell_price}}</text>
... ...
pages/index/index/index.wxss
  View file @70ab945
... ... @@ -433,7 +433,7 @@
433 433 .p_swiper {
434 434 display: flex;
435 435 padding: 0 10rpx;
436   - box-sizing: border-box;
  436 + box-sizing: content-box;
437 437 }
438 438  
439 439 .nav {
... ...
utils/auth.js
  View file @70ab945
... ... @@ -153,8 +153,10 @@ module.exports = {
153 153 ab.get("/api/weshop/users/get/" + oo.stoid+"/"+app_d.user_id, {
154 154 data:{r:Math.random()},
155 155 success: function (e) {
156   - app_d.userInfo = e.data.data;
157   - "function" == typeof t && t(e.data.data);
  156 + app_d.userInfo = e.data.data;
  157 + app_d.user_id = e.data.data.user_id;
  158 + wx.setStorageSync("userinfo",app_d.userInfo);
  159 + "function" == typeof t && t(e.data.data);
158 160 },
159 161 });
160 162 }else{
... ... @@ -186,7 +188,9 @@ module.exports = {
186 188 ab.get("/api/weshop/users/get/" + oo.stoid + "/" + app_d.user_id, {
187 189 isShowLoading:0,
188 190 success: function (e) {
189   - app_d.userInfo = e.data.data;
  191 + app_d.userInfo = e.data.data;
  192 + app_d.user_id = e.data.data.user_id;
  193 + wx.setStorageSync("userinfo",app_d.userInfo);
190 194 "function" == typeof t && t(e.data.data);
191 195 },
192 196 });
... ...