Commit c6ae1afadcc8341117331b3dce53e94092c9faf7
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
Showing
25 changed files
with
524 additions
and
273 deletions
components/diy_goodsGroup/diy_goodsGroup.js
| @@ -443,7 +443,9 @@ Component({ | @@ -443,7 +443,9 @@ Component({ | ||
| 443 | item.cardprice1 = val.cardprice1; | 443 | item.cardprice1 = val.cardprice1; |
| 444 | item.cardprice2 = val.cardprice2; | 444 | item.cardprice2 = val.cardprice2; |
| 445 | item.cardprice3 = val.cardprice3; | 445 | item.cardprice3 = val.cardprice3; |
| 446 | - | 446 | + item.prom_type = val.prom_type; |
| 447 | + item.prom_id = val.prom_id; | ||
| 448 | + | ||
| 447 | if(val.prom_price) item.prom_price = val.prom_price; | 449 | if(val.prom_price) item.prom_price = val.prom_price; |
| 448 | if(val.prom_integral) item.prom_integral = val.prom_integral; | 450 | if(val.prom_integral) item.prom_integral = val.prom_integral; |
| 449 | 451 |
components/diy_goodsGroup/diy_goodsGroup.wxml
| @@ -15,7 +15,7 @@ | @@ -15,7 +15,7 @@ | ||
| 15 | <view class="zs_goods_wai" wx:if='{{object.column==1}}'> | 15 | <view class="zs_goods_wai" wx:if='{{object.column==1}}'> |
| 16 | <block wx:for="{{goods_array}}" > | 16 | <block wx:for="{{goods_array}}" > |
| 17 | <view class='zs_goods {{g_filter.get_border_type(object.big_order_type)}}'> | 17 | <view class='zs_goods {{g_filter.get_border_type(object.big_order_type)}}'> |
| 18 | - <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1"> | 18 | + <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&prom_id={{item.prom_id}}&&prom_type={{item.prom_type}}" class="s1_gk_a1"> |
| 19 | <view class='zs_top rel'> | 19 | <view class='zs_top rel'> |
| 20 | 20 | ||
| 21 | <block wx:if="{{object.big_order_type==3}}"> | 21 | <block wx:if="{{object.big_order_type==3}}"> |
| @@ -169,7 +169,7 @@ | @@ -169,7 +169,7 @@ | ||
| 169 | <!--2个一列--> | 169 | <!--2个一列--> |
| 170 | <block wx:if="{{object.column==2}}"> | 170 | <block wx:if="{{object.column==2}}"> |
| 171 | <block wx:for="{{goods_array}}" > | 171 | <block wx:for="{{goods_array}}" > |
| 172 | - <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1"> | 172 | + <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&prom_id={{item.prom_id}}&&prom_type={{item.prom_type}}" class="s1_gk_a1"> |
| 173 | <view class="zs_goods_wai_ban {{g_filter.get_border_type(object.big_order_type)}}"> | 173 | <view class="zs_goods_wai_ban {{g_filter.get_border_type(object.big_order_type)}}"> |
| 174 | <view class="zs_goods_ban"> | 174 | <view class="zs_goods_ban"> |
| 175 | <view class='zs_goods_2l'> | 175 | <view class='zs_goods_2l'> |
| @@ -328,7 +328,7 @@ | @@ -328,7 +328,7 @@ | ||
| 328 | <block wx:if='{{object.column==3}}'> | 328 | <block wx:if='{{object.column==3}}'> |
| 329 | <view class="zwp_3"> | 329 | <view class="zwp_3"> |
| 330 | <block wx:for="{{goods_array}}" > | 330 | <block wx:for="{{goods_array}}" > |
| 331 | - <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1"> | 331 | + <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&prom_id={{item.prom_id}}&&prom_type={{item.prom_type}}" class="s1_gk_a1"> |
| 332 | <view class="zs_goods_wai_san" > | 332 | <view class="zs_goods_wai_san" > |
| 333 | <view class="zs_goods_san"> | 333 | <view class="zs_goods_san"> |
| 334 | <view class='zs_goods_3l {{g_filter.get_border_type(object.big_order_type)}}'> | 334 | <view class='zs_goods_3l {{g_filter.get_border_type(object.big_order_type)}}'> |
| @@ -485,7 +485,7 @@ | @@ -485,7 +485,7 @@ | ||
| 485 | <!-- 列表显示 --> | 485 | <!-- 列表显示 --> |
| 486 | <view class="zs_goods_xiao_wai" wx:if='{{object.column==4}}'> | 486 | <view class="zs_goods_xiao_wai" wx:if='{{object.column==4}}'> |
| 487 | <block wx:for="{{goods_array}}" > | 487 | <block wx:for="{{goods_array}}" > |
| 488 | - <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1"> | 488 | + <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&prom_id={{item.prom_id}}&&prom_type={{item.prom_type}}" class="s1_gk_a1"> |
| 489 | <view class="{{object.noboder==0?'zs_goods_xiao_bottom':'zs_goods_xiao'}}" > | 489 | <view class="{{object.noboder==0?'zs_goods_xiao_bottom':'zs_goods_xiao'}}" > |
| 490 | <view class='zs_top_x'> | 490 | <view class='zs_top_x'> |
| 491 | <block wx:if="{{object.big_order_type==3}}"> | 491 | <block wx:if="{{object.big_order_type==3}}"> |
| @@ -662,7 +662,7 @@ | @@ -662,7 +662,7 @@ | ||
| 662 | <view class="sp"> | 662 | <view class="sp"> |
| 663 | <swiper-item class="s_it" wx:for="{{goods_array}}"> | 663 | <swiper-item class="s_it" wx:for="{{goods_array}}"> |
| 664 | <block wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind"> | 664 | <block wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind"> |
| 665 | - <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{aitem.goods_id}}" style="width: 32%" > | 665 | + <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{aitem.goods_id}}&prom_id={{aitem.prom_id}}&&prom_type={{aitem.prom_type}}" style="width: 32%" > |
| 666 | <view class="one {{object.big_order_type==0?'zj':''}}{{object.big_order_type==1?'yj':''}} " style="margin-left: 10rpx"> | 666 | <view class="one {{object.big_order_type==0?'zj':''}}{{object.big_order_type==1?'yj':''}} " style="margin-left: 10rpx"> |
| 667 | <view class='sp_top'> | 667 | <view class='sp_top'> |
| 668 | <view class='s_img' style="position: relative; width: 100%"> | 668 | <view class='s_img' style="position: relative; width: 100%"> |
components/diy_seckill/diy_seckill.js
| @@ -81,7 +81,7 @@ Component({ | @@ -81,7 +81,7 @@ Component({ | ||
| 81 | 81 | ||
| 82 | //--调用接口,读取秒杀-- | 82 | //--调用接口,读取秒杀-- |
| 83 | app.request.promiseGet("/api/ms/flash_sale/getGoodsList?store_id=" | 83 | app.request.promiseGet("/api/ms/flash_sale/getGoodsList?store_id=" |
| 84 | - + os.stoid + "&goodsidlist=" + goodsidlist+"&user_id"+user_id, {}).then(res => { | 84 | + + os.stoid + "&goodsidlist=" + goodsidlist+"&user_id="+user_id, {}).then(res => { |
| 85 | console.log(res); | 85 | console.log(res); |
| 86 | //如果秒杀的数组为空的时候 | 86 | //如果秒杀的数组为空的时候 |
| 87 | var goodslist = res.data.data; | 87 | var goodslist = res.data.data; |
components/goods_list/goods_list.js
| @@ -26,6 +26,12 @@ Component({ | @@ -26,6 +26,12 @@ Component({ | ||
| 26 | //要处理一下，游客登录后的界面的变化,主要还该是改变会员 | 26 | //要处理一下，游客登录后的界面的变化,主要还该是改变会员 |
| 27 | show: function () { | 27 | show: function () { |
| 28 | this.init(); | 28 | this.init(); |
| 29 | + if(getApp().globalData.login_back==1){ | ||
| 30 | + getApp().globalData.login_back==0; | ||
| 31 | + this.data.curPage=1; | ||
| 32 | + this.setData({ recommend: [] }); | ||
| 33 | + this.get_list(); | ||
| 34 | + } | ||
| 29 | } | 35 | } |
| 30 | }, | 36 | }, |
| 31 | 37 | ||
| @@ -98,6 +104,9 @@ Component({ | @@ -98,6 +104,9 @@ Component({ | ||
| 98 | get_list: function () { | 104 | get_list: function () { |
| 99 | var that = this; | 105 | var that = this; |
| 100 | if (that.data.is_no_more == 0) return false; | 106 | if (that.data.is_no_more == 0) return false; |
| 107 | + var user_id=getApp().globalData.user_id; | ||
| 108 | + if(!user_id) user_id=0; | ||
| 109 | + | ||
| 101 | var curPage = that.data.curPage; | 110 | var curPage = that.data.curPage; |
| 102 | getApp().request.get('/api/weshop/goods/page?page', { | 111 | getApp().request.get('/api/weshop/goods/page?page', { |
| 103 | isShowLoading: false, | 112 | isShowLoading: false, |
| @@ -111,6 +120,7 @@ Component({ | @@ -111,6 +120,7 @@ Component({ | ||
| 111 | pageSize: 6, | 120 | pageSize: 6, |
| 112 | orderField: "sort", | 121 | orderField: "sort", |
| 113 | orderType: 'asc', | 122 | orderType: 'asc', |
| 123 | + user_id: user_id, | ||
| 114 | }, | 124 | }, |
| 115 | success: function (res) { | 125 | success: function (res) { |
| 116 | var data = res.data; | 126 | var data = res.data; |
| @@ -124,6 +134,13 @@ Component({ | @@ -124,6 +134,13 @@ Component({ | ||
| 124 | } | 134 | } |
| 125 | //加载完成 | 135 | //加载完成 |
| 126 | if (data.data.pageData) { | 136 | if (data.data.pageData) { |
| 137 | + | ||
| 138 | + for(let i in data.data.pageData){ | ||
| 139 | + let item=data.data.pageData[i]; | ||
| 140 | + if(item.user_price) | ||
| 141 | + item.prom_price=item.user_price; | ||
| 142 | + } | ||
| 143 | + | ||
| 127 | that.setData({ | 144 | that.setData({ |
| 128 | load_complete: 1 | 145 | load_complete: 1 |
| 129 | }); | 146 | }); |
packageA/pages/goodsInfo/goodsInfo.js
| @@ -958,44 +958,54 @@ Page({ | @@ -958,44 +958,54 @@ Page({ | ||
| 958 | getApp().request.get("/api/weshop/storagecategory/page", { | 958 | getApp().request.get("/api/weshop/storagecategory/page", { |
| 959 | data: { | 959 | data: { |
| 960 | store_id: o.stoid, | 960 | store_id: o.stoid, |
| 961 | - is_show: 1, | ||
| 962 | pageSize: 1000, | 961 | pageSize: 1000, |
| 963 | orderField:"sort", | 962 | orderField:"sort", |
| 964 | orderType:'asc', | 963 | orderType:'asc', |
| 965 | }, | 964 | }, |
| 966 | success: function(ee) { | 965 | success: function(ee) { |
| 967 | if (ee.data.code == 0) { | 966 | if (ee.data.code == 0) { |
| 968 | - | ||
| 969 | - if (ee.data.data && ee.data.data.pageData && ee.data.data.pageData.length > 0) { | ||
| 970 | - var def_arr = new Array(); | ||
| 971 | - var ishas = 0; | ||
| 972 | - //-- 开始就看5个门店 -- | ||
| 973 | - for (var k = 0; k < 5; k++) { | ||
| 974 | - if (k == e.data.data.pageData.length) break; | ||
| 975 | - def_arr.push(e.data.data.pageData[k]); | 967 | + |
| 968 | + var check_all_cate=0; | ||
| 969 | + if (ee.data.data && ee.data.data.pageData && ee.data.data.pageData.length > 0){ | ||
| 970 | + for(let i in ee.data.data.pageData){ | ||
| 971 | + let item=ee.data.data.pageData[i]; | ||
| 972 | + if(item.is_show==1){ | ||
| 973 | + check_all_cate=1;break | ||
| 974 | + } | ||
| 975 | + } | ||
| 976 | } | 976 | } |
| 977 | + | ||
| 978 | + if (check_all_cate) { | ||
| 979 | + | ||
| 977 | 980 | ||
| 978 | - th.setData({ | ||
| 979 | - def_pickpu_list: def_arr, | ||
| 980 | - pickpu_list: ee.data.data.pageData | ||
| 981 | - }); | ||
| 982 | var sto_cate = ee.data.data.pageData; | 981 | var sto_cate = ee.data.data.pageData; |
| 983 | var sto_arr = e.data.data.pageData; | 982 | var sto_arr = e.data.data.pageData; |
| 984 | var newarr = new Array(); | 983 | var newarr = new Array(); |
| 985 | var qita = new Array(); | 984 | var qita = new Array(); |
| 986 | 985 | ||
| 986 | + var is_del_pk=0; | ||
| 987 | + | ||
| 987 | //----要进行门店分组-------- | 988 | //----要进行门店分组-------- |
| 988 | for (var i = 0; i < sto_arr.length; i++) { | 989 | for (var i = 0; i < sto_arr.length; i++) { |
| 989 | //找一下这个门店有没有在分类数组内 | 990 | //找一下这个门店有没有在分类数组内 |
| 990 | var find2 = 0, find2name = "",sort=0; | 991 | var find2 = 0, find2name = "",sort=0; |
| 992 | + is_del_pk=0; | ||
| 991 | for (var m = 0; m < sto_cate.length; m++) { | 993 | for (var m = 0; m < sto_cate.length; m++) { |
| 992 | - if (sto_arr[i].category_id == sto_cate[m].cat_id) { | ||
| 993 | - find2 = sto_cate[m].cat_id; | ||
| 994 | - find2name = sto_cate[m].cat_name; | ||
| 995 | - sort = sto_cate[m].sort; | ||
| 996 | - break; | ||
| 997 | - } | 994 | + if (sto_arr[i].category_id == sto_cate[m].cat_id) { |
| 995 | + if (sto_cate[m].is_show != 1) { | ||
| 996 | + is_del_pk = 1; | ||
| 997 | + sto_arr.splice(i, 1); | ||
| 998 | + i--; | ||
| 999 | + } else { | ||
| 1000 | + find2 = sto_cate[m].cat_id; | ||
| 1001 | + find2name = sto_cate[m].cat_name; | ||
| 1002 | + sort = sto_cate[m].sort; | ||
| 1003 | + is_del_pk = 0; | ||
| 1004 | + } | ||
| 1005 | + break; | ||
| 1006 | + } | ||
| 998 | } | 1007 | } |
| 1008 | + if(is_del_pk) continue; | ||
| 999 | 1009 | ||
| 1000 | if (newarr.length > 0) { | 1010 | if (newarr.length > 0) { |
| 1001 | var find = 0; | 1011 | var find = 0; |
| @@ -1039,6 +1049,18 @@ Page({ | @@ -1039,6 +1049,18 @@ Page({ | ||
| 1039 | } | 1049 | } |
| 1040 | } | 1050 | } |
| 1041 | } | 1051 | } |
| 1052 | + | ||
| 1053 | + var def_arr = new Array(); | ||
| 1054 | + //-- 开始就看10个门店 -- | ||
| 1055 | + for (var k = 0; k < 10; k++) { | ||
| 1056 | + if (k == sto_arr.length) break; | ||
| 1057 | + def_arr.push(sto_arr[k]); | ||
| 1058 | + } | ||
| 1059 | + | ||
| 1060 | + th.setData({ | ||
| 1061 | + def_pickpu_list: def_arr, | ||
| 1062 | + pickpu_list: ee.data.data.pageData | ||
| 1063 | + }); | ||
| 1042 | 1064 | ||
| 1043 | //门店分类要排序下 | 1065 | //门店分类要排序下 |
| 1044 | function compare(property){ | 1066 | function compare(property){ |
| @@ -1060,11 +1082,16 @@ Page({ | @@ -1060,11 +1082,16 @@ Page({ | ||
| 1060 | }; | 1082 | }; |
| 1061 | newarr.push(item); | 1083 | newarr.push(item); |
| 1062 | } | 1084 | } |
| 1063 | - | ||
| 1064 | - th.setData({ | ||
| 1065 | - is_show_sto_cat: 1, | ||
| 1066 | - all_sto: newarr | ||
| 1067 | - }); | 1085 | + |
| 1086 | + var sd={ | ||
| 1087 | + all_sto: newarr, | ||
| 1088 | + is_show_sto_cat:1 | ||
| 1089 | + } | ||
| 1090 | + if(!sto_arr || sto_arr.length<=10){ | ||
| 1091 | + sd.is_show_sto_cat=-1; | ||
| 1092 | + sd.only_pk=sto_arr; | ||
| 1093 | + } | ||
| 1094 | + th.setData(sd); | ||
| 1068 | 1095 | ||
| 1069 | } else { | 1096 | } else { |
| 1070 | th.setData({ | 1097 | th.setData({ |
packageA/pages/goodsInfo/goodsInfo.wxml
| @@ -340,9 +340,9 @@ | @@ -340,9 +340,9 @@ | ||
| 340 | <view> | 340 | <view> |
| 341 | <icon bindtap="close_popup" class="modal-closes" color="black" size="22" type="cancel"></icon> | 341 | <icon bindtap="close_popup" class="modal-closes" color="black" size="22" type="cancel"></icon> |
| 342 | </view> | 342 | </view> |
| 343 | - <view class="felx choose_more" bindtap="more_store"> | ||
| 344 | - <text class="fs26 red-co" wx:if="{{is_show_sto_cat}}">{{choice_sort_store==0?'更多门店':'返回'}}</text> | ||
| 345 | - <view class="bg_rights" wx:if="{{is_show_sto_cat}}"></view> | 343 | + <view class="felx choose_more" bindtap="more_store" wx:if="{{is_show_sto_cat>0}}" > |
| 344 | + <text class="fs26 red-co">{{choice_sort_store==0?'更多门店':'返回'}}</text> | ||
| 345 | + <view class="bg_rights"></view> | ||
| 346 | </view> | 346 | </view> |
| 347 | </view> | 347 | </view> |
| 348 | </view> | 348 | </view> |
packageA/pages/profile/profile.js
| @@ -284,43 +284,53 @@ Page({ | @@ -284,43 +284,53 @@ Page({ | ||
| 284 | if (e.data.data.total > 10 && ishas_cate) { | 284 | if (e.data.data.total > 10 && ishas_cate) { |
| 285 | i.get("/api/weshop/storagecategory/page", { | 285 | i.get("/api/weshop/storagecategory/page", { |
| 286 | data: { | 286 | data: { |
| 287 | - store_id: r.stoid, | ||
| 288 | - is_show: 1, | ||
| 289 | - pageSize: 300 | 287 | + store_id: r.stoid, |
| 288 | + pageSize: 1000, | ||
| 289 | + orderField:"sort", | ||
| 290 | + orderType:'asc', | ||
| 290 | }, | 291 | }, |
| 291 | success: function(ee) { | 292 | success: function(ee) { |
| 292 | if (ee.data.code == 0) { | 293 | if (ee.data.code == 0) { |
| 293 | - if (ee.data.data.pageData.length > 0) { | ||
| 294 | - var def_arr = new Array(); | ||
| 295 | - var ishas = 0; | ||
| 296 | - //-- 开始就看5个门店 -- | ||
| 297 | - for (var k = 0; k < 5; k++) { | ||
| 298 | - if (k == e.data.data.pageData.length) break; | ||
| 299 | - def_arr.push(e.data.data.pageData[k]); | ||
| 300 | - } | ||
| 301 | - | ||
| 302 | - th.setData({ | ||
| 303 | - def_pickpu_list: def_arr, | ||
| 304 | - pickpu_list: ee.data.data.pageData | ||
| 305 | - }); | 294 | + |
| 295 | + var check_all_cate=0; | ||
| 296 | + if (ee.data.data && ee.data.data.pageData && ee.data.data.pageData.length > 0){ | ||
| 297 | + for(let i in ee.data.data.pageData){ | ||
| 298 | + let item=ee.data.data.pageData[i]; | ||
| 299 | + if(item.is_show==1){ | ||
| 300 | + check_all_cate=1;break | ||
| 301 | + } | ||
| 302 | + } | ||
| 303 | + } | ||
| 304 | + | ||
| 305 | + if (check_all_cate) { | ||
| 306 | + | ||
| 306 | var sto_cate = ee.data.data.pageData; | 307 | var sto_cate = ee.data.data.pageData; |
| 307 | var sto_arr = e.data.data.pageData; | 308 | var sto_arr = e.data.data.pageData; |
| 308 | var newarr = new Array(); | 309 | var newarr = new Array(); |
| 309 | var qita = new Array(); | 310 | var qita = new Array(); |
| 310 | - | 311 | + |
| 312 | + var is_del_pk=0; | ||
| 311 | //----要进行门店分组-------- | 313 | //----要进行门店分组-------- |
| 312 | for (var i = 0; i < sto_arr.length; i++) { | 314 | for (var i = 0; i < sto_arr.length; i++) { |
| 313 | //找一下这个门店有没有在分类数组内 | 315 | //找一下这个门店有没有在分类数组内 |
| 314 | - var find2 = 0, | ||
| 315 | - find2name = ""; | 316 | + var find2 = 0,find2name = "",sort=0; |
| 317 | + is_del_pk=0; | ||
| 316 | for (var m = 0; m < sto_cate.length; m++) { | 318 | for (var m = 0; m < sto_cate.length; m++) { |
| 317 | if (sto_arr[i].category_id == sto_cate[m].cat_id) { | 319 | if (sto_arr[i].category_id == sto_cate[m].cat_id) { |
| 318 | - find2 = sto_cate[m].cat_id; | ||
| 319 | - find2name = sto_cate[m].cat_name; | 320 | + if(sto_cate[m].is_show!=1){ |
| 321 | + is_del_pk=1; sto_arr.splice(i,1); | ||
| 322 | + i--; | ||
| 323 | + }else { | ||
| 324 | + find2 = sto_cate[m].cat_id; | ||
| 325 | + find2name = sto_cate[m].cat_name; | ||
| 326 | + sort = sto_cate[m].sort; | ||
| 327 | + is_del_pk=0; | ||
| 328 | + } | ||
| 320 | break; | 329 | break; |
| 321 | } | 330 | } |
| 322 | } | 331 | } |
| 323 | - | 332 | + if(is_del_pk) continue; |
| 333 | + | ||
| 324 | if (newarr.length > 0) { | 334 | if (newarr.length > 0) { |
| 325 | var find = 0; | 335 | var find = 0; |
| 326 | //如果有找到，那门店就在这个分组内，否则，分类就要排在其他 | 336 | //如果有找到，那门店就在这个分组内，否则，分类就要排在其他 |
| @@ -338,6 +348,7 @@ Page({ | @@ -338,6 +348,7 @@ Page({ | ||
| 338 | var item = { | 348 | var item = { |
| 339 | cat_id: find2, | 349 | cat_id: find2, |
| 340 | name: find2name, | 350 | name: find2name, |
| 351 | + sort:sort, | ||
| 341 | s_arr: arr0 | 352 | s_arr: arr0 |
| 342 | }; | 353 | }; |
| 343 | newarr.push(item); | 354 | newarr.push(item); |
| @@ -353,6 +364,7 @@ Page({ | @@ -353,6 +364,7 @@ Page({ | ||
| 353 | var item = { | 364 | var item = { |
| 354 | cat_id: find2, | 365 | cat_id: find2, |
| 355 | name: find2name, | 366 | name: find2name, |
| 367 | + sort:sort, | ||
| 356 | s_arr: arr0 | 368 | s_arr: arr0 |
| 357 | }; | 369 | }; |
| 358 | newarr.push(item); | 370 | newarr.push(item); |
| @@ -361,6 +373,30 @@ Page({ | @@ -361,6 +373,30 @@ Page({ | ||
| 361 | } | 373 | } |
| 362 | } | 374 | } |
| 363 | } | 375 | } |
| 376 | + | ||
| 377 | + var def_arr = new Array(); | ||
| 378 | + //-- 开始就看10个门店 -- | ||
| 379 | + for (var k = 0; k < 10; k++) { | ||
| 380 | + if (k == e.data.data.pageData.length) break; | ||
| 381 | + def_arr.push(e.data.data.pageData[k]); | ||
| 382 | + } | ||
| 383 | + | ||
| 384 | + th.setData({ | ||
| 385 | + def_pickpu_list: def_arr, | ||
| 386 | + pickpu_list: ee.data.data.pageData | ||
| 387 | + }); | ||
| 388 | + | ||
| 389 | + //门店分类要排序下 | ||
| 390 | + function compare(property){ | ||
| 391 | + return function(a,b){ | ||
| 392 | + var value1 = a[property]; | ||
| 393 | + var value2 = b[property]; | ||
| 394 | + return value1 - value2; | ||
| 395 | + } | ||
| 396 | + } | ||
| 397 | + if(newarr.length>0) | ||
| 398 | + newarr.sort(compare("sort")); | ||
| 399 | + | ||
| 364 | 400 | ||
| 365 | //----安排其他的分类----- | 401 | //----安排其他的分类----- |
| 366 | if (qita.length > 0) { | 402 | if (qita.length > 0) { |
packageA/pages/profile/profile.wxml
| @@ -211,8 +211,8 @@ | @@ -211,8 +211,8 @@ | ||
| 211 | <view> | 211 | <view> |
| 212 | <icon bindtap="onclickstore" class="modal-closes" color="black" size="22" type="cancel"></icon> | 212 | <icon bindtap="onclickstore" class="modal-closes" color="black" size="22" type="cancel"></icon> |
| 213 | </view> | 213 | </view> |
| 214 | - <view class="felx choose_more" bindtap="more_store"> | ||
| 215 | - <text class="fs26 red-co" wx:if="{{is_show_sto_cat}}">{{choice_sort_store==0?'更多门店':'返回'}}</text> | 214 | + <view class="felx choose_more" bindtap="more_store" wx:if="{{is_show_sto_cat>0}}" > |
| 215 | + <text class="fs26 red-co" >{{choice_sort_store==0?'更多门店':'返回'}}</text> | ||
| 216 | <view class="bg_rights"></view> | 216 | <view class="bg_rights"></view> |
| 217 | </view> | 217 | </view> |
| 218 | </view> | 218 | </view> |
packageA/pages/prom_list/prom_list.js
| @@ -650,8 +650,11 @@ Page({ | @@ -650,8 +650,11 @@ Page({ | ||
| 650 | th.data.def_pick_store.is_no_dis=1; | 650 | th.data.def_pick_store.is_no_dis=1; |
| 651 | th.setData({def_pick_store:th.data.def_pick_store}); | 651 | th.setData({def_pick_store:th.data.def_pick_store}); |
| 652 | }else{ | 652 | }else{ |
| 653 | - th.data.def_pick_store.is_no_dis=0; | ||
| 654 | - th.setData({def_pick_store:th.data.def_pick_store}); | 653 | + if(th.data.def_pick_store){ |
| 654 | + th.data.def_pick_store.is_no_dis=0; | ||
| 655 | + th.setData({def_pick_store:th.data.def_pick_store}); | ||
| 656 | + } | ||
| 657 | + | ||
| 655 | } | 658 | } |
| 656 | } | 659 | } |
| 657 | } | 660 | } |
| @@ -823,43 +826,51 @@ Page({ | @@ -823,43 +826,51 @@ Page({ | ||
| 823 | getApp().request.get("/api/weshop/storagecategory/page", { | 826 | getApp().request.get("/api/weshop/storagecategory/page", { |
| 824 | data: { | 827 | data: { |
| 825 | store_id: o.stoid, | 828 | store_id: o.stoid, |
| 826 | - is_show: 1, | ||
| 827 | pageSize: 1000, | 829 | pageSize: 1000, |
| 828 | orderField:"sort", | 830 | orderField:"sort", |
| 829 | orderType:'asc', | 831 | orderType:'asc', |
| 830 | }, | 832 | }, |
| 831 | success: function(ee) { | 833 | success: function(ee) { |
| 832 | if (ee.data.code == 0) { | 834 | if (ee.data.code == 0) { |
| 833 | - if (ee.data.data && ee.data.data.pageData && ee.data.data.pageData.length > 0) { | ||
| 834 | - var def_arr = new Array(); | ||
| 835 | - var ishas = 0; | ||
| 836 | - //-- 开始就看5个门店 -- | ||
| 837 | - for (var k = 0; k < 5; k++) { | ||
| 838 | - if (k == e.data.data.pageData.length) break; | ||
| 839 | - def_arr.push(e.data.data.pageData[k]); | ||
| 840 | - } | ||
| 841 | - | ||
| 842 | - th.setData({ | ||
| 843 | - def_pickpu_list: def_arr, | ||
| 844 | - pickpu_list: ee.data.data.pageData | ||
| 845 | - }); | 835 | + |
| 836 | + var check_all_cate=0; | ||
| 837 | + if (ee.data.data && ee.data.data.pageData && ee.data.data.pageData.length > 0){ | ||
| 838 | + for(let i in ee.data.data.pageData){ | ||
| 839 | + let item=ee.data.data.pageData[i]; | ||
| 840 | + if(item.is_show==1){ | ||
| 841 | + check_all_cate=1;break | ||
| 842 | + } | ||
| 843 | + } | ||
| 844 | + } | ||
| 845 | + | ||
| 846 | + if (check_all_cate) { | ||
| 847 | + | ||
| 846 | var sto_cate = ee.data.data.pageData; | 848 | var sto_cate = ee.data.data.pageData; |
| 847 | var sto_arr = e.data.data.pageData; | 849 | var sto_arr = e.data.data.pageData; |
| 848 | var newarr = new Array(); | 850 | var newarr = new Array(); |
| 849 | var qita = new Array(); | 851 | var qita = new Array(); |
| 850 | - | 852 | + |
| 853 | + var is_del_pk=0; | ||
| 851 | //----要进行门店分组-------- | 854 | //----要进行门店分组-------- |
| 852 | for (var i = 0; i < sto_arr.length; i++) { | 855 | for (var i = 0; i < sto_arr.length; i++) { |
| 853 | //找一下这个门店有没有在分类数组内 | 856 | //找一下这个门店有没有在分类数组内 |
| 854 | var find2 = 0, find2name = "",sort=0; | 857 | var find2 = 0, find2name = "",sort=0; |
| 858 | + is_del_pk=0; | ||
| 855 | for (var m = 0; m < sto_cate.length; m++) { | 859 | for (var m = 0; m < sto_cate.length; m++) { |
| 856 | - if (sto_arr[i].category_id == sto_cate[m].cat_id) { | ||
| 857 | - find2 = sto_cate[m].cat_id; | ||
| 858 | - find2name = sto_cate[m].cat_name; | ||
| 859 | - sort=sto_cate[m].sort; | ||
| 860 | - break; | ||
| 861 | - } | 860 | + if (sto_arr[i].category_id == sto_cate[m].cat_id) { |
| 861 | + if(sto_cate[m].is_show!=1){ | ||
| 862 | + is_del_pk=1; sto_arr.splice(i,1); | ||
| 863 | + i--; | ||
| 864 | + }else { | ||
| 865 | + find2 = sto_cate[m].cat_id; | ||
| 866 | + find2name = sto_cate[m].cat_name; | ||
| 867 | + sort = sto_cate[m].sort; | ||
| 868 | + is_del_pk=0; | ||
| 869 | + } | ||
| 870 | + break; | ||
| 871 | + } | ||
| 862 | } | 872 | } |
| 873 | + if(is_del_pk) continue; | ||
| 863 | 874 | ||
| 864 | if (newarr.length > 0) { | 875 | if (newarr.length > 0) { |
| 865 | var find = 0; | 876 | var find = 0; |
| @@ -903,8 +914,19 @@ Page({ | @@ -903,8 +914,19 @@ Page({ | ||
| 903 | } | 914 | } |
| 904 | } | 915 | } |
| 905 | } | 916 | } |
| 906 | - | ||
| 907 | - //门店分类要排序下 | 917 | + |
| 918 | + var def_arr = new Array(); | ||
| 919 | + //-- 开始就看10个门店 -- | ||
| 920 | + for (var k = 0; k < 10; k++) { | ||
| 921 | + if (k == sto_arr.length) break; | ||
| 922 | + def_arr.push(sto_arr[k]); | ||
| 923 | + } | ||
| 924 | + th.setData({ | ||
| 925 | + def_pickpu_list: def_arr, | ||
| 926 | + pickpu_list: ee.data.data.pageData | ||
| 927 | + }); | ||
| 928 | + | ||
| 929 | + //门店分类要排序下 | ||
| 908 | function compare(property){ | 930 | function compare(property){ |
| 909 | return function(a,b){ | 931 | return function(a,b){ |
| 910 | var value1 = a[property]; | 932 | var value1 = a[property]; |
| @@ -925,10 +947,17 @@ Page({ | @@ -925,10 +947,17 @@ Page({ | ||
| 925 | }; | 947 | }; |
| 926 | newarr.push(item); | 948 | newarr.push(item); |
| 927 | } | 949 | } |
| 928 | - th.setData({ | ||
| 929 | - is_show_sto_cat: 1, | ||
| 930 | - all_sto: newarr | ||
| 931 | - }); | 950 | + |
| 951 | + | ||
| 952 | + var sd={ | ||
| 953 | + all_sto: newarr, | ||
| 954 | + is_show_sto_cat:1 | ||
| 955 | + } | ||
| 956 | + if(!sto_arr || sto_arr.length<=10){ | ||
| 957 | + sd.is_show_sto_cat=-1; | ||
| 958 | + sd.only_pk=sto_arr; | ||
| 959 | + } | ||
| 960 | + th.setData(sd); | ||
| 932 | 961 | ||
| 933 | } else { | 962 | } else { |
| 934 | th.setData({ | 963 | th.setData({ |
packageA/pages/prom_list/prom_list.wxml
| @@ -214,9 +214,9 @@ | @@ -214,9 +214,9 @@ | ||
| 214 | <view> | 214 | <view> |
| 215 | <icon bindtap="close_popup" class="modal-closes" color="black" size="22" type="cancel"></icon> | 215 | <icon bindtap="close_popup" class="modal-closes" color="black" size="22" type="cancel"></icon> |
| 216 | </view> | 216 | </view> |
| 217 | - <view class="felx choose_more" bindtap="more_store"> | ||
| 218 | - <text class="fs26 red-co" wx:if="{{is_show_sto_cat}}">{{choice_sort_store==0?'更多门店':'返回'}}</text> | ||
| 219 | - <view class="bg_rights" wx:if="{{is_show_sto_cat}}"></view> | 217 | + <view class="felx choose_more" bindtap="more_store" wx:if="{{is_show_sto_cat>0}}"> |
| 218 | + <text class="fs26 red-co" >{{choice_sort_store==0?'更多门店':'返回'}}</text> | ||
| 219 | + <view class="bg_rights"></view> | ||
| 220 | </view> | 220 | </view> |
| 221 | </view> | 221 | </view> |
| 222 | </view> | 222 | </view> |
packageA/pages/prom_list/prom_list.wxss
packageB/pages/zuhegou/index/index.js
| @@ -441,6 +441,23 @@ Page({ | @@ -441,6 +441,23 @@ Page({ | ||
| 441 | }, | 441 | }, |
| 442 | 442 | ||
| 443 | /** | 443 | /** |
| 444 | + * 用户分享朋友圈 | ||
| 445 | + */ | ||
| 446 | + onShareTimeline(){ | ||
| 447 | + var title = this.data.act.name; | ||
| 448 | + var url= "/packageB/pages/zuhegou/index/index?id="+this.data.act.id; | ||
| 449 | + if (getApp().globalData.user_id) { | ||
| 450 | + url += "&first_leader=" + getApp().globalData.user_id; | ||
| 451 | + } | ||
| 452 | + var ob = { | ||
| 453 | + title:title, | ||
| 454 | + path: url, | ||
| 455 | + }; | ||
| 456 | + if(this.data.act.img_url) | ||
| 457 | + ob.imageUrl=this.data.iurl+this.data.act.img_url; | ||
| 458 | + return ob; | ||
| 459 | + }, | ||
| 460 | + /** | ||
| 444 | * 点击规则详情,弹出规则 | 461 | * 点击规则详情,弹出规则 |
| 445 | */ | 462 | */ |
| 446 | showRule() { | 463 | showRule() { |
| @@ -1272,42 +1289,52 @@ Page({ | @@ -1272,42 +1289,52 @@ Page({ | ||
| 1272 | getApp().request.get("/api/weshop/storagecategory/page", { | 1289 | getApp().request.get("/api/weshop/storagecategory/page", { |
| 1273 | data: { | 1290 | data: { |
| 1274 | store_id: os.stoid, | 1291 | store_id: os.stoid, |
| 1275 | - is_show: 1, | ||
| 1276 | pageSize: 1000, | 1292 | pageSize: 1000, |
| 1277 | orderField: "sort", | 1293 | orderField: "sort", |
| 1278 | orderType: 'asc', | 1294 | orderType: 'asc', |
| 1279 | }, | 1295 | }, |
| 1280 | success: function (ee) { | 1296 | success: function (ee) { |
| 1281 | if (ee.data.code == 0) { | 1297 | if (ee.data.code == 0) { |
| 1282 | - if (ee.data.data && ee.data.data.pageData && ee.data.data.pageData.length > 0) { | ||
| 1283 | - var def_arr = new Array(); | ||
| 1284 | - //-- 开始就看5个门店 -- | ||
| 1285 | - for (var k = 0; k < 5; k++) { | ||
| 1286 | - if (k == e.data.data.pageData.length) break; | ||
| 1287 | - def_arr.push(e.data.data.pageData[k]); | 1298 | + |
| 1299 | + var check_all_cate=0; | ||
| 1300 | + if (ee.data.data && ee.data.data.pageData && ee.data.data.pageData.length > 0){ | ||
| 1301 | + for(let i in ee.data.data.pageData){ | ||
| 1302 | + let item=ee.data.data.pageData[i]; | ||
| 1303 | + if(item.is_show==1){ | ||
| 1304 | + check_all_cate=1;break | ||
| 1305 | + } | ||
| 1288 | } | 1306 | } |
| 1307 | + } | ||
| 1308 | + | ||
| 1309 | + if (check_all_cate) { | ||
| 1289 | 1310 | ||
| 1290 | - th.setData({ | ||
| 1291 | - def_pickpu_list: def_arr, | ||
| 1292 | - pickpu_list: ee.data.data.pageData | ||
| 1293 | - }); | ||
| 1294 | var sto_cate = ee.data.data.pageData; | 1311 | var sto_cate = ee.data.data.pageData; |
| 1295 | var sto_arr = e.data.data.pageData; | 1312 | var sto_arr = e.data.data.pageData; |
| 1296 | var newarr = new Array(); | 1313 | var newarr = new Array(); |
| 1297 | var qita = new Array(); | 1314 | var qita = new Array(); |
| 1298 | 1315 | ||
| 1316 | + var is_del_pk=0; | ||
| 1299 | //----要进行门店分组-------- | 1317 | //----要进行门店分组-------- |
| 1300 | for (var i = 0; i < sto_arr.length; i++) { | 1318 | for (var i = 0; i < sto_arr.length; i++) { |
| 1301 | //找一下这个门店有没有在分类数组内 | 1319 | //找一下这个门店有没有在分类数组内 |
| 1302 | var find2 = 0, find2name = "", sort = 0; | 1320 | var find2 = 0, find2name = "", sort = 0; |
| 1321 | + is_del_pk=0; | ||
| 1303 | for (var m = 0; m < sto_cate.length; m++) { | 1322 | for (var m = 0; m < sto_cate.length; m++) { |
| 1304 | if (sto_arr[i].category_id == sto_cate[m].cat_id) { | 1323 | if (sto_arr[i].category_id == sto_cate[m].cat_id) { |
| 1305 | - find2 = sto_cate[m].cat_id; | ||
| 1306 | - find2name = sto_cate[m].cat_name; | ||
| 1307 | - sort = sto_cate[m].sort; | 1324 | + if (sto_cate[m].is_show != 1) { |
| 1325 | + is_del_pk = 1; | ||
| 1326 | + sto_arr.splice(i, 1); | ||
| 1327 | + i--; | ||
| 1328 | + } else { | ||
| 1329 | + find2 = sto_cate[m].cat_id; | ||
| 1330 | + find2name = sto_cate[m].cat_name; | ||
| 1331 | + sort = sto_cate[m].sort; | ||
| 1332 | + is_del_pk = 0; | ||
| 1333 | + } | ||
| 1308 | break; | 1334 | break; |
| 1309 | } | 1335 | } |
| 1310 | } | 1336 | } |
| 1337 | + if(is_del_pk) continue; | ||
| 1311 | 1338 | ||
| 1312 | if (newarr.length > 0) { | 1339 | if (newarr.length > 0) { |
| 1313 | var find = 0; | 1340 | var find = 0; |
| @@ -1352,6 +1379,18 @@ Page({ | @@ -1352,6 +1379,18 @@ Page({ | ||
| 1352 | } | 1379 | } |
| 1353 | } | 1380 | } |
| 1354 | 1381 | ||
| 1382 | + var def_arr = new Array(); | ||
| 1383 | + //-- 开始就看10个门店 -- | ||
| 1384 | + for (var k = 0; k < 10; k++) { | ||
| 1385 | + if (k == sto_arr.length) break; | ||
| 1386 | + def_arr.push(sto_arr[k]); | ||
| 1387 | + } | ||
| 1388 | + | ||
| 1389 | + th.setData({ | ||
| 1390 | + def_pickpu_list: def_arr, | ||
| 1391 | + pickpu_list: ee.data.data.pageData | ||
| 1392 | + }); | ||
| 1393 | + | ||
| 1355 | //门店分类要排序下 | 1394 | //门店分类要排序下 |
| 1356 | function compare(property) { | 1395 | function compare(property) { |
| 1357 | return function (a, b) { | 1396 | return function (a, b) { |
| @@ -1372,10 +1411,17 @@ Page({ | @@ -1372,10 +1411,17 @@ Page({ | ||
| 1372 | }; | 1411 | }; |
| 1373 | newarr.push(item); | 1412 | newarr.push(item); |
| 1374 | } | 1413 | } |
| 1375 | - th.setData({ | ||
| 1376 | - is_show_sto_cat: 1, | ||
| 1377 | - all_sto: newarr | ||
| 1378 | - }); | 1414 | + |
| 1415 | + | ||
| 1416 | + var sd={ | ||
| 1417 | + all_sto: newarr, | ||
| 1418 | + is_show_sto_cat:1 | ||
| 1419 | + } | ||
| 1420 | + if(!sto_arr || sto_arr.length<=10){ | ||
| 1421 | + sd.is_show_sto_cat=-1; | ||
| 1422 | + sd.only_pk=sto_arr; | ||
| 1423 | + } | ||
| 1424 | + th.setData(sd); | ||
| 1379 | 1425 | ||
| 1380 | } else { | 1426 | } else { |
| 1381 | th.setData({ | 1427 | th.setData({ |
packageB/pages/zuhegou/index/index.wxml
| @@ -167,9 +167,9 @@ | @@ -167,9 +167,9 @@ | ||
| 167 | <view> | 167 | <view> |
| 168 | <icon bindtap="close_popup" class="modal-closes" color="black" size="22" type="cancel"></icon> | 168 | <icon bindtap="close_popup" class="modal-closes" color="black" size="22" type="cancel"></icon> |
| 169 | </view> | 169 | </view> |
| 170 | - <view class="flex choose_more" bindtap="more_store"> | ||
| 171 | - <text class="fs26 red-co" style="line-height: 30rpx;height: 30rpx" wx:if="{{is_show_sto_cat}}">{{choice_sort_store==0?'更多门店':'返回'}}</text> | ||
| 172 | - <view class="bg_rights" wx:if="{{is_show_sto_cat}}"></view> | 170 | + <view class="flex choose_more" bindtap="more_store" wx:if="{{is_show_sto_cat>0}}"> |
| 171 | + <text class="fs26 red-co" style="line-height: 30rpx;height: 30rpx" >{{choice_sort_store==0?'更多门店':'返回'}}</text> | ||
| 172 | + <view class="bg_rights" ></view> | ||
| 173 | </view> | 173 | </view> |
| 174 | </view> | 174 | </view> |
| 175 | </view> | 175 | </view> |
packageC/pages/presell/goodsInfo/goodsInfo.js
| @@ -1877,7 +1877,6 @@ Page({ | @@ -1877,7 +1877,6 @@ Page({ | ||
| 1877 | getApp().request.get("/api/weshop/storagecategory/page", { | 1877 | getApp().request.get("/api/weshop/storagecategory/page", { |
| 1878 | data: { | 1878 | data: { |
| 1879 | store_id: o.stoid, | 1879 | store_id: o.stoid, |
| 1880 | - is_show: 1, | ||
| 1881 | pageSize: 1000, | 1880 | pageSize: 1000, |
| 1882 | orderField: "sort", | 1881 | orderField: "sort", |
| 1883 | orderType: 'asc', | 1882 | orderType: 'asc', |
| @@ -1885,37 +1884,47 @@ Page({ | @@ -1885,37 +1884,47 @@ Page({ | ||
| 1885 | success: function (ee) { | 1884 | success: function (ee) { |
| 1886 | if (ee.data.code == 0) { | 1885 | if (ee.data.code == 0) { |
| 1887 | 1886 | ||
| 1888 | - if (ee.data.data && ee.data.data.pageData && ee.data.data.pageData.length > 0) { | ||
| 1889 | - var def_arr = new Array(); | ||
| 1890 | - var ishas = 0; | ||
| 1891 | - //-- 开始就看5个门店 -- | ||
| 1892 | - for (var k = 0; k < 5; k++) { | ||
| 1893 | - if (k == e.data.data.pageData.length) break; | ||
| 1894 | - def_arr.push(e.data.data.pageData[k]); | 1887 | + var check_all_cate=0; |
| 1888 | + if (ee.data.data && ee.data.data.pageData && ee.data.data.pageData.length > 0){ | ||
| 1889 | + for(let i in ee.data.data.pageData){ | ||
| 1890 | + let item=ee.data.data.pageData[i]; | ||
| 1891 | + if(item.is_show==1){ | ||
| 1892 | + check_all_cate=1;break | ||
| 1893 | + } | ||
| 1894 | + } | ||
| 1895 | } | 1895 | } |
| 1896 | 1896 | ||
| 1897 | - th.setData({ | ||
| 1898 | - def_pickpu_list: def_arr, | ||
| 1899 | - pickpu_list: ee.data.data.pageData | ||
| 1900 | - }); | 1897 | + if (check_all_cate) { |
| 1898 | + | ||
| 1901 | var sto_cate = ee.data.data.pageData; | 1899 | var sto_cate = ee.data.data.pageData; |
| 1902 | var sto_arr = e.data.data.pageData; | 1900 | var sto_arr = e.data.data.pageData; |
| 1903 | var newarr = new Array(); | 1901 | var newarr = new Array(); |
| 1904 | var qita = new Array(); | 1902 | var qita = new Array(); |
| 1905 | 1903 | ||
| 1904 | + var is_del_pk=0; | ||
| 1906 | //----要进行门店分组-------- | 1905 | //----要进行门店分组-------- |
| 1907 | for (var i = 0; i < sto_arr.length; i++) { | 1906 | for (var i = 0; i < sto_arr.length; i++) { |
| 1908 | //找一下这个门店有没有在分类数组内 | 1907 | //找一下这个门店有没有在分类数组内 |
| 1909 | var find2 = 0, find2name = "", sort = 0; | 1908 | var find2 = 0, find2name = "", sort = 0; |
| 1909 | + is_del_pk=0; | ||
| 1910 | for (var m = 0; m < sto_cate.length; m++) { | 1910 | for (var m = 0; m < sto_cate.length; m++) { |
| 1911 | - if (sto_arr[i].category_id == sto_cate[m].cat_id) { | ||
| 1912 | - find2 = sto_cate[m].cat_id; | ||
| 1913 | - find2name = sto_cate[m].cat_name; | ||
| 1914 | - sort = sto_cate[m].sort; | ||
| 1915 | - break; | ||
| 1916 | - } | 1911 | + if (sto_arr[i].category_id == sto_cate[m].cat_id) { |
| 1912 | + if (sto_cate[m].is_show != 1) { | ||
| 1913 | + is_del_pk = 1; | ||
| 1914 | + sto_arr.splice(i, 1); | ||
| 1915 | + i--; | ||
| 1916 | + } else { | ||
| 1917 | + find2 = sto_cate[m].cat_id; | ||
| 1918 | + find2name = sto_cate[m].cat_name; | ||
| 1919 | + sort = sto_cate[m].sort; | ||
| 1920 | + is_del_pk = 0; | ||
| 1921 | + } | ||
| 1922 | + break; | ||
| 1923 | + } | ||
| 1917 | } | 1924 | } |
| 1918 | 1925 | ||
| 1926 | + if(is_del_pk) continue; | ||
| 1927 | + | ||
| 1919 | if (newarr.length > 0) { | 1928 | if (newarr.length > 0) { |
| 1920 | var find = 0; | 1929 | var find = 0; |
| 1921 | //如果有找到，那门店就在这个分组内，否则，分类就要排在其他 | 1930 | //如果有找到，那门店就在这个分组内，否则，分类就要排在其他 |
| @@ -1959,6 +1968,18 @@ Page({ | @@ -1959,6 +1968,18 @@ Page({ | ||
| 1959 | } | 1968 | } |
| 1960 | } | 1969 | } |
| 1961 | 1970 | ||
| 1971 | + | ||
| 1972 | + var def_arr = new Array(); | ||
| 1973 | + //-- 开始就看10个门店 -- | ||
| 1974 | + for (var k = 0; k < 10; k++) { | ||
| 1975 | + if (k == sto_arr.length) break; | ||
| 1976 | + def_arr.push(sto_arr[k]); | ||
| 1977 | + } | ||
| 1978 | + | ||
| 1979 | + th.setData({ | ||
| 1980 | + def_pickpu_list: def_arr, | ||
| 1981 | + pickpu_list: ee.data.data.pageData | ||
| 1982 | + }); | ||
| 1962 | //门店分类要排序下 | 1983 | //门店分类要排序下 |
| 1963 | function compare(property) { | 1984 | function compare(property) { |
| 1964 | return function (a, b) { | 1985 | return function (a, b) { |
| @@ -1981,10 +2002,16 @@ Page({ | @@ -1981,10 +2002,16 @@ Page({ | ||
| 1981 | newarr.push(item); | 2002 | newarr.push(item); |
| 1982 | } | 2003 | } |
| 1983 | 2004 | ||
| 1984 | - th.setData({ | ||
| 1985 | - is_show_sto_cat: 1, | ||
| 1986 | - all_sto: newarr | ||
| 1987 | - }); | 2005 | + |
| 2006 | + var sd={ | ||
| 2007 | + all_sto: newarr, | ||
| 2008 | + is_show_sto_cat:1 | ||
| 2009 | + } | ||
| 2010 | + if(!sto_arr || sto_arr.length<=10){ | ||
| 2011 | + sd.is_show_sto_cat=-1; | ||
| 2012 | + sd.only_pk=sto_arr; | ||
| 2013 | + } | ||
| 2014 | + th.setData(sd); | ||
| 1988 | 2015 | ||
| 1989 | } else { | 2016 | } else { |
| 1990 | th.setData({ | 2017 | th.setData({ |
packageC/pages/presell/goodsInfo/goodsInfo.wxml
| @@ -788,9 +788,9 @@ | @@ -788,9 +788,9 @@ | ||
| 788 | <view> | 788 | <view> |
| 789 | <icon bindtap="close_popup" class="modal-closes" color="black" size="22" type="cancel"></icon> | 789 | <icon bindtap="close_popup" class="modal-closes" color="black" size="22" type="cancel"></icon> |
| 790 | </view> | 790 | </view> |
| 791 | - <view class="felx choose_more" bindtap="more_store"> | ||
| 792 | - <text class="fs26 red-co" wx:if="{{is_show_sto_cat}}">{{choice_sort_store==0?'更多门店':'返回'}}</text> | ||
| 793 | - <view class="bg_rights" wx:if="{{is_show_sto_cat}}"></view> | 791 | + <view class="felx choose_more" bindtap="more_store" wx:if="{{is_show_sto_cat>0}}" > |
| 792 | + <text class="fs26 red-co" >{{choice_sort_store==0?'更多门店':'返回'}}</text> | ||
| 793 | + <view class="bg_rights"></view> | ||
| 794 | </view> | 794 | </view> |
| 795 | </view> | 795 | </view> |
| 796 | </view> | 796 | </view> |
pages/goods/categoryList/categoryList.js
| @@ -856,9 +856,7 @@ Page({ | @@ -856,9 +856,7 @@ Page({ | ||
| 856 | data: { page: page, cat_id: cid, parent_id: 0, orderField: 'sort', orderType: 'asc', is_mainshow: 1, isonsale: 1, store_id: oo.stoid, is_recommend: 1 }, | 856 | data: { page: page, cat_id: cid, parent_id: 0, orderField: 'sort', orderType: 'asc', is_mainshow: 1, isonsale: 1, store_id: oo.stoid, is_recommend: 1 }, |
| 857 | success: function (e) { | 857 | success: function (e) { |
| 858 | console.log(e.data.data.pageData) | 858 | console.log(e.data.data.pageData) |
| 859 | - s.setData({ | ||
| 860 | - dataLength: e.data.data.pageData.length, | ||
| 861 | - }); | 859 | + |
| 862 | if (e.data.data.pageData.length > 0) { | 860 | if (e.data.data.pageData.length > 0) { |
| 863 | s.setData({ | 861 | s.setData({ |
| 864 | msgStatus: false,is_no_more:0 | 862 | msgStatus: false,is_no_more:0 |
| @@ -886,6 +884,10 @@ Page({ | @@ -886,6 +884,10 @@ Page({ | ||
| 886 | }) | 884 | }) |
| 887 | } | 885 | } |
| 888 | } | 886 | } |
| 887 | + | ||
| 888 | + s.setData({ | ||
| 889 | + dataLength: s.data.requestData.length, | ||
| 890 | + }); | ||
| 889 | 891 | ||
| 890 | } else { | 892 | } else { |
| 891 | //没有数据页面显示暂无数据 | 893 | //没有数据页面显示暂无数据 |
| @@ -911,9 +913,7 @@ Page({ | @@ -911,9 +913,7 @@ Page({ | ||
| 911 | }); | 913 | }); |
| 912 | s.style(s.data.stylePage, dataArray[index + 1]['items']['id']) | 914 | s.style(s.data.stylePage, dataArray[index + 1]['items']['id']) |
| 913 | } | 915 | } |
| 914 | - | ||
| 915 | - | ||
| 916 | - | 916 | + |
| 917 | }else{ | 917 | }else{ |
| 918 | //没有数据而且是第一页的时候 | 918 | //没有数据而且是第一页的时候 |
| 919 | s.setData({ | 919 | s.setData({ |
pages/goods/goodsInfo/goodsInfo.js
| @@ -2594,44 +2594,49 @@ Page({ | @@ -2594,44 +2594,49 @@ Page({ | ||
| 2594 | getApp().request.get("/api/weshop/storagecategory/page", { | 2594 | getApp().request.get("/api/weshop/storagecategory/page", { |
| 2595 | data: { | 2595 | data: { |
| 2596 | store_id: o.stoid, | 2596 | store_id: o.stoid, |
| 2597 | - is_show: 1, | ||
| 2598 | pageSize: 1000, | 2597 | pageSize: 1000, |
| 2599 | orderField: "sort", | 2598 | orderField: "sort", |
| 2600 | orderType: 'asc', | 2599 | orderType: 'asc', |
| 2601 | }, | 2600 | }, |
| 2602 | success: function (ee) { | 2601 | success: function (ee) { |
| 2603 | if (ee.data.code == 0) { | 2602 | if (ee.data.code == 0) { |
| 2604 | - | ||
| 2605 | - if (ee.data.data && ee.data.data.pageData && ee.data.data.pageData.length > 0) { | ||
| 2606 | - var def_arr = new Array(); | ||
| 2607 | - var ishas = 0; | ||
| 2608 | - //-- 开始就看5个门店 -- | ||
| 2609 | - for (var k = 0; k < 10; k++) { | ||
| 2610 | - if (k == e.data.data.pageData.length) break; | ||
| 2611 | - def_arr.push(e.data.data.pageData[k]); | ||
| 2612 | - } | ||
| 2613 | - | ||
| 2614 | - th.setData({ | ||
| 2615 | - def_pickpu_list: def_arr, | ||
| 2616 | - pickpu_list: ee.data.data.pageData | ||
| 2617 | - }); | 2603 | + var check_all_cate=0; |
| 2604 | + if (ee.data.data && ee.data.data.pageData && ee.data.data.pageData.length > 0){ | ||
| 2605 | + for(let i in ee.data.data.pageData){ | ||
| 2606 | + let item=ee.data.data.pageData[i]; | ||
| 2607 | + if(item.is_show==1){ | ||
| 2608 | + check_all_cate=1;break | ||
| 2609 | + } | ||
| 2610 | + } | ||
| 2611 | + } | ||
| 2612 | + if (check_all_cate) { | ||
| 2618 | var sto_cate = ee.data.data.pageData; | 2613 | var sto_cate = ee.data.data.pageData; |
| 2619 | var sto_arr = e.data.data.pageData; | 2614 | var sto_arr = e.data.data.pageData; |
| 2620 | var newarr = new Array(); | 2615 | var newarr = new Array(); |
| 2621 | var qita = new Array(); | 2616 | var qita = new Array(); |
| 2622 | 2617 | ||
| 2618 | + | ||
| 2619 | + var is_del_pk=0; | ||
| 2623 | //----要进行门店分组-------- | 2620 | //----要进行门店分组-------- |
| 2624 | for (var i = 0; i < sto_arr.length; i++) { | 2621 | for (var i = 0; i < sto_arr.length; i++) { |
| 2625 | //找一下这个门店有没有在分类数组内 | 2622 | //找一下这个门店有没有在分类数组内 |
| 2626 | var find2 = 0, find2name = "", sort = 0; | 2623 | var find2 = 0, find2name = "", sort = 0; |
| 2624 | + is_del_pk=0; | ||
| 2627 | for (var m = 0; m < sto_cate.length; m++) { | 2625 | for (var m = 0; m < sto_cate.length; m++) { |
| 2628 | if (sto_arr[i].category_id == sto_cate[m].cat_id) { | 2626 | if (sto_arr[i].category_id == sto_cate[m].cat_id) { |
| 2629 | - find2 = sto_cate[m].cat_id; | ||
| 2630 | - find2name = sto_cate[m].cat_name; | ||
| 2631 | - sort = sto_cate[m].sort; | 2627 | + if(sto_cate[m].is_show!=1){ |
| 2628 | + is_del_pk=1; sto_arr.splice(i,1); | ||
| 2629 | + i--; | ||
| 2630 | + }else { | ||
| 2631 | + find2 = sto_cate[m].cat_id; | ||
| 2632 | + find2name = sto_cate[m].cat_name; | ||
| 2633 | + sort = sto_cate[m].sort; | ||
| 2634 | + is_del_pk=0; | ||
| 2635 | + } | ||
| 2632 | break; | 2636 | break; |
| 2633 | } | 2637 | } |
| 2634 | } | 2638 | } |
| 2639 | + if(is_del_pk) continue; | ||
| 2635 | 2640 | ||
| 2636 | if (newarr.length > 0) { | 2641 | if (newarr.length > 0) { |
| 2637 | var find = 0; | 2642 | var find = 0; |
| @@ -2676,6 +2681,19 @@ Page({ | @@ -2676,6 +2681,19 @@ Page({ | ||
| 2676 | } | 2681 | } |
| 2677 | } | 2682 | } |
| 2678 | 2683 | ||
| 2684 | + var def_arr = new Array(); | ||
| 2685 | + //-- 开始就看10个门店 -- | ||
| 2686 | + for (var k = 0; k < 10; k++) { | ||
| 2687 | + if (k == sto_arr.length) break; | ||
| 2688 | + def_arr.push(sto_arr[k]); | ||
| 2689 | + } | ||
| 2690 | + | ||
| 2691 | + th.setData({ | ||
| 2692 | + def_pickpu_list: def_arr, | ||
| 2693 | + pickpu_list: ee.data.data.pageData | ||
| 2694 | + }); | ||
| 2695 | + | ||
| 2696 | + | ||
| 2679 | //门店分类要排序下 | 2697 | //门店分类要排序下 |
| 2680 | function compare(property) { | 2698 | function compare(property) { |
| 2681 | return function (a, b) { | 2699 | return function (a, b) { |
| @@ -2698,10 +2716,15 @@ Page({ | @@ -2698,10 +2716,15 @@ Page({ | ||
| 2698 | newarr.push(item); | 2716 | newarr.push(item); |
| 2699 | } | 2717 | } |
| 2700 | 2718 | ||
| 2701 | - th.setData({ | ||
| 2702 | - is_show_sto_cat: 1, | ||
| 2703 | - all_sto: newarr | ||
| 2704 | - }); | 2719 | + var sd={ |
| 2720 | + all_sto: newarr, | ||
| 2721 | + is_show_sto_cat:1 | ||
| 2722 | + } | ||
| 2723 | + if(!sto_arr || sto_arr.length<=10){ | ||
| 2724 | + sd.is_show_sto_cat=-1; | ||
| 2725 | + sd.only_pk=sto_arr; | ||
| 2726 | + } | ||
| 2727 | + th.setData(sd); | ||
| 2705 | 2728 | ||
| 2706 | } else { | 2729 | } else { |
| 2707 | th.setData({ | 2730 | th.setData({ |
| @@ -2710,7 +2733,12 @@ Page({ | @@ -2710,7 +2733,12 @@ Page({ | ||
| 2710 | }); | 2733 | }); |
| 2711 | //-----如果没有默认门店，要取第一个门店作为默认店.此时没有门店分类的情况------ | 2734 | //-----如果没有默认门店，要取第一个门店作为默认店.此时没有门店分类的情况------ |
| 2712 | if (!th.data.def_pick_store) { | 2735 | if (!th.data.def_pick_store) { |
| 2713 | - th.setData({ def_pick_store: e.data.data.pageData[0] }) | 2736 | + th.setData({ |
| 2737 | + def_pick_store: e.data.data.pageData[0], | ||
| 2738 | + sto_sele_name: e.data.data.pageData[0].pickup_name, | ||
| 2739 | + sto_sele_id: e.data.data.pageData[0].pickup_id, | ||
| 2740 | + sto_sele_distr: e.data.data.pageData[0].distr_type | ||
| 2741 | + }) | ||
| 2714 | } | 2742 | } |
| 2715 | } | 2743 | } |
| 2716 | } else { | 2744 | } else { |
| @@ -2720,7 +2748,12 @@ Page({ | @@ -2720,7 +2748,12 @@ Page({ | ||
| 2720 | }); | 2748 | }); |
| 2721 | //-----如果没有默认门店，要取第一个门店作为默认店.此时没有门店分类的情况------ | 2749 | //-----如果没有默认门店，要取第一个门店作为默认店.此时没有门店分类的情况------ |
| 2722 | if (!th.data.def_pick_store) { | 2750 | if (!th.data.def_pick_store) { |
| 2723 | - th.setData({ def_pick_store: e.data.data.pageData[0] }) | 2751 | + th.setData({ |
| 2752 | + def_pick_store: e.data.data.pageData[0], | ||
| 2753 | + sto_sele_name: e.data.data.pageData[0].pickup_name, | ||
| 2754 | + sto_sele_id: e.data.data.pageData[0].pickup_id, | ||
| 2755 | + sto_sele_distr: e.data.data.pageData[0].distr_type | ||
| 2756 | + }) | ||
| 2724 | } | 2757 | } |
| 2725 | 2758 | ||
| 2726 | } | 2759 | } |
| @@ -4441,7 +4474,7 @@ Page({ | @@ -4441,7 +4474,7 @@ Page({ | ||
| 4441 | 4474 | ||
| 4442 | var pri0 = th.data.data.shop_price; | 4475 | var pri0 = th.data.data.shop_price; |
| 4443 | if (th.data.prom_act) | 4476 | if (th.data.prom_act) |
| 4444 | - pri0 = th.data.prom_act.price; | 4477 | + pri0 = th.data.prom_price; |
| 4445 | pri0 = parseFloat(pri0).toFixed(2); | 4478 | pri0 = parseFloat(pri0).toFixed(2); |
| 4446 | var wd1 = th.data.screenWidth - ut.measureText(pri0, 31 * unit) - 25; | 4479 | var wd1 = th.data.screenWidth - ut.measureText(pri0, 31 * unit) - 25; |
| 4447 | context.fillText("￥", wd1 - 15, 185 * unit); | 4480 | context.fillText("￥", wd1 - 15, 185 * unit); |
pages/goods/goodsInfo/goodsInfo.wxml
| @@ -188,26 +188,11 @@ | @@ -188,26 +188,11 @@ | ||
| 188 | <view class="rel"> | 188 | <view class="rel"> |
| 189 | <view class='ghaicha ellipsis-2'> | 189 | <view class='ghaicha ellipsis-2'> |
| 190 | <text class='gred' wx:if="{{prom_act.max_ct_num >0}}"> | 190 | <text class='gred' wx:if="{{prom_act.max_ct_num >0}}"> |
| 191 | - <text class="flex" wx:if="{{prom_act.max_ct_num - item.open_num>0}}"> | ||
| 192 | - 还差 | ||
| 193 | - <text class="word-color">{{prom_act.max_ct_num - item.open_num}}</text> | ||
| 194 | - 人享最低优惠 | ||
| 195 | - </text> | 191 | + <text class="flex" wx:if="{{prom_act.max_ct_num - item.open_num>0}}">还差<text class="word-color">{{prom_act.max_ct_num - item.open_num}}</text>人享最低优惠</text> |
| 196 | <text wx:else>您已经享最低优惠</text> | 192 | <text wx:else>您已经享最低优惠</text> |
| 197 | </text> | 193 | </text> |
| 198 | - <text class='gred' wx:else> | ||
| 199 | - 还差 | ||
| 200 | - <text style='color:#ff2753'>{{prom_act.ct_num - item.open_num}}</text> | ||
| 201 | - 人成团 | ||
| 202 | - </text> | ||
| 203 | - <view class="t_show"> | ||
| 204 | - 剩余 | ||
| 205 | - <text wx:if="{{timer[t_ind].day}}">{{timer[t_ind].day}}天:</text> | ||
| 206 | - <text>{{timer[t_ind].hou}}</text> | ||
| 207 | - : | ||
| 208 | - <text>{{timer[t_ind].min}}</text> | ||
| 209 | - : | ||
| 210 | - <text>{{timer[t_ind].sec}}</text> | 194 | + <text class='gred' wx:else>还差<text style='color:#ff2753'>{{prom_act.ct_num - item.open_num}}</text>人成团</text> |
| 195 | + <view class="t_show">剩余<text wx:if="{{timer[t_ind].day}}">{{timer[t_ind].day}}天:</text><text>{{timer[t_ind].hou}}</text>:<text>{{timer[t_ind].min}}</text>:<text>{{timer[t_ind].sec}}</text> | ||
| 211 | </view> | 196 | </view> |
| 212 | </view> | 197 | </view> |
| 213 | </view> | 198 | </view> |
| @@ -1457,8 +1442,8 @@ | @@ -1457,8 +1442,8 @@ | ||
| 1457 | <view> | 1442 | <view> |
| 1458 | <icon bindtap="close_popup" class="modal-closes" color="black" size="22" type="cancel"></icon> | 1443 | <icon bindtap="close_popup" class="modal-closes" color="black" size="22" type="cancel"></icon> |
| 1459 | </view> | 1444 | </view> |
| 1460 | - <view class="felx choose_more" bindtap="more_store"> | ||
| 1461 | - <text class="fs26 red-co" wx:if="{{is_show_sto_cat}}">{{choice_sort_store==0?'更多门店':'返回'}}</text> <view class="bg_rights" wx:if="{{is_show_sto_cat}}"></view> | 1445 | + <view class="felx choose_more" bindtap="more_store" wx:if="{{is_show_sto_cat>0}}"> |
| 1446 | + <text class="fs26 red-co" >{{choice_sort_store==0?'更多门店':'返回'}}</text> <view class="bg_rights" ></view> | ||
| 1462 | </view> | 1447 | </view> |
| 1463 | </view> | 1448 | </view> |
| 1464 | </view> | 1449 | </view> |
pages/team/team_show/team_show.js
| @@ -1178,43 +1178,53 @@ Page({ | @@ -1178,43 +1178,53 @@ Page({ | ||
| 1178 | getApp().request.get("/api/weshop/storagecategory/page", { | 1178 | getApp().request.get("/api/weshop/storagecategory/page", { |
| 1179 | data: { | 1179 | data: { |
| 1180 | store_id: o.stoid, | 1180 | store_id: o.stoid, |
| 1181 | - is_show: 1, | ||
| 1182 | pageSize: 1000, | 1181 | pageSize: 1000, |
| 1183 | orderField:"sort", | 1182 | orderField:"sort", |
| 1184 | orderType:'asc', | 1183 | orderType:'asc', |
| 1185 | }, | 1184 | }, |
| 1186 | success: function(ee) { | 1185 | success: function(ee) { |
| 1187 | if (ee.data.code == 0) { | 1186 | if (ee.data.code == 0) { |
| 1188 | - if (ee.data.data && ee.data.data.pageData && ee.data.data.pageData.length > 0) { | ||
| 1189 | - var def_arr = new Array(); | ||
| 1190 | - var ishas = 0; | ||
| 1191 | - //-- 开始就看5个门店 -- | ||
| 1192 | - for (var k = 0; k < 5; k++) { | ||
| 1193 | - if (k == e.data.data.pageData.length) break; | ||
| 1194 | - def_arr.push(e.data.data.pageData[k]); | ||
| 1195 | - } | ||
| 1196 | - | ||
| 1197 | - th.setData({ | ||
| 1198 | - def_pickpu_list: def_arr, | ||
| 1199 | - pickpu_list: ee.data.data.pageData | ||
| 1200 | - }); | 1187 | + |
| 1188 | + var check_all_cate=0; | ||
| 1189 | + if (ee.data.data && ee.data.data.pageData && ee.data.data.pageData.length > 0){ | ||
| 1190 | + for(let i in ee.data.data.pageData){ | ||
| 1191 | + let item=ee.data.data.pageData[i]; | ||
| 1192 | + if(item.is_show==1){ | ||
| 1193 | + check_all_cate=1;break | ||
| 1194 | + } | ||
| 1195 | + } | ||
| 1196 | + } | ||
| 1197 | + | ||
| 1198 | + | ||
| 1199 | + | ||
| 1200 | + if (check_all_cate) { | ||
| 1201 | + | ||
| 1201 | var sto_cate = ee.data.data.pageData; | 1202 | var sto_cate = ee.data.data.pageData; |
| 1202 | var sto_arr = e.data.data.pageData; | 1203 | var sto_arr = e.data.data.pageData; |
| 1203 | var newarr = new Array(); | 1204 | var newarr = new Array(); |
| 1204 | var qita = new Array(); | 1205 | var qita = new Array(); |
| 1205 | - | 1206 | + |
| 1207 | + var is_del_pk=0; | ||
| 1206 | //----要进行门店分组-------- | 1208 | //----要进行门店分组-------- |
| 1207 | for (var i = 0; i < sto_arr.length; i++) { | 1209 | for (var i = 0; i < sto_arr.length; i++) { |
| 1208 | //找一下这个门店有没有在分类数组内 | 1210 | //找一下这个门店有没有在分类数组内 |
| 1209 | var find2 = 0,find2name = "",sort=0; | 1211 | var find2 = 0,find2name = "",sort=0; |
| 1212 | + is_del_pk=0; | ||
| 1210 | for (var m = 0; m < sto_cate.length; m++) { | 1213 | for (var m = 0; m < sto_cate.length; m++) { |
| 1211 | if (sto_arr[i].category_id == sto_cate[m].cat_id) { | 1214 | if (sto_arr[i].category_id == sto_cate[m].cat_id) { |
| 1212 | - find2 = sto_cate[m].cat_id; | ||
| 1213 | - find2name = sto_cate[m].cat_name; | ||
| 1214 | - sort=sto_cate[m].sort; | ||
| 1215 | - break; | 1215 | + if(sto_cate[m].is_show!=1){ |
| 1216 | + is_del_pk=1; sto_arr.splice(i,1); | ||
| 1217 | + i--; | ||
| 1218 | + }else { | ||
| 1219 | + find2 = sto_cate[m].cat_id; | ||
| 1220 | + find2name = sto_cate[m].cat_name; | ||
| 1221 | + sort = sto_cate[m].sort; | ||
| 1222 | + is_del_pk=0; | ||
| 1223 | + } | ||
| 1224 | + break; | ||
| 1216 | } | 1225 | } |
| 1217 | } | 1226 | } |
| 1227 | + if(is_del_pk) continue; | ||
| 1218 | 1228 | ||
| 1219 | if (newarr.length > 0) { | 1229 | if (newarr.length > 0) { |
| 1220 | var find = 0; | 1230 | var find = 0; |
| @@ -1258,8 +1268,20 @@ Page({ | @@ -1258,8 +1268,20 @@ Page({ | ||
| 1258 | } | 1268 | } |
| 1259 | } | 1269 | } |
| 1260 | } | 1270 | } |
| 1261 | - | ||
| 1262 | - //门店分类要排序下 | 1271 | + |
| 1272 | + var def_arr = new Array(); | ||
| 1273 | + //-- 开始就看10个门店 -- | ||
| 1274 | + for (var k = 0; k < 10; k++) { | ||
| 1275 | + if (k == sto_arr.length) break; | ||
| 1276 | + def_arr.push(sto_arr[k]); | ||
| 1277 | + } | ||
| 1278 | + | ||
| 1279 | + th.setData({ | ||
| 1280 | + def_pickpu_list: def_arr, | ||
| 1281 | + pickpu_list: ee.data.data.pageData | ||
| 1282 | + }); | ||
| 1283 | + | ||
| 1284 | + //门店分类要排序下 | ||
| 1263 | function compare(property){ | 1285 | function compare(property){ |
| 1264 | return function(a,b){ | 1286 | return function(a,b){ |
| 1265 | var value1 = a[property]; | 1287 | var value1 = a[property]; |
| @@ -1280,10 +1302,16 @@ Page({ | @@ -1280,10 +1302,16 @@ Page({ | ||
| 1280 | }; | 1302 | }; |
| 1281 | newarr.push(item); | 1303 | newarr.push(item); |
| 1282 | } | 1304 | } |
| 1283 | - th.setData({ | ||
| 1284 | - is_show_sto_cat: 1, | ||
| 1285 | - all_sto: newarr | ||
| 1286 | - }); | 1305 | + |
| 1306 | + var sd={ | ||
| 1307 | + all_sto: newarr, | ||
| 1308 | + is_show_sto_cat:1 | ||
| 1309 | + } | ||
| 1310 | + if(!sto_arr || sto_arr.length<=10){ | ||
| 1311 | + sd.is_show_sto_cat=-1; | ||
| 1312 | + sd.only_pk=sto_arr; | ||
| 1313 | + } | ||
| 1314 | + th.setData(sd); | ||
| 1287 | 1315 | ||
| 1288 | } else { | 1316 | } else { |
| 1289 | th.setData({ | 1317 | th.setData({ |
pages/team/team_show/team_show.wxml
| @@ -291,9 +291,9 @@ | @@ -291,9 +291,9 @@ | ||
| 291 | <view> | 291 | <view> |
| 292 | <icon bindtap="close_popup" class="modal-closes" color="black" size="22" type="cancel"></icon> | 292 | <icon bindtap="close_popup" class="modal-closes" color="black" size="22" type="cancel"></icon> |
| 293 | </view> | 293 | </view> |
| 294 | - <view class="felx choose_more" bindtap="more_store"> | ||
| 295 | - <text class="fs26 red-co" wx:if="{{is_show_sto_cat}}">{{choice_sort_store==0?'更多门店':'返回'}}</text> | ||
| 296 | - <view class="bg_rights" wx:if="{{is_show_sto_cat}}"></view> | 294 | + <view class="felx choose_more" bindtap="more_store" wx:if="{{is_show_sto_cat>0}}"> |
| 295 | + <text class="fs26 red-co">{{choice_sort_store==0?'更多门店':'返回'}}</text> | ||
| 296 | + <view class="bg_rights"></view> | ||
| 297 | </view> | 297 | </view> |
| 298 | </view> | 298 | </view> |
| 299 | </view> | 299 | </view> |
pages/togoin/togoin.js
| @@ -105,7 +105,8 @@ Page({ | @@ -105,7 +105,8 @@ Page({ | ||
| 105 | wx.setStorageSync("userinfo",e.data.data); | 105 | wx.setStorageSync("userinfo",e.data.data); |
| 106 | 106 | ||
| 107 | setTimeout(function () { | 107 | setTimeout(function () { |
| 108 | - wx.navigateBack({ delta: 1}) //返回上一页 | 108 | + getApp().globalData.login_back=1; |
| 109 | + wx.navigateBack({ delta: 1}) //返回上一页 | ||
| 109 | },1000) | 110 | },1000) |
| 110 | }else{ | 111 | }else{ |
| 111 | getApp().globalData.sessionKey=e.data.data.sessionKey; | 112 | getApp().globalData.sessionKey=e.data.data.sessionKey; |
| @@ -200,7 +201,9 @@ Page({ | @@ -200,7 +201,9 @@ Page({ | ||
| 200 | 201 | ||
| 201 | var need_go=0; | 202 | var need_go=0; |
| 202 | var t_user=e.data.data; | 203 | var t_user=e.data.data; |
| 203 | - | 204 | + |
| 205 | + | ||
| 206 | + getApp().globalData.login_back=1; | ||
| 204 | wx.setStorageSync("userinfo",e.data.data); | 207 | wx.setStorageSync("userinfo",e.data.data); |
| 205 | wx.setStorageSync("isAuth", !0), app.globalData.userInfo = e.data.data, app.globalData.userInfo.head_pic = t.getFullUrl(a.globalData.userInfo.head_pic); | 208 | wx.setStorageSync("isAuth", !0), app.globalData.userInfo = e.data.data, app.globalData.userInfo.head_pic = t.getFullUrl(a.globalData.userInfo.head_pic); |
| 206 | 209 | ||
| @@ -272,7 +275,8 @@ Page({ | @@ -272,7 +275,8 @@ Page({ | ||
| 272 | wx.setStorageSync("userinfo",e.data.data); | 275 | wx.setStorageSync("userinfo",e.data.data); |
| 273 | 276 | ||
| 274 | setTimeout(function () { | 277 | setTimeout(function () { |
| 275 | - wx.navigateBack({ delta: 1}) //返回上一页 | 278 | + getApp().globalData.login_back=1; |
| 279 | + wx.navigateBack({ delta: 1}) //返回上一页 | ||
| 276 | },1000) | 280 | },1000) |
| 277 | }else{ | 281 | }else{ |
| 278 | getApp().globalData.sessionKey=e.data.data.sessionKey; | 282 | getApp().globalData.sessionKey=e.data.data.sessionKey; |
pages/user/order_detail/order_detail.js
| @@ -654,23 +654,13 @@ Page({ | @@ -654,23 +654,13 @@ Page({ | ||
| 654 | th.toast(content); | 654 | th.toast(content); |
| 655 | return false; | 655 | return false; |
| 656 | } | 656 | } |
| 657 | - }else{ | ||
| 658 | - var redis_num = 0; | ||
| 659 | - //------判断活动是否抢光----- | ||
| 660 | - await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" + | ||
| 661 | - os.stoid + "/" + goodsinfo.prom_type + "/" + goodsinfo.prom_id, { | ||
| 662 | - }).then(res => { | ||
| 663 | - redis_num = res.data.data; | ||
| 664 | - }); | ||
| 665 | - | ||
| 666 | - if (good.goods_num > redis_num) { | ||
| 667 | - | ||
| 668 | - var content=gg.goods_name+'超出商品活动库存,请取消订单'; | ||
| 669 | - th.toast(content); | ||
| 670 | - return false; | ||
| 671 | - } | ||
| 672 | - } | ||
| 673 | - | 657 | + }else if(goodsinfo.prom_type == 1 || goodsinfo.prom_type == 2 || goodsinfo.prom_type == 6 ) { |
| 658 | + if(order.add_time+5*60<ut.gettimestamp()) { | ||
| 659 | + var content = gg.goods_name + '该订单已经超时无法支付,请取消订单'; | ||
| 660 | + th.toast(content); | ||
| 661 | + return false; | ||
| 662 | + } | ||
| 663 | + } | ||
| 674 | } | 664 | } |
| 675 | 665 | ||
| 676 | } | 666 | } |
pages/user/order_list/order_list.js
| @@ -460,7 +460,6 @@ Page({ | @@ -460,7 +460,6 @@ Page({ | ||
| 460 | } | 460 | } |
| 461 | }); | 461 | }); |
| 462 | }, | 462 | }, |
| 463 | - | ||
| 464 | /*----------跳转支付-----------*/ | 463 | /*----------跳转支付-----------*/ |
| 465 | async jumpToCart4(t) { | 464 | async jumpToCart4(t) { |
| 466 | var o_index = t.currentTarget.dataset.idx; | 465 | var o_index = t.currentTarget.dataset.idx; |
| @@ -835,17 +834,9 @@ Page({ | @@ -835,17 +834,9 @@ Page({ | ||
| 835 | th.toast(content); | 834 | th.toast(content); |
| 836 | return false; | 835 | return false; |
| 837 | } | 836 | } |
| 838 | - } else { | ||
| 839 | - var redis_num = 0; | ||
| 840 | - //------判断活动是否抢光----- | ||
| 841 | - await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" + | ||
| 842 | - os.stoid + "/" + goodsinfo.prom_type + "/" + goodsinfo.prom_id, {}).then(res => { | ||
| 843 | - redis_num = res.data.data; | ||
| 844 | - }); | ||
| 845 | - | ||
| 846 | - if (good.goods_num > redis_num) { | ||
| 847 | - | ||
| 848 | - var content = gg.goods_name + '超出商品活动库存,请取消订单'; | 837 | + } else if(goodsinfo.prom_type == 1 || goodsinfo.prom_type == 2 || goodsinfo.prom_type == 6 ) { |
| 838 | + if(order.add_time+5*60<ut.gettimestamp()) { | ||
| 839 | + var content = gg.goods_name + '该订单已经超时无法支付,请取消订单'; | ||
| 849 | th.toast(content); | 840 | th.toast(content); |
| 850 | return false; | 841 | return false; |
| 851 | } | 842 | } |
pages/user/userinfo/userinfo.js
| @@ -317,46 +317,57 @@ Page({ | @@ -317,46 +317,57 @@ Page({ | ||
| 317 | } | 317 | } |
| 318 | 318 | ||
| 319 | //单总量超出5个的时候 | 319 | //单总量超出5个的时候 |
| 320 | - if (e.data.data.total > 5) { | 320 | + if (e.data.data.total > 10) { |
| 321 | i.get("/api/weshop/storagecategory/page", { | 321 | i.get("/api/weshop/storagecategory/page", { |
| 322 | data: { | 322 | data: { |
| 323 | - store_id: r.stoid, | ||
| 324 | - is_show: 1, | ||
| 325 | - pageSize: 300 | 323 | + store_id: r.stoid, |
| 324 | + pageSize: 1000, | ||
| 325 | + orderField:"sort", | ||
| 326 | + orderType:'asc', | ||
| 326 | }, | 327 | }, |
| 327 | success: function(ee) { | 328 | success: function(ee) { |
| 328 | if (ee.data.code == 0) { | 329 | if (ee.data.code == 0) { |
| 329 | - if (ee.data.data.pageData.length > 0) { | ||
| 330 | - var def_arr = new Array(); | ||
| 331 | - var ishas = 0; | ||
| 332 | - //-- 开始就看5个门店 -- | ||
| 333 | - for (var k = 0; k < 5; k++) { | ||
| 334 | - if (k == e.data.data.pageData.length) break; | ||
| 335 | - def_arr.push(e.data.data.pageData[k]); | ||
| 336 | - } | ||
| 337 | - | ||
| 338 | - th.setData({ | ||
| 339 | - def_pickpu_list: def_arr, | ||
| 340 | - pickpu_list: ee.data.data.pageData | ||
| 341 | - }); | 330 | + |
| 331 | + var check_all_cate=0; | ||
| 332 | + if (ee.data.data && ee.data.data.pageData && ee.data.data.pageData.length > 0){ | ||
| 333 | + for(let i in ee.data.data.pageData){ | ||
| 334 | + let item=ee.data.data.pageData[i]; | ||
| 335 | + if(item.is_show==1){ | ||
| 336 | + check_all_cate=1;break | ||
| 337 | + } | ||
| 338 | + } | ||
| 339 | + } | ||
| 340 | + | ||
| 341 | + | ||
| 342 | + if (check_all_cate) { | ||
| 343 | + | ||
| 342 | var sto_cate = ee.data.data.pageData; | 344 | var sto_cate = ee.data.data.pageData; |
| 343 | var sto_arr = e.data.data.pageData; | 345 | var sto_arr = e.data.data.pageData; |
| 344 | var newarr = new Array(); | 346 | var newarr = new Array(); |
| 345 | var qita = new Array(); | 347 | var qita = new Array(); |
| 346 | - | 348 | + |
| 349 | + var is_del_pk=0; | ||
| 347 | //----要进行门店分组-------- | 350 | //----要进行门店分组-------- |
| 348 | for (var i = 0; i < sto_arr.length; i++) { | 351 | for (var i = 0; i < sto_arr.length; i++) { |
| 349 | //找一下这个门店有没有在分类数组内 | 352 | //找一下这个门店有没有在分类数组内 |
| 350 | - var find2 = 0, | ||
| 351 | - find2name = ""; | 353 | + var find2 = 0, find2name = "",sort=0; |
| 354 | + is_del_pk=0; | ||
| 352 | for (var m = 0; m < sto_cate.length; m++) { | 355 | for (var m = 0; m < sto_cate.length; m++) { |
| 353 | if (sto_arr[i].category_id == sto_cate[m].cat_id) { | 356 | if (sto_arr[i].category_id == sto_cate[m].cat_id) { |
| 354 | - find2 = sto_cate[m].cat_id; | ||
| 355 | - find2name = sto_cate[m].cat_name; | 357 | + if(sto_cate[m].is_show!=1){ |
| 358 | + is_del_pk=1; sto_arr.splice(i,1); | ||
| 359 | + i--; | ||
| 360 | + }else { | ||
| 361 | + find2 = sto_cate[m].cat_id; | ||
| 362 | + find2name = sto_cate[m].cat_name; | ||
| 363 | + sort = sto_cate[m].sort; | ||
| 364 | + is_del_pk=0; | ||
| 365 | + } | ||
| 356 | break; | 366 | break; |
| 357 | } | 367 | } |
| 358 | } | 368 | } |
| 359 | - | 369 | + |
| 370 | + if(is_del_pk) continue; | ||
| 360 | if (newarr.length > 0) { | 371 | if (newarr.length > 0) { |
| 361 | var find = 0; | 372 | var find = 0; |
| 362 | //如果有找到，那门店就在这个分组内，否则，分类就要排在其他 | 373 | //如果有找到，那门店就在这个分组内，否则，分类就要排在其他 |
| @@ -374,6 +385,7 @@ Page({ | @@ -374,6 +385,7 @@ Page({ | ||
| 374 | var item = { | 385 | var item = { |
| 375 | cat_id: find2, | 386 | cat_id: find2, |
| 376 | name: find2name, | 387 | name: find2name, |
| 388 | + sort:sort, | ||
| 377 | s_arr: arr0 | 389 | s_arr: arr0 |
| 378 | }; | 390 | }; |
| 379 | newarr.push(item); | 391 | newarr.push(item); |
| @@ -389,6 +401,7 @@ Page({ | @@ -389,6 +401,7 @@ Page({ | ||
| 389 | var item = { | 401 | var item = { |
| 390 | cat_id: find2, | 402 | cat_id: find2, |
| 391 | name: find2name, | 403 | name: find2name, |
| 404 | + sort:sort, | ||
| 392 | s_arr: arr0 | 405 | s_arr: arr0 |
| 393 | }; | 406 | }; |
| 394 | newarr.push(item); | 407 | newarr.push(item); |
| @@ -397,6 +410,29 @@ Page({ | @@ -397,6 +410,29 @@ Page({ | ||
| 397 | } | 410 | } |
| 398 | } | 411 | } |
| 399 | } | 412 | } |
| 413 | + | ||
| 414 | + var def_arr = new Array(); | ||
| 415 | + //-- 开始就看10个门店 -- | ||
| 416 | + for (var k = 0; k < 10; k++) { | ||
| 417 | + if (k == e.data.data.pageData.length) break; | ||
| 418 | + def_arr.push(e.data.data.pageData[k]); | ||
| 419 | + } | ||
| 420 | + | ||
| 421 | + th.setData({ | ||
| 422 | + def_pickpu_list: def_arr, | ||
| 423 | + pickpu_list: ee.data.data.pageData | ||
| 424 | + }); | ||
| 425 | + | ||
| 426 | + //门店分类要排序下 | ||
| 427 | + function compare(property){ | ||
| 428 | + return function(a,b){ | ||
| 429 | + var value1 = a[property]; | ||
| 430 | + var value2 = b[property]; | ||
| 431 | + return value1 - value2; | ||
| 432 | + } | ||
| 433 | + } | ||
| 434 | + if(newarr.length>0) | ||
| 435 | + newarr.sort(compare("sort")); | ||
| 400 | 436 | ||
| 401 | //----安排其他的分类----- | 437 | //----安排其他的分类----- |
| 402 | if (qita.length > 0) { | 438 | if (qita.length > 0) { |
pages/user/userinfo/userinfo.wxml
| @@ -287,8 +287,8 @@ | @@ -287,8 +287,8 @@ | ||
| 287 | <view> | 287 | <view> |
| 288 | <icon bindtap="onclickstore" class="modal-closes" color="black" size="22" type="cancel"></icon> | 288 | <icon bindtap="onclickstore" class="modal-closes" color="black" size="22" type="cancel"></icon> |
| 289 | </view> | 289 | </view> |
| 290 | - <view class="felx choose_more" bindtap="more_store"> | ||
| 291 | - <text class="fs26 red-co" wx:if="{{is_show_sto_cat}}">{{choice_sort_store==0?'更多门店':'返回'}}</text> | 290 | + <view class="felx choose_more" bindtap="more_store" wx:if="{{is_show_sto_cat>0}}"> |
| 291 | + <text class="fs26 red-co">{{choice_sort_store==0?'更多门店':'返回'}}</text> | ||
| 292 | <view class="bg_rights"></view> | 292 | <view class="bg_rights"></view> |
| 293 | </view> | 293 | </view> |
| 294 | </view> | 294 | </view> |